@yume-chan/scrcpy 2.2.0 → 3.0.0-beta.0

package/src/1_21/impl/set-clipboard.ts

@@ -12,6 +12,7 @@ export const AckClipboardDeviceMessage = struct(
 
 export const SetClipboardControlMessage = struct(
     {
+        // value of `type` can change between versions
         type: u8,
         sequence: u64,
         paste: u8<boolean>(),
@@ -75,3 +76,16 @@ export class AckClipboardHandler implements ScrcpyDeviceMessageParser {
         ];
     }
 }
+
+export function serializeSetClipboardControlMessage(
+    message: ScrcpySetClipboardControlMessage,
+    ackHandler: AckClipboardHandler | undefined,
+): Uint8Array | [Uint8Array, Promise<void>] {
+    if (!ackHandler) {
+        throw new Error(
+            "`serializeSetClipboardControlMessage` requires `control: true` option",
+        );
+    }
+
+    return ackHandler.serializeSetClipboardControlMessage(message);
+}

package/src/1_21/options.ts

@@ -2,7 +2,6 @@ import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -33,6 +32,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -44,7 +44,7 @@ export class ScrcpyOptions1_21
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -63,10 +63,12 @@ export class ScrcpyOptions1_21
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -122,8 +124,9 @@ export class ScrcpyOptions1_21
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/1_22/impl/defaults.ts

@@ -1,10 +1,9 @@
 import type { Init } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
-export const Defaults = /* #__PURE__ */ (() =>
-    ({
-        ...PrevImpl.Defaults,
-        downsizeOnError: true,
-        sendDeviceMeta: true,
-        sendDummyByte: true,
-    }) as const satisfies Required<Init>)();
+export const Defaults = {
+    ...PrevImpl.Defaults,
+    downsizeOnError: true,
+    sendDeviceMeta: true,
+    sendDummyByte: true,
+} as const satisfies Required<Init>;

package/src/1_22/options.ts

@@ -2,7 +2,6 @@ import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -33,6 +32,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -44,7 +44,7 @@ export class ScrcpyOptions1_22
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -63,10 +63,12 @@ export class ScrcpyOptions1_22
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -122,8 +124,9 @@ export class ScrcpyOptions1_22
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/1_23/impl/defaults.ts

@@ -1,8 +1,7 @@
 import type { Init } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
-export const Defaults = /* #__PURE__ */ (() =>
-    ({
-        ...PrevImpl.Defaults,
-        cleanup: true,
-    }) as const satisfies Required<Init>)();
+export const Defaults = {
+    ...PrevImpl.Defaults,
+    cleanup: true,
+} as const satisfies Required<Init>;

package/src/1_23/options.ts

@@ -2,7 +2,6 @@ import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -33,6 +32,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -44,7 +44,7 @@ export class ScrcpyOptions1_23
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -63,10 +63,12 @@ export class ScrcpyOptions1_23
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -122,8 +124,9 @@ export class ScrcpyOptions1_23
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/1_24/impl/defaults.ts

@@ -1,8 +1,7 @@
 import type { Init } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
-export const Defaults = /* #__PURE__ */ (() =>
-    ({
-        ...PrevImpl.Defaults,
-        powerOn: true,
-    }) as const satisfies Required<Init>)();
+export const Defaults = {
+    ...PrevImpl.Defaults,
+    powerOn: true,
+} as const satisfies Required<Init>;

package/src/1_24/options.ts

@@ -2,7 +2,6 @@ import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -33,6 +32,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -44,7 +44,7 @@ export class ScrcpyOptions1_24
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -63,10 +63,12 @@ export class ScrcpyOptions1_24
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -122,8 +124,9 @@ export class ScrcpyOptions1_24
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/1_25/impl/scroll-controller.ts

@@ -3,7 +3,6 @@ import type { Field, StructInit } from "@yume-chan/struct";
 import { field, struct, u16, u32, u8 } from "@yume-chan/struct";
 
 import type { ScrcpyScrollController } from "../../base/index.js";
-import { ScrcpyControlMessageType } from "../../base/index.js";
 import type { ScrcpyInjectScrollControlMessage } from "../../latest.js";
 import { clamp } from "../../utils/index.js";
 
@@ -24,20 +23,20 @@ export const SignedFloat: Field<number, never, never> = field(
     },
 );
 
