diff --git a/crates/bindings-typescript/src/sdk/db_connection_impl.ts b/crates/bindings-typescript/src/sdk/db_connection_impl.ts index 94236be12e9..74b4497f3e1 100644 --- a/crates/bindings-typescript/src/sdk/db_connection_impl.ts +++ b/crates/bindings-typescript/src/sdk/db_connection_impl.ts @@ -2101,7 +2101,7 @@ export class DbConnectionImpl if (result.tag === 'Ok') { resolve(result.value); } else { - reject(result.value); + reject(new InternalError(result.value)); } }); return promise; @@ -2131,7 +2131,7 @@ export class DbConnectionImpl if (result.tag === 'Ok') { resolve(result.value); } else { - reject(result.value); + reject(new InternalError(result.value)); } }); return promise; diff --git a/crates/bindings-typescript/tests/db_connection.test.ts b/crates/bindings-typescript/tests/db_connection.test.ts index 01685c737ce..f957111a093 100644 --- a/crates/bindings-typescript/tests/db_connection.test.ts +++ b/crates/bindings-typescript/tests/db_connection.test.ts @@ -5,6 +5,7 @@ import { Identity, InternalError, SenderError, + TimeDuration, Timestamp, type Infer, } from '../src'; @@ -70,6 +71,18 @@ class Deferred { beforeEach(() => {}); +function getLastCallProcedureRequestId( + wsAdapter: WebsocketTestAdapter +): number { + for (let i = wsAdapter.outgoingMessages.length - 1; i >= 0; i--) { + const message = wsAdapter.outgoingMessages[i]; + if (message.tag === 'CallProcedure') { + return message.value.requestId; + } + } + throw new Error('No CallProcedure message found in messageQueue.'); +} + function getLastCallReducerRequestId(wsAdapter: WebsocketTestAdapter): number { for (let i = wsAdapter.outgoingMessages.length - 1; i >= 0; i--) { const message = wsAdapter.outgoingMessages[i]; @@ -143,6 +156,18 @@ function makeReducerInternalErrorResult(requestId: number, error: string) { }); } +function makeProcedureInternalErrorResult(requestId: number, error: string) { + return ServerMessage.ProcedureResult({ + requestId, + timestamp: new Timestamp(0n), + totalHostExecutionDuration: new TimeDuration(0n), + status: { + tag: 'InternalError', + value: error, + }, + }); +} + type MyUserViewRow = Infer; function encodeMyUserProcedural(value: MyUserViewRow): Uint8Array { @@ -794,6 +819,47 @@ describe('DbConnection', () => { expect(insertCalled).toBeFalsy(); }); + test('procedure internal error rejects with InternalError', async () => { + const wsAdapter = new WebsocketTestAdapter(); + const onConnectPromise = new Deferred(); + const client = DbConnection.builder() + .withUri('ws://127.0.0.1:1234') + .withDatabaseName('db') + .withWSFn(wsAdapter.openWebSocket) + .onConnect(() => { + onConnectPromise.resolve(); + }) + .build(); + + await client['wsPromise']; + wsAdapter.acceptConnection(); + wsAdapter.sendToClient( + ServerMessage.InitialConnection({ + identity: anIdentity, + token: 'a-token', + connectionId: ConnectionId.random(), + }) + ); + await onConnectPromise.promise; + + const procedurePromise = client.callProcedure( + 'test_proc', + new Uint8Array() + ); + + await Promise.resolve(); + const requestId = getLastCallProcedureRequestId(wsAdapter); + wsAdapter.sendToClient( + makeProcedureInternalErrorResult(requestId, 'internal procedure error') + ); + + await expect(procedurePromise).rejects.toBeInstanceOf(InternalError); + await expect(procedurePromise).rejects.toHaveProperty( + 'message', + 'internal procedure error' + ); + }); + test('reducer internal error rejects with InternalError', async () => { const wsAdapter = new WebsocketTestAdapter(); const onConnectPromise = new Deferred();