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

package/src/service/sync/socket.ts

@@ -21,7 +21,15 @@ import { ResponseId } from "./id/index.js";
 
 const NumberRequest = struct({ id: u32, arg: u32 }, { littleEndian: true });
 
-class AdbSyncError extends Error {}
+const AdbSyncErrorBrand = Symbol.for("AdbSyncError.brand");
+
+class AdbSyncError extends Error {
+    [AdbSyncErrorBrand] = true;
+
+    static override [Symbol.hasInstance](value: unknown) {
+        return !!(value as AdbSyncError | undefined)?.[AdbSyncErrorBrand];
+    }
+}
 export { AdbSyncError as Error };
 
 const FailResponse = struct(
@@ -38,10 +46,13 @@ function i32ToHex(i: number) {
     return "0x" + i.toString(16).padStart(8, "0");
 }
 
+let NextId = 0;
+
 export class Socket implements AsyncExactReadable {
     static readonly NumberRequest = NumberRequest;
     static readonly FailResponse = FailResponse;
 
+    #id: number;
     readonly #socket: Adb.Socket;
     readonly #writer: WritableStreamDefaultWriter<MaybeConsumable<Uint8Array>>;
     readonly #readable: BufferedReadableStream;
@@ -49,6 +60,10 @@ export class Socket implements AsyncExactReadable {
     readonly #combiner: BufferCombiner;
     #idleTimeoutId: ReturnType<typeof setTimeout> | null = null;
 
+    get id() {
+        return this.#id;
+    }
+
     get position() {
         return this.#readable.position;
     }
@@ -58,6 +73,9 @@ export class Socket implements AsyncExactReadable {
     }
 
     constructor(socket: Adb.Socket, bufferSize: number) {
+        this.#id = NextId;
+        NextId += 1;
+
         this.#socket = socket;
         this.#writer = socket.writable.getWriter();
         this.#readable = new BufferedReadableStream(socket.readable);
@@ -73,6 +91,10 @@ export class Socket implements AsyncExactReadable {
     startIdleTimer(timeout: number, callback: () => void) {
         this.clearIdleTimer();
         this.#idleTimeoutId = setTimeout(callback, timeout);
+        if (typeof this.#idleTimeoutId === "object") {
+            // Node.js: unref the timer so that it won't keep the process alive
+            (this.#idleTimeoutId as { unref?: () => void }).unref?.();
+        }
     }
 
     /**

package/src/utils/ref.ts

@@ -1,3 +1,5 @@
+import type { Disposable } from "@yume-chan/event";
+
 interface GlobalExtension {
     setInterval: (callback: () => void, delay: number) => number;
     clearInterval: (id: number) => void;
@@ -9,14 +11,12 @@ const { setInterval, clearInterval } = globalThis as unknown as GlobalExtension;
  * An object to keep current Node.js process alive even when no code is running.
  *
  * Does nothing in Web environments.
- *
- * Note that it does't have reference counting. Calling `unref` will
- * remove the ref no matter how many times `ref` has been previously called, and vice versa.
- * This is the same as how Node.js works.
  */
-export class Ref {
+export class Ref implements Disposable {
     #intervalId: number | undefined;
 
+    #count = 0;
+
     constructor(options?: { unref?: boolean | undefined }) {
         if (!options?.unref) {
             this.ref();
@@ -24,11 +24,21 @@ export class Ref {
     }
 
     ref() {
-        // `setInterval` can keep current Node.js alive, the delay value doesn't matter
-        this.#intervalId = setInterval(() => {}, 60 * 1000);
+        if (this.#count === 0) {
+            // `setInterval` can keep current Node.js alive, the delay value doesn't matter
+            this.#intervalId = setInterval(() => {}, 60 * 1000);
+        }
+        this.#count += 1;
     }
 
     unref() {
+        this.#count -= 1;
+        if (this.#count === 0) {
+            this.dispose();
+        }
+    }
+
+    dispose(): void {
         if (this.#intervalId) {
             clearInterval(this.#intervalId);
             this.#intervalId = undefined;

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

@@ -1,17 +0,0 @@
-import { CompressionStream } from "@yume-chan/stream-extra";
-import type { Adb } from "../../../adb.js";
-import { Format } from "./format.js";
-export { Format };
-export declare const Mode: {
-    readonly Compress: 0;
-    readonly Decompress: 1;
-};
-export type Mode = (typeof Mode)[keyof typeof Mode];
-export declare function hasRuntimeSupport(format: Format, mode: Mode): boolean;
-export declare function canUseBrotli(adb: Adb, mode: Mode): boolean;
-export declare function canUseLz4(adb: Adb, mode: Mode): boolean;
-export declare function canUseZstd(adb: Adb, mode: Mode): boolean;
-export declare function canUseFormat(adb: Adb, format: Format, mode: Mode): boolean;
-export declare function chooseFormat(adb: Adb, mode: Mode): 0 | 3 | 4 | 2;
-export declare function createCompressionStream(format: Format): CompressionStream;
-//# sourceMappingURL=compression.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"compression.d.ts","sourceRoot":"","sources":["../../../../src/service/sync/compression/compression.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAGpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAI3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,eAAO,MAAM,IAAI;;;CAGP,CAAC;AAEX,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,MAAM,OAAO,IAAI,CAAC,CAAC;AAepD,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,WA4B3D;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,WAKhD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,WAK7C;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,WAK9C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,WAahE;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,iBAiBhD;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,CAMzE"}

package/esm/service/sync/compression/compression.js

@@ -1,92 +0,0 @@
-import { CompressionStream, DecompressionStream, TransformStream, } from "@yume-chan/stream-extra";
-import { AdbFeature } from "../../../features.js";
-import { NOOP } from "../../../utils/no-op.js";
-import { Format } from "./format.js";
-export { Format };
-export const Mode = {
-    Compress: 0,
-    Decompress: 1,
-};
-const FormatMap = {
-    [Format.None]: "",
-    // https://github.com/whatwg/compression/pull/80
-    [Format.Zstd]: "zstd",
-    // placeholder
-    [Format.Lz4]: "lz4",
-    // https://github.com/whatwg/compression/pull/80
-    [Format.Brotli]: "brotli",
-};
-const CompressionFormatCache = new Map();
-const DecompressionFormatCache = new Map();
-export function hasRuntimeSupport(format, mode) {
-    if (format === Format.None) {
-        return true;
-    }
-    const Cache = mode === Mode.Compress
-        ? CompressionFormatCache
-        : DecompressionFormatCache;
-    if (Cache.has(format)) {
-        return Cache.get(format);
-    }
-    const Stream = mode === Mode.Compress ? CompressionStream : DecompressionStream;
-    if (!Stream) {
-        return false;
-    }
-    try {
-        const stream = new Stream(FormatMap[format]);
-        void stream.writable.abort().catch(NOOP);
-        Cache.set(format, true);
-        return true;
-    }
-    catch {
-        Cache.set(format, false);
-        return false;
-    }
-}
-export function canUseBrotli(adb, mode) {
-    return (adb.canUseFeature(AdbFeature.SendReceive2Brotli) &&
-        hasRuntimeSupport(Format.Brotli, mode));
-}
-export function canUseLz4(adb, mode) {
-    return (adb.canUseFeature(AdbFeature.SendReceive2Lz4) &&
-        hasRuntimeSupport(Format.Lz4, mode));
-}
-export function canUseZstd(adb, mode) {
-    return (adb.canUseFeature(AdbFeature.SendReceive2Zstd) &&
-        hasRuntimeSupport(Format.Zstd, mode));
-}
-export function canUseFormat(adb, format, mode) {
-    switch (format) {
-        case Format.None:
-            return true;
-        case Format.Brotli:
-            return canUseBrotli(adb, mode);
-        case Format.Lz4:
-            return canUseLz4(adb, mode);
-        case Format.Zstd:
-            return canUseZstd(adb, mode);
-        default:
-            return false;
-    }
-}
-export function chooseFormat(adb, mode) {
-    // The order follows
-    // https://android.googlesource.com/platform/packages/modules/adb/+/3da39565cad412a743a58b94b875a43ed3c640d3/client/file_sync_client.cpp#277
-    if (canUseZstd(adb, mode)) {
-        return Format.Zstd;
-    }
-    if (canUseLz4(adb, mode)) {
-        return Format.Lz4;
-    }
-    if (canUseBrotli(adb, mode)) {
-        return Format.Brotli;
-    }
-    return Format.None;
-}
-export function createCompressionStream(format) {
-    if (format === Format.None) {
-        return new TransformStream();
-    }
-    return new CompressionStream(FormatMap[format]);
-}
-//# sourceMappingURL=compression.js.map

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

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

package/src/service/sync/compression/compression.ts

@@ -1,126 +0,0 @@
-import {
-    CompressionStream,
-    DecompressionStream,
-    TransformStream,
-} from "@yume-chan/stream-extra";
-
-import type { Adb } from "../../../adb.js";
-import { AdbFeature } from "../../../features.js";
-import { NOOP } from "../../../utils/no-op.js";
-
-import { Format } from "./format.js";
-
-export { Format };
-
-export const Mode = {
-    Compress: 0,
-    Decompress: 1,
-} as const;
-
-export type Mode = (typeof Mode)[keyof typeof Mode];
-
-const FormatMap: Record<Format, string> = {
-    [Format.None]: "",
-    // https://github.com/whatwg/compression/pull/80
-    [Format.Zstd]: "zstd",
-    // placeholder
-    [Format.Lz4]: "lz4",
-    // https://github.com/whatwg/compression/pull/80
-    [Format.Brotli]: "brotli",
-};
-
-const CompressionFormatCache = new Map<Format, boolean>();
-const DecompressionFormatCache = new Map<Format, boolean>();
-
-export function hasRuntimeSupport(format: Format, mode: Mode) {
-    if (format === Format.None) {
-        return true;
-    }
-
-    const Cache =
-        mode === Mode.Compress
-            ? CompressionFormatCache
-            : DecompressionFormatCache;
-    if (Cache.has(format)) {
-        return Cache.get(format)!;
-    }
-
-    const Stream =
-        mode === Mode.Compress ? CompressionStream : DecompressionStream;
-    if (!Stream) {
-        return false;
-    }
-
-    try {
-        const stream = new Stream(FormatMap[format]);
-        void stream.writable.abort().catch(NOOP);
-        Cache.set(format, true);
-        return true;
-    } catch {
-        Cache.set(format, false);
-        return false;
-    }
-}
-
-export function canUseBrotli(adb: Adb, mode: Mode) {
-    return (
-        adb.canUseFeature(AdbFeature.SendReceive2Brotli) &&
-        hasRuntimeSupport(Format.Brotli, mode)
-    );
-}
-
-export function canUseLz4(adb: Adb, mode: Mode) {
-    return (
-        adb.canUseFeature(AdbFeature.SendReceive2Lz4) &&
-        hasRuntimeSupport(Format.Lz4, mode)
-    );
-}
-
-export function canUseZstd(adb: Adb, mode: Mode) {
-    return (
-        adb.canUseFeature(AdbFeature.SendReceive2Zstd) &&
-        hasRuntimeSupport(Format.Zstd, mode)
-    );
-}
-
-export function canUseFormat(adb: Adb, format: Format, mode: Mode) {
-    switch (format) {
-        case Format.None:
-            return true;
-        case Format.Brotli:
-            return canUseBrotli(adb, mode);
-        case Format.Lz4:
-            return canUseLz4(adb, mode);
-        case Format.Zstd:
-            return canUseZstd(adb, mode);
-        default:
-            return false;
-    }
-}
-
-export function chooseFormat(adb: Adb, mode: Mode) {
-    // The order follows
-    // https://android.googlesource.com/platform/packages/modules/adb/+/3da39565cad412a743a58b94b875a43ed3c640d3/client/file_sync_client.cpp#277
-
-    if (canUseZstd(adb, mode)) {
-        return Format.Zstd;
-    }
-
-    if (canUseLz4(adb, mode)) {
-        return Format.Lz4;
-    }
-
-    if (canUseBrotli(adb, mode)) {
-        return Format.Brotli;
-    }
-
-    return Format.None;
-}
-
-export function createCompressionStream(format: Format): CompressionStream {
-    if (format === Format.None) {
-        return new TransformStream();
-    }
-
-    return new CompressionStream(FormatMap[format]);
-}