-export const InjectScrollControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            type: u8(ScrcpyControlMessageType.InjectScroll),
-            pointerX: u32,
-            pointerY: u32,
-            videoWidth: u16,
-            videoHeight: u16,
-            scrollX: SignedFloat,
-            scrollY: SignedFloat,
-            buttons: u32,
-        },
-        { littleEndian: false },
-    ))();
+export const InjectScrollControlMessage = struct(
+    {
+        // value of `type` can change between versions
+        type: u8,
+        pointerX: u32,
+        pointerY: u32,
+        videoWidth: u16,
+        videoHeight: u16,
+        scrollX: SignedFloat,
+        scrollY: SignedFloat,
+        buttons: u32,
+    },
+    { littleEndian: false },
+);
 
 export type InjectScrollControlMessage = StructInit<
     typeof InjectScrollControlMessage

package/src/1_25/options.ts

@@ -2,7 +2,6 @@ import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -33,6 +32,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -44,7 +44,7 @@ export class ScrcpyOptions1_25
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -63,10 +63,12 @@ export class ScrcpyOptions1_25
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -122,8 +124,9 @@ export class ScrcpyOptions1_25
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/2_0/impl/defaults.ts

@@ -1,25 +1,30 @@
-import { omit } from "../../utils/index.js";
-
 import type { Init } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
-export const Defaults = /* #__PURE__ */ (() =>
-    ({
-        ...omit(PrevImpl.Defaults, "bitRate", "codecOptions", "encoderName"),
-        scid: undefined,
+export const Defaults = {
+    ...{
+        ...PrevImpl.Defaults,
+        // Remove obsolete values
+        // relies on the minifier to flatten the nested spread
+        bitRate: undefined,
+        codecOptions: undefined,
+        encoderName: undefined,
+    },
+
+    scid: undefined,
 
-        videoCodec: "h264",
-        videoBitRate: 8000000,
-        videoCodecOptions: undefined,
-        videoEncoder: undefined,
+    videoCodec: "h264",
+    videoBitRate: 8000000,
+    videoCodecOptions: undefined,
+    videoEncoder: undefined,
 
-        audio: true,
-        audioCodec: "opus",
-        audioBitRate: 128000,
-        audioCodecOptions: undefined,
-        audioEncoder: undefined,
+    audio: true,
+    audioCodec: "opus",
+    audioBitRate: 128000,
+    audioCodecOptions: undefined,
+    audioEncoder: undefined,
 
-        listEncoders: false,
-        listDisplays: false,
-        sendCodecMeta: true,
-    }) as const satisfies Required<Init>)();
+    listEncoders: false,
+    listDisplays: false,
+    sendCodecMeta: true,
+} as const satisfies Required<Init>;

package/src/2_0/impl/init.ts

@@ -24,8 +24,10 @@ export class InstanceId implements ScrcpyOptionValue {
     }
 }
 
-export interface Init
-    extends Omit<PrevImpl.Init, "bitRate" | "codecOptions" | "encoderName"> {
+export interface Init extends Omit<
+    PrevImpl.Init,
+    "bitRate" | "codecOptions" | "encoderName"
+> {
     scid?: InstanceId | string | undefined;
 
     videoCodec?: "h264" | "h265" | "av1";

package/src/2_0/impl/inject-touch.ts

@@ -2,27 +2,26 @@ import type { StructInit } from "@yume-chan/struct";
 import { struct, u16, u32, u64, u8 } from "@yume-chan/struct";
 
 import type { AndroidMotionEventAction } from "../../android/motion-event.js";
-import { ScrcpyControlMessageType } from "../../base/control-message-type.js";
 import type { ScrcpyInjectTouchControlMessage } from "../../latest.js";
 
 import { PrevImpl } from "./prev.js";
 
-export const InjectTouchControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            type: u8(ScrcpyControlMessageType.InjectTouch),
-            action: u8<AndroidMotionEventAction>(),
-            pointerId: u64,
-            pointerX: u32,
-            pointerY: u32,
-            videoWidth: u16,
-            videoHeight: u16,
-            pressure: PrevImpl.UnsignedFloat,
-            actionButton: u32,
-            buttons: u32,
-        },
-        { littleEndian: false },
-    ))();
+export const InjectTouchControlMessage = struct(
+    {
+        // value of `type` can change between versions
+        type: u8,
+        action: u8<AndroidMotionEventAction>(),
+        pointerId: u64,
+        pointerX: u32,
+        pointerY: u32,
+        videoWidth: u16,
+        videoHeight: u16,
+        pressure: PrevImpl.UnsignedFloat,
+        actionButton: u32,
+        buttons: u32,
+    },
+    { littleEndian: false },
+);
 
 export type InjectTouchControlMessage = StructInit<
     typeof InjectTouchControlMessage

