@e-mc/request 0.10.0 → 0.10.1

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.1/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -117,6 +117,7 @@ interface RequestModule {
     proxy?: {
         address?: string;
         port?: number;
+        origin?: string;
         username?: string;
         password?: string;
         include?: string[];
@@ -203,9 +204,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.1/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/host/index.d.ts

@@ -1,5 +1,5 @@
-import type { HttpHostConstructor } from '../../../types/lib/request';
-
-declare const HttpHost: HttpHostConstructor;
-
+import type { HttpHostConstructor } from '../../../types/lib/request';
+
+declare const HttpHost: HttpHostConstructor;
+
 export = HttpHost;

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { RequestConstructor } from '../types/lib';
-
-declare const Request: RequestConstructor;
-
+import type { RequestConstructor } from '../types/lib';
+
+declare const Request: RequestConstructor;
+
 export = Request;

package/index.js

@@ -129,18 +129,17 @@ function setOutgoingHeaders(output, headers) {
 }
 function getProxySettings(request, agentTimeout) {
     const proxy = request.proxy;
-    if (proxy?.address && proxy.port) {
-        const port = (0, util_1.asInt)(proxy.port);
-        const address = (!module_1.isURL(proxy.address) ? port === 80 ? 'http://' : 'https://' : '') + proxy.address;
+    if (proxy && (proxy.origin || proxy.address && proxy.port)) {
+        const origin = proxy.origin || ((!module_1.isURL(proxy.address) ? (0, util_1.asInt)(proxy.port) === 80 ? 'http://' : 'https://' : '') + proxy.address + ':' + proxy.port);
         try {
-            let host = new URL(address + ':' + port), include, exclude;
+            let host = new URL(origin), include, exclude;
             if (proxy.username) {
                 host = new URL(host.protocol + '//' + (0, util_1.getBasicAuth)(proxy.username, proxy.password) + host.host);
             }
             if ((0, types_1.isArray)(proxy.include)) {
                 include = proxy.include;
             }
-            else if ((0, types_1.isArray)(proxy.exclude)) {
+            if ((0, types_1.isArray)(proxy.exclude)) {
                 exclude = proxy.exclude;
             }
             return { host, include, exclude, keepAlive: proxy.keep_alive, agentTimeout };
@@ -1566,7 +1565,7 @@ class Request extends module_1 {
                 return proxy;
             }
             if ((0, types_1.isArray)(include) && !include.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value)) || (0, types_1.isArray)(exclude) && exclude.some(value => REGEXP_GLOBWITHIN.test(value) ? pm.isMatch(uri, value) : uri.startsWith(value))) {
-                return undefined;
+                return;
             }
             return proxy;
         }
@@ -2160,11 +2159,10 @@ class Request extends module_1 {
                 if (proxy) {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
-                        const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
                         keepAlive ?? (keepAlive = proxy.keepAlive);
                         agentTimeout ?? (agentTimeout = proxy.agentTimeout);
-                        agent = require(pkg)(keepAlive !== null || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive: keepAlive ?? true, 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 ?? true, timeout: agentTimeout, headers: proxyHeaders } : undefined);
                         if (proxyHeaders) {
                             baseHeaders = { ...baseHeaders, ...proxyHeaders };
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.10.0",
-    "@e-mc/types": "0.10.0",
+    "@e-mc/module": "0.10.1",
+    "@e-mc/types": "0.10.1",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2",

package/util.d.ts

@@ -1,4 +1,5 @@
 import type { AuthValue } from '../types/lib/http';
+import type { HttpProxySettings } from '../types/lib/settings';
 
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 import type { Readable, Writable } from 'stream';
@@ -11,6 +12,7 @@ declare namespace util {
     function hasBasicAuth(value: string): boolean;
     function checkRetryable(err: unknown): boolean;
     function isRetryable(value: number, timeout?: boolean): boolean;
+    function parseHttpProxy(value?: string): HttpProxySettings | undefined;
     function trimPath(value: string): string;
     function asInt(value: unknown): number;
     function asFloat(value: unknown): number;

package/util.js

@@ -5,6 +5,7 @@ exports.getBasicAuth = getBasicAuth;
 exports.hasBasicAuth = hasBasicAuth;
 exports.checkRetryable = checkRetryable;
 exports.isRetryable = isRetryable;
+exports.parseHttpProxy = parseHttpProxy;
 exports.trimPath = trimPath;
 exports.asInt = asInt;
 exports.asFloat = asFloat;
@@ -17,8 +18,10 @@ exports.byteLength = byteLength;
 exports.cleanupStream = cleanupStream;
 const path = require("path");
 const fs = require("fs");
+const util = require("util");
 const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const SUPPORTED_USVSTRING = (0, types_1.supported)(16, 8);
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
     const value = headers[name];
@@ -65,7 +68,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) : '') + '@' : '';
 }
 function hasBasicAuth(value) {
     try {
@@ -117,6 +120,38 @@ function isRetryable(value, timeout) {
             return false;
     }
 }
+function parseHttpProxy(value) {
+    value || (value = process.env.HTTP_PROXY || process.env.HTTPS_PROXY);
+    if (value) {
+        try {
+            const url = new URL(value);
+            if (url.port) {
+                let exclude;
+                if (process.env.NO_PROXY) {
+                    exclude = [];
+                    for (const item of process.env.NO_PROXY.trim().split(/\s*,\s*/)) {
+                        if (module_1.isURL(item)) {
+                            exclude.push(item);
+                        }
+                        else {
+                            exclude.push(`https://${item}`, `http://${item}`);
+                        }
+                    }
+                }
+                return {
+                    address: url.protocol + '//' + url.hostname,
+                    port: url.port,
+                    origin: url.origin,
+                    username: url.username ? decodeURIComponent(url.username) : '',
+                    password: url.password ? decodeURIComponent(url.password) : '',
+                    exclude
+                };
+            }
+        }
+        catch {
+        }
+    }
+}
 function trimPath(value) {
     const length = value.length - 1;
     return value[length] === '/' ? value.substring(0, length) : value;