@yume-chan/adb 2.6.2 → 3.0.0-beta.0

package/esm/daemon/auth.js

@@ -1,104 +0,0 @@
-import { PromiseResolver } from "@yume-chan/async";
-import { EmptyUint8Array } from "@yume-chan/struct";
-import { calculateBase64EncodedLength, encodeBase64, encodeUtf8, } from "../utils/index.js";
-import { adbGeneratePublicKey, adbGetPublicKeySize, rsaSign, } from "./crypto.js";
-import { AdbCommand } from "./packet.js";
-export const AdbAuthType = {
-    Token: 1,
-    Signature: 2,
-    PublicKey: 3,
-};
-export const AdbSignatureAuthenticator = async function* (credentialStore, getNextRequest) {
-    for await (const key of credentialStore.iterateKeys()) {
-        const packet = await getNextRequest();
-        if (packet.arg0 !== AdbAuthType.Token) {
-            return;
-        }
-        const signature = rsaSign(key.buffer, packet.payload);
-        yield {
-            command: AdbCommand.Auth,
-            arg0: AdbAuthType.Signature,
-            arg1: 0,
-            payload: signature,
-        };
-    }
-};
-export const AdbPublicKeyAuthenticator = async function* (credentialStore, getNextRequest) {
-    const packet = await getNextRequest();
-    if (packet.arg0 !== AdbAuthType.Token) {
-        return;
-    }
-    let privateKey;
-    for await (const key of credentialStore.iterateKeys()) {
-        privateKey = key;
-        break;
-    }
-    if (!privateKey) {
-        privateKey = await credentialStore.generateKey();
-    }
-    const publicKeyLength = adbGetPublicKeySize();
-    const [publicKeyBase64Length] = calculateBase64EncodedLength(publicKeyLength);
-    const nameBuffer = privateKey.name?.length
-        ? encodeUtf8(privateKey.name)
-        : EmptyUint8Array;
-    const publicKeyBuffer = new Uint8Array(publicKeyBase64Length +
-        (nameBuffer.length ? nameBuffer.length + 1 : 0) + // Space character + name
-        1);
-    adbGeneratePublicKey(privateKey.buffer, publicKeyBuffer);
-    encodeBase64(publicKeyBuffer.subarray(0, publicKeyLength), publicKeyBuffer);
-    if (nameBuffer.length) {
-        publicKeyBuffer[publicKeyBase64Length] = 0x20;
-        publicKeyBuffer.set(nameBuffer, publicKeyBase64Length + 1);
-    }
-    yield {
-        command: AdbCommand.Auth,
-        arg0: AdbAuthType.PublicKey,
-        arg1: 0,
-        payload: publicKeyBuffer,
-    };
-};
-export const ADB_DEFAULT_AUTHENTICATORS = [
-    AdbSignatureAuthenticator,
-    AdbPublicKeyAuthenticator,
-];
-export class AdbAuthenticationProcessor {
-    authenticators;
-    #credentialStore;
-    #pendingRequest = new PromiseResolver();
-    #iterator;
-    constructor(authenticators, credentialStore) {
-        this.authenticators = authenticators;
-        this.#credentialStore = credentialStore;
-    }
-    #getNextRequest = () => {
-        return this.#pendingRequest.promise;
-    };
-    async *#invokeAuthenticator() {
-        for (const authenticator of this.authenticators) {
-            for await (const packet of authenticator(this.#credentialStore, this.#getNextRequest)) {
-                // If the authenticator yielded a response
-                // Prepare `nextRequest` for next authentication request
-                this.#pendingRequest = new PromiseResolver();
-                // Yield the response to outer layer
-                yield packet;
-            }
-            // If the authenticator returned,
-            // Next authenticator will be given the same `pendingRequest`
-        }
-    }
-    async process(packet) {
-        if (!this.#iterator) {
-            this.#iterator = this.#invokeAuthenticator();
-        }
-        this.#pendingRequest.resolve(packet);
-        const result = await this.#iterator.next();
-        if (result.done) {
-            throw new Error("No authenticator can handle the request");
-        }
-        return result.value;
-    }
-    dispose() {
-        void this.#iterator?.return?.();
-    }
-}
-//# sourceMappingURL=auth.js.map

