Make code comply with oxlint suspicious ruleset (#5435)

* Use `node:` imports

* Remove spurious disablements

* Fix imports

* Fix badly written test

* Make oxlint happy with empty catch statements

* Simplify some assertions

* Make code comply with category restriction & reportUnusedDisableDirectives=warn

* Make code comply with oxlint suspicious ruleset

* Delint

* Iterate

Author: t3chguy

.oxlintrc.jsonc

@@ -5,6 +5,7 @@
         "correctness": "error",
         "perf": "error",
         "restriction": "error",
+        "suspicious": "error",
     },
     "options": {
         "typeAware": true,
@@ -104,6 +105,13 @@
         "no-void": "off",
         "no-bitwise": "off",
         "no-eq-null": "off",
+        "unicorn/no-array-sort": "off",
+        "unicorn/no-array-reverse": "off",
+        "typescript/no-unnecessary-type-parameters": "off",
+        "typescript/no-unnecessary-boolean-literal-compare": "off",
+        "typescript/no-extraneous-class": "off",
+        "promise/always-return": "off",
+        "unicorn/prefer-add-event-listener": "off",
 
         // Disable some rules by default for them to be enabled for `src` via overrides
         "no-console": "off",
@@ -133,6 +141,8 @@
         "typescript/no-import-type-side-effects": "off",
         "typescript/use-unknown-in-catch-callback-variable": "off",
         "typescript/no-invalid-void-type": "off", // https://github.com/oxc-project/oxc/issues/20280
+        "typescript/no-unsafe-enum-comparison": "off",
+        "typescript/no-unnecessary-type-conversion": "off",
         "no-param-reassign": "off",
         "typescript/no-explicit-any": "off",
         "import/no-cycle": "off",
@@ -142,6 +152,11 @@
         "guard-for-in": "error",
         "complexity": "off",
         "no-empty-function": "off",
+        "no-underscore-dangle": "off",
+        "no-shadow": "off",
+        "unicorn/consistent-function-scoping": "off",
+        "typescript/no-unsafe-type-assertion": "off",
+        "typescript/consistent-return": "off",
     },
     "overrides": [
         {
@@ -164,6 +179,7 @@
                 "typescript/unbound-method": "off",
                 "typescript/no-floating-promises": "off",
                 "typescript/no-misused-spread": "off",
+                "typescript/consistent-return": "off",
                 "vitest/require-mock-type-parameters": "off",
                 "vitest/no-disabled-tests": "off",
                 "vitest/no-conditional-expect": "off",
@@ -191,7 +207,18 @@
                         ],
                     },
                 ],
+                "unicorn/consistent-function-scoping": "off",
                 "jsdoc/check-tag-names": "off",
+                "no-shadow": "off",
+                "import/no-unassigned-import": [
+                    "error",
+                    {
+                        "allow": ["fake-indexeddb/auto"],
+                    },
+                ],
+                "promise/no-promise-in-callback": "off",
+                "no-new": "off",
+                "unicorn/prefer-add-event-listener": "off",
             },
         },
         {
@@ -221,5 +248,6 @@
                 "typescript/no-require-imports": "off",
             },
         },
+        { "files": ["**/*.d.ts"], "rules": { "unicorn/require-module-specifiers": "off" } },
     ],
 }

spec/integ/crypto/cross-signing.spec.ts

