@yume-chan/adb 3.0.0-beta.1 → 3.0.0-beta.2

package/esm/service/sync/request/pull.js

@@ -1,28 +1,88 @@
-import { ReadableStream } from "@yume-chan/stream-extra";
+import { InspectStream, ReadableStream } from "@yume-chan/stream-extra";
 import { buffer, struct, u32 } from "@yume-chan/struct";
 import { RequestId, ResponseId } from "../id/index.js";
+import { Compression } from "../index-ns.js";
 import { Error as AdbSyncError } from "../socket.js";
+import { SyncFlag } from "./flag.js";
 export const DataResponse = struct({ data: buffer(u32) }, { littleEndian: true });
-export async function* generator(pool, path) {
-    const socket = await pool.acquire();
-    let completed = false;
-    let error;
-    try {
-        await socket.writeRequest(RequestId.Receive, path);
+export function receiveV1(pool, path) {
+    let bytesReceived = 0;
+    return {
+        readable: ReadableStream.from(pool.withSocketGenerator(async function* (socket) {
+            await socket.writeRequest(RequestId.Receive, path);
+            for await (const packet of socket.readResponses(ResponseId.Data, DataResponse)) {
+                bytesReceived += packet.data.length;
+                yield packet.data;
+            }
+        })),
+        get bytesRead() {
+            return bytesReceived;
+        },
+        compression: undefined,
+        get bytesCompressed() {
+            return bytesReceived;
+        },
+    };
+}
+export function receiveV2(pool, path, compression) {
+    let flags = SyncFlag.None;
+    let decompressStream;
+    switch (compression) {
+        case Compression.Format.Brotli:
+            flags |= SyncFlag.Brotli;
+            decompressStream = Compression.createDecompressionStream(Compression.Format.Brotli);
+            break;
+        case Compression.Format.Lz4:
+            flags |= SyncFlag.Lz4;
+            decompressStream = Compression.createDecompressionStream(Compression.Format.Lz4);
+            break;
+        case Compression.Format.Zstd:
+            flags |= SyncFlag.Zstd;
+            decompressStream = Compression.createDecompressionStream(Compression.Format.Zstd);
+            break;
+    }
+    let bytesReceived = 0;
+    const raw = ReadableStream.from(pool.withSocketGenerator(async function* (socket) {
+        await socket.writeRequest(RequestId.ReceiveV2, path);
+        await socket.writeRequest(RequestId.ReceiveV2, flags);
         for await (const packet of socket.readResponses(ResponseId.Data, DataResponse)) {
+            bytesReceived += packet.data.length;
             yield packet.data;
         }
-        completed = true;
+    }));
+    if (decompressStream) {
+        let bytesRead = 0;
+        return {
+            readable: raw.pipeThrough(decompressStream).pipeThrough(new InspectStream((chunk) => {
+                bytesRead += chunk.length;
+            })),
+            get bytesRead() {
+                return bytesRead;
+            },
+            compression,
+            get bytesCompressed() {
+                return bytesReceived;
+            },
+        };
     }
-    catch (e) {
-        error = e;
-        throw e;
+    return {
+        readable: raw,
+        get bytesRead() {
+            return bytesReceived;
+        },
+        compression: Compression.Format.None,
+        get bytesCompressed() {
+            return bytesReceived;
+        },
+    };
+}
+export function receive(version, pool, path, compression) {
+    if (version === 2) {
+        return receiveV2(pool, path, compression);
     }
-    finally {
-        await pool.release(socket, !(completed || error instanceof AdbSyncError));
+    if (compression !== undefined && compression !== Compression.Format.None) {
+        throw new AdbSyncError("compression is not supported in v1");
     }
-}
-export function stream(pool, path) {
-    return ReadableStream.from(generator(pool, path));
+    return receiveV1(pool, path);
 }
 //# sourceMappingURL=pull.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/service/sync/request/pull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEvD,OAAO,EAAE,KAAK,IAAI,YAAY,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAC9B,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,EACrB,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC;AAIF,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,SAAS,CAC5B,IAAgB,EAChB,IAAY;IAEZ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACpC,IAAI,SAAS,GAAG,KAAK,CAAC;IACtB,IAAI,KAAc,CAAC;IAEnB,IAAI,CAAC;QACD,MAAM,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,MAAM,CAAC,aAAa,CAC3C,UAAU,CAAC,IAAI,EACf,YAAY,CACf,EAAE,CAAC;YACA,MAAM,MAAM,CAAC,IAAI,CAAC;QACtB,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;IACrB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,KAAK,GAAG,CAAC,CAAC;QACV,MAAM,CAAC,CAAC;IACZ,CAAC;YAAS,CAAC;QACP,MAAM,IAAI,CAAC,OAAO,CACd,MAAM,EACN,CAAC,CAAC,SAAS,IAAI,KAAK,YAAY,YAAY,CAAC,CAChD,CAAC;IACN,CAAC;AACL,CAAC;AAED,MAAM,UAAU,MAAM,CAClB,IAAgB,EAChB,IAAY;IAEZ,OAAO,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../../src/service/sync/request/pull.ts"],"names":[],"mappings":"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"}

package/esm/service/sync/request/push.d.ts

@@ -1,4 +1,4 @@
-import type { ReadableStream } from "@yume-chan/stream-extra";
+import type { WritableStream } from "@yume-chan/stream-extra";
 import { MaybeConsumable } from "@yume-chan/stream-extra";
 import { LinuxFileType } from "../android.js";
 import { Compression } from "../compression/index.js";
@@ -9,24 +9,36 @@ export declare const OkResponse: import("@yume-chan/struct").Struct<{
 }, undefined, import("@yume-chan/struct").FieldsValue<{
     unused: import("@yume-chan/struct").NumberField<number>;
 }>>;
+export interface SendSession {
+    /**
+     * The writable stream to write the file content into.
+     */
+    writable: WritableStream<MaybeConsumable<Uint8Array>>;
+    /**
+     * Gets the number of bytes written into {@link writable}.
+     */
+    bytesWritten: number;
+    /**
+     * When using Send v2, gets the compression format used (might be `None`).
+     *
+     * When using Send v1, this will always be `undefined`.
+     */
+    compression?: Compression.Format | undefined;
+    /**
+     * When using Send v2, gets the size of the compressed data sent to the device.
+     * Might be same as {@link bytesWritten} if no compression was applied.
+     */
+    bytesCompressed: number;
+}
 export interface SendV1Options {
     pool: SocketPool;
-    filename: string;
-    file: ReadableStream<MaybeConsumable<Uint8Array>>;
+    path: string;
     type?: LinuxFileType | undefined;
     permission?: number | undefined;
     mtime?: number | undefined;
     packetSize?: number | undefined;
 }
-export declare function sendV1({ pool, filename, file, type, permission, mtime, packetSize, }: SendV1Options): Promise<void>;
-export declare const SendV2Flags: {
-    readonly None: 0;
-    readonly Brotli: 1;
-    readonly Lz4: 2;
-    readonly Zstd: 4;
-    readonly DryRun: 2147483648;
-};
-export type SendV2Flags = (typeof SendV2Flags)[keyof typeof SendV2Flags];
+export declare function sendV1({ pool, path, type, permission, mtime, packetSize, }: SendV1Options): Promise<SendSession>;
 export declare const SendV2Request: import("@yume-chan/struct").Struct<{
     id: import("@yume-chan/struct").NumberField<number>;
     mode: import("@yume-chan/struct").NumberField<number>;
@@ -37,6 +49,16 @@ export declare const SendV2Request: import("@yume-chan/struct").Struct<{
     flags: import("@yume-chan/struct").NumberField<number>;
 }>>;
 export interface SendV2Options extends SendV1Options {
+    /**
+     * The format to compress the file stream for sending.
+     *
+     * If the device or current runtime doesn't support the specified format,
+     * an Error will be thrown.
+     *
+     * If `undefined` is specified, no compression will be used.
+     * (this behavior is different from `AdbSync.Service.prototype.write`,
+     * which will automatically choose the best format)
+     */
     compression?: Compression.Format | undefined;
     /**
      * Don't write the file to disk. Requires the `sendrecv_v2` feature.
@@ -46,9 +68,9 @@ export interface SendV2Options extends SendV1Options {
      */
     dryRun?: boolean | undefined;
 }
-export declare function sendV2({ pool, filename, file, type, permission, mtime, packetSize, compression, dryRun, }: SendV2Options): Promise<void>;
+export declare function sendV2({ pool, path, type, permission, mtime, packetSize, compression, dryRun, }: SendV2Options): Promise<SendSession>;
 export interface SendOptions extends SendV2Options {
     version: 1 | 2;
 }
-export declare function send(options: SendOptions): Promise<void>;
+export declare function send(options: SendOptions): Promise<SendSession>;
 //# sourceMappingURL=push.d.ts.map

package/esm/service/sync/request/push.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAGH,eAAe,EAClB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,eAAO,MAAM,aAAa,QAAY,CAAC;AAEvC,eAAO,MAAM,UAAU;;;;GAAkD,CAAC;AA2C1E,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,wBAAgB,MAAM,CAAC,EACnB,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,GAC7B,EAAE,aAAa,iBAaf;AAED,eAAO,MAAM,WAAW;;;;;;CAMd,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,OAAO,WAAW,CAAC,CAAC;AAEzE,eAAO,MAAM,aAAa;;;;;;;;GAGzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,aAAa;IAChD,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC;AAED,wBAAgB,MAAM,CAAC,EACnB,IAAI,EACJ,QAAQ,EACR,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,EAC1B,WAAqC,EACrC,MAAc,GACjB,EAAE,aAAa,iBA6Bf;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa;IAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;CAClB;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,iBAiBxC"}
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../../../src/service/sync/request/push.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAER,cAAc,EAEjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAsB,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAI9E,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAMpD,eAAO,MAAM,aAAa,QAAY,CAAC;AAEvC,eAAO,MAAM,UAAU;;;;GAAkD,CAAC;AAE1E,MAAM,WAAW,WAAW;IACxB;;OAEG;IACH,QAAQ,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACtD;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAC7C;;;OAGG;IACH,eAAe,EAAE,MAAM,CAAC;CAC3B;AA4FD,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,UAAU,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,wBAAsB,MAAM,CAAC,EACzB,IAAI,EACJ,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,GAC7B,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAyBtC;AAED,eAAO,MAAM,aAAa;;;;;;;;GAGzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,aAAa;IAChD;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAE7C;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC;AAED,wBAAsB,MAAM,CAAC,EACzB,IAAI,EACJ,IAAI,EACJ,IAAyB,EACzB,UAAkB,EAClB,KAA+B,EAC/B,UAA0B,EAC1B,WAAqC,EACrC,MAAc,GACjB,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAgGtC;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa;IAC9C,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;CAClB;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,wBAiBxC"}

package/esm/service/sync/request/push.js

@@ -1,83 +1,199 @@
-import { AbortController, DistributionStream, MaybeConsumable, } from "@yume-chan/stream-extra";
+import { PromiseResolver } from "@yume-chan/async";
+import { DistributionStream, MaybeConsumable } from "@yume-chan/stream-extra";
 import { struct, u32 } from "@yume-chan/struct";
-import { NOOP } from "../../../utils/index.js";
+import { NOOP } from "../../../utils/no-op.js";
 import { LinuxFileType } from "../android.js";
 import { Compression } from "../compression/index.js";
 import { RequestId, ResponseId } from "../id/index.js";
 import { Error as AdbSyncError } from "../socket.js";
+import { SyncFlag } from "./flag.js";
 export const MaxPacketSize = 64 * 1024;
 export const OkResponse = struct({ unused: u32 }, { littleEndian: true });
-// eslint-disable-next-line @typescript-eslint/max-params
-async function pipeFileData(socket, file, packetSize, mtime, compression) {
-    if (compression !== Compression.Format.None) {
-        const stream = Compression.createCompressionStream(compression);
-        void file
-            .pipeTo(new MaybeConsumable.WrapWritableStream(stream.writable))
-            .catch(NOOP);
-        file = stream.readable;
+class SendWritableStream extends MaybeConsumable.WritableStream {
+    #pool;
+    #socket;
+    #resolver = new PromiseResolver();
+    #controller;
+    #bytesWritten = 0;
+    get bytesWritten() {
+        return this.#bytesWritten;
     }
-    // Read and write in parallel,
-    // allow error response to abort the write.
-    const abortController = new AbortController();
-    file.pipeThrough(new DistributionStream(packetSize, true))
-        .pipeTo(new MaybeConsumable.WritableStream({
-        write(chunk) {
-            return socket.writeRequest(RequestId.Data, chunk);
-        },
-    }), { signal: abortController.signal })
-        .then(async () => {
-        await socket.writeRequest(RequestId.Done, mtime);
-        await socket.flush();
-    }, NOOP);
+    constructor(pool, socket, mtime) {
+        let controller;
+        super({
+            start: (controller_) => {
+                controller = controller_;
+                // Start reading response immediately,
+                // the server can send error response before the whole file is sent.
+                socket.readResponse(ResponseId.Ok, OkResponse).then(() => this.#finish(), (e) => this.#finish(e));
+            },
+            write: async (chunk) => {
+                try {
+                    this.#bytesWritten += chunk.length;
+                    await socket.writeRequest(RequestId.Data, chunk);
+                }
+                catch (e) {
+                    await this.#finish(e);
+                }
+            },
+            close: async () => {
+                try {
+                    await socket.writeRequest(RequestId.Done, mtime);
+                    await socket.flush();
+                }
+                catch (e) {
+                    await this.#finish(e);
+                    return;
+                }
+                await this.#resolver.promise;
+            },
+            abort: async (reason) => {
+                // Write anything other than `Data` or `Done`
+                // will cause the server to delete the file.
+                await socket.writeRequest(ResponseId.Fail, 0);
+                // Socket not reusable after aborting, so discard it.
+                await this.#finish(reason);
+            },
+        });
+        this.#pool = pool;
+        this.#socket = socket;
+        this.#controller = controller;
+        // Suppress unhandled rejection warning when the promise is not awaited.
+        this.#resolver.promise.catch(NOOP);
+    }
+    #trySetError(reason) {
+        try {
+            this.#controller.error(reason);
+        }
+        catch {
+            // Ignore if controller is already closed or errored
+        }
+    }
+    async #finish(error) {
+        try {
+            await this.#pool.release(this.#socket, !(error instanceof AdbSyncError));
+            if (error) {
+                this.#trySetError(error);
+                this.#resolver.reject(error);
+            }
+            else {
+                this.#resolver.resolve();
+            }
+        }
+        catch (e) {
+            // TOOD: use `SuppressedError` when universally supported
+            this.#trySetError(e);
+            this.#resolver.reject(e);
+        }
+    }
+}
+export async function sendV1({ pool, path, type = LinuxFileType.File, permission = 0o666, mtime = (Date.now() / 1000) | 0, packetSize = MaxPacketSize, }) {
+    const mode = (type << 12) | permission;
+    const request = path + "," + mode;
+    const socket = await pool.acquire();
     try {
-        await socket.readResponse(ResponseId.Ok, OkResponse);
+        await socket.writeRequest(RequestId.Send, request);
     }
     catch (e) {
-        abortController.abort(e);
+        await pool.release(socket, !(e instanceof AdbSyncError));
         throw e;
     }
+    const distributeStream = new DistributionStream(packetSize, true);
+    const sendStream = new SendWritableStream(pool, socket, mtime);
+    void distributeStream.readable.pipeTo(sendStream).catch(NOOP);
+    return {
+        writable: distributeStream.writable,
+        get bytesWritten() {
+            return sendStream.bytesWritten;
+        },
+        get bytesCompressed() {
+            return sendStream.bytesWritten;
+        },
+    };
 }
-export function sendV1({ pool, filename, file, type = LinuxFileType.File, permission = 0o666, mtime = (Date.now() / 1000) | 0, packetSize = MaxPacketSize, }) {
-    return pool.withSocket(async (socket) => {
-        const mode = (type << 12) | permission;
-        const pathAndMode = `${filename},${mode.toString()}`;
-        await socket.writeRequest(RequestId.Send, pathAndMode);
-        await pipeFileData(socket, file, packetSize, mtime, Compression.Format.None);
-    });
-}
-export const SendV2Flags = {
-    None: 0,
-    Brotli: 1,
-    Lz4: 2,
-    Zstd: 4,
-    DryRun: 0x80000000,
-};
 export const SendV2Request = struct({ id: u32, mode: u32, flags: u32 }, { littleEndian: true });
-export function sendV2({ pool, filename, file, type = LinuxFileType.File, permission = 0o666, mtime = (Date.now() / 1000) | 0, packetSize = MaxPacketSize, compression = Compression.Format.None, dryRun = false, }) {
-    return pool.withSocket(async (socket) => {
-        let flags = SendV2Flags.None;
-        switch (compression) {
-            case Compression.Format.Brotli:
-                flags |= SendV2Flags.Brotli;
-                break;
-            case Compression.Format.Lz4:
-                flags |= SendV2Flags.Lz4;
-                break;
-            case Compression.Format.Zstd:
-                flags |= SendV2Flags.Zstd;
-                break;
-        }
-        if (dryRun) {
-            flags |= SendV2Flags.DryRun;
-        }
-        await socket.writeRequest(RequestId.SendV2, filename);
+export async function sendV2({ pool, path, type = LinuxFileType.File, permission = 0o666, mtime = (Date.now() / 1000) | 0, packetSize = MaxPacketSize, compression = Compression.Format.None, dryRun = false, }) {
+    let flags = SyncFlag.None;
+    let compressStream;
+    // Validate `compression` before acquiring the socket
+    switch (compression) {
+        case Compression.Format.Brotli:
+            flags |= SyncFlag.Brotli;
+            compressStream = Compression.createCompressionStream(Compression.Format.Brotli);
+            break;
+        case Compression.Format.Lz4:
+            flags |= SyncFlag.Lz4;
+            compressStream = Compression.createCompressionStream(Compression.Format.Lz4);
+            break;
+        case Compression.Format.Zstd:
+            flags |= SyncFlag.Zstd;
+            compressStream = Compression.createCompressionStream(Compression.Format.Zstd);
+            break;
+    }
+    if (dryRun) {
+        flags |= SyncFlag.DryRun;
+    }
+    const socket = await pool.acquire();
+    try {
+        await socket.writeRequest(RequestId.SendV2, path);
         await socket.write(SendV2Request.serialize({
             id: RequestId.SendV2,
             mode: (type << 12) | permission,
             flags,
         }));
-        await pipeFileData(socket, file, packetSize, mtime, compression);
-    });
+    }
+    catch (e) {
+        await pool.release(socket, !(e instanceof AdbSyncError));
+        throw e;
+    }
+    const distributeStream = new DistributionStream(packetSize, true);
+    const sendStream = new SendWritableStream(pool, socket, mtime);
+    if (!compressStream) {
+        const pipe = distributeStream.readable.pipeTo(sendStream);
+        const writer = distributeStream.writable.getWriter();
+        return {
+            writable: new MaybeConsumable.WritableStream({
+                write(chunk) {
+                    return writer.write(chunk);
+                },
+                async close() {
+                    await writer.close();
+                    await pipe;
+                },
+            }),
+            get bytesWritten() {
+                return sendStream.bytesWritten;
+            },
+            compression: Compression.Format.None,
+            get bytesCompressed() {
+                return sendStream.bytesWritten;
+            },
+        };
+    }
+    const pipe = compressStream.readable
+        .pipeThrough(distributeStream)
+        .pipeTo(sendStream);
+    const writer = compressStream.writable.getWriter();
+    let bytesWritten = 0;
+    return {
+        writable: new MaybeConsumable.WritableStream({
+            write(chunk) {
+                bytesWritten += chunk.length;
+                return writer.write(chunk);
+            },
+            async close() {
+                await writer.close();
+                await pipe;
+            },
+        }),
+        get bytesWritten() {
+            return bytesWritten;
+        },
+        compression,
+        get bytesCompressed() {
+            return sendStream.bytesWritten;
+        },
+    };
 }
 export function send(options) {
     if (options.version === 2) {

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

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

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

@@ -1,8 +1,9 @@
-import type { AbortSignal, MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
+import type { AbortSignal, ReadableStream } from "@yume-chan/stream-extra";
+import { MaybeConsumable } from "@yume-chan/stream-extra";
 import type { Adb } from "../../adb.js";
 import type { LinuxFileType } from "./android.js";
 import { Compression } from "./compression/index.js";
-import { OpenDir, Stat } from "./request/index.js";
+import { OpenDir, Receive, Send, Stat } from "./request/index.js";
 import type { Socket } from "./socket.js";
 export interface ServiceOptions {
     /**
@@ -29,20 +30,20 @@ export interface ServiceOptions {
  */
 export declare function dirname(path: string): string;
 export interface WriteOptions {
-    filename: string;
-    file: ReadableStream<MaybeConsumable<Uint8Array>>;
+    path: string;
     type?: LinuxFileType | undefined;
     permission?: number | undefined;
     mtime?: number | undefined;
     /**
      * The format to compress the file stream for sending.
      *
-     * If the device doesn't support compressed sending, it will be ignored.
+     * If the device doesn't support compressed sending, the value will be ignored.
      *
-     * If the device or current runtime doesn't support the specified format,
+     * Otherwise, if the device or current runtime doesn't support the specified format,
      * an Error will be thrown.
-     * {@link Compression.canUseFormat} can be used to check if
-     * the device and current runtime both supports the format.
+     *
+     * If `undefined` is specified, automatically choose the best format
+     * supported by both device and current runtime.
      */
     compression?: Compression.Format | undefined;
     dryRun?: boolean | undefined;
@@ -107,17 +108,32 @@ export declare class Service {
     opendir(path: string): AsyncGenerator<OpenDir.Entry, void, void>;
     readdir(path: string): Promise<OpenDir.Entry[]>;
     /**
-     * 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.
+     * Creates a readable stream to read the content of a file on device.
+     * @param path The full path of the file on device to read.
+     * @param compression The compression format to use for reading the file. If the device doesn't support compressed reading, the value will be ignored.
+     * @returns A {@link Receive.ReceiveSession} object that contains a readable stream to read the file content.
      */
-    read(filename: string): ReadableStream<Uint8Array>;
+    createReadable(path: string, compression?: Compression.Format): Receive.ReceiveSession;
     /**
-     * Writes a file on device. If the file name already exists, it will be overwritten.
+     * Creates a readable stream to read the content of a file on device.
      *
-     * @param options The content and options of the file to write.
+     * @param path The full path of the file on device to read.
+     * @returns A readable stream to read the file content.
+     */
+    read(path: string): ReadableStream<Uint8Array>;
+    /**
+     * Creates a writable stream to write a file
+     * @param options The options for writing the file, including the path, type, permission, mtime, and compression format.
+     * @returns A {@link SendSession} object that contains a writable stream to write the file content.
+     */
+    createWritable(options: WriteOptions): Promise<Send.SendSession>;
+    /**
+     * Writes a file to the device using a readable stream.
+     * @param options The options for writing the file, including the path, type, permission, mtime, compression format, and a readable stream to read the file content.
+     * @returns An object that contains the number of bytes written, the compression format used (if any), and the size of the compressed data written (if any).
      */
-    write(options: WriteOptions): Promise<void>;
+    write(options: WriteOptions & {
+        readable: ReadableStream<MaybeConsumable<Uint8Array>>;
+    }): Promise<Omit<Send.SendSession, "writable">>;
 }
 //# sourceMappingURL=service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service/sync/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,cAAc,EACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAiB,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,MAAM,WAAW,cAAc;IAC3B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5C;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IAClD,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAC7C,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC;AAED,qBAAa,OAAO;;IAChB,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC;IASpB,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,uBAAuB,IAAI,OAAO,CAErC;gBAEW,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc;IAsB9C;;;;;;OAMG;IACG,aAAa;IAInB;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,UAAQ;IAInD;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IAMvC;;;;OAIG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;;;;;IAQjB;;;;OAIG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAajD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;IAM1D,OAAO,CAAC,IAAI,EAAE,MAAM;IAS1B;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC;IAIlD;;;;OAIG;IACG,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;CAmCpD"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/service/sync/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAIxC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAG1C,MAAM,WAAW,cAAc;IAC3B;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5C;AAED,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B;;;;;;;;;;OAUG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,SAAS,CAAC;IAC7C,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;CAChC;AAED,qBAAa,OAAO;;IAChB,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC;IASpB,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,uBAAuB,IAAI,OAAO,CAErC;gBAEW,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,cAAc;IAsB9C;;;;;;OAMG;IACG,aAAa;IAInB;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,UAAQ;IAInD;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IAMvC;;;;OAIG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM;;;;;;;;;;;;;;;;IAQjB;;;;OAIG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAajD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC;IAM1D,OAAO,CAAC,IAAI,EAAE,MAAM;IAS1B;;;;;OAKG;IACH,cAAc,CACV,IAAI,EAAE,MAAM,EACZ,WAAW,CAAC,EAAE,WAAW,CAAC,MAAM,GACjC,OAAO,CAAC,cAAc;IAwBzB;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAAC,UAAU,CAAC;IAK9C;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC;IA4CtE;;;;OAIG;IACG,KAAK,CACP,OAAO,EAAE,YAAY,GAAG;QACpB,QAAQ,EAAE,cAAc,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;KACzD,GACF,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;CAWjD"}