@api.global/typedsocket 4.2.4 → 5.0.0
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.
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@api.global/typedsocket',
|
|
6
|
-
version: '
|
|
6
|
+
version: '5.0.0',
|
|
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,7 +95,10 @@ export declare class TypedSocket {
|
|
|
88
95
|
private clientTags;
|
|
89
96
|
private clientTagMutations;
|
|
90
97
|
private smartServeRef;
|
|
91
|
-
private
|
|
98
|
+
private serverStopping;
|
|
99
|
+
private unsubscribeSmartServeConnectionClose;
|
|
100
|
+
private pendingServerRequests;
|
|
101
|
+
private pendingServerRequestIdsByPeerId;
|
|
92
102
|
private constructor();
|
|
93
103
|
/**
|
|
94
104
|
* Connects the client to the server using native WebSocket
|
|
@@ -131,12 +141,15 @@ export declare class TypedSocket {
|
|
|
131
141
|
* Sends a request to the server and waits for response (client-side)
|
|
132
142
|
*/
|
|
133
143
|
private sendRequest;
|
|
144
|
+
private normalizeRequestTimeout;
|
|
145
|
+
private cancelPendingServerRequestsForPeer;
|
|
146
|
+
private sendServerRequest;
|
|
134
147
|
/**
|
|
135
148
|
* Creates a TypedRequest for the specified method.
|
|
136
149
|
* On clients, sends to the server.
|
|
137
150
|
* On servers, sends to the specified target connection.
|
|
138
151
|
*/
|
|
139
|
-
createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper): plugins.typedrequest.TypedRequest<T>;
|
|
152
|
+
createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper, optionsArg?: ITypedSocketRequestOptions): plugins.typedrequest.TypedRequest<T>;
|
|
140
153
|
/**
|
|
141
154
|
* Gets the current connection status
|
|
142
155
|
*/
|
|
@@ -161,10 +174,6 @@ export declare class TypedSocket {
|
|
|
161
174
|
* @client-only
|
|
162
175
|
*/
|
|
163
176
|
removeTag(name: string): Promise<void>;
|
|
164
|
-
/**
|
|
165
|
-
* Gets or creates a connection wrapper for a peer
|
|
166
|
-
*/
|
|
167
|
-
private getOrCreateWrapper;
|
|
168
177
|
/**
|
|
169
178
|
* Finds all connections matching the filter function.
|
|
170
179
|
* @server-only
|
|
@@ -96,12 +96,14 @@ export class TypedSocket {
|
|
|
96
96
|
* ```
|
|
97
97
|
*/
|
|
98
98
|
static fromSmartServe(smartServeArg, typedRouterArg) {
|
|
99
|
-
const connectionWrappers = new Map();
|
|
100
99
|
// Register built-in tag handlers
|
|
101
100
|
TypedSocket.registerTagHandlers(typedRouterArg);
|
|
102
101
|
const typedSocket = new TypedSocket('server', typedRouterArg);
|
|
103
102
|
typedSocket.smartServeRef = smartServeArg;
|
|
104
|
-
typedSocket.
|
|
103
|
+
typedSocket.unsubscribeSmartServeConnectionClose =
|
|
104
|
+
smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
|
|
105
|
+
typedSocket.cancelPendingServerRequestsForPeer(peerArg.id, new Error(`TypedSocket target connection closed: ${peerArg.id}`));
|
|
106
|
+
});
|
|
105
107
|
return typedSocket;
|
|
106
108
|
}
|
|
107
109
|
/**
|
|
@@ -153,7 +155,10 @@ export class TypedSocket {
|
|
|
153
155
|
this.clientTagMutations = new Map();
|
|
154
156
|
// Server-specific properties (SmartServe mode)
|
|
155
157
|
this.smartServeRef = null;
|
|
156
|
-
this.
|
|
158
|
+
this.serverStopping = false;
|
|
159
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
160
|
+
this.pendingServerRequests = new Map();
|
|
161
|
+
this.pendingServerRequestIdsByPeerId = new Map();
|
|
157
162
|
this.side = sideArg;
|
|
158
163
|
this.typedrouter = typedrouterArg;
|
|
159
164
|
}
|
|
@@ -399,33 +404,163 @@ export class TypedSocket {
|
|
|
399
404
|
/**
|
|
400
405
|
* Sends a request to the server and waits for response (client-side)
|
|
401
406
|
*/
|
|
402
|
-
async sendRequest(request) {
|
|
407
|
+
async sendRequest(request, optionsArg = {}) {
|
|
403
408
|
if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
|
|
404
409
|
throw new Error('WebSocket not connected');
|
|
405
410
|
}
|
|
411
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
412
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
413
|
+
throw new Error('TypedSocket request aborted');
|
|
414
|
+
}
|
|
406
415
|
request.correlation ||= {
|
|
407
416
|
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
408
417
|
phase: 'request',
|
|
409
418
|
};
|
|
410
419
|
const correlationId = request.correlation.id;
|
|
411
420
|
return new Promise((resolve, reject) => {
|
|
412
|
-
|
|
421
|
+
let settled = false;
|
|
422
|
+
const cleanup = () => {
|
|
423
|
+
clearTimeout(timeout);
|
|
424
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
413
425
|
this.pendingRequests.delete(correlationId);
|
|
414
|
-
|
|
415
|
-
|
|
426
|
+
};
|
|
427
|
+
const settle = (errorArg, responseArg) => {
|
|
428
|
+
if (settled) {
|
|
429
|
+
return;
|
|
430
|
+
}
|
|
431
|
+
settled = true;
|
|
432
|
+
cleanup();
|
|
433
|
+
if (errorArg) {
|
|
434
|
+
reject(errorArg);
|
|
435
|
+
}
|
|
436
|
+
else {
|
|
437
|
+
resolve(responseArg);
|
|
438
|
+
}
|
|
439
|
+
};
|
|
440
|
+
const onAbort = () => settle(new Error('TypedSocket request aborted'));
|
|
441
|
+
const timeout = setTimeout(() => {
|
|
442
|
+
settle(new Error('TypedSocket request timed out'));
|
|
443
|
+
}, timeoutMs);
|
|
416
444
|
this.pendingRequests.set(correlationId, {
|
|
417
445
|
resolve: (response) => {
|
|
418
|
-
|
|
419
|
-
resolve(response);
|
|
446
|
+
settle(undefined, response);
|
|
420
447
|
},
|
|
421
448
|
reject: (error) => {
|
|
422
|
-
|
|
423
|
-
reject(error);
|
|
449
|
+
settle(error);
|
|
424
450
|
},
|
|
425
451
|
});
|
|
426
|
-
|
|
452
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
453
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
454
|
+
onAbort();
|
|
455
|
+
return;
|
|
456
|
+
}
|
|
457
|
+
try {
|
|
458
|
+
this.websocket.send(plugins.smartjson.stringify(request));
|
|
459
|
+
}
|
|
460
|
+
catch (error) {
|
|
461
|
+
settle(error instanceof Error ? error : new Error(String(error)));
|
|
462
|
+
}
|
|
427
463
|
});
|
|
428
464
|
}
|
|
465
|
+
normalizeRequestTimeout(timeoutMsArg) {
|
|
466
|
+
const timeoutMs = timeoutMsArg ?? 30000;
|
|
467
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
|
|
468
|
+
throw new Error('TypedSocket request timeout must be a finite non-negative number');
|
|
469
|
+
}
|
|
470
|
+
return timeoutMs;
|
|
471
|
+
}
|
|
472
|
+
cancelPendingServerRequestsForPeer(peerIdArg, errorArg) {
|
|
473
|
+
const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
|
|
474
|
+
if (!correlationIds) {
|
|
475
|
+
return;
|
|
476
|
+
}
|
|
477
|
+
for (const correlationId of Array.from(correlationIds)) {
|
|
478
|
+
this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
|
|
479
|
+
}
|
|
480
|
+
}
|
|
481
|
+
async sendServerRequest(typedRequestDataArg, targetArg, optionsArg) {
|
|
482
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
483
|
+
if (this.serverStopping || !this.smartServeRef) {
|
|
484
|
+
throw new Error('TypedSocket server stopped');
|
|
485
|
+
}
|
|
486
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
487
|
+
throw new Error('TypedSocket request aborted');
|
|
488
|
+
}
|
|
489
|
+
typedRequestDataArg.correlation ||= {
|
|
490
|
+
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
491
|
+
phase: 'request',
|
|
492
|
+
};
|
|
493
|
+
const correlationId = typedRequestDataArg.correlation.id;
|
|
494
|
+
const peerId = targetArg.peer.id;
|
|
495
|
+
if (this.pendingServerRequests.has(correlationId)) {
|
|
496
|
+
throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
|
|
497
|
+
}
|
|
498
|
+
const cancellation = plugins.smartpromise.defer();
|
|
499
|
+
// A stop/abort may happen while InterestMap.addInterest is yielding. Attach
|
|
500
|
+
// a rejection handler immediately; Promise.race below still receives the
|
|
501
|
+
// original rejection once the interest exists.
|
|
502
|
+
void cancellation.promise.catch(() => { });
|
|
503
|
+
const cleanup = plugins.smartpromise.defer();
|
|
504
|
+
let cancellationRequested = false;
|
|
505
|
+
const cancel = (errorArg) => {
|
|
506
|
+
if (cancellationRequested) {
|
|
507
|
+
return;
|
|
508
|
+
}
|
|
509
|
+
cancellationRequested = true;
|
|
510
|
+
cancellation.reject(errorArg);
|
|
511
|
+
};
|
|
512
|
+
const pendingRequest = {
|
|
513
|
+
peerId,
|
|
514
|
+
cancel,
|
|
515
|
+
cleanupComplete: cleanup.promise,
|
|
516
|
+
};
|
|
517
|
+
this.pendingServerRequests.set(correlationId, pendingRequest);
|
|
518
|
+
const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set();
|
|
519
|
+
requestsForPeer.add(correlationId);
|
|
520
|
+
this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
|
|
521
|
+
const onAbort = () => cancel(new Error('TypedSocket request aborted'));
|
|
522
|
+
const timeout = setTimeout(() => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)), timeoutMs);
|
|
523
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
524
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
525
|
+
onAbort();
|
|
526
|
+
}
|
|
527
|
+
let destroyInterest;
|
|
528
|
+
try {
|
|
529
|
+
const interest = await this.typedrouter.fireEventInterestMap.addInterest(correlationId, typedRequestDataArg);
|
|
530
|
+
destroyInterest = () => interest.destroy();
|
|
531
|
+
// Establish the rejecting race before send so synchronous close/abort and
|
|
532
|
+
// send failures all use the same cleanup path.
|
|
533
|
+
const response = Promise.race([
|
|
534
|
+
interest.interestFullfilled,
|
|
535
|
+
cancellation.promise,
|
|
536
|
+
]);
|
|
537
|
+
const targetIsStillConnected = this.smartServeRef
|
|
538
|
+
?.getWebSocketConnections()
|
|
539
|
+
.some((peerArg) => peerArg.id === peerId) ?? false;
|
|
540
|
+
if (!targetIsStillConnected) {
|
|
541
|
+
cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
|
|
542
|
+
}
|
|
543
|
+
if (this.serverStopping) {
|
|
544
|
+
cancel(new Error('TypedSocket server stopped'));
|
|
545
|
+
}
|
|
546
|
+
if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
|
|
547
|
+
targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
|
|
548
|
+
}
|
|
549
|
+
return await response;
|
|
550
|
+
}
|
|
551
|
+
finally {
|
|
552
|
+
clearTimeout(timeout);
|
|
553
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
554
|
+
this.pendingServerRequests.delete(correlationId);
|
|
555
|
+
const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
|
|
556
|
+
remainingRequestsForPeer?.delete(correlationId);
|
|
557
|
+
if (remainingRequestsForPeer?.size === 0) {
|
|
558
|
+
this.pendingServerRequestIdsByPeerId.delete(peerId);
|
|
559
|
+
}
|
|
560
|
+
destroyInterest?.();
|
|
561
|
+
cleanup.resolve();
|
|
562
|
+
}
|
|
563
|
+
}
|
|
429
564
|
// ============================================================================
|
|
430
565
|
// PUBLIC API - SHARED
|
|
431
566
|
// ============================================================================
|
|
@@ -434,11 +569,11 @@ export class TypedSocket {
|
|
|
434
569
|
* On clients, sends to the server.
|
|
435
570
|
* On servers, sends to the specified target connection.
|
|
436
571
|
*/
|
|
437
|
-
createTypedRequest(methodName, targetConnection) {
|
|
572
|
+
createTypedRequest(methodName, targetConnection, optionsArg = {}) {
|
|
438
573
|
const postMethod = async (requestDataArg) => {
|
|
439
574
|
const typedRequestData = requestDataArg;
|
|
440
575
|
if (this.side === 'client') {
|
|
441
|
-
return this.sendRequest(typedRequestData);
|
|
576
|
+
return this.sendRequest(typedRequestData, optionsArg);
|
|
442
577
|
}
|
|
443
578
|
// Server-side: send to target connection
|
|
444
579
|
if (!this.smartServeRef) {
|
|
@@ -449,7 +584,7 @@ export class TypedSocket {
|
|
|
449
584
|
const allConnections = this.smartServeRef.getWebSocketConnections();
|
|
450
585
|
if (allConnections.length === 1) {
|
|
451
586
|
const peer = allConnections[0];
|
|
452
|
-
target =
|
|
587
|
+
target = wrapSmartServePeer(peer);
|
|
453
588
|
}
|
|
454
589
|
else if (allConnections.length === 0) {
|
|
455
590
|
throw new Error('No WebSocket connections available');
|
|
@@ -458,16 +593,7 @@ export class TypedSocket {
|
|
|
458
593
|
throw new Error('Multiple connections available - specify targetConnection');
|
|
459
594
|
}
|
|
460
595
|
}
|
|
461
|
-
typedRequestData
|
|
462
|
-
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
463
|
-
phase: 'request',
|
|
464
|
-
};
|
|
465
|
-
// Register interest for response
|
|
466
|
-
const interest = await this.typedrouter.fireEventInterestMap.addInterest(typedRequestData.correlation.id, typedRequestData);
|
|
467
|
-
// Send request
|
|
468
|
-
target.peer.send(plugins.smartjson.stringify(typedRequestData));
|
|
469
|
-
// Wait for response
|
|
470
|
-
return await interest.interestFullfilled;
|
|
596
|
+
return await this.sendServerRequest(typedRequestData, target, optionsArg);
|
|
471
597
|
};
|
|
472
598
|
return new plugins.typedrequest.TypedRequest(new plugins.typedrequest.TypedTarget({ postMethod }), methodName);
|
|
473
599
|
}
|
|
@@ -504,8 +630,15 @@ export class TypedSocket {
|
|
|
504
630
|
this.pendingRequests.clear();
|
|
505
631
|
}
|
|
506
632
|
else {
|
|
507
|
-
|
|
508
|
-
this.
|
|
633
|
+
this.serverStopping = true;
|
|
634
|
+
const pendingRequests = Array.from(this.pendingServerRequests.values());
|
|
635
|
+
for (const pendingRequest of pendingRequests) {
|
|
636
|
+
pendingRequest.cancel(new Error('TypedSocket server stopped'));
|
|
637
|
+
}
|
|
638
|
+
await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
|
|
639
|
+
this.unsubscribeSmartServeConnectionClose?.();
|
|
640
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
641
|
+
this.smartServeRef = null;
|
|
509
642
|
}
|
|
510
643
|
}
|
|
511
644
|
// ============================================================================
|
|
@@ -583,17 +716,6 @@ export class TypedSocket {
|
|
|
583
716
|
// ============================================================================
|
|
584
717
|
// SERVER-ONLY METHODS
|
|
585
718
|
// ============================================================================
|
|
586
|
-
/**
|
|
587
|
-
* Gets or creates a connection wrapper for a peer
|
|
588
|
-
*/
|
|
589
|
-
getOrCreateWrapper(peer) {
|
|
590
|
-
let wrapper = this.smartServeConnectionWrappers.get(peer.id);
|
|
591
|
-
if (!wrapper) {
|
|
592
|
-
wrapper = wrapSmartServePeer(peer);
|
|
593
|
-
this.smartServeConnectionWrappers.set(peer.id, wrapper);
|
|
594
|
-
}
|
|
595
|
-
return wrapper;
|
|
596
|
-
}
|
|
597
719
|
/**
|
|
598
720
|
* Finds all connections matching the filter function.
|
|
599
721
|
* @server-only
|
|
@@ -604,7 +726,7 @@ export class TypedSocket {
|
|
|
604
726
|
}
|
|
605
727
|
const matchingConnections = [];
|
|
606
728
|
for (const peer of this.smartServeRef.getWebSocketConnections()) {
|
|
607
|
-
const wrapper =
|
|
729
|
+
const wrapper = wrapSmartServePeer(peer);
|
|
608
730
|
if (await asyncFindFuncArg(wrapper)) {
|
|
609
731
|
matchingConnections.push(wrapper);
|
|
610
732
|
}
|
|
@@ -630,7 +752,7 @@ export class TypedSocket {
|
|
|
630
752
|
const peers = this.smartServeRef.getWebSocketConnectionsByTag(keyArg);
|
|
631
753
|
const results = [];
|
|
632
754
|
for (const peer of peers) {
|
|
633
|
-
const wrapper =
|
|
755
|
+
const wrapper = wrapSmartServePeer(peer);
|
|
634
756
|
// If payload specified, also filter by payload
|
|
635
757
|
if (payloadArg !== undefined) {
|
|
636
758
|
const tag = await wrapper.getTagById(keyArg);
|
|
@@ -651,4 +773,4 @@ export class TypedSocket {
|
|
|
651
773
|
return allResults[0];
|
|
652
774
|
}
|
|
653
775
|
}
|
|
654
|
-
//# 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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"}
|
|
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@api.global/typedsocket",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "5.0.0",
|
|
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.2",
|
|
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/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
|
*/
|
|
@@ -149,14 +163,18 @@ export class TypedSocket {
|
|
|
149
163
|
smartServeArg: plugins.SmartServe,
|
|
150
164
|
typedRouterArg: plugins.typedrequest.TypedRouter
|
|
151
165
|
): TypedSocket {
|
|
152
|
-
const connectionWrappers = new Map<string, ISmartServeConnectionWrapper>();
|
|
153
|
-
|
|
154
166
|
// Register built-in tag handlers
|
|
155
167
|
TypedSocket.registerTagHandlers(typedRouterArg);
|
|
156
168
|
|
|
157
169
|
const typedSocket = new TypedSocket('server', typedRouterArg);
|
|
158
170
|
typedSocket.smartServeRef = smartServeArg;
|
|
159
|
-
typedSocket.
|
|
171
|
+
typedSocket.unsubscribeSmartServeConnectionClose =
|
|
172
|
+
smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
|
|
173
|
+
typedSocket.cancelPendingServerRequestsForPeer(
|
|
174
|
+
peerArg.id,
|
|
175
|
+
new Error(`TypedSocket target connection closed: ${peerArg.id}`),
|
|
176
|
+
);
|
|
177
|
+
});
|
|
160
178
|
|
|
161
179
|
return typedSocket;
|
|
162
180
|
}
|
|
@@ -229,7 +247,10 @@ export class TypedSocket {
|
|
|
229
247
|
|
|
230
248
|
// Server-specific properties (SmartServe mode)
|
|
231
249
|
private smartServeRef: plugins.SmartServe | null = null;
|
|
232
|
-
private
|
|
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>>();
|
|
233
254
|
|
|
234
255
|
// ============================================================================
|
|
235
256
|
// CONSTRUCTOR
|
|
@@ -516,12 +537,18 @@ export class TypedSocket {
|
|
|
516
537
|
* Sends a request to the server and waits for response (client-side)
|
|
517
538
|
*/
|
|
518
539
|
private async sendRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
519
|
-
request: T
|
|
540
|
+
request: T,
|
|
541
|
+
optionsArg: ITypedSocketRequestOptions = {},
|
|
520
542
|
): Promise<T> {
|
|
521
543
|
if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
|
|
522
544
|
throw new Error('WebSocket not connected');
|
|
523
545
|
}
|
|
524
546
|
|
|
547
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
548
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
549
|
+
throw new Error('TypedSocket request aborted');
|
|
550
|
+
}
|
|
551
|
+
|
|
525
552
|
request.correlation ||= {
|
|
526
553
|
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
527
554
|
phase: 'request',
|
|
@@ -529,26 +556,165 @@ export class TypedSocket {
|
|
|
529
556
|
const correlationId = request.correlation.id;
|
|
530
557
|
|
|
531
558
|
return new Promise((resolve, reject) => {
|
|
532
|
-
|
|
559
|
+
let settled = false;
|
|
560
|
+
const cleanup = () => {
|
|
561
|
+
clearTimeout(timeout);
|
|
562
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
533
563
|
this.pendingRequests.delete(correlationId);
|
|
534
|
-
|
|
535
|
-
|
|
564
|
+
};
|
|
565
|
+
const settle = (errorArg?: Error, responseArg?: T) => {
|
|
566
|
+
if (settled) {
|
|
567
|
+
return;
|
|
568
|
+
}
|
|
569
|
+
settled = true;
|
|
570
|
+
cleanup();
|
|
571
|
+
if (errorArg) {
|
|
572
|
+
reject(errorArg);
|
|
573
|
+
} else {
|
|
574
|
+
resolve(responseArg!);
|
|
575
|
+
}
|
|
576
|
+
};
|
|
577
|
+
const onAbort = () => settle(new Error('TypedSocket request aborted'));
|
|
578
|
+
const timeout = setTimeout(() => {
|
|
579
|
+
settle(new Error('TypedSocket request timed out'));
|
|
580
|
+
}, timeoutMs);
|
|
536
581
|
|
|
537
582
|
this.pendingRequests.set(correlationId, {
|
|
538
583
|
resolve: (response) => {
|
|
539
|
-
|
|
540
|
-
resolve(response);
|
|
584
|
+
settle(undefined, response as T);
|
|
541
585
|
},
|
|
542
586
|
reject: (error) => {
|
|
543
|
-
|
|
544
|
-
reject(error);
|
|
587
|
+
settle(error);
|
|
545
588
|
},
|
|
546
589
|
});
|
|
590
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
591
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
592
|
+
onAbort();
|
|
593
|
+
return;
|
|
594
|
+
}
|
|
547
595
|
|
|
548
|
-
|
|
596
|
+
try {
|
|
597
|
+
this.websocket!.send(plugins.smartjson.stringify(request));
|
|
598
|
+
} catch (error) {
|
|
599
|
+
settle(error instanceof Error ? error : new Error(String(error)));
|
|
600
|
+
}
|
|
549
601
|
});
|
|
550
602
|
}
|
|
551
603
|
|
|
604
|
+
private normalizeRequestTimeout(timeoutMsArg: number | undefined): number {
|
|
605
|
+
const timeoutMs = timeoutMsArg ?? 30000;
|
|
606
|
+
if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
|
|
607
|
+
throw new Error('TypedSocket request timeout must be a finite non-negative number');
|
|
608
|
+
}
|
|
609
|
+
return timeoutMs;
|
|
610
|
+
}
|
|
611
|
+
|
|
612
|
+
private cancelPendingServerRequestsForPeer(peerIdArg: string, errorArg: Error): void {
|
|
613
|
+
const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
|
|
614
|
+
if (!correlationIds) {
|
|
615
|
+
return;
|
|
616
|
+
}
|
|
617
|
+
for (const correlationId of Array.from(correlationIds)) {
|
|
618
|
+
this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
|
|
619
|
+
}
|
|
620
|
+
}
|
|
621
|
+
|
|
622
|
+
private async sendServerRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
623
|
+
typedRequestDataArg: T,
|
|
624
|
+
targetArg: ISmartServeConnectionWrapper,
|
|
625
|
+
optionsArg: ITypedSocketRequestOptions,
|
|
626
|
+
): Promise<T> {
|
|
627
|
+
const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
|
|
628
|
+
if (this.serverStopping || !this.smartServeRef) {
|
|
629
|
+
throw new Error('TypedSocket server stopped');
|
|
630
|
+
}
|
|
631
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
632
|
+
throw new Error('TypedSocket request aborted');
|
|
633
|
+
}
|
|
634
|
+
|
|
635
|
+
typedRequestDataArg.correlation ||= {
|
|
636
|
+
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
637
|
+
phase: 'request',
|
|
638
|
+
};
|
|
639
|
+
const correlationId = typedRequestDataArg.correlation.id;
|
|
640
|
+
const peerId = targetArg.peer.id;
|
|
641
|
+
if (this.pendingServerRequests.has(correlationId)) {
|
|
642
|
+
throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
|
|
643
|
+
}
|
|
644
|
+
const cancellation = plugins.smartpromise.defer<never>();
|
|
645
|
+
// A stop/abort may happen while InterestMap.addInterest is yielding. Attach
|
|
646
|
+
// a rejection handler immediately; Promise.race below still receives the
|
|
647
|
+
// original rejection once the interest exists.
|
|
648
|
+
void cancellation.promise.catch(() => {});
|
|
649
|
+
const cleanup = plugins.smartpromise.defer<void>();
|
|
650
|
+
let cancellationRequested = false;
|
|
651
|
+
const cancel = (errorArg: Error) => {
|
|
652
|
+
if (cancellationRequested) {
|
|
653
|
+
return;
|
|
654
|
+
}
|
|
655
|
+
cancellationRequested = true;
|
|
656
|
+
cancellation.reject(errorArg);
|
|
657
|
+
};
|
|
658
|
+
const pendingRequest: IPendingServerRequest = {
|
|
659
|
+
peerId,
|
|
660
|
+
cancel,
|
|
661
|
+
cleanupComplete: cleanup.promise,
|
|
662
|
+
};
|
|
663
|
+
this.pendingServerRequests.set(correlationId, pendingRequest);
|
|
664
|
+
const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set<string>();
|
|
665
|
+
requestsForPeer.add(correlationId);
|
|
666
|
+
this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
|
|
667
|
+
|
|
668
|
+
const onAbort = () => cancel(new Error('TypedSocket request aborted'));
|
|
669
|
+
const timeout = setTimeout(
|
|
670
|
+
() => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)),
|
|
671
|
+
timeoutMs,
|
|
672
|
+
);
|
|
673
|
+
optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
|
|
674
|
+
if (optionsArg.abortSignal?.aborted) {
|
|
675
|
+
onAbort();
|
|
676
|
+
}
|
|
677
|
+
|
|
678
|
+
let destroyInterest: (() => void) | undefined;
|
|
679
|
+
try {
|
|
680
|
+
const interest = await this.typedrouter.fireEventInterestMap.addInterest(
|
|
681
|
+
correlationId,
|
|
682
|
+
typedRequestDataArg,
|
|
683
|
+
);
|
|
684
|
+
destroyInterest = () => interest.destroy();
|
|
685
|
+
// Establish the rejecting race before send so synchronous close/abort and
|
|
686
|
+
// send failures all use the same cleanup path.
|
|
687
|
+
const response = Promise.race([
|
|
688
|
+
interest.interestFullfilled as Promise<T>,
|
|
689
|
+
cancellation.promise,
|
|
690
|
+
]);
|
|
691
|
+
const targetIsStillConnected = this.smartServeRef
|
|
692
|
+
?.getWebSocketConnections()
|
|
693
|
+
.some((peerArg) => peerArg.id === peerId) ?? false;
|
|
694
|
+
if (!targetIsStillConnected) {
|
|
695
|
+
cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
|
|
696
|
+
}
|
|
697
|
+
if (this.serverStopping) {
|
|
698
|
+
cancel(new Error('TypedSocket server stopped'));
|
|
699
|
+
}
|
|
700
|
+
if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
|
|
701
|
+
targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
|
|
702
|
+
}
|
|
703
|
+
return await response;
|
|
704
|
+
} finally {
|
|
705
|
+
clearTimeout(timeout);
|
|
706
|
+
optionsArg.abortSignal?.removeEventListener('abort', onAbort);
|
|
707
|
+
this.pendingServerRequests.delete(correlationId);
|
|
708
|
+
const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
|
|
709
|
+
remainingRequestsForPeer?.delete(correlationId);
|
|
710
|
+
if (remainingRequestsForPeer?.size === 0) {
|
|
711
|
+
this.pendingServerRequestIdsByPeerId.delete(peerId);
|
|
712
|
+
}
|
|
713
|
+
destroyInterest?.();
|
|
714
|
+
cleanup.resolve();
|
|
715
|
+
}
|
|
716
|
+
}
|
|
717
|
+
|
|
552
718
|
// ============================================================================
|
|
553
719
|
// PUBLIC API - SHARED
|
|
554
720
|
// ============================================================================
|
|
@@ -560,14 +726,15 @@ export class TypedSocket {
|
|
|
560
726
|
*/
|
|
561
727
|
public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
|
|
562
728
|
methodName: T['method'],
|
|
563
|
-
targetConnection?: ISmartServeConnectionWrapper
|
|
729
|
+
targetConnection?: ISmartServeConnectionWrapper,
|
|
730
|
+
optionsArg: ITypedSocketRequestOptions = {},
|
|
564
731
|
): plugins.typedrequest.TypedRequest<T> {
|
|
565
732
|
const postMethod = async (
|
|
566
733
|
requestDataArg: plugins.typedrequestInterfaces.ITypedRequest,
|
|
567
734
|
): Promise<plugins.typedrequestInterfaces.ITypedRequest> => {
|
|
568
735
|
const typedRequestData = requestDataArg as T;
|
|
569
736
|
if (this.side === 'client') {
|
|
570
|
-
return this.sendRequest(typedRequestData);
|
|
737
|
+
return this.sendRequest(typedRequestData, optionsArg);
|
|
571
738
|
}
|
|
572
739
|
|
|
573
740
|
// Server-side: send to target connection
|
|
@@ -580,7 +747,7 @@ export class TypedSocket {
|
|
|
580
747
|
const allConnections = this.smartServeRef.getWebSocketConnections();
|
|
581
748
|
if (allConnections.length === 1) {
|
|
582
749
|
const peer = allConnections[0];
|
|
583
|
-
target =
|
|
750
|
+
target = wrapSmartServePeer(peer);
|
|
584
751
|
} else if (allConnections.length === 0) {
|
|
585
752
|
throw new Error('No WebSocket connections available');
|
|
586
753
|
} else {
|
|
@@ -588,22 +755,7 @@ export class TypedSocket {
|
|
|
588
755
|
}
|
|
589
756
|
}
|
|
590
757
|
|
|
591
|
-
typedRequestData
|
|
592
|
-
id: plugins.smartstring.create.createCryptoRandomString(),
|
|
593
|
-
phase: 'request',
|
|
594
|
-
};
|
|
595
|
-
|
|
596
|
-
// Register interest for response
|
|
597
|
-
const interest = await this.typedrouter.fireEventInterestMap.addInterest(
|
|
598
|
-
typedRequestData.correlation.id,
|
|
599
|
-
typedRequestData,
|
|
600
|
-
);
|
|
601
|
-
|
|
602
|
-
// Send request
|
|
603
|
-
target.peer.send(plugins.smartjson.stringify(typedRequestData));
|
|
604
|
-
|
|
605
|
-
// Wait for response
|
|
606
|
-
return await interest.interestFullfilled as T;
|
|
758
|
+
return await this.sendServerRequest(typedRequestData, target, optionsArg);
|
|
607
759
|
};
|
|
608
760
|
|
|
609
761
|
return new plugins.typedrequest.TypedRequest<T>(
|
|
@@ -645,8 +797,15 @@ export class TypedSocket {
|
|
|
645
797
|
}
|
|
646
798
|
this.pendingRequests.clear();
|
|
647
799
|
} else {
|
|
648
|
-
|
|
649
|
-
this.
|
|
800
|
+
this.serverStopping = true;
|
|
801
|
+
const pendingRequests = Array.from(this.pendingServerRequests.values());
|
|
802
|
+
for (const pendingRequest of pendingRequests) {
|
|
803
|
+
pendingRequest.cancel(new Error('TypedSocket server stopped'));
|
|
804
|
+
}
|
|
805
|
+
await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
|
|
806
|
+
this.unsubscribeSmartServeConnectionClose?.();
|
|
807
|
+
this.unsubscribeSmartServeConnectionClose = null;
|
|
808
|
+
this.smartServeRef = null;
|
|
650
809
|
}
|
|
651
810
|
}
|
|
652
811
|
|
|
@@ -734,18 +893,6 @@ export class TypedSocket {
|
|
|
734
893
|
// SERVER-ONLY METHODS
|
|
735
894
|
// ============================================================================
|
|
736
895
|
|
|
737
|
-
/**
|
|
738
|
-
* Gets or creates a connection wrapper for a peer
|
|
739
|
-
*/
|
|
740
|
-
private getOrCreateWrapper(peer: plugins.IWebSocketPeer): ISmartServeConnectionWrapper {
|
|
741
|
-
let wrapper = this.smartServeConnectionWrappers.get(peer.id);
|
|
742
|
-
if (!wrapper) {
|
|
743
|
-
wrapper = wrapSmartServePeer(peer);
|
|
744
|
-
this.smartServeConnectionWrappers.set(peer.id, wrapper);
|
|
745
|
-
}
|
|
746
|
-
return wrapper;
|
|
747
|
-
}
|
|
748
|
-
|
|
749
896
|
/**
|
|
750
897
|
* Finds all connections matching the filter function.
|
|
751
898
|
* @server-only
|
|
@@ -759,7 +906,7 @@ export class TypedSocket {
|
|
|
759
906
|
|
|
760
907
|
const matchingConnections: ISmartServeConnectionWrapper[] = [];
|
|
761
908
|
for (const peer of this.smartServeRef.getWebSocketConnections()) {
|
|
762
|
-
const wrapper =
|
|
909
|
+
const wrapper = wrapSmartServePeer(peer);
|
|
763
910
|
if (await asyncFindFuncArg(wrapper)) {
|
|
764
911
|
matchingConnections.push(wrapper);
|
|
765
912
|
}
|
|
@@ -794,7 +941,7 @@ export class TypedSocket {
|
|
|
794
941
|
const results: ISmartServeConnectionWrapper[] = [];
|
|
795
942
|
|
|
796
943
|
for (const peer of peers) {
|
|
797
|
-
const wrapper =
|
|
944
|
+
const wrapper = wrapSmartServePeer(peer);
|
|
798
945
|
|
|
799
946
|
// If payload specified, also filter by payload
|
|
800
947
|
if (payloadArg !== undefined) {
|