@@ -137,7 +137,7 @@ describe("cross-signing", () => {
             // check that the cross-signing keys have been uploaded
             expect(fetchMock.callHistory.called("upload-cross-signing-keys")).toBeTruthy();
             const keysOpts = fetchMock.callHistory.lastCall("upload-cross-signing-keys")!.options;
-            const keysBody = JSON.parse(keysOpts!.body as string);
+            const keysBody = JSON.parse(keysOpts.body as string);
             expect(keysBody.auth).toEqual(authDict); // check uia dict was passed
             // there should be a key of each type
             // master key is signed by the device
@@ -151,7 +151,7 @@ describe("cross-signing", () => {
             // check the publish call
             expect(fetchMock.callHistory.called("upload-sigs")).toBeTruthy();
             const sigsOpts = fetchMock.callHistory.lastCall("upload-sigs")!.options;
-            const body = JSON.parse(sigsOpts!.body as string);
+            const body = JSON.parse(sigsOpts.body as string);
             // there should be a signature for our device, by our self-signing key.
             expect(body).toHaveProperty([TEST_USER_ID, TEST_DEVICE_ID, "signatures", TEST_USER_ID, sskId]);
         });
@@ -234,7 +234,7 @@ describe("cross-signing", () => {
             // Expect the signature to be uploaded
             expect(fetchMock.callHistory.called("upload-sigs")).toBeTruthy();
             const sigsOpts = fetchMock.callHistory.lastCall("upload-sigs")!.options;
-            const body = JSON.parse(sigsOpts!.body as string);
+            const body = JSON.parse(sigsOpts.body as string);
             // the device should have a signature with the public self cross signing keys.
             expect(body).toHaveProperty([
                 TEST_USER_ID,
@@ -476,7 +476,7 @@ describe("cross-signing", () => {
             // check that a sig for the device was uploaded
             const calls = fetchMock.callHistory.calls("upload-sigs");
             expect(calls.length).toEqual(1);
-            const body = JSON.parse(calls[0].options!.body as string);
+            const body = JSON.parse(calls[0].options.body as string);
             const deviceSig = body[aliceClient.getSafeUserId()][testData.TEST_DEVICE_ID];
             expect(deviceSig).toHaveProperty("signatures");
         });

spec/integ/crypto/crypto.spec.ts

@@ -1158,7 +1158,7 @@ describe("crypto", () => {
         // it probably won't be decrypted yet, because it takes a while to process the olm keys
         const decryptedEvent = await testUtils.awaitDecryption(event, { waitOnDecryptionFailure: true });
         expect(decryptedEvent.getRoomId()).toEqual(ROOM_ID);
-        expect(decryptedEvent.getContent<IContent>()).toEqual({});
+        expect(decryptedEvent.getContent()).toEqual({});
         expect(decryptedEvent.getClearContent()).toBeUndefined();
     });
 
@@ -1196,7 +1196,7 @@ describe("crypto", () => {
             // and wait for the outgoing requests
             const inboundGroupSession = await inboundGroupSessionPromise;
             const encryptedMessageContent = await reqProm;
-            const msg: any = inboundGroupSession.decrypt(encryptedMessageContent!.ciphertext);
+            const msg: any = inboundGroupSession.decrypt(encryptedMessageContent.ciphertext);
             logger.log("Decrypted received megolm message", msg);
 
             // at this point, the request to send the room message has been made, but not completed.
@@ -1229,7 +1229,7 @@ describe("crypto", () => {
             });
             await syncPromise(aliceClient);
 
-            const timelineEvents = aliceClient.getRoom(testData.TEST_ROOM_ID)!.getLiveTimeline()!.getEvents();
+            const timelineEvents = aliceClient.getRoom(testData.TEST_ROOM_ID)!.getLiveTimeline().getEvents();
             const lastEvent = timelineEvents[timelineEvents.length - 1];
             expect(lastEvent.getId()).toEqual("$event_id");
 
@@ -1864,11 +1864,11 @@ describe("crypto", () => {
                 expect(activeBackup).toStrictEqual(backupVersion);
 
                 // check that there is a MSK signature
-                const signatures = (await aliceClient.getCrypto()!.checkKeyBackupAndEnable())!.backupInfo.auth_data!
+                const signatures = (await aliceClient.getCrypto()!.checkKeyBackupAndEnable())!.backupInfo.auth_data
                     .signatures;
                 expect(signatures).toBeDefined();
                 expect(signatures![aliceClient.getUserId()!]).toBeDefined();
-                const mskId = await aliceClient.getCrypto()!.getCrossSigningKeyId(CrossSigningKey.Master)!;
+                const mskId = await aliceClient.getCrypto()!.getCrossSigningKeyId(CrossSigningKey.Master);
                 expect(signatures![aliceClient.getUserId()!][`ed25519:${mskId}`]).toBeDefined();
             });
 
@@ -1907,7 +1907,7 @@ describe("crypto", () => {
                 const check = await aliceClient.getCrypto()!.checkKeyBackupAndEnable();
                 fetchMock.get(
                     `path:/_matrix/client/v3/room_keys/version/${check!.backupInfo.version}`,
-                    check!.backupInfo!,
+                    check!.backupInfo,
                 );
 
                 // Import a new key that should be uploaded

spec/integ/crypto/history-sharing.spec.ts

@@ -709,7 +709,7 @@ describe("History Sharing", () => {
                 sender: aliceClient.getSafeUserId(),
                 content: firstMessage,
                 event_id: "$event_id",
-            }) as any,
+            }),
         );
         bobSyncResponder.sendOrQueueSyncResponse(bobSyncResponse);
         await syncPromise(bobClient);
@@ -797,7 +797,7 @@ describe("History Sharing", () => {
                     sender: bobClient.getSafeUserId(),
                     content: bobEventM1Content,
                     event_id: "$event_id_m1",
-                }) as any,
+                }),
             );
             syncResponse.to_device = {
                 events: [
@@ -873,7 +873,7 @@ describe("History Sharing", () => {
                     sender: bobClient.getSafeUserId(),
                     content: bobEventM1Content,
                     event_id: "$event_id_m1",
-                }) as any,
+                }),
             );
             charlieSyncResponder.sendOrQueueSyncResponse(syncResponse);
             await syncPromise(charlieClient);
@@ -939,7 +939,7 @@ describe("History Sharing", () => {
                             type: EventType.RoomMember,
                             sender: charlieClient.getSafeUserId(),
                             state_key: charlieClient.getSafeUserId(),
-                        }) as any,
+                        }),
                     ],
                 };
             } else {
@@ -949,13 +949,13 @@ describe("History Sharing", () => {
                         type: EventType.RoomMember,
                         sender: charlieClient.getSafeUserId(),
                         state_key: charlieClient.getSafeUserId(),
-                    }) as any,
+                    }),
                     mkEventCustom({
                         content: { membership: config.leftState },
                         type: EventType.RoomMember,
                         sender: charlieClient.getSafeUserId(),
                         state_key: charlieClient.getSafeUserId(),
-                    }) as any,
+                    }),
                 );
             }
             // Bob syncs to learn about Charlie's leaving (and joining if non-gappy).

