@e-mc/request 0.13.10 → 0.14.1

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@e-mc/request",
-  "version": "0.13.10",
+  "version": "0.14.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",
@@ -19,8 +16,8 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.13.10",
-    "@e-mc/types": "0.13.10",
+    "@e-mc/module": "0.14.1",
+    "@e-mc/types": "0.14.1",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.1",
     "picomatch": "^4.0.4",

package/util.d.ts

@@ -4,10 +4,17 @@ import type { HttpProxySettings } from '@e-mc/types/lib/settings';
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'node:http';
 import type { Readable, Writable } from 'node:stream';
 
+type OutgoingHeaders = OutgoingHttpHeaders | Headers;
+
 declare namespace util {
-    function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
-    function parseOutgoingHeaders(headers: OutgoingHttpHeaders | Headers | undefined, ...ignore: string[]): OutgoingHttpHeaders | undefined;
-    function normalizeHeaders(headers: OutgoingHttpHeaders | Headers): OutgoingHttpHeaders;
+    function parseHeader(headers: IncomingHttpHeaders | OutgoingHttpHeaders, name: "cache-control"): string[] | undefined;
+    function parseHeader(headers: IncomingHttpHeaders, name: "expires" | "date" | "age"): number | undefined;
+    function parseHeader(headers: IncomingHttpHeaders, name: "content-disposition"): string | undefined;
+    function parseHeader<T extends string | string[] | number>(headers: IncomingHttpHeaders, name: string): T | undefined;
+    /** @deprecated copyHeaders (rename) */
+    function parseOutgoingHeaders(headers: OutgoingHeaders | undefined, ...ignore: string[]): OutgoingHttpHeaders | undefined;
+    function copyHeaders(headers: OutgoingHeaders | undefined, ...ignore: string[]): OutgoingHttpHeaders | undefined;
+    function normalizeHeaders(headers: OutgoingHeaders): OutgoingHttpHeaders;
     function getBasicAuth(auth: AuthValue): string;
     function getBasicAuth(username: unknown, password?: unknown): string;
     function hasBasicAuth(value: string): boolean;

package/util.js

@@ -1,30 +1,11 @@
 "use strict";
-exports.parseHeader = parseHeader;
-exports.parseOutgoingHeaders = parseOutgoingHeaders;
-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.fromURL = fromURL;
-exports.fromStatusCode = fromStatusCode;
-exports.getTransferRate = getTransferRate;
-exports.hasSize = hasSize;
-exports.getSize = getSize;
-exports.hasSameStat = hasSameStat;
-exports.byteLength = byteLength;
-exports.cleanupStream = cleanupStream;
-const path = require("node:path");
-const fs = require("node:fs");
-const node_util_1 = require("node:util");
-const types_1 = require("@e-mc/types");
-const module_1 = require("@e-mc/module");
-const host_1 = require("@e-mc/request/http/host");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const { toUSVString } = require('node:util');
+const { getEncoding, isArray, isError, isErrorCode, isObject, isString } = require('@e-mc/types');
+const Module = require('@e-mc/module');
+const HttpHost = require('@e-mc/request/http/host');
 function setHeader(result, key, value) {
     if (key === 'set-cookie') {
         (result[key] ||= []).push(value);
@@ -36,9 +17,32 @@ function setHeader(result, key, value) {
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
     const value = headers[name];
+    if (!value) {
+        return;
+    }
     switch (name.toLowerCase()) {
+        case 'date':
+        case 'expires': {
+            const result = Date.parse(value);
+            if (!isNaN(result)) {
+                return result;
+            }
+            break;
+        }
+        case 'age': {
+            const result = parseInt(value);
+            if (!isNaN(result)) {
+                return result * 1000;
+            }
+            break;
+        }
+        case 'cache-control':
+            if (isString(value)) {
+                return value.toLowerCase().split(/\s*,\s*/);
+            }
+            break;
         case 'content-disposition':
-            if ((0, types_1.isString)(value)) {
+            if (isString(value)) {
                 let result;
                 for (const match of value.matchAll(/\bfilename(?:\*\s*=\s*UTF-8''([^\s;]+)|\s*=\s*(?:"([^"]+)"|([^\s;]+)))/gi)) {
                     if (match[1]) {
@@ -49,9 +53,11 @@ function parseHeader(headers, name) {
                 return result;
             }
             break;
+        default:
+            return value;
     }
 }
-function parseOutgoingHeaders(headers, ...ignore) {
+function copyHeaders(headers, ...ignore) {
     if (!headers) {
         return;
     }
@@ -92,10 +98,10 @@ function normalizeHeaders(headers) {
                 value = value.trim();
                 break;
             default:
-                if (!(0, types_1.isArray)(value)) {
+                if (!isArray(value)) {
                     continue;
                 }
-                value = value.map(out => module_1.asString(out).trim());
+                value = value.map(out => Module.asString(out).trim());
                 break;
         }
         if (value) {
@@ -105,10 +111,10 @@ function normalizeHeaders(headers) {
     return result;
 }
 function getBasicAuth(username, password) {
-    if ((0, types_1.isObject)(username)) {
+    if (isObject(username)) {
         ({ username, password } = username);
     }
-    return (0, types_1.isString)(username) ? encodeURIComponent((0, node_util_1.toUSVString)(username)) + ((0, types_1.isString)(password) ? ':' + encodeURIComponent((0, node_util_1.toUSVString)(password)) : '') + '@' : '';
+    return isString(username) ? encodeURIComponent(toUSVString(username)) + (isString(password) ? ':' + encodeURIComponent(toUSVString(password)) : '') + '@' : '';
 }
 function hasBasicAuth(value) {
     try {
@@ -119,7 +125,7 @@ function hasBasicAuth(value) {
     return false;
 }
 function checkRetryable(err) {
-    if (err instanceof Error) {
+    if (isError(err)) {
         const { code, errno } = err;
         switch (code) {
             case 'ETIMEDOUT':
@@ -174,11 +180,11 @@ function parseHttpProxy(value, ignoreEnv) {
                             exclude = ['**'];
                             break;
                         }
-                        if (module_1.isURL(item)) {
+                        if (Module.isURL(item)) {
                             exclude.push(item);
                         }
                         else {
-                            const negate = item.startsWith('!') ? (item = item.substring(1), '!') : '';
+                            const negate = item.startsWith('!') ? (item = item.slice(1), '!') : '';
                             if (!/^(?:[^.]+|(?:\d+\.){3}\d+)$/.test(item) && !item.includes('*')) {
                                 item = '*' + item;
                             }
@@ -237,10 +243,10 @@ function fromSeconds(value) {
     }
 }
 function fromURL(url, value) {
-    if (module_1.isURL(value)) {
+    if (Module.isURL(value)) {
         return value;
     }
-    const auth = host_1.formatBasicAuth(url);
+    const auth = HttpHost.formatBasicAuth(url);
     return url.protocol + '//' + (auth && (auth + '@')) + url.hostname + (url.port ? ':' + url.port : '') + (value.startsWith('/') ? '' : '/') + value;
 }
 function fromStatusCode(value) {
@@ -435,7 +441,7 @@ function hasSameStat(src, dest, keepEmpty) {
     return false;
 }
 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));
+    return typeof value === 'string' && (path.isAbsolute(value) || Module.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && getEncoding(encoding));
 }
 function cleanupStream(stream, uri) {
     try {
@@ -446,8 +452,30 @@ function cleanupStream(stream, uri) {
         }
     }
     catch (err) {
-        if (!(0, types_1.isErrorCode)(err, 'ENOENT')) {
-            module_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
+        if (!isErrorCode(err, 'ENOENT')) {
+            Module.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
         }
     }
 }
+
+exports.asFloat = asFloat;
+exports.asInt = asInt;
+exports.byteLength = byteLength;
+exports.checkRetryable = checkRetryable;
+exports.cleanupStream = cleanupStream;
+exports.copyHeaders = copyHeaders;
+exports.fromSeconds = fromSeconds;
+exports.fromStatusCode = fromStatusCode;
+exports.fromURL = fromURL;
+exports.getBasicAuth = getBasicAuth;
+exports.getSize = getSize;
+exports.getTransferRate = getTransferRate;
+exports.hasBasicAuth = hasBasicAuth;
+exports.hasSameStat = hasSameStat;
+exports.hasSize = hasSize;
+exports.isRetryable = isRetryable;
+exports.normalizeHeaders = normalizeHeaders;
+exports.parseHeader = parseHeader;
+exports.parseHttpProxy = parseHttpProxy;
+exports.parseOutgoingHeaders = copyHeaders;
+exports.trimPath = trimPath;