Support for .ready verification event (MSC2366) & other things

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

@@ -22,6 +22,8 @@ import {makeTestClients} from './util';
 
 const Olm = global.Olm;
 
+jest.useFakeTimers();
+
 describe("verification request", function() {
     if (!global.Olm) {
         logger.warn('Not running device verification unit tests: libolm not present');
@@ -64,7 +66,9 @@ describe("verification request", function() {
             // XXX: Private function access (but it's a test, so we're okay)
             bobVerifier._endTimer();
         });
-        const aliceVerifier = await alice.client.requestVerification("@bob:example.com");
+        const aliceRequest = await alice.client.requestVerification("@bob:example.com");
+        await aliceRequest.waitFor(r => r.started);
+        const aliceVerifier = aliceRequest.verifier;
         expect(aliceVerifier).toBeInstanceOf(SAS);
 
         // XXX: Private function access (but it's a test, so we're okay)

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

@@ -442,9 +442,11 @@ describe("SAS verification", function() {
                 });
             });
 
-            aliceVerifier = await alice.client.requestVerificationDM(
+            const aliceRequest = await alice.client.requestVerificationDM(
                 bob.client.getUserId(), "!room_id", [verificationMethods.SAS],
             );
+            await aliceRequest.waitFor(r => r.started);
+            aliceVerifier = aliceRequest.verifier;
             aliceVerifier.on("show_sas", (e) => {
                 if (!e.sas.emoji || !e.sas.decimal) {
                     e.cancel();

spec/unit/crypto/verification/util.js

@@ -33,15 +33,13 @@ export async function makeTestClients(userInfos, options) {
                             content: msg,
                         });
                         const client = clientMap[userId][deviceId];
-                        if (event.isEncrypted()) {
-                            event.attemptDecryption(client._crypto)
-                                .then(() => client.emit("toDeviceEvent", event));
-                        } else {
-                            setTimeout(
-                                () => client.emit("toDeviceEvent", event),
-                                0,
-                            );
-                        }
+                        const decryptionPromise = event.isEncrypted() ?
+                            event.attemptDecryption(client._crypto) :
+                            Promise.resolve();
+
+                        decryptionPromise.then(
+                            () => client.emit("toDeviceEvent", event),
+                        );
                     }
                 }
             }
@@ -50,21 +48,33 @@ export async function makeTestClients(userInfos, options) {
     const sendEvent = function(room, type, content) {
         // make up a unique ID as the event ID
         const eventId = "$" + this.makeTxnId(); // eslint-disable-line babel/no-invalid-this
-        const event = new MatrixEvent({
+        const rawEvent = {
             sender: this.getUserId(), // eslint-disable-line babel/no-invalid-this
             type: type,
             content: content,
             room_id: room,
             event_id: eventId,
+            origin_server_ts: Date.now(),
+        };
+        const event = new MatrixEvent(rawEvent);
+        const remoteEcho = new MatrixEvent(Object.assign({}, rawEvent, {
+            unsigned: {
+                transaction_id: this.makeTxnId(), // eslint-disable-line babel/no-invalid-this
+            },
+        }));
+
+        setImmediate(() => {
+            for (const tc of clients) {
+                if (tc.client === this) { // eslint-disable-line babel/no-invalid-this
+                    console.log("sending remote echo!!");
+                    tc.client.emit("Room.timeline", remoteEcho);
+                } else {
+                    tc.client.emit("Room.timeline", event);
+                }
+            }
         });
-        for (const tc of clients) {
-            setTimeout(
-                () => tc.client.emit("Room.timeline", event),
-                0,
-            );
-        }
 
-        return {event_id: eventId};
+        return Promise.resolve({event_id: eventId});
     };
 
     for (const userInfo of userInfos) {

src/client.js

@@ -853,8 +853,8 @@ async function _setDeviceVerification(
  * @param {Array} methods array of verification methods to use.  Defaults to
  *    all known methods
  *
- * @returns {Promise<module:crypto/verification/Base>} resolves to a verifier
- *    when the request is accepted by the other user
+ * @returns {Promise<module:crypto/verification/request/VerificationRequest>} resolves to a VerificationRequest
+ *    when the request has been sent to the other party.
  */
 MatrixClient.prototype.requestVerificationDM = function(userId, roomId, methods) {
     if (this._crypto === null) {
@@ -863,22 +863,6 @@ MatrixClient.prototype.requestVerificationDM = function(userId, roomId, methods)
     return this._crypto.requestVerificationDM(userId, roomId, methods);
 };
 
-/**
- * Accept a key verification request from a DM.
- *
- * @param {module:models/event~MatrixEvent} event the verification request
- * that is accepted
- * @param {string} method the verification mmethod to use
- *
- * @returns {module:crypto/verification/Base} a verifier
- */
-MatrixClient.prototype.acceptVerificationDM = function(event, method) {
-    if (this._crypto === null) {
-        throw new Error("End-to-end encryption disabled");
-    }
-    return this._crypto.acceptVerificationDM(event, method);
-};
-
 /**
  * Request a key verification from another user.
  *
@@ -888,8 +872,8 @@ MatrixClient.prototype.acceptVerificationDM = function(event, method) {
  * @param {Array} devices array of device IDs to send requests to.  Defaults to
  *    all devices owned by the user
  *
- * @returns {Promise<module:crypto/verification/Base>} resolves to a verifier
- *    when the request is accepted by the other user
+ * @returns {Promise<module:crypto/verification/request/VerificationRequest>} resolves to a VerificationRequest
+ *    when the request has been sent to the other party.
  */
 MatrixClient.prototype.requestVerification = function(userId, methods, devices) {
     if (this._crypto === null) {