Preserve environment when spawning processes

code-asher · code-asher · commit ab163b5d3177 · 2019-03-22T16:17:50.000-05:00
diff --git a/packages/protocol/src/common/util.ts b/packages/protocol/src/common/util.ts
@@ -301,3 +301,13 @@ export const isProxy = (value: any): value is ServerProxy => {
 export const isPromise = (value: any): value is Promise<any> => {
 	return typeof value.then === "function" && typeof value.catch === "function";
 };
+
+/**
+ * When spawning VS Code tries to preserve the environment but since it's in
+ * the browser, it doesn't work.
+ */
+export const preserveEnv = (options?: { env?: NodeJS.ProcessEnv } | null): void => {
+	if (options && options.env) {
+		options.env = { ...process.env, ...options.env };
+	}
+};
diff --git a/packages/protocol/src/node/modules/child_process.ts b/packages/protocol/src/node/modules/child_process.ts
@@ -1,5 +1,6 @@
 import * as cp from "child_process";
 import { ServerProxy } from "../../common/proxy";
+import { preserveEnv } from "../../common/util";
 import { WritableProxy, ReadableProxy } from "./stream";
 
 export type ForkProvider = (modulePath: string, args?: string[], options?: cp.ForkOptions) => cp.ChildProcess;
@@ -74,14 +75,20 @@ export class ChildProcessModuleProxy {
 		options?: { encoding?: string | null } & cp.ExecOptions | null,
 		callback?: ((error: cp.ExecException | null, stdin: string | Buffer, stdout: string | Buffer) => void),
 	): Promise<ChildProcessProxies> {
+		preserveEnv(options);
+
 		return this.returnProxies(cp.exec(command, options, callback));
 	}
 
 	public async fork(modulePath: string, args?: string[], options?: cp.ForkOptions): Promise<ChildProcessProxies> {
+		preserveEnv(options);
+
 		return this.returnProxies((this.forkProvider || cp.fork)(modulePath, args, options));
 	}
 
 	public async spawn(command: string, args?: string[], options?: cp.SpawnOptions): Promise<ChildProcessProxies> {
+		preserveEnv(options);
+
 		return this.returnProxies(cp.spawn(command, args, options));
 	}
 
diff --git a/packages/protocol/src/node/modules/node-pty.ts b/packages/protocol/src/node/modules/node-pty.ts
@@ -2,6 +2,7 @@
 import { EventEmitter } from "events";
 import * as pty from "node-pty";
 import { ServerProxy } from "../../common/proxy";
+import { preserveEnv } from "../../common/util";
 
 /**
  * Server-side IPty proxy.
@@ -67,6 +68,8 @@ export class NodePtyProcessProxy implements ServerProxy {
  */
 export class NodePtyModuleProxy {
 	public async spawn(file: string, args: string[] | string, options: pty.IPtyForkOptions): Promise<NodePtyProcessProxy> {
+		preserveEnv(options);
+
 		return new NodePtyProcessProxy(pty.spawn(file, args, options));
 	}
 }
