@e-mc/request 0.9.12 → 0.9.14

package/README.md

@@ -9,12 +9,12 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.12/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.14/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>;
@@ -201,9 +202,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.12/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.12/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.12/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.14/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.14/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.14/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -258,8 +258,8 @@ function validateCerts(certs) {
     }
     return [text, file];
 }
-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);
@@ -1059,13 +1059,14 @@ class Request extends module_1 {
                 return Promise.reject(err);
             }
         }
-        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][\S\s]*$/i.test(opt.trim()))).map((opt) => {
@@ -1365,7 +1366,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]);
@@ -1418,9 +1425,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)) {
@@ -1471,12 +1486,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, 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) {
@@ -1486,7 +1501,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, 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, 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);
@@ -1678,6 +1693,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 });
         }
         if (posting) {
@@ -1697,8 +1715,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;
@@ -1706,9 +1737,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;
             }
@@ -1717,7 +1749,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 {
@@ -1727,14 +1759,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();
@@ -1837,7 +1869,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";
@@ -1890,7 +1924,7 @@ class Request extends module_1 {
                     }
                     const client = this.open(href, request);
                     const { host, url, encoding, progressId, outFormat } = request;
-                    let buffer, aborted;
+                    let buffer, aborted = false;
                     ({ httpVersion, outAbort } = request);
                     const isAborted = () => client.destroyed || httpVersion === 2 && client.aborted;
                     const isRetry = (value) => (0, util_1.isRetryable)(value) && ++retries <= this._config.retryLimit;
@@ -1907,14 +1941,11 @@ class Request extends module_1 {
                         if (timeout) {
                             clearTimeout(timeout);
                         }
-                        buffer = null;
-                        aborted = true;
                         if (outAbort) {
-                            if (!client.aborted) {
-                                outAbort.abort();
-                            }
                             this[kDownloading].delete(outAbort);
                         }
+                        buffer = null;
+                        aborted = true;
                         client.destroy();
                     };
                     const retryTimeout = () => {
@@ -1938,7 +1969,6 @@ class Request extends module_1 {
                             client.once('readable', () => {
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
-                                        abortResponse();
                                         throwError((0, types_1.errorValue)("Timeout was exceeded", href.toString()));
                                     }, readTimeout);
                                 }
@@ -1988,7 +2018,6 @@ class Request extends module_1 {
                                         dataLength += Buffer.byteLength(chunk, encoding);
                                     }
                                     if (dataLength > maxBufferSize) {
-                                        abortResponse();
                                         throwError((0, types_1.errorValue)("Size limit was exceeded", href.toString()));
                                     }
                                 }
@@ -2080,12 +2109,12 @@ class Request extends module_1 {
                         host.success(httpVersion);
                     };
                     const redirectResponse = (statusCode, location) => {
-                        abortResponse();
                         if (location) {
                             if (request.followRedirect === false || request.follow_redirect === false) {
                                 throwError(formatStatus(statusCode, 'Follow redirect was disabled'));
                             }
                             else if (++redirects <= this._config.redirectLimit) {
+                                abortResponse();
                                 downloadUri.call(this, Request.fromURL(url, location));
                             }
                             else {
@@ -2097,11 +2126,11 @@ class Request extends module_1 {
                         }
                     };
                     const errorResponse = (err) => {
-                        abortResponse();
                         if (wasAborted(err)) {
                             throwError(err);
                         }
                         else if ((0, util_1.checkRetryable)(err) && ++retries <= this._config.retryLimit) {
+                            abortResponse();
                             if (isConnectionTimeout(err)) {
                                 retryTimeout();
                             }
@@ -2247,7 +2276,6 @@ class Request extends module_1 {
                                 retryResponse(statusCode, res.headers['retry-after']);
                             }
                             else {
-                                abortResponse();
                                 throwError(formatStatus(statusCode));
                             }
                         })
@@ -2265,8 +2293,8 @@ class Request extends module_1 {
                         if (aborted) {
                             return;
                         }
-                        abortResponse();
                         if (++retries <= this._config.retryLimit) {
+                            abortResponse();
                             retryTimeout();
                         }
                         else {
@@ -2307,7 +2335,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.9.12",
+  "version": "0.9.14",
   "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.9.12",
-    "@e-mc/types": "0.9.12",
+    "@e-mc/module": "0.9.14",
+    "@e-mc/types": "0.9.14",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2",

package/util.d.ts

@@ -5,6 +5,7 @@ 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,5 @@
 "use strict";
-exports.cleanupStream = exports.byteLength = exports.hasSameStat = exports.getSize = exports.hasSize = exports.getTransferRate = exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+exports.cleanupStream = exports.byteLength = exports.hasSameStat = exports.getSize = exports.hasSize = exports.getTransferRate = exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseOutgoingHeaders = exports.parseHeader = void 0;
 const path = require("path");
 const fs = require("fs");
 const util = require("util");
@@ -25,6 +25,24 @@ function parseHeader(headers, name) {
     }
 }
 exports.parseHeader = parseHeader;
+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;
+    }
+}
+exports.parseOutgoingHeaders = parseOutgoingHeaders;
 function normalizeHeaders(headers) {
     const result = Object.create(null);
     for (const name in headers) {
@@ -37,11 +55,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;