@e-mc/request 0.8.19 → 0.8.21

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/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.19/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.21/lib/index.d.ts
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -82,9 +82,9 @@ interface RequestConstructor extends ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.19/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.19/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.19/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.21/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.21/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.21/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -16,11 +16,11 @@ const combined = require("combined-stream");
 const pm = require("picomatch");
 const yaml = require("js-yaml");
 const which = require("which");
-const lib_v4_1 = require("@e-mc/module/lib-v4");
 const types_1 = require("@e-mc/types");
+const lib_v4_1 = require("@e-mc/module/lib-v4");
 const module_1 = require("@e-mc/module");
-const host_1 = require("@e-mc/request/http/host");
 const util_1 = require("@e-mc/request/util");
+const host_1 = require("@e-mc/request/http/host");
 const kSession = Symbol('session');
 const kHttpVersion = Symbol('httpVersion');
 const kIpVersion = Symbol('ipVersion');
@@ -316,8 +316,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);
@@ -1061,13 +1061,13 @@ 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, headers, binOpts, signal, silent } = options);
                 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) => {
@@ -1371,7 +1371,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]);
@@ -1686,6 +1692,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(new Error("Aborted by process")), { once: true });
         }
         if (posting) {
@@ -1898,7 +1907,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;
@@ -1916,12 +1925,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 = () => {
@@ -1946,7 +1949,6 @@ class Request extends module_1.default {
                                 var _o;
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
-                                        abortResponse();
                                         throwError((0, types_1.errorValue)("Timeout was exceeded", href.toString()));
                                     }, readTimeout);
                                 }
@@ -2070,9 +2072,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 {
@@ -2084,11 +2086,11 @@ class Request extends module_1.default {
                         }
                     };
                     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();
                             }
@@ -2233,7 +2235,6 @@ class Request extends module_1.default {
                                 retryResponse(statusCode, res.headers['retry-after']);
                             }
                             else {
-                                abortResponse();
                                 throwError(formatStatus(statusCode));
                             }
                         })
@@ -2251,8 +2252,8 @@ class Request extends module_1.default {
                         if (aborted) {
                             return;
                         }
-                        abortResponse();
                         if (++retries <= this._config.retryLimit) {
+                            abortResponse();
                             retryTimeout();
                         }
                         else {
@@ -2294,7 +2295,7 @@ class Request extends module_1.default {
             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.8.19",
+  "version": "0.8.21",
   "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.8.19",
-    "@e-mc/types": "0.8.19",
+    "@e-mc/module": "0.8.21",
+    "@e-mc/types": "0.8.21",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",

package/util.d.ts

@@ -1,3 +1,5 @@
+import type { AuthValue } from '@e-mc/types/lib/http';
+
 import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 
 declare namespace util {