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

package/esm/service/sync/service.js

@@ -0,0 +1,170 @@
+import { AdbFeature } from "../../features.js";
+import { escapeArg } from "../subprocess/index.js";
+import { Compression } from "./compression/index.js";
+import { OpenDir, Receive, Send, Stat } from "./request/index.js";
+import { SocketPool } from "./socket-pool.js";
+import { Error as AdbSyncError } from "./socket.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 absolute unix path: ${path}`);
+    }
+    if (end === 0) {
+        return "/";
+    }
+    return path.substring(0, end);
+}
+export class Service {
+    _adb;
+    #socketPool;
+    #supportsStat2;
+    #supportsLs2;
+    #fixedPushMkdir;
+    #supportsSendReceive2;
+    #needPushMkdirWorkaround;
+    get supportsStat2() {
+        return this.#supportsStat2;
+    }
+    get supportsLs2() {
+        return this.#supportsLs2;
+    }
+    get fixedPushMkdir() {
+        return this.#fixedPushMkdir;
+    }
+    get supportsSendReceive2() {
+        return this.#supportsSendReceive2;
+    }
+    get needPushMkdirWorkaround() {
+        return this.#needPushMkdirWorkaround;
+    }
+    constructor(adb, options) {
+        this._adb = adb;
+        this.#socketPool = new SocketPool(adb, options?.maxPoolSize, options?.idleTimeout);
+        // Dispose the socket pool when the abort signal is triggered
+        options?.signal?.addEventListener("abort", () => {
+            void this.#socketPool.dispose();
+        });
+        this.#supportsStat2 = adb.canUseFeature(AdbFeature.Stat2);
+        this.#supportsLs2 = adb.canUseFeature(AdbFeature.Ls2);
+        this.#fixedPushMkdir = adb.canUseFeature(AdbFeature.FixedPushMkdir);
+        this.#supportsSendReceive2 = adb.canUseFeature(AdbFeature.SendReceive2);
+        // https://android.googlesource.com/platform/packages/modules/adb/+/91768a57b7138166e0a3d11f79cd55909dda7014/client/file_sync_client.cpp#1361
+        this.#needPushMkdirWorkaround =
+            this._adb.canUseFeature(AdbFeature.Shell2) && !this.fixedPushMkdir;
+    }
+    /**
+     * Acquires a socket from the pool for direct use.
+     *
+     * The socket must be returned to the pool using {@link releaseSocket} after use.
+     *
+     * @returns A socket from the pool
+     */
+    async acquireSocket() {
+        return await this.#socketPool.acquire();
+    }
+    /**
+     * Returns a socket to the pool after use.
+     *
+     * @param socket The socket to return to the pool
+     * @param discard Whether to discard the socket instead of returning it to the pool
+     */
+    async releaseSocket(socket, discard = false) {
+        await this.#socketPool.release(socket, discard);
+    }
+    /**
+     * Gets information of a file or folder.
+     *
+     * If `path` points to a symbolic link, the returned information is about the link itself (with `type` being `LinuxFileType.Link`).
+     */
+    lstat(path) {
+        return Stat.lstat(this.#socketPool, path, {
+            version: this.#supportsStat2 ? 2 : 1,
+        });
+    }
+    /**
+     * Gets the information of a file or folder.
+     *
+     * If `path` points to a symbolic link, it will be resolved and the returned information is about the target (with `type` being `LinuxFileType.File` or `LinuxFileType.Directory`).
+     */
+    stat(path) {
+        if (!this.#supportsStat2) {
+            throw new Error("Not supported");
+        }
+        return Stat.stat(this.#socketPool, path);
+    }
+    /**
+     * Checks if `path` is a directory, or a symbolic link to a directory.
+     *
+     * This uses `lstat` internally, thus works on all Android versions.
+     */
+    async isDirectory(path) {
+        try {
+            await this.lstat(path + "/");
+            return true;
+        }
+        catch (e) {
+            if (e instanceof AdbSyncError) {
+                return false;
+            }
+            else {
+                throw e;
+            }
+        }
+    }
+    opendir(path) {
+        return OpenDir.opendir(this.#socketPool, path, {
+            version: this.supportsLs2 ? 2 : 1,
+        });
+    }
+    async readdir(path) {
+        // TODO: Convert to `Array.fromAsync`
+        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 Receive.stream(this.#socketPool, 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 `filename` already exists.
+            // Ignore the result.
+            // TODO: sync: test push mkdir workaround (need an Android 8 device)
+            await this._adb.subprocess.noneProtocol
+                .spawn(["mkdir", "-p", escapeArg(dirname(options.filename))])
+                .wait();
+        }
+        if (this.supportsSendReceive2) {
+            if (options.compression === undefined) {
+                options.compression = Compression.chooseFormat(this._adb, Compression.Mode.Compress);
+            }
+            else if (!Compression.canUseFormat(this._adb, options.compression, Compression.Mode.Compress)) {
+                throw new Error(`Compression type ${options.compression} is not supported`);
+            }
+        }
+        await Send.send({
+            version: this.supportsSendReceive2 ? 2 : 1,
+            pool: this.#socketPool,
+            ...options,
+        });
+    }
+}
+//# sourceMappingURL=service.js.map

