@yume-chan/scrcpy 0.0.17 → 0.0.19

package/esm/options/types.d.ts

@@ -1,45 +1,47 @@
-import type { TransformStream } from '@yume-chan/stream-extra';
-import type { ScrcpyControlMessageType } from '../control/index.js';
-import type { ScrcpyBackOrScreenOnControlMessage1_18 } from './1_18.js';
-import type { ScrcpyInjectScrollControlMessage1_22 } from './1_22.js';
-export declare const DEFAULT_SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
-export interface ScrcpyOptionValue {
-    toOptionValue(): string | undefined;
-}
-export declare function isScrcpyOptionValue(value: any): value is ScrcpyOptionValue;
-export declare function toScrcpyOptionValue<T>(value: any, empty: T): string | T;
-export interface H264Configuration {
-    profileIndex: number;
-    constraintSet: number;
-    levelIndex: number;
-    encodedWidth: number;
-    encodedHeight: number;
-    cropLeft: number;
-    cropRight: number;
-    cropTop: number;
-    cropBottom: number;
-    croppedWidth: number;
-    croppedHeight: number;
-}
-export interface ScrcpyVideoStreamConfigurationPacket {
-    type: 'configuration';
-    data: H264Configuration;
-}
-export interface ScrcpyVideoStreamFramePacket {
-    type: 'frame';
-    keyframe?: boolean | undefined;
-    pts?: bigint | undefined;
-    data: Uint8Array;
-}
-export declare type ScrcpyVideoStreamPacket = ScrcpyVideoStreamConfigurationPacket | ScrcpyVideoStreamFramePacket;
-export interface ScrcpyOptions<T> {
-    value: Partial<T>;
-    getDefaultValue(): T;
-    formatServerArguments(): string[];
-    getOutputEncoderNameRegex(): RegExp;
-    createVideoStreamTransformer(): TransformStream<Uint8Array, ScrcpyVideoStreamPacket>;
-    getControlMessageTypes(): ScrcpyControlMessageType[];
-    serializeBackOrScreenOnControlMessage(message: ScrcpyBackOrScreenOnControlMessage1_18): Uint8Array | undefined;
-    serializeInjectScrollControlMessage(message: ScrcpyInjectScrollControlMessage1_22): Uint8Array;
-}
+import type { TransformStream } from "@yume-chan/stream-extra";
+import type { ScrcpyBackOrScreenOnControlMessage, ScrcpyControlMessageType, ScrcpySetClipboardControlMessage } from "../control/index.js";
+import type { ScrcpyScrollController } from "./1_16/scroll.js";
+export declare const DEFAULT_SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+export interface ScrcpyOptionValue {
+    toOptionValue(): string | undefined;
+}
+export declare function isScrcpyOptionValue(value: unknown): value is ScrcpyOptionValue;
+export declare function toScrcpyOptionValue<T>(value: unknown, empty: T): string | T;
+export interface H264Configuration {
+    profileIndex: number;
+    constraintSet: number;
+    levelIndex: number;
+    encodedWidth: number;
+    encodedHeight: number;
+    cropLeft: number;
+    cropRight: number;
+    cropTop: number;
+    cropBottom: number;
+    croppedWidth: number;
+    croppedHeight: number;
+}
+export interface ScrcpyVideoStreamConfigurationPacket {
+    type: "configuration";
+    sequenceParameterSet: Uint8Array;
+    pictureParameterSet: Uint8Array;
+    data: H264Configuration;
+}
+export interface ScrcpyVideoStreamFramePacket {
+    type: "frame";
+    keyframe?: boolean;
+    pts?: bigint;
+    data: Uint8Array;
+}
+export type ScrcpyVideoStreamPacket = ScrcpyVideoStreamConfigurationPacket | ScrcpyVideoStreamFramePacket;
+export interface ScrcpyOptions<T extends object> {
+    value: Partial<T>;
+    getDefaultValue(): T;
+    formatServerArguments(): string[];
+    getOutputEncoderNameRegex(): RegExp;
+    createVideoStreamTransformer(): TransformStream<Uint8Array, ScrcpyVideoStreamPacket>;
+    getControlMessageTypes(): ScrcpyControlMessageType[];
+    serializeBackOrScreenOnControlMessage(message: ScrcpyBackOrScreenOnControlMessage): Uint8Array | undefined;
+    serializeSetClipboardControlMessage(message: ScrcpySetClipboardControlMessage): Uint8Array;
+    getScrollController(): ScrcpyScrollController;
+}
 //# sourceMappingURL=types.d.ts.map

