fix(scripts): support npm node command shims · openclaw/o...

Recent Commits to openclaw:main

vincentkoc · 2026-06-22 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ function spawnInvocation(command, commandArgs, env, platform) {`
`122`	`122`	`if (nodeShim) {`
`123`	`123`	`return {`
`124`	`124`	`command: nodeShim.node,`
`125`		`-args: [nodeShim.script, ...commandArgs],`
	`125`	`+args: [...nodeShim.args, ...commandArgs],`
`126`	`126`	`};`
`127`	`127`	`}`
`128`	`128`	`return {`
`@@ -151,11 +151,39 @@ function resolveNodeCmdShim(command, platform) {`
`151`	`151`	`if (!isExecutableFile(script, platform)) {`
`152`	`152`	`continue;`
`153`	`153`	`}`
`154`		`-return { node: match[1], script };`
	`154`	`+return { node: match[1], args: [script] };`
	`155`	`+}`
	`156`	`+const npmCmdShim = resolveNpmNodeCmdShim(command, content, platform);`
	`157`	`+if (npmCmdShim) {`
	`158`	`+return npmCmdShim;`
`155`	`159`	`}`
`156`	`160`	`return null;`
`157`	`161`	`}`
`158`	`162`
	`163`	`+function resolveNpmNodeCmdShim(command, content, platform) {`
	`164`	`+const lines = content.split(/\r?\n/u).map((line) => line.trim());`
	`165`	`+if (`
	`166`	`+!lines.some((line) => /^IF EXIST "%dp0%\\node\.exe" \($/iu.test(line)) \|\|`
	`167`	`+!lines.some((line) => /^SET "_prog=node(?:\.exe)?"$/iu.test(line))`
	`168`	`+) {`
	`169`	`+return null;`
	`170`	`+}`
	`171`	`+const invocation = lines.find((line) => line.includes('"%_prog%"') && line.endsWith("%*"));`
	`172`	`+if (!invocation) {`
	`173`	`+return null;`
	`174`	`+}`
	`175`	`+const match = /(?:^\|&)\s"%_prog%"\s+(.?)"(%dp0%\\[^"]+)"\s+%\*$/iu.exec(invocation);`
	`176`	`+if (!match \|\| match[1].trim()) {`
	`177`	`+return null;`
	`178`	`+}`
	`179`	`+const script = resolve(dirname(command), match[2].replace(/^%dp0%\\/iu, ""));`
	`180`	`+if (!isExecutableFile(script, platform)) {`
	`181`	`+return null;`
	`182`	`+}`
	`183`	`+const localNode = resolve(dirname(command), "node.exe");`
	`184`	`+return { node: isExecutableFile(localNode, platform) ? localNode : "node", args: [script] };`
	`185`	`+}`
	`186`	`+`
`159`	`187`	const cmdMetaCharactersRe = /([()\][%!^"`<>&\|;, *?])/g;
`160`	`188`	`const jsRuntimeEntrypoints = new Set([`
`161`	`189`	`"pnpm",`

Original file line number	Diff line number	Diff line change
`@@ -191,11 +191,7 @@ function writeFakeCrabbox(binDir: string, helpText: string): string {`
`191`	`191`	`require(${JSON.stringify(helperPath)});`,
`192`	`192`	`].join("\n");`
`193`	`193`	writeFileSync(crabboxPath, `${script}\n`, "utf8");
`194`		`-writeFileSync(`
`195`		-`${crabboxPath}.cmd`,
`196`		-`@echo off\r\n"${process.execPath}" "%~dp0crabbox" %*\r\n`,
`197`		`-"utf8",`
`198`		`-);`
	`194`	+writeFileSync(`${crabboxPath}.cmd`, windowsNodeCmdShim("crabbox"), "utf8");
`199`	`195`	`chmodSync(crabboxPath, 0o755);`
`200`	`196`	`return crabboxPath;`
`201`	`197`	`}`
`@@ -212,15 +208,34 @@ function makeSlowVersionCrabbox(helpText: string): string {`
`212`	`208`	`else if (args[0] === "run" && args[1] === "--help") { process.stdout.write(${JSON.stringify(helpText)}); }`,
`213`	`209`	`].join("\n");`
`214`	`210`	writeFileSync(crabboxPath, `${script}\n`, "utf8");
`215`		`-writeFileSync(`
`216`		-`${crabboxPath}.cmd`,
`217`		-`@echo off\r\n"${process.execPath}" "%~dp0crabbox" %*\r\n`,
`218`		`-"utf8",`
`219`		`-);`
	`211`	+writeFileSync(`${crabboxPath}.cmd`, windowsNodeCmdShim("crabbox"), "utf8");
`220`	`212`	`chmodSync(crabboxPath, 0o755);`
`221`	`213`	`return binDir;`
`222`	`214`	`}`
`223`	`215`
	`216`	`+function windowsNodeCmdShim(target: string): string {`
	`217`	`+return [`
	`218`	`+"@ECHO off",`
	`219`	`+"GOTO start",`
	`220`	`+":find_dp0",`
	`221`	`+"SET dp0=%~dp0",`
	`222`	`+"EXIT /b",`
	`223`	`+":start",`
	`224`	`+"SETLOCAL",`
	`225`	`+"CALL :find_dp0",`
	`226`	`+'IF EXIST "%dp0%\\node.exe" (',`
	`227`	`+' SET "_prog=%dp0%\\node.exe"',`
	`228`	`+") ELSE (",`
	`229`	`+' SET "_prog=node"',`
	`230`	`+")",`
	`231`	`+"",`
	`232`	`+'endLocal & goto #_undefined_# 2>NUL \|\| title %COMSPEC% & set PATHEXT=%PATHEXT:;.JS;=;% & "%_prog%" "%dp0%\\' +`
	`233`	`+target +`
	`234`	`+'" %*',`
	`235`	`+"",`
	`236`	`+].join("\r\n");`
	`237`	`+}`
	`238`	`+`
`224`	`239`	`function shellSingleQuote(value: string): string {`
`225`	`240`	return `'${value.replaceAll("'", "'\\''")}'`;
`226`	`241`	`}`
`@@ -282,7 +297,7 @@ function makeFakeGit(`
`282`	`297`	`"process.exit(response.status ?? 0);",`
`283`	`298`	`].join("\n");`
`284`	`299`	writeFileSync(gitPath, `${script}\n`, "utf8");
`285`		-writeFileSync(`${gitPath}.cmd`, `@echo off\r\n"${process.execPath}" "%~dp0git" %*\r\n`, "utf8");
	`300`	+writeFileSync(`${gitPath}.cmd`, windowsNodeCmdShim("git"), "utf8");
`286`	`301`	`chmodSync(gitPath, 0o755);`
`287`	`302`	`return binDir;`
`288`	`303`	`}`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main