Merge pull request #11635 from FranciscoPombal/prevent_excessive_sync

WebUI: Prevent excessive requests to /api/v2/sync/maindata

src/webui/www/private/scripts/client.js

@@ -35,6 +35,8 @@ let serverSyncMainDataInterval = 1500;
 let customSyncMainDataInterval = null;
 let searchTabInitialized = false;
 
+let syncRequestInProgress = false;
+
 let clipboardEvent;
 
 const CATEGORIES_ALL = 1;
@@ -458,7 +460,7 @@ window.addEvent('load', function() {
     const syncMainData = function() {
         const url = new URI('api/v2/sync/maindata');
         url.setData('rid', syncMainDataLastResponseId);
-        new Request.JSON({
+        const request = new Request.JSON({
             url: url,
             noCache: true,
             method: 'get',
@@ -466,8 +468,8 @@ window.addEvent('load', function() {
                 const errorDiv = $('error_div');
                 if (errorDiv)
                     errorDiv.set('html', 'QBT_TR(qBittorrent client is not reachable)QBT_TR[CONTEXT=HttpServer]');
-                clearTimeout(syncMainDataTimer);
+                syncRequestInProgress = false;
-                syncMainDataTimer = syncMainData.delay(2000);
+                syncData(2000);
             },
             onSuccess: function(response) {
                 $('error_div').set('html', '');
@@ -579,18 +581,26 @@ window.addEvent('load', function() {
                         // re-select previously selected rows
                         torrentsTable.reselectRows(torrentsTableSelectedRows);
                 }
-                clearTimeout(syncMainDataTimer);
+                syncRequestInProgress = false;
-                syncMainDataTimer = syncMainData.delay(getSyncMainDataInterval());
+                syncData(getSyncMainDataInterval())
             }
-        }).send();
+        });
+        syncRequestInProgress = true;
+        request.send();
     };
 
     updateMainData = function() {
         torrentsTable.updateTable();
-        clearTimeout(syncMainDataTimer);
+        syncData(100);
-        syncMainDataTimer = syncMainData.delay(100);
     };
 
+    const syncData = function(delay) {
+        if (!syncRequestInProgress){
+            clearTimeout(syncMainDataTimer);
+            syncMainDataTimer = syncMainData.delay(delay);
+        }
+    }
+
     const processServerState = function() {
         let transfer_info = window.qBittorrent.Misc.friendlyUnit(serverState.dl_info_speed, true);
         if (serverState.dl_rate_limit > 0)
@@ -764,8 +774,7 @@ window.addEvent('load', function() {
         $("mainColumn").removeClass("invisible");
 
         customSyncMainDataInterval = null;
-        clearTimeout(syncMainDataTimer);
+        syncData(100);
-        syncMainDataTimer = syncMainData.delay(100);
 
         hideSearchTab();
     };