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
2 changes: 1 addition & 1 deletion dist/tsconfig.tsbuildinfo

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion dist/web3-wrapper/rpc/abstractRPCSender.js

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

2 changes: 1 addition & 1 deletion dist/web3-wrapper/rpc/abstractRPCSender.js.map

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

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "archive-sdk",
"version": "1.8.0",
"version": "1.8.1",
"description": "",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -76,8 +76,7 @@
"typeorm": "0.3.20"
},
"engines": {
"node": "22.12.0",
"yarn": "4.6.0"
"node": ">=22.12.0"
},
"lint-staged": {
"*.ts": [
Expand Down
7 changes: 6 additions & 1 deletion src/web3-wrapper/rpc/abstractRPCSender.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ export class AbstractRPCSender {

protected shouldRetry(error: any): boolean {
const retryErrorCodes = ['NETWORK_ERROR', 'TIMEOUT'];
// Batched calls surface rate limiting as BAD_DATA with nested -32005 errors in `value`, not as a 429/error.code.
const isRateLimited = (val: any) =>
Array.isArray(val) && val.some((e) => e?.code === -32005);

return (
retryErrorCodes.includes(error.code) ||
retryErrorCodes.includes(error.error?.code) ||
[402, 403, 429].includes(error.status)
[402, 403, 429].includes(error.status) ||
(error.code === 'BAD_DATA' && isRateLimited(error.value))
);
}
}
92 changes: 92 additions & 0 deletions test/web3-wrapper/rpc/abstractRPCSender.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import { AbstractRPCSender } from '../../../src/web3-wrapper/rpc/abstractRPCSender';

class TestableRPCSender extends AbstractRPCSender {
public shouldRetry(error: any): boolean {
return super.shouldRetry(error);
}

public getErrorMessage(error: any, rpcUrl: string): string {
return super.getErrorMessage(error, rpcUrl);
}
}

describe('AbstractRPCSender', () => {
const sender = new TestableRPCSender();

describe('shouldRetry', () => {
it('returns true for NETWORK_ERROR code', () => {
expect(sender.shouldRetry({ code: 'NETWORK_ERROR' })).toBe(true);
});

it('returns true for TIMEOUT code', () => {
expect(sender.shouldRetry({ code: 'TIMEOUT' })).toBe(true);
});

it('returns true when nested error.error.code is retryable', () => {
expect(
sender.shouldRetry({ code: 'SERVER_ERROR', error: { code: 'TIMEOUT' } }),
).toBe(true);
});

it.each([402, 403, 429])('returns true for status %d', (status) => {
expect(sender.shouldRetry({ status })).toBe(true);
});

it('returns true for BAD_DATA with nested -32005 rate limit errors', () => {
const error = {
code: 'BAD_DATA',
message: 'missing response for request',
value: [
{ code: -32005, message: 'Too Many Requests' },
{ code: -32005, message: 'Too Many Requests' },
],
};

expect(sender.shouldRetry(error)).toBe(true);
});

it('returns false for BAD_DATA without nested -32005 errors', () => {
const error = {
code: 'BAD_DATA',
message: 'could not decode result data',
value: '0x',
};

expect(sender.shouldRetry(error)).toBe(false);
});

it('returns false for BAD_DATA when value is not an array', () => {
const error = { code: 'BAD_DATA', value: { code: -32005 } };

expect(sender.shouldRetry(error)).toBe(false);
});

it('returns false for unrelated error codes', () => {
expect(sender.shouldRetry({ code: 'UNKNOWN_ERROR' })).toBe(false);
});

it('returns false for an empty error object', () => {
expect(sender.shouldRetry({})).toBe(false);
});
});

describe('getErrorMessage', () => {
const rpcUrl = 'https://rpc.example.com';

it('formats NETWORK_ERROR messages distinctly', () => {
const error = { code: 'NETWORK_ERROR', message: 'connection refused' };

expect(sender.getErrorMessage(error, rpcUrl)).toBe(
`Error connecting to RPC ${rpcUrl}, message: connection refused`,
);
});

it('formats other error codes with the code included', () => {
const error = { code: 'BAD_DATA', message: 'missing response for request' };

expect(sender.getErrorMessage(error, rpcUrl)).toBe(
`Error on RPC ${rpcUrl}, code: BAD_DATA, message: missing response for request`,
);
});
});
});
Loading