Update abp.signalr-client.js

Author: ismcagdas

Abp/Framework/scripts/libs/abp.signalr-client.js

@@ -14,53 +14,15 @@ var abp = abp || {};
     abp.signalr.increaseReconnectTime = abp.signalr.increaseReconnectTime || function (time) {
         return time * 2;
     };
-    abp.signalr.withUrlOptions = abp.signalr.withUrlOptions || {}; 
+    abp.signalr.withUrlOptions = abp.signalr.withUrlOptions || {};
 
     // Configure the connection for abp.signalr.hubs.common
     function configureConnection(connection) {
         // Set the common hub
         abp.signalr.hubs.common = connection;
 
-        let tries = 1;
         let reconnectTime = abp.signalr.reconnectTime;
 
-        // Reconnect loop
-        function tryReconnect() {
-            if (tries <= abp.signalr.maxTries) {
-                connection.start()
-                    .then(function () {
-                        reconnectTime = abp.signalr.reconnectTime;
-                        tries = 1;
-                        console.log('Reconnected to SignalR server!');
-                        abp.event.trigger('abp.signalr.reconnected');
-                    }).catch(function () {
-                    tries += 1;
-                    reconnectTime = abp.signalr.increaseReconnectTime(reconnectTime);
-                    setTimeout(function () {
-                            tryReconnect()
-                        },
-                        reconnectTime
-                    );
-                });
-            }
-        }
-
-        // Reconnect if hub disconnects
-        connection.onclose(function (e) {
-            if (e) {
-                abp.log.debug('Connection closed with error: ' + e);
-            } else {
-                abp.log.debug('Disconnected');
-            }
-
-            if (!abp.signalr.autoReconnect) {
-                return;
-            }
-            
-            abp.event.trigger('abp.signalr.disconnected');
-            tryReconnect();
-        });
-
         // Register to get notifications
         connection.on('getNotification', function (notification) {
             abp.event.trigger('abp.notifications.received', notification);
@@ -104,6 +66,18 @@ var abp = abp || {};
             abp.log.debug('Starting connection using ' + signalR.HttpTransportType[transport] + ' transport');
             abp.signalr.withUrlOptions.transport = transport;
             var connection = new signalR.HubConnectionBuilder()
+                .withAutomaticReconnect({
+                    nextRetryDelayInMilliseconds: retryContext => {
+                        abp.log.debug('Retry to connect to SignalR');
+                        if (retryContext.previousRetryCount > maxTries) {
+                            abp.log.debug('Max retries reached');
+                            return null;
+                        }
+                        reconnectTime *= 2;
+                        abp.log.debug('Waiting ' + reconnectTime + 'ms before retrying');
+                        return reconnectTime;
+                    }
+                })
                 .withUrl(url, abp.signalr.withUrlOptions)
                 .build();