@yume-chan/adb 0.0.10 → 0.0.11

package/esm/crypto.js

@@ -1,15 +1,16 @@
+import { getBigUint64, setBigUint64 } from '@yume-chan/dataview-bigint-polyfill/esm/fallback.js';
 const BigInt0 = BigInt(0);
 const BigInt1 = BigInt(1);
 const BigInt2 = BigInt(2);
-const BigInt2To64 = BigInt2 ** BigInt(64);
-export function getBig(buffer, offset = 0, length = buffer.byteLength - offset) {
-    const view = new DataView(buffer);
+const BigInt64 = BigInt(64);
+export function getBig(array, offset = 0, length = array.byteLength - offset) {
+    const view = new DataView(array.buffer, array.byteOffset, array.byteLength);
     let result = BigInt0;
-    // Now `length` must be a multiplication of 8
+    // Currently `length` must be a multiplication of 8
     // Support for arbitrary length can be easily added
     for (let i = offset; i < offset + length; i += 8) {
-        result *= BigInt2To64;
-        const value = view.getBigUint64(i, false);
+        result <<= BigInt64;
+        const value = getBigUint64(view, i, false);
         result += value;
     }
     return result;
@@ -18,20 +19,20 @@ export function setBig(buffer, value, offset = 0) {
     const uint64Array = [];
     while (value > BigInt0) {
         uint64Array.push(BigInt.asUintN(64, value));
-        value /= BigInt2To64;
+        value >>= BigInt64;
     }
     const view = new DataView(buffer);
     for (let i = uint64Array.length - 1; i >= 0; i -= 1) {
-        view.setBigUint64(offset, uint64Array[i], false);
+        setBigUint64(view, offset, uint64Array[i], false);
         offset += 8;
     }
 }
-export function setBigLE(buffer, value, offset = 0) {
-    const view = new DataView(buffer);
+export function setBigLE(array, value, offset = 0) {
+    const view = new DataView(array.buffer, array.byteOffset, array.byteLength);
     while (value > BigInt0) {
-        view.setBigUint64(offset, value, true);
+        setBigUint64(view, offset, value, true);
         offset += 8;
-        value /= BigInt2To64;
+        value >>= BigInt64;
     }
 }
 // These values are correct only if
@@ -65,11 +66,6 @@ export function parsePrivateKey(key) {
 // I can't understand, but it does work
 // Only used with numbers less than 2^32 so doesn't need BigInt
 export function modInverse(a, m) {
-    // validate inputs
-    [a, m] = [Number(a), Number(m)];
-    if (Number.isNaN(a) || Number.isNaN(m)) {
-        return NaN; // invalid input
-    }
     a = (a % m + m) % m;
     if (!a || m < 2) {
         return NaN; // invalid input
@@ -95,7 +91,7 @@ export function modInverse(a, m) {
 export function calculatePublicKeyLength() {
     return 4 + 4 + 2048 / 8 + 2048 / 8 + 4;
 }
-export function calculatePublicKey(privateKey, output, outputOffset = 0) {
+export function calculatePublicKey(privateKey, output) {
     // Android has its own public key generation algorithm
     // See https://android.googlesource.com/platform/system/core.git/+/91784040db2b9273687f88d8b95f729d4a61ecc2/libcrypto_utils/android_pubkey.cpp#111
     // The public key is an array of
@@ -116,16 +112,17 @@ export function calculatePublicKey(privateKey, output, outputOffset = 0) {
     let outputType;
     const outputLength = calculatePublicKeyLength();
     if (!output) {
-        output = new ArrayBuffer(outputLength);
-        outputType = 'ArrayBuffer';
+        output = new Uint8Array(outputLength);
+        outputType = 'Uint8Array';
     }
     else {
-        if (output.byteLength - outputOffset < outputLength) {
+        if (output.byteLength < outputLength) {
             throw new Error('output buffer is too small');
         }
         outputType = 'number';
     }
-    const outputView = new DataView(output);
+    const outputView = new DataView(output.buffer, output.byteOffset, output.byteLength);
+    let outputOffset = 0;
     // modulusLengthInWords
     outputView.setUint32(outputOffset, 2048 / 8 / 4, true);
     outputOffset += 4;
@@ -145,7 +142,7 @@ export function calculatePublicKey(privateKey, output, outputOffset = 0) {
     // exponent
     outputView.setUint32(outputOffset, 65537, true);
     outputOffset += 4;
-    if (outputType === 'ArrayBuffer') {
+    if (outputType === 'Uint8Array') {
         return output;
     }
     else {
@@ -180,14 +177,14 @@ export const Asn1OctetString = 0x04;
 export const Asn1Null = 0x05;
 export const Asn1Oid = 0x06;
 // PKCS#1 SHA-1 hash digest info
-export const Sha1DigestInfo = [
+export const Sha1DigestInfo = new Uint8Array([
     Asn1Sequence, 0x0d + Sha1DigestLength,
     Asn1Sequence, 0x09,
     // SHA-1 (1 3 14 3 2 26)
     Asn1Oid, 0x05, 1 * 40 + 3, 14, 3, 2, 26,
     Asn1Null, 0x00,
     Asn1OctetString, Sha1DigestLength
-];
+]);
 // SubtleCrypto.sign() will hash the given data and sign the hash
 // But we don't need the hashing step
 // (In another word, ADB just requires the client to
@@ -203,19 +200,19 @@ export function sign(privateKey, data) {
     index += 1;
     padded[index] = 1;
     index += 1;
-    const fillLength = padded.length - Sha1DigestInfo.length - data.byteLength - 1;
+    const fillLength = padded.length - Sha1DigestInfo.length - data.length - 1;
     while (index < fillLength) {
         padded[index] = 0xff;
         index += 1;
     }
     padded[index] = 0;
     index += 1;
-    padded.set(new Uint8Array(Sha1DigestInfo), index);
+    padded.set(Sha1DigestInfo, index);
     index += Sha1DigestInfo.length;
-    padded.set(new Uint8Array(data), index);
+    padded.set(data, index);
     // Encryption
     // signature = padded ** d % n
-    let signature = powMod(getBig(padded.buffer), d, n);
+    let signature = powMod(getBig(padded), d, n);
     // Put into an ArrayBuffer
     const result = new ArrayBuffer(256);
     setBig(result, signature);

package/esm/crypto.js.map

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

package/esm/features.js

@@ -3,5 +3,5 @@ export var AdbFeatures;
     AdbFeatures["StatV2"] = "stat_v2";
     AdbFeatures["Cmd"] = "cmd";
     AdbFeatures["ShellV2"] = "shell_v2";
-})(AdbFeatures || (AdbFeatures = {}));
+})(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,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,iCAAkB,CAAA;IAClB,0BAAW,CAAA;IACX,mCAAoB,CAAA;AACxB,CAAC,EAJW,WAAW,GAAX,WAAW,KAAX,WAAW,QAItB"}

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,28 @@
+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 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'];
+export declare type AdbPacketCore = 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: AdbPacketCore): 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;AAaD,eAAO,MAAM,SAAS;;;;;;;;kCAG0C,CAAC;AAEjE,oBAAY,SAAS,GAAG,OAAO,SAAS,CAAC,oBAAoB,CAAC,CAAC;AAG/D,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,7 +8,7 @@ export var AdbCommand;
     AdbCommand[AdbCommand["OK"] = 1497451343] = "OK";
     AdbCommand[AdbCommand["Open"] = 1313165391] = "Open";
     AdbCommand[AdbCommand["Write"] = 1163154007] = "Write";
-})(AdbCommand || (AdbCommand = {}));
+})(AdbCommand = AdbCommand || (AdbCommand = {}));
 const AdbPacketHeader = new Struct({ littleEndian: true })
     .uint32('command')
     .uint32('arg0')
@@ -17,56 +16,32 @@ const AdbPacketHeader = new Struct({ littleEndian: true })
     .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 an 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,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;AAIxB,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;AAYjE,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,iEAAiE;gBAChE,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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"}