package/esm/service/sync/service.js.map

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

package/esm/service/sync/socket-pool.d.ts

@@ -0,0 +1,11 @@
+import type { Adb } from "../../adb.js";
+import { Socket } from "./socket.js";
+export declare class SocketPool {
+    #private;
+    constructor(adb: Adb, maxSize?: number, idleTimeout?: number);
+    acquire(): Promise<Socket>;
+    withSocket<T>(fn: (socket: Socket) => Promise<T>): Promise<T>;
+    release(socket: Socket, discard?: boolean): Promise<void>;
+    dispose(): Promise<void>;
+}
+//# sourceMappingURL=socket-pool.d.ts.map

package/esm/service/sync/socket-pool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket-pool.d.ts","sourceRoot":"","sources":["../../../src/service/sync/socket-pool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAExC,OAAO,EAAyB,MAAM,EAAE,MAAM,aAAa,CAAC;AAE5D,qBAAa,UAAU;;gBAQP,GAAG,EAAE,GAAG,EAAE,OAAO,SAAI,EAAE,WAAW,SAAQ;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAwB1B,UAAU,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAY7D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBvD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAiBjC"}

package/esm/service/sync/socket-pool.js

@@ -0,0 +1,80 @@
+import { Error as AdbSyncError, Socket } from "./socket.js";
+export class SocketPool {
+    #adb;
+    #maxSize;
+    #idleTimeout;
+    #availableSockets = [];
+    #inUseSockets = new Set();
+    #closed = false;
+    constructor(adb, maxSize = 4, idleTimeout = 60000) {
+        this.#adb = adb;
+        this.#maxSize = maxSize;
+        this.#idleTimeout = idleTimeout;
+    }
+    async acquire() {
+        if (this.#closed) {
+            throw new Error("SocketPool is closed");
+        }
+        // Try to reuse an available socket
+        if (this.#availableSockets.length > 0) {
+            const socket = this.#availableSockets.pop();
+            // Clear the idle timeout
+            socket.clearIdleTimer();
+            this.#inUseSockets.add(socket);
+            return socket;
+        }
+        // Create a new socket
+        const adbSocket = await this.#adb.createSocket("sync:");
+        if (this.#closed) {
+            await adbSocket.close();
+            throw new Error("SocketPool is closed");
+        }
+        const socket = new Socket(adbSocket, this.#adb.maxPayloadSize);
+        this.#inUseSockets.add(socket);
+        return socket;
+    }
+    async withSocket(fn) {
+        const socket = await this.acquire();
+        try {
+            const result = await fn(socket);
+            await this.release(socket);
+            return result;
+        }
+        catch (e) {
+            await this.release(socket, !(e instanceof AdbSyncError));
+            throw e;
+        }
+    }
+    async release(socket, discard = false) {
+        this.#inUseSockets.delete(socket);
+        // If discarding or we already have enough sockets in the pool, close this socket
+        if (discard || this.#availableSockets.length >= this.#maxSize) {
+            await socket.close();
+            return;
+        }
+        // Otherwise, return it to the pool and start idle timeout
+        socket.startIdleTimer(this.#idleTimeout, () => {
+            this.#closeIdleSocket(socket);
+        });
+        this.#availableSockets.push(socket);
+    }
+    #closeIdleSocket(socket) {
+        // Remove from available sockets
+        const index = this.#availableSockets.indexOf(socket);
+        if (index !== -1) {
+            this.#availableSockets.splice(index, 1);
+            void socket.close();
+        }
+    }
+    async dispose() {
+        this.#closed = true;
+        // Close all available sockets
+        const closePromises = this.#availableSockets.map((socket) => socket.close());
+        this.#availableSockets.length = 0;
+        // Force close all in-use sockets immediately
+        const inUseClosePromises = Array.from(this.#inUseSockets).map((socket) => socket.close());
+        this.#inUseSockets.clear();
+        await Promise.all([...closePromises, ...inUseClosePromises]);
+    }
+}
+//# sourceMappingURL=socket-pool.js.map

