@yume-chan/scrcpy 0.0.22 → 0.0.24

package/src/options/1_16/options.ts

@@ -1,11 +1,19 @@
-import type { ReadableStream } from "@yume-chan/stream-extra";
+import {
+    getUint16BigEndian,
+    getUint32BigEndian,
+} from "@yume-chan/no-data-view";
+import type {
+    PushReadableStreamController,
+    ReadableStream,
+} from "@yume-chan/stream-extra";
 import {
     BufferedReadableStream,
+    PushReadableStream,
     StructDeserializeStream,
     TransformStream,
 } from "@yume-chan/stream-extra";
 import type { AsyncExactReadable, ValueOrPromise } from "@yume-chan/struct";
-import { NumberFieldType, decodeUtf8 } from "@yume-chan/struct";
+import { decodeUtf8 } from "@yume-chan/struct";
 
 import type {
     ScrcpyBackOrScreenOnControlMessage,
@@ -20,8 +28,8 @@ import type {
     ScrcpyVideoStreamMetadata,
 } from "../codec.js";
 import { ScrcpyVideoCodecId } from "../codec.js";
-import type { ScrcpyDisplay, ScrcpyEncoder, ScrcpyOptions } from "../types.js";
-import { toScrcpyOptionValue } from "../types.js";
+import type { ScrcpyDisplay, ScrcpyEncoder } from "../types.js";
+import { ScrcpyOptions, toScrcpyOptionValue } from "../types.js";
 
 import { CodecOptions } from "./codec-options.js";
 import type { ScrcpyOptionsInit1_16 } from "./init.js";
@@ -30,6 +38,7 @@ import {
     SCRCPY_CONTROL_MESSAGE_TYPES_1_16,
     SCRCPY_MEDIA_PACKET_FLAG_CONFIG,
     ScrcpyBackOrScreenOnControlMessage1_16,
+    ScrcpyClipboardDeviceMessage,
     ScrcpyInjectTouchControlMessage1_16,
     ScrcpyMediaStreamRawPacket,
     ScrcpySetClipboardControlMessage1_15,
@@ -37,7 +46,7 @@ import {
 import type { ScrcpyScrollController } from "./scroll.js";
 import { ScrcpyScrollController1_16 } from "./scroll.js";
 
-export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
+export class ScrcpyOptions1_16 extends ScrcpyOptions<ScrcpyOptionsInit1_16> {
     static readonly DEFAULTS = {
         logLevel: ScrcpyLogLevel1_16.Debug,
         maxSize: 0,
@@ -45,7 +54,7 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         maxFps: 0,
         lockVideoOrientation: ScrcpyVideoOrientation1_16.Unlocked,
         tunnelForward: false,
-        crop: "",
+        crop: undefined,
         sendFrameMeta: true,
         control: true,
         displayId: 0,
@@ -74,35 +83,50 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         return order.map((key) => toScrcpyOptionValue(options[key], "-"));
     }
 
+    /**
+     * Parse a fixed-length, null-terminated string.
+     * @param stream The stream to read from
+     * @param maxLength The maximum length of the string, including the null terminator, in bytes
+     * @returns The parsed string, without the null terminator
+     */
     static async parseCString(
         stream: AsyncExactReadable,
         maxLength: number,
     ): Promise<string> {
-        let result = decodeUtf8(await stream.readExactly(maxLength));
-        result = result.substring(0, result.indexOf("\0"));
-        return result;
+        const buffer = await stream.readExactly(maxLength);
+        // If null terminator is not found, `subarray(0, -1)` will remove the last byte
+        // But since it's a invalid case, it's fine
+        return decodeUtf8(buffer.subarray(0, buffer.indexOf(0)));
     }
 
     static async parseUint16BE(stream: AsyncExactReadable): Promise<number> {
-        const buffer = await stream.readExactly(NumberFieldType.Uint16.size);
-        return NumberFieldType.Uint16.deserialize(buffer, false);
+        const buffer = await stream.readExactly(2);
+        return getUint16BigEndian(buffer, 0);
     }
 
     static async parseUint32BE(stream: AsyncExactReadable): Promise<number> {
-        const buffer = await stream.readExactly(NumberFieldType.Uint32.size);
-        return NumberFieldType.Uint32.deserialize(buffer, false);
+        const buffer = await stream.readExactly(4);
+        return getUint32BigEndian(buffer, 0);
     }
 
-    value: Required<ScrcpyOptionsInit1_16>;
-
     readonly defaults: Required<ScrcpyOptionsInit1_16> =
         ScrcpyOptions1_16.DEFAULTS;
 
-    readonly controlMessageTypes: readonly ScrcpyControlMessageType[] =
-        SCRCPY_CONTROL_MESSAGE_TYPES_1_16;
+    override get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
+        return SCRCPY_CONTROL_MESSAGE_TYPES_1_16;
+    }
+
+    #clipboardController!: PushReadableStreamController<string>;
+    #clipboard: ReadableStream<string>;
+    override get clipboard() {
+        return this.#clipboard;
+    }
 
     constructor(init: ScrcpyOptionsInit1_16) {
-        this.value = { ...ScrcpyOptions1_16.DEFAULTS, ...init };
+        super(undefined, init, ScrcpyOptions1_16.DEFAULTS);
+        this.#clipboard = new PushReadableStream<string>((controller) => {
+            this.#clipboardController = controller;
+        });
     }
 
     serialize(): string[] {
@@ -112,24 +136,23 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         );
     }
 
