@api.global/typedsocket 4.2.5 → 5.0.0

package/dist_ts/00_commitinfo_data.js

@@ -3,7 +3,7 @@
  */
 export const commitinfo = {
     name: '@api.global/typedsocket',
-    version: '4.2.5',
+    version: '5.0.0',
     description: 'A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.'
 };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx5QkFBeUI7SUFDL0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLCtHQUErRztDQUM3SCxDQUFBIn0=

package/dist_ts/typedsocket.classes.typedsocket.d.ts

@@ -11,6 +11,13 @@ export interface ITypedSocketClientOptions {
     maxBackoffMs?: number;
     abortSignal?: AbortSignal;
 }
+/**
+ * Lifecycle controls for one TypedRequest sent over a TypedSocket.
+ */
+export interface ITypedSocketRequestOptions {
+    timeoutMs?: number;
+    abortSignal?: AbortSignal;
+}
 /**
  * Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
  */
@@ -88,6 +95,10 @@ export declare class TypedSocket {
     private clientTags;
     private clientTagMutations;
     private smartServeRef;
+    private serverStopping;
+    private unsubscribeSmartServeConnectionClose;
+    private pendingServerRequests;
+    private pendingServerRequestIdsByPeerId;
     private constructor();
     /**
      * Connects the client to the server using native WebSocket
@@ -130,12 +141,15 @@ export declare class TypedSocket {
      * Sends a request to the server and waits for response (client-side)
      */
     private sendRequest;
+    private normalizeRequestTimeout;
+    private cancelPendingServerRequestsForPeer;
+    private sendServerRequest;
     /**
      * Creates a TypedRequest for the specified method.
      * On clients, sends to the server.
      * On servers, sends to the specified target connection.
      */
-    createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper): plugins.typedrequest.TypedRequest<T>;
+    createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: ISmartServeConnectionWrapper, optionsArg?: ITypedSocketRequestOptions): plugins.typedrequest.TypedRequest<T>;
     /**
      * Gets the current connection status
      */

package/dist_ts/typedsocket.classes.typedsocket.js

@@ -100,6 +100,10 @@ export class TypedSocket {
         TypedSocket.registerTagHandlers(typedRouterArg);
         const typedSocket = new TypedSocket('server', typedRouterArg);
         typedSocket.smartServeRef = smartServeArg;
+        typedSocket.unsubscribeSmartServeConnectionClose =
+            smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
+                typedSocket.cancelPendingServerRequestsForPeer(peerArg.id, new Error(`TypedSocket target connection closed: ${peerArg.id}`));
+            });
         return typedSocket;
     }
     /**
@@ -151,6 +155,10 @@ export class TypedSocket {
         this.clientTagMutations = new Map();
         // Server-specific properties (SmartServe mode)
         this.smartServeRef = null;
+        this.serverStopping = false;
+        this.unsubscribeSmartServeConnectionClose = null;
+        this.pendingServerRequests = new Map();
+        this.pendingServerRequestIdsByPeerId = new Map();
         this.side = sideArg;
         this.typedrouter = typedrouterArg;
     }
@@ -396,33 +404,163 @@ export class TypedSocket {
     /**
      * Sends a request to the server and waits for response (client-side)
      */
-    async sendRequest(request) {
+    async sendRequest(request, optionsArg = {}) {
         if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
             throw new Error('WebSocket not connected');
         }
+        const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
+        if (optionsArg.abortSignal?.aborted) {
+            throw new Error('TypedSocket request aborted');
+        }
         request.correlation ||= {
             id: plugins.smartstring.create.createCryptoRandomString(),
             phase: 'request',
         };
         const correlationId = request.correlation.id;
         return new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
+            let settled = false;
+            const cleanup = () => {
+                clearTimeout(timeout);
+                optionsArg.abortSignal?.removeEventListener('abort', onAbort);
                 this.pendingRequests.delete(correlationId);
-                reject(new Error('Request timeout'));
-            }, 30000);
+            };
+            const settle = (errorArg, responseArg) => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                cleanup();
+                if (errorArg) {
+                    reject(errorArg);
+                }
+                else {
+                    resolve(responseArg);
+                }
+            };
+            const onAbort = () => settle(new Error('TypedSocket request aborted'));
+            const timeout = setTimeout(() => {
+                settle(new Error('TypedSocket request timed out'));
+            }, timeoutMs);
             this.pendingRequests.set(correlationId, {
                 resolve: (response) => {
-                    clearTimeout(timeout);
-                    resolve(response);
+                    settle(undefined, response);
                 },
                 reject: (error) => {
-                    clearTimeout(timeout);
-                    reject(error);
+                    settle(error);
                 },
             });
