From 6fe83a6cd0293f3950aeef4db3b0e86e6da5ae68 Mon Sep 17 00:00:00 2001 From: Dylan Audius Date: Thu, 12 Nov 2026 09:52:17 -0800 Subject: [PATCH] fix(sdk): handle async errors in storage, node selection, relay and chats From #14665: - Storage: forward tus onSuccess polling failures to reject; stop polling after abort - StorageNodeSelector: drop the bootstrap ordering when the node list refreshes - Request signature middleware: clear the cached signature on errors - SolanaRelayWalletAdapter: reset connecting when getFeePayer throws - SolanaRelay: don't mask ResponseError with a body parse error - SolanaClient: round the priority fee so BigInt() doesn't throw - ChatsApi: don't cache rejected public key lookups; catch websocket handler errors Co-Authored-By: Claude Opus 5.5 --- .changeset/sdk-error-handling-fixes.md | 13 +++++ packages/sdk/src/sdk/api/chats/ChatsApi.ts | 16 +++++- .../addRequestSignatureMiddleware.test.ts | 34 ++++++++++++ .../addRequestSignatureMiddleware.ts | 5 ++ .../src/sdk/services/Solana/SolanaRelay.ts | 6 ++- .../Solana/SolanaRelayWalletAdapter.ts | 17 +++--- .../Solana/programs/SolanaClient.test.ts | 52 +++++++++++++++++++ .../services/Solana/programs/SolanaClient.ts | 9 ++-- .../src/sdk/services/Storage/Storage.test.ts | 24 +++++++++ .../sdk/src/sdk/services/Storage/Storage.ts | 15 +++--- .../StorageNodeSelector.test.ts | 39 ++++++++++++++ .../StorageNodeSelector.ts | 14 +++-- 12 files changed, 220 insertions(+), 24 deletions(-) create mode 100644 .changeset/sdk-error-handling-fixes.md create mode 100644 packages/sdk/src/sdk/services/Solana/programs/SolanaClient.test.ts diff --git a/.changeset/sdk-error-handling-fixes.md b/.changeset/sdk-error-handling-fixes.md new file mode 100644 index 00000000000..5b2b749efb3 --- /dev/null +++ b/.changeset/sdk-error-handling-fixes.md @@ -0,0 +1,13 @@ +--- +'@audius/sdk': patch +--- + +Fix several error-handling bugs: + +- Uploads reject when transcode/resize polling fails instead of never settling, and aborting an upload stops status polling right away. +- The storage node selector reorders using the refreshed node list after an earlier node list fetch failed. +- The request signature middleware no longer attaches a previously cached signature after the wallet is gone (e.g. after logout) or signing fails. +- `SolanaRelayWalletAdapter.connect()` resets `connecting` when fetching the fee payer fails. +- `SolanaRelay.relay()` rethrows the original response error when the error body isn't JSON. +- `SolanaClient.buildTransaction()` rounds the percentile-based priority fee, which threw on fractional values. +- Chats: a failed public key fetch is no longer cached, and errors handling websocket events are logged instead of becoming unhandled rejections. diff --git a/packages/sdk/src/sdk/api/chats/ChatsApi.ts b/packages/sdk/src/sdk/api/chats/ChatsApi.ts index ff53baa2723..259ab0f7cb9 100644 --- a/packages/sdk/src/sdk/api/chats/ChatsApi.ts +++ b/packages/sdk/src/sdk/api/chats/ChatsApi.ts @@ -884,7 +884,14 @@ export class ChatsApi private async getPublicKey(userId: string): Promise { if (!this.publicKeyCache[userId]) { - this.publicKeyCache[userId] = this.fetchPublicKey(userId) + const promise = this.fetchPublicKey(userId) + this.publicKeyCache[userId] = promise + // Don't cache failures, so a transient error can be retried + promise.catch(() => { + if (this.publicKeyCache[userId] === promise) { + delete this.publicKeyCache[userId] + } + }) } const cachedPromise = this.publicKeyCache[userId] if (!cachedPromise) { @@ -1049,7 +1056,12 @@ export class ChatsApi }) } } - handleAsync() + handleAsync().catch((e) => { + this.logger.error( + '[audius-sdk]: Error: Failed to handle websocket event', + e + ) + }) }) ws.addEventListener('open', () => { this.eventEmitter.emit('open') diff --git a/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.test.ts b/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.test.ts index 80482d75ad6..ccc8732923f 100644 --- a/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.test.ts +++ b/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.test.ts @@ -1,3 +1,4 @@ +import { generatePrivateKey } from 'viem/accounts' import { describe, it, expect, vi } from 'vitest' import { createAppWalletClient, Logger } from '../services' @@ -105,6 +106,39 @@ describe('addRequestSignatureMiddleware', () => { expect(ctx?.init.headers).not.toHaveProperty('Encoded-Data-Signature') }) + it('does not reuse a cached signature once the wallet is gone', async () => { + const appWalletClient = createAppWalletClient({ + apiKey: '', + apiSecret: generatePrivateKey() + }) + const getAddresses = vi.fn(() => appWalletClient.getAddresses()) + const services = { + audiusWalletClient: { + ...appWalletClient, + getAddresses, + signMessage: appWalletClient.signMessage.bind(appWalletClient) + } as any, + logger: { warn: vi.fn() } as any + } + + const m = addRequestSignatureMiddleware({ services }) + const request = () => + m.pre?.({ + fetch, + url: 'example.com', + init: { headers: { 'x-something': 'value' } } + }) + + const ctx = await request() + expect(ctx?.init.headers).toHaveProperty('Encoded-Data-Signature') + + // Simulate logging out + getAddresses.mockRejectedValue(new HedgehogWalletNotFoundError()) + const ctx2 = await request() + expect(ctx2?.init.headers).not.toHaveProperty('Encoded-Data-Message') + expect(ctx2?.init.headers).not.toHaveProperty('Encoded-Data-Signature') + }) + it('logs warning for other errors', async () => { const mockLogger = { warn: vi.fn() diff --git a/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.ts b/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.ts index e0105e90e23..cebb3f71a24 100644 --- a/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.ts +++ b/packages/sdk/src/sdk/middleware/addRequestSignatureMiddleware.ts @@ -82,6 +82,11 @@ export const addRequestSignatureMiddleware = ({ timestamp = currentTimestamp } } catch (e) { + // Don't keep sending a stale signature, e.g. after logout + message = null + signature = null + signatureAddress = null + timestamp = null // Don't log a warning for HedgehogWalletNotFoundError as it's expected when user is logged out if (!(e instanceof HedgehogWalletNotFoundError)) { logger?.warn(`Unable to add request signature: ${e}`) diff --git a/packages/sdk/src/sdk/services/Solana/SolanaRelay.ts b/packages/sdk/src/sdk/services/Solana/SolanaRelay.ts index f32b3d4a8f8..1c1773cc00b 100644 --- a/packages/sdk/src/sdk/services/Solana/SolanaRelay.ts +++ b/packages/sdk/src/sdk/services/Solana/SolanaRelay.ts @@ -146,8 +146,12 @@ export class SolanaRelay extends BaseAPI { // SendTransactionError to transparently raise to the caller. if (e instanceof Error && e.name === 'ResponseError') { const resp = (e as runtime.ResponseError).response.clone() - const body = await resp.json() + // The error body isn't always JSON; if it can't be parsed, surface the + // original ResponseError instead of a SyntaxError + const body = await resp.json().catch(() => null) if ( + body !== null && + typeof body === 'object' && 'error' in body && 'transactionMessage' in body && 'signature' in body diff --git a/packages/sdk/src/sdk/services/Solana/SolanaRelayWalletAdapter.ts b/packages/sdk/src/sdk/services/Solana/SolanaRelayWalletAdapter.ts index 3a5f5e1dbc3..59a8a38b2c5 100644 --- a/packages/sdk/src/sdk/services/Solana/SolanaRelayWalletAdapter.ts +++ b/packages/sdk/src/sdk/services/Solana/SolanaRelayWalletAdapter.ts @@ -62,14 +62,17 @@ export class SolanaRelayWalletAdapter implements SolanaWalletAdapter { */ public async connect() { this._connecting = true - this._publicKey = await this.solanaRelay.getFeePayer() - if (!this._publicKey) { - throw new Error( - 'Failed to connect SolanaRelayWalletAdapter: Failed to get fee payer.' - ) + try { + this._publicKey = await this.solanaRelay.getFeePayer() + if (!this._publicKey) { + throw new Error( + 'Failed to connect SolanaRelayWalletAdapter: Failed to get fee payer.' + ) + } + this._connected = true + } finally { + this._connecting = false } - this._connecting = false - this._connected = true } public async disconnect() { diff --git a/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.test.ts b/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.test.ts new file mode 100644 index 00000000000..2b05e11bbf6 --- /dev/null +++ b/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.test.ts @@ -0,0 +1,52 @@ +import { + ComputeBudgetProgram, + Keypair, + SystemProgram, + TransactionMessage +} from '@solana/web3.js' +import { describe, it, expect, vi } from 'vitest' + +import type { SolanaWalletAdapter } from '../types' + +import { SolanaClient } from './SolanaClient' + +const feePayer = Keypair.generate().publicKey +const recentBlockhash = Keypair.generate().publicKey.toBase58() + +describe('SolanaClient', () => { + describe('buildTransaction', () => { + // The default VERY_HIGH priority uses a 1.5x multiplier, so an odd recent + // fee produces a fractional microLamports value + it('rounds a fractional priority fee', async () => { + const client = new SolanaClient({ + rpcEndpoints: ['http://localhost:8899'], + solanaWalletAdapter: {} as SolanaWalletAdapter + }) + vi.spyOn( + client.connection, + 'getRecentPrioritizationFees' + ).mockResolvedValue([{ slot: 1, prioritizationFee: 200_001 }]) + + const transaction = await client.buildTransaction({ + feePayer, + recentBlockhash, + computeLimit: { units: 1000 }, + instructions: [ + SystemProgram.transfer({ + fromPubkey: feePayer, + toPubkey: Keypair.generate().publicKey, + lamports: 1 + }) + ] + }) + + const { instructions } = TransactionMessage.decompile(transaction.message) + const expected = ComputeBudgetProgram.setComputeUnitPrice({ + microLamports: 300_002 + }) + expect( + instructions.some((i) => Buffer.from(i.data).equals(expected.data)) + ).toBe(true) + }) + }) +}) diff --git a/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.ts b/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.ts index 34c763e76fb..d166dbaf4a0 100644 --- a/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.ts +++ b/packages/sdk/src/sdk/services/Solana/programs/SolanaClient.ts @@ -128,9 +128,12 @@ export class SolanaClient { 0 ) const baseFee = (orderedFees[percentileIndex] ?? 0) * multiplier - const microLamports = Math.min( - Math.max(baseFee, priorityFee.minimumMicroLamports ?? 0), - priorityFee.maximumMicroLamports ?? Number.MAX_SAFE_INTEGER + // setComputeUnitPrice converts to BigInt, which throws on fractions + const microLamports = Math.round( + Math.min( + Math.max(baseFee, priorityFee.minimumMicroLamports ?? 0), + priorityFee.maximumMicroLamports ?? Number.MAX_SAFE_INTEGER + ) ) if (microLamports !== undefined) { instructions.push( diff --git a/packages/sdk/src/sdk/services/Storage/Storage.test.ts b/packages/sdk/src/sdk/services/Storage/Storage.test.ts index 40419746747..05bea729f29 100644 --- a/packages/sdk/src/sdk/services/Storage/Storage.test.ts +++ b/packages/sdk/src/sdk/services/Storage/Storage.test.ts @@ -137,6 +137,30 @@ describe('pollProcessingStatus', () => { expect(mockFetch).toHaveBeenCalledTimes(1) }) + it('stops polling once the upload is aborted', async () => { + const ac = new AbortController() + mockFetch.mockImplementation(async () => { + ac.abort() + return statusResponse({ id: 'upload-1', status: 'busy' }) + }) + + const storage = new Storage({ storageNodeSelector: nodeSelector }) + const pollWithSignal = ( + storage as unknown as { + pollProcessingStatus: ( + id: string, + template: string, + total: number, + onProgress: undefined, + abortSignal: AbortSignal + ) => Promise + } + ).pollProcessingStatus('upload-1', 'audio', 1, undefined, ac.signal) + + await expect(pollWithSignal).rejects.toThrow('Upload aborted') + expect(mockFetch).toHaveBeenCalledTimes(1) + }, 20000) + // Image resizes have no '320' result to wait for; the gate is audio-only. it('does not require a 320 result for image templates', async () => { mockFetch.mockResolvedValue( diff --git a/packages/sdk/src/sdk/services/Storage/Storage.ts b/packages/sdk/src/sdk/services/Storage/Storage.ts index dcbdd661940..b9854eea74c 100644 --- a/packages/sdk/src/sdk/services/Storage/Storage.ts +++ b/packages/sdk/src/sdk/services/Storage/Storage.ts @@ -117,20 +117,22 @@ export class Storage implements StorageService { transcode: 0 }) }, - onSuccess: async () => { + onSuccess: () => { const uploadId = upload?.url?.split('/').pop() if (!uploadId) { reject(new Error('No upload ID received')) return } - const res = await this.pollProcessingStatus( + // tus doesn't await onSuccess, so forward polling failures + this.pollProcessingStatus( uploadId, metadata.template, cachedTotal, onProgress, ac.signal ) - resolve(res) + .then(resolve) + .catch(reject) } }) @@ -241,10 +243,11 @@ export class Storage implements StorageService { : MAX_IMAGE_RESIZE_TIMEOUT_MS while (Date.now() - start < maxPollingMs) { + // Outside the try so the abort isn't caught and retried + if (abortSignal?.aborted) { + throw new Error('Upload aborted') + } try { - if (abortSignal?.aborted) { - throw new Error('Upload aborted') - } const resp = await this.getProcessingStatus(id) if (resp?.status === 'done') { if (template !== 'audio' || resp.results?.['320']) { diff --git a/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.test.ts b/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.test.ts index 744bb57c539..e904347c139 100644 --- a/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.test.ts +++ b/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.test.ts @@ -179,4 +179,43 @@ describe('StorageNodeSelector', () => { expect(second).toEqual(storageNodeC.endpoint) expect(healthCheckCalls).toBe(1) }) + + it('reorders with the refreshed node list after a failed fetch', async () => { + let healthCheckCalls = 0 + const storageNodeC = { + endpoint: 'https://node-c.audius.co', + delegateOwnerWallet: '0xc0ffee254729296a45a3885639AC7E10F9d54973' + } + server.use( + rest.get(`${discoveryNode}/health_check`, (_req, res, ctx) => { + healthCheckCalls++ + if (healthCheckCalls === 1) { + return res.networkError('Failed to connect') + } + const data: HealthCheckResponseData = { + network: { content_nodes: [storageNodeC] } + } + return res(ctx.status(200), ctx.json({ data })) + }), + rest.get(`${storageNodeC.endpoint}/health_check`, (_req, res, ctx) => { + return res(ctx.status(200), ctx.json({ data: { diskHasSpace: true } })) + }) + ) + + const storageNodeSelector = new StorageNodeSelector({ + bootstrapNodes: [storageNodeA, storageNodeB], + logger, + endpoint: discoveryNode + }) + + // The first fetch fails, so selection falls back to the bootstrap nodes + expect([storageNodeA.endpoint, storageNodeB.endpoint]).toContain( + await storageNodeSelector.getSelectedNode() + ) + + expect(await storageNodeSelector.getSelectedNode(true)).toEqual( + storageNodeC.endpoint + ) + expect(healthCheckCalls).toBe(2) + }) }) diff --git a/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.ts b/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.ts index d8ee51fa370..613854f9f46 100644 --- a/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.ts +++ b/packages/sdk/src/sdk/services/StorageNodeSelector/StorageNodeSelector.ts @@ -78,6 +78,8 @@ export class StorageNodeSelector implements StorageNodeSelectorService { } this.nodes = contentNodes + // Drop any ordering computed from the bootstrap nodes + this.orderedNodes = undefined this.selectionState = 'healthy_only' return true } @@ -127,22 +129,24 @@ export class StorageNodeSelector implements StorageNodeSelectorService { if (!this.orderedNodes?.length) { this.orderedNodes = this.orderNodes(new Date().toString()) } + // A node list refresh can replace this.orderedNodes while we await below + const orderedNodes = this.orderedNodes - if (this.orderedNodes.length === 0) { + if (orderedNodes.length === 0) { return undefined } const currentNodeIndex = this.selectedNode - ? this.orderedNodes.indexOf(this.selectedNode) + ? orderedNodes.indexOf(this.selectedNode) : -1 let selectedNode: string | undefined let nextNodeIndex = currentNodeIndex - while (nextNodeIndex !== this.orderedNodes.length - 1) { + while (nextNodeIndex !== orderedNodes.length - 1) { nextNodeIndex++ - const nextNode = this.orderedNodes[nextNodeIndex] - if (!nextNode) continue // should never happen unless this.orderedNodes has falsy values + const nextNode = orderedNodes[nextNodeIndex] + if (!nextNode) continue // should never happen unless orderedNodes has falsy values if (await isNodeHealthy(nextNode)) { selectedNode = nextNode break