package/esm/options/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EAAE,sCAAsC,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,WAAW,CAAC;AAEtE,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IAC9B,aAAa,IAAI,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,iBAAiB,CAI1E;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,CAUvE;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IAEtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,oCAAoC;IACjD,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,iBAAiB,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IACzC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,UAAU,CAAC;CACpB;AAED,oBAAY,uBAAuB,GAC7B,oCAAoC,GACpC,4BAA4B,CAAC;AAEnC,MAAM,WAAW,aAAa,CAAC,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAElB,eAAe,IAAI,CAAC,CAAC;IAErB,qBAAqB,IAAI,MAAM,EAAE,CAAC;IAElC,yBAAyB,IAAI,MAAM,CAAC;IAEpC,4BAA4B,IAAI,eAAe,CAAC,UAAU,EAAE,uBAAuB,CAAC,CAAC;IAErF,sBAAsB,IAAI,wBAAwB,EAAE,CAAC;IAErD,qCAAqC,CACjC,OAAO,EAAE,sCAAsC,GAChD,UAAU,GAAG,SAAS,CAAC;IAE1B,mCAAmC,CAC/B,OAAO,EAAE,oCAAoC,GAC9C,UAAU,CAAC;CACjB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EACR,kCAAkC,EAClC,wBAAwB,EACxB,gCAAgC,EACnC,MAAM,qBAAqB,CAAC;AAE7B,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,eAAO,MAAM,mBAAmB,sCAAsC,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IAC9B,aAAa,IAAI,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,wBAAgB,mBAAmB,CAC/B,KAAK,EAAE,OAAO,GACf,KAAK,IAAI,iBAAiB,CAO5B;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,CAW3E;AAED,MAAM,WAAW,iBAAiB;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IAEtB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IAEnB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,oCAAoC;IACjD,IAAI,EAAE,eAAe,CAAC;IACtB,oBAAoB,EAAE,UAAU,CAAC;IACjC,mBAAmB,EAAE,UAAU,CAAC;IAChC,IAAI,EAAE,iBAAiB,CAAC;CAC3B;AAED,MAAM,WAAW,4BAA4B;IACzC,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC;CACpB;AAED,MAAM,MAAM,uBAAuB,GAC7B,oCAAoC,GACpC,4BAA4B,CAAC;AAEnC,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,MAAM;IAC3C,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IAElB,eAAe,IAAI,CAAC,CAAC;IAErB,qBAAqB,IAAI,MAAM,EAAE,CAAC;IAElC,yBAAyB,IAAI,MAAM,CAAC;IAEpC,4BAA4B,IAAI,eAAe,CAC3C,UAAU,EACV,uBAAuB,CAC1B,CAAC;IAEF,sBAAsB,IAAI,wBAAwB,EAAE,CAAC;IAErD,qCAAqC,CACjC,OAAO,EAAE,kCAAkC,GAC5C,UAAU,GAAG,SAAS,CAAC;IAE1B,mCAAmC,CAC/B,OAAO,EAAE,gCAAgC,GAC1C,UAAU,CAAC;IAEd,mBAAmB,IAAI,sBAAsB,CAAC;CACjD"}

package/esm/options/types.js

@@ -1,16 +1,18 @@
-export const DEFAULT_SERVER_PATH = '/data/local/tmp/scrcpy-server.jar';
-export function isScrcpyOptionValue(value) {
-    return typeof value === 'object' &&
-        value !== null &&
-        typeof value.toOptionValue === 'function';
-}
-export function toScrcpyOptionValue(value, empty) {
-    if (isScrcpyOptionValue(value)) {
-        value = value.toOptionValue();
-    }
-    if (value === undefined) {
-        return empty;
-    }
-    return `${value}`;
-}
+export const DEFAULT_SERVER_PATH = "/data/local/tmp/scrcpy-server.jar";
+export function isScrcpyOptionValue(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        "toOptionValue" in value &&
+        typeof value.toOptionValue === "function");
+}
+export function toScrcpyOptionValue(value, empty) {
+    if (isScrcpyOptionValue(value)) {
+        value = value.toOptionValue();
+    }
+    // `value` may become `undefined` after `toOptionValue`
+    if (value === undefined) {
+        return empty;
+    }
+    return String(value);
+}
 //# sourceMappingURL=types.js.map