-            this.websocket.send(plugins.smartjson.stringify(request));
+            optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
+            if (optionsArg.abortSignal?.aborted) {
+                onAbort();
+                return;
+            }
+            try {
+                this.websocket.send(plugins.smartjson.stringify(request));
+            }
+            catch (error) {
+                settle(error instanceof Error ? error : new Error(String(error)));
+            }
         });
     }
+    normalizeRequestTimeout(timeoutMsArg) {
+        const timeoutMs = timeoutMsArg ?? 30000;
+        if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
+            throw new Error('TypedSocket request timeout must be a finite non-negative number');
+        }
+        return timeoutMs;
+    }
+    cancelPendingServerRequestsForPeer(peerIdArg, errorArg) {
+        const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
+        if (!correlationIds) {
+            return;
+        }
+        for (const correlationId of Array.from(correlationIds)) {
+            this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
+        }
+    }
+    async sendServerRequest(typedRequestDataArg, targetArg, optionsArg) {
+        const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
+        if (this.serverStopping || !this.smartServeRef) {
+            throw new Error('TypedSocket server stopped');
+        }
+        if (optionsArg.abortSignal?.aborted) {
+            throw new Error('TypedSocket request aborted');
+        }
+        typedRequestDataArg.correlation ||= {
+            id: plugins.smartstring.create.createCryptoRandomString(),
+            phase: 'request',
+        };
+        const correlationId = typedRequestDataArg.correlation.id;
+        const peerId = targetArg.peer.id;
+        if (this.pendingServerRequests.has(correlationId)) {
+            throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
+        }
+        const cancellation = plugins.smartpromise.defer();
+        // A stop/abort may happen while InterestMap.addInterest is yielding. Attach
+        // a rejection handler immediately; Promise.race below still receives the
+        // original rejection once the interest exists.
+        void cancellation.promise.catch(() => { });
+        const cleanup = plugins.smartpromise.defer();
+        let cancellationRequested = false;
+        const cancel = (errorArg) => {
+            if (cancellationRequested) {
+                return;
+            }
+            cancellationRequested = true;
+            cancellation.reject(errorArg);
+        };
+        const pendingRequest = {
+            peerId,
+            cancel,
+            cleanupComplete: cleanup.promise,
+        };
+        this.pendingServerRequests.set(correlationId, pendingRequest);
+        const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set();
+        requestsForPeer.add(correlationId);
+        this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
+        const onAbort = () => cancel(new Error('TypedSocket request aborted'));
+        const timeout = setTimeout(() => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)), timeoutMs);
+        optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
+        if (optionsArg.abortSignal?.aborted) {
+            onAbort();
+        }
+        let destroyInterest;
+        try {
+            const interest = await this.typedrouter.fireEventInterestMap.addInterest(correlationId, typedRequestDataArg);
+            destroyInterest = () => interest.destroy();
+            // Establish the rejecting race before send so synchronous close/abort and
+            // send failures all use the same cleanup path.
+            const response = Promise.race([
+                interest.interestFullfilled,
+                cancellation.promise,
+            ]);
+            const targetIsStillConnected = this.smartServeRef
+                ?.getWebSocketConnections()
+                .some((peerArg) => peerArg.id === peerId) ?? false;
+            if (!targetIsStillConnected) {
+                cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
+            }
+            if (this.serverStopping) {
+                cancel(new Error('TypedSocket server stopped'));
+            }
+            if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
+                targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
+            }
+            return await response;
+        }
+        finally {
+            clearTimeout(timeout);
+            optionsArg.abortSignal?.removeEventListener('abort', onAbort);
+            this.pendingServerRequests.delete(correlationId);
+            const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
+            remainingRequestsForPeer?.delete(correlationId);
+            if (remainingRequestsForPeer?.size === 0) {
+                this.pendingServerRequestIdsByPeerId.delete(peerId);
+            }
+            destroyInterest?.();
+            cleanup.resolve();
+        }
+    }
     // ============================================================================
     // PUBLIC API - SHARED
     // ============================================================================
