@yume-chan/scrcpy 2.3.0 → 3.0.0-beta.1

package/src/control/serializer.ts

@@ -1,7 +1,4 @@
-import type {
-    AndroidKeyEventAction,
-    AndroidScreenPowerMode,
-} from "../android/index.js";
+import type { AndroidKeyEventAction } from "../android/index.js";
 import type { ScrcpyOptions, ScrcpyScrollController } from "../base/index.js";
 import { ScrcpyControlMessageType } from "../base/index.js";
 import type {
@@ -11,11 +8,11 @@ import type {
     ScrcpyUHidCreateControlMessage,
 } from "../latest.js";
 
+import { BooleanControlMessage } from "./boolean.js";
 import { EmptyControlMessage } from "./empty.js";
 import { ScrcpyInjectKeyCodeControlMessage } from "./inject-key-code.js";
 import { ScrcpyInjectTextControlMessage } from "./inject-text.js";
-import { ScrcpyControlMessageTypeMap } from "./message-type-map.js";
-import { ScrcpySetDisplayPowerControlMessage } from "./set-screen-power-mode.js";
+import { ScrcpyResizeDisplayControlMessage } from "./resize-display.js";
 import { ScrcpyStartAppControlMessage } from "./start-app.js";
 import {
     ScrcpyUHidDestroyControlMessage,
@@ -24,28 +21,39 @@ import {
 
 export class ScrcpyControlMessageSerializer {
     #options: ScrcpyOptions<object>;
-    #typeMap: ScrcpyControlMessageTypeMap;
     #scrollController: ScrcpyScrollController;
 
     constructor(options: ScrcpyOptions<object>) {
         this.#options = options;
-        this.#typeMap = new ScrcpyControlMessageTypeMap(options);
         this.#scrollController = options.createScrollController();
     }
 
+    getType(type: ScrcpyControlMessageType): number {
+        const value = this.#options.controlMessageTypes[type];
+        if (value === undefined) {
+            throw new TypeError(`Invalid control message type: ${type}`);
+        }
+        return value;
+    }
+
+    #addType<T extends { type: number }>(
+        message: Omit<T, "type">,
+        type: ScrcpyControlMessageType,
+    ): T {
+        (message as T).type = this.getType(type);
+        return message as T;
+    }
+
     injectKeyCode(message: Omit<ScrcpyInjectKeyCodeControlMessage, "type">) {
         return ScrcpyInjectKeyCodeControlMessage.serialize(
-            this.#typeMap.fillMessageType(
-                message,
-                ScrcpyControlMessageType.InjectKeyCode,
-            ),
+            this.#addType(message, ScrcpyControlMessageType.InjectKeyCode),
         );
     }
 
     injectText(text: string) {
         return ScrcpyInjectTextControlMessage.serialize({
             text,
-            type: this.#typeMap.get(ScrcpyControlMessageType.InjectText),
+            type: this.getType(ScrcpyControlMessageType.InjectText),
         });
     }
 
@@ -54,10 +62,7 @@ export class ScrcpyControlMessageSerializer {
      */
     injectTouch(message: Omit<ScrcpyInjectTouchControlMessage, "type">) {
         return this.#options.serializeInjectTouchControlMessage(
-            this.#typeMap.fillMessageType(
-                message,
-                ScrcpyControlMessageType.InjectTouch,
-            ),
+            this.#addType(message, ScrcpyControlMessageType.InjectTouch),
         );
     }
 
@@ -66,30 +71,27 @@ export class ScrcpyControlMessageSerializer {
      */
     injectScroll(message: Omit<ScrcpyInjectScrollControlMessage, "type">) {
         return this.#scrollController.serializeScrollMessage(
-            this.#typeMap.fillMessageType(
-                message,
-                ScrcpyControlMessageType.InjectScroll,
-            ),
+            this.#addType(message, ScrcpyControlMessageType.InjectScroll),
         );
     }
 
     backOrScreenOn(action: AndroidKeyEventAction) {
         return this.#options.serializeBackOrScreenOnControlMessage({
             action,
-            type: this.#typeMap.get(ScrcpyControlMessageType.BackOrScreenOn),
+            type: this.getType(ScrcpyControlMessageType.BackOrScreenOn),
         });
     }
 
