2.0.9

.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.20",
+  "version": "2.0.9",
   "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 && tsbundle --from ./ts/index.ts --to dist_bundle/bundle.js)"
   },
   "repository": {
     "type": "git",
@@ -19,29 +20,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartsocket#README",
   "dependencies": {
-    "@apiglobal/typedrequest-interfaces": "^1.0.15",
-    "@pushrocks/isohash": "^1.0.2",
+    "@apiglobal/typedrequest-interfaces": "^2.0.1",
+    "@pushrocks/isohash": "^2.0.0",
     "@pushrocks/isounique": "^1.0.5",
-    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/lik": "^6.0.0",
     "@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/smartrx": "^2.0.19",
-    "@pushrocks/smarttime": "^3.0.43",
-    "socket.io": "^4.4.1",
-    "socket.io-client": "^4.4.1"
+    "@pushrocks/smartenv": "^5.0.2",
+    "@pushrocks/smartexpress": "^4.0.18",
+    "@pushrocks/smartjson": "^5.0.1",
+    "@pushrocks/smartlog": "^3.0.1",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrx": "^3.0.0",
+    "@pushrocks/smarttime": "^4.0.0",
+    "socket.io": "^4.5.1",
+    "socket.io-client": "^4.5.1"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tsrun": "^1.2.18",
-    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.15",
-    "@types/node": "^17.0.10",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.72",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.6.3"
   },
   "private": false,
   "files": [

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,7 +1,7 @@
 // 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';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
@@ -79,7 +79,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) => {
@@ -92,7 +92,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('should be able to make a functionCall from client to server', async () => {
@@ -100,7 +100,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 () => {
@@ -114,14 +114,14 @@ 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 (toolsArg) => {
   await testSmartsocketClient.disconnect();
   await testSmartsocketClient.connect();
   await toolsArg.delayFor(2000);
-  expect(testSmartsocket.socketConnections.getArray().length).to.equal(1);
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
 });
 
 // class smartsocket
@@ -133,19 +133,20 @@ tap.test('should be able to switch to a new server', async (toolsArg) => {
 });
 
 tap.test('should be able to locate a connection tag after reconnect', async (tools) => {
-  expect(testSmartsocket.socketConnections.getArray().length).to.equal(1);
+  expect(testSmartsocket.socketConnections.getArray().length).toEqual(1);
   const tagOnServerSide = await testSmartsocket.socketConnections
     .findSync((socketConnection) => {
       return true;
     })
     .getTagById('awesome');
-  expect(tagOnServerSide.payload).to.equal('yes');
+  expect(tagOnServerSide.payload).toEqual('yes');
 });
 
 // terminate
-tap.test('should close the server', async () => {
+tap.test('should close the server', async (tools) => {
   await testSmartsocketClient.stop();
   await testSmartsocket.stop();
+  tools.delayFor(1000).then(() => process.exit(0));
 });
 
 tap.start();

test/test.tagging.ts

@@ -1,7 +1,7 @@
 // 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';
 
 let testSmartsocket: smartsocket.Smartsocket;
 let testSmartsocketClient: smartsocket.SmartsocketClient;
@@ -35,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
@@ -82,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) => {
@@ -95,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 () => {
@@ -107,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 () => {
@@ -121,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) => {
@@ -136,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/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartsocket',
+  version: '2.0.9',
+  description: 'easy and secure websocket communication'
+}

ts/index.ts

@@ -1,7 +1,7 @@
 // export main classes
-export * from './smartsocket.classes.smartsocket';
-export * from './smartsocket.classes.smartsocketclient';
+export * from './smartsocket.classes.smartsocket.js';
+export * from './smartsocket.classes.smartsocketclient.js';
 
 // export further classes and objects
-export * from './smartsocket.classes.socketfunction';
-export * from './smartsocket.classes.socketconnection';
+export * from './smartsocket.classes.socketfunction.js';
+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 './tag';
+export * from './connection.js';
+export * from './tag.js';

ts/smartsocket.classes.smartsocket.ts

@@ -1,17 +1,17 @@
-import * as plugins from './smartsocket.plugins';
-import * as pluginsTyped from './smartsocket.pluginstyped';
+import * as plugins from './smartsocket.plugins.js';
+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';
-import { SocketRequest } from './smartsocket.classes.socketrequest';
-import { SocketServer } from './smartsocket.classes.socketserver';
+} from './smartsocket.classes.socketfunction.js';
+import { SocketRequest } from './smartsocket.classes.socketrequest.js';
+import { SocketServer } from './smartsocket.classes.socketserver.js';
 
-import { logger } from './smartsocket.logging';
+import { logger } from './smartsocket.logging.js';
 
 export interface ISmartsocketConstructorOptions {
   alias: string;
@@ -46,8 +46,8 @@ export class Smartsocket {
    * starts smartsocket
    */
   public async start() {
-    const socketIoModule = this.smartenv.getSafeNodeModule('socket.io');
-    this.io = socketIoModule(await this.socketServer.getServerForSocketIo());
+    const socketIoModule = await this.smartenv.getSafeNodeModule('socket.io');
+    this.io = new socketIoModule.Server(await this.socketServer.getServerForSocketIo());
     await this.socketServer.start();
     this.io.on('connection', (socketArg) => {
       this._handleSocketConnection(socketArg);

ts/smartsocket.classes.smartsocketclient.ts

@@ -1,14 +1,14 @@
-import * as plugins from './smartsocket.plugins';
-import * as pluginsTyped from './smartsocket.pluginstyped';
-import * as interfaces from './interfaces';
+import * as plugins from './smartsocket.plugins.js';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
+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';
-import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest';
-import { logger } from './smartsocket.logging';
+} from './smartsocket.classes.socketfunction.js';
+import { ISocketRequestDataObject, SocketRequest } from './smartsocket.classes.socketrequest.js';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * interface for class SmartsocketClient
@@ -95,7 +95,10 @@ export class SmartsocketClient {
       nodeModuleName: 'socket.io-client',
       webUrlArg: 'https://cdn.jsdelivr.net/npm/socket.io-client@4/dist/socket.io.js',
       getFunction: () => {
-        return (globalThis as any).io;
+        const socketIoBrowserModule = (globalThis as any).io;
+        console.log('loaded socket.io for browser');
+        console.log(socketIoBrowserModule);
+        return socketIoBrowserModule;
       },
     });
     logger.log('info', 'trying to connect...');
@@ -118,6 +121,7 @@ export class SmartsocketClient {
     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(true);
     });
@@ -189,7 +193,7 @@ export class SmartsocketClient {
   /**
    * disconnect from the server
    */
-  public async disconnect(useAutoconnectSetting = false) {
+  public async disconnect(useAutoReconnectSetting = false) {
     if (this.disconnectRunning) {
       return;
     }
@@ -209,10 +213,12 @@ export class SmartsocketClient {
     logger.log('warn', `disconnected from server ${this.remoteShortId}`);
     this.remoteShortId = null;
 
-    if (this.autoReconnect && useAutoconnectSetting && this.eventStatus !== 'connecting') {
+    if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
       this.updateStatus('connecting');
-      await this.tryDebouncedReconnect();
+      console.log('debounced reconnect!');
+      await plugins.smartdelay.delayForRandom(10000, 20000);
       this.disconnectRunning = false;
+      await this.connect();
     } else {
       this.disconnectRunning = false;
     }
@@ -226,15 +232,6 @@ export class SmartsocketClient {
     await this.disconnect();
   }
 
-  /**
-   * try a reconnection
-   */
-  public async tryDebouncedReconnect() {
-    console.log('debounced reconnect!');
-    await plugins.smartdelay.delayForRandom(10000, 20000);
-    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 pluginsTyped from './smartsocket.pluginstyped';
-import * as interfaces from './interfaces';
+import * as plugins from './smartsocket.plugins.js';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
+import * as interfaces from './interfaces/index.js';
 
 // import classes
-import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SocketFunction } from './smartsocket.classes.socketfunction';
-import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
+import { SocketFunction } from './smartsocket.classes.socketfunction.js';
+import { SocketRequest, ISocketRequestDataObject } from './smartsocket.classes.socketrequest.js';
 
 // socket.io
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
-import { logger } from './smartsocket.logging';
+import { SmartsocketClient } from './smartsocket.classes.smartsocketclient.js';
+import { logger } from './smartsocket.logging.js';
 
 // export interfaces
 

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 { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
+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 { logger } from './smartsocket.logging';
-import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { SmartsocketClient } from './smartsocket.classes.smartsocketclient';
+import { SocketConnection } from './smartsocket.classes.socketconnection.js';
+import { logger } from './smartsocket.logging.js';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
+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 pluginsTyped from './smartsocket.pluginstyped';
+import * as plugins from './smartsocket.plugins.js';
+import * as pluginsTyped from './smartsocket.pluginstyped.js';
 
 // used in case no other server is supplied
-import { Smartsocket } from './smartsocket.classes.smartsocket';
-import { logger } from './smartsocket.logging';
+import { Smartsocket } from './smartsocket.classes.smartsocket.js';
+import { logger } from './smartsocket.logging.js';
 
 /**
  * class socketServer
@@ -47,7 +47,7 @@ export class SocketServer {
     if (this.httpServer) {
       return this.httpServer;
     } else {
-      const httpModule = this.smartsocket.smartenv.getSafeNodeModule('http');
+      const httpModule = await this.smartsocket.smartenv.getSafeNodeModule('http');
       this.httpServer = new httpModule.Server();
       this.standaloneServer = true;
       return this.httpServer;

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 https from 'https';
+import type * as http from 'http';
+import type * as https from 'https';
 
 export { http, https };
 
@@ -10,10 +10,13 @@ import type * as smartexpress from '@pushrocks/smartexpress';
 export { smartexpress };
 
 // third party scope
-import type socketIo from 'socket.io';
+import type { Socket as ServerSocket, Server as ServerServer} from 'socket.io';
 import type { Socket as ClientSocket, connect as ClientIo } from 'socket.io-client';
 
-export { socketIo };
+export namespace socketIo {
+  export type Socket = ServerSocket;
+  export type Server = ServerServer;
+}
 export namespace socketIoClient {
   export type Socket = ClientSocket;
   export type connect = typeof ClientIo;

tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext",
+    "esModuleInterop": true
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}