1.1.58

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.1.55",
+  "version": "1.1.58",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.1.55",
+  "version": "1.1.58",
   "description": "easy and secure websocket communication",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

ts/interfaces/connection.ts

@@ -2,4 +2,4 @@ export interface IRequestAuthPayload {
   serverShortId: string;
 }
 
-export type TConnectionEvent = 'terminated' | 'error';
+export type TConnectionStatus = 'new' | 'connecting' | 'connected' | 'disconnecting' | 'disconnected';

ts/smartsocket.classes.smartsocketclient.ts

@@ -33,7 +33,9 @@ export class SmartsocketClient {
   public serverPort: number;
   public autoReconnect: boolean;
 
-  public eventSubject = new plugins.smartrx.rxjs.Subject();
+  // status handling
+  public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
+  public eventStatus: interfaces.TConnectionStatus = 'new';
 
   public socketFunctions = new plugins.lik.Objectmap<SocketFunction<any>>();
   public socketRequests = new plugins.lik.Objectmap<SocketRequest<any>>();
@@ -110,6 +112,11 @@ export class SmartsocketClient {
 
     });
 
+    // handle connection
+    this.socketConnection.socket.on('connect', async () => {
+      this.updateStatus('connected');
+    });
+
     // handle disconnection and errors
     this.socketConnection.socket.on('disconnect', async () => {
       await this.disconnect();
@@ -135,6 +142,7 @@ export class SmartsocketClient {
     }
     defaultLogger.log('warn', `disconnected from server ${this.remoteShortId}`);
     this.remoteShortId = null;
+    this.updateStatus('disconnected');
 
     if (this.autoReconnect) {
       this.tryDebouncedReconnect();
@@ -169,4 +177,11 @@ export class SmartsocketClient {
     const result = response.funcDataArg;
     return result;
   }
+
+  private updateStatus (statusArg: interfaces.TConnectionStatus) {
+    if (this.eventStatus !== statusArg) {
+      this.eventSubject.next(statusArg);
+    }
+    this.eventStatus = statusArg;
+  }
 }

ts/smartsocket.classes.socketconnection.ts

@@ -55,7 +55,8 @@ export class SocketConnection {
   public smartsocketRef: Smartsocket | SmartsocketClient;
   public socket: SocketIO.Socket | SocketIOClient.Socket;
 
-  public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionEvent>();
+  public eventSubject = new plugins.smartrx.rxjs.Subject<interfaces.TConnectionStatus>();
+  public eventStatus: interfaces.TConnectionStatus = 'new';
 
   constructor(optionsArg: ISocketConnectionConstructorOptions) {
     this.alias = optionsArg.alias;
@@ -67,6 +68,11 @@ export class SocketConnection {
 
     // standard behaviour that is always true
     allSocketConnections.add(this);
+
+    // handle connection
+    this.socket.on('connect', async () => {
+      this.updateStatus('connected');
+    });
     this.socket.on('disconnect', async () => {
       plugins.smartlog.defaultLogger.log(
         'info',
@@ -173,6 +179,13 @@ export class SocketConnection {
   // disconnecting ----------------------
   public async disconnect() {
     this.socket.disconnect(true);
-    this.eventSubject.next('terminated');
+    this.updateStatus('disconnected');
+  }
+
+  private updateStatus (statusArg: interfaces.TConnectionStatus) {
+    if (this.eventStatus !== statusArg) {
+      this.eventSubject.next(statusArg);
+    }
+    this.eventStatus = statusArg;
   }
 }