feat(adb-scrcpy): infer type of videoStream from video option

yume-chan · Feb 18, 2025 · 24b65fd · 24b65fd
1 parent 02f5bd5
commit 24b65fd
Show file tree

Hide file tree

Showing 61 changed files with 653 additions and 336 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -115,7 +115,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "explorer.sortOrder": "mixed",
-    "prettier.prettierPath": "./node_modules/prettier/index.cjs",
+    "prettier.prettierPath": "./toolchain/eslint-config/node_modules/prettier/index.cjs",
     "cSpell.numSuggestions": 4,
     "cSpell.ignoreRegExpList": [
         "0x[0-9a-f_]+"

diff --git a/libraries/adb-scrcpy/package.json b/libraries/adb-scrcpy/package.json
@@ -29,7 +29,8 @@
     "scripts": {
         "build": "tsc -b tsconfig.build.json",
         "lint": "run-eslint && prettier src/**/*.ts --write --tab-width 4",
-        "prepublishOnly": "npm run build"
+        "prepublishOnly": "npm run build",
+        "test": "run-test"
     },
     "dependencies": {
         "@yume-chan/adb": "workspace:^",
@@ -40,7 +41,9 @@
         "@yume-chan/struct": "workspace:^"
     },
     "devDependencies": {
+        "@types/node": "^22.10.10",
         "@yume-chan/eslint-config": "workspace:^",
+        "@yume-chan/test-runner": "workspace:^",
         "@yume-chan/tsconfig": "workspace:^",
         "prettier": "^3.4.2",
         "typescript": "^5.7.3"

diff --git a/libraries/adb-scrcpy/src/2_1/impl/create-connection.ts b/libraries/adb-scrcpy/src/2_1/impl/create-connection.ts
@@ -15,7 +15,7 @@ export function createConnection(
     adb: Adb,
     options: Required<
         Pick<
-            ScrcpyOptions2_1.Init,
+            ScrcpyOptions2_1.Init<boolean>,
             | "tunnelForward"
             | "control"
             | "sendDummyByte"

diff --git a/libraries/adb-scrcpy/src/2_1/options.ts b/libraries/adb-scrcpy/src/2_1/options.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "../connection.js";
 import { AdbScrcpyOptions } from "../types.js";
 
-export class AdbScrcpyOptions2_1 extends AdbScrcpyOptions<ScrcpyOptions2_1.Init> {
-    constructor(init: ScrcpyOptions2_1.Init, version?: string) {
+export class AdbScrcpyOptions2_1<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_1.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_1.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_1(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_1 extends AdbScrcpyOptions<ScrcpyOptions2_1.Init>
 }
 
 export namespace AdbScrcpyOptions2_1 {
-    export type Init = ScrcpyOptions2_1.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_1.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_1_1.ts b/libraries/adb-scrcpy/src/2_1_1.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_1_1 extends AdbScrcpyOptions<ScrcpyOptions2_1_1.Init> {
-    constructor(init: ScrcpyOptions2_1_1.Init, version?: string) {
+export class AdbScrcpyOptions2_1_1<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_1_1.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_1_1.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_1_1(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_1_1 extends AdbScrcpyOptions<ScrcpyOptions2_1_1.I
 }
 
 export namespace AdbScrcpyOptions2_1_1 {
-    export type Init = ScrcpyOptions2_1_1.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_1_1.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_2.ts b/libraries/adb-scrcpy/src/2_2.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_2 extends AdbScrcpyOptions<ScrcpyOptions2_2.Init> {
-    constructor(init: ScrcpyOptions2_2.Init, version?: string) {
+export class AdbScrcpyOptions2_2<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_2.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_2.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_2(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_2 extends AdbScrcpyOptions<ScrcpyOptions2_2.Init>
 }
 
 export namespace AdbScrcpyOptions2_2 {
-    export type Init = ScrcpyOptions2_2.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_2.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_3.ts b/libraries/adb-scrcpy/src/2_3.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_3 extends AdbScrcpyOptions<ScrcpyOptions2_3.Init> {
-    constructor(init: ScrcpyOptions2_3.Init, version?: string) {
+export class AdbScrcpyOptions2_3<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_3.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_3.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_3(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_3 extends AdbScrcpyOptions<ScrcpyOptions2_3.Init>
 }
 
 export namespace AdbScrcpyOptions2_3 {
-    export type Init = ScrcpyOptions2_3.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_3.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_3_1.ts b/libraries/adb-scrcpy/src/2_3_1.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_3_1 extends AdbScrcpyOptions<ScrcpyOptions2_3_1.Init> {
-    constructor(init: ScrcpyOptions2_3_1.Init, version?: string) {
+export class AdbScrcpyOptions2_3_1<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_3_1.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_3_1.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_3_1(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_3_1 extends AdbScrcpyOptions<ScrcpyOptions2_3_1.I
 }
 
 export namespace AdbScrcpyOptions2_3_1 {
-    export type Init = ScrcpyOptions2_3_1.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_3_1.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_4.ts b/libraries/adb-scrcpy/src/2_4.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_4 extends AdbScrcpyOptions<ScrcpyOptions2_4.Init> {
-    constructor(init: ScrcpyOptions2_4.Init, version?: string) {
+export class AdbScrcpyOptions2_4<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_4.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_4.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_4(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_4 extends AdbScrcpyOptions<ScrcpyOptions2_4.Init>
 }
 
 export namespace AdbScrcpyOptions2_4 {
-    export type Init = ScrcpyOptions2_4.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_4.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_5.ts b/libraries/adb-scrcpy/src/2_5.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_5 extends AdbScrcpyOptions<ScrcpyOptions2_5.Init> {
-    constructor(init: ScrcpyOptions2_5.Init, version?: string) {
+export class AdbScrcpyOptions2_5<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_5.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_5.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_5(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_5 extends AdbScrcpyOptions<ScrcpyOptions2_5.Init>
 }
 
 export namespace AdbScrcpyOptions2_5 {
-    export type Init = ScrcpyOptions2_5.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_5.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_6.ts b/libraries/adb-scrcpy/src/2_6.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_6 extends AdbScrcpyOptions<ScrcpyOptions2_6.Init> {
-    constructor(init: ScrcpyOptions2_6.Init, version?: string) {
+export class AdbScrcpyOptions2_6<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_6.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_6.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_6(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_6 extends AdbScrcpyOptions<ScrcpyOptions2_6.Init>
 }
 
 export namespace AdbScrcpyOptions2_6 {
-    export type Init = ScrcpyOptions2_6.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_6.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/2_7.ts b/libraries/adb-scrcpy/src/2_7.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions2_7 extends AdbScrcpyOptions<ScrcpyOptions2_7.Init> {
-    constructor(init: ScrcpyOptions2_7.Init, version?: string) {
+export class AdbScrcpyOptions2_7<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions2_7.Init<TVideo>> {
+    constructor(init: ScrcpyOptions2_7.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions2_7(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions2_7 extends AdbScrcpyOptions<ScrcpyOptions2_7.Init>
 }
 
 export namespace AdbScrcpyOptions2_7 {
-    export type Init = ScrcpyOptions2_7.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_7.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/3_0.ts b/libraries/adb-scrcpy/src/3_0.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions3_0 extends AdbScrcpyOptions<ScrcpyOptions3_0.Init> {
-    constructor(init: ScrcpyOptions3_0.Init, version?: string) {
+export class AdbScrcpyOptions3_0<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions3_0.Init<TVideo>> {
+    constructor(init: ScrcpyOptions3_0.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions3_0(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions3_0 extends AdbScrcpyOptions<ScrcpyOptions3_0.Init>
 }
 
 export namespace AdbScrcpyOptions3_0 {
-    export type Init = ScrcpyOptions3_0.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_0.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/3_0_1.ts b/libraries/adb-scrcpy/src/3_0_1.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions3_0_1 extends AdbScrcpyOptions<ScrcpyOptions3_0_1.Init> {
-    constructor(init: ScrcpyOptions3_0_1.Init, version?: string) {
+export class AdbScrcpyOptions3_0_1<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions3_0_1.Init<TVideo>> {
+    constructor(init: ScrcpyOptions3_0_1.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions3_0_1(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions3_0_1 extends AdbScrcpyOptions<ScrcpyOptions3_0_1.I
 }
 
 export namespace AdbScrcpyOptions3_0_1 {
-    export type Init = ScrcpyOptions3_0_1.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_0_1.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/3_0_2.ts b/libraries/adb-scrcpy/src/3_0_2.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions3_0_2 extends AdbScrcpyOptions<ScrcpyOptions3_0_2.Init> {
-    constructor(init: ScrcpyOptions3_0_2.Init, version?: string) {
+export class AdbScrcpyOptions3_0_2<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions3_0_2.Init<TVideo>> {
+    constructor(init: ScrcpyOptions3_0_2.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions3_0_2(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions3_0_2 extends AdbScrcpyOptions<ScrcpyOptions3_0_2.I
 }
 
 export namespace AdbScrcpyOptions3_0_2 {
-    export type Init = ScrcpyOptions3_0_2.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_0_2.Init<TVideo>;
 }
diff --git a/libraries/adb-scrcpy/src/3_1.ts b/libraries/adb-scrcpy/src/3_1.ts
@@ -10,8 +10,10 @@ import {
 import type { AdbScrcpyConnection } from "./connection.js";
 import { AdbScrcpyOptions } from "./types.js";
 
-export class AdbScrcpyOptions3_1 extends AdbScrcpyOptions<ScrcpyOptions3_1.Init> {
-    constructor(init: ScrcpyOptions3_1.Init, version?: string) {
+export class AdbScrcpyOptions3_1<
+    TVideo extends boolean,
+> extends AdbScrcpyOptions<ScrcpyOptions3_1.Init<TVideo>> {
+    constructor(init: ScrcpyOptions3_1.Init<TVideo>, version?: string) {
         super(new ScrcpyOptions3_1(init, version));
     }
 
@@ -29,5 +31,6 @@ export class AdbScrcpyOptions3_1 extends AdbScrcpyOptions<ScrcpyOptions3_1.Init>
 }
 
 export namespace AdbScrcpyOptions3_1 {
-    export type Init = ScrcpyOptions3_1.Init;
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_1.Init<TVideo>;
 }