-    setListEncoders(): void {
+    override setListEncoders(): void {
         throw new Error("Not supported");
     }
 
-    setListDisplays(): void {
+    override setListDisplays(): void {
         // Set to an invalid value
         // Server will print valid values before crashing
         // (server will crash before opening sockets)
         this.value.displayId = -1;
     }
 
-    parseEncoder(): ScrcpyEncoder | undefined {
+    override parseEncoder(): ScrcpyEncoder | undefined {
         throw new Error("Not supported");
     }
 
-    parseDisplay(line: string): ScrcpyDisplay | undefined {
-        const displayIdRegex = /\s+scrcpy --display (\d+)/;
-        const match = line.match(displayIdRegex);
+    override parseDisplay(line: string): ScrcpyDisplay | undefined {
+        const match = line.match(/^\s+scrcpy --display (\d+)$/);
         if (match) {
             return {
                 id: Number.parseInt(match[1]!, 10),
@@ -138,7 +161,7 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         return undefined;
     }
 
-    parseVideoStreamMetadata(
+    override parseVideoStreamMetadata(
         stream: ReadableStream<Uint8Array>,
     ): ValueOrPromise<ScrcpyVideoStream> {
         return (async () => {
@@ -156,11 +179,27 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         })();
     }
 
-    parseAudioStreamMetadata(): never {
+    override parseAudioStreamMetadata(): never {
         throw new Error("Not supported");
     }
 
-    createMediaStreamTransformer(): TransformStream<
+    override async parseDeviceMessage(
+        id: number,
+        stream: AsyncExactReadable,
+    ): Promise<boolean> {
+        switch (id) {
+            case 0: {
+                const message =
+                    await ScrcpyClipboardDeviceMessage.deserialize(stream);
+                await this.#clipboardController.enqueue(message.content);
+                return true;
+            }
+            default:
+                return false;
+        }
+    }
+
+    override createMediaStreamTransformer(): TransformStream<
         Uint8Array,
         ScrcpyMediaStreamPacket
     > {
@@ -203,13 +242,13 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         };
     }
 
-    serializeInjectTouchControlMessage(
+    override serializeInjectTouchControlMessage(
         message: ScrcpyInjectTouchControlMessage,
     ): Uint8Array {
         return ScrcpyInjectTouchControlMessage1_16.serialize(message);
     }
 
-    serializeBackOrScreenOnControlMessage(
+    override serializeBackOrScreenOnControlMessage(
         message: ScrcpyBackOrScreenOnControlMessage,
     ) {
         if (message.action === AndroidKeyEventAction.Down) {
@@ -219,13 +258,13 @@ export class ScrcpyOptions1_16 implements ScrcpyOptions<ScrcpyOptionsInit1_16> {
         return undefined;
     }
 
-    serializeSetClipboardControlMessage(
+    override serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
     ): Uint8Array {
         return ScrcpySetClipboardControlMessage1_15.serialize(message);
     }
 
-    createScrollController(): ScrcpyScrollController {
+    override createScrollController(): ScrcpyScrollController {
         return new ScrcpyScrollController1_16();
     }
 }

package/src/options/1_17.ts

@@ -1,16 +1,13 @@
 import type { ScrcpyOptionsInit1_16 } from "./1_16/index.js";
 import { ScrcpyOptions1_16 } from "./1_16/index.js";
 import type { ScrcpyEncoder } from "./types.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 
 export interface ScrcpyOptionsInit1_17 extends ScrcpyOptionsInit1_16 {
     encoderName?: string | undefined;
 }
 
-export class ScrcpyOptions1_17 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_17,
-    ScrcpyOptions1_16
-> {
+export class ScrcpyOptions1_17 extends ScrcpyOptions<ScrcpyOptionsInit1_17> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_16.DEFAULTS,
         encoderName: undefined,
@@ -37,10 +34,7 @@ export class ScrcpyOptions1_17 extends ScrcpyOptionsBase<
     }
 
     constructor(init: ScrcpyOptionsInit1_17) {
-        super(new ScrcpyOptions1_16(init), {
-            ...ScrcpyOptions1_17.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_16, init, ScrcpyOptions1_17.DEFAULTS);
     }
 
     override serialize(): string[] {
@@ -60,7 +54,7 @@ export class ScrcpyOptions1_17 extends ScrcpyOptionsBase<
     override parseEncoder(line: string): ScrcpyEncoder | undefined {
         return ScrcpyOptions1_17.parseEncoder(
             line,
-            /\s+scrcpy --encoder-name '(.*?)'/,
+            /^\s+scrcpy --encoder-name '([^']+)'$/,
         );
     }
 }

package/src/options/1_18.ts

@@ -9,14 +9,12 @@ import { ScrcpyControlMessageType } from "../control/index.js";
 import {
     SCRCPY_CONTROL_MESSAGE_TYPES_1_16,
     ScrcpyBackOrScreenOnControlMessage1_16,
-    ScrcpyLogLevel1_16,
     ScrcpyOptions1_16,
-    ScrcpyVideoOrientation1_16,
 } from "./1_16/index.js";
 import type { ScrcpyOptionsInit1_17 } from "./1_17.js";
 import { ScrcpyOptions1_17 } from "./1_17.js";
 import type { ScrcpyEncoder } from "./types.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 
 export enum ScrcpyLogLevel1_18 {
     Verbose = "verbose",
@@ -59,29 +57,7 @@ SCRCPY_CONTROL_MESSAGE_TYPES_1_18.splice(
     ScrcpyControlMessageType.ExpandSettingPanel,
 );
 
-const LOG_LEVEL_MAP = {
-    [ScrcpyLogLevel1_18.Verbose]: ScrcpyLogLevel1_16.Debug,
-    [ScrcpyLogLevel1_18.Debug]: ScrcpyLogLevel1_16.Debug,
-    [ScrcpyLogLevel1_18.Info]: ScrcpyLogLevel1_16.Info,
-    [ScrcpyLogLevel1_18.Warn]: ScrcpyLogLevel1_16.Warn,
-    [ScrcpyLogLevel1_18.Error]: ScrcpyLogLevel1_16.Error,
-};
-
-const VIDEO_ORIENTATION_MAP = {
-    [ScrcpyVideoOrientation1_18.Initial]: ScrcpyVideoOrientation1_16.Unlocked,
-    [ScrcpyVideoOrientation1_18.Unlocked]: ScrcpyVideoOrientation1_16.Unlocked,
-    [ScrcpyVideoOrientation1_18.Portrait]: ScrcpyVideoOrientation1_16.Portrait,
-    [ScrcpyVideoOrientation1_18.Landscape]:
-        ScrcpyVideoOrientation1_16.Landscape,
-    [ScrcpyVideoOrientation1_18.PortraitFlipped]:
-        ScrcpyVideoOrientation1_16.PortraitFlipped,
-    [ScrcpyVideoOrientation1_18.LandscapeFlipped]:
-        ScrcpyVideoOrientation1_16.LandscapeFlipped,
-};
-export class ScrcpyOptions1_18 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_18,
-    ScrcpyOptions1_17
-> {
+export class ScrcpyOptions1_18 extends ScrcpyOptions<ScrcpyOptionsInit1_18> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_17.DEFAULTS,
         logLevel: ScrcpyLogLevel1_18.Debug,
@@ -103,16 +79,7 @@ export class ScrcpyOptions1_18 extends ScrcpyOptionsBase<
     }
 
     constructor(init: ScrcpyOptionsInit1_18) {
-        const value = { ...ScrcpyOptions1_18.DEFAULTS, ...init };
-        super(
-            new ScrcpyOptions1_17({
-                ...init,
-                logLevel: LOG_LEVEL_MAP[value.logLevel],
-                lockVideoOrientation:
-                    VIDEO_ORIENTATION_MAP[value.lockVideoOrientation],
-            }),
-            value,
-        );
+        super(ScrcpyOptions1_17, init, ScrcpyOptions1_18.DEFAULTS);
     }
 
     override serialize(): string[] {
@@ -125,7 +92,7 @@ export class ScrcpyOptions1_18 extends ScrcpyOptionsBase<
     override parseEncoder(line: string): ScrcpyEncoder | undefined {
         return ScrcpyOptions1_17.parseEncoder(
             line,
-            /\s+scrcpy --encoder '(.*?)'/,
+            /^\s+scrcpy --encoder '([^']+)'$/,
         );
     }
 

package/src/options/1_21.ts

@@ -1,12 +1,16 @@
 // cspell: ignore autosync
 
+import { PromiseResolver } from "@yume-chan/async";
+import type { AsyncExactReadable } from "@yume-chan/struct";
 import Struct, { placeholder } from "@yume-chan/struct";
 
 import type { ScrcpySetClipboardControlMessage } from "../control/index.js";
 
 import type { ScrcpyOptionsInit1_18 } from "./1_18.js";
 import { ScrcpyOptions1_18 } from "./1_18.js";
-import { ScrcpyOptionsBase, toScrcpyOptionValue } from "./types.js";
+import { ScrcpyOptions, toScrcpyOptionValue } from "./types.js";
+
+export const ScrcpyAckClipboardDeviceMessage = new Struct().uint64("sequence");
 
 export interface ScrcpyOptionsInit1_21 extends ScrcpyOptionsInit1_18 {
     clipboardAutosync?: boolean;
@@ -26,10 +30,7 @@ export const ScrcpySetClipboardControlMessage1_21 = new Struct()
 export type ScrcpySetClipboardControlMessage1_21 =
     (typeof ScrcpySetClipboardControlMessage1_21)["TInit"];
 
-export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_21,
-    ScrcpyOptions1_18
-> {
+export class ScrcpyOptions1_21 extends ScrcpyOptions<ScrcpyOptionsInit1_21> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_18.DEFAULTS,
         clipboardAutosync: true,
@@ -64,11 +65,30 @@ export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
         return ScrcpyOptions1_21.DEFAULTS;
     }
 
+    #clipboardAck = new Map<bigint, PromiseResolver<void>>();
+
     constructor(init: ScrcpyOptionsInit1_21) {
-        super(new ScrcpyOptions1_18(init), {
-            ...ScrcpyOptions1_21.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_18, init, ScrcpyOptions1_21.DEFAULTS);
+    }
+
+    override async parseDeviceMessage(
+        id: number,
+        stream: AsyncExactReadable,
+    ): Promise<boolean> {
+        switch (id) {
+            case 1: {
+                const message =
+                    await ScrcpyAckClipboardDeviceMessage.deserialize(stream);
+                const resolver = this.#clipboardAck.get(message.sequence);
+                if (resolver) {
+                    resolver.resolve();
+                    this.#clipboardAck.delete(message.sequence);
+                }
+                return true;
+            }
+            default:
+                return await super.parseDeviceMessage(id, stream);
+        }
     }
 
     override serialize(): string[] {
@@ -77,7 +97,16 @@ export class ScrcpyOptions1_21 extends ScrcpyOptionsBase<
 
     override serializeSetClipboardControlMessage(
         message: ScrcpySetClipboardControlMessage,
-    ): Uint8Array {
-        return ScrcpySetClipboardControlMessage1_21.serialize(message);
+    ): Uint8Array | [Uint8Array, Promise<void>] {
+        if (message.sequence === 0n) {
+            return ScrcpySetClipboardControlMessage1_21.serialize(message);
+        }
+
+        const resolver = new PromiseResolver<void>();
+        this.#clipboardAck.set(message.sequence, resolver);
+        return [
+            ScrcpySetClipboardControlMessage1_21.serialize(message),
+            resolver.promise,
+        ];
     }
 }

package/src/options/1_22/options.ts

@@ -5,15 +5,12 @@ import type { ScrcpyScrollController } from "../1_16/index.js";
 import { ScrcpyOptions1_21 } from "../1_21.js";
 import type { ScrcpyVideoStream } from "../codec.js";
 import { ScrcpyVideoCodecId } from "../codec.js";
-import { ScrcpyOptionsBase } from "../types.js";
+import { ScrcpyOptions } from "../types.js";
 
 import type { ScrcpyOptionsInit1_22 } from "./init.js";
 import { ScrcpyScrollController1_22 } from "./scroll.js";
 
-export class ScrcpyOptions1_22 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_22,
-    ScrcpyOptions1_21
-> {
+export class ScrcpyOptions1_22 extends ScrcpyOptions<ScrcpyOptionsInit1_22> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_21.DEFAULTS,
         downsizeOnError: true,
@@ -26,10 +23,7 @@ export class ScrcpyOptions1_22 extends ScrcpyOptionsBase<
     }
 
     constructor(init: ScrcpyOptionsInit1_22) {
-        super(new ScrcpyOptions1_21(init), {
-            ...ScrcpyOptions1_22.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_21, init, ScrcpyOptions1_22.DEFAULTS);
     }
 
     override parseVideoStreamMetadata(
@@ -38,7 +32,7 @@ export class ScrcpyOptions1_22 extends ScrcpyOptionsBase<
         if (!this.value.sendDeviceMeta) {
             return { stream, metadata: { codec: ScrcpyVideoCodecId.H264 } };
         } else {
-            return this._base.parseVideoStreamMetadata(stream);
+            return super.parseVideoStreamMetadata(stream);
         }
     }
 

package/src/options/1_23.ts

@@ -4,7 +4,7 @@ import { ScrcpyOptions1_21 } from "./1_21.js";
 import type { ScrcpyOptionsInit1_22 } from "./1_22/index.js";
 import { ScrcpyOptions1_22 } from "./1_22/index.js";
 import type { ScrcpyMediaStreamPacket } from "./codec.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 
 export interface ScrcpyOptionsInit1_23 extends ScrcpyOptionsInit1_22 {
     cleanup?: boolean;
@@ -12,10 +12,7 @@ export interface ScrcpyOptionsInit1_23 extends ScrcpyOptionsInit1_22 {
 
 const KEYFRAME_PTS = 1n << 62n;
 
-export class ScrcpyOptions1_23 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_23,
-    ScrcpyOptions1_22
-> {
+export class ScrcpyOptions1_23 extends ScrcpyOptions<ScrcpyOptionsInit1_23> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_22.DEFAULTS,
         cleanup: true,
@@ -26,10 +23,7 @@ export class ScrcpyOptions1_23 extends ScrcpyOptionsBase<
     }
 
     constructor(init: ScrcpyOptionsInit1_22) {
-        super(new ScrcpyOptions1_22(init), {
-            ...ScrcpyOptions1_23.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_22, init, ScrcpyOptions1_23.DEFAULTS);
     }
 
     override serialize(): string[] {
@@ -40,7 +34,7 @@ export class ScrcpyOptions1_23 extends ScrcpyOptionsBase<
         Uint8Array,
         ScrcpyMediaStreamPacket
     > {
-        const stream = this._base.createMediaStreamTransformer();
+        const stream = super.createMediaStreamTransformer();
         return {
             writable: stream.writable,
             readable: stream.readable.pipeThrough(

package/src/options/1_24.ts

@@ -1,16 +1,13 @@
 import { ScrcpyOptions1_21 } from "./1_21.js";
 import type { ScrcpyOptionsInit1_23 } from "./1_23.js";
 import { ScrcpyOptions1_23 } from "./1_23.js";
-import { ScrcpyOptionsBase } from "./types.js";
+import { ScrcpyOptions } from "./types.js";
 
 export interface ScrcpyOptionsInit1_24 extends ScrcpyOptionsInit1_23 {
     powerOn?: boolean;
 }
 
-export class ScrcpyOptions1_24 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_24,
-    ScrcpyOptions1_23
-> {
+export class ScrcpyOptions1_24 extends ScrcpyOptions<ScrcpyOptionsInit1_24> {
     static readonly DEFAULTS = {
         ...ScrcpyOptions1_23.DEFAULTS,
         powerOn: true,
@@ -21,10 +18,7 @@ export class ScrcpyOptions1_24 extends ScrcpyOptionsBase<
     }
 
     constructor(init: ScrcpyOptionsInit1_24) {
-        super(new ScrcpyOptions1_23(init), {
-            ...ScrcpyOptions1_24.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_23, init, ScrcpyOptions1_24.DEFAULTS);
     }
 
     override serialize(): string[] {

package/src/options/1_25/options.ts

@@ -2,23 +2,17 @@ import type { ScrcpyScrollController } from "../1_16/index.js";
 import { ScrcpyOptions1_21 } from "../1_21.js";
 import type { ScrcpyOptionsInit1_24 } from "../1_24.js";
 import { ScrcpyOptions1_24 } from "../1_24.js";
-import { ScrcpyOptionsBase } from "../types.js";
+import { ScrcpyOptions } from "../types.js";
 
 import { ScrcpyScrollController1_25 } from "./scroll.js";
 
-export class ScrcpyOptions1_25 extends ScrcpyOptionsBase<
-    ScrcpyOptionsInit1_24,
-    ScrcpyOptions1_24
-> {
+export class ScrcpyOptions1_25 extends ScrcpyOptions<ScrcpyOptionsInit1_24> {
     override get defaults(): Required<ScrcpyOptionsInit1_24> {
         return ScrcpyOptions1_24.DEFAULTS;
     }
 
     constructor(init: ScrcpyOptionsInit1_24) {
-        super(new ScrcpyOptions1_24(init), {
-            ...ScrcpyOptions1_24.DEFAULTS,
-            ...init,
-        });
+        super(ScrcpyOptions1_24, init, ScrcpyOptions1_24.DEFAULTS);
     }
 
     override serialize(): string[] {

package/src/options/1_25/scroll.ts

@@ -1,18 +1,17 @@
-import Struct, {
-    NumberFieldDefinition,
-    NumberFieldType,
-} from "@yume-chan/struct";
+import { getInt16 } from "@yume-chan/no-data-view";
+import type { NumberFieldVariant } from "@yume-chan/struct";
+import Struct, { NumberFieldDefinition } from "@yume-chan/struct";
 
 import type { ScrcpyInjectScrollControlMessage } from "../../control/index.js";
 import { ScrcpyControlMessageType } from "../../control/index.js";
 import type { ScrcpyScrollController } from "../1_16/index.js";
 import { clamp } from "../1_16/index.js";
 
-export const ScrcpyFloatToInt16NumberType: NumberFieldType = {
+export const ScrcpySignedFloatNumberVariant: NumberFieldVariant = {
     size: 2,
     signed: true,
     deserialize(array, littleEndian) {
-        const value = NumberFieldType.Int16.deserialize(array, littleEndian);
+        const value = getInt16(array, 0, littleEndian);
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/server/src/main/java/com/genymobile/scrcpy/Binary.java#L34
         return value === 0x7fff ? 1 : value / 0x8000;
     },
@@ -20,12 +19,12 @@ export const ScrcpyFloatToInt16NumberType: NumberFieldType = {
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/app/src/util/binary.h#L65
         value = clamp(value, -1, 1);
         value = value === 1 ? 0x7fff : value * 0x8000;
-        NumberFieldType.Int16.serialize(dataView, offset, value, littleEndian);
+        dataView.setInt16(offset, value, littleEndian);
     },
 };
 
-const ScrcpyFloatToInt16FieldDefinition = new NumberFieldDefinition(
-    ScrcpyFloatToInt16NumberType,
+const ScrcpySignedFloatFieldDefinition = new NumberFieldDefinition(
+    ScrcpySignedFloatNumberVariant,
 );
 
 export const ScrcpyInjectScrollControlMessage1_25 = new Struct()
@@ -34,8 +33,8 @@ export const ScrcpyInjectScrollControlMessage1_25 = new Struct()
     .uint32("pointerY")
     .uint16("screenWidth")
     .uint16("screenHeight")
-    .field("scrollX", ScrcpyFloatToInt16FieldDefinition)
-    .field("scrollY", ScrcpyFloatToInt16FieldDefinition)
+    .field("scrollX", ScrcpySignedFloatFieldDefinition)
+    .field("scrollY", ScrcpySignedFloatFieldDefinition)
     .int32("buttons");
 
 export type ScrcpyInjectScrollControlMessage1_25 =