@yume-chan/adb 0.0.10 → 0.0.11

package/{dts → esm}/socket/dispatcher.d.ts

@@ -1,32 +1,22 @@
 import { AutoDisposable } from '@yume-chan/event';
-import { AdbBackend } from '../backend';
-import { AdbCommand, AdbPacket, AdbPacketInit } from '../packet';
-import { AdbLogger } from './logger';
-import { AdbSocket } from './socket';
-export interface AdbPacketReceivedEventArgs {
-    handled: boolean;
-    packet: AdbPacket;
-}
+import { AdbCommand, type AdbPacketCore, type AdbPacketInit } from '../packet.js';
+import { type ReadableWritablePair } from '../stream/index.js';
+import { AdbSocket } from './socket.js';
 export interface AdbIncomingSocketEventArgs {
     handled: boolean;
-    packet: AdbPacket;
+    packet: AdbPacketCore;
     serviceString: string;
     socket: AdbSocket;
 }
 export declare class AdbPacketDispatcher extends AutoDisposable {
     private readonly initializers;
     private readonly sockets;
-    private readonly sendLock;
-    private readonly logger;
-    readonly backend: AdbBackend;
+    private _writer;
     maxPayloadSize: number;
     calculateChecksum: boolean;
     appendNullToServiceString: boolean;
-    private readonly packetEvent;
-    get onPacket(): {
-        (listener: import("@yume-chan/event").EventListener<AdbPacketReceivedEventArgs, unknown, [], unknown>): import("@yume-chan/event").RemoveEventListener;
-        <TThis, TArgs extends unknown[]>(listener: import("@yume-chan/event").EventListener<AdbPacketReceivedEventArgs, TThis, TArgs, unknown>, thisArg: TThis, ...args: TArgs): import("@yume-chan/event").RemoveEventListener;
-    };
+    private _disconnected;
+    get disconnected(): Promise<void>;
     private readonly incomingSocketEvent;
     get onIncomingSocket(): {
         (listener: import("@yume-chan/event").EventListener<AdbIncomingSocketEventArgs, unknown, [], unknown>): import("@yume-chan/event").RemoveEventListener;
@@ -37,17 +27,14 @@ export declare class AdbPacketDispatcher extends AutoDisposable {
         (listener: import("@yume-chan/event").EventListener<Error, unknown, [], unknown>): import("@yume-chan/event").RemoveEventListener;
         <TThis, TArgs extends unknown[]>(listener: import("@yume-chan/event").EventListener<Error, TThis, TArgs, unknown>, thisArg: TThis, ...args: TArgs): import("@yume-chan/event").RemoveEventListener;
     };
-    private _running;
-    get running(): boolean;
-    constructor(backend: AdbBackend, logger?: AdbLogger);
-    private receiveLoop;
+    private _abortController;
+    constructor(connection: ReadableWritablePair<AdbPacketCore, AdbPacketInit>);
     private handleOk;
     private handleClose;
     private handleOpen;
-    start(): void;
     createSocket(serviceString: string): Promise<AdbSocket>;
     sendPacket(packet: AdbPacketInit): Promise<void>;
-    sendPacket(command: AdbCommand, arg0: number, arg1: number, payload?: string | ArrayBuffer): Promise<void>;
+    sendPacket(command: AdbCommand, arg0: number, arg1: number, payload?: string | Uint8Array): Promise<void>;
     dispose(): void;
 }
 //# sourceMappingURL=dispatcher.d.ts.map

package/esm/socket/dispatcher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/socket/dispatcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAgB,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,UAAU,EAAqB,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AACrG,OAAO,EAAgE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE7H,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,WAAW,0BAA0B;IACvC,OAAO,EAAE,OAAO,CAAC;IAEjB,MAAM,EAAE,aAAa,CAAC;IAEtB,aAAa,EAAE,MAAM,CAAC;IAEtB,MAAM,EAAE,SAAS,CAAC;CACrB;AAID,qBAAa,mBAAoB,SAAQ,cAAc;IAGnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IAExD,OAAO,CAAC,OAAO,CAA8C;IAEtD,cAAc,SAAK;IACnB,iBAAiB,UAAQ;IACzB,yBAAyB,UAAQ;IAExC,OAAO,CAAC,aAAa,CAA+B;IACpD,IAAW,YAAY,kBAAyC;IAEhE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsE;IAC1G,IAAW,gBAAgB;;;MAA6C;IAExE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiD;IAC5E,IAAW,OAAO;;;MAAoC;IAEtD,OAAO,CAAC,gBAAgB,CAAyB;gBAG7C,UAAU,EAAE,oBAAoB,CAAC,aAAa,EAAE,aAAa,CAAC;IAkDlE,OAAO,CAAC,QAAQ;YAkBF,WAAW;YA8BX,UAAU;IAiCX,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAqB7D,UAAU,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAChD,UAAU,CACb,OAAO,EAAE,UAAU,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,MAAM,GAAG,UAAU,GAC9B,OAAO,CAAC,IAAI,CAAC;IAqCA,OAAO;CAiB1B"}

package/esm/socket/dispatcher.js

@@ -1,78 +1,70 @@
-import { __awaiter } from "tslib";
-import { AsyncOperationManager } from '@yume-chan/async';
+import { AsyncOperationManager, PromiseResolver } from '@yume-chan/async';
 import { AutoDisposable, EventEmitter } from '@yume-chan/event';
-import { AdbCommand, AdbPacket } from '../packet';
-import { AutoResetEvent, decodeUtf8, encodeUtf8 } from '../utils';
-import { AdbSocketController } from './controller';
-import { AdbSocket } from './socket';
-const EmptyArrayBuffer = new ArrayBuffer(0);
+import { AdbCommand, calculateChecksum } from '../packet.js';
+import { AbortController, WritableStream } from '../stream/index.js';
+import { decodeUtf8, encodeUtf8 } from '../utils/index.js';
+import { AdbSocket } from './socket.js';
+const EmptyUint8Array = new Uint8Array(0);
 export class AdbPacketDispatcher extends AutoDisposable {
-    constructor(backend, logger) {
-        super();
-        // ADB socket id starts from 1
-        // (0 means open failed)
-        this.initializers = new AsyncOperationManager(1);
-        this.sockets = new Map();
-        this.sendLock = new AutoResetEvent();
-        this.maxPayloadSize = 0;
-        this.calculateChecksum = true;
-        this.appendNullToServiceString = true;
-        this.packetEvent = this.addDisposable(new EventEmitter());
-        this.incomingSocketEvent = this.addDisposable(new EventEmitter());
-        this.errorEvent = this.addDisposable(new EventEmitter());
-        this._running = false;
-        this.backend = backend;
-        this.logger = logger;
-    }
-    get onPacket() { return this.packetEvent.event; }
+    // ADB socket id starts from 1
+    // (0 means open failed)
+    initializers = new AsyncOperationManager(1);
+    sockets = new Map();
+    _writer;
+    maxPayloadSize = 0;
+    calculateChecksum = true;
+    appendNullToServiceString = true;
+    _disconnected = new PromiseResolver();
+    get disconnected() { return this._disconnected.promise; }
+    incomingSocketEvent = this.addDisposable(new EventEmitter());
     get onIncomingSocket() { return this.incomingSocketEvent.event; }
+    errorEvent = this.addDisposable(new EventEmitter());
     get onError() { return this.errorEvent.event; }
-    get running() { return this._running; }
-    receiveLoop() {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                while (this._running) {
-                    const packet = yield AdbPacket.read(this.backend);
-                    (_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.onIncomingPacket) === null || _b === void 0 ? void 0 : _b.call(_a, packet);
+    _abortController = new AbortController();
+    constructor(connection) {
+        super();
+        connection.readable
+            .pipeTo(new WritableStream({
+            write: async (packet) => {
+                try {
                     switch (packet.command) {
                         case AdbCommand.OK:
                             this.handleOk(packet);
-                            continue;
+                            return;
                         case AdbCommand.Close:
-                            yield this.handleClose(packet);
-                            continue;
+                            await this.handleClose(packet);
+                            return;
                         case AdbCommand.Write:
                             if (this.sockets.has(packet.arg1)) {
-                                yield this.sockets.get(packet.arg1).dataEvent.fire(packet.payload);
-                                yield this.sendPacket(AdbCommand.OK, packet.arg1, packet.arg0);
+                                await this.sockets.get(packet.arg1).enqueue(packet.payload);
+                                await this.sendPacket(AdbCommand.OK, packet.arg1, packet.arg0);
                             }
                             // Maybe the device is responding to a packet of last connection
                             // Just ignore it
-                            continue;
+                            return;
                         case AdbCommand.Open:
-                            yield this.handleOpen(packet);
-                            continue;
-                    }
-                    const args = {
-                        handled: false,
-                        packet,
-                    };
-                    this.packetEvent.fire(args);
-                    if (!args.handled) {
-                        this.dispose();
-                        throw new Error(`Unhandled packet with command '${packet.command}'`);
+                            await this.handleOpen(packet);
+                            return;
                     }
                 }
-            }
-            catch (e) {
-                if (!this._running) {
-                    // ignore error
-                    return;
+                catch (e) {
+                    this.errorEvent.fire(e);
+                    // Throw error here will stop the pipe
+                    // But won't close `readable` because of `preventCancel: true`
+                    throw e;
                 }
-                this.errorEvent.fire(e);
-            }
+            },
+        }), {
+            preventCancel: false,
+            signal: this._abortController.signal,
+        })
+            .then(() => {
+            this.dispose();
+        }, () => {
+            // TODO: AdbPacketDispatcher: reject `_disconnected` when pipe errored?
+            this.dispose();
         });
+        this._writer = connection.writable.getWriter();
     }
     handleOk(packet) {
         if (this.initializers.resolve(packet.arg1, packet.arg0)) {
@@ -89,126 +81,118 @@ export class AdbPacketDispatcher extends AutoDisposable {
         // Tell the device to close the socket
         this.sendPacket(AdbCommand.Close, packet.arg1, packet.arg0);
     }
-    handleClose(packet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // From https://android.googlesource.com/platform/packages/modules/adb/+/65d18e2c1cc48b585811954892311b28a4c3d188/adb.cpp#459
-            /* According to protocol.txt, p->msg.arg0 might be 0 to indicate
-             * a failed OPEN only. However, due to a bug in previous ADB
-             * versions, CLOSE(0, remote-id, "") was also used for normal
-             * CLOSE() operations.
-             */
-            // So don't return if `reject` didn't find a pending socket
-            if (packet.arg0 === 0 &&
-                this.initializers.reject(packet.arg1, new Error('Socket open failed'))) {
-                // Device failed to create the socket
-                return;
-            }
-            const socket = this.sockets.get(packet.arg1);
-            if (socket) {
-                // The device want to close the socket
-                if (!socket.closed) {
-                    yield this.sendPacket(AdbCommand.Close, packet.arg1, packet.arg0);
-                }
-                socket.dispose();
-                this.sockets.delete(packet.arg1);
-                return;
+    async handleClose(packet) {
+        // From https://android.googlesource.com/platform/packages/modules/adb/+/65d18e2c1cc48b585811954892311b28a4c3d188/adb.cpp#459
+        /* According to protocol.txt, p->msg.arg0 might be 0 to indicate
+         * a failed OPEN only. However, due to a bug in previous ADB
+         * versions, CLOSE(0, remote-id, "") was also used for normal
+         * CLOSE() operations.
+         */
+        // So don't return if `reject` didn't find a pending socket
+        if (packet.arg0 === 0 &&
+            this.initializers.reject(packet.arg1, new Error('Socket open failed'))) {
+            // Device failed to create the socket
+            return;
+        }
+        const socket = this.sockets.get(packet.arg1);
+        if (socket) {
+            // The device want to close the socket
+            if (!socket.closed) {
+                await this.sendPacket(AdbCommand.Close, packet.arg1, packet.arg0);
             }
-            // Maybe the device is responding to a packet of last connection
-            // Just ignore it
-        });
+            socket.dispose();
+            this.sockets.delete(packet.arg1);
+            return;
+        }
+        // Maybe the device is responding to a packet of last connection
+        // Just ignore it
     }
-    handleOpen(packet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // AsyncOperationManager doesn't support get and skip an ID
-            // Use `add` + `resolve` to simulate this behavior
-            const [localId] = this.initializers.add();
-            this.initializers.resolve(localId, undefined);
-            const remoteId = packet.arg0;
-            const serviceString = decodeUtf8(packet.payload);
-            const controller = new AdbSocketController({
-                dispatcher: this,
-                localId,
-                remoteId,
-                localCreated: false,
-                serviceString,
-            });
-            const socket = new AdbSocket(controller);
-            const args = {
-                handled: false,
-                packet,
-                serviceString,
-                socket,
-            };
-            this.incomingSocketEvent.fire(args);
-            if (args.handled) {
-                this.sockets.set(localId, controller);
-                yield this.sendPacket(AdbCommand.OK, localId, remoteId);
-            }
-            else {
-                yield this.sendPacket(AdbCommand.Close, 0, remoteId);
-            }
+    async handleOpen(packet) {
+        // AsyncOperationManager doesn't support get and skip an ID
+        // Use `add` + `resolve` to simulate this behavior
+        const [localId] = this.initializers.add();
+        this.initializers.resolve(localId, undefined);
+        const remoteId = packet.arg0;
+        const serviceString = decodeUtf8(packet.payload);
+        const socket = new AdbSocket({
+            dispatcher: this,
+            localId,
+            remoteId,
+            localCreated: false,
+            serviceString,
         });
+        const args = {
+            handled: false,
+            packet,
+            serviceString,
+            socket,
+        };
+        this.incomingSocketEvent.fire(args);
+        if (args.handled) {
+            this.sockets.set(localId, socket);
+            await this.sendPacket(AdbCommand.OK, localId, remoteId);
+        }
+        else {
+            await this.sendPacket(AdbCommand.Close, 0, remoteId);
+        }
     }
-    start() {
-        this._running = true;
-        this.receiveLoop();
-    }
-    createSocket(serviceString) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.appendNullToServiceString) {
-                serviceString += '\0';
-            }
-            const [localId, initializer] = this.initializers.add();
-            yield this.sendPacket(AdbCommand.Open, localId, 0, serviceString);
-            const remoteId = yield initializer;
-            const controller = new AdbSocketController({
-                dispatcher: this,
-                localId,
-                remoteId,
-                localCreated: true,
-                serviceString,
-            });
-            this.sockets.set(controller.localId, controller);
-            return new AdbSocket(controller);
+    async createSocket(serviceString) {
+        if (this.appendNullToServiceString) {
+            serviceString += '\0';
+        }
+        const [localId, initializer] = this.initializers.add();
+        await this.sendPacket(AdbCommand.Open, localId, 0, serviceString);
+        const remoteId = await initializer;
+        const socket = new AdbSocket({
+            dispatcher: this,
+            localId,
+            remoteId,
+            localCreated: true,
+            serviceString,
         });
+        this.sockets.set(localId, socket);
+        return socket;
     }
-    sendPacket(packetOrCommand, arg0, arg1, payload = EmptyArrayBuffer) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            let init;
-            if (arg0 === undefined) {
-                init = packetOrCommand;
-            }
-            else {
-                init = {
-                    command: packetOrCommand,
-                    arg0: arg0,
-                    arg1: arg1,
-                    payload: typeof payload === 'string' ? encodeUtf8(payload) : payload,
-                };
-            }
-            if (init.payload &&
-                init.payload.byteLength > this.maxPayloadSize) {
-                throw new Error('payload too large');
-            }
-            try {
-                // `AdbPacket.write` writes each packet in two parts
-                // Use a lock to prevent packets been interlaced
-                yield this.sendLock.wait();
-                (_b = (_a = this.logger) === null || _a === void 0 ? void 0 : _a.onOutgoingPacket) === null || _b === void 0 ? void 0 : _b.call(_a, init);
-                yield AdbPacket.write(init, this.calculateChecksum, this.backend);
-            }
-            finally {
-                this.sendLock.notify();
+    async sendPacket(packetOrCommand, arg0, arg1, payload = EmptyUint8Array) {
+        let init;
+        if (arg0 === undefined) {
+            init = packetOrCommand;
+        }
+        else {
+            if (typeof payload === 'string') {
+                payload = encodeUtf8(payload);
             }
-        });
+            init = {
+                command: packetOrCommand,
+                arg0: arg0,
+                arg1: arg1,
+                payload,
+            };
+        }
+        if (init.payload &&
+            init.payload.byteLength > this.maxPayloadSize) {
+            throw new Error('payload too large');
+        }
+        if (this.calculateChecksum) {
+            calculateChecksum(init);
+        }
+        else {
+            init.checksum = 0;
+        }
+        await this._writer.write(init);
     }
     dispose() {
-        this._running = false;
         for (const socket of this.sockets.values()) {
             socket.dispose();
         }
         this.sockets.clear();
+        try {
+            // Stop pipes
+            this._abortController.abort();
+        }
+        catch { }
+        this._writer.releaseLock();
+        this._disconnected.resolve();
         super.dispose();
     }
 }

package/esm/socket/dispatcher.js.map

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

package/esm/socket/index.d.ts

@@ -0,0 +1,3 @@
+export * from './socket.js';
+export * from './dispatcher.js';
+//# sourceMappingURL=index.d.ts.map

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

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

package/esm/socket/index.js

@@ -1,7 +1,3 @@
-export * from './close-event-emitter';
-export * from './controller';
-export * from './data-event-emitter';
-export * from './dispatcher';
-export * from './logger';
-export * from './socket';
+export * from './socket.js';
+export * from './dispatcher.js';
 //# sourceMappingURL=index.js.map

package/esm/socket/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/socket/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC"}

package/esm/socket/socket.d.ts

@@ -0,0 +1,34 @@
+import { ReadableStream, WritableStream } from '../stream/index.js';
+import type { AdbPacketDispatcher } from './dispatcher.js';
+export interface AdbSocketInfo {
+    localId: number;
+    remoteId: number;
+    localCreated: boolean;
+    serviceString: string;
+}
+export interface AdbSocketConstructionOptions {
+    dispatcher: AdbPacketDispatcher;
+    localId: number;
+    remoteId: number;
+    localCreated: boolean;
+    serviceString: string;
+    highWaterMark?: number | undefined;
+}
+export declare class AdbSocket implements AdbSocketInfo {
+    private readonly dispatcher;
+    readonly localId: number;
+    readonly remoteId: number;
+    readonly localCreated: boolean;
+    readonly serviceString: string;
+    private _factory;
+    private _readable;
+    private _readableController;
+    get readable(): ReadableStream<Uint8Array>;
+    private _writePromise;
+    readonly writable: WritableStream<Uint8Array>;
+    private _closed;
+    get closed(): boolean;
+    constructor(options: AdbSocketConstructionOptions);
+    close(): Promise<void>;
+}
+//# sourceMappingURL=socket.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"socket.d.ts","sourceRoot":"","sources":["../../src/socket/socket.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8C,cAAc,EAAE,cAAc,EAAqC,MAAM,oBAAoB,CAAC;AACnJ,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,OAAO,CAAC;IAEtB,aAAa,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,4BAA4B;IACzC,UAAU,EAAE,mBAAmB,CAAC;IAEhC,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IAEjB,YAAY,EAAE,OAAO,CAAC;IAEtB,aAAa,EAAE,MAAM,CAAC;IAEtB,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACtC;AAED,qBAAa,SAAU,YAAW,aAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuB;IAElD,SAAgB,OAAO,EAAG,MAAM,CAAC;IACjC,SAAgB,QAAQ,EAAG,MAAM,CAAC;IAClC,SAAgB,YAAY,EAAG,OAAO,CAAC;IACvC,SAAgB,aAAa,EAAG,MAAM,CAAC;IAEvC,OAAO,CAAC,QAAQ,CAA8C;IAE9D,OAAO,CAAC,SAAS,CAA6B;IAC9C,OAAO,CAAC,mBAAmB,CAA4C;IACvE,IAAW,QAAQ,+BAA6B;IAEhD,OAAO,CAAC,aAAa,CAAoC;IACzD,SAAgB,QAAQ,EAAE,cAAc,CAAC,UAAU,CAAC,CAAC;IAErD,OAAO,CAAC,OAAO,CAAS;IACxB,IAAW,MAAM,YAA2B;gBAEzB,OAAO,EAAE,4BAA4B;IAoD3C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA4BtC"}

package/esm/socket/socket.js

@@ -1,20 +1,75 @@
+import { PromiseResolver } from "@yume-chan/async";
+import { AdbCommand } from '../packet.js';
+import { ChunkStream, DuplexStreamFactory, pipeFrom } from '../stream/index.js';
 export class AdbSocket {
-    constructor(controller) {
-        this.controller = controller;
+    dispatcher;
+    localId;
+    remoteId;
+    localCreated;
+    serviceString;
+    _factory;
+    _readable;
+    _readableController;
+    get readable() { return this._readable; }
+    _writePromise;
+    writable;
+    _closed = false;
+    get closed() { return this._closed; }
+    constructor(options) {
+        Object.assign(this, options);
+        // Check this image to help you understand the stream graph
+        // cspell: disable-next-line
+        // https://www.plantuml.com/plantuml/png/TL0zoeGm4ErpYc3l5JxyS0yWM6mX5j4C6p4cxcJ25ejttuGX88ZftizxUKmJI275pGhXl0PP_UkfK_CAz5Z2hcWsW9Ny2fdU4C1f5aSchFVxA8vJjlTPRhqZzDQMRB7AklwJ0xXtX0ZSKH1h24ghoKAdGY23FhxC4nS2pDvxzIvxb-8THU0XlEQJ-ZB7SnXTAvc_LhOckhMdLBnbtndpb-SB7a8q2SRD_W00
+        this._factory = new DuplexStreamFactory({
+            close: async () => {
+                await this.close();
+            },
+        });
+        this._readable = this._factory.createPushReadable(controller => {
+            this._readableController = controller;
+        }, {
+            highWaterMark: options.highWaterMark ?? 16 * 1024,
+            size(chunk) { return chunk.byteLength; }
+        });
+        this.writable = pipeFrom(this._factory.createWritable({
+            write: async (chunk) => {
+                // Wait for an ack packet
+                this._writePromise = new PromiseResolver();
+                await this.dispatcher.sendPacket(AdbCommand.Write, this.localId, this.remoteId, chunk);
+                await this._writePromise.promise;
+            },
+        }), new ChunkStream(this.dispatcher.maxPayloadSize));
     }
-    get backend() { return this.controller.backend; }
-    get localId() { return this.controller.localId; }
-    get remoteId() { return this.controller.remoteId; }
-    get localCreated() { return this.controller.localCreated; }
-    get serviceString() { return this.controller.serviceString; }
-    get closed() { return this.controller.closed; }
-    get onData() { return this.controller.dataEvent.event; }
-    get onClose() { return this.controller.onClose; }
-    write(data) {
-        return this.controller.write(data);
+    /**
+     * @internal
+     */
+    async enqueue(packet) {
+        await this._readableController.enqueue(packet);
     }
-    close() {
-        return this.controller.close();
+    /**
+     * @internal
+     */
+    ack() {
+        this._writePromise?.resolve();
+    }
+    async close() {
+        // Error out the pending writes
+        this._writePromise?.reject(new Error('Socket closed'));
+        if (!this._closed) {
+            this._closed = true;
+            // Only send close packet when `close` is called before `dispose`
+            // (the client initiated the close)
+            await this.dispatcher.sendPacket(AdbCommand.Close, this.localId, this.remoteId);
+        }
+    }
+    /**
+     * @internal
+     */
+    dispose() {
+        this._closed = true;
+        this._factory.close();
+        // Close `writable` side
+        this.close();
     }
 }
 //# sourceMappingURL=socket.js.map

package/esm/socket/socket.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/socket/socket.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,SAAS;IAclB,YAAmB,UAA+B;QAC9C,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAbD,IAAW,OAAO,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,IAAW,OAAO,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACxD,IAAW,QAAQ,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC1D,IAAW,YAAY,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;IAClE,IAAW,aAAa,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC;IAEpE,IAAW,MAAM,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAEtD,IAAW,MAAM,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC/D,IAAW,OAAO,KAAK,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IAMjD,KAAK,CAAC,IAAiB;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;CACJ"}
+{"version":3,"file":"socket.js","sourceRoot":"","sources":["../../src/socket/socket.ts"],"names":[],"mappings":"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"}