@@ -431,11 +569,11 @@ export class TypedSocket {
      * On clients, sends to the server.
      * On servers, sends to the specified target connection.
      */
-    createTypedRequest(methodName, targetConnection) {
+    createTypedRequest(methodName, targetConnection, optionsArg = {}) {
         const postMethod = async (requestDataArg) => {
             const typedRequestData = requestDataArg;
             if (this.side === 'client') {
-                return this.sendRequest(typedRequestData);
+                return this.sendRequest(typedRequestData, optionsArg);
             }
             // Server-side: send to target connection
             if (!this.smartServeRef) {
@@ -455,16 +593,7 @@ export class TypedSocket {
                     throw new Error('Multiple connections available - specify targetConnection');
                 }
             }
-            typedRequestData.correlation ||= {
-                id: plugins.smartstring.create.createCryptoRandomString(),
-                phase: 'request',
-            };
-            // Register interest for response
-            const interest = await this.typedrouter.fireEventInterestMap.addInterest(typedRequestData.correlation.id, typedRequestData);
-            // Send request
-            target.peer.send(plugins.smartjson.stringify(typedRequestData));
-            // Wait for response
-            return await interest.interestFullfilled;
+            return await this.sendServerRequest(typedRequestData, target, optionsArg);
         };
         return new plugins.typedrequest.TypedRequest(new plugins.typedrequest.TypedTarget({ postMethod }), methodName);
     }
@@ -501,6 +630,14 @@ export class TypedSocket {
             this.pendingRequests.clear();
         }
         else {
+            this.serverStopping = true;
+            const pendingRequests = Array.from(this.pendingServerRequests.values());
+            for (const pendingRequest of pendingRequests) {
+                pendingRequest.cancel(new Error('TypedSocket server stopped'));
+            }
+            await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
+            this.unsubscribeSmartServeConnectionClose?.();
+            this.unsubscribeSmartServeConnectionClose = null;
             this.smartServeRef = null;
         }
     }
@@ -636,4 +773,4 @@ export class TypedSocket {
         return allResults[0];
     }
 }
-//# 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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"}
+//# 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

