@yume-chan/scrcpy 1.1.0 → 2.0.1

package/src/2_6/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -41,12 +42,12 @@ import {
     UHidOutputStream,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_6<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -66,9 +67,8 @@ export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
         return this.#uHidOutput;
     }
 
-    constructor(init: Init, version = "2.6") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -89,7 +89,7 @@ export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -122,7 +122,7 @@ export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -183,8 +183,8 @@ export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_6 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/2_6_1.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions2_6 } from "./2_6/index.js";
 
-export class ScrcpyOptions2_6_1 extends ScrcpyOptions2_6 {
-    constructor(init: ScrcpyOptions2_6.Init, version = "2.6.1") {
-        super(init, version);
+export class ScrcpyOptions2_6_1<
+    TVideo extends boolean,
+> extends ScrcpyOptions2_6<TVideo> {
+    constructor(init: ScrcpyOptions2_6.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions2_6Impl as ScrcpyOptions2_6_1Impl } from "./2_6/index.js";
+export namespace ScrcpyOptions2_6_1 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions2_6.Init<TVideo>;
+}

package/src/2_7/index.ts

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

package/src/2_7/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -41,12 +42,12 @@ import {
     UHidOutputStream,
 } from "./impl/index.js";
 
-export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions2_7<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -66,9 +67,8 @@ export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
         return this.#uHidOutput;
     }
 
-    constructor(init: Init, version = "2.7") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -89,7 +89,7 @@ export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -122,7 +122,7 @@ export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -183,8 +183,8 @@ export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions2_7 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/3_0/impl/defaults.ts

@@ -12,4 +12,4 @@ export const Defaults = /* #__PURE__ */ (() =>
         listApps: false,
         newDisplay: undefined,
         vdSystemDecorations: true,
-    }) as const satisfies Required<Init>)();
+    }) as const satisfies Required<Init<true>>)();

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

@@ -106,7 +106,8 @@ export class NewDisplay implements ScrcpyOptionValue {
     }
 }
 
-export interface Init extends Omit<PrevImpl.Init, "lockVideoOrientation"> {
+export interface Init<TVideo extends boolean>
+    extends Omit<PrevImpl.Init<TVideo>, "lockVideoOrientation"> {
     captureOrientation?: CaptureOrientation | string | undefined;
     angle?: number;
     screenOffTimeout?: number | undefined;

package/src/3_0/index.ts

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

package/src/3_0/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -41,12 +42,12 @@ import {
     UHidOutputStream,
 } from "./impl/index.js";
 
-export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions3_0<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -66,9 +67,8 @@ export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
         return this.#uHidOutput;
     }
 
-    constructor(init: Init, version = "3.0") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -89,7 +89,7 @@ export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -122,7 +122,7 @@ export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -183,8 +183,8 @@ export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions3_0 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/3_0_1.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions3_0 } from "./3_0/index.js";
 
