@e-mc/request 0.10.2 → 0.10.4

package/README.md

@@ -9,12 +9,12 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.10.4/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, OpenOptions, PostOptions, ProxySettings, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
+import type { ApplyOptions, Aria2Options, FormDataPart, HeadersOnCallback, HostConfig, OpenOptions, PostOptions, ProxySettings, PutOptions, ReadExpectType, RequestInit, StatusOnCallback } from "./request";
 import type { DnsLookupSettings, RequestModule, RequestSettings } from "./settings";
 
 import type { ClientRequest, OutgoingHttpHeaders } from "http";
@@ -47,7 +47,8 @@ interface IRequest extends IModule {
     opts(url: string | URL, options?: OpenOptions): HostConfig;
     open(uri: string | URL, options: OpenOptions): HttpRequestClient;
     head(uri: string | URL, options?: OpenOptions): ClientRequest;
-    post(uri: string | URL, data: unknown, contentType: string): Promise<Buffer | string | null>;
+    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, data: unknown, options: PostOptions): Promise<Buffer | string | null>;
@@ -204,9 +205,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.10.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/host/index.d.ts

@@ -1,5 +1,5 @@
-import type { HttpHostConstructor } from '../../../types/lib/request';
-
-declare const HttpHost: HttpHostConstructor;
-
+import type { HttpHostConstructor } from '@e-mc/types/lib/request';
+
+declare const HttpHost: HttpHostConstructor;
+
 export = HttpHost;

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { RequestConstructor } from '../types/lib';
-
-declare const Request: RequestConstructor;
-
+import type { RequestConstructor } from '@e-mc/types/lib';
+
+declare const Request: RequestConstructor;
+
 export = Request;

package/index.js

@@ -16,8 +16,8 @@ const combined = require("combined-stream");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const which = require("which");
-const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/request/util");
 const host_1 = require("@e-mc/request/http/host");
 const kSession = Symbol('session');
@@ -331,8 +331,8 @@ function decompressEncoding(value, chunkSize) {
             break;
     }
 }
