@yume-chan/scrcpy 3.0.0-beta.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,10 +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 { ScrcpySetDisplayPowerControlMessage } from "./set-screen-power-mode.js";
+import { ScrcpyResizeDisplayControlMessage } from "./resize-display.js";
 import { ScrcpyStartAppControlMessage } from "./start-app.js";
 import {
     ScrcpyUHidDestroyControlMessage,
@@ -84,9 +82,9 @@ export class ScrcpyControlMessageSerializer {
         });
     }
 
-    setDisplayPower(mode: AndroidScreenPowerMode) {
-        return ScrcpySetDisplayPowerControlMessage.serialize({
-            mode,
+    setDisplayPower(on: boolean) {
+        return this.#options.serializeSetDisplayPowerControlMessage({
+            on,
             type: this.getType(ScrcpyControlMessageType.SetDisplayPower),
         });
     }
@@ -171,4 +169,36 @@ export class ScrcpyControlMessageSerializer {
             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/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 {
         }
     }
 
-    setDisplayPower(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

@@ -31,6 +31,8 @@ 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 "./control/index.js";

package/src/latest.ts

@@ -1,10 +1,9 @@
-export { ScrcpyOptions3_3_2 as ScrcpyOptionsLatest } from "./3_3_2.js";
+export { ScrcpyOptions4_1 as ScrcpyOptionsLatest } from "./4_1/index.js";
 
 export {
     BackOrScreenOnControlMessage as ScrcpyBackOrScreenOnControlMessage,
     CaptureOrientation as ScrcpyCaptureOrientation,
     CodecOptions as ScrcpyCodecOptions,
-    VideoCodecOptions as ScrcpyVideoCodecOptions,
     Crop as ScrcpyCrop,
     InjectScrollControlMessage as ScrcpyInjectScrollControlMessage,
     InjectTouchControlMessage as ScrcpyInjectTouchControlMessage,
@@ -14,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/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

@@ -1,2 +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

@@ -1,11 +1,17 @@
 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<{ width: number; height: number }>;
+    readonly sizeChanged: Event<ScrcpyVideoSizeChangedEvent>;
 }
 
 export class ScrcpyVideoSizeImpl implements ScrcpyVideoSize {
@@ -19,19 +25,19 @@ export class ScrcpyVideoSizeImpl implements ScrcpyVideoSize {
         return this.#height;
     }
 
-    #sizeChanged = new StickyEventEmitter<{ width: number; height: number }>();
+    #sizeChanged = new StickyEventEmitter<ScrcpyVideoSizeChangedEvent>();
     get sizeChanged() {
         return this.#sizeChanged.event;
     }
 
-    setSize(width: number, height: number) {
+    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 });
+        this.#sizeChanged.fire({ width, height, isClientResize });
     }
 
     dispose() {

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

@@ -1,11 +0,0 @@
-import type { StructInit } from "@yume-chan/struct";
-import type { AndroidScreenPowerMode } from "../android/index.js";
-export declare const ScrcpySetDisplayPowerControlMessage: import("@yume-chan/struct").Struct<{
-    type: import("@yume-chan/struct").NumberField<number>;
-    mode: import("@yume-chan/struct").Field<AndroidScreenPowerMode, never, never, number>;
-}, undefined, import("@yume-chan/struct").FieldsValue<{
-    type: import("@yume-chan/struct").NumberField<number>;
-    mode: import("@yume-chan/struct").Field<AndroidScreenPowerMode, never, never, number>;
-}>>;
-export type ScrcpySetScreenPowerModeControlMessage = StructInit<typeof ScrcpySetDisplayPowerControlMessage>;
-//# sourceMappingURL=set-screen-power-mode.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"set-screen-power-mode.d.ts","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,eAAO,MAAM,mCAAmC;;;;;;GAO/C,CAAC;AAEF,MAAM,MAAM,sCAAsC,GAAG,UAAU,CAC3D,OAAO,mCAAmC,CAC7C,CAAC"}

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

@@ -1,7 +0,0 @@
-import { struct, u8 } from "@yume-chan/struct";
-export const ScrcpySetDisplayPowerControlMessage = struct({
-    // value of `type` can change between versions
-    type: u8,
-    mode: u8(),
-}, { littleEndian: false });
-//# sourceMappingURL=set-screen-power-mode.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"set-screen-power-mode.js","sourceRoot":"","sources":["../../src/control/set-screen-power-mode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,mBAAmB,CAAC;AAI/C,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CACrD;IACI,8CAA8C;IAC9C,IAAI,EAAE,EAAE;IACR,IAAI,EAAE,EAAE,EAA0B;CACrC,EACD,EAAE,YAAY,EAAE,KAAK,EAAE,CAC1B,CAAC"}

package/src/control/set-screen-power-mode.ts

@@ -1,17 +0,0 @@
-import type { StructInit } from "@yume-chan/struct";
-import { struct, u8 } from "@yume-chan/struct";
-
-import type { AndroidScreenPowerMode } from "../android/index.js";
-
-export const ScrcpySetDisplayPowerControlMessage = struct(
-    {
-        // value of `type` can change between versions
-        type: u8,
-        mode: u8<AndroidScreenPowerMode>(),
-    },
-    { littleEndian: false },
-);
-
-export type ScrcpySetScreenPowerModeControlMessage = StructInit<
-    typeof ScrcpySetDisplayPowerControlMessage
->;