@e-mc/request 0.6.12 → 0.6.14

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2024 An Pham
+Copyright 2023 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/index.js

@@ -1006,13 +1006,14 @@ class Request extends module_1.default {
                 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) => {
@@ -1311,7 +1312,13 @@ class Request extends module_1.default {
                         }
                         for (const item of ARIA2.PID_QUEUE) {
                             try {
-                                process.kill(item[0], 0);
+                                if (pid === item[0] && (signal === null || signal === void 0 ? void 0 : signal.aborted)) {
+                                    process.kill(item[0]);
+                                    closeTorrent(item[0]);
+                                }
+                                else {
+                                    process.kill(item[0], 0);
+                                }
                             }
                             catch {
                                 closeTorrent(item[0]);
@@ -1369,7 +1376,7 @@ class Request extends module_1.default {
     open(uri, options) {
         var _l;
         var _m, _o;
-        let { host, url, httpVersion, method = 'GET', encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
+        let { host, url, httpVersion, method = 'GET', encoding, format, headers: outgoing, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options, headers = (0, util_1.parseOutgoingHeaders)(outgoing);
         const getting = method === 'GET';
         const posting = method === 'POST';
         if (format) {
@@ -1624,6 +1631,9 @@ class Request extends module_1.default {
             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(), { once: true });
         }
         if (posting) {
@@ -1673,7 +1683,7 @@ class Request extends module_1.default {
         else {
             options = {};
         }
-        const headers = options.headers || (options.headers = {});
+        const headers = (0, util_1.parseOutgoingHeaders)(options.headers || (options.headers = {}));
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
@@ -1836,7 +1846,7 @@ class Request extends module_1.default {
                     }
                     const client = this.open(href, request);
                     const { host, url, encoding, 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;
@@ -1853,12 +1863,6 @@ class Request extends module_1.default {
                         }
                         buffer = null;
                         aborted = true;
-                        if (outAbort) {
-                            if (!client.aborted) {
-                                outAbort.abort();
-                            }
-                            this[kDownloading].delete(outAbort);
-                        }
                         client.destroy();
                     };
                     const retryTimeout = () => {
@@ -1883,7 +1887,6 @@ class Request extends module_1.default {
                                 var _l;
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
-                                        abortResponse();
                                         throwError((0, types_1.errorValue)("Timeout was exceeded", href.toString()));
                                     }, readTimeout);
                                 }
@@ -2012,9 +2015,9 @@ class Request extends module_1.default {
                         host.success(httpVersion);
                     };
                     const redirectResponse = (statusCode, location) => {
-                        abortResponse();
                         if (location) {
                             if (++redirects <= this._config.redirectLimit) {
+                                abortResponse();
                                 downloadUri.call(this, Request.fromURL(url, location));
                             }
                             else {
@@ -2026,8 +2029,8 @@ class Request extends module_1.default {
                         }
                     };
                     const errorResponse = (err) => {
-                        abortResponse();
                         if ((0, util_1.checkRetryable)(err) && ++retries <= this._config.retryLimit) {
+                            abortResponse();
                             if (isConnectionTimeout(err)) {
                                 retryTimeout();
                             }
@@ -2170,7 +2173,6 @@ class Request extends module_1.default {
                                 retryResponse(statusCode, res.headers['retry-after']);
                             }
                             else {
-                                abortResponse();
                                 throwError(formatStatus(statusCode));
                             }
                         })
@@ -2188,8 +2190,8 @@ class Request extends module_1.default {
                         if (aborted) {
                             return;
                         }
-                        abortResponse();
                         if (++retries <= this._config.retryLimit) {
+                            abortResponse();
                             retryTimeout();
                         }
                         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.6.12",
+  "version": "0.6.14",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.6.12",
-    "@e-mc/types": "0.6.12",
+    "@e-mc/module": "0.6.14",
+    "@e-mc/types": "0.6.14",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"

package/util.d.ts

@@ -1,9 +1,10 @@
-/// <reference path="@e-mc/types/lib/object.d.ts" />
+import type { AuthValue } from '@e-mc/types/lib/http';
 
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 
 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
+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 util = require("util");
 const module_1 = require("@e-mc/module");
 const types_1 = require("@e-mc/types");
@@ -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] || (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.default.asString(out).trim());
-                    break;
+                if (!(0, types_1.isArray)(value)) {
+                    continue;
                 }
-                continue;
+                value = value.map(out => module_1.default.asString(out).trim());
+                break;
         }
         if (value) {
             result[trimPath(name.trim().toLowerCase())] = value;