@yume-chan/android-bin 0.0.16 → 0.0.18

package/esm/logcat.js

@@ -1,6 +1,7 @@
 // cspell: ignore logcat
-import { AdbCommandBase, AdbSubprocessNoneProtocol, BufferedStream, BufferedStreamEndedError, DecodeUtf8Stream, ReadableStream, SplitLineStream, WritableStream } from "@yume-chan/adb";
-import Struct from "@yume-chan/struct";
+import { AdbCommandBase, AdbSubprocessNoneProtocol } from "@yume-chan/adb";
+import { BufferedTransformStream, DecodeUtf8Stream, SplitStringStream, WrapReadableStream, WritableStream, } from "@yume-chan/stream-extra";
+import Struct, { decodeUtf8, } from "@yume-chan/struct";
 // `adb logcat` is an alias to `adb shell logcat`
 // so instead of adding to core library, it's implemented here
 // https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/include/android/log.h;l=141;drc=82b5738732161dbaafb2e2f25cce19cd26b9157d
@@ -15,43 +16,100 @@ export var LogId;
     LogId[LogId["Stats"] = 5] = "Stats";
     LogId[LogId["Security"] = 6] = "Security";
     LogId[LogId["Kernel"] = 7] = "Kernel";
-})(LogId || (LogId = {}));
-export var LogPriority;
-(function (LogPriority) {
-    LogPriority[LogPriority["Unknown"] = 0] = "Unknown";
-    LogPriority[LogPriority["Default"] = 1] = "Default";
-    LogPriority[LogPriority["Verbose"] = 2] = "Verbose";
-    LogPriority[LogPriority["Info"] = 3] = "Info";
-    LogPriority[LogPriority["Warn"] = 4] = "Warn";
-    LogPriority[LogPriority["Error"] = 5] = "Error";
-    LogPriority[LogPriority["Fatal"] = 6] = "Fatal";
-    LogPriority[LogPriority["Silent"] = 7] = "Silent";
-})(LogPriority || (LogPriority = {}));
+})(LogId = LogId || (LogId = {}));
+// https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/include/android/log.h;l=73;drc=82b5738732161dbaafb2e2f25cce19cd26b9157d
+export var AndroidLogPriority;
+(function (AndroidLogPriority) {
+    AndroidLogPriority[AndroidLogPriority["Unknown"] = 0] = "Unknown";
+    AndroidLogPriority[AndroidLogPriority["Default"] = 1] = "Default";
+    AndroidLogPriority[AndroidLogPriority["Verbose"] = 2] = "Verbose";
+    AndroidLogPriority[AndroidLogPriority["Debug"] = 3] = "Debug";
+    AndroidLogPriority[AndroidLogPriority["Info"] = 4] = "Info";
+    AndroidLogPriority[AndroidLogPriority["Warn"] = 5] = "Warn";
+    AndroidLogPriority[AndroidLogPriority["Error"] = 6] = "Error";
+    AndroidLogPriority[AndroidLogPriority["Fatal"] = 7] = "Fatal";
+    AndroidLogPriority[AndroidLogPriority["Silent"] = 8] = "Silent";
+})(AndroidLogPriority = AndroidLogPriority || (AndroidLogPriority = {}));
+// https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/logprint.cpp;l=140;drc=8dbf3b2bb6b6d1652d9797e477b9abd03278bb79
+export const AndroidLogPriorityToCharacter = {
+    [AndroidLogPriority.Unknown]: "?",
+    [AndroidLogPriority.Default]: "?",
+    [AndroidLogPriority.Verbose]: "V",
+    [AndroidLogPriority.Debug]: "D",
+    [AndroidLogPriority.Info]: "I",
+    [AndroidLogPriority.Warn]: "W",
+    [AndroidLogPriority.Error]: "E",
+    [AndroidLogPriority.Fatal]: "F",
+    [AndroidLogPriority.Silent]: "S",
+};
+export var LogcatFormat;
+(function (LogcatFormat) {
+    LogcatFormat[LogcatFormat["Brief"] = 0] = "Brief";
+    LogcatFormat[LogcatFormat["Process"] = 1] = "Process";
+    LogcatFormat[LogcatFormat["Tag"] = 2] = "Tag";
+    LogcatFormat[LogcatFormat["Thread"] = 3] = "Thread";
+    LogcatFormat[LogcatFormat["Raw"] = 4] = "Raw";
+    LogcatFormat[LogcatFormat["Time"] = 5] = "Time";
+    LogcatFormat[LogcatFormat["ThreadTime"] = 6] = "ThreadTime";
+    LogcatFormat[LogcatFormat["Long"] = 7] = "Long";
+})(LogcatFormat = LogcatFormat || (LogcatFormat = {}));
 const NANOSECONDS_PER_SECOND = BigInt(1e9);
 // https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/include/log/log_read.h;l=39;drc=82b5738732161dbaafb2e2f25cce19cd26b9157d
 export const LoggerEntry = new Struct({ littleEndian: true })
-    .uint16('payloadSize')
-    .uint16('headerSize')
-    .int32('pid')
-    .uint32('tid')
-    .uint32('second')
-    .uint32('nanoseconds')
-    .uint32('logId')
-    .uint32('uid')
+    .uint16("payloadSize")
+    .uint16("headerSize")
+    .int32("pid")
+    .uint32("tid")
+    .uint32("second")
+    .uint32("nanoseconds")
+    .uint32("logId")
+    .uint32("uid")
     .extra({
     get timestamp() {
-        return BigInt(this.second) * NANOSECONDS_PER_SECOND + BigInt(this.nanoseconds);
+        return (BigInt(this.second) * NANOSECONDS_PER_SECOND +
+            BigInt(this.nanoseconds));
     },
 });
-export async function deserializeLogMessage(stream) {
-    const entry = await LoggerEntry.deserialize(stream);
+// https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/logprint.cpp;l=1415;drc=8dbf3b2bb6b6d1652d9797e477b9abd03278bb79
+export function formatAndroidLogEntry(entry, format = LogcatFormat.Brief, modifier) {
+    const uid = modifier?.uid ? `${entry.uid.toString().padStart(5)}:` : "";
+    switch (format) {
+        // TODO: implement other formats
+        default:
+            return `${AndroidLogPriorityToCharacter[entry.priority]}/${entry.tag.padEnd(8)}(${uid}${entry.pid
+                .toString()
+                .padStart(5)}): ${entry.message}`;
+    }
+}
+function findTagEnd(payload) {
+    for (const separator of [0, " ".charCodeAt(0), ":".charCodeAt(0)]) {
+        const index = payload.indexOf(separator);
+        if (index !== -1) {
+            return index;
+        }
+    }
+    const index = payload.findIndex((x) => x >= 0x7f);
+    if (index !== -1) {
+        return index;
+    }
+    return payload.length;
+}
+export async function deserializeAndroidLogEntry(stream) {
+    const entry = (await LoggerEntry.deserialize(stream));
     if (entry.headerSize !== LoggerEntry.size) {
         await stream.read(entry.headerSize - LoggerEntry.size);
     }
-    const priority = (await stream.read(1))[0];
-    const payload = await stream.read(entry.payloadSize - 1);
-    entry.priority = priority;
-    entry.payload = payload;
+    let payload = await stream.read(entry.payloadSize);
+    // https://cs.android.com/android/platform/superproject/+/master:system/logging/logcat/logcat.cpp;l=193-194;drc=bbe77d66e7bee8bd1f0bc7e5492b5376b0207ef6
+    // TODO: payload for some log IDs are in binary format.
+    entry.priority = payload[0];
+    payload = payload.subarray(1);
+    const tagEnd = findTagEnd(payload);
+    entry.tag = decodeUtf8(payload.subarray(0, tagEnd));
+    entry.message =
+        tagEnd < payload.length - 1
+            ? decodeUtf8(payload.subarray(tagEnd + 1))
+            : "";
     return entry;
 }
 export class Logcat extends AdbCommandBase {
@@ -63,10 +121,10 @@ export class Logcat extends AdbCommandBase {
         return LogId[key];
     }
     static joinLogId(ids) {
-        return ids.map(id => Logcat.logIdToName(id)).join(',');
+        return ids.map((id) => Logcat.logIdToName(id)).join(",");
     }
     static parseSize(value, multiplier) {
-        const MULTIPLIERS = ['', 'Ki', 'Mi', 'Gi'];
+        const MULTIPLIERS = ["", "Ki", "Mi", "Gi"];
         return value * 1024 ** (MULTIPLIERS.indexOf(multiplier) || 0);
     }
     // TODO: logcat: Support output format before Android 10
@@ -77,14 +135,14 @@ export class Logcat extends AdbCommandBase {
     static LOG_SIZE_REGEX_11 = /(.*): ring buffer is (.*) (.*)B \((.*) (.*)B consumed, (.*) (.*)B readable\), max entry is (.*) B, max payload is (.*) B/;
     async getLogSize(ids) {
         const { stdout } = await this.adb.subprocess.spawn([
-            'logcat',
-            '-g',
-            ...(ids ? ['-b', Logcat.joinLogId(ids)] : [])
+            "logcat",
+            "-g",
+            ...(ids ? ["-b", Logcat.joinLogId(ids)] : []),
         ]);
         const result = [];
         await stdout
             .pipeThrough(new DecodeUtf8Stream())
-            .pipeThrough(new SplitLineStream())
+            .pipeThrough(new SplitStringStream("\n"))
             .pipeTo(new WritableStream({
             write(chunk) {
                 let match = chunk.match(Logcat.LOG_SIZE_REGEX_11);
@@ -114,43 +172,30 @@ export class Logcat extends AdbCommandBase {
     }
     async clear(ids) {
         await this.adb.subprocess.spawnAndWait([
-            'logcat',
-            '-c',
-            ...(ids ? ['-b', Logcat.joinLogId(ids)] : []),
+            "logcat",
+            "-c",
+            ...(ids ? ["-b", Logcat.joinLogId(ids)] : []),
         ]);
     }
     binary(options) {
-        let bufferedStream;
-        return new ReadableStream({
-            start: async () => {
-                const { stdout } = await this.adb.subprocess.spawn([
-                    'logcat',
-                    '-B',
-                    ...(options?.pid ? ['--pid', options.pid.toString()] : []),
-                    ...(options?.ids ? ['-b', Logcat.joinLogId(options.ids)] : [])
-                ], {
-                    // PERF: None protocol is 150% faster then Shell protocol
-                    protocols: [AdbSubprocessNoneProtocol],
-                });
-                bufferedStream = new BufferedStream(stdout);
-            },
-            async pull(controller) {
-                try {
-                    const entry = await deserializeLogMessage(bufferedStream);
-                    controller.enqueue(entry);
-                }
-                catch (e) {
-                    if (e instanceof BufferedStreamEndedError) {
-                        controller.close();
-                        return;
-                    }
-                    throw e;
-                }
-            },
-            cancel() {
-                bufferedStream.close();
-            },
-        });
+        return new WrapReadableStream(async () => {
+            // TODO: make `spawn` return synchronously with streams pending
+            // so it's easier to chain them.
+            const { stdout } = await this.adb.subprocess.spawn([
+                "logcat",
+                "-B",
+                ...(options?.pid ? ["--pid", options.pid.toString()] : []),
+                ...(options?.ids
+                    ? ["-b", Logcat.joinLogId(options.ids)]
+                    : []),
+            ], {
+                // PERF: None protocol is 150% faster then Shell protocol
+                protocols: [AdbSubprocessNoneProtocol],
+            });
+            return stdout;
+        }).pipeThrough(new BufferedTransformStream((stream) => {
+            return deserializeAndroidLogEntry(stream);
+        }));
     }
 }
 //# sourceMappingURL=logcat.js.map

package/esm/logcat.js.map

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

package/esm/settings.d.ts

@@ -1,6 +1,6 @@
 import { AdbCommandBase } from "@yume-chan/adb";
-export declare type SettingsNamespace = 'system' | 'secure' | 'global';
-export declare type SettingsResetMode = 'untrusted_defaults' | 'untrusted_clear' | 'trusted_defaults';
+export type SettingsNamespace = 'system' | 'secure' | 'global';
+export type SettingsResetMode = 'untrusted_defaults' | 'untrusted_clear' | 'trusted_defaults';
 export declare class Settings extends AdbCommandBase {
     base(command: string, namespace: SettingsNamespace, ...args: string[]): Promise<string>;
     get(namespace: SettingsNamespace, key: string): Promise<string>;

package/esm/settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,oBAAY,iBAAiB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE/D,oBAAY,iBAAiB,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,kBAAkB,CAAC;AAG9F,qBAAa,QAAS,SAAQ,cAAc;IAGjC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;IAIrE,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM;IAI7C,MAAM,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM;IAIhD,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO;IAWjG,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7E,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjF,IAAI,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAIrE"}
+{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../src/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAE/D,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,GAAG,iBAAiB,GAAG,kBAAkB,CAAC;AAG9F,qBAAa,QAAS,SAAQ,cAAc;IAGjC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;IAIrE,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM;IAI7C,MAAM,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM;IAIhD,GAAG,CAAC,SAAS,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO;IAWjG,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAC7E,KAAK,CAAC,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjF,IAAI,CAAC,SAAS,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAIrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/android-bin",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "Wrappers for Android built-in executables.",
   "keywords": [
     "adb",
@@ -12,7 +12,7 @@
     "email": "cnsimonchan@live.com",
     "url": "https://chensi.moe/blog"
   },
-  "homepage": "https://github.com/yume-chan/ya-webadb/tree/master/libraries/android-bin#readme",
+  "homepage": "https://github.com/yume-chan/ya-webadb/tree/main/libraries/android-bin#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/yume-chan/ya-webadb.git",
@@ -25,17 +25,20 @@
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "devDependencies": {
-    "typescript": "4.7.2",
-    "@yume-chan/ts-package-builder": "^1.0.0"
+    "@yume-chan/eslint-config": "^1.0.0",
+    "@yume-chan/tsconfig": "^1.0.0",
+    "eslint": "^8.31.0",
+    "typescript": "^4.9.4"
   },
   "dependencies": {
-    "@yume-chan/adb": "^0.0.16",
-    "@yume-chan/struct": "^0.0.16",
-    "tslib": "^2.3.1"
+    "@yume-chan/adb": "^0.0.18",
+    "@yume-chan/stream-extra": "^0.0.18",
+    "@yume-chan/struct": "^0.0.18",
+    "tslib": "^2.4.1"
   },
   "scripts": {
-    "build": "build-ts-package",
-    "build:watch": "build-ts-package --incremental"
-  },
-  "readme": "# `@yume-chan/android-bin`\n\nWrappers for Android built-in executables.\n\nCurrently it's bound to `@yume-chan/adb`, maybe one day it can be used with other executors.\n"
+    "build": "tsc -b tsconfig.build.json",
+    "build:watch": "tsc -b tsconfig.build.json",
+    "lint": "eslint src/**/*.ts --fix"
+  }
 }

package/src/bu.ts

@@ -4,7 +4,7 @@
 import { AdbCommandBase } from "@yume-chan/adb";
 
 export interface AdbBackupOptions {
-    apps: string[] | 'all' | 'all-including-system';
+    apps: string[] | "all" | "all-including-system";
     apks: boolean;
     obbs: boolean;
     shared: boolean;
@@ -14,9 +14,13 @@ export interface AdbBackupOptions {
 }
 
 export class AdbBackup extends AdbCommandBase {
-    async backup(options: AdbBackupOptions): Promise<void> {
+    backup(options: AdbBackupOptions): Promise<void> {
+        void options;
+        throw new Error("Not implemented");
     }
 
-    async restore(options: AdbBackupOptions): Promise<void> {
+    restore(options: AdbBackupOptions): Promise<void> {
+        void options;
+        throw new Error("Not implemented");
     }
 }

package/src/bug-report.ts

@@ -1,7 +1,15 @@
 // cspell: ignore bugreport
 // cspell: ignore bugreportz
 
-import { AdbCommandBase, AdbSubprocessShellProtocol, DecodeUtf8Stream, PushReadableStream, ReadableStream, SplitLineStream, WrapReadableStream, WritableStream } from "@yume-chan/adb";
+import { AdbCommandBase, AdbSubprocessShellProtocol } from "@yume-chan/adb";
+import {
+    DecodeUtf8Stream,
+    PushReadableStream,
+    SplitStringStream,
+    WrapReadableStream,
+    WritableStream,
+    type ReadableStream,
+} from "@yume-chan/stream-extra";
 
 export interface BugReportZVersion {
     major: number;
@@ -33,8 +41,11 @@ export class BugReportZ extends AdbCommandBase {
             return undefined;
         }
 
-        const { stderr, exitCode } = await this.adb.subprocess.spawnAndWait(['bugreportz', '-v']);
-        if (exitCode !== 0 || stderr === '') {
+        const { stderr, exitCode } = await this.adb.subprocess.spawnAndWait([
+            "bugreportz",
+            "-v",
+        ]);
+        if (exitCode !== 0 || stderr === "") {
             return undefined;
         }
 
@@ -67,10 +78,12 @@ export class BugReportZ extends AdbCommandBase {
      * @param onProgress Progress callback. Only specify this if `supportsProgress` is `true`.
      * @returns The path of the bugreport file.
      */
-    public async generate(onProgress?: (progress: string, total: string) => void): Promise<string> {
+    public async generate(
+        onProgress?: (progress: string, total: string) => void
+    ): Promise<string> {
         const process = await this.adb.subprocess.spawn([
-            'bugreportz',
-            ...(onProgress ? ['-p'] : []),
+            "bugreportz",
+            ...(onProgress ? ["-p"] : []),
         ]);
 
         let filename: string | undefined;
@@ -78,40 +91,42 @@ export class BugReportZ extends AdbCommandBase {
 
         await process.stdout
             .pipeThrough(new DecodeUtf8Stream())
-            .pipeThrough(new SplitLineStream())
-            .pipeTo(new WritableStream<string>({
-                write(line) {
-                    // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
-                    let match = line.match(BugReportZ.PROGRESS_REGEX);
-                    if (match) {
-                        onProgress?.(match[1]!, match[2]!);
-                    }
-
-                    match = line.match(BugReportZ.BEGIN_REGEX);
-                    if (match) {
-                        filename = match[1]!;
-                    }
-
-                    match = line.match(BugReportZ.OK_REGEX);
-                    if (match) {
-                        filename = match[1];
-                    }
-
-                    match = line.match(BugReportZ.FAIL_REGEX);
-                    if (match) {
-                        // Don't report error now
-                        // We want to gather all output.
-                        error = match[1];
-                    }
-                }
-            }));
+            .pipeThrough(new SplitStringStream("\n"))
+            .pipeTo(
+                new WritableStream<string>({
+                    write(line) {
+                        // `BEGIN:` and `PROGRESS:` only appear when `-p` is specified.
+                        let match = line.match(BugReportZ.PROGRESS_REGEX);
+                        if (match) {
+                            onProgress?.(match[1]!, match[2]!);
+                        }
+
+                        match = line.match(BugReportZ.BEGIN_REGEX);
+                        if (match) {
+                            filename = match[1]!;
+                        }
+
+                        match = line.match(BugReportZ.OK_REGEX);
+                        if (match) {
+                            filename = match[1];
+                        }
+
+                        match = line.match(BugReportZ.FAIL_REGEX);
+                        if (match) {
+                            // Don't report error now
+                            // We want to gather all output.
+                            error = match[1];
+                        }
+                    },
+                })
+            );
 
         if (error) {
             throw new Error(error);
         }
 
         if (!filename) {
-            throw new Error('bugreportz did not return file name');
+            throw new Error("bugreportz did not return file name");
         }
 
         // Design choice: we don't automatically pull the file to avoid more dependency on `@yume-chan/adb`
@@ -124,22 +139,34 @@ export class BugReportZ extends AdbCommandBase {
 
     public stream(): ReadableStream<Uint8Array> {
         return new PushReadableStream(async (controller) => {
-            const process = await this.adb.subprocess.spawn(['bugreportz', '-s']);
+            const process = await this.adb.subprocess.spawn([
+                "bugreportz",
+                "-s",
+            ]);
             process.stdout
-                .pipeTo(new WritableStream({
-                    async write(chunk) {
-                        await controller.enqueue(chunk);
-                    },
-                }));
+                .pipeTo(
+                    new WritableStream({
+                        async write(chunk) {
+                            await controller.enqueue(chunk);
+                        },
+                    })
+                )
+                .catch((e) => {
+                    void e;
+                });
             process.stderr
                 .pipeThrough(new DecodeUtf8Stream())
-                .pipeTo(new WritableStream({
-                    async write(chunk) {
-                        controller.error(new Error(chunk));
-                    }
-                }));
+                .pipeTo(
+                    new WritableStream({
+                        write(chunk) {
+                            controller.error(new Error(chunk));
+                        },
+                    })
+                )
+                .catch((e) => {
+                    void e;
+                });
             await process.exit;
-            controller.close();
         });
     }
 }
@@ -148,7 +175,7 @@ export class BugReportZ extends AdbCommandBase {
 export class BugReport extends AdbCommandBase {
     public generate(): ReadableStream<Uint8Array> {
         return new WrapReadableStream(async () => {
-            const process = await this.adb.subprocess.spawn(['bugreport']);
+            const process = await this.adb.subprocess.spawn(["bugreport"]);
             return process.stdout;
         });
     }