@e-mc/request 0.7.6 → 0.7.8

package/README.md

@@ -1,7 +1,5 @@
 # @e-mc/request
 
-PEP 402 - Forever 2056
-
 ## LICENSE
 
 MIT

package/http/host/index.js

@@ -102,28 +102,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

@@ -257,6 +257,61 @@ function validateCerts(certs) {
     }
     return [text, file];
 }
+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 === null || outStream === void 0 ? void 0 : 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.default {
     static purgeMemory(percent = 1, limit = 0, parent) {
         if (percent >= 1) {
@@ -1366,44 +1421,6 @@ class Request extends module_1.default {
             url = new URL(uri);
             options.url = url;
         }
-        const checkEncoding = (response, statusCode, contentEncoding = '') => {
-            switch (statusCode) {
-                case 206:
-                    request.emit('error', new Error('[ABORT] Partial content'));
-                case 204:
-                    return;
-            }
-            const chunkSize = outStream === null || outStream === void 0 ? void 0 : 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);
@@ -1429,7 +1446,8 @@ class Request extends module_1.default {
                     connected = true;
                     const statusCode = response[':status'];
                     if (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('-');
@@ -1550,7 +1568,7 @@ class Request extends module_1.default {
                 const statusCode = response.statusCode;
                 if ((getting || posting) && statusCode >= 200 && statusCode < 300) {
                     const incoming = response.headers;
-                    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'));
                     }
@@ -1788,6 +1806,9 @@ class Request extends module_1.default {
             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)) {
@@ -1795,9 +1816,6 @@ class Request extends module_1.default {
                     }
                     reject(typeof err === 'string' ? new Error(err) : err);
                 }
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
                 if (outAbort) {
                     this[kDownloading].delete(outAbort);
                 }
@@ -1992,10 +2010,10 @@ class Request extends module_1.default {
                                 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);
                     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "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.7.6",
-    "@e-mc/types": "0.7.6",
+    "@e-mc/module": "0.7.8",
+    "@e-mc/types": "0.7.8",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"