fix: 修复某些情况下代理环境变量不生效的问题

surgioproject · Feb 15, 2020 · 7deb7d9 · 7deb7d9
1 parent 33d4007
commit 7deb7d9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/bin/surgio.js b/bin/surgio.js
@@ -2,8 +2,6 @@
 
 'use strict';
 
-process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
-
 const SurgioCommand = require('..').SurgioCommand;
 
 const d = new SurgioCommand();

diff --git a/lib/index.ts b/lib/index.ts
@@ -1,3 +1,5 @@
+import './utils/patch-proxy';
+
 import { bootstrap } from 'global-agent';
 import Command from 'common-bin';
 import fs from 'fs';

diff --git a/lib/utils/patch-proxy.ts b/lib/utils/patch-proxy.ts
@@ -0,0 +1,22 @@
+// istanbul ignore file
+
+import Debug from 'debug';
+
+const debug = Debug('surgio:utils:patch-proxy');
+const keys: ReadonlyArray<string> = [
+  'http_proxy',
+  'https_proxy',
+  'all_proxy',
+];
+
+process.env.GLOBAL_AGENT_ENVIRONMENT_VARIABLE_NAMESPACE = '';
+
+keys.forEach(key => {
+  if (key in process.env) {
+    const newKey = key.toUpperCase();
+    const value = process.env[key];
+
+    debug('Patched environment variable %s=%s', newKey, value);
+    process.env[newKey] = value;
+  }
+});