* fix(cancellation): preserve caller abort reasons through late finalization Caller aborts that arrived during final provider, cleanup, or protocol handling were dropped or replaced by I/O, cleanup, or success results. Each affected path now samples the caller signal after its owner has settled and returns AnalysisCancelledError carrying the exact signal.reason, keeping any completed partial Evidence or cleanup state. - Web script export: keep the exact reason for an interrupted output write, and honor a cancellation fact recorded before a retried capture close succeeds. - Native value tracing and Hopper regex search: check the signal after the final provider reply or regex worker settles. - Apple asset catalog: stop assetutil with SIGTERM so cancellation settles only after the helper exits. - CDP observation: end an armed window on a fatal protocol failure. - ADB bugreport: prefer cancellation over the staging-removal output error when the caller aborted. - JavaScript recovery: check the signal after provider success. - export-web-scripts CLI: run under command cancellation and forward the signal into the export workflow. - Objdump and Rizin CLI: report cancellation after cleanup completes. - Binary session: keep cancellation primary when previous-client retirement fails after abort. Fixes morluto/rea#6042 Fixes morluto/rea#6043 Fixes morluto/rea#6048 Fixes morluto/rea#6049 Fixes morluto/rea#6057 Fixes morluto/rea#6060 Fixes morluto/rea#6078 Fixes morluto/rea#6080 Fixes morluto/rea#6108 Fixes morluto/rea#6111 Fixes morluto/rea#6115 * fix(cancellation): keep caller reasons through export rollback and commit - Rollback failure after a caller abort now returns AnalysisCancelledError with the exact signal.reason, attaching the rollback failure as cleanup and retaining any published result as partial observation. - A capture close retry that succeeds after abort returns cancellation instead of the stale cleanup diagnostic. - An abort that lands during the final output commit returns cancellation carrying the completed manifest as partial observation. - Apple assetutil stop test: abort and await the run in finally so a timed-out wait does not leave the child running, and skip on Windows where the JavaScript SIGTERM handler cannot run. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5 * fix(cancellation): bind export cancellations to cleanup and caller reasons - A rollback-failure cancellation is bound to the retained cleanup lease, so a later successful close clears cleanup_incomplete instead of reporting a residual directory that no longer exists. - mapExportFailure wraps the caller's own AnalysisCancelledError reason under export_web_scripts rather than returning it as the export's error. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5 --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: morluto <76467478+morluto@users.noreply.github.com> Copilot-Session: 35b247e9-c793-4b8f-979a-807c27112cf5
92 lines
3.2 KiB
TypeScript
92 lines
3.2 KiB
TypeScript
import { access } from "node:fs/promises";
|
|
import { join } from "node:path";
|
|
|
|
import pino from "pino";
|
|
import { expect, it, vi } from "vitest";
|
|
|
|
import { registerWebScriptCommands } from "../../../src/cli/webScriptCommands.js";
|
|
import * as webScriptExport from "../../../src/application/WebScriptExportService.js";
|
|
import { CLI_COMMANDS } from "../../../src/cliCommandNames.js";
|
|
import { AnalysisCancelledError } from "../../../src/domain/analysisErrorCore.js";
|
|
import { err } from "../../../src/domain/result.js";
|
|
import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js";
|
|
import { cliTest } from "../../support/cli/cliFixture.js";
|
|
|
|
it("forwards an interrupt into the export workflow and reports cancellation", async () => {
|
|
const commands = new Map<string, { run(input: unknown): Promise<unknown> }>();
|
|
const cli = {
|
|
command: (
|
|
name: string,
|
|
definition: { run(input: unknown): Promise<unknown> },
|
|
) => {
|
|
commands.set(name, definition);
|
|
return cli;
|
|
},
|
|
} as unknown as Parameters<typeof registerWebScriptCommands>[0];
|
|
registerWebScriptCommands(cli, pino({ enabled: false }));
|
|
const exported = vi
|
|
.spyOn(webScriptExport, "exportWebScripts")
|
|
.mockImplementation(async (_input, _resources, options) => {
|
|
process.emit("SIGINT");
|
|
return err(
|
|
new AnalysisCancelledError("export_web_scripts", {
|
|
cause: options?.signal?.reason,
|
|
}),
|
|
);
|
|
});
|
|
const previousExitCode = process.exitCode;
|
|
try {
|
|
const output = await commands.get(CLI_COMMANDS.exportWebScripts)?.run({
|
|
args: {
|
|
capturePath: "/unused/capture.json",
|
|
outputDirectory: "/unused/out",
|
|
},
|
|
});
|
|
expect(exported.mock.calls[0]?.[2]?.signal?.aborted).toBe(true);
|
|
expect(output).toMatchObject({ code: "cancelled" });
|
|
expect(process.exitCode).toBe(130);
|
|
} finally {
|
|
exported.mockRestore();
|
|
process.exitCode = previousExitCode;
|
|
}
|
|
});
|
|
|
|
cliTest.skipIf(process.platform === "win32")(
|
|
"exits with a capture_path invalid_request for a named pipe before publishing output",
|
|
async ({ cli, processes }) => {
|
|
const root = await createTestTempDirectory("rea-script-selection-cli-");
|
|
const capturePath = join(root, "capture.pipe");
|
|
const outputDirectory = join(root, "export");
|
|
const created = await processes.run("mkfifo", [capturePath], {
|
|
timeoutMs: 5_000,
|
|
});
|
|
expect(created.exitCode).toBe(0);
|
|
|
|
const response = await cli.run({
|
|
arguments: ["export-web-scripts", capturePath, outputDirectory, "--json"],
|
|
environment: { REA_LOG_LEVEL: "silent" },
|
|
timeoutMs: 5_000,
|
|
});
|
|
expect(response.exitCode).toBe(1);
|
|
expect(response.signal).toBeNull();
|
|
expect(response.json).toMatchObject({
|
|
error: "Script export failed",
|
|
code: "invalid_request",
|
|
details: {
|
|
operation: "export_web_scripts",
|
|
issues: [
|
|
{
|
|
path: ["capture_path"],
|
|
reason: "invalid_value",
|
|
message: expect.stringContaining("regular file"),
|
|
},
|
|
],
|
|
},
|
|
});
|
|
expect(response.stdout).toContain(capturePath);
|
|
await expect(access(outputDirectory)).rejects.toMatchObject({
|
|
code: "ENOENT",
|
|
});
|
|
},
|
|
);
|