@e-mc/request 0.10.1 → 0.10.3

package/package.json

@@ -1,30 +1,30 @@
-{
-  "name": "@e-mc/request",
-  "version": "0.10.1",
-  "description": "Request constructor for E-mc.",
-  "main": "index.js",
-  "types": "index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
-    "directory": "src/request"
-  },
-  "keywords": [
-    "squared",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
-  "homepage": "https://github.com/anpham6/e-mc#readme",
-  "dependencies": {
-    "@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",
-    "which": "^2.0.2"
-  }
-}
+{
+  "name": "@e-mc/request",
+  "version": "0.10.3",
+  "description": "Request constructor for E-mc.",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
+    "directory": "src/request"
+  },
+  "keywords": [
+    "squared",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "BSD-3-Clause",
+  "homepage": "https://github.com/anpham6/e-mc#readme",
+  "dependencies": {
+    "@e-mc/module": "0.10.3",
+    "@e-mc/types": "0.10.3",
+    "combined-stream": "^1.0.8",
+    "js-yaml": "^4.1.0",
+    "picomatch": "^4.0.2",
+    "which": "^2.0.2"
+  }
+}

package/util.d.ts

@@ -1,28 +1,29 @@
-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';
-
-declare namespace util {
-    function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
-    function normalizeHeaders(headers: OutgoingHttpHeaders): OutgoingHttpHeaders;
-    function getBasicAuth(auth: AuthValue): string;
-    function getBasicAuth(username: unknown, password?: unknown): string;
-    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;
-    function fromSeconds(value: unknown): number;
-    function getTransferRate(length: number, timeMs: number, unitSeparator?: string): string;
-    function hasSameStat(src: string, dest: string, keepEmpty?: boolean): boolean;
-    function hasSize(value: string, keepEmpty?: boolean): boolean;
-    function getSize(value: string, diskUsed?: boolean): number;
-    function byteLength(value: Bufferable, encoding?: BufferEncoding): number;
-    function cleanupStream(target: Readable | Writable, pathname?: string): void;
-}
-
+import type { AuthValue } from '@e-mc/types/lib/http';
+import type { HttpProxySettings } from '@e-mc/types/lib/settings';
+
+import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
+import type { Readable, Writable } from 'stream';
+
+declare namespace util {
+    function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
+    function parseOutgoingHeaders(headers: OutgoingHttpHeaders | Headers | undefined): OutgoingHttpHeaders | undefined;
+    function normalizeHeaders(headers: OutgoingHttpHeaders): OutgoingHttpHeaders;
+    function getBasicAuth(auth: AuthValue): string;
+    function getBasicAuth(username: unknown, password?: unknown): string;
+    function hasBasicAuth(value: string): boolean;
+    function checkRetryable(err: unknown): boolean;
+    function isRetryable(value: number, timeout?: boolean): boolean;
+    function parseHttpProxy(value?: string, ignoreEnv?: boolean): HttpProxySettings | undefined;
+    function trimPath(value: string): string;
+    function asInt(value: unknown): number;
+    function asFloat(value: unknown): number;
+    function fromSeconds(value: unknown): number;
+    function getTransferRate(length: number, timeMs: number, unitSeparator?: string): string;
+    function hasSameStat(src: string, dest: string, keepEmpty?: boolean): boolean;
+    function hasSize(value: string, keepEmpty?: boolean): boolean;
+    function getSize(value: string, diskUsed?: boolean): number;
+    function byteLength(value: Bufferable, encoding?: BufferEncoding): number;
+    function cleanupStream(target: Readable | Writable, pathname?: string): void;
+}
+
 export = util;

package/util.js

@@ -1,5 +1,6 @@
 "use strict";
 exports.parseHeader = parseHeader;
+exports.parseOutgoingHeaders = parseOutgoingHeaders;
 exports.normalizeHeaders = normalizeHeaders;
 exports.getBasicAuth = getBasicAuth;
 exports.hasBasicAuth = hasBasicAuth;
@@ -19,8 +20,8 @@ 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 module_1 = require("@e-mc/module");
 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) {
@@ -40,6 +41,23 @@ function parseHeader(headers, name) {
         }
     }
 }
+function parseOutgoingHeaders(headers) {
+    if (headers) {
+        if (globalThis.Headers && headers instanceof Headers) {
+            const result = {};
+            headers.forEach((value, key) => {
+                if (key === 'set-cookie') {
+                    (result[key] ||= []).push(value);
+                }
+                else {
+                    result[key] = value;
+                }
+            });
+            return result;
+        }
+        return headers;
+    }
+}
 function normalizeHeaders(headers) {
     const result = Object.create(null);
     for (const name in headers) {
@@ -52,11 +70,11 @@ function normalizeHeaders(headers) {
                 value = value.trim();
                 break;
             default:
-                if (Array.isArray(value)) {
-                    value = value.map(out => module_1.asString(out).trim());
-                    break;
+                if (!(0, types_1.isArray)(value)) {
+                    continue;
                 }
-                continue;
+                value = value.map(out => module_1.asString(out).trim());
+                break;
         }
         if (value) {
             result[trimPath(name.trim().toLowerCase())] = value;
@@ -113,28 +131,36 @@ function isRetryable(value, timeout) {
         case 502:
         case 503:
         case 521:
-            if (!timeout) {
-                return true;
-            }
+            return !timeout;
         default:
             return false;
     }
 }
-function parseHttpProxy(value) {
-    value || (value = process.env.HTTP_PROXY || process.env.HTTPS_PROXY);
+function parseHttpProxy(value, ignoreEnv) {
+    if (!ignoreEnv) {
+        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) {
+                if (process.env.NO_PROXY && !ignoreEnv) {
                     exclude = [];
-                    for (const item of process.env.NO_PROXY.trim().split(/\s*,\s*/)) {
+                    for (let item of process.env.NO_PROXY.trim().split(/\s*,\s*/)) {
+                        if (item === '*') {
+                            exclude = ['**'];
+                            break;
+                        }
                         if (module_1.isURL(item)) {
                             exclude.push(item);
                         }
                         else {
-                            exclude.push(`https://${item}`, `http://${item}`);
+                            const negate = item.startsWith('!') ? (item = item.substring(1), '!') : '';
+                            if (!/^(?:[^.]+|(?:\d+\.){3}\d+)$/.test(item) && !item.includes('*')) {
+                                item = '*' + item;
+                            }
+                            exclude.push(`${negate}http?(s)://${item}?(/)**`);
                         }
                     }
                 }