@e-mc/request 0.11.3 → 0.11.5

package/README.md

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

package/http/adapter/index.js

@@ -359,6 +359,7 @@ class HttpAdapter {
                     this.terminate("No data received");
                     return;
                 }
+                dataLength = this.contentLength || (typeof this.pipeTo === 'string' ? (0, util_1.getSize)(this.pipeTo) : 0);
                 result = encoding && !pipeline ? '' : null;
             }
             this.endResponse(result, dataLength, log);
@@ -371,12 +372,11 @@ class HttpAdapter {
     }
     endResponse(result, dataLength = 0, logging = this.state.log) {
         if (logging) {
-            const messageUnit = this.dataTime && dataLength > 0 ? (0, util_1.getTransferRate)(dataLength, (0, types_1.convertTime)(process.hrtime.bigint() - this.dataTime, false) * 1000) : undefined;
             this.instance.writeTimeProcess('HTTP' + this.httpVersion, this.opts.statusMessage || this.uri.toString(), this.startTime, {
                 type: 1024,
                 queue: !!this.instance.host,
                 titleBgColor: !result ? 'bgBlue' : undefined,
-                messageUnit,
+                messageUnit: this.formatMibs(dataLength),
                 messageUnitMinWidth: 9,
                 delayTime: this.delayTime,
                 bypassLog: module_1.hasLogType(32768)
@@ -488,6 +488,11 @@ class HttpAdapter {
     formatStatus(value, hint) {
         return value + ': ' + (hint || (0, util_1.fromStatusCode)(value)) + ` (${this.uri.toString()})`;
     }
+    formatMibs(dataLength) {
+        if (dataLength > 0 && this.dataTime) {
+            return (0, util_1.getTransferRate)(dataLength, Math.max(1, (0, types_1.convertTime)(process.hrtime.bigint() - this.dataTime, false) * 1000));
+        }
+    }
     close() {
         this.closed = true;
         this.instance.reset(this);

package/index.js

@@ -37,6 +37,7 @@ const kStatusOn = Symbol('statusOn');
 const kHeadersOn = Symbol('headersOn');
 const kAdapter = Symbol('adapter');
 const SUPPORTED_NODE20 = (0, types_1.supported)(20);
+const SUPPORTED_ZSTD = (0, types_1.supported)(23, 8) && typeof zlib.createZstdDecompress === 'function';
 const REGEXP_PEMCERT = /^-{3,}[ \t]*BEGIN[ \t].+\n-{3,}[ \t]*END[ \t][^-]+-{3,}$/s;
 const REGEXP_GLOBWITHIN = /\\\?|(?:(?<!\\)(?:\*|\[!?[^!\]]+\]|\{(?:[^,]+,)+[^}]+\}|[!?+*@]\((?:[^|]+\|)*[^)]+\)|\?.*\?|\?$))/;
 const HTTP = {
@@ -328,6 +329,9 @@ function decompressEncoding(value, chunkSize) {
             if (LIB_ZSTD) {
                 return new LIB_ZSTD.ZstdDecompressTransform({ writableHighWaterMark: chunkSize });
             }
+            if (SUPPORTED_ZSTD) {
+                return zlib.createZstdDecompress({ chunkSize });
+            }
             break;
     }
 }
@@ -1433,7 +1437,7 @@ class Request extends module_1 {
         const baseHeaders = this.headersOf(uri);
         let request, ca, cert, key, ciphers, minVersion;
         if (getting && this.acceptEncoding && !host.localhost && !baseHeaders?.['accept-encoding']) {
-            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : '');
+            (headers ||= {})['accept-encoding'] ||= 'gzip, deflate, br' + (LIB_ZSTD || SUPPORTED_ZSTD ? ', zstd' : '');
         }
         if (posting && options.postData) {
             if (expectContinue) {
@@ -1767,7 +1771,7 @@ class Request extends module_1 {
         else {
             options = {};
         }
-        const headers = (0, util_1.parseOutgoingHeaders)(options.headers ||= {});
+        const headers = (0, util_1.parseOutgoingHeaders)(options.headers) || {};
         for (const attr in headers) {
             const name = attr.toLowerCase();
             if (name === 'content-type' || name === 'content-length') {
@@ -1877,6 +1881,7 @@ class Request extends module_1 {
         options.httpVersion = 1;
         options.postData = data;
         headers['content-type'] = contentType || "text/plain";
+        options.headers = headers;
         return this.get(uri, options);
     }
     async get(uri, options) {

package/package.json

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