@yume-chan/scrcpy 1.0.0 → 2.0.0

package/src/1_15/impl/init.ts

@@ -89,6 +89,24 @@ export namespace CodecOptions {
     export type Init = CodecOptionsInit;
 }
 
+export class Crop implements ScrcpyOptionValue {
+    width: number;
+    height: number;
+    x: number;
+    y: number;
+
+    constructor(width: number, height: number, x: number, y: number) {
+        this.width = width;
+        this.height = height;
+        this.x = x;
+        this.y = y;
+    }
+
+    toOptionValue(): string | undefined {
+        return `${this.width}:${this.height}:${this.x}:${this.y}`;
+    }
+}
+
 export interface Init {
     logLevel?: LogLevel;
 
@@ -124,7 +142,7 @@ export interface Init {
      */
     tunnelForward?: boolean;
 
-    crop?: string | undefined;
+    crop?: Crop | string | undefined;
 
     /**
      * Send PTS so that the client may record properly
@@ -150,5 +168,5 @@ export interface Init {
 
     stayAwake?: boolean;
 
-    codecOptions?: CodecOptions;
+    codecOptions?: CodecOptions | string | undefined;
 }

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,
@@ -75,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

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

package/src/1_16.ts

@@ -1,4 +1,11 @@
-export {
-    ScrcpyOptions1_15 as ScrcpyOptions1_16,
-    ScrcpyOptions1_15Impl as ScrcpyOptions1_16Impl,
-} from "./1_15/index.js";
+import { ScrcpyOptions1_15 } from "./1_15/index.js";
+
+export class ScrcpyOptions1_16 extends ScrcpyOptions1_15 {
+    constructor(init: ScrcpyOptions1_15.Init) {
+        super(init);
+    }
+}
+
+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,7 +38,9 @@ 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 value: Required<Init>;
@@ -87,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,7 +38,9 @@ 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 value: Required<Init>;
@@ -87,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,4 +1,11 @@
-export {
-    ScrcpyOptions1_18 as ScrcpyOptions1_19,
-    ScrcpyOptions1_18Impl as ScrcpyOptions1_19Impl,
-} from "./1_18/index.js";
+import { ScrcpyOptions1_18 } from "./1_18/index.js";
+
+export class ScrcpyOptions1_19 extends ScrcpyOptions1_18 {
+    constructor(init: ScrcpyOptions1_18.Init) {
+        super(init);
+    }
+}
+
+export namespace ScrcpyOptions1_19 {
+    export type Init = ScrcpyOptions1_18.Init;
+}

package/src/1_20.ts

@@ -1,4 +1,11 @@
-export {
-    ScrcpyOptions1_18 as ScrcpyOptions1_20,
-    ScrcpyOptions1_18Impl as ScrcpyOptions1_20Impl,
-} from "./1_18/index.js";
+import { ScrcpyOptions1_18 } from "./1_18/index.js";
+
+export class ScrcpyOptions1_20 extends ScrcpyOptions1_18 {
+    constructor(init: ScrcpyOptions1_18.Init) {
+        super(init);
+    }
+}
+
+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,7 +37,9 @@ 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 value: Required<Init>;
@@ -89,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/index.ts

@@ -3,6 +3,7 @@ export { Defaults } from "./defaults.js";
 export type { Init } from "./init.js";
 export { parseVideoStreamMetadata } from "./parse-video-stream-metadata.js";
 export {
+    createScrollController,
     InjectScrollControlMessage,
     ScrollController,
 } from "./scroll-controller.js";

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

@@ -1,18 +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
@@ -30,3 +27,7 @@ export class ScrollController extends PrevImpl.ScrollController {
         return InjectScrollControlMessage.serialize(processed);
     }
 }
+
+export function createScrollController(): ScrcpyScrollController {
+    return new ScrollController();
+}

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,7 +37,9 @@ 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 value: Required<Init>;
@@ -89,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,7 +37,9 @@ 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 value: Required<Init>;
@@ -89,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,7 +37,9 @@ 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 value: Required<Init>;
@@ -89,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/index.ts

@@ -1,5 +1,6 @@
 export * from "../../1_24/impl/index.js";
 export {
+    createScrollController,
     InjectScrollControlMessage,
     ScrollController,
     SignedFloat,

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 { ScrcpyControlMessageType } from "../../base/index.js";
 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,
@@ -49,3 +50,7 @@ export class ScrollController implements ScrcpyScrollController {
         return InjectScrollControlMessage.serialize(message);
     }
 }
+
+export function createScrollController(): ScrcpyScrollController {
+    return new ScrollController();
+}

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,7 +37,9 @@ 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 value: Required<Init>;
@@ -89,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/defaults.ts

@@ -1,23 +1,22 @@
 import { omit } from "../../utils/index.js";
 
 import type { Init } from "./init.js";
-import { InstanceId } from "./init.js";
 import { PrevImpl } from "./prev.js";
 
 export const Defaults = /* #__PURE__ */ (() =>
     ({
         ...omit(PrevImpl.Defaults, "bitRate", "codecOptions", "encoderName"),
-        scid: InstanceId.NONE,
+        scid: undefined,
 
         videoCodec: "h264",
         videoBitRate: 8000000,
-        videoCodecOptions: PrevImpl.CodecOptions.Empty,
+        videoCodecOptions: undefined,
         videoEncoder: undefined,
 
         audio: true,
         audioCodec: "opus",
         audioBitRate: 128000,
-        audioCodecOptions: PrevImpl.CodecOptions.Empty,
+        audioCodecOptions: undefined,
         audioEncoder: undefined,
 
         listEncoders: false,

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

@@ -26,17 +26,17 @@ export class InstanceId implements ScrcpyOptionValue {
 
 export interface Init
     extends Omit<PrevImpl.Init, "bitRate" | "codecOptions" | "encoderName"> {
-    scid?: InstanceId;
+    scid?: InstanceId | string | undefined;
 
     videoCodec?: "h264" | "h265" | "av1";
     videoBitRate?: number;
-    videoCodecOptions?: PrevImpl.CodecOptions;
+    videoCodecOptions?: PrevImpl.CodecOptions | string | undefined;
     videoEncoder?: string | undefined;
 
     audio?: boolean;
     audioCodec?: "raw" | "opus" | "aac";
     audioBitRate?: number;
-    audioCodecOptions?: PrevImpl.CodecOptions;
+    audioCodecOptions?: PrevImpl.CodecOptions | string | undefined;
     audioEncoder?: string | undefined;
 
     listEncoders?: boolean;

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,