-    setDisplayPower(mode: AndroidScreenPowerMode) {
-        return ScrcpySetDisplayPowerControlMessage.serialize({
-            mode,
-            type: this.#typeMap.get(ScrcpyControlMessageType.SetDisplayPower),
+    setDisplayPower(on: boolean) {
+        return this.#options.serializeSetDisplayPowerControlMessage({
+            on,
+            type: this.getType(ScrcpyControlMessageType.SetDisplayPower),
         });
     }
 
     expandNotificationPanel() {
         return EmptyControlMessage.serialize({
-            type: this.#typeMap.get(
+            type: this.getType(
                 ScrcpyControlMessageType.ExpandNotificationPanel,
             ),
         });
@@ -97,15 +99,13 @@ export class ScrcpyControlMessageSerializer {
 
     expandSettingPanel() {
         return EmptyControlMessage.serialize({
-            type: this.#typeMap.get(
-                ScrcpyControlMessageType.ExpandSettingPanel,
-            ),
+            type: this.getType(ScrcpyControlMessageType.ExpandSettingPanel),
         });
     }
 
     collapseNotificationPanel() {
         return EmptyControlMessage.serialize({
-            type: this.#typeMap.get(
+            type: this.getType(
                 ScrcpyControlMessageType.CollapseNotificationPanel,
             ),
         });
@@ -113,14 +113,14 @@ export class ScrcpyControlMessageSerializer {
 
     rotateDevice() {
         return EmptyControlMessage.serialize({
-            type: this.#typeMap.get(ScrcpyControlMessageType.RotateDevice),
+            type: this.getType(ScrcpyControlMessageType.RotateDevice),
         });
     }
 
     setClipboard(message: Omit<ScrcpySetClipboardControlMessage, "type">) {
         return this.#options.serializeSetClipboardControlMessage({
             ...message,
-            type: this.#typeMap.get(ScrcpyControlMessageType.SetClipboard),
+            type: this.getType(ScrcpyControlMessageType.SetClipboard),
         });
     }
 
@@ -130,25 +130,19 @@ export class ScrcpyControlMessageSerializer {
         }
 
         return this.#options.serializeUHidCreateControlMessage(
-            this.#typeMap.fillMessageType(
-                message,
-                ScrcpyControlMessageType.UHidCreate,
-            ),
+            this.#addType(message, ScrcpyControlMessageType.UHidCreate),
         );
     }
 
     uHidInput(message: Omit<ScrcpyUHidInputControlMessage, "type">) {
         return ScrcpyUHidInputControlMessage.serialize(
-            this.#typeMap.fillMessageType(
-                message,
-                ScrcpyControlMessageType.UHidInput,
-            ),
+            this.#addType(message, ScrcpyControlMessageType.UHidInput),
         );
     }
 
     uHidDestroy(id: number) {
         return ScrcpyUHidDestroyControlMessage.serialize({
-            type: this.#typeMap.get(ScrcpyControlMessageType.UHidDestroy),
+            type: this.getType(ScrcpyControlMessageType.UHidDestroy),
             id,
         });
     }
