Merge pull request #1087 from matrix-org/t3chguy/remove_bluebird_11

Remove Bluebird: phase 2

spec/integ/matrix-client-crypto.spec.js

@@ -203,7 +203,7 @@ function aliSendsFirstMessage() {
         expectAliQueryKeys()
             .then(expectAliClaimKeys)
             .then(expectAliSendMessageRequest),
-    ]).spread(function(_, ciphertext) {
+    ]).then(function([_, ciphertext]) {
         return ciphertext;
     });
 }
@@ -218,7 +218,7 @@ function aliSendsMessage() {
     return Promise.all([
         sendMessage(aliTestClient.client),
         expectAliSendMessageRequest(),
-    ]).spread(function(_, ciphertext) {
+    ]).then(function([_, ciphertext]) {
         return ciphertext;
     });
 }
@@ -234,7 +234,7 @@ function bobSendsReplyMessage() {
         sendMessage(bobTestClient.client),
         expectBobQueryKeys()
             .then(expectBobSendMessageRequest),
-    ]).spread(function(_, ciphertext) {
+    ]).then(function([_, ciphertext]) {
         return ciphertext;
     });
 }
@@ -279,16 +279,17 @@ function sendMessage(client) {
 
 function expectSendMessageRequest(httpBackend) {
     const path = "/send/m.room.encrypted/";
-    const deferred = Promise.defer();
+    const prom = new Promise((resolve) => {
         httpBackend.when("PUT", path).respond(200, function(path, content) {
-        deferred.resolve(content);
+            resolve(content);
             return {
                 event_id: "asdfgh",
             };
         });
+    });
 
     // it can take a while to process the key query
-    return httpBackend.flush(path, 1).then(() => deferred.promise);
+    return httpBackend.flush(path, 1).then(() => prom);
 }
 
 function aliRecvMessage() {
@@ -491,7 +492,7 @@ describe("MatrixClient crypto", function() {
                 aliTestClient.client.getStoredDevicesForUser(bobUserId),
                 aliTestClient.client.getStoredDevicesForUser(eveUserId),
             ]);
-        }).spread((bobDevices, eveDevices) => {
+        }).then(([bobDevices, eveDevices]) => {
             // should get an empty list
             expect(bobDevices).toEqual([]);
             expect(eveDevices).toEqual([]);

spec/integ/matrix-client-event-timeline.spec.js

@@ -83,18 +83,19 @@ function startClient(httpBackend, client) {
     client.startClient();
 
     // set up a promise which will resolve once the client is initialised
-    const deferred = Promise.defer();
+    const prom = new Promise((resolve) => {
         client.on("sync", function(state) {
             logger.log("sync", state);
             if (state != "SYNCING") {
                 return;
             }
-        deferred.resolve();
+            resolve();
+        });
     });
 
     return Promise.all([
         httpBackend.flushAllExpected(),
-        deferred.promise,
+        prom,
     ]);
 }
 
@@ -343,7 +344,7 @@ describe("MatrixClient event timelines", function() {
                     };
                 });
 
-            const deferred = Promise.defer();
+            const prom = new Promise((resolve, reject) => {
                 client.on("sync", function() {
                     client.getEventTimeline(timelineSet, EVENTS[2].event_id,
                     ).then(function(tl) {
@@ -355,13 +356,13 @@ describe("MatrixClient event timelines", function() {
                             .toEqual("start_token");
                         // expect(tl.getPaginationToken(EventTimeline.FORWARDS))
                         //    .toEqual("s_5_4");
-                }).done(() => deferred.resolve(),
+                    }).done(resolve, reject);
-                        (e) => deferred.reject(e));
+                });
             });
 
             return Promise.all([
                 httpBackend.flushAllExpected(),
-                deferred.promise,
+                prom,
             ]);
         });
 

spec/integ/matrix-client-syncing.spec.js

@@ -691,12 +691,12 @@ describe("MatrixClient syncing", function() {
                             include_leave: true }});
             }).respond(200, { filter_id: "another_id" });
 
