@api.global/typedsocket 5.0.0 → 5.0.2
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/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/typedsocket.classes.typedsocket.d.ts +1 -0
- package/dist_ts/typedsocket.classes.typedsocket.js +106 -41
- package/package.json +7 -7
- package/readme.md +32 -1
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/typedsocket.classes.typedsocket.ts +119 -39
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@api.global/typedsocket',
|
|
6
|
-
version: '5.0.
|
|
6
|
+
version: '5.0.2',
|
|
7
7
|
description: 'A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtHQUErRztDQUM3SCxDQUFBIn0=
|
|
@@ -15,6 +15,45 @@ function wrapSmartServePeer(peer) {
|
|
|
15
15
|
},
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
|
+
function composeAbortSignals(configuredSignalArg, requestSignalArg) {
|
|
19
|
+
if (!configuredSignalArg || configuredSignalArg === requestSignalArg) {
|
|
20
|
+
return {
|
|
21
|
+
signal: requestSignalArg ?? configuredSignalArg,
|
|
22
|
+
cleanup: () => { },
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
if (!requestSignalArg) {
|
|
26
|
+
return {
|
|
27
|
+
signal: configuredSignalArg,
|
|
28
|
+
cleanup: () => { },
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
const abortController = new AbortController();
|
|
32
|
+
const configuredAbortListener = () => {
|
|
33
|
+
abortController.abort(configuredSignalArg.reason);
|
|
34
|
+
};
|
|
35
|
+
const requestAbortListener = () => {
|
|
36
|
+
abortController.abort(requestSignalArg.reason);
|
|
37
|
+
};
|
|
38
|
+
const cleanup = () => {
|
|
39
|
+
configuredSignalArg.removeEventListener('abort', configuredAbortListener);
|
|
40
|
+
requestSignalArg.removeEventListener('abort', requestAbortListener);
|
|
41
|
+
};
|
|
42
|
+
if (configuredSignalArg.aborted) {
|
|
43
|
+
configuredAbortListener();
|
|
44
|
+
}
|
|
45
|
+
else if (requestSignalArg.aborted) {
|
|
46
|
+
requestAbortListener();
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
configuredSignalArg.addEventListener('abort', configuredAbortListener, { once: true });
|
|
50
|
+
requestSignalArg.addEventListener('abort', requestAbortListener, { once: true });
|
|
51
|
+
}
|
|
52
|
+
return {
|
|
53
|
+
signal: abortController.signal,
|
|
54
|
+
cleanup,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
18
57
|
export class TypedSocket {
|
|
19
58
|
// ============================================================================
|
|
20
59
|
// STATIC METHODS
|
|
@@ -213,13 +252,27 @@ export class TypedSocket {
|
|
|
213
252
|
settleConnection(new Error('Connection timeout'));
|
|
214
253
|
}
|
|
215
254
|
}, 10000);
|
|
216
|
-
this.websocket.onopen = () => {
|
|
217
|
-
this.
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
255
|
+
this.websocket.onopen = async () => {
|
|
256
|
+
const openedWebsocket = this.websocket;
|
|
257
|
+
try {
|
|
258
|
+
await this.reapplyClientTags();
|
|
259
|
+
if (this.websocket !== openedWebsocket || openedWebsocket?.readyState !== WebSocket.OPEN) {
|
|
260
|
+
throw new Error('TypedSocket connection changed while restoring client tags');
|
|
261
|
+
}
|
|
262
|
+
this.logDebug('TypedSocket connected and client registration restored!');
|
|
263
|
+
this.retryCount = 0;
|
|
264
|
+
this.currentBackoff = this.clientOptions?.initialBackoffMs ?? 1000;
|
|
265
|
+
this.updateStatus('connected');
|
|
266
|
+
settleConnection();
|
|
267
|
+
}
|
|
268
|
+
catch (error) {
|
|
269
|
+
const restorationError = error instanceof Error
|
|
270
|
+
? error
|
|
271
|
+
: new Error(String(error));
|
|
272
|
+
this.logTransient(`TypedSocket client registration restoration failed: ${restorationError.message}`);
|
|
273
|
+
settleConnection(restorationError);
|
|
274
|
+
openedWebsocket?.close();
|
|
275
|
+
}
|
|
223
276
|
};
|
|
224
277
|
this.websocket.onmessage = async (event) => {
|
|
225
278
|
await this.handleMessage(event.data);
|
|
@@ -229,6 +282,7 @@ export class TypedSocket {
|
|
|
229
282
|
this.handleDisconnect();
|
|
230
283
|
}
|
|
231
284
|
else {
|
|
285
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
232
286
|
settleConnection(this.stopped || this.clientOptions?.abortSignal?.aborted
|
|
233
287
|
? this.createAbortError()
|
|
234
288
|
: new Error('TypedSocket connection closed before it opened'));
|
|
@@ -298,10 +352,7 @@ export class TypedSocket {
|
|
|
298
352
|
}
|
|
299
353
|
this.updateStatus('disconnected');
|
|
300
354
|
// Reject all pending requests — the connection is gone and they'll never receive a response
|
|
301
|
-
|
|
302
|
-
pending.reject(new Error('TypedSocket disconnected'));
|
|
303
|
-
}
|
|
304
|
-
this.pendingRequests.clear();
|
|
355
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
305
356
|
if (this.shouldReconnect()) {
|
|
306
357
|
this.scheduleReconnect();
|
|
307
358
|
}
|
|
@@ -392,6 +443,12 @@ export class TypedSocket {
|
|
|
392
443
|
createAbortError() {
|
|
393
444
|
return new Error('TypedSocket client startup aborted');
|
|
394
445
|
}
|
|
446
|
+
rejectPendingClientRequests(errorArg) {
|
|
447
|
+
for (const pending of this.pendingRequests.values()) {
|
|
448
|
+
pending.reject(errorArg);
|
|
449
|
+
}
|
|
450
|
+
this.pendingRequests.clear();
|
|
451
|
+
}
|
|
395
452
|
/**
|
|
396
453
|
* Updates connection status and notifies subscribers
|
|
397
454
|
*/
|
|
@@ -570,32 +627,45 @@ export class TypedSocket {
|
|
|
570
627
|
* On servers, sends to the specified target connection.
|
|
571
628
|
*/
|
|
572
629
|
createTypedRequest(methodName, targetConnection, optionsArg = {}) {
|
|
573
|
-
const postMethod = async (requestDataArg) => {
|
|
630
|
+
const postMethod = async (requestDataArg, postOptionsArg = {}) => {
|
|
574
631
|
const typedRequestData = requestDataArg;
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
if (!target) {
|
|
584
|
-
const allConnections = this.smartServeRef.getWebSocketConnections();
|
|
585
|
-
if (allConnections.length === 1) {
|
|
586
|
-
const peer = allConnections[0];
|
|
587
|
-
target = wrapSmartServePeer(peer);
|
|
632
|
+
const composedAbortSignal = composeAbortSignals(optionsArg.abortSignal, postOptionsArg.signal);
|
|
633
|
+
const requestOptions = {
|
|
634
|
+
...optionsArg,
|
|
635
|
+
abortSignal: composedAbortSignal.signal,
|
|
636
|
+
};
|
|
637
|
+
try {
|
|
638
|
+
if (this.side === 'client') {
|
|
639
|
+
return await this.sendRequest(typedRequestData, requestOptions);
|
|
588
640
|
}
|
|
589
|
-
|
|
590
|
-
|
|
641
|
+
// Server-side: send to target connection
|
|
642
|
+
if (!this.smartServeRef) {
|
|
643
|
+
throw new Error('Server not initialized');
|
|
591
644
|
}
|
|
592
|
-
|
|
593
|
-
|
|
645
|
+
let target = targetConnection;
|
|
646
|
+
if (!target) {
|
|
647
|
+
const allConnections = this.smartServeRef.getWebSocketConnections();
|
|
648
|
+
if (allConnections.length === 1) {
|
|
649
|
+
const peer = allConnections[0];
|
|
650
|
+
target = wrapSmartServePeer(peer);
|
|
651
|
+
}
|
|
652
|
+
else if (allConnections.length === 0) {
|
|
653
|
+
throw new Error('No WebSocket connections available');
|
|
654
|
+
}
|
|
655
|
+
else {
|
|
656
|
+
throw new Error('Multiple connections available - specify targetConnection');
|
|
657
|
+
}
|
|
594
658
|
}
|
|
659
|
+
return await this.sendServerRequest(typedRequestData, target, requestOptions);
|
|
660
|
+
}
|
|
661
|
+
finally {
|
|
662
|
+
composedAbortSignal.cleanup();
|
|
595
663
|
}
|
|
596
|
-
return await this.sendServerRequest(typedRequestData, target, optionsArg);
|
|
597
664
|
};
|
|
598
|
-
return new plugins.typedrequest.TypedRequest(new plugins.typedrequest.TypedTarget({
|
|
665
|
+
return new plugins.typedrequest.TypedRequest(new plugins.typedrequest.TypedTarget({
|
|
666
|
+
postMethod,
|
|
667
|
+
supportsAbortSignal: true,
|
|
668
|
+
}), methodName);
|
|
599
669
|
}
|
|
600
670
|
/**
|
|
601
671
|
* Gets the current connection status
|
|
@@ -677,15 +747,10 @@ export class TypedSocket {
|
|
|
677
747
|
*/
|
|
678
748
|
async reapplyClientTags() {
|
|
679
749
|
for (const [name, payload] of this.clientTags) {
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
|
|
684
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
685
|
-
}
|
|
686
|
-
}
|
|
687
|
-
catch (error) {
|
|
688
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect: ${error.message}`);
|
|
750
|
+
const request = this.createTypedRequest('__typedsocket_setTag');
|
|
751
|
+
const response = await request.fire({ name, payload });
|
|
752
|
+
if (!response.success) {
|
|
753
|
+
throw new Error(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
689
754
|
}
|
|
690
755
|
}
|
|
691
756
|
}
|
|
@@ -773,4 +838,4 @@ export class TypedSocket {
|
|
|
773
838
|
return allResults[0];
|
|
774
839
|
}
|
|
775
840
|
}
|
|
776
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typedsocket.classes.typedsocket.js","sourceRoot":"","sources":["../ts/typedsocket.classes.typedsocket.ts"],"names":[],"mappings":"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"}
|
|
841
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typedsocket.classes.typedsocket.js","sourceRoot":"","sources":["../ts/typedsocket.classes.typedsocket.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@api.global/typedsocket",
|
|
3
|
-
"version": "5.0.
|
|
3
|
+
"version": "5.0.2",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.",
|
|
6
6
|
"main": "dist_ts/index.js",
|
|
@@ -10,16 +10,16 @@
|
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
12
|
"@git.zone/tsbuild": "^4.4.2",
|
|
13
|
-
"@git.zone/tsbundle": "^2.11.
|
|
14
|
-
"@git.zone/tsrun": "^2.0.
|
|
15
|
-
"@git.zone/tstest": "^3.6.
|
|
13
|
+
"@git.zone/tsbundle": "^2.11.3",
|
|
14
|
+
"@git.zone/tsrun": "^2.0.6",
|
|
15
|
+
"@git.zone/tstest": "^3.6.7",
|
|
16
16
|
"@push.rocks/smartenv": "^6.1.0",
|
|
17
|
-
"@push.rocks/smartserve": "^2.
|
|
17
|
+
"@push.rocks/smartserve": "^2.4.1",
|
|
18
18
|
"@types/node": "26.1.1"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@api.global/typedrequest": "^3.
|
|
22
|
-
"@api.global/typedrequest-interfaces": "^
|
|
21
|
+
"@api.global/typedrequest": "^3.5.0",
|
|
22
|
+
"@api.global/typedrequest-interfaces": "^4.0.0",
|
|
23
23
|
"@push.rocks/smartdelay": "^3.1.0",
|
|
24
24
|
"@push.rocks/smartjson": "^6.0.1",
|
|
25
25
|
"@push.rocks/smartpromise": "^4.2.4",
|
package/readme.md
CHANGED
|
@@ -220,6 +220,33 @@ const connection = await server.findTargetConnection(async (conn) => {
|
|
|
220
220
|
const targetedRequest = server.createTypedRequest<IGreetingRequest>('greet', connection);
|
|
221
221
|
```
|
|
222
222
|
|
|
223
|
+
#### Request Deadlines and Cancellation
|
|
224
|
+
|
|
225
|
+
TypedSocket forwards both configured request cancellation and per-`fire()` deadlines to its client
|
|
226
|
+
and SmartServe server transports. The first timeout or abort to occur cancels the transport work and
|
|
227
|
+
cleans the pending request state.
|
|
228
|
+
|
|
229
|
+
```typescript
|
|
230
|
+
const requestAbort = new AbortController();
|
|
231
|
+
const request = client.createTypedRequest<IGreetingRequest>(
|
|
232
|
+
'greet',
|
|
233
|
+
undefined,
|
|
234
|
+
{
|
|
235
|
+
timeoutMs: 10_000,
|
|
236
|
+
abortSignal: requestAbort.signal,
|
|
237
|
+
}
|
|
238
|
+
);
|
|
239
|
+
|
|
240
|
+
const responsePromise = request.fire(
|
|
241
|
+
{ name: 'World' },
|
|
242
|
+
{ timeoutMs: 3_000 }
|
|
243
|
+
);
|
|
244
|
+
|
|
245
|
+
// A lifecycle owner can independently cancel before either timeout:
|
|
246
|
+
// requestAbort.abort();
|
|
247
|
+
const response = await responsePromise;
|
|
248
|
+
```
|
|
249
|
+
|
|
223
250
|
### Connection Tagging
|
|
224
251
|
|
|
225
252
|
Tag connections for organized, targeted communication:
|
|
@@ -233,6 +260,10 @@ interface IUserTag extends typedrequestInterfaces.ITag {
|
|
|
233
260
|
|
|
234
261
|
await client.setTag<IUserTag>('userRole', 'admin');
|
|
235
262
|
|
|
263
|
+
// On reconnect, stored tags are restored before statusSubject emits
|
|
264
|
+
// "connected". A failed restoration keeps the client unready and is retried
|
|
265
|
+
// through the normal reconnect policy.
|
|
266
|
+
|
|
236
267
|
// Removed tags are not restored after reconnect, even if this rejects because
|
|
237
268
|
// the server is unavailable while the removal request is attempted.
|
|
238
269
|
await client.removeTag('userRole');
|
|
@@ -305,7 +336,7 @@ await smartServe.stop();
|
|
|
305
336
|
|
|
306
337
|
| Method | Description |
|
|
307
338
|
|--------|-------------|
|
|
308
|
-
| `createTypedRequest(method, targetConnection?)` | Creates a typed request
|
|
339
|
+
| `createTypedRequest(method, targetConnection?, options?)` | Creates a typed request. Options include the transport `timeoutMs` and `abortSignal`; per-call `fire()` deadlines are also forwarded to the transport. |
|
|
309
340
|
| `setTag(name, payload)` | Sets a tag on the client connection (client-side only). |
|
|
310
341
|
| `removeTag(name)` | Immediately removes a tag from local reconnect state, then removes it from the server connection; rejects if the server removal fails. |
|
|
311
342
|
| `findAllTargetConnections(filterFn)` | Finds all connections matching the filter (server-side only). |
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -45,6 +45,11 @@ interface IPendingServerRequest {
|
|
|
45
45
|
cleanupComplete: Promise<void>;
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
+
interface IComposedAbortSignal {
|
|
49
|
+
signal?: AbortSignal;
|
|
50
|
+
cleanup: () => void;
|
|
51
|
+
}
|
|
52
|
+
|
|
48
53
|
/**
|
|
49
54
|
* Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
|
|
50
55
|
*/
|
|
@@ -69,6 +74,50 @@ function wrapSmartServePeer(peer: plugins.IWebSocketPeer): ISmartServeConnection
|
|
|
69
74
|
};
|
|
70
75
|
}
|
|
71
76
|
|
|
77
|
+
function composeAbortSignals(
|
|
78
|
+
configuredSignalArg?: AbortSignal,
|
|
79
|
+
requestSignalArg?: AbortSignal,
|
|
80
|
+
): IComposedAbortSignal {
|
|
81
|
+
if (!configuredSignalArg || configuredSignalArg === requestSignalArg) {
|
|
82
|
+
return {
|
|
83
|
+
signal: requestSignalArg ?? configuredSignalArg,
|
|
84
|
+
cleanup: () => {},
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
if (!requestSignalArg) {
|
|
88
|
+
return {
|
|
89
|
+
signal: configuredSignalArg,
|
|
90
|
+
cleanup: () => {},
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
const abortController = new AbortController();
|
|
95
|
+
const configuredAbortListener = () => {
|
|
96
|
+
abortController.abort(configuredSignalArg.reason);
|
|
97
|
+
};
|
|
98
|
+
const requestAbortListener = () => {
|
|
99
|
+
abortController.abort(requestSignalArg.reason);
|
|
100
|
+
};
|
|
101
|
+
const cleanup = () => {
|
|
102
|
+
configuredSignalArg.removeEventListener('abort', configuredAbortListener);
|
|
103
|
+
requestSignalArg.removeEventListener('abort', requestAbortListener);
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
if (configuredSignalArg.aborted) {
|
|
107
|
+
configuredAbortListener();
|
|
108
|
+
} else if (requestSignalArg.aborted) {
|
|
109
|
+
requestAbortListener();
|
|
110
|
+
} else {
|
|
111
|
+
configuredSignalArg.addEventListener('abort', configuredAbortListener, { once: true });
|
|
112
|
+
requestSignalArg.addEventListener('abort', requestAbortListener, { once: true });
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
return {
|
|
116
|
+
signal: abortController.signal,
|
|
117
|
+
cleanup,
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
|
|
72
121
|
export class TypedSocket {
|
|
73
122
|
// ============================================================================
|
|
74
123
|
// STATIC METHODS
|
|
@@ -323,13 +372,26 @@ export class TypedSocket {
|
|
|
323
372
|
}
|
|
324
373
|
}, 10000);
|
|
325
374
|
|
|
326
|
-
this.websocket.onopen = () => {
|
|
327
|
-
this.
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
375
|
+
this.websocket.onopen = async () => {
|
|
376
|
+
const openedWebsocket = this.websocket;
|
|
377
|
+
try {
|
|
378
|
+
await this.reapplyClientTags();
|
|
379
|
+
if (this.websocket !== openedWebsocket || openedWebsocket?.readyState !== WebSocket.OPEN) {
|
|
380
|
+
throw new Error('TypedSocket connection changed while restoring client tags');
|
|
381
|
+
}
|
|
382
|
+
this.logDebug('TypedSocket connected and client registration restored!');
|
|
383
|
+
this.retryCount = 0;
|
|
384
|
+
this.currentBackoff = this.clientOptions?.initialBackoffMs ?? 1000;
|
|
385
|
+
this.updateStatus('connected');
|
|
386
|
+
settleConnection();
|
|
387
|
+
} catch (error) {
|
|
388
|
+
const restorationError = error instanceof Error
|
|
389
|
+
? error
|
|
390
|
+
: new Error(String(error));
|
|
391
|
+
this.logTransient(`TypedSocket client registration restoration failed: ${restorationError.message}`);
|
|
392
|
+
settleConnection(restorationError);
|
|
393
|
+
openedWebsocket?.close();
|
|
394
|
+
}
|
|
333
395
|
};
|
|
334
396
|
|
|
335
397
|
this.websocket.onmessage = async (event) => {
|
|
@@ -340,6 +402,7 @@ export class TypedSocket {
|
|
|
340
402
|
if (this.connectionStatus === 'connected') {
|
|
341
403
|
this.handleDisconnect();
|
|
342
404
|
} else {
|
|
405
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
343
406
|
settleConnection(this.stopped || this.clientOptions?.abortSignal?.aborted
|
|
344
407
|
? this.createAbortError()
|
|
345
408
|
: new Error('TypedSocket connection closed before it opened'));
|
|
@@ -415,10 +478,7 @@ export class TypedSocket {
|
|
|
415
478
|
this.updateStatus('disconnected');
|
|
416
479
|
|
|
417
480
|
// Reject all pending requests — the connection is gone and they'll never receive a response
|
|
418
|
-
|
|
419
|
-
pending.reject(new Error('TypedSocket disconnected'));
|
|
420
|
-
}
|
|
421
|
-
this.pendingRequests.clear();
|
|
481
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
422
482
|
|
|
423
483
|
if (this.shouldReconnect()) {
|
|
424
484
|
this.scheduleReconnect();
|
|
@@ -523,6 +583,13 @@ export class TypedSocket {
|
|
|
523
583
|
return new Error('TypedSocket client startup aborted');
|
|
524
584
|
}
|
|
525
585
|
|
|
586
|
+
private rejectPendingClientRequests(errorArg: Error): void {
|
|
587
|
+
for (const pending of this.pendingRequests.values()) {
|
|
588
|
+
pending.reject(errorArg);
|
|
589
|
+
}
|
|
590
|
+
this.pendingRequests.clear();
|
|
591
|
+
}
|
|
592
|
+
|
|
526
593
|
/**
|
|
527
594
|
* Updates connection status and notifies subscribers
|
|
528
595
|
*/
|
|
@@ -731,35 +798,52 @@ export class TypedSocket {
|
|
|
731
798
|
): plugins.typedrequest.TypedRequest<T> {
|
|
732
799
|
const postMethod = async (
|
|
733
800
|
requestDataArg: plugins.typedrequestInterfaces.ITypedRequest,
|
|
801
|
+
postOptionsArg: plugins.typedrequest.ITypedTargetPostOptions = {},
|
|
734
802
|
): Promise<plugins.typedrequestInterfaces.ITypedRequest> => {
|
|
735
803
|
const typedRequestData = requestDataArg as T;
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
804
|
+
const composedAbortSignal = composeAbortSignals(
|
|
805
|
+
optionsArg.abortSignal,
|
|
806
|
+
postOptionsArg.signal,
|
|
807
|
+
);
|
|
808
|
+
const requestOptions: ITypedSocketRequestOptions = {
|
|
809
|
+
...optionsArg,
|
|
810
|
+
abortSignal: composedAbortSignal.signal,
|
|
811
|
+
};
|
|
739
812
|
|
|
740
|
-
|
|
741
|
-
|
|
742
|
-
|
|
743
|
-
|
|
813
|
+
try {
|
|
814
|
+
if (this.side === 'client') {
|
|
815
|
+
return await this.sendRequest(typedRequestData, requestOptions);
|
|
816
|
+
}
|
|
744
817
|
|
|
745
|
-
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
818
|
+
// Server-side: send to target connection
|
|
819
|
+
if (!this.smartServeRef) {
|
|
820
|
+
throw new Error('Server not initialized');
|
|
821
|
+
}
|
|
822
|
+
|
|
823
|
+
let target = targetConnection;
|
|
824
|
+
if (!target) {
|
|
825
|
+
const allConnections = this.smartServeRef.getWebSocketConnections();
|
|
826
|
+
if (allConnections.length === 1) {
|
|
827
|
+
const peer = allConnections[0];
|
|
828
|
+
target = wrapSmartServePeer(peer);
|
|
829
|
+
} else if (allConnections.length === 0) {
|
|
830
|
+
throw new Error('No WebSocket connections available');
|
|
831
|
+
} else {
|
|
832
|
+
throw new Error('Multiple connections available - specify targetConnection');
|
|
833
|
+
}
|
|
755
834
|
}
|
|
756
|
-
}
|
|
757
835
|
|
|
758
|
-
|
|
836
|
+
return await this.sendServerRequest(typedRequestData, target, requestOptions);
|
|
837
|
+
} finally {
|
|
838
|
+
composedAbortSignal.cleanup();
|
|
839
|
+
}
|
|
759
840
|
};
|
|
760
841
|
|
|
761
842
|
return new plugins.typedrequest.TypedRequest<T>(
|
|
762
|
-
new plugins.typedrequest.TypedTarget({
|
|
843
|
+
new plugins.typedrequest.TypedTarget({
|
|
844
|
+
postMethod,
|
|
845
|
+
supportsAbortSignal: true,
|
|
846
|
+
}),
|
|
763
847
|
methodName
|
|
764
848
|
);
|
|
765
849
|
}
|
|
@@ -851,14 +935,10 @@ export class TypedSocket {
|
|
|
851
935
|
*/
|
|
852
936
|
private async reapplyClientTags(): Promise<void> {
|
|
853
937
|
for (const [name, payload] of this.clientTags) {
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
859
|
-
}
|
|
860
|
-
} catch (error) {
|
|
861
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect: ${(error as Error).message}`);
|
|
938
|
+
const request = this.createTypedRequest<IReq_SetClientTag>('__typedsocket_setTag');
|
|
939
|
+
const response = await request.fire({ name, payload });
|
|
940
|
+
if (!response.success) {
|
|
941
|
+
throw new Error(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
862
942
|
}
|
|
863
943
|
}
|
|
864
944
|
}
|