@fairmint/canton-node-sdk 0.0.236 → 0.0.237
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/src/clients/ledger-json-api/operations/v2/state/get-active-contracts.d.ts +1 -1
- package/build/src/clients/ledger-json-api/operations/v2/state/get-active-contracts.d.ts.map +1 -1
- package/build/src/clients/ledger-json-api/operations/v2/state/get-active-contracts.js +19 -5
- package/build/src/clients/ledger-json-api/operations/v2/state/get-active-contracts.js.map +1 -1
- package/build/src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.d.ts +770 -8
- package/build/src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.d.ts.map +1 -1
- package/build/src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.js +43 -8
- package/build/src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.js.map +1 -1
- package/build/src/core/operations/WebSocketOperationFactory.d.ts.map +1 -1
- package/build/src/core/operations/WebSocketOperationFactory.js +1 -3
- package/build/src/core/operations/WebSocketOperationFactory.js.map +1 -1
- package/build/src/core/ws/WebSocketClient.d.ts +9 -6
- package/build/src/core/ws/WebSocketClient.d.ts.map +1 -1
- package/build/src/core/ws/WebSocketClient.js +175 -74
- package/build/src/core/ws/WebSocketClient.js.map +1 -1
- package/package.json +1 -1
package/build/src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe-to-updates.d.ts","sourceRoot":"","sources":["../../../../../../../src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,
|
|
1
|
+
{"version":3,"file":"subscribe-to-updates.d.ts","sourceRoot":"","sources":["../../../../../../../src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,wCAAwC,CAAC;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAYlF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,oBAAY,gBAAgB;IAC1B,2BAA2B,gCAAgC;IAC3D,gCAAgC,qCAAqC;CACtE;AAED,QAAA,MAAM,8BAA8B;;;;;;;;;iBA0BlC,CAAC;AAEH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,8BAA8B,CAAC,GAAG;IACtF,uEAAuE;IACvE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEhE;;;OAGG;IACH,eAAe,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;IAEtD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;CACjE,CAAC;AAEF,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAK1B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,mBAAmB,EAAI;IAE/C,OAAO,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwKpE;CACF"}
|
|
@@ -4,6 +4,8 @@ exports.SubscribeToUpdates = exports.TransactionShape = void 0;
|
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
const errors_1 = require("../../../../../core/errors");
|
|
6
6
|
const WebSocketClient_1 = require("../../../../../core/ws/WebSocketClient");
|
|
7
|
+
const errors_2 = require("../../../schemas/api/errors");
|
|
8
|
+
const updates_1 = require("../../../schemas/api/updates");
|
|
7
9
|
const event_format_builder_1 = require("../utils/event-format-builder");
|
|
8
10
|
const path = '/v2/updates';
|
|
9
11
|
/**
|
|
@@ -60,6 +62,12 @@ const SubscribeToUpdatesParamsSchema = zod_1.z.object({
|
|
|
60
62
|
/** Transaction shape (default TRANSACTION_SHAPE_LEDGER_EFFECTS). */
|
|
61
63
|
transactionShape: zod_1.z.nativeEnum(TransactionShape).optional(),
|
|
62
64
|
});
|
|
65
|
+
const UpdatesWsMessageSchema = zod_1.z.union([
|
|
66
|
+
zod_1.z.object({ update: updates_1.JsUpdateSchema }),
|
|
67
|
+
zod_1.z.object({ update: updates_1.WsUpdateSchema }),
|
|
68
|
+
errors_2.JsCantonErrorSchema,
|
|
69
|
+
errors_2.WsCantonErrorSchema,
|
|
70
|
+
]);
|
|
63
71
|
/**
|
|
64
72
|
* Subscribes to ledger updates via WebSocket connection.
|
|
65
73
|
*
|
|
@@ -152,6 +160,16 @@ class SubscribeToUpdates {
|
|
|
152
160
|
}
|
|
153
161
|
return new Promise((resolve, reject) => {
|
|
154
162
|
let settled = false;
|
|
163
|
+
let subscription;
|
|
164
|
+
let closeWhenConnected = false;
|
|
165
|
+
const closeSubscription = () => {
|
|
166
|
+
if (subscription) {
|
|
167
|
+
subscription.close();
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
closeWhenConnected = true;
|
|
171
|
+
}
|
|
172
|
+
};
|
|
155
173
|
/** Convert a Canton error response to a proper Error object */
|
|
156
174
|
const toError = (errorResponse) => {
|
|
157
175
|
if ('cause' in errorResponse) {
|
|
@@ -163,20 +181,31 @@ class SubscribeToUpdates {
|
|
|
163
181
|
return new errors_1.ApiError(`WebSocket error [${codeStr}]: ${errorResponse.message}`);
|
|
164
182
|
};
|
|
165
183
|
/** Check if a message is a Canton error response */
|
|
166
|
-
const isErrorMessage = (msg) =>
|
|
184
|
+
const isErrorMessage = (msg) => 'cause' in msg || ('code' in msg && 'message' in msg && !('update' in msg));
|
|
167
185
|
void wsClient
|
|
168
186
|
.connect(path, requestMessage, {
|
|
169
|
-
onMessage: (parsed) => {
|
|
170
|
-
|
|
171
|
-
if (
|
|
172
|
-
|
|
187
|
+
onMessage: async (parsed) => {
|
|
188
|
+
const decoded = UpdatesWsMessageSchema.safeParse(parsed);
|
|
189
|
+
if (!decoded.success) {
|
|
190
|
+
throw new errors_1.ApiError('Unexpected ledger updates WebSocket message');
|
|
173
191
|
}
|
|
174
|
-
|
|
175
|
-
|
|
192
|
+
const message = decoded.data;
|
|
193
|
+
// Surface Canton error frames immediately; a slow consumer callback must not delay stream failure.
|
|
194
|
+
if (isErrorMessage(message)) {
|
|
195
|
+
const error = toError(message);
|
|
176
196
|
if (!settled) {
|
|
177
197
|
settled = true;
|
|
178
|
-
reject(
|
|
198
|
+
reject(error);
|
|
179
199
|
}
|
|
200
|
+
closeSubscription();
|
|
201
|
+
if (typeof params.onMessage === 'function') {
|
|
202
|
+
await params.onMessage(message);
|
|
203
|
+
}
|
|
204
|
+
throw error;
|
|
205
|
+
}
|
|
206
|
+
// Call user's onMessage callback if provided
|
|
207
|
+
if (typeof params.onMessage === 'function') {
|
|
208
|
+
await params.onMessage(message);
|
|
180
209
|
}
|
|
181
210
|
},
|
|
182
211
|
onError: (err) => {
|
|
@@ -192,6 +221,12 @@ class SubscribeToUpdates {
|
|
|
192
221
|
}
|
|
193
222
|
},
|
|
194
223
|
}, wsOptions)
|
|
224
|
+
.then((connected) => {
|
|
225
|
+
subscription = connected;
|
|
226
|
+
if (closeWhenConnected) {
|
|
227
|
+
connected.close();
|
|
228
|
+
}
|
|
229
|
+
})
|
|
195
230
|
.catch((err) => {
|
|
196
231
|
if (!settled) {
|
|
197
232
|
settled = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscribe-to-updates.js","sourceRoot":"","sources":["../../../../../../../src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,uDAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"subscribe-to-updates.js","sourceRoot":"","sources":["../../../../../../../src/clients/ledger-json-api/operations/v2/updates/subscribe-to-updates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketOperationFactory.d.ts","sourceRoot":"","sources":["../../../../src/core/operations/WebSocketOperationFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAmB,KAAK,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAE5F,+DAA+D;AAC/D,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc;IAC9E,0CAA0C;IAC1C,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,MAAM,CAAC;IACnF,yEAAyE;IACzE,QAAQ,CAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/G,sFAAsF;IACtF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;CACrE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,EAC7E,MAAM,EAAE,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,GACvE,KAAK,MAAM,EAAE,UAAU,KAAK;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC5G,
|
|
1
|
+
{"version":3,"file":"WebSocketOperationFactory.d.ts","sourceRoot":"","sources":["../../../../src/core/operations/WebSocketOperationFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,EAAmB,KAAK,iBAAiB,EAAE,KAAK,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAE5F,+DAA+D;AAC/D,MAAM,WAAW,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc;IAC9E,0CAA0C;IAC1C,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,MAAM,CAAC;IACnF,yEAAyE;IACzE,QAAQ,CAAC,mBAAmB,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,KAAK,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/G,sFAAsF;IACtF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,cAAc,CAAC;CACrE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,EAC7E,MAAM,EAAE,wBAAwB,CAAC,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,GACvE,KAAK,MAAM,EAAE,UAAU,KAAK;IAC7B,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,KAAK,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC5G,CAqCA"}
|
|
@@ -42,9 +42,7 @@ function createWebSocketOperation(config) {
|
|
|
42
42
|
const wrappedHandlers = transformInbound
|
|
43
43
|
? {
|
|
44
44
|
...handlers,
|
|
45
|
-
onMessage: (msg) =>
|
|
46
|
-
handlers.onMessage(transformInbound(msg));
|
|
47
|
-
},
|
|
45
|
+
onMessage: (msg) => handlers.onMessage(transformInbound(msg)),
|
|
48
46
|
}
|
|
49
47
|
: handlers;
|
|
50
48
|
return wsClient.connect(path, request, wrappedHandlers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketOperationFactory.js","sourceRoot":"","sources":["../../../../src/core/operations/WebSocketOperationFactory.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,sCAA4C;AAC5C,8BAA4F;AAc5F;;;;;;;;;;;;GAYG;AACH,kCACE,MAAwE;IAKxE,OAAO,MAAM,kBAAkB;QAC7B,YAA4B,MAAkB;0BAAlB,MAAM;QAAe,CAAC;QAE1C,cAAc,CAAI,MAAS,EAAE,MAAsB;YACzD,IAAI,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,OAAC,CAAC,QAAQ,EAAE,CAAC;oBAChC,MAAM,IAAI,wBAAe,CACvB,gCAAgC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1G,CAAC;gBACJ,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAEM,KAAK,CAAC,SAAS,CACpB,MAAc,EACd,QAA2C;YAE3C,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,IAAI,oBAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACrF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAE/E,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC;YACpC,MAAM,eAAe,GAAsC,gBAAgB;gBACzE,CAAC,CAAC;oBACE,GAAG,QAAQ;oBACX,SAAS,EAAE,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"WebSocketOperationFactory.js","sourceRoot":"","sources":["../../../../src/core/operations/WebSocketOperationFactory.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAExB,sCAA4C;AAC5C,8BAA4F;AAc5F;;;;;;;;;;;;GAYG;AACH,kCACE,MAAwE;IAKxE,OAAO,MAAM,kBAAkB;QAC7B,YAA4B,MAAkB;0BAAlB,MAAM;QAAe,CAAC;QAE1C,cAAc,CAAI,MAAS,EAAE,MAAsB;YACzD,IAAI,CAAC;gBACH,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC9B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,OAAC,CAAC,QAAQ,EAAE,CAAC;oBAChC,MAAM,IAAI,wBAAe,CACvB,gCAAgC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1G,CAAC;gBACJ,CAAC;gBACD,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QAEM,KAAK,CAAC,SAAS,CACpB,MAAc,EACd,QAA2C;YAE3C,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;YACzE,MAAM,QAAQ,GAAG,IAAI,oBAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACrF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAE/E,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAAC;YACpC,MAAM,eAAe,GAAsC,gBAAgB;gBACzE,CAAC,CAAC;oBACE,GAAG,QAAQ;oBACX,SAAS,EAAE,CAAC,GAAG,EAAwB,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;iBACpF;gBACH,CAAC,CAAC,QAAQ,CAAC;YAEb,OAAO,QAAQ,CAAC,OAAO,CAAiC,IAAI,EAAE,OAAO,EAAE,eAAe,CAAC,CAAC;QAC1F,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -10,10 +10,10 @@ export interface WebSocketSubscription {
|
|
|
10
10
|
}
|
|
11
11
|
/** Callbacks for WebSocket lifecycle events. Only `onMessage` is required. */
|
|
12
12
|
export interface WebSocketHandlers<Message> {
|
|
13
|
-
readonly onOpen?: () => void
|
|
14
|
-
readonly onMessage: (msg: Message) => void
|
|
15
|
-
readonly onError?: (err: Error) => void
|
|
16
|
-
readonly onClose?: (code: number, reason: string) => void
|
|
13
|
+
readonly onOpen?: () => void | Promise<void>;
|
|
14
|
+
readonly onMessage: (msg: Message) => void | Promise<void>;
|
|
15
|
+
readonly onError?: (err: Error) => void | Promise<void>;
|
|
16
|
+
readonly onClose?: (code: number, reason: string) => void | Promise<void>;
|
|
17
17
|
}
|
|
18
18
|
/** Options for WebSocket token refresh lifecycle. */
|
|
19
19
|
export interface WebSocketOptions {
|
|
@@ -21,7 +21,7 @@ export interface WebSocketOptions {
|
|
|
21
21
|
* Called when the token is about to expire and refresh is scheduled. Use this to prepare for reconnection (e.g.,
|
|
22
22
|
* track current offset for resumption).
|
|
23
23
|
*/
|
|
24
|
-
readonly onTokenExpiring?: () => void
|
|
24
|
+
readonly onTokenExpiring?: () => void | Promise<void>;
|
|
25
25
|
/**
|
|
26
26
|
* Called when token refresh timer fires. The WebSocket will close after this callback returns, and the caller should
|
|
27
27
|
* initiate a new connection with a fresh token. Returns the close code and reason.
|
|
@@ -29,7 +29,10 @@ export interface WebSocketOptions {
|
|
|
29
29
|
readonly onTokenRefreshNeeded?: () => {
|
|
30
30
|
code?: number;
|
|
31
31
|
reason?: string;
|
|
32
|
-
} | void
|
|
32
|
+
} | void | Promise<{
|
|
33
|
+
code?: number;
|
|
34
|
+
reason?: string;
|
|
35
|
+
} | void>;
|
|
33
36
|
}
|
|
34
37
|
export { calculateTokenRefreshTime } from '@hardlydifficult/websocket';
|
|
35
38
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../../../src/core/ws/WebSocketClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,wFAAwF;AACxF,MAAM,WAAW,qBAAqB;IACpC,+DAA+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC;IACpC,kDAAkD;IAClD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,MAAM,CAAC;CAC3C;AAED,8EAA8E;AAC9E,MAAM,WAAW,iBAAiB,CAAC,OAAO;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../../../src/core/ws/WebSocketClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,wFAAwF;AACxF,MAAM,WAAW,qBAAqB;IACpC,+DAA+D;IAC/D,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,CAAC;IAC3B,uDAAuD;IACvD,QAAQ,CAAC,WAAW,EAAE,MAAM,OAAO,CAAC;IACpC,kDAAkD;IAClD,QAAQ,CAAC,kBAAkB,EAAE,MAAM,MAAM,CAAC;CAC3C;AAED,8EAA8E;AAC9E,MAAM,WAAW,iBAAiB,CAAC,OAAO;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,QAAQ,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3E;AAUD,qDAAqD;AACrD,MAAM,WAAW,gBAAgB;IAC/B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtD;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAC5B;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAClC,IAAI,GACJ,OAAO,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACxD;AAGD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AAEvE;;;;;;;;GAQG;AACH,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,UAAU,EAAI;IAEtC,OAAO,CAAC,cAAc,EAAE,cAAc,EACjD,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,EAC3C,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,qBAAqB,CAAC,CAsQhC;IAED,OAAO,CAAC,UAAU;CAMnB"}
|
|
@@ -48,56 +48,149 @@ class WebSocketClient {
|
|
|
48
48
|
// Token refresh timer handle (cleared on close)
|
|
49
49
|
let tokenRefreshTimer = null;
|
|
50
50
|
const logger = this.client.getLogger();
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const reportAuxiliaryFailure = (message, context) => {
|
|
52
|
+
try {
|
|
53
|
+
logger?.error?.(message, context);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// A failing logger cannot report its own failure.
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
const log = (event, payload) => {
|
|
60
|
+
if (!logger)
|
|
61
|
+
return;
|
|
62
|
+
try {
|
|
63
|
+
void Promise.resolve(logger.logRequestResponse(wsUrl, { event, requestMessage }, payload)).catch((err) => {
|
|
64
|
+
reportAuxiliaryFailure('WebSocket request/response logging failed', {
|
|
65
|
+
event,
|
|
66
|
+
error: toError(err).message,
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
}
|
|
70
|
+
catch (err) {
|
|
71
|
+
// Request/response logging is auxiliary and must not change WebSocket delivery semantics.
|
|
72
|
+
reportAuxiliaryFailure('WebSocket request/response logging failed', {
|
|
73
|
+
event,
|
|
74
|
+
error: toError(err).message,
|
|
75
|
+
});
|
|
54
76
|
}
|
|
55
77
|
};
|
|
56
|
-
|
|
78
|
+
const runCallback = async (callback, onFailure, onSuccess) => {
|
|
79
|
+
try {
|
|
80
|
+
await callback();
|
|
81
|
+
onSuccess?.();
|
|
82
|
+
}
|
|
83
|
+
catch (err) {
|
|
84
|
+
onFailure(toError(err));
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
const observeCallback = (callback, onFailure, onSuccess) => {
|
|
88
|
+
void runCallback(callback, onFailure, onSuccess).catch((err) => {
|
|
89
|
+
reportAuxiliaryFailure('WebSocket callback failure handling failed', { error: toError(err).message });
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
const notifyError = (error) => {
|
|
93
|
+
const { onError } = handlers;
|
|
94
|
+
if (!onError)
|
|
95
|
+
return;
|
|
96
|
+
observeCallback(() => onError(error), (err) => {
|
|
97
|
+
reportAuxiliaryFailure('WebSocket onError handler failed', {
|
|
98
|
+
error: err.message,
|
|
99
|
+
originalError: error.message,
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
};
|
|
103
|
+
let inFlightMessageCallbacks = 0;
|
|
104
|
+
let resolveMessageCallbacksDrained;
|
|
105
|
+
let messageCallbacksDrained = Promise.resolve();
|
|
106
|
+
const beginMessageCallback = () => {
|
|
107
|
+
if (inFlightMessageCallbacks === 0) {
|
|
108
|
+
messageCallbacksDrained = new Promise((resolve) => {
|
|
109
|
+
resolveMessageCallbacksDrained = resolve;
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
inFlightMessageCallbacks += 1;
|
|
113
|
+
};
|
|
114
|
+
const completeMessageCallback = () => {
|
|
115
|
+
inFlightMessageCallbacks -= 1;
|
|
116
|
+
if (inFlightMessageCallbacks === 0) {
|
|
117
|
+
resolveMessageCallbacksDrained?.();
|
|
118
|
+
resolveMessageCallbacksDrained = undefined;
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
log('connect', { headers: token ? { Authorization: '[REDACTED]' } : undefined, protocols });
|
|
57
122
|
// Schedule proactive token refresh if we have token timing and callbacks
|
|
58
123
|
if (tokenIssuedAt !== null && tokenExpiresAt !== null && options?.onTokenRefreshNeeded) {
|
|
59
124
|
const refreshTime = (0, websocket_1.calculateTokenRefreshTime)(tokenIssuedAt, tokenExpiresAt);
|
|
60
125
|
const delayMs = Math.max(0, refreshTime - Date.now());
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
tokenRefreshTimer =
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
126
|
+
log('token_refresh_scheduled', {
|
|
127
|
+
tokenIssuedAt: new Date(tokenIssuedAt).toISOString(),
|
|
128
|
+
tokenExpiresAt: new Date(tokenExpiresAt).toISOString(),
|
|
129
|
+
refreshAt: new Date(refreshTime).toISOString(),
|
|
130
|
+
delayMs,
|
|
131
|
+
});
|
|
132
|
+
tokenRefreshTimer = setTimeout(() => {
|
|
133
|
+
tokenRefreshTimer = null;
|
|
134
|
+
void (async () => {
|
|
135
|
+
if (options.onTokenExpiring) {
|
|
136
|
+
observeCallback(options.onTokenExpiring, (error) => {
|
|
137
|
+
notifyError(error);
|
|
138
|
+
log('token_expiring_handler_error', { error: error.message });
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
log('token_refresh_triggered', { reason: 'proactive_refresh' });
|
|
142
|
+
let closeCode = 4000;
|
|
143
|
+
let closeReason = 'Token refresh required';
|
|
144
|
+
try {
|
|
145
|
+
const closeParams = await options.onTokenRefreshNeeded?.();
|
|
146
|
+
closeCode = closeParams?.code ?? closeCode;
|
|
147
|
+
closeReason = closeParams?.reason ?? closeReason;
|
|
148
|
+
}
|
|
149
|
+
catch (err) {
|
|
150
|
+
const error = toError(err);
|
|
151
|
+
notifyError(error);
|
|
152
|
+
log('token_refresh_handler_error', { error: error.message });
|
|
153
|
+
}
|
|
154
|
+
try {
|
|
80
155
|
socket.close(closeCode, closeReason);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
|
|
156
|
+
}
|
|
157
|
+
catch (err) {
|
|
158
|
+
const error = toError(err);
|
|
159
|
+
notifyError(error);
|
|
160
|
+
log('token_refresh_close_error', { error: error.message });
|
|
161
|
+
}
|
|
162
|
+
})().catch((err) => {
|
|
163
|
+
const error = toError(err);
|
|
164
|
+
notifyError(error);
|
|
165
|
+
log('token_refresh_error', { error: error.message });
|
|
166
|
+
try {
|
|
167
|
+
socket.close(4000, 'Token refresh required');
|
|
168
|
+
}
|
|
169
|
+
catch {
|
|
170
|
+
// The original refresh failure was already reported.
|
|
171
|
+
}
|
|
172
|
+
});
|
|
173
|
+
}, delayMs);
|
|
84
174
|
}
|
|
85
175
|
socket.on('open', () => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
176
|
+
try {
|
|
177
|
+
socket.send(JSON.stringify(requestMessage));
|
|
178
|
+
log('send', requestMessage);
|
|
179
|
+
}
|
|
180
|
+
catch (err) {
|
|
181
|
+
const error = toError(err);
|
|
182
|
+
log('send_error', { message: error.message });
|
|
183
|
+
notifyError(error);
|
|
184
|
+
socket.close();
|
|
185
|
+
return;
|
|
186
|
+
}
|
|
187
|
+
if (handlers.onOpen) {
|
|
188
|
+
observeCallback(handlers.onOpen, (error) => {
|
|
189
|
+
notifyError(error);
|
|
190
|
+
socket.close(1011, 'Open handler failed');
|
|
191
|
+
log('open_handler_error', { error: error.message });
|
|
192
|
+
});
|
|
193
|
+
}
|
|
101
194
|
});
|
|
102
195
|
socket.on('message', (rawData) => {
|
|
103
196
|
// Convert RawData to string safely
|
|
@@ -111,47 +204,55 @@ class WebSocketClient {
|
|
|
111
204
|
else {
|
|
112
205
|
dataString = new TextDecoder().decode(rawData);
|
|
113
206
|
}
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
}
|
|
130
|
-
})()
|
|
207
|
+
let parsed;
|
|
208
|
+
try {
|
|
209
|
+
parsed = WebSocketErrorUtils_1.WebSocketErrorUtils.safeJsonParse(dataString, 'WebSocket message');
|
|
210
|
+
}
|
|
211
|
+
catch (err) {
|
|
212
|
+
const error = toError(err);
|
|
213
|
+
notifyError(error);
|
|
214
|
+
socket.close(1003, 'Invalid JSON received');
|
|
215
|
+
log('parse_error', { raw: dataString, error: error.message });
|
|
216
|
+
return;
|
|
217
|
+
}
|
|
218
|
+
beginMessageCallback();
|
|
219
|
+
void runCallback(() => handlers.onMessage(parsed), (error) => {
|
|
220
|
+
notifyError(error);
|
|
221
|
+
socket.close(1011, 'Message handler failed');
|
|
222
|
+
log('message_handler_error', { error: error.message });
|
|
223
|
+
}, () => log('message', parsed))
|
|
224
|
+
.catch((err) => {
|
|
225
|
+
reportAuxiliaryFailure('WebSocket message callback failure handling failed', {
|
|
226
|
+
error: toError(err).message,
|
|
227
|
+
});
|
|
228
|
+
})
|
|
229
|
+
.finally(completeMessageCallback);
|
|
131
230
|
});
|
|
132
231
|
socket.on('error', (err) => {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
if (handlers.onError)
|
|
136
|
-
handlers.onError(err);
|
|
137
|
-
})();
|
|
232
|
+
log('socket_error', { message: err.message });
|
|
233
|
+
notifyError(err);
|
|
138
234
|
});
|
|
139
235
|
socket.on('close', (code, reason) => {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
236
|
+
// Clear token refresh timer on close
|
|
237
|
+
if (tokenRefreshTimer !== null) {
|
|
238
|
+
clearTimeout(tokenRefreshTimer);
|
|
239
|
+
tokenRefreshTimer = null;
|
|
240
|
+
}
|
|
241
|
+
const closeReason = reason.toString();
|
|
242
|
+
log('close', { code, reason: closeReason });
|
|
243
|
+
const { onClose } = handlers;
|
|
244
|
+
if (onClose) {
|
|
245
|
+
void messageCallbacksDrained.then(() => {
|
|
246
|
+
observeCallback(() => onClose(code, closeReason), (error) => {
|
|
247
|
+
reportAuxiliaryFailure('WebSocket onClose handler failed', { error: error.message });
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
}
|
|
150
251
|
});
|
|
151
252
|
return {
|
|
152
253
|
close: () => {
|
|
153
254
|
// Clear token refresh timer
|
|
154
|
-
if (tokenRefreshTimer) {
|
|
255
|
+
if (tokenRefreshTimer !== null) {
|
|
155
256
|
clearTimeout(tokenRefreshTimer);
|
|
156
257
|
tokenRefreshTimer = null;
|
|
157
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../../../src/core/ws/WebSocketClient.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAuE;AACvE,4CAA6C;AAE7C,+DAA4D;AAoB5D,qDAAqD;AACrD,SAAS,OAAO,CAAC,KAAc;IAC7B,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;AACtE,CAAC;
|
|
1
|
+
{"version":3,"file":"WebSocketClient.js","sourceRoot":"","sources":["../../../../src/core/ws/WebSocketClient.ts"],"names":[],"mappings":"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"}
|