@e-mc/request 0.10.8 → 0.10.10

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.8/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.8/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.8/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.8/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

@@ -1,15 +1,15 @@
 "use strict";
-var _a;
 const fs = require("node:fs");
 const http2 = require("node:http2");
 const yaml = require("js-yaml");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 const util_1 = require("@e-mc/request/util");
-const kOutStream = Symbol('outStream');
-const kOptions = Symbol('options');
 let LOG_TIMEFORMAT = 'readable';
 class HttpAdapter {
+    instance;
+    state;
+    uri;
     static isUnsupported(value) {
         return value === 421 || value === 505;
     }
@@ -38,20 +38,26 @@ class HttpAdapter {
                 break;
         }
     }
+    contentLength = 0;
+    retries = 0;
+    redirects = 0;
+    closed = false;
+    aborted = false;
+    timeout = null;
+    dataTime = null;
+    delayTime = undefined;
+    opts;
+    client;
+    resolve;
+    reject;
+    startTime;
+    #outStream = null;
+    #options;
     constructor(instance, state, uri, options) {
         this.instance = instance;
         this.state = state;
         this.uri = uri;
-        this.contentLength = 0;
-        this.retries = 0;
-        this.redirects = 0;
-        this.closed = false;
-        this.aborted = false;
-        this.timeout = null;
-        this.dataTime = null;
-        this.delayTime = undefined;
-        this[_a] = null;
-        this[kOptions] = options;
+        this.#options = options;
         this.startTime = state.log ? process.hrtime.bigint() : BigInt(0);
         this.setOpts();
     }
@@ -91,14 +97,14 @@ class HttpAdapter {
                     this.retryResponse(statusCode, headers['retry-after']);
                 }
                 else if (HttpAdapter.isUnsupported(statusCode)) {
-                    this.retryDownload(true, this.formatNgFlags(http2.constants.NGHTTP2_PROTOCOL_ERROR, statusCode));
+                    this.retryDownload(true, this.#formatNgFlags(http2.constants.NGHTTP2_PROTOCOL_ERROR, statusCode));
                 }
                 else {
                     switch (flags) {
                         case http2.constants.NGHTTP2_PROTOCOL_ERROR:
                         case http2.constants.NGHTTP2_INADEQUATE_SECURITY:
                         case http2.constants.NGHTTP2_HTTP_1_1_REQUIRED:
-                            this.retryDownload(true, this.formatNgFlags(flags, statusCode, headers.location));
+                            this.retryDownload(true, this.#formatNgFlags(flags, statusCode, headers.location));
                             break;
                         default:
                             this.retryDownload(false, this.formatStatus(statusCode));
@@ -186,7 +192,7 @@ class HttpAdapter {
         if (uri) {
             this.uri = uri;
         }
-        this.opts = this.instance.opts(this.uri, this[kOptions]);
+        this.opts = this.instance.opts(this.uri, this.#options);
     }
     setWriteStream() {
         const pipeTo = this.pipeTo;
@@ -359,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);
@@ -371,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)
@@ -454,7 +460,7 @@ class HttpAdapter {
                 return;
             }
         }
-        this.sendWarning(this.formatRetry((0, util_1.fromStatusCode)(statusCode)));
+        this.sendWarning(this.#formatRetry((0, util_1.fromStatusCode)(statusCode)));
         if ((0, util_1.isRetryable)(statusCode, true)) {
             setImmediate(this.init.bind(this));
         }
@@ -468,7 +474,7 @@ class HttpAdapter {
         return (0, util_1.isRetryable)(value) && ++this.retries <= this.retryLimit;
     }
     retryTimeout() {
-        this.sendWarning(this.formatRetry("HTTP connection timeout"));
+        this.sendWarning(this.#formatRetry("HTTP connection timeout"));
         this.init();
     }
     terminate(err) {
@@ -488,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);
@@ -501,10 +512,10 @@ class HttpAdapter {
             this.outStream = null;
         }
     }
-    formatNgFlags(value, statusCode, location) {
+    #formatNgFlags(value, statusCode, location) {
         return location ? `Using HTTP 1.1 for URL redirect (${location})` : this.formatStatus(statusCode, value ? 'NGHTTP2 Error ' + value : '');
     }
-    formatRetry(message) {
+    #formatRetry(message) {
         return `${message} (${this.retries} / ${this.retryLimit})`;
     }
     set abortController(value) {
@@ -514,13 +525,13 @@ class HttpAdapter {
         return this.opts.outAbort || null;
     }
     set outStream(value) {
-        this[kOutStream] = value;
+        this.#outStream = value;
         if (value) {
             this.opts.outStream = value;
         }
     }
     get outStream() {
-        return this[kOutStream];
+        return this.#outStream;
     }
     get destroyed() {
         return this.client.destroyed || this.httpVersion === 2 && this.client.aborted;
@@ -550,5 +561,4 @@ class HttpAdapter {
         return this.state.config.redirectLimit;
     }
 }
-_a = kOutStream;
 module.exports = HttpAdapter;

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);
@@ -2360,7 +2368,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') {
@@ -2470,6 +2478,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.10.8",
+  "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.8",
-    "@e-mc/types": "0.10.8",
+    "@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",