-            const defer = Promise.defer();
+            const prom = new Promise((resolve) => {
-
                 httpBackend.when("GET", "/sync").check(function(req) {
                     expect(req.queryParams.filter).toEqual("another_id");
-                defer.resolve();
+                    resolve();
                 }).respond(200, {});
+            });
 
             client.syncLeftRooms();
 
@@ -707,7 +707,7 @@ describe("MatrixClient syncing", function() {
                     // flush the syncs
                     return httpBackend.flushAllExpected();
                 }),
-                defer.promise,
+                prom,
             ]);
         });
 

spec/unit/crypto.spec.js

@@ -25,8 +25,8 @@ describe("Crypto", function() {
         return;
     }
 
-    beforeEach(function(done) {
+    beforeAll(function() {
-        Olm.init().then(done);
+        return Olm.init();
     });
 
     it("Crypto exposes the correct olm library version", function() {

spec/unit/crypto/algorithms/megolm.spec.js

@@ -25,14 +25,16 @@ describe("MegolmDecryption", function() {
         return;
     }
 
+    beforeAll(function() {
+        return Olm.init();
+    });
+
     let megolmDecryption;
     let mockOlmLib;
     let mockCrypto;
     let mockBaseApis;
 
     beforeEach(async function() {
-        await Olm.init();
-
         mockCrypto = testUtils.mock(Crypto, 'Crypto');
         mockBaseApis = {};
 

spec/unit/crypto/algorithms/olm.spec.js

@@ -48,12 +48,14 @@ describe("OlmDecryption", function() {
         return;
     }
 
+    beforeAll(function() {
+        return global.Olm.init();
+    });
+
     let aliceOlmDevice;
     let bobOlmDevice;
 
     beforeEach(async function() {
-        await global.Olm.init();
-
         aliceOlmDevice = makeOlmDevice();
         bobOlmDevice = makeOlmDevice();
         await aliceOlmDevice.init();

spec/unit/crypto/backup.spec.js

@@ -128,6 +128,10 @@ describe("MegolmBackup", function() {
         return;
     }
 
+    beforeAll(function() {
+        return Olm.init();
+    });
+
     let olmDevice;
     let mockOlmLib;
     let mockCrypto;
@@ -136,7 +140,6 @@ describe("MegolmBackup", function() {
     let cryptoStore;
     let megolmDecryption;
     beforeEach(async function() {
-        await Olm.init();
         mockCrypto = testUtils.mock(Crypto, 'Crypto');
         mockCrypto.backupKey = new Olm.PkEncryption();
         mockCrypto.backupKey.set_recipient_key(

spec/unit/crypto/cross-signing.spec.js

@@ -55,8 +55,8 @@ describe("Cross Signing", function() {
         return;
     }
 
-    beforeEach(async function() {
+    beforeAll(function() {
-        await global.Olm.init();
+        return global.Olm.init();
     });
 
     it("should sign the master key with the device key", async function() {

spec/unit/crypto/secrets.spec.js

@@ -40,8 +40,8 @@ describe("Secrets", function() {
         return;
     }
 
-    beforeEach(async function() {
+    beforeAll(function() {
-        await global.Olm.init();
+        return global.Olm.init();
     });
 
     it("should store and retrieve a secret", async function() {

spec/unit/crypto/verification/qr_code.spec.js

@@ -33,8 +33,8 @@ describe("QR code verification", function() {
         return;
     }
 
-    beforeEach(async function() {
+    beforeAll(function() {
-        await Olm.init();
+        return Olm.init();
     });
 
     describe("showing", function() {

spec/unit/crypto/verification/request.spec.js

@@ -35,8 +35,8 @@ describe("verification request", function() {
         return;
     }
 
-    beforeEach(async function() {
+    beforeAll(function() {
-        await Olm.init();
+        return Olm.init();
     });
 
     it("should request and accept a verification", async function() {

spec/unit/crypto/verification/sas.spec.js

@@ -45,8 +45,8 @@ describe("SAS verification", function() {
         return;
     }
 
-    beforeEach(async function() {
+    beforeAll(function() {
-        await Olm.init();
+        return Olm.init();
     });
 
     it("should error on an unexpected event", async function() {
@@ -169,6 +169,12 @@ describe("SAS verification", function() {
                 }
             });
         });
+        afterEach(async function() {
+            await Promise.all([
+                alice.stop(),
+                bob.stop(),
+            ]);
+        });
 
         it("should verify a key", async function() {
             let macMethod;

src/client.js

@@ -1872,9 +1872,8 @@ MatrixClient.prototype.joinRoom = function(roomIdOrAlias, opts, callback) {
 
     const reqOpts = {qsStringifyOptions: {arrayFormat: 'repeat'}};
 
-    const defer = Promise.defer();
-
     const self = this;
+    const prom = new Promise((resolve, reject) => {
         sign_promise.then(function(signed_invite_object) {
             const data = {};
             if (signed_invite_object) {
@@ -1894,11 +1893,12 @@ MatrixClient.prototype.joinRoom = function(roomIdOrAlias, opts, callback) {
             }
             return Promise.resolve(room);
         }).done(function(room) {
-        _resolve(callback, defer, room);
+            _resolve(callback, resolve, room);
         }, function(err) {
-        _reject(callback, defer, err);
+            _reject(callback, reject, err);
         });
-    return defer.promise;
+    });
+    return prom;
 };
 
 /**
@@ -3214,12 +3214,8 @@ MatrixClient.prototype.scrollback = function(room, limit, callback) {
     // reduce the required number of events appropriately
     limit = limit - numAdded;
 
-    const defer = Promise.defer();
-    info = {
-        promise: defer.promise,
-        errorTs: null,
-    };
     const self = this;
+    const prom = new Promise((resolve, reject) => {
         // wait for a time before doing this request
         // (which may be 0 in order not to special case the code paths)
         sleep(timeToWaitMs).then(function() {
@@ -3241,15 +3237,22 @@ MatrixClient.prototype.scrollback = function(room, limit, callback) {
             }
             self.store.storeEvents(room, matrixEvents, res.end, true);
             self._ongoingScrollbacks[room.roomId] = null;
-        _resolve(callback, defer, room);
+            _resolve(callback, resolve, room);
         }, function(err) {
             self._ongoingScrollbacks[room.roomId] = {
                 errorTs: Date.now(),
             };
-        _reject(callback, defer, err);
+            _reject(callback, reject, err);
         });
+    });
+
+    info = {
+        promise: prom,
+        errorTs: null,
+    };
+
     this._ongoingScrollbacks[room.roomId] = info;
-    return defer.promise;
+    return prom;
 };
 
 /**
@@ -3867,7 +3870,7 @@ MatrixClient.prototype.setRoomMutePushRule = function(scope, roomId, mute) {
         } else if (!hasDontNotifyRule) {
             // Remove the existing one before setting the mute push rule
             // This is a workaround to SYN-590 (Push rule update fails)
-            deferred = Promise.defer();
+            deferred = utils.defer();
             this.deletePushRule(scope, "room", roomPushRule.rule_id)
             .done(function() {
                 self.addPushRule(scope, "room", roomId, {
@@ -3886,26 +3889,26 @@ MatrixClient.prototype.setRoomMutePushRule = function(scope, roomId, mute) {
     }
 
     if (deferred) {
+        return new Promise((resolve, reject) => {
             // Update this.pushRules when the operation completes
-        const ruleRefreshDeferred = Promise.defer();
             deferred.done(function() {
                 self.getPushRules().done(function(result) {
                     self.pushRules = result;
-                ruleRefreshDeferred.resolve();
+                    resolve();
                 }, function(err) {
-                ruleRefreshDeferred.reject(err);
+                    reject(err);
                 });
             }, function(err) {
                 // Update it even if the previous operation fails. This can help the
                 // app to recover when push settings has been modifed from another client
                 self.getPushRules().done(function(result) {
                     self.pushRules = result;
-                ruleRefreshDeferred.reject(err);
+                    reject(err);
                 }, function(err2) {
-                ruleRefreshDeferred.reject(err);
+                    reject(err);
+                });
             });
         });
-        return ruleRefreshDeferred.promise;
     }
 };
 
@@ -4876,18 +4879,18 @@ function checkTurnServers(client) {
     });
 }
 
-function _reject(callback, defer, err) {
+function _reject(callback, reject, err) {
     if (callback) {
         callback(err);
     }
-    defer.reject(err);
+    reject(err);
 }
 
-function _resolve(callback, defer, res) {
+function _resolve(callback, resolve, res) {
     if (callback) {
         callback(null, res);
     }
-    defer.resolve(res);
+    resolve(res);
 }
 
 function _PojoToMatrixEventMapper(client) {

src/crypto/algorithms/olm.js

@@ -139,7 +139,7 @@ OlmEncryption.prototype.encryptMessage = async function(room, eventType, content
         }
     }
 
-    return await Promise.all(promises).return(encryptedContent);
+    return await Promise.all(promises).then(() => encryptedContent);
 };
 
 /**

src/crypto/index.js

@@ -1824,8 +1824,7 @@ Crypto.prototype.exportRoomKeys = async function() {
  * @return {module:client.Promise} a promise which resolves once the keys have been imported
  */
 Crypto.prototype.importRoomKeys = function(keys) {
-    return Promise.map(
+    return Promise.all(keys.map((key) => {
-        keys, (key) => {
         if (!key.room_id || !key.algorithm) {
             logger.warn("ignoring room key entry with missing fields", key);
             return null;
@@ -1833,8 +1832,7 @@ Crypto.prototype.importRoomKeys = function(keys) {
 
         const alg = this._getRoomDecryptor(key.room_id, key.algorithm);
         return alg.importRoomKey(key);
-        },
+    }));
-    );
 };
 
 /**
@@ -2858,14 +2856,10 @@ Crypto.prototype._processReceivedRoomKeyRequests = async function() {
         // cancellation (and end up with a cancelled request), rather than the
         // cancellation before the request (and end up with an outstanding
         // request which should have been cancelled.)
-        await Promise.map(
+        await Promise.all(requests.map((req) =>
-            requests, (req) =>
+            this._processReceivedRoomKeyRequest(req)));
-                this._processReceivedRoomKeyRequest(req),
+        await Promise.all(cancellations.map((cancellation) =>
-        );
+            this._processReceivedRoomKeyRequestCancellation(cancellation)));
-        await Promise.map(
-            cancellations, (cancellation) =>
-                this._processReceivedRoomKeyRequestCancellation(cancellation),
-        );
     } catch (e) {
         logger.error(`Error processing room key requsts: ${e}`);
     } finally {

src/crypto/store/indexeddb-crypto-store-backend.js

@@ -58,9 +58,9 @@ export class Backend {
     getOrAddOutgoingRoomKeyRequest(request) {
         const requestBody = request.requestBody;
 
-        const deferred = Promise.defer();
+        return new Promise((resolve, reject) => {
             const txn = this._db.transaction("outgoingRoomKeyRequests", "readwrite");
-        txn.onerror = deferred.reject;
+            txn.onerror = reject;
 
             // first see if we already have an entry for this request.
             this._getOutgoingRoomKeyRequest(txn, requestBody, (existing) => {
@@ -71,7 +71,7 @@ export class Backend {
                             `${requestBody.room_id} / ${requestBody.session_id}: ` +
                             `not sending another`,
                     );
-                deferred.resolve(existing);
+                    resolve(existing);
                     return;
                 }
 
@@ -81,12 +81,11 @@ export class Backend {
                     `enqueueing key request for ${requestBody.room_id} / ` +
                         requestBody.session_id,
                 );
-            txn.oncomplete = () => { deferred.resolve(request); };
+                txn.oncomplete = () => { resolve(request); };
                 const store = txn.objectStore("outgoingRoomKeyRequests");
                 store.add(request);
             });
-
+        });
-        return deferred.promise;
     }
 
     /**
@@ -100,15 +99,14 @@ export class Backend {
      *    not found
      */
     getOutgoingRoomKeyRequest(requestBody) {
-        const deferred = Promise.defer();
+        return new Promise((resolve, reject) => {
-
             const txn = this._db.transaction("outgoingRoomKeyRequests", "readonly");
-        txn.onerror = deferred.reject;
+            txn.onerror = reject;
 
             this._getOutgoingRoomKeyRequest(txn, requestBody, (existing) => {
-            deferred.resolve(existing);
+                resolve(existing);
+            });
         });
-        return deferred.promise;
     }
 
     /**

src/crypto/store/indexeddb-crypto-store.js

@@ -287,7 +287,9 @@ export default class IndexedDBCryptoStore {
      * @param {function(string)} func Called with the account pickle
      */
     getAccount(txn, func) {
-        this._backendPromise.value().getAccount(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getAccount(txn, func);
+        });
     }
 
     /**
@@ -298,7 +300,9 @@ export default class IndexedDBCryptoStore {
      * @param {string} newData The new account pickle to store.
      */
     storeAccount(txn, newData) {
-        this._backendPromise.value().storeAccount(txn, newData);
+        this._backendPromise.then(backend => {
+            backend.storeAccount(txn, newData);
+        });
     }
 
     /**
@@ -310,7 +314,9 @@ export default class IndexedDBCryptoStore {
      *        { key_type: base64 encoded seed } where key type = user_signing_key_seed or self_signing_key_seed
      */
     getCrossSigningKeys(txn, func) {
-        this._backendPromise.value().getCrossSigningKeys(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getCrossSigningKeys(txn, func);
+        });
     }
 
     /**
@@ -320,7 +326,9 @@ export default class IndexedDBCryptoStore {
      * @param {string} keys keys object as getCrossSigningKeys()
      */
     storeCrossSigningKeys(txn, keys) {
-        this._backendPromise.value().storeCrossSigningKeys(txn, keys);
+        this._backendPromise.then(backend => {
+            backend.storeCrossSigningKeys(txn, keys);
+        });
     }
 
     // Olm sessions
@@ -331,7 +339,9 @@ export default class IndexedDBCryptoStore {
      * @param {function(int)} func Called with the count of sessions
      */
     countEndToEndSessions(txn, func) {
-        this._backendPromise.value().countEndToEndSessions(txn, func);
+        this._backendPromise.then(backend => {
+            backend.countEndToEndSessions(txn, func);
+        });
     }
 
     /**
@@ -347,7 +357,9 @@ export default class IndexedDBCryptoStore {
      *     a message.
      */
     getEndToEndSession(deviceKey, sessionId, txn, func) {
-        this._backendPromise.value().getEndToEndSession(deviceKey, sessionId, txn, func);
+        this._backendPromise.then(backend => {
+            backend.getEndToEndSession(deviceKey, sessionId, txn, func);
+        });
     }
 
     /**
@@ -362,7 +374,9 @@ export default class IndexedDBCryptoStore {
      *     a message.
      */
     getEndToEndSessions(deviceKey, txn, func) {
-        this._backendPromise.value().getEndToEndSessions(deviceKey, txn, func);
+        this._backendPromise.then(backend => {
+            backend.getEndToEndSessions(deviceKey, txn, func);
+        });
     }
 
     /**
@@ -373,7 +387,9 @@ export default class IndexedDBCryptoStore {
      *     and session keys.
      */
     getAllEndToEndSessions(txn, func) {
-        this._backendPromise.value().getAllEndToEndSessions(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getAllEndToEndSessions(txn, func);
+        });
     }
 
     /**
@@ -384,9 +400,11 @@ export default class IndexedDBCryptoStore {
      * @param {*} txn An active transaction. See doTxn().
      */
     storeEndToEndSession(deviceKey, sessionId, sessionInfo, txn) {
-        this._backendPromise.value().storeEndToEndSession(
+        this._backendPromise.then(backend => {
+            backend.storeEndToEndSession(
                 deviceKey, sessionId, sessionInfo, txn,
             );
+        });
     }
 
     // Inbound group saessions
@@ -401,9 +419,11 @@ export default class IndexedDBCryptoStore {
      *     to Base64 end-to-end session.
      */
     getEndToEndInboundGroupSession(senderCurve25519Key, sessionId, txn, func) {
-        this._backendPromise.value().getEndToEndInboundGroupSession(
+        this._backendPromise.then(backend => {
+            backend.getEndToEndInboundGroupSession(
                 senderCurve25519Key, sessionId, txn, func,
             );
+        });
     }
 
     /**
@@ -414,7 +434,9 @@ export default class IndexedDBCryptoStore {
      *     sessionData}, then once with null to indicate the end of the list.
      */
     getAllEndToEndInboundGroupSessions(txn, func) {
-        this._backendPromise.value().getAllEndToEndInboundGroupSessions(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getAllEndToEndInboundGroupSessions(txn, func);
+        });
     }
 
     /**
@@ -427,9 +449,11 @@ export default class IndexedDBCryptoStore {
      * @param {*} txn An active transaction. See doTxn().
      */
     addEndToEndInboundGroupSession(senderCurve25519Key, sessionId, sessionData, txn) {
-        this._backendPromise.value().addEndToEndInboundGroupSession(
+        this._backendPromise.then(backend => {
+            backend.addEndToEndInboundGroupSession(
                 senderCurve25519Key, sessionId, sessionData, txn,
             );
+        });
     }
 
     /**
@@ -442,9 +466,11 @@ export default class IndexedDBCryptoStore {
      * @param {*} txn An active transaction. See doTxn().
      */
     storeEndToEndInboundGroupSession(senderCurve25519Key, sessionId, sessionData, txn) {
-        this._backendPromise.value().storeEndToEndInboundGroupSession(
+        this._backendPromise.then(backend => {
+            backend.storeEndToEndInboundGroupSession(
                 senderCurve25519Key, sessionId, sessionData, txn,
             );
+        });
     }
 
     // End-to-end device tracking
@@ -460,7 +486,9 @@ export default class IndexedDBCryptoStore {
      * @param {*} txn An active transaction. See doTxn().
      */
     storeEndToEndDeviceData(deviceData, txn) {
-        this._backendPromise.value().storeEndToEndDeviceData(deviceData, txn);
+        this._backendPromise.then(backend => {
+            backend.storeEndToEndDeviceData(deviceData, txn);
+        });
     }
 
     /**
@@ -471,7 +499,9 @@ export default class IndexedDBCryptoStore {
      *     device data
      */
     getEndToEndDeviceData(txn, func) {
-        this._backendPromise.value().getEndToEndDeviceData(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getEndToEndDeviceData(txn, func);
+        });
     }
 
     // End to End Rooms
@@ -483,7 +513,9 @@ export default class IndexedDBCryptoStore {
      * @param {*} txn An active transaction. See doTxn().
      */
     storeEndToEndRoom(roomId, roomInfo, txn) {
-        this._backendPromise.value().storeEndToEndRoom(roomId, roomInfo, txn);
+        this._backendPromise.then(backend => {
+            backend.storeEndToEndRoom(roomId, roomInfo, txn);
+        });
     }
 
     /**
@@ -492,7 +524,9 @@ export default class IndexedDBCryptoStore {
      * @param {function(Object)} func Function called with the end to end encrypted rooms
      */
     getEndToEndRooms(txn, func) {
-        this._backendPromise.value().getEndToEndRooms(txn, func);
+        this._backendPromise.then(backend => {
+            backend.getEndToEndRooms(txn, func);
+        });
     }
 
     // session backups

src/store/indexeddb-remote-backend.js

@@ -17,6 +17,7 @@ limitations under the License.
 
 import Promise from 'bluebird';
 import logger from '../logger';
+import {defer} from '../utils';
 
 /**
  * An IndexedDB store backend where the actual backend sits in a web
@@ -152,7 +153,7 @@ RemoteIndexedDBStoreBackend.prototype = {
         // the promise automatically gets rejected
         return Promise.resolve().then(() => {
             const seq = this._nextSeq++;
-            const def = Promise.defer();
+            const def = defer();
 
             this._inFlight[seq] = def;
 

src/utils.js

@@ -714,3 +714,16 @@ module.exports.ensureNoTrailingSlash = function(url) {
 module.exports.sleep = (ms, value) => new Promise((resolve => {
     setTimeout(resolve, ms, value);
 }));
+
+// Returns a Deferred
+module.exports.defer = () => {
+    let resolve;
+    let reject;
+
+    const promise = new Promise((_resolve, _reject) => {
+        resolve = _resolve;
+        reject = _reject;
+    });
+
+    return {resolve, reject, promise};
+};