fix: runtime detection on Windows (#785)

Author: vladfrangu

package.json

@@ -1,6 +1,6 @@
 {
     "name": "apify-cli",
-    "version": "0.21.4",
+    "version": "0.21.5",
     "description": "Apify command-line interface (CLI) helps you manage the Apify cloud platform and develop, build, and deploy Apify Actors.",
     "exports": "./dist/index.js",
     "types": "./dist/index.d.ts",

src/lib/exec.ts

@@ -1,6 +1,6 @@
 import { type SpawnOptions, type SpawnOptionsWithoutStdio, spawn } from 'node:child_process';
-import { isAbsolute } from 'node:path';
 
+import { normalizeExecutablePath } from './hooks/runtimes/utils.js';
 import { run } from './outputs.js';
 
 const windowsOptions: SpawnOptions = {
@@ -12,7 +12,7 @@ const windowsOptions: SpawnOptions = {
  * Run child process and returns stdout and stderr to user stout
  */
 const spawnPromised = async (cmd: string, args: string[], opts: SpawnOptionsWithoutStdio) => {
-	const escapedCommand = isAbsolute(cmd) && process.platform === 'win32' ? `"${cmd}"` : cmd;
+	const escapedCommand = normalizeExecutablePath(cmd);
 
 	// NOTE: Pipes stderr, stdout to main process
 	const childProcess = spawn(escapedCommand, args, {

src/lib/hooks/runtimes/javascript.ts

@@ -5,6 +5,7 @@ import { execa } from 'execa';
 import which from 'which';
 
 import type { Runtime } from '../useCwdProject.js';
+import { normalizeExecutablePath } from './utils.js';
 
 const cwdCache = new Map<string, Option<Runtime>>();
 
@@ -55,7 +56,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()): Promise<Option<
 
 	for (const [runtime, args] of Object.entries(runtimesToCheck) as [keyof typeof runtimesToCheck, string[]][]) {
 		try {
-			const runtimePath = await which(runtime);
+			const runtimePath = normalizeExecutablePath(await which(runtime));
 
 			const version = await getRuntimeVersion(runtimePath, args);
 
@@ -67,7 +68,7 @@ export async function useJavaScriptRuntime(cwd = process.cwd()): Promise<Option<
 
 				// For npm, we also fetch the npm version
 				if (runtime === 'node') {
-					const npmPath = await which('npm').catch(() => null);
+					const npmPath = normalizeExecutablePath(await which('npm').catch(() => null));
 
 					if (npmPath) {
 						res.pmPath = npmPath;

src/lib/hooks/runtimes/python.ts

@@ -8,6 +8,7 @@ import { execa } from 'execa';
 import which from 'which';
 
 import type { Runtime } from '../useCwdProject.js';
+import { normalizeExecutablePath } from './utils.js';
 
 const cwdCache = new Map<string, Option<Runtime>>();
 
@@ -51,12 +52,15 @@ export async function usePythonRuntime({
 	const pathParts = isWindows ? ['Scripts', 'python.exe'] : ['bin', 'python3'];
 
 	let fullPythonVenvPath;
+
 	if (process.env.VIRTUAL_ENV) {
 		fullPythonVenvPath = join(process.env.VIRTUAL_ENV, ...pathParts);
 	} else {
 		fullPythonVenvPath = join(cwd, '.venv', ...pathParts);
 	}
 
+	fullPythonVenvPath = normalizeExecutablePath(fullPythonVenvPath);
+
 	try {
 		await access(fullPythonVenvPath);
 
@@ -84,7 +88,7 @@ export async function usePythonRuntime({
 
 	for (const fallback of fallbacks) {
 		try {
-			const fullPath = await which(fallback);
+			const fullPath = normalizeExecutablePath(await which(fallback));
 
 			const version = await getPythonVersion(fullPath);
 

src/lib/hooks/runtimes/utils.ts

@@ -0,0 +1,25 @@
+import { isAbsolute } from 'node:path';
+import process from 'node:process';
+
+export function normalizeExecutablePath(path: string): string;
+export function normalizeExecutablePath(path: string | null): string | null;
+export function normalizeExecutablePath(path: string | null) {
+	if (!path) {
+		return null;
+	}
+
+	// Already escaped
+	if (path.startsWith('"')) {
+		return path;
+	}
+
+	if (process.platform === 'win32') {
+		if (isAbsolute(path)) {
+			return `"${path}"`;
+		}
+
+		return path;
+	}
+
+	return path;
+}