@yume-chan/scrcpy 2.0.1 → 2.1.1

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

@@ -34,33 +34,36 @@ export class ScrollController implements ScrcpyScrollController {
     protected processMessage(
         message: ScrcpyInjectScrollControlMessage,
     ): ScrcpyInjectScrollControlMessage | undefined {
-        this.#accumulatedX += message.scrollX;
-        this.#accumulatedY += message.scrollY;
+        // Ref https://github.com/libsdl-org/SDL/blob/878ea48b607f23e4ec8c12d1395b86ab529e30d0/src/events/SDL_mouse.c#L897-L914
 
-        let scrollX = 0;
-        let scrollY = 0;
-        if (this.#accumulatedX >= 1) {
-            scrollX = 1;
-            this.#accumulatedX = 0;
-        } else if (this.#accumulatedX <= -1) {
-            scrollX = -1;
-            this.#accumulatedX = 0;
+        if (message.scrollX) {
+            if (Math.sign(message.scrollX) !== Math.sign(this.#accumulatedX)) {
+                this.#accumulatedX = message.scrollX;
+            } else {
+                this.#accumulatedX += message.scrollX;
+            }
         }
 
-        if (this.#accumulatedY >= 1) {
-            scrollY = 1;
-            this.#accumulatedY = 0;
-        } else if (this.#accumulatedY <= -1) {
-            scrollY = -1;
-            this.#accumulatedY = 0;
+        if (message.scrollY) {
+            if (Math.sign(message.scrollY) !== Math.sign(this.#accumulatedY)) {
+                this.#accumulatedY = message.scrollY;
+            } else {
+                this.#accumulatedY += message.scrollY;
+            }
         }
 
-        if (scrollX === 0 && scrollY === 0) {
+        const integerX = this.#accumulatedX | 0;
+        this.#accumulatedX -= integerX;
+
+        const integerY = this.#accumulatedY | 0;
+        this.#accumulatedY -= integerY;
+
+        if (integerX === 0 && integerY === 0) {
             return undefined;
         }
 
-        message.scrollX = scrollX;
-        message.scrollY = scrollY;
+        message.scrollX = integerX;
+        message.scrollY = integerY;
         return message;
     }
 

package/src/1_15/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 {
     ScrcpyControlMessageType,
@@ -10,6 +9,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -47,11 +47,18 @@ export class ScrcpyOptions1_15 implements ScrcpyOptions<Init> {
         return this.#clipboard;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         if (this.value.control) {
-            this.#clipboard = new ClipboardStream();
+            this.#clipboard = this.#deviceMessageParsers.add(
+                new ClipboardStream(),
+            );
         }
     }
 
@@ -73,25 +80,6 @@ export class ScrcpyOptions1_15 implements ScrcpyOptions<Init> {
         return parseVideoStreamMetadata(stream);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard!.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard!.error(e);
-        } else {
-            this.#clipboard!.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/1_17/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -54,11 +54,18 @@ export class ScrcpyOptions1_17
         return this.#clipboard;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         if (this.value.control) {
-            this.#clipboard = new ClipboardStream();
+            this.#clipboard = this.#deviceMessageParsers.add(
+                new ClipboardStream(),
+            );
         }
     }
 
@@ -88,25 +95,6 @@ export class ScrcpyOptions1_17
         return parseVideoStreamMetadata(stream);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard!.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard!.error(e);
-        } else {
-            this.#clipboard!.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

package/src/1_18/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -54,11 +54,18 @@ export class ScrcpyOptions1_18
         return this.#clipboard;
     }
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         if (this.value.control) {
-            this.#clipboard = new ClipboardStream();
+            this.#clipboard = this.#deviceMessageParsers.add(
+                new ClipboardStream(),
+            );
         }
     }
 
@@ -88,25 +95,6 @@ export class ScrcpyOptions1_18
         return parseVideoStreamMetadata(stream);
     }
 
-    async parseDeviceMessage(
-        id: number,
-        stream: ExactReadable | AsyncExactReadable,
-    ): Promise<void> {
-        if (await this.#clipboard!.parse(id, stream)) {
-            return;
-        }
-
-        throw new Error("Unknown device message");
-    }
-
-    endDeviceMessageStream(e?: unknown): void {
-        if (e) {
-            this.#clipboard!.error(e);
-        } else {
-            this.#clipboard!.close();
-        }
-    }
-
     createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket

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

@@ -29,18 +29,15 @@ export class AckClipboardHandler implements ScrcpyDeviceMessageParser {
 
     #closed = false;
 
-    async parse(id: number, stream: AsyncExactReadable) {
-        if (id !== 1) {
-            return false;
-        }
+    readonly id = 1;
 
+    async parse(_id: number, stream: AsyncExactReadable): Promise<undefined> {
         const message = await AckClipboardDeviceMessage.deserialize(stream);
         const resolver = this.#resolvers.get(message.sequence);
         if (resolver) {
             resolver.resolve();
             this.#resolvers.delete(message.sequence);
         }
-        return true;
     }
 
     close(): void {

package/src/1_21/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -55,12 +55,22 @@ export class ScrcpyOptions1_21
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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(),
+            );
         }
     }
 
@@ -90,31 +100,6 @@ export class ScrcpyOptions1_21
         return parseVideoStreamMetadata(stream);
     }
 
-    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/1_22/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -55,12 +55,22 @@ export class ScrcpyOptions1_22
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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(),
+            );
         }
     }
 
@@ -90,31 +100,6 @@ export class ScrcpyOptions1_22
         return parseVideoStreamMetadata(this.value, stream);
     }
 
-    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/1_23/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -55,12 +55,22 @@ export class ScrcpyOptions1_23
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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(),
+            );
         }
     }
 
@@ -90,31 +100,6 @@ export class ScrcpyOptions1_23
         return parseVideoStreamMetadata(this.value, stream);
     }
 
-    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/1_24/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -55,12 +55,22 @@ export class ScrcpyOptions1_24
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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(),
+            );
         }
     }
 
@@ -90,31 +100,6 @@ export class ScrcpyOptions1_24
         return parseVideoStreamMetadata(this.value, stream);
     }
 
-    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/1_25/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 {
     ScrcpyControlMessageType,
@@ -12,6 +11,7 @@ import type {
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
+import { ScrcpyDeviceMessageParsers } from "../base/index.js";
 import type {
     ScrcpyBackOrScreenOnControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -55,12 +55,22 @@ export class ScrcpyOptions1_25
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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(),
+            );
         }
     }
 
@@ -90,31 +100,6 @@ export class ScrcpyOptions1_25
         return parseVideoStreamMetadata(this.value, stream);
     }
 
-    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_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,
@@ -56,12 +56,22 @@ export class ScrcpyOptions2_0
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
+    #deviceMessageParsers = new ScrcpyDeviceMessageParsers();
+    get deviceMessageParsers() {
+        return this.#deviceMessageParsers;
+    }
+
     constructor(init: Init) {
         this.value = { ...Defaults, ...init };
 
         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_0
         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