@api.global/typedsocket 4.2.5 → 5.0.1
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 +16 -1
- package/dist_ts/typedsocket.classes.typedsocket.js +192 -42
- package/package.json +9 -9
- package/readme.md +4 -0
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/typedsocket.classes.typedsocket.ts +224 -46
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@api.global/typedsocket',
|
|
6
|
-
version: '
|
|
6
|
+
version: '5.0.1',
|
|
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=
|
|
@@ -11,6 +11,13 @@ export interface ITypedSocketClientOptions {
|
|
|
11
11
|
maxBackoffMs?: number;
|
|
12
12
|
abortSignal?: AbortSignal;
|
|
13
13
|
}
|
|
14
|
+
/**
|
|
15
|
+
* Lifecycle controls for one TypedRequest sent over a TypedSocket.
|
|
16
|
+
*/
|
|
17
|
+
export interface ITypedSocketRequestOptions {
|
|
18
|
+
timeoutMs?: number;
|
|
19
|
+
abortSignal?: AbortSignal;
|
|
20
|
+
}
|
|
14
21
|
/**
|
|
15
22
|
* Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
|
|
16
23
|
*/
|
|
@@ -88,6 +95,10 @@ export declare class TypedSocket {
|
|
|
88
95
|
private clientTags;
|
|
89
96
|
private clientTagMutations;
|
|
90
97
|
private smartServeRef;
|
|
98
|
+
private serverStopping;
|
|
99
|
+
private unsubscribeSmartServeConnectionClose;
|
|
100
|
+
private pendingServerRequests;
|
|
101
|
+
private pendingServerRequestIdsByPeerId;
|
|
91
102
|
private constructor();
|
|
92
103
|
/**
|
|
93
104
|
* Connects the client to the server using native WebSocket
|
|
@@ -122,6 +133,7 @@ export declare class TypedSocket {
|
|
|
122
133
|
private shouldReconnect;
|
|
123
134
|
private waitForReconnectDelay;
|
|
124
135
|
private createAbortError;
|
|
136
|
+
private rejectPendingClientRequests;
|
|
125
137
|
/**
|
|
126
138
|
* Updates connection status and notifies subscribers
|
|
127
139
|
*/
|
|
@@ -130,12 +142,15 @@ export declare class TypedSocket {
|
|
|
130
142
|
* Sends a request to the server and waits for response (client-side)
|
|
131
143
|
*/
|
|
132
144
|
private sendRequest;
|
|
145
|
+
private normalizeRequestTimeout;
|
|
146
|
+
private cancelPendingServerRequestsForPeer;
|
|
147
|
+
private sendServerRequest;
|
|
133
148
|
/**
|
|
134
149
|
* Creates a TypedRequest for the specified method.
|
|
135
150
|
* On clients, sends to the server.
|
|
136
151
|
* On servers, sends to the specified target connection.
|
|
137
152
|
*/
|
|
138
|
-
createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper): plugins.typedrequest.TypedRequest<T>;
|
|
153
|
+
createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper, optionsArg?: ITypedSocketRequestOptions): plugins.typedrequest.TypedRequest<T>;
|
|
139
154
|
/**
|
|
140
155
|
* Gets the current connection status
|
|
141
156
|
*/
|
|
@@ -100,6 +100,10 @@ export class TypedSocket {
|
|
|
100
100
|
TypedSocket.registerTagHandlers(typedRouterArg);
|
|
101
101
|
const typedSocket = new TypedSocket('server', typedRouterArg);
|
|
102
102
|
typedSocket.smartServeRef = smartServeArg;
|
|
103
|
+
typedSocket.unsubscribeSmartServeConnectionClose =
|
|
104
|
+
smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
|
|
105
|
+
typedSocket.cancelPendingServerRequestsForPeer(peerArg.id, new Error(`TypedSocket target connection closed: ${peerArg.id}`));
|
|
106
|
+
});
|
|
103
107
|
return typedSocket;
|
|
104
108
|
}
|
|
105
109
|
/**
|
|
@@ -151,6 +155,10 @@ export class TypedSocket {
|
|
|
151
155
|
this.clientTagMutations = new Map();
|
|
152
156
|
// Server-specific properties (SmartServe mode)
|
|
153
157
|
this.smartServeRef = null;
|
|
158
|
+
this.serverStopping = false;
|
|
159
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
160
|
+
this.pendingServerRequests = new Map();
|
|
161
|
+
this.pendingServerRequestIdsByPeerId = new Map();
|
|
154
162
|
this.side = sideArg;
|
|
155
163
|
this.typedrouter = typedrouterArg;
|
|
156
164
|
}
|
|
@@ -205,13 +213,27 @@ export class TypedSocket {
|
|
|
205
213
|
settleConnection(new Error('Connection timeout'));
|
|
206
214
|
}
|
|
207
215
|
}, 10000);
|
|
208
|
-
this.websocket.onopen = () => {
|
|
209
|
-
this.
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
216
|
+
this.websocket.onopen = async () => {
|
|
217
|
+
const openedWebsocket = this.websocket;
|
|
218
|
+
try {
|
|
219
|
+
await this.reapplyClientTags();
|
|
220
|
+
if (this.websocket !== openedWebsocket || openedWebsocket?.readyState !== WebSocket.OPEN) {
|
|
221
|
+
throw new Error('TypedSocket connection changed while restoring client tags');
|
|
222
|
+
}
|
|
223
|
+
this.logDebug('TypedSocket connected and client registration restored!');
|
|
224
|
+
this.retryCount = 0;
|
|
225
|
+
this.currentBackoff = this.clientOptions?.initialBackoffMs ?? 1000;
|
|
226
|
+
this.updateStatus('connected');
|
|
227
|
+
settleConnection();
|
|
228
|
+
}
|
|
229
|
+
catch (error) {
|
|
230
|
+
const restorationError = error instanceof Error
|
|
231
|
+
? error
|
|
232
|
+
: new Error(String(error));
|
|
233
|
+
this.logTransient(`TypedSocket client registration restoration failed: ${restorationError.message}`);
|
|
234
|
+
settleConnection(restorationError);
|
|
235
|
+
openedWebsocket?.close();
|
|
236
|
+
}
|
|
215
237
|
};
|
|
216
238
|
this.websocket.onmessage = async (event) => {
|
|
217
239
|
await this.handleMessage(event.data);
|
|
@@ -221,6 +243,7 @@ export class TypedSocket {
|
|
|
221
243
|
this.handleDisconnect();
|
|
222
244
|
}
|
|
223
245
|
else {
|
|
246
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
224
247
|
settleConnection(this.stopped || this.clientOptions?.abortSignal?.aborted
|
|
225
248
|
? this.createAbortError()
|
|
226
249
|
: new Error('TypedSocket connection closed before it opened'));
|
|
@@ -290,10 +313,7 @@ export class TypedSocket {
|
|
|
290
313
|
}
|
|
291
314
|
this.updateStatus('disconnected');
|
|
292
315
|
// Reject all pending requests — the connection is gone and they'll never receive a response
|
|
293
|
-
|
|
294
|
-
pending.reject(new Error('TypedSocket disconnected'));
|
|
295
|
-
}
|
|
296
|
-
this.pendingRequests.clear();
|
|
316
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
297
317
|
if (this.shouldReconnect()) {
|
|
298
318
|
this.scheduleReconnect();
|
|
299
319
|
}
|
|
@@ -384,6 +404,12 @@ export class TypedSocket {
|
|
|
384
404
|
createAbortError() {
|
|
385
405
|
return new Error('TypedSocket client startup aborted');
|
|
386
406
|
}
|
|
407
|
+
rejectPendingClientRequests(errorArg) {
|
|
408
|
+
for (const pending of this.pendingRequests.values()) {
|
|
409
|
+
pending.reject(errorArg);
|
|
410
|
+
}
|
|
411
|
+
this.pendingRequests.clear();
|
|
412
|
+
}
|
|
387
413
|
/**
|
|
388
414
|
* Updates connection status and notifies subscribers
|
|
389
415
|
*/
|
|
@@ -396,33 +422,163 @@ export class TypedSocket {
|
|
|
396
422
|
/**
|
|
397
423
|
* Sends a request to the server and waits for response (client-side)
|
|
398
424
|
*/
|
|
399
|
-
async sendRequest(request) {
|
|
425
|
+
async sendRequest(request, optionsArg = {}) {
|
|
400
426
|
if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
|
|
401
427
|
throw new Error('WebSocket not connected');
|
|
402
428
|
}
|
|
429
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
430
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
431
|
+
throw new Error('TypedSocket request aborted');
|
|
432
|
+
}
|
|
403
433
|
request.correlation ||= {
|
|
404
434
|
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
405
435
|
phase: 'request',
|
|
406
436
|
};
|
|
407
437
|
const correlationId = request.correlation.id;
|
|
408
438
|
return new Promise((resolve, reject) => {
|
|
409
|
-
|
|
439
|
+
let settled = false;
|
|
440
|
+
const cleanup = () => {
|
|
441
|
+
clearTimeout(timeout);
|
|
442
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
410
443
|
this.pendingRequests.delete(correlationId);
|
|
411
|
-
|
|
412
|
-
|
|
444
|
+
};
|
|
445
|
+
const settle = (errorArg, responseArg) => {
|
|
446
|
+
if (settled) {
|
|
447
|
+
return;
|
|
448
|
+
}
|
|
449
|
+
settled = true;
|
|
450
|
+
cleanup();
|
|
451
|
+
if (errorArg) {
|
|
452
|
+
reject(errorArg);
|
|
453
|
+
}
|
|
454
|
+
else {
|
|
455
|
+
resolve(responseArg);
|
|
456
|
+
}
|
|
457
|
+
};
|
|
458
|
+
const onAbort = () => settle(new Error('TypedSocket request aborted'));
|
|
459
|
+
const timeout = setTimeout(() => {
|
|
460
|
+
settle(new Error('TypedSocket request timed out'));
|
|
461
|
+
}, timeoutMs);
|
|
413
462
|
this.pendingRequests.set(correlationId, {
|
|
414
463
|
resolve: (response) => {
|
|
415
|
-
|
|
416
|
-
resolve(response);
|
|
464
|
+
settle(undefined, response);
|
|
417
465
|
},
|
|
418
466
|
reject: (error) => {
|
|
419
|
-
|
|
420
|
-
reject(error);
|
|
467
|
+
settle(error);
|
|
421
468
|
},
|
|
422
469
|
});
|
|
423
|
-
|
|
470
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
471
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
472
|
+
onAbort();
|
|
473
|
+
return;
|
|
474
|
+
}
|
|
475
|
+
try {
|
|
476
|
+
this.websocket.send(plugins.smartjson.stringify(request));
|
|
477
|
+
}
|
|
478
|
+
catch (error) {
|
|
479
|
+
settle(error instanceof Error ? error : new Error(String(error)));
|
|
480
|
+
}
|
|
424
481
|
});
|
|
425
482
|
}
|
|
483
|
+
normalizeRequestTimeout(timeoutMsArg) {
|
|
484
|
+
const timeoutMs = timeoutMsArg ?? 30000;
|
|
485
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
|
|
486
|
+
throw new Error('TypedSocket request timeout must be a finite non-negative number');
|
|
487
|
+
}
|
|
488
|
+
return timeoutMs;
|
|
489
|
+
}
|
|
490
|
+
cancelPendingServerRequestsForPeer(peerIdArg, errorArg) {
|
|
491
|
+
const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
|
|
492
|
+
if (!correlationIds) {
|
|
493
|
+
return;
|
|
494
|
+
}
|
|
495
|
+
for (const correlationId of Array.from(correlationIds)) {
|
|
496
|
+
this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
|
|
497
|
+
}
|
|
498
|
+
}
|
|
499
|
+
async sendServerRequest(typedRequestDataArg, targetArg, optionsArg) {
|
|
500
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
501
|
+
if (this.serverStopping || !this.smartServeRef) {
|
|
502
|
+
throw new Error('TypedSocket server stopped');
|
|
503
|
+
}
|
|
504
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
505
|
+
throw new Error('TypedSocket request aborted');
|
|
506
|
+
}
|
|
507
|
+
typedRequestDataArg.correlation ||= {
|
|
508
|
+
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
509
|
+
phase: 'request',
|
|
510
|
+
};
|
|
511
|
+
const correlationId = typedRequestDataArg.correlation.id;
|
|
512
|
+
const peerId = targetArg.peer.id;
|
|
513
|
+
if (this.pendingServerRequests.has(correlationId)) {
|
|
514
|
+
throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
|
|
515
|
+
}
|
|
516
|
+
const cancellation = plugins.smartpromise.defer();
|
|
517
|
+
// A stop/abort may happen while InterestMap.addInterest is yielding. Attach
|
|
518
|
+
// a rejection handler immediately; Promise.race below still receives the
|
|
519
|
+
// original rejection once the interest exists.
|
|
520
|
+
void cancellation.promise.catch(() => { });
|
|
521
|
+
const cleanup = plugins.smartpromise.defer();
|
|
522
|
+
let cancellationRequested = false;
|
|
523
|
+
const cancel = (errorArg) => {
|
|
524
|
+
if (cancellationRequested) {
|
|
525
|
+
return;
|
|
526
|
+
}
|
|
527
|
+
cancellationRequested = true;
|
|
528
|
+
cancellation.reject(errorArg);
|
|
529
|
+
};
|
|
530
|
+
const pendingRequest = {
|
|
531
|
+
peerId,
|
|
532
|
+
cancel,
|
|
533
|
+
cleanupComplete: cleanup.promise,
|
|
534
|
+
};
|
|
535
|
+
this.pendingServerRequests.set(correlationId, pendingRequest);
|
|
536
|
+
const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set();
|
|
537
|
+
requestsForPeer.add(correlationId);
|
|
538
|
+
this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
|
|
539
|
+
const onAbort = () => cancel(new Error('TypedSocket request aborted'));
|
|
540
|
+
const timeout = setTimeout(() => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)), timeoutMs);
|
|
541
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
542
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
543
|
+
onAbort();
|
|
544
|
+
}
|
|
545
|
+
let destroyInterest;
|
|
546
|
+
try {
|
|
547
|
+
const interest = await this.typedrouter.fireEventInterestMap.addInterest(correlationId, typedRequestDataArg);
|
|
548
|
+
destroyInterest = () => interest.destroy();
|
|
549
|
+
// Establish the rejecting race before send so synchronous close/abort and
|
|
550
|
+
// send failures all use the same cleanup path.
|
|
551
|
+
const response = Promise.race([
|
|
552
|
+
interest.interestFullfilled,
|
|
553
|
+
cancellation.promise,
|
|
554
|
+
]);
|
|
555
|
+
const targetIsStillConnected = this.smartServeRef
|
|
556
|
+
?.getWebSocketConnections()
|
|
557
|
+
.some((peerArg) => peerArg.id === peerId) ?? false;
|
|
558
|
+
if (!targetIsStillConnected) {
|
|
559
|
+
cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
|
|
560
|
+
}
|
|
561
|
+
if (this.serverStopping) {
|
|
562
|
+
cancel(new Error('TypedSocket server stopped'));
|
|
563
|
+
}
|
|
564
|
+
if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
|
|
565
|
+
targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
|
|
566
|
+
}
|
|
567
|
+
return await response;
|
|
568
|
+
}
|
|
569
|
+
finally {
|
|
570
|
+
clearTimeout(timeout);
|
|
571
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
572
|
+
this.pendingServerRequests.delete(correlationId);
|
|
573
|
+
const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
|
|
574
|
+
remainingRequestsForPeer?.delete(correlationId);
|
|
575
|
+
if (remainingRequestsForPeer?.size === 0) {
|
|
576
|
+
this.pendingServerRequestIdsByPeerId.delete(peerId);
|
|
577
|
+
}
|
|
578
|
+
destroyInterest?.();
|
|
579
|
+
cleanup.resolve();
|
|
580
|
+
}
|
|
581
|
+
}
|
|
426
582
|
// ============================================================================
|
|
427
583
|
// PUBLIC API - SHARED
|
|
428
584
|
// ============================================================================
|
|
@@ -431,11 +587,11 @@ export class TypedSocket {
|
|
|
431
587
|
* On clients, sends to the server.
|
|
432
588
|
* On servers, sends to the specified target connection.
|
|
433
589
|
*/
|
|
434
|
-
createTypedRequest(methodName, targetConnection) {
|
|
590
|
+
createTypedRequest(methodName, targetConnection, optionsArg = {}) {
|
|
435
591
|
const postMethod = async (requestDataArg) => {
|
|
436
592
|
const typedRequestData = requestDataArg;
|
|
437
593
|
if (this.side === 'client') {
|
|
438
|
-
return this.sendRequest(typedRequestData);
|
|
594
|
+
return this.sendRequest(typedRequestData, optionsArg);
|
|
439
595
|
}
|
|
440
596
|
// Server-side: send to target connection
|
|
441
597
|
if (!this.smartServeRef) {
|
|
@@ -455,16 +611,7 @@ export class TypedSocket {
|
|
|
455
611
|
throw new Error('Multiple connections available - specify targetConnection');
|
|
456
612
|
}
|
|
457
613
|
}
|
|
458
|
-
typedRequestData
|
|
459
|
-
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
460
|
-
phase: 'request',
|
|
461
|
-
};
|
|
462
|
-
// Register interest for response
|
|
463
|
-
const interest = await this.typedrouter.fireEventInterestMap.addInterest(typedRequestData.correlation.id, typedRequestData);
|
|
464
|
-
// Send request
|
|
465
|
-
target.peer.send(plugins.smartjson.stringify(typedRequestData));
|
|
466
|
-
// Wait for response
|
|
467
|
-
return await interest.interestFullfilled;
|
|
614
|
+
return await this.sendServerRequest(typedRequestData, target, optionsArg);
|
|
468
615
|
};
|
|
469
616
|
return new plugins.typedrequest.TypedRequest(new plugins.typedrequest.TypedTarget({ postMethod }), methodName);
|
|
470
617
|
}
|
|
@@ -501,6 +648,14 @@ export class TypedSocket {
|
|
|
501
648
|
this.pendingRequests.clear();
|
|
502
649
|
}
|
|
503
650
|
else {
|
|
651
|
+
this.serverStopping = true;
|
|
652
|
+
const pendingRequests = Array.from(this.pendingServerRequests.values());
|
|
653
|
+
for (const pendingRequest of pendingRequests) {
|
|
654
|
+
pendingRequest.cancel(new Error('TypedSocket server stopped'));
|
|
655
|
+
}
|
|
656
|
+
await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
|
|
657
|
+
this.unsubscribeSmartServeConnectionClose?.();
|
|
658
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
504
659
|
this.smartServeRef = null;
|
|
505
660
|
}
|
|
506
661
|
}
|
|
@@ -540,15 +695,10 @@ export class TypedSocket {
|
|
|
540
695
|
*/
|
|
541
696
|
async reapplyClientTags() {
|
|
542
697
|
for (const [name, payload] of this.clientTags) {
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
548
|
-
}
|
|
549
|
-
}
|
|
550
|
-
catch (error) {
|
|
551
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect: ${error.message}`);
|
|
698
|
+
const request = this.createTypedRequest('__typedsocket_setTag');
|
|
699
|
+
const response = await request.fire({ name, payload });
|
|
700
|
+
if (!response.success) {
|
|
701
|
+
throw new Error(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
552
702
|
}
|
|
553
703
|
}
|
|
554
704
|
}
|
|
@@ -636,4 +786,4 @@ export class TypedSocket {
|
|
|
636
786
|
return allResults[0];
|
|
637
787
|
}
|
|
638
788
|
}
|
|
639
|
-
//# 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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"}
|
|
789
|
+
//# 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": "
|
|
3
|
+
"version": "5.0.1",
|
|
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,25 +10,25 @@
|
|
|
10
10
|
"license": "MIT",
|
|
11
11
|
"devDependencies": {
|
|
12
12
|
"@git.zone/tsbuild": "^4.4.2",
|
|
13
|
-
"@git.zone/tsbundle": "^2.11.
|
|
13
|
+
"@git.zone/tsbundle": "^2.11.3",
|
|
14
14
|
"@git.zone/tsrun": "^2.0.5",
|
|
15
15
|
"@git.zone/tstest": "^3.6.6",
|
|
16
|
-
"@push.rocks/smartenv": "^6.
|
|
17
|
-
"@push.rocks/smartserve": "^2.
|
|
18
|
-
"@types/node": "26.1.
|
|
16
|
+
"@push.rocks/smartenv": "^6.1.0",
|
|
17
|
+
"@push.rocks/smartserve": "^2.3.0",
|
|
18
|
+
"@types/node": "26.1.1"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
21
|
"@api.global/typedrequest": "^3.3.2",
|
|
22
22
|
"@api.global/typedrequest-interfaces": "^3.0.19",
|
|
23
|
-
"@push.rocks/smartdelay": "^3.0
|
|
23
|
+
"@push.rocks/smartdelay": "^3.1.0",
|
|
24
24
|
"@push.rocks/smartjson": "^6.0.1",
|
|
25
|
-
"@push.rocks/smartpromise": "^4.2.
|
|
26
|
-
"@push.rocks/smartrx": "^3.0.
|
|
25
|
+
"@push.rocks/smartpromise": "^4.2.4",
|
|
26
|
+
"@push.rocks/smartrx": "^3.0.12",
|
|
27
27
|
"@push.rocks/smartstring": "^4.1.1",
|
|
28
28
|
"@push.rocks/smarturl": "^3.1.0"
|
|
29
29
|
},
|
|
30
30
|
"peerDependencies": {
|
|
31
|
-
"@push.rocks/smartserve": ">=
|
|
31
|
+
"@push.rocks/smartserve": ">=2.3.0"
|
|
32
32
|
},
|
|
33
33
|
"browserslist": [
|
|
34
34
|
"last 1 chrome versions"
|
package/readme.md
CHANGED
|
@@ -233,6 +233,10 @@ interface IUserTag extends typedrequestInterfaces.ITag {
|
|
|
233
233
|
|
|
234
234
|
await client.setTag<IUserTag>('userRole', 'admin');
|
|
235
235
|
|
|
236
|
+
// On reconnect, stored tags are restored before statusSubject emits
|
|
237
|
+
// "connected". A failed restoration keeps the client unready and is retried
|
|
238
|
+
// through the normal reconnect policy.
|
|
239
|
+
|
|
236
240
|
// Removed tags are not restored after reconnect, even if this rejects because
|
|
237
241
|
// the server is unavailable while the removal request is attempted.
|
|
238
242
|
await client.removeTag('userRole');
|
package/ts/00_commitinfo_data.ts
CHANGED
|
@@ -31,6 +31,20 @@ export interface ITypedSocketClientOptions {
|
|
|
31
31
|
abortSignal?: AbortSignal;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
+
/**
|
|
35
|
+
* Lifecycle controls for one TypedRequest sent over a TypedSocket.
|
|
36
|
+
*/
|
|
37
|
+
export interface ITypedSocketRequestOptions {
|
|
38
|
+
timeoutMs?: number;
|
|
39
|
+
abortSignal?: AbortSignal;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
interface IPendingServerRequest {
|
|
43
|
+
peerId: string;
|
|
44
|
+
cancel: (errorArg: Error) => void;
|
|
45
|
+
cleanupComplete: Promise<void>;
|
|
46
|
+
}
|
|
47
|
+
|
|
34
48
|
/**
|
|
35
49
|
* Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
|
|
36
50
|
*/
|
|
@@ -154,6 +168,13 @@ export class TypedSocket {
|
|
|
154
168
|
|
|
155
169
|
const typedSocket = new TypedSocket('server', typedRouterArg);
|
|
156
170
|
typedSocket.smartServeRef = smartServeArg;
|
|
171
|
+
typedSocket.unsubscribeSmartServeConnectionClose =
|
|
172
|
+
smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
|
|
173
|
+
typedSocket.cancelPendingServerRequestsForPeer(
|
|
174
|
+
peerArg.id,
|
|
175
|
+
new Error(`TypedSocket target connection closed: ${peerArg.id}`),
|
|
176
|
+
);
|
|
177
|
+
});
|
|
157
178
|
|
|
158
179
|
return typedSocket;
|
|
159
180
|
}
|
|
@@ -226,6 +247,10 @@ export class TypedSocket {
|
|
|
226
247
|
|
|
227
248
|
// Server-specific properties (SmartServe mode)
|
|
228
249
|
private smartServeRef: plugins.SmartServe | null = null;
|
|
250
|
+
private serverStopping = false;
|
|
251
|
+
private unsubscribeSmartServeConnectionClose: (() => void) | null = null;
|
|
252
|
+
private pendingServerRequests = new Map<string, IPendingServerRequest>();
|
|
253
|
+
private pendingServerRequestIdsByPeerId = new Map<string, Set<string>>();
|
|
229
254
|
|
|
230
255
|
// ============================================================================
|
|
231
256
|
// CONSTRUCTOR
|
|
@@ -298,13 +323,26 @@ export class TypedSocket {
|
|
|
298
323
|
}
|
|
299
324
|
}, 10000);
|
|
300
325
|
|
|
301
|
-
this.websocket.onopen = () => {
|
|
302
|
-
this.
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
326
|
+
this.websocket.onopen = async () => {
|
|
327
|
+
const openedWebsocket = this.websocket;
|
|
328
|
+
try {
|
|
329
|
+
await this.reapplyClientTags();
|
|
330
|
+
if (this.websocket !== openedWebsocket || openedWebsocket?.readyState !== WebSocket.OPEN) {
|
|
331
|
+
throw new Error('TypedSocket connection changed while restoring client tags');
|
|
332
|
+
}
|
|
333
|
+
this.logDebug('TypedSocket connected and client registration restored!');
|
|
334
|
+
this.retryCount = 0;
|
|
335
|
+
this.currentBackoff = this.clientOptions?.initialBackoffMs ?? 1000;
|
|
336
|
+
this.updateStatus('connected');
|
|
337
|
+
settleConnection();
|
|
338
|
+
} catch (error) {
|
|
339
|
+
const restorationError = error instanceof Error
|
|
340
|
+
? error
|
|
341
|
+
: new Error(String(error));
|
|
342
|
+
this.logTransient(`TypedSocket client registration restoration failed: ${restorationError.message}`);
|
|
343
|
+
settleConnection(restorationError);
|
|
344
|
+
openedWebsocket?.close();
|
|
345
|
+
}
|
|
308
346
|
};
|
|
309
347
|
|
|
310
348
|
this.websocket.onmessage = async (event) => {
|
|
@@ -315,6 +353,7 @@ export class TypedSocket {
|
|
|
315
353
|
if (this.connectionStatus === 'connected') {
|
|
316
354
|
this.handleDisconnect();
|
|
317
355
|
} else {
|
|
356
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
318
357
|
settleConnection(this.stopped || this.clientOptions?.abortSignal?.aborted
|
|
319
358
|
? this.createAbortError()
|
|
320
359
|
: new Error('TypedSocket connection closed before it opened'));
|
|
@@ -390,10 +429,7 @@ export class TypedSocket {
|
|
|
390
429
|
this.updateStatus('disconnected');
|
|
391
430
|
|
|
392
431
|
// Reject all pending requests — the connection is gone and they'll never receive a response
|
|
393
|
-
|
|
394
|
-
pending.reject(new Error('TypedSocket disconnected'));
|
|
395
|
-
}
|
|
396
|
-
this.pendingRequests.clear();
|
|
432
|
+
this.rejectPendingClientRequests(new Error('TypedSocket disconnected'));
|
|
397
433
|
|
|
398
434
|
if (this.shouldReconnect()) {
|
|
399
435
|
this.scheduleReconnect();
|
|
@@ -498,6 +534,13 @@ export class TypedSocket {
|
|
|
498
534
|
return new Error('TypedSocket client startup aborted');
|
|
499
535
|
}
|
|
500
536
|
|
|
537
|
+
private rejectPendingClientRequests(errorArg: Error): void {
|
|
538
|
+
for (const pending of this.pendingRequests.values()) {
|
|
539
|
+
pending.reject(errorArg);
|
|
540
|
+
}
|
|
541
|
+
this.pendingRequests.clear();
|
|
542
|
+
}
|
|
543
|
+
|
|
501
544
|
/**
|
|
502
545
|
* Updates connection status and notifies subscribers
|
|
503
546
|
*/
|
|
@@ -512,12 +555,18 @@ export class TypedSocket {
|
|
|
512
555
|
* Sends a request to the server and waits for response (client-side)
|
|
513
556
|
*/
|
|
514
557
|
private async sendRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
515
|
-
request: T
|
|
558
|
+
request: T,
|
|
559
|
+
optionsArg: ITypedSocketRequestOptions = {},
|
|
516
560
|
): Promise<T> {
|
|
517
561
|
if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
|
|
518
562
|
throw new Error('WebSocket not connected');
|
|
519
563
|
}
|
|
520
564
|
|
|
565
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
566
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
567
|
+
throw new Error('TypedSocket request aborted');
|
|
568
|
+
}
|
|
569
|
+
|
|
521
570
|
request.correlation ||= {
|
|
522
571
|
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
523
572
|
phase: 'request',
|
|
@@ -525,26 +574,165 @@ export class TypedSocket {
|
|
|
525
574
|
const correlationId = request.correlation.id;
|
|
526
575
|
|
|
527
576
|
return new Promise((resolve, reject) => {
|
|
528
|
-
|
|
577
|
+
let settled = false;
|
|
578
|
+
const cleanup = () => {
|
|
579
|
+
clearTimeout(timeout);
|
|
580
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
529
581
|
this.pendingRequests.delete(correlationId);
|
|
530
|
-
|
|
531
|
-
|
|
582
|
+
};
|
|
583
|
+
const settle = (errorArg?: Error, responseArg?: T) => {
|
|
584
|
+
if (settled) {
|
|
585
|
+
return;
|
|
586
|
+
}
|
|
587
|
+
settled = true;
|
|
588
|
+
cleanup();
|
|
589
|
+
if (errorArg) {
|
|
590
|
+
reject(errorArg);
|
|
591
|
+
} else {
|
|
592
|
+
resolve(responseArg!);
|
|
593
|
+
}
|
|
594
|
+
};
|
|
595
|
+
const onAbort = () => settle(new Error('TypedSocket request aborted'));
|
|
596
|
+
const timeout = setTimeout(() => {
|
|
597
|
+
settle(new Error('TypedSocket request timed out'));
|
|
598
|
+
}, timeoutMs);
|
|
532
599
|
|
|
533
600
|
this.pendingRequests.set(correlationId, {
|
|
534
601
|
resolve: (response) => {
|
|
535
|
-
|
|
536
|
-
resolve(response);
|
|
602
|
+
settle(undefined, response as T);
|
|
537
603
|
},
|
|
538
604
|
reject: (error) => {
|
|
539
|
-
|
|
540
|
-
reject(error);
|
|
605
|
+
settle(error);
|
|
541
606
|
},
|
|
542
607
|
});
|
|
608
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
609
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
610
|
+
onAbort();
|
|
611
|
+
return;
|
|
612
|
+
}
|
|
543
613
|
|
|
544
|
-
|
|
614
|
+
try {
|
|
615
|
+
this.websocket!.send(plugins.smartjson.stringify(request));
|
|
616
|
+
} catch (error) {
|
|
617
|
+
settle(error instanceof Error ? error : new Error(String(error)));
|
|
618
|
+
}
|
|
545
619
|
});
|
|
546
620
|
}
|
|
547
621
|
|
|
622
|
+
private normalizeRequestTimeout(timeoutMsArg: number | undefined): number {
|
|
623
|
+
const timeoutMs = timeoutMsArg ?? 30000;
|
|
624
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
|
|
625
|
+
throw new Error('TypedSocket request timeout must be a finite non-negative number');
|
|
626
|
+
}
|
|
627
|
+
return timeoutMs;
|
|
628
|
+
}
|
|
629
|
+
|
|
630
|
+
private cancelPendingServerRequestsForPeer(peerIdArg: string, errorArg: Error): void {
|
|
631
|
+
const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
|
|
632
|
+
if (!correlationIds) {
|
|
633
|
+
return;
|
|
634
|
+
}
|
|
635
|
+
for (const correlationId of Array.from(correlationIds)) {
|
|
636
|
+
this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
|
|
637
|
+
}
|
|
638
|
+
}
|
|
639
|
+
|
|
640
|
+
private async sendServerRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
641
|
+
typedRequestDataArg: T,
|
|
642
|
+
targetArg: ISmartServeConnectionWrapper,
|
|
643
|
+
optionsArg: ITypedSocketRequestOptions,
|
|
644
|
+
): Promise<T> {
|
|
645
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
646
|
+
if (this.serverStopping || !this.smartServeRef) {
|
|
647
|
+
throw new Error('TypedSocket server stopped');
|
|
648
|
+
}
|
|
649
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
650
|
+
throw new Error('TypedSocket request aborted');
|
|
651
|
+
}
|
|
652
|
+
|
|
653
|
+
typedRequestDataArg.correlation ||= {
|
|
654
|
+
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
655
|
+
phase: 'request',
|
|
656
|
+
};
|
|
657
|
+
const correlationId = typedRequestDataArg.correlation.id;
|
|
658
|
+
const peerId = targetArg.peer.id;
|
|
659
|
+
if (this.pendingServerRequests.has(correlationId)) {
|
|
660
|
+
throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
|
|
661
|
+
}
|
|
662
|
+
const cancellation = plugins.smartpromise.defer<never>();
|
|
663
|
+
// A stop/abort may happen while InterestMap.addInterest is yielding. Attach
|
|
664
|
+
// a rejection handler immediately; Promise.race below still receives the
|
|
665
|
+
// original rejection once the interest exists.
|
|
666
|
+
void cancellation.promise.catch(() => {});
|
|
667
|
+
const cleanup = plugins.smartpromise.defer<void>();
|
|
668
|
+
let cancellationRequested = false;
|
|
669
|
+
const cancel = (errorArg: Error) => {
|
|
670
|
+
if (cancellationRequested) {
|
|
671
|
+
return;
|
|
672
|
+
}
|
|
673
|
+
cancellationRequested = true;
|
|
674
|
+
cancellation.reject(errorArg);
|
|
675
|
+
};
|
|
676
|
+
const pendingRequest: IPendingServerRequest = {
|
|
677
|
+
peerId,
|
|
678
|
+
cancel,
|
|
679
|
+
cleanupComplete: cleanup.promise,
|
|
680
|
+
};
|
|
681
|
+
this.pendingServerRequests.set(correlationId, pendingRequest);
|
|
682
|
+
const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set<string>();
|
|
683
|
+
requestsForPeer.add(correlationId);
|
|
684
|
+
this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
|
|
685
|
+
|
|
686
|
+
const onAbort = () => cancel(new Error('TypedSocket request aborted'));
|
|
687
|
+
const timeout = setTimeout(
|
|
688
|
+
() => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)),
|
|
689
|
+
timeoutMs,
|
|
690
|
+
);
|
|
691
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
692
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
693
|
+
onAbort();
|
|
694
|
+
}
|
|
695
|
+
|
|
696
|
+
let destroyInterest: (() => void) | undefined;
|
|
697
|
+
try {
|
|
698
|
+
const interest = await this.typedrouter.fireEventInterestMap.addInterest(
|
|
699
|
+
correlationId,
|
|
700
|
+
typedRequestDataArg,
|
|
701
|
+
);
|
|
702
|
+
destroyInterest = () => interest.destroy();
|
|
703
|
+
// Establish the rejecting race before send so synchronous close/abort and
|
|
704
|
+
// send failures all use the same cleanup path.
|
|
705
|
+
const response = Promise.race([
|
|
706
|
+
interest.interestFullfilled as Promise<T>,
|
|
707
|
+
cancellation.promise,
|
|
708
|
+
]);
|
|
709
|
+
const targetIsStillConnected = this.smartServeRef
|
|
710
|
+
?.getWebSocketConnections()
|
|
711
|
+
.some((peerArg) => peerArg.id === peerId) ?? false;
|
|
712
|
+
if (!targetIsStillConnected) {
|
|
713
|
+
cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
|
|
714
|
+
}
|
|
715
|
+
if (this.serverStopping) {
|
|
716
|
+
cancel(new Error('TypedSocket server stopped'));
|
|
717
|
+
}
|
|
718
|
+
if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
|
|
719
|
+
targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
|
|
720
|
+
}
|
|
721
|
+
return await response;
|
|
722
|
+
} finally {
|
|
723
|
+
clearTimeout(timeout);
|
|
724
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
725
|
+
this.pendingServerRequests.delete(correlationId);
|
|
726
|
+
const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
|
|
727
|
+
remainingRequestsForPeer?.delete(correlationId);
|
|
728
|
+
if (remainingRequestsForPeer?.size === 0) {
|
|
729
|
+
this.pendingServerRequestIdsByPeerId.delete(peerId);
|
|
730
|
+
}
|
|
731
|
+
destroyInterest?.();
|
|
732
|
+
cleanup.resolve();
|
|
733
|
+
}
|
|
734
|
+
}
|
|
735
|
+
|
|
548
736
|
// ============================================================================
|
|
549
737
|
// PUBLIC API - SHARED
|
|
550
738
|
// ============================================================================
|
|
@@ -556,14 +744,15 @@ export class TypedSocket {
|
|
|
556
744
|
*/
|
|
557
745
|
public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
558
746
|
methodName: T['method'],
|
|
559
|
-
targetConnection?: ISmartServeConnectionWrapper
|
|
747
|
+
targetConnection?: ISmartServeConnectionWrapper,
|
|
748
|
+
optionsArg: ITypedSocketRequestOptions = {},
|
|
560
749
|
): plugins.typedrequest.TypedRequest<T> {
|
|
561
750
|
const postMethod = async (
|
|
562
751
|
requestDataArg: plugins.typedrequestInterfaces.ITypedRequest,
|
|
563
752
|
): Promise<plugins.typedrequestInterfaces.ITypedRequest> => {
|
|
564
753
|
const typedRequestData = requestDataArg as T;
|
|
565
754
|
if (this.side === 'client') {
|
|
566
|
-
return this.sendRequest(typedRequestData);
|
|
755
|
+
return this.sendRequest(typedRequestData, optionsArg);
|
|
567
756
|
}
|
|
568
757
|
|
|
569
758
|
// Server-side: send to target connection
|
|
@@ -584,22 +773,7 @@ export class TypedSocket {
|
|
|
584
773
|
}
|
|
585
774
|
}
|
|
586
775
|
|
|
587
|
-
typedRequestData
|
|
588
|
-
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
589
|
-
phase: 'request',
|
|
590
|
-
};
|
|
591
|
-
|
|
592
|
-
// Register interest for response
|
|
593
|
-
const interest = await this.typedrouter.fireEventInterestMap.addInterest(
|
|
594
|
-
typedRequestData.correlation.id,
|
|
595
|
-
typedRequestData,
|
|
596
|
-
);
|
|
597
|
-
|
|
598
|
-
// Send request
|
|
599
|
-
target.peer.send(plugins.smartjson.stringify(typedRequestData));
|
|
600
|
-
|
|
601
|
-
// Wait for response
|
|
602
|
-
return await interest.interestFullfilled as T;
|
|
776
|
+
return await this.sendServerRequest(typedRequestData, target, optionsArg);
|
|
603
777
|
};
|
|
604
778
|
|
|
605
779
|
return new plugins.typedrequest.TypedRequest<T>(
|
|
@@ -641,6 +815,14 @@ export class TypedSocket {
|
|
|
641
815
|
}
|
|
642
816
|
this.pendingRequests.clear();
|
|
643
817
|
} else {
|
|
818
|
+
this.serverStopping = true;
|
|
819
|
+
const pendingRequests = Array.from(this.pendingServerRequests.values());
|
|
820
|
+
for (const pendingRequest of pendingRequests) {
|
|
821
|
+
pendingRequest.cancel(new Error('TypedSocket server stopped'));
|
|
822
|
+
}
|
|
823
|
+
await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
|
|
824
|
+
this.unsubscribeSmartServeConnectionClose?.();
|
|
825
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
644
826
|
this.smartServeRef = null;
|
|
645
827
|
}
|
|
646
828
|
}
|
|
@@ -687,14 +869,10 @@ export class TypedSocket {
|
|
|
687
869
|
*/
|
|
688
870
|
private async reapplyClientTags(): Promise<void> {
|
|
689
871
|
for (const [name, payload] of this.clientTags) {
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
695
|
-
}
|
|
696
|
-
} catch (error) {
|
|
697
|
-
console.warn(`TypedSocket failed to restore tag ${name} after reconnect: ${(error as Error).message}`);
|
|
872
|
+
const request = this.createTypedRequest<IReq_SetClientTag>('__typedsocket_setTag');
|
|
873
|
+
const response = await request.fire({ name, payload });
|
|
874
|
+
if (!response.success) {
|
|
875
|
+
throw new Error(`TypedSocket failed to restore tag ${name} after reconnect`);
|
|
698
876
|
}
|
|
699
877
|
}
|
|
700
878
|
}
|