@yume-chan/scrcpy 2.0.1 → 2.1.1

package/src/2_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,
@@ -56,12 +56,22 @@ export class ScrcpyOptions2_1<TVideo extends boolean>
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
         if (this.value.control && 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(),
+            );
         }
     }
 
@@ -97,31 +107,6 @@ export class ScrcpyOptions2_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/2_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,
@@ -56,6 +56,11 @@ export class ScrcpyOptions2_2<TVideo extends boolean>
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -64,8 +69,13 @@ export class ScrcpyOptions2_2<TVideo extends boolean>
         }
 
         if (this.value.control && 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(),
+            );
         }
     }
 
@@ -101,31 +111,6 @@ export class ScrcpyOptions2_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/2_3/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,
@@ -56,6 +56,11 @@ export class ScrcpyOptions2_3<TVideo extends boolean>
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init<TVideo>) {
         this.value = { ...Defaults, ...init } as never;
 
@@ -64,8 +69,13 @@ export class ScrcpyOptions2_3<TVideo extends boolean>
         }
 
         if (this.value.control && 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(),
+            );
         }
     }
 
@@ -101,31 +111,6 @@ export class ScrcpyOptions2_3<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_4/impl/uhid-output-stream.ts

@@ -23,6 +23,8 @@ export class UHidOutputStream
 {
     #controller: PushReadableStreamController<UHidOutputDeviceMessage>;
 
+    readonly id = 2;
+
     constructor() {
         let controller!: PushReadableStreamController<UHidOutputDeviceMessage>;
         super((controller_) => {
@@ -31,14 +33,9 @@ export class UHidOutputStream
         this.#controller = controller;
     }
 
-    async parse(id: number, stream: AsyncExactReadable): Promise<boolean> {
-        if (id !== 2) {
-            return false;
-        }
-
+    async parse(_id: number, stream: AsyncExactReadable): Promise<undefined> {
         const message = await UHidOutputDeviceMessage.deserialize(stream);
         await this.#controller.enqueue(message);
-        return true;
     }
 
     close() {

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