Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 24b65fd2 authored by Simon Chan's avatar Simon Chan
Browse files

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

parent 02f5bd59

.vscode/settings.json

+1 −1
Original line number Diff line number Diff line
@@ -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_]+"

libraries/adb-scrcpy/package.json

+4 −1
Original line number Diff line number Diff line
@@ -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"

libraries/adb-scrcpy/src/2_1/impl/create-connection.ts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ export function createConnection( 
    adb: Adb,

    options: Required<

        Pick<

            ScrcpyOptions2_1.Init,

            ScrcpyOptions2_1.Init<boolean>,

            | "tunnelForward"

            | "control"

            | "sendDummyByte"

libraries/adb-scrcpy/src/2_1/options.ts

+6 −3
Original line number Diff line number Diff line
@@ -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>;

}

libraries/adb-scrcpy/src/2_1_1.ts

+6 −3
Original line number Diff line number Diff line
@@ -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>;

}