@e-mc/request 0.14.0 → 0.14.2

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.14.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.2/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -253,9 +253,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.14.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.2/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.2/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -18,7 +18,7 @@ const which = require('which');
 const { fileURLToPath } = require('node:url');
 const { createAbortError, errorMessage, errorValue, formatTime, getEncoding, getLogCurrent, isArray, isObject, isPlainObject, isString, parseExpires, sanitizeArgs, sanitizeCmd, supported } = require('@e-mc/types');
 const Module = require('@e-mc/module');
-const { asInt, fromSeconds, fromStatusCode, getBasicAuth, normalizeHeaders, parseOutgoingHeaders, trimPath } = require('@e-mc/request/util');
+const { asInt, copyHeaders, fromSeconds, fromStatusCode, getBasicAuth, normalizeHeaders, trimPath } = require('@e-mc/request/util');
 const HttpHost = require('@e-mc/request/http/host');
 const HttpAdapter = require('@e-mc/request/http/adapter');
 const kRequest = Symbol.for('request:constructor');
@@ -1408,6 +1408,7 @@ class Request extends Module {
         silent ??= this.#singleton;
         return new Promise((resolve, reject) => {
             const init = [
+                '--files-only=true',
                 '--links=false',
                 '--delete-excluded=false',
                 '--interactive=false',
@@ -1661,8 +1662,9 @@ class Request extends Module {
         return { ...options, host, url };
     }
     open(uri, options) {
-        let { host, url, httpVersion, method = 'GET', search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = parseOutgoingHeaders(options.headers), getting = false, posting = false;
-        switch (method = method.toUpperCase()) {
+        let { host, url, httpVersion, search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = copyHeaders(options.headers), getting = false, posting = false;
+        const method = (options.method?.toUpperCase() || 'GET');
+        switch (method) {
             case 'GET':
             case 'DELETE':
                 getting = true;
@@ -1775,6 +1777,22 @@ class Request extends Module {
                 ({ ca, cert, key, ciphers, version: minVersion } = certs);
             }
         }
+        const basicAuth = HttpHost.getBasicAuth(url);
+        if (baseHeaders || basicAuth) {
+            headers = { ...baseHeaders, ...basicAuth, ...headers };
+        }
+        if (headers) {
+            const cacheControl = headers['cache-control']?.toLowerCase();
+            if (headers.authorization && !cacheControl?.includes('max-age')) {
+                options.noCache ??= true;
+            }
+            else if (cacheControl?.includes('no-cache')) {
+                options.noCache ??= 0;
+            }
+            if (cacheControl?.includes('no-store')) {
+                options.noStore ??= true;
+            }
+        }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
             let session = this.#session[0][origin], conn, maxConcurrentStreams = 0;
             if (session) {
@@ -1791,7 +1809,10 @@ class Request extends Module {
             else {
                 conn = session[0].at(-1);
             }
-            request = conn.request({ ...baseHeaders, ...HttpHost.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            headers ||= {};
+            headers[':method'] = method;
+            headers[':path'] = pathname;
+            request = conn.request(headers);
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1917,10 +1938,6 @@ class Request extends Module {
                     }
                 }
             }
-            const basicAuth = HttpHost.getBasicAuth(url);
-            if (baseHeaders || basicAuth) {
-                headers = { ...baseHeaders, ...basicAuth, ...headers };
-            }
             request = (secure ? https : http).request(socketPath ? { socketPath, path: pathname } : {
                 protocol: host.protocol,
                 hostname,
@@ -2114,7 +2131,7 @@ class Request extends Module {
         else {
             options = {};
         }
-        const headers = parseOutgoingHeaders(options.headers, 'content-type', 'content-length') || {};
+        const headers = copyHeaders(options.headers, 'content-type', 'content-length') || {};
         if (!putting && (parts || contentType === "multipart/form-data" || contentType === 'form-data')) {
             let valid = false;
             if (isArray(parts)) {
@@ -2453,7 +2470,7 @@ class Request extends Module {
                 return [];
             }).flat();
         }
-        return { pathname, headers: parseOutgoingHeaders(options.headers), binOpts };
+        return { pathname, headers: copyHeaders(options.headers), binOpts };
     }
     mergeBinOpts(args, opts, binOpts, options) {
         if (binOpts) {

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@e-mc/request",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "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.14.0",
-    "@e-mc/types": "0.14.0",
+    "@e-mc/module": "0.14.2",
+    "@e-mc/types": "0.14.2",
     "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

@@ -17,7 +17,30 @@ 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 (isString(value)) {
                 let result;
@@ -30,9 +53,11 @@ function parseHeader(headers, name) {
                 return result;
             }
             break;
+        default:
+            return value;
     }
 }
-function parseOutgoingHeaders(headers, ...ignore) {
+function copyHeaders(headers, ...ignore) {
     if (!headers) {
         return;
     }
@@ -438,6 +463,7 @@ exports.asInt = asInt;
 exports.byteLength = byteLength;
 exports.checkRetryable = checkRetryable;
 exports.cleanupStream = cleanupStream;
+exports.copyHeaders = copyHeaders;
 exports.fromSeconds = fromSeconds;
 exports.fromStatusCode = fromStatusCode;
 exports.fromURL = fromURL;
@@ -451,5 +477,5 @@ exports.isRetryable = isRetryable;
 exports.normalizeHeaders = normalizeHeaders;
 exports.parseHeader = parseHeader;
 exports.parseHttpProxy = parseHttpProxy;
-exports.parseOutgoingHeaders = parseOutgoingHeaders;
+exports.parseOutgoingHeaders = copyHeaders;
 exports.trimPath = trimPath;