@e-mc/request 0.13.8 → 0.13.9

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.8/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";
@@ -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;
@@ -252,9 +253,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.8/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.8/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.8/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) {
@@ -586,10 +588,13 @@ 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 ((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) {
@@ -1603,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);
@@ -1670,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;
@@ -1743,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);
@@ -1831,6 +1868,7 @@ class Request extends module_1 {
                 };
             }
             options.httpVersion = 2;
+            session[1]++;
         }
         else {
             let agent;
@@ -2217,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);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.13.8",
+  "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.8",
-    "@e-mc/types": "0.13.8",
+    "@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",