1.2.21

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartsocket",
-  "version": "1.2.19",
+  "version": "1.2.21",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartsocket",
-      "version": "1.2.19",
+      "version": "1.2.21",
       "license": "MIT",
       "dependencies": {
         "@apiglobal/typedrequest-interfaces": "^1.0.15",

package.json

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

ts/interfaces/connection.ts

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

ts/smartsocket.classes.smartsocketclient.ts

@@ -118,6 +118,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);
     });
@@ -184,28 +185,37 @@ export class SmartsocketClient {
     return done.promise;
   }
 
+  private disconnectRunning = false;
+
   /**
    * disconnect from the server
    */
-  public async disconnect(useAutoconnectSetting = false) {
-    if (this.eventStatus === 'disconnecting') {
+  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 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;
 
-    if (this.autoReconnect && useAutoconnectSetting && this.eventStatus !== 'connecting') {
+    if (this.autoReconnect && useAutoReconnectSetting && this.eventStatus !== 'connecting') {
       this.updateStatus('connecting');
-      this.tryDebouncedReconnect();
-    } else if (this.eventStatus === 'connected') {
-      this.updateStatus('disconnected');
+      await this.tryDebouncedReconnect();
+      this.disconnectRunning = false;
+    } else {
+      this.disconnectRunning = false;
     }
   }