@push.rocks/smartsocket 2.1.0 → 4.0.0

package/dist_ts/smartsocket.classes.socketserver.js

@@ -4,75 +4,182 @@ import * as pluginsTyped from './smartsocket.pluginstyped.js';
 import { Smartsocket } from './smartsocket.classes.smartsocket.js';
 import { logger } from './smartsocket.logging.js';
 /**
- * class socketServer
- * handles the attachment of socketIo to whatever server is in play
+ * class SocketServer
+ * handles the WebSocket server in standalone mode, or provides hooks for smartserve integration
  */
 export class SocketServer {
     constructor(smartSocketInstance) {
         /**
-         * wether httpServer is standalone
+         * whether httpServer is standalone (created by us)
          */
         this.standaloneServer = false;
         this.smartsocket = smartSocketInstance;
     }
     /**
-     * starts the server with another server
-     * also works with an express style server
+     * Starts listening to incoming websocket connections (standalone mode).
+     * If no port is specified, this is a no-op (hooks mode via smartserve).
      */
-    async setExternalServer(serverType, serverArg) {
-        this.httpServerDeferred = plugins.smartpromise.defer();
-        await serverArg.startedPromise;
-        this.httpServer = serverArg.httpServer;
-        this.httpServerDeferred.resolve();
-    }
-    /**
-     * gets the server for socket.io
-     */
-    async getServerForSocketIo() {
-        if (this.httpServerDeferred) {
-            await this.httpServerDeferred.promise;
-        }
-        if (this.httpServer) {
-            return this.httpServer;
-        }
-        else {
-            const httpModule = await this.smartsocket.smartenv.getSafeNodeModule('http');
-            this.httpServer = new httpModule.Server();
-            this.standaloneServer = true;
-            return this.httpServer;
+    async start() {
+        // If no port specified, we're in hooks mode - nothing to start
+        if (!this.smartsocket.options.port) {
+            return;
         }
+        // Standalone mode - create our own HTTP server and WebSocket server
+        const done = plugins.smartpromise.defer();
+        const httpModule = await this.smartsocket.smartenv.getSafeNodeModule('http');
+        const wsModule = await this.smartsocket.smartenv.getSafeNodeModule('ws');
+        this.httpServer = httpModule.createServer();
+        this.standaloneServer = true;
+        // Create WebSocket server attached to HTTP server
+        this.wsServer = new wsModule.WebSocketServer({ server: this.httpServer });
+        this.wsServer.on('connection', (ws) => {
+            this.smartsocket.handleNewConnection(ws);
+        });
+        this.httpServer.listen(this.smartsocket.options.port, () => {
+            logger.log('success', `Server started in standalone mode on port ${this.smartsocket.options.port}`);
+            done.resolve();
+        });
+        await done.promise;
     }
     /**
-     * starts listening to incoming sockets:
+     * closes the server
      */
-    async start() {
+    async stop() {
         const done = plugins.smartpromise.defer();
-        // handle http servers
-        // in case an external server has been set "this.standaloneServer" should be false
+        let resolved = false;
+        if (this.wsServer) {
+            // Close all WebSocket connections
+            this.wsServer.clients.forEach((client) => {
+                client.terminate();
+            });
+            this.wsServer.close();
+            this.wsServer = null;
+        }
         if (this.httpServer && this.standaloneServer) {
-            if (!this.smartsocket.options.port) {
-                logger.log('error', 'there should be a port specifed for smartsocket!');
-                throw new Error('there should be a port specified for smartsocket');
-            }
-            this.httpServer.listen(this.smartsocket.options.port, () => {
-                logger.log('success', `Server started in standalone mode on ${this.smartsocket.options.port}`);
-                done.resolve();
+            const resolveOnce = () => {
+                if (!resolved) {
+                    resolved = true;
+                    this.httpServer = null;
+                    this.standaloneServer = false;
+                    done.resolve();
+                }
+            };
+            this.httpServer.close(() => {
+                resolveOnce();
             });
+            // Add a timeout in case close callback doesn't fire
+            const timeoutId = setTimeout(() => {
+                resolveOnce();
+            }, 2000);
+            // Ensure timeout doesn't keep process alive
+            if (timeoutId.unref) {
+                timeoutId.unref();
+            }
         }
         else {
             done.resolve();
         }
-        // nothing else to do if express server is set
         await done.promise;
-        return;
     }
     /**
-     * closes the server
+     * Returns WebSocket hooks for integration with smartserve.
+     * Pass these hooks to SmartServe's websocket config.
      */
-    async stop() {
-        if (this.httpServer) {
-            this.httpServer.close();
-        }
+    getSmartserveWebSocketHooks() {
+        return {
+            onOpen: async (peer) => {
+                // Create a wrapper that adapts ISmartserveWebSocketPeer to WebSocket-like interface
+                const wsLikeSocket = this.createWsLikeFromPeer(peer);
+                await this.smartsocket.handleNewConnection(wsLikeSocket);
+            },
+            onMessage: async (peer, message) => {
+                // Dispatch message to the SocketConnection via the adapter
+                const adapter = peer.data.get('smartsocket_adapter');
+                if (adapter) {
+                    let textData;
+                    if (message.type === 'text' && message.text) {
+                        textData = message.text;
+                    }
+                    else if (message.type === 'binary' && message.data) {
+                        // Convert binary to text (Buffer/Uint8Array to string)
+                        textData = new TextDecoder().decode(message.data);
+                    }
+                    if (textData) {
+                        adapter.dispatchMessage(textData);
+                    }
+                }
+            },
+            onClose: async (peer, code, reason) => {
+                // Dispatch close to the SocketConnection via the adapter
+                const adapter = peer.data.get('smartsocket_adapter');
+                if (adapter) {
+                    adapter.dispatchClose();
+                }
+            },
+            onError: async (peer, error) => {
+                // Dispatch error to the SocketConnection via the adapter
+                const adapter = peer.data.get('smartsocket_adapter');
+                if (adapter) {
+                    adapter.dispatchError();
+                }
+            },
+        };
+    }
+    /**
+     * Creates a WebSocket-like object from a smartserve peer
+     * This allows our SocketConnection to work with both native WebSocket and smartserve peers
+     */
+    createWsLikeFromPeer(peer) {
+        const messageListeners = [];
+        const closeListeners = [];
+        const errorListeners = [];
+        // Store the adapter on the peer for message routing
+        peer.data.set('smartsocket_adapter', {
+            dispatchMessage: (data) => {
+                messageListeners.forEach((listener) => {
+                    listener({ data });
+                });
+            },
+            dispatchClose: () => {
+                closeListeners.forEach((listener) => listener());
+            },
+            dispatchError: () => {
+                errorListeners.forEach((listener) => listener());
+            },
+        });
+        return {
+            get readyState() { return peer.readyState; },
+            send: (data) => peer.send(data),
+            close: (code, reason) => peer.close(code, reason),
+            addEventListener: (event, listener) => {
+                if (event === 'message') {
+                    messageListeners.push(listener);
+                }
+                else if (event === 'close') {
+                    closeListeners.push(listener);
+                }
+                else if (event === 'error') {
+                    errorListeners.push(listener);
+                }
+            },
+            removeEventListener: (event, listener) => {
+                if (event === 'message') {
+                    const idx = messageListeners.indexOf(listener);
+                    if (idx >= 0)
+                        messageListeners.splice(idx, 1);
+                }
+                else if (event === 'close') {
+                    const idx = closeListeners.indexOf(listener);
+                    if (idx >= 0)
+                        closeListeners.splice(idx, 1);
+                }
+                else if (event === 'error') {
+                    const idx = errorListeners.indexOf(listener);
+                    if (idx >= 0)
+                        errorListeners.splice(idx, 1);
+                }
+            },
+        };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxZQUFZLE1BQU0sK0JBQStCLENBQUM7QUFFOUQsMkNBQTJDO0FBQzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFVdkIsWUFBWSxtQkFBZ0M7UUFMNUM7O1dBRUc7UUFDSyxxQkFBZ0IsR0FBRyxLQUFLLENBQUM7UUFHL0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxtQkFBbUIsQ0FBQztJQUN6QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLGlCQUFpQixDQUM1QixVQUEwQixFQUMxQixTQUFzRDtRQUV0RCxJQUFJLENBQUMsa0JBQWtCLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUN2RCxNQUFNLFNBQVMsQ0FBQyxjQUFjLENBQUM7UUFDL0IsSUFBSSxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsVUFBVSxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLEVBQUUsQ0FBQztJQUNwQyxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsb0JBQW9CO1FBQy9CLElBQUksSUFBSSxDQUFDLGtCQUFrQixFQUFFLENBQUM7WUFDNUIsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDO1FBQ3hDLENBQUM7UUFDRCxJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNwQixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDekIsQ0FBQzthQUFNLENBQUM7WUFDTixNQUFNLFVBQVUsR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzdFLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxVQUFVLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDMUMsSUFBSSxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQztZQUM3QixPQUFPLElBQUksQ0FBQyxVQUFVLENBQUM7UUFDekIsQ0FBQztJQUNILENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxLQUFLO1FBQ2hCLE1BQU0sSUFBSSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFMUMsc0JBQXNCO1FBQ3RCLGtGQUFrRjtRQUNsRixJQUFJLElBQUksQ0FBQyxVQUFVLElBQUksSUFBSSxDQUFDLGdCQUFnQixFQUFFLENBQUM7WUFDN0MsSUFBSSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUNuQyxNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxrREFBa0QsQ0FBQyxDQUFDO2dCQUN4RSxNQUFNLElBQUksS0FBSyxDQUFDLGtEQUFrRCxDQUFDLENBQUM7WUFDdEUsQ0FBQztZQUNELElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUU7Z0JBQ3pELE1BQU0sQ0FBQyxHQUFHLENBQ1IsU0FBUyxFQUNULHdDQUF3QyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FDeEUsQ0FBQztnQkFDRixJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7WUFDakIsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO2FBQU0sQ0FBQztZQUNOLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNqQixDQUFDO1FBRUQsOENBQThDO1FBQzlDLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNuQixPQUFPO0lBQ1QsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLElBQUk7UUFDZixJQUFJLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNwQixJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFCLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRzZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydHNvY2tldC5jbGFzc2VzLnNvY2tldHNlcnZlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLDBCQUEwQixDQUFDO0FBQ3BELE9BQU8sS0FBSyxZQUFZLE1BQU0sK0JBQStCLENBQUM7QUFFOUQsMkNBQTJDO0FBQzNDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFbEQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFVdkIsWUFBWSxtQkFBZ0M7UUFMNUM7O1dBRUc7UUFDSyxxQkFBZ0IsR0FBRyxLQUFLLENBQUM7UUFHL0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxtQkFBbUIsQ0FBQztJQUN6QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLEtBQUs7UUFDaEIsK0RBQStEO1FBQy9ELElBQUksQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUNuQyxPQUFPO1FBQ1QsQ0FBQztRQUVELG9FQUFvRTtRQUNwRSxNQUFNLElBQUksR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzFDLE1BQU0sVUFBVSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDN0UsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUV6RSxJQUFJLENBQUMsVUFBVSxHQUFHLFVBQVUsQ0FBQyxZQUFZLEVBQUUsQ0FBQztRQUM1QyxJQUFJLENBQUMsZ0JBQWdC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

package/dist_ts/smartsocket.pluginstyped.d.ts

@@ -1,15 +1,58 @@
 import type * as http from 'http';
 import type * as https from 'https';
 export type { http, https };
-import type * as typedserver from '@api.global/typedserver';
-export type { typedserver };
-import type { Socket as ServerSocket, Server as ServerServer } from 'socket.io';
-import type { Socket as ClientSocket, connect as ClientIo } from 'socket.io-client';
-export declare namespace socketIo {
-    type Socket = ServerSocket;
-    type Server = ServerServer;
-}
-export declare namespace socketIoClient {
-    type Socket = ClientSocket;
-    type connect = typeof ClientIo;
+import type * as wsTypes from 'ws';
+export declare namespace ws {
+    type WebSocket = wsTypes.WebSocket;
+    type WebSocketServer = wsTypes.WebSocketServer;
+    type RawData = wsTypes.RawData;
+}
+/**
+ * Unified WebSocket type supporting both browser and Node.js environments
+ */
+export type TWebSocket = WebSocket | ws.WebSocket;
+/**
+ * Message event type for WebSocket messages (browser and Node.js compatible)
+ */
+export type TMessageEvent = MessageEvent | {
+    data: string;
+};
+/**
+ * WebSocket-like interface for adapters (e.g., smartserve peer adapter)
+ */
+export interface IWebSocketLike {
+    readyState: number;
+    send(data: string): void;
+    close(code?: number, reason?: string): void;
+    addEventListener(event: 'message', listener: (event: TMessageEvent) => void): void;
+    addEventListener(event: 'close', listener: () => void): void;
+    addEventListener(event: 'error', listener: () => void): void;
+    removeEventListener?(event: string, listener: (...args: any[]) => void): void;
+}
+export interface ISmartserveWebSocketPeer {
+    id: string;
+    url: string;
+    readyState: 0 | 1 | 2 | 3;
+    protocol: string;
+    extensions: string;
+    send(data: string): void;
+    sendBinary(data: Uint8Array | ArrayBuffer): void;
+    close(code?: number, reason?: string): void;
+    ping(data?: Uint8Array): void;
+    terminate(): void;
+    context: any;
+    data: Map<string, unknown>;
+    tags: Set<string>;
+}
+export interface ISmartserveWebSocketMessage {
+    type: 'text' | 'binary';
+    text?: string;
+    data?: Uint8Array;
+    size: number;
+}
+export interface ISmartserveWebSocketHooks {
+    onOpen?: (peer: ISmartserveWebSocketPeer) => void | Promise<void>;
+    onMessage?: (peer: ISmartserveWebSocketPeer, message: ISmartserveWebSocketMessage) => void | Promise<void>;
+    onClose?: (peer: ISmartserveWebSocketPeer, code: number, reason: string) => void | Promise<void>;
+    onError?: (peer: ISmartserveWebSocketPeer, error: Error) => void | Promise<void>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@push.rocks/smartsocket",
-  "version": "2.1.0",
+  "version": "4.0.0",
   "description": "Provides easy and secure websocket communication mechanisms, including server and client implementation, function call routing, connection management, and tagging.",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
@@ -9,36 +9,34 @@
     "type": "git",
     "url": "https://code.foss.global/push.rocks/smartsocket.git"
   },
-  "author": "Lossless GmbH",
+  "author": "Task Venture Capital GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://gitlab.com/pushrocks/smartsocket/issues"
+    "url": "https://community.foss.global/"
   },
   "homepage": "https://code.foss.global/push.rocks/smartsocket",
   "dependencies": {
-    "@api.global/typedrequest-interfaces": "^3.0.18",
-    "@api.global/typedserver": "^3.0.27",
-    "@push.rocks/isohash": "^2.0.0",
+    "@api.global/typedrequest-interfaces": "^3.0.19",
+    "@push.rocks/isohash": "^2.0.1",
     "@push.rocks/isounique": "^1.0.5",
-    "@push.rocks/lik": "^6.0.14",
+    "@push.rocks/lik": "^6.2.2",
     "@push.rocks/smartdelay": "^3.0.5",
-    "@push.rocks/smartenv": "^5.0.12",
-    "@push.rocks/smartjson": "^5.0.19",
-    "@push.rocks/smartlog": "^3.0.3",
-    "@push.rocks/smartpromise": "^4.0.3",
-    "@push.rocks/smartrx": "^3.0.7",
-    "@push.rocks/smarttime": "^4.0.6",
-    "engine.io": "6.6.4",
-    "socket.io": "4.8.1",
-    "socket.io-client": "4.8.1"
+    "@push.rocks/smartenv": "^6.0.0",
+    "@push.rocks/smartjson": "^5.2.0",
+    "@push.rocks/smartlog": "^3.1.10",
+    "@push.rocks/smartpromise": "^4.2.3",
+    "@push.rocks/smartrx": "^3.0.10",
+    "@push.rocks/smarttime": "^4.1.1",
+    "ws": "^8.18.3"
   },
   "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/tapbundle": "^5.0.23",
-    "@types/node": "^22.13.10"
+    "@git.zone/tsbuild": "^3.1.2",
+    "@git.zone/tsbundle": "^2.6.3",
+    "@git.zone/tsrun": "^2.0.0",
+    "@git.zone/tstest": "^3.1.3",
+    "@push.rocks/smartserve": "^1.1.2",
+    "@types/node": "^24.10.1",
+    "@types/ws": "^8.18.1"
   },
   "private": false,
   "files": [
@@ -61,15 +59,16 @@
     "communication",
     "server",
     "client",
-    "socket.io",
+    "native websocket",
     "authentication",
     "reconnection",
     "tagging",
     "function routing",
-    "secure"
+    "secure",
+    "rpc"
   ],
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "(tstest test/ --verbose)",
     "build": "(tsbuild --web --allowimplicitany && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)",
     "buildDocs": "tsdoc"
   }