@yume-chan/scrcpy 0.0.19 → 0.0.20

package/esm/control/inject-touch.d.ts

@@ -1,5 +1,4 @@
-import Struct, { NumberFieldType } from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
+import type { ScrcpyInjectTouchControlMessage2_0 } from "../options/index.js";
 export declare enum AndroidMotionEventAction {
     Down = 0,
     Up = 1,
@@ -15,24 +14,20 @@ export declare enum AndroidMotionEventAction {
     ButtonPress = 11,
     ButtonRelease = 12
 }
+export declare enum AndroidMotionEventButton {
+    Primary = 1,
+    Secondary = 2,
+    Tertiary = 4,
+    Back = 8,
+    Forward = 16,
+    StylusPrimary = 32,
+    StylusSecondary = 64
+}
 export declare namespace ScrcpyPointerId {
-    const Mouse: bigint;
-    const Finger: bigint;
-    const VirtualMouse: bigint;
-    const VirtualFinger: bigint;
+    const Mouse = -1n;
+    const Finger = -2n;
+    const VirtualMouse = -3n;
+    const VirtualFinger = -4n;
 }
-export declare function clamp(value: number, min: number, max: number): number;
-export declare const ScrcpyFloatToUint16NumberType: NumberFieldType;
-export declare const ScrcpyInjectTouchControlMessage: Struct<{
-    type: ScrcpyControlMessageType.InjectTouch;
-    action: AndroidMotionEventAction;
-    pointerId: bigint;
-    pointerX: number;
-    pointerY: number;
-    screenWidth: number;
-    screenHeight: number;
-    pressure: number;
-    buttons: number;
-}, never, Record<never, never>, undefined>;
-export type ScrcpyInjectTouchControlMessage = (typeof ScrcpyInjectTouchControlMessage)["TInit"];
+export type ScrcpyInjectTouchControlMessage = ScrcpyInjectTouchControlMessage2_0;
 //# sourceMappingURL=inject-touch.d.ts.map

package/esm/control/inject-touch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inject-touch.d.ts","sourceRoot":"","sources":["../../src/control/inject-touch.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAEX,eAAe,EAElB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAGrD,oBAAY,wBAAwB;IAChC,IAAI,IAAA;IACJ,EAAE,IAAA;IACF,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,WAAW,IAAA;IACX,SAAS,IAAA;IACT,SAAS,IAAA;IACT,MAAM,IAAA;IACN,UAAU,IAAA;IACV,SAAS,KAAA;IACT,WAAW,KAAA;IACX,aAAa,KAAA;CAChB;AAGD,yBAAiB,eAAe,CAAC;IACtB,MAAM,KAAK,QAAa,CAAC;IACzB,MAAM,MAAM,QAAa,CAAC;IAC1B,MAAM,YAAY,QAAa,CAAC;IAChC,MAAM,aAAa,QAAa,CAAC;CAC3C;AAED,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAUrE;AAED,eAAO,MAAM,6BAA6B,EAAE,eAc3C,CAAC;AAMF,eAAO,MAAM,+BAA+B;;;;;;;;;;0CAStB,CAAC;AAEvB,MAAM,MAAM,+BAA+B,GACvC,CAAC,OAAO,+BAA+B,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"inject-touch.d.ts","sourceRoot":"","sources":["../../src/control/inject-touch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kCAAkC,EAAE,MAAM,qBAAqB,CAAC;AAG9E,oBAAY,wBAAwB;IAChC,IAAI,IAAA;IACJ,EAAE,IAAA;IACF,IAAI,IAAA;IACJ,MAAM,IAAA;IACN,OAAO,IAAA;IACP,WAAW,IAAA;IACX,SAAS,IAAA;IACT,SAAS,IAAA;IACT,MAAM,IAAA;IACN,UAAU,IAAA;IACV,SAAS,KAAA;IACT,WAAW,KAAA;IACX,aAAa,KAAA;CAChB;AAED,oBAAY,wBAAwB;IAChC,OAAO,IAAO;IACd,SAAS,IAAO;IAChB,QAAQ,IAAO;IACf,IAAI,IAAO;IACX,OAAO,KAAO;IACd,aAAa,KAAO;IACpB,eAAe,KAAO;CACzB;AAGD,yBAAiB,eAAe,CAAC;IACtB,MAAM,KAAK,MAAM,CAAC;IAClB,MAAM,MAAM,MAAM,CAAC;IACnB,MAAM,YAAY,MAAM,CAAC;IACzB,MAAM,aAAa,MAAM,CAAC;CACpC;AAED,MAAM,MAAM,+BAA+B,GACvC,kCAAkC,CAAC"}

package/esm/control/inject-touch.js

@@ -1,5 +1,3 @@
-import Struct, { NumberFieldDefinition, NumberFieldType, placeholder, } from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
 // https://developer.android.com/reference/android/view/MotionEvent#constants_1
 export var AndroidMotionEventAction;
 (function (AndroidMotionEventAction) {
@@ -17,47 +15,22 @@ export var AndroidMotionEventAction;
     AndroidMotionEventAction[AndroidMotionEventAction["ButtonPress"] = 11] = "ButtonPress";
     AndroidMotionEventAction[AndroidMotionEventAction["ButtonRelease"] = 12] = "ButtonRelease";
 })(AndroidMotionEventAction = AndroidMotionEventAction || (AndroidMotionEventAction = {}));
+export var AndroidMotionEventButton;
+(function (AndroidMotionEventButton) {
+    AndroidMotionEventButton[AndroidMotionEventButton["Primary"] = 1] = "Primary";
+    AndroidMotionEventButton[AndroidMotionEventButton["Secondary"] = 2] = "Secondary";
+    AndroidMotionEventButton[AndroidMotionEventButton["Tertiary"] = 4] = "Tertiary";
+    AndroidMotionEventButton[AndroidMotionEventButton["Back"] = 8] = "Back";
+    AndroidMotionEventButton[AndroidMotionEventButton["Forward"] = 16] = "Forward";
+    AndroidMotionEventButton[AndroidMotionEventButton["StylusPrimary"] = 32] = "StylusPrimary";
+    AndroidMotionEventButton[AndroidMotionEventButton["StylusSecondary"] = 64] = "StylusSecondary";
+})(AndroidMotionEventButton = AndroidMotionEventButton || (AndroidMotionEventButton = {}));
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export var ScrcpyPointerId;
 (function (ScrcpyPointerId) {
-    ScrcpyPointerId.Mouse = BigInt(-1);
-    ScrcpyPointerId.Finger = BigInt(-2);
-    ScrcpyPointerId.VirtualMouse = BigInt(-3);
-    ScrcpyPointerId.VirtualFinger = BigInt(-4);
+    ScrcpyPointerId.Mouse = -1n;
+    ScrcpyPointerId.Finger = -2n;
+    ScrcpyPointerId.VirtualMouse = -3n;
+    ScrcpyPointerId.VirtualFinger = -4n;
 })(ScrcpyPointerId = ScrcpyPointerId || (ScrcpyPointerId = {}));
-export function clamp(value, min, max) {
-    if (value < min) {
-        return min;
-    }
-    if (value > max) {
-        return max;
-    }
-    return value;
-}
-export const ScrcpyFloatToUint16NumberType = {
-    size: 2,
-    signed: false,
-    deserialize(array, littleEndian) {
-        const value = NumberFieldType.Uint16.deserialize(array, littleEndian);
-        // https://github.com/Genymobile/scrcpy/blob/1f138aef41de651668043b32c4effc2d4adbfc44/server/src/main/java/com/genymobile/scrcpy/Binary.java#L22
-        return value === 0xffff ? 1 : value / 0x10000;
-    },
-    serialize(dataView, offset, value, 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;
-        NumberFieldType.Uint16.serialize(dataView, offset, value, littleEndian);
-    },
-};
-const ScrcpyFloatToUint16FieldDefinition = new NumberFieldDefinition(ScrcpyFloatToUint16NumberType);
-export const ScrcpyInjectTouchControlMessage = new Struct()
-    .uint8("type", ScrcpyControlMessageType.InjectTouch)
-    .uint8("action", placeholder())
-    .uint64("pointerId")
-    .uint32("pointerX")
-    .uint32("pointerY")
-    .uint16("screenWidth")
-    .uint16("screenHeight")
-    .field("pressure", ScrcpyFloatToUint16FieldDefinition)
-    .uint32("buttons");
 //# sourceMappingURL=inject-touch.js.map

package/esm/control/inject-touch.js.map

@@ -1 +1 @@
-{"version":3,"file":"inject-touch.js","sourceRoot":"","sources":["../../src/control/inject-touch.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EACX,qBAAqB,EACrB,eAAe,EACf,WAAW,GACd,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,+EAA+E;AAC/E,MAAM,CAAN,IAAY,wBAcX;AAdD,WAAY,wBAAwB;IAChC,uEAAI,CAAA;IACJ,mEAAE,CAAA;IACF,uEAAI,CAAA;IACJ,2EAAM,CAAA;IACN,6EAAO,CAAA;IACP,qFAAW,CAAA;IACX,iFAAS,CAAA;IACT,iFAAS,CAAA;IACT,2EAAM,CAAA;IACN,mFAAU,CAAA;IACV,kFAAS,CAAA;IACT,sFAAW,CAAA;IACX,0FAAa,CAAA;AACjB,CAAC,EAdW,wBAAwB,GAAxB,wBAAwB,KAAxB,wBAAwB,QAcnC;AAED,2DAA2D;AAC3D,MAAM,KAAW,eAAe,CAK/B;AALD,WAAiB,eAAe;IACf,qBAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACnB,sBAAM,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACpB,4BAAY,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1B,6BAAa,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5C,CAAC,EALgB,eAAe,GAAf,eAAe,KAAf,eAAe,QAK/B;AAED,MAAM,UAAU,KAAK,CAAC,KAAa,EAAE,GAAW,EAAE,GAAW;IACzD,IAAI,KAAK,GAAG,GAAG,EAAE;QACb,OAAO,GAAG,CAAC;KACd;IAED,IAAI,KAAK,GAAG,GAAG,EAAE;QACb,OAAO,GAAG,CAAC;KACd;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAoB;IAC1D,IAAI,EAAE,CAAC;IACP,MAAM,EAAE,KAAK;IACb,WAAW,CAAC,KAAK,EAAE,YAAY;QAC3B,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACtE,gJAAgJ;QAChJ,OAAO,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;IAClD,CAAC;IACD,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY;QAC3C,+GAA+G;QAC/G,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5B,KAAK,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,OAAO,CAAC;QAC/C,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;IAC5E,CAAC;CACJ,CAAC;AAEF,MAAM,kCAAkC,GAAG,IAAI,qBAAqB,CAChE,6BAA6B,CAChC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,MAAM,EAAE;KACtD,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,WAAoB,CAAC;KAC5D,KAAK,CAAC,QAAQ,EAAE,WAAW,EAA4B,CAAC;KACxD,MAAM,CAAC,WAAW,CAAC;KACnB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,UAAU,CAAC;KAClB,MAAM,CAAC,aAAa,CAAC;KACrB,MAAM,CAAC,cAAc,CAAC;KACtB,KAAK,CAAC,UAAU,EAAE,kCAAkC,CAAC;KACrD,MAAM,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"inject-touch.js","sourceRoot":"","sources":["../../src/control/inject-touch.ts"],"names":[],"mappings":"AAEA,+EAA+E;AAC/E,MAAM,CAAN,IAAY,wBAcX;AAdD,WAAY,wBAAwB;IAChC,uEAAI,CAAA;IACJ,mEAAE,CAAA;IACF,uEAAI,CAAA;IACJ,2EAAM,CAAA;IACN,6EAAO,CAAA;IACP,qFAAW,CAAA;IACX,iFAAS,CAAA;IACT,iFAAS,CAAA;IACT,2EAAM,CAAA;IACN,mFAAU,CAAA;IACV,kFAAS,CAAA;IACT,sFAAW,CAAA;IACX,0FAAa,CAAA;AACjB,CAAC,EAdW,wBAAwB,GAAxB,wBAAwB,KAAxB,wBAAwB,QAcnC;AAED,MAAM,CAAN,IAAY,wBAQX;AARD,WAAY,wBAAwB;IAChC,6EAAc,CAAA;IACd,iFAAgB,CAAA;IAChB,+EAAe,CAAA;IACf,uEAAW,CAAA;IACX,8EAAc,CAAA;IACd,0FAAoB,CAAA;IACpB,8FAAsB,CAAA;AAC1B,CAAC,EARW,wBAAwB,GAAxB,wBAAwB,KAAxB,wBAAwB,QAQnC;AAED,2DAA2D;AAC3D,MAAM,KAAW,eAAe,CAK/B;AALD,WAAiB,eAAe;IACf,qBAAK,GAAG,CAAC,EAAE,CAAC;IACZ,sBAAM,GAAG,CAAC,EAAE,CAAC;IACb,4BAAY,GAAG,CAAC,EAAE,CAAC;IACnB,6BAAa,GAAG,CAAC,EAAE,CAAC;AACrC,CAAC,EALgB,eAAe,GAAf,eAAe,KAAf,eAAe,QAK/B"}

package/esm/control/rotate-device.d.ts

@@ -1,7 +1,5 @@
-import Struct from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
-export declare const ScrcpyRotateDeviceControlMessage: Struct<{
-    type: ScrcpyControlMessageType.RotateDevice;
+export declare const ScrcpyRotateDeviceControlMessage: import("@yume-chan/struct").default<{
+    type: number;
 }, never, Record<never, never>, undefined>;
 export type ScrcpyRotateDeviceControlMessage = (typeof ScrcpyRotateDeviceControlMessage)["TInit"];
 //# sourceMappingURL=rotate-device.d.ts.map

package/esm/control/rotate-device.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rotate-device.d.ts","sourceRoot":"","sources":["../../src/control/rotate-device.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,eAAO,MAAM,gCAAgC;;0CAG5C,CAAC;AAEF,MAAM,MAAM,gCAAgC,GACxC,CAAC,OAAO,gCAAgC,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"rotate-device.d.ts","sourceRoot":"","sources":["../../src/control/rotate-device.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,gCAAgC;;0CAAsB,CAAC;AAEpE,MAAM,MAAM,gCAAgC,GACxC,CAAC,OAAO,gCAAgC,CAAC,CAAC,OAAO,CAAC,CAAC"}

package/esm/control/rotate-device.js

@@ -1,4 +1,3 @@
-import Struct from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
-export const ScrcpyRotateDeviceControlMessage = new Struct().uint8("type", ScrcpyControlMessageType.RotateDevice);
+import { BasicControlMessage } from "./basic.js";
+export const ScrcpyRotateDeviceControlMessage = BasicControlMessage;
 //# sourceMappingURL=rotate-device.js.map

package/esm/control/rotate-device.js.map

@@ -1 +1 @@
-{"version":3,"file":"rotate-device.js","sourceRoot":"","sources":["../../src/control/rotate-device.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,MAAM,CAAC,MAAM,gCAAgC,GAAG,IAAI,MAAM,EAAE,CAAC,KAAK,CAC9D,MAAM,EACN,wBAAwB,CAAC,YAAqB,CACjD,CAAC"}
+{"version":3,"file":"rotate-device.js","sourceRoot":"","sources":["../../src/control/rotate-device.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,MAAM,CAAC,MAAM,gCAAgC,GAAG,mBAAmB,CAAC"}

package/esm/control/serializer.d.ts

@@ -1,36 +1,26 @@
-import type { Consumable, WritableStream } from "@yume-chan/stream-extra";
-import type { ScrcpyOptions, ScrcpyOptionsInit1_16 } from "../options/index.js";
+import type { ScrcpyOptions } from "../options/index.js";
 import type { AndroidKeyEventAction } from "./inject-keycode.js";
 import { ScrcpyInjectKeyCodeControlMessage } from "./inject-keycode.js";
 import type { ScrcpyInjectScrollControlMessage } from "./inject-scroll.js";
-import { ScrcpyInjectTouchControlMessage } from "./inject-touch.js";
+import type { ScrcpyInjectTouchControlMessage } from "./inject-touch.js";
 import type { AndroidScreenPowerMode } from "./set-screen-power-mode.js";
-import { ScrcpyControlMessageType } from "./type.js";
 export declare class ScrcpyControlMessageSerializer {
-    private options;
-    /** Control message type values for current version of server */
-    private types;
-    private writer;
-    private scrollController;
-    constructor(stream: WritableStream<Consumable<Uint8Array>>, options: ScrcpyOptions<ScrcpyOptionsInit1_16>);
-    getActualMessageType(type: ScrcpyControlMessageType): number;
-    addMessageType<T extends {
-        type: ScrcpyControlMessageType;
-    }>(message: Omit<T, "type">, type: T["type"]): T;
-    private write;
-    injectKeyCode(message: Omit<ScrcpyInjectKeyCodeControlMessage, "type">): Promise<void>;
-    injectText(text: string): Promise<void>;
+    private _options;
+    private _typeValues;
+    private _scrollController;
+    constructor(options: ScrcpyOptions<object>);
+    injectKeyCode(message: Omit<ScrcpyInjectKeyCodeControlMessage, "type">): Uint8Array;
+    injectText(text: string): Uint8Array;
     /**
      * `pressure` is a float value between 0 and 1.
      */
-    injectTouch(message: Omit<ScrcpyInjectTouchControlMessage, "type">): Promise<void>;
+    injectTouch(message: Omit<ScrcpyInjectTouchControlMessage, "type">): Uint8Array;
     /**
      * `scrollX` and `scrollY` are float values between 0 and 1.
      */
-    injectScroll(message: Omit<ScrcpyInjectScrollControlMessage, "type">): Promise<void> | undefined;
-    backOrScreenOn(action: AndroidKeyEventAction): Promise<void>;
-    setScreenPowerMode(mode: AndroidScreenPowerMode): Promise<void>;
-    rotateDevice(): Promise<void>;
-    close(): Promise<void>;
+    injectScroll(message: Omit<ScrcpyInjectScrollControlMessage, "type">): Uint8Array | undefined;
+    backOrScreenOn(action: AndroidKeyEventAction): Uint8Array | undefined;
+    setScreenPowerMode(mode: AndroidScreenPowerMode): Uint8Array;
+    rotateDevice(): Uint8Array;
 }
 //# sourceMappingURL=serializer.d.ts.map

package/esm/control/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/control/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EACR,aAAa,EACb,qBAAqB,EAExB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,qBAAa,8BAA8B;IACvC,OAAO,CAAC,OAAO,CAAuC;IACtD,gEAAgE;IAChE,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,MAAM,CAAsD;IACpE,OAAO,CAAC,gBAAgB,CAAyB;gBAG7C,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAC9C,OAAO,EAAE,aAAa,CAAC,qBAAqB,CAAC;IAS1C,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM;IAQ5D,cAAc,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,wBAAwB,CAAA;KAAE,EAC9D,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,EACxB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAChB,CAAC;YAKU,KAAK;IAIZ,aAAa,CAChB,OAAO,EAAE,IAAI,CAAC,iCAAiC,EAAE,MAAM,CAAC;IAYrD,UAAU,CAAC,IAAI,EAAE,MAAM;IAW9B;;OAEG;IACI,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,+BAA+B,EAAE,MAAM,CAAC;IAWzE;;OAEG;IACI,YAAY,CACf,OAAO,EAAE,IAAI,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAa9C,cAAc,CAAC,MAAM,EAAE,qBAAqB;IAalD,kBAAkB,CAAC,IAAI,EAAE,sBAAsB;IAW/C,YAAY;IAUZ,KAAK;CAGf"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/control/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,aAAa,EAEhB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AACxE,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAOzE,qBAAa,8BAA8B;IACvC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,iBAAiB,CAAyB;gBAE/B,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC;IAM1C,aAAa,CAChB,OAAO,EAAE,IAAI,CAAC,iCAAiC,EAAE,MAAM,CAAC;IAUrD,UAAU,CAAC,IAAI,EAAE,MAAM;IAO9B;;OAEG;IACI,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,+BAA+B,EAAE,MAAM,CAAC;IASzE;;OAEG;IACI,YAAY,CACf,OAAO,EAAE,IAAI,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAUpD,cAAc,CAAC,MAAM,EAAE,qBAAqB;IAO5C,kBAAkB,CAAC,IAAI,EAAE,sBAAsB;IAS/C,YAAY;CAKtB"}

package/esm/control/serializer.js

@@ -1,83 +1,54 @@
-import { ConsumableWritableStream } from "@yume-chan/stream-extra";
 import { ScrcpyInjectKeyCodeControlMessage } from "./inject-keycode.js";
 import { ScrcpyInjectTextControlMessage } from "./inject-text.js";
-import { ScrcpyInjectTouchControlMessage } from "./inject-touch.js";
 import { ScrcpyRotateDeviceControlMessage } from "./rotate-device.js";
 import { ScrcpySetScreenPowerModeControlMessage } from "./set-screen-power-mode.js";
-import { ScrcpyControlMessageType } from "./type.js";
+import { ScrcpyControlMessageType, ScrcpyControlMessageTypeValue, } from "./type.js";
 export class ScrcpyControlMessageSerializer {
-    options;
-    /** Control message type values for current version of server */
-    types;
-    writer;
-    scrollController;
-    constructor(stream, options) {
-        this.writer = stream.getWriter();
-        this.options = options;
-        this.types = options.getControlMessageTypes();
-        this.scrollController = options.getScrollController();
-    }
-    getActualMessageType(type) {
-        const value = this.types.indexOf(type);
-        if (value === -1) {
-            throw new Error("Not supported");
-        }
-        return value;
-    }
-    addMessageType(message, type) {
-        message.type = this.getActualMessageType(type);
-        return message;
-    }
-    async write(data) {
-        await ConsumableWritableStream.write(this.writer, data);
+    _options;
+    _typeValues;
+    _scrollController;
+    constructor(options) {
+        this._options = options;
+        this._typeValues = new ScrcpyControlMessageTypeValue(options);
+        this._scrollController = options.createScrollController();
     }
     injectKeyCode(message) {
-        return this.write(ScrcpyInjectKeyCodeControlMessage.serialize(this.addMessageType(message, ScrcpyControlMessageType.InjectKeyCode)));
+        return ScrcpyInjectKeyCodeControlMessage.serialize(this._typeValues.fillMessageType(message, ScrcpyControlMessageType.InjectKeyCode));
     }
     injectText(text) {
-        return this.write(ScrcpyInjectTextControlMessage.serialize({
+        return ScrcpyInjectTextControlMessage.serialize({
             text,
-            type: this.getActualMessageType(ScrcpyControlMessageType.InjectText),
-        }));
+            type: this._typeValues.get(ScrcpyControlMessageType.InjectText),
+        });
     }
     /**
      * `pressure` is a float value between 0 and 1.
      */
     injectTouch(message) {
-        return this.write(ScrcpyInjectTouchControlMessage.serialize(this.addMessageType(message, ScrcpyControlMessageType.InjectTouch)));
+        return this._options.serializeInjectTouchControlMessage(this._typeValues.fillMessageType(message, ScrcpyControlMessageType.InjectTouch));
     }
     /**
      * `scrollX` and `scrollY` are float values between 0 and 1.
      */
     injectScroll(message) {
-        const data = this.scrollController.serializeScrollMessage(this.addMessageType(message, ScrcpyControlMessageType.InjectScroll));
-        if (!data) {
-            return;
-        }
-        return this.write(data);
+        return this._scrollController.serializeScrollMessage(this._typeValues.fillMessageType(message, ScrcpyControlMessageType.InjectScroll));
     }
-    async backOrScreenOn(action) {
-        const buffer = this.options.serializeBackOrScreenOnControlMessage({
+    backOrScreenOn(action) {
+        return this._options.serializeBackOrScreenOnControlMessage({
             action,
-            type: this.getActualMessageType(ScrcpyControlMessageType.BackOrScreenOn),
+            type: this._typeValues.get(ScrcpyControlMessageType.BackOrScreenOn),
         });
-        if (buffer) {
-            return await this.write(buffer);
-        }
     }
     setScreenPowerMode(mode) {
-        return this.write(ScrcpySetScreenPowerModeControlMessage.serialize({
+        return ScrcpySetScreenPowerModeControlMessage.serialize({
             mode,
-            type: this.getActualMessageType(ScrcpyControlMessageType.SetScreenPowerMode),
-        }));
+            type: this._typeValues.get(ScrcpyControlMessageType.SetScreenPowerMode),
+        });
     }
     rotateDevice() {
-        return this.write(ScrcpyRotateDeviceControlMessage.serialize({
-            type: this.getActualMessageType(ScrcpyControlMessageType.RotateDevice),
-        }));
-    }
-    close() {
-        return this.writer.close();
+        return ScrcpyRotateDeviceControlMessage.serialize({
+            type: this._typeValues.get(ScrcpyControlMessageType.RotateDevice),
+        });
     }
 }
 //# sourceMappingURL=serializer.js.map

package/esm/control/serializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/control/serializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/control/serializer.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AAExE,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,sCAAsC,EAAE,MAAM,4BAA4B,CAAC;AACpF,OAAO,EACH,wBAAwB,EACxB,6BAA6B,GAChC,MAAM,WAAW,CAAC;AAEnB,MAAM,OAAO,8BAA8B;IAC/B,QAAQ,CAAwB;IAChC,WAAW,CAAgC;IAC3C,iBAAiB,CAAyB;IAElD,YAAmB,OAA8B;QAC7C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,IAAI,6BAA6B,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAC9D,CAAC;IAEM,aAAa,CAChB,OAAwD;QAExD,OAAO,iCAAiC,CAAC,SAAS,CAC9C,IAAI,CAAC,WAAW,CAAC,eAAe,CAC5B,OAAO,EACP,wBAAwB,CAAC,aAAa,CACzC,CACJ,CAAC;IACN,CAAC;IAEM,UAAU,CAAC,IAAY;QAC1B,OAAO,8BAA8B,CAAC,SAAS,CAAC;YAC5C,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,UAAU,CAAC;SAClE,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACI,WAAW,CAAC,OAAsD;QACrE,OAAO,IAAI,CAAC,QAAQ,CAAC,kCAAkC,CACnD,IAAI,CAAC,WAAW,CAAC,eAAe,CAC5B,OAAO,EACP,wBAAwB,CAAC,WAAW,CACvC,CACJ,CAAC;IACN,CAAC;IAED;;OAEG;IACI,YAAY,CACf,OAAuD;QAEvD,OAAO,IAAI,CAAC,iBAAiB,CAAC,sBAAsB,CAChD,IAAI,CAAC,WAAW,CAAC,eAAe,CAC5B,OAAO,EACP,wBAAwB,CAAC,YAAY,CACxC,CACJ,CAAC;IACN,CAAC;IAEM,cAAc,CAAC,MAA6B;QAC/C,OAAO,IAAI,CAAC,QAAQ,CAAC,qCAAqC,CAAC;YACvD,MAAM;YACN,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,cAAc,CAAC;SACtE,CAAC,CAAC;IACP,CAAC;IAEM,kBAAkB,CAAC,IAA4B;QAClD,OAAO,sCAAsC,CAAC,SAAS,CAAC;YACpD,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CACtB,wBAAwB,CAAC,kBAAkB,CAC9C;SACJ,CAAC,CAAC;IACP,CAAC;IAEM,YAAY;QACf,OAAO,gCAAgC,CAAC,SAAS,CAAC;YAC9C,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,wBAAwB,CAAC,YAAY,CAAC;SACpE,CAAC,CAAC;IACP,CAAC;CACJ"}

package/esm/control/set-screen-power-mode.d.ts

@@ -1,11 +1,10 @@
 import Struct from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
 export declare enum AndroidScreenPowerMode {
     Off = 0,
     Normal = 2
 }
 export declare const ScrcpySetScreenPowerModeControlMessage: Struct<{
-    type: ScrcpyControlMessageType.SetScreenPowerMode;
+    type: number;
     mode: AndroidScreenPowerMode;
 }, never, Record<never, never>, undefined>;
 export type ScrcpySetScreenPowerModeControlMessage = (typeof ScrcpySetScreenPowerModeControlMessage)["TInit"];

package/esm/control/set-screen-power-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set-screen-power-mode.d.ts","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AAAA,OAAO,MAAuB,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAGrD,oBAAY,sBAAsB;IAC9B,GAAG,IAAI;IACP,MAAM,IAAI;CACb;AAED,eAAO,MAAM,sCAAsC;;;0CAEM,CAAC;AAE1D,MAAM,MAAM,sCAAsC,GAC9C,CAAC,OAAO,sCAAsC,CAAC,CAAC,OAAO,CAAC,CAAC"}
+{"version":3,"file":"set-screen-power-mode.d.ts","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AAAA,OAAO,MAAuB,MAAM,mBAAmB,CAAC;AAGxD,oBAAY,sBAAsB;IAC9B,GAAG,IAAI;IACP,MAAM,IAAI;CACb;AAED,eAAO,MAAM,sCAAsC;;;0CAEM,CAAC;AAE1D,MAAM,MAAM,sCAAsC,GAC9C,CAAC,OAAO,sCAAsC,CAAC,CAAC,OAAO,CAAC,CAAC"}

package/esm/control/set-screen-power-mode.js

@@ -1,5 +1,4 @@
 import Struct, { placeholder } from "@yume-chan/struct";
-import { ScrcpyControlMessageType } from "./type.js";
 // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/view/SurfaceControl.java;l=659;drc=20303e05bf73796124ab70a279cf849b61b97905
 export var AndroidScreenPowerMode;
 (function (AndroidScreenPowerMode) {
@@ -7,6 +6,6 @@ export var AndroidScreenPowerMode;
     AndroidScreenPowerMode[AndroidScreenPowerMode["Normal"] = 2] = "Normal";
 })(AndroidScreenPowerMode = AndroidScreenPowerMode || (AndroidScreenPowerMode = {}));
 export const ScrcpySetScreenPowerModeControlMessage = new Struct()
-    .uint8("type", ScrcpyControlMessageType.SetScreenPowerMode)
+    .uint8("type")
     .uint8("mode", placeholder());
 //# sourceMappingURL=set-screen-power-mode.js.map

package/esm/control/set-screen-power-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"set-screen-power-mode.js","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAErD,8KAA8K;AAC9K,MAAM,CAAN,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAC9B,iEAAO,CAAA;IACP,uEAAU,CAAA;AACd,CAAC,EAHW,sBAAsB,GAAtB,sBAAsB,KAAtB,sBAAsB,QAGjC;AAED,MAAM,CAAC,MAAM,sCAAsC,GAAG,IAAI,MAAM,EAAE;KAC7D,KAAK,CAAC,MAAM,EAAE,wBAAwB,CAAC,kBAA2B,CAAC;KACnE,KAAK,CAAC,MAAM,EAAE,WAAW,EAA0B,CAAC,CAAC"}
+{"version":3,"file":"set-screen-power-mode.js","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAExD,8KAA8K;AAC9K,MAAM,CAAN,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAC9B,iEAAO,CAAA;IACP,uEAAU,CAAA;AACd,CAAC,EAHW,sBAAsB,GAAtB,sBAAsB,KAAtB,sBAAsB,QAGjC;AAED,MAAM,CAAC,MAAM,sCAAsC,GAAG,IAAI,MAAM,EAAE;KAC7D,KAAK,CAAC,MAAM,CAAC;KACb,KAAK,CAAC,MAAM,EAAE,WAAW,EAA0B,CAAC,CAAC"}

package/esm/control/type.d.ts

@@ -1,3 +1,4 @@
+import type { ScrcpyOptions } from "../options/index.js";
 export declare enum ScrcpyControlMessageType {
     InjectKeyCode = 0,
     InjectText = 1,
@@ -12,4 +13,17 @@ export declare enum ScrcpyControlMessageType {
     SetScreenPowerMode = 10,
     RotateDevice = 11
 }
+/**
+ * Scrcpy control message types have different values between versions.
+ *
+ * This class provides a way to get the actual value for a given type.
+ */
+export declare class ScrcpyControlMessageTypeValue {
+    private types;
+    constructor(options: ScrcpyOptions<object>);
+    get(type: ScrcpyControlMessageType): number;
+    fillMessageType<T extends {
+        type: ScrcpyControlMessageType;
+    }>(message: Omit<T, "type">, type: T["type"]): T;
+}
 //# sourceMappingURL=type.d.ts.map

package/esm/control/type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/control/type.ts"],"names":[],"mappings":"AAGA,oBAAY,wBAAwB;IAChC,aAAa,IAAA;IACb,UAAU,IAAA;IACV,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,cAAc,IAAA;IACd,uBAAuB,IAAA;IACvB,kBAAkB,IAAA;IAClB,yBAAyB,IAAA;IACzB,YAAY,IAAA;IACZ,YAAY,IAAA;IACZ,kBAAkB,KAAA;IAClB,YAAY,KAAA;CACf"}
+{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/control/type.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,oBAAY,wBAAwB;IAChC,aAAa,IAAA;IACb,UAAU,IAAA;IACV,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,cAAc,IAAA;IACd,uBAAuB,IAAA;IACvB,kBAAkB,IAAA;IAClB,yBAAyB,IAAA;IACzB,YAAY,IAAA;IACZ,YAAY,IAAA;IACZ,kBAAkB,KAAA;IAClB,YAAY,KAAA;CACf;AAED;;;;GAIG;AACH,qBAAa,6BAA6B;IACtC,OAAO,CAAC,KAAK,CAAsC;gBAEhC,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC;IAI1C,GAAG,CAAC,IAAI,EAAE,wBAAwB,GAAG,MAAM;IAQ3C,eAAe,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,wBAAwB,CAAA;KAAE,EAC/D,OAAO,EAAE,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,EACxB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAChB,CAAC;CAIP"}

package/esm/control/type.js

@@ -16,4 +16,26 @@ export var ScrcpyControlMessageType;
     ScrcpyControlMessageType[ScrcpyControlMessageType["SetScreenPowerMode"] = 10] = "SetScreenPowerMode";
     ScrcpyControlMessageType[ScrcpyControlMessageType["RotateDevice"] = 11] = "RotateDevice";
 })(ScrcpyControlMessageType = ScrcpyControlMessageType || (ScrcpyControlMessageType = {}));
+/**
+ * Scrcpy control message types have different values between versions.
+ *
+ * This class provides a way to get the actual value for a given type.
+ */
+export class ScrcpyControlMessageTypeValue {
+    types;
+    constructor(options) {
+        this.types = options.controlMessageTypes;
+    }
+    get(type) {
+        const value = this.types.indexOf(type);
+        if (value === -1) {
+            throw new Error("Not supported");
+        }
+        return value;
+    }
+    fillMessageType(message, type) {
+        message.type = this.get(type);
+        return message;
+    }
+}
 //# sourceMappingURL=type.js.map

package/esm/control/type.js.map

@@ -1 +1 @@
-{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/control/type.ts"],"names":[],"mappings":"AAAA,+GAA+G;AAC/G,6IAA6I;AAC7I,sFAAsF;AACtF,MAAM,CAAN,IAAY,wBAaX;AAbD,WAAY,wBAAwB;IAChC,yFAAa,CAAA;IACb,mFAAU,CAAA;IACV,qFAAW,CAAA;IACX,uFAAY,CAAA;IACZ,2FAAc,CAAA;IACd,6GAAuB,CAAA;IACvB,mGAAkB,CAAA;IAClB,iHAAyB,CAAA;IACzB,uFAAY,CAAA;IACZ,uFAAY,CAAA;IACZ,oGAAkB,CAAA;IAClB,wFAAY,CAAA;AAChB,CAAC,EAbW,wBAAwB,GAAxB,wBAAwB,KAAxB,wBAAwB,QAanC"}
+{"version":3,"file":"type.js","sourceRoot":"","sources":["../../src/control/type.ts"],"names":[],"mappings":"AAAA,+GAA+G;AAC/G,6IAA6I;AAI7I,sFAAsF;AACtF,MAAM,CAAN,IAAY,wBAaX;AAbD,WAAY,wBAAwB;IAChC,yFAAa,CAAA;IACb,mFAAU,CAAA;IACV,qFAAW,CAAA;IACX,uFAAY,CAAA;IACZ,2FAAc,CAAA;IACd,6GAAuB,CAAA;IACvB,mGAAkB,CAAA;IAClB,iHAAyB,CAAA;IACzB,uFAAY,CAAA;IACZ,uFAAY,CAAA;IACZ,oGAAkB,CAAA;IAClB,wFAAY,CAAA;AAChB,CAAC,EAbW,wBAAwB,GAAxB,wBAAwB,KAAxB,wBAAwB,QAanC;AAED;;;;GAIG;AACH,MAAM,OAAO,6BAA6B;IAC9B,KAAK,CAAsC;IAEnD,YAAmB,OAA8B;QAC7C,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAC7C,CAAC;IAEM,GAAG,CAAC,IAA8B;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;SACpC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAEM,eAAe,CAClB,OAAwB,EACxB,IAAe;QAEd,OAAa,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,OAAY,CAAC;IACxB,CAAC;CACJ"}

package/esm/control/writer.d.ts

@@ -0,0 +1,28 @@
+import type { Consumable, WritableStreamDefaultWriter } from "@yume-chan/stream-extra";
+import type { ScrcpyOptions } from "../options/index.js";
+import type { AndroidKeyEventAction, ScrcpyInjectKeyCodeControlMessage } from "./inject-keycode.js";
+import type { ScrcpyInjectScrollControlMessage } from "./inject-scroll.js";
+import type { ScrcpyInjectTouchControlMessage } from "./inject-touch.js";
+import type { AndroidScreenPowerMode } from "./set-screen-power-mode.js";
+export declare class ScrcpyControlMessageWriter {
+    private _writer;
+    private _serializer;
+    constructor(writer: WritableStreamDefaultWriter<Consumable<Uint8Array>>, options: ScrcpyOptions<object>);
+    private write;
+    injectKeyCode(message: Omit<ScrcpyInjectKeyCodeControlMessage, "type">): Promise<void>;
+    injectText(text: string): Promise<void>;
+    /**
+     * `pressure` is a float value between 0 and 1.
+     */
+    injectTouch(message: Omit<ScrcpyInjectTouchControlMessage, "type">): Promise<void>;
+    /**
+     * `scrollX` and `scrollY` are float values between 0 and 1.
+     */
+    injectScroll(message: Omit<ScrcpyInjectScrollControlMessage, "type">): Promise<void>;
+    backOrScreenOn(action: AndroidKeyEventAction): Promise<void>;
+    setScreenPowerMode(mode: AndroidScreenPowerMode): Promise<void>;
+    rotateDevice(): Promise<void>;
+    releaseLock(): void;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=writer.d.ts.map

package/esm/control/writer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/control/writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,UAAU,EACV,2BAA2B,EAC9B,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EACR,qBAAqB,EACrB,iCAAiC,EACpC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AAEzE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AAEzE,qBAAa,0BAA0B;IACnC,OAAO,CAAC,OAAO,CAAsD;IACrE,OAAO,CAAC,WAAW,CAAiC;gBAGhD,MAAM,EAAE,2BAA2B,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,EAC3D,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC;YAMpB,KAAK;IAIN,aAAa,CACtB,OAAO,EAAE,IAAI,CAAC,iCAAiC,EAAE,MAAM,CAAC;IAK/C,UAAU,CAAC,IAAI,EAAE,MAAM;IAIpC;;OAEG;IACU,WAAW,CACpB,OAAO,EAAE,IAAI,CAAC,+BAA+B,EAAE,MAAM,CAAC;IAK1D;;OAEG;IACU,YAAY,CACrB,OAAO,EAAE,IAAI,CAAC,gCAAgC,EAAE,MAAM,CAAC;IAQ9C,cAAc,CAAC,MAAM,EAAE,qBAAqB;IAO5C,kBAAkB,CAAC,IAAI,EAAE,sBAAsB;IAI/C,YAAY;IAIlB,WAAW;IAIL,KAAK;CAGrB"}

package/esm/control/writer.js

@@ -0,0 +1,53 @@
+import { ConsumableWritableStream } from "@yume-chan/stream-extra";
+import { ScrcpyControlMessageSerializer } from "./serializer.js";
+export class ScrcpyControlMessageWriter {
+    _writer;
+    _serializer;
+    constructor(writer, options) {
+        this._writer = writer;
+        this._serializer = new ScrcpyControlMessageSerializer(options);
+    }
+    async write(message) {
+        await ConsumableWritableStream.write(this._writer, message);
+    }
+    async injectKeyCode(message) {
+        await this.write(this._serializer.injectKeyCode(message));
+    }
+    async injectText(text) {
+        await this.write(this._serializer.injectText(text));
+    }
+    /**
+     * `pressure` is a float value between 0 and 1.
+     */
+    async injectTouch(message) {
+        await this.write(this._serializer.injectTouch(message));
+    }
+    /**
+     * `scrollX` and `scrollY` are float values between 0 and 1.
+     */
+    async injectScroll(message) {
+        const data = this._serializer.injectScroll(message);
+        if (data) {
+            await this.write(data);
+        }
+    }
+    async backOrScreenOn(action) {
+        const data = this._serializer.backOrScreenOn(action);
+        if (data) {
+            await this.write(data);
+        }
+    }
+    async setScreenPowerMode(mode) {
+        await this.write(this._serializer.setScreenPowerMode(mode));
+    }
+    async rotateDevice() {
+        await this.write(this._serializer.rotateDevice());
+    }
+    releaseLock() {
+        this._writer.releaseLock();
+    }
+    async close() {
+        await this._writer.close();
+    }
+}
+//# sourceMappingURL=writer.js.map

package/esm/control/writer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/control/writer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAUnE,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAC;AAGjE,MAAM,OAAO,0BAA0B;IAC3B,OAAO,CAAsD;IAC7D,WAAW,CAAiC;IAEpD,YACI,MAA2D,EAC3D,OAA8B;QAE9B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,IAAI,8BAA8B,CAAC,OAAO,CAAC,CAAC;IACnE,CAAC;IAEO,KAAK,CAAC,KAAK,CAAC,OAAmB;QACnC,MAAM,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,aAAa,CACtB,OAAwD;QAExD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,IAAY;QAChC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACxD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW,CACpB,OAAsD;QAEtD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY,CACrB,OAAuD;QAEvD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,IAAI,EAAE;YACN,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;IACL,CAAC;IAEM,KAAK,CAAC,cAAc,CAAC,MAA6B;QACrD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACrD,IAAI,IAAI,EAAE;YACN,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;IACL,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,IAA4B;QACxD,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;IAChE,CAAC;IAEM,KAAK,CAAC,YAAY;QACrB,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC,CAAC;IACtD,CAAC;IAEM,WAAW;QACd,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;CACJ"}

package/esm/device-message/stream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/device-message/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAG9D,MAAM,MAAM,mBAAmB,GACzB,4BAA4B,GAC5B,+BAA+B,CAAC;AAEtC,qBAAa,oCAAqC,SAAQ,uBAAuB,CAAC,mBAAmB,CAAC;;CAkBrG"}
+{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/device-message/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAOlE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAG9D,MAAM,MAAM,mBAAmB,GACzB,4BAA4B,GAC5B,+BAA+B,CAAC;AAEtC,qBAAa,oCAAqC,SAAQ,uBAAuB,CAAC,mBAAmB,CAAC;;CAiCrG"}

package/esm/device-message/stream.js

@@ -1,18 +1,33 @@
 import { BufferedTransformStream } from "@yume-chan/stream-extra";
+import { ExactReadableEndedError, StructEmptyError, StructNotEnoughDataError, } from "@yume-chan/struct";
 import { ScrcpyAckClipboardDeviceMessage } from "./ack-clipboard.js";
 import { ScrcpyClipboardDeviceMessage } from "./clipboard.js";
 import { ScrcpyDeviceMessageType } from "./type.js";
 export class ScrcpyDeviceMessageDeserializeStream extends BufferedTransformStream {
     constructor() {
         super(async (stream) => {
-            const type = await stream.read(1);
-            switch (type[0]) {
-                case ScrcpyDeviceMessageType.Clipboard:
-                    return await ScrcpyClipboardDeviceMessage.deserialize(stream);
-                case ScrcpyDeviceMessageType.AckClipboard:
-                    return await ScrcpyAckClipboardDeviceMessage.deserialize(stream);
-                default:
-                    throw new Error("unknown control message type");
+            try {
+                const type = await stream.readExactly(1);
+                switch (type[0]) {
+                    case ScrcpyDeviceMessageType.Clipboard:
+                        return await ScrcpyClipboardDeviceMessage.deserialize(stream);
+                    case ScrcpyDeviceMessageType.AckClipboard:
+                        return await ScrcpyAckClipboardDeviceMessage.deserialize(stream);
+                    default:
+                        throw new Error("Unsupported control message type");
+                }
+            }
+            catch (e) {
+                // Can't read the `type` byte
+                if (e instanceof ExactReadableEndedError) {
+                    throw new StructEmptyError();
+                }
+                // Can't read struct body,
+                // treat as not enough data because `type` byte is already read
+                if (e instanceof StructEmptyError) {
+                    throw new StructNotEnoughDataError();
+                }
+                throw e;
             }
         });
     }

package/esm/device-message/stream.js.map

@@ -1 +1 @@
-{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/device-message/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAMpD,MAAM,OAAO,oCAAqC,SAAQ,uBAA4C;IAClG;QACI,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE;gBACb,KAAK,uBAAuB,CAAC,SAAS;oBAClC,OAAO,MAAM,4BAA4B,CAAC,WAAW,CACjD,MAAM,CACT,CAAC;gBACN,KAAK,uBAAuB,CAAC,YAAY;oBACrC,OAAO,MAAM,+BAA+B,CAAC,WAAW,CACpD,MAAM,CACT,CAAC;gBACN;oBACI,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACvD;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}
+{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/device-message/stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EACH,uBAAuB,EACvB,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AACrE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAMpD,MAAM,OAAO,oCAAqC,SAAQ,uBAA4C;IAClG;QACI,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACnB,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBACzC,QAAQ,IAAI,CAAC,CAAC,CAAC,EAAE;oBACb,KAAK,uBAAuB,CAAC,SAAS;wBAClC,OAAO,MAAM,4BAA4B,CAAC,WAAW,CACjD,MAAM,CACT,CAAC;oBACN,KAAK,uBAAuB,CAAC,YAAY;wBACrC,OAAO,MAAM,+BAA+B,CAAC,WAAW,CACpD,MAAM,CACT,CAAC;oBACN;wBACI,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;iBAC3D;aACJ;YAAC,OAAO,CAAC,EAAE;gBACR,6BAA6B;gBAC7B,IAAI,CAAC,YAAY,uBAAuB,EAAE;oBACtC,MAAM,IAAI,gBAAgB,EAAE,CAAC;iBAChC;gBAED,0BAA0B;gBAC1B,+DAA+D;gBAC/D,IAAI,CAAC,YAAY,gBAAgB,EAAE;oBAC/B,MAAM,IAAI,wBAAwB,EAAE,CAAC;iBACxC;gBAED,MAAM,CAAC,CAAC;aACX;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ"}

package/esm/index.d.ts

@@ -1,5 +1,4 @@
-export * from "./adb/index.js";
-export * from "./codec.js";
+export * from "./codec/index.js";
 export * from "./control/index.js";
 export * from "./device-message/index.js";
 export * from "./options/index.js";

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oBAAoB,CAAC"}