@yume-chan/adb 0.0.18 → 0.0.20

package/esm/commands/sync/sync.js

@@ -1,150 +1,124 @@
-import { AutoDisposable } from "@yume-chan/event";
-import { BufferedReadableStream, WrapReadableStream, WrapWritableStream, } from "@yume-chan/stream-extra";
-import { AdbFeatures } from "../../features.js";
-import { AutoResetEvent } from "../../utils/index.js";
-import { escapeArg } from "../subprocess/index.js";
-import { adbSyncOpenDir } from "./list.js";
-import { adbSyncPull } from "./pull.js";
-import { adbSyncPush } from "./push.js";
-import { adbSyncLstat, adbSyncStat } from "./stat.js";
-/**
- * A simplified `dirname` function that only handles absolute unix paths.
- * @param path an absolute unix path
- * @returns the directory name of the input path
- */
-export function dirname(path) {
-    const end = path.lastIndexOf("/");
-    if (end === -1) {
-        throw new Error(`Invalid path`);
-    }
-    if (end === 0) {
-        return "/";
-    }
-    return path.substring(0, end);
-}
-export class AdbSync extends AutoDisposable {
-    adb;
-    stream;
-    // Getting another writer on a locked WritableStream will throw.
-    // We don't want this behavior on higher-level APIs.
-    // So we acquire the writer early and use a blocking lock to guard it.
-    writer;
-    sendLock = this.addDisposable(new AutoResetEvent());
-    get supportsStat() {
-        return this.adb.features.includes(AdbFeatures.StatV2);
-    }
-    get supportsList2() {
-        return this.adb.features.includes(AdbFeatures.ListV2);
-    }
-    get fixedPushMkdir() {
-        return this.adb.features.includes(AdbFeatures.FixedPushMkdir);
-    }
-    get needPushMkdirWorkaround() {
-        // https://android.googlesource.com/platform/packages/modules/adb/+/91768a57b7138166e0a3d11f79cd55909dda7014/client/file_sync_client.cpp#1361
-        return (this.adb.features.includes(AdbFeatures.ShellV2) &&
-            !this.fixedPushMkdir);
-    }
-    constructor(adb, socket) {
-        super();
-        this.adb = adb;
-        this.stream = new BufferedReadableStream(socket.readable);
-        this.writer = socket.writable.getWriter();
-    }
-    async lstat(path) {
-        await this.sendLock.wait();
-        try {
-            return adbSyncLstat(this.stream, this.writer, path, this.supportsStat);
-        }
-        finally {
-            this.sendLock.notify();
-        }
-    }
-    async stat(path) {
-        if (!this.supportsStat) {
-            throw new Error("Not supported");
-        }
-        await this.sendLock.wait();
-        try {
-            return adbSyncStat(this.stream, this.writer, path);
-        }
-        finally {
-            this.sendLock.notify();
-        }
-    }
-    async isDirectory(path) {
-        try {
-            await this.lstat(path + "/");
-            return true;
-        }
-        catch (e) {
-            return false;
-        }
-    }
-    async *opendir(path) {
-        await this.sendLock.wait();
-        try {
-            yield* adbSyncOpenDir(this.stream, this.writer, path, this.supportsList2);
-        }
-        finally {
-            this.sendLock.notify();
-        }
-    }
-    async readdir(path) {
-        const results = [];
-        for await (const entry of this.opendir(path)) {
-            results.push(entry);
-        }
-        return results;
-    }
-    /**
-     * Read the content of a file on device.
-     *
-     * @param filename The full path of the file on device to read.
-     * @returns A `ReadableStream` that reads from the file.
-     */
-    read(filename) {
-        return new WrapReadableStream({
-            start: async () => {
-                await this.sendLock.wait();
-                return adbSyncPull(this.stream, this.writer, filename);
-            },
-            close: () => {
-                this.sendLock.notify();
-            },
-        });
-    }
-    /**
-     * Write (or overwrite) a file on device.
-     *
-     * @param filename The full path of the file on device to write.
-     * @param mode The unix permissions of the file.
-     * @param mtime The modified time of the file.
-     * @returns A `WritableStream` that writes to the file.
-     */
-    write(filename, mode, mtime) {
-        return new WrapWritableStream({
-            start: async () => {
-                await this.sendLock.wait();
-                if (this.needPushMkdirWorkaround) {
-                    // It may fail if the path is already existed.
-                    // Ignore the result.
-                    // TODO: sync: test push mkdir workaround (need an Android 8 device)
-                    await this.adb.subprocess.spawnAndWait([
-                        "mkdir",
-                        "-p",
-                        escapeArg(dirname(filename)),
-                    ]);
-                }
-                return adbSyncPush(this.stream, this.writer, filename, mode, mtime);
-            },
-            close: () => {
-                this.sendLock.notify();
-            },
-        });
-    }
-    async dispose() {
-        super.dispose();
-        await this.writer.close();
-    }
-}
+import { AutoDisposable } from "@yume-chan/event";
+import { AdbFeature } from "../../features.js";
+import { escapeArg } from "../subprocess/index.js";
+import { adbSyncOpenDir } from "./list.js";
+import { adbSyncPull } from "./pull.js";
+import { adbSyncPush } from "./push.js";
+import { AdbSyncSocket } from "./socket.js";
+import { adbSyncLstat, adbSyncStat } from "./stat.js";
+/**
+ * A simplified `dirname` function that only handles absolute unix paths.
+ * @param path an absolute unix path
+ * @returns the directory name of the input path
+ */
+export function dirname(path) {
+    const end = path.lastIndexOf("/");
+    if (end === -1) {
+        throw new Error(`Invalid path`);
+    }
+    if (end === 0) {
+        return "/";
+    }
+    return path.substring(0, end);
+}
+export class AdbSync extends AutoDisposable {
+    _adb;
+    _socket;
+    #supportsStat;
+    #supportsListV2;
+    #fixedPushMkdir;
+    #supportsSendReceiveV2;
+    #needPushMkdirWorkaround;
+    get supportsStat() {
+        return this.#supportsStat;
+    }
+    get supportsListV2() {
+        return this.#supportsListV2;
+    }
+    get fixedPushMkdir() {
+        return this.#fixedPushMkdir;
+    }
+    get supportsSendReceiveV2() {
+        return this.#supportsSendReceiveV2;
+    }
+    get needPushMkdirWorkaround() {
+        return this.#needPushMkdirWorkaround;
+    }
+    constructor(adb, socket) {
+        super();
+        this._adb = adb;
+        this._socket = new AdbSyncSocket(socket, adb.maxPayloadSize);
+        this.#supportsStat = adb.supportsFeature(AdbFeature.StatV2);
+        this.#supportsListV2 = adb.supportsFeature(AdbFeature.ListV2);
+        this.#fixedPushMkdir = adb.supportsFeature(AdbFeature.FixedPushMkdir);
+        this.#supportsSendReceiveV2 = adb.supportsFeature(AdbFeature.SendReceiveV2);
+        // https://android.googlesource.com/platform/packages/modules/adb/+/91768a57b7138166e0a3d11f79cd55909dda7014/client/file_sync_client.cpp#1361
+        this.#needPushMkdirWorkaround =
+            this._adb.supportsFeature(AdbFeature.ShellV2) &&
+                !this.fixedPushMkdir;
+    }
+    async lstat(path) {
+        return await adbSyncLstat(this._socket, path, this.supportsStat);
+    }
+    async stat(path) {
+        if (!this.supportsStat) {
+            throw new Error("Not supported");
+        }
+        return await adbSyncStat(this._socket, path);
+    }
+    async isDirectory(path) {
+        try {
+            await this.lstat(path + "/");
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    opendir(path) {
+        return adbSyncOpenDir(this._socket, path, this.supportsListV2);
+    }
+    async readdir(path) {
+        const results = [];
+        for await (const entry of this.opendir(path)) {
+            results.push(entry);
+        }
+        return results;
+    }
+    /**
+     * Reads the content of a file on device.
+     *
+     * @param filename The full path of the file on device to read.
+     * @returns A `ReadableStream` that contains the file content.
+     */
+    read(filename) {
+        return adbSyncPull(this._socket, filename);
+    }
+    /**
+     * Writes a file on device. If the file name already exists, it will be overwritten.
+     *
+     * @param options The content and options of the file to write.
+     */
+    async write(options) {
+        if (this.needPushMkdirWorkaround) {
+            // It may fail if the path is already existed.
+            // Ignore the result.
+            // TODO: sync: test push mkdir workaround (need an Android 8 device)
+            await this._adb.subprocess.spawnAndWait([
+                "mkdir",
+                "-p",
+                escapeArg(dirname(options.filename)),
+            ]);
+        }
+        await adbSyncPush({
+            v2: this.supportsSendReceiveV2,
+            socket: this._socket,
+            ...options,
+        });
+    }
+    async dispose() {
+        super.dispose();
+        await this._socket.close();
+    }
+}
 //# sourceMappingURL=sync.js.map

package/esm/commands/sync/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/sync/sync.ts"],"names":[],"mappings":"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"}

package/esm/commands/tcpip.d.ts

@@ -1,6 +1,6 @@
-import { AdbCommandBase } from './base.js';
-export declare class AdbTcpIpCommand extends AdbCommandBase {
-    setPort(port: number): Promise<void>;
-    disable(): Promise<void>;
-}
+import { AdbCommandBase } from "./base.js";
+export declare class AdbTcpIpCommand extends AdbCommandBase {
+    setPort(port: number): Promise<string>;
+    disable(): Promise<string>;
+}
 //# sourceMappingURL=tcpip.d.ts.map

package/esm/commands/tcpip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tcpip.d.ts","sourceRoot":"","sources":["../../src/commands/tcpip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,qBAAa,eAAgB,SAAQ,cAAc;IAClC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAMxC"}
+{"version":3,"file":"tcpip.d.ts","sourceRoot":"","sources":["../../src/commands/tcpip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,qBAAa,eAAgB,SAAQ,cAAc;IAClC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAO1C"}

package/esm/commands/tcpip.js

@@ -1,19 +1,21 @@
-import { AdbCommandBase } from './base.js';
-export class AdbTcpIpCommand extends AdbCommandBase {
-    async setPort(port) {
-        if (port <= 0) {
-            throw new Error(`Invalid port ${port}`);
-        }
-        const output = await this.adb.createSocketAndWait(`tcpip:${port}`);
-        if (output !== `restarting in TCP mode port: ${port}\n`) {
-            throw new Error('Invalid response');
-        }
-    }
-    async disable() {
-        const output = await this.adb.createSocketAndWait('usb:');
-        if (output !== 'restarting in USB mode\n') {
-            throw new Error('Invalid response');
-        }
-    }
-}
+import { AdbCommandBase } from "./base.js";
+export class AdbTcpIpCommand extends AdbCommandBase {
+    async setPort(port) {
+        if (port <= 0) {
+            throw new Error(`Invalid port ${port}`);
+        }
+        const output = await this.adb.createSocketAndWait(`tcpip:${port}`);
+        if (output !== `restarting in TCP mode port: ${port}\n`) {
+            throw new Error(output);
+        }
+        return output;
+    }
+    async disable() {
+        const output = await this.adb.createSocketAndWait("usb:");
+        if (output !== "restarting in USB mode\n") {
+            throw new Error(output);
+        }
+        return output;
+    }
+}
 //# sourceMappingURL=tcpip.js.map

package/esm/commands/tcpip.js.map

@@ -1 +1 @@
-{"version":3,"file":"tcpip.js","sourceRoot":"","sources":["../../src/commands/tcpip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,OAAO,eAAgB,SAAQ,cAAc;IACxC,KAAK,CAAC,OAAO,CAAC,IAAY;QAC7B,IAAI,IAAI,IAAI,CAAC,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;SAC3C;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM,KAAK,gCAAgC,IAAI,IAAI,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;IACL,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,KAAK,0BAA0B,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACvC;IACL,CAAC;CACJ"}
+{"version":3,"file":"tcpip.js","sourceRoot":"","sources":["../../src/commands/tcpip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,OAAO,eAAgB,SAAQ,cAAc;IACxC,KAAK,CAAC,OAAO,CAAC,IAAY;QAC7B,IAAI,IAAI,IAAI,CAAC,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;SAC3C;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACnE,IAAI,MAAM,KAAK,gCAAgC,IAAI,IAAI,EAAE;YACrD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;SAC3B;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,OAAO;QAChB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC1D,IAAI,MAAM,KAAK,0BAA0B,EAAE;YACvC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;SAC3B;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}

package/esm/{auth.d.ts → daemon/auth.d.ts}

@@ -1,52 +1,51 @@
-import { type Disposable } from "@yume-chan/event";
-import { type ValueOrPromise } from "@yume-chan/struct";
-import { type AdbPacketData } from "./packet.js";
-export type AdbKeyIterable = Iterable<Uint8Array> | AsyncIterable<Uint8Array>;
-export interface AdbCredentialStore {
-    /**
-     * Generate and store a RSA private key with modulus length `2048` and public exponent `65537`.
-     *
-     * The returned `Uint8Array` is the private key in PKCS #8 format.
-     */
-    generateKey(): ValueOrPromise<Uint8Array>;
-    /**
-     * Synchronously or asynchronously iterate through all stored RSA private keys.
-     *
-     * Each call to `iterateKeys` must return a different iterator that iterate through all stored keys.
-     */
-    iterateKeys(): AdbKeyIterable;
-}
-export declare enum AdbAuthType {
-    Token = 1,
-    Signature = 2,
-    PublicKey = 3
-}
-export interface AdbAuthenticator {
-    /**
-     * @param getNextRequest
-     *
-     * Call this function to get the next authentication request packet from device.
-     *
-     * After calling `getNextRequest`, authenticator can `yield` a packet as response, or `return` to indicate its incapability of handling the request.
-     *
-     * After `return`, the `AdbAuthenticatorHandler` will move on to next authenticator and never go back.
-     *
-     * Calling `getNextRequest` multiple times without `yield` or `return` will always return the same request.
-     */
-    (credentialStore: AdbCredentialStore, getNextRequest: () => Promise<AdbPacketData>): AsyncIterable<AdbPacketData>;
-}
-export declare const AdbSignatureAuthenticator: AdbAuthenticator;
-export declare const AdbPublicKeyAuthenticator: AdbAuthenticator;
-export declare const ADB_DEFAULT_AUTHENTICATORS: AdbAuthenticator[];
-export declare class AdbAuthenticationProcessor implements Disposable {
-    readonly authenticators: readonly AdbAuthenticator[];
-    private readonly credentialStore;
-    private pendingRequest;
-    private iterator;
-    constructor(authenticators: readonly AdbAuthenticator[], credentialStore: AdbCredentialStore);
-    private getNextRequest;
-    private invokeAuthenticator;
-    process(packet: AdbPacketData): Promise<AdbPacketData>;
-    dispose(): void;
-}
+import type { Disposable } from "@yume-chan/event";
+import type { ValueOrPromise } from "@yume-chan/struct";
+import type { AdbPacketData } from "./packet.js";
+export type AdbKeyIterable = Iterable<Uint8Array> | AsyncIterable<Uint8Array>;
+export interface AdbCredentialStore {
+    /**
+     * Generate and store a RSA private key with modulus length `2048` and public exponent `65537`.
+     *
+     * The returned `Uint8Array` is the private key in PKCS #8 format.
+     */
+    generateKey(): ValueOrPromise<Uint8Array>;
+    /**
+     * Synchronously or asynchronously iterate through all stored RSA private keys.
+     *
+     * Each call to `iterateKeys` must return a different iterator that iterate through all stored keys.
+     */
+    iterateKeys(): AdbKeyIterable;
+}
+export declare enum AdbAuthType {
+    Token = 1,
+    Signature = 2,
+    PublicKey = 3
+}
+export interface AdbAuthenticator {
+    /**
+     * @param getNextRequest
+     *
+     * Call this function to get the next authentication request packet from device.
+     *
+     * After calling `getNextRequest`, authenticator can `yield` a packet as response, or `return` to indicate its incapability of handling the request.
+     *
+     * After `return`, the `AdbAuthenticatorHandler` will move on to next authenticator and never go back.
+     *
+     * Calling `getNextRequest` multiple times without `yield` or `return` will always return the same request.
+     */
+    (credentialStore: AdbCredentialStore, getNextRequest: () => Promise<AdbPacketData>): AsyncIterable<AdbPacketData>;
+}
+export declare const AdbSignatureAuthenticator: AdbAuthenticator;
+export declare const AdbPublicKeyAuthenticator: AdbAuthenticator;
+export declare const ADB_DEFAULT_AUTHENTICATORS: AdbAuthenticator[];
+export declare class AdbAuthenticationProcessor implements Disposable {
+    #private;
+    readonly authenticators: readonly AdbAuthenticator[];
+    private readonly credentialStore;
+    constructor(authenticators: readonly AdbAuthenticator[], credentialStore: AdbCredentialStore);
+    private getNextRequest;
+    private invokeAuthenticator;
+    process(packet: AdbPacketData): Promise<AdbPacketData>;
+    dispose(): void;
+}
 //# sourceMappingURL=auth.d.ts.map

package/esm/daemon/auth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/daemon/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC,UAAU,CAAC,CAAC;AAE9E,MAAM,WAAW,kBAAkB;IAC/B;;;;OAIG;IACH,WAAW,IAAI,cAAc,CAAC,UAAU,CAAC,CAAC;IAE1C;;;;OAIG;IACH,WAAW,IAAI,cAAc,CAAC;CACjC;AAED,oBAAY,WAAW;IACnB,KAAK,IAAI;IACT,SAAS,IAAI;IACb,SAAS,IAAI;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC7B;;;;;;;;;;OAUG;IACH,CACI,eAAe,EAAE,kBAAkB,EACnC,cAAc,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,GAC7C,aAAa,CAAC,aAAa,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,yBAAyB,EAAE,gBAmBvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,gBAqCvC,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,gBAAgB,EAGxD,CAAC;AAEF,qBAAa,0BAA2B,YAAW,UAAU;;IACzD,SAAgB,cAAc,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAE5D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;gBAMjD,cAAc,EAAE,SAAS,gBAAgB,EAAE,EAC3C,eAAe,EAAE,kBAAkB;IAMvC,OAAO,CAAC,cAAc,CAEpB;YAEa,mBAAmB;IAuBrB,OAAO,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAe5D,OAAO;CAGjB"}