@e-mc/request 0.8.15 → 0.8.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +4 -4
  2. package/index.js +3 -4
  3. package/package.json +3 -3
  4. package/util.js +3 -1
package/README.md CHANGED
@@ -9,7 +9,7 @@
9
9
 
10
10
  ## Interface
11
11
 
12
- - https://www.unpkg.com/@e-mc/types@0.8.15/lib/index.d.ts
12
+ - https://www.unpkg.com/@e-mc/types@0.8.17/lib/index.d.ts
13
13
 
14
14
  ```typescript
15
15
  import type { IModule, ModuleConstructor } from "./index";
@@ -82,9 +82,9 @@ interface RequestConstructor extends ModuleConstructor {
82
82
 
83
83
  ## References
84
84
 
85
- - https://www.unpkg.com/@e-mc/types@0.8.15/lib/http.d.ts
86
- - https://www.unpkg.com/@e-mc/types@0.8.15/lib/request.d.ts
87
- - https://www.unpkg.com/@e-mc/types@0.8.15/lib/settings.d.ts
85
+ - https://www.unpkg.com/@e-mc/types@0.8.17/lib/http.d.ts
86
+ - https://www.unpkg.com/@e-mc/types@0.8.17/lib/request.d.ts
87
+ - https://www.unpkg.com/@e-mc/types@0.8.17/lib/settings.d.ts
88
88
 
89
89
  ## LICENSE
90
90
 
package/index.js CHANGED
@@ -1575,11 +1575,10 @@ class Request extends module_1.default {
1575
1575
  if (proxy) {
1576
1576
  const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
1577
1577
  try {
1578
- const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
1579
- keepAlive !== null && keepAlive !== void 0 ? keepAlive : (keepAlive = proxy.keepAlive || false);
1578
+ keepAlive !== null && keepAlive !== void 0 ? keepAlive : (keepAlive = proxy.keepAlive);
1580
1579
  agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = proxy.agentTimeout);
1581
- agent = require(pkg)(keepAlive || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive, timeout: agentTimeout } : href);
1582
- const proxyHeaders = this[kHeaders] && getBaseHeaders(href, this[kHeaders]) || getBaseHeaders(href, HTTP.HEADERS);
1580
+ const proxyHeaders = this[kHeaders] && getBaseHeaders(proxy.host.href, this[kHeaders]) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
1581
+ agent = require(pkg)(proxy.host, typeof keepAlive === 'boolean' || agentTimeout > 0 || proxyHeaders ? { keepAlive: keepAlive !== null && keepAlive !== void 0 ? keepAlive : true, timeout: agentTimeout, headers: proxyHeaders } : undefined);
1583
1582
  if (proxyHeaders) {
1584
1583
  baseHeaders = { ...baseHeaders, ...proxyHeaders };
1585
1584
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@e-mc/request",
3
- "version": "0.8.15",
3
+ "version": "0.8.17",
4
4
  "description": "Request constructor for E-mc.",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
@@ -20,8 +20,8 @@
20
20
  "license": "MIT",
21
21
  "homepage": "https://github.com/anpham6/e-mc#readme",
22
22
  "dependencies": {
23
- "@e-mc/module": "0.8.15",
24
- "@e-mc/types": "0.8.15",
23
+ "@e-mc/module": "0.8.17",
24
+ "@e-mc/types": "0.8.17",
25
25
  "combined-stream": "^1.0.8",
26
26
  "js-yaml": "^4.1.0",
27
27
  "picomatch": "^3.0.1",
package/util.js CHANGED
@@ -1,8 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
4
+ const util = require("util");
4
5
  const module_1 = require("@e-mc/module");
5
6
  const types_1 = require("@e-mc/types");
7
+ const SUPPORTED_USVSTRING = module_1.default.supported(16, 8);
6
8
  const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
7
9
  function parseHeader(headers, name) {
8
10
  const value = headers[name];
@@ -52,7 +54,7 @@ function getBasicAuth(username, password) {
52
54
  if ((0, types_1.isObject)(username)) {
53
55
  ({ username, password } = username);
54
56
  }
55
- return (0, types_1.isString)(username) ? encodeURIComponent(username) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent(password) : '') + '@' : '';
57
+ return (0, types_1.isString)(username) ? encodeURIComponent(SUPPORTED_USVSTRING ? util.toUSVString(username) : username) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent(SUPPORTED_USVSTRING ? util.toUSVString(password) : password) : '') + '@' : '';
56
58
  }
57
59
  exports.getBasicAuth = getBasicAuth;
58
60
  function hasBasicAuth(value) {