Skip to content

Commit c124a98

Browse files
chore: added compiled js
1 parent 0ce2e47 commit c124a98

File tree

4 files changed

+12
-39
lines changed

4 files changed

+12
-39
lines changed

lib-es5/api_client/execute_request.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@ var Q = require('q');
1010
var url = require('url');
1111
var utils = require("../utils");
1212
var ensureOption = require('../utils/ensureOption').defaults(config());
13-
var ProxyAgent = utils.optionalRequireProxyAgent();
1413

1514
var extend = utils.extend,
1615
includes = utils.includes,
1716
isEmpty = utils.isEmpty;
1817

1918

19+
var agent = config.api_proxy ? new https.Agent(config.api_proxy) : null;
20+
2021
function execute_request(method, params, auth, api_url, callback) {
2122
var options = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
2223

@@ -63,11 +64,10 @@ function execute_request(method, params, auth, api_url, callback) {
6364

6465
var proxy = options.api_proxy || config().api_proxy;
6566
if (!isEmpty(proxy)) {
66-
if (!request_options.agent) {
67-
if (ProxyAgent === null) {
68-
throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.");
69-
}
70-
request_options.agent = new ProxyAgent(proxy);
67+
if (!request_options.agent && agent) {
68+
request_options.agent = agent;
69+
} else if (!request_options.agent) {
70+
request_options.agent = new https.Agent(proxy);
7171
} else {
7272
console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
7373
}

lib-es5/uploader.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ var config = require("./config");
3737
var ensureOption = require('./utils/ensureOption').defaults(config());
3838
var ProxyAgent = utils.optionalRequireProxyAgent();
3939

40+
var agent = config.api_proxy ? new https.Agent(config.api_proxy) : null;
41+
4042
var build_upload_params = utils.build_upload_params,
4143
extend = utils.extend,
4244
includes = utils.includes,
@@ -680,11 +682,10 @@ function post(url, post_data, boundary, file, callback, options) {
680682
}
681683
var proxy = options.api_proxy || config().api_proxy;
682684
if (!isEmpty(proxy)) {
683-
if (!post_options.agent) {
684-
if (ProxyAgent === null) {
685-
throw new Error("Proxy value is set, but `proxy-agent` is not installed, please install `proxy-agent` module.");
686-
}
687-
post_options.agent = new ProxyAgent(proxy);
685+
if (!post_options.agent && agent) {
686+
post_options.agent = agent;
687+
} else if (!post_options.agent) {
688+
post_options.agent = new https.Agent(proxy);
688689
} else {
689690
console.warn("Proxy is set, but request uses a custom agent, proxy is ignored.");
690691
}

lib-es5/utils/index.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1669,19 +1669,6 @@ function jsonArrayParam(data, modifier) {
16691669
return JSON.stringify(data);
16701670
}
16711671

1672-
function optionalRequireProxyAgent() {
1673-
var module = void 0;
1674-
try {
1675-
module = require('proxy-agent');
1676-
return module;
1677-
} catch (e) {
1678-
if (e.code === "MODULE_NOT_FOUND") {
1679-
return null;
1680-
}
1681-
throw e;
1682-
}
1683-
}
1684-
16851672
/**
16861673
* Empty function - do nothing
16871674
*
@@ -1739,7 +1726,6 @@ exports.jsonArrayParam = jsonArrayParam;
17391726
exports.download_folder = download_folder;
17401727
exports.base_api_url = base_api_url;
17411728
exports.download_backedup_asset = download_backedup_asset;
1742-
exports.optionalRequireProxyAgent = optionalRequireProxyAgent;
17431729

17441730
// was exported before, so kept for backwards compatibility
17451731
exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;

lib/utils/index.js

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,19 +1533,6 @@ function jsonArrayParam(data, modifier) {
15331533
return JSON.stringify(data);
15341534
}
15351535

1536-
function optionalRequireProxyAgent() {
1537-
let module;
1538-
try {
1539-
module = require('proxy-agent');
1540-
return module;
1541-
} catch (e) {
1542-
if (e.code === "MODULE_NOT_FOUND") {
1543-
return null;
1544-
}
1545-
throw e;
1546-
}
1547-
}
1548-
15491536
/**
15501537
* Empty function - do nothing
15511538
*
@@ -1601,7 +1588,6 @@ exports.jsonArrayParam = jsonArrayParam;
16011588
exports.download_folder = download_folder;
16021589
exports.base_api_url = base_api_url;
16031590
exports.download_backedup_asset = download_backedup_asset;
1604-
exports.optionalRequireProxyAgent = optionalRequireProxyAgent;
16051591

16061592
// was exported before, so kept for backwards compatibility
16071593
exports.DEFAULT_POSTER_OPTIONS = DEFAULT_POSTER_OPTIONS;

0 commit comments

Comments
 (0)