feat(process): support env overrides in exec
This commit is contained in:
22
src/process/exec.test.ts
Normal file
22
src/process/exec.test.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
import { runCommandWithTimeout } from "./exec.js";
|
||||||
|
|
||||||
|
describe("runCommandWithTimeout", () => {
|
||||||
|
it("passes env overrides to child", async () => {
|
||||||
|
const result = await runCommandWithTimeout(
|
||||||
|
[
|
||||||
|
process.execPath,
|
||||||
|
"-e",
|
||||||
|
'process.stdout.write(process.env.CLAWDIS_TEST_ENV ?? "")',
|
||||||
|
],
|
||||||
|
{
|
||||||
|
timeoutMs: 5_000,
|
||||||
|
env: { CLAWDIS_TEST_ENV: "ok" },
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(result.code).toBe(0);
|
||||||
|
expect(result.stdout).toBe("ok");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -47,6 +47,7 @@ export type CommandOptions = {
|
|||||||
timeoutMs: number;
|
timeoutMs: number;
|
||||||
cwd?: string;
|
cwd?: string;
|
||||||
input?: string;
|
input?: string;
|
||||||
|
env?: NodeJS.ProcessEnv;
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function runCommandWithTimeout(
|
export async function runCommandWithTimeout(
|
||||||
@@ -57,13 +58,14 @@ export async function runCommandWithTimeout(
|
|||||||
typeof optionsOrTimeout === "number"
|
typeof optionsOrTimeout === "number"
|
||||||
? { timeoutMs: optionsOrTimeout }
|
? { timeoutMs: optionsOrTimeout }
|
||||||
: optionsOrTimeout;
|
: optionsOrTimeout;
|
||||||
const { timeoutMs, cwd, input } = options;
|
const { timeoutMs, cwd, input, env } = options;
|
||||||
|
|
||||||
// Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
|
// Spawn with inherited stdin (TTY) so tools like `pi` stay interactive when needed.
|
||||||
return await new Promise((resolve, reject) => {
|
return await new Promise((resolve, reject) => {
|
||||||
const child = spawn(argv[0], argv.slice(1), {
|
const child = spawn(argv[0], argv.slice(1), {
|
||||||
stdio: [input ? "pipe" : "inherit", "pipe", "pipe"],
|
stdio: [input ? "pipe" : "inherit", "pipe", "pipe"],
|
||||||
cwd,
|
cwd,
|
||||||
|
env: env ? { ...process.env, ...env } : process.env,
|
||||||
});
|
});
|
||||||
let stdout = "";
|
let stdout = "";
|
||||||
let stderr = "";
|
let stderr = "";
|
||||||
|
|||||||
Reference in New Issue
Block a user