@yume-chan/android-bin 1.1.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (50) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/LICENSE +1 -1
  3. package/esm/am.d.ts +4 -2
  4. package/esm/am.d.ts.map +1 -1
  5. package/esm/am.js +9 -17
  6. package/esm/am.js.map +1 -1
  7. package/esm/bu.d.ts +2 -2
  8. package/esm/bu.d.ts.map +1 -1
  9. package/esm/bu.js +6 -14
  10. package/esm/bu.js.map +1 -1
  11. package/esm/bug-report.d.ts +2 -2
  12. package/esm/bug-report.d.ts.map +1 -1
  13. package/esm/bug-report.js +15 -13
  14. package/esm/bug-report.js.map +1 -1
  15. package/esm/cmd.d.ts +18 -20
  16. package/esm/cmd.d.ts.map +1 -1
  17. package/esm/cmd.js +84 -63
  18. package/esm/cmd.js.map +1 -1
  19. package/esm/demo-mode.d.ts +2 -2
  20. package/esm/demo-mode.js +3 -3
  21. package/esm/demo-mode.js.map +1 -1
  22. package/esm/dumpsys.d.ts +2 -2
  23. package/esm/dumpsys.js +6 -6
  24. package/esm/dumpsys.js.map +1 -1
  25. package/esm/logcat.d.ts +7 -8
  26. package/esm/logcat.d.ts.map +1 -1
  27. package/esm/logcat.js +18 -10
  28. package/esm/logcat.js.map +1 -1
  29. package/esm/overlay-display.d.ts +2 -2
  30. package/esm/overlay-display.js +2 -2
  31. package/esm/pm.d.ts +7 -3
  32. package/esm/pm.d.ts.map +1 -1
  33. package/esm/pm.js +81 -88
  34. package/esm/pm.js.map +1 -1
  35. package/esm/settings.d.ts +10 -7
  36. package/esm/settings.d.ts.map +1 -1
  37. package/esm/settings.js +14 -23
  38. package/esm/settings.js.map +1 -1
  39. package/package.json +9 -9
  40. package/src/am.ts +14 -21
  41. package/src/bu.ts +6 -14
  42. package/src/bug-report.ts +16 -16
  43. package/src/cmd.ts +136 -85
  44. package/src/demo-mode.ts +3 -3
  45. package/src/dumpsys.ts +6 -6
  46. package/src/logcat.ts +26 -15
  47. package/src/overlay-display.ts +2 -2
  48. package/src/pm.ts +92 -96
  49. package/src/settings.ts +20 -28
  50. package/tsconfig.build.tsbuildinfo +1 -1
package/esm/demo-mode.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"demo-mode.js","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"demo-mode.js","sourceRoot":"","sources":["../src/demo-mode.ts"],"names":[],"mappings":"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"}
package/esm/dumpsys.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AdbCommandBase } from "@yume-chan/adb";
1
+ import { AdbServiceBase } from "@yume-chan/adb";
2
2
  declare const Status: {
3
3
  readonly Unknown: 1;
4
4
  readonly Charging: 2;
@@ -15,7 +15,7 @@ declare const Health: {
15
15
  readonly UnspecifiedFailure: 6;
16
16
  readonly Cold: 7;
17
17
  };
18
- export declare class DumpSys extends AdbCommandBase {
18
+ export declare class DumpSys extends AdbServiceBase {
19
19
  static readonly Battery: {
20
20
  Status: {
21
21
  readonly Unknown: 1;
package/esm/dumpsys.js CHANGED
@@ -1,4 +1,4 @@
1
- import { AdbCommandBase } from "@yume-chan/adb";
1
+ import { AdbServiceBase } from "@yume-chan/adb";
2
2
  const BatteryDumpFields = {
3
3
  "AC powered": { type: "boolean", field: "acPowered" },
4
4
  "USB powered": { type: "boolean", field: "usbPowered" },
@@ -43,15 +43,15 @@ const Battery = {
43
43
  Status,
44
44
  Health,
45
45
  };
46
- export class DumpSys extends AdbCommandBase {
46
+ export class DumpSys extends AdbServiceBase {
47
47
  static Battery = Battery;
48
48
  async diskStats() {
49
- const output = await this.adb.subprocess.spawnAndWaitLegacy([
49
+ const result = await this.adb.subprocess.noneProtocol.spawnWaitText([
50
50
  "dumpsys",
51
51
  "diskstats",
52
52
  ]);
53
53
  function getSize(name) {
54
- const match = output.match(new RegExp(`${name}-Free: (\\d+)K / (\\d+)K`));
54
+ const match = result.match(new RegExp(`${name}-Free: (\\d+)K / (\\d+)K`));
55
55
  if (!match) {
56
56
  return [0, 0];
57
57
  }
@@ -73,7 +73,7 @@ export class DumpSys extends AdbCommandBase {
73
73
  };
74
74
  }
75
75
  async battery() {
76
- const output = await this.adb.subprocess.spawnAndWaitLegacy([
76
+ const result = await this.adb.subprocess.noneProtocol.spawnWaitText([
77
77
  "dumpsys",
78
78
  "battery",
79
79
  ]);
@@ -85,7 +85,7 @@ export class DumpSys extends AdbCommandBase {
85
85
  status: DumpSys.Battery.Status.Unknown,
86
86
  health: DumpSys.Battery.Health.Unknown,
87
87
  };
88
- for (const line of output.split("\n")) {
88
+ for (const line of result.split("\n")) {
89
89
  const parts = line.split(":").map((part) => part.trim());
90
90
  if (parts.length !== 2) {
91
91
  continue;
package/esm/dumpsys.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"dumpsys.js","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dumpsys.js","sourceRoot":"","sources":["../src/dumpsys.ts"],"names":[],"mappings":"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"}
package/esm/logcat.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { AdbCommandBase } from "@yume-chan/adb";
1
+ import { AdbServiceBase } from "@yume-chan/adb";
2
2
  import type { ReadableStream } from "@yume-chan/stream-extra";
3
3
  import type { AsyncExactReadable, StructValue } from "@yume-chan/struct";
4
4
  export declare const LogId: {
@@ -40,18 +40,17 @@ export type LogcatFormat = (typeof LogcatFormat)[keyof typeof LogcatFormat];
40
40
  export interface LogcatFormatModifiers {
41
41
  microseconds?: boolean;
42
42
  nanoseconds?: boolean;
43
- printable?: boolean;
44
43
  year?: boolean;
45
44
  timezone?: boolean;
46
45
  epoch?: boolean;
47
46
  monotonic?: boolean;
48
47
  uid?: boolean;
49
- descriptive?: boolean;
50
48
  }
51
49
  export interface LogcatOptions {
52
- dump?: boolean;
53
- pid?: number;
54
- ids?: LogId[];
50
+ dump?: boolean | undefined;
51
+ pid?: number | undefined;
52
+ ids?: LogId[] | undefined;
53
+ tail?: number | Date | undefined;
55
54
  }
56
55
  export declare const LoggerEntry: import("@yume-chan/struct").Struct<{
57
56
  payloadSize: import("@yume-chan/struct").NumberField<number>;
@@ -64,7 +63,7 @@ export declare const LoggerEntry: import("@yume-chan/struct").Struct<{
64
63
  uid: import("@yume-chan/struct").NumberField<number>;
65
64
  }, {
66
65
  readonly timestamp: bigint;
67
- }, import("@yume-chan/struct").FieldsType<{
66
+ }, import("@yume-chan/struct").FieldsValue<{
68
67
  payloadSize: import("@yume-chan/struct").NumberField<number>;
69
68
  headerSize: import("@yume-chan/struct").NumberField<number>;
70
69
  pid: import("@yume-chan/struct").NumberField<number>;
@@ -92,7 +91,7 @@ export interface LogSize {
92
91
  maxEntrySize: number;
93
92
  maxPayloadSize: number;
94
93
  }
95
- export declare class Logcat extends AdbCommandBase {
94
+ export declare class Logcat extends AdbServiceBase {
96
95
  static logIdToName(id: LogId): string;
97
96
  static logNameToId(name: string): LogId;
98
97
  static joinLogId(ids: LogId[]): string;
package/esm/logcat.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../src/logcat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logcat.d.ts","sourceRoot":"","sources":["../src/logcat.ts"],"names":[],"mappings":"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"}
package/esm/logcat.js CHANGED
@@ -1,6 +1,6 @@
1
1
  // cspell: ignore logcat
2
2
  // cspell: ignore usec
3
- import { AdbCommandBase, AdbSubprocessNoneProtocol } from "@yume-chan/adb";
3
+ import { AdbServiceBase } from "@yume-chan/adb";
4
4
  import { BufferedTransformStream, SplitStringStream, TextDecoderStream, WrapReadableStream, } from "@yume-chan/stream-extra";
5
5
  import { decodeUtf8, struct, u16, u32 } from "@yume-chan/struct";
6
6
  // `adb logcat` is an alias to `adb shell logcat`
@@ -54,6 +54,12 @@ export const LogcatFormat = {
54
54
  ThreadTime: 6,
55
55
  Long: 7,
56
56
  };
57
+ function formatTailTime(date) {
58
+ // Tail time supports multiple formats,
59
+ // `sssss.mmm` is simplest to implement
60
+ const timestamp = date.getTime();
61
+ return ((timestamp / 1000) | 0) + "." + (timestamp % 1000);
62
+ }
57
63
  const NANOSECONDS_PER_SECOND = /* #__PURE__ */ BigInt(1e9);
58
64
  // https://cs.android.com/android/platform/superproject/+/master:system/logging/liblog/include/log/log_read.h;l=39;drc=82b5738732161dbaafb2e2f25cce19cd26b9157d
59
65
  export const LoggerEntry = struct({
@@ -210,7 +216,7 @@ export async function deserializeAndroidLogEntry(stream) {
210
216
  entry.toString = AndroidLogEntryToString;
211
217
  return entry;
212
218
  }
213
- export class Logcat extends AdbCommandBase {
219
+ export class Logcat extends AdbServiceBase {
214
220
  static logIdToName(id) {
215
221
  return LogIdName[id];
216
222
  }
@@ -232,13 +238,13 @@ export class Logcat extends AdbCommandBase {
232
238
  // ref https://android-review.googlesource.com/c/platform/system/core/+/1390940
233
239
  static LOG_SIZE_REGEX_11 = /(.*): ring buffer is (.*) (.*)B \((.*) (.*)B consumed, (.*) (.*)B readable\), max entry is (.*) B, max payload is (.*) B/;
234
240
  async getLogSize(ids) {
235
- const { stdout } = await this.adb.subprocess.spawn([
241
+ const process = await this.adb.subprocess.noneProtocol.spawn([
236
242
  "logcat",
237
243
  "-g",
238
244
  ...(ids ? ["-b", Logcat.joinLogId(ids)] : []),
239
245
  ]);
240
246
  const result = [];
241
- for await (const line of stdout
247
+ for await (const line of process.output
242
248
  .pipeThrough(new TextDecoderStream())
243
249
  .pipeThrough(new SplitStringStream("\n"))) {
244
250
  let match = line.match(Logcat.LOG_SIZE_REGEX_11);
@@ -271,7 +277,7 @@ export class Logcat extends AdbCommandBase {
271
277
  if (ids && ids.length > 0) {
272
278
  args.push("-b", Logcat.joinLogId(ids));
273
279
  }
274
- await this.adb.subprocess.spawnAndWait(args);
280
+ await this.adb.subprocess.noneProtocol.spawnWaitText(args);
275
281
  }
276
282
  binary(options) {
277
283
  return new WrapReadableStream(async () => {
@@ -285,13 +291,15 @@ export class Logcat extends AdbCommandBase {
285
291
  if (options?.ids) {
286
292
  args.push("-b", Logcat.joinLogId(options.ids));
287
293
  }
294
+ if (options?.tail) {
295
+ args.push("-t", typeof options.tail === "number"
296
+ ? options.tail.toString()
297
+ : formatTailTime(options.tail));
298
+ }
288
299
  // TODO: make `spawn` return synchronously with streams pending
289
300
  // so it's easier to chain them.
290
- const { stdout } = await this.adb.subprocess.spawn(args, {
291
- // PERF: None protocol is 150% faster then Shell protocol
292
- protocols: [AdbSubprocessNoneProtocol],
293
- });
294
- return stdout;
301
+ const process = await this.adb.subprocess.noneProtocol.spawn(args);
302
+ return process.output;
295
303
  }).pipeThrough(new BufferedTransformStream((stream) => {
296
304
  return deserializeAndroidLogEntry(stream);
297
305
  }));
package/esm/logcat.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logcat.js","sourceRoot":"","sources":["../src/logcat.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logcat.js","sourceRoot":"","sources":["../src/logcat.ts"],"names":[],"mappings":"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"}
package/esm/overlay-display.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { Adb } from "@yume-chan/adb";
2
- import { AdbCommandBase } from "@yume-chan/adb";
2
+ import { AdbServiceBase } from "@yume-chan/adb";
3
3
  export interface OverlayDisplayDeviceMode {
4
4
  width: number;
5
5
  height: number;
@@ -11,7 +11,7 @@ export interface OverlayDisplayDevice {
11
11
  ownContentOnly: boolean;
12
12
  showSystemDecorations: boolean;
13
13
  }
14
- export declare class OverlayDisplay extends AdbCommandBase {
14
+ export declare class OverlayDisplay extends AdbServiceBase {
15
15
  #private;
16
16
  static readonly SETTING_KEY = "overlay_display_devices";
17
17
  static readonly SETTING_FORMAT: import("./string-format.js").Format<{
package/esm/overlay-display.js CHANGED
@@ -1,7 +1,7 @@
1
- import { AdbCommandBase } from "@yume-chan/adb";
1
+ import { AdbServiceBase } from "@yume-chan/adb";
2
2
  import { Settings } from "./settings.js";
3
3
  import { p } from "./string-format.js";
4
- export class OverlayDisplay extends AdbCommandBase {
4
+ export class OverlayDisplay extends AdbServiceBase {
5
5
  #settings;
6
6
  static SETTING_KEY = "overlay_display_devices";
7
7
  static SETTING_FORMAT = p.separated(";", p.sequence({
package/esm/pm.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { Adb } from "@yume-chan/adb";
2
- import { AdbCommandBase } from "@yume-chan/adb";
2
+ import { AdbServiceBase } from "@yume-chan/adb";
3
3
  import type { MaybeConsumable, ReadableStream } from "@yume-chan/stream-extra";
4
4
  import type { IntentBuilder } from "./intent.js";
5
5
  import type { SingleUserOrAll } from "./utils.js";
@@ -167,8 +167,10 @@ export interface PackageManagerResolveActivityOptions {
167
167
  user?: SingleUserOrAll;
168
168
  intent: IntentBuilder;
169
169
  }
170
- export declare class PackageManager extends AdbCommandBase {
170
+ export declare class PackageManager extends AdbServiceBase {
171
171
  #private;
172
+ static ServiceName: string;
173
+ static CommandName: string;
172
174
  constructor(adb: Adb);
173
175
  /**
174
176
  * Install the apk file.
@@ -176,10 +178,11 @@ export declare class PackageManager extends AdbCommandBase {
176
178
  * @param apks Path to the apk file. It must exist on the device. On Android 10 and lower, only one apk can be specified.
177
179
  */
178
180
  install(apks: string[], options?: Partial<PackageManagerInstallOptions>): Promise<string>;
179
- pushAndInstallStream(stream: ReadableStream<MaybeConsumable<Uint8Array>>, options?: Partial<PackageManagerInstallOptions>): Promise<void>;
181
+ pushAndInstallStream(stream: ReadableStream<MaybeConsumable<Uint8Array>>, options?: Partial<PackageManagerInstallOptions>): Promise<string>;
180
182
  installStream(size: number, stream: ReadableStream<MaybeConsumable<Uint8Array>>, options?: Partial<PackageManagerInstallOptions>): Promise<void>;
181
183
  static parsePackageListItem(line: string): PackageManagerListPackagesResult;
182
184
  listPackages(options?: Partial<PackageManagerListPackagesOptions>): AsyncGenerator<PackageManagerListPackagesResult, void, void>;
185
+ getPackageSources(packageName: string): Promise<string[]>;
183
186
  uninstall(packageName: string, options?: Partial<PackageManagerUninstallOptions>): Promise<void>;
184
187
  resolveActivity(options: PackageManagerResolveActivityOptions): Promise<string | undefined>;
185
188
  /**
@@ -193,6 +196,7 @@ export declare class PackageManager extends AdbCommandBase {
193
196
  * @returns ID of the new install session
194
197
  */
195
198
  sessionCreate(options?: Partial<PackageManagerInstallOptions>): Promise<number>;
199
+ checkResult(stream: ReadableStream<Uint8Array>): Promise<void>;
196
200
  sessionAddSplit(sessionId: number, splitName: string, path: string): Promise<void>;
197
201
  sessionAddSplitStream(sessionId: number, splitName: string, size: number, stream: ReadableStream<MaybeConsumable<Uint8Array>>): Promise<void>;
198
202
  sessionCommit(sessionId: number): Promise<void>;
package/esm/pm.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"pm.d.ts","sourceRoot":"","sources":["../src/pm.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pm.d.ts","sourceRoot":"","sources":["../src/pm.ts"],"names":[],"mappings":"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"}