Merge pull request #610 from cloudinary/no-optional-require-http-agent

fix: only explicit require used

Author: cloudinary-pkoniu

lib-es5/api_client/execute_request.js

@@ -10,7 +10,7 @@ var Q = require('q');
 var url = require('url');
 var utils = require("../utils");
 var ensureOption = require('../utils/ensureOption').defaults(config());
-var ProxyAgent = utils.optionalRequire('proxy-agent');
+var ProxyAgent = utils.optionalRequireProxyAgent();
 
 var extend = utils.extend,
     includes = utils.includes,

lib-es5/uploader.js

@@ -34,8 +34,8 @@ var Cache = require('./cache');
 var utils = require("./utils");
 var UploadStream = require('./upload_stream');
 var config = require("./config");
-var ProxyAgent = utils.optionalRequire('proxy-agent');
 var ensureOption = require('./utils/ensureOption').defaults(config());
+var ProxyAgent = utils.optionalRequireProxyAgent();
 
 var build_upload_params = utils.build_upload_params,
     extend = utils.extend,

lib-es5/utils/index.js

@@ -1669,10 +1669,10 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
-function optionalRequire(moduleName) {
+function optionalRequireProxyAgent() {
   var module = void 0;
   try {
-    module = require(moduleName);
+    module = require('proxy-agent');
     return module;
   } catch (e) {
     if (e.code === "MODULE_NOT_FOUND") {
@@ -1739,7 +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.optionalRequire = optionalRequire;
+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,7 +6,7 @@ const Q = require('q');
 const url = require('url');
 const utils = require("../utils");
 const ensureOption = require('../utils/ensureOption').defaults(config());
-const ProxyAgent = utils.optionalRequire('proxy-agent');
+const ProxyAgent = utils.optionalRequireProxyAgent();
 
 const { extend, includes, isEmpty } = utils;
 

lib/uploader.js

@@ -14,8 +14,8 @@ const Cache = require('./cache');
 const utils = require("./utils");
 const UploadStream = require('./upload_stream');
 const config = require("./config");
-const ProxyAgent = utils.optionalRequire('proxy-agent');
 const ensureOption = require('./utils/ensureOption').defaults(config());
+const ProxyAgent = utils.optionalRequireProxyAgent();
 
 const {
   build_upload_params,

lib/utils/index.js

@@ -1533,10 +1533,10 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
-function optionalRequire(moduleName) {
+function optionalRequireProxyAgent() {
   let module;
   try {
-    module = require(moduleName)
+    module = require('proxy-agent');
     return module;
   } catch (e) {
     if (e.code === "MODULE_NOT_FOUND") {
@@ -1601,7 +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.optionalRequire = optionalRequire;
+exports.optionalRequireProxyAgent = optionalRequireProxyAgent;
 
 // was exported before, so kept for backwards compatibility
 exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;