Ensure SSE & WS will attempt reconnecting multiple times

#1684
SignalR · Mar 16, 2013 · cdaaa33 · cdaaa33
1 parent 35b65d0
commit cdaaa33
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.js
@@ -974,19 +974,22 @@
             var transport = signalR.transports[transportName],
                 that = this;
 
+            function isConnectedOrReconnecting() {
+                return connection.state === signalR.connectionState.connected ||
+                       connection.state === signalR.connectionState.reconnecting;
+            }
+
             // We should only set a reconnectTimeout if we are currently connected
             // and a reconnectTimeout isn't already set.
-            if (connection.state === signalR.connectionState.connected && !connection._.reconnectTimeout) {
+            if (isConnectedOrReconnecting() && !connection._.reconnectTimeout) {
+
                 connection._.reconnectTimeout = window.setTimeout(function () {
                     transport.stop(connection);
 
                     if (that.ensureReconnectingState(connection)) {
                         connection.log(transportName + " reconnecting");
                         transport.start(connection);
                     }
-
-                    // Delete the reconnectTimeout so a new one can be created later if needed.
-                    delete connection._.reconnectTimeout;
                 }, connection.reconnectDelay);
             }
         },

diff --git a/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js b/samples/Microsoft.AspNet.SignalR.Hosting.AspNet.Samples/Scripts/jquery.signalR.min.js
diff --git a/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.js b/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.js
@@ -974,19 +974,22 @@
             var transport = signalR.transports[transportName],
                 that = this;
 
+            function isConnectedOrReconnecting() {
+                return connection.state === signalR.connectionState.connected ||
+                       connection.state === signalR.connectionState.reconnecting;
+            }
+
             // We should only set a reconnectTimeout if we are currently connected
             // and a reconnectTimeout isn't already set.
-            if (connection.state === signalR.connectionState.connected && !connection._.reconnectTimeout) {
+            if (isConnectedOrReconnecting() && !connection._.reconnectTimeout) {
+
                 connection._.reconnectTimeout = window.setTimeout(function () {
                     transport.stop(connection);
 
                     if (that.ensureReconnectingState(connection)) {
                         connection.log(transportName + " reconnecting");
                         transport.start(connection);
                     }
-
-                    // Delete the reconnectTimeout so a new one can be created later if needed.
-                    delete connection._.reconnectTimeout;
                 }, connection.reconnectDelay);
             }
         },

diff --git a/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.min.js b/samples/Microsoft.AspNet.SignalR.LoadTestHarness/Scripts/jquery.signalR.min.js
diff --git a/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.common.js b/src/Microsoft.AspNet.SignalR.Client.JS/jquery.signalR.transports.common.js
@@ -320,19 +320,22 @@
             var transport = signalR.transports[transportName],
                 that = this;
 
+            function isConnectedOrReconnecting() {
+                return connection.state === signalR.connectionState.connected ||
+                       connection.state === signalR.connectionState.reconnecting;
+            }
+
             // We should only set a reconnectTimeout if we are currently connected
             // and a reconnectTimeout isn't already set.
-            if (connection.state === signalR.connectionState.connected && !connection._.reconnectTimeout) {
+            if (isConnectedOrReconnecting() && !connection._.reconnectTimeout) {
+
                 connection._.reconnectTimeout = window.setTimeout(function () {
                     transport.stop(connection);
 
                     if (that.ensureReconnectingState(connection)) {
                         connection.log(transportName + " reconnecting");
                         transport.start(connection);
                     }
-
-                    // Delete the reconnectTimeout so a new one can be created later if needed.
-                    delete connection._.reconnectTimeout;
                 }, connection.reconnectDelay);
             }
         },

diff --git a/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Scripts/jquery.signalR.js b/tests/Microsoft.AspNet.SignalR.Client.JS.Tests/Scripts/jquery.signalR.js
@@ -974,19 +974,22 @@
             var transport = signalR.transports[transportName],
                 that = this;
 
+            function isConnectedOrReconnecting() {
+                return connection.state === signalR.connectionState.connected ||
+                       connection.state === signalR.connectionState.reconnecting;
+            }
+
             // We should only set a reconnectTimeout if we are currently connected
             // and a reconnectTimeout isn't already set.
-            if (connection.state === signalR.connectionState.connected && !connection._.reconnectTimeout) {
+            if (isConnectedOrReconnecting() && !connection._.reconnectTimeout) {
+
                 connection._.reconnectTimeout = window.setTimeout(function () {
                     transport.stop(connection);
 
                     if (that.ensureReconnectingState(connection)) {
                         connection.log(transportName + " reconnecting");
                         transport.start(connection);
                     }
-
-                    // Delete the reconnectTimeout so a new one can be created later if needed.
-                    delete connection._.reconnectTimeout;
                 }, connection.reconnectDelay);
             }
         },