@push.rocks/smartsocket 2.0.27 → 3.0.0

package/dist_ts/smartsocket.classes.socketconnection.d.ts

@@ -15,7 +15,7 @@ export interface ISocketConnectionConstructorOptions {
     authenticated: boolean;
     side: TSocketConnectionSide;
     smartsocketHost: Smartsocket | SmartsocketClient;
-    socket: pluginsTyped.socketIo.Socket | pluginsTyped.socketIoClient.Socket;
+    socket: WebSocket | pluginsTyped.ws.WebSocket;
 }
 /**
  * interface for authentication data
@@ -32,13 +32,24 @@ export declare class SocketConnection {
     side: TSocketConnectionSide;
     authenticated: boolean;
     smartsocketRef: Smartsocket | SmartsocketClient;
-    socket: pluginsTyped.socketIo.Socket | pluginsTyped.socketIoClient.Socket;
+    socket: WebSocket | pluginsTyped.ws.WebSocket;
     eventSubject: plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>;
     eventStatus: interfaces.TConnectionStatus;
     private tagStore;
     tagStoreObservable: plugins.smartrx.rxjs.Subject<interfaces.TTagStore>;
     remoteTagStoreObservable: plugins.smartrx.rxjs.Subject<interfaces.TTagStore>;
     constructor(optionsArg: ISocketConnectionConstructorOptions);
+    /**
+     * Sends a message through the socket
+     */
+    sendMessage(message: interfaces.ISocketMessage): void;
+    /**
+     * Handles incoming messages
+     */
+    handleMessage(messageData: interfaces.ISocketMessage): void;
+    private handleFunctionCall;
+    private handleFunctionResponse;
+    private handleTagUpdate;
     /**
      * adds a tag to a connection
      */