@@ -1,6 +1,6 @@
 {
   "name": "@api.global/typedsocket",
-  "version": "4.2.5",
+  "version": "5.0.0",
   "private": false,
   "description": "A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.",
   "main": "dist_ts/index.js",
@@ -10,25 +10,25 @@
   "license": "MIT",
   "devDependencies": {
     "@git.zone/tsbuild": "^4.4.2",
-    "@git.zone/tsbundle": "^2.11.0",
+    "@git.zone/tsbundle": "^2.11.2",
     "@git.zone/tsrun": "^2.0.5",
     "@git.zone/tstest": "^3.6.6",
-    "@push.rocks/smartenv": "^6.0.0",
-    "@push.rocks/smartserve": "^2.2.0",
-    "@types/node": "26.1.0"
+    "@push.rocks/smartenv": "^6.1.0",
+    "@push.rocks/smartserve": "^2.3.0",
+    "@types/node": "26.1.1"
   },
   "dependencies": {
     "@api.global/typedrequest": "^3.3.2",
     "@api.global/typedrequest-interfaces": "^3.0.19",
-    "@push.rocks/smartdelay": "^3.0.5",
+    "@push.rocks/smartdelay": "^3.1.0",
     "@push.rocks/smartjson": "^6.0.1",
-    "@push.rocks/smartpromise": "^4.2.3",
-    "@push.rocks/smartrx": "^3.0.10",
+    "@push.rocks/smartpromise": "^4.2.4",
+    "@push.rocks/smartrx": "^3.0.12",
     "@push.rocks/smartstring": "^4.1.1",
     "@push.rocks/smarturl": "^3.1.0"
   },
   "peerDependencies": {
-    "@push.rocks/smartserve": ">=1.1.0"
+    "@push.rocks/smartserve": ">=2.3.0"
   },
   "browserslist": [
     "last 1 chrome versions"

package/ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@api.global/typedsocket',
-  version: '4.2.5',
+  version: '5.0.0',
   description: 'A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.'
 }

package/ts/typedsocket.classes.typedsocket.ts

@@ -31,6 +31,20 @@ export interface ITypedSocketClientOptions {
   abortSignal?: AbortSignal;
 }
 
+/**
+ * Lifecycle controls for one TypedRequest sent over a TypedSocket.
+ */
+export interface ITypedSocketRequestOptions {
+  timeoutMs?: number;
+  abortSignal?: AbortSignal;
+}
+
+interface IPendingServerRequest {
+  peerId: string;
+  cancel: (errorArg: Error) => void;
+  cleanupComplete: Promise<void>;
+}
+
 /**
  * Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
  */
@@ -154,6 +168,13 @@ export class TypedSocket {
 
     const typedSocket = new TypedSocket('server', typedRouterArg);
     typedSocket.smartServeRef = smartServeArg;
+    typedSocket.unsubscribeSmartServeConnectionClose =
+      smartServeArg.subscribeWebSocketConnectionClose((peerArg) => {
+        typedSocket.cancelPendingServerRequestsForPeer(
+          peerArg.id,
+          new Error(`TypedSocket target connection closed: ${peerArg.id}`),
+        );
+      });
 
     return typedSocket;
   }
@@ -226,6 +247,10 @@ export class TypedSocket {
 
   // Server-specific properties (SmartServe mode)
   private smartServeRef: plugins.SmartServe | null = null;
+  private serverStopping = false;
+  private unsubscribeSmartServeConnectionClose: (() => void) | null = null;
+  private pendingServerRequests = new Map<string, IPendingServerRequest>();
+  private pendingServerRequestIdsByPeerId = new Map<string, Set<string>>();
 
   // ============================================================================
   // CONSTRUCTOR
@@ -512,12 +537,18 @@ export class TypedSocket {
    * Sends a request to the server and waits for response (client-side)
    */
   private async sendRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
-    request: T
+    request: T,
+    optionsArg: ITypedSocketRequestOptions = {},
   ): Promise<T> {
     if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
       throw new Error('WebSocket not connected');
     }
 
+    const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
+    if (optionsArg.abortSignal?.aborted) {
+      throw new Error('TypedSocket request aborted');
+    }
+
     request.correlation ||= {
       id: plugins.smartstring.create.createCryptoRandomString(),
       phase: 'request',
@@ -525,26 +556,165 @@ export class TypedSocket {
     const correlationId = request.correlation.id;
 
     return new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => {
+      let settled = false;
+      const cleanup = () => {
+        clearTimeout(timeout);
+        optionsArg.abortSignal?.removeEventListener('abort', onAbort);
         this.pendingRequests.delete(correlationId);
-        reject(new Error('Request timeout'));
-      }, 30000);
+      };
+      const settle = (errorArg?: Error, responseArg?: T) => {
+        if (settled) {
+          return;
+        }
+        settled = true;
+        cleanup();
+        if (errorArg) {
+          reject(errorArg);
+        } else {
+          resolve(responseArg!);
+        }
+      };
+      const onAbort = () => settle(new Error('TypedSocket request aborted'));
+      const timeout = setTimeout(() => {
+        settle(new Error('TypedSocket request timed out'));
+      }, timeoutMs);
 
       this.pendingRequests.set(correlationId, {
         resolve: (response) => {
-          clearTimeout(timeout);
-          resolve(response);
+          settle(undefined, response as T);
         },
         reject: (error) => {
-          clearTimeout(timeout);
-          reject(error);
+          settle(error);
         },
       });
+      optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
+      if (optionsArg.abortSignal?.aborted) {
+        onAbort();
+        return;
+      }
 
-      this.websocket!.send(plugins.smartjson.stringify(request));
+      try {
+        this.websocket!.send(plugins.smartjson.stringify(request));
+      } catch (error) {
+        settle(error instanceof Error ? error : new Error(String(error)));
+      }
     });
   }
 
