@yume-chan/scrcpy 1.1.0 → 2.0.0

package/esm/latest.js

@@ -1,9 +1,8 @@
 import { ScrcpyOptions3_1 } from "./3_1/options.js";
 export class ScrcpyOptionsLatest extends ScrcpyOptions3_1 {
-    constructor(init, version) {
-        super(init, version);
+    constructor(init) {
+        super(init);
     }
 }
-export { ScrcpyOptions3_1Impl as ScrcpyOptionsLatestImpl } from "./3_1/index.js";
 export { BackOrScreenOnControlMessage as ScrcpyBackOrScreenOnControlMessage, CaptureOrientation as ScrcpyCaptureOrientation, CodecOptions as ScrcpyCodecOptions, Crop as ScrcpyCrop, InjectScrollControlMessage as ScrcpyInjectScrollControlMessage, InjectTouchControlMessage as ScrcpyInjectTouchControlMessage, InstanceId as ScrcpyInstanceId, LockOrientation as ScrcpyLockOrientation, NewDisplay as ScrcpyNewDisplay, Orientation as ScrcpyOrientation, PointerId as ScrcpyPointerId, SetClipboardControlMessage as ScrcpySetClipboardControlMessage, UHidCreateControlMessage as ScrcpyUHidCreateControlMessage, UHidOutputDeviceMessage as ScrcpyUHidOutputDeviceMessage, } from "./3_1/impl/index.js";
 //# sourceMappingURL=latest.js.map

package/esm/latest.js.map

@@ -1 +1 @@
-{"version":3,"file":"latest.js","sourceRoot":"","sources":["../src/latest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,OAAO,mBAAoB,SAAQ,gBAAgB;IACrD,YAAY,IAA2B,EAAE,OAAe;QACpD,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACzB,CAAC;CACJ;AAED,OAAO,EAAE,oBAAoB,IAAI,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAEjF,OAAO,EACH,4BAA4B,IAAI,kCAAkC,EAClE,kBAAkB,IAAI,wBAAwB,EAC9C,YAAY,IAAI,kBAAkB,EAClC,IAAI,IAAI,UAAU,EAClB,0BAA0B,IAAI,gCAAgC,EAC9D,yBAAyB,IAAI,+BAA+B,EAC5D,UAAU,IAAI,gBAAgB,EAC9B,eAAe,IAAI,qBAAqB,EACxC,UAAU,IAAI,gBAAgB,EAC9B,WAAW,IAAI,iBAAiB,EAChC,SAAS,IAAI,eAAe,EAC5B,0BAA0B,IAAI,gCAAgC,EAC9D,wBAAwB,IAAI,8BAA8B,EAC1D,uBAAuB,IAAI,6BAA6B,GAC3D,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"latest.js","sourceRoot":"","sources":["../src/latest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,OAAO,mBAEX,SAAQ,gBAAwB;IAC9B,YAAY,IAAmC;QAC3C,KAAK,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;CACJ;AAOD,OAAO,EACH,4BAA4B,IAAI,kCAAkC,EAClE,kBAAkB,IAAI,wBAAwB,EAC9C,YAAY,IAAI,kBAAkB,EAClC,IAAI,IAAI,UAAU,EAClB,0BAA0B,IAAI,gCAAgC,EAC9D,yBAAyB,IAAI,+BAA+B,EAC5D,UAAU,IAAI,gBAAgB,EAC9B,eAAe,IAAI,qBAAqB,EACxC,UAAU,IAAI,gBAAgB,EAC9B,WAAW,IAAI,iBAAiB,EAChC,SAAS,IAAI,eAAe,EAC5B,0BAA0B,IAAI,gCAAgC,EAC9D,wBAAwB,IAAI,8BAA8B,EAC1D,uBAAuB,IAAI,6BAA6B,GAC3D,MAAM,qBAAqB,CAAC"}

package/esm/utils/index.d.ts

@@ -1,5 +1,4 @@
 export * from "./clamp.js";
 export * from "./constants.js";
 export * from "./omit.js";
-export * from "./wrapper.js";
 //# sourceMappingURL=index.d.ts.map

package/esm/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}

package/esm/utils/index.js

@@ -1,5 +1,4 @@
 export * from "./clamp.js";
 export * from "./constants.js";
 export * from "./omit.js";
-export * from "./wrapper.js";
 //# sourceMappingURL=index.js.map

package/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/scrcpy",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "TypeScript implementation of Scrcpy client.",
   "keywords": [
     "adb",
@@ -28,14 +28,14 @@
   "sideEffects": false,
   "dependencies": {
     "@yume-chan/async": "^4.0.2",
-    "@yume-chan/no-data-view": "^1.0.0",
-    "@yume-chan/struct": "^1.0.0",
-    "@yume-chan/stream-extra": "^1.0.0"
+    "@yume-chan/stream-extra": "^2.0.0",
+    "@yume-chan/struct": "^2.0.0",
+    "@yume-chan/no-data-view": "^2.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
-    "prettier": "^3.4.2",
-    "typescript": "^5.7.2",
+    "@types/node": "^22.13.10",
+    "prettier": "^3.5.3",
+    "typescript": "^5.8.2",
     "@yume-chan/test-runner": "^1.0.0",
     "@yume-chan/eslint-config": "^1.0.0",
     "@yume-chan/tsconfig": "^1.0.0"

package/src/1_15/impl/inject-touch.ts

@@ -1,26 +1,27 @@
 import { getUint16, setUint16 } from "@yume-chan/no-data-view";
 import type { Field, StructInit } from "@yume-chan/struct";
-import { bipedal, struct, u16, u32, u64, u8 } from "@yume-chan/struct";
+import { field, struct, u16, u32, u64, u8 } from "@yume-chan/struct";
 
 import type { AndroidMotionEventAction } from "../../android/index.js";
 import type { ScrcpyInjectTouchControlMessage } from "../../latest.js";
 import { clamp } from "../../utils/index.js";
 
-export const UnsignedFloat: Field<number, never, never> = {
-    size: 2,
-    serialize(value, { buffer, index, littleEndian }) {
+export const UnsignedFloat: Field<number, never, never> = field(
+    2,
+    "byob",
+    (source, { buffer, index, littleEndian }) => {
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/app/src/util/binary.h#L51
-        value = clamp(value, -1, 1);
-        value = value === 1 ? 0xffff : value * 0x10000;
-        setUint16(buffer, index, value, littleEndian);
+        source = clamp(source, -1, 1);
+        source = source === 1 ? 0xffff : source * 0x10000;
+        setUint16(buffer, index, source, littleEndian);
     },
-    deserialize: bipedal(function* (then, { reader, littleEndian }) {
+    function* (then, reader, { littleEndian }) {
         const data = yield* then(reader.readExactly(2));
         const value = getUint16(data, 0, littleEndian);
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/server/src/main/java/com/genymobile/scrcpy/Binary.java#L22
         return value === 0xffff ? 1 : value / 0x10000;
-    }),
-};
+    },
+);
 
 export const PointerId = {
     Mouse: -1n,
@@ -36,8 +37,8 @@ export const InjectTouchControlMessage = struct(
         pointerId: u64,
         pointerX: u32,
         pointerY: u32,
-        screenWidth: u16,
-        screenHeight: u16,
+        videoWidth: u16,
+        videoHeight: u16,
         pressure: UnsignedFloat,
         buttons: u32,
     },

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

@@ -9,8 +9,8 @@ export const InjectScrollControlMessage = struct(
         type: u8,
         pointerX: u32,
         pointerY: u32,
-        screenWidth: u16,
-        screenHeight: u16,
+        videoWidth: u16,
+        videoHeight: u16,
         scrollX: s32,
         scrollY: s32,
     },

package/src/1_15/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_15Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_15/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -36,8 +36,6 @@ import {
 export class ScrcpyOptions1_15 implements ScrcpyOptions<Init> {
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -49,9 +47,8 @@ export class ScrcpyOptions1_15 implements ScrcpyOptions<Init> {
         return this.#clipboard;
     }
 
-    constructor(init: Init, version = "1.15") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control) {
             this.#clipboard = new ClipboardStream();
@@ -78,7 +75,7 @@ export class ScrcpyOptions1_15 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard!.parse(id, stream)) {
             return;

package/src/1_15_1.ts

@@ -1,9 +1,11 @@
 import { ScrcpyOptions1_15 } from "./1_15/index.js";
 
 export class ScrcpyOptions1_15_1 extends ScrcpyOptions1_15 {
-    constructor(init: ScrcpyOptions1_15.Init, version = "1.15.1") {
-        super(init, version);
+    constructor(init: ScrcpyOptions1_15.Init) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions1_15Impl as ScrcpyOptions1_15_1Impl } from "./1_15/index.js";
+export namespace ScrcpyOptions1_15_1 {
+    export type Init = ScrcpyOptions1_15.Init;
+}

package/src/1_16.ts

@@ -1,9 +1,11 @@
 import { ScrcpyOptions1_15 } from "./1_15/index.js";
 
 export class ScrcpyOptions1_16 extends ScrcpyOptions1_15 {
-    constructor(init: ScrcpyOptions1_15.Init, version = "1.16") {
-        super(init, version);
+    constructor(init: ScrcpyOptions1_15.Init) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions1_15Impl as ScrcpyOptions1_16Impl } from "./1_15/index.js";
+export namespace ScrcpyOptions1_16 {
+    export type Init = ScrcpyOptions1_15.Init;
+}

package/src/1_17/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_17Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_17/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -37,11 +38,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_17 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_17
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -53,9 +54,8 @@ export class ScrcpyOptions1_17 implements ScrcpyOptions<Init> {
         return this.#clipboard;
     }
 
-    constructor(init: Init, version = "1.17") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control) {
             this.#clipboard = new ClipboardStream();
@@ -90,7 +90,7 @@ export class ScrcpyOptions1_17 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard!.parse(id, stream)) {
             return;

package/src/1_18/impl/back-or-screen-on.ts

@@ -1,19 +1,15 @@
 import type { StructInit } from "@yume-chan/struct";
-import { struct, u8 } from "@yume-chan/struct";
+import { extend, u8 } from "@yume-chan/struct";
 
 import type { AndroidKeyEventAction } from "../../android/index.js";
 import type { ScrcpyBackOrScreenOnControlMessage } from "../../latest.js";
 
 import { PrevImpl } from "./prev.js";
 
-export const BackOrScreenOnControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            ...PrevImpl.BackOrScreenOnControlMessage.fields,
-            action: u8<AndroidKeyEventAction>(),
-        },
-        { littleEndian: false },
-    ))();
+export const BackOrScreenOnControlMessage = extend(
+    PrevImpl.BackOrScreenOnControlMessage,
+    { action: u8<AndroidKeyEventAction>() },
+);
 
 export type BackOrScreenOnControlMessage = StructInit<
     typeof BackOrScreenOnControlMessage

package/src/1_18/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_18Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_18/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -37,11 +38,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_18 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_18
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -53,9 +54,8 @@ export class ScrcpyOptions1_18 implements ScrcpyOptions<Init> {
         return this.#clipboard;
     }
 
-    constructor(init: Init, version = "1.18") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control) {
             this.#clipboard = new ClipboardStream();
@@ -90,7 +90,7 @@ export class ScrcpyOptions1_18 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard!.parse(id, stream)) {
             return;

package/src/1_19.ts

@@ -1,9 +1,11 @@
 import { ScrcpyOptions1_18 } from "./1_18/index.js";
 
 export class ScrcpyOptions1_19 extends ScrcpyOptions1_18 {
-    constructor(init: ScrcpyOptions1_18.Init, version = "1.19") {
-        super(init, version);
+    constructor(init: ScrcpyOptions1_18.Init) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions1_18Impl as ScrcpyOptions1_19Impl } from "./1_18/index.js";
+export namespace ScrcpyOptions1_19 {
+    export type Init = ScrcpyOptions1_18.Init;
+}

package/src/1_20.ts

@@ -1,9 +1,11 @@
 import { ScrcpyOptions1_18 } from "./1_18/index.js";
 
 export class ScrcpyOptions1_20 extends ScrcpyOptions1_18 {
-    constructor(init: ScrcpyOptions1_18.Init, version = "1.20") {
-        super(init, version);
+    constructor(init: ScrcpyOptions1_18.Init) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions1_18Impl as ScrcpyOptions1_20Impl } from "./1_18/index.js";
+export namespace ScrcpyOptions1_20 {
+    export type Init = ScrcpyOptions1_18.Init;
+}

package/src/1_21/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_21Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_21/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -36,11 +37,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_21 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_21
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -54,9 +55,8 @@ export class ScrcpyOptions1_21 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "1.21") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -92,7 +92,7 @@ export class ScrcpyOptions1_21 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;

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

@@ -1,19 +1,15 @@
 import type { StructInit } from "@yume-chan/struct";
-import { s32, struct } from "@yume-chan/struct";
+import { extend, s32 } from "@yume-chan/struct";
 
 import type { ScrcpyScrollController } from "../../base/index.js";
 import type { ScrcpyInjectScrollControlMessage } from "../../latest.js";
 
 import { PrevImpl } from "./prev.js";
 
-export const InjectScrollControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            ...PrevImpl.InjectScrollControlMessage.fields,
-            buttons: s32,
-        },
-        { littleEndian: false },
-    ))();
+export const InjectScrollControlMessage = extend(
+    PrevImpl.InjectScrollControlMessage,
+    { buttons: s32 },
+);
 
 export type InjectScrollControlMessage = StructInit<
     typeof InjectScrollControlMessage

package/src/1_22/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_22Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_22/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -36,11 +37,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_22 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_22
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -54,9 +55,8 @@ export class ScrcpyOptions1_22 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "1.22") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -92,7 +92,7 @@ export class ScrcpyOptions1_22 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;

package/src/1_23/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_23Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_23/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -36,11 +37,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_23 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_23
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -54,9 +55,8 @@ export class ScrcpyOptions1_23 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "1.23") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -92,7 +92,7 @@ export class ScrcpyOptions1_23 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;

package/src/1_24/index.ts

@@ -1,2 +1 @@
-export * as ScrcpyOptions1_24Impl from "./impl/index.js";
 export * from "./options.js";

package/src/1_24/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyControlMessageType,
@@ -8,6 +8,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -36,11 +37,11 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions1_24 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_24
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -54,9 +55,8 @@ export class ScrcpyOptions1_24 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "1.24") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -92,7 +92,7 @@ export class ScrcpyOptions1_24 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;