package/esm/daemon/auth.js.map

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

package/esm/server/stream.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stream.d.ts","sourceRoot":"","sources":["../../src/server/stream.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAgBzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnD,eAAO,MAAM,IAAI,6BAAqB,CAAC;AAEvC,qBAAa,eAAe;;gBAKZ,UAAU,EAAE,eAAe,CAAC,gBAAgB;IAMxD,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC;IAIzD,UAAU,sDAmBP;IAEG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBzB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/C,OAAO;;;;;;IAUD,OAAO;CAKhB"}

package/esm/server/stream.js.map

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

package/src/commands/base.ts

@@ -1,15 +0,0 @@
-import { AutoDisposable } from "@yume-chan/event";
-
-import type { Adb } from "../adb.js";
-
-export class AdbServiceBase extends AutoDisposable {
-    readonly #adb: Adb;
-    get adb() {
-        return this.#adb;
-    }
-
-    constructor(adb: Adb) {
-        super();
-        this.#adb = adb;
-    }
-}

package/src/commands/subprocess/none/service.ts

@@ -1,45 +0,0 @@
-import type { Adb } from "../../../adb.js";
-
-import { AdbNoneProtocolProcessImpl } from "./process.js";
-import { AdbNoneProtocolPtyProcess } from "./pty.js";
-import { AdbNoneProtocolSpawner } from "./spawner.js";
-
-export class AdbNoneProtocolSubprocessService extends AdbNoneProtocolSpawner {
-    readonly #adb: Adb;
-    get adb(): Adb {
-        return this.#adb;
-    }
-
-    constructor(adb: Adb) {
-        super(async (command, signal) => {
-            // `shell,raw:${command}` also triggers raw mode,
-            // But is not supported on Android version <7.
-            const socket = await this.#adb.createSocket(
-                `exec:${command.join(" ")}`,
-            );
-
-            if (signal?.aborted) {
-                await socket.close();
-                throw signal.reason;
-            }
-
-            return new AdbNoneProtocolProcessImpl(socket, signal);
-        });
-        this.#adb = adb;
-    }
-
-    async pty(
-        command?: string | readonly string[],
-    ): Promise<AdbNoneProtocolPtyProcess> {
-        if (command === undefined) {
-            command = "";
-        } else if (Array.isArray(command)) {
-            command = command.join(" ");
-        }
-
-        return new AdbNoneProtocolPtyProcess(
-            // https://github.com/microsoft/typescript/issues/17002
-            await this.#adb.createSocket(`shell:${command as string}`),
-        );
-    }
-}

package/src/commands/subprocess/none/spawner.ts

@@ -1,68 +0,0 @@
-import type { MaybePromiseLike } from "@yume-chan/async";
-import type {
-    AbortSignal,
-    MaybeConsumable,
-    ReadableStream,
-    WritableStream,
-} from "@yume-chan/stream-extra";
-import {
-    ConcatBufferStream,
-    ConcatStringStream,
-    TextDecoderStream,
-} from "@yume-chan/stream-extra";
-
-import { splitCommand } from "../utils.js";
-
-export interface AdbNoneProtocolProcess {
-    get stdin(): WritableStream<MaybeConsumable<Uint8Array>>;
-
-    /**
-     * Mix of stdout and stderr
-     */
-    get output(): ReadableStream<Uint8Array>;
-
-    get exited(): Promise<void>;
-
-    kill(): MaybePromiseLike<void>;
-}
-
-export class AdbNoneProtocolSpawner {
-    readonly #spawn: (
-        command: readonly string[],
-        signal: AbortSignal | undefined,
-    ) => Promise<AdbNoneProtocolProcess>;
-
-    constructor(
-        spawn: (
-            command: readonly string[],
-            signal: AbortSignal | undefined,
-        ) => Promise<AdbNoneProtocolProcess>,
-    ) {
-        this.#spawn = spawn;
-    }
-
-    spawn(
-        command: string | readonly string[],
-        signal?: AbortSignal,
-    ): Promise<AdbNoneProtocolProcess> {
-        signal?.throwIfAborted();
-
-        if (typeof command === "string") {
-            command = splitCommand(command);
-        }
-
-        return this.#spawn(command, signal);
-    }
-
-    async spawnWait(command: string | readonly string[]): Promise<Uint8Array> {
-        const process = await this.spawn(command);
-        return await process.output.pipeThrough(new ConcatBufferStream());
-    }
-
-    async spawnWaitText(command: string | readonly string[]): Promise<string> {
-        const process = await this.spawn(command);
-        return await process.output
-            .pipeThrough(new TextDecoderStream())
-            .pipeThrough(new ConcatStringStream());
-    }
-}

package/src/commands/subprocess/shell/service.ts

@@ -1,58 +0,0 @@
-import type { Adb } from "../../../adb.js";
-import { AdbFeature } from "../../../features.js";
-
-import { AdbShellProtocolProcessImpl } from "./process.js";
-import { AdbShellProtocolPtyProcess } from "./pty.js";
-import { AdbShellProtocolSpawner } from "./spawner.js";
-
-export class AdbShellProtocolSubprocessService extends AdbShellProtocolSpawner {
-    readonly #adb: Adb;
-    get adb() {
-        return this.#adb;
-    }
-
-    get isSupported() {
-        return this.#adb.canUseFeature(AdbFeature.ShellV2);
-    }
-
-    constructor(adb: Adb) {
-        super(async (command, signal) => {
-            const socket = await this.#adb.createSocket(
-                `shell,v2,raw:${command.join(" ")}`,
-            );
-
-            if (signal?.aborted) {
-                await socket.close();
-                throw signal.reason;
-            }
-
-            return new AdbShellProtocolProcessImpl(socket, signal);
-        });
-        this.#adb = adb;
-    }
-
-    async pty(options?: {
-        command?: string | readonly string[] | undefined;
-        terminalType?: string;
-    }): Promise<AdbShellProtocolPtyProcess> {
-        let service = "shell,v2,pty";
-
-        if (options?.terminalType) {
-            service += `,TERM=` + options.terminalType;
-        }
-
-        service += ":";
-
-        if (options) {
-            if (typeof options.command === "string") {
-                service += options.command;
-            } else if (Array.isArray(options.command)) {
-                service += options.command.join(" ");
-            }
-        }
-
-        return new AdbShellProtocolPtyProcess(
-            await this.#adb.createSocket(service),
-        );
-    }
-}

package/src/commands/subprocess/shell/spawner.ts

@@ -1,90 +0,0 @@
-import type { MaybePromiseLike } from "@yume-chan/async";
-import type {
-    AbortSignal,
-    MaybeConsumable,
-    ReadableStream,
-    WritableStream,
-} from "@yume-chan/stream-extra";
-import {
-    ConcatBufferStream,
-    ConcatStringStream,
-    TextDecoderStream,
-} from "@yume-chan/stream-extra";
-
-import { splitCommand } from "../utils.js";
-
-export interface AdbShellProtocolProcess {
-    get stdin(): WritableStream<MaybeConsumable<Uint8Array>>;
-
-    get stdout(): ReadableStream<Uint8Array>;
-    get stderr(): ReadableStream<Uint8Array>;
-
-    get exited(): Promise<number>;
-
-    kill(): MaybePromiseLike<void>;
-}
-
-export class AdbShellProtocolSpawner {
-    readonly #spawn: (
-        command: readonly string[],
-        signal: AbortSignal | undefined,
-    ) => Promise<AdbShellProtocolProcess>;
-
-    constructor(
-        spawn: (
-            command: readonly string[],
-            signal: AbortSignal | undefined,
-        ) => Promise<AdbShellProtocolProcess>,
-    ) {
-        this.#spawn = spawn;
-    }
-
-    spawn(
-        command: string | readonly string[],
-        signal?: AbortSignal,
-    ): Promise<AdbShellProtocolProcess> {
-        signal?.throwIfAborted();
-
-        if (typeof command === "string") {
-            command = splitCommand(command);
-        }
-
-        return this.#spawn(command, signal);
-    }
-
-    async spawnWait(
-        command: string | readonly string[],
-    ): Promise<AdbShellProtocolSpawner.WaitResult<Uint8Array>> {
-        const process = await this.spawn(command);
-        const [stdout, stderr, exitCode] = await Promise.all([
-            process.stdout.pipeThrough(new ConcatBufferStream()),
-            process.stderr.pipeThrough(new ConcatBufferStream()),
-            process.exited,
-        ]);
-        return { stdout, stderr, exitCode };
-    }
-
-    async spawnWaitText(
-        command: string | readonly string[],
-    ): Promise<AdbShellProtocolSpawner.WaitResult<string>> {
-        const process = await this.spawn(command);
-        const [stdout, stderr, exitCode] = await Promise.all([
-            process.stdout
-                .pipeThrough(new TextDecoderStream())
-                .pipeThrough(new ConcatStringStream()),
-            process.stderr
-                .pipeThrough(new TextDecoderStream())
-                .pipeThrough(new ConcatStringStream()),
-            process.exited,
-        ]);
-        return { stdout, stderr, exitCode };
-    }
-}
-
-export namespace AdbShellProtocolSpawner {
-    export interface WaitResult<T> {
-        stdout: T;
-        stderr: T;
-        exitCode: number;
-    }
-}

package/src/commands/subprocess/utils.ts

@@ -1,61 +0,0 @@
-export function escapeArg(s: string) {
-    let result = "";
-    result += `'`;
-
-    let base = 0;
-    while (true) {
-        const found = s.indexOf(`'`, base);
-        if (found === -1) {
-            result += s.substring(base);
-            break;
-        }
-        result += s.substring(base, found);
-        // a'b becomes a'\'b (the backslash is not a escape character)
-        result += String.raw`'\''`;
-        base = found + 1;
-    }
-
-    result += `'`;
-    return result;
-}
-
-export function splitCommand(command: string): string[] {
-    const result: string[] = [];
-    let quote: string | undefined;
-    let isEscaped = false;
-    let start = 0;
-
-    for (let i = 0, len = command.length; i < len; i += 1) {
-        if (isEscaped) {
-            isEscaped = false;
-            continue;
-        }
-
-        const char = command.charAt(i);
-        switch (char) {
-            case " ":
-                if (!quote && i !== start) {
-                    result.push(command.substring(start, i));
-                    start = i + 1;
-                }
-                break;
-            case "'":
-            case '"':
-                if (!quote) {
-                    quote = char;
-                } else if (char === quote) {
-                    quote = undefined;
-                }
-                break;
-            case "\\":
-                isEscaped = true;
-                break;
-        }
-    }
-
-    if (start < command.length) {
-        result.push(command.substring(start));
-    }
-
-    return result;
-}

package/src/commands/sync/index.ts

@@ -1,8 +0,0 @@
-export * from "./list.js";
-export * from "./pull.js";
-export * from "./push.js";
-export * from "./request.js";
-export * from "./response.js";
-export * from "./socket.js";
-export * from "./stat.js";
-export * from "./sync.js";

package/src/commands/sync/list.ts

@@ -1,99 +0,0 @@
-import type { StructValue } from "@yume-chan/struct";
-import { extend, string, u32 } from "@yume-chan/struct";
-
-import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js";
-import { AdbSyncResponseId, adbSyncReadResponses } from "./response.js";
-import type { AdbSyncSocket } from "./socket.js";
-import type { AdbSyncStat } from "./stat.js";
-import {
-    AdbSyncLstatResponse,
-    AdbSyncStatErrorCode,
-    AdbSyncStatResponse,
-} from "./stat.js";
-
-export interface AdbSyncEntry extends AdbSyncStat {
-    name: string;
-}
-
-export const AdbSyncEntryResponse = extend(AdbSyncLstatResponse, {
-    name: string(u32),
-});
-
-export type AdbSyncEntryResponse = StructValue<typeof AdbSyncEntryResponse>;
-
-export const AdbSyncEntry2Response = extend(AdbSyncStatResponse, {
-    name: string(u32),
-});
-
-export type AdbSyncEntry2Response = StructValue<typeof AdbSyncEntry2Response>;
-
-export async function* adbSyncOpenDirV2(
-    socket: AdbSyncSocket,
-    path: string,
-): AsyncGenerator<AdbSyncEntry2Response, void, void> {
-    const locked = await socket.lock();
-    try {
-        await adbSyncWriteRequest(locked, AdbSyncRequestId.ListV2, path);
-        for await (const item of adbSyncReadResponses(
-            locked,
-            AdbSyncResponseId.Entry2,
-            AdbSyncEntry2Response,
-        )) {
-            // `LST2` can return error codes for failed `lstat` calls.
-            // `LIST` just ignores them.
-            // But they only contain `name` so still pretty useless.
-            if (item.error !== AdbSyncStatErrorCode.SUCCESS) {
-                continue;
-            }
-            yield item;
-        }
-    } finally {
-        locked.release();
-    }
-}
-
-export async function* adbSyncOpenDirV1(
-    socket: AdbSyncSocket,
-    path: string,
-): AsyncGenerator<AdbSyncEntryResponse, void, void> {
-    const locked = await socket.lock();
-    try {
-        await adbSyncWriteRequest(locked, AdbSyncRequestId.List, path);
-        for await (const item of adbSyncReadResponses(
-            locked,
-            AdbSyncResponseId.Entry,
-            AdbSyncEntryResponse,
-        )) {
-            yield item;
-        }
-    } finally {
-        locked.release();
-    }
-}
-
-export async function* adbSyncOpenDir(
-    socket: AdbSyncSocket,
-    path: string,
-    v2: boolean,
-): AsyncGenerator<AdbSyncEntry, void, void> {
-    if (v2) {
-        yield* adbSyncOpenDirV2(socket, path);
-    } else {
-        for await (const item of adbSyncOpenDirV1(socket, path)) {
-            // Convert to same format as `AdbSyncEntry2Response` for easier consumption.
-            // However it will add some overhead.
-            yield {
-                mode: item.mode,
-                size: BigInt(item.size),
-                mtime: BigInt(item.mtime),
-                get type() {
-                    return item.type;
-                },
-                get permission() {
-                    return item.permission;
-                },
-                name: item.name,
-            };
-        }
-    }
-}

package/src/commands/sync/pull.ts

@@ -1,55 +0,0 @@
-import { ReadableStream } from "@yume-chan/stream-extra";
-import type { StructValue } from "@yume-chan/struct";
-import { buffer, struct, u32 } from "@yume-chan/struct";
-
-import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js";
-import { adbSyncReadResponses, AdbSyncResponseId } from "./response.js";
-import type { AdbSyncSocket } from "./socket.js";
-
-export const AdbSyncDataResponse = struct(
-    { data: buffer(u32) },
-    { littleEndian: true },
-);
-
-export type AdbSyncDataResponse = StructValue<typeof AdbSyncDataResponse>;
-
-export async function* adbSyncPullGenerator(
-    socket: AdbSyncSocket,
-    path: string,
-): AsyncGenerator<Uint8Array, void, void> {
-    const locked = await socket.lock();
-    let done = false;
-    try {
-        await adbSyncWriteRequest(locked, AdbSyncRequestId.Receive, path);
-        for await (const packet of adbSyncReadResponses(
-            locked,
-            AdbSyncResponseId.Data,
-            AdbSyncDataResponse,
-        )) {
-            yield packet.data;
-        }
-        done = true;
-    } catch (e) {
-        done = true;
-        throw e;
-    } finally {
-        if (!done) {
-            // sync pull can't be cancelled, so we have to read all data
-            for await (const packet of adbSyncReadResponses(
-                locked,
-                AdbSyncResponseId.Data,
-                AdbSyncDataResponse,
-            )) {
-                void packet;
-            }
-        }
-        locked.release();
-    }
-}
-
-export function adbSyncPull(
-    socket: AdbSyncSocket,
-    path: string,
-): ReadableStream<Uint8Array> {
-    return ReadableStream.from(adbSyncPullGenerator(socket, path));
-}