@api.global/typedsocket 3.0.1 → 4.0.0

package/dist_ts/00_commitinfo_data.d.ts

@@ -1,5 +1,5 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export declare const commitinfo: {
     name: string;

package/dist_ts/00_commitinfo_data.js

@@ -1,9 +1,9 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
     name: '@api.global/typedsocket',
-    version: '3.0.1',
+    version: '4.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

@@ -1,34 +1,81 @@
 import * as plugins from './typedsocket.plugins.js';
 export type TTypedSocketSide = 'server' | 'client';
+/**
+ * Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
+ * SmartServe uses Set<string> for tags, while TypedSocket uses {id, payload} format
+ */
+export interface ISmartServeConnectionWrapper {
+    peer: plugins.IWebSocketPeer;
+    getTagById(tagId: string): Promise<{
+        id: string;
+        payload: any;
+    } | undefined>;
+}
 export declare class TypedSocket {
     /**
      * creates a typedsocket server
      * note: this will fail in browser environments as server libs are not bundled.
      */
-    static createServer(typedrouterArg: plugins.typedrequest.TypedRouter, smartexpressServerArg?: any): Promise<TypedSocket>;
+    static createServer(typedrouterArg: plugins.typedrequest.TypedRouter): Promise<TypedSocket>;
     static createClient(typedrouterArg: plugins.typedrequest.TypedRouter, serverUrlArg: string, aliasArg?: string): Promise<TypedSocket>;
     static useWindowLocationOriginUrl: () => string;
+    /**
+     * Creates a TypedSocket server from an existing SmartServe instance.
+     * Use this when you want TypedSocket to work with SmartServe's WebSocket handling.
+     *
+     * @param smartServeArg - SmartServe instance with typedRouter configured in websocket options
+     * @param typedRouterArg - TypedRouter for handling requests (must match SmartServe's typedRouter)
+     *
+     * @example
+     * ```typescript
+     * const typedRouter = new TypedRouter();
+     * const smartServe = new SmartServe({
+     *   port: 3000,
+     *   websocket: {
+     *     typedRouter,
+     *     onConnectionOpen: (peer) => peer.tags.add('client')
+     *   }
+     * });
+     * await smartServe.start();
+     * const typedSocket = TypedSocket.fromSmartServe(smartServe, typedRouter);
+     * ```
+     */
+    static fromSmartServe(smartServeArg: plugins.SmartServe, typedRouterArg: plugins.typedrequest.TypedRouter): TypedSocket;
     side: TTypedSocketSide;
     typedrouter: plugins.typedrequest.TypedRouter;
+    private smartServeRef?;
+    private smartServeConnectionWrappers;
     get eventSubject(): plugins.smartrx.rxjs.Subject<plugins.smartsocket.TConnectionStatus>;
     private postMethod;
     private socketServerOrClient;
     constructor(sideArg: TTypedSocketSide, typedrouterArg: plugins.typedrequest.TypedRouter, postMethodArg: plugins.typedrequest.IPostMethod, socketServerOrClientArg: plugins.smartsocket.Smartsocket | plugins.smartsocket.SmartsocketClient);
     addTag<T extends plugins.typedrequestInterfaces.ITag = any>(nameArg: T['name'], payloadArg: T['payload']): void;
-    createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: plugins.smartsocket.SocketConnection): plugins.typedrequest.TypedRequest<T>;
+    createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(methodName: T['method'], targetConnection?: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper): plugins.typedrequest.TypedRequest<T>;
     /**
-     * returns all matching target connection
-     * @param asyncFindFuncArg
-     * @returns
+     * returns all matching target connections
+     * Works with both Smartsocket and SmartServe backends
+     * @param asyncFindFuncArg - async filter function
+     * @returns array of matching connections
      */
-    findAllTargetConnections(asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>): Promise<plugins.smartsocket.SocketConnection[]>;
+    findAllTargetConnections(asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper) => Promise<boolean>): Promise<(plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper)[]>;
     /**
      * returns a single target connection by returning the first one of all matching ones
      * @param asyncFindFuncArg
      * @returns
      */
-    findTargetConnection(asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>): Promise<plugins.smartsocket.SocketConnection>;
-    findAllTargetConnectionsByTag<TTag extends plugins.typedrequestInterfaces.ITag = any>(keyArg: TTag['name'], payloadArg?: TTag['payload']): Promise<plugins.smartsocket.SocketConnection[]>;
-    findTargetConnectionByTag<TTag extends plugins.typedrequestInterfaces.ITag = any>(keyArg: TTag['name'], payloadArg?: TTag['payload']): Promise<plugins.smartsocket.SocketConnection>;
+    findTargetConnection(asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper) => Promise<boolean>): Promise<plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper | undefined>;
+    /**
+     * Find all connections that have a specific tag
+     * Works with both Smartsocket and SmartServe backends
+     */
+    findAllTargetConnectionsByTag<TTag extends plugins.typedrequestInterfaces.ITag = any>(keyArg: TTag['name'], payloadArg?: TTag['payload']): Promise<(plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper)[]>;
+    /**
+     * Find a single connection by tag
+     */
+    findTargetConnectionByTag<TTag extends plugins.typedrequestInterfaces.ITag = any>(keyArg: TTag['name'], payloadArg?: TTag['payload']): Promise<plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper | undefined>;
+    /**
+     * Stop the TypedSocket server/client
+     * Note: In SmartServe mode, SmartServe manages its own lifecycle
+     */
     stop(): Promise<void>;
 }

package/dist_ts/typedsocket.classes.typedsocket.js

@@ -1,20 +1,33 @@
 import * as plugins from './typedsocket.plugins.js';
 const publicRoleName = 'publicRoleName';
 const publicRolePass = 'publicRolePass';
