@yume-chan/scrcpy 1.1.0 → 2.0.1

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;

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

@@ -1,27 +1,28 @@
 import { getInt16, setInt16 } from "@yume-chan/no-data-view";
 import type { Field, StructInit } from "@yume-chan/struct";
-import { bipedal, struct, u16, u32, u8 } from "@yume-chan/struct";
+import { field, struct, u16, u32, u8 } from "@yume-chan/struct";
 
 import type { ScrcpyScrollController } from "../../base/index.js";
 import { ScrcpyControlMessageType } from "../../base/index.js";
 import type { ScrcpyInjectScrollControlMessage } from "../../latest.js";
 import { clamp } from "../../utils/index.js";
 
-export const SignedFloat: Field<number, never, never> = {
-    size: 2,
-    serialize(value, { buffer, index, littleEndian }) {
+export const SignedFloat: Field<number, never, never> = field(
+    2,
+    "byob",
+    (value, { buffer, index, littleEndian }) => {
         // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/app/src/util/binary.h#L51
         value = clamp(value, -1, 1);
         value = value === 1 ? 0x7fff : value * 0x8000;
         setInt16(buffer, index, value, littleEndian);
     },
-    deserialize: bipedal(function* (then, { reader, littleEndian }) {
+    function* (then, reader, { littleEndian }) {
         const data = yield* then(reader.readExactly(2));
         const value = getInt16(data, 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;
-    }),
-};
+    },
+);
 
 export const InjectScrollControlMessage = /* #__PURE__ */ (() =>
     struct(
@@ -29,8 +30,8 @@ export const InjectScrollControlMessage = /* #__PURE__ */ (() =>
             type: u8(ScrcpyControlMessageType.InjectScroll),
             pointerX: u32,
             pointerY: u32,
-            screenWidth: u16,
-            screenHeight: u16,
+            videoWidth: u16,
+            videoHeight: u16,
             scrollX: SignedFloat,
             scrollY: SignedFloat,
             buttons: u32,

package/src/1_25/index.ts

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

package/src/1_25/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_25 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions1_25
+    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_25 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "1.25") {
+    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_25 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;

package/src/2_0/impl/inject-touch.ts

@@ -15,8 +15,8 @@ export const InjectTouchControlMessage = /* #__PURE__ */ (() =>
             pointerId: u64,
             pointerX: u32,
             pointerY: u32,
-            screenWidth: u16,
-            screenHeight: u16,
+            videoWidth: u16,
+            videoHeight: u16,
             pressure: PrevImpl.UnsignedFloat,
             actionButton: u32,
             buttons: u32,

package/src/2_0/impl/parse-audio-stream-metadata.ts

@@ -11,7 +11,7 @@ import { ScrcpyAudioCodec } from "../../base/index.js";
 
 export async function parseAudioStreamMetadata(
     stream: ReadableStream<Uint8Array>,
-    options: Pick<Required<Init>, "sendCodecMeta" | "audioCodec">,
+    options: Pick<Required<Init<boolean>>, "sendCodecMeta" | "audioCodec">,
 ): Promise<ScrcpyAudioStreamMetadata> {
     const buffered = new BufferedReadableStream(stream);
 

package/src/2_0/index.ts

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

package/src/2_0/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 {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,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 ScrcpyOptions2_0 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_0
+    implements ScrcpyOptions<Init>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
     readonly value: Required<Init>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
@@ -55,9 +56,8 @@ export class ScrcpyOptions2_0 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "2.0") {
+    constructor(init: Init) {
         this.value = { ...Defaults, ...init };
-        this.version = version;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -99,7 +99,7 @@ export class ScrcpyOptions2_0 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;

package/src/2_1/impl/defaults.ts

@@ -6,4 +6,4 @@ export const Defaults = /* #__PURE__ */ (() =>
         ...PrevImpl.Defaults,
         video: true,
         audioSource: "output",
-    }) as const satisfies Required<Init>)();
+    }) as const satisfies Required<Init<true>>)();

package/src/2_1/impl/init.ts

@@ -1,6 +1,6 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends PrevImpl.Init {
-    video?: boolean;
+export interface Init<TVideo extends boolean> extends PrevImpl.Init {
+    video?: TVideo;
     audioSource?: "output" | "mic";
 }

package/src/2_1/index.ts

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

package/src/2_1/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 {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -37,12 +38,12 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_1 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_1<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -55,9 +56,8 @@ export class ScrcpyOptions2_1 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "2.1") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.control && this.value.clipboardAutosync) {
             this.#clipboard = new ClipboardStream();
@@ -66,7 +66,7 @@ export class ScrcpyOptions2_1 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -99,7 +99,7 @@ export class ScrcpyOptions2_1 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -154,8 +154,8 @@ export class ScrcpyOptions2_1 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_1 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/2_1_1.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions2_1 } from "./2_1/index.js";
 
-export class ScrcpyOptions2_1_1 extends ScrcpyOptions2_1 {
-    constructor(init: ScrcpyOptions2_1.Init, version = "2.1.1") {
-        super(init, version);
+export class ScrcpyOptions2_1_1<
+    TVideo extends boolean,
+> extends ScrcpyOptions2_1<TVideo> {
+    constructor(init: ScrcpyOptions2_1.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions2_1Impl as ScrcpyOptions2_1_1Impl } from "./2_1/index.js";
+export namespace ScrcpyOptions2_1_1 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_1.Init<TVideo>;
+}

package/src/2_2/impl/defaults.ts

@@ -14,4 +14,4 @@ export const Defaults = /* #__PURE__ */ (() =>
         cameraHighSpeed: false,
         listCameras: false,
         listCameraSizes: false,
-    }) as const satisfies Required<Init>)();
+    }) as const satisfies Required<Init<true>>)();

package/src/2_2/impl/init.ts

@@ -1,6 +1,6 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends PrevImpl.Init {
+export interface Init<TVideo extends boolean> extends PrevImpl.Init<TVideo> {
     videoSource?: "display" | "camera";
     cameraId?: string | undefined;
     cameraSize?: string | undefined;

package/src/2_2/index.ts

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

package/src/2_2/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 {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -37,12 +38,12 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_2 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_2<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -55,9 +56,8 @@ export class ScrcpyOptions2_2 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "v2.2") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -70,7 +70,7 @@ export class ScrcpyOptions2_2 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -103,7 +103,7 @@ export class ScrcpyOptions2_2 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -158,8 +158,8 @@ export class ScrcpyOptions2_2 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_2 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/2_3/impl/init.ts

@@ -1,5 +1,6 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends Omit<PrevImpl.Init, "audioCodec"> {
-    audioCodec?: PrevImpl.Init["audioCodec"] | "flac";
+export interface Init<TVideo extends boolean>
+    extends Omit<PrevImpl.Init<TVideo>, "audioCodec"> {
+    audioCodec?: PrevImpl.Init<TVideo>["audioCodec"] | "flac";
 }

package/src/2_3/index.ts

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

package/src/2_3/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 {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -37,12 +38,12 @@ import {
     setListEncoders,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_3 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_3<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -55,9 +56,8 @@ export class ScrcpyOptions2_3 implements ScrcpyOptions<Init> {
 
     #ackClipboardHandler: AckClipboardHandler | undefined;
 
-    constructor(init: Init, version = "2.3") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -70,7 +70,7 @@ export class ScrcpyOptions2_3 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -103,7 +103,7 @@ export class ScrcpyOptions2_3 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -158,8 +158,8 @@ export class ScrcpyOptions2_3 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_3 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/2_3_1.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions2_3 } from "./2_3/index.js";
 
-export class ScrcpyOptions2_3_1 extends ScrcpyOptions2_3 {
-    constructor(init: ScrcpyOptions2_3.Init, version = "2.3.1") {
-        super(init, version);
+export class ScrcpyOptions2_3_1<
+    TVideo extends boolean,
+> extends ScrcpyOptions2_3<TVideo> {
+    constructor(init: ScrcpyOptions2_3.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions2_3Impl as ScrcpyOptions2_3_1Impl } from "./2_3/index.js";
+export namespace ScrcpyOptions2_3_1 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_3.Init<TVideo>;
+}

package/src/2_4/index.ts

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

package/src/2_4/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 {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -41,12 +42,12 @@ import {
     UHidOutputStream,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_4 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_4<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -66,9 +67,8 @@ export class ScrcpyOptions2_4 implements ScrcpyOptions<Init> {
         return this.#uHidOutput;
     }
 
-    constructor(init: Init, version = "2.4") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -85,7 +85,7 @@ export class ScrcpyOptions2_4 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -118,7 +118,7 @@ export class ScrcpyOptions2_4 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -185,8 +185,8 @@ export class ScrcpyOptions2_4 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_4 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/2_5.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions2_4 } from "./2_4/index.js";
 
-export class ScrcpyOptions2_5 extends ScrcpyOptions2_4 {
-    constructor(init: ScrcpyOptions2_4.Init, version = "2.5") {
-        super(init, version);
+export class ScrcpyOptions2_5<
+    TVideo extends boolean,
+> extends ScrcpyOptions2_4<TVideo> {
+    constructor(init: ScrcpyOptions2_4.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions2_4Impl as ScrcpyOptions2_5Impl } from "./2_4/index.js";
+export namespace ScrcpyOptions2_5 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_4.Init<TVideo>;
+}

package/src/2_6/impl/defaults.ts

@@ -5,4 +5,4 @@ export const Defaults = /* #__PURE__ */ (() =>
     ({
         ...PrevImpl.Defaults,
         audioDup: false,
-    }) as const satisfies Required<Init>)();
+    }) as const satisfies Required<Init<true>>)();

package/src/2_6/impl/init.ts

@@ -1,6 +1,7 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends Omit<PrevImpl.Init, "audioSource"> {
-    audioSource?: PrevImpl.Init["audioSource"] | "playback";
+export interface Init<TVideo extends boolean>
+    extends Omit<PrevImpl.Init<TVideo>, "audioSource"> {
+    audioSource?: PrevImpl.Init<TVideo>["audioSource"] | "playback";
     audioDup?: boolean;
 }

package/src/2_6/index.ts

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