spec/integ/crypto/megolm-backup.spec.ts

@@ -22,7 +22,6 @@ import { type Mocked } from "vitest";
 import {
     createClient,
     encodeBase64,
-    type IContent,
     type ICreateClientOpts,
     type IEvent,
     type IMegolmSessionData,
@@ -240,7 +239,7 @@ describe("megolm-keys backup", () => {
 
             // Eventually, decryption succeeds.
             await awaitDecryption(event, { waitOnDecryptionFailure: true });
-            expect(event.getContent<IContent>()).toEqual(testData.CLEAR_EVENT.content);
+            expect(event.getContent()).toEqual(testData.CLEAR_EVENT.content);
         });
 
         it("handles error on backup query gracefully", async () => {
@@ -329,7 +328,7 @@ describe("megolm-keys backup", () => {
             const check = await aliceCrypto.checkKeyBackupAndEnable();
             await aliceCrypto.storeSessionBackupPrivateKey(
                 decodeRecoveryKey(testData.BACKUP_DECRYPTION_KEY_BASE58),
-                check!.backupInfo!.version,
+                check!.backupInfo.version,
             );
 
             const result = await advanceTimersUntil(aliceCrypto.restoreKeyBackup());
@@ -379,7 +378,7 @@ describe("megolm-keys backup", () => {
 
             await aliceCrypto.storeSessionBackupPrivateKey(
                 decodeRecoveryKey(testData.BACKUP_DECRYPTION_KEY_BASE58),
-                check!.backupInfo!.version,
+                check!.backupInfo.version,
             );
 
             const progressCallback = vi.fn();
@@ -438,7 +437,7 @@ describe("megolm-keys backup", () => {
             const check = await aliceCrypto.checkKeyBackupAndEnable();
             await aliceCrypto.storeSessionBackupPrivateKey(
                 decodeRecoveryKey(testData.BACKUP_DECRYPTION_KEY_BASE58),
-                check!.backupInfo!.version,
+                check!.backupInfo.version,
             );
 
             const progressCallback = vi.fn();
@@ -473,7 +472,7 @@ describe("megolm-keys backup", () => {
                 // DecryptSessions does not reject on decryption failure, but just skip the key
                 decryptSessions: vi.fn().mockImplementation((sessions) => {
                     // simulate fail to decrypt 2 keys out of all
-                    const decrypted = [];
+                    const decrypted: Mocked<IMegolmSessionData>[] = [];
                     const keys = Object.keys(sessions);
                     for (let i = 0; i < keys.length - decryptionFailureCount; i++) {
                         decrypted.push({
@@ -495,7 +494,7 @@ describe("megolm-keys backup", () => {
             const check = await aliceCrypto.checkKeyBackupAndEnable();
             await aliceCrypto.storeSessionBackupPrivateKey(
                 decodeRecoveryKey(testData.BACKUP_DECRYPTION_KEY_BASE58),
-                check!.backupInfo!.version,
+                check!.backupInfo.version,
             );
 
             const result = await aliceCrypto.restoreKeyBackup();
@@ -1132,7 +1131,7 @@ describe("megolm-keys backup", () => {
             const event = room.getLiveTimeline().getEvents()[0];
             await advanceTimersUntil(awaitDecryption(event, { waitOnDecryptionFailure: true }));
 
-            expect(event.getContent<IContent>()).toEqual(testData.CLEAR_EVENT.content);
+            expect(event.getContent()).toEqual(testData.CLEAR_EVENT.content);
 
             // =====
             // Second suppose now that the backup has changed to version 2

spec/integ/crypto/olm-utils.ts

@@ -518,7 +518,7 @@ export async function expectSendMegolmMessageEvent(
     // In some of the tests, the room key is sent *after* the actual event, so we may need to wait for it now.
     const inboundGroupSession = await inboundGroupSessionPromise;
 
-    const r: any = inboundGroupSession.decrypt(encryptedMessageContent!.ciphertext);
+    const r: any = inboundGroupSession.decrypt(encryptedMessageContent.ciphertext);
     logger.log("Decrypted received megolm message", r);
     return JSON.parse(r.plaintext);
 }
@@ -541,7 +541,7 @@ export async function expectSendMegolmStateEvent(
     // In some of the tests, the room key is sent *after* the actual event, so we may need to wait for it now.
     const inboundGroupSession = await inboundGroupSessionPromise;
 
-    const r: any = inboundGroupSession.decrypt(encryptedStateContent!.ciphertext);
+    const r: any = inboundGroupSession.decrypt(encryptedStateContent.ciphertext);
     logger.log("Decrypted received megolm state event", r);
     return JSON.parse(r.plaintext);
 }

spec/integ/crypto/verification.spec.ts

@@ -1284,7 +1284,7 @@ describe("verification", () => {
                 signedNonMatchingBackupInfo,
             ]);
 
-            e2eKeyResponder.addDeviceKeys(bootstrapped.device_keys![TEST_USER_ID]![olmDeviceId]);
+            e2eKeyResponder.addDeviceKeys(bootstrapped.device_keys![TEST_USER_ID][olmDeviceId]);
             e2eKeyResponder.addCrossSigningData(bootstrapped);
 
             usermasterPubKey = Object.values(bootstrapped.master_keys![TEST_USER_ID].keys)[0];
@@ -1529,7 +1529,7 @@ describe("verification", () => {
                 recipientEd25519Key: e2eKeyReceiver.getSigningKey(),
                 p2pSession: p2pSession,
                 olmAccount: testOlmAccount,
-                requestId: requestId!,
+                requestId: requestId,
                 secret: secret,
             });
 

spec/integ/matrix-client-event-emitter.spec.ts

@@ -39,11 +39,11 @@ describe("MatrixClient events", function () {
         const testClient = new TestClient(selfUserId, "DEVICE", selfAccessToken);
         const client = testClient.client;
         const httpBackend = testClient.httpBackend;
-        httpBackend!.when("GET", "/versions").respond(200, {});
-        httpBackend!.when("GET", "/pushrules").respond(200, {});
-        httpBackend!.when("POST", "/filter").respond(200, { filter_id: "a filter id" });
+        httpBackend.when("GET", "/versions").respond(200, {});
+        httpBackend.when("GET", "/pushrules").respond(200, {});
+        httpBackend.when("POST", "/filter").respond(200, { filter_id: "a filter id" });
 
-        return [client!, httpBackend];
+        return [client, httpBackend];
     };
 
     beforeEach(function () {