Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@super-protocol/ctl",
"version": "0.11.6",
"version": "0.11.8",
"description": "A tool for publishing values in a secure and reliable way.",
"main": "./build/index.js",
"type": "commonjs",
Expand Down Expand Up @@ -36,7 +36,7 @@
"@iarna/toml": "^2.2.5",
"@super-protocol/distributed-secrets": "1.1.7",
"@super-protocol/dto-js": "1.1.2",
"@super-protocol/sdk-js": "3.11.4",
"@super-protocol/sdk-js": "3.11.12",
"@super-protocol/sp-files-addon": "^0.11.0",
"@types/tar-stream": "^3.1.3",
"axios": "1.6.2",
Expand Down
29 changes: 29 additions & 0 deletions src/error.utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
interface ApiErrorResponse {
response?: {
status?: number;
errors?: Array<{ message?: string }>;
};
}

const isApiError = (error: unknown): error is ApiErrorResponse =>
error !== null && typeof error === 'object' && 'response' in error;

export function getErrorMessage(error: unknown, baseMessage: string): string {
if (!isApiError(error)) {
return baseMessage;
}

const { response } = error;
const status = response?.status;

if (typeof status === 'number' && status >= 500) {
return `${baseMessage}: Server error - code = ${status}`;
}

const errorMessage = response?.errors?.[0]?.message;
if (errorMessage) {
return `${baseMessage}: ${errorMessage}`;
}

return baseMessage;
}
30 changes: 16 additions & 14 deletions src/services/fetchOffers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { GraphQLClient } from 'graphql-request';
import { ErrorWithCustomMessage, formatDate, getObjectKey } from '../utils';
import getGqlHeaders from './gqlHeaders';
import { OfferType } from '@super-protocol/sdk-js';
import doWithRetries from './doWithRetries';
import { getErrorMessage } from '../error.utils';

export type FetchOffersParams = {
backendUrl: string;
Expand Down Expand Up @@ -54,26 +56,26 @@ export default async (
const headers = getGqlHeaders(params.accessToken);

try {
const { result } = await sdk.Offers(
{
pagination: {
first: params.limit,
after: params.cursor,
sortDir: 'DESC',
sortBy: 'origins.createdDate',
const { result } = await doWithRetries(() =>
sdk.Offers(
{
pagination: {
first: params.limit,
after: params.cursor,
sortDir: 'DESC',
sortBy: 'origins.createdDate',
},
filter: { id: params.id, ids: params.ids },
},
filter: { id: params.id, ids: params.ids },
},
headers,
headers,
),
);

return {
list: result.page.edges?.map((item) => item.node) || [],
cursor: result.page.pageInfo?.endCursor || '',
};
} catch (error: any) {
let message = 'Fetching offers error';
if (error?.response?.errors[0]?.message) message += ': ' + error.response.errors[0].message;
throw ErrorWithCustomMessage(message, error);
} catch (error: unknown) {
throw ErrorWithCustomMessage(getErrorMessage(error, 'Fetching offers error'), error);
}
};