@e-mc/request 0.14.2 → 0.14.3

package/README.md

@@ -9,12 +9,12 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.14.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.14.3/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
 import type { HttpAgentSettings, HttpProtocolVersion, HttpRequestClient, InternetProtocolVersion } from "./http";
-import type { ApplyOptions, Aria2Options, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PostFileParts, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
+import type { ApplyOptions, Aria2Options, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PatchOptions, PostFileParts, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
 import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
 
 import type { ClientRequest, OutgoingHttpHeaders } from "node:http";
@@ -52,6 +52,8 @@ interface IRequest extends IModule {
     head(uri: string | URL, options?: OpenOptions): ClientRequest;
     put(uri: string | URL, data: unknown, options: PutOptions): Promise<Buffer | string | null>;
     put(uri: string | URL, data: unknown, contentType?: string, options?: PutOptions): Promise<Buffer | string | null>;
+    patch(uri: string | URL, data: unknown, options: PatchOptions): Promise<Buffer | string | null>;
+    patch(uri: string | URL, data: unknown, contentType?: string, options?: PatchOptions): Promise<Buffer | string | null>;
     post(uri: string | URL, parts: PostFileParts): Promise<Buffer | string | null>;
     post(uri: string | URL, form: Record<string, unknown>, parts: PostFileParts): Promise<Buffer | string | null>;
     post(uri: string | URL, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
@@ -253,9 +255,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- 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.unpkg.com/@e-mc/types@0.14.3/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.14.3/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -388,7 +388,7 @@ class HttpAdapter {
                 if (updating) {
                     this.updateProgress(0, this.contentLength);
                 }
-                if (enabled && this.instance.readExpect === 'always' && !empty) {
+                if (enabled && this.instance.readExpect === 'always' && !empty || opts.throwsEmpty) {
                     this.terminate("No data received");
                     return;
                 }

package/index.js

@@ -37,7 +37,8 @@ const HTTP = {
 };
 const TLS = {
     TEXT: Object.create(null),
-    FILE: Object.create(null)
+    FILE: Object.create(null),
+    EXTRA_CA_CERTS: isString(process.env.NODE_EXTRA_CA_CERTS) && path.isAbsolute(process.env.NODE_EXTRA_CA_CERTS) && Module.isFile(process.env.NODE_EXTRA_CA_CERTS)
 };
 const DNS = {
     CACHE: Object.create(null),
@@ -200,7 +201,7 @@ function resetHttpHost(version) {
             break;
     }
 }
-function validateCerts(certs) {
+function validateCerts(certs, global) {
     const text = {};
     const file = {};
     for (let origin in certs) {
@@ -211,7 +212,7 @@ function validateCerts(certs) {
         catch {
             continue;
         }
-        if (ca) {
+        if (ca && (!TLS.EXTRA_CA_CERTS || !global)) {
             if (!Array.isArray(ca)) {
                 ca = [ca];
             }
@@ -282,6 +283,19 @@ function copySearchParams(url, base) {
         }
     });
 }
+function setOutgoingMethod(method, contentType, options) {
+    if (isPlainObject(contentType)) {
+        options = contentType;
+    }
+    else {
+        (options ||= {}).contentType = contentType;
+    }
+    options.method = method;
+    if (options.contentType === "multipart/form-data") {
+        options.contentType = "application/x-www-form-urlencoded";
+    }
+    return options;
+}
 function checkEncoding(request, statusCode, contentEncoding) {
     switch (statusCode) {
         case 206:
@@ -648,7 +662,7 @@ class Request extends Module {
                 }
             }
             if (isPlainObject(certs)) {
-                [TLS.TEXT, TLS.FILE] = validateCerts(certs);
+                [TLS.TEXT, TLS.FILE] = validateCerts(certs, true);
             }
             HTTP.PROXY = getProxySettings(request, agent_timeout);
             HttpHost.defineHostConfig(request);
@@ -779,6 +793,9 @@ class Request extends Module {
             this.readTimeout = (value = fromSeconds(read_timeout)) >= 0 ? value : READ_TIMEOUT;
             this.keepAlive = typeof (value = agent?.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
             this.acceptEncoding = typeof (value = use?.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
+            if ((value = asInt(use?.http_version)) === 1 || value === 2) {
+                this.#httpVersion = value;
+            }
             this.#ipVersion = (value = asInt(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
             if ((value = fromSeconds(agent?.timeout)) >= 0) {
                 this.#agentTimeout = value;
@@ -787,16 +804,13 @@ class Request extends Module {
                 this.#agentTimeout = AGENT_TIMEOUT;
                 value = undefined;
             }
-            if ((value = asInt(use?.http_version)) === 1 || value === 2) {
-                this.#httpVersion = value;
-            }
             const proxy = getProxySettings(data, value);
             if (proxy) {
                 this.proxy = proxy;
             }
             this.parseHeaders(headers);
             if (isObject(certs)) {
-                this.#certs = validateCerts(certs);
+                this.#certs = validateCerts(certs, false);
             }
             if (isObject(connect)) {
                 this.apply({
@@ -1662,7 +1676,7 @@ class Request extends Module {
         return { ...options, host, url };
     }
     open(uri, options) {
-        let { host, url, httpVersion, search, encoding, format, socketPath, expectContinue = false, timeout = this._config.connectTimeout, outStream } = options, headers = copyHeaders(options.headers), getting = false, posting = false;
+        let { host, url, httpVersion, search, proxyHost, 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':
@@ -1671,6 +1685,7 @@ class Request extends Module {
                 break;
             case 'POST':
             case 'PUT':
+            case 'PATCH':
                 posting = true;
                 break;
         }
@@ -1680,7 +1695,7 @@ class Request extends Module {
                 ({ out: format = 'json', parser } = format);
             }
             if (format.includes('/')) {
-                format = format.split('/').pop().split('-').pop();
+                format = format.split('/').at(-1).split('-').at(-1);
             }
             headers ||= {};
             switch (format = format.toLowerCase()) {
@@ -1729,6 +1744,9 @@ class Request extends Module {
             }
             options.url = url;
         }
+        else if (search) {
+            options.url = new URL(url);
+        }
         if (options.base) {
             this.#baseUrl = [url, httpVersion, headers];
         }
@@ -1742,14 +1760,24 @@ class Request extends Module {
             for (const param in search) {
                 url.searchParams.append(param, search[param]);
             }
+            url.searchParams.sort();
             uri = url.href;
         }
         const { hostname, origin, secure } = host;
         const pathname = url.pathname + (socketPath ? '' : url.search);
-        const proxy = this.proxyOf(uri, host.localhost);
         const version = this.httpVersion;
         const baseHeaders = this.headersOf(uri);
-        let request, ca, cert, key, ciphers, minVersion;
+        let request, ca, cert, key, ciphers, proxy, minVersion;
+        if (proxyHost) {
+            let pass = new URL(proxyHost.uri);
+            if (proxyHost.username) {
+                pass = new URL(pass.protocol + '//' + getBasicAuth(proxyHost.username, proxyHost.password) + pass.host);
+            }
+            proxy = { host: pass, keepAlive: proxyHost.keepAlive ?? this.keepAlive ?? true, agentOptions: proxyHost.agentOptions };
+        }
+        else if (proxyHost !== null) {
+            proxy = this.proxyOf(uri, host.localhost);
+        }
         if (getting && this.acceptEncoding && !host.localhost && !baseHeaders?.['accept-encoding']) {
             (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (SUPPORTED_ZSTD ? ', zstd' : '');
         }
@@ -1922,7 +1950,7 @@ class Request extends Module {
                 }
                 if (!agent) {
                     let proxyEnv;
-                    if (SUPPORTED_PROXY && !(proxyEnv = agentOptions?.proxyEnv) && proxy) {
+                    if (SUPPORTED_PROXY && proxyHost !== null && !(proxyEnv = agentOptions?.proxyEnv) && proxy) {
                         const http_proxy = proxy.host.toString();
                         proxyEnv = { http_proxy, https_proxy: http_proxy };
                     }
@@ -2089,17 +2117,10 @@ class Request extends Module {
         return this.open(out.url, out);
     }
     async put(uri, data, contentType, options) {
-        if (isPlainObject(contentType)) {
-            options = contentType;
-        }
-        else {
-            (options ||= {}).contentType = contentType;
-        }
-        options.method = 'PUT';
-        if (options.contentType === "multipart/form-data") {
-            options.contentType = "application/x-www-form-urlencoded";
-        }
-        return this.post(uri, data, options);
+        return this.post(uri, data, setOutgoingMethod('PUT', contentType, options));
+    }
+    async patch(uri, data, contentType, options) {
+        return this.post(uri, data, setOutgoingMethod('PATCH', contentType, options));
     }
     async post(uri, data, contentType, options) {
         let putting = false, parts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -16,10 +16,10 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.14.2",
-    "@e-mc/types": "0.14.2",
+    "@e-mc/module": "0.14.3",
+    "@e-mc/types": "0.14.3",
     "combined-stream": "^1.0.8",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^4.2.0",
     "picomatch": "^4.0.4",
     "which": "^4.0.0"
   }