moving
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
import { existsSync, readFileSync } from 'node:fs';
|
||||
import { execFile } from 'node:child_process';
|
||||
import { win32 as pathWin32 } from 'node:path';
|
||||
import { promisify } from 'node:util';
|
||||
|
||||
const execFileAsync = promisify(execFile);
|
||||
|
||||
export interface ToolCommandInvocation {
|
||||
binary: string;
|
||||
@@ -11,6 +15,9 @@ export interface ToolCommandResolutionDeps {
|
||||
readTextFile?: (path: string) => string | null;
|
||||
fileExists?: (path: string) => boolean;
|
||||
nodeBinary?: string;
|
||||
env?: NodeJS.ProcessEnv;
|
||||
pathLookup?: (binary: string, env: NodeJS.ProcessEnv) => Promise<string[]>;
|
||||
fallbackToWhere?: boolean;
|
||||
}
|
||||
|
||||
function defaultReadTextFile(path: string): string | null {
|
||||
@@ -26,12 +33,14 @@ function defaultFileExists(path: string): boolean {
|
||||
}
|
||||
|
||||
function npmCmdShimTarget(content: string): string | null {
|
||||
const match = content.match(/"%_prog%"\s+"%dp0%[\\/]+([^"]+)"/i);
|
||||
return match?.[1] ?? null;
|
||||
}
|
||||
const packageShim = content.match(/"%_prog%"\s+"%dp0%[\\/]+([^"]+)"/i);
|
||||
if (packageShim?.[1]) return packageShim[1];
|
||||
|
||||
function quoteCmdArg(value: string): string {
|
||||
return `"${value.replace(/"/g, '""')}"`;
|
||||
// npm 11's own npm.cmd/npx.cmd use NPM_CLI_JS/NPX_CLI_JS rather than
|
||||
// the package-shim `_prog` template. Resolve their local JS entrypoint so
|
||||
// model-supplied argv never passes through cmd.exe expansion.
|
||||
const npmCli = content.match(/SET\s+"(?:NPM|NPX)_CLI_JS=%~dp0[\\/]+([^"]+)"/i);
|
||||
return npmCli?.[1] ?? null;
|
||||
}
|
||||
|
||||
export function resolveToolCommandInvocation(
|
||||
@@ -54,17 +63,92 @@ export function resolveToolCommandInvocation(
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
binary: 'cmd.exe',
|
||||
args: [
|
||||
'/d',
|
||||
'/v:off',
|
||||
'/s',
|
||||
'/c',
|
||||
['call', quoteCmdArg(binary), ...args.map(quoteCmdArg)].join(' '),
|
||||
],
|
||||
windowsVerbatimArguments: true,
|
||||
};
|
||||
throw Object.assign(
|
||||
new Error(`UNSAFE_WINDOWS_BATCH_SHIM: Refusing unrecognized Windows batch shim: ${binary}`),
|
||||
{ code: 'UNSAFE_WINDOWS_BATCH_SHIM' },
|
||||
);
|
||||
}
|
||||
return { binary, args };
|
||||
}
|
||||
|
||||
function envValue(env: NodeJS.ProcessEnv, name: string): string | undefined {
|
||||
const match = Object.entries(env).find(([key]) => key.toUpperCase() === name);
|
||||
return match?.[1];
|
||||
}
|
||||
|
||||
function windowsLookupEnv(source: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
|
||||
const env: NodeJS.ProcessEnv = {};
|
||||
for (const name of ['PATH', 'PATHEXT', 'SYSTEMROOT', 'WINDIR']) {
|
||||
const value = envValue(source, name);
|
||||
if (value !== undefined) env[name] = value;
|
||||
}
|
||||
return env;
|
||||
}
|
||||
|
||||
async function defaultWindowsPathLookup(
|
||||
binary: string,
|
||||
env: NodeJS.ProcessEnv,
|
||||
fallbackToWhere: boolean,
|
||||
): Promise<string[]> {
|
||||
const pathValue = envValue(env, 'PATH') ?? '';
|
||||
const extension = pathWin32.extname(binary);
|
||||
const extensions = extension
|
||||
? ['']
|
||||
: (envValue(env, 'PATHEXT') ?? '.COM;.EXE;.BAT;.CMD')
|
||||
.split(';')
|
||||
.filter((item) => /^\.(?:exe|com|cmd|bat)$/i.test(item));
|
||||
for (const rawDir of pathValue.split(';')) {
|
||||
const directory = rawDir.trim().replace(/^"(.*)"$/, '$1');
|
||||
if (!directory) continue;
|
||||
for (const suffix of extensions) {
|
||||
const candidate = pathWin32.join(directory, `${binary}${suffix}`);
|
||||
if (existsSync(candidate)) return [candidate];
|
||||
}
|
||||
}
|
||||
|
||||
if (!fallbackToWhere) return [];
|
||||
|
||||
// `where.exe` remains the authoritative fallback for App Execution Aliases
|
||||
// and other Windows resolution cases not represented as ordinary PATH files.
|
||||
const windowsRoot = envValue(env, 'SYSTEMROOT') ?? envValue(env, 'WINDIR') ?? 'C:\\Windows';
|
||||
const whereBinary = pathWin32.join(windowsRoot, 'System32', 'where.exe');
|
||||
const { stdout } = await execFileAsync(whereBinary, [binary], {
|
||||
env,
|
||||
timeout: 3_000,
|
||||
windowsHide: true,
|
||||
});
|
||||
return stdout
|
||||
.split(/\r?\n/)
|
||||
.map((candidate) => candidate.trim())
|
||||
.filter(Boolean);
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve a bare Windows command through PATH before applying cmd-shim
|
||||
* handling. Node's shell-free spawn does not honor PATHEXT for npm/npx .cmd
|
||||
* shims, so spawning the logical name directly fails with ENOENT.
|
||||
*/
|
||||
export async function resolveToolCommandInvocationFromPath(
|
||||
binary: string,
|
||||
args: string[],
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
deps: ToolCommandResolutionDeps = {},
|
||||
): Promise<ToolCommandInvocation> {
|
||||
if (platform !== 'win32' || pathWin32.isAbsolute(binary) || /[\\/]/.test(binary)) {
|
||||
return resolveToolCommandInvocation(binary, args, platform, deps);
|
||||
}
|
||||
|
||||
const lookupEnv = windowsLookupEnv(deps.env ?? process.env);
|
||||
let candidates: string[];
|
||||
try {
|
||||
candidates = deps.pathLookup
|
||||
? await deps.pathLookup(binary, lookupEnv)
|
||||
: await defaultWindowsPathLookup(binary, lookupEnv, deps.fallbackToWhere !== false);
|
||||
} catch {
|
||||
// Preserve the original spawn error when PATH lookup itself fails.
|
||||
return resolveToolCommandInvocation(binary, args, platform, deps);
|
||||
}
|
||||
const resolved = candidates.find((candidate) => /\.(?:exe|com|cmd|bat)$/i.test(candidate));
|
||||
if (resolved) return resolveToolCommandInvocation(resolved, args, platform, deps);
|
||||
return resolveToolCommandInvocation(binary, args, platform, deps);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user