@e-mc/request 0.9.9 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.9.9",
+  "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.9.9",
-    "@e-mc/types": "0.9.9",
+    "@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

@@ -1,11 +1,27 @@
 "use strict";
-exports.cleanupStream = exports.byteLength = exports.hasSameStat = exports.getSize = exports.hasSize = exports.getTransferRate = exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+exports.parseHeader = parseHeader;
+exports.normalizeHeaders = normalizeHeaders;
+exports.getBasicAuth = getBasicAuth;
+exports.hasBasicAuth = hasBasicAuth;
+exports.checkRetryable = checkRetryable;
+exports.isRetryable = isRetryable;
+exports.parseHttpProxy = parseHttpProxy;
+exports.trimPath = trimPath;
+exports.asInt = asInt;
+exports.asFloat = asFloat;
+exports.fromSeconds = fromSeconds;
+exports.getTransferRate = getTransferRate;
+exports.hasSize = hasSize;
+exports.getSize = getSize;
+exports.hasSameStat = hasSameStat;
+exports.byteLength = byteLength;
+exports.cleanupStream = cleanupStream;
 const path = require("path");
-const util = require("util");
 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 = module_1.supported(16, 8);
+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];
@@ -24,7 +40,6 @@ function parseHeader(headers, name) {
         }
     }
 }
-exports.parseHeader = parseHeader;
 function normalizeHeaders(headers) {
     const result = Object.create(null);
     for (const name in headers) {
@@ -49,14 +64,12 @@ function normalizeHeaders(headers) {
     }
     return result;
 }
-exports.normalizeHeaders = normalizeHeaders;
 function getBasicAuth(username, password) {
     if ((0, types_1.isObject)(username)) {
         ({ username, password } = username);
     }
     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) {
     try {
         return new URL(value).username.length > 0;
@@ -65,7 +78,6 @@ function hasBasicAuth(value) {
     }
     return false;
 }
-exports.hasBasicAuth = hasBasicAuth;
 function checkRetryable(err) {
     if (err instanceof Error) {
         const { code, errno } = err;
@@ -86,7 +98,6 @@ function checkRetryable(err) {
     }
     return false;
 }
-exports.checkRetryable = checkRetryable;
 function isRetryable(value, timeout) {
     switch (value) {
         case 408:
@@ -109,12 +120,42 @@ function isRetryable(value, timeout) {
             return false;
     }
 }
-exports.isRetryable = isRetryable;
+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;
 }
-exports.trimPath = trimPath;
 function asInt(value) {
     switch (typeof value) {
         case 'string':
@@ -125,7 +166,6 @@ function asInt(value) {
             return NaN;
     }
 }
-exports.asInt = asInt;
 function asFloat(value) {
     switch (typeof value) {
         case 'string':
@@ -136,7 +176,6 @@ function asFloat(value) {
             return NaN;
     }
 }
-exports.asFloat = asFloat;
 function fromSeconds(value) {
     switch (typeof value) {
         case 'string':
@@ -147,7 +186,6 @@ function fromSeconds(value) {
             return NaN;
     }
 }
-exports.fromSeconds = fromSeconds;
 function getTransferRate(length, timeMs, unitSeparator = '') {
     const unit = (length * 8) / timeMs;
     if (unit < 1) {
@@ -158,7 +196,6 @@ function getTransferRate(length, timeMs, unitSeparator = '') {
     }
     return (unit / 1000).toPrecision(3) + unitSeparator + 'GiB/s';
 }
-exports.getTransferRate = getTransferRate;
 function hasSize(value, keepEmpty) {
     try {
         const statSrc = fs.statSync(value);
@@ -173,7 +210,6 @@ function hasSize(value, keepEmpty) {
     }
     return false;
 }
-exports.hasSize = hasSize;
 function getSize(value, diskUsed) {
     try {
         return (diskUsed ? fs.lstatSync(value) : fs.statSync(value)).size;
@@ -182,7 +218,6 @@ function getSize(value, diskUsed) {
         return 0;
     }
 }
-exports.getSize = getSize;
 function hasSameStat(src, dest, keepEmpty) {
     try {
         if (fs.existsSync(dest)) {
@@ -200,11 +235,9 @@ function hasSameStat(src, dest, keepEmpty) {
     }
     return false;
 }
-exports.hasSameStat = hasSameStat;
 function byteLength(value, encoding) {
     return typeof value === 'string' && (path.isAbsolute(value) || module_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
 }
-exports.byteLength = byteLength;
 function cleanupStream(stream, uri) {
     try {
         stream.removeAllListeners();
@@ -219,4 +252,3 @@ function cleanupStream(stream, uri) {
         }
     }
 }
-exports.cleanupStream = cleanupStream;