abp-web-resources - npm Package Compare versions

Comparing version 5.9.2 to 5.9.3

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

@@ -17,3 +17,3 @@ var abp = abp || {};
     };
-    abp.signalr.withUrlOptions = abp.signalr.withUrlOptions || {}; 
+    abp.signalr.withUrlOptions = abp.signalr.withUrlOptions || {};
 
@@ -25,42 +25,4 @@ // Configure the connection for abp.signalr.hubs.common
 
-        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
@@ -109,2 +71,14 @@ connection.on('getNotification', function (notification) {
             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)
@@ -111,0 +85,0 @@ .build();

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

@@ -1,1 +0,1 @@
-var abp=abp||{};(function(){function t(n){function r(){i<=abp.signalr.maxTries&&n.start().then(function(){t=abp.signalr.reconnectTime;i=1;console.log("Reconnected to SignalR server!")}).catch(function(){i+=1;t=abp.signalr.increaseReconnectTime(t);setTimeout(function(){r()},t)})}abp.signalr.hubs.common=n;let i=1,t=abp.signalr.reconnectTime;n.onclose(function(n){(n?abp.log.debug("Connection closed with error: "+n):abp.log.debug("Disconnected"),abp.signalr.autoReconnect)&&r()});n.on("getNotification",function(n){abp.event.trigger("abp.notifications.received",n)})}function i(){var i=abp.signalr.url||abp.appPath+"signalr";n(i,t).then(function(n){abp.log.debug("Connected to SignalR server!");abp.event.trigger("abp.signalr.connected");n.invoke("register").then(function(){abp.log.debug("Registered to the SignalR server!")})}).catch(function(n){abp.log.debug(n.message)})}function n(n,t){return abp.signalr.remoteServiceBaseUrl&&(n=abp.signalr.remoteServiceBaseUrl+n),abp.signalr.qs&&(n+=(n.indexOf("?")==-1?"?":"&")+abp.signalr.qs),function i(r){abp.log.debug("Starting connection using "+signalR.HttpTransportType[r]+" transport");var u=(new signalR.HubConnectionBuilder).withUrl(n,r).build();return t&&typeof t=="function"&&t(u),u.start().then(function(){return u}).catch(function(n){return(abp.log.debug("Cannot start the connection using "+signalR.HttpTransportType[r]+" transport. "+n.message),r!==signalR.HttpTransportType.LongPolling)?i(r+1):Promise.reject(n)})}(signalR.HttpTransportType.WebSockets)}signalR&&(abp.signalr=abp.signalr||{},abp.signalr.hubs=abp.signalr.hubs||{},abp.signalr.reconnectTime=abp.signalr.reconnectTime||5e3,abp.signalr.maxTries=abp.signalr.maxTries||8,abp.signalr.increaseReconnectTime=abp.signalr.increaseReconnectTime||function(n){return n*2},abp.signalr.autoConnect=abp.signalr.autoConnect===undefined?!0:abp.signalr.autoConnect,abp.signalr.autoReconnect=abp.signalr.autoReconnect===undefined?!0:abp.signalr.autoReconnect,abp.signalr.connect=abp.signalr.connect||i,abp.signalr.startConnection=abp.signalr.startConnection||n,abp.signalr.autoConnect&&!abp.signalr.hubs.common&&abp.signalr.connect())})();
+var abp=abp||{};(function(){function t(n){abp.signalr.hubs.common=n;let t=abp.signalr.reconnectTime;n.on("getNotification",function(n){abp.event.trigger("abp.notifications.received",n)})}function i(){var i=abp.signalr.url||abp.appPath+"signalr";n(i,t).then(function(n){abp.log.debug("Connected to SignalR server!");abp.event.trigger("abp.signalr.connected");n.invoke("register").then(function(){abp.log.debug("Registered to the SignalR server!")})}).catch(function(n){abp.log.debug(n.message)})}function n(n,t){return abp.signalr.remoteServiceBaseUrl&&(n=abp.signalr.remoteServiceBaseUrl+n),abp.signalr.qs&&(n+=(n.indexOf("?")==-1?"?":"&")+abp.signalr.qs),function i(r){abp.log.debug("Starting connection using "+signalR.HttpTransportType[r]+" transport");abp.signalr.withUrlOptions.transport=r;var u=(new signalR.HubConnectionBuilder).withAutomaticReconnect({nextRetryDelayInMilliseconds:n=>(abp.log.debug("Retry to connect to SignalR"),n.previousRetryCount>maxTries)?(abp.log.debug("Max retries reached"),null):(reconnectTime*=2,abp.log.debug("Waiting "+reconnectTime+"ms before retrying"),reconnectTime)}).withUrl(n,abp.signalr.withUrlOptions).build();return t&&typeof t=="function"&&t(u),u.start().then(function(){return u}).catch(function(n){return(abp.log.debug("Cannot start the connection using "+signalR.HttpTransportType[r]+" transport. "+n.message),r!==signalR.HttpTransportType.LongPolling)?i(r+1):Promise.reject(n)})}(signalR.HttpTransportType.WebSockets)}signalR&&(abp.signalr=abp.signalr||{},abp.signalr.hubs=abp.signalr.hubs||{},abp.signalr.reconnectTime=abp.signalr.reconnectTime||5e3,abp.signalr.maxTries=abp.signalr.maxTries||8,abp.signalr.increaseReconnectTime=abp.signalr.increaseReconnectTime||function(n){return n*2},abp.signalr.withUrlOptions=abp.signalr.withUrlOptions||{},abp.signalr.autoConnect=abp.signalr.autoConnect===undefined?!0:abp.signalr.autoConnect,abp.signalr.autoReconnect=abp.signalr.autoReconnect===undefined?!0:abp.signalr.autoReconnect,abp.signalr.connect=abp.signalr.connect||i,abp.signalr.startConnection=abp.signalr.startConnection||n,abp.signalr.autoConnect&&!abp.signalr.hubs.common&&abp.signalr.connect())})();

package.json

 {
   "name": "abp-web-resources",
-  "version": "5.9.2",
+  "version": "5.9.3",
   "description": "ASP.NET Boilerplate web resources",
@@ -5,0 +5,0 @@ "main": "Abp/Framework/scripts/abp.js",

No alert changes

Worsened metrics

Total package byte prevSize

130772

-0.52%

Lines of code

2207

-0.99%

No dependency changes