package/esm/options/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAMA,MAAM,CAAC,MAAM,mBAAmB,GAAG,mCAAmC,CAAC;AAMvE,MAAM,UAAU,mBAAmB,CAAC,KAAU;IAC1C,OAAO,OAAO,KAAK,KAAK,QAAQ;QAC5B,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,CAAC,aAAa,KAAK,UAAU,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAI,KAAU,EAAE,KAAQ;IACvD,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC5B,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;KACjC;IAED,IAAI,KAAK,KAAK,SAAS,EAAE;QACrB,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,GAAG,KAAK,EAAE,CAAC;AACtB,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/options/types.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,mBAAmB,GAAG,mCAAmC,CAAC;AAMvE,MAAM,UAAU,mBAAmB,CAC/B,KAAc;IAEd,OAAO,CACH,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,eAAe,IAAI,KAAK;QACxB,OAAO,KAAK,CAAC,aAAa,KAAK,UAAU,CAC5C,CAAC;AACN,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAI,KAAc,EAAE,KAAQ;IAC3D,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE;QAC5B,KAAK,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;KACjC;IAED,uDAAuD;IACvD,IAAI,KAAK,KAAK,SAAS,EAAE;QACrB,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/scrcpy",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "TypeScript implementation of Scrcpy.",
   "keywords": [
     "adb",
@@ -29,26 +29,33 @@
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "dependencies": {
-    "@yume-chan/adb": "^0.0.17",
     "@yume-chan/async": "^2.2.0",
-    "@yume-chan/event": "^0.0.17",
-    "@yume-chan/stream-extra": "^0.0.17",
-    "@yume-chan/struct": "^0.0.17",
-    "tslib": "^2.4.0"
+    "@yume-chan/event": "^0.0.19",
+    "@yume-chan/stream-extra": "^0.0.19",
+    "@yume-chan/struct": "^0.0.19",
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
-    "@jest/globals": "^28.1.2",
-    "@yume-chan/ts-package-builder": "^1.0.0",
+    "@jest/globals": "^29.5.0",
+    "@yume-chan/adb": "^0.0.19",
+    "@yume-chan/eslint-config": "^1.0.0",
+    "@yume-chan/tsconfig": "^1.0.0",
     "cross-env": "^7.0.3",
+    "eslint": "^8.36.0",
     "gh-release-fetch": "^3.0.2",
-    "jest": "^28.1.2",
-    "ts-jest": "^28.0.5",
-    "typescript": "^4.7.4"
+    "jest": "^29.5.0",
+    "prettier": "^2.8.4",
+    "ts-jest": "^29.0.4",
+    "typescript": "^4.9.4"
   },
   "peerDependencies": {
+    "@yume-chan/adb": "^0.0.19",
     "gh-release-fetch": "^3.0.2"
   },
   "peerDependenciesMeta": {
+    "@yume-chan/adb": {
+      "optional": true
+    },
     "gh-release-fetch": {
       "optional": true
     }
@@ -56,6 +63,7 @@
   "scripts": {
     "build": "tsc -b tsconfig.build.json",
     "build:watch": "tsc -b tsconfig.build.json",
-    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage"
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage",
+    "lint": "eslint src/**/*.ts --fix && prettier src/**/*.ts --write --tab-width 4"
   }
 }

package/scripts/fetch-server.cjs

@@ -1,17 +1,21 @@
 #!/usr/bin/env node
 
-const { fetchVersion } = require('gh-release-fetch');
-const path = require('path');
-const fs = require('fs').promises;
+const { fetchVersion } = require("gh-release-fetch");
+const path = require("path");
+const fs = require("fs").promises;
 
 (async () => {
     const serverVersion = process.argv[2];
-    console.log(`Downloading Scrcpy server binary version ${serverVersion}...`);
+    if (!serverVersion) {
+        console.log("Usage: fetch-scrcpy-server <version>");
+        process.exit(1);
+    }
 
-    const binFolder = path.resolve(__dirname, '..', 'bin');
+    console.log(`Downloading Scrcpy server binary version ${serverVersion}...`);
+    const binFolder = path.resolve(__dirname, "..", "bin");
 
     await fetchVersion({
-        repository: 'Genymobile/scrcpy',
+        repository: "Genymobile/scrcpy",
         version: `v${serverVersion}`,
         package: `scrcpy-server-v${serverVersion}`,
         destination: binFolder,
@@ -20,9 +24,15 @@ const fs = require('fs').promises;
 
     await fs.rename(
         path.resolve(binFolder, `scrcpy-server-v${serverVersion}`),
-        path.resolve(binFolder, 'scrcpy-server')
+        path.resolve(binFolder, "scrcpy-server")
     );
 
-    fs.writeFile(path.resolve(binFolder, 'version.js'), `export default '${serverVersion}';`);
-    fs.writeFile(path.resolve(binFolder, 'version.d.ts'), `export default '${serverVersion}';`);
+    fs.writeFile(
+        path.resolve(binFolder, "version.js"),
+        `export default '${serverVersion}';`
+    );
+    fs.writeFile(
+        path.resolve(binFolder, "version.d.ts"),
+        `export default '${serverVersion}';`
+    );
 })();