mirror of
https://github.com/morluto/rea.git
synced 2026-11-07 07:16:13 +00:00
* feat(android): make the JADX operation deadline configurable JADX operations used a fixed 120 s provider deadline and a separate fixed 120 s per-call bound in the session, so an APK whose cold load exceeds 120 s could not complete, and raising only the MCP client timeout could not extend either. Add REA_JADX_OPERATION_TIMEOUT_MS, parsed once by the JADX configuration owner (decimal milliseconds from 1 to 2147483647, default 120000). The provider resolves it before acquiring anything and uses it for the operation deadline and its timeout errors, and the session uses it for every upstream call. Doctor reports the effective value, and setup forwards an explicit value like the other JADX settings. Fixes #3918 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(android): isolate JADX fixtures from inherited shell settings The shared JADX protocol fixture spread the developer's process.env, so an exported REA_JADX_OPERATION_TIMEOUT_MS (or REA_JADX_HEAP_MIB) changed every provider test that never selected one. Keep inheriting the host environment for process launch, but take REA_JADX_* settings only from the fixture. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
177 lines
6.1 KiB
TypeScript
177 lines
6.1 KiB
TypeScript
import {
|
|
access,
|
|
chmod,
|
|
mkdir,
|
|
readFile,
|
|
rm,
|
|
writeFile,
|
|
} from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
import { expect, onTestFinished } from "vitest";
|
|
import { AndroidAnalysisService } from "../../../src/application/android/AndroidAnalysisService.js";
|
|
import { createAndroidAnalysisProvider } from "../../../src/composition/android.js";
|
|
import { ProviderCleanupError } from "../../../src/domain/providerCleanupError.js";
|
|
import {
|
|
ProviderProcessSupervisor,
|
|
spawnOwnedProviderProcess,
|
|
} from "../../../src/process/ProviderProcess.js";
|
|
import { cleanupOwnedProcessGroup } from "../../../src/process/ProcessOwnership.js";
|
|
import { writeOrderedZip } from "../artifactEntryOrder.js";
|
|
import { createTestTempDirectory } from "../temporaryDirectory.js";
|
|
import { writeJadxJarInventory } from "./jadxJar.js";
|
|
|
|
const fixture = fileURLToPath(new URL("./jadx-mcp.mjs", import.meta.url));
|
|
|
|
/** Real owned subprocess running a synthetic MCP producer, with no module mocks. */
|
|
export const createJadxProtocolFixture = async (
|
|
mode = "normal",
|
|
cleanupFailure?: () => boolean,
|
|
inventory?: { readonly classCount?: number },
|
|
settings: Readonly<Record<string, string>> = {},
|
|
) => {
|
|
const root = await createTestTempDirectory("rea-android-boundary-");
|
|
const apk = join(root, "fixture.apk");
|
|
const jar = join(root, "fixture.jar");
|
|
const javaHome = join(root, "jdk");
|
|
const javaBin = join(javaHome, "bin");
|
|
const java = join(javaBin, "java");
|
|
const javaProbeLog = join(root, "java-probes.log");
|
|
await mkdir(javaBin, { recursive: true });
|
|
await writeFile(
|
|
java,
|
|
`#!/usr/bin/env node\nif (process.argv[2] === "--list-modules") { require("node:fs").appendFileSync(${JSON.stringify(javaProbeLog)}, "probe\\n"); console.log("java.base@21.0.0\\njdk.compiler@21.0.0"); }\n`,
|
|
);
|
|
await chmod(java, 0o755);
|
|
await writeOrderedZip(apk, ["AndroidManifest.xml", "classes.dex"]);
|
|
await writeJadxJarInventory(jar);
|
|
const launches: {
|
|
runId: string;
|
|
cwd: string | undefined;
|
|
pid: number | undefined;
|
|
arguments: readonly string[] | undefined;
|
|
javaToolOptions: string | undefined;
|
|
legacyJavaOptions: string | undefined;
|
|
}[] = [];
|
|
// Inherit the host environment for process launch, but take JADX settings
|
|
// only from this fixture so a developer's shell cannot change the provider.
|
|
const environment: NodeJS.ProcessEnv = {
|
|
...Object.fromEntries(
|
|
Object.entries(process.env).filter(
|
|
([name]) => !name.startsWith("REA_JADX_"),
|
|
),
|
|
),
|
|
JAVA_HOME: javaHome,
|
|
REA_JADX_MCP_JAR: jar,
|
|
...settings,
|
|
};
|
|
const provider = createAndroidAnalysisProvider(
|
|
environment,
|
|
async (options) => {
|
|
const spawned = await spawnOwnedProviderProcess({
|
|
...options,
|
|
command: process.execPath,
|
|
arguments: [fixture],
|
|
expectedCommand: process.execPath,
|
|
env: {
|
|
...options.env,
|
|
REA_FAKE_JADX_MODE: mode,
|
|
...(inventory?.classCount === undefined
|
|
? {}
|
|
: {
|
|
REA_FAKE_JADX_CLASS_COUNT: String(inventory.classCount),
|
|
}),
|
|
},
|
|
});
|
|
launches.push({
|
|
runId: options.runId,
|
|
cwd: options.cwd,
|
|
pid: spawned.process.pid,
|
|
arguments: options.arguments,
|
|
javaToolOptions: options.hostEnvironment?.JAVA_TOOL_OPTIONS,
|
|
legacyJavaOptions:
|
|
options.env?._JAVA_OPTIONS ?? options.hostEnvironment?._JAVA_OPTIONS,
|
|
});
|
|
if (mode === "cleanup-failure" || cleanupFailure !== undefined) {
|
|
onTestFinished(async () => {
|
|
const supervisor = new ProviderProcessSupervisor({
|
|
...spawned,
|
|
ownsProcessLifetime: true,
|
|
cleanup: () => cleanupOwnedProcessGroup(spawned.ownership),
|
|
});
|
|
// The SDK can close the child transport before process exit settles.
|
|
// Retry retained ownership without bypassing the supervisor's proof.
|
|
// Retain the entire stop result so an incomplete teardown failure reports its reason.
|
|
await expect
|
|
.poll(
|
|
async () => {
|
|
const stopped = await supervisor.stop();
|
|
if (stopped.status === "incomplete")
|
|
throw new Error(
|
|
`Owned process cleanup incomplete: ${stopped.reason}`,
|
|
);
|
|
return stopped.status;
|
|
},
|
|
{ timeout: 5_000 },
|
|
)
|
|
.not.toBe("incomplete");
|
|
if (options.cwd !== undefined)
|
|
await rm(options.cwd, { recursive: true, force: true });
|
|
});
|
|
return {
|
|
...spawned,
|
|
cleanup: async () =>
|
|
(cleanupFailure?.() ?? true)
|
|
? {
|
|
cleaned: false,
|
|
reason: "injected ownership verification failure",
|
|
}
|
|
: cleanupOwnedProcessGroup(spawned.ownership),
|
|
};
|
|
}
|
|
return spawned;
|
|
},
|
|
);
|
|
onTestFinished(async () => {
|
|
try {
|
|
await provider.close();
|
|
} catch (cause) {
|
|
if (
|
|
mode !== "cleanup-failure" ||
|
|
!(cause instanceof ProviderCleanupError) ||
|
|
cause.providerId !== "jadx"
|
|
)
|
|
throw cause;
|
|
}
|
|
});
|
|
return {
|
|
service: new AndroidAnalysisService(provider),
|
|
provider,
|
|
apk,
|
|
jar,
|
|
environment,
|
|
launches,
|
|
javaProbeCount: async () => {
|
|
const contents = await readFile(javaProbeLog, "utf8");
|
|
return contents.split("\n").filter(Boolean).length;
|
|
},
|
|
};
|
|
};
|
|
|
|
/** Verify only this fixture's acquired group and workspace, without scanning unrelated host environments. */
|
|
export const verifyJadxFixtureCleanup = async (
|
|
launches: Awaited<ReturnType<typeof createJadxProtocolFixture>>["launches"],
|
|
): Promise<void> => {
|
|
for (const launch of launches) {
|
|
const pid = launch.pid;
|
|
if (pid !== undefined)
|
|
expect(() => process.kill(-pid, 0)).toThrowError(
|
|
expect.objectContaining({ code: "ESRCH" }),
|
|
);
|
|
if (launch.cwd !== undefined)
|
|
await expect(access(launch.cwd)).rejects.toMatchObject({
|
|
code: "ENOENT",
|
|
});
|
|
}
|
|
};
|