@yume-chan/scrcpy 2.1.0 → 2.2.0

package/src/2_4/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions2_4<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -76,11 +81,18 @@ export class ScrcpyOptions2_4<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -116,37 +128,6 @@ export class ScrcpyOptions2_4<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#uHidOutput?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-            this.#uHidOutput?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-            this.#uHidOutput?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/2_6/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions2_6<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -80,11 +85,18 @@ export class ScrcpyOptions2_6<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -120,31 +132,6 @@ export class ScrcpyOptions2_6<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/2_7/impl/serialize-uhid-create.ts

@@ -1,19 +1,17 @@
 import type { StructInit } from "@yume-chan/struct";
 import { buffer, string, struct, u16, u8 } from "@yume-chan/struct";
 
-import { ScrcpyControlMessageType } from "../../base/control-message-type.js";
 import type { ScrcpyUHidCreateControlMessage } from "../../latest.js";
 
-export const UHidCreateControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            type: u8(ScrcpyControlMessageType.UHidCreate),
-            id: u16,
-            name: string(u8),
-            data: buffer(u16),
-        },
-        { littleEndian: false },
-    ))();
+export const UHidCreateControlMessage = struct(
+    {
+        type: u8,
+        id: u16,
+        name: string(u8),
+        data: buffer(u16),
+    },
+    { littleEndian: false },
+);
 
 export type UHidCreateControlMessage = StructInit<
     typeof UHidCreateControlMessage

package/src/2_7/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions2_7<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -80,11 +85,18 @@ export class ScrcpyOptions2_7<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -120,31 +132,6 @@ export class ScrcpyOptions2_7<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/3_0/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions3_0<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -80,11 +85,18 @@ export class ScrcpyOptions3_0<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -120,31 +132,6 @@ export class ScrcpyOptions3_0<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/3_1/impl/serialize-uhid-create.ts

@@ -1,21 +1,19 @@
 import type { StructInit } from "@yume-chan/struct";
 import { buffer, string, struct, u16, u8 } from "@yume-chan/struct";
 
-import { ScrcpyControlMessageType } from "../../base/control-message-type.js";
 import type { ScrcpyUHidCreateControlMessage } from "../../latest.js";
 
-export const UHidCreateControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            type: u8(ScrcpyControlMessageType.UHidCreate),
-            id: u16,
-            vendorId: u16,
-            productId: u16,
-            name: string(u8),
-            data: buffer(u16),
-        },
-        { littleEndian: false },
-    ))();
+export const UHidCreateControlMessage = struct(
+    {
+        type: u8,
+        id: u16,
+        vendorId: u16,
+        productId: u16,
+        name: string(u8),
+        data: buffer(u16),
+    },
+    { littleEndian: false },
+);
 
 export type UHidCreateControlMessage = StructInit<
     typeof UHidCreateControlMessage

package/src/3_1/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions3_1<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -80,11 +85,18 @@ export class ScrcpyOptions3_1<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -120,31 +132,6 @@ export class ScrcpyOptions3_1<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/3_2/options.ts

@@ -1,6 +1,5 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -13,6 +12,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,6 +67,11 @@ export class ScrcpyOptions3_2<TVideo extends boolean>
         return this.#uHidOutput;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -80,11 +85,18 @@ export class ScrcpyOptions3_2<TVideo extends boolean>
 
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
-                this.#clipboard = new ClipboardStream();
-                this.#ackClipboardHandler = new AckClipboardHandler();
+                this.#clipboard = this.#deviceMessageParsers.add(
+                    new ClipboardStream(),
+                );
+
+                this.#ackClipboardHandler = this.#deviceMessageParsers.add(
+                    new AckClipboardHandler(),
+                );
             }
 
-            this.#uHidOutput = new UHidOutputStream();
+            this.#uHidOutput = this.#deviceMessageParsers.add(
+                new UHidOutputStream(),
+            );
         }
     }
 
@@ -120,31 +132,6 @@ export class ScrcpyOptions3_2<TVideo extends boolean>
         return parseAudioStreamMetadata(stream, this.value);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard?.parse(id, stream)) {
-            return;
-        }
-
-        if (await this.#ackClipboardHandler?.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard?.error(e);
-            this.#ackClipboardHandler?.error(e);
-        } else {
-            this.#clipboard?.close();
-            this.#ackClipboardHandler?.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/3_3.ts

@@ -0,0 +1,14 @@
+import { ScrcpyOptions3_2 } from "./3_2/index.js";
+
+export class ScrcpyOptions3_3<
+    TVideo extends boolean,
+> extends ScrcpyOptions3_2<TVideo> {
+    constructor(init: ScrcpyOptions3_2.Init<TVideo>) {
+        super(init);
+    }
+}
+
+export namespace ScrcpyOptions3_3 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_2.Init<TVideo>;
+}

package/src/3_3_1/impl/index.ts

@@ -0,0 +1,6 @@
+export * from "../../3_2/impl/index.js";
+
+export {
+    createScrollController,
+    ScrollController,
+} from "./scroll-controller.js";

package/src/3_3_1/impl/prev.ts

@@ -0,0 +1 @@
+export * as PrevImpl from "../../3_2/impl/index.js";

package/src/3_3_1/impl/scroll-controller.ts

@@ -0,0 +1,21 @@
+import type { ScrcpyScrollController } from "../../base/index.js";
+import type { ScrcpyInjectScrollControlMessage } from "../../latest.js";
+
+import { PrevImpl } from "./prev.js";
+
+export class ScrollController implements ScrcpyScrollController {
+    serializeScrollMessage(
+        message: ScrcpyInjectScrollControlMessage,
+    ): Uint8Array | undefined {
+        message = {
+            ...message,
+            scrollX: message.scrollX / 16,
+            scrollY: message.scrollY / 16,
+        };
+        return PrevImpl.InjectScrollControlMessage.serialize(message);
+    }
+}
+
+export function createScrollController(): ScrcpyScrollController {
+    return new ScrollController();
+}

package/src/3_3_1/index.ts

@@ -0,0 +1 @@
+export * from "./options.js";