-export class ScrcpyOptions3_0_1 extends ScrcpyOptions3_0 {
-    constructor(init: ScrcpyOptions3_0.Init, version = "3.0.1") {
-        super(init, version);
+export class ScrcpyOptions3_0_1<
+    TVideo extends boolean,
+> extends ScrcpyOptions3_0<TVideo> {
+    constructor(init: ScrcpyOptions3_0.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions3_0Impl as ScrcpyOptions3_0_1Impl } from "./3_0/index.js";
+export namespace ScrcpyOptions3_0_1 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_0.Init<TVideo>;
+}

package/src/3_0_2.ts

@@ -1,9 +1,14 @@
 import { ScrcpyOptions3_0 } from "./3_0/index.js";
 
-export class ScrcpyOptions3_0_2 extends ScrcpyOptions3_0 {
-    constructor(init: ScrcpyOptions3_0.Init, version = "3.0.2") {
-        super(init, version);
+export class ScrcpyOptions3_0_2<
+    TVideo extends boolean,
+> extends ScrcpyOptions3_0<TVideo> {
+    constructor(init: ScrcpyOptions3_0.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions3_0Impl as ScrcpyOptions3_0_2Impl } from "./3_0/index.js";
+export namespace ScrcpyOptions3_0_2 {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_0.Init<TVideo>;
+}

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

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

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

@@ -1,5 +1,5 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends PrevImpl.Init {
+export interface Init<TVideo extends boolean> extends PrevImpl.Init<TVideo> {
     vdDestroyContent?: boolean;
 }

package/src/3_1/index.ts

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

package/src/3_1/options.ts

@@ -1,6 +1,6 @@
 import type { MaybePromiseLike } from "@yume-chan/async";
 import type { ReadableStream, TransformStream } from "@yume-chan/stream-extra";
-import type { AsyncExactReadable } from "@yume-chan/struct";
+import type { AsyncExactReadable, ExactReadable } from "@yume-chan/struct";
 
 import type {
     ScrcpyAudioStreamMetadata,
@@ -9,6 +9,7 @@ import type {
     ScrcpyEncoder,
     ScrcpyMediaStreamPacket,
     ScrcpyOptions,
+    ScrcpyOptionsListEncoders,
     ScrcpyScrollController,
     ScrcpyVideoStream,
 } from "../base/index.js";
@@ -41,12 +42,12 @@ import {
     UHidOutputStream,
 } from "./impl/index.js";
 
-export class ScrcpyOptions3_1 implements ScrcpyOptions<Init> {
+export class ScrcpyOptions3_1<TVideo extends boolean>
+    implements ScrcpyOptions<Init<TVideo>>, ScrcpyOptionsListEncoders
+{
     static readonly Defaults = Defaults;
 
-    readonly version: string;
-
-    readonly value: Required<Init>;
+    readonly value: Required<Init<TVideo>>;
 
     get controlMessageTypes(): readonly ScrcpyControlMessageType[] {
         return ControlMessageTypes;
@@ -66,9 +67,8 @@ export class ScrcpyOptions3_1 implements ScrcpyOptions<Init> {
         return this.#uHidOutput;
     }
 
-    constructor(init: Init, version = "3.1") {
-        this.value = { ...Defaults, ...init };
-        this.version = version;
+    constructor(init: Init<TVideo>) {
+        this.value = { ...Defaults, ...init } as never;
 
         if (this.value.videoSource === "camera") {
             this.value.control = false;
@@ -89,7 +89,7 @@ export class ScrcpyOptions3_1 implements ScrcpyOptions<Init> {
     }
 
     serialize(): string[] {
-        return serialize(this.value, Defaults);
+        return serialize<Init<boolean>>(this.value, Defaults);
     }
 
     setListDisplays(): void {
@@ -122,7 +122,7 @@ export class ScrcpyOptions3_1 implements ScrcpyOptions<Init> {
 
     async parseDeviceMessage(
         id: number,
-        stream: AsyncExactReadable,
+        stream: ExactReadable | AsyncExactReadable,
     ): Promise<void> {
         if (await this.#clipboard?.parse(id, stream)) {
             return;
@@ -183,8 +183,8 @@ export class ScrcpyOptions3_1 implements ScrcpyOptions<Init> {
     }
 }
 
-type Init_ = Init;
+type Init_<TVideo extends boolean> = Init<TVideo>;
 
 export namespace ScrcpyOptions3_1 {
-    export type Init = Init_;
+    export type Init<TVideo extends boolean = boolean> = Init_<TVideo>;
 }

package/src/android/key-event.ts

@@ -30,8 +30,9 @@ export type AndroidKeyEventMeta =
     (typeof AndroidKeyEventMeta)[keyof typeof AndroidKeyEventMeta];
 
 // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/core/java/android/view/KeyEvent.java;l=97;drc=95c1165bb895dd844e1793460710f7163dd330a3
-// Most names follow Web API `KeyboardEvent.code`,
-// Android-only (not exist in HID keyboard standard) keys are prefixed by `Android`.
+// Android key code to Chrome key code: https://source.chromium.org/chromium/chromium/src/+/main:ui/events/keycodes/keyboard_code_conversion_android.cc
+// Chrome key code to DOM key code: https://source.chromium.org/chromium/chromium/src/+/main:ui/events/keycodes/dom/dom_code_data.inc
+// Some keys are not mapped to `KeyboardEvent.code`, only to `KeyboardEvent.key`: https://source.chromium.org/chromium/chromium/src/+/main:ui/events/keycodes/dom/dom_key_data.inc
 export const AndroidKeyCode = {
     AndroidHome: 3,
     AndroidBack: 4,

package/src/base/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 {
     ScrcpyBackOrScreenOnControlMessage,
@@ -19,8 +19,6 @@ import type { ScrcpyScrollController } from "./scroll-controller.js";
 import type { ScrcpyVideoStream } from "./video.js";
 
 export interface ScrcpyOptions<T extends object> {
-    get version(): string;
-
     get controlMessageTypes(): readonly ScrcpyControlMessageType[];
 
     value: Required<T>;
@@ -37,10 +35,6 @@ export interface ScrcpyOptions<T extends object> {
 
     parseDisplay(line: string): ScrcpyDisplay | undefined;
 
-    setListEncoders?(): void;
-
-    parseEncoder?(line: string): ScrcpyEncoder | undefined;
-
     parseVideoStreamMetadata(
         stream: ReadableStream<Uint8Array>,
     ): MaybePromiseLike<ScrcpyVideoStream>;
@@ -49,7 +43,10 @@ export interface ScrcpyOptions<T extends object> {
         stream: ReadableStream<Uint8Array>,
     ): MaybePromiseLike<ScrcpyAudioStreamMetadata>;
 
-    parseDeviceMessage(id: number, stream: AsyncExactReadable): Promise<void>;
+    parseDeviceMessage(
+        id: number,
+        stream: ExactReadable | AsyncExactReadable,
+    ): Promise<void>;
 
     endDeviceMessageStream(e?: unknown): void;
 
@@ -76,3 +73,9 @@ export interface ScrcpyOptions<T extends object> {
         message: ScrcpyUHidCreateControlMessage,
     ): Uint8Array;
 }
+
+export interface ScrcpyOptionsListEncoders {
+    setListEncoders(): void;
+
+    parseEncoder(line: string): ScrcpyEncoder | undefined;
+}

package/src/codec/h265.ts

@@ -330,8 +330,10 @@ export function h265ParseSequenceParameterSet(nalu: Uint8Array) {
     if (pcm_enabled_flag) {
         pcm_sample_bit_depth_luma_minus1 = reader.read(4);
         pcm_sample_bit_depth_chroma_minus1 = reader.read(4);
-        log2_min_pcm_luma_coding_block_size_minus3 = reader.read(4);
-        log2_diff_max_min_pcm_luma_coding_block_size = reader.read(4);
+        log2_min_pcm_luma_coding_block_size_minus3 =
+            reader.decodeExponentialGolombNumber();
+        log2_diff_max_min_pcm_luma_coding_block_size =
+            reader.decodeExponentialGolombNumber();
         pcm_loop_filter_disabled_flag = !!reader.next();
     }
 
@@ -894,6 +896,30 @@ export function h265ParseShortTermReferencePictureSet(
     };
 }
 
+export const H265AspectRatioIndicator = {
+    Unspecified: 0,
+    Square: 1,
+    _12_11: 2,
+    _10_11: 3,
+    _16_11: 4,
+    _40_33: 5,
+    _24_11: 6,
+    _20_11: 7,
+    _32_11: 8,
+    _80_33: 9,
+    _18_11: 10,
+    _15_11: 11,
+    _64_33: 12,
+    _160_99: 13,
+    _4_3: 15,
+    _3_2: 16,
+    _2_1: 17,
+    Extended: 255,
+} as const;
+
+export type H265AspectRatioIndicator =
+    (typeof H265AspectRatioIndicator)[keyof typeof H265AspectRatioIndicator];
+
 /**
  * E.2.1 VUI parameters syntax
  */
@@ -902,12 +928,12 @@ export function h265ParseVuiParameters(
     sps_max_sub_layers_minus1: number,
 ) {
     const aspect_ratio_info_present_flag = !!reader.next();
-    let aspect_ratio_idc: number | undefined;
+    let aspect_ratio_idc: H265AspectRatioIndicator | undefined;
     let sar_width: number | undefined;
     let sar_height: number | undefined;
     if (aspect_ratio_info_present_flag) {
-        aspect_ratio_idc = reader.read(8);
-        if (aspect_ratio_idc === 255) {
+        aspect_ratio_idc = reader.read(8) as H265AspectRatioIndicator;
+        if (aspect_ratio_idc === H265AspectRatioIndicator.Extended) {
             sar_width = reader.read(16);
             sar_height = reader.read(16);
         }

package/src/latest.ts

@@ -1,12 +1,17 @@
 import { ScrcpyOptions3_1 } from "./3_1/options.js";
 
-export class ScrcpyOptionsLatest extends ScrcpyOptions3_1 {
-    constructor(init: ScrcpyOptions3_1.Init, version: string) {
-        super(init, version);
+export class ScrcpyOptionsLatest<
+    TVideo extends boolean,
+> extends ScrcpyOptions3_1<TVideo> {
+    constructor(init: ScrcpyOptions3_1.Init<TVideo>) {
+        super(init);
     }
 }
 
-export { ScrcpyOptions3_1Impl as ScrcpyOptionsLatestImpl } from "./3_1/index.js";
+export namespace ScrcpyOptionsLatest {
+    export type Init<TVideo extends boolean = boolean> =
+        ScrcpyOptions3_1.Init<TVideo>;
+}
 
 export {
     BackOrScreenOnControlMessage as ScrcpyBackOrScreenOnControlMessage,

package/src/utils/index.ts

@@ -1,4 +1,3 @@
 export * from "./clamp.js";
 export * from "./constants.js";
 export * from "./omit.js";
-export * from "./wrapper.js";