@e-mc/request 0.12.14 → 0.12.16

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.14/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.16/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -45,6 +45,7 @@ interface IRequest extends IModule {
     rclone(uri: string | URL, pathname: string | URL): Promise<string[]>;
     rclone(uri: string | URL, options?: RcloneOptions): Promise<string[]>;
     json(uri: string | URL, options?: OpenOptions): Promise<object | null>;
+    blob(uri: string | URL, options?: OpenOptions): Promise<Blob | null>;
     pipe(uri: string | URL, to: Writable, options?: OpenOptions): Promise<null>;
     opts(url: string | URL, options?: OpenOptions): HostConfig;
     open(uri: string | URL, options: OpenOptions): HttpRequestClient;
@@ -255,9 +256,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.14/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -243,6 +243,9 @@ class HttpAdapter {
         if ('outFilename' in opts) {
             opts.outFilename = (0, util_1.parseHeader)(headers, 'content-disposition');
         }
+        if ('outContentType' in opts) {
+            opts.outContentType = headers['content-type'];
+        }
         const pipeline = this.pipeTo ? !(0, types_1.isString)(this.pipeTo) : false;
         const enabled = opts.connected?.call(this.client, headers) !== false && !pipeline;
         const maxBufferSize = opts.maxBufferSize ? (0, types_1.alignSize)(opts.maxBufferSize) : 0;
@@ -349,7 +352,12 @@ class HttpAdapter {
                                     result = new (require(packageName = 'fast-xml-parser').XMLParser)(parser).parse(buffer);
                                     break;
                                 case 'toml':
-                                    result = require(packageName = 'toml').parse(buffer);
+                                    try {
+                                        result = require('smol-toml').parse(buffer, parser);
+                                    }
+                                    catch {
+                                        result = require(packageName = 'toml').parse(buffer);
+                                    }
                                     break;
                                 default:
                                     result = JSON.parse(buffer);
@@ -367,6 +375,9 @@ class HttpAdapter {
                         }
                     }
                 }
+                else if (opts.outFormat) {
+                    opts.outFormat = undefined;
+                }
                 if (result === undefined) {
                     result = buffer;
                 }

package/index.js

@@ -23,6 +23,7 @@ const adapter_1 = require("@e-mc/request/http/adapter");
 const kRequest = Symbol.for('request:constructor');
 const SUPPORTED_NODE20 = (0, types_1.supported)(20);
 const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) || (0, types_1.supported)(22, 15, 0, true);