@@ -165,14 +159,46 @@ export class ScrcpyControlMessageSerializer {
         }
 
         return ScrcpyStartAppControlMessage.serialize({
-            type: this.#typeMap.get(ScrcpyControlMessageType.StartApp),
+            type: this.getType(ScrcpyControlMessageType.StartApp),
             name,
         });
     }
 
     resetVideo() {
         return EmptyControlMessage.serialize({
-            type: this.#typeMap.get(ScrcpyControlMessageType.ResetVideo),
+            type: this.getType(ScrcpyControlMessageType.ResetVideo),
+        });
+    }
+
+    cameraSetTorch(enabled: boolean) {
+        return BooleanControlMessage.serialize({
+            type: this.getType(ScrcpyControlMessageType.CameraSetTorch),
+            value: enabled,
+        });
+    }
+
+    cameraZoomIn() {
+        return EmptyControlMessage.serialize({
+            type: this.getType(ScrcpyControlMessageType.CameraZoomIn),
+        });
+    }
+
+    cameraZoomOut() {
+        return EmptyControlMessage.serialize({
+            type: this.getType(ScrcpyControlMessageType.CameraZoomOut),
+        });
+    }
+
+    resizeDisplay(message: Omit<ScrcpyResizeDisplayControlMessage, "type">) {
+        return ScrcpyResizeDisplayControlMessage.serialize(
+            this.#addType(message, ScrcpyControlMessageType.ResizeDisplay),
+        );
+    }
+
+    scanFile(path: string) {
+        return ScrcpyInjectTextControlMessage.serialize({
+            text: path,
+            type: this.getType(ScrcpyControlMessageType.ScanFile),
         });
     }
 }

package/src/control/start-app.ts

