@e-mc/request 0.9.0 → 0.9.2

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2024 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2024 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/request
 
-* NodeJS 14/16
+* NodeJS 16
 * ES2020
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.0/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.2/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -199,27 +199,11 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 });
 ```
 
-## NodeJS 14 LTS
-
-Any optional fail safe dependencies were removed as of `E-mc 0.9`. The code itself will still be *ES2020* and will continue to work equivalently when self-installing these dependencies:
-
-### Under 15.4 + 16.0
-
-```sh
-npm i abort-controller event-target-shim
-```
-
-### Under 14.17 + 15.6
-
-```sh
-  npm i uuid
-```
-
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.0/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.2/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 '../../../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 '../types/lib';
+
+declare const Request: RequestConstructor;
+
 export = Request;

package/index.js

@@ -35,7 +35,6 @@ const kStatusOn = Symbol('statusOn');
 const kHeadersOn = Symbol('headersOn');
 const PLATFORM_WIN32 = process.platform === 'win32';
 const SUPPORT_NODEJS20 = module_1.supported(20);
-const SUPPORT_ABORTSIGNAL = module_1.supported(15, 3) || module_1.supported(14, 17, 0, true);
 const HTTP = {
     HOST: {},
     HEADERS: {},
@@ -878,7 +877,12 @@ class Request extends module_1 {
         const resolved = this[kConnectDns][hostname] || DNS.CACHE[hostname];
         if (resolved) {
             return (...args) => {
-                return SUPPORT_NODEJS20 ? args[2](null, resolved) : args[2](null, resolved[0].address, resolved[0].family);
+                if (SUPPORT_NODEJS20) {
+                    args[2](null, resolved);
+                }
+                else {
+                    args[2](null, resolved[0].address, resolved[0].family);
+                }
             };
         }
         const pending = (_o = this[kPendingDns])[hostname] || (_o[hostname] = []);
@@ -1658,7 +1662,7 @@ class Request extends module_1 {
         if (timeout > 0) {
             request.setTimeout(timeout);
         }
-        if ((getting || posting) && SUPPORT_ABORTSIGNAL) {
+        if (getting || posting) {
             const ac = new AbortController();
             this[kDownloading].add(options.outAbort = ac);
             stream.addAbortSignal(ac.signal, request);
@@ -1833,11 +1837,14 @@ class Request extends module_1 {
             opts.encoding = (0, types_1.getEncoding)(opts.encoding);
         }
         return new Promise((resolve, reject) => {
-            const { silent = this[kSingleton], pipeTo } = opts;
-            const log = LOG_HTTP && LOG_TIMEPROCESS && !silent;
+            const pipeTo = opts.pipeTo;
+            const status = opts.silent === false || !opts.silent && !this[kSingleton];
+            let log = status && LOG_HTTP && LOG_TIMEPROCESS, retries = 0, redirects = 0, closed, timeout, outStream;
             const startTime = log ? process.hrtime() : 0;
-            let retries = 0, redirects = 0, closed, timeout, outStream;
             const throwError = (err, outAbort) => {
+                if (timeout) {
+                    clearTimeout(timeout);
+                }
                 if (!closed) {
                     closed = true;
                     if (outStream && (0, types_1.isString)(pipeTo)) {
@@ -1845,9 +1852,6 @@ class Request extends module_1 {
                     }
                     reject(typeof err === 'string' ? new Error(err) : err);
                 }
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
                 if (outAbort) {
                     this[kDownloading].delete(outAbort);
                 }
@@ -1881,7 +1885,8 @@ class Request extends module_1 {
                     const isUnsupported = (value) => value === 421 || value === 505;
                     const isDowngrade = (err) => err instanceof Error && (err.code === 'ERR_HTTP2_ERROR' || isUnsupported(Math.abs(err.errno)));
                     const wasAborted = (err) => err instanceof Error && err.message.startsWith("Aborted");
-                    const formatWarning = (message) => LOG_HTTP && !silent && this.formatMessage(1024, 'HTTP' + httpVersion, [message, host.origin], url.toString(), { titleBgColor: 'bgGrey', titleColor: 'yellow' });
+                    const sendWarning = (message) => status && LOG_HTTP && this.formatMessage(1024, 'HTTP' + httpVersion, [message, host.origin], url.toString(), { ...module_1.LOG_STYLE_WARN });
+                    const formatRetry = (message) => message + ` (${retries} / ${this._config.retryLimit})`;
                     const formatNgFlags = (value, statusCode, location) => location ? `Using HTTP 1.1 for URL redirect (${location})` : formatStatus(statusCode, value ? 'NGHTTP2 Error ' + value : '');
                     const abortResponse = () => {
                         if (closed) {
@@ -1901,7 +1906,7 @@ class Request extends module_1 {
                         client.destroy();
                     };
                     const retryTimeout = () => {
-                        formatWarning(`Connection timeout (${retries} / ${this._config.retryLimit})`);
+                        sendWarning(formatRetry('Connection timeout'));
                         downloadUri.call(this, href);
                     };
                     const acceptResponse = (headers) => {
@@ -1911,9 +1916,8 @@ class Request extends module_1 {
                         if ('outFilename' in opts) {
                             opts.outFilename = (0, util_1.parseHeader)(headers, 'content-disposition');
                         }
-                        const buffering = request.connected?.call(client, headers);
                         const pipeline = pipeTo ? !(0, types_1.isString)(pipeTo) : false;
-                        const enabled = buffering !== false && !pipeline;
+                        const enabled = request.connected?.call(client, headers) !== false && !pipeline;
                         const maxBufferSize = request.maxBufferSize ? (0, types_1.alignSize)(request.maxBufferSize) : 0;
                         const { host: parent, readTimeout } = this;
                         const contentLength = parent && progressId !== undefined ? parseInt(headers['content-length'] || '0') : 0;
@@ -1927,13 +1931,18 @@ class Request extends module_1 {
                                     }, readTimeout);
                                 }
                                 if (log) {
-                                    switch (this.settings?.time_format || LOG_TIMEFORMAT) {
+                                    switch (this.settings.time_format || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
                                             break;
                                         case 'relative':
                                             delayTime = Date.now() - this.startTime;
                                             break;
+                                        case 'none':
+                                            if (opts.silent !== false) {
+                                                log = false;
+                                            }
+                                            break;
                                     }
                                 }
                                 mibsTime = process.hrtime();
@@ -1984,8 +1993,7 @@ class Request extends module_1 {
                                 this[kDownloading].delete(outAbort);
                             }
                             closed = true;
-                            let messageUnit, titleBgColor;
-                            let result;
+                            let result, messageUnit, titleBgColor;
                             if (buffer) {
                                 if (Array.isArray(buffer)) {
                                     buffer = Buffer.concat(buffer);
@@ -2030,7 +2038,7 @@ class Request extends module_1 {
                                             }
                                         }
                                         catch (err) {
-                                            if (!silent && !this[kSingleton] && !(packageName && this.checkPackage(err, packageName))) {
+                                            if (status && !(packageName && this.checkPackage(err, packageName))) {
                                                 this.writeFail(['Unable to parse URI response', format], err, 1024);
                                             }
                                             result = null;
@@ -2106,7 +2114,7 @@ class Request extends module_1 {
                             }
                             if (offset > 0) {
                                 if (offset <= this._config.retryAfter) {
-                                    formatWarning(`Retry After (${retryAfter})`);
+                                    sendWarning(`Retry After (${retryAfter})`);
                                     setTimeout(() => downloadUri.call(this, href), offset);
                                 }
                                 else {
@@ -2115,7 +2123,7 @@ class Request extends module_1 {
                                 return;
                             }
                         }
-                        formatWarning(Request.fromStatusCode(statusCode) + ` (${retries} / ${this._config.retryLimit})`);
+                        sendWarning(formatRetry(Request.fromStatusCode(statusCode)));
                         if ((0, util_1.isRetryable)(statusCode, true)) {
                             process.nextTick(downloadUri.bind(this), href);
                         }
@@ -2132,7 +2140,7 @@ class Request extends module_1 {
                             if (downgrade) {
                                 host.failed(2);
                                 if (host.version > 1) {
-                                    if (!silent) {
+                                    if (status && LOG_HTTP) {
                                         this.formatMessage(1024, 'HTTP2', ['Unsupported protocol', host.origin], message, { failed: true });
                                     }
                                     host.version = 1;
@@ -2194,18 +2202,19 @@ class Request extends module_1 {
                             }
                             if (wasAborted(err)) {
                                 errorResponse(err);
-                                return;
                             }
-                            switch (!isDowngrade(err) && await host.hasProtocol(2)) {
-                                case 1:
-                                    errorResponse(err);
-                                    break;
-                                case 2:
-                                    retryDownload(false, err);
-                                    break;
-                                default:
-                                    retryDownload(true, err);
-                                    break;
+                            else {
+                                switch (!isDowngrade(err) && await host.hasProtocol(2)) {
+                                    case 1:
+                                        errorResponse(err);
+                                        break;
+                                    case 2:
+                                        retryDownload(false, err);
+                                        break;
+                                    default:
+                                        retryDownload(true, err);
+                                        break;
+                                }
                             }
                         });
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.9.0",
-    "@e-mc/types": "0.9.0",
+    "@e-mc/module": "0.9.2",
+    "@e-mc/types": "0.9.2",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2",