pusher-js 8.1.0 → 8.3.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 8.3.0
+
+- [CHANGED] Update cached re-connect strategy to prioritize WebSocket
+
+## 8.2.0
+
+- [CHANGED] Remove WebSocket retry limit.
+
 ## 8.1.0
 
 - [CHANGED] Move @types dependencies to devDependencies

package/dist/node/pusher.js

@@ -1,5 +1,5 @@
 /*!
- * Pusher JavaScript Library v8.1.0
+ * Pusher JavaScript Library v8.3.0
  * https://pusher.com/
  *
  * Copyright 2020, Pusher
@@ -7499,7 +7499,7 @@ function safeJSONStringify(source) {
 
 // CONCATENATED MODULE: ./src/core/defaults.ts
 var Defaults = {
-    VERSION: "8.1.0",
+    VERSION: "8.3.0",
     PROTOCOL: 7,
     wsPort: 80,
     wssPort: 443,
@@ -9224,12 +9224,12 @@ function abortRunner(runner) {
     }
 }
 
-// CONCATENATED MODULE: ./src/core/strategies/cached_strategy.ts
+// CONCATENATED MODULE: ./src/core/strategies/websocket_prioritized_cached_strategy.ts
 
 
 
 
-class cached_strategy_CachedStrategy {
+class websocket_prioritized_cached_strategy_WebSocketPrioritizedCachedStrategy {
     constructor(strategy, transports, options) {
         this.strategy = strategy;
         this.transports = transports;
@@ -9243,19 +9243,25 @@ class cached_strategy_CachedStrategy {
     connect(minPriority, callback) {
         var usingTLS = this.usingTLS;
         var info = fetchTransportCache(usingTLS);
+        var cacheSkipCount = info && info.cacheSkipCount ? info.cacheSkipCount : 0;
         var strategies = [this.strategy];
         if (info && info.timestamp + this.ttl >= util.now()) {
             var transport = this.transports[info.transport];
             if (transport) {
-                this.timeline.info({
-                    cached: true,
-                    transport: info.transport,
-                    latency: info.latency
-                });
-                strategies.push(new sequential_strategy_SequentialStrategy([transport], {
-                    timeout: info.latency * 2 + 1000,
-                    failFast: true
-                }));
+                if (['ws', 'wss'].includes(info.transport) || cacheSkipCount > 3) {
+                    this.timeline.info({
+                        cached: true,
+                        transport: info.transport,
+                        latency: info.latency
+                    });
+                    strategies.push(new sequential_strategy_SequentialStrategy([transport], {
+                        timeout: info.latency * 2 + 1000,
+                        failFast: true
+                    }));
+                }
+                else {
+                    cacheSkipCount++;
+                }
             }
         }
         var startTimestamp = util.now();
@@ -9273,7 +9279,7 @@ class cached_strategy_CachedStrategy {
                 }
             }
             else {
-                storeTransportCache(usingTLS, handshake.transport.name, util.now() - startTimestamp);
+                storeTransportCache(usingTLS, handshake.transport.name, util.now() - startTimestamp, cacheSkipCount);
                 callback(null, handshake);
             }
         });
@@ -9308,14 +9314,15 @@ function fetchTransportCache(usingTLS) {
     }
     return null;
 }
-function storeTransportCache(usingTLS, transport, latency) {
+function storeTransportCache(usingTLS, transport, latency, cacheSkipCount) {
     var storage = node_runtime.getLocalStorage();
     if (storage) {
         try {
             storage[getTransportCacheKey(usingTLS)] = safeJSONStringify({
                 timestamp: util.now(),
                 transport: transport,
-                latency: latency
+                latency: latency,
+                cacheSkipCount: cacheSkipCount
             });
         }
         catch (e) {
@@ -9442,7 +9449,6 @@ var getDefaultStrategy = function (config, baseOptions, defineTransport) {
         timeoutLimit: 60000
     };
     var ws_manager = new transport_manager_TransportManager({
-        lives: 2,
         minPingDelay: 10000,
         maxPingDelay: config.activityTimeout
     });
@@ -9479,7 +9485,7 @@ var getDefaultStrategy = function (config, baseOptions, defineTransport) {
             new delayed_strategy_DelayedStrategy(http_loop, { delay: 5000 })
         ]);
     }
-    return new cached_strategy_CachedStrategy(new FirstConnectedStrategy(new IfStrategy(testSupportsStrategy(ws_transport), wsStrategy, http_loop)), definedTransports, {
+    return new websocket_prioritized_cached_strategy_WebSocketPrioritizedCachedStrategy(new FirstConnectedStrategy(new IfStrategy(testSupportsStrategy(ws_transport), wsStrategy, http_loop)), definedTransports, {
         ttl: 1800000,
         timeline: baseOptions.timeline,
         useTLS: baseOptions.useTLS