package/esm/service/sync/socket-pool.js.map

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

package/esm/service/sync/socket.d.ts

@@ -0,0 +1,40 @@
+import type { AsyncExactReadable, StructDeserializer } from "@yume-chan/struct";
+import type { Adb } from "../../adb.js";
+declare class AdbSyncError extends Error {
+}
+export { AdbSyncError as Error };
+export declare class Socket implements AsyncExactReadable {
+    #private;
+    static readonly NumberRequest: import("@yume-chan/struct").Struct<{
+        id: import("@yume-chan/struct").NumberField<number>;
+        arg: import("@yume-chan/struct").NumberField<number>;
+    }, undefined, import("@yume-chan/struct").FieldsValue<{
+        id: import("@yume-chan/struct").NumberField<number>;
+        arg: import("@yume-chan/struct").NumberField<number>;
+    }>>;
+    static readonly FailResponse: import("@yume-chan/struct").Struct<{
+        message: import("@yume-chan/struct").Field<string, string, never, string>;
+    }, undefined, never>;
+    get position(): number;
+    get closed(): Promise<undefined>;
+    constructor(socket: Adb.Socket, bufferSize: number);
+    /**
+     * Start an idle timer that will close the socket after the specified duration.
+     * The timer is automatically cancelled when the socket is used.
+     * @param timeout The timeout in milliseconds
+     * @param callback The callback to invoke when the timeout expires
+     */
+    startIdleTimer(timeout: number, callback: () => void): void;
+    /**
+     * Clear the idle timer.
+     */
+    clearIdleTimer(): void;
+    flush(): Promise<void>;
+    write(data: Uint8Array): Promise<void>;
+    writeRequest(id: number, value: number | string | Uint8Array): Promise<void>;
+    readExactly(length: number): Promise<Uint8Array<ArrayBufferLike>>;
+    readResponse<T>(id: number, type: StructDeserializer<T>): Promise<T>;
+    readResponses<T>(expectedId: number, type: StructDeserializer<T>): AsyncGenerator<T, void, void>;
+    close(): Promise<void>;
+}
+//# sourceMappingURL=socket.d.ts.map

package/esm/service/sync/socket.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../../src/service/sync/socket.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAOxC,cAAM,YAAa,SAAQ,KAAK;CAAG;AACnC,OAAO,EAAE,YAAY,IAAI,KAAK,EAAE,CAAC;AAgBjC,qBAAa,MAAO,YAAW,kBAAkB;;IAC7C,MAAM,CAAC,QAAQ,CAAC,aAAa;;;;;;QAAiB;IAC9C,MAAM,CAAC,QAAQ,CAAC,YAAY;;yBAAgB;IAS5C,IAAI,QAAQ,WAEX;IAED,IAAI,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAE/B;gBAEW,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM;IAOlD;;;;;OAKG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI;IAKpD;;OAEG;IACH,cAAc;IAyBR,KAAK;IAaX,KAAK,CAAC,IAAI,EAAE,UAAU;IAIhB,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU;IAkB5D,WAAW,CAAC,MAAM,EAAE,MAAM;IAO1B,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAgBtD,aAAa,CAAC,CAAC,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,GAC5B,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;IA6B1B,KAAK;CAKd"}

package/esm/service/sync/socket.js

