mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

setTimeout/setImmediate workaround for linux hangs (#1497)

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-09-22 11:06:52 -07:00 • committed by GitHub
parent 42f2142e36
commit 9db0cb49c4
3 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
js/libtextsecure.js
View file

@ -37666,8 +37666,22 @@ var TextSecureServer = (function() {
return true; 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) { function createSocket(url) {
var requestOptions = { ca: window.config.certificateAuthorities }; var requestOptions = { ca: window.config.certificateAuthorities };
scheduleHangWorkaround();
return new nodeWebSocket(url, null, null, null, requestOptions); return new nodeWebSocket(url, null, null, null, requestOptions);
} }
@ -37728,6 +37742,8 @@ var TextSecureServer = (function() {
reject(HTTPError(xhr.status, xhr.statusText, options.stack)); reject(HTTPError(xhr.status, xhr.statusText, options.stack));
}; };
xhr.send( options.data || null ); xhr.send( options.data || null );
scheduleHangWorkaround();
}); });
} }

16
libtextsecure/api.js
View file

@ -24,8 +24,22 @@ var TextSecureServer = (function() {
return true; 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) { function createSocket(url) {
var requestOptions = { ca: window.config.certificateAuthorities }; var requestOptions = { ca: window.config.certificateAuthorities };
scheduleHangWorkaround();
return new nodeWebSocket(url, null, null, null, requestOptions); return new nodeWebSocket(url, null, null, null, requestOptions);
} }
@ -86,6 +100,8 @@ var TextSecureServer = (function() {
reject(HTTPError(xhr.status, xhr.statusText, options.stack)); reject(HTTPError(xhr.status, xhr.statusText, options.stack));
}; };
xhr.send( options.data || null ); xhr.send( options.data || null );
scheduleHangWorkaround();
}); });
} }

1
test/index.html
View file

@ -583,7 +583,6 @@
<script type="text/javascript" src="../js/storage.js" data-cover></script> <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/signal_protocol_store.js" data-cover></script>
<script type="text/javascript" src="../js/libtextsecure.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/libphonenumber-util.js"></script>
<script type="text/javascript" src="../js/models/messages.js" data-cover></script> <script type="text/javascript" src="../js/models/messages.js" data-cover></script>