@primitivedotdev/cli 0.29.0 → 0.30.1

package/dist/oclif/proxy-auto-detect.js

@@ -1,3 +1,4 @@
+import { spawnSync } from "node:child_process";
 //#region src/oclif/proxy-auto-detect.ts
 const PROXY_ENV_VARS = [
 	"HTTP_PROXY",
@@ -15,7 +16,7 @@ function detectProxyVars(env) {
 		return typeof value === "string" && value.length > 0;
 	});
 }
-function applyProxyAutoDetect(options = {}) {
+function restartWithProxyEnvIfNeeded(options = {}) {
 	const env = options.env ?? process.env;
 	const stderr = options.stderr ?? process.stderr;
 	const detectedVars = detectProxyVars(env);
@@ -29,17 +30,42 @@ function applyProxyAutoDetect(options = {}) {
 		detectedVars,
 		reason: "node_use_env_proxy_already_set"
 	};
-	env.NODE_USE_ENV_PROXY = "1";
+	const argv = options.argv ?? process.argv;
+	const entrypoint = argv[1];
+	if (!entrypoint) return {
+		applied: false,
+		detectedVars,
+		reason: "missing_entrypoint"
+	};
+	const execPath = options.execPath ?? process.execPath;
+	const execArgv = options.execArgv ?? process.execArgv;
+	const spawn = options.spawn ?? spawnSync;
+	const exit = options.exit ?? ((code) => {
+		process.exit(code);
+		throw new Error("process.exit returned unexpectedly");
+	});
 	if (!hintPrinted) {
 		hintPrinted = true;
 		const names = detectedVars.join("/");
-		stderr.write(`primitive: proxy detected via ${names}, NODE_USE_ENV_PROXY=1 set automatically\n`);
+		stderr.write(`primitive: proxy detected via ${names}, restarting with NODE_USE_ENV_PROXY=1\n`);
 	}
-	return {
-		applied: true,
-		detectedVars,
-		reason: "applied"
-	};
+	const child = spawn(execPath, [
+		...execArgv,
+		entrypoint,
+		...argv.slice(2)
+	], {
+		env: {
+			...env,
+			NODE_USE_ENV_PROXY: "1"
+		},
+		stdio: "inherit"
+	});
+	if (child.error) throw child.error;
+	if (child.signal) {
+		(options.kill ?? process.kill)(options.pid ?? process.pid, child.signal);
+		return exit(1);
+	}
+	return exit(child.status ?? 1);
 }
 //#endregion
-export { _resetHintLatchForTest, applyProxyAutoDetect };
+export { _resetHintLatchForTest, restartWithProxyEnvIfNeeded };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primitivedotdev/cli",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "description": "Official Primitive CLI: deploy Primitive Functions, send and inspect mail, manage endpoints, all from the terminal. Wraps the @primitivedotdev/sdk runtime client with one-shot commands.",
   "type": "module",
   "sideEffects": false,