@e-mc/request 0.13.7 → 0.13.8

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.8/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";
@@ -51,8 +51,8 @@ interface IRequest extends IModule {
     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 +252,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.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.npmjs.com/package/@types/node
 

package/index.js

@@ -414,8 +414,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 +487,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 {
@@ -591,7 +590,7 @@ class Request extends module_1 {
             if ((read_timeout = (0, util_1.fromSeconds)(read_timeout)) >= 0) {
                 READ_TIMEOUT = read_timeout;
             }
-            if ((0, types_1.isObject)(agent)) {
+            if (agent) {
                 let { keep_alive, timeout, proxy_env } = agent;
                 if ((agent_timeout = (0, util_1.fromSeconds)(timeout)) > 0) {
                     AGENT_TIMEOUT = agent_timeout;
@@ -620,8 +619,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 +1120,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 +1218,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 +1388,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 = [
@@ -1770,13 +1759,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);
                                 }
                             }
                         }
@@ -1899,9 +1893,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 +2092,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') {
@@ -2226,28 +2234,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.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.13.7",
-    "@e-mc/types": "0.13.7",
+    "@e-mc/module": "0.13.8",
+    "@e-mc/types": "0.13.8",
     "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;