+/**
+ * Creates a wrapper around IWebSocketPeer for tag compatibility
+ */
+function wrapSmartServePeer(peer) {
+    const TAG_PREFIX = '__typedsocket_tag__';
+    return {
+        peer,
+        async getTagById(tagId) {
+            if (!peer.tags.has(tagId)) {
+                return undefined;
+            }
+            const payload = peer.data.get(`${TAG_PREFIX}${tagId}`);
+            return { id: tagId, payload };
+        },
+    };
+}
 export class TypedSocket {
     // STATIC
     /**
      * creates a typedsocket server
      * note: this will fail in browser environments as server libs are not bundled.
      */
-    static async createServer(typedrouterArg, smartexpressServerArg) {
+    static async createServer(typedrouterArg) {
         const smartsocketServer = new plugins.smartsocket.Smartsocket({
             alias: 'typedsocketServer',
             port: 3000,
         });
-        if (smartexpressServerArg) {
-            smartsocketServer.setExternalServer('smartexpress', smartexpressServerArg);
-        }
         smartsocketServer.socketFunctions.add(new plugins.smartsocket.SocketFunction({
             funcName: 'processMessage',
             funcDef: async (dataArg, socketConnectionArg) => {
@@ -68,10 +81,75 @@ export class TypedSocket {
         const windowLocationResult = plugins.smarturl.Smarturl.createFromUrl(globalThis.location.origin).toString();
         return windowLocationResult;
     }; }
+    /**
+     * Creates a TypedSocket server from an existing SmartServe instance.
+     * Use this when you want TypedSocket to work with SmartServe's WebSocket handling.
+     *
+     * @param smartServeArg - SmartServe instance with typedRouter configured in websocket options
+     * @param typedRouterArg - TypedRouter for handling requests (must match SmartServe's typedRouter)
+     *
+     * @example
+     * ```typescript
+     * const typedRouter = new TypedRouter();
+     * const smartServe = new SmartServe({
+     *   port: 3000,
+     *   websocket: {
+     *     typedRouter,
+     *     onConnectionOpen: (peer) => peer.tags.add('client')
+     *   }
+     * });
+     * await smartServe.start();
+     * const typedSocket = TypedSocket.fromSmartServe(smartServe, typedRouter);
+     * ```
+     */
+    static fromSmartServe(smartServeArg, typedRouterArg) {
+        const connectionWrappers = new Map();
+        // Create the postMethod for server-initiated requests
+        const postMethod = async (dataArg, targetConnectionArg) => {
+            if (!targetConnectionArg) {
+                const allConnections = smartServeArg.getWebSocketConnections();
+                if (allConnections.length === 1) {
+                    console.log('Since no targetConnection was supplied and there is only one active one present, choosing that one automatically');
+                    const peer = allConnections[0];
+                    let wrapper = connectionWrappers.get(peer.id);
+                    if (!wrapper) {
+                        wrapper = wrapSmartServePeer(peer);
+                        connectionWrappers.set(peer.id, wrapper);
+                    }
+                    targetConnectionArg = wrapper;
+                }
+                else if (allConnections.length === 0) {
+                    throw new Error('No WebSocket connections available');
+                }
+                else {
+                    throw new Error('you need to specify the wanted targetConnection. Currently no target is selectable automatically.');
+                }
+            }
+            // Register interest for the response using correlation ID
+            const interest = await typedRouterArg.fireEventInterestMap.addInterest(dataArg.correlation.id, dataArg);
+            // Send the request to the client
+            targetConnectionArg.peer.send(plugins.smartjson.stringify(dataArg));
+            // Wait for the response (TypedRouter will fulfill via routeAndAddResponse when response arrives)
+            const response = await interest.interestFullfilled;
+            return response;
+        };
+        const typedSocket = new TypedSocket('server', typedRouterArg, postMethod, null // No smartsocket server/client when using SmartServe
+        );
+        typedSocket.smartServeRef = smartServeArg;
+        typedSocket.smartServeConnectionWrappers = connectionWrappers;
+        return typedSocket;
+    }
     get eventSubject() {
+        if (this.smartServeRef) {
+            // SmartServe doesn't provide an eventSubject, return a new Subject
+            // In SmartServe mode, connection events are handled via onConnectionOpen/onConnectionClose hooks
+            console.warn('eventSubject is not fully supported in SmartServe mode. Use SmartServe hooks instead.');
+            return new plugins.smartrx.rxjs.Subject();
+        }
         return this.socketServerOrClient.eventSubject;
     }
     constructor(sideArg, typedrouterArg, postMethodArg, socketServerOrClientArg) {
+        this.smartServeConnectionWrappers = new Map();
         this.side = sideArg;
         this.typedrouter = typedrouterArg;
         this.postMethod = postMethodArg;
@@ -99,11 +177,28 @@ export class TypedSocket {
         return typedrequest;
     }
     /**
-     * returns all matching target connection
-     * @param asyncFindFuncArg
-     * @returns
+     * returns all matching target connections
+     * Works with both Smartsocket and SmartServe backends
+     * @param asyncFindFuncArg - async filter function
+     * @returns array of matching connections
      */
     async findAllTargetConnections(asyncFindFuncArg) {
+        // SmartServe mode
+        if (this.smartServeRef) {
+            const matchingConnections = [];
+            for (const peer of this.smartServeRef.getWebSocketConnections()) {
+                let wrapper = this.smartServeConnectionWrappers.get(peer.id);
+                if (!wrapper) {
+                    wrapper = wrapSmartServePeer(peer);
+                    this.smartServeConnectionWrappers.set(peer.id, wrapper);
+                }
+                if (await asyncFindFuncArg(wrapper)) {
+                    matchingConnections.push(wrapper);
+                }
+            }
+            return matchingConnections;
+        }
+        // Smartsocket mode
         if (this.socketServerOrClient instanceof plugins.smartsocket.Smartsocket) {
             const matchingSockets = [];
             for (const socketConnection of this.socketServerOrClient.socketConnections.getArray()) {
@@ -113,9 +208,7 @@ export class TypedSocket {
             }
             return matchingSockets;
         }
-        else {
-            throw new Error('this method >>findTargetConnection<< is only available from the server');
-        }
+        throw new Error('this method >>findTargetConnection<< is only available from the server');
     }
     /**
      * returns a single target connection by returning the first one of all matching ones
@@ -126,7 +219,33 @@ export class TypedSocket {
         const allMatching = await this.findAllTargetConnections(asyncFindFuncArg);
         return allMatching[0];
     }
+    /**
+     * Find all connections that have a specific tag
+     * Works with both Smartsocket and SmartServe backends
+     */
     async findAllTargetConnectionsByTag(keyArg, payloadArg) {
+        // SmartServe mode - use native filtering for better performance
+        if (this.smartServeRef) {
+            const peers = this.smartServeRef.getWebSocketConnectionsByTag(keyArg);
+            const results = [];
+            for (const peer of peers) {
+                let wrapper = this.smartServeConnectionWrappers.get(peer.id);
+                if (!wrapper) {
+                    wrapper = wrapSmartServePeer(peer);
+                    this.smartServeConnectionWrappers.set(peer.id, wrapper);
+                }
+                // If payload specified, also filter by payload stored in peer.data
+                if (payloadArg !== undefined) {
+                    const tag = await wrapper.getTagById(keyArg);
+                    if (plugins.smartjson.stringify(tag?.payload) !== plugins.smartjson.stringify(payloadArg)) {
+                        continue;
+                    }
+                }
+                results.push(wrapper);
+            }
+            return results;
+        }
+        // Smartsocket mode - use existing logic
         return this.findAllTargetConnections(async (socketConnectionArg) => {
             let result;
             if (!payloadArg) {
@@ -139,12 +258,25 @@ export class TypedSocket {
             return result;
         });
     }
+    /**
+     * Find a single connection by tag
+     */
     async findTargetConnectionByTag(keyArg, payloadArg) {
         const allResults = await this.findAllTargetConnectionsByTag(keyArg, payloadArg);
         return allResults[0];
     }
+    /**
+     * Stop the TypedSocket server/client
+     * Note: In SmartServe mode, SmartServe manages its own lifecycle
+     */
     async stop() {
+        if (this.smartServeRef) {
+            // SmartServe manages its own lifecycle
+            // Clear our connection wrappers
+            this.smartServeConnectionWrappers.clear();
+            return;
+        }
         await this.socketServerOrClient.stop();
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZWRzb2NrZXQuY2xhc3Nlcy50eXBlZHNvY2tldC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3R5cGVkc29ja2V0LmNsYXNzZXMudHlwZWRzb2NrZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSwwQkFBMEIsQ0FBQztBQUVwRCxNQUFNLGNBQWMsR0FBRyxnQkFBZ0IsQ0FBQztBQUN4QyxNQUFNLGNBQWMsR0FBRyxnQkFBZ0IsQ0FBQztBQUl4QyxNQUFNLE9BQU8sV0FBVztJQUN0QixTQUFTO0lBQ1Q7OztPQUdHO0lBQ0ksTUFBTSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQzlCLGNBQWdELEVBQ2hELHFCQUEyQjtRQUUzQixNQUFNLGlCQUFpQixHQUFHLElBQUksT0FBTyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUM7WUFDNUQsS0FBSyxFQUFFLG1CQUFtQjtZQUMxQixJQUFJLEVBQUUsSUFBSTtTQUNYLENBQUMsQ0FBQztRQUNILElBQUkscUJBQXFCLEVBQUUsQ0FBQztZQUMxQixpQkFBaUIsQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLEVBQUUscUJBQXFCLENBQUMsQ0FBQztRQUM3RSxDQUFDO1FBRUQsaUJBQWlCLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FDbkMsSUFBSSxPQUFPLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQztZQUNyQyxRQUFRLEVBQUUsZ0JBQWdCO1lBQzFCLE9BQU8sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLEVBQUU7Z0JBQzlDLE9BQU8sY0FBYyxDQUFDLG1CQUFtQixDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3JELENBQUM7U0FDRixDQUFDLENBQ0gsQ0FBQztRQUNGLE1BQU0sV0FBVyxHQUFHLElBQUksV0FBVyxDQUNqQyxRQUFRLEVBQ1IsY0FBYyxFQUNkLEtBQUssRUFDSCxPQUFVLEVBQ1YsbUJBQTBELEVBQzlDLEVBQUU7WUFDZCxJQUFJLENB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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/dist_ts/typedsocket.plugins.d.ts

@@ -8,3 +8,4 @@ import * as smartsocket from '@push.rocks/smartsocket';
 import * as smartstring from '@push.rocks/smartstring';
 import * as smarturl from '@push.rocks/smarturl';
 export { isohash, smartjson, smartrx, smartsocket, smartstring, smarturl };
+export type { SmartServe, IWebSocketPeer } from '@push.rocks/smartserve';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@api.global/typedsocket",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "private": false,
   "description": "A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.",
   "main": "dist_ts/index.js",
@@ -9,23 +9,32 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "devDependencies": {
-    "@git.zone/tsbuild": "^2.1.66",
-    "@git.zone/tsbundle": "^2.0.8",
-    "@git.zone/tsrun": "^1.2.44",
-    "@git.zone/tstest": "^1.0.77",
-    "@push.rocks/smartenv": "^5.0.12",
-    "@push.rocks/tapbundle": "^5.0.23",
-    "@types/node": "^20.12.7"
+    "@git.zone/tsbuild": "^3.1.2",
+    "@git.zone/tsbundle": "^2.6.2",
+    "@git.zone/tsrun": "^2.0.0",
+    "@git.zone/tstest": "^3.1.3",
+    "@push.rocks/smartenv": "^6.0.0",
+    "@push.rocks/smartserve": "^1.1.0",
+    "@push.rocks/tapbundle": "^6.0.3",
+    "@types/node": "^24.10.1"
   },
   "dependencies": {
-    "@api.global/typedrequest": "^3.0.21",
-    "@api.global/typedrequest-interfaces": "^3.0.18",
-    "@push.rocks/isohash": "^2.0.0",
-    "@push.rocks/smartjson": "^5.0.19",
-    "@push.rocks/smartrx": "^3.0.7",
-    "@push.rocks/smartsocket": "^2.0.25",
-    "@push.rocks/smartstring": "^4.0.15",
-    "@push.rocks/smarturl": "^3.0.5"
+    "@api.global/typedrequest": "^3.1.10",
+    "@api.global/typedrequest-interfaces": "^3.0.19",
+    "@push.rocks/isohash": "^2.0.1",
+    "@push.rocks/smartjson": "^5.2.0",
+    "@push.rocks/smartrx": "^3.0.10",
+    "@push.rocks/smartsocket": "^3.0.0",
+    "@push.rocks/smartstring": "^4.1.0",
+    "@push.rocks/smarturl": "^3.1.0"
+  },
+  "peerDependencies": {
+    "@push.rocks/smartserve": ">=1.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@push.rocks/smartserve": {
+      "optional": true
+    }
   },
   "browserslist": [
     "last 1 chrome versions"

package/readme.hints.md

@@ -1 +1,21 @@
- 
+# TypedSocket Hints
+
+## SmartServe Integration (Added v3.1.0)
+
+TypedSocket now supports SmartServe as an alternative WebSocket backend via `TypedSocket.fromSmartServe()`.
+
+### Key Differences from Smartsocket Mode
+
+1. **Tag System**: SmartServe uses `Set<string>` for tags, while Smartsocket uses `{id, payload}`. The wrapper stores payloads in `peer.data` with `__typedsocket_tag__` prefix.
+
+2. **Request/Response**: Uses TypedRouter's `fireEventInterestMap` for async correlation when sending server-initiated requests.
+
+3. **Lifecycle**: SmartServe manages WebSocket lifecycle. `typedSocket.stop()` only clears internal state.
+
+4. **eventSubject**: Not fully supported in SmartServe mode - use SmartServe's `onConnectionOpen`/`onConnectionClose` hooks instead.
+
+### Files Modified for SmartServe Support
+
+- `ts/typedsocket.classes.typedsocket.ts` - Main implementation
+- `ts/typedsocket.plugins.ts` - Type imports
+- `package.json` - Optional peer dependency

package/readme.md

@@ -1,159 +1,297 @@
 # @api.global/typedsocket
-a typedrequest extension supporting websockets
+
+A TypeScript library for creating typed WebSocket connections with bi-directional communication support. Extends `@api.global/typedrequest` to bring type-safe request/response patterns to WebSocket connections.
+
+## Issue Reporting and Security
+
+For reporting bugs, issues, or security vulnerabilities, please visit [community.foss.global/](https://community.foss.global/). This is the central community hub for all issue reporting. Developers who sign and comply with our contribution agreement and go through identification can also get a [code.foss.global/](https://code.foss.global/) account to submit Pull Requests directly.
+
+## Features
+
+- 🔒 **Full Type Safety** - Leverages TypeScript for compile-time checking of all request/response payloads
+- 🔄 **Bi-directional Communication** - Both server and client can initiate requests
+- 🔌 **Auto-reconnect** - Client automatically reconnects on connection loss
+- 🏷️ **Connection Tagging** - Tag and filter connections for targeted messaging
+- 🌐 **Browser Compatible** - Works in both Node.js and browser environments
+- 🚀 **SmartServe Integration** - Native support for SmartServe's WebSocket handling
 
 ## Install
-To install `@api.global/typedsocket` in your project, run the following command using npm:
 
 ```bash
-npm install @api.global/typedsocket --save
+npm install @api.global/typedsocket
 ```
 
-For Yarn users:
+Or with pnpm:
 
 ```bash
-yarn add @api.global/typedsocket
+pnpm add @api.global/typedsocket
 ```
 
 ## Usage
 
-To utilize `@api.global/typedsocket` effectively, let's explore how to integrate it into a project with TypeScript. This guide provides comprehensive usage scenarios, highlighting all features of the module. `@api.global/typedsocket` extends the capabilities of `typedrequest` by integrating websocket support, allowing for real-time, bidirectional communication between a client and server.
+### Prerequisites
 
-### Getting Started
+- TypeScript project setup
+- Basic understanding of async/await patterns
+- Familiarity with `@api.global/typedrequest` concepts
 
-#### Prerequisites
+### Define Your Request Interface
 
-Before diving into examples, ensure you have the following:
+First, define the typed request interface that both client and server will use:
 
-- A basic understanding of TypeScript and Node.js.
-- An existing project set up with TypeScript.
-- `@api.global/typedrequest` and its dependencies installed in your project.
-
-#### Initialization
+```typescript
+import * as typedrequestInterfaces from '@api.global/typedrequest-interfaces';
 
-First, let's import the required modules and initialize our server and client instances.
+interface IGreetingRequest extends typedrequestInterfaces.implementsTR<
+  typedrequestInterfaces.ITypedRequest,
+  IGreetingRequest
+> {
+  method: 'greet';
+  request: {
+    name: string;
+  };
+  response: {
+    message: string;
+  };
+}
+```
 
-**Server Side:**
+### Server Setup
 
-Within your server-side code, import and set up `TypedSocket` to create a websocket server.
+Create a WebSocket server that handles typed requests:
 
 ```typescript
 import { TypedSocket } from '@api.global/typedsocket';
 import * as typedrequest from '@api.global/typedrequest';
 
-// Initialize your TypedRouter
+// Create the router and add handlers
 const typedRouter = new typedrequest.TypedRouter();
 
-// Create the TypedSocket server
-const server = await TypedSocket.createServer(typedRouter);
+typedRouter.addTypedHandler<IGreetingRequest>(
+  new typedrequest.TypedHandler('greet', async (requestData) => {
+    return {
+      message: `Hello, ${requestData.name}! 👋`,
+    };
+  })
+);
 
-// Optionally, you can provide a smartexpressServerArg if you have an existing SmartExpress server
+// Start the TypedSocket server (defaults to port 3000)
+const server = await TypedSocket.createServer(typedRouter);
 ```
 
-**Client Side:**
+#### Integration with SmartServe
 
-On the client side, initialize `TypedSocket` to connect to the websocket server.
+For SmartServe-based applications, use `fromSmartServe()` for native integration:
 
 ```typescript
 import { TypedSocket } from '@api.global/typedsocket';
+import { SmartServe } from '@push.rocks/smartserve';
+import * as typedrequest from '@api.global/typedrequest';
 
-// Assuming server is at http://localhost:3000
-const client = await TypedSocket.createClient(typedRouter, 'http://localhost:3000');
-```
+const typedRouter = new typedrequest.TypedRouter();
 
-### Defining Typed Requests
+// Add handlers for client-to-server requests
+typedRouter.addTypedHandler<IGreetingRequest>(
+  new typedrequest.TypedHandler('greet', async (requestData) => {
+    return { message: `Hello, ${requestData.name}!` };
+  })
+);
 
-`@api.global/typedsocket` leverages `typedrequest` for type-safe requests and responses. Here's how you can define and handle typed requests:
+// Create SmartServe with typedRouter in websocket options
+const smartServe = new SmartServe({
+  port: 3000,
+  websocket: {
+    typedRouter,
+    onConnectionOpen: (peer) => {
+      // Tag connections for later filtering
+      peer.tags.add('client');
+    }
+  }
+});
 
-**Defining a Typed Request Interface:**
+await smartServe.start();
 
-Define an interface for the request and its corresponding response.
+// Create TypedSocket bound to SmartServe
+const typedSocket = TypedSocket.fromSmartServe(smartServe, typedRouter);
 
-```typescript
-interface ExampleRequest extends typedrequestInterfaces.ITypedRequest {
-  method: 'exampleMethod';
-  request: {
-    message: string;
-  };
-  response: {
-    reply: string;
-  };
+// Push notifications to tagged clients
+const clients = await typedSocket.findAllTargetConnectionsByTag('client');
+for (const client of clients) {
+  const request = typedSocket.createTypedRequest<INotifyRequest>('notify', client);
+  await request.fire({ message: 'Hello from server!' });
 }
 ```
 
-**Handling Requests on the Server:**
+> **Note:** When using SmartServe, the WebSocket transport is managed by SmartServe. TypedSocket acts as a convenience layer for finding connections and sending server-initiated requests.
+
+### Client Setup
 
-Add a typed handler for the request in your `TypedRouter`.
+Connect to the WebSocket server from a client:
 
 ```typescript
-typedRouter.addTypedHandler<ExampleRequest>(
-  new typedrequest.TypedHandler('exampleMethod', async (requestData) => {
-    return {
-      reply: `Server received: ${requestData.message}`,
-    };
-  })
+import { TypedSocket } from '@api.global/typedsocket';
+import * as typedrequest from '@api.global/typedrequest';
+
+// Create a router for handling server-initiated requests (if needed)
+const clientRouter = new typedrequest.TypedRouter();
+
+// Connect to the server
+const client = await TypedSocket.createClient(
+  clientRouter,
+  'http://localhost:3000'
 );
 ```
 
-### Sending Requests from the Client
+#### Using Window Location (Browser)
 
-Use the client instance to send a request to the server and await a response.
+In browser environments, you can automatically use the current page's origin:
 
 ```typescript
-const exampleRequest = client.createTypedRequest<ExampleRequest>('exampleMethod');
-const response = await exampleRequest.fire({
-  message: 'Hello from client!',
+const client = await TypedSocket.createClient(
+  clientRouter,
+  TypedSocket.useWindowLocationOriginUrl()
+);
+```
+
+### Sending Requests
+
+#### Client to Server
+
+```typescript
+const request = client.createTypedRequest<IGreetingRequest>('greet');
+const response = await request.fire({
+  name: 'World',
 });
 
-console.log(response.reply); // "Server received: Hello from client!"
+console.log(response.message); // "Hello, World! 👋"
 ```
 
-### Advanced Usage
+#### Server to Client
+
+The server can also initiate requests to connected clients:
+
+```typescript
+// When only one client is connected, it's automatically selected
+const request = server.createTypedRequest<IGreetingRequest>('greet');
+const response = await request.fire({
+  name: 'Client',
+});
+
+// For multiple clients, specify the target connection
+const connection = await server.findTargetConnection(async (conn) => {
+  // Your filter logic here
+  return true;
+});
+const targetedRequest = server.createTypedRequest<IGreetingRequest>('greet', connection);
+```
 
-#### Tagging Connections
+### Connection Tagging
 
-For more refined control, especially in scenarios with multiple clients, you can tag connections for targeted communication.
+Tag connections for organized, targeted communication:
 
 ```typescript
-// Add a tag to a client
-client.addTag('role', 'admin');
-
-// On the server, find connections with the tag
-const adminConnections = await server.findAllTargetConnectionsByTag('role', 'admin');
-
-// Send a message to all admin connections
-for (const adminConnection of adminConnections) {
-  const request = server.createTypedRequest<ExampleRequest>('exampleMethod', adminConnection);
-  await request.fire({
-    message: 'Message to admins',
-  });
+// Client side: add a tag
+interface IUserTag extends typedrequestInterfaces.ITag {
+  name: 'userRole';
+  payload: 'admin' | 'user' | 'guest';
 }
+
+client.addTag<IUserTag>('userRole', 'admin');
 ```
 
-#### Handling Reconnections
+```typescript
+// Server side: find connections by tag
+const adminConnections = await server.findAllTargetConnectionsByTag<IUserTag>(
+  'userRole',
+  'admin'
+);
 
-`TypedSocket` automatically attempts to reconnect in the event of connection loss. Ensure your server and client logic accounts for reconnection, especially for maintaining state or re-subscribing to necessary events.
+// Send to all admins
+for (const conn of adminConnections) {
+  const request = server.createTypedRequest<INotificationRequest>('notify', conn);
+  await request.fire({ message: 'Admin notification' });
+}
 
-### Conclusion
+// Find a single connection
+const firstAdmin = await server.findTargetConnectionByTag<IUserTag>('userRole', 'admin');
+```
 
-Implementing `@api.global/typedsocket` provides a type-safe, real-time communication layer for your TypeScript applications, extending the functionality of `typedrequest` into the realm of websockets. This guide covered initialization, defining typed requests, sending requests, and advanced usage patterns like tagging connections and handling reconnections.
+### Event Handling
 
-Integrating `@api.global/typedsocket` into your project harnesses the power of websockets with the benefits of type safety and structured request/response patterns, enabling more reliable and maintainable real-time applications.
+Subscribe to connection status events:
+
+```typescript
+client.eventSubject.subscribe((status) => {
+  console.log('Connection status:', status);
+});
+
+server.eventSubject.subscribe((status) => {
+  console.log('Server connection event:', status);
+});
+```
+
+### Cleanup
+
+Properly close connections when done:
+
+```typescript
+// Client
+await client.stop();
+
+// Server
+await server.stop();
+```
+
+## API Reference
+
+### TypedSocket
+
+#### Static Methods
+
+| Method | Description |
+|--------|-------------|
+| `createServer(router)` | Creates a WebSocket server (defaults to port 3000). |
+| `createClient(router, serverUrl, alias?)` | Creates a WebSocket client that connects to the specified server URL. |
+| `fromSmartServe(smartServe, router)` | Creates a TypedSocket bound to an existing SmartServe instance. |
+| `useWindowLocationOriginUrl()` | Returns the current window location origin (browser only). |
+
+#### Instance Properties
+
+| Property | Description |
+|----------|-------------|
+| `side` | Whether this instance is a `'server'` or `'client'`. |
+| `typedrouter` | The TypedRouter instance handling requests. |
+| `eventSubject` | RxJS Subject for connection status events. |
+
+#### Instance Methods
+
+| Method | Description |
+|--------|-------------|
+| `createTypedRequest(method, targetConnection?)` | Creates a typed request for the specified method. |
+| `addTag(name, payload)` | Adds a tag to the client connection (client-side only). |
+| `findAllTargetConnections(filterFn)` | Finds all connections matching the filter (server-side only). |
+| `findTargetConnection(filterFn)` | Finds the first connection matching the filter (server-side only). |
+| `findAllTargetConnectionsByTag(key, payload?)` | Finds all connections with the specified tag. |
+| `findTargetConnectionByTag(key, payload?)` | Finds the first connection with the specified tag. |
+| `stop()` | Closes the WebSocket connection. |
 
 ## License and Legal Information
 
-This repository contains open-source code that is licensed under the MIT License. A copy of the MIT License can be found in the [license](license) file within this repository. 
+This repository contains open-source code licensed under the MIT License. A copy of the license can be found in the [LICENSE](./LICENSE) file.
 
 **Please note:** The MIT License does not grant permission to use the trade names, trademarks, service marks, or product names of the project, except as required for reasonable and customary use in describing the origin of the work and reproducing the content of the NOTICE file.
 
 ### Trademarks
 
-This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH and are not included within the scope of the MIT license granted herein. Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines, and any usage must be approved in writing by Task Venture Capital GmbH.
+This project is owned and maintained by Task Venture Capital GmbH. The names and logos associated with Task Venture Capital GmbH and any related products or services are trademarks of Task Venture Capital GmbH or third parties, and are not included within the scope of the MIT license granted herein.
+
+Use of these trademarks must comply with Task Venture Capital GmbH's Trademark Guidelines or the guidelines of the respective third-party owners, and any usage must be approved in writing. Third-party trademarks used herein are the property of their respective owners and used only in a descriptive manner, e.g. for an implementation of an API or similar.
 
 ### Company Information
 
-Task Venture Capital GmbH  
-Registered at District court Bremen HRB 35230 HB, Germany
+Task Venture Capital GmbH
+Registered at District Court Bremen HRB 35230 HB, Germany
 
-For any legal inquiries or if you require further information, please contact us via email at hello@task.vc.
+For any legal inquiries or further information, please contact us via email at hello@task.vc.
 
 By using this repository, you acknowledge that you have read this section, agree to comply with its terms, and understand that the licensing of the code does not imply endorsement by Task Venture Capital GmbH of any derivative works.

package/ts/00_commitinfo_data.ts

@@ -1,8 +1,8 @@
 /**
- * autocreated commitinfo by @pushrocks/commitinfo
+ * autocreated commitinfo by @push.rocks/commitinfo
  */
 export const commitinfo = {
   name: '@api.global/typedsocket',
-  version: '3.0.1',
+  version: '4.0.0',
   description: 'A library for creating typed WebSocket connections, supporting bi-directional communication with type safety.'
 }

package/ts/typedsocket.classes.typedsocket.ts

@@ -5,6 +5,32 @@ const publicRolePass = 'publicRolePass';
 
 export type TTypedSocketSide = 'server' | 'client';
 
+/**
+ * Wrapper for SmartServe's IWebSocketPeer to provide tag compatibility
+ * SmartServe uses Set<string> for tags, while TypedSocket uses {id, payload} format
+ */
+export interface ISmartServeConnectionWrapper {
+  peer: plugins.IWebSocketPeer;
+  getTagById(tagId: string): Promise<{ id: string; payload: any } | undefined>;
+}
+
+/**
+ * Creates a wrapper around IWebSocketPeer for tag compatibility
+ */
+function wrapSmartServePeer(peer: plugins.IWebSocketPeer): ISmartServeConnectionWrapper {
+  const TAG_PREFIX = '__typedsocket_tag__';
+  return {
+    peer,
+    async getTagById(tagId: string): Promise<{ id: string; payload: any } | undefined> {
+      if (!peer.tags.has(tagId)) {
+        return undefined;
+      }
+      const payload = peer.data.get(`${TAG_PREFIX}${tagId}`);
+      return { id: tagId, payload };
+    },
+  };
+}
+
 export class TypedSocket {
   // STATIC
   /**
@@ -12,16 +38,12 @@ export class TypedSocket {
    * note: this will fail in browser environments as server libs are not bundled.
    */
   public static async createServer(
-    typedrouterArg: plugins.typedrequest.TypedRouter,
-    smartexpressServerArg?: any
+    typedrouterArg: plugins.typedrequest.TypedRouter
   ): Promise<TypedSocket> {
     const smartsocketServer = new plugins.smartsocket.Smartsocket({
       alias: 'typedsocketServer',
       port: 3000,
     });
-    if (smartexpressServerArg) {
-      smartsocketServer.setExternalServer('smartexpress', smartexpressServerArg);
-    }
 
     smartsocketServer.socketFunctions.add(
       new plugins.smartsocket.SocketFunction({
@@ -110,16 +132,108 @@ export class TypedSocket {
     return windowLocationResult;
   }
 
+  /**
+   * Creates a TypedSocket server from an existing SmartServe instance.
+   * Use this when you want TypedSocket to work with SmartServe's WebSocket handling.
+   *
+   * @param smartServeArg - SmartServe instance with typedRouter configured in websocket options
+   * @param typedRouterArg - TypedRouter for handling requests (must match SmartServe's typedRouter)
+   *
+   * @example
+   * ```typescript
+   * const typedRouter = new TypedRouter();
+   * const smartServe = new SmartServe({
+   *   port: 3000,
+   *   websocket: {
+   *     typedRouter,
+   *     onConnectionOpen: (peer) => peer.tags.add('client')
+   *   }
+   * });
+   * await smartServe.start();
+   * const typedSocket = TypedSocket.fromSmartServe(smartServe, typedRouter);
+   * ```
+   */
+  public static fromSmartServe(
+    smartServeArg: plugins.SmartServe,
+    typedRouterArg: plugins.typedrequest.TypedRouter
+  ): TypedSocket {
+    const connectionWrappers = new Map<string, ISmartServeConnectionWrapper>();
+
+    // Create the postMethod for server-initiated requests
+    const postMethod = async <T extends plugins.typedrequestInterfaces.ITypedRequest>(
+      dataArg: T,
+      targetConnectionArg?: ISmartServeConnectionWrapper
+    ): Promise<T> => {
+      if (!targetConnectionArg) {
+        const allConnections = smartServeArg.getWebSocketConnections();
+        if (allConnections.length === 1) {
+          console.log(
+            'Since no targetConnection was supplied and there is only one active one present, choosing that one automatically'
+          );
+          const peer = allConnections[0];
+          let wrapper = connectionWrappers.get(peer.id);
+          if (!wrapper) {
+            wrapper = wrapSmartServePeer(peer);
+            connectionWrappers.set(peer.id, wrapper);
+          }
+          targetConnectionArg = wrapper;
+        } else if (allConnections.length === 0) {
+          throw new Error('No WebSocket connections available');
+        } else {
+          throw new Error(
+            'you need to specify the wanted targetConnection. Currently no target is selectable automatically.'
+          );
+        }
+      }
+
+      // Register interest for the response using correlation ID
+      const interest = await typedRouterArg.fireEventInterestMap.addInterest(
+        dataArg.correlation.id,
+        dataArg
+      );
+
+      // Send the request to the client
+      targetConnectionArg.peer.send(plugins.smartjson.stringify(dataArg));
+
+      // Wait for the response (TypedRouter will fulfill via routeAndAddResponse when response arrives)
+      const response = await interest.interestFullfilled as T;
+      return response;
+    };
+
+    const typedSocket = new TypedSocket(
+      'server',
+      typedRouterArg,
+      postMethod as any,
+      null as any // No smartsocket server/client when using SmartServe
+    );
+
+    typedSocket.smartServeRef = smartServeArg;
+    typedSocket.smartServeConnectionWrappers = connectionWrappers;
+
+    return typedSocket;
+  }
+
   // INSTANCE
   public side: TTypedSocketSide;
   public typedrouter: plugins.typedrequest.TypedRouter;
+
+  // SmartServe mode properties
+  private smartServeRef?: plugins.SmartServe;
+  private smartServeConnectionWrappers: Map<string, ISmartServeConnectionWrapper> = new Map();
+
   public get eventSubject(): plugins.smartrx.rxjs.Subject<plugins.smartsocket.TConnectionStatus> {
+    if (this.smartServeRef) {
+      // SmartServe doesn't provide an eventSubject, return a new Subject
+      // In SmartServe mode, connection events are handled via onConnectionOpen/onConnectionClose hooks
+      console.warn('eventSubject is not fully supported in SmartServe mode. Use SmartServe hooks instead.');
+      return new plugins.smartrx.rxjs.Subject();
+    }
     return this.socketServerOrClient.eventSubject;
   }
   private postMethod: plugins.typedrequest.IPostMethod &
     ((
       typedRequestPostObject: plugins.typedrequestInterfaces.ITypedRequest,
-      socketConnectionArg?: plugins.smartsocket.SocketConnection
+      socketConnectionArg?: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper
     ) => Promise<plugins.typedrequestInterfaces.ITypedRequest>);
   private socketServerOrClient:
     | plugins.smartsocket.Smartsocket
@@ -155,12 +269,12 @@ export class TypedSocket {
 
   public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
     methodName: T['method'],
-    targetConnection?: plugins.smartsocket.SocketConnection
+    targetConnection?: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper
   ): plugins.typedrequest.TypedRequest<T> {
     const typedrequest = new plugins.typedrequest.TypedRequest<T>(
       new plugins.typedrequest.TypedTarget({
         postMethod: async (requestDataArg) => {
-          const result = await this.postMethod(requestDataArg, targetConnection);
+          const result = await this.postMethod(requestDataArg, targetConnection as any);
           return result;
         },
       }),
@@ -170,13 +284,31 @@ export class TypedSocket {
   }
 
   /**
-   * returns all matching target connection
-   * @param asyncFindFuncArg
-   * @returns
+   * returns all matching target connections
+   * Works with both Smartsocket and SmartServe backends
+   * @param asyncFindFuncArg - async filter function
+   * @returns array of matching connections
    */
   public async findAllTargetConnections(
-    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
-  ) {
+    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper) => Promise<boolean>
+  ): Promise<(plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper)[]> {
+    // SmartServe mode
+    if (this.smartServeRef) {
+      const matchingConnections: ISmartServeConnectionWrapper[] = [];
+      for (const peer of this.smartServeRef.getWebSocketConnections()) {
+        let wrapper = this.smartServeConnectionWrappers.get(peer.id);
+        if (!wrapper) {
+          wrapper = wrapSmartServePeer(peer);
+          this.smartServeConnectionWrappers.set(peer.id, wrapper);
+        }
+        if (await asyncFindFuncArg(wrapper)) {
+          matchingConnections.push(wrapper);
+        }
+      }
+      return matchingConnections;
+    }
+
+    // Smartsocket mode
     if (this.socketServerOrClient instanceof plugins.smartsocket.Smartsocket) {
       const matchingSockets: plugins.smartsocket.SocketConnection[] = [];
       for (const socketConnection of this.socketServerOrClient.socketConnections.getArray()) {
@@ -185,9 +317,9 @@ export class TypedSocket {
         }
       }
       return matchingSockets;
-    } else {
-      throw new Error('this method >>findTargetConnection<< is only available from the server');
     }
+
+    throw new Error('this method >>findTargetConnection<< is only available from the server');
   }
 
   /**
@@ -196,22 +328,51 @@ export class TypedSocket {
    * @returns
    */
   public async findTargetConnection(
-    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection) => Promise<boolean>
-  ) {
+    asyncFindFuncArg: (connectionArg: plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper) => Promise<boolean>
+  ): Promise<plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper | undefined> {
     const allMatching = await this.findAllTargetConnections(asyncFindFuncArg);
     return allMatching[0];
   }
 
+  /**
+   * Find all connections that have a specific tag
+   * Works with both Smartsocket and SmartServe backends
+   */
   public async findAllTargetConnectionsByTag<
     TTag extends plugins.typedrequestInterfaces.ITag = any
-  >(keyArg: TTag['name'], payloadArg?: TTag['payload']) {
+  >(keyArg: TTag['name'], payloadArg?: TTag['payload']): Promise<(plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper)[]> {
+    // SmartServe mode - use native filtering for better performance
+    if (this.smartServeRef) {
+      const peers = this.smartServeRef.getWebSocketConnectionsByTag(keyArg);
+      const results: ISmartServeConnectionWrapper[] = [];
+
+      for (const peer of peers) {
+        let wrapper = this.smartServeConnectionWrappers.get(peer.id);
+        if (!wrapper) {
+          wrapper = wrapSmartServePeer(peer);
+          this.smartServeConnectionWrappers.set(peer.id, wrapper);
+        }
+
+        // If payload specified, also filter by payload stored in peer.data
+        if (payloadArg !== undefined) {
+          const tag = await wrapper.getTagById(keyArg);
+          if (plugins.smartjson.stringify(tag?.payload) !== plugins.smartjson.stringify(payloadArg)) {
+            continue;
+          }
+        }
+        results.push(wrapper);
+      }
+      return results;
+    }
+
+    // Smartsocket mode - use existing logic
     return this.findAllTargetConnections(async (socketConnectionArg) => {
       let result: boolean;
       if (!payloadArg) {
-        result = !!(await socketConnectionArg.getTagById(keyArg));
+        result = !!(await (socketConnectionArg as plugins.smartsocket.SocketConnection).getTagById(keyArg));
       } else {
         result = !!(
-          plugins.smartjson.stringify((await socketConnectionArg.getTagById(keyArg))?.payload) ===
+          plugins.smartjson.stringify((await (socketConnectionArg as plugins.smartsocket.SocketConnection).getTagById(keyArg))?.payload) ===
           plugins.smartjson.stringify(payloadArg)
         );
       }
@@ -219,15 +380,28 @@ export class TypedSocket {
     });
   }
 
+  /**
+   * Find a single connection by tag
+   */
   public async findTargetConnectionByTag<TTag extends plugins.typedrequestInterfaces.ITag = any>(
     keyArg: TTag['name'],
     payloadArg?: TTag['payload']
-  ) {
+  ): Promise<plugins.smartsocket.SocketConnection | ISmartServeConnectionWrapper | undefined> {
     const allResults = await this.findAllTargetConnectionsByTag(keyArg, payloadArg);
     return allResults[0];
   }
 
+  /**
+   * Stop the TypedSocket server/client
+   * Note: In SmartServe mode, SmartServe manages its own lifecycle
+   */
   public async stop() {
+    if (this.smartServeRef) {
+      // SmartServe manages its own lifecycle
+      // Clear our connection wrappers
+      this.smartServeConnectionWrappers.clear();
+      return;
+    }
     await this.socketServerOrClient.stop();
   }
 }

package/ts/typedsocket.plugins.ts

@@ -13,3 +13,6 @@ import * as smartstring from '@push.rocks/smartstring';
 import * as smarturl from '@push.rocks/smarturl';
 
 export { isohash, smartjson, smartrx, smartsocket, smartstring, smarturl };
+
+// Optional SmartServe support (type-only imports for optional peer dependency)
+export type { SmartServe, IWebSocketPeer } from '@push.rocks/smartserve';