@@ -0,0 +1,153 @@
+import { getUint32LittleEndian } from "@yume-chan/no-data-view";
+import { BufferCombiner, BufferedReadableStream, clearTimeout, Consumable, setTimeout, tryCancel, } from "@yume-chan/stream-extra";
+import { decodeUtf8, string, struct, u32 } from "@yume-chan/struct";
+import { AutoResetEvent, encodeUtf8, unreachable } from "../../utils/index.js";
+import { ResponseId } from "./id/index.js";
+const NumberRequest = struct({ id: u32, arg: u32 }, { littleEndian: true });
+class AdbSyncError extends Error {
+}
+export { AdbSyncError as Error };
+const FailResponse = struct({ message: string(u32) }, {
+    littleEndian: true,
+    postDeserialize(value) {
+        throw new AdbSyncError(value.message);
+    },
+});
+function i32ToHex(i) {
+    return "0x" + i.toString(16).padStart(8, "0");
+}
+export class Socket {
+    static NumberRequest = NumberRequest;
+    static FailResponse = FailResponse;
+    #socket;
+    #writer;
+    #readable;
+    #writeLock = new AutoResetEvent();
+    #combiner;
+    #idleTimeoutId = null;
+    get position() {
+        return this.#readable.position;
+    }
+    get closed() {
+        return this.#socket.closed;
+    }
+    constructor(socket, bufferSize) {
+        this.#socket = socket;
+        this.#writer = socket.writable.getWriter();
+        this.#readable = new BufferedReadableStream(socket.readable);
+        this.#combiner = new BufferCombiner(bufferSize);
+    }
+    /**
+     * Start an idle timer that will close the socket after the specified duration.
+     * The timer is automatically cancelled when the socket is used.
+     * @param timeout The timeout in milliseconds
+     * @param callback The callback to invoke when the timeout expires
+     */
+    startIdleTimer(timeout, callback) {
+        this.clearIdleTimer();
+        this.#idleTimeoutId = setTimeout(callback, timeout);
+    }
+    /**
+     * Clear the idle timer.
+     */
+    clearIdleTimer() {
+        if (this.#idleTimeoutId !== null) {
+            clearTimeout(this.#idleTimeoutId);
+            this.#idleTimeoutId = null;
+        }
+    }
+    /**
+     * Write a packet to the socket.
+     * @param packet The packet to write. Must be smaller than the buffer size.
+     */
+    #writeOne(packet) {
+        // `#combiner` will reuse the buffer, so we need to use the Consumable pattern
+        return Consumable.WritableStream.write(this.#writer, packet);
+    }
+    async #withWriteLock(callback) {
+        try {
+            await this.#writeLock.wait();
+            await callback();
+        }
+        finally {
+            this.#writeLock.notifyOne();
+        }
+    }
+    async flush() {
+        const buffer = this.#combiner.flush();
+        if (buffer) {
+            await this.#withWriteLock(() => this.#writeOne(buffer));
+        }
+    }
+    async #write(data) {
+        for (const buffer of this.#combiner.push(data)) {
+            await this.#writeOne(buffer);
+        }
+    }
+    write(data) {
+        return this.#withWriteLock(() => this.#write(data));
+    }
+    async writeRequest(id, value) {
+        return this.#withWriteLock(async () => {
+            if (typeof value === "number") {
+                await this.#write(NumberRequest.serialize({ id, arg: value }));
+                return;
+            }
+            if (typeof value === "string") {
+                value = encodeUtf8(value);
+            }
+            await this.#write(NumberRequest.serialize({ id, arg: value.length }));
+            await this.#write(value);
+        });
+    }
+    async readExactly(length) {
+        // The request may still be in the internal buffer.
+        // Call `flush` to send it before starting reading
+        await this.flush();
+        return await this.#readable.readExactly(length);
+    }
+    async readResponse(id, type) {
+        const buffer = await this.readExactly(4);
+        switch (getUint32LittleEndian(buffer, 0)) {
+            case ResponseId.Fail:
+                await FailResponse.deserialize(this.#readable);
+                unreachable();
+            case id:
+                return await type.deserialize(this.#readable);
+            default:
+                // non-recoverable
+                throw new Error(`Expected '${id}', but got '${decodeUtf8(buffer)}'`);
+        }
+    }
+    async *readResponses(expectedId, type) {
+        await this.flush();
+        while (true) {
+            const buffer = await this.#readable.readExactly(4);
+            const actualId = getUint32LittleEndian(buffer, 0);
+            switch (actualId) {
+                case ResponseId.Fail:
+                    await FailResponse.deserialize(this.#readable);
+                    unreachable();
+                case ResponseId.Done:
+                    // `DONE` responses' size are always same as the request's normal response.
+                    //
+                    // For example, `DONE` responses for `LIST` requests are 16 bytes (same as `DENT` responses),
+                    // but `DONE` responses for `STAT` requests are 12 bytes (same as `STAT` responses).
+                    await this.#readable.readExactly(type.size);
+                    return;
+                case expectedId:
+                    yield await type.deserialize(this.#readable);
+                    break;
+                default:
+                    // non-recoverable
+                    throw new Error(`Expected ${i32ToHex(expectedId)} or ${i32ToHex(ResponseId.Done)}, but got ${i32ToHex(actualId)}`);
+            }
+        }
+    }
+    async close() {
+        this.clearIdleTimer();
+        await tryCancel(this.#readable);
+        await this.#socket.close();
+    }
+}
+//# sourceMappingURL=socket.js.map

package/esm/service/sync/socket.js.map

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

package/esm/{commands → service}/tcpip.d.ts

@@ -1,4 +1,4 @@
-import { AdbServiceBase } from "./base.js";
+import type { Adb } from "../adb.js";
 /**
  * ADB daemon checks for the following properties in the order of
  *
@@ -18,7 +18,9 @@ export interface AdbTcpIpListenAddresses {
     servicePort: number | undefined;
     persistPort: number | undefined;
 }
-export declare class AdbTcpIpService extends AdbServiceBase {
+export declare class AdbTcpIpService {
+    #private;
+    constructor(adb: Adb);
     getListenAddresses(): Promise<AdbTcpIpListenAddresses>;
     setPort(port: number): Promise<string>;
     disable(): Promise<string>;

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

@@ -0,0 +1 @@
+{"version":3,"file":"tcpip.d.ts","sourceRoot":"","sources":["../../src/service/tcpip.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC;;;;;;;;;;;;;GAaG;AACH,MAAM,WAAW,uBAAuB;IACpC,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AASD,qBAAa,eAAe;;gBAGZ,GAAG,EAAE,GAAG;IAId,kBAAkB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAiBtD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYtC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;CAOnC"}

package/esm/{commands → service}/tcpip.js

@@ -1,15 +1,18 @@
-import { AdbServiceBase } from "./base.js";
 function parsePort(value) {
     if (!value || value === "0") {
         return undefined;
     }
     return Number.parseInt(value, 10);
 }
-export class AdbTcpIpService extends AdbServiceBase {
+export class AdbTcpIpService {
+    #adb;
+    constructor(adb) {
+        this.#adb = adb;
+    }
     async getListenAddresses() {
-        const serviceListenAddresses = await this.adb.getProp("service.adb.listen_addrs");
-        const servicePort = await this.adb.getProp("service.adb.tcp.port");
-        const persistPort = await this.adb.getProp("persist.adb.tcp.port");
+        const serviceListenAddresses = await this.#adb.getProp("service.adb.listen_addrs");
+        const servicePort = await this.#adb.getProp("service.adb.tcp.port");
+        const persistPort = await this.#adb.getProp("persist.adb.tcp.port");
         return {
             serviceListenAddresses: serviceListenAddresses != ""
                 ? serviceListenAddresses.split(",")
@@ -22,14 +25,14 @@ export class AdbTcpIpService extends AdbServiceBase {
         if (port <= 0) {
             throw new TypeError(`Invalid port ${port}`);
         }
-        const output = await this.adb.createSocketAndWait(`tcpip:${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:");
+        const output = await this.#adb.createSocketAndWait("usb:");
         if (output !== "restarting in USB mode\n") {
             throw new Error(output);
         }

package/esm/service/tcpip.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tcpip.js","sourceRoot":"","sources":["../../src/service/tcpip.ts"],"names":[],"mappings":"AAsBA,SAAS,SAAS,CAAC,KAAa;IAC5B,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,OAAO,eAAe;IACf,IAAI,CAAM;IAEnB,YAAY,GAAQ;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,kBAAkB;QACpB,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAClD,0BAA0B,CAC7B,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QACpE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAEpE,OAAO;YACH,sBAAsB,EAClB,sBAAsB,IAAI,EAAE;gBACxB,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,GAAG,CAAC;gBACnC,CAAC,CAAC,EAAE;YACZ,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC;YACnC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC;SACtC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACtB,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;YACZ,MAAM,IAAI,SAAS,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QACpE,IAAI,MAAM,KAAK,gCAAgC,IAAI,IAAI,EAAE,CAAC;YACtD,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,MAAM,KAAK,0BAA0B,EAAE,CAAC;YACxC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}

package/esm/utils/array-buffer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"array-buffer.d.ts","sourceRoot":"","sources":["../../src/utils/array-buffer.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,CAQ5E"}
+{"version":3,"file":"array-buffer.d.ts","sourceRoot":"","sources":["../../src/utils/array-buffer.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,CAO5E"}

package/esm/utils/array-buffer.js

@@ -2,8 +2,7 @@ export function toLocalUint8Array(value) {
     if (value.buffer instanceof ArrayBuffer) {
         return value;
     }
-    const copy = new Uint8Array(value.length);
-    copy.set(value);
-    return copy;
+    // This invokes the `constructor(Iterable<number>)` overload and copies the data
+    return new Uint8Array(value);
 }
 //# sourceMappingURL=array-buffer.js.map

package/esm/utils/array-buffer.js.map

@@ -1 +1 @@
-{"version":3,"file":"array-buffer.js","sourceRoot":"","sources":["../../src/utils/array-buffer.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,KAAiB;IAC/C,IAAI,KAAK,CAAC,MAAM,YAAY,WAAW,EAAE,CAAC;QACtC,OAAO,KAAgC,CAAC;IAC5C,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAChB,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"array-buffer.js","sourceRoot":"","sources":["../../src/utils/array-buffer.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,KAAiB;IAC/C,IAAI,KAAK,CAAC,MAAM,YAAY,WAAW,EAAE,CAAC;QACtC,OAAO,KAAgC,CAAC;IAC5C,CAAC;IAED,gFAAgF;IAChF,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}

package/esm/utils/base64.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base64.d.ts","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CACxC,WAAW,EAAE,MAAM,GACpB,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAI/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AACzE;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;AA0O5E,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CA4DnE"}
+{"version":3,"file":"base64.d.ts","sourceRoot":"","sources":["../../src/utils/base64.ts"],"names":[],"mappings":"AA6BA;;;;;GAKG;AACH,wBAAgB,4BAA4B,CACxC,WAAW,EAAE,MAAM,GACpB,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAI/C;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AACzE;;;;;;;;;;GAUG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,GAAG,MAAM,CAAC;AAmP5E,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,CAiEnE"}

package/esm/utils/base64.js

@@ -208,7 +208,18 @@ function encodeBackward(input, output, paddingLength) {
         outputIndex -= 1;
     }
 }
+function getCharIndex(input, offset) {
+    const charCode = input.charCodeAt(offset);
+    const index = charToIndex[charCode];
+    if (index === undefined) {
+        throw new Error("Invalid Base64 character: " + input[offset]);
+    }
+    return index;
+}
 export function decodeBase64(input) {
+    if (input.length % 4 !== 0) {
+        throw new Error("Invalid Base64 length: " + input.length);
+    }
     let padding;
     if (input[input.length - 2] === "=") {
         padding = 2;
@@ -222,14 +233,15 @@ export function decodeBase64(input) {
     const result = new Uint8Array((input.length / 4) * 3 - padding);
     let sIndex = 0;
     let dIndex = 0;
-    while (sIndex < input.length - (padding !== 0 ? 4 : 0)) {
-        const a = charToIndex[input.charCodeAt(sIndex)];
+    const loopEnd = input.length - (padding !== 0 ? 4 : 0);
+    while (sIndex < loopEnd) {
+        const a = getCharIndex(input, sIndex);
         sIndex += 1;
-        const b = charToIndex[input.charCodeAt(sIndex)];
+        const b = getCharIndex(input, sIndex);
         sIndex += 1;
-        const c = charToIndex[input.charCodeAt(sIndex)];
+        const c = getCharIndex(input, sIndex);
         sIndex += 1;
-        const d = charToIndex[input.charCodeAt(sIndex)];
+        const d = getCharIndex(input, sIndex);
         sIndex += 1;
         result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
         dIndex += 1;
@@ -239,19 +251,19 @@ export function decodeBase64(input) {
         dIndex += 1;
     }
     if (padding === 1) {
-        const a = charToIndex[input.charCodeAt(sIndex)];
+        const a = getCharIndex(input, sIndex);
         sIndex += 1;
-        const b = charToIndex[input.charCodeAt(sIndex)];
+        const b = getCharIndex(input, sIndex);
         sIndex += 1;
-        const c = charToIndex[input.charCodeAt(sIndex)];
+        const c = getCharIndex(input, sIndex);
         result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
         dIndex += 1;
         result[dIndex] = ((b & 0b1111) << 4) | ((c & 0b11_1100) >> 2);
     }
     else if (padding === 2) {
-        const a = charToIndex[input.charCodeAt(sIndex)];
+        const a = getCharIndex(input, sIndex);
         sIndex += 1;
-        const b = charToIndex[input.charCodeAt(sIndex)];
+        const b = getCharIndex(input, sIndex);
         result[dIndex] = (a << 2) | ((b & 0b11_0000) >> 4);
     }
     return result;