@e-mc/request 0.8.3 → 0.8.5

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2024 Mile Square Park
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,7 @@
-### @e-mc/request
+# @e-mc/request
 
-https://e-mc.readthedocs.io
+PEP 402
 
-### LICENSE
+## LICENSE
 
-BSD 3-Clause
+MIT

package/index.js

@@ -722,7 +722,7 @@ class Request extends module_1.default {
                         const args = [];
                         for (let i = 0; i < log.length; ++i) {
                             const item = log[i];
-                            if (Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
+                            if (item[1] === title && Array.isArray(item[2]) && item[2][0].startsWith(origin)) {
                                 item[1] = '';
                                 item[2][0] = item[2][0].substring(origin.length);
                                 item[4].titleBgColor = undefined;
@@ -731,12 +731,17 @@ class Request extends module_1.default {
                                 log.splice(i--, 1);
                             }
                         }
-                        output.push([title, origin, value, args]);
+                        output.push([title, origin, value, args.sort((a, b) => a[2][0] < b[2][0] ? -1 : 1)]);
                         count = Math.max(count, value);
                     }
                 });
                 if (LOG_STDOUT) {
-                    output.sort((a, b) => b[2] - a[2]);
+                    output.sort((a, b) => {
+                        if (a[2] === b[2]) {
+                            return a[1] < b[1] ? -1 : 1;
+                        }
+                        return b[2] - a[2];
+                    });
                     const width = count.toString().length;
                     output.forEach(item => {
                         const [title, origin, downloads, messages] = item;
@@ -779,7 +784,7 @@ class Request extends module_1.default {
     }
     init(config) {
         if (config) {
-            const { headers, httpVersion, ipVersion, requestTimeout } = config;
+            const { headers, httpVersion, ipVersion, requestTimeout, readTimeout = requestTimeout } = config;
             if ((0, types_1.isObject)(headers)) {
                 setOutgoingHeaders(this[kHeaders] || (this[kHeaders] = {}), headers);
             }
@@ -789,8 +794,8 @@ class Request extends module_1.default {
             if (ipVersion !== undefined) {
                 this.ipVersion = ipVersion;
             }
-            if (requestTimeout !== undefined) {
-                this.readTimeout = (0, util_1.fromSeconds)(requestTimeout);
+            if (readTimeout !== undefined) {
+                this.readTimeout = (0, util_1.fromSeconds)(readTimeout);
             }
         }
         return this;
@@ -950,35 +955,35 @@ class Request extends module_1.default {
             }
         }
     }
-    statusOn(code, patternUrl = '*', callback) {
-        if (typeof patternUrl === 'function') {
-            callback = patternUrl;
-            patternUrl = '*';
+    statusOn(code, globUrl = '*', callback) {
+        if (typeof globUrl === 'function') {
+            callback = globUrl;
+            globUrl = '*';
         }
-        if ((0, types_1.isString)(patternUrl) && typeof callback === 'function') {
+        if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
             const on = this[kStatusOn] || (this[kStatusOn] = new Map());
             for (const item of !Array.isArray(code) ? [code] : code) {
                 let status = on.get(item);
                 if (!status) {
                     on.set(item, status = []);
                 }
-                status.push([patternUrl, callback]);
+                status.push([globUrl, callback]);
             }
         }
     }
-    headersOn(name, patternUrl = '*', callback) {
-        if (typeof patternUrl === 'function') {
-            callback = patternUrl;
-            patternUrl = '*';
+    headersOn(name, globUrl = '*', callback) {
+        if (typeof globUrl === 'function') {
+            callback = globUrl;
+            globUrl = '*';
         }
-        if ((0, types_1.isString)(patternUrl) && typeof callback === 'function') {
+        if ((0, types_1.isString)(globUrl) && typeof callback === 'function') {
             const on = this[kHeadersOn] || (this[kHeadersOn] = new Map());
             for (const item of !Array.isArray(name) ? [name] : name) {
                 let headers = on.get(item);
                 if (!headers) {
                     on.set(item, headers = []);
                 }
-                headers.push([patternUrl, callback]);
+                headers.push([globUrl, callback]);
             }
         }
     }
@@ -1464,7 +1469,7 @@ class Request extends module_1.default {
             }
         }
         if (!proxy && httpVersion !== 1 && ((httpVersion || host.version) === 2 && version !== 1 || secure && version === 2 && host.failed(2, true) === 0)) {
-            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { initialWindowSize: 4294967295 /* CONSTANTS.INITIAL_WINDOW_SIZE */, maxFrameSize: 16777215 /* CONSTANTS.MAX_FRAME_SIZE */, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { maxFrameSize: 16777215 /* CONSTANTS.MAX_FRAME_SIZE */, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1921,9 +1926,6 @@ class Request extends module_1.default {
                                     }, readTimeout);
                                 }
                                 if (log) {
-                                    if (buffering === false) {
-                                        mibsTime = process.hrtime();
-                                    }
                                     switch (this.settings?.time_format || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
@@ -1932,6 +1934,7 @@ class Request extends module_1.default {
                                             delayTime = Date.now() - this.startTime;
                                             break;
                                     }
+                                    mibsTime = process.hrtime();
                                 }
                             });
                         }
@@ -1949,9 +1952,6 @@ class Request extends module_1.default {
                                     }
                                 }
                                 else {
-                                    if (log) {
-                                        mibsTime = process.hrtime();
-                                    }
                                     buffer = typeof chunk === 'string' ? chunk : [chunk];
                                 }
                             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,11 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.3",
-    "@e-mc/types": "0.8.3",
+    "@e-mc/module": "0.8.5",
+    "@e-mc/types": "0.8.5",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",

package/util.js

@@ -138,9 +138,9 @@ exports.asFloat = asFloat;
 function fromSeconds(value) {
     switch (typeof value) {
         case 'string':
-            return safeInt(Math.ceil(parseFloat(value)) * 1000 /* TIME.S */);
+            return safeInt(parseInt(value) * 1000 /* TIME.S */);
         case 'number':
-            return safeInt(value * 1000 /* TIME.S */);
+            return safeInt(Math.trunc(value) * 1000 /* TIME.S */);
         default:
             return NaN;
     }