From 13fcff9688cc1ecb772f1b0fcf63d213621bc09c Mon Sep 17 00:00:00 2001 From: Richard van der Hoff Date: Fri, 18 Dec 2015 16:23:48 +0000 Subject: [PATCH 1/2] Allow passing a next_batch token into /search for backfill --- lib/client.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/client.js b/lib/client.js index 50bec8400..503e3b05c 100644 --- a/lib/client.js +++ b/lib/client.js @@ -2098,14 +2098,19 @@ MatrixClient.prototype.searchMessageText = function(opts, callback) { /** * Perform a server-side search. * @param {Object} opts + * @param {string} opts.next_batch the batch token to pass in the query string * @param {Object} opts.body the JSON object to pass to the request body. * @param {module:client.callback} callback Optional. * @return {module:client.Promise} Resolves: TODO * @return {module:http-api.MatrixError} Rejects: with an error response. */ MatrixClient.prototype.search = function(opts, callback) { + var queryparams = {}; + if (opts.next_batch) { + queryparams.next_batch = opts.next_batch; + } return this._http.authedRequest( - callback, "POST", "/search", undefined, opts.body + callback, "POST", "/search", queryparams, opts.body ); }; From 2802092231c5936af272bbdfb685cd793f01394f Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Mon, 21 Dec 2015 13:49:14 +0000 Subject: [PATCH 2/2] Add 60s to client-side timeout to account for slow HSes --- lib/sync.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sync.js b/lib/sync.js index 4d1cd71e9..ff4e8ba9d 100644 --- a/lib/sync.js +++ b/lib/sync.js @@ -19,7 +19,7 @@ var Filter = require("./filter"); // beyond that and wedge forever, so we need to track how long we are willing // to keep open the connection. This constant is *ADDED* to the timeout= value // to determine the max time we're willing to wait. -var BUFFER_PERIOD_MS = 20 * 1000; +var BUFFER_PERIOD_MS = 80 * 1000; function getFilterName(userId, suffix) { // scope this on the user ID because people may login on many accounts