refactor: upgrade to typescript-eslint v8

yume-chan · Aug 3, 2024 · 66a98f8 · 66a98f8
1 parent 6115266
commit 66a98f8
Show file tree

Hide file tree

Showing 32 changed files with 278 additions and 180 deletions.
diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -41,7 +41,7 @@
         "source-map-support": "^0.5.21"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",
         "prettier": "^3.3.3",

diff --git a/libraries/adb-credential-web/src/index.ts b/libraries/adb-credential-web/src/index.ts
@@ -6,7 +6,7 @@ function openDatabase() {
     return new Promise<IDBDatabase>((resolve, reject) => {
         const request = indexedDB.open("Tango", 1);
         request.onerror = () => {
-            reject(request.error);
+            reject(request.error!);
         };
         request.onupgradeneeded = () => {
             const db = request.result;
@@ -27,13 +27,13 @@ async function saveKey(key: Uint8Array): Promise<void> {
         const store = transaction.objectStore("Authentication");
         const putRequest = store.add(key);
         putRequest.onerror = () => {
-            reject(putRequest.error);
+            reject(putRequest.error!);
         };
         putRequest.onsuccess = () => {
             resolve();
         };
         transaction.onerror = () => {
-            reject(transaction.error);
+            reject(transaction.error!);
         };
         transaction.oncomplete = () => {
             db.close();
@@ -49,13 +49,13 @@ async function getAllKeys() {
         const store = transaction.objectStore("Authentication");
         const getRequest = store.getAll();
         getRequest.onerror = () => {
-            reject(getRequest.error);
+            reject(getRequest.error!);
         };
         getRequest.onsuccess = () => {
             resolve(getRequest.result as Uint8Array[]);
         };
         transaction.onerror = () => {
-            reject(transaction.error);
+            reject(transaction.error!);
         };
         transaction.oncomplete = () => {
             db.close();

diff --git a/libraries/adb-daemon-webusb/package.json b/libraries/adb-daemon-webusb/package.json
@@ -38,7 +38,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/adb-scrcpy/src/connection.ts b/libraries/adb-scrcpy/src/connection.ts
@@ -110,7 +110,7 @@ export class AdbScrcpyForwardConnection extends AdbScrcpyConnection {
                     };
                 }
                 return stream;
-            } catch (e) {
+            } catch {
                 // Maybe the server is still starting
                 await delay(100);
             }

diff --git a/libraries/adb-server-node-tcp/package.json b/libraries/adb-server-node-tcp/package.json
@@ -37,7 +37,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",
         "prettier": "^3.3.3",

diff --git a/libraries/adb-server-node-tcp/src/index.ts b/libraries/adb-server-node-tcp/src/index.ts
@@ -5,6 +5,7 @@ import type { AdbIncomingSocketHandler, AdbServerClient } from "@yume-chan/adb";
 import {
     MaybeConsumable,
     PushReadableStream,
+    tryClose,
     WrapWritableStream,
     WritableStream,
 } from "@yume-chan/stream-extra";
@@ -32,11 +33,7 @@ function nodeSocketToConnection(
                 socket.resume();
             });
             socket.on("end", () => {
-                try {
-                    controller.close();
-                } catch (e) {
-                    // controller already closed
-                }
+                tryClose(controller);
             });
         }),
         writable: new WritableStream<Uint8Array>({

diff --git a/libraries/adb/package.json b/libraries/adb/package.json
@@ -39,7 +39,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/adb/src/commands/sync/sync.ts b/libraries/adb/src/commands/sync/sync.ts
@@ -117,7 +117,7 @@ export class AdbSync extends AutoDisposable {
         try {
             await this.lstat(path + "/");
             return true;
-        } catch (e) {
+        } catch {
             return false;
         }
     }

diff --git a/libraries/adb/src/daemon/dispatcher.ts b/libraries/adb/src/daemon/dispatcher.ts
@@ -334,7 +334,7 @@ export class AdbPacketDispatcher implements Closeable {
                 remoteId,
                 this.options.initialDelayedAckBytes,
             );
-        } catch (e) {
+        } catch {
             await this.sendPacket(
                 AdbCommand.Close,
                 0,

diff --git a/libraries/adb/src/server/client.ts b/libraries/adb/src/server/client.ts
@@ -11,6 +11,8 @@ import {
     BufferedReadableStream,
     MaybeConsumable,
     WrapWritableStream,
+    tryCancel,
+    tryClose,
 } from "@yume-chan/stream-extra";
 import type { ValueOrPromise } from "@yume-chan/struct";
 import {
@@ -23,12 +25,7 @@ import {
 import type { AdbIncomingSocketHandler, AdbSocket, Closeable } from "../adb.js";
 import { AdbBanner } from "../banner.js";
 import type { AdbFeature } from "../features.js";
-import {
-    NOOP,
-    hexToNumber,
-    sequenceEqual,
-    write4HexDigits,
-} from "../utils/index.js";
+import { hexToNumber, sequenceEqual, write4HexDigits } from "../utils/index.js";
 
 import { AdbServerTransport } from "./transport.js";
 
@@ -123,8 +120,8 @@ class AdbServerStream {
     }
 
     async dispose() {
-        await this.#buffered.cancel().catch(NOOP);
-        await this.#writer.close().catch(NOOP);
+        void tryCancel(this.#buffered);
+        void tryClose(this.#writer);
         await this.#connection.close();
     }
 }

diff --git a/libraries/adb/tsconfig.json b/libraries/adb/tsconfig.json
@@ -1,10 +1,10 @@
 {
     "references": [
         {
-            "path": "./tsconfig.build.json"
+            "path": "./tsconfig.test.json"
         },
         {
-            "path": "./tsconfig.test.json"
+            "path": "./tsconfig.build.json"
         }
     ]
 }
diff --git a/libraries/android-bin/package.json b/libraries/android-bin/package.json
@@ -37,7 +37,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/android-bin/src/bug-report.ts b/libraries/android-bin/src/bug-report.ts
@@ -185,7 +185,7 @@ export class BugReport extends AdbCommandBase {
      */
     async bugReportZ(options?: BugReportZOptions): Promise<string> {
         if (options?.signal?.aborted) {
-            throw options?.signal.reason ?? new Error("Aborted");
+            throw options?.signal.reason as Error;
         }
 
         if (!this.#supportsBugReportZ) {

diff --git a/libraries/android-bin/src/string-format.ts b/libraries/android-bin/src/string-format.ts
@@ -93,7 +93,7 @@ export const p = {
                     const result = format.stringify(value);
                     // Parse the result to make sure it is valid
                     format.parse({ value: result, position: 0 });
-                } catch (e) {
+                } catch {
                     // ignore
                 }
             }
@@ -141,7 +141,7 @@ export const p = {
             while (true) {
                 try {
                     result.push(format.parse(reader));
-                } catch (e) {
+                } catch {
                     break;
                 }
             }

diff --git a/libraries/event/package.json b/libraries/event/package.json
@@ -36,7 +36,7 @@
         "@yume-chan/async": "^2.2.0"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/fetch-scrcpy-server/package.json b/libraries/fetch-scrcpy-server/package.json
@@ -31,6 +31,6 @@
         "gh-release-fetch": "^4.0.3"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12"
+        "@types/node": "^22.1.0"
     }
 }
diff --git a/libraries/no-data-view/package.json b/libraries/no-data-view/package.json
@@ -30,12 +30,12 @@
         "test": "run-test"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",
         "prettier": "^3.3.3",
-        "tinybench": "^2.8.0",
+        "tinybench": "^2.9.0",
         "typescript": "^5.5.4"
     }
 }
diff --git a/libraries/pcm-player/package.json b/libraries/pcm-player/package.json
@@ -30,7 +30,7 @@
         "prepublishOnly": "npm run build"
     },
     "devDependencies": {
-        "@types/audioworklet": "^0.0.57",
+        "@types/audioworklet": "^0.0.58",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",
         "prettier": "^3.3.3",

diff --git a/libraries/scrcpy/package.json b/libraries/scrcpy/package.json
@@ -39,7 +39,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/scrcpy/src/options/1_21.ts b/libraries/scrcpy/src/options/1_21.ts
@@ -81,7 +81,7 @@ export class ScrcpyOptions1_21 extends ScrcpyOptions<ScrcpyOptionsInit1_21> {
         }
     }
 
-    #deviceMessageError: unknown;
+    #deviceMessageError: Error | undefined;
 
     override async parseDeviceMessage(
         id: number,
@@ -97,12 +97,12 @@ export class ScrcpyOptions1_21 extends ScrcpyOptions<ScrcpyOptionsInit1_21> {
                     break;
             }
         } catch (e) {
-            this.#deviceMessageError = e;
+            this.#deviceMessageError = e as Error;
             throw e;
         }
     }
 
-    override async endDeviceMessageStream(e?: unknown): Promise<void> {
+    override async endDeviceMessageStream(e?: Error): Promise<void> {
         await super.endDeviceMessageStream(e);
         this.#deviceMessageError ??=
             e ?? new Error("Device message stream ended");

diff --git a/libraries/stream-extra/package.json b/libraries/stream-extra/package.json
@@ -36,7 +36,7 @@
         "@yume-chan/struct": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",

diff --git a/libraries/stream-extra/src/buffered.ts b/libraries/stream-extra/src/buffered.ts
@@ -3,10 +3,7 @@ import { ExactReadableEndedError } from "@yume-chan/struct";
 
 import { PushReadableStream } from "./push-readable.js";
 import type { ReadableStream, ReadableStreamDefaultReader } from "./stream.js";
-
-const NOOP = () => {
-    // no-op
-};
+import { tryCancel } from "./try-close.js";
 
 export class BufferedReadableStream implements AsyncExactReadable {
     #buffered: Uint8Array | undefined;
@@ -133,8 +130,7 @@ export class BufferedReadableStream implements AsyncExactReadable {
                 await controller.enqueue(buffered);
 
                 controller.abortSignal.addEventListener("abort", () => {
-                    // NOOP: the reader might already be released
-                    this.reader.cancel().catch(NOOP);
+                    void tryCancel(this.reader);
                 });
 
                 // Manually pipe the stream

diff --git a/libraries/stream-extra/src/duplex.ts b/libraries/stream-extra/src/duplex.ts
@@ -8,6 +8,7 @@ import type {
     WritableStreamDefaultWriter,
 } from "./stream.js";
 import { WritableStream } from "./stream.js";
+import { tryClose } from "./try-close.js";
 import { WrapReadableStream } from "./wrap-readable.js";
 
 const NOOP = () => {
@@ -134,11 +135,7 @@ export class DuplexStreamFactory<R, W> {
         this.#closed.resolve();
 
         for (const controller of this.#readableControllers) {
-            try {
-                controller.close();
-            } catch {
-                // ignore
-            }
+            tryClose(controller);
         }
 
         await this.#options.dispose?.();

diff --git a/libraries/stream-extra/src/index.ts b/libraries/stream-extra/src/index.ts
@@ -14,5 +14,6 @@ export * from "./stream.js";
 export * from "./struct-deserialize.js";
 export * from "./struct-serialize.js";
 export * from "./task.js";
+export * from "./try-close.js";
 export * from "./wrap-readable.js";
 export * from "./wrap-writable.js";
diff --git a/libraries/stream-extra/src/try-close.ts b/libraries/stream-extra/src/try-close.ts
@@ -0,0 +1,44 @@
+import type { BufferedReadableStream } from "./buffered.js";
+import type { PushReadableStreamController } from "./push-readable.js";
+import type {
+    ReadableStream,
+    ReadableStreamDefaultController,
+    ReadableStreamDefaultReader,
+    WritableStreamDefaultWriter,
+} from "./stream.js";
+
+export function tryClose(
+    controller: PushReadableStreamController<unknown>,
+): boolean;
+export function tryClose(
+    controller: ReadableStreamDefaultController<unknown>,
+): boolean;
+export function tryClose(writer: WritableStreamDefaultWriter<never>): boolean;
+export function tryClose(controller: { close(): void }) {
+    try {
+        controller.close();
+        return true;
+    } catch {
+        return false;
+    }
+}
+
+export async function tryCancel(
+    stream: ReadableStream<unknown>,
+): Promise<boolean>;
+export async function tryCancel(
+    stream: BufferedReadableStream,
+): Promise<boolean>;
+export async function tryCancel(
+    reader: ReadableStreamDefaultReader<unknown>,
+): Promise<boolean>;
+export async function tryCancel(stream: {
+    cancel(): Promise<void>;
+}): Promise<boolean> {
+    try {
+        await stream.cancel();
+        return true;
+    } catch {
+        return false;
+    }
+}
diff --git a/libraries/struct/package.json b/libraries/struct/package.json
@@ -37,7 +37,7 @@
         "@yume-chan/no-data-view": "workspace:^0.0.24"
     },
     "devDependencies": {
-        "@types/node": "^20.14.12",
+        "@types/node": "^22.1.0",
         "@yume-chan/eslint-config": "workspace:^1.0.0",
         "@yume-chan/test-runner": "workspace:^1.0.0",
         "@yume-chan/tsconfig": "workspace:^1.0.0",