fix(native): retain signature snapshot cleanup ownership
Use the shared resource scope and private runtime root for signature snapshots. Retain failed file-handle/root cleanup, preserve primary failures alongside cleanup diagnostics, and wait for binding operations during client close before retrying owned resources. Validate root cleanup failure, blocked retry, repeated client close and in-flight acquisition. Existing provider/MCP/CLI tests and the real Darwin codesign ancestor-swap case pass. Dedicated native file-handle close-failure injection remains unverified.
This commit is contained in:
@@ -84,16 +84,24 @@ import {
|
||||
inspectNativeMacho,
|
||||
} from "./NativeMachoInspection.js";
|
||||
import { analysisErrorWithCleanupFailure } from "../domain/analysisErrorCleanup.js";
|
||||
import { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
|
||||
import { ArtifactReaderFailure } from "../artifacts/ArtifactReader.js";
|
||||
import type { PrivateRuntimeRoot } from "../process/PrivateRuntimeRoot.js";
|
||||
import {
|
||||
createNativeUiHelperRuntime,
|
||||
type NativeUiHelperRuntime,
|
||||
} from "./NativeUiHelperRuntime.js";
|
||||
|
||||
type SignatureRuntimeRootFactory = () => Promise<
|
||||
Pick<PrivateRuntimeRoot, "path" | "close">
|
||||
>;
|
||||
|
||||
/** Read-only semantic provider composed from Xcode command-line utilities. */
|
||||
export class NativeMacOSProvider implements AnalysisProvider {
|
||||
readonly #capabilities: readonly CapabilityDescriptor[];
|
||||
readonly #environment: NodeJS.ProcessEnv;
|
||||
readonly #tracerFactory: () => NativeCallTracer;
|
||||
readonly #privateRuntimeRootFactory: SignatureRuntimeRootFactory | undefined;
|
||||
|
||||
constructor(
|
||||
environment: Readonly<NodeJS.ProcessEnv>,
|
||||
@@ -102,10 +110,12 @@ export class NativeMacOSProvider implements AnalysisProvider {
|
||||
),
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
tracerFactory?: () => NativeCallTracer,
|
||||
privateRuntimeRootFactory?: SignatureRuntimeRootFactory,
|
||||
) {
|
||||
this.#environment = snapshotEnvironment(environment, platform);
|
||||
this.#tracerFactory =
|
||||
tracerFactory ?? (() => new LldbCallTracer(this.#environment));
|
||||
this.#privateRuntimeRootFactory = privateRuntimeRootFactory;
|
||||
this.#capabilities = nativeMacOSCapabilities(platform);
|
||||
}
|
||||
|
||||
@@ -123,6 +133,7 @@ export class NativeMacOSProvider implements AnalysisProvider {
|
||||
this.runner,
|
||||
this.#tracerFactory(),
|
||||
this.#environment,
|
||||
this.#privateRuntimeRootFactory,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -130,6 +141,7 @@ export class NativeMacOSProvider implements AnalysisProvider {
|
||||
class NativeMacOSClient implements AnalysisClient {
|
||||
readonly #pendingNativeUiRuntimes = new Set<NativeUiHelperRuntime>();
|
||||
readonly #pendingCommands = new Set<Promise<unknown>>();
|
||||
readonly #signatureResources = new ArtifactResourceScope();
|
||||
#nativeUiTail: Promise<void> = Promise.resolve();
|
||||
#closed = false;
|
||||
|
||||
@@ -138,6 +150,9 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
private readonly runner: NativeCommandRunner,
|
||||
private readonly tracer: NativeCallTracer,
|
||||
private readonly environment: Readonly<NodeJS.ProcessEnv>,
|
||||
private readonly privateRuntimeRootFactory:
|
||||
| SignatureRuntimeRootFactory
|
||||
| undefined,
|
||||
) {}
|
||||
|
||||
async execute(
|
||||
@@ -270,6 +285,21 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
const uiCleanupFailures = await this.#serializeNativeUi(() =>
|
||||
this.#retryNativeUiCleanup(),
|
||||
);
|
||||
let signatureCleanup: AnalysisError | undefined;
|
||||
try {
|
||||
await this.#signatureResources.close();
|
||||
} catch (cause: unknown) {
|
||||
const observation = ArtifactReaderFailure.cleanupObservation(
|
||||
cause,
|
||||
"signature-snapshot",
|
||||
);
|
||||
signatureCleanup = new ProviderCleanupError(
|
||||
IDENTITY.id,
|
||||
observation.resources,
|
||||
{ reason: observation.reason },
|
||||
{ operation: "close_binary", cause },
|
||||
);
|
||||
}
|
||||
const commandCleanup = await this.#retryNativeCommandCleanup();
|
||||
let result = await this.tracer.close();
|
||||
const cleanupErrors = [
|
||||
@@ -277,6 +307,7 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
? []
|
||||
: [this.#nativeUiCleanupFailure(uiCleanupFailures, "close_binary")]),
|
||||
...(commandCleanup === undefined ? [] : [commandCleanup]),
|
||||
...(signatureCleanup === undefined ? [] : [signatureCleanup]),
|
||||
];
|
||||
for (const cleanupError of cleanupErrors)
|
||||
result = result.ok
|
||||
@@ -532,8 +563,10 @@ class NativeMacOSClient implements AnalysisClient {
|
||||
): Promise<Result<NativeObservation, AnalysisError>> {
|
||||
return withSignatureTarget(
|
||||
this.target,
|
||||
this.#signatureResources,
|
||||
(binding) => this.#inspectBoundSignature(binding, signal),
|
||||
signal,
|
||||
this.privateRuntimeRootFactory,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user