@yume-chan/adb 0.0.10 → 0.0.13

package/esm/features.d.ts

@@ -0,0 +1,8 @@
+export declare enum AdbFeatures {
+    ShellV2 = "shell_v2",
+    Cmd = "cmd",
+    StatV2 = "stat_v2",
+    ListV2 = "ls_v2",
+    FixedPushMkdir = "fixed_push_mkdir"
+}
+//# sourceMappingURL=features.d.ts.map

package/esm/features.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"features.d.ts","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAEA,oBAAY,WAAW;IACnB,OAAO,aAAa;IACpB,GAAG,QAAQ;IACX,MAAM,YAAY;IAClB,MAAM,UAAU;IAChB,cAAc,qBAAqB;CACtC"}

package/esm/features.js

@@ -1,7 +1,11 @@
+// The order follows
+// https://android.googlesource.com/platform/packages/modules/adb/+/79010dc6d5ca7490c493df800d4421730f5466ca/transport.cpp#1252
 export var AdbFeatures;
 (function (AdbFeatures) {
-    AdbFeatures["StatV2"] = "stat_v2";
-    AdbFeatures["Cmd"] = "cmd";
     AdbFeatures["ShellV2"] = "shell_v2";
-})(AdbFeatures || (AdbFeatures = {}));
+    AdbFeatures["Cmd"] = "cmd";
+    AdbFeatures["StatV2"] = "stat_v2";
+    AdbFeatures["ListV2"] = "ls_v2";
+    AdbFeatures["FixedPushMkdir"] = "fixed_push_mkdir";
+})(AdbFeatures = AdbFeatures || (AdbFeatures = {}));
 //# sourceMappingURL=features.js.map

package/esm/features.js.map

@@ -1 +1 @@
-{"version":3,"file":"features.js","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,iCAAkB,CAAA;IAClB,0BAAW,CAAA;IACX,mCAAoB,CAAA;AACxB,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB"}
+{"version":3,"file":"features.js","sourceRoot":"","sources":["../src/features.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,+HAA+H;AAC/H,MAAM,CAAN,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,mCAAoB,CAAA;IACpB,0BAAW,CAAA;IACX,iCAAkB,CAAA;IAClB,+BAAgB,CAAA;IAChB,kDAAmC,CAAA;AACvC,CAAC,EANW,WAAW,GAAX,WAAW,KAAX,WAAW,QAMtB"}

package/esm/index.d.ts

@@ -0,0 +1,11 @@
+export * from './adb.js';
+export * from './auth.js';
+export * from './backend.js';
+export * from './commands/index.js';
+export * from './crypto.js';
+export * from './features.js';
+export * from './packet.js';
+export * from './socket/index.js';
+export * from './stream/index.js';
+export * from './utils/index.js';
+//# sourceMappingURL=index.d.ts.map

package/esm/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}

package/esm/index.js

@@ -1,11 +1,11 @@
-export * from './adb';
-export * from './auth';
-export * from './backend';
-export * from './commands';
-export * from './crypto';
-export * from './features';
-export * from './packet';
-export * from './socket';
-export * from './stream';
-export * from './utils';
+export * from './adb.js';
+export * from './auth.js';
+export * from './backend.js';
+export * from './commands/index.js';
+export * from './crypto.js';
+export * from './features.js';
+export * from './packet.js';
+export * from './socket/index.js';
+export * from './stream/index.js';
+export * from './utils/index.js';
 //# sourceMappingURL=index.js.map

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}

package/esm/packet.d.ts

