Merge pull request #31 from val-town/master

Allow process spawn options to be set

Author: KallynGowdy

package-lock.json

@@ -20,6 +20,8 @@ describe('DenoWorker', () => {
     const infiniteScript = readFileSync(infiniteFile, { encoding: 'utf-8' });
     const failFile = path.resolve(__dirname, './test/fail.js');
     const failScript = readFileSync(failFile, { encoding: 'utf-8' });
+    const envFile = path.resolve(__dirname, './test/env.js');
+    const envScript = readFileSync(envFile, { encoding: 'utf-8' });
 
     afterEach(() => {
         if (worker) {
@@ -707,6 +709,41 @@ describe('DenoWorker', () => {
                 );
             });
         });
+
+        describe('spawnOptions', async () => {
+            it('should be able to pass spawn options', async () => {
+                worker = new DenoWorker(envScript, {
+                    permissions: {
+                        allowEnv: true,
+                    },
+                    spawnOptions: {
+                        env: {
+                            ...process.env,
+                            HELLO: 'WORLD',
+                        },
+                    },
+                });
+
+                let ret: any;
+                let resolve: any;
+                let promise = new Promise((res, rej) => {
+                    resolve = res;
+                });
+                worker.onmessage = (e) => {
+                    ret = e.data;
+                    resolve();
+                };
+
+                worker.postMessage({
+                    type: 'env',
+                    name: 'HELLO',
+                });
+
+                await promise;
+
+                expect(ret).toEqual('WORLD');
+            });
+        });
     });
 
     describe('data types', () => {

src/DenoWorker.spec.ts

@@ -1,7 +1,7 @@
 import { createServer, Server } from 'http';
 import WebSocket, { Server as WSServer } from 'ws';
 import { resolve } from 'path';
-import { ChildProcess, spawn } from 'child_process';
+import { ChildProcess, spawn, SpawnOptions } from 'child_process';
 import {
     serializeStructure,
     deserializeStructure,
@@ -141,6 +141,11 @@ export interface DenoWorkerOptions {
          */
         allowHrtime?: boolean;
     };
+
+    /**
+     * Options used to spawn the Deno child process
+     */
+    spawnOptions: SpawnOptions;
 }
 
 /**
@@ -192,6 +197,7 @@ export class DenoWorker {
                 denoLockFilePath: '',
                 denoCachedOnly: false,
                 denoNoCheck: false,
+                spawnOptions: {},
             },
             options || {}
         );
@@ -346,13 +352,17 @@ export class DenoWorker {
                 }
             }
 
-            this._process = spawn(this._options.denoExecutable, [
-                'run',
-                ...runArgs,
-                this._options.denoBootstrapScriptPath,
-                connectAddress,
-                ...scriptArgs,
-            ]);
+            this._process = spawn(
+                this._options.denoExecutable,
+                [
+                    'run',
+                    ...runArgs,
+                    this._options.denoBootstrapScriptPath,
+                    connectAddress,
+                    ...scriptArgs,
+                ],
+                this._options.spawnOptions
+            );
             this._process.on('exit', (code: number, signal: string) => {
                 this.terminate();
 

src/DenoWorker.ts

@@ -0,0 +1,5 @@
+self.onmessage = (e) => {
+    if (e.data.type === 'env') {
+        self.postMessage(Deno.env.get(e.data.name));
+    }
+};