-function abortHeaders(href, request, options) {
-    const reason = (0, types_1.errorValue)("Aborted by client", href);
+function abortHeaders(href, request, options, statusCode = '') {
+    const reason = (0, types_1.errorMessage)(statusCode, "Aborted by client", href);
     const outAbort = options.outAbort;
     if (outAbort) {
         outAbort.abort(reason);
@@ -413,15 +413,13 @@ class Fetch {
     }
     async start() {
         return new Promise((resolve, reject) => {
-            this.promise = [resolve, reject];
+            this.resolve = resolve;
+            this.reject = reject;
             this.init();
         });
     }
     init() {
-        if (this.retries > 0) {
-            this.cleanup();
-            this.aborted = false;
-        }
+        this.aborted = false;
         this.setWriteStream();
         const config = this.config;
         const client = this.instance.open(this.uri, config);
@@ -445,7 +443,7 @@ class Fetch {
                     statusCode === 404 ||
                     statusCode === 407 ||
                     statusCode === 410) {
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
                 else if (this.isRetry(statusCode)) {
                     this.retryResponse(statusCode, headers['retry-after']);
@@ -473,7 +471,7 @@ class Fetch {
             })
                 .on('aborted', () => {
                 this.aborted = true;
-                this.rejectError((0, types_1.createAbortError)());
+                this.terminate((0, types_1.createAbortError)());
             })
                 .on('error', async (err) => {
                 if (this.aborted) {
@@ -514,13 +512,12 @@ class Fetch {
                     this.retryResponse(statusCode, res.headers['retry-after']);
                 }
                 else {
-                    this.abortResponse();
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
             })
                 .on('abort', () => {
                 this.aborted = true;
-                this.rejectError((0, types_1.createAbortError)());
+                this.terminate((0, types_1.createAbortError)());
             })
                 .on('error', err => {
                 if (!this.aborted) {
@@ -532,12 +529,12 @@ class Fetch {
             if (this.aborted) {
                 return;
             }
-            this.abortResponse();
             if (++this.retries <= this.retryLimit) {
+                this.abortResponse();
                 this.retryTimeout();
             }
             else {
-                this.rejectError(this.formatStatus(408));
+                this.terminate(this.formatStatus(408));
             }
         });
     }
@@ -553,7 +550,7 @@ class Fetch {
                 this.config.outStream = this.outStream;
             }
             catch (err) {
-                this.rejectError(err);
+                this.terminate(err);
             }
         }
         else {
@@ -568,13 +565,8 @@ class Fetch {
             clearTimeout(this.timeout);
         }
         this.aborted = true;
-        if (this.outAbort) {
-            if (!this.client.aborted) {
-                this.outAbort.abort();
-            }
-            this.downloading.delete(this.outAbort);
-        }
         this.client.destroy();
+        this.cleanup();
     }
     retryDownload(downgrade, message) {
         if (this.aborted) {
@@ -613,8 +605,7 @@ class Fetch {
             client.once('readable', () => {
                 if (instance.readTimeout > 0) {
                     this.timeout = setTimeout(() => {
-                        this.abortResponse();
-                        this.rejectError((0, types_1.errorValue)("Timeout was exceeded", this.uri.toString()));
+                        this.terminate((0, types_1.errorValue)("Timeout was exceeded", this.uri.toString()));
                     }, instance.readTimeout);
                 }
                 if (log) {
@@ -664,8 +655,7 @@ class Fetch {
                         dataLength += Buffer.byteLength(chunk, encoding);
                     }
                     if (dataLength > maxBufferSize) {
-                        this.abortResponse();
-                        this.rejectError((0, types_1.errorValue)("Size limit was exceeded", this.uri.toString()));
+                        this.terminate((0, types_1.errorValue)("Size limit was exceeded", this.uri.toString()));
                     }
                 }
             });
@@ -674,13 +664,7 @@ class Fetch {
             if (this.closed || this.aborted) {
                 return;
             }
-            if (this.timeout) {
-                clearTimeout(this.timeout);
-            }
-            if (this.outAbort) {
-                this.downloading.delete(this.outAbort);
-            }
-            this.closed = true;
+            this.close();
             const encoding = opts.encoding;
             let result, messageUnit, titleBgColor;
             if (buffer) {
@@ -743,7 +727,7 @@ class Fetch {
                     parent.updateProgress("request", progressId, 0, contentLength);
                 }
                 if (enabled && instance.readExpect === 'always') {
-                    this.rejectError("No data received");
+                    this.terminate("No data received");
                     return;
                 }
                 result = encoding && !pipeline ? '' : null;
@@ -752,34 +736,34 @@ class Fetch {
             if (log) {
                 instance.writeTimeProcess('HTTP' + config.httpVersion, config.statusMessage || this.uri.toString(), this.startTime, { type: 1024, queue: !!parent, titleBgColor, messageUnit, messageUnitMinWidth: 9, delayTime, bypassLog: LOG_STDOUT });
             }
-            this.promise[0](result);
+            this.resolve(result);
         });
         config.host.success(this.httpVersion);
     }
     redirectResponse(statusCode, location) {
-        this.abortResponse();
         if (location) {
             if (this.config.follow_redirect === false || this.config.followRedirect === false) {
-                this.rejectError(this.formatStatus(statusCode, "Follow redirect was disabled"));
+                this.terminate(this.formatStatus(statusCode, "Follow redirect was disabled"));
             }
             else if (++this.redirects <= this.redirectLimit) {
+                this.abortResponse();
                 this.setConfig(Request.fromURL(this.config.url, location));
                 this.init();
             }
             else {
-                this.rejectError(this.formatStatus(statusCode, "Exceeded redirect limit"));
+                this.terminate(this.formatStatus(statusCode, "Exceeded redirect limit"));
             }
         }
         else {
-            this.rejectError(this.formatStatus(statusCode, "Missing redirect location"));
+            this.terminate(this.formatStatus(statusCode, "Missing redirect location"));
         }
     }
     errorResponse(err) {
-        this.abortResponse();
         if (Fetch.wasAborted(err)) {
-            this.rejectError(err);
+            this.terminate(err);
         }
         else if ((0, util_1.checkRetryable)(err) && ++this.retries <= this.retryLimit) {
+            this.abortResponse();
             if (Fetch.isConnectionTimeout(err)) {
                 this.retryTimeout();
             }
@@ -791,7 +775,7 @@ class Fetch {
         }
         else {
             this.config.host.error(this.httpVersion);
-            this.rejectError(err);
+            this.terminate(err);
         }
     }
     retryResponse(statusCode, retryAfter) {
@@ -812,7 +796,7 @@ class Fetch {
                     }, offset);
                 }
                 else {
-                    this.rejectError(this.formatStatus(statusCode));
+                    this.terminate(this.formatStatus(statusCode));
                 }
                 return;
             }
@@ -834,17 +818,14 @@ class Fetch {
         this.sendWarning(this.formatRetry("HTTP connection timeout"));
         this.init();
     }
-    rejectError(err) {
+    terminate(err) {
         if (this.timeout) {
             clearTimeout(this.timeout);
         }
         if (!this.closed) {
-            this.closed = true;
             this.cleanup();
-            this.promise[1](typeof err === 'string' ? new Error(err) : err);
-        }
-        if (this.outAbort) {
-            this.downloading.delete(this.outAbort);
+            this.close();
+            this.reject(typeof err === 'string' ? new Error(err) : err);
         }
     }
     sendWarning(message) {
@@ -862,7 +843,20 @@ class Fetch {
     formatRetry(message) {
         return message + ` (${this.retries} / ${this.retryLimit})`;
     }
+    close() {
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+        }
+        this.closed = true;
+        if (this.aborted && !this.client.aborted && !this.client.destroyed) {
+            this.opts.outAbort?.abort();
+        }
+    }
     cleanup() {
+        const outAbort = this.opts.outAbort;
+        if (outAbort) {
+            this.downloading.delete(outAbort);
+        }
         if ((0, types_1.isString)(this.pipeTo) && this.outStream) {
             (0, util_1.cleanupStream)(this.outStream, this.pipeTo);
         }
@@ -1611,13 +1605,14 @@ class Request extends module_1 {
         if (typeof uri === 'string' && module_1.isURL(uri)) {
             uri = new URL(uri);
         }
-        let pathname, headers, binOpts, silent;
+        let pathname, headers, binOpts, signal, silent;
         if (options) {
             if (typeof options === 'string') {
                 pathname = options;
             }
             else {
-                ({ pathname, headers, binOpts, silent } = options);
+                ({ pathname, binOpts, signal, silent } = options);
+                headers = (0, util_1.parseOutgoingHeaders)(options.headers);
                 if ((0, types_1.isArray)(binOpts)) {
                     let next = false;
                     binOpts = binOpts.filter(opt => !((0, types_1.isString)(opt) && /^-[a-z].*$/i.test(opt.trim()))).map((opt) => {
@@ -1920,7 +1915,13 @@ class Request extends module_1 {
                         }
                         for (const item of ARIA2.PID_QUEUE) {
                             try {
-                                process.kill(item[0], 0);
+                                if (pid === item[0] && signal?.aborted) {
+                                    process.kill(item[0]);
+                                    closeTorrent(item[0]);
+                                }
+                                else {
+                                    process.kill(item[0], 0);
+                                }
                             }
                             catch {
                                 closeTorrent(item[0]);
@@ -1982,9 +1983,17 @@ class Request extends module_1 {
         return { ...options, host, url };
     }
     open(uri, options) {
-        let { host, url, httpVersion, method = 'GET', search, encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
-        const getting = method === 'GET';
-        const posting = method === 'POST';
+        let { host, url, httpVersion, method = 'GET', search, encoding, format, headers: outgoing, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(outgoing), getting = false, posting = false;
+        switch (method = method.toUpperCase()) {
+            case 'GET':
+            case 'DELETE':
+                getting = true;
+                break;
+            case 'POST':
+            case 'PUT':
+                posting = true;
+                break;
+        }
         if (format) {
             let parser;
             if ((0, types_1.isObject)(format)) {
@@ -2053,12 +2062,12 @@ class Request extends module_1 {
             }
             uri = url.href;
         }
-        const { hostname, origin, secure, localhost } = host;
+        const { hostname, origin, secure } = host;
         const pathname = url.pathname + (socketPath ? '' : url.search);
-        const proxy = this.proxyOf(uri, localhost);
+        const proxy = this.proxyOf(uri, host.localhost);
         const version = this.httpVersion;
         let request, ca, cert, key, ciphers, minVersion, baseHeaders = this.headersOf(uri);
-        if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
+        if (getting && this.acceptEncoding && !host.localhost && !baseHeaders?.['accept-encoding']) {
             (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : '');
         }
         if (secure) {
@@ -2068,7 +2077,7 @@ 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[kSession][0][origin] ||= http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, ciphers, minVersion, settings: localhost ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } })).request({ ...baseHeaders, ...host_1.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = (this[kSession][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 });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -2279,6 +2288,9 @@ class Request extends module_1 {
             const ac = new AbortController();
             this[kDownloading].add(options.outAbort = ac);
             stream.addAbortSignal(ac.signal, request);
+            if (options.signal) {
+                stream.addAbortSignal(options.signal, request);
+            }
             this.signal.addEventListener('abort', () => {
                 ac.abort(new Error("Aborted by process"));
             }, { once: true });
@@ -2300,8 +2312,21 @@ class Request extends module_1 {
         out.httpVersion = 1;
         return this.open(out.url, out);
     }
+    async put(uri, data, contentType, options) {
+        if ((0, types_1.isPlainObject)(contentType)) {
+            options = contentType;
+        }
+        else {
+            (options ||= {}).contentType = contentType;
+        }
+        options.method = 'PUT';
+        if (options.contentType === "multipart/form-data") {
+            options.contentType = "application/x-www-form-urlencoded";
+        }
+        return this.post(uri, data, options);
+    }
     async post(uri, data, contentType, options) {
-        let parts;
+        let putting = false, parts;
         if (Array.isArray(contentType)) {
             parts = contentType;
             contentType = undefined;
@@ -2309,9 +2334,10 @@ class Request extends module_1 {
         else {
             if ((0, types_1.isPlainObject)(contentType)) {
                 options = contentType;
+                putting = options.method === 'PUT';
                 contentType = undefined;
             }
-            if (Array.isArray(data) && (!contentType || contentType === "multipart/form-data")) {
+            if (!putting && Array.isArray(data) && (!contentType || contentType === "multipart/form-data")) {
                 parts = data;
                 data = undefined;
             }
@@ -2320,7 +2346,7 @@ class Request extends module_1 {
         if ((0, types_1.isPlainObject)(options)) {
             let formData;
             ({ formData, dataEncoding } = options);
-            if (formData) {
+            if (!putting && formData) {
                 (parts ||= []).push(...Array.isArray(formData) ? formData : [formData]);
             }
             else {
@@ -2330,14 +2356,14 @@ class Request extends module_1 {
         else {
             options = {};
         }
-        const headers = options.headers ||= {};
+        const headers = (0, util_1.parseOutgoingHeaders)(options.headers ||= {});
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
                 delete headers[attr];
             }
         }
-        if (parts || contentType === "multipart/form-data" || contentType === 'form-data') {
+        if (!putting && (parts || contentType === "multipart/form-data" || contentType === 'form-data')) {
             let valid;
             if ((0, types_1.isArray)(parts)) {
                 const write = combined.create();
@@ -2434,7 +2460,9 @@ class Request extends module_1 {
             }
             headers['content-length'] = Buffer.byteLength(data, (0, types_1.getEncoding)(dataEncoding)).toString();
         }
-        options.method = 'POST';
+        if (!putting) {
+            options.method = 'POST';
+        }
         options.httpVersion = 1;
         options.postData = data;
         headers['content-type'] = contentType || "text/plain";
@@ -2474,7 +2502,7 @@ class Request extends module_1 {
             for (const callback of called) {
                 try {
                     if (callback(code, headers, url) === true) {
-                        abortHeaders.call(this, href, request, options);
+                        abortHeaders.call(this, href, request, options, code);
                         return false;
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.10.2",
+  "version": "0.10.4",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,11 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.10.2",
-    "@e-mc/types": "0.10.2",
+    "@e-mc/module": "0.10.4",
+    "@e-mc/types": "0.10.4",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2",

package/util.d.ts

@@ -1,11 +1,12 @@
-import type { AuthValue } from '../types/lib/http';
-import type { HttpProxySettings } from '../types/lib/settings';
+import type { AuthValue } from '@e-mc/types/lib/http';
+import type { HttpProxySettings } from '@e-mc/types/lib/settings';
 
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 import type { Readable, Writable } from 'stream';
 
 declare namespace util {
     function parseHeader<T = unknown>(headers: IncomingHttpHeaders, name: string): T | undefined;
+    function parseOutgoingHeaders(headers: OutgoingHttpHeaders | Headers | undefined): OutgoingHttpHeaders | undefined;
     function normalizeHeaders(headers: OutgoingHttpHeaders): OutgoingHttpHeaders;
     function getBasicAuth(auth: AuthValue): string;
     function getBasicAuth(username: unknown, password?: unknown): string;

package/util.js

@@ -1,5 +1,6 @@
 "use strict";
 exports.parseHeader = parseHeader;
+exports.parseOutgoingHeaders = parseOutgoingHeaders;
 exports.normalizeHeaders = normalizeHeaders;
 exports.getBasicAuth = getBasicAuth;
 exports.hasBasicAuth = hasBasicAuth;
@@ -19,8 +20,8 @@ exports.cleanupStream = cleanupStream;
 const path = require("path");
 const fs = require("fs");
 const util = require("util");
-const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
+const module_1 = require("@e-mc/module");
 const SUPPORTED_USVSTRING = (0, types_1.supported)(16, 8);
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
@@ -40,6 +41,23 @@ function parseHeader(headers, name) {
         }
     }
 }
+function parseOutgoingHeaders(headers) {
+    if (headers) {
+        if (globalThis.Headers && headers instanceof Headers) {
+            const result = {};
+            headers.forEach((value, key) => {
+                if (key === 'set-cookie') {
+                    (result[key] ||= []).push(value);
+                }
+                else {
+                    result[key] = value;
+                }
+            });
+            return result;
+        }
+        return headers;
+    }
+}
 function normalizeHeaders(headers) {
     const result = Object.create(null);
     for (const name in headers) {
@@ -52,11 +70,11 @@ function normalizeHeaders(headers) {
                 value = value.trim();
                 break;
             default:
-                if (Array.isArray(value)) {
-                    value = value.map(out => module_1.asString(out).trim());
-                    break;
+                if (!(0, types_1.isArray)(value)) {
+                    continue;
                 }
-                continue;
+                value = value.map(out => module_1.asString(out).trim());
+                break;
         }
         if (value) {
             result[trimPath(name.trim().toLowerCase())] = value;