From 7772643b0d34357dd7c9aa08c0689164c6ddf862 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Mon, 15 Nov 2021 12:45:27 +0530
Subject: [PATCH 01/26] Disposables.js --> Disposables.ts

---
 src/utils/{Disposables.js => Disposables.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/utils/{Disposables.js => Disposables.ts} (100%)

diff --git a/src/utils/Disposables.js b/src/utils/Disposables.ts
similarity index 100%
rename from src/utils/Disposables.js
rename to src/utils/Disposables.ts

From dd74ed19570f7091769d15f20e25957758e1a4b9 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Mon, 15 Nov 2021 13:08:32 +0530
Subject: [PATCH 02/26] Add types to disposeValue

---
 src/utils/Disposables.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index b63cba85..6b9200f0 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-function disposeValue(value) {
+type func = () => void;
+type Disposable = { dispose: func; [key: string]: any } | func;
+
+function disposeValue(value: Disposable): void {
     if (typeof value === "function") {
         value();
     } else {
@@ -27,9 +30,7 @@ function isDisposable(value) {
 }
 
 export class Disposables {
-    constructor() {
-        this._disposables = [];
-    }
+    private readonly _disposables = [];
 
     track(disposable) {
         if (!isDisposable(disposable)) {

From 7270918b652438be2124d178c01b325dc8c0f5a4 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Mon, 15 Nov 2021 13:43:39 +0530
Subject: [PATCH 03/26] Convert Disposables to typescript

---
 src/utils/Disposables.ts | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index 6b9200f0..e05b1e87 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -25,14 +25,15 @@ function disposeValue(value: Disposable): void {
     }
 }
 
-function isDisposable(value) {
+function isDisposable(value: Disposable): boolean {
+    // todo: value can be undefined I think?
     return value && (typeof value === "function" || typeof value.dispose === "function");
 }
 
 export class Disposables {
-    private readonly _disposables = [];
+    private _disposables: Disposable[] | null = [];
 
-    track(disposable) {
+    track(disposable: Disposable): Disposable {
         if (!isDisposable(disposable)) {
             throw new Error("Not a disposable");
         }
@@ -41,19 +42,23 @@ export class Disposables {
             disposeValue(disposable);
             return disposable;
         }
-        this._disposables.push(disposable);
+        this._disposables!.push(disposable);
         return disposable;
     }
 
-    untrack(disposable) {
-        const idx = this._disposables.indexOf(disposable);
+    untrack(disposable: Disposable) {
+        if (this.isDisposed) {
+            console.warn("Disposables already disposed, cannot untrack");
+            return;
+        }
+        const idx = this._disposables!.indexOf(disposable);
         if (idx >= 0) {
-            this._disposables.splice(idx, 1);
+            this._disposables!.splice(idx, 1);
         }
         return null;
     }
 
-    dispose() {
+    dispose(): void {
         if (this._disposables) {
             for (const d of this._disposables) {
                 disposeValue(d);
@@ -62,17 +67,17 @@ export class Disposables {
         }
     }
 
-    get isDisposed() {
+    get isDisposed(): boolean {
         return this._disposables === null;
     }
 
-    disposeTracked(value) {
+    disposeTracked(value: Disposable): null {
         if (value === undefined || value === null || this.isDisposed) {
             return null;
         }
-        const idx = this._disposables.indexOf(value);
+        const idx = this._disposables!.indexOf(value);
         if (idx !== -1) {
-            const [foundValue] = this._disposables.splice(idx, 1);
+            const [foundValue] = this._disposables!.splice(idx, 1);
             disposeValue(foundValue);
         } else {
             console.warn("disposable not found, did it leak?", value);

From 7d12c2ba54a34fb837f620ae76ba46bd25cff03d Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 14:09:37 +0530
Subject: [PATCH 04/26] Add return types

---
 src/utils/Disposables.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index e05b1e87..dc538c99 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -26,7 +26,6 @@ function disposeValue(value: Disposable): void {
 }
 
 function isDisposable(value: Disposable): boolean {
-    // todo: value can be undefined I think?
     return value && (typeof value === "function" || typeof value.dispose === "function");
 }
 
@@ -46,10 +45,10 @@ export class Disposables {
         return disposable;
     }
 
-    untrack(disposable: Disposable) {
+    untrack(disposable: Disposable): null {
         if (this.isDisposed) {
             console.warn("Disposables already disposed, cannot untrack");
-            return;
+            return null;
         }
         const idx = this._disposables!.indexOf(disposable);
         if (idx >= 0) {

From ef53a12f7ab24705d57c53178d18aa415677877c Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 14:13:35 +0530
Subject: [PATCH 05/26] Fix imports

---
 src/domain/ViewModel.js              | 2 +-
 src/matrix/room/timeline/Timeline.js | 2 +-
 src/platform/web/Platform.js         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/domain/ViewModel.js b/src/domain/ViewModel.js
index f0e109f8..0c665194 100644
--- a/src/domain/ViewModel.js
+++ b/src/domain/ViewModel.js
@@ -19,7 +19,7 @@ limitations under the License.
 // we do need to return a disposable from EventEmitter.on, or at least have a method here to easily track a subscription to an EventEmitter
 
 import {EventEmitter} from "../utils/EventEmitter";
-import {Disposables} from "../utils/Disposables.js";
+import {Disposables} from "../utils/Disposables";
 
 export class ViewModel extends EventEmitter {
     constructor(options = {}) {
diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js
index bd89ee8d..04adde0d 100644
--- a/src/matrix/room/timeline/Timeline.js
+++ b/src/matrix/room/timeline/Timeline.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {SortedArray, AsyncMappedList, ConcatList, ObservableArray} from "../../../observable/index.js";
-import {Disposables} from "../../../utils/Disposables.js";
+import {Disposables} from "../../../utils/Disposables";
 import {Direction} from "./Direction";
 import {TimelineReader} from "./persistence/TimelineReader.js";
 import {PendingEventEntry} from "./entries/PendingEventEntry.js";
diff --git a/src/platform/web/Platform.js b/src/platform/web/Platform.js
index f6cd2895..3e1d6791 100644
--- a/src/platform/web/Platform.js
+++ b/src/platform/web/Platform.js
@@ -35,7 +35,7 @@ import {WorkerPool} from "./dom/WorkerPool.js";
 import {BlobHandle} from "./dom/BlobHandle.js";
 import {hasReadPixelPermission, ImageHandle, VideoHandle} from "./dom/ImageHandle.js";
 import {downloadInIframe} from "./dom/download.js";
-import {Disposables} from "../../utils/Disposables.js";
+import {Disposables} from "../../utils/Disposables";
 import {parseHTML} from "./parsehtml.js";
 import {handleAvatarError} from "./ui/avatar.js";
 

From 4ce7634201e8fd56d503a1c3572cb89b19ba9d18 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 14:21:47 +0530
Subject: [PATCH 06/26] Convert error.js to ts

---
 src/matrix/error.js                     | 2 +-
 src/matrix/net/ExponentialRetryDelay.js | 2 +-
 src/matrix/net/RequestScheduler.js      | 2 +-
 src/matrix/room/sending/PendingEvent.js | 2 +-
 src/matrix/storage/idb/utils.ts         | 2 +-
 src/mocks/Request.js                    | 2 +-
 src/observable/ObservableValue.ts       | 2 +-
 src/platform/web/dom/Clock.js           | 2 +-
 src/platform/web/dom/WorkerPool.js      | 2 +-
 src/utils/{error.js => error.ts}        | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename src/utils/{error.js => error.ts} (96%)

diff --git a/src/matrix/error.js b/src/matrix/error.js
index 07144acd..0dd2b688 100644
--- a/src/matrix/error.js
+++ b/src/matrix/error.js
@@ -38,7 +38,7 @@ export class HomeServerError extends Error {
     }
 }
 
-export {AbortError} from "../utils/error.js";
+export {AbortError} from "../utils/error";
 
 export class ConnectionError extends Error {
     constructor(message, isTimeout) {
diff --git a/src/matrix/net/ExponentialRetryDelay.js b/src/matrix/net/ExponentialRetryDelay.js
index eac4bec0..853f8758 100644
--- a/src/matrix/net/ExponentialRetryDelay.js
+++ b/src/matrix/net/ExponentialRetryDelay.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../../utils/error.js";
+import {AbortError} from "../../utils/error";
 
 export class ExponentialRetryDelay {
     constructor(createTimeout) {
diff --git a/src/matrix/net/RequestScheduler.js b/src/matrix/net/RequestScheduler.js
index 53ab50ac..f9adec97 100644
--- a/src/matrix/net/RequestScheduler.js
+++ b/src/matrix/net/RequestScheduler.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../../utils/error.js";
+import {AbortError} from "../../utils/error";
 import {HomeServerError} from "../error.js";
 import {HomeServerApi} from "./HomeServerApi.js";
 import {ExponentialRetryDelay} from "./ExponentialRetryDelay.js";
diff --git a/src/matrix/room/sending/PendingEvent.js b/src/matrix/room/sending/PendingEvent.js
index 01874178..4c7a0e99 100644
--- a/src/matrix/room/sending/PendingEvent.js
+++ b/src/matrix/room/sending/PendingEvent.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import {createEnum} from "../../../utils/enum.js";
-import {AbortError} from "../../../utils/error.js";
+import {AbortError} from "../../../utils/error";
 import {REDACTION_TYPE} from "../common.js";
 import {getRelationFromContent, getRelationTarget, setRelationTarget} from "../timeline/relations.js";
 
diff --git a/src/matrix/storage/idb/utils.ts b/src/matrix/storage/idb/utils.ts
index ca6e06de..4ac373d2 100644
--- a/src/matrix/storage/idb/utils.ts
+++ b/src/matrix/storage/idb/utils.ts
@@ -17,7 +17,7 @@ limitations under the License.
 
 import { IDBRequestError } from "./error";
 import { StorageError } from "../common";
-import { AbortError } from "../../../utils/error.js";
+import { AbortError } from "../../../utils/error";
 
 let needsSyncPromise = false;
 
diff --git a/src/mocks/Request.js b/src/mocks/Request.js
index 1984f06f..14a3fabf 100644
--- a/src/mocks/Request.js
+++ b/src/mocks/Request.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../utils/error.js";
+import {AbortError} from "../utils/error";
 
 export class BaseRequest {
     constructor() {
diff --git a/src/observable/ObservableValue.ts b/src/observable/ObservableValue.ts
index 02d5fc69..b3ffa6ee 100644
--- a/src/observable/ObservableValue.ts
+++ b/src/observable/ObservableValue.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../utils/error.js";
+import {AbortError} from "../utils/error";
 import {BaseObservable} from "./BaseObservable";
 
 // like an EventEmitter, but doesn't have an event type
diff --git a/src/platform/web/dom/Clock.js b/src/platform/web/dom/Clock.js
index 7e64de47..855e925c 100644
--- a/src/platform/web/dom/Clock.js
+++ b/src/platform/web/dom/Clock.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../../../utils/error.js";
+import {AbortError} from "../../../utils/error";
 
 class Timeout {
     constructor(ms) {
diff --git a/src/platform/web/dom/WorkerPool.js b/src/platform/web/dom/WorkerPool.js
index aeb6ca89..c36ffb78 100644
--- a/src/platform/web/dom/WorkerPool.js
+++ b/src/platform/web/dom/WorkerPool.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {AbortError} from "../../../utils/error.js";
+import {AbortError} from "../../../utils/error";
 
 class WorkerState {
     constructor(worker) {
diff --git a/src/utils/error.js b/src/utils/error.ts
similarity index 96%
rename from src/utils/error.js
rename to src/utils/error.ts
index 820f0673..dcade6ce 100644
--- a/src/utils/error.js
+++ b/src/utils/error.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 export class AbortError extends Error {
-    get name() {
+    get name(): string {
         return "AbortError";
     }
 }

From a3460d8c2aa8acc58799eca1ef599b4982576b5c Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 14:44:16 +0530
Subject: [PATCH 07/26] Convert formatSize to ts

---
 src/domain/session/room/timeline/tiles/FileTile.js | 2 +-
 src/utils/{formatSize.js => formatSize.ts}         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename src/utils/{formatSize.js => formatSize.ts} (92%)

diff --git a/src/domain/session/room/timeline/tiles/FileTile.js b/src/domain/session/room/timeline/tiles/FileTile.js
index c761e68e..1007d28c 100644
--- a/src/domain/session/room/timeline/tiles/FileTile.js
+++ b/src/domain/session/room/timeline/tiles/FileTile.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {BaseMessageTile} from "./BaseMessageTile.js";
-import {formatSize} from "../../../../../utils/formatSize.js";
+import {formatSize} from "../../../../../utils/formatSize";
 import {SendStatus} from "../../../../../matrix/room/sending/PendingEvent.js";
 
 export class FileTile extends BaseMessageTile {
diff --git a/src/utils/formatSize.js b/src/utils/formatSize.ts
similarity index 92%
rename from src/utils/formatSize.js
rename to src/utils/formatSize.ts
index d001dacd..14ec6387 100644
--- a/src/utils/formatSize.js
+++ b/src/utils/formatSize.ts
@@ -14,7 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function formatSize(size, decimals = 2) {
+
+export function formatSize(size: number, decimals: number = 2): string | undefined {
     if (Number.isSafeInteger(size)) {
         const base = Math.min(3, Math.floor(Math.log(size) / Math.log(1024)));
         const formattedSize = Math.round(size / Math.pow(1024, base)).toFixed(decimals);

From c8eb7ea7ac911a53242c239dfe461d5450b91ee5 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 15:06:19 +0530
Subject: [PATCH 08/26] Convert Lock.js to ts

---
 src/matrix/e2ee/olm/Decryption.js |  2 +-
 src/utils/{Lock.js => Lock.ts}    | 26 ++++++++++++--------------
 src/utils/LockMap.js              |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)
 rename src/utils/{Lock.js => Lock.ts} (83%)

diff --git a/src/matrix/e2ee/olm/Decryption.js b/src/matrix/e2ee/olm/Decryption.js
index 0af3bd23..16e617a5 100644
--- a/src/matrix/e2ee/olm/Decryption.js
+++ b/src/matrix/e2ee/olm/Decryption.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {DecryptionError} from "../common.js";
 import {groupBy} from "../../../utils/groupBy";
-import {MultiLock} from "../../../utils/Lock.js";
+import {MultiLock} from "../../../utils/Lock";
 import {Session} from "./Session.js";
 import {DecryptionResult} from "../DecryptionResult.js";
 
diff --git a/src/utils/Lock.js b/src/utils/Lock.ts
similarity index 83%
rename from src/utils/Lock.js
rename to src/utils/Lock.ts
index 8cfc733f..ce7101de 100644
--- a/src/utils/Lock.js
+++ b/src/utils/Lock.ts
@@ -15,12 +15,10 @@ limitations under the License.
 */
 
 export class Lock {
-    constructor() {
-        this._promise = null;
-        this._resolve = null;
-    }
+    private _promise: Promise<void> | null = null;
+    private _resolve: (() => void) | null = null;
 
-    tryTake() {
+    tryTake(): boolean {
         if (!this._promise) {
             this._promise = new Promise(resolve => {
                 this._resolve = resolve;
@@ -30,17 +28,17 @@ export class Lock {
         return false;
     }
 
-    async take() {
+    async take(): Promise<void> {
         while(!this.tryTake()) {
             await this.released();
         }
     }
 
-    get isTaken() {
+    get isTaken(): boolean {
         return !!this._promise;
     }
 
-    release() {
+    release(): void {
         if (this._resolve) {
             this._promise = null;
             const resolve = this._resolve;
@@ -49,17 +47,17 @@ export class Lock {
         }
     }
 
-    released() {
+    released(): Promise<void> | null {
         return this._promise;
     }
 }
 
 export class MultiLock {
-    constructor(locks) {
-        this.locks = locks;
+
+    constructor(public readonly locks: Lock[]) {
     }
 
-    release() {
+    release(): void {
         for (const lock of this.locks) {
             lock.release();
         }
@@ -86,9 +84,9 @@ export function tests() {
             lock.tryTake();
 
             let first;
-            lock.released().then(() => first = lock.tryTake());
+            lock.released()!.then(() => first = lock.tryTake());
             let second;
-            lock.released().then(() => second = lock.tryTake());
+            lock.released()!.then(() => second = lock.tryTake());
             const promise = lock.released();
             lock.release();
             await promise;
diff --git a/src/utils/LockMap.js b/src/utils/LockMap.js
index a73dee4a..567acf4c 100644
--- a/src/utils/LockMap.js
+++ b/src/utils/LockMap.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Lock} from "./Lock.js";
+import {Lock} from "./Lock";
 
 export class LockMap {
     constructor() {

From 1549d8add0874737c80093918e052281822fe785 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 15:26:40 +0530
Subject: [PATCH 09/26] Convert LockMap to ts

---
 src/matrix/Session.js                |  2 +-
 src/utils/{LockMap.js => LockMap.ts} | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename src/utils/{LockMap.js => LockMap.ts} (92%)

diff --git a/src/matrix/Session.js b/src/matrix/Session.js
index 37fd90ad..874bfecd 100644
--- a/src/matrix/Session.js
+++ b/src/matrix/Session.js
@@ -34,7 +34,7 @@ import {Encryption as MegOlmEncryption} from "./e2ee/megolm/Encryption.js";
 import {MEGOLM_ALGORITHM} from "./e2ee/common.js";
 import {RoomEncryption} from "./e2ee/RoomEncryption.js";
 import {DeviceTracker} from "./e2ee/DeviceTracker.js";
-import {LockMap} from "../utils/LockMap.js";
+import {LockMap} from "../utils/LockMap";
 import {groupBy} from "../utils/groupBy";
 import {
     keyFromCredential as ssssKeyFromCredential,
diff --git a/src/utils/LockMap.js b/src/utils/LockMap.ts
similarity index 92%
rename from src/utils/LockMap.js
rename to src/utils/LockMap.ts
index 567acf4c..5952f031 100644
--- a/src/utils/LockMap.js
+++ b/src/utils/LockMap.ts
@@ -17,11 +17,9 @@ limitations under the License.
 import {Lock} from "./Lock";
 
 export class LockMap {
-    constructor() {
-        this._map = new Map();
-    }
+    private readonly _map: Map<unknown, Lock> = new Map();
 
-    async takeLock(key) {
+    async takeLock(key: unknown): Promise<Lock> {
         let lock = this._map.get(key);
         if (lock) {
             await lock.take();
@@ -31,10 +29,10 @@ export class LockMap {
             this._map.set(key, lock);
         }
         // don't leave old locks lying around
-        lock.released().then(() => {
+        lock.released()!.then(() => {
             // give others a chance to take the lock first
             Promise.resolve().then(() => {
-                if (!lock.isTaken) {
+                if (!lock!.isTaken) {
                     this._map.delete(key);
                 }
             });
@@ -67,6 +65,7 @@ export function tests() {
                 ranSecond = true;
                 assert.equal(returnedLock.isTaken, true);
                 // peek into internals, naughty
+                // @ts-ignore
                 assert.equal(lockMap._map.get("foo"), returnedLock);
             });
             lock.release();
@@ -84,6 +83,7 @@ export function tests() {
             // double delay to make sure cleanup logic ran
             await Promise.resolve();
             await Promise.resolve();
+            // @ts-ignore
             assert.equal(lockMap._map.has("foo"), false);
         },
         

From 88ec1b575d96f566b56bd3c6242aceaef4927575 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 15:37:32 +0530
Subject: [PATCH 10/26] Convert mergeMap.js to ts

---
 src/matrix/e2ee/RoomEncryption.js                          | 2 +-
 src/matrix/e2ee/megolm/decryption/DecryptionPreparation.js | 2 +-
 src/utils/{mergeMap.js => mergeMap.ts}                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/utils/{mergeMap.js => mergeMap.ts} (93%)

diff --git a/src/matrix/e2ee/RoomEncryption.js b/src/matrix/e2ee/RoomEncryption.js
index 430d9af3..d9151a85 100644
--- a/src/matrix/e2ee/RoomEncryption.js
+++ b/src/matrix/e2ee/RoomEncryption.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {MEGOLM_ALGORITHM, DecryptionSource} from "./common.js";
 import {groupEventsBySession} from "./megolm/decryption/utils";
-import {mergeMap} from "../../utils/mergeMap.js";
+import {mergeMap} from "../../utils/mergeMap";
 import {groupBy} from "../../utils/groupBy";
 import {makeTxnId} from "../common.js";
 
diff --git a/src/matrix/e2ee/megolm/decryption/DecryptionPreparation.js b/src/matrix/e2ee/megolm/decryption/DecryptionPreparation.js
index 02ee32df..618955bb 100644
--- a/src/matrix/e2ee/megolm/decryption/DecryptionPreparation.js
+++ b/src/matrix/e2ee/megolm/decryption/DecryptionPreparation.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {DecryptionChanges} from "./DecryptionChanges.js";
-import {mergeMap} from "../../../../utils/mergeMap.js";
+import {mergeMap} from "../../../../utils/mergeMap";
 
 /**
  * Class that contains all the state loaded from storage to decrypt the given events
diff --git a/src/utils/mergeMap.js b/src/utils/mergeMap.ts
similarity index 93%
rename from src/utils/mergeMap.js
rename to src/utils/mergeMap.ts
index a0aed207..21ad0086 100644
--- a/src/utils/mergeMap.js
+++ b/src/utils/mergeMap.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function mergeMap(src, dst) {
+export function mergeMap<K, V>(src: Map<K, V> | undefined, dst: Map<K, V>) {
     if (src) {
         for (const [key, value] of src.entries()) {
             dst.set(key, value);

From ea0adb440715414a6a19641cdbf2206c8910db20 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 15:41:50 +0530
Subject: [PATCH 11/26] Convert RetainedValue.js to ts

---
 src/matrix/room/members/MemberList.js            |  2 +-
 src/utils/{RetainedValue.js => RetainedValue.ts} | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
 rename src/utils/{RetainedValue.js => RetainedValue.ts} (82%)

diff --git a/src/matrix/room/members/MemberList.js b/src/matrix/room/members/MemberList.js
index de07adf5..9923fb87 100644
--- a/src/matrix/room/members/MemberList.js
+++ b/src/matrix/room/members/MemberList.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {ObservableMap} from "../../../observable/map/ObservableMap.js";
-import {RetainedValue} from "../../../utils/RetainedValue.js";
+import {RetainedValue} from "../../../utils/RetainedValue";
 
 export class MemberList extends RetainedValue {
     constructor({members, closeCallback}) {
diff --git a/src/utils/RetainedValue.js b/src/utils/RetainedValue.ts
similarity index 82%
rename from src/utils/RetainedValue.js
rename to src/utils/RetainedValue.ts
index b3ed7a91..a67b848b 100644
--- a/src/utils/RetainedValue.js
+++ b/src/utils/RetainedValue.ts
@@ -15,16 +15,18 @@ limitations under the License.
 */
 
 export class RetainedValue {
-    constructor(freeCallback) {
+    private readonly _freeCallback: () => void;
+    private _retentionCount: number = 1;
+
+    constructor(freeCallback: () => void) {
         this._freeCallback = freeCallback;
-        this._retentionCount = 1;
     }
 
-    retain() {
+    retain(): void {
         this._retentionCount += 1;
     }
 
-    release() {
+    release(): void {
         this._retentionCount -= 1;
         if (this._retentionCount === 0) {
             this._freeCallback();

From 8a169d5ddc6886eb0a289ea4517bf4f2d374a8c9 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 15:52:42 +0530
Subject: [PATCH 12/26] Convert sortedIndex.js to ts

---
 src/domain/session/room/timeline/TilesCollection.js | 2 +-
 src/observable/list/SortedArray.js                  | 2 +-
 src/observable/list/SortedMapList.js                | 2 +-
 src/utils/{sortedIndex.js => sortedIndex.ts}        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename src/utils/{sortedIndex.js => sortedIndex.ts} (93%)

diff --git a/src/domain/session/room/timeline/TilesCollection.js b/src/domain/session/room/timeline/TilesCollection.js
index b3696fad..8dce4125 100644
--- a/src/domain/session/room/timeline/TilesCollection.js
+++ b/src/domain/session/room/timeline/TilesCollection.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {BaseObservableList} from "../../../../observable/list/BaseObservableList";
-import {sortedIndex} from "../../../../utils/sortedIndex.js";
+import {sortedIndex} from "../../../../utils/sortedIndex";
 
 // maps 1..n entries to 0..1 tile. Entries are what is stored in the timeline, either an event or fragmentboundary
 // for now, tileCreator should be stable in whether it returns a tile or not.
diff --git a/src/observable/list/SortedArray.js b/src/observable/list/SortedArray.js
index 874d1b04..1201845c 100644
--- a/src/observable/list/SortedArray.js
+++ b/src/observable/list/SortedArray.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {BaseObservableList} from "./BaseObservableList";
-import {sortedIndex} from "../../utils/sortedIndex.js";
+import {sortedIndex} from "../../utils/sortedIndex";
 import {findAndUpdateInArray} from "./common";
 
 export class SortedArray extends BaseObservableList {
diff --git a/src/observable/list/SortedMapList.js b/src/observable/list/SortedMapList.js
index 2421419e..38900380 100644
--- a/src/observable/list/SortedMapList.js
+++ b/src/observable/list/SortedMapList.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {BaseObservableList} from "./BaseObservableList";
-import {sortedIndex} from "../../utils/sortedIndex.js";
+import {sortedIndex} from "../../utils/sortedIndex";
 
 /*
 
diff --git a/src/utils/sortedIndex.js b/src/utils/sortedIndex.ts
similarity index 93%
rename from src/utils/sortedIndex.js
rename to src/utils/sortedIndex.ts
index e0acb5ff..0022cb87 100644
--- a/src/utils/sortedIndex.js
+++ b/src/utils/sortedIndex.ts
@@ -22,7 +22,7 @@ limitations under the License.
  * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
-export function sortedIndex(array, value, comparator) {
+export function sortedIndex<T>(array: T[], value: T, comparator: (x:T, y:T) => number): number {
     let low = 0;
     let high = array.length;
 

From afecac3e3cd8b851c8a2df90b9556ea6f01a54a2 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Tue, 16 Nov 2021 16:14:13 +0530
Subject: [PATCH 13/26] Convert timeout.js to ts

---
 src/platform/web/dom/request/fetch.js | 2 +-
 src/utils/{timeout.js => timeout.ts}  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename src/utils/{timeout.js => timeout.ts} (88%)

diff --git a/src/platform/web/dom/request/fetch.js b/src/platform/web/dom/request/fetch.js
index 66f1a148..adf833ef 100644
--- a/src/platform/web/dom/request/fetch.js
+++ b/src/platform/web/dom/request/fetch.js
@@ -19,7 +19,7 @@ import {
     AbortError,
     ConnectionError
 } from "../../../../matrix/error.js";
-import {abortOnTimeout} from "../../../../utils/timeout.js";
+import {abortOnTimeout} from "../../../../utils/timeout";
 import {addCacheBuster} from "./common.js";
 import {xhrRequest} from "./xhr.js";
 
diff --git a/src/utils/timeout.js b/src/utils/timeout.ts
similarity index 88%
rename from src/utils/timeout.js
rename to src/utils/timeout.ts
index 6bfc0d7e..96efc10d 100644
--- a/src/utils/timeout.js
+++ b/src/utils/timeout.ts
@@ -16,9 +16,13 @@ limitations under the License.
 */
 
 import {ConnectionError} from "../matrix/error.js";
+import type {Timeout} from "../platform/web/dom/Clock.js"
 
+type TimeoutCreator = (ms: number) => Timeout;
+// ts-todo: export type RequestResult from fetch.js? we'll need to wait until it's typescript though.
+type Abortable = { abort(): void; [key: string]: any };
 
-export function abortOnTimeout(createTimeout, timeoutAmount, requestResult, responsePromise) {
+export function abortOnTimeout(createTimeout: TimeoutCreator, timeoutAmount: number, requestResult: Abortable, responsePromise: Promise<Response>) {
     const timeout = createTimeout(timeoutAmount);
     // abort request if timeout finishes first
     let timedOut = false;

From 6c2aa1bf61fce74bb3c80d73a2d71b784740a627 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 14:04:43 +0530
Subject: [PATCH 14/26] Convert hkdf.js to ts

---
 src/platform/web/LegacyPlatform.js    | 2 +-
 src/utils/crypto/{hkdf.js => hkdf.ts} | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
 rename src/utils/crypto/{hkdf.js => hkdf.ts} (83%)

diff --git a/src/platform/web/LegacyPlatform.js b/src/platform/web/LegacyPlatform.js
index e6bf7774..5cbfb52f 100644
--- a/src/platform/web/LegacyPlatform.js
+++ b/src/platform/web/LegacyPlatform.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import aesjs from "../../../lib/aes-js/index.js";
-import {hkdf} from "../../utils/crypto/hkdf.js";
+import {hkdf} from "../../utils/crypto/hkdf";
 import {Platform as ModernPlatform} from "./Platform.js";
 
 export function Platform(container, paths) {
diff --git a/src/utils/crypto/hkdf.js b/src/utils/crypto/hkdf.ts
similarity index 83%
rename from src/utils/crypto/hkdf.js
rename to src/utils/crypto/hkdf.ts
index d46dc496..25c1faf6 100644
--- a/src/utils/crypto/hkdf.js
+++ b/src/utils/crypto/hkdf.ts
@@ -6,8 +6,10 @@
  * Based on https://github.com/junkurihara/jscu/blob/develop/packages/js-crypto-hkdf/src/hkdf.ts
  */
 
+import type {Crypto} from "../../platform/web/dom/Crypto.js";
+
 // forked this code to make it use the cryptoDriver for HMAC that is more backwards-compatible
-export async function hkdf(cryptoDriver, key, salt, info, hash, length) {
+export async function hkdf(cryptoDriver: Crypto, key: Uint8Array, salt: Uint8Array, info: Uint8Array, hash: string, length: number): Promise<Uint8Array> {
     length = length / 8;
     const len = cryptoDriver.digestSize(hash);
 

From a945edfe07808867f87191ae4cce8c394aa26315 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 14:24:30 +0530
Subject: [PATCH 15/26] Convert pbkdf2.js to ts

---
 src/utils/crypto/{pbkdf2.js => pbkdf2.ts} | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 rename src/utils/crypto/{pbkdf2.js => pbkdf2.ts} (83%)

diff --git a/src/utils/crypto/pbkdf2.js b/src/utils/crypto/pbkdf2.ts
similarity index 83%
rename from src/utils/crypto/pbkdf2.js
rename to src/utils/crypto/pbkdf2.ts
index 5a239791..6a8b8495 100644
--- a/src/utils/crypto/pbkdf2.js
+++ b/src/utils/crypto/pbkdf2.ts
@@ -6,17 +6,19 @@
  * Based on https://github.com/junkurihara/jscu/blob/develop/packages/js-crypto-pbkdf/src/pbkdf.ts
  */
 
+import type {Crypto} from "../../platform/web/dom/Crypto.js";
+
 // not used atm, but might in the future
 // forked this code to make it use the cryptoDriver for HMAC that is more backwards-compatible
 
 
-const nwbo = (num, len) => {
+const nwbo = (num: number, len: number): Uint8Array => {
   const arr = new Uint8Array(len);
   for(let i=0; i<len; i++) arr[i] = 0xFF && (num >> ((len - i - 1)*8));
   return arr;
 };
 
-export async function pbkdf2(cryptoDriver, password, iterations, salt, hash, length) {
+export async function pbkdf2(cryptoDriver: Crypto, password: Uint8Array, iterations: number, salt: Uint8Array, hash: string, length: number): Promise<Uint8Array> {
     const dkLen = length / 8;
     if (iterations <= 0) {
         throw new Error('InvalidIterationCount');
@@ -30,7 +32,7 @@ export async function pbkdf2(cryptoDriver, password, iterations, salt, hash, len
     const l = Math.ceil(dkLen/hLen);
     const r = dkLen - (l-1)*hLen;
 
-    const funcF = async (i) => {
+    const funcF = async (i: number) => {
         const seed = new Uint8Array(salt.length + 4);
         seed.set(salt);
         seed.set(nwbo(i+1, 4), salt.length);
@@ -46,7 +48,7 @@ export async function pbkdf2(cryptoDriver, password, iterations, salt, hash, len
         return {index: i, value: outputF};
     };
 
-    const Tis = [];
+    const Tis: Promise<{index: number, value: Uint8Array}>[] = [];
     const DK = new Uint8Array(dkLen);
     for(let i = 0; i < l; i++) {
         Tis.push(funcF(i));

From 0e18247184f0d041659cc46b07da197b17569bea Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 14:36:15 +0530
Subject: [PATCH 16/26] Use constant type

---
 src/utils/crypto/hkdf.ts   | 2 +-
 src/utils/crypto/pbkdf2.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/crypto/hkdf.ts b/src/utils/crypto/hkdf.ts
index 25c1faf6..44f66029 100644
--- a/src/utils/crypto/hkdf.ts
+++ b/src/utils/crypto/hkdf.ts
@@ -9,7 +9,7 @@
 import type {Crypto} from "../../platform/web/dom/Crypto.js";
 
 // forked this code to make it use the cryptoDriver for HMAC that is more backwards-compatible
-export async function hkdf(cryptoDriver: Crypto, key: Uint8Array, salt: Uint8Array, info: Uint8Array, hash: string, length: number): Promise<Uint8Array> {
+export async function hkdf(cryptoDriver: Crypto, key: Uint8Array, salt: Uint8Array, info: Uint8Array, hash: "SHA-256" | "SHA-512", length: number): Promise<Uint8Array> {
     length = length / 8;
     const len = cryptoDriver.digestSize(hash);
 
diff --git a/src/utils/crypto/pbkdf2.ts b/src/utils/crypto/pbkdf2.ts
index 6a8b8495..a9108377 100644
--- a/src/utils/crypto/pbkdf2.ts
+++ b/src/utils/crypto/pbkdf2.ts
@@ -18,7 +18,7 @@ const nwbo = (num: number, len: number): Uint8Array => {
   return arr;
 };
 
-export async function pbkdf2(cryptoDriver: Crypto, password: Uint8Array, iterations: number, salt: Uint8Array, hash: string, length: number): Promise<Uint8Array> {
+export async function pbkdf2(cryptoDriver: Crypto, password: Uint8Array, iterations: number, salt: Uint8Array, hash: "SHA-256" | "SHA-512", length: number): Promise<Uint8Array> {
     const dkLen = length / 8;
     if (iterations <= 0) {
         throw new Error('InvalidIterationCount');

From ebd1caf6d19583ece0e6795a109bc38fa7ce6b5b Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 15:50:04 +0530
Subject: [PATCH 17/26] Convert enum.js to ts

---
 src/utils/{enum.js => enum.ts} | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
 rename src/utils/{enum.js => enum.ts} (80%)

diff --git a/src/utils/enum.js b/src/utils/enum.ts
similarity index 80%
rename from src/utils/enum.js
rename to src/utils/enum.ts
index 4defcfd7..71365984 100644
--- a/src/utils/enum.js
+++ b/src/utils/enum.ts
@@ -14,12 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function createEnum(...values) {
+export function createEnum(...values: string[]): Readonly<{}> {
     const obj = {};
     for (const value of values) {
-        if (typeof value !== "string") {
-            throw new Error("Invalid enum value name" + value?.toString());
-        }
         obj[value] = value;
     }
     return Object.freeze(obj);

From 0c424cb77f054bc5706b49325683fb12c654f476 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 15:54:44 +0530
Subject: [PATCH 18/26] Fix imports

---
 src/domain/session/SessionStatusViewModel.js           | 2 +-
 src/domain/session/room/timeline/tiles/BaseTextTile.js | 2 +-
 src/domain/session/settings/SessionBackupViewModel.js  | 2 +-
 src/matrix/SessionContainer.js                         | 2 +-
 src/matrix/Sync.js                                     | 2 +-
 src/matrix/e2ee/common.js                              | 2 +-
 src/matrix/net/Reconnector.js                          | 2 +-
 src/matrix/room/sending/PendingEvent.js                | 2 +-
 src/matrix/ssss/index.js                               | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/domain/session/SessionStatusViewModel.js b/src/domain/session/SessionStatusViewModel.js
index 108d2aca..27dad7cc 100644
--- a/src/domain/session/SessionStatusViewModel.js
+++ b/src/domain/session/SessionStatusViewModel.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import {ViewModel} from "../ViewModel.js";
-import {createEnum} from "../../utils/enum.js";
+import {createEnum} from "../../utils/enum";
 import {ConnectionStatus} from "../../matrix/net/Reconnector.js";
 import {SyncStatus} from "../../matrix/Sync.js";
 
diff --git a/src/domain/session/room/timeline/tiles/BaseTextTile.js b/src/domain/session/room/timeline/tiles/BaseTextTile.js
index fb61cb4b..60024ca6 100644
--- a/src/domain/session/room/timeline/tiles/BaseTextTile.js
+++ b/src/domain/session/room/timeline/tiles/BaseTextTile.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {BaseMessageTile} from "./BaseMessageTile.js";
 import {stringAsBody} from "../MessageBody.js";
-import {createEnum} from "../../../../../utils/enum.js";
+import {createEnum} from "../../../../../utils/enum";
 
 export const BodyFormat = createEnum("Plain", "Html");
 
diff --git a/src/domain/session/settings/SessionBackupViewModel.js b/src/domain/session/settings/SessionBackupViewModel.js
index 533d0f6d..52be43b4 100644
--- a/src/domain/session/settings/SessionBackupViewModel.js
+++ b/src/domain/session/settings/SessionBackupViewModel.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 import {ViewModel} from "../../ViewModel.js";
 import {KeyType} from "../../../matrix/ssss/index.js";
-import {createEnum} from "../../../utils/enum.js";
+import {createEnum} from "../../../utils/enum";
 
 export const Status = createEnum("Enabled", "SetupKey", "SetupPhrase", "Pending"); 
 
diff --git a/src/matrix/SessionContainer.js b/src/matrix/SessionContainer.js
index 3e3dab66..dc9f9ee8 100644
--- a/src/matrix/SessionContainer.js
+++ b/src/matrix/SessionContainer.js
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {createEnum} from "../utils/enum.js";
+import {createEnum} from "../utils/enum";
 import {lookupHomeserver} from "./well-known.js";
 import {AbortableOperation} from "../utils/AbortableOperation";
 import {ObservableValue} from "../observable/ObservableValue";
diff --git a/src/matrix/Sync.js b/src/matrix/Sync.js
index 0be48007..de09a96d 100644
--- a/src/matrix/Sync.js
+++ b/src/matrix/Sync.js
@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import {ObservableValue} from "../observable/ObservableValue";
-import {createEnum} from "../utils/enum.js";
+import {createEnum} from "../utils/enum";
 
 const INCREMENTAL_TIMEOUT = 30000;
 
diff --git a/src/matrix/e2ee/common.js b/src/matrix/e2ee/common.js
index fa970236..775e3dd0 100644
--- a/src/matrix/e2ee/common.js
+++ b/src/matrix/e2ee/common.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 import anotherjson from "../../../lib/another-json/index.js";
-import {createEnum} from "../../utils/enum.js";
+import {createEnum} from "../../utils/enum";
 
 export const DecryptionSource = createEnum("Sync", "Timeline", "Retry");
 
diff --git a/src/matrix/net/Reconnector.js b/src/matrix/net/Reconnector.js
index 6fd2ca94..6eaa78d7 100644
--- a/src/matrix/net/Reconnector.js
+++ b/src/matrix/net/Reconnector.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {createEnum} from "../../utils/enum.js";
+import {createEnum} from "../../utils/enum";
 import {ObservableValue} from "../../observable/ObservableValue";
 
 export const ConnectionStatus = createEnum(
diff --git a/src/matrix/room/sending/PendingEvent.js b/src/matrix/room/sending/PendingEvent.js
index 4c7a0e99..d4c10704 100644
--- a/src/matrix/room/sending/PendingEvent.js
+++ b/src/matrix/room/sending/PendingEvent.js
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import {createEnum} from "../../../utils/enum.js";
+import {createEnum} from "../../../utils/enum";
 import {AbortError} from "../../../utils/error";
 import {REDACTION_TYPE} from "../common.js";
 import {getRelationFromContent, getRelationTarget, setRelationTarget} from "../timeline/relations.js";
diff --git a/src/matrix/ssss/index.js b/src/matrix/ssss/index.js
index cb795766..b063ab0b 100644
--- a/src/matrix/ssss/index.js
+++ b/src/matrix/ssss/index.js
@@ -18,7 +18,7 @@ import {KeyDescription, Key} from "./common.js";
 import {keyFromPassphrase} from "./passphrase.js";
 import {keyFromRecoveryKey} from "./recoveryKey.js";
 import {SESSION_E2EE_KEY_PREFIX} from "../e2ee/common.js";
-import {createEnum} from "../../utils/enum.js";
+import {createEnum} from "../../utils/enum";
 
 const SSSS_KEY = `${SESSION_E2EE_KEY_PREFIX}ssssKey`;
 

From 1beb153f21fa27b6cd9013b6f125231af493f013 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 16:26:19 +0530
Subject: [PATCH 19/26] func --> Func

---
 src/utils/Disposables.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index dc538c99..0317825b 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-type func = () => void;
-type Disposable = { dispose: func; [key: string]: any } | func;
+type Func = () => void;
+type Disposable = { dispose: Func; [key: string]: any } | Func;
 
 function disposeValue(value: Disposable): void {
     if (typeof value === "function") {

From 5a0c06473c215ebb86ba09c0373e6f82e9f6eb50 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 16:28:14 +0530
Subject: [PATCH 20/26] Use undefined instead of null

---
 src/utils/Lock.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/utils/Lock.ts b/src/utils/Lock.ts
index ce7101de..238d88f9 100644
--- a/src/utils/Lock.ts
+++ b/src/utils/Lock.ts
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 export class Lock {
-    private _promise: Promise<void> | null = null;
-    private _resolve: (() => void) | null = null;
+    private _promise?: Promise<void>;
+    private _resolve?: (() => void);
 
     tryTake(): boolean {
         if (!this._promise) {
@@ -40,14 +40,14 @@ export class Lock {
 
     release(): void {
         if (this._resolve) {
-            this._promise = null;
+            this._promise = undefined;
             const resolve = this._resolve;
-            this._resolve = null;
+            this._resolve = undefined;
             resolve();
         }
     }
 
-    released(): Promise<void> | null {
+    released(): Promise<void> | undefined {
         return this._promise;
     }
 }

From 08ef84d1121cc6b22d8421b06ad99d4f93cf1100 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 16:33:37 +0530
Subject: [PATCH 21/26] Mention return type

---
 src/utils/mergeMap.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/mergeMap.ts b/src/utils/mergeMap.ts
index 21ad0086..b5d9b524 100644
--- a/src/utils/mergeMap.ts
+++ b/src/utils/mergeMap.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-export function mergeMap<K, V>(src: Map<K, V> | undefined, dst: Map<K, V>) {
+export function mergeMap<K, V>(src: Map<K, V> | undefined, dst: Map<K, V>): void {
     if (src) {
         for (const [key, value] of src.entries()) {
             dst.set(key, value);

From a14a8c3a07cbdbcf7b901e789a44ab0617e93132 Mon Sep 17 00:00:00 2001
From: R Midhun Suresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 19:40:21 +0530
Subject: [PATCH 22/26] Create interface IDisposable

Co-authored-by: Bruno Windels <brunow@matrix.org>
---
 src/utils/Disposables.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index 0317825b..9671665f 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -15,7 +15,11 @@ limitations under the License.
 */
 
 type Func = () => void;
-type Disposable = { dispose: Func; [key: string]: any } | Func;
+export interface IDisposable {
+    dispose(): void;
+}
+
+type Disposable = IDisposable | (() => void);
 
 function disposeValue(value: Disposable): void {
     if (typeof value === "function") {

From 048547828d5e70e93a3b107ada97d30253e42778 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 19:41:03 +0530
Subject: [PATCH 23/26] Remove type Func

---
 src/utils/Disposables.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/Disposables.ts b/src/utils/Disposables.ts
index 9671665f..19a5983c 100644
--- a/src/utils/Disposables.ts
+++ b/src/utils/Disposables.ts
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-type Func = () => void;
 export interface IDisposable {
     dispose(): void;
 }

From 64a9892ee20e3440e42dbb1028cacdca004c07f7 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 19:44:19 +0530
Subject: [PATCH 24/26] Use generic T in LockMap

---
 src/utils/LockMap.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/utils/LockMap.ts b/src/utils/LockMap.ts
index 5952f031..4c7cba13 100644
--- a/src/utils/LockMap.ts
+++ b/src/utils/LockMap.ts
@@ -16,10 +16,10 @@ limitations under the License.
 
 import {Lock} from "./Lock";
 
-export class LockMap {
-    private readonly _map: Map<unknown, Lock> = new Map();
+export class LockMap<T> {
+    private readonly _map: Map<T, Lock> = new Map();
 
-    async takeLock(key: unknown): Promise<Lock> {
+    async takeLock(key: T): Promise<Lock> {
         let lock = this._map.get(key);
         if (lock) {
             await lock.take();

From ea2842f37fc907f29980afe84cbcdb3a8e8ca4a3 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 19:57:38 +0530
Subject: [PATCH 25/26] Return empty string

---
 src/utils/formatSize.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/formatSize.ts b/src/utils/formatSize.ts
index 14ec6387..f611c79e 100644
--- a/src/utils/formatSize.ts
+++ b/src/utils/formatSize.ts
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 
-export function formatSize(size: number, decimals: number = 2): string | undefined {
+export function formatSize(size: number, decimals: number = 2): string {
     if (Number.isSafeInteger(size)) {
         const base = Math.min(3, Math.floor(Math.log(size) / Math.log(1024)));
         const formattedSize = Math.round(size / Math.pow(1024, base)).toFixed(decimals);
@@ -26,4 +26,5 @@ export function formatSize(size: number, decimals: number = 2): string | undefin
             case 3: return `${formattedSize} GB`;
         }
     }
+    return "";
 }

From 8fcfd713e07e8a04f4f2f39abf056cf45da9298f Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Wed, 17 Nov 2021 20:27:23 +0530
Subject: [PATCH 26/26] Use IAbortable

---
 src/utils/AbortableOperation.ts | 2 +-
 src/utils/timeout.ts            | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/utils/AbortableOperation.ts b/src/utils/AbortableOperation.ts
index 0cc49e10..d03f820a 100644
--- a/src/utils/AbortableOperation.ts
+++ b/src/utils/AbortableOperation.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-interface IAbortable {
+export interface IAbortable {
     abort();
 }
 
diff --git a/src/utils/timeout.ts b/src/utils/timeout.ts
index 96efc10d..f0460047 100644
--- a/src/utils/timeout.ts
+++ b/src/utils/timeout.ts
@@ -17,12 +17,11 @@ limitations under the License.
 
 import {ConnectionError} from "../matrix/error.js";
 import type {Timeout} from "../platform/web/dom/Clock.js"
+import type {IAbortable} from "./AbortableOperation";
 
 type TimeoutCreator = (ms: number) => Timeout;
-// ts-todo: export type RequestResult from fetch.js? we'll need to wait until it's typescript though.
-type Abortable = { abort(): void; [key: string]: any };
 
-export function abortOnTimeout(createTimeout: TimeoutCreator, timeoutAmount: number, requestResult: Abortable, responsePromise: Promise<Response>) {
+export function abortOnTimeout(createTimeout: TimeoutCreator, timeoutAmount: number, requestResult: IAbortable, responsePromise: Promise<Response>) {
     const timeout = createTimeout(timeoutAmount);
     // abort request if timeout finishes first
     let timedOut = false;