Only memorize lonpgoll fallback if primary transport never establishe…

…d connection. Closes #5741

assets/js/phoenix/socket.js

@@ -115,6 +115,7 @@ export default class Socket {
     this.ref = 0
     this.timeout = opts.timeout || DEFAULT_TIMEOUT
     this.transport = opts.transport || global.WebSocket || LongPoll
+    this.primaryPassedHealthCheck = false
     this.longPollFallbackMs = opts.longPollFallbackMs
     this.fallbackTimer = null
     this.sessionStore = opts.sessionStorage || global.sessionStorage
@@ -366,11 +367,10 @@ export default class Socket {
       this.log("transport", `falling back to ${fallbackTransport.name}...`, reason)
       this.off([openRef, errorRef])
       primaryTransport = false
-      this.storeSession("phx:longpoll", "true")
       this.replaceTransport(fallbackTransport)
       this.transportConnect()
     }
-    if(this.getSession("phx:longpoll")){ return fallback("memorized") }
+    if(this.getSession(`phx:fallback:${fallbackTransport.name}`)){ return fallback("memorized") }
 
     this.fallbackTimer = setTimeout(fallback, fallbackThreshold)
 
@@ -384,13 +384,16 @@ export default class Socket {
     this.onOpen(() => {
       established = true
       if(!primaryTransport){
-        return console.log("transport", `established ${fallbackTransport.name} fallback`)
+        // only memorize LP if we never connected to primary
+        if(!this.primaryPassedHealthCheck){ this.storeSession(`phx:fallback:${fallbackTransport.name}`, "true") }
+        return this.log("transport", `established ${fallbackTransport.name} fallback`)
       }
       // if we've established primary, give the fallback a new period to attempt ping
       clearTimeout(this.fallbackTimer)
       this.fallbackTimer = setTimeout(fallback, fallbackThreshold)
       this.ping(rtt => {
         this.log("transport", "connected to primary after", rtt)
+        this.primaryPassedHealthCheck = true
         clearTimeout(this.fallbackTimer)
       })
     })

priv/static/phoenix.js

@@ -1026,6 +1026,7 @@ var Phoenix = (() => {
       this.ref = 0;
       this.timeout = opts.timeout || DEFAULT_TIMEOUT;
       this.transport = opts.transport || global.WebSocket || LongPoll;
+      this.primaryPassedHealthCheck = false;
       this.longPollFallbackMs = opts.longPollFallbackMs;
       this.fallbackTimer = null;
       this.sessionStore = opts.sessionStorage || global.sessionStorage;
@@ -1282,11 +1283,10 @@ var Phoenix = (() => {
         this.log("transport", `falling back to ${fallbackTransport.name}...`, reason);
         this.off([openRef, errorRef]);
         primaryTransport = false;
-        this.storeSession("phx:longpoll", "true");
         this.replaceTransport(fallbackTransport);
         this.transportConnect();
       };
-      if (this.getSession("phx:longpoll")) {
+      if (this.getSession(`phx:fallback:${fallbackTransport.name}`)) {
         return fallback("memorized");
       }
       this.fallbackTimer = setTimeout(fallback, fallbackThreshold);
@@ -1300,12 +1300,16 @@ var Phoenix = (() => {
       this.onOpen(() => {
         established = true;
         if (!primaryTransport) {
-          return console.log("transport", `established ${fallbackTransport.name} fallback`);
+          if (!this.primaryPassedHealthCheck) {
+            this.storeSession(`phx:fallback:${fallbackTransport.name}`, "true");
+          }
+          return this.log("transport", `established ${fallbackTransport.name} fallback`);
         }
         clearTimeout(this.fallbackTimer);
         this.fallbackTimer = setTimeout(fallback, fallbackThreshold);
         this.ping((rtt) => {
           this.log("transport", "connected to primary after", rtt);
+          this.primaryPassedHealthCheck = true;
           clearTimeout(this.fallbackTimer);
         });
       });

priv/static/phoenix.mjs

@@ -997,6 +997,7 @@ var Socket = class {
     this.ref = 0;
     this.timeout = opts.timeout || DEFAULT_TIMEOUT;
     this.transport = opts.transport || global.WebSocket || LongPoll;
+    this.primaryPassedHealthCheck = false;
     this.longPollFallbackMs = opts.longPollFallbackMs;
     this.fallbackTimer = null;
     this.sessionStore = opts.sessionStorage || global.sessionStorage;
@@ -1253,11 +1254,10 @@ var Socket = class {
       this.log("transport", `falling back to ${fallbackTransport.name}...`, reason);
       this.off([openRef, errorRef]);
       primaryTransport = false;
-      this.storeSession("phx:longpoll", "true");
       this.replaceTransport(fallbackTransport);
       this.transportConnect();
     };
-    if (this.getSession("phx:longpoll")) {
+    if (this.getSession(`phx:fallback:${fallbackTransport.name}`)) {
       return fallback("memorized");
     }
     this.fallbackTimer = setTimeout(fallback, fallbackThreshold);
@@ -1271,12 +1271,16 @@ var Socket = class {
     this.onOpen(() => {
       established = true;
       if (!primaryTransport) {
-        return console.log("transport", `established ${fallbackTransport.name} fallback`);
+        if (!this.primaryPassedHealthCheck) {
+          this.storeSession(`phx:fallback:${fallbackTransport.name}`, "true");
+        }
+        return this.log("transport", `established ${fallbackTransport.name} fallback`);
       }
       clearTimeout(this.fallbackTimer);
       this.fallbackTimer = setTimeout(fallback, fallbackThreshold);
       this.ping((rtt) => {
         this.log("transport", "connected to primary after", rtt);
+        this.primaryPassedHealthCheck = true;
         clearTimeout(this.fallbackTimer);
       });
     });