@yume-chan/scrcpy 0.0.20 → 0.0.21

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/codec.ts

@@ -21,35 +21,35 @@ export interface ScrcpyVideoStream {
 }
 
 export class ScrcpyAudioCodec implements ScrcpyOptionValue {
-    public static readonly OPUS = new ScrcpyAudioCodec(
+    static readonly OPUS = new ScrcpyAudioCodec(
         "opus",
         0x6f_70_75_73,
         "audio/opus",
-        "opus"
+        "opus",
     );
-    public static readonly AAC = new ScrcpyAudioCodec(
+    static readonly AAC = new ScrcpyAudioCodec(
         "aac",
         0x00_61_61_63,
         "audio/aac",
-        "mp4a.66"
+        "mp4a.66",
     );
-    public static readonly RAW = new ScrcpyAudioCodec(
+    static readonly RAW = new ScrcpyAudioCodec(
         "raw",
         0x00_72_61_77,
         "audio/raw",
-        "1"
+        "1",
     );
 
-    public readonly optionValue: string;
-    public readonly metadataValue: number;
-    public readonly mimeType: string;
-    public readonly webCodecId: string;
+    readonly optionValue: string;
+    readonly metadataValue: number;
+    readonly mimeType: string;
+    readonly webCodecId: string;
 
-    public constructor(
+    constructor(
         optionValue: string,
         metadataValue: number,
         mimeType: string,
-        webCodecId: string
+        webCodecId: string,
     ) {
         this.optionValue = optionValue;
         this.metadataValue = metadataValue;
@@ -57,7 +57,7 @@ export class ScrcpyAudioCodec implements ScrcpyOptionValue {
         this.webCodecId = webCodecId;
     }
 
-    public toOptionValue(): string {
+    toOptionValue(): string {
         return this.optionValue;
     }
 }

package/src/options/index.ts

@@ -7,6 +7,7 @@ export * from "./1_23.js";
 export * from "./1_24.js";
 export * from "./1_25/index.js";
 export * from "./2_0.js";
+export * from "./2_1.js";
 export * from "./codec.js";
 export * from "./latest.js";
 export * from "./types.js";

package/src/options/latest.ts

@@ -1,6 +1,6 @@
 import { ScrcpyLogLevel1_18, ScrcpyVideoOrientation1_18 } from "./1_18.js";
-import type { ScrcpyOptionsInit2_0 } from "./2_0.js";
-import { ScrcpyOptions2_0 } from "./2_0.js";
+import type { ScrcpyOptionsInit2_1 } from "./2_1.js";
+import { ScrcpyOptions2_1 } from "./2_1.js";
 
 export const ScrcpyLogLevel = ScrcpyLogLevel1_18;
 export type ScrcpyLogLevel = ScrcpyLogLevel1_18;
@@ -8,7 +8,5 @@ export type ScrcpyLogLevel = ScrcpyLogLevel1_18;
 export const ScrcpyVideoOrientation = ScrcpyVideoOrientation1_18;
 export type ScrcpyVideoOrientation = ScrcpyVideoOrientation1_18;
 
-export type ScrcpyOptionsInitLatest = ScrcpyOptionsInit2_0;
-export class ScrcpyOptionsLatest extends ScrcpyOptions2_0 {}
-
-export const ScrcpyLatestVersion = "2.0";
+export type ScrcpyOptionsInitLatest = ScrcpyOptionsInit2_1;
+export class ScrcpyOptionsLatest extends ScrcpyOptions2_1 {}

package/src/options/types.ts

@@ -22,7 +22,7 @@ export interface ScrcpyOptionValue {
 }
 
 export function isScrcpyOptionValue(
-    value: unknown
+    value: unknown,
 ): value is ScrcpyOptionValue {
     return (
         typeof value === "object" &&
@@ -96,11 +96,11 @@ export interface ScrcpyOptions<T extends object> {
      * The returned video stream may be different from the input stream, and should be used for further processing.
      */
     parseVideoStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyVideoStream>;
 
     parseAudioStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyAudioStreamMetadata>;
 
     createMediaStreamTransformer(): TransformStream<
@@ -109,15 +109,15 @@ export interface ScrcpyOptions<T extends object> {
     >;
 
     serializeInjectTouchControlMessage(
-        message: ScrcpyInjectTouchControlMessage
+        message: ScrcpyInjectTouchControlMessage,
     ): Uint8Array;
 
     serializeBackOrScreenOnControlMessage(
-        message: ScrcpyBackOrScreenOnControlMessage
+        message: ScrcpyBackOrScreenOnControlMessage,
     ): Uint8Array | undefined;
 
     serializeSetClipboardControlMessage(
-        message: ScrcpySetClipboardControlMessage
+        message: ScrcpySetClipboardControlMessage,
     ): Uint8Array;
 
     createScrollController(): ScrcpyScrollController;
@@ -125,39 +125,50 @@ export interface ScrcpyOptions<T extends object> {
 
 export abstract class ScrcpyOptionsBase<
     T extends object,
-    B extends ScrcpyOptions<object>
+    B extends ScrcpyOptions<object>,
 > implements ScrcpyOptions<T>
 {
     protected _base: B;
 
-    public abstract get defaults(): Required<T>;
+    abstract get defaults(): Required<T>;
 
-    public get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return this._base.controlMessageTypes;
     }
 
-    public readonly value: Required<T>;
+    readonly value: Required<T>;
 
-    public constructor(base: B, value: Required<T>) {
+    constructor(base: B, value: Required<T>) {
         this._base = base;
         this.value = value;
+        this.#setValue();
+    }
+
+    #setValue() {
+        // Share `value` with `_base` class,
+        // so updating `_base.value` in `_base.setListEncoders()`/
+        // `_base.setListDisplays()` will also update `this.value`.
+        Object.assign(this._base, { value: this.value });
+        if (this._base instanceof ScrcpyOptionsBase) {
+            this._base.#setValue();
+        }
     }
 
-    public abstract serialize(): string[];
+    abstract serialize(): string[];
 
-    public setListEncoders(): void {
+    setListEncoders(): void {
         this._base.setListEncoders();
     }
 
-    public setListDisplays(): void {
+    setListDisplays(): void {
         this._base.setListDisplays();
     }
 
-    public parseEncoder(line: string): ScrcpyEncoder | undefined {
+    parseEncoder(line: string): ScrcpyEncoder | undefined {
         return this._base.parseEncoder(line);
     }
 
-    public parseDisplay(line: string): ScrcpyDisplay | undefined {
+    parseDisplay(line: string): ScrcpyDisplay | undefined {
         return this._base.parseDisplay(line);
     }
 
@@ -169,44 +180,44 @@ export abstract class ScrcpyOptionsBase<
      *
      * The returned video stream may be different from the input stream, and should be used for further processing.
      */
-    public parseVideoStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+    parseVideoStreamMetadata(
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyVideoStream> {
         return this._base.parseVideoStreamMetadata(stream);
     }
 
-    public parseAudioStreamMetadata(
-        stream: ReadableStream<Uint8Array>
+    parseAudioStreamMetadata(
+        stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyAudioStreamMetadata> {
         return this._base.parseAudioStreamMetadata(stream);
     }
 
-    public createMediaStreamTransformer(): TransformStream<
+    createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket
     > {
         return this._base.createMediaStreamTransformer();
     }
 
-    public serializeInjectTouchControlMessage(
-        message: ScrcpyInjectTouchControlMessage
+    serializeInjectTouchControlMessage(
+        message: ScrcpyInjectTouchControlMessage,
     ): Uint8Array {
         return this._base.serializeInjectTouchControlMessage(message);
     }
 
-    public serializeBackOrScreenOnControlMessage(
-        message: ScrcpyBackOrScreenOnControlMessage
+    serializeBackOrScreenOnControlMessage(
+        message: ScrcpyBackOrScreenOnControlMessage,
     ): Uint8Array | undefined {
         return this._base.serializeBackOrScreenOnControlMessage(message);
     }
 
-    public serializeSetClipboardControlMessage(
-        message: ScrcpySetClipboardControlMessage
+    serializeSetClipboardControlMessage(
+        message: ScrcpySetClipboardControlMessage,
     ): Uint8Array {
         return this._base.serializeSetClipboardControlMessage(message);
     }
 
-    public createScrollController(): ScrcpyScrollController {
+    createScrollController(): ScrcpyScrollController {
         return this._base.createScrollController();
     }
 }