@e-mc/request 0.12.15 → 0.12.16

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.15/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.15/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/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;
@@ -350,7 +353,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);
@@ -372,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;
@@ -1218,15 +1219,10 @@ class Request extends module_1 {
             ({ signal, silent } = options);
             ({ pathname, headers, binOpts } = this.parseBinOpts(options, ['--daemon'], ['--input-file'], options.shellExpansion));
         }
-        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;
@@ -1491,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 = [
@@ -1690,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);
@@ -1757,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;

package/package.json

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