fix: extracted optional require for proxy agent as a function

Author: cloudinary-pkoniu

lib-es5/api_client/execute_request.js

@@ -10,6 +10,7 @@ var Q = require('q');
 var url = require('url');
 var utils = require("../utils");
 var ensureOption = require('../utils/ensureOption').defaults(config());
+var ProxyAgent = utils.optionalRequireProxyAgent();
 
 var extend = utils.extend,
     includes = utils.includes,
@@ -63,12 +64,10 @@ function execute_request(method, params, auth, api_url, callback) {
   var proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!request_options.agent) {
-      try {
-        var ProxyAgent = require('proxy-agent');
-        request_options.agent = new ProxyAgent(proxy);
-      } catch (requireError) {
+      if (ProxyAgent === null) {
         throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.");
       }
+      request_options.agent = new ProxyAgent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

lib-es5/uploader.js

@@ -35,6 +35,7 @@ var utils = require("./utils");
 var UploadStream = require('./upload_stream');
 var config = require("./config");
 var ensureOption = require('./utils/ensureOption').defaults(config());
+var ProxyAgent = utils.optionalRequireProxyAgent();
 
 var build_upload_params = utils.build_upload_params,
     extend = utils.extend,
@@ -680,12 +681,10 @@ function post(url, post_data, boundary, file, callback, options) {
   var proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!post_options.agent) {
-      try {
-        var ProxyAgent = require('proxy-agent');
-        post_options.agent = new ProxyAgent(proxy);
-      } catch (requireError) {
+      if (ProxyAgent === null) {
         throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.");
       }
+      post_options.agent = new ProxyAgent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

lib-es5/utils/index.js

@@ -1669,6 +1669,19 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
+function optionalRequireProxyAgent() {
+  var module = void 0;
+  try {
+    module = require('proxy-agent');
+    return module;
+  } catch (e) {
+    if (e.code === "MODULE_NOT_FOUND") {
+      return null;
+    }
+    throw e;
+  }
+}
+
 /**
  * Empty function - do nothing
  *
@@ -1726,6 +1739,7 @@ exports.jsonArrayParam = jsonArrayParam;
 exports.download_folder = download_folder;
 exports.base_api_url = base_api_url;
 exports.download_backedup_asset = download_backedup_asset;
+exports.optionalRequireProxyAgent = optionalRequireProxyAgent;
 
 // was exported before, so kept for backwards compatibility
 exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;

lib/api_client/execute_request.js

@@ -6,6 +6,7 @@ const Q = require('q');
 const url = require('url');
 const utils = require("../utils");
 const ensureOption = require('../utils/ensureOption').defaults(config());
+const ProxyAgent = utils.optionalRequireProxyAgent();
 
 const { extend, includes, isEmpty } = utils;
 
@@ -53,12 +54,10 @@ function execute_request(method, params, auth, api_url, callback, options = {})
   let proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!request_options.agent) {
-      try {
-        const ProxyAgent = require('proxy-agent');
-        request_options.agent = new ProxyAgent(proxy);
-      } catch (requireError) {
+      if (ProxyAgent === null) {
         throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.")
       }
+      request_options.agent = new ProxyAgent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

lib/uploader.js

@@ -15,6 +15,7 @@ const utils = require("./utils");
 const UploadStream = require('./upload_stream');
 const config = require("./config");
 const ensureOption = require('./utils/ensureOption').defaults(config());
+const ProxyAgent = utils.optionalRequireProxyAgent();
 
 const {
   build_upload_params,
@@ -578,12 +579,10 @@ function post(url, post_data, boundary, file, callback, options) {
   let proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!post_options.agent) {
-      try {
-        const ProxyAgent = require('proxy-agent');
-        post_options.agent = new ProxyAgent(proxy);
-      } catch (requireError) {
+      if (ProxyAgent === null) {
         throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.")
       }
+      post_options.agent = new ProxyAgent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

lib/utils/index.js

@@ -1533,6 +1533,19 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
+function optionalRequireProxyAgent() {
+  let module;
+  try {
+    module = require('proxy-agent');
+    return module;
+  } catch (e) {
+    if (e.code === "MODULE_NOT_FOUND") {
+      return null;
+    }
+    throw e;
+  }
+}
+
 /**
  * Empty function - do nothing
  *
@@ -1588,6 +1601,7 @@ exports.jsonArrayParam = jsonArrayParam;
 exports.download_folder = download_folder;
 exports.base_api_url = base_api_url;
 exports.download_backedup_asset = download_backedup_asset;
+exports.optionalRequireProxyAgent = optionalRequireProxyAgent;
 
 // was exported before, so kept for backwards compatibility
 exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;