1.1.53

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.1.49",
+  "version": "1.1.53",
   "description": "easy and secure websocket communication",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -21,25 +21,25 @@
   "dependencies": {
     "@apiglobal/typedrequest-interfaces": "^1.0.7",
     "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartdelay": "^2.0.3",
+    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartexpress": "^3.0.40",
+    "@pushrocks/smartexpress": "^3.0.52",
     "@pushrocks/smarthash": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.19",
+    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.6",
-    "@types/shortid": "0.0.29",
+    "@pushrocks/smartrx": "^2.0.5",
-    "@types/socket.io": "^2.1.2",
+    "@pushrocks/smartunique": "^3.0.1",
+    "@types/socket.io": "^2.1.4",
     "@types/socket.io-client": "^1.4.32",
-    "shortid": "^2.2.15",
+    "socket.io": "^2.3.0",
-    "socket.io": "^2.2.0",
+    "socket.io-client": "^2.3.0"
-    "socket.io-client": "^2.2.0"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
     "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.24",
+    "@gitzone/tstest": "^1.0.28",
     "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^12.7.4",
+    "@types/node": "^12.12.5",
-    "tslint": "^5.19.0",
+    "tslint": "^5.20.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "private": false,

test/test.ts

@@ -21,7 +21,7 @@ export interface IReqResClient {
   };
   response: {
     value1: string;
-  }
+  };
 }
 
 export interface IReqResServer {

ts/smartsocket.classes.smartsocket.ts

@@ -16,6 +16,10 @@ export interface ISmartsocketConstructorOptions {
 }
 
 export class Smartsocket {
+  /**
+   * a unique id to detect server restarts
+   */
+  public id = plugins.smartunique.shortId();
   public options: ISmartsocketConstructorOptions;
   public io: SocketIO.Server;
   public socketConnections = new Objectmap<SocketConnection>();
@@ -80,7 +84,7 @@ export class Smartsocket {
         funcName: functionNameArg
       },
       originSocketConnection: targetSocketConnectionArg,
-      shortId: plugins.shortid.generate(),
+      shortId: plugins.smartunique.shortId(),
       side: 'requesting'
     });
     const response: ISocketFunctionCallDataResponse<T> = await socketRequest.dispatch();

ts/smartsocket.classes.smartsocketclient.ts

@@ -23,6 +23,8 @@ export class SmartsocketClient {
   public serverUrl: string;
   public serverPort: number;
 
+  // public eventSubject = new plugins.smart
+
   public socketFunctions = new plugins.lik.Objectmap<SocketFunction<any>>();
   public socketRequests = new plugins.lik.Objectmap<SocketRequest<any>>();
   public socketRoles = new plugins.lik.Objectmap<SocketRole>();
@@ -55,7 +57,10 @@ export class SmartsocketClient {
       role: this.socketRole,
       side: 'client',
       smartsocketHost: this,
-      socket: plugins.socketIoClient(socketUrl, { multiplex: false })
+      socket: plugins.socketIoClient(socketUrl, {
+        multiplex: false,
+        reconnectionAttempts: 5,
+      })
     });
     this.socketConnection.socket.on('requestAuth', () => {
       plugins.smartlog.defaultLogger.log('info', 'server requested authentication');
@@ -70,6 +75,14 @@ export class SmartsocketClient {
         this.socketConnection.listenToFunctionRequests();
         done.resolve();
       });
+
+      // handle errors
+      this.socketConnection.socket.on('reconnect_failed', async () => {
+        this.disconnect();
+      });
+      this.socketConnection.socket.on('connect_error', async () => {
+        this.disconnect();
+      });
     });
     return done.promise;
   }
@@ -78,9 +91,19 @@ export class SmartsocketClient {
    * disconnect from the server
    */
   public async disconnect() {
-    this.socketConnection.socket.disconnect(true);
+    if (this.socketConnection) {
-    this.socketConnection = undefined;
+      this.socketConnection.socket.disconnect(true);
-    plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
+      this.socketConnection = undefined;
+      plugins.smartlog.defaultLogger.log('ok', 'disconnected!');
+    }
+  }
+
+  /**
+   * try a reconnection
+   */
+  public async tryDebouncedReconnect() {
+    await plugins.smartdelay.delayForRandom(10000, 60000);
+    await this.connect();
   }
 
   /**
@@ -93,7 +116,7 @@ export class SmartsocketClient {
     const socketRequest = new SocketRequest<T>(this, {
       side: 'requesting',
       originSocketConnection: this.socketConnection,
-      shortId: plugins.shortid.generate(),
+      shortId: plugins.smartunique.shortId(),
       funcCallData: {
         funcName: functionNameArg,
         funcDataArg: dataArg

ts/smartsocket.plugins.ts

@@ -10,6 +10,7 @@ import * as smarthash from '@pushrocks/smarthash';
 import * as smartdelay from '@pushrocks/smartdelay';
 import * as smartexpress from '@pushrocks/smartexpress';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartunique from '@pushrocks/smartunique';
 
 
 export {
@@ -18,16 +19,15 @@ export {
   smarthash,
   smartdelay,
   smartexpress,
-  smartpromise
+  smartpromise,
+  smartunique,
 };
 
 // third party scope
-import * as shortid from 'shortid';
 import socketIo from 'socket.io';
 import socketIoClient from 'socket.io-client';
 
 export {
-  shortid,
   socketIo,
   socketIoClient
 };