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

Commit c440e838 authored by 陈希旻's avatar 陈希旻
Browse files

fix(adb-scrcpy): improve options types type compatibility

parent 2db3e8f8

libraries/adb-scrcpy/src/options/1_16.ts

+5 −1
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ import { 


import { AdbScrcpyOptions } from "./types.js";



export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<ScrcpyOptionsInit1_16> {

export class AdbScrcpyOptions1_16 extends AdbScrcpyOptions<

    // Only pick options that are used in this class,

    // so changes in `ScrcpyOptionsInitX_XX` won't affect type assignability with this class

    Pick<ScrcpyOptionsInit1_16, "tunnelForward">

> {

    static createConnection(

        adb: Adb,

        connectionOptions: AdbScrcpyConnectionOptions,

libraries/adb-scrcpy/src/options/1_22.ts

+5 −1
Original line number Diff line number Diff line
@@ -10,7 +10,11 @@ import type { AdbScrcpyConnection } from "../connection.js"; 
import { AdbScrcpyOptions1_16 } from "./1_16.js";

import { AdbScrcpyOptions } from "./types.js";



export class AdbScrcpyOptions1_22 extends AdbScrcpyOptions<ScrcpyOptionsInit1_22> {

export class AdbScrcpyOptions1_22 extends AdbScrcpyOptions<

    // Only pick options that are used in this class,

    // so changes in `ScrcpyOptionsInitX_XX` won't affect type assignability with this class

    Pick<ScrcpyOptionsInit1_22, "tunnelForward" | "control" | "sendDummyByte">

> {

    override getEncoders(

        adb: Adb,

        path: string,

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

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,14 @@ import type { AdbScrcpyConnection } from "../connection.js"; 
import { AdbScrcpyOptions1_16 } from "./1_16.js";

import { AdbScrcpyOptions } from "./types.js";



export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<ScrcpyOptionsInit2_0> {

export class AdbScrcpyOptions2_0 extends AdbScrcpyOptions<

    // Only pick options that are used in this class,

    // so changes in `ScrcpyOptionsInitX_XX` won't affect type assignability with this class

    Pick<

        ScrcpyOptionsInit2_0,

        "tunnelForward" | "control" | "sendDummyByte" | "scid" | "audio"

    >

> {

    static async getEncoders(

        adb: Adb,

        path: string,

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

+13 −1
Original line number Diff line number Diff line
@@ -11,7 +11,19 @@ import { AdbScrcpyOptions1_16 } from "./1_16.js"; 
import { AdbScrcpyOptions2_0 } from "./2_0.js";

import { AdbScrcpyOptions } from "./types.js";



export class AdbScrcpyOptions2_1 extends AdbScrcpyOptions<ScrcpyOptionsInit2_1> {

export class AdbScrcpyOptions2_1 extends AdbScrcpyOptions<

    // Only pick options that are used in this class,

    // so changes in `ScrcpyOptionsInitX_XX` won't affect type assignability with this class

    Pick<

        ScrcpyOptionsInit2_1,

        | "tunnelForward"

        | "control"

        | "sendDummyByte"

        | "scid"

        | "audio"

        | "video"

    >

> {

    override async getEncoders(

        adb: Adb,

        path: string,

toolchain/eslint-config/run-eslint.js

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file