@e-mc/request 0.12.6 → 0.12.8

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.7/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -255,9 +255,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.6/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.6/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.6/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.7/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/adapter/index.js

@@ -14,19 +14,13 @@ class HttpAdapter {
         return value === 421 || value === 505;
     }
     static isDowngrade(err) {
-        return err instanceof Error && (err.code === 'ERR_HTTP2_ERROR' || this.isUnsupported(Math.abs(err.errno)));
+        return module_1.isErrorCode(err, 'ERR_HTTP2_ERROR') || err instanceof Error && this.isUnsupported(Math.abs(err.errno));
     }
     static wasAborted(err) {
         return err instanceof Error && err.message.startsWith("Aborted");
     }
     static isConnectionError(err) {
-        switch (err instanceof Error && err.code) {
-            case 'ETIMEDOUT':
-            case 'ECONNRESET':
-                return true;
-            default:
-                return false;
-        }
+        return module_1.isErrorCode(err, 'ETIMEDOUT', 'ECONNRESET');
     }
     static defineHostConfig({ settings }) {
         const time_format = settings?.time_format;

package/index.js

@@ -21,7 +21,7 @@ const host_1 = require("@e-mc/request/http/host");
 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) && typeof zlib.createZstdDecompress === 'function';
+const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) || (0, types_1.supported)(22, 15, 0, true);
 const REGEXP_PEMCERT = /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s;
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const REGEXP_RCLONE = /^rclone:\?/i;
@@ -482,24 +482,25 @@ function checkBinTarget(instance, name, uri, pathname, command, binOpts) {
     return pathname;
 }
 function checkBinOpts(init, binOpts) {
-    if ((0, types_1.isArray)(binOpts)) {
-        for (let i = 0; i < binOpts.length; ++i) {
-            const leading = binOpts[i] + '=';
-            for (const arg of init) {
-                if (arg.startsWith(leading)) {
-                    const items = [];
-                    for (let k = i + 1; k < binOpts.length; ++k) {
-                        const next = binOpts[k];
-                        if (next.startsWith('--')) {
-                            break;
-                        }
-                        items.push(next);
+    if (!binOpts) {
+        return;
+    }
+    for (let i = 0; i < binOpts.length; ++i) {
+        const leading = binOpts[i] + '=';
+        for (const arg of init) {
+            if (arg.startsWith(leading)) {
+                const items = [];
+                for (let k = i + 1; k < binOpts.length; ++k) {
+                    const next = binOpts[k];
+                    if (next.startsWith('--')) {
+                        break;
                     }
-                    const l = items.length + 1;
-                    binOpts.splice(i, l);
-                    i += l;
-                    break;
+                    items.push(next);
                 }
+                const l = items.length + 1;
+                binOpts.splice(i, l);
+                i += l;
+                break;
             }
         }
     }
@@ -514,7 +515,7 @@ function setBinHeaders(args, headers) {
     }
 }
 function finalizeBinArgs(instance, name, bin, args, opts, binOpts, cmd = []) {
-    if ((0, types_1.isArray)(binOpts)) {
+    if (binOpts) {
         for (const leading of binOpts) {
             if (leading.startsWith('-')) {
                 const pattern = new RegExp(`^${leading}(?:=|$)`);
@@ -554,7 +555,7 @@ const trimCharEnd = (value) => value.substring(0, value.length - 1);
 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);
-const rcloneSize = (value) => (0, types_1.isString)(value) ? /^\d+(?:B|K|M|G|T|P)$/.exec(value)?.[0] : undefined;
+const rcloneSize = (value) => (0, types_1.isString)(value) ? /^\d+(?:B|[KMGTP]i?)$/i.exec(value)?.[0] : undefined;
 const rcloneDuration = (value) => (0, types_1.isString)(value) ? /^\d+(?:h|m|s|ms|ns)$/.exec(value)?.[0] : undefined;
 class Request extends module_1 {
     static [kRequest] = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.12.6",
+  "version": "0.12.8",
   "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.12.6",
-    "@e-mc/types": "0.12.6",
+    "@e-mc/module": "0.12.8",
+    "@e-mc/types": "0.12.8",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.3",