active-connect-ng2 0.2.46 → 0.2.48

package/fesm2020/active-connect-ng2.mjs

@@ -102,7 +102,8 @@ class WebsocketClient {
             url = protocol + '//' + document.location.hostname + port + '/wss';
         }
         this.url = url;
-        this.disconnect(false);
+        // Initial setup: nothing to tear down yet, just open the first connection.
+        this.closed = false;
         this.connect(this.url);
     }
     connect(url) {
@@ -110,10 +111,12 @@ class WebsocketClient {
             this.target.___connectionId = 0;
         }
         this.target.___connectionId++;
-        if (!this.subject) {
-            this.create(url);
+        if (this.ws &&
+            (this.ws.readyState === WebSocket.CONNECTING ||
+                this.ws.readyState === WebSocket.OPEN)) {
+            return;
         }
-        return this.subject;
+        this.create(url);
     }
     initTabSuspendedListener() {
         if (document) {
@@ -124,6 +127,7 @@ class WebsocketClient {
                 }
                 else if (document.visibilityState === 'visible') {
                     console.log('ActiveConnect: Reconnecting WebSocket...');
+                    this.closed = false;
                     this.connect(this.url);
                 }
             });
@@ -155,7 +159,7 @@ class WebsocketClient {
                     setTimeout(() => {
                         this.resetRequestedState();
                         this.requestStack.forEach((e) => {
-                            this.sendToSocket(e.method, e.data);
+                            this.sendToSocket(e.method, e.data, false, e.messageId);
                             this.requestStack = this.requestStack.filter((e1) => e1 != e);
                         });
                     }, 2000);
@@ -169,7 +173,7 @@ class WebsocketClient {
         if (this.connectionEstablishedOnce) {
             // reset requested state for outbounds
             WebsocketClient.resetRequestedStateCallbacks.forEach((reset) => {
-                reset();
+                reset(this);
             });
         }
         else {
@@ -180,6 +184,20 @@ class WebsocketClient {
         WebsocketClient.resetRequestedStateCallbacks.push(callback);
     }
     create(url) {
+        if (this.ws) {
+            // Detach handlers first so the old socket's close event can't trigger
+            // another reconnect cycle once it's no longer the "current" socket.
+            this.ws.onopen = null;
+            this.ws.onmessage = null;
+            this.ws.onerror = null;
+            this.ws.onclose = null;
+            if (this.ws.readyState === WebSocket.CONNECTING ||
+                this.ws.readyState === WebSocket.OPEN) {
+                this.ws.close();
+            }
+        }
+        this.clearReconnectTimer();
+        this.closed = false;
         // create new connection
         this.logEntry('TCP/HTTP:CONNECT-SERVER');
         this.ws = new WebSocket(url + (this.supportsCache ? '?cache=true' : ''));
@@ -191,7 +209,6 @@ class WebsocketClient {
         this.ws.onopen = () => {
             this.logEntry('TCP/HTTP:CONNECTED');
             this.Connected = true;
-            this.closed = false;
         };
         this.ws.onmessage = (e) => {
             this.messageReceived(JsonParser.parse(e.data.toString()));
@@ -203,14 +220,22 @@ class WebsocketClient {
                     this.pool.WssConnected = false;
                 this.logEntry('TCP/HTTP:RESET-REQUESTED-OUTBOUND-STATE');
                 this.resetRequestedState();
-                setTimeout(() => {
+                this.clearReconnectTimer();
+                this.reconnectTimer = setTimeout(() => {
+                    this.reconnectTimer = undefined;
                     this.connect(url);
                 }, 1000);
             }
         };
     }
-    sendToSocket(method, data, dontEnsureTransmission) {
-        const messageId = ++this.messageId;
+    clearReconnectTimer() {
+        if (this.reconnectTimer !== undefined) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = undefined;
+        }
+    }
+    sendToSocket(method, data, dontEnsureTransmission, forcedMessageId) {
+        const messageId = forcedMessageId ?? ++this.messageId;
         if (this.ws.readyState != this.ws.OPEN) {
             if (!dontEnsureTransmission)
                 this.requestStack.push({ method, data, messageId });
@@ -254,7 +279,7 @@ class WebsocketClient {
             }
         });
     }
-    messageReceived({ method, value, messageId, specificHash, inserted, updated, deleted, length, }) {
+    messageReceived({ method, value, messageId, specificHash, inserted, updated, deleted, length }) {
         this.logEntry('RECEIVED:' + method);
         if (method == '___cache') {
             this.handleOutboundCacheRequest(value);
@@ -306,13 +331,13 @@ class WebsocketClient {
                     if (item) {
                         this.send('___cache', {
                             method,
-                            specificHash: item.specificHash || null,
+                            specificHash: item.specificHash || null
                         });
                     }
                     else {
                         this.send('___cache', {
                             method,
-                            specificHash: null,
+                            specificHash: null
                         });
                     }
                 });
@@ -320,7 +345,7 @@ class WebsocketClient {
             catch (e) {
                 this.send('___cache', {
                     method,
-                    specificHash: null,
+                    specificHash: null
                 });
                 console.error('ActiveConnect: ' + e);
             }
@@ -328,7 +353,7 @@ class WebsocketClient {
         else {
             this.send('___cache', {
                 method,
-                specificHash: null,
+                specificHash: null
             });
             console.error('Active-Connect: Caching not possible as the indexedDB has not been initialized');
         }
@@ -349,7 +374,7 @@ class WebsocketClient {
         const browser = this.getBrowser();
         const os = this.getOS();
         this.send('___browser', {
-            browser: `${browser.name} ${browser.version} ${os}`,
+            browser: `${browser.name} ${browser.version} ${os}`
         });
     }
     getBrowser() {
@@ -371,7 +396,7 @@ class WebsocketClient {
         }
         return {
             name: M[0],
-            version: M[1],
+            version: M[1]
         };
     }
     getOS() {
@@ -410,10 +435,16 @@ class WebsocketClient {
         });
     }
     disconnect(restart) {
-        if (!restart)
-            this.closed = true;
+        this.closed = true;
+        this.clearReconnectTimer();
         if (this.ws)
             this.ws.close();
+        if (!restart) {
+            this.ws.onopen = null;
+            this.ws.onmessage = null;
+            this.ws.onerror = null;
+            this.ws.onclose = null;
+        }
     }
     initCache() { }
     get target() {
@@ -588,7 +619,7 @@ function Outbound(method, requestingRequired, cached, sortBy) {
                                     .update('outbound', {
                                     method,
                                     data,
-                                    specificHash,
+                                    specificHash
                                 })
                                     .subscribe(() => { });
                             }
@@ -628,7 +659,7 @@ function Outbound(method, requestingRequired, cached, sortBy) {
                                     .update('outbound', {
                                     method,
                                     data,
-                                    specificHash,
+                                    specificHash
                                 })
                                     .subscribe(() => { });
                             }
@@ -656,9 +687,9 @@ function Outbound(method, requestingRequired, cached, sortBy) {
             }
         });
         if (requestingRequired) {
-            WebsocketClient.addResetRequestingStateCallback(function callback() {
-                if (target.___requested) {
-                    target.___requested[propertyKey] = false;
+            WebsocketClient.addResetRequestingStateCallback(function callback(client) {
+                if (target.___requested && target.___requested[propertyKey]) {
+                    client.send('request.' + method, null).then();
                 }
             });
         }
@@ -688,7 +719,7 @@ function Outbound(method, requestingRequired, cached, sortBy) {
                 if (sortBy && val)
                     val = val.sort(sortBy);
                 return (target.___data[propertyKey] = val);
-            },
+            }
         };
         target[propertyKey] = obj;
         return obj;
@@ -924,7 +955,7 @@ class OutboundObject {
                                     method,
                                     data: _this.data,
                                     specificHash,
-                                    length,
+                                    length
                                 })
                                     .subscribe(() => { });
                             }
@@ -963,7 +994,7 @@ class OutboundObject {
                                     method,
                                     data,
                                     specificHash,
-                                    length,
+                                    length
                                 })
                                     .subscribe(() => { });
                             }
@@ -1101,7 +1132,7 @@ class OutboundObject {
                             : undefined
                         : undefined
                     : this.previouslyCachedCount || this.initialLoadingCount,
-                loaded: this.loadedLength,
+                loaded: this.loadedLength
             });
         }
         else {
@@ -1161,7 +1192,7 @@ class OutboundObject {
     afterServerReconnected() {
         if (this.requested && this.lazyLoaded) {
             this.requested = false;
-            this.load(1).then();
+            this.load(this.loadedLength).then();
         }
         if (this.loadedId) {
             this.loadedIdData = null;