@yume-chan/scrcpy 0.0.20 → 0.0.22

package/src/options/1_17.ts

@@ -11,19 +11,19 @@ export class ScrcpyOptions1_17 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_17,
     ScrcpyOptions1_16
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_16.DEFAULTS,
         encoderName: undefined,
     } as const satisfies Required<ScrcpyOptionsInit1_17>;
 
-    public static readonly SERIALIZE_ORDER = [
+    static readonly SERIALIZE_ORDER = [
         ...ScrcpyOptions1_16.SERIALIZE_ORDER,
         "encoderName",
     ] as const satisfies readonly (keyof ScrcpyOptionsInit1_17)[];
 
-    public static parseEncoder(
+    static parseEncoder(
         line: string,
-        encoderNameRegex: RegExp
+        encoderNameRegex: RegExp,
     ): ScrcpyEncoder | undefined {
         const match = line.match(encoderNameRegex);
         if (match) {
@@ -32,35 +32,35 @@ export class ScrcpyOptions1_17 extends ScrcpyOptionsBase<
         return undefined;
     }
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_17> {
+    override get defaults(): Required<ScrcpyOptionsInit1_17> {
         return ScrcpyOptions1_17.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_17) {
+    constructor(init: ScrcpyOptionsInit1_17) {
         super(new ScrcpyOptions1_16(init), {
             ...ScrcpyOptions1_17.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_16.serialize(
             this.value,
-            ScrcpyOptions1_17.SERIALIZE_ORDER
+            ScrcpyOptions1_17.SERIALIZE_ORDER,
         );
     }
 
-    public override setListEncoders() {
+    override setListEncoders() {
         // Set to an invalid value
         // Server will print valid values before crashing
         // (server will crash after opening video and control sockets)
         this.value.encoderName = "_";
     }
 
-    public override parseEncoder(line: string): ScrcpyEncoder | undefined {
+    override parseEncoder(line: string): ScrcpyEncoder | undefined {
         return ScrcpyOptions1_17.parseEncoder(
             line,
-            /\s+scrcpy --encoder-name '(.*?)'/
+            /\s+scrcpy --encoder-name '(.*?)'/,
         );
     }
 }

package/src/options/1_18.ts

@@ -56,7 +56,7 @@ export const SCRCPY_CONTROL_MESSAGE_TYPES_1_18 =
 SCRCPY_CONTROL_MESSAGE_TYPES_1_18.splice(
     6,
     0,
-    ScrcpyControlMessageType.ExpandSettingPanel
+    ScrcpyControlMessageType.ExpandSettingPanel,
 );
 
 const LOG_LEVEL_MAP = {
@@ -82,23 +82,23 @@ export class ScrcpyOptions1_18 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_18,
     ScrcpyOptions1_17
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_17.DEFAULTS,
         logLevel: ScrcpyLogLevel1_18.Debug,
         lockVideoOrientation: ScrcpyVideoOrientation1_18.Unlocked,
         powerOffOnClose: false,
     } as const satisfies Required<ScrcpyOptionsInit1_18>;
 
-    public static readonly SERIALIZE_ORDER = [
+    static readonly SERIALIZE_ORDER = [
         ...ScrcpyOptions1_17.SERIALIZE_ORDER,
         "powerOffOnClose",
     ] as const satisfies readonly (keyof ScrcpyOptionsInit1_18)[];
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_18> {
+    override get defaults(): Required<ScrcpyOptionsInit1_18> {
         return ScrcpyOptions1_18.DEFAULTS;
     }
 
-    public override get controlMessageTypes() {
+    override get controlMessageTypes() {
         return SCRCPY_CONTROL_MESSAGE_TYPES_1_18;
     }
 
@@ -111,26 +111,26 @@ export class ScrcpyOptions1_18 extends ScrcpyOptionsBase<
                 lockVideoOrientation:
                     VIDEO_ORIENTATION_MAP[value.lockVideoOrientation],
             }),
-            value
+            value,
         );
     }
 
-    public serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_16.serialize(
             this.value,
-            ScrcpyOptions1_18.SERIALIZE_ORDER
+            ScrcpyOptions1_18.SERIALIZE_ORDER,
         );
     }
 
-    public override parseEncoder(line: string): ScrcpyEncoder | undefined {
+    override parseEncoder(line: string): ScrcpyEncoder | undefined {
         return ScrcpyOptions1_17.parseEncoder(
             line,
-            /\s+scrcpy --encoder '(.*?)'/
+            /\s+scrcpy --encoder '(.*?)'/,
         );
     }
 
-    public override serializeBackOrScreenOnControlMessage(
-        message: ScrcpyBackOrScreenOnControlMessage
+    override serializeBackOrScreenOnControlMessage(
+        message: ScrcpyBackOrScreenOnControlMessage,
     ) {
         return ScrcpyBackOrScreenOnControlMessage1_18.serialize(message);
     }

package/src/options/1_21.ts

@@ -30,14 +30,14 @@ export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_21,
     ScrcpyOptions1_18
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_18.DEFAULTS,
         clipboardAutosync: true,
     } as const satisfies Required<ScrcpyOptionsInit1_21>;
 
-    public static serialize<T extends object>(
+    static serialize<T extends object>(
         options: T,
-        defaults: Required<T>
+        defaults: Required<T>,
     ): string[] {
         // 1.21 changed the format of arguments
         const result: string[] = [];
@@ -49,7 +49,7 @@ export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
 
             const defaultValue = toScrcpyOptionValue(
                 defaults[key as keyof T],
-                undefined
+                undefined,
             );
             if (serializedValue == defaultValue) {
                 continue;
@@ -60,23 +60,23 @@ export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
         return result;
     }
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_21> {
+    override get defaults(): Required<ScrcpyOptionsInit1_21> {
         return ScrcpyOptions1_21.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_21) {
+    constructor(init: ScrcpyOptionsInit1_21) {
         super(new ScrcpyOptions1_18(init), {
             ...ScrcpyOptions1_21.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 
-    public override serializeSetClipboardControlMessage(
-        message: ScrcpySetClipboardControlMessage
+    override serializeSetClipboardControlMessage(
+        message: ScrcpySetClipboardControlMessage,
     ): Uint8Array {
         return ScrcpySetClipboardControlMessage1_21.serialize(message);
     }

package/src/options/1_22/options.ts

@@ -14,26 +14,26 @@ export class ScrcpyOptions1_22 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_22,
     ScrcpyOptions1_21
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_21.DEFAULTS,
         downsizeOnError: true,
         sendDeviceMeta: true,
         sendDummyByte: true,
     } as const satisfies Required<ScrcpyOptionsInit1_22>;
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_22> {
+    override get defaults(): Required<ScrcpyOptionsInit1_22> {
         return ScrcpyOptions1_22.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_22) {
+    constructor(init: ScrcpyOptionsInit1_22) {
         super(new ScrcpyOptions1_21(init), {
             ...ScrcpyOptions1_22.DEFAULTS,
             ...init,
         });
     }
 
-    public override parseVideoStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+    override parseVideoStreamMetadata(
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyVideoStream> {
         if (!this.value.sendDeviceMeta) {
             return { stream, metadata: { codec: ScrcpyVideoCodecId.H264 } };
@@ -42,11 +42,11 @@ export class ScrcpyOptions1_22 extends ScrcpyOptionsBase<
         }
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 
-    public override createScrollController(): ScrcpyScrollController {
+    override createScrollController(): ScrcpyScrollController {
         return new ScrcpyScrollController1_22();
     }
 }

package/src/options/1_22/scroll.ts

@@ -13,8 +13,8 @@ export type ScrcpyInjectScrollControlMessage1_22 =
     (typeof ScrcpyInjectScrollControlMessage1_22)["TInit"];
 
 export class ScrcpyScrollController1_22 extends ScrcpyScrollController1_16 {
-    public override serializeScrollMessage(
-        message: ScrcpyInjectScrollControlMessage1_22
+    override serializeScrollMessage(
+        message: ScrcpyInjectScrollControlMessage1_22,
     ): Uint8Array | undefined {
         const processed = this.processMessage(message);
         if (!processed) {

package/src/options/1_23.ts

@@ -16,27 +16,27 @@ export class ScrcpyOptions1_23 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_23,
     ScrcpyOptions1_22
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_22.DEFAULTS,
         cleanup: true,
     } as const satisfies Required<ScrcpyOptionsInit1_23>;
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_23> {
+    override get defaults(): Required<ScrcpyOptionsInit1_23> {
         return ScrcpyOptions1_23.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_22) {
+    constructor(init: ScrcpyOptionsInit1_22) {
         super(new ScrcpyOptions1_22(init), {
             ...ScrcpyOptions1_23.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 
-    public override createMediaStreamTransformer(): TransformStream<
+    override createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket
     > {
@@ -61,7 +61,7 @@ export class ScrcpyOptions1_23 extends ScrcpyOptionsBase<
 
                         controller.enqueue(packet);
                     },
-                })
+                }),
             ),
         };
     }

package/src/options/1_24.ts

@@ -11,23 +11,23 @@ export class ScrcpyOptions1_24 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_24,
     ScrcpyOptions1_23
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...ScrcpyOptions1_23.DEFAULTS,
         powerOn: true,
     } as const satisfies Required<ScrcpyOptionsInit1_24>;
 
-    public override get defaults(): Required<ScrcpyOptionsInit1_24> {
+    override get defaults(): Required<ScrcpyOptionsInit1_24> {
         return ScrcpyOptions1_24.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_24) {
+    constructor(init: ScrcpyOptionsInit1_24) {
         super(new ScrcpyOptions1_23(init), {
             ...ScrcpyOptions1_24.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 }

package/src/options/1_25/options.ts

@@ -10,22 +10,22 @@ export class ScrcpyOptions1_25 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit1_24,
     ScrcpyOptions1_24
 > {
-    public override get defaults(): Required<ScrcpyOptionsInit1_24> {
+    override get defaults(): Required<ScrcpyOptionsInit1_24> {
         return ScrcpyOptions1_24.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit1_24) {
+    constructor(init: ScrcpyOptionsInit1_24) {
         super(new ScrcpyOptions1_24(init), {
             ...ScrcpyOptions1_24.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 
-    public override createScrollController(): ScrcpyScrollController {
+    override createScrollController(): ScrcpyScrollController {
         return new ScrcpyScrollController1_25();
     }
 }

package/src/options/1_25/scroll.ts

@@ -25,7 +25,7 @@ export const ScrcpyFloatToInt16NumberType: NumberFieldType = {
 };
 
 const ScrcpyFloatToInt16FieldDefinition = new NumberFieldDefinition(
-    ScrcpyFloatToInt16NumberType
+    ScrcpyFloatToInt16NumberType,
 );
 
 export const ScrcpyInjectScrollControlMessage1_25 = new Struct()
@@ -43,7 +43,7 @@ export type ScrcpyInjectScrollControlMessage1_25 =
 
 export class ScrcpyScrollController1_25 implements ScrcpyScrollController {
     serializeScrollMessage(
-        message: ScrcpyInjectScrollControlMessage
+        message: ScrcpyInjectScrollControlMessage,
     ): Uint8Array | undefined {
         return ScrcpyInjectScrollControlMessage1_25.serialize(message);
     }

package/src/options/2_0.ts

@@ -45,20 +45,20 @@ export type ScrcpyInjectTouchControlMessage2_0 =
     (typeof ScrcpyInjectTouchControlMessage2_0)["TInit"];
 
 export class ScrcpyInstanceId implements ScrcpyOptionValue {
-    public static readonly NONE = new ScrcpyInstanceId(-1);
+    static readonly NONE = new ScrcpyInstanceId(-1);
 
-    public static random(): ScrcpyInstanceId {
+    static random(): ScrcpyInstanceId {
         // A random 31-bit unsigned integer
         return new ScrcpyInstanceId((Math.random() * 0x80000000) | 0);
     }
 
-    public value: number;
+    value: number;
 
-    public constructor(value: number) {
+    constructor(value: number) {
         this.value = value;
     }
 
-    public toOptionValue(): string | undefined {
+    toOptionValue(): string | undefined {
         if (this.value < 0) {
             return undefined;
         }
@@ -91,7 +91,7 @@ export interface ScrcpyOptionsInit2_0
 
 function omit<T extends object, K extends keyof T>(
     obj: T,
-    keys: K[]
+    keys: K[],
 ): Omit<T, K> {
     const result: Record<PropertyKey, unknown> = {};
     for (const key in obj) {
@@ -106,7 +106,7 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
     ScrcpyOptionsInit2_0,
     ScrcpyOptions1_25
 > {
-    public static readonly DEFAULTS = {
+    static readonly DEFAULTS = {
         ...omit(ScrcpyOptions1_24.DEFAULTS, [
             "bitRate",
             "codecOptions",
@@ -130,32 +130,32 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
         sendCodecMeta: true,
     } as const satisfies Required<ScrcpyOptionsInit2_0>;
 
-    public override get defaults(): Required<ScrcpyOptionsInit2_0> {
+    override get defaults(): Required<ScrcpyOptionsInit2_0> {
         return ScrcpyOptions2_0.DEFAULTS;
     }
 
-    public constructor(init: ScrcpyOptionsInit2_0) {
+    constructor(init: ScrcpyOptionsInit2_0) {
         super(new ScrcpyOptions1_25(init), {
             ...ScrcpyOptions2_0.DEFAULTS,
             ...init,
         });
     }
 
-    public override serialize(): string[] {
+    override serialize(): string[] {
         return ScrcpyOptions1_21.serialize(this.value, this.defaults);
     }
 
-    public override setListEncoders(): void {
+    override setListEncoders(): void {
         this.value.listEncoders = true;
     }
 
-    public override setListDisplays(): void {
+    override setListDisplays(): void {
         this.value.listDisplays = true;
     }
 
-    public override parseEncoder(line: string): ScrcpyEncoder | undefined {
+    override parseEncoder(line: string): ScrcpyEncoder | undefined {
         let match = line.match(
-            /\s+--video-codec=(.*)\s+--video-encoder='(.*)'/
+            /\s+--video-codec=(.*)\s+--video-encoder='(.*)'/,
         );
         if (match) {
             return {
@@ -177,7 +177,7 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
         return undefined;
     }
 
-    public override parseDisplay(line: string): ScrcpyDisplay | undefined {
+    override parseDisplay(line: string): ScrcpyDisplay | undefined {
         const match = line.match(/\s+--display=(\d+)\s+\((.*?)\)/);
         if (match) {
             const display: ScrcpyDisplay = {
@@ -191,8 +191,8 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
         return undefined;
     }
 
-    public override parseVideoStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+    override parseVideoStreamMetadata(
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyVideoStream> {
         const { sendDeviceMeta, sendCodecMeta } = this.value;
         if (!sendDeviceMeta && !sendCodecMeta) {
@@ -249,18 +249,18 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
         })();
     }
 
-    public override parseAudioStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+    override parseAudioStreamMetadata(
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyAudioStreamMetadata> {
         return (async (): Promise<ScrcpyAudioStreamMetadata> => {
             const buffered = new BufferedReadableStream(stream);
             const buffer = await buffered.readExactly(
-                NumberFieldType.Uint32.size
+                NumberFieldType.Uint32.size,
             );
 
             const codecMetadataValue = NumberFieldType.Uint32.deserialize(
                 buffer,
-                false
+                false,
             );
             // Server will send `0x00_00_00_00` and `0x00_00_00_01` even if `sendCodecMeta` is false
             switch (codecMetadataValue) {
@@ -288,7 +288,7 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
                         break;
                     default:
                         throw new Error(
-                            `Unknown audio codec metadata value: ${codecMetadataValue}`
+                            `Unknown audio codec metadata value: ${codecMetadataValue}`,
                         );
                 }
                 return {
@@ -328,14 +328,14 @@ export class ScrcpyOptions2_0 extends ScrcpyOptionsBase<
                             }
                             await controller.enqueue(value);
                         }
-                    }
+                    },
                 ),
             };
         })();
     }
 
-    public override serializeInjectTouchControlMessage(
-        message: ScrcpyInjectTouchControlMessage
+    override serializeInjectTouchControlMessage(
+        message: ScrcpyInjectTouchControlMessage,
     ): Uint8Array {
         return ScrcpyInjectTouchControlMessage2_0.serialize(message);
     }

package/src/options/2_1.ts

@@ -0,0 +1,35 @@
+import { ScrcpyOptions1_21 } from "./1_21.js";
+import type { ScrcpyOptionsInit2_0 } from "./2_0.js";
+import { ScrcpyOptions2_0 } from "./2_0.js";
+import { ScrcpyOptionsBase } from "./types.js";
+
+export interface ScrcpyOptionsInit2_1 extends ScrcpyOptionsInit2_0 {
+    video?: boolean;
+    audioSource?: "output" | "mic";
+}
+
+export class ScrcpyOptions2_1 extends ScrcpyOptionsBase<
+    ScrcpyOptionsInit2_1,
+    ScrcpyOptions2_0
+> {
+    static readonly DEFAULTS = {
+        ...ScrcpyOptions2_0.DEFAULTS,
+        video: true,
+        audioSource: "output",
+    } as const satisfies Required<ScrcpyOptionsInit2_1>;
+
+    override get defaults(): Required<ScrcpyOptionsInit2_1> {
+        return ScrcpyOptions2_1.DEFAULTS;
+    }
+
+    constructor(init: ScrcpyOptionsInit2_1) {
+        super(new ScrcpyOptions2_0(init), {
+            ...ScrcpyOptions2_1.DEFAULTS,
+            ...init,
+        });
+    }
+
+    override serialize(): string[] {
+        return ScrcpyOptions1_21.serialize(this.value, this.defaults);
+    }
+}

package/src/options/2_2.ts

@@ -0,0 +1,68 @@
+import { ScrcpyOptions1_21 } from "./1_21.js";
+import type { ScrcpyOptionsInit2_1 } from "./2_1.js";
+import { ScrcpyOptions2_1 } from "./2_1.js";
+import type { ScrcpyDisplay } from "./types.js";
+import { ScrcpyOptionsBase } from "./types.js";
+
+export interface ScrcpyOptionsInit2_2
+    extends Omit<ScrcpyOptionsInit2_1, "display"> {
+    videoSource?: "display" | "camera";
+    displayId?: number;
+    cameraId?: string | undefined;
+    cameraSize?: string | undefined;
+    cameraFacing?: "front" | "back" | "external" | undefined;
+    cameraAr?: string | undefined;
+    cameraFps?: number | undefined;
+    cameraHighSpeed?: boolean;
+
+    listCameras?: boolean;
+    listCameraSizes?: boolean;
+}
+
+export class ScrcpyOptions2_2 extends ScrcpyOptionsBase<
+    ScrcpyOptionsInit2_2,
+    ScrcpyOptions2_1
+> {
+    static readonly DEFAULTS = {
+        ...ScrcpyOptions2_1.DEFAULTS,
+        videoSource: "display",
+        displayId: 0,
+        cameraId: undefined,
+        cameraSize: undefined,
+        cameraFacing: undefined,
+        cameraAr: undefined,
+        cameraFps: undefined,
+        cameraHighSpeed: false,
+        listCameras: false,
+        listCameraSizes: false,
+    } as const satisfies Required<ScrcpyOptionsInit2_2>;
+
+    override get defaults(): Required<ScrcpyOptionsInit2_2> {
+        return ScrcpyOptions2_2.DEFAULTS;
+    }
+
+    constructor(init: ScrcpyOptionsInit2_2) {
+        super(new ScrcpyOptions2_1(init), {
+            ...ScrcpyOptions2_2.DEFAULTS,
+            ...init,
+        });
+    }
+
+    override parseDisplay(line: string): ScrcpyDisplay | undefined {
+        const match = line.match(/\s+--display-id=(\d+)\s+\((.*?)\)/);
+        if (match) {
+            const display: ScrcpyDisplay = {
+                id: Number.parseInt(match[1]!, 10),
+            };
+            if (match[2] !== "size unknown") {
+                display.resolution = match[2]!;
+            }
+            return display;
+        }
+        return undefined;
+    }
+
+    override serialize(): string[] {
+        return ScrcpyOptions1_21.serialize(this.value, this.defaults);
+    }
+}