fix: native http agent used instead of an external dependency

Author: cloudinary-pkoniu

lib/api_client/execute_request.js

@@ -6,10 +6,11 @@ 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;
 
+const agent = config.api_proxy ? new https.Agent(config.api_proxy) : null;
+
 function execute_request(method, params, auth, api_url, callback, options = {}) {
   method = method.toUpperCase();
   const deferred = Q.defer();
@@ -53,11 +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) {
-      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);
+    if (!request_options.agent && agent) {
+      request_options.agent = agent;
+    } else if (!request_options.agent) {
+      request_options.agent = new https.Agent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

lib/uploader.js

@@ -17,6 +17,8 @@ const config = require("./config");
 const ensureOption = require('./utils/ensureOption').defaults(config());
 const ProxyAgent = utils.optionalRequireProxyAgent();
 
+const agent = config.api_proxy ? new https.Agent(config.api_proxy) : null;
+
 const {
   build_upload_params,
   extend,
@@ -578,11 +580,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) {
-      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);
+    if (!post_options.agent && agent) {
+      post_options.agent = agent;
+    } else if (!post_options.agent) {
+      post_options.agent = new https.Agent(proxy);
     } else {
       console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
     }

package.json

@@ -11,10 +11,10 @@
   },
   "main": "cloudinary.js",
   "dependencies": {
-    "cloudinary-core": "2.13.0",
-    "core-js": "3.30.2",
-    "lodash": "4.17.21",
-    "q": "1.5.1"
+    "cloudinary-core": "^2.13.0",
+    "core-js": "^3.30.1",
+    "lodash": "^4.17.21",
+    "q": "^1.5.1"
   },
   "devDependencies": {
     "@types/mocha": "^7.0.2",
@@ -68,12 +68,6 @@
     "test-es5": "tools/scripts/test.es5.sh",
     "docs": "tools/scripts/docs.sh"
   },
-  "optionalDependencies": {
-    "proxy-agent": "^5.0.0"
-  },
-  "overrides": {
-    "vm2": "3.9.19"
-  },
   "engines": {
     "node": ">=0.6"
   }

test/integration/api/admin/api_spec.js

@@ -2,7 +2,6 @@ const sinon = require('sinon');
 const formatDate = require("date-fns").format;
 const subDate = require("date-fns").sub;
 const https = require('https');
-const ProxyAgent = require('proxy-agent');
 const ClientRequest = require('_http_client').ClientRequest;
 const Q = require('q');
 const cloudinary = require("../../../../cloudinary");
@@ -1476,7 +1475,7 @@ describe("api", function () {
       cloudinary.config({api_proxy: "https://myuser:[email protected]"});
       cloudinary.v2.api.resources({});
       sinon.assert.calledWith(mocked.request, sinon.match(
-        arg => arg.agent instanceof ProxyAgent
+        arg => arg.agent instanceof https.Agent
       ));
     });
     it("should prioritize custom agent", function () {
@@ -1491,7 +1490,7 @@ describe("api", function () {
       cloudinary.config({});
       cloudinary.v2.api.resources({api_proxy: "https://myuser:[email protected]"});
       sinon.assert.calledWith(mocked.request, sinon.match(
-        arg => arg.agent instanceof ProxyAgent
+        arg => arg.agent instanceof https.Agent
       ));
     });
   })

test/integration/api/uploader/uploader_spec.js

@@ -11,7 +11,6 @@ const cloudinary = require("../../../../cloudinary");
 const helper = require("../../../spechelper");
 const describe = require('../../../testUtils/suite');
 const cloneDeep = require('lodash/cloneDeep');
-const ProxyAgent = require('proxy-agent');
 const assert = require('assert');
 
 const IMAGE_FILE = helper.IMAGE_FILE;
@@ -1512,7 +1511,7 @@ describe("uploader", function () {
       cloudinary.config({api_proxy: proxy});
       UPLOADER_V2.upload(IMAGE_FILE, {"tags": [TEST_TAG]});
       sinon.assert.calledWith(mocked.request, sinon.match(
-        arg => arg.agent instanceof ProxyAgent
+        arg => arg.agent instanceof https.Agent
       ));
     });
     it("should prioritize custom agent", function () {
@@ -1527,7 +1526,7 @@ describe("uploader", function () {
       cloudinary.config({});
       UPLOADER_V2.upload(IMAGE_FILE, {"tags": [TEST_TAG], api_proxy: proxy});
       sinon.assert.calledWith(mocked.request, sinon.match(
-        arg => arg.agent instanceof ProxyAgent
+        arg => arg.agent instanceof https.Agent
       ));
     });
   })