@e-mc/request 0.10.9 → 0.10.10

package/README.md

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

package/http/adapter/index.js

@@ -365,6 +365,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);
@@ -377,12 +378,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)
@@ -494,6 +494,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

@@ -676,7 +676,7 @@ class Fetch {
                 }
                 dataLength = Buffer.byteLength(buffer, encoding);
                 if (mibsTime) {
-                    messageUnit = (0, util_1.getTransferRate)(dataLength, (0, types_1.convertTime)(process.hrtime(mibsTime), false) * 1000);
+                    messageUnit = this.formatMibs(dataLength, mibsTime);
                 }
                 if (contentLength > 0) {
                     parent.updateProgress("request", progressId, dataLength, dataLength);
@@ -730,6 +730,9 @@ class Fetch {
                     this.terminate("No data received");
                     return;
                 }
+                if (mibsTime && (contentLength > 0 || typeof pipeTo === 'string')) {
+                    messageUnit = this.formatMibs(contentLength || (0, util_1.getSize)(pipeTo), mibsTime);
+                }
                 result = encoding && !pipeline ? '' : null;
                 titleBgColor = 'bgBlue';
             }
@@ -843,6 +846,11 @@ class Fetch {
     formatRetry(message) {
         return message + ` (${this.retries} / ${this.retryLimit})`;
     }
+    formatMibs(dataLength, mibsTime) {
+        if (dataLength > 0) {
+            return (0, util_1.getTransferRate)(dataLength, Math.max(1, (0, types_1.convertTime)(process.hrtime(mibsTime), false) * 1000));
+        }
+    }
     close() {
         if (this.timeout) {
             clearTimeout(this.timeout);

package/package.json

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