@e-mc/request 0.8.10 → 0.8.11

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.11/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.10/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.10/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.11/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.11/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.11/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -261,6 +261,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;
+    }
+}
 function abortHeaders(href, request, options) {
     const reason = (0, types_1.errorValue)("Aborted by client", href);
     const outAbort = options.outAbort;
@@ -1421,44 +1476,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', (0, types_1.errorValue)("Aborted", '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);
@@ -1484,7 +1501,8 @@ class Request extends module_1.default {
                     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('-');
@@ -1606,7 +1624,7 @@ class Request extends module_1.default {
                 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'));
                     }
@@ -1845,6 +1863,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)) {
@@ -1852,9 +1873,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);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.10",
+  "version": "0.8.11",
   "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.10",
-    "@e-mc/types": "0.8.10",
+    "@e-mc/module": "0.8.11",
+    "@e-mc/types": "0.8.11",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",