@@ -53,9 +64,9 @@ export declare class SocketConnection {
      */
     removeTagById(tagIdArg: interfaces.ITag['id']): Promise<void>;
     /**
-     * authenticate the socket
+     * authenticate the socket (server side)
      */
-    authenticate(): Promise<unknown>;
+    authenticate(): Promise<SocketConnection>;
     /**
      * listen to function requests
      */

package/dist_ts/smartsocket.classes.socketconnection.js

@@ -28,16 +28,83 @@ export class SocketConnection {
         this.socket = optionsArg.socket;
         // standard behaviour that is always true
         allSocketConnections.add(this);
-        // handle connection
-        this.socket.on('connect', async () => {
-            this.updateStatus('connected');
-        });
-        this.socket.on('disconnect', async () => {
-            logger.log('info', `SocketConnection with >alias ${this.alias} on >side ${this.side} disconnected`);
-            await this.disconnect();
-            allSocketConnections.remove(this);
-            this.eventSubject.next('disconnected');
+    }
+    /**
+     * Sends a message through the socket
+     */
+    sendMessage(message) {
+        if (this.socket.readyState === 1) { // WebSocket.OPEN
+            this.socket.send(JSON.stringify(message));
+        }
+    }
+    /**
+     * Handles incoming messages
+     */
+    handleMessage(messageData) {
+        switch (messageData.type) {
+            case 'function':
+                this.handleFunctionCall(messageData);
+                break;
+            case 'functionResponse':
+                this.handleFunctionResponse(messageData);
+                break;
+            case 'tagUpdate':
+                this.handleTagUpdate(messageData);
+                break;
+            default:
+                // Authentication messages are handled by the server/client classes
+                break;
+        }
+    }
+    handleFunctionCall(messageData) {
+        const requestData = {
+            funcCallData: {
+                funcName: messageData.payload.funcName,
+                funcDataArg: messageData.payload.funcData,
+            },
+            shortId: messageData.id,
+        };
+        const referencedFunction = this.smartsocketRef.socketFunctions.findSync((socketFunctionArg) => {
+            return socketFunctionArg.name === requestData.funcCallData.funcName;
         });
+        if (referencedFunction) {
+            const localSocketRequest = new SocketRequest(this.smartsocketRef, {
+                side: 'responding',
+                originSocketConnection: this,
+                shortId: requestData.shortId,
+                funcCallData: requestData.funcCallData,
+            });
+            localSocketRequest.createResponse();
+        }
+        else {
+            logger.log('warn', `function ${requestData.funcCallData.funcName} not found or out of scope`);
+        }
+    }
+    handleFunctionResponse(messageData) {
+        const responseData = {
+            funcCallData: {
+                funcName: messageData.payload.funcName,
+                funcDataArg: messageData.payload.funcData,
+            },
+            shortId: messageData.id,
+        };
+        const targetSocketRequest = SocketRequest.getSocketRequestById(this.smartsocketRef, responseData.shortId);
+        if (targetSocketRequest) {
+            targetSocketRequest.handleResponse(responseData);
+        }
+    }
+    handleTagUpdate(messageData) {
+        const tagStoreArg = messageData.payload.tags;
+        if (!plugins.smartjson.deepEqualObjects(this.tagStore, tagStoreArg)) {
+            this.tagStore = tagStoreArg;
+            // Echo back to confirm
+            this.sendMessage({
+                type: 'tagUpdate',
+                payload: { tags: this.tagStore },
+            });
+            this.tagStoreObservable.next(this.tagStore);
+        }
+        this.remoteTagStoreObservable.next(tagStoreArg);
     }
     /**
      * adds a tag to a connection
@@ -57,7 +124,10 @@ export class SocketConnection {
                 done.resolve();
             }
         });
-        this.socket.emit('updateTagStore', this.tagStore);
+        this.sendMessage({
+            type: 'tagUpdate',
+            payload: { tags: this.tagStore },
+        });
         await done.promise;
     }
     /**
@@ -73,35 +143,60 @@ export class SocketConnection {
     async removeTagById(tagIdArg) {
         delete this.tagStore[tagIdArg];
         this.tagStoreObservable.next(this.tagStore);
-        this.socket.emit('updateTagStore', this.tagStore);
+        this.sendMessage({
+            type: 'tagUpdate',
+            payload: { tags: this.tagStore },
+        });
     }
     // authenticating --------------------------
     /**
-     * authenticate the socket
+     * authenticate the socket (server side)
      */
     authenticate() {
         const done = plugins.smartpromise.defer();
-        this.socket.on('dataAuth', async (dataArg) => {
-            logger.log('info', 'received authentication data...');
-            this.socket.removeAllListeners('dataAuth');
-            if (dataArg.alias) {
-                // TODO: authenticate password
-                this.alias = dataArg.alias;
-                this.authenticated = true;
-                this.socket.emit('authenticated');
-                logger.log('ok', `socket with >>alias ${this.alias} is authenticated!`);
-                done.resolve(this);
+        // Set up message handler for authentication
+        const messageHandler = (event) => {
+            try {
+                const data = typeof event.data === 'string' ? event.data : event.data.toString();
+                const message = JSON.parse(data);
+                if (message.type === 'auth') {
+                    const authData = message.payload;
+                    logger.log('info', 'received authentication data...');
+                    if (authData.alias) {
+                        this.alias = authData.alias;
+                        this.authenticated = true;
+                        // Send authentication response
+                        this.sendMessage({
+                            type: 'authResponse',
+                            payload: { success: true },
+                        });
+                        logger.log('ok', `socket with >>alias ${this.alias} is authenticated!`);
+                        done.resolve(this);
+                    }
+                    else {
+                        this.authenticated = false;
+                        this.sendMessage({
+                            type: 'authResponse',
+                            payload: { success: false, error: 'No alias provided' },
+                        });
+                        this.disconnect();
+                        done.reject('a socket tried to connect, but could not authenticate.');
+                    }
+                }
             }
-            else {
-                this.authenticated = false;
-                await this.disconnect();
-                done.reject('a socket tried to connect, but could not authenticated.');
+            catch (err) {
+                // Not a valid message, ignore
             }
-        });
+        };
+        this.socket.addEventListener('message', messageHandler);
+        // Request authentication
         const requestAuthPayload = {
-            serverAlias: this.smartsocketRef.alias,
+            type: 'authRequest',
+            payload: {
+                serverAlias: this.smartsocketRef.alias,
+            },
         };
-        this.socket.emit('requestAuth', requestAuthPayload);
+        this.sendMessage(requestAuthPayload);
         return done.promise;
     }
     // listening -------------------------------
@@ -111,39 +206,18 @@ export class SocketConnection {
     listenToFunctionRequests() {
         const done = plugins.smartpromise.defer();
         if (this.authenticated) {
-            this.socket.on('function', (dataArg) => {
-                // check if requested function is available to the socket's scope
-                // logger.log('info', 'function request received');
-                const referencedFunction = this.smartsocketRef.socketFunctions.findSync((socketFunctionArg) => {
-                    return socketFunctionArg.name === dataArg.funcCallData.funcName;
-                });
-                if (referencedFunction) {
-                    // logger.log('ok', 'function in access scope');
-                    const localSocketRequest = new SocketRequest(this.smartsocketRef, {
-                        side: 'responding',
-                        originSocketConnection: this,
-                        shortId: dataArg.shortId,
-                        funcCallData: dataArg.funcCallData,
-                    });
-                    localSocketRequest.createResponse(); // takes care of creating response and sending it back
+            // Set up message handler for all messages
+            const messageHandler = (event) => {
+                try {
+                    const data = typeof event.data === 'string' ? event.data : event.data.toString();
+                    const message = JSON.parse(data);
+                    this.handleMessage(message);
                 }
-                else {
-                    logger.log('warn', 'function not existent or out of access scope');
+                catch (err) {
+                    // Not a valid JSON message, ignore
                 }
-            });
-            this.socket.on('functionResponse', (dataArg) => {
-                // logger.log('info', `received response for request with id ${dataArg.shortId}`);
-                const targetSocketRequest = SocketRequest.getSocketRequestById(this.smartsocketRef, dataArg.shortId);
-                targetSocketRequest.handleResponse(dataArg);
-            });
-            this.socket.on('updateTagStore', async (tagStoreArg) => {
-                if (!plugins.smartjson.deepEqualObjects(this.tagStore, tagStoreArg)) {
-                    this.tagStore = tagStoreArg;
-                    this.socket.emit('updateTagStore', this.tagStore);
-                    this.tagStoreObservable.next(this.tagStore);
-                }
-                this.remoteTagStoreObservable.next(tagStoreArg);
-            });
+            };
+            this.socket.addEventListener('message', messageHandler);
             logger.log('info', `now listening to function requests for ${this.alias} on side ${this.side}`);
             done.resolve(this);
         }
@@ -156,7 +230,10 @@ export class SocketConnection {
     }
     // disconnecting ----------------------
     async disconnect() {
-        this.socket.disconnect(true);
+        if (this.socket.readyState === 1 || this.socket.readyState === 0) {
+            this.socket.close();
+        }
+        allSocketConnections.remove(this);
         this.updateStatus('disconnected');
     }
     updateStatus(statusArg) {
@@ -166,4 +243,4 @@ export class SocketConnection {
         this.eventStatus = statusArg;
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRjb25uZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFlBQVksTUFBTSwrQkFBK0IsQ0FBQztBQUM5RCxPQUFPLEtBQUssVUFBVSxNQUFNLHVCQUF1QixDQUFDO0FBRXBELGlCQUFpQjtBQUNqQixPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDbkUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHlDQUF5QyxDQUFDO0FBQ3pFLE9BQU8sRUFBRSxhQUFhLEVBQWlDLE1BQU0sd0NBQXdDLENBQUM7QUFFdEcsWUFBWTtBQUNaLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBQy9FLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTJCbEQsaUJBQWlCO0FBQ2pCLE1BQU0sQ0FBQyxJQUFJLG9CQUFvQixHQUFHLElBQUksT0FBTyxDQUFDLEdBQUcsQ0FBQyxTQUFTLEVBQW9CLENBQUM7QUFFaEY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZ0JBQWdCO0lBYzNCLFlBQVksVUFBK0M7UUFYcEQsa0JBQWEsR0FBWSxLQUFLLENBQUM7UUFJL0IsaUJBQVksR0FBRyxJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBZ0MsQ0FBQztRQUNoRixnQkFBVyxHQUFpQyxLQUFLLENBQUM7UUFFakQsYUFBUSxHQUF5QixFQUFFLENBQUM7UUFDckMsdUJBQWtCLEdBQUcsSUFBSSxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQXdCLENBQUM7UUFDOUUsNkJBQXdCLEdBQUcsSUFBSSxPQUFP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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"smartsocket.classes.socketconnection.js","sourceRoot":"","sources":["../ts/smartsocket.classes.socketconnection.ts"],"names":[],"mappings":"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"}

package/dist_ts/smartsocket.classes.socketrequest.js

@@ -1,4 +1,5 @@
 import * as plugins from './smartsocket.plugins.js';
+import * as interfaces from './interfaces/index.js';
 // import interfaces
 import { SocketFunction, } from './smartsocket.classes.socketfunction.js';
 // import classes
@@ -30,18 +31,21 @@ export class SocketRequest {
      * dispatches a socketrequest from the requesting to the receiving side
      */
     dispatch() {
-        const requestData = {
-            funcCallData: this.funcCallData,
-            shortId: this.shortid,
+        const message = {
+            type: 'function',
+            id: this.shortid,
+            payload: {
+                funcName: this.funcCallData.funcName,
+                funcData: this.funcCallData.funcDataArg,
+            },
         };
-        this.originSocketConnection.socket.emit('function', requestData);
+        this.originSocketConnection.sendMessage(message);
         return this.done.promise;
     }
     /**
      * handles the response that is received by the requesting side
      */
     async handleResponse(responseDataArg) {
-        // logger.log('info', 'handling response!');
         this.done.resolve(responseDataArg.funcCallData);
         this.smartsocketRef.socketRequests.remove(this);
     }
@@ -55,18 +59,20 @@ export class SocketRequest {
             logger.log('error', `There is no SocketFunction defined for ${this.funcCallData.funcName}`);
             return;
         }
-        // logger.log('info', `invoking ${targetSocketFunction.name}`);
         targetSocketFunction
             .invoke(this.funcCallData, this.originSocketConnection)
             .then((resultData) => {
-            // logger.log('info', 'got resultData. Sending it to requesting party.');
-            const responseData = {
-                funcCallData: resultData,
-                shortId: this.shortid,
+            const message = {
+                type: 'functionResponse',
+                id: this.shortid,
+                payload: {
+                    funcName: resultData.funcName,
+                    funcData: resultData.funcDataArg,
+                },
             };
-            this.originSocketConnection.socket.emit('functionResponse', responseData);
+            this.originSocketConnection.sendMessage(message);
             this.smartsocketRef.socketRequests.remove(this);
         });
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUFFcEQsb0JBQW9CO0FBQ3BCLE9BQU8sRUFDTCxjQUFjLEdBR2YsTUFBTSx5Q0FBeUMsQ0FBQztBQUVqRCxpQkFBaUI7QUFDakIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDN0UsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQUNuRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSw0Q0FBNEMsQ0FBQztBQTJCL0UsaUJBQWlCO0FBQ2pCLE1BQU0sT0FBTyxhQUFhO0lBQ3hCLFNBQVM7SUFDRixNQUFNLENBQUMsb0JBQW9CLENBQ2hDLGNBQStDLEVBQy9DLFVBQWtCO1FBRWxCLE9BQU8sY0FBYyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFO1lBQ2pFLE9BQU8sZ0JBQWdCLENBQUMsT0FBTyxLQUFLLFVBQVUsQ0FBQztRQUNqRCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFZRCxZQUNFLGlCQUFrRCxFQUNsRCxVQUErQztRQVpqRCxXQUFXO1FBQ0osV0FBTSxHQUF5QixLQUFLLENBQUM7UUFLckMsU0FBSSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFzQyxDQUFDO1FBUTdFLElBQUksQ0FBQyxjQUFjLEdBQUcsaUJBQWlCLENBQUM7UUFDeEMsSUFBSSxDQUFDLElBQUksR0FBRyxVQUFVLENBQUMsSUFBSSxDQUFDO1FBQzVCLElBQUksQ0FBQyxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxJQUFJLENBQUMsWUFBWSxHQUFHLFVBQVUsQ0FBQyxZQUFZLENBQUM7UUFDNUMsSUFBSSxDQUFDLHNCQUFzQixHQUFHLFVBQVUsQ0FBQyxzQkFBc0IsQ0FBQztRQUNoRSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDL0MsQ0FBQztJQUVELHdDQUF3QztJQUV4Qzs7T0FFRztJQUNJLFFBQVE7UUFDYixNQUFNLFdBQVcsR0FBZ0M7WUFDL0MsWUFBWSxFQUFFLElBQUksQ0FBQyxZQUFZO1lBQy9CLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTztTQUN0QixDQUFDO1FBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBQ2pFLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDM0IsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGNBQWMsQ0FBQyxlQUE0QztRQUN0RSw0Q0FBNEM7UUFDNUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsd0NBQXdDO0lBRXhDOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGNBQWM7UUFDekIsTUFBTSxvQkFBb0IsR0FBc0IsY0FBYyxDQUFDLHVCQUF1QixDQUNwRixJQUFJLENBQUMsY0FBYyxFQUNuQixJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsQ0FBQztRQUVGLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQzFCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLDBDQUEwQyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDNUYsT0FBTztRQUNULENBQUM7UUFDRCwrREFBK0Q7UUFDL0Qsb0JBQW9CO2FBQ2pCLE1BQU0sQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLElBQUksQ0FBQyxzQkFBc0IsQ0FBQzthQUN0RCxJQUFJLENBQUMsQ0FBQyxVQUFVLEVBQUUsRUFBRTtZQUNuQix5RUFBeUU7WUFDekUsTUFBTSxZQUFZLEdBQWdDO2dCQUNoRCxZQUFZLEVBQUUsVUFBVTtnQkFDeEIsT0FBTyxFQUFFLElBQUksQ0FBQyxPQUFPO2FBQ3RCLENBQUM7WUFDRixJQUFJLENBQUMsc0JBQXNCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsRUFBRSxZQUFZLENBQUMsQ0FBQztZQUMxRSxJQUFJLENBQUMsY0FBYyxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEQsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0YifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRzb2NrZXQuY2xhc3Nlcy5zb2NrZXRyZXF1ZXN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxPQUFPLE1BQU0sMEJBQTBCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFVBQVUsTUFBTSx1QkFBdUIsQ0FBQztBQUVwRCxvQkFBb0I7QUFDcEIsT0FBTyxFQUNMLGNBQWMsR0FHZixNQUFNLHlDQUF5QyxDQUFDO0FBRWpELGlCQUFpQjtBQUNqQixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUM3RSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ25FLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDRDQUE0QyxDQUFDO0FBMkIvRSxpQkFBaUI7QUFDakIsTUFBTSxPQUFPLGFBQWE7SUFDeEIsU0FBUztJQUNGLE1BQU0sQ0FBQyxvQkFBb0IsQ0FDaEMsY0FBK0MsRUFDL0MsVUFBa0I7UUFFbEIsT0FBTyxjQUFjLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDLGdCQUFnQixFQUFFLEVBQUU7WUFDakUsT0FBTyxnQkFBZ0IsQ0FBQyxPQUFPLEtBQUssVUFBVSxDQUFDO1FBQ2pELENBQUMsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQVlELFlBQ0UsaUJBQWtELEVBQ2xELFVBQStDO1FBWmpELFdBQVc7UUFDSixXQUFNLEdBQXlCLEtBQUssQ0FBQztRQUtyQyxTQUFJLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQXNDLENBQUM7UUFRN0UsSUFBSSxDQUFDLGNBQWMsR0FBRyxpQkFBaUIsQ0FBQztRQUN4QyxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUM7UUFDNUIsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO1FBQ2xDLElBQUksQ0FBQyxZQUFZLEdBQUcsVUFBVSxDQUFDLFlBQVksQ0FBQztRQUM1QyxJQUFJLENBQUMsc0JBQXNCLEdBQUcsVUFBVSxDQUFDLHNCQUFzQixDQUFDO1FBQ2hFLElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUMvQyxDQUFDO0lBRUQsd0NBQXdDO0lBRXhDOztPQUVHO0lBQ0ksUUFBUTtRQUNiLE1BQU0sT0FBTyxHQUErRDtZQUMxRSxJQUFJLEVBQUUsVUFBVTtZQUNoQixFQUFFLEVBQUUsSUFBSSxDQUFDLE9BQU87WUFDaEIsT0FBTyxFQUFFO2dCQUNQLFFBQVEsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVE7Z0JBQ3BDLFFBQVEsRUFBRSxJQUFJLENBQUMsWUFBWSxDQUFDLFdBQVc7YUFDeEM7U0FDRixDQUFDO1FBQ0YsSUFBSSxDQUFDLHNCQUFzQixDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNqRCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO0lBQzNCLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxjQUFjLENBQUMsZUFBNEM7UUFDdEUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsZUFBZSxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQ2hELElBQUksQ0FBQyxjQUFjLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsd0NBQXdDO0lBRXhDOztPQUVHO0lBQ0ksS0FBSyxDQUFDLGNBQWM7UUFDekIsTUFBTSxvQkFBb0IsR0FBc0IsY0FBYyxDQUFDLHVCQUF1QixDQUNwRixJQUFJLENBQUMsY0FBYyxFQUNuQixJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsQ0FDM0IsQ0FBQztRQUVGLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1lBQzFCLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLDBDQUEwQyxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7WUFDNUYsT0FBTztRQUNULENBQUM7UUFFRCxvQkFBb0I7YUFDakIsTUFBTSxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLHNCQUFzQixDQUFDO2FBQ3RELElBQUksQ0FBQyxDQUFDLFVBQVUsRUFBRSxFQUFFO1lBQ25CLE1BQU0sT0FBTyxHQUErRDtnQkFDMUUsSUFBSSxFQUFFLGtCQUFrQjtnQkFDeEIsRUFBRSxFQUFFLElBQUksQ0FBQyxPQUFPO2dCQUNoQixPQUFPLEVBQUU7b0JBQ1AsUUFBUSxFQUFFLFVBQVUsQ0FBQyxRQUFRO29CQUM3QixRQUFRLEVBQUUsVUFBVSxDQUFDLFdBQVc7aUJBQ2pDO2FBQ0YsQ0FBQztZQUNGLElBQUksQ0FBQyxzQkFBc0IsQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDakQsSUFBSSxDQUFDLGNBQWMsQ0FBQyxjQUFjLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xELENBQUMsQ0FBQyxDQUFDO0lBQ1AsQ0FBQztDQUNGIn0=

package/dist_ts/smartsocket.classes.socketserver.d.ts

@@ -1,35 +1,35 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import * as pluginsTyped from './smartsocket.pluginstyped.js';
 import { Smartsocket } from './smartsocket.classes.smartsocket.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 declare class SocketServer {
     private smartsocket;
-    private httpServerDeferred;
     private httpServer;
+    private wsServer;
     /**
-     * wether httpServer is standalone
+     * whether httpServer is standalone (created by us)
      */
     private standaloneServer;
     constructor(smartSocketInstance: Smartsocket);
     /**
-     * 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).
      */
-    setExternalServer(serverType: 'smartexpress', serverArg: pluginsTyped.typedserver.servertools.Server): Promise<void>;
+    start(): Promise<void>;
     /**
-     * gets the server for socket.io
+     * closes the server
      */
-    getServerForSocketIo(): Promise<pluginsTyped.http.Server<typeof pluginsTyped.http.IncomingMessage, typeof pluginsTyped.http.ServerResponse> | pluginsTyped.https.Server<typeof pluginsTyped.http.IncomingMessage, typeof pluginsTyped.http.ServerResponse>>;
+    stop(): Promise<void>;
     /**
-     * starts listening to incoming sockets:
+     * Returns WebSocket hooks for integration with smartserve.
+     * Pass these hooks to SmartServe's websocket config.
      */
-    start(): Promise<void>;
+    getSmartserveWebSocketHooks(): pluginsTyped.ISmartserveWebSocketHooks;
     /**
-     * closes the server
+     * Creates a WebSocket-like object from a smartserve peer
+     * This allows our SocketConnection to work with both native WebSocket and smartserve peers
      */
-    stop(): Promise<void>;
+    private createWsLikeFromPeer;
 }