@@ -3,6 +3,7 @@ import { string, struct, u8 } from "@yume-chan/struct";
 
 export const ScrcpyStartAppControlMessage = struct(
     {
+        // value of `type` can change between versions
         type: u8,
         name: string(u8),
     },

package/src/control/uhid.ts

@@ -1,24 +1,26 @@
 import type { StructInit } from "@yume-chan/struct";
 import { buffer, struct, u16, u8 } from "@yume-chan/struct";
 
-import { ScrcpyControlMessageType } from "../base/index.js";
-
-export const ScrcpyUHidInputControlMessage = /* #__PURE__ */ (() =>
-    struct(
-        {
-            type: u8(ScrcpyControlMessageType.UHidInput),
-            id: u16,
-            data: buffer(u16),
-        },
-        { littleEndian: false },
-    ))();
+export const ScrcpyUHidInputControlMessage = struct(
+    {
+        // value of `type` can change between versions
+        type: u8,
+        id: u16,
+        data: buffer(u16),
+    },
+    { littleEndian: false },
+);
 
 export type ScrcpyUHidInputControlMessage = StructInit<
     typeof ScrcpyUHidInputControlMessage
 >;
 
 export const ScrcpyUHidDestroyControlMessage = struct(
-    { type: u8, id: u16 },
+    {
+        // value of `type` can change between versions
+        type: u8,
+        id: u16,
+    },
     { littleEndian: false },
 );
 

package/src/control/writer.ts

@@ -1,11 +1,9 @@
 import type { WritableStreamDefaultWriter } from "@yume-chan/stream-extra";
 import { Consumable } from "@yume-chan/stream-extra";
 
-import type {
-    AndroidKeyEventAction,
-    AndroidScreenPowerMode,
-} from "../android/index.js";
+import type { AndroidKeyEventAction } from "../android/index.js";
 import type { ScrcpyOptions } from "../base/index.js";
+import type { ScrcpyResizeDisplayControlMessage } from "../index.js";
 import type {
     ScrcpyInjectScrollControlMessage,
     ScrcpyInjectTouchControlMessage,
@@ -67,8 +65,8 @@ export class ScrcpyControlMessageWriter {
         }
     }
 
-    setScreenPowerMode(mode: AndroidScreenPowerMode) {
-        return this.write(this.#serializer.setDisplayPower(mode));
+    setDisplayPower(on: boolean) {
+        return this.write(this.#serializer.setDisplayPower(on));
     }
 
     expandNotificationPanel() {
@@ -122,6 +120,26 @@ export class ScrcpyControlMessageWriter {
         return this.write(this.#serializer.resetVideo());
     }
 
+    cameraSetTorch(enabled: boolean) {
+        return this.write(this.#serializer.cameraSetTorch(enabled));
+    }
+
+    cameraZoomIn() {
+        return this.write(this.#serializer.cameraZoomIn());
+    }
+
+    cameraZoomOut() {
+        return this.write(this.#serializer.cameraZoomOut());
+    }
+
+    resizeDisplay(message: Omit<ScrcpyResizeDisplayControlMessage, "type">) {
+        return this.write(this.#serializer.resizeDisplay(message));
+    }
+
+    scanFile(path: string) {
+        return this.write(this.#serializer.scanFile(path));
+    }
+
     releaseLock() {
         this.#writer.releaseLock();
     }

package/src/index.ts

@@ -30,9 +30,12 @@ export * from "./3_3.js";
 export * from "./3_3_1/index.js";
 export * from "./3_3_2.js";
 export * from "./3_3_3.js";
+export * from "./3_3_4.js";
+export * from "./4_0/index.js";
+export * from "./4_1/index.js";
 export * from "./android/index.js";
 export * from "./base/index.js";
-export * from "./codec/index.js";
 export * from "./control/index.js";
 export * from "./latest.js";
 export * from "./utils/index.js";
+export * from "./video/index.js";

package/src/latest.ts

@@ -1,4 +1,4 @@
-export { ScrcpyOptions3_3_3 as ScrcpyOptionsLatest } from "./3_3_3.js";
+export { ScrcpyOptions4_1 as ScrcpyOptionsLatest } from "./4_1/index.js";
 
 export {
     BackOrScreenOnControlMessage as ScrcpyBackOrScreenOnControlMessage,
@@ -13,6 +13,8 @@ export {
     Orientation as ScrcpyOrientation,
     PointerId as ScrcpyPointerId,
     SetClipboardControlMessage as ScrcpySetClipboardControlMessage,
+    SetDisplayPowerControlMessage as ScrcpySetDisplayPowerControlMessage,
     UHidCreateControlMessage as ScrcpyUHidCreateControlMessage,
     UHidOutputDeviceMessage as ScrcpyUHidOutputDeviceMessage,
-} from "./3_3_1/impl/index.js";
+    VideoCodecOptions as ScrcpyVideoCodecOptions,
+} from "./4_1/impl/index.js";

package/src/utils/omit.ts

@@ -2,7 +2,7 @@
 export function omit<T extends Record<string, unknown>, K extends (keyof T)[]>(
     value: T,
     ...keys: K
-): T {
+): Omit<T, K[number]> {
     return Object.fromEntries(
         Object.entries(value).filter(
             ([key]) => !keys.includes(key as K[number]),

package/src/video/android.ts

@@ -0,0 +1,72 @@
+// From https://developer.android.com/reference/android/media/MediaCodecInfo.CodecProfileLevel
+export const AndroidAvcProfile = {
+    Baseline: 1 << 0,
+    Main: 1 << 1,
+    Extended: 1 << 2,
+    High: 1 << 3,
+    High10: 1 << 4,
+    High422: 1 << 5,
+    High444: 1 << 6,
+    ConstrainedBaseline: 1 << 16,
+    ConstrainedHigh: 1 << 19,
+};
+
+export const AndroidAvcLevel = {
+    Level1: 1 << 0,
+    Level1b: 1 << 1,
+    Level11: 1 << 2,
+    Level12: 1 << 3,
+    Level13: 1 << 4,
+    Level2: 1 << 5,
+    Level21: 1 << 6,
+    Level22: 1 << 7,
+    Level3: 1 << 8,
+    Level31: 1 << 9,
+    Level32: 1 << 10,
+    Level4: 1 << 11,
+    Level41: 1 << 12,
+    Level42: 1 << 13,
+    Level5: 1 << 14,
+    Level51: 1 << 15,
+    Level52: 1 << 16,
+    Level6: 1 << 17,
+    Level61: 1 << 18,
+    Level62: 1 << 19,
+};
+
+export const AndroidHevcProfile = {
+    Main: 1 << 0,
+    Main10: 1 << 1,
+    MainStill: 1 << 2,
+    Main10Hdr10: 1 << 12,
+    Main10Hdr10Plus: 1 << 13,
+};
+
+export const AndroidHevcLevel = {
+    MainTierLevel1: 1 << 0,
+    HighTierLevel1: 1 << 1,
+    MainTierLevel2: 1 << 2,
+    HighTierLevel2: 1 << 3,
+    MainTierLevel21: 1 << 4,
+    HighTierLevel21: 1 << 5,
+    MainTierLevel3: 1 << 6,
+    HighTierLevel3: 1 << 7,
+    MainTierLevel31: 1 << 8,
+    HighTierLevel31: 1 << 9,
+    MainTierLevel4: 1 << 10,
+    HighTierLevel4: 1 << 11,
+    MainTierLevel41: 1 << 12,
+    HighTierLevel41: 1 << 13,
+    MainTierLevel5: 1 << 14,
+    HighTierLevel5: 1 << 15,
+    MainTierLevel51: 1 << 16,
+    HighTierLevel51: 1 << 17,
+    MainTierLevel52: 1 << 18,
+    HighTierLevel52: 1 << 19,
+    MainTierLevel6: 1 << 20,
+    HighTierLevel6: 1 << 21,
+    MainTierLevel61: 1 << 22,
+    HighTierLevel61: 1 << 23,
+    MainTierLevel62: 1 << 24,
+    HighTierLevel62: 1 << 25,
+};

package/src/video/codec-id.ts

@@ -0,0 +1,6 @@
+export const H264 = 0x68_32_36_34;
+export const H265 = 0x68_32_36_35;
+export const Av1 = 0x00_61_76_31;
+
+export const Vp8 = 0x00_76_70_38;
+export const Vp9 = 0x00_76_70_39;

package/src/video/index.ts

@@ -0,0 +1,21 @@
+import * as ScrcpyVideoCodecId from "./codec-id.js";
+
+export * from "./android.js";
+export * from "./size.js";
+
+type ScrcpyVideoCodecId =
+    (typeof ScrcpyVideoCodecId)[keyof typeof ScrcpyVideoCodecId];
+
+export const ScrcpyVideoCodecNameMap = /* #__PURE__ */ (() => {
+    const result = new Map<number, string>();
+    for (const key in ScrcpyVideoCodecId) {
+        const value =
+            ScrcpyVideoCodecId[key as keyof typeof ScrcpyVideoCodecId];
+        if (typeof value === "number") {
+            result.set(value, key);
+        }
+    }
+    return result;
+})();
+
+export { ScrcpyVideoCodecId };

package/src/video/size.ts

@@ -0,0 +1,46 @@
+import type { Event } from "@yume-chan/event";
+import { StickyEventEmitter } from "@yume-chan/event";
+
+export interface ScrcpyVideoSizeChangedEvent {
+    width: number;
+    height: number;
+    isClientResize?: boolean | undefined;
+}
+
+export interface ScrcpyVideoSize {
+    readonly width: number;
+    readonly height: number;
+
+    readonly sizeChanged: Event<ScrcpyVideoSizeChangedEvent>;
+}
+
+export class ScrcpyVideoSizeImpl implements ScrcpyVideoSize {
+    #width: number = 0;
+    get width() {
+        return this.#width;
+    }
+
+    #height: number = 0;
+    get height() {
+        return this.#height;
+    }
+
+    #sizeChanged = new StickyEventEmitter<ScrcpyVideoSizeChangedEvent>();
+    get sizeChanged() {
+        return this.#sizeChanged.event;
+    }
+
+    setSize(width: number, height: number, isClientResize?: boolean) {
+        if (this.#width === width && this.#height === height) {
+            return;
+        }
+
+        this.#width = width;
+        this.#height = height;
+        this.#sizeChanged.fire({ width, height, isClientResize });
+    }
+
+    dispose() {
+        this.#sizeChanged.dispose();
+    }
+}

package/tsconfig.build.json

@@ -1,11 +1,3 @@
 {
     "extends": "./node_modules/@yume-chan/tsconfig/tsconfig.base.json",
-    "references": [
-        {
-            "path": "../stream-extra/tsconfig.build.json"
-        },
-        {
-            "path": "../struct/tsconfig.build.json"
-        }
-    ]
 }