2.0.0

.snyk

@@ -1,13 +0,0 @@
-# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
-# ignores vulnerabilities until expiry date; change duration by modifying expiry date
-ignore:
-  SNYK-JS-JSYAML-173999:
-    - '@pushrocks/smartexpress > @pushrocks/smartfile > js-yaml':
-        reason: None given
-        expires: '2019-05-24T15:16:11.291Z'
-  SNYK-JS-JSYAML-174129:
-    - '@pushrocks/smartexpress > @pushrocks/smartfile > js-yaml':
-        reason: None given
-        expires: '2019-05-24T15:16:11.291Z'
-patch: {}

.vscode/settings.json

@@ -22,5 +22,6 @@
         }
       }
     }
-  ]
+  ],
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

package.json

@@ -1,12 +1,13 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.2.13",
+  "version": "2.0.0",
   "description": "easy and secure websocket communication",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild --web && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)"
+    "build": "(tsbuild --web --allowimplicitany --skiplibcheck && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)"
   },
   "repository": {
     "type": "git",
@@ -21,27 +22,25 @@
   "dependencies": {
     "@apiglobal/typedrequest-interfaces": "^1.0.15",
     "@pushrocks/isohash": "^1.0.2",
-    "@pushrocks/isounique": "^1.0.4",
+    "@pushrocks/isounique": "^1.0.5",
-    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/lik": "^5.0.4",
     "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartenv": "^4.0.16",
     "@pushrocks/smartexpress": "^3.0.108",
     "@pushrocks/smartjson": "^4.0.6",
     "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrx": "^2.0.19",
+    "@pushrocks/smartrx": "^2.0.25",
-    "@pushrocks/smarttime": "^3.0.43",
+    "@pushrocks/smarttime": "^3.0.45",
-    "@types/socket.io": "^3.0.2",
+    "socket.io": "^4.4.1",
-    "@types/socket.io-client": "^3.0.0",
+    "socket.io-client": "^4.4.1"
-    "socket.io": "^3.1.0",
-    "socket.io-client": "^3.1.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbuild": "^2.1.50",
-    "@gitzone/tsrun": "^1.2.18",
+    "@gitzone/tsrun": "^1.2.31",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tstest": "^1.0.67",
-    "@pushrocks/tapbundle": "^3.2.15",
+    "@pushrocks/tapbundle": "^5.0.2",
-    "@types/node": "^17.0.9",
+    "@types/node": "^17.0.21",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

test/test.expressserver.ts

@@ -1,10 +1,10 @@
 // tslint:disable-next-line:no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
 
 import * as isohash from '@pushrocks/isohash';
 import * as smartexpress from '@pushrocks/smartexpress';
 
-import smartsocket = require('../ts/index');
+import * as smartsocket from '../ts/index.js';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
@@ -18,7 +18,7 @@ const testConfig = {
 // class smartsocket
 tap.test('should create a new smartsocket', async () => {
   testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver', port: testConfig.port });
-  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
+  expect(testSmartsocket).toBeInstanceOf(smartsocket.Smartsocket);
 });
 
 tap.test('Should accept an smartExpressServer as server', async () => {
@@ -80,7 +80,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
     const response: any = await testSmartsocketClient.serverCall('testFunction1', {
       value1: randomString,
     });
-    expect(response.value1).to.equal(randomString);
+    expect(response.value1).toEqual(randomString);
     if (counter % 100 === 0) {
       console.log(
         `processed 100 more messages in ${Date.now() - startTime}ms. ${

test/test.reconnect.ts

@@ -1,5 +1,151 @@
-import { tap, expect } from '@pushrocks/tapbundle';
+// tslint:disable-next-line:no-implicit-dependencies
+import { expect, tap } from '@pushrocks/tapbundle';
 
-tap.test('should run a test', async () => {});
+import * as smartsocket from '../ts/index.js';
+
+let testSmartsocket: smartsocket.Smartsocket;
+let testSmartsocketClient: smartsocket.SmartsocketClient;
+let testSocketFunctionForServer: smartsocket.SocketFunction<any>;
+let testSocketFunctionClient: smartsocket.SocketFunction<any>;
+
+export interface IReqResClient {
+  method: 'testFunction1';
+  request: {
+    value1: string;
+  };
+  response: {
+    value1: string;
+  };
+}
+
+export interface IReqResServer {
+  method: 'testFunction2';
+  request: {
+    hi: string;
+  };
+  response: {
+    hi: string;
+  };
+}
+
+const testConfig = {
+  port: 3000,
+};
+
+// class smartsocket
+tap.test('should create a new smartsocket', async () => {
+  testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver1', port: testConfig.port });
+  await testSmartsocket.start();
+});
+
+// class SocketFunction
+tap.test('should register a new Function', async () => {
+  testSocketFunctionForServer = new smartsocket.SocketFunction({
+    funcDef: async (dataArg, socketConnectionArg) => {
+      return dataArg;
+    },
+    funcName: 'testFunction1',
+  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+
+  testSocketFunctionClient = new smartsocket.SocketFunction({
+    funcDef: async (dataArg, socketConnectionArg) => {
+      return dataArg;
+    },
+    funcName: 'testFunction2',
+  });
+  testSmartsocket.addSocketFunction(testSocketFunctionForServer);
+});
+
+// class SmartsocketClient
+tap.test('should react to a new websocket connection from client', async () => {
+  testSmartsocketClient = new smartsocket.SmartsocketClient({
+    port: testConfig.port,
+    url: 'http://localhost',
+    alias: 'testClient1',
+    autoReconnect: true,
+  });
+  testSmartsocketClient.addSocketFunction(testSocketFunctionClient);
+  await testSmartsocketClient.connect();
+});
+
+tap.test('should be able to tag a connection from client', async (tools) => {
+  await testSmartsocketClient.addTag({
+    id: 'awesome',
+    payload: 'yes',
+  });
+  const tagOnServerSide = await testSmartsocket.socketConnections
+    .findSync((socketConnection) => {
+      return true;
+    })
+    .getTagById('awesome');
+  expect(tagOnServerSide.payload).toEqual('yes');
+});
+
+tap.test('should be able to tag a connection from server', async (tools) => {
+  await testSmartsocket.socketConnections
+    .findSync((socketConnection) => {
+      return true;
+    })
+    .addTag({
+      id: 'awesome2',
+      payload: 'absolutely',
+    });
+  const tagOnClientSide = await testSmartsocketClient.socketConnection.getTagById('awesome2');
+  expect(tagOnClientSide.payload).toEqual('absolutely');
+});
+
+tap.test('should be able to make a functionCall from client to server', async () => {
+  const response = await testSmartsocketClient.serverCall<IReqResClient>('testFunction1', {
+    value1: 'hello',
+  });
+  console.log(response);
+  expect(response.value1).toEqual('hello');
+});
+
+tap.test('should be able to make a functionCall from server to client', async () => {
+  const response = await testSmartsocket.clientCall<IReqResServer>(
+    'testFunction2',
+    {
+      hi: 'hi there from server',
+    },
+    testSmartsocket.socketConnections.findSync((socketConnection) => {
+      return true;
+    })
+  );
+  console.log(response);
+  expect(response.hi).toEqual('hi there from server');
+});
+
+tap.test('client should disconnect and reconnect', async (toolsArg) => {
+  await testSmartsocketClient.disconnect();
+  await testSmartsocketClient.connect();
+  await toolsArg.delayFor(2000);
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
+});
+
+// class smartsocket
+tap.test('should be able to switch to a new server', async (toolsArg) => {
+  await testSmartsocket.stop();
+  testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
+  await testSmartsocket.start();
+  await toolsArg.delayFor(30000);
+});
+
+tap.test('should be able to locate a connection tag after reconnect', async (tools) => {
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
+  const tagOnServerSide = await testSmartsocket.socketConnections
+    .findSync((socketConnection) => {
+      return true;
+    })
+    .getTagById('awesome');
+  expect(tagOnServerSide.payload).toEqual('yes');
+});
+
+// terminate
+tap.test('should close the server', async () => {
+  await testSmartsocketClient.stop();
+  await testSmartsocket.stop();
+});
 
 tap.start();

test/test.tagging.ts

@@ -1,12 +1,10 @@
 // tslint:disable-next-line:no-implicit-dependencies
 import { expect, tap } from '@pushrocks/tapbundle';
 
-import smartsocket = require('../ts/index');
+import * as smartsocket from '../ts/index.js';
-import * as isohash from '@pushrocks/isohash';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
-let testSocketConnection: smartsocket.SocketConnection;
 let testSocketFunctionForServer: smartsocket.SocketFunction<any>;
 let testSocketFunctionClient: smartsocket.SocketFunction<any>;
 
@@ -37,7 +35,7 @@ const testConfig = {
 // class smartsocket
 tap.test('should create a new smartsocket', async () => {
   testSmartsocket = new smartsocket.Smartsocket({ alias: 'testserver2', port: testConfig.port });
-  expect(testSmartsocket).be.instanceOf(smartsocket.Smartsocket);
+  expect(testSmartsocket).toBeInstanceOf(smartsocket.Smartsocket);
 });
 
 // class SocketFunction
@@ -57,7 +55,6 @@ tap.test('should register a new Function', async () => {
     funcName: 'testFunction2',
   });
   testSmartsocket.addSocketFunction(testSocketFunctionForServer);
-  console.log(testSmartsocket.socketFunctions);
 });
 
 tap.test('should start listening when .started is called', async () => {
@@ -72,7 +69,6 @@ tap.test('should react to a new websocket connection from client', async () => {
     alias: 'testClient1',
   });
   testSmartsocketClient.addSocketFunction(testSocketFunctionClient);
-  console.log(testSmartsocketClient.socketFunctions);
   await testSmartsocketClient.connect();
 });
 
@@ -86,7 +82,7 @@ tap.test('should be able to tag a connection from client', async (tools) => {
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 tap.test('should be able to tag a connection from server', async (tools) => {
@@ -99,7 +95,7 @@ tap.test('should be able to tag a connection from server', async (tools) => {
       payload: 'absolutely',
     });
   const tagOnClientSide = await testSmartsocketClient.socketConnection.getTagById('awesome2');
-  expect(tagOnClientSide.payload).to.equal('absolutely');
+  expect(tagOnClientSide.payload).toEqual('absolutely');
 });
 
 tap.test('2 clients should connect in parallel', async () => {
@@ -111,7 +107,7 @@ tap.test('should be able to make a functionCall from client to server', async ()
     value1: 'hello',
   });
   console.log(response);
-  expect(response.value1).to.equal('hello');
+  expect(response.value1).toEqual('hello');
 });
 
 tap.test('should be able to make a functionCall from server to client', async () => {
@@ -125,7 +121,7 @@ tap.test('should be able to make a functionCall from server to client', async ()
     })
   );
   console.log(response);
-  expect(response.hi).to.equal('hi there from server');
+  expect(response.hi).toEqual('hi there from server');
 });
 
 tap.test('client should disconnect and reconnect', async (tools) => {
@@ -140,7 +136,7 @@ tap.test('should be able to locate a connection tag after reconnect', async (too
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 // terminate

ts/index.ts

@@ -1,7 +1,7 @@
 // export main classes
-export * from './smartsocket.classes.smartsocket';
+export * from './smartsocket.classes.smartsocket.js';
-export * from './smartsocket.classes.smartsocketclient';
+export * from './smartsocket.classes.smartsocketclient.js';
 
 // export further classes and objects
-export * from './smartsocket.classes.socketfunction';
+export * from './smartsocket.classes.socketfunction.js';
-export * from './smartsocket.classes.socketconnection';
+export * from './smartsocket.classes.socketconnection.js';

ts/interfaces/connection.ts

@@ -7,4 +7,5 @@ export type TConnectionStatus =
   | 'connecting'
   | 'connected'
   | 'disconnecting'
-  | 'disconnected';
+  | 'disconnected'
+  | 'timedOut';

ts/interfaces/index.ts

@@ -1,2 +1,2 @@
-export * from './connection';
+export * from './connection.js';
-export * from './tag';
+export * from './tag.js';

ts/smartsocket.classes.smartsocket.ts

@@ -1,17 +1,17 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
 
 // classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
 import {
   ISocketFunctionCallDataRequest,
   SocketFunction,
   ISocketFunctionCallDataResponse,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
-import { SocketRequest } from './smartsocket.classes.socketrequest';
+import { SocketRequest } from './smartsocket.classes.socketrequest.js';
-import { SocketServer } from './smartsocket.classes.socketserver';
+import { SocketServer } from './smartsocket.classes.socketserver.js';
 
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 export interface ISmartsocketConstructorOptions {
   alias: string;
@@ -47,7 +47,7 @@ export class Smartsocket {
    */
   public async start() {
     const socketIoModule = this.smartenv.getSafeNodeModule('socket.io');
-    this.io = socketIoModule(this.socketServer.getServerForSocketIo());
+    this.io = socketIoModule(await this.socketServer.getServerForSocketIo());
     await this.socketServer.start();
     this.io.on('connection', (socketArg) => {
       this._handleSocketConnection(socketArg);
@@ -103,7 +103,7 @@ export class Smartsocket {
   /**
    * the standard handler for new socket connections
    */
-  private async _handleSocketConnection(socketArg: SocketIO.Socket) {
+  private async _handleSocketConnection(socketArg: pluginsTyped.socketIo.Socket) {
     const socketConnection: SocketConnection = new SocketConnection({
       alias: undefined,
       authenticated: false,

ts/smartsocket.classes.smartsocketclient.ts

@@ -1,14 +1,14 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
-import * as interfaces from './interfaces';
+import * as interfaces from './interfaces/index.js';
 
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
 import {
   ISocketFunctionCallDataRequest,
   SocketFunction,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
-import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
+import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * interface for class SmartsocketClient
@@ -91,11 +91,11 @@ export class SmartsocketClient {
   public async connect() {
     const done = plugins.smartpromise.defer();
     const smartenvInstance = new plugins.smartenv.Smartenv();
-    const socketIoClient = await smartenvInstance.getEnvAwareModule({
+    const socketIoClient: any = await smartenvInstance.getEnvAwareModule({
       nodeModuleName: 'socket.io-client',
-      webUrlArg: 'https://cdn.jsdelivr.net/npm/socket.io-client@2/dist/socket.io.js',
+      webUrlArg: 'https://cdn.jsdelivr.net/npm/socket.io-client@4/dist/socket.io.js',
       getFunction: () => {
-        return globalThis.io;
+        return (globalThis as any).io;
       },
     });
     logger.log('info', 'trying to connect...');
@@ -105,102 +105,119 @@ export class SmartsocketClient {
       authenticated: false,
       side: 'client',
       smartsocketHost: this,
-      socket: await socketIoClient.connect(socketUrl, {
+      socket: await socketIoClient
-        multiplex: false,
+        .connect(socketUrl, {
-        reconnectionAttempts: 5,
+          multiplex: false,
-        rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
+          autoConnect: false,
-      }),
+          reconnectionAttempts: 0,
+          rejectUnauthorized: socketUrl.startsWith('https://localhost') ? false : true,
+        })
+        .open(),
     });
 
     const timer = new plugins.smarttime.Timer(5000);
     timer.start();
     timer.completed.then(() => {
+      this.updateStatus('timedOut');
       logger.log('warn', 'connection to server timed out.');
-      this.disconnect();
+      this.disconnect(true);
     });
 
     // authentication flow
-    this.socketConnection.socket.on(
+    this.socketConnection.socket.on('requestAuth', (dataArg: interfaces.IRequestAuthPayload) => {
-      'requestAuth',
+      timer.reset();
-      (requestAuthPayload: interfaces.IRequestAuthPayload) => {
+      logger.log('info', `server ${dataArg.serverAlias} requested authentication`);
-        timer.reset();
-        logger.log('info', 'server requested authentication');
 
-        // lets register the authenticated event
+      // lets register the authenticated event
-        this.socketConnection.socket.on('authenticated', async () => {
+      this.socketConnection.socket.on('authenticated', async () => {
-          this.remoteShortId = requestAuthPayload.serverAlias;
+        this.remoteShortId = dataArg.serverAlias;
-          logger.log('info', 'client is authenticated');
+        logger.log('info', 'client is authenticated');
-          this.socketConnection.authenticated = true;
+        this.socketConnection.authenticated = true;
-          await this.socketConnection.listenToFunctionRequests();
+        await this.socketConnection.listenToFunctionRequests();
-        });
+      });
 
-        this.socketConnection.socket.on('serverFullyReactive', async () => {
+      this.socketConnection.socket.on('serverFullyReactive', async () => {
-          // lets take care of retagging
+        // lets take care of retagging
-          const oldTagStore = this.tagStore;
+        const oldTagStore = this.tagStore;
-          this.tagStoreSubscription?.unsubscribe();
+        this.tagStoreSubscription?.unsubscribe();
-          for (const keyArg of Object.keys(this.tagStore)) {
+        for (const keyArg of Object.keys(this.tagStore)) {
-            this.socketConnection.addTag(this.tagStore[keyArg]);
+          this.socketConnection.addTag(this.tagStore[keyArg]);
+        }
+        this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(
+          (tagStoreArg) => {
+            this.tagStore = tagStoreArg;
           }
-          this.tagStoreSubscription = this.socketConnection.tagStoreObservable.subscribe(
+        );
-            (tagStoreArg) => {
-              this.tagStore = tagStoreArg;
-            }
-          );
 
-          for (const tag of Object.keys(oldTagStore)) {
+        for (const tag of Object.keys(oldTagStore)) {
-            await this.addTag(oldTagStore[tag]);
+          await this.addTag(oldTagStore[tag]);
-          }
+        }
-          done.resolve();
+        this.updateStatus('connected');
-        });
+        done.resolve();
+      });
 
-        // lets register the forbidden event
+      // lets register the forbidden event
-        this.socketConnection.socket.on('forbidden', async () => {
+      this.socketConnection.socket.on('forbidden', async () => {
-          logger.log('warn', `disconnecting due to being forbidden to use the ressource`);
+        logger.log('warn', `disconnecting due to being forbidden to use the ressource`);
-          await this.disconnect();
+        await this.disconnect();
-        });
+      });
 
-        // lets provide the actual auth data
+      // lets provide the actual auth data
-        this.socketConnection.socket.emit('dataAuth', {
+      this.socketConnection.socket.emit('dataAuth', {
-          alias: this.alias,
+        alias: this.alias,
-        });
+      });
-      }
+    });
-    );
 
     // handle connection
-    this.socketConnection.socket.on('connect', async () => {
+    this.socketConnection.socket.on('connect', async () => {});
-      this.updateStatus('connected');
-    });
 
     // handle disconnection and errors
     this.socketConnection.socket.on('disconnect', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
 
     this.socketConnection.socket.on('reconnect_failed', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
     this.socketConnection.socket.on('connect_error', async () => {
-      await this.disconnect();
+      await this.disconnect(true);
     });
     return done.promise;
   }
 
+  private disconnectRunning = false;
+
   /**
    * disconnect from the server
    */
-  public async disconnect() {
+  public async disconnect(useAutoReconnectSetting = false) {
+    if (this.disconnectRunning) {
+      return;
+    }
+    this.disconnectRunning = true;
+    this.updateStatus('disconnecting');
     this.tagStoreSubscription?.unsubscribe();
     if (this.socketConnection) {
       await this.socketConnection.disconnect();
       this.socketConnection = undefined;
-      logger.log('ok', 'disconnected!');
+      logger.log('ok', 'disconnected socket!');
+    } else {
+      this.disconnectRunning = false;
+      logger.log('warn', 'tried to disconnect, without a SocketConnection');
+      return;
     }
+
     logger.log('warn', `disconnected from server ${this.remoteShortId}`);
     this.remoteShortId = null;
-    this.updateStatus('disconnected');
 
-    if (this.autoReconnect) {
+    if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
-      this.tryDebouncedReconnect();
+      this.updateStatus('connecting');
+      console.log('debounced reconnect!');
+      await plugins.smartdelay.delayForRandom(10000, 20000);
+      this.disconnectRunning = false;
+      await this.connect();
+    } else {
+      this.disconnectRunning = false;
     }
   }
 
@@ -212,14 +229,6 @@ export class SmartsocketClient {
     await this.disconnect();
   }
 
-  /**
-   * try a reconnection
-   */
-  public async tryDebouncedReconnect() {
-    await plugins.smartdelay.delayForRandom(10000, 50000);
-    await this.connect();
-  }
-
   /**
    * dispatches a server call
    * @param functionNameArg

ts/smartsocket.classes.socketconnection.ts

@@ -1,15 +1,15 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as interfaces from './interfaces';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
+import * as interfaces from './interfaces/index.js';
 
 // import classes
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SocketFunction } from './smartsocket.classes.socketfunction';
+import { SocketFunction } from './smartsocket.classes.socketfunction.js';
-import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest';
+import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest.js';
 
 // socket.io
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { logger } from './smartsocket.logging.js';
-import { logger } from './smartsocket.logging';
 
 // export interfaces
 
@@ -26,7 +26,7 @@ export interface ISocketConnectionConstructorOptions {
   authenticated: boolean;
   side: TSocketConnectionSide;
   smartsocketHost: Smartsocket | SmartsocketClient;
-  socket: SocketIO.Socket | SocketIOClient.Socket;
+  socket: pluginsTyped.socketIo.Socket | pluginsTyped.socketIoClient.Socket;
 }
 
 /**
@@ -47,7 +47,7 @@ export class SocketConnection {
   public side: TSocketConnectionSide;
   public authenticated: boolean = false;
   public smartsocketRef: Smartsocket | SmartsocketClient;
-  public socket: SocketIO.Socket | SocketIOClient.Socket;
+  public socket: pluginsTyped.socketIo.Socket | pluginsTyped.socketIoClient.Socket;
 
   public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
   public eventStatus: interfaces.TConnectionStatus = 'new';
@@ -197,7 +197,7 @@ export class SocketConnection {
         this.remoteTagStoreObservable.next(tagStoreArg);
       });
 
-      logger.log('info', `now listening to function requests for ${this.alias}`);
+      logger.log('info', `now listening to function requests for ${this.alias} on side ${this.side}`);
       done.resolve(this);
     } else {
       const errMessage = 'socket needs to be authenticated first';

ts/smartsocket.classes.socketfunction.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
 
 // import classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
 
 // export interfaces
 

ts/smartsocket.classes.socketrequest.ts

@@ -1,17 +1,17 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
 
 // import interfaces
 import {
   SocketFunction,
   ISocketFunctionCallDataRequest,
   ISocketFunctionCallDataResponse,
-} from './smartsocket.classes.socketfunction';
+} from './smartsocket.classes.socketfunction.js';
 
 // import classes
-import { SocketConnection } from './smartsocket.classes.socketconnection';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
 
 // export interfaces
 export type TSocketRequestStatus = 'new' | 'pending' | 'finished';

ts/smartsocket.classes.socketserver.ts

@@ -1,9 +1,9 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
 
 // used in case no other server is supplied
-import { Smartsocket } from './smartsocket.classes.smartsocket';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * class socketServer
@@ -11,6 +11,7 @@ import { logger } from './smartsocket.logging';
  */
 export class SocketServer {
   private smartsocket: Smartsocket;
+  private httpServerDeferred: plugins.smartpromise.Deferred<any>;
   private httpServer: pluginsTyped.http.Server | pluginsTyped.https.Server;
   
   /**
@@ -30,14 +31,19 @@ export class SocketServer {
     serverType: 'smartexpress',
     serverArg: pluginsTyped.smartexpress.Server
   ) {
+    this.httpServerDeferred = plugins.smartpromise.defer();
     await serverArg.startedPromise;
     this.httpServer = serverArg.httpServer;
+    this.httpServerDeferred.resolve();
   }
 
   /**
    * gets the server for socket.io
    */
-  public getServerForSocketIo() {
+  public async getServerForSocketIo() {
+    if (this.httpServerDeferred) {
+      await this.httpServerDeferred.promise;
+    }
     if (this.httpServer) {
       return this.httpServer;
     } else {

ts/smartsocket.logging.ts

@@ -1,3 +1,3 @@
-import * as plugins from './smartsocket.plugins';
+import * as plugins from './smartsocket.plugins.js';
 
 export const logger = new plugins.smartlog.ConsoleLog();

ts/smartsocket.pluginstyped.ts

@@ -1,6 +1,6 @@
 // node native
-import type http from 'http';
+import type * as http from 'http';
-import type https from 'https';
+import type * as https from 'https';
 
 export { http, https };
 
@@ -11,6 +11,10 @@ export { smartexpress };
 
 // third party scope
 import type socketIo from 'socket.io';
-import type socketIoClient from 'socket.io-client';
+import type { Socket as ClientSocket, connect as ClientIo } from 'socket.io-client';
 
-export { socketIoClient, socketIo };
+export { socketIo };
+export namespace socketIoClient {
+  export type Socket = ClientSocket;
+  export type connect = typeof ClientIo;
+}

tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "module": "ES2020",
+    "moduleResolution": "node12",
+    "esModuleInterop": true
+  }
+}