fix: using execvp now while setting env variables

Hopefully this works now.

Author: tegefaulkes

src/exec.ts

@@ -8,22 +8,21 @@ import path from 'path';
 
 interface Exec {
   /**
-   * This calls the provided command with the provided arguments. The env variable are also provided in the format of
-   * 'key=value'. If the call fails in any way then it just throws the error code 'Error('number')`. The most common
-   * would be an `ENOENT` in the form of `Error('2')`.
+   * This calls the provided command with the provided arguments. The env variable are also provided as a
+   * `Record<string, string>`. If the call fails in any way then it just throws the error code 'Error('number')`.
+   * The most common would be an `ENOENT` in the form of `Error('2')`.
    *
    * This will replace the current process with the provided cmd. From the callers perspective this will seem really odd
    * and never return. The call can not return so and code after it is unreachable, hence the `never` return type. So
    * treat this function as a termination of the process, much like a `process.exit()` call.
    *
-   * The exec'ed program will not assume the environment of the current process. This can allow isolation but if you
-   * want to have the current environment then you'll have to pass it in manually through the envp parameter.
+   * The exec'ed program will assume the current environment while adding the environment variables set by `env` to it.
    *
    * @param cmd - the command to call, this can be anything in the PATH or a specific file
    * @param argv - The args to be passed to the command
-   * @param envp - env variables that you want to provide. These are formatted as an array of 'key=value'
+   * @param envp - env variables that you want to provide.
    */
-  execvpe(cmd: string, argv: Array<string>, envp: Array<string>): never;
+  execvp(cmd: string, argv: Array<string>, envp: Record<string, string>): never;
 }
 
 const projectRoot = path.join(__dirname, '../');

src/napi/lib.rs

@@ -3,6 +3,7 @@ extern crate core;
 use napi_derive::napi;
 use napi::bindgen_prelude::{
   Array,
+  Object,
 };
 use uapi;
 
@@ -16,8 +17,8 @@ fn set_fd_cloexec() -> uapi::Result<()> {
   Ok(())
 }
 
-#[napi(ts_args_type="cmd: string, argv: Array<string>, envp: Array<string>")]
-pub fn execvpe(cmd: String, argv: Array, envp: Array) -> napi::Result<()> {
+#[napi(ts_args_type="cmd: string, argv: Array<string>, envp: Record<string, string>")]
+pub fn execvp(cmd: String, argv: Array, envp: Object) -> napi::Result<()> {
   // Before making the call we need to configure the stdio. This ensures we get the output of the exec'ed program.
   set_fd_cloexec().or_else(
     |e| Err(napi::Error::from_reason(e.to_string()))
@@ -38,22 +39,23 @@ pub fn execvpe(cmd: String, argv: Array, envp: Array) -> napi::Result<()> {
   }
 
   // Setting up the env parameters
-  let mut envp_ = uapi::UstrPtr::new();
-  for i in 0..envp.len() {
-    match envp.get::<String>(i) {
-      Ok(Some(value)) => {
-        envp_.push(value);
-        Ok(())
-      },
-      Err(e) => Err(napi::Error::from_reason(e.to_string())),
-      _ => Ok(()),
-    }?;
+  let keys = Object::keys(&envp).or_else(
+    |e| Err(napi::Error::from_reason(e.to_string()))
+  )?;
+  for key in keys.iter() {
+    let value = match envp.get::<String, String>(key.clone()) {
+      Ok(Some(value)) => Ok(value),
+      Ok(None) => panic!("asd"),
+      Err(e) => Err(e),
+    }.or_else(
+      |e| Err(napi::Error::from_reason(e.to_string()))
+    )?;
+    std::env::set_var(key, value);
   }
 
-  uapi::execvpe(
+  uapi::execvp(
     cmd,
     &argv_,
-    &envp_,
   ).or_else(
     |e| Err(napi::Error::from_reason(e.to_string()))
   )

tests/Exec.test.ts

@@ -1,15 +1,16 @@
 import child_process from 'child_process';
 import { exec } from '@';
 
-test('execvpe should provide environment variables', async () => {
-  const output = child_process.execFileSync('./tests/callExecvpe.ts');
-  const jsonOut = JSON.parse(output.toString());
-  expect(jsonOut).toMatchObject({
-    test: 'asd',
-    best: 'bsd',
+describe('execvp', () => {
+  test('execvp should provide environment variables', async () => {
+    // Setting envs to check
+    const output = child_process.execFileSync('./tests/callExecvpe.ts');
+    const jsonOut = JSON.parse(output.toString());
+    expect(jsonOut['TEST1']).toBe('value1');
+    expect(jsonOut['TEST2']).toBe('value2');
+  });
+  test('execvp should throw when call fails', async () => {
+    // Code 2 corresponds to `ENOENT`
+    expect(() => exec.execvp('invalidCommand', [], {})).toThrow('2');
   });
-});
-test('execvpe should throw when call fails', async () => {
-  // Code 2 corresponds to `ENOENT`
-  expect(() => exec.execvpe('invalidCommand', [], [])).toThrow('2');
 });

tests/callExecvpe.ts

@@ -4,5 +4,8 @@ import { exec } from '@';
 // This executes `printEnv.js` while setting environment variables
 // eslint-disable-next-line no-console
 console.log(
-  exec.execvpe('node', ['./tests/printEnv.js'], ['test=asd', 'best=bsd']),
+  exec.execvp('node', ['./tests/printEnv.js'], {
+    TEST1: 'value1',
+    TEST2: 'value2',
+  }),
 );