+  private normalizeRequestTimeout(timeoutMsArg: number | undefined): number {
+    const timeoutMs = timeoutMsArg ?? 30000;
+    if (!Number.isFinite(timeoutMs) || timeoutMs < 0) {
+      throw new Error('TypedSocket request timeout must be a finite non-negative number');
+    }
+    return timeoutMs;
+  }
+
+  private cancelPendingServerRequestsForPeer(peerIdArg: string, errorArg: Error): void {
+    const correlationIds = this.pendingServerRequestIdsByPeerId.get(peerIdArg);
+    if (!correlationIds) {
+      return;
+    }
+    for (const correlationId of Array.from(correlationIds)) {
+      this.pendingServerRequests.get(correlationId)?.cancel(errorArg);
+    }
+  }
+
+  private async sendServerRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
+    typedRequestDataArg: T,
+    targetArg: ISmartServeConnectionWrapper,
+    optionsArg: ITypedSocketRequestOptions,
+  ): Promise<T> {
+    const timeoutMs = this.normalizeRequestTimeout(optionsArg.timeoutMs);
+    if (this.serverStopping || !this.smartServeRef) {
+      throw new Error('TypedSocket server stopped');
+    }
+    if (optionsArg.abortSignal?.aborted) {
+      throw new Error('TypedSocket request aborted');
+    }
+
+    typedRequestDataArg.correlation ||= {
+      id: plugins.smartstring.create.createCryptoRandomString(),
+      phase: 'request',
+    };
+    const correlationId = typedRequestDataArg.correlation.id;
+    const peerId = targetArg.peer.id;
+    if (this.pendingServerRequests.has(correlationId)) {
+      throw new Error(`Duplicate in-flight TypedSocket correlation ID: ${correlationId}`);
+    }
+    const cancellation = plugins.smartpromise.defer<never>();
+    // A stop/abort may happen while InterestMap.addInterest is yielding. Attach
+    // a rejection handler immediately; Promise.race below still receives the
+    // original rejection once the interest exists.
+    void cancellation.promise.catch(() => {});
+    const cleanup = plugins.smartpromise.defer<void>();
+    let cancellationRequested = false;
+    const cancel = (errorArg: Error) => {
+      if (cancellationRequested) {
+        return;
+      }
+      cancellationRequested = true;
+      cancellation.reject(errorArg);
+    };
+    const pendingRequest: IPendingServerRequest = {
+      peerId,
+      cancel,
+      cleanupComplete: cleanup.promise,
+    };
+    this.pendingServerRequests.set(correlationId, pendingRequest);
+    const requestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId) ?? new Set<string>();
+    requestsForPeer.add(correlationId);
+    this.pendingServerRequestIdsByPeerId.set(peerId, requestsForPeer);
+
+    const onAbort = () => cancel(new Error('TypedSocket request aborted'));
+    const timeout = setTimeout(
+      () => cancel(new Error(`TypedSocket request timed out after ${timeoutMs}ms`)),
+      timeoutMs,
+    );
+    optionsArg.abortSignal?.addEventListener('abort', onAbort, { once: true });
+    if (optionsArg.abortSignal?.aborted) {
+      onAbort();
+    }
+
+    let destroyInterest: (() => void) | undefined;
+    try {
+      const interest = await this.typedrouter.fireEventInterestMap.addInterest(
+        correlationId,
+        typedRequestDataArg,
+      );
+      destroyInterest = () => interest.destroy();
+      // Establish the rejecting race before send so synchronous close/abort and
+      // send failures all use the same cleanup path.
+      const response = Promise.race([
+        interest.interestFullfilled as Promise<T>,
+        cancellation.promise,
+      ]);
+      const targetIsStillConnected = this.smartServeRef
+        ?.getWebSocketConnections()
+        .some((peerArg) => peerArg.id === peerId) ?? false;
+      if (!targetIsStillConnected) {
+        cancel(new Error(`TypedSocket target connection closed: ${peerId}`));
+      }
+      if (this.serverStopping) {
+        cancel(new Error('TypedSocket server stopped'));
+      }
+      if (!cancellationRequested && targetIsStillConnected && !this.serverStopping) {
+        targetArg.peer.send(plugins.smartjson.stringify(typedRequestDataArg));
+      }
+      return await response;
+    } finally {
+      clearTimeout(timeout);
+      optionsArg.abortSignal?.removeEventListener('abort', onAbort);
+      this.pendingServerRequests.delete(correlationId);
+      const remainingRequestsForPeer = this.pendingServerRequestIdsByPeerId.get(peerId);
+      remainingRequestsForPeer?.delete(correlationId);
+      if (remainingRequestsForPeer?.size === 0) {
+        this.pendingServerRequestIdsByPeerId.delete(peerId);
+      }
+      destroyInterest?.();
+      cleanup.resolve();
+    }
+  }
+
   // ============================================================================
   // PUBLIC API - SHARED
   // ============================================================================
