fix: only explicit require used

Author: cloudinary-pkoniu

lib-es5/api_client/execute_request.js

@@ -10,7 +10,6 @@ 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 extend = utils.extend,
     includes = utils.includes,
@@ -64,10 +63,12 @@ function execute_request(method, params, auth, api_url, callback) {
   var proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!request_options.agent) {
-      if (ProxyAgent === null) {
+      try {
+        var ProxyAgent = require('proxy-agent');
+        request_options.agent = new ProxyAgent(proxy);
+      } catch (requireError) {
         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

@@ -34,7 +34,6 @@ 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 build_upload_params = utils.build_upload_params,
@@ -681,10 +680,13 @@ function post(url, post_data, boundary, file, callback, options) {
   var proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!post_options.agent) {
-      if (ProxyAgent === null) {
+      try {
+        var ProxyAgent = require('proxy-agent');
+        console.log('123');
+        post_options.agent = new ProxyAgent(proxy);
+      } catch (requireError) {
         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,19 +1669,6 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
-function optionalRequire(moduleName) {
-  var module = void 0;
-  try {
-    module = require(moduleName);
-    return module;
-  } catch (e) {
-    if (e.code === "MODULE_NOT_FOUND") {
-      return null;
-    }
-    throw e;
-  }
-}
-
 /**
  * Empty function - do nothing
  *
@@ -1739,7 +1726,6 @@ 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;
 
 // was exported before, so kept for backwards compatibility
 exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;

lib/api_client/execute_request.js

@@ -6,7 +6,6 @@ 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 { extend, includes, isEmpty } = utils;
 
@@ -54,10 +53,12 @@ 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) {
-      if (ProxyAgent === null) {
+      try {
+        const ProxyAgent = require('proxy-agent');
+        request_options.agent = new ProxyAgent(proxy);
+      } catch (requireError) {
         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

@@ -14,7 +14,6 @@ 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 {
@@ -579,10 +578,13 @@ function post(url, post_data, boundary, file, callback, options) {
   let proxy = options.api_proxy || config().api_proxy;
   if (!isEmpty(proxy)) {
     if (!post_options.agent) {
-      if (ProxyAgent === null) {
+      try {
+        const ProxyAgent = require('proxy-agent');
+        console.log('123')
+        post_options.agent = new ProxyAgent(proxy);
+      } catch (requireError) {
         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,19 +1533,6 @@ function jsonArrayParam(data, modifier) {
   return JSON.stringify(data);
 }
 
-function optionalRequire(moduleName) {
-  let module;
-  try {
-    module = require(moduleName)
-    return module;
-  } catch (e) {
-    if (e.code === "MODULE_NOT_FOUND") {
-      return null;
-    }
-    throw e;
-  }
-}
-
 /**
  * Empty function - do nothing
  *
@@ -1601,7 +1588,6 @@ 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;
 
 // was exported before, so kept for backwards compatibility
 exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;