setTimeout/setImmediate workaround for linux hangs (#1497)

FREEBIE
signalapp · Sep 22, 2017 · 9db0cb4 · 9db0cb4
1 parent 42f2142
commit 9db0cb4
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/js/libtextsecure.js b/js/libtextsecure.js
@@ -37666,8 +37666,22 @@ var TextSecureServer = (function() {
         return true;
     }
 
+    // On Linux/Electron multiple quick web requests can result in the Node.js event
+    //   loop getting wedged. Bug: https://github.com/electron/electron/issues/10570
+    //   This forces the event loop to move.
+    function scheduleHangWorkaround() {
+        setTimeout(function() {
+            setImmediate(function() {
+                // noop
+            });
+        }, 1000);
+    }
+
     function createSocket(url) {
       var requestOptions = { ca: window.config.certificateAuthorities };
+
+      scheduleHangWorkaround();
+
       return new nodeWebSocket(url, null, null, null, requestOptions);
     }
 
@@ -37728,6 +37742,8 @@ var TextSecureServer = (function() {
                 reject(HTTPError(xhr.status, xhr.statusText, options.stack));
             };
             xhr.send( options.data || null );
+
+            scheduleHangWorkaround();
         });
     }
 

diff --git a/libtextsecure/api.js b/libtextsecure/api.js
@@ -24,8 +24,22 @@ var TextSecureServer = (function() {
         return true;
     }
 
+    // On Linux/Electron multiple quick web requests can result in the Node.js event
+    //   loop getting wedged. Bug: https://github.com/electron/electron/issues/10570
+    //   This forces the event loop to move.
+    function scheduleHangWorkaround() {
+        setTimeout(function() {
+            setImmediate(function() {
+                // noop
+            });
+        }, 1000);
+    }
+
     function createSocket(url) {
       var requestOptions = { ca: window.config.certificateAuthorities };
+
+      scheduleHangWorkaround();
+
       return new nodeWebSocket(url, null, null, null, requestOptions);
     }
 
@@ -86,6 +100,8 @@ var TextSecureServer = (function() {
                 reject(HTTPError(xhr.status, xhr.statusText, options.stack));
             };
             xhr.send( options.data || null );
+
+            scheduleHangWorkaround();
         });
     }
 

diff --git a/test/index.html b/test/index.html
@@ -583,7 +583,6 @@ <h3>{{ message }}</h3>
   <script type="text/javascript" src="../js/storage.js" data-cover></script>
   <script type="text/javascript" src="../js/signal_protocol_store.js" data-cover></script>
   <script type="text/javascript" src="../js/libtextsecure.js" data-cover></script>
-  <script type="text/javascript" src="../js/backup.js" data-cover></script>
 
   <script type="text/javascript" src="../js/libphonenumber-util.js"></script>
   <script type="text/javascript" src="../js/models/messages.js" data-cover></script>