@automattic/vip 4.1.6 → 4.1.8

package/dist/lib/envvar/api-get-all.js

@@ -1,11 +1,12 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getEnvVars;
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _api = _interopRequireDefault(require("../../lib/api"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const query = (0, _graphqlTag.default)`
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+const api_1 = __importDefault(require("../../lib/api"));
+const query = (0, graphql_tag_1.default) `
 	query GetEnvironmentVariablesWithValues($appId: Int!, $envId: Int!) {
 		app(id: $appId) {
 			id
@@ -23,16 +24,11 @@ const query = (0, _graphqlTag.default)`
 	}
 `;
 async function getEnvVars(appId, envId) {
-  const api = (0, _api.default)();
-  const variables = {
-    appId,
-    envId
-  };
-  const {
-    data
-  } = await api.query({
-    query,
-    variables
-  });
-  return data?.app?.environments?.[0]?.environmentVariables?.nodes ?? null;
-}
+    const api = (0, api_1.default)();
+    const variables = {
+        appId,
+        envId,
+    };
+    const { data } = await api.query({ query, variables });
+    return (data?.app?.environments?.[0]?.environmentVariables?.nodes ?? null);
+}

package/dist/lib/envvar/api-get.js

@@ -1,12 +1,11 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getEnvVar;
-var _apiGetAll = _interopRequireDefault(require("../../lib/envvar/api-get-all"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const api_get_all_1 = __importDefault(require("../../lib/envvar/api-get-all"));
 async function getEnvVar(appId, envId, name) {
-  const envvars = await (0, _apiGetAll.default)(appId, envId);
-  return envvars?.find(({
-    name: foundName
-  }) => name === foundName);
-}
+    const envvars = await (0, api_get_all_1.default)(appId, envId);
+    return envvars?.find(({ name: foundName }) => name === foundName);
+}

package/dist/lib/envvar/api-list.js

@@ -1,11 +1,12 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = listEnvVars;
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _api = _interopRequireDefault(require("../../lib/api"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const query = (0, _graphqlTag.default)`
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+const api_1 = __importDefault(require("../../lib/api"));
+const query = (0, graphql_tag_1.default) `
 	query GetEnvironmentVariables($appId: Int!, $envId: Int!) {
 		app(id: $appId) {
 			id
@@ -21,20 +22,14 @@ const query = (0, _graphqlTag.default)`
 		}
 	}
 `;
-
 // List the names (but not values) of environment variables.
 async function listEnvVars(appId, envId) {
-  const api = (0, _api.default)();
-  const variables = {
-    appId,
-    envId
-  };
-  const {
-    data
-  } = await api.query({
-    query,
-    variables
-  });
-  const nodes = data?.app?.environments?.[0]?.environmentVariables?.nodes ?? [];
-  return nodes.map(entry => entry?.name ?? '');
-}
+    const api = (0, api_1.default)();
+    const variables = {
+        appId,
+        envId,
+    };
+    const { data } = await api.query({ query, variables });
+    const nodes = data?.app?.environments?.[0]?.environmentVariables?.nodes ?? [];
+    return nodes.map(entry => entry?.name ?? '');
+}

package/dist/lib/envvar/api-set.js

@@ -1,11 +1,12 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = setEnvVar;
-var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-var _api = _interopRequireDefault(require("../../lib/api"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const mutation = (0, _graphqlTag.default)`
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+const api_1 = __importDefault(require("../../lib/api"));
+const mutation = (0, graphql_tag_1.default) `
 	mutation AddEnvironmentVariable(
 		$appId: Int!
 		$envId: Int!
@@ -32,16 +33,16 @@ const mutation = (0, _graphqlTag.default)`
 	}
 `;
 async function setEnvVar(appId, envId, name, value, reloadManifest = false) {
-  const api = (0, _api.default)();
-  const variables = {
-    appId,
-    envId,
-    name,
-    value,
-    reloadManifest
-  };
-  return api.mutate({
-    mutation,
-    variables
-  });
-}
+    const api = (0, api_1.default)();
+    const variables = {
+        appId,
+        envId,
+        name,
+        value,
+        reloadManifest,
+    };
+    return api.mutate({
+        mutation,
+        variables,
+    });
+}

package/dist/lib/envvar/api.js

@@ -1,26 +1,25 @@
 "use strict";
-
-exports.__esModule = true;
-exports.appQuery = void 0;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.appQuery = exports.setEnvVar = exports.listEnvVars = exports.getEnvVars = exports.getEnvVar = exports.deleteEnvVar = void 0;
 exports.validateName = validateName;
 exports.validateNameWithMessage = validateNameWithMessage;
-var _chalk = _interopRequireDefault(require("chalk"));
-var _apiDelete = _interopRequireDefault(require("./api-delete"));
-exports.deleteEnvVar = _apiDelete.default;
-var _apiGet = _interopRequireDefault(require("./api-get"));
-exports.getEnvVar = _apiGet.default;
-var _apiGetAll = _interopRequireDefault(require("./api-get-all"));
-exports.getEnvVars = _apiGetAll.default;
-var _apiList = _interopRequireDefault(require("./api-list"));
-exports.listEnvVars = _apiList.default;
-var _apiSet = _interopRequireDefault(require("./api-set"));
-exports.setEnvVar = _apiSet.default;
-var _logging = require("../../lib/envvar/logging");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-// Reexport for convenience
-
+const chalk_1 = __importDefault(require("chalk"));
+const api_delete_1 = __importDefault(require("./api-delete"));
+exports.deleteEnvVar = api_delete_1.default;
+const api_get_1 = __importDefault(require("./api-get"));
+exports.getEnvVar = api_get_1.default;
+const api_get_all_1 = __importDefault(require("./api-get-all"));
+exports.getEnvVars = api_get_all_1.default;
+const api_list_1 = __importDefault(require("./api-list"));
+exports.listEnvVars = api_list_1.default;
+const api_set_1 = __importDefault(require("./api-set"));
+exports.setEnvVar = api_set_1.default;
+const logging_1 = require("../../lib/envvar/logging");
 // The subquery for environments lets users choose any environment, including production.
-const appQuery = exports.appQuery = `
+exports.appQuery = `
 	id
 	name
 	typeId
@@ -39,15 +38,21 @@ const appQuery = exports.appQuery = `
 	}
 `;
 function validateName(name) {
-  const sanitizedName = name.trim().toUpperCase().replace(/[^A-Z0-9_]/g, '');
-  return name === sanitizedName && /^[A-Z]/.test(sanitizedName);
+    const sanitizedName = name
+        .trim()
+        .toUpperCase()
+        .replace(/[^A-Z0-9_]/g, '');
+    return name === sanitizedName && /^[A-Z]/.test(sanitizedName);
 }
 function validateNameWithMessage(name) {
-  (0, _logging.debug)(`Validating environment variable name "${name}"`);
-  if (!validateName(name)) {
-    const message = ['Environment variable name must consist of A-Z, 0-9, or _,', 'and must start with an uppercase letter.'].join('\n');
-    console.log(_chalk.default.bold.red(message));
-    return false;
-  }
-  return true;
-}
+    (0, logging_1.debug)(`Validating environment variable name "${name}"`);
+    if (!validateName(name)) {
+        const message = [
+            'Environment variable name must consist of A-Z, 0-9, or _,',
+            'and must start with an uppercase letter.',
+        ].join('\n');
+        console.log(chalk_1.default.bold.red(message));
+        return false;
+    }
+    return true;
+}

package/dist/lib/envvar/input.js

@@ -1,41 +1,37 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.cancel = cancel;
 exports.confirm = confirm;
-exports.promptForReloadManifest = promptForReloadManifest;
 exports.promptForValue = promptForValue;
+exports.promptForReloadManifest = promptForReloadManifest;
 exports.showDeployWarning = showDeployWarning;
-var _chalk = _interopRequireDefault(require("chalk"));
-var _enquirer = require("enquirer");
-var _app = require("../app");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const chalk_1 = __importDefault(require("chalk"));
+const enquirer_1 = require("enquirer");
+const app_1 = require("../app");
 function cancel() {
-  console.log(_chalk.default.yellow('Command cancelled by user.'));
-  process.exit();
+    console.log(chalk_1.default.yellow('Command cancelled by user.'));
+    process.exit();
 }
 function confirm(message) {
-  return new _enquirer.Confirm({
-    message
-  }).run().catch(() => false);
+    return new enquirer_1.Confirm({ message }).run().catch(() => false);
 }
 async function promptForValue(message, mustMatch) {
-  const {
-    str
-  } = await (0, _enquirer.prompt)({
-    message,
-    name: 'str',
-    type: 'input',
-    validate: input => {
-      if (mustMatch && input !== mustMatch) {
-        return `Please type ${mustMatch} to proceed or ESC to cancel`;
-      }
-      return true;
-    }
-  });
-  return str?.trim() ?? '';
+    const { str } = await (0, enquirer_1.prompt)({
+        message,
+        name: 'str',
+        type: 'input',
+        validate: (input) => {
+            if (mustMatch && input !== mustMatch) {
+                return `Please type ${mustMatch} to proceed or ESC to cancel`;
+            }
+            return true;
+        },
+    });
+    return str?.trim() ?? '';
 }
-
 /**
  * Prompts the user to confirm whether to apply the environment variable update now.
  *
@@ -43,15 +39,14 @@ async function promptForValue(message, mustMatch) {
  * @return {Promise<boolean>} Whether to reload the manifest
  */
 async function promptForReloadManifest(appTypeId) {
-  if ((0, _app.isAppNodejs)(appTypeId)) {
-    console.log(_chalk.default.yellow(`⚠️ Note: ${_chalk.default.bold('Only applies to runtime variable changes.')} Build-time environment variable changes won't take effect until your next deploy.`));
-  }
-  return await confirm('Apply this environment variable update now?');
+    if ((0, app_1.isAppNodejs)(appTypeId)) {
+        console.log(chalk_1.default.yellow(`⚠️ Note: ${chalk_1.default.bold('Only applies to runtime variable changes.')} Build-time environment variable changes won't take effect until your next deploy.`));
+    }
+    return await confirm('Apply this environment variable update now?');
 }
-
 /**
  * Shows a warning message that the environment variable update won't be available until the next deploy.
  */
 function showDeployWarning() {
-  console.log(_chalk.default.bgYellow(_chalk.default.bold('Important:')), 'This environment variable update will not be available until the next code deploy is made to this environment.');
-}
+    console.log(chalk_1.default.bgYellow(chalk_1.default.bold('Important:')), 'This environment variable update will not be available until the next code deploy is made to this environment.');
+}

package/dist/lib/envvar/logging.js

@@ -1,16 +1,14 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.debug = void 0;
 exports.getEnvContext = getEnvContext;
-var _debug = _interopRequireDefault(require("debug"));
-var _command = require("../../lib/cli/command");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const debug_1 = __importDefault(require("debug"));
+const command_1 = require("../../lib/cli/command");
 // Shared debugger.
-const debug = exports.debug = (0, _debug.default)('@automattic/vip:bin:config:envvar');
-
-// FIXME: Replace with a proper type
-
+exports.debug = (0, debug_1.default)('@automattic/vip:bin:config:envvar');
 function getEnvContext(app, env) {
-  return `@${app.id}.${(0, _command.getEnvIdentifier)(env)}`;
-}
+    return `@${app.id}.${(0, command_1.getEnvIdentifier)(env)}`;
+}

package/dist/lib/envvar/read-file.js

@@ -1,10 +1,9 @@
 "use strict";
-
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.readVariableFromFile = readVariableFromFile;
-var _logging = require("../../lib/envvar/logging");
-var _readFile = require("../read-file");
+const logging_1 = require("../../lib/envvar/logging");
+const read_file_1 = require("../read-file");
 function readVariableFromFile(path) {
-  (0, _logging.debug)(`Loading variable value from file "${path}"`);
-  return (0, _readFile.readFromFile)(path);
-}
+    (0, logging_1.debug)(`Loading variable value from file "${path}"`);
+    return (0, read_file_1.readFromFile)(path);
+}

package/dist/lib/http/download-file.js

@@ -1,51 +1,83 @@
 "use strict";
-
-exports.__esModule = true;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.downloadFile = void 0;
-var fs = _interopRequireWildcard(require("fs"));
-var _stream = require("stream");
-var _promises = require("stream/promises");
-var _undici = require("undici");
-var _proxyDispatcher = require("./proxy-dispatcher");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+const fs = __importStar(require("fs"));
+const stream_1 = require("stream");
+const promises_1 = require("stream/promises");
+const undici_1 = require("undici");
+const proxy_dispatcher_1 = require("./proxy-dispatcher");
 const downloadFile = async (fileUrl, destinationPath, onProgress) => {
-  let response;
-  const proxyDispatcher = (0, _proxyDispatcher.createProxyDispatcher)(fileUrl);
-  try {
-    response = await (0, _undici.fetch)(fileUrl, {
-      dispatcher: proxyDispatcher ?? undefined
-    });
-  } catch (error) {
-    throw new Error(`Request to ${fileUrl} failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
-  }
-  if (!response.ok) {
-    const errorMessage = `Failed to download file. Status: ${response.status} ${response.statusText}`;
-    throw new Error(errorMessage);
-  }
-  if (!response.body) {
-    throw new Error('Failed to download file. The response body is empty.');
-  }
-  const totalSizeHeader = response.headers.get('content-length');
-  const totalBytes = totalSizeHeader ? parseInt(totalSizeHeader, 10) : null;
-  let downloadedBytes = 0;
-  const fileStream = fs.createWriteStream(destinationPath);
-  const nodeReadable = _stream.Readable.fromWeb(response.body);
-  nodeReadable.on('data', chunk => {
-    downloadedBytes += chunk.length;
-    if (onProgress) {
-      onProgress(downloadedBytes, totalBytes);
+    let response;
+    const proxyDispatcher = (0, proxy_dispatcher_1.createProxyDispatcher)(fileUrl);
+    try {
+        response = await (0, undici_1.fetch)(fileUrl, { dispatcher: proxyDispatcher ?? undefined });
+    }
+    catch (error) {
+        throw new Error(`Request to ${fileUrl} failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
-  });
-  try {
-    nodeReadable.pipe(fileStream);
-    await (0, _promises.finished)(fileStream);
-  } catch (error) {
+    if (!response.ok) {
+        const errorMessage = `Failed to download file. Status: ${response.status} ${response.statusText}`;
+        throw new Error(errorMessage);
+    }
+    if (!response.body) {
+        throw new Error('Failed to download file. The response body is empty.');
+    }
+    const totalSizeHeader = response.headers.get('content-length');
+    const totalBytes = totalSizeHeader ? parseInt(totalSizeHeader, 10) : null;
+    let downloadedBytes = 0;
+    const fileStream = fs.createWriteStream(destinationPath);
+    const nodeReadable = stream_1.Readable.fromWeb(response.body);
+    nodeReadable.on('data', (chunk) => {
+        downloadedBytes += chunk.length;
+        if (onProgress) {
+            onProgress(downloadedBytes, totalBytes);
+        }
+    });
     try {
-      await fs.promises.unlink(destinationPath);
-    } catch (unlinkErr) {
-      console.error(`Failed to delete partial file ${destinationPath}:`, unlinkErr);
+        nodeReadable.pipe(fileStream);
+        await (0, promises_1.finished)(fileStream);
+    }
+    catch (error) {
+        try {
+            await fs.promises.unlink(destinationPath);
+        }
+        catch (unlinkErr) {
+            console.error(`Failed to delete partial file ${destinationPath}:`, unlinkErr);
+        }
+        throw new Error(`Failed to write file to disk: ${error instanceof Error ? error.message : 'Unknown error'}`);
     }
-    throw new Error(`Failed to write file to disk: ${error instanceof Error ? error.message : 'Unknown error'}`);
-  }
 };
-exports.downloadFile = downloadFile;
+exports.downloadFile = downloadFile;

package/dist/lib/http/proxy-agent.js

@@ -1,18 +1,17 @@
 "use strict";
-
-exports.__esModule = true;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProxyAgent = createProxyAgent;
-var _debug = _interopRequireDefault(require("debug"));
-var _httpsProxyAgent = require("https-proxy-agent");
-var _proxyFromEnv = require("proxy-from-env");
-var _socksProxyAgent = require("socks-proxy-agent");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const debug = (0, _debug.default)('vip:proxy-agent');
-
+const debug_1 = __importDefault(require("debug"));
+const https_proxy_agent_1 = require("https-proxy-agent");
+const proxy_from_env_1 = require("proxy-from-env");
+const socks_proxy_agent_1 = require("socks-proxy-agent");
+const debug = (0, debug_1.default)('vip:proxy-agent');
 // Note: This module requires the use of a special environment variable "VIP_USE_SYSTEM_PROXY"
 // The setting of it to any value allows this module to create a proxy agent based on proxy environment variables
 // If not set, this module will revert back to the previous functionality (hence being fully backward compatible and non-breaking for users)
-
 // This function returns a proxy given a few scenarios (in order of precedence):
 // 1. VIP_PROXY is set: a SOCKS proxy is returned same as the previous version of this module
 // 2. No applicable variables are set: null is returned (thus, no proxy agent is returned)
@@ -21,31 +20,29 @@ const debug = (0, _debug.default)('vip:proxy-agent');
 // 5. NO_PROXY is set along with VIP_USE_SYSTEM_PROXY and any system proxy: null is returned if the no proxy applies, otherwise the first active proxy is used
 // This allows near full customization by the client of what proxy should be used, instead of making assumptions based on the URL string
 function createProxyAgent(url) {
-  const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null; // NOSONAR
-  const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null; // NOSONAR
-  const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null; // NOSONAR
-  const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // NOSONAR
-
-  // VIP Socks Proxy should take precedence and should be fully backward compatible
-  if (VIP_PROXY) {
-    debug(`Enabling VIP_PROXY proxy support using config: ${VIP_PROXY}`);
-    return new _socksProxyAgent.SocksProxyAgent(VIP_PROXY);
-  }
-  // Now check for any system proxy usage
-  if (process.env.VIP_USE_SYSTEM_PROXY && !coveredInNoProxy(url, NO_PROXY)) {
-    if (SOCKS_PROXY) {
-      debug(`Enabling SOCKS proxy support using config: ${SOCKS_PROXY}`);
-      return new _socksProxyAgent.SocksProxyAgent(SOCKS_PROXY);
+    const VIP_PROXY = process.env.VIP_PROXY || process.env.vip_proxy || null; // NOSONAR
+    const SOCKS_PROXY = process.env.SOCKS_PROXY || process.env.socks_proxy || null; // NOSONAR
+    const HTTPS_PROXY = process.env.HTTPS_PROXY || process.env.https_proxy || null; // NOSONAR
+    const NO_PROXY = process.env.NO_PROXY || process.env.no_proxy || null; // NOSONAR
+    // VIP Socks Proxy should take precedence and should be fully backward compatible
+    if (VIP_PROXY) {
+        debug(`Enabling VIP_PROXY proxy support using config: ${VIP_PROXY}`);
+        return new socks_proxy_agent_1.SocksProxyAgent(VIP_PROXY);
     }
-    if (HTTPS_PROXY) {
-      debug(`Enabling HTTPS proxy support using config: ${HTTPS_PROXY}`);
-      return new _httpsProxyAgent.HttpsProxyAgent(HTTPS_PROXY);
+    // Now check for any system proxy usage
+    if (process.env.VIP_USE_SYSTEM_PROXY && !coveredInNoProxy(url, NO_PROXY)) {
+        if (SOCKS_PROXY) {
+            debug(`Enabling SOCKS proxy support using config: ${SOCKS_PROXY}`);
+            return new socks_proxy_agent_1.SocksProxyAgent(SOCKS_PROXY);
+        }
+        if (HTTPS_PROXY) {
+            debug(`Enabling HTTPS proxy support using config: ${HTTPS_PROXY}`);
+            return new https_proxy_agent_1.HttpsProxyAgent(HTTPS_PROXY);
+        }
     }
-  }
-  // If no environment variables are set, the no proxy is in effect, or if the proxy enable is not set return null (equivilant of no Proxy agent)
-  return null;
+    // If no environment variables are set, the no proxy is in effect, or if the proxy enable is not set return null (equivilant of no Proxy agent)
+    return null;
 }
-
 // Determine if a NO_PROXY variable is applicable to a given URL
 // Parameters:
 //	- url (string): absolute desintation URL (including the protocol)
@@ -59,11 +56,11 @@ function createProxyAgent(url) {
 // 3. abc.com: do not proxy www.abc.com, abc.com, etc.
 // See proxy-from-env on npmjs.org for full "ruleset"
 function coveredInNoProxy(url, noProxyString) {
-  // If the NO_PROXY env variable is not set, then the URL is not covered in the NO_PROXY (utility below does not handle this case)
-  if (!noProxyString) {
-    return false;
-  }
-  // If getProxyForUrl returns an empty string, then the host should not be proxied
-  // This isn't the most straight forward way to determine if a NO_PROXY is applicable, but the only package I could find that is relatively new and maintained
-  return (0, _proxyFromEnv.getProxyForUrl)(url) === '';
-}
+    // If the NO_PROXY env variable is not set, then the URL is not covered in the NO_PROXY (utility below does not handle this case)
+    if (!noProxyString) {
+        return false;
+    }
+    // If getProxyForUrl returns an empty string, then the host should not be proxied
+    // This isn't the most straight forward way to determine if a NO_PROXY is applicable, but the only package I could find that is relatively new and maintained
+    return (0, proxy_from_env_1.getProxyForUrl)(url) === '';
+}