Convert OlmDevice to Typescript

src/crypto/algorithms/megolm.ts

@@ -67,7 +67,7 @@ export interface IOlmDevice<T = DeviceInfo> {
 }
 
 /* eslint-disable camelcase */
-interface IOutboundGroupSessionKey {
+export interface IOutboundGroupSessionKey {
     chain_index: number;
     key: string;
 }
@@ -887,9 +887,7 @@ class MegolmEncryption extends EncryptionAlgorithm {
         }
 
         const filteredFailedDevices =
-            await this.olmDevice.filterOutNotifiedErrorDevices(
-                failedDevices,
-            );
+            await this.olmDevice.filterOutNotifiedErrorDevices(failedDevices);
         logger.debug(
             `Filtered down to ${filteredFailedDevices.length} error devices ` +
             `in ${this.roomId}`,
@@ -1391,7 +1389,7 @@ class MegolmDecryption extends DecryptionAlgorithm {
      *
      * @param {module:models/event.MatrixEvent} event key event
      */
-    public onRoomKeyEvent(event: MatrixEvent): void {
+    public onRoomKeyEvent(event: MatrixEvent): Promise<void> {
         const content = event.getContent();
         const sessionId = content.session_id;
         let senderKey = event.getSenderKey();

src/crypto/algorithms/olm.ts

@@ -36,7 +36,7 @@ import { IEventDecryptionResult } from "../index";
 const DeviceVerification = DeviceInfo.DeviceVerification;
 
 interface IMessage {
-    type: number | string;
+    type: number;
     body: string;
 }
 
@@ -269,11 +269,11 @@ class OlmDecryption extends DecryptionAlgorithm {
             // not a prekey message: we can safely just try & decrypt it
             return this.reallyDecryptMessage(theirDeviceIdentityKey, message);
         } else {
-            const myPromise = this.olmDevice._olmPrekeyPromise.then(() => {
+            const myPromise = this.olmDevice.olmPrekeyPromise.then(() => {
                 return this.reallyDecryptMessage(theirDeviceIdentityKey, message);
             });
             // we want the error, but don't propagate it to the next decryption
-            this.olmDevice._olmPrekeyPromise = myPromise.catch(() => {});
+            this.olmDevice.olmPrekeyPromise = myPromise.catch(() => {});
             return await myPromise;
         }
     }