@yume-chan/android-bin 0.0.19 → 0.0.21

package/esm/string-format.d.ts

@@ -0,0 +1,40 @@
+export declare class ParseError extends Error {
+    #private;
+    get expected(): string[];
+    constructor(expected: string[]);
+}
+export interface Reader {
+    value: string;
+    position: number;
+}
+export interface Format<T> {
+    parse(reader: Reader): T;
+    stringify(value: T): string;
+}
+type UnionResult<T extends readonly Format<unknown>[]> = Exclude<{
+    [K in keyof T]: T[K] extends Format<infer F> ? F : never;
+}[number], undefined>;
+type SequenceResult<T extends readonly (Format<unknown> | {
+    name: string;
+    format: Format<unknown>;
+})[]> = {
+    [K in keyof T as K extends `${number}` ? T[K] extends {
+        name: infer N extends string;
+    } ? N : never : never]: T[K] extends {
+        format: Format<infer F>;
+    } ? F : never;
+} extends infer R extends Record<string, unknown> ? R : never;
+export declare const p: {
+    literal: <T extends string>(value: T) => Format<T>;
+    digits: () => Format<number>;
+    union: <const T_1 extends readonly Format<unknown>[]>(...args: T_1) => Format<Exclude<{ [K in keyof T_1]: T_1[K] extends Format<infer F> ? F : never; }[number], undefined>>;
+    separated: <T_2>(separator: string, format: Format<T_2>, min?: number, max?: number) => Format<T_2[]>;
+    repeated: <T_3>(format: Format<T_3>) => Format<T_3[]>;
+    sequence: <const T_4 extends readonly (Format<unknown> | {
+        name: string;
+        format: Format<unknown>;
+    })[]>(...args: T_4) => Format<SequenceResult<T_4>>;
+    map: <T_5, R>(format: Format<T_5>, map: (value: T_5) => R, reverse: (value: R) => T_5) => Format<R>;
+};
+export {};
+//# sourceMappingURL=string-format.d.ts.map

package/esm/string-format.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"string-format.d.ts","sourceRoot":"","sources":["../src/string-format.ts"],"names":[],"mappings":"AACA,qBAAa,UAAW,SAAQ,KAAK;;IAGjC,IAAI,QAAQ,IAAI,MAAM,EAAE,CAEvB;gBAEW,QAAQ,EAAE,MAAM,EAAE;CAIjC;AAED,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC;IACrB,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC;IACzB,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC;CAC/B;AAED,KAAK,WAAW,CAAC,CAAC,SAAS,SAAS,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,OAAO,CAC5D;KACK,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAC3D,CAAC,MAAM,CAAC,EACT,SAAS,CACZ,CAAC;AAEF,KAAK,cAAc,CACf,CAAC,SAAS,SAAS,CACb,MAAM,CAAC,OAAO,CAAC,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;CAAE,CAC9C,EAAE,IACH;KACC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,GAAG,MAAM,EAAE,GAChC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC,SAAS,MAAM,CAAA;KAAE,GACzC,CAAC,GACD,KAAK,GACT,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;KAAE,GAAG,CAAC,GAAG,KAAK;CACrE,SAAS,MAAM,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3C,CAAC,GACD,KAAK,CAAC;AAEZ,eAAO,MAAM,CAAC;;kBAaE,OAAO,MAAM,CAAC;;gCA6CX,MAAM;;;cAsDH,MAAM;gBAAU,OAAO,OAAO,CAAC;;;CAwCU,CAAC"}

package/esm/string-format.js

@@ -0,0 +1,153 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+export class ParseError extends Error {
+    #expected;
+    get expected() {
+        return this.#expected;
+    }
+    constructor(expected) {
+        super(`Expected ${expected.join(", ")}`);
+        this.#expected = expected;
+    }
+}
+export const p = {
+    literal: (value) => ({
+        parse(reader) {
+            if (!reader.value.startsWith(value, reader.position)) {
+                throw new ParseError([value.charAt(0)]);
+            }
+            reader.position += value.length;
+            return value;
+        },
+        stringify() {
+            return value;
+        },
+    }),
+    digits: () => ({
+        parse(reader) {
+            const match = reader.value.substring(reader.position).match(/^\d+/);
+            if (!match) {
+                throw new ParseError("0123456789".split(""));
+            }
+            reader.position += match[0].length;
+            return Number.parseInt(match[0], 10);
+        },
+        stringify(value) {
+            return value.toString();
+        },
+    }),
+    union: (...args) => ({
+        parse(reader) {
+            const expected = [];
+            for (const format of args) {
+                try {
+                    return format.parse(reader);
+                }
+                catch (e) {
+                    if (e instanceof ParseError) {
+                        expected.push(...e.expected);
+                    }
+                    else {
+                        throw e;
+                    }
+                }
+            }
+            throw new ParseError(expected);
+        },
+        stringify(value) {
+            for (const format of args) {
+                try {
+                    const result = format.stringify(value);
+                    // Parse the result to make sure it is valid
+                    format.parse({ value: result, position: 0 });
+                }
+                catch (e) {
+                    // ignore
+                }
+            }
+            throw new Error("No format matches");
+        },
+    }),
+    separated: (separator, format, min = 0, max = Infinity) => ({
+        parse(reader) {
+            const result = [];
+            while (true) {
+                try {
+                    result.push(format.parse(reader));
+                    if (result.length === max) {
+                        break;
+                    }
+                }
+                catch (e) {
+                    if (result.length < min) {
+                        throw e;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                if (reader.value.startsWith(separator, reader.position)) {
+                    reader.position += separator.length;
+                }
+                else if (result.length < min) {
+                    throw new ParseError([separator.charAt(0)]);
+                }
+                else {
+                    break;
+                }
+            }
+            return result;
+        },
+        stringify(value) {
+            return value.map((item) => format.stringify(item)).join(separator);
+        },
+    }),
+    repeated: (format) => ({
+        parse(reader) {
+            const result = [];
+            while (true) {
+                try {
+                    result.push(format.parse(reader));
+                }
+                catch (e) {
+                    break;
+                }
+            }
+            return result;
+        },
+        stringify(value) {
+            return value.map((item) => format.stringify(item)).join("");
+        },
+    }),
+    sequence: (...args) => ({
+        parse(reader) {
+            const result = {};
+            for (const part of args) {
+                if ("name" in part) {
+                    result[part.name] = part.format.parse(reader);
+                }
+                else {
+                    void part.parse(reader);
+                }
+            }
+            return result;
+        },
+        stringify: (value) => {
+            let result = "";
+            for (const part of args) {
+                if ("name" in part) {
+                    result += part.format.stringify(value[part.name]);
+                }
+            }
+            return result;
+        },
+    }),
+    map: (format, map, reverse) => ({
+        parse(reader) {
+            return map(format.parse(reader));
+        },
+        stringify(value) {
+            return format.stringify(reverse(value));
+        },
+    }),
+};
+//# sourceMappingURL=string-format.js.map

package/esm/string-format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"string-format.js","sourceRoot":"","sources":["../src/string-format.ts"],"names":[],"mappings":"AAAA,0DAA0D;AAC1D,MAAM,OAAO,UAAW,SAAQ,KAAK;IACjC,SAAS,CAAW;IAEpB,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,YAAY,QAAkB;QAC1B,KAAK,CAAC,YAAY,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC9B,CAAC;CACJ;AAkCD,MAAM,CAAC,MAAM,CAAC,GAAG;IACb,OAAO,EAAE,CAAmB,KAAQ,EAAa,EAAE,CAAC,CAAC;QACjD,KAAK,CAAC,MAAM;YACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAClD,MAAM,IAAI,UAAU,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aAC3C;YACD,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,CAAC;YAChC,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,SAAS;YACL,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC;IACF,MAAM,EAAE,GAAmB,EAAE,CAAC,CAAC;QAC3B,KAAK,CAAC,MAAM;YACR,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,EAAE;gBACR,MAAM,IAAI,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aAChD;YACD,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACzC,CAAC;QACD,SAAS,CAAC,KAAK;YACX,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC5B,CAAC;KACJ,CAAC;IACF,KAAK,EAAE,CACH,GAAG,IAAO,EACY,EAAE,CAAC,CAAC;QAC1B,KAAK,CAAC,MAAM;YACR,MAAM,QAAQ,GAAa,EAAE,CAAC;YAC9B,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE;gBACvB,IAAI;oBACA,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAmB,CAAC;iBACjD;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAI,CAAC,YAAY,UAAU,EAAE;wBACzB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;qBAChC;yBAAM;wBACH,MAAM,CAAC,CAAC;qBACX;iBACJ;aACJ;YACD,MAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;QACD,SAAS,CAAC,KAAK;YACX,KAAK,MAAM,MAAM,IAAI,IAAI,EAAE;gBACvB,IAAI;oBACA,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;oBACvC,4CAA4C;oBAC5C,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;iBAChD;gBAAC,OAAO,CAAC,EAAE;oBACR,SAAS;iBACZ;aACJ;YACD,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACzC,CAAC;KACJ,CAAC;IACF,SAAS,EAAE,CACP,SAAiB,EACjB,MAAiB,EACjB,GAAG,GAAG,CAAC,EACP,GAAG,GAAG,QAAQ,EACH,EAAE,CAAC,CAAC;QACf,KAAK,CAAC,MAAc;YAChB,MAAM,MAAM,GAAQ,EAAE,CAAC;YACvB,OAAO,IAAI,EAAE;gBACT,IAAI;oBACA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;oBAClC,IAAI,MAAM,CAAC,MAAM,KAAK,GAAG,EAAE;wBACvB,MAAM;qBACT;iBACJ;gBAAC,OAAO,CAAC,EAAE;oBACR,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;wBACrB,MAAM,CAAC,CAAC;qBACX;yBAAM;wBACH,MAAM;qBACT;iBACJ;gBAED,IAAI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE;oBACrD,MAAM,CAAC,QAAQ,IAAI,SAAS,CAAC,MAAM,CAAC;iBACvC;qBAAM,IAAI,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE;oBAC5B,MAAM,IAAI,UAAU,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC/C;qBAAM;oBACH,MAAM;iBACT;aACJ;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,SAAS,CAAC,KAAK;YACX,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvE,CAAC;KACJ,CAAC;IACF,QAAQ,EAAE,CAAI,MAAiB,EAAe,EAAE,CAAC,CAAC;QAC9C,KAAK,CAAC,MAAc;YAChB,MAAM,MAAM,GAAQ,EAAE,CAAC;YACvB,OAAO,IAAI,EAAE;gBACT,IAAI;oBACA,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;iBACrC;gBAAC,OAAO,CAAC,EAAE;oBACR,MAAM;iBACT;aACJ;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,SAAS,CAAC,KAAU;YAChB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChE,CAAC;KACJ,CAAC;IACF,QAAQ,EAAE,CAMN,GAAG,IAAO,EACe,EAAE,CAAC,CAAC;QAC7B,KAAK,CAAC,MAAc;YAChB,MAAM,MAAM,GAA4B,EAAE,CAAC;YAC3C,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;gBACrB,IAAI,MAAM,IAAI,IAAI,EAAE;oBAChB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBACjD;qBAAM;oBACH,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBAC3B;aACJ;YACD,OAAO,MAA2B,CAAC;QACvC,CAAC;QACD,SAAS,EAAE,CAAC,KAAwB,EAAE,EAAE;YACpC,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;gBACrB,IAAI,MAAM,IAAI,IAAI,EAAE;oBAChB,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAC3B,KAAK,CAAC,IAAI,CAAC,IAA0B,CAAC,CACzC,CAAC;iBACL;aACJ;YACD,OAAO,MAAM,CAAC;QAClB,CAAC;KACJ,CAAC;IACF,GAAG,EAAE,CACD,MAAiB,EACjB,GAAoB,EACpB,OAAwB,EACf,EAAE,CAAC,CAAC;QACb,KAAK,CAAC,MAAc;YAChB,OAAO,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACrC,CAAC;QACD,SAAS,CAAC,KAAQ;YACd,OAAO,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5C,CAAC;KACJ,CAAC;CACyD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yume-chan/android-bin",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "Wrappers for Android built-in executables.",
   "keywords": [
     "adb",
@@ -25,21 +25,26 @@
   "main": "esm/index.js",
   "types": "esm/index.d.ts",
   "dependencies": {
-    "@yume-chan/adb": "^0.0.19",
-    "@yume-chan/stream-extra": "^0.0.19",
-    "@yume-chan/struct": "^0.0.19",
-    "tslib": "^2.4.1"
+    "@yume-chan/adb": "^0.0.21",
+    "@yume-chan/stream-extra": "^0.0.21",
+    "@yume-chan/struct": "^0.0.21",
+    "tslib": "^2.6.0"
   },
   "devDependencies": {
+    "@jest/globals": "^29.6.1",
     "@yume-chan/eslint-config": "^1.0.0",
     "@yume-chan/tsconfig": "^1.0.0",
-    "eslint": "^8.36.0",
-    "prettier": "^2.8.4",
-    "typescript": "^4.9.4"
+    "cross-env": "^7.0.3",
+    "eslint": "^8.44.0",
+    "jest": "^29.5.0",
+    "prettier": "^3.0.0",
+    "ts-jest": "^29.1.1",
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "build": "tsc -b tsconfig.build.json",
     "build:watch": "tsc -b tsconfig.build.json",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage",
     "lint": "eslint src/**/*.ts --fix && prettier src/**/*.ts --write --tab-width 4"
   }
 }

package/src/bu.ts

@@ -1,26 +1,80 @@
-// cspell: ignore apks
-// cspell: ignore obbs
-
 import { AdbCommandBase } from "@yume-chan/adb";
+import type { Consumable, ReadableStream } from "@yume-chan/stream-extra";
+import { ConcatStringStream, DecodeUtf8Stream } from "@yume-chan/stream-extra";
 
 export interface AdbBackupOptions {
-    apps: string[] | "all" | "all-including-system";
-    apks: boolean;
-    obbs: boolean;
-    shared: boolean;
-    widgets: boolean;
+    user: number;
+    saveSharedStorage?: boolean;
+    saveWidgets?: boolean;
+    packages: string[] | "user" | "all";
+    savePackageApk: boolean;
+    savePackageObb: boolean;
+    savePackageKeyValue: boolean;
     compress: boolean;
+}
+
+export interface AdbRestoreOptions {
     user: number;
+    file: ReadableStream<Consumable<Uint8Array>>;
 }
 
 export class AdbBackup extends AdbCommandBase {
-    backup(options: AdbBackupOptions): Promise<void> {
-        void options;
-        throw new Error("Not implemented");
+    /**
+     * User must confirm backup on device within 60 seconds.
+     */
+    async backup(
+        options: AdbBackupOptions,
+    ): Promise<ReadableStream<Uint8Array>> {
+        const args = ["bu", "backup"];
+
+        if (options.user !== undefined) {
+            args.push("--user", options.user.toString());
+        }
+
+        args.push(options.saveSharedStorage ? "--shared" : "--no-shared");
+        args.push(options.saveWidgets ? "--widgets" : "--no-widgets");
+
+        args.push(options.savePackageApk ? "--apk" : "--no-apk");
+        args.push(options.savePackageObb ? "--obb" : "--no-obb");
+        args.push(
+            options.savePackageKeyValue ? "--key-value" : "--no-key-value",
+        );
+
+        args.push(options.compress ? "--compress" : "--no-compress");
+
+        if (typeof options.packages === "string") {
+            switch (options.packages) {
+                case "user":
+                    args.push("--all", "--no-system");
+                    break;
+                case "all":
+                    args.push("--all", "--system");
+                    break;
+            }
+        } else {
+            args.push(...options.packages);
+        }
+
+        const process = await this.adb.subprocess.spawn(args);
+        return process.stdout;
     }
 
-    restore(options: AdbBackupOptions): Promise<void> {
-        void options;
-        throw new Error("Not implemented");
+    /**
+     * User must enter the password (if any) and
+     * confirm restore on device within 60 seconds.
+     */
+    async restore(options: AdbRestoreOptions): Promise<string> {
+        const args = ["bu", "restore"];
+        if (options.user !== undefined) {
+            args.push("--user", options.user.toString());
+        }
+        const process = await this.adb.subprocess.spawn(args);
+        const [output] = await Promise.all([
+            process.stdout
+                .pipeThrough(new DecodeUtf8Stream())
+                .pipeThrough(new ConcatStringStream()),
+            options.file.pipeTo(process.stdin),
+        ]);
+        return output;
     }
 }