@e-mc/request 0.13.7 → 0.13.9

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/request
 
-* NodeJS 18.20.5 LTS
+* NodeJS 18.20 LTS
 * ES2022
 
 ## General Usage
@@ -9,12 +9,12 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.7/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.9/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
 import type { HttpAgentSettings, HttpProtocolVersion, HttpRequestClient, InternetProtocolVersion } from "./http";
-import type { ApplyOptions, Aria2Options, FormDataPart, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
+import type { ApplyOptions, Aria2Options, HeadersOnCallback, HostConfig, IHttpAdapter, OpenOptions, PostFileParts, PostOptions, ProxySettings, PutOptions, RcloneOptions, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
 import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
 
 import type { ClientRequest, OutgoingHttpHeaders } from "node:http";
@@ -45,14 +45,15 @@ 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;
     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>;
-    post(uri: string | URL, parts: FormDataPart[]): Promise<Buffer | string | null>;
-    post(uri: string | URL, form: Record<string, unknown>, parts: FormDataPart[]): 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>;
     post(uri: string | URL, data: unknown, contentType?: string, options?: PostOptions): Promise<Buffer | string | null>;
     get(uri: string | URL, format: "json" | "yaml" | "json5" | "xml" | "toml"): Promise<object | null>;
@@ -252,9 +253,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.7/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.7/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.9/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.9/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.9/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -249,6 +249,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;
@@ -356,7 +359,7 @@ class HttpAdapter {
                                     break;
                                 case 'toml':
                                     try {
-                                        result = require('smol-toml').parse(buffer);
+                                        result = require('smol-toml').parse(buffer, parser);
                                     }
                                     catch {
                                         result = require(packageName = 'toml').parse(buffer);
@@ -378,6 +381,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, true);
+const SUPPORTED_FILE = (0, types_1.supported)(19, 2) || (0, types_1.supported)(18, 13, true);
 const SUPPORTED_PROXY = (0, types_1.supported)(24, 5);
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const REGEXP_RCLONE = /^rclone:\?/i;
@@ -114,6 +115,7 @@ let KEEP_ALIVE = null;
 let ACCEPT_ENCODING = false;
 let READ_TIMEOUT = 0;
 let AGENT_TIMEOUT = 0;
+let MAX_CONCURRENT_STREAMS = 100;
 let LOG_HTTP = false;
 let LOG_TIMEPROCESS = true;
 function setDnsCache(hostname, value, expires) {
@@ -414,8 +416,7 @@ function createAgentOptions(options) {
     }
 }
 const hasResponse = (value) => value >= 200 && (value < 300 || value === 304);
-const isDirEnd = (value) => value.endsWith('/') || value.endsWith(path.sep);
-const trimCharEnd = (value) => value.substring(0, value.length - 1);
+const isDirEnd = (value) => (value = value.at(-1), value === '/' || value === path.sep);
 const configureDns = (family, options) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
 const ignoreOpt = (opts, ...values) => !opts?.some(opt => values.some(value => opt === value || opt.startsWith(value + '=')));
 const escapeQuote = (value) => value.replace(/[\\"]/g, capture => '\\' + capture);
@@ -488,7 +489,7 @@ class Request extends module_1 {
                 try {
                     for (const uri in proxy) {
                         const host = new URL(uri);
-                        ARIA2.PROXY[trimCharEnd(host.protocol)] = { host };
+                        ARIA2.PROXY[host.protocol.slice(0, -1)] = { host };
                     }
                 }
                 catch {
@@ -587,11 +588,14 @@ class Request extends module_1 {
             }
         }
         if (request) {
-            let { read_timeout, agent, use, headers, certs } = request, agent_timeout;
+            let { read_timeout, max_concurrent_streams, agent, use, headers, certs } = request, agent_timeout;
             if ((read_timeout = (0, util_1.fromSeconds)(read_timeout)) >= 0) {
                 READ_TIMEOUT = read_timeout;
             }
-            if ((0, types_1.isObject)(agent)) {
+            if ((max_concurrent_streams = (0, util_1.asInt)(max_concurrent_streams)) > 0) {
+                MAX_CONCURRENT_STREAMS = max_concurrent_streams;
+            }
+            if (agent) {
                 let { keep_alive, timeout, proxy_env } = agent;
                 if ((agent_timeout = (0, util_1.fromSeconds)(timeout)) > 0) {
                     AGENT_TIMEOUT = agent_timeout;
@@ -620,8 +624,8 @@ class Request extends module_1 {
                         break;
                 }
             }
-            if ((0, types_1.isPlainObject)(headers)) {
-                for (const href in headers) {
+            for (const href in headers) {
+                if ((0, types_1.isObject)(headers[href])) {
                     HTTP.HEADERS[href] = (0, util_1.normalizeHeaders)(headers[href]);
                 }
             }
@@ -1121,15 +1125,10 @@ class Request extends module_1 {
             ({ signal, silent } = options);
             ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--daemon'], ['--input-file']));
         }
-        try {
-            if ((0, types_1.isString)(uri) && 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;
@@ -1224,7 +1223,7 @@ class Request extends module_1 {
                         }
                     }
                 }
-                switch (protocol = trimCharEnd(protocol)) {
+                switch (protocol = protocol.slice(0, -1)) {
                     case 'http':
                     case 'https':
                         if (ignoreOpt(binOpts, '--http-no-cache')) {
@@ -1394,12 +1393,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 = [
@@ -1614,6 +1608,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);
@@ -1681,7 +1690,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;
@@ -1754,7 +1765,22 @@ class Request extends module_1 {
             }
         }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
-            request = (this.#session[0][origin] ||= http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: host.localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } })).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            let session = this.#session[0][origin], conn, maxConcurrentStreams = 0;
+            if (session) {
+                maxConcurrentStreams = session[2];
+            }
+            else {
+                maxConcurrentStreams = options.maxConcurrentStreams || MAX_CONCURRENT_STREAMS;
+                session = [[], 0, maxConcurrentStreams];
+            }
+            if (session[0].length * maxConcurrentStreams <= session[1]) {
+                conn = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: host.localhost ? { enablePush: false, maxConcurrentStreams, maxFrameSize: 16777215 } : { enablePush: false, maxConcurrentStreams } });
+                session[0].push(conn);
+            }
+            else {
+                conn = session[0].at(-1);
+            }
+            request = conn.request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1770,13 +1796,18 @@ class Request extends module_1 {
                     if (this.matchStatus(statusCode, url, response, request, options) && hasResponse(statusCode)) {
                         const contentEncoding = response['content-encoding'];
                         if (checkEncoding(request, statusCode, contentEncoding) && (emitter = this.pipeline(request, contentEncoding, outStream))) {
-                            for (const event in listenerMap) {
-                                const [name, type] = event.split('-');
-                                for (const listener of listenerMap[event]) {
-                                    if (name !== 'error') {
-                                        request.removeListener(name, listener);
+                            if (typeof emitter === 'number') {
+                                this.abortHeaders(request, options, { href: url.href, statusCode: emitter, message: (0, util_1.fromStatusCode)(emitter) });
+                            }
+                            else {
+                                for (const event in listenerMap) {
+                                    const [name, type] = event.split('-');
+                                    for (const listener of listenerMap[event]) {
+                                        if (name !== 'error') {
+                                            request.removeListener(name, listener);
+                                        }
+                                        emitter[type](name === 'end' ? 'finish' : name, listener);
                                     }
-                                    emitter[type](name === 'end' ? 'finish' : name, listener);
                                 }
                             }
                         }
@@ -1837,6 +1868,7 @@ class Request extends module_1 {
                 };
             }
             options.httpVersion = 2;
+            session[1]++;
         }
         else {
             let agent;
@@ -1899,9 +1931,14 @@ class Request extends module_1 {
                     const contentEncoding = incoming['content-encoding'];
                     let source;
                     if (checkEncoding(request, statusCode, contentEncoding) && (source = this.pipeline(response, contentEncoding, outStream))) {
-                        source.once('finish', () => {
-                            request.emit('end');
-                        });
+                        if (typeof source === 'number') {
+                            this.abortHeaders(request, options, { href: url.href, statusCode: source, message: (0, util_1.fromStatusCode)(source) });
+                        }
+                        else {
+                            source.once('finish', () => {
+                                request.emit('end');
+                            });
+                        }
                     }
                     else {
                         if (encoding) {
@@ -2093,9 +2130,18 @@ class Request extends module_1 {
                         addValue(name, data[name]);
                     }
                 }
-                for (let { name, data: target, value, contentType: type, filename } of parts) {
-                    if (!name) {
-                        continue;
+                for (const part of parts) {
+                    let name, target, value, type, filename;
+                    if ((0, types_1.isPlainObject)(part)) {
+                        ({ name, data: target, value, contentType: type, filename } = part);
+                    }
+                    else if ((0, types_1.supported)(18, 13) && part instanceof File) {
+                        name = part.name;
+                        type = part.type;
+                        target = Buffer.from(await part.arrayBuffer());
+                    }
+                    if (!(0, types_1.isString)(name)) {
+                        throw (0, types_1.errorValue)('Name of file part was invalid', uri.toString());
                     }
                     if (target) {
                         if (typeof target === 'string') {
@@ -2209,7 +2255,9 @@ class Request extends module_1 {
         const session = this.#session;
         session.forEach((protocol, index) => {
             for (const host in protocol) {
-                protocol[host].close();
+                for (const conn of protocol[host][0]) {
+                    conn.close();
+                }
             }
             session[index] = Object.create(null);
         });
@@ -2226,28 +2274,30 @@ class Request extends module_1 {
             for (const value of encoding.split(/\s*,\s*/).reverse()) {
                 const next = this.fromEncoding(value, { chunkSize });
                 if (!next) {
-                    return;
+                    pipeTo = undefined;
+                    break;
                 }
                 pipeTo = pipeTo ? pipeTo.pipe(next) : next;
             }
         }
-        if (pipeTo) {
-            if (outStream) {
-                stream.pipeline(response, pipeTo, outStream, err => {
-                    if (err) {
-                        response.emit('error', err);
-                    }
-                });
-            }
-            else {
-                stream.pipeline(response, pipeTo, err => {
-                    if (err) {
-                        response.emit('error', err);
-                    }
-                });
-            }
-            return pipeTo;
+        if (!pipeTo) {
+            return 415;
+        }
+        if (outStream) {
+            stream.pipeline(response, pipeTo, outStream, err => {
+                if (err) {
+                    response.emit('error', err);
+                }
+            });
+        }
+        else {
+            stream.pipeline(response, pipeTo, err => {
+                if (err) {
+                    response.emit('error', err);
+                }
+            });
         }
+        return pipeTo;
     }
     fromEncoding(value, options) {
         switch (value) {

package/package.json

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

package/util.d.ts

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