package/src/2_0/impl/parse-audio-stream-metadata.ts

@@ -86,13 +86,9 @@ export async function parseAudioStreamMetadata(
             await controller.enqueue(buffer);
 
             const stream = buffered.release();
-            const reader = stream.getReader();
-            while (true) {
-                const { done, value } = await reader.read();
-                if (done) {
-                    break;
-                }
-                await controller.enqueue(value);
+
+            for await (const chunk of stream) {
+                await controller.enqueue(chunk);
             }
         }),
     };

package/src/2_0/options.ts

@@ -3,7 +3,6 @@ import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
     ScrcpyAudioStreamMetadata,
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -34,6 +33,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -45,7 +45,7 @@ export class ScrcpyOptions2_0
 
     readonly value: Required<Init>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -64,10 +64,12 @@ export class ScrcpyOptions2_0
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -129,8 +131,9 @@ export class ScrcpyOptions2_0
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/2_1/impl/defaults.ts

@@ -1,9 +1,8 @@
 import type { Init } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
-export const Defaults = /* #__PURE__ */ (() =>
-    ({
-        ...PrevImpl.Defaults,
-        video: true,
-        audioSource: "output",
-    }) as const satisfies Required<Init<true>>)();
+export const Defaults = {
+    ...PrevImpl.Defaults,
+    video: true,
+    audioSource: "output",
+} as const satisfies Required<Init<true>>;

package/src/2_1/options.ts

@@ -3,7 +3,6 @@ import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
 
 import type {
     ScrcpyAudioStreamMetadata,
-    ScrcpyControlMessageType,
     ScrcpyDisplay,
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
@@ -34,6 +33,7 @@ import {
     serialize,
     serializeBackOrScreenOnControlMessage,
     serializeInjectTouchControlMessage,
+    serializeSetClipboardControlMessage,
     setListDisplays,
     setListEncoders,
 } from "./impl/index.js";
@@ -45,7 +45,7 @@ export class ScrcpyOptions2_1<TVideo extends boolean>
 
     readonly value: Required<Init<TVideo>>;
 
-    get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+    get controlMessageTypes(): typeof ControlMessageTypes {
         return ControlMessageTypes;
     }
 
@@ -64,10 +64,12 @@ export class ScrcpyOptions2_1<TVideo extends boolean>
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
-        if (this.value.control && this.value.clipboardAutosync) {
-            this.#clipboard = this.#deviceMessageParsers.add(
-                new ClipboardStream(),
-            );
+        if (this.value.control) {
+            if (this.value.clipboardAutosync) {
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+            }
 
             this.#ackClipboardHandler = this.#deviceMessageParsers.add(
                 new AckClipboardHandler(),
@@ -129,8 +131,9 @@ export class ScrcpyOptions2_1<TVideo extends boolean>
     serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array | [Uint8Array, Promise<void>] {
-        return this.#ackClipboardHandler!.serializeSetClipboardControlMessage(
+        return serializeSetClipboardControlMessage(
             message,
+            this.#ackClipboardHandler,
         );
     }
 

package/src/2_1_1.ts

@@ -1,14 +1 @@
-import { ScrcpyOptions2_1 } from "./2_1/index.js";
-
-export class ScrcpyOptions2_1_1<
-    TVideo extends boolean,
-> extends ScrcpyOptions2_1<TVideo> {
-    constructor(init: ScrcpyOptions2_1.Init<TVideo>) {
-        super(init);
-    }
-}
-
-export namespace ScrcpyOptions2_1_1 {
-    export type Init<TVideo extends boolean = boolean> =
-        ScrcpyOptions2_1.Init<TVideo>;
-}
+export { ScrcpyOptions2_1 as ScrcpyOptions2_1_1 } from "./2_1/index.js";