@@ -556,14 +726,15 @@ export class TypedSocket {
    */
   public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
     methodName: T['method'],
-    targetConnection?: ISmartServeConnectionWrapper
+    targetConnection?: ISmartServeConnectionWrapper,
+    optionsArg: ITypedSocketRequestOptions = {},
   ): plugins.typedrequest.TypedRequest<T> {
     const postMethod = async (
       requestDataArg: plugins.typedrequestInterfaces.ITypedRequest,
     ): Promise<plugins.typedrequestInterfaces.ITypedRequest> => {
       const typedRequestData = requestDataArg as T;
       if (this.side === 'client') {
-        return this.sendRequest(typedRequestData);
+        return this.sendRequest(typedRequestData, optionsArg);
       }
 
       // Server-side: send to target connection
@@ -584,22 +755,7 @@ export class TypedSocket {
         }
       }
 
-      typedRequestData.correlation ||= {
-        id: plugins.smartstring.create.createCryptoRandomString(),
-        phase: 'request',
-      };
-
-      // Register interest for response
-      const interest = await this.typedrouter.fireEventInterestMap.addInterest(
-        typedRequestData.correlation.id,
-        typedRequestData,
-      );
-
-      // Send request
-      target.peer.send(plugins.smartjson.stringify(typedRequestData));
-
-      // Wait for response
-      return await interest.interestFullfilled as T;
+      return await this.sendServerRequest(typedRequestData, target, optionsArg);
     };
 
     return new plugins.typedrequest.TypedRequest<T>(
@@ -641,6 +797,14 @@ export class TypedSocket {
       }
       this.pendingRequests.clear();
     } else {
+      this.serverStopping = true;
+      const pendingRequests = Array.from(this.pendingServerRequests.values());
+      for (const pendingRequest of pendingRequests) {
+        pendingRequest.cancel(new Error('TypedSocket server stopped'));
+      }
+      await Promise.all(pendingRequests.map((pendingRequest) => pendingRequest.cleanupComplete));
+      this.unsubscribeSmartServeConnectionClose?.();
+      this.unsubscribeSmartServeConnectionClose = null;
       this.smartServeRef = null;
     }
   }