@e-mc/request 0.9.1 → 0.9.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -201,9 +201,9 @@ instance.get("http://hostname/path/config.yml", options).then(data => {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/http/host/index.js

@@ -100,28 +100,28 @@ class HttpHost {
                     return this._tlsConnect || (this._tlsConnect = new Promise(resolve => {
                         const alpn = 'h' + version;
                         const socket = tls.connect(+this.port, this.hostname, { ALPNProtocols: [alpn], requestCert: true, rejectUnauthorized: false }, () => {
-                            resolve(data[3] = alpn === socket.alpnProtocol ? 1 : 0);
                             this._tlsConnect = null;
+                            resolve(data[3] = alpn === socket.alpnProtocol ? 1 : 0);
                         });
                         socket
                             .setNoDelay(false)
                             .setTimeout(10000)
                             .on('timeout', () => {
+                            socket.destroy();
                             if (this._tlsConnect) {
+                                this._tlsConnect = null;
                                 if (this.error(version) >= 10) {
                                     resolve(data[3] = 0);
                                 }
                                 else {
                                     resolve(2);
                                 }
-                                this._tlsConnect = null;
                             }
-                            socket.destroy();
                         })
                             .on('error', () => {
                             this.failed(version);
-                            resolve(data[3] = 0);
                             this._tlsConnect = null;
+                            resolve(data[3] = 0);
                         })
                             .end();
                     }));

package/index.js

@@ -267,6 +267,61 @@ function abortHeaders(href, request, options) {
     }
     request.destroy(reason);
 }
+function checkEncoding(request, response, statusCode, outStream, contentEncoding = '') {
+    switch (statusCode) {
+        case 206:
+            request.emit('error', (0, types_1.errorValue)("Aborted", 'Partial content'));
+        case 204:
+            return;
+        default:
+            contentEncoding = contentEncoding.trim();
+            if (!contentEncoding) {
+                return;
+            }
+            contentEncoding = contentEncoding.toLowerCase();
+            break;
+    }
+    const chunkSize = outStream?.writableHighWaterMark;
+    let pipeTo;
+    if (contentEncoding.indexOf(',') === -1) {
+        pipeTo = decompressEncoding(contentEncoding, chunkSize);
+    }
+    else {
+        for (const value of contentEncoding.split(/\s*,\s*/).reverse()) {
+            const next = decompressEncoding(value, chunkSize);
+            if (!next) {
+                return;
+            }
+            pipeTo = pipeTo ? pipeTo.pipe(next) : next;
+        }
+    }
+    if (pipeTo) {
+        if (outStream) {
+            stream.pipeline(response, pipeTo, outStream, err => err && response.emit('error', err));
+        }
+        else {
+            stream.pipeline(response, pipeTo, err => err && response.emit('error', err));
+        }
+        return pipeTo;
+    }
+}
+function decompressEncoding(value, chunkSize) {
+    switch (value) {
+        case 'gzip':
+            return zlib.createGunzip({ chunkSize });
+        case 'br':
+            return zlib.createBrotliDecompress({ chunkSize });
+        case 'deflate':
+            return zlib.createInflate({ chunkSize });
+        case 'deflate-raw':
+            return zlib.createInflateRaw({ chunkSize });
+        case 'zstd':
+            if (LIB_ZSTD) {
+                return new LIB_ZSTD.ZstdDecompressTransform({ writableHighWaterMark: chunkSize });
+            }
+            break;
+    }
+}
 class Request extends module_1 {
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (percent >= 1) {
@@ -877,7 +932,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] = []);
@@ -1414,44 +1474,6 @@ class Request extends module_1 {
             }
             uri = url.href;
         }
-        const checkEncoding = (response, statusCode, contentEncoding = '') => {
-            switch (statusCode) {
-                case 206:
-                    request.emit('error', (0, types_1.errorValue)("Aborted", 'Partial content'));
-                case 204:
-                    return;
-            }
-            const chunkSize = outStream?.writableHighWaterMark;
-            let pipeTo;
-            switch (contentEncoding.trim().toLowerCase()) {
-                case 'gzip':
-                    pipeTo = zlib.createGunzip({ chunkSize });
-                    break;
-                case 'br':
-                    pipeTo = zlib.createBrotliDecompress({ chunkSize });
-                    break;
-                case 'deflate':
-                    pipeTo = zlib.createInflate({ chunkSize });
-                    break;
-                case 'deflate-raw':
-                    pipeTo = zlib.createInflateRaw({ chunkSize });
-                    break;
-                case 'zstd':
-                    if (LIB_ZSTD) {
-                        pipeTo = new LIB_ZSTD.ZstdDecompressTransform({ writableHighWaterMark: chunkSize });
-                    }
-                    break;
-            }
-            if (pipeTo) {
-                if (outStream) {
-                    stream.pipeline(response, pipeTo, outStream, err => err && response.emit('error', err));
-                }
-                else {
-                    stream.pipeline(response, pipeTo, err => err && response.emit('error', err));
-                }
-                return pipeTo;
-            }
-        };
         const { hostname, origin, secure, localhost } = host;
         const pathname = url.pathname + (socketPath ? '' : url.search);
         const proxy = this.proxyOf(uri, localhost);
@@ -1477,7 +1499,8 @@ class Request extends module_1 {
                     connected = true;
                     const statusCode = response[':status'];
                     if (this.matchStatus(statusCode, url, response, request, options) && statusCode >= 200 && statusCode < 300) {
-                        if (emitter = checkEncoding(request, statusCode, response['content-encoding'])) {
+                        emitter = checkEncoding(request, request, statusCode, outStream, response['content-encoding']);
+                        if (emitter) {
                             for (const event in listenerMap) {
                                 listenerMap[event].forEach(listener => {
                                     const [name, type] = event.split('-');
@@ -1598,7 +1621,7 @@ class Request extends module_1 {
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
                 if (this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 && statusCode < 300) {
-                    let source = checkEncoding(response, statusCode, incoming['content-encoding']);
+                    let source = checkEncoding(request, response, statusCode, outStream, incoming['content-encoding']);
                     if (source) {
                         source.once('finish', () => request.emit('end'));
                     }
@@ -1832,11 +1855,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)) {
@@ -1844,9 +1870,6 @@ class Request extends module_1 {
                     }
                     reject(typeof err === 'string' ? new Error(err) : err);
                 }
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
                 if (outAbort) {
                     this[kDownloading].delete(outAbort);
                 }
@@ -1880,7 +1903,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) {
@@ -1900,7 +1924,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) => {
@@ -1910,9 +1934,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;
@@ -1926,13 +1949,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();
@@ -1983,8 +2011,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);
@@ -2029,7 +2056,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;
@@ -2051,10 +2078,10 @@ class Request extends module_1 {
                                 result = encoding && !pipeline ? '' : null;
                                 titleBgColor = 'bgBlue';
                             }
-                            resolve(result);
                             if (log) {
                                 this.writeTimeProcess('HTTP' + httpVersion, request.statusMessage || url.toString(), startTime, { type: 1024, queue: !!this.host, titleBgColor, messageUnit, messageUnitMinWidth: 9, delayTime, bypassLog: LOG_STDOUT });
                             }
+                            resolve(result);
                         });
                         host.success(httpVersion);
                     };
@@ -2105,7 +2132,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 {
@@ -2114,7 +2141,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);
                         }
@@ -2131,7 +2158,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;
@@ -2193,18 +2220,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.1",
+  "version": "0.9.3",
   "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.1",
-    "@e-mc/types": "0.9.1",
+    "@e-mc/module": "0.9.3",
+    "@e-mc/types": "0.9.3",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^4.0.2",