@@ -0,0 +1,47 @@
+import Struct from '@yume-chan/struct';
+import { TransformStream } from "./stream/index.js";
+export declare enum AdbCommand {
+    Auth = 1213486401,
+    Close = 1163086915,
+    Connect = 1314410051,
+    OK = 1497451343,
+    Open = 1313165391,
+    Write = 1163154007
+}
+export declare const AdbPacketHeader: Struct<{
+    command: number;
+    arg0: number;
+    arg1: number;
+    payloadLength: number;
+    checksum: number;
+    magic: number;
+}, never, {}, undefined>;
+export declare type AdbPacketHeader = typeof AdbPacketHeader['TDeserializeResult'];
+export declare const AdbPacket: Struct<{
+    command: number;
+    arg0: number;
+    arg1: number;
+    payloadLength: number;
+    checksum: number;
+    magic: number;
+    payload: Uint8Array;
+}, "payloadLength", {}, undefined>;
+export declare type AdbPacket = typeof AdbPacket['TDeserializeResult'];
+/**
+ * `AdbPacketData` contains all the useful fields of `AdbPacket`.
+ *
+ * `AdbBackend#connect` will return a `ReadableStream<AdbPacketData>`,
+ * so each backend can encode `AdbPacket` in different ways.
+ *
+ * `AdbBackend#connect` will return a `WritableStream<AdbPacketInit>`,
+ * however, `AdbPacketDispatcher` will transform `AdbPacketData` to `AdbPacketInit` for you,
+ * so `AdbSocket#writable#write` only needs `AdbPacketData`.
+ */
+export declare type AdbPacketData = Omit<typeof AdbPacket['TInit'], 'checksum' | 'magic'>;
+export declare type AdbPacketInit = Omit<typeof AdbPacket['TInit'], 'magic'>;
+export declare function calculateChecksum(payload: Uint8Array): number;
+export declare function calculateChecksum(init: AdbPacketData): AdbPacketInit;
+export declare class AdbPacketSerializeStream extends TransformStream<AdbPacketInit, Uint8Array> {
+    constructor();
+}
+//# sourceMappingURL=packet.d.ts.map

package/esm/packet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"packet.d.ts","sourceRoot":"","sources":["../src/packet.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,oBAAY,UAAU;IAClB,IAAI,aAAa;IACjB,KAAK,aAAa;IAClB,OAAO,aAAa;IACpB,EAAE,aAAa;IACf,IAAI,aAAa;IACjB,KAAK,aAAa;CACrB;AAED,eAAO,MAAM,eAAe;;;;;;;wBAOL,CAAC;AAExB,oBAAY,eAAe,GAAG,OAAO,eAAe,CAAC,oBAAoB,CAAC,CAAC;AAI3E,eAAO,MAAM,SAAS;;;;;;;;kCAG0C,CAAC;AAEjE,oBAAY,SAAS,GAAG,OAAO,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAE/D;;;;;;;;;GASG;AACH,oBAAY,aAAa,GAAG,IAAI,CAAC,OAAO,SAAS,CAAC,OAAO,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC;AAGlF,oBAAY,aAAa,GAAG,IAAI,CAAC,OAAO,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC;AAErE,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,UAAU,GAAG,MAAM,CAAC;AAC/D,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,aAAa,CAAC;AAUtE,qBAAa,wBAAyB,SAAQ,eAAe,CAAC,aAAa,EAAE,UAAU,CAAC;;CAqBvF"}

package/esm/packet.js

@@ -1,6 +1,5 @@
-import { __awaiter } from "tslib";
 import Struct from '@yume-chan/struct';
-import { BufferedStream } from './stream';
+import { TransformStream } from "./stream/index.js";
 export var AdbCommand;
 (function (AdbCommand) {
     AdbCommand[AdbCommand["Auth"] = 1213486401] = "Auth";
@@ -9,64 +8,40 @@ export var AdbCommand;
     AdbCommand[AdbCommand["OK"] = 1497451343] = "OK";
     AdbCommand[AdbCommand["Open"] = 1313165391] = "Open";
     AdbCommand[AdbCommand["Write"] = 1163154007] = "Write";
-})(AdbCommand || (AdbCommand = {}));
-const AdbPacketHeader = new Struct({ littleEndian: true })
+})(AdbCommand = AdbCommand || (AdbCommand = {}));
+export const AdbPacketHeader = new Struct({ littleEndian: true })
     .uint32('command')
     .uint32('arg0')
     .uint32('arg1')
     .uint32('payloadLength')
     .uint32('checksum')
     .int32('magic');
-const AdbPacketStruct = new Struct({ littleEndian: true })
+export const AdbPacket = new Struct({ littleEndian: true })
     .fields(AdbPacketHeader)
