mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-16 20:11:08 +00:00
Requiring mcpServerBridge from node --test inherited the production netcatty-tool-cli/discovery.json path, so cleanup() removed the running app's bridge pointer. Resolve the discovery path on demand and isolate the affected tests via NETCATTY_TOOL_CLI_DISCOVERY_FILE. Rebased onto #3502, which now owns the self-heal (live-host reuse, status and content validation); this change only adds on-demand path resolution to those helpers and drops the separate 30s missing-file sweep. The subprocess regression test redirects HOME/USERPROFILE as well as APPDATA/XDG_CONFIG_HOME, since macOS derives the default path from os.homedir(), and refuses to plant its canary anywhere outside the throwaway root, so it can never write the real app path on any OS. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
62 lines
1.8 KiB
JavaScript
62 lines
1.8 KiB
JavaScript
"use strict";
|
|
|
|
/**
|
|
* Test-only isolation helper for the AI CLI discovery file.
|
|
*
|
|
* The bridge writes and deletes the file returned by getCliDiscoveryFilePath().
|
|
* With no override that is the INSTALLED app's live
|
|
* `%APPDATA%\netcatty\netcatty-tool-cli\discovery.json`, so a plain `node --test`
|
|
* run used to remove the running app's bridge pointer. Pointing the discovery
|
|
* env var at a throwaway temp file keeps both sides safe.
|
|
*/
|
|
const fs = require("node:fs");
|
|
const os = require("node:os");
|
|
const path = require("node:path");
|
|
|
|
const {
|
|
getCliDiscoveryFilePath,
|
|
TOOL_CLI_DISCOVERY_ENV_VAR,
|
|
} = require("../cli/discoveryPath.cjs");
|
|
|
|
const tempDirs = new Set();
|
|
let exitHookRegistered = false;
|
|
|
|
function removeAllTempDirs() {
|
|
for (const dir of tempDirs) {
|
|
try {
|
|
fs.rmSync(dir, { recursive: true, force: true });
|
|
} catch {
|
|
// Best effort: the process is exiting anyway.
|
|
}
|
|
}
|
|
tempDirs.clear();
|
|
}
|
|
|
|
/** Redirect discovery writes/deletes to a fresh temp file for this process. */
|
|
function isolateCliDiscoveryFile() {
|
|
const dir = fs.mkdtempSync(path.join(os.tmpdir(), "netcatty-cli-discovery-"));
|
|
tempDirs.add(dir);
|
|
if (!exitHookRegistered) {
|
|
exitHookRegistered = true;
|
|
process.once("exit", removeAllTempDirs);
|
|
}
|
|
const discoveryPath = path.join(dir, "discovery.json");
|
|
process.env[TOOL_CLI_DISCOVERY_ENV_VAR] = discoveryPath;
|
|
return { dir, discoveryPath };
|
|
}
|
|
|
|
/** Resolve the path the installed app would use, ignoring any active override. */
|
|
function defaultCliDiscoveryPath() {
|
|
const override = process.env[TOOL_CLI_DISCOVERY_ENV_VAR];
|
|
delete process.env[TOOL_CLI_DISCOVERY_ENV_VAR];
|
|
try {
|
|
return getCliDiscoveryFilePath();
|
|
} finally {
|
|
if (override !== undefined) {
|
|
process.env[TOOL_CLI_DISCOVERY_ENV_VAR] = override;
|
|
}
|
|
}
|
|
}
|
|
|
|
module.exports = { isolateCliDiscoveryFile, defaultCliDiscoveryPath };
|