yetangitu/ya-webadb
1
0
Fork 0
mirror of https://github.com/yume-chan/ya-webadb.git synced 2025-10-03 17:59:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

chore: update dependencies

Browse source 
also experiment with some new eslint rules
This commit is contained in:
Simon Chan 2024-06-26 17:08:47 +08:00
parent 349c7c84d3
commit b86a23a345
No known key found for this signature in database
GPG key ID: A8B69F750B9BCEDD
26 changed files with 332 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

60
libraries/android-bin/src/pm.ts
View file

@ -255,6 +255,32 @@ const PACKAGE_MANAGER_RESOLVE_ACTIVITY_OPTIONS_MAP: Partial<
user: "--user",
};
function buildInstallArguments(
command: string,
options: Partial<PackageManagerInstallOptions> | undefined,
): string[] {
const args = buildArguments(
["pm", command],
options,
PACKAGE_MANAGER_INSTALL_OPTIONS_MAP,
);
if (!options?.skipExisting) {
/*
* | behavior | previous version | modern version |
* | -------------------- | -------------------- | -------------------- |
* | replace existing app | requires `-r` | default behavior [1] |
* | skip existing app | default behavior [2] | requires `-R` |
*
* [1]: `-r` recognized but ignored
* [2]: `-R` not recognized but ignored
*
* So add `-r` when `skipExisting` is `false` for compatibility.
*/
args.push("-r");
}
return args;
}
export class PackageManager extends AdbCommandBase {
#cmd: Cmd;
@ -263,32 +289,6 @@ export class PackageManager extends AdbCommandBase {
this.#cmd = new Cmd(adb);
}
#buildInstallArguments(
command: string,
options: Partial<PackageManagerInstallOptions> | undefined,
): string[] {
const args = buildArguments(
["pm", command],
options,
PACKAGE_MANAGER_INSTALL_OPTIONS_MAP,
);
if (!options?.skipExisting) {
/*
* | behavior | previous version | modern version |
* | -------------------- | -------------------- | -------------------- |
* | replace existing app | requires `-r` | default behavior [1] |
* | skip existing app | default behavior [2] | requires `-R` |
*
* [1]: `-r` recognized but ignored)
* [2]: `-R` not recognized but ignored
*
* So add `-r` when `skipExisting` is `false` for compatibility.
*/
args.push("-r");
}
return args;
}
/**
* Install the apk file.
*
@ -298,7 +298,7 @@ export class PackageManager extends AdbCommandBase {
apks: string[],
options?: Partial<PackageManagerInstallOptions>,
): Promise<string> {
const args = this.#buildInstallArguments("install", options);
const args = buildInstallArguments("install", options);
// WIP: old version of pm doesn't support multiple apks
args.push(...apks);
return await this.adb.subprocess.spawnAndWaitLegacy(args);
@ -331,7 +331,7 @@ export class PackageManager extends AdbCommandBase {
// read files in `/data/local/tmp` (and many other places) due to SELinux policies,
// so installing files must still use `pm`.
// (the starting executable file decides which SELinux policies to apply)
const args = this.#buildInstallArguments("install", options);
const args = buildInstallArguments("install", options);
args.push(filePath);
try {
@ -362,7 +362,7 @@ export class PackageManager extends AdbCommandBase {
return;
}
const args = this.#buildInstallArguments("install", options);
const args = buildInstallArguments("install", options);
// Remove `pm` from args, `Cmd#spawn` will prepend `cmd <command>` so the final args
// will be `cmd package install <args>`
args.shift();
@ -536,7 +536,7 @@ export class PackageManager extends AdbCommandBase {
async sessionCreate(
options?: Partial<PackageManagerInstallOptions>,
): Promise<number> {
const args = this.#buildInstallArguments("install-create", options);
const args = buildInstallArguments("install-create", options);
const process = await this.#cmdOrSubprocess(args);
const output = await process.stdout