-    .arrayBuffer('payload', { lengthField: 'payloadLength' });
-export var AdbPacket;
-(function (AdbPacket) {
-    function read(backend) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Detect boundary
-            // Note that it relies on the backend to only return data from one write operation
-            let buffer;
-            do {
-                // Maybe it's a payload from last connection.
-                // Ignore and try again
-                buffer = yield backend.read(24);
-            } while (buffer.byteLength !== 24);
-            let bufferUsed = false;
-            const stream = new BufferedStream({
-                read(length) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        if (!bufferUsed) {
-                            bufferUsed = true;
-                            return buffer;
-                        }
-                        return backend.read(length);
-                    });
-                }
-            });
-            return AdbPacketStruct.deserialize(stream);
-        });
+    .uint8Array('payload', { lengthField: 'payloadLength' });
+export function calculateChecksum(payload) {
+    if (payload instanceof Uint8Array) {
+        return payload.reduce((result, item) => result + item, 0);
     }
-    AdbPacket.read = read;
-    function write(init, calculateChecksum, backend) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let checksum;
-            if (calculateChecksum && init.payload) {
-                const array = new Uint8Array(init.payload);
-                checksum = array.reduce((result, item) => result + item, 0);
-            }
-            else {
-                checksum = 0;
-            }
-            const packet = Object.assign(Object.assign({}, init), { checksum, magic: init.command ^ 0xFFFFFFFF, payloadLength: init.payload.byteLength });
-            // Write payload separately to avoid an extra copy
-            const header = AdbPacketHeader.serialize(packet);
-            yield backend.write(header);
-            if (packet.payload.byteLength) {
-                yield backend.write(packet.payload);
-            }
+    else {
+        payload.checksum = calculateChecksum(payload.payload);
+        return payload;
+    }
+}
+export class AdbPacketSerializeStream extends TransformStream {
+    constructor() {
+        super({
+            transform: async (init, controller) => {
+                // This syntax is ugly, but I don't want to create a new object.
+                init.magic = init.command ^ 0xFFFFFFFF;
+                init.payloadLength = init.payload.byteLength;
+                controller.enqueue(AdbPacketHeader.serialize(init));
+                if (init.payload.byteLength) {
+                    // Enqueue payload separately to avoid copying
+                    controller.enqueue(init.payload);
+                }
+            },
         });
     }
-    AdbPacket.write = write;
-})(AdbPacket || (AdbPacket = {}));
+}
 //# sourceMappingURL=packet.js.map

package/esm/packet.js.map

@@ -1 +1 @@
-{"version":3,"file":"packet.js","sourceRoot":"","sources":["../src/packet.ts"],"names":[],"mappings":";AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AAEvC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;IAClB,0DAAoB,CAAA;IACpB,gDAAe,CAAA;IACf,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;AACtB,CAAC,EAPW,UAAU,KAAV,UAAU,QAOrB;AAED,MAAM,eAAe,GACjB,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7B,MAAM,CAAC,SAAS,CAAC;KACjB,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,eAAe,CAAC;KACvB,MAAM,CAAC,UAAU,CAAC;KAClB,KAAK,CAAC,OAAO,CAAC,CAAC;AAExB,MAAM,eAAe,GACjB,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7B,MAAM,CAAC,eAAe,CAAC;KACvB,WAAW,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAC;AAMlE,MAAM,KAAW,SAAS,CAoDzB;AApDD,WAAiB,SAAS;IACtB,SAAsB,IAAI,CAAC,OAAmB;;YAC1C,kBAAkB;YAClB,kFAAkF;YAClF,IAAI,MAAmB,CAAC;YACxB,GAAG;gBACC,6CAA6C;gBAC7C,uBAAuB;gBACvB,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACnC,QAAQ,MAAM,CAAC,UAAU,KAAK,EAAE,EAAE;YAEnC,IAAI,UAAU,GAAG,KAAK,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;gBACxB,IAAI,CAAC,MAAc;;wBACrB,IAAI,CAAC,UAAU,EAAE;4BACb,UAAU,GAAG,IAAI,CAAC;4BAClB,OAAO,MAAM,CAAC;yBACjB;wBACD,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBAChC,CAAC;iBAAA;aACJ,CAAC,CAAC;YAEH,OAAO,eAAe,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC/C,CAAC;KAAA;IAtBqB,cAAI,OAsBzB,CAAA;IAED,SAAsB,KAAK,CACvB,IAAmB,EACnB,iBAA0B,EAC1B,OAAmB;;YAEnB,IAAI,QAAgB,CAAC;YACrB,IAAI,iBAAiB,IAAI,IAAI,CAAC,OAAO,EAAE;gBACnC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC3C,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;aAC/D;iBAAM;gBACH,QAAQ,GAAG,CAAC,CAAC;aAChB;YAED,MAAM,MAAM,mCACL,IAAI,KACP,QAAQ,EACR,KAAK,EAAE,IAAI,CAAC,OAAO,GAAG,UAAU,EAChC,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,GACzC,CAAC;YAEF,kDAAkD;YAClD,MAAM,MAAM,GAAG,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5B,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE;gBAC3B,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACvC;QACL,CAAC;KAAA;IA1BqB,eAAK,QA0B1B,CAAA;AACL,CAAC,EApDgB,SAAS,KAAT,SAAS,QAoDzB"}
+{"version":3,"file":"packet.js","sourceRoot":"","sources":["../src/packet.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAN,IAAY,UAOX;AAPD,WAAY,UAAU;IAClB,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;IAClB,0DAAoB,CAAA;IACpB,gDAAe,CAAA;IACf,oDAAiB,CAAA;IACjB,sDAAkB,CAAA;AACtB,CAAC,EAPW,UAAU,GAAV,UAAU,KAAV,UAAU,QAOrB;AAED,MAAM,CAAC,MAAM,eAAe,GACxB,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7B,MAAM,CAAC,SAAS,CAAC;KACjB,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,MAAM,CAAC;KACd,MAAM,CAAC,eAAe,CAAC;KACvB,MAAM,CAAC,UAAU,CAAC;KAClB,KAAK,CAAC,OAAO,CAAC,CAAC;AAMxB,MAAM,CAAC,MAAM,SAAS,GAClB,IAAI,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;KAC7B,MAAM,CAAC,eAAe,CAAC;KACvB,UAAU,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAC;AAqBjE,MAAM,UAAU,iBAAiB,CAAC,OAAmC;IACjE,IAAI,OAAO,YAAY,UAAU,EAAE;QAC/B,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;KAC7D;SAAM;QACF,OAAyB,CAAC,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzE,OAAO,OAAwB,CAAC;KACnC;AACL,CAAC;AAED,MAAM,OAAO,wBAAyB,SAAQ,eAA0C;IACpF;QACI,KAAK,CAAC;YACF,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;gBAClC,gEAAgE;gBAC/D,IAAuC,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC;gBAC1E,IAAuC,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBAEjF,UAAU,CAAC,OAAO,CACd,eAAe,CAAC,SAAS,CACrB,IAAsC,CACzC,CACJ,CAAC;gBAEF,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;oBACzB,8CAA8C;oBAC9C,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACpC;YACL,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;CACJ"}

package/esm/socket/controller.d.ts

@@ -0,0 +1,37 @@
+import { ReadableStream, WritableStream } from '../stream';
+import { AdbPacketDispatcher } from './dispatcher';
+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 AdbSocketController 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);
+    enqueue(packet: Uint8Array): Promise<void>;
+    ack(): void;
+    close(): Promise<void>;
+    dispose(): void;
+}
+//# sourceMappingURL=controller.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/socket/controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAA4E,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACrI,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,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,mBAAoB,YAAW,aAAa;IACrD,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;IAsC3C,OAAO,CAAC,MAAM,EAAE,UAAU;IAIhC,GAAG;IAIG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAiB5B,OAAO;CAQjB"}

package/esm/socket/controller.js

@@ -1,80 +1,66 @@
-import { __asyncValues, __awaiter } from "tslib";
-import { AutoDisposable } from '@yume-chan/event';
+import { PromiseResolver } from "@yume-chan/async";
 import { AdbCommand } from '../packet';
-import { AutoResetEvent, chunkArrayLike } from '../utils';
-import { CloseEventEmitter } from './close-event-emitter';
-import { DataEventEmitter } from './data-event-emitter';
-export class AdbSocketController extends AutoDisposable {
+import { ChunkStream, DuplexStreamFactory, pipeFrom } from '../stream';
+export class AdbSocketController {
+    dispatcher;
+    localId;
+    remoteId;
+    localCreated;
+    serviceString;
+    _factory;
+    _readable;
+    _readableController;
+    get readable() { return this._readable; }
+    _writePromise;
+    writable;
+    _closed = false;
+    get closed() { return this._closed; }
     constructor(options) {
-        super();
-        this.writeChunkLock = this.addDisposable(new AutoResetEvent());
-        this.writeLock = this.addDisposable(new AutoResetEvent());
-        this.dataEvent = this.addDisposable(new DataEventEmitter());
-        this._closed = false;
-        this.closeEvent = this.addDisposable(new CloseEventEmitter());
         Object.assign(this, options);
-    }
-    get backend() { return this.dispatcher.backend; }
-    get closed() { return this._closed; }
-    get onClose() { return this.closeEvent.event; }
-    writeChunk(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // Wait for an ack packet
-                yield this.writeChunkLock.wait();
-            }
-            catch (_a) {
-                // Lock has been disposed, which means the socket has been closed
-                throw new Error('Can not write after closed');
-            }
-            yield this.dispatcher.sendPacket(AdbCommand.Write, this.localId, this.remoteId, data);
+        // 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();
+            },
         });
-    }
-    write(data) {
-        var e_1, _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // Keep write operations in order
-                yield this.writeLock.wait();
-            }
-            catch (_b) {
-                // Lock has been disposed, which means the socket has been closed
-                throw new Error('Can not write after closed');
-            }
-            try {
-                for (var _c = __asyncValues(chunkArrayLike(data, this.dispatcher.maxPayloadSize)), _d; _d = yield _c.next(), !_d.done;) {
-                    const chunk = _d.value;
-                    yield this.writeChunk(chunk);
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_d && !_d.done && (_a = _c.return)) yield _a.call(_c);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            this.writeLock.notify();
+        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));
+    }
+    async enqueue(packet) {
+        await this._readableController.enqueue(packet);
     }
     ack() {
-        this.writeChunkLock.notify();
+        this._writePromise?.resolve();
     }
-    close() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._closed) {
-                // Immediately cancel all pending writes
-                this.writeLock.dispose();
-                this.writeChunkLock.dispose();
-                yield this.dispatcher.sendPacket(AdbCommand.Close, this.localId, this.remoteId);
-                this._closed = true;
-            }
-        });
+    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);
+        }
     }
     dispose() {
         this._closed = true;
-        this.closeEvent.fire();
-        super.dispose();
+        this._factory.close();
+        // Close `writable` side
+        this.close();
     }
 }
 //# sourceMappingURL=controller.js.map

package/esm/socket/controller.js.map

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

package/esm/socket/dispatcher.d.ts

@@ -0,0 +1,44 @@
+import { AutoDisposable } from '@yume-chan/event';
+import { AdbCommand, type AdbPacketData, type AdbPacketInit } from '../packet.js';
+import { type ReadableWritablePair } from '../stream/index.js';
+import { AdbSocket } from './socket.js';
+export interface AdbIncomingSocketEventArgs {
+    handled: boolean;
+    packet: AdbPacketData;
+    serviceString: string;
+    socket: AdbSocket;
+}
+export interface AdbPacketDispatcherOptions {
+    calculateChecksum: boolean;
+    /**
+     * Before Android 9.0, ADB uses `char*` to parse service string,
+     * thus requires a null character to terminate.
+     *
+     * Usually it should have the same value as `calculateChecksum`.
+     */
+    appendNullToServiceString: boolean;
+    maxPayloadSize: number;
+}
+export declare class AdbPacketDispatcher extends AutoDisposable {
+    private readonly initializers;
+    private readonly sockets;
+    private _writer;
+    readonly options: AdbPacketDispatcherOptions;
+    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;
+        <TThis, TArgs extends unknown[]>(listener: import("@yume-chan/event").EventListener<AdbIncomingSocketEventArgs, TThis, TArgs, unknown>, thisArg: TThis, ...args: TArgs): import("@yume-chan/event").RemoveEventListener;
+    };
+    private _abortController;
+    constructor(connection: ReadableWritablePair<AdbPacketData, AdbPacketInit>, options: AdbPacketDispatcherOptions);
+    private handleOk;
+    private handleClose;
+    private handleOpen;
+    createSocket(serviceString: string): Promise<AdbSocket>;
+    sendPacket(packet: AdbPacketInit): 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,EAAuB,MAAM,aAAa,CAAC;AAE7D,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,MAAM,WAAW,0BAA0B;IACvC,iBAAiB,EAAE,OAAO,CAAC;IAC3B;;;;;OAKG;IACH,yBAAyB,EAAE,OAAO,CAAC;IACnC,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAa,mBAAoB,SAAQ,cAAc;IAGnD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgC;IAC7D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA0C;IAElE,OAAO,CAAC,OAAO,CAA8C;IAE7D,SAAgB,OAAO,EAAE,0BAA0B,CAAC;IAEpD,OAAO,CAAC,aAAa,CAA+B;IACpD,IAAW,YAAY,kBAAyC;IAEhE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAsE;IAC1G,IAAW,gBAAgB;;;MAA6C;IAExE,OAAO,CAAC,gBAAgB,CAAyB;gBAG7C,UAAU,EAAE,oBAAoB,CAAC,aAAa,EAAE,aAAa,CAAC,EAC9D,OAAO,EAAE,0BAA0B;IAkDvC,OAAO,CAAC,QAAQ;YAkBF,WAAW;YA8BX,UAAU;IAiCX,YAAY,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IA2B7D,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"}