@push.rocks/smartsocket 4.0.0 → 4.0.2

package/ts/smartsocket.classes.socketconnection.ts

@@ -22,7 +22,7 @@ export type TSocketConnectionSide = 'server' | 'client';
  * interface for constructor of class SocketConnection
  */
 export interface ISocketConnectionConstructorOptions {
-  alias: string;
+  alias?: string;
   authenticated: boolean;
   side: TSocketConnectionSide;
   smartsocketHost: Smartsocket | SmartsocketClient;
@@ -43,7 +43,7 @@ export let allSocketConnections = new plugins.lik.ObjectMap<SocketConnection>();
  * class SocketConnection represents a websocket connection
  */
 export class SocketConnection {
-  public alias: string;
+  public alias?: string;
   public side: TSocketConnectionSide;
   public authenticated: boolean = false;
   public smartsocketRef: Smartsocket | SmartsocketClient;
@@ -97,6 +97,10 @@ export class SocketConnection {
   }
 
   private handleFunctionCall(messageData: interfaces.ISocketMessage<interfaces.IFunctionCallPayload>): void {
+    if (!messageData.id) {
+      logger.log('warn', 'received function call without request id');
+      return;
+    }
     const requestData: ISocketRequestDataObject<any> = {
       funcCallData: {
         funcName: messageData.payload.funcName,
@@ -124,6 +128,10 @@ export class SocketConnection {
   }
 
   private handleFunctionResponse(messageData: interfaces.ISocketMessage<interfaces.IFunctionCallPayload>): void {
+    if (!messageData.id) {
+      logger.log('warn', 'received function response without request id');
+      return;
+    }
     const responseData: ISocketRequestDataObject<any> = {
       funcCallData: {
         funcName: messageData.payload.funcName,

package/ts/smartsocket.classes.socketrequest.ts

@@ -27,7 +27,7 @@ export interface ISocketRequestConstructorOptions<
   side: TSocketRequestSide;
   originSocketConnection: SocketConnection;
   shortId: string;
-  funcCallData?: ISocketFunctionCallDataRequest<T>;
+  funcCallData: ISocketFunctionCallDataRequest<T>;
 }
 
 /**

package/ts/smartsocket.classes.socketserver.ts

@@ -11,8 +11,8 @@ import { logger } from './smartsocket.logging.js';
  */
 export class SocketServer {
   private smartsocket: Smartsocket;
-  private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server;
-  private wsServer: pluginsTyped.ws.WebSocketServer;
+  private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server | null = null;
+  private wsServer: pluginsTyped.ws.WebSocketServer | null = null;
 
   /**
    * whether httpServer is standalone (created by us)
@@ -38,17 +38,19 @@ export class SocketServer {
     const httpModule = await this.smartsocket.smartenv.getSafeNodeModule('http');
     const wsModule = await this.smartsocket.smartenv.getSafeNodeModule('ws');
 
-    this.httpServer = httpModule.createServer();
+    const httpServer = httpModule.createServer();
+    this.httpServer = httpServer;
     this.standaloneServer = true;
 
     // Create WebSocket server attached to HTTP server
-    this.wsServer = new wsModule.WebSocketServer({ server: this.httpServer });
+    const wsServer = new wsModule.WebSocketServer({ server: httpServer });
+    this.wsServer = wsServer;
 
-    this.wsServer.on('connection', (ws: pluginsTyped.ws.WebSocket) => {
+    wsServer.on('connection', (ws: pluginsTyped.ws.WebSocket) => {
       this.smartsocket.handleNewConnection(ws);
     });
 
-    this.httpServer.listen(this.smartsocket.options.port, () => {
+    httpServer.listen(this.smartsocket.options.port, () => {
       logger.log(
         'success',
         `Server started in standalone mode on port ${this.smartsocket.options.port}`

package/ts/smartsocket.plugins.ts

@@ -4,7 +4,6 @@ import * as typedrequestInterfaces from '@api.global/typedrequest-interfaces';
 export { typedrequestInterfaces };
 
 // pushrocks scope
-import * as isohash from '@push.rocks/isohash';
 import * as isounique from '@push.rocks/isounique';
 import * as lik from '@push.rocks/lik';
 import * as smartenv from '@push.rocks/smartenv';
@@ -16,7 +15,6 @@ import * as smarttime from '@push.rocks/smarttime';
 import * as smartrx from '@push.rocks/smartrx';
 
 export {
-  isohash,
   isounique,
   lik,
   smartenv,