+const SUPPORTED_FILE = (0, types_1.supported)(19, 2) || (0, types_1.supported)(18, 13, true);
 const REGEXP_PEMCERT = /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s;
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const REGEXP_RCLONE = /^rclone:\?/i;
@@ -33,8 +34,8 @@ const HTTP = {
     PROXY: null
 };
 const TLS = {
-    TEXT: {},
-    FILE: {}
+    TEXT: Object.create(null),
+    FILE: Object.create(null)
 };
 const DNS = {
     CACHE: Object.create(null),
@@ -61,7 +62,7 @@ const ARIA2 = {
     LOWEST_SPEED_LIMIT: null,
     ALWAYS_RESUME: false,
     FILE_ALLOCATION: 'none',
-    PROXY: {},
+    PROXY: Object.create(null),
     NO_PROXY: '',
     CONF_PATH: ''
 };
@@ -116,21 +117,6 @@ try {
 }
 catch {
 }
-function getBaseHeaders(uri, headers) {
-    let result;
-    uri = (0, util_1.trimPath)(uri);
-    for (const pathname in headers) {
-        if (pathname === uri || uri.startsWith(pathname + '/')) {
-            (result ||= []).push([pathname, headers[pathname]]);
-        }
-    }
-    if (result) {
-        if (result.length > 1) {
-            result.sort((a, b) => b[0].length - a[0].length);
-        }
-        return result[0][1];
-    }
-}
 function setDnsCache(hostname, value, expires) {
     expires ??= DNS.EXPIRES;
     if (expires > 0 && !DNS.CACHE[hostname]) {
@@ -175,11 +161,9 @@ function getProxySettings(request, agentTimeout) {
     return null;
 }
 function closeTorrent(pid) {
-    if (typeof pid === 'number') {
-        const index = ARIA2.PID_QUEUE.findIndex(value => pid === value[0]);
-        if (index !== -1) {
-            ARIA2.PID_QUEUE.splice(index, 1);
-        }
+    const index = ARIA2.PID_QUEUE.findIndex(value => value[0] === pid);
+    if (index !== -1) {
+        ARIA2.PID_QUEUE.splice(index, 1);
     }
 }
 function clearDnsLookup() {
@@ -201,7 +185,7 @@ function resetHttpHost(version) {
                 const host = HTTP.HOST[origin];
                 if (host.secure && host.version === 1) {
                     const failed = host.failed(2, true);
-                    if (failed === 0 && host.failed(2, true) < 10 || failed < 3 && host.success(2, true) > 0) {
+                    if (failed === 0 && host.error(2, true) < 10 || failed < 3 && host.success(2, true) > 0) {
                         host.version = version;
                     }
                 }
@@ -362,8 +346,10 @@ function decompressEncoding(value, chunkSize) {
     }
 }
 function resetAria2() {
-    clearInterval(ARIA2.PID_TIMER);
-    ARIA2.PID_TIMER = null;
+    if (ARIA2.PID_TIMER) {
+        clearInterval(ARIA2.PID_TIMER);
+        ARIA2.PID_TIMER = null;
+    }
 }
 function escapeShellQuote(value) {
     value = value.replace(/(?<!\\)"/g, '\\"');
@@ -846,9 +832,9 @@ class Request extends module_1 {
     };
     #singleton = false;
     #httpVersion = null;
+    #headers = null;
     #ipVersion;
     #agentTimeout;
-    #headers = null;
     #baseUrl = null;
     #connectDns = Object.create(null);
     #pendingDns = Object.create(null);
@@ -858,7 +844,7 @@ class Request extends module_1 {
     #adapter = HTTP_ADAPTER;
     #certs = null;
     #downloading = new Set();
-    #hostInfo = {};
+    #hostInfo = Object.create(null);
     #session = [Object.create(null)];
     constructor(data) {
         super();
@@ -884,9 +870,7 @@ class Request extends module_1 {
             if (proxy) {
                 this.proxy = proxy;
             }
-            if ((0, types_1.isObject)(headers)) {
-                setOutgoingHeaders(this.#headers = {}, headers);
-            }
+            this.parseHeaders(headers);
             if ((0, types_1.isObject)(certs)) {
                 this.#certs = validateCerts(certs);
             }
@@ -994,9 +978,7 @@ class Request extends module_1 {
     init(config) {
         if (config) {
             const { headers, httpVersion, ipVersion, readTimeout } = config;
-            if ((0, types_1.isObject)(headers)) {
-                setOutgoingHeaders(this.#headers ||= {}, headers);
-            }
+            this.parseHeaders(headers);
             if (httpVersion !== undefined) {
                 this.httpVersion = httpVersion;
             }
@@ -1220,8 +1202,7 @@ class Request extends module_1 {
         }
     }
     headersOf(uri) {
-        const headers = this.#headers;
-        return headers && getBaseHeaders(uri, headers) || (this.host ? getBaseHeaders(uri, HTTP.HEADERS) : undefined);
+        return this.findHeadersByUri(uri) || (this.host ? this.findHeadersByUri(uri, HTTP.HEADERS) : undefined);
     }
     async aria2c(uri, options = {}) {
         if (!ARIA2.BIN) {
@@ -1238,15 +1219,10 @@ class Request extends module_1 {
             ({ signal, silent } = options);
             ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--daemon'], ['--input-file'], options.shellExpansion));
         }
-        try {
-            if (typeof uri === 'string' && module_1.isURL(uri)) {
-                uri = new URL(uri);
-            }
-            pathname = checkBinTarget(this, "aria2", uri, pathname, 'aria2', binOpts);
-        }
-        catch (err) {
-            return Promise.reject(err);
+        if ((0, types_1.isString)(uri) && module_1.isURL(uri)) {
+            uri = new URL(uri);
         }
+        pathname = checkBinTarget(this, "aria2", uri, pathname, 'aria2', binOpts);
         silent ??= this.#singleton;
         return new Promise((resolve, reject) => {
             let protocol, origin, username, password;
@@ -1511,12 +1487,7 @@ class Request extends module_1 {
             default:
                 return Promise.reject((0, types_1.errorMessage)("rclone", "Invalid command", command || uri));
         }
-        try {
-            pathname = checkBinTarget(this, "rclone", uri, pathname, command, binOpts);
-        }
-        catch (err) {
-            return Promise.reject(err);
-        }
+        pathname = checkBinTarget(this, "rclone", uri, pathname, command, binOpts);
         silent ??= this.#singleton;
         return new Promise((resolve, reject) => {
             const init = [
@@ -1710,6 +1681,21 @@ class Request extends module_1 {
         options.format = 'json';
         return this.get(uri, options);
     }
+    async blob(uri, options = {}) {
+        options.outContentType = undefined;
+        options.outFilename = undefined;
+        options.outBlob = true;
+        const data = await this.get(uri, options);
+        if (!data) {
+            return null;
+        }
+        const format = options.outFormat?.out;
+        const type = { type: format ? 'application/' + format : options.outContentType || (typeof data === 'string' ? 'text/plain' : undefined) };
+        if (SUPPORTED_FILE && options.outFilename) {
+            return new File([Buffer.from(data)], path.basename(options.outFilename), type);
+        }
+        return new Blob([Buffer.from(data)], type);
+    }
     async pipe(uri, to, options = {}) {
         options.pipeTo = to;
         return this.get(uri, options);
@@ -1777,7 +1763,9 @@ class Request extends module_1 {
             }
             headers.accept += ', text/plain';
             options.encoding = (0, types_1.getEncoding)(encoding);
-            options.outFormat = { out: format, parser };
+            if (!options.outBlob) {
+                options.outFormat = { out: format, parser };
+            }
         }
         if (typeof uri !== 'string') {
             url = uri;
@@ -1942,7 +1930,7 @@ class Request extends module_1 {
                     try {
                         keepAlive ??= proxy.keepAlive;
                         agentTimeout ??= proxy.agentTimeout;
-                        const proxyHeaders = this.#headers && getBaseHeaders(proxy.host.href, this.#headers) || getBaseHeaders(proxy.host.href, HTTP.HEADERS);
+                        const proxyHeaders = this.findHeadersByUri(proxy.host.href) || this.findHeadersByUri(proxy.host.href, HTTP.HEADERS);
                         agent = require(pkg)(proxy.host, (typeof keepAlive === 'boolean' || agentTimeout > 0) && agentTimeout !== 0 ? { keepAlive: keepAlive ?? true, timeout: agentTimeout, headers: proxyHeaders } : { headers: proxyHeaders });
                     }
                     catch (err) {
@@ -2391,7 +2379,7 @@ class Request extends module_1 {
         }
         if ((0, types_1.isArray)(options.binOpts)) {
             let next = false;
-            binOpts = options.binOpts.filter((opt) => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt.trim()))).map((opt) => {
+            binOpts = options.binOpts.filter((opt) => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt))).map((opt) => {
                 if (next) {
                     if (!module_1.asString(opt).startsWith('--')) {
                         return [];
@@ -2441,6 +2429,26 @@ class Request extends module_1 {
         }
         return { pathname, headers: (0, util_1.parseOutgoingHeaders)(options.headers), binOpts };
     }
+    parseHeaders(outgoing) {
+        if ((0, types_1.isObject)(outgoing)) {
+            setOutgoingHeaders(this.#headers ||= {}, outgoing);
+        }
+    }
+    findHeadersByUri(uri, outgoing = this.#headers) {
+        if (outgoing) {
+            const result = [];
+            uri = (0, util_1.trimPath)(uri);
+            for (const pathname in outgoing) {
+                if (pathname === uri || uri.startsWith(pathname + '/')) {
+                    result.push([pathname, outgoing[pathname]]);
+                }
+            }
+            if (result.length > 0) {
+                result.sort((a, b) => b[0].length - a[0].length);
+                return result[0][1];
+            }
+        }
+    }
     set adapter(value) {
         if (isConstructor(value) && value.prototype instanceof adapter_1) {
             this.#adapter = value;

package/package.json

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

package/util.d.ts

@@ -13,8 +13,8 @@ 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 parseHttpProxy(value?: string, ignoreEnv?: boolean): HttpProxySettings | undefined;
+    function trimPath(value: string, char?: string): string;
     function asInt(value: unknown): number;
     function asFloat(value: unknown): number;
     function fromSeconds(value: unknown): number;

package/util.js

@@ -182,9 +182,11 @@ function parseHttpProxy(value, ignoreEnv) {
         }
     }
 }
-function trimPath(value) {
-    const length = value.length - 1;
-    return value[length] === '/' ? value.substring(0, length) : value;
+function trimPath(value, char = '/') {
+    while (value.at(-1) === char) {
+        value = value.slice(0, -1);
+    }
+    return value;
 }
 function asInt(value) {
     switch (typeof value) {