@e-mc/request 0.6.8 → 0.6.9

package/index.js

@@ -1514,11 +1514,8 @@ class Request extends module_1.default {
                 if (proxy) {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
-                        keepAlive !== null && keepAlive !== void 0 ? keepAlive : (keepAlive = proxy.keepAlive || false);
-                        agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = proxy.agentTimeout);
-                        agent = require(pkg)(keepAlive || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive, timeout: agentTimeout } : href);
-                        const proxyHeaders = this[kHeaders] && getBaseHeaders(href, this[kHeaders]) || getBaseHeaders(href, HTTP.HEADERS);
+                        const proxyHeaders = this[kHeaders] && getBaseHeaders(proxy.host.href, this[kHeaders]) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
+                        agent = require(pkg)(proxy.host, typeof keepAlive === 'boolean' || agentTimeout > 0 || proxyHeaders ? { keepAlive: keepAlive !== null && keepAlive !== void 0 ? keepAlive : true, timeout: agentTimeout, headers: proxyHeaders } : undefined);
                         if (proxyHeaders) {
                             baseHeaders = { ...baseHeaders, ...proxyHeaders };
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.6.8",
-    "@e-mc/types": "0.6.8",
+    "@e-mc/module": "0.6.9",
+    "@e-mc/types": "0.6.9",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"

package/util.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+const util = require("util");
 const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const SUPPORTED_USVSTRING = module_1.default.supported(16, 8);
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
     const value = headers[name];
@@ -52,7 +54,7 @@ function getBasicAuth(username, password) {
     if ((0, types_1.isObject)(username)) {
         ({ username, password } = username);
     }
-    return (0, types_1.isString)(username) ? encodeURIComponent(username) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent(password) : '') + '@' : '';
+    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) : '') + '@' : '';
 }
 exports.getBasicAuth = getBasicAuth;
 function hasBasicAuth(value) {