@yume-chan/adb 0.0.19 → 0.0.21

package/esm/server/client.js

@@ -0,0 +1,328 @@
+// cspell:ignore tport
+import { PromiseResolver } from "@yume-chan/async";
+import { BufferedReadableStream, DuplexStreamFactory, UnwrapConsumableStream, WrapWritableStream, } from "@yume-chan/stream-extra";
+import { BigIntFieldType, SyncPromise, decodeUtf8, encodeUtf8, } from "@yume-chan/struct";
+import { AdbBanner } from "../banner.js";
+import { NOOP, hexToNumber, numberToHex } from "../utils/index.js";
+import { AdbServerTransport } from "./transport.js";
+export class AdbServerClient {
+    static VERSION = 41;
+    connection;
+    constructor(connection) {
+        this.connection = connection;
+    }
+    static readString(stream) {
+        return SyncPromise.try(() => stream.readExactly(4))
+            .then((buffer) => {
+            const length = hexToNumber(buffer);
+            return stream.readExactly(length);
+        })
+            .then((valueBuffer) => {
+            return decodeUtf8(valueBuffer);
+        })
+            .valueOrPromise();
+    }
+    static async writeString(writer, value) {
+        const valueBuffer = encodeUtf8(value);
+        const buffer = new Uint8Array(4 + valueBuffer.length);
+        buffer.set(numberToHex(valueBuffer.length));
+        buffer.set(valueBuffer, 4);
+        await writer.write(buffer);
+    }
+    static async readOkay(stream) {
+        const response = decodeUtf8(await stream.readExactly(4));
+        if (response === "OKAY") {
+            return;
+        }
+        if (response === "FAIL") {
+            const reason = await AdbServerClient.readString(stream);
+            throw new Error(reason);
+        }
+        throw new Error(`Unexpected response: ${response}`);
+    }
+    async connect(request, options) {
+        const connection = await this.connection.connect(options);
+        const writer = connection.writable.getWriter();
+        await AdbServerClient.writeString(writer, request);
+        const readable = new BufferedReadableStream(connection.readable);
+        try {
+            // `raceSignal` throws if the signal is aborted,
+            // so the `catch` block can close the connection.
+            await raceSignal(() => AdbServerClient.readOkay(readable), options?.signal);
+            writer.releaseLock();
+            return {
+                readable: readable.release(),
+                writable: connection.writable,
+            };
+        }
+        catch (e) {
+            writer.close().catch(NOOP);
+            readable.cancel().catch(NOOP);
+            throw e;
+        }
+    }
+    async getVersion() {
+        const connection = await this.connect("host:version");
+        const readable = new BufferedReadableStream(connection.readable);
+        try {
+            const length = hexToNumber(await readable.readExactly(4));
+            const version = hexToNumber(await readable.readExactly(length));
+            return version;
+        }
+        finally {
+            connection.writable.close().catch(NOOP);
+            readable.cancel().catch(NOOP);
+        }
+    }
+    async validateVersion() {
+        const version = await this.getVersion();
+        if (version !== AdbServerClient.VERSION) {
+            throw new Error(`adb server version (${version}) doesn't match this client (${AdbServerClient.VERSION})`);
+        }
+    }
+    async killServer() {
+        const connection = await this.connect("host:kill");
+        connection.writable.close().catch(NOOP);
+        connection.readable.cancel().catch(NOOP);
+    }
+    async getServerFeatures() {
+        const connection = await this.connect("host:host-features");
+        const readable = new BufferedReadableStream(connection.readable);
+        try {
+            const response = await AdbServerClient.readString(readable);
+            return response.split(",");
+        }
+        finally {
+            connection.writable.close().catch(NOOP);
+            readable.cancel().catch(NOOP);
+        }
+    }
+    async getDevices() {
+        const connection = await this.connect("host:devices-l");
+        const readable = new BufferedReadableStream(connection.readable);
+        try {
+            const devices = [];
+            const response = await AdbServerClient.readString(readable);
+            for (const line of response.split("\n")) {
+                if (!line) {
+                    continue;
+                }
+                const parts = line.split(" ").filter(Boolean);
+                const serial = parts[0];
+                const status = parts[1];
+                if (status !== "device") {
+                    continue;
+                }
+                let product;
+                let model;
+                let device;
+                let transportId;
+                for (let i = 2; i < parts.length; i += 1) {
+                    const [key, value] = parts[i].split(":");
+                    switch (key) {
+                        case "product":
+                            product = value;
+                            break;
+                        case "model":
+                            model = value;
+                            break;
+                        case "device":
+                            device = value;
+                            break;
+                        case "transport_id":
+                            transportId = BigInt(value);
+                            break;
+                    }
+                }
+                if (!transportId) {
+                    throw new Error(`No transport id for device ${serial}`);
+                }
+                devices.push({
+                    serial,
+                    product,
+                    model,
+                    device,
+                    transportId,
+                });
+            }
+            return devices;
+        }
+        finally {
+            connection.writable.close().catch(NOOP);
+            readable.cancel().catch(NOOP);
+        }
+    }
+    formatDeviceService(device, command) {
+        if (!device) {
+            return `host:${command}`;
+        }
+        if ("transportId" in device) {
+            return `host-transport-id:${device.transportId}:${command}`;
+        }
+        if ("serial" in device) {
+            return `host-serial:${device.serial}:${command}`;
+        }
+        if ("usb" in device) {
+            return `host-usb:${command}`;
+        }
+        if ("tcp" in device) {
+            return `host-local:${command}`;
+        }
+        throw new Error("Invalid device selector");
+    }
+    /**
+     * Gets the features supported by the device.
+     * The transport ID of the selected device is also returned,
+     * so the caller can execute other commands against the same device.
+     * @param device The device selector
+     * @returns The transport ID of the selected device, and the features supported by the device.
+     */
+    async getDeviceFeatures(device) {
+        // Usually the client sends a device command using `connectDevice`,
+        // so the command got forwarded and handled by ADB daemon.
+        // However, in fact, `connectDevice` only forwards unknown services to device,
+        // if the service is a host command, it will still be handled by ADB server.
+        // Also, if the command is about a device, but didn't specify a selector,
+        // it will be executed against the device selected previously by `connectDevice`.
+        // Using this method, we can get the transport ID and device features in one connection.
+        const socket = await this.connectDevice(device, "host:features");
+        try {
+            const readable = new BufferedReadableStream(socket.readable);
+            const featuresString = await AdbServerClient.readString(readable);
+            const features = featuresString.split(",");
+            return { transportId: socket.transportId, features };
+        }
+        finally {
+            await socket.close();
+        }
+    }
+    /**
+     * Creates a connection that will forward the service to device.
+     * @param device The device selector
+     * @param service The service to forward
+     * @returns An `AdbServerSocket` that can be used to communicate with the service
+     */
+    async connectDevice(device, service) {
+        await this.validateVersion();
+        let switchService;
+        let transportId;
+        if (!device) {
+            switchService = `host:tport:any`;
+        }
+        else if ("transportId" in device) {
+            switchService = `host:transport-id:${device.transportId}`;
+            transportId = device.transportId;
+        }
+        else if ("serial" in device) {
+            switchService = `host:tport:serial:${device.serial}`;
+        }
+        else if ("usb" in device) {
+            switchService = `host:tport:usb`;
+        }
+        else if ("tcp" in device) {
+            switchService = `host:tport:local`;
+        }
+        else {
+            throw new Error("Invalid device selector");
+        }
+        const connection = await this.connect(switchService);
+        const readable = new BufferedReadableStream(connection.readable);
+        const writer = connection.writable.getWriter();
+        try {
+            if (transportId === undefined) {
+                const array = await readable.readExactly(8);
+                // TODO: switch to a more performant algorithm.
+                const dataView = new DataView(array.buffer, array.byteOffset, array.byteLength);
+                transportId = BigIntFieldType.Uint64.getter(dataView, 0, true);
+            }
+            await AdbServerClient.writeString(writer, service);
+            await AdbServerClient.readOkay(readable);
+            writer.releaseLock();
+            const duplex = new DuplexStreamFactory();
+            const wrapReadable = duplex.wrapReadable(readable.release());
+            const wrapWritable = duplex.createWritable(new WrapWritableStream(connection.writable).bePipedThroughFrom(new UnwrapConsumableStream()));
+            return {
+                transportId,
+                service,
+                readable: wrapReadable,
+                writable: wrapWritable,
+                close() {
+                    return duplex.close();
+                },
+            };
+        }
+        catch (e) {
+            writer.close().catch(NOOP);
+            readable.cancel().catch(NOOP);
+            throw e;
+        }
+    }
+    /**
+     * Wait for a device to be connected or disconnected.
+     * @param device The device selector
+     * @param state The state to wait for
+     * @param options The options
+     * @returns A promise that resolves when the condition is met.
+     */
+    async waitFor(device, state, options) {
+        let type;
+        if (!device) {
+            type = "any";
+        }
+        else if ("transportId" in device) {
+            type = "any";
+        }
+        else if ("serial" in device) {
+            type = "any";
+        }
+        else if ("usb" in device) {
+            type = "usb";
+        }
+        else if ("tcp" in device) {
+            type = "local";
+        }
+        else {
+            throw new Error("Invalid device selector");
+        }
+        // `waitFor` can't use `connectDevice`, because the device
+        // might not be available yet.
+        const service = this.formatDeviceService(device, `wait-for-${type}-${state}`);
+        // `connect` resolves when server writes `OKAY`,
+        // but for this command the server writes `OKAY` after the condition is met.
+        await this.connect(service, options);
+    }
+    async createTransport(device) {
+        const { transportId, features } = await this.getDeviceFeatures(device);
+        const devices = await this.getDevices();
+        const info = devices.find((device) => device.transportId === transportId);
+        const banner = new AdbBanner(info?.product, info?.model, info?.device, features);
+        return new AdbServerTransport(this, info?.serial ?? "", banner, transportId);
+    }
+}
+async function raceSignal(callback, ...signals) {
+    const abortPromise = new PromiseResolver();
+    function abort() {
+        abortPromise.reject(this.reason);
+    }
+    try {
+        for (const signal of signals) {
+            if (!signal) {
+                continue;
+            }
+            if (signal.aborted) {
+                throw signal.reason;
+            }
+            signal.addEventListener("abort", abort);
+        }
+        return await Promise.race([callback(), abortPromise.promise]);
+    }
+    finally {
+        for (const signal of signals) {
+            if (!signal) {
+                continue;
+            }
+            signal.removeEventListener("abort", abort);
+        }
+    }
+}
+//# sourceMappingURL=client.js.map

package/esm/server/client.js.map

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

package/esm/server/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./client.js";
+export * from "./transport.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/esm/server/index.js

@@ -0,0 +1,3 @@
+export * from "./client.js";
+export * from "./transport.js";
+//# sourceMappingURL=index.js.map

package/esm/server/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC"}

package/esm/server/transport.d.ts

@@ -0,0 +1,19 @@
+import type { ValueOrPromise } from "@yume-chan/struct";
+import type { AdbIncomingSocketHandler, AdbSocket, AdbTransport } from "../adb.js";
+import type { AdbBanner } from "../banner.js";
+import type { AdbServerClient } from "./client.js";
+export declare class AdbServerTransport implements AdbTransport {
+    #private;
+    readonly serial: string;
+    readonly transportId: bigint;
+    readonly maxPayloadSize: number;
+    readonly banner: AdbBanner;
+    readonly disconnected: Promise<void>;
+    constructor(client: AdbServerClient, serial: string, banner: AdbBanner, transportId: bigint);
+    connect(service: string): Promise<AdbSocket>;
+    addReverseTunnel(handler: AdbIncomingSocketHandler, address?: string): Promise<string>;
+    removeReverseTunnel(address: string): Promise<void>;
+    clearReverseTunnels(): Promise<void>;
+    close(): ValueOrPromise<void>;
+}
+//# sourceMappingURL=transport.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,KAAK,EACR,wBAAwB,EACxB,SAAS,EACT,YAAY,EACf,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,qBAAa,kBAAmB,YAAW,YAAY;;IAGnD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAExB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAE7B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAmB;IAElD,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;IAI3B,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAGjC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,MAAM;IAgBjB,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAS5C,gBAAgB,CAClB,OAAO,EAAE,wBAAwB,EACjC,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC;IAIZ,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C,KAAK,IAAI,cAAc,CAAC,IAAI,CAAC;CAIhC"}

package/esm/server/transport.js

@@ -0,0 +1,44 @@
+import { PromiseResolver } from "@yume-chan/async";
+import { AbortController } from "@yume-chan/stream-extra";
+export class AdbServerTransport {
+    #client;
+    serial;
+    transportId;
+    maxPayloadSize = 1 * 1024 * 1024;
+    banner;
+    #closed = new PromiseResolver();
+    #waitAbortController = new AbortController();
+    disconnected;
+    constructor(client, serial, banner, transportId) {
+        this.#client = client;
+        this.serial = serial;
+        this.banner = banner;
+        this.transportId = transportId;
+        this.disconnected = Promise.race([
+            this.#closed.promise,
+            client.waitFor({ transportId }, "disconnect", {
+                signal: this.#waitAbortController.signal,
+                unref: true,
+            }),
+        ]);
+    }
+    async connect(service) {
+        return await this.#client.connectDevice({
+            transportId: this.transportId,
+        }, service);
+    }
+    async addReverseTunnel(handler, address) {
+        return await this.#client.connection.addReverseTunnel(handler, address);
+    }
+    async removeReverseTunnel(address) {
+        await this.#client.connection.removeReverseTunnel(address);
+    }
+    async clearReverseTunnels() {
+        await this.#client.connection.clearReverseTunnels();
+    }
+    close() {
+        this.#closed.resolve();
+        this.#waitAbortController.abort();
+    }
+}
+//# sourceMappingURL=transport.js.map

package/esm/server/transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/server/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAY1D,MAAM,OAAO,kBAAkB;IAC3B,OAAO,CAAkB;IAEhB,MAAM,CAAS;IAEf,WAAW,CAAS;IAEpB,cAAc,GAAW,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAEzC,MAAM,CAAY;IAE3B,OAAO,GAAG,IAAI,eAAe,EAAQ,CAAC;IACtC,oBAAoB,GAAG,IAAI,eAAe,EAAE,CAAC;IACpC,YAAY,CAAgB;IAErC,YACI,MAAuB,EACvB,MAAc,EACd,MAAiB,EACjB,WAAmB;QAEnB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;YAC7B,IAAI,CAAC,OAAO,CAAC,OAAO;YACpB,MAAM,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,EAAE,YAAY,EAAE;gBAC1C,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,MAAM;gBACxC,KAAK,EAAE,IAAI;aACd,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAe;QACzB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CACnC;YACI,WAAW,EAAE,IAAI,CAAC,WAAW;SAChC,EACD,OAAO,CACV,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CAClB,OAAiC,EACjC,OAAgB;QAEhB,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACrC,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC;IACxD,CAAC;IAED,KAAK;QACD,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACvB,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IACtC,CAAC;CACJ"}

package/esm/utils/auto-reset-event.d.ts

@@ -1,7 +1,6 @@
 import type { Disposable } from "@yume-chan/event";
 export declare class AutoResetEvent implements Disposable {
-    private _set;
-    private readonly _queue;
+    #private;
     constructor(initialSet?: boolean);
     wait(): Promise<void>;
     notifyOne(): void;

package/esm/utils/auto-reset-event.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto-reset-event.d.ts","sourceRoot":"","sources":["../../src/utils/auto-reset-event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,qBAAa,cAAe,YAAW,UAAU;IAC7C,OAAO,CAAC,IAAI,CAAU;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA+B;gBAEnC,UAAU,UAAQ;IAI9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAcrB,SAAS;IAQT,OAAO;CAMjB"}
+{"version":3,"file":"auto-reset-event.d.ts","sourceRoot":"","sources":["../../src/utils/auto-reset-event.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnD,qBAAa,cAAe,YAAW,UAAU;;gBAIjC,UAAU,UAAQ;IAI9B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAcrB,SAAS;IAQT,OAAO;CAMV"}

package/esm/utils/auto-reset-event.js

@@ -1,34 +1,34 @@
 import { PromiseResolver } from "@yume-chan/async";
 export class AutoResetEvent {
-    _set;
-    _queue = [];
+    #set;
+    #queue = [];
     constructor(initialSet = false) {
-        this._set = initialSet;
+        this.#set = initialSet;
     }
     wait() {
-        if (!this._set) {
-            this._set = true;
-            if (this._queue.length === 0) {
+        if (!this.#set) {
+            this.#set = true;
+            if (this.#queue.length === 0) {
                 return Promise.resolve();
             }
         }
         const resolver = new PromiseResolver();
-        this._queue.push(resolver);
+        this.#queue.push(resolver);
         return resolver.promise;
     }
     notifyOne() {
-        if (this._queue.length !== 0) {
-            this._queue.pop().resolve();
+        if (this.#queue.length !== 0) {
+            this.#queue.pop().resolve();
         }
         else {
-            this._set = false;
+            this.#set = false;
         }
     }
     dispose() {
-        for (const item of this._queue) {
+        for (const item of this.#queue) {
             item.reject(new Error("The AutoResetEvent has been disposed"));
         }
-        this._queue.length = 0;
+        this.#queue.length = 0;
     }
 }
 //# sourceMappingURL=auto-reset-event.js.map

package/esm/utils/auto-reset-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"auto-reset-event.js","sourceRoot":"","sources":["../../src/utils/auto-reset-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,MAAM,OAAO,cAAc;IACf,IAAI,CAAU;IACL,MAAM,GAA4B,EAAE,CAAC;IAEtD,YAAmB,UAAU,GAAG,KAAK;QACjC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YAEjB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAQ,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC5B,CAAC;IAEM,SAAS;QACZ,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAG,CAAC,OAAO,EAAE,CAAC;SAChC;aAAM;YACH,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;SACrB;IACL,CAAC;IAEM,OAAO;QACV,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAC;SAClE;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"auto-reset-event.js","sourceRoot":"","sources":["../../src/utils/auto-reset-event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGnD,MAAM,OAAO,cAAc;IACvB,IAAI,CAAU;IACL,MAAM,GAA4B,EAAE,CAAC;IAE9C,YAAY,UAAU,GAAG,KAAK;QAC1B,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;YAEjB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC1B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;aAC5B;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,eAAe,EAAQ,CAAC;QAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3B,OAAO,QAAQ,CAAC,OAAO,CAAC;IAC5B,CAAC;IAED,SAAS;QACL,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,EAAG,CAAC,OAAO,EAAE,CAAC;SAChC;aAAM;YACH,IAAI,CAAC,IAAI,GAAG,KAAK,CAAC;SACrB;IACL,CAAC;IAED,OAAO;QACH,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE;YAC5B,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAC;SAClE;QACD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3B,CAAC;CACJ"}

package/esm/utils/base64.js

@@ -219,9 +219,9 @@ export function decodeBase64(input) {
         sIndex += 1;
         const d = charToIndex[input.charCodeAt(sIndex)];
         sIndex += 1;
-        result[dIndex] = (a << 2) | ((b & 48) >> 4);
+        result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
         dIndex += 1;
-        result[dIndex] = ((b & 0b1111) << 4) | ((c & 60) >> 2);
+        result[dIndex] = ((b & 0b1111) << 4) | ((c & 0b11_1100) >> 2);
         dIndex += 1;
         result[dIndex] = ((c & 0b11) << 6) | d;
         dIndex += 1;
@@ -232,15 +232,15 @@ export function decodeBase64(input) {
         const b = charToIndex[input.charCodeAt(sIndex)];
         sIndex += 1;
         const c = charToIndex[input.charCodeAt(sIndex)];
-        result[dIndex] = (a << 2) | ((b & 48) >> 4);
+        result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
         dIndex += 1;
-        result[dIndex] = ((b & 0b1111) << 4) | ((c & 60) >> 2);
+        result[dIndex] = ((b & 0b1111) << 4) | ((c & 0b11_1100) >> 2);
     }
     else if (padding === 2) {
         const a = charToIndex[input.charCodeAt(sIndex)];
         sIndex += 1;
         const b = charToIndex[input.charCodeAt(sIndex)];
-        result[dIndex] = (a << 2) | ((b & 48) >> 4);
+        result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
     }
     return result;
 }

package/esm/utils/base64.js.map

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

package/esm/utils/conditional-variable.d.ts

@@ -1,7 +1,6 @@
 import type { Disposable } from "@yume-chan/event";
 export declare class ConditionalVariable implements Disposable {
-    private _locked;
-    private readonly _queue;
+    #private;
     wait(condition: () => boolean): Promise<void>;
     notifyOne(): void;
     dispose(): void;

package/esm/utils/conditional-variable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conditional-variable.d.ts","sourceRoot":"","sources":["../../src/utils/conditional-variable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOnD,qBAAa,mBAAoB,YAAW,UAAU;IAClD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAEnC,IAAI,CAAC,SAAS,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7C,SAAS;IAWT,OAAO,IAAI,IAAI;CAQzB"}
+{"version":3,"file":"conditional-variable.d.ts","sourceRoot":"","sources":["../../src/utils/conditional-variable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAOnD,qBAAa,mBAAoB,YAAW,UAAU;;IAIlD,IAAI,CAAC,SAAS,EAAE,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7C,SAAS;IAWT,OAAO,IAAI,IAAI;CAQlB"}

package/esm/utils/conditional-variable.js

@@ -1,34 +1,34 @@
 import { PromiseResolver } from "@yume-chan/async";
 export class ConditionalVariable {
-    _locked = false;
-    _queue = [];
+    #locked = false;
+    #queue = [];
     wait(condition) {
-        if (!this._locked) {
-            this._locked = true;
-            if (this._queue.length === 0 && condition()) {
+        if (!this.#locked) {
+            this.#locked = true;
+            if (this.#queue.length === 0 && condition()) {
                 return Promise.resolve();
             }
         }
         const resolver = new PromiseResolver();
-        this._queue.push({ condition, resolver });
+        this.#queue.push({ condition, resolver });
         return resolver.promise;
     }
     notifyOne() {
-        const entry = this._queue.shift();
+        const entry = this.#queue.shift();
         if (entry) {
             if (entry.condition()) {
                 entry.resolver.resolve();
             }
         }
         else {
-            this._locked = false;
+            this.#locked = false;
         }
     }
     dispose() {
-        for (const item of this._queue) {
+        for (const item of this.#queue) {
             item.resolver.reject(new Error("The ConditionalVariable has been disposed"));
         }
-        this._queue.length = 0;
+        this.#queue.length = 0;
     }
 }
 //# sourceMappingURL=conditional-variable.js.map