matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Implement HTTP callbacks in realtime

Browse Source 
Hopefully this will improve our recovery time after a laptop is suspended. The
idea is to treat the timeouts on the http apis as being in realtime, rather
than in elapsed time while the machine is awake.

To do this, we add a layer on top of window.setTimeout. We run a callback every
second, which then checks the wallclock time and runs any pending callbacks.
This commit is contained in:
Richard van der Hoff
2016-03-31 13:51:18 +01:00
parent bbe41aa7b4
commit d2adb30ded
3 changed files with 398 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/http-api.js
View File

@@ -21,6 +21,11 @@ limitations under the License.
var q = require("q");
var utils = require("./utils");
// we use our own implementation of setTimeout, so that if we get suspended in
// the middle of a /sync, we cancel the sync as soon as we awake, rather than
// waiting for the delay to elapse.
var callbacks = require("./realtime-callbacks");
/*
TODO:
- CS: complete register function (doing stages)
@@ -125,12 +130,12 @@ module.exports.MatrixHttpApi.prototype = {
cb(new Error('Timeout'));
};
xhr.timeout_timer = setTimeout(timeout_fn, 30000);
xhr.timeout_timer = callbacks.setTimeout(timeout_fn, 30000);
xhr.onreadystatechange = function() {
switch (xhr.readyState) {
case global.XMLHttpRequest.DONE:
clearTimeout(xhr.timeout_timer);
callbacks.clearTimeout(xhr.timeout_timer);
var err;
if (!xhr.responseText) {
err = new Error('No response body.');
@@ -152,10 +157,10 @@ module.exports.MatrixHttpApi.prototype = {
}
};
xhr.upload.addEventListener("progress", function(ev) {
clearTimeout(xhr.timeout_timer);
callbacks.clearTimeout(xhr.timeout_timer);
upload.loaded = ev.loaded;
upload.total = ev.total;
xhr.timeout_timer = setTimeout(timeout_fn, 30000);
xhr.timeout_timer = callbacks.setTimeout(timeout_fn, 30000);
defer.notify(ev);
});
url += "?access_token=" + encodeURIComponent(this.opts.accessToken);
@@ -450,9 +455,13 @@ module.exports.MatrixHttpApi.prototype = {
var timeoutId;
var timedOut = false;
var req;
if (localTimeoutMs) {
timeoutId = setTimeout(function() {
timeoutId = callbacks.setTimeout(function() {
timedOut = true;
if (req && req.abort) {
req.abort();
}
defer.reject(new module.exports.MatrixError({
error: "Locally timed out waiting for a response",
errcode: "ORG.MATRIX.JSSDK_TIMEOUT",
@@ -464,7 +473,7 @@ module.exports.MatrixHttpApi.prototype = {
var reqPromise = defer.promise;
try {
var req = this.opts.request(
req = this.opts.request(
{
uri: uri,
method: method,
@@ -477,7 +486,7 @@ module.exports.MatrixHttpApi.prototype = {
},
function(err, response, body) {
if (localTimeoutMs) {
clearTimeout(timeoutId);
callbacks.clearTimeout(timeoutId);
if (timedOut) {
return; // already rejected promise
}