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

feat(bin): allow Intent.extras to contain typed empty arrays

Browse source
This commit is contained in:
Simon Chan 2025-08-26 02:13:32 +08:00
parent 34ca176c6f
commit 7d88980094
No known key found for this signature in database
GPG key ID: A8B69F750B9BCEDD
1 changed files with 120 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

247
libraries/android-bin/src/intent.ts
View file

@ -14,11 +14,33 @@ export interface IntentStringExtra {
value: string; value: string;
} }
export interface IntentNumberArrayExtra {
type: "array";
itemType: "int" | IntentNumberExtra["type"];
value: number[];
}
export interface IntentArrayListExtra { export interface IntentArrayListExtra {
type: "arrayList"; type: "arrayList";
value: number[] | IntentNumberExtra[] | string[]; value: number[] | IntentNumberExtra[] | string[];
} }
export interface IntentNumberArrayListExtra extends IntentArrayListExtra {
itemType: "int" | IntentNumberExtra["type"];
value: number[];
}
export interface IntentStringArrayExtra {
type: "array";
itemType: "string";
value: string[];
}
export interface IntentStringArrayListExtra extends IntentArrayListExtra {
itemType: "string";
value: string[];
}
export interface ComponentName { export interface ComponentName {
packageName: string; packageName: string;
className: string; className: string;
@ -39,10 +61,14 @@ export interface Intent {
| IntentStringExtra | IntentStringExtra
| ComponentName | ComponentName
| number[] | number[]
| IntentNumberArrayExtra
| IntentArrayListExtra | IntentArrayListExtra
| IntentNumberExtra | IntentNumberExtra
| IntentNumberExtra[] | IntentNumberExtra[]
| IntentNumberArrayListExtra
| string[] | string[]
| IntentStringArrayExtra
| IntentStringArrayListExtra
| boolean | boolean
> >
| undefined; | undefined;
@ -51,6 +77,81 @@ export interface Intent {
component?: ComponentName | undefined; component?: ComponentName | undefined;
} }
function getNumberType(type: "int" | IntentNumberExtra["type"]) {
switch (type) {
case "int":
return "--ei";
case "long":
return "--el";
case "float":
return "--ef";
case "double":
return "--ed";
default:
throw new Error(`Unknown number type: ${type as string}`);
}
}
function serializeRawArray(
value: number[] | IntentNumberExtra[] | string[],
): [type: string, value: string] {
if (value.length === 0) {
throw new Error("Can't determine array item type from empty array.");
}
const item = value[0];
switch (typeof item) {
case "number":
return ["--eia", (value as number[]).join(",")];
case "object":
return [
getNumberType(item.type) + "a",
(value as IntentNumberExtra[])
.map((item) => item.value)
.join(","),
];
case "string":
return [
"--esa",
(value as string[])
.map((item) => item.replaceAll(",", "\\,"))
.join(","),
];
default:
throw new Error(`Unknown array item type: ${typeof item}`);
}
}
function serializeArrayExtra(
value:
| Omit<IntentNumberArrayExtra, "type">
| Omit<IntentStringArrayExtra, "type">,
): [type: string, value: string] {
if (value.itemType === "string") {
return [
"--esa",
value.value.map((item) => item.replaceAll(",", "\\,")).join(","),
];
}
return [getNumberType(value.itemType) + "a", value.value.join(",")];
}
function serializeArrayListExtra(
value:
| IntentArrayListExtra
| IntentNumberArrayListExtra
| IntentStringArrayListExtra,
): [type: string, value: string] {
if ("itemType" in value) {
const [type, valueString] = serializeArrayExtra(value);
return [type + "l", valueString];
}
const [type, valueString] = serializeRawArray(value.value);
return [type + "l", valueString];
}
export function serializeIntent(intent: Intent) { export function serializeIntent(intent: Intent) {
const result: string[] = []; const result: string[] = [];
@ -89,63 +190,8 @@ export function serializeIntent(intent: Intent) {
} }
if (Array.isArray(value)) { if (Array.isArray(value)) {
if (value.length === 0) { const [type, valueString] = serializeRawArray(value);
throw new Error( result.push(type, key, valueString);
"Intent extra array cannot be empty",
);
}
switch (typeof value[0]) {
case "number":
result.push(
"--eia",
key,
(value as number[]).join(","),
);
break;
case "object":
switch (value[0].type) {
case "long":
result.push(
"--ela",
key,
(value as IntentNumberExtra[])
.map((item) => item.value)
.join(","),
);
break;
case "float":
result.push(
"--efa",
key,
(value as IntentNumberExtra[])
.map((item) => item.value)
.join(","),
);
break;
case "double":
result.push(
"--eda",
key,
(value as IntentNumberExtra[])
.map((item) => item.value)
.join(","),
);
break;
}
break;
case "string":
result.push(
"--esa",
key,
(value as string[])
.map((item) =>
item.replaceAll(",", "\\,"),
)
.join(","),
);
break;
}
break; break;
} }
@ -162,79 +208,26 @@ export function serializeIntent(intent: Intent) {
case "uri": case "uri":
result.push("--eu", key, value.value); result.push("--eu", key, value.value);
break; break;
case "array":
{
const [type, valueString] =
serializeArrayExtra(value);
result.push(type, key, valueString);
}
break;
case "arrayList": case "arrayList":
if (value.value.length === 0) { {
throw new Error( const [type, valueString] =
"Intent extra array cannot be empty", serializeArrayListExtra(value);
); result.push(type, key, valueString);
}
switch (typeof value.value[0]) {
case "number":
result.push(
"--eial",
key,
(value.value as number[]).join(","),
);
break;
case "object":
switch (value.value[0].type) {
case "long":
result.push(
"--elal",
key,
(
value.value as IntentNumberExtra[]
)
.map((item) => item.value)
.join(","),
);
break;
case "float":
result.push(
"--efal",
key,
(
value.value as IntentNumberExtra[]
)
.map((item) => item.value)
.join(","),
);
break;
case "double":
result.push(
"--edal",
key,
(
value.value as IntentNumberExtra[]
)
.map((item) => item.value)
.join(","),
);
break;
}
break;
case "string":
result.push(
"--esal",
key,
(value.value as string[])
.map((item) =>
item.replaceAll(",", "\\,"),
)
.join(","),
);
break;
} }
break; break;
case "long": default:
result.push("--el", key, value.value.toString()); result.push(
break; getNumberType(value.type),
case "float": key,
result.push("--ef", key, value.value.toString()); value.value.toString(),
break; );
case "double":
result.push("--ed", key, value.value.toString());
break; break;
} }
break; break;