@e-mc/request 0.8.7 → 0.8.9

package/LICENSE

@@ -1,11 +1,7 @@
 Copyright 2024 An Pham
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+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:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+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
 
 * NodeJS 14
-* ES2020
+* ES2019
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.9/lib/index.d.ts
 
 ```typescript
 import type { IModule, ModuleConstructor } from "./index";
@@ -82,10 +82,10 @@ interface RequestConstructor extends ModuleConstructor {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/http.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.7/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.9/lib/http.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.9/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.9/lib/settings.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+MIT

package/http/host/index.js

@@ -154,6 +154,7 @@ class HttpHost {
         return ++data[2];
     }
     upgrade(version, altSvc) {
+        var _e;
         if (altSvc && this.secure) {
             if (altSvc === 'clear') {
                 this.clearAltSvc();
@@ -187,7 +188,7 @@ class HttpHost {
                         break;
                     }
                     const address = match[1] || hostname;
-                    const ma = +(/ma=(\d+)/.exec(match[3])?.[1] || 86400);
+                    const ma = +(((_e = /ma=(\d+)/.exec(match[3])) === null || _e === void 0 ? void 0 : _e[1]) || 86400);
                     if (!excluded.includes(`h${i + 1}:${address}:${port}`)) {
                         addresses.push([
                             address,

package/index.js

@@ -37,7 +37,7 @@ const kStatusOn = Symbol('statusOn');
 const kHeadersOn = Symbol('headersOn');
 const PLATFORM_WIN32 = process.platform === 'win32';
 const SUPPORT_NODEJS20 = module_1.default.supported(20);
-const SUPPORT_ABORTSIGNAL = module_1.default.supported(15, 3) || module_1.default.supported(14, 17, 0, true);
+const SUPPORT_ABORTSIGNAL = module_1.default.supported(15, 4);
 const HTTP = {
     HOST: {},
     HEADERS: {},
@@ -106,7 +106,7 @@ function getBaseHeaders(uri, headers) {
     }
 }
 function setDnsCache(hostname, value, expires) {
-    expires ?? (expires = DNS.EXPIRES);
+    expires !== null && expires !== void 0 ? expires : (expires = DNS.EXPIRES);
     if (expires > 0 && !DNS.CACHE[hostname]) {
         DNS.CACHE[hostname] = value;
         if (expires !== Infinity) {
@@ -137,7 +137,7 @@ function setOutgoingHeaders(output, headers) {
 }
 function getProxySettings(request, agentTimeout) {
     const proxy = request.proxy;
-    if (proxy?.address && proxy.port) {
+    if ((proxy === null || proxy === void 0 ? void 0 : proxy.address) && proxy.port) {
         const port = (0, util_1.asInt)(proxy.port);
         const address = (!module_1.default.isURL(proxy.address) ? port === 80 ? 'http://' : 'https://' : '') + proxy.address;
         try {
@@ -285,6 +285,7 @@ class Request extends module_1.default {
         return parent ? super.purgeMemory(percent, limit) : 0;
     }
     static loadSettings(settings, password) {
+        var _o;
         if (this.enabled("process.password") && !super.loadSettings({ process: settings.process }, password)) {
             return false;
         }
@@ -403,7 +404,7 @@ class Request extends module_1.default {
                 [TLS.TEXT, TLS.FILE] = validateCerts(certs);
             }
             HTTP.PROXY = getProxySettings(request, agent_timeout);
-            const time_format = request.settings?.time_format;
+            const time_format = (_o = request.settings) === null || _o === void 0 ? void 0 : _o.time_format;
             switch (time_format) {
                 case 'readable':
                 case 'relative':
@@ -628,6 +629,7 @@ class Request extends module_1.default {
         return ARIA2.BIN;
     }
     constructor(data) {
+        var _o;
         super();
         this.startTime = Date.now();
         this.readExpect = 'none';
@@ -659,13 +661,13 @@ class Request extends module_1.default {
             const timeout = (0, util_1.fromSeconds)(data.timeout);
             let value;
             this.readTimeout = (value = (0, util_1.fromSeconds)(read_timeout)) >= 0 ? value : READ_TIMEOUT;
-            this.keepAlive = typeof (value = agent?.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
-            this.acceptEncoding = typeof (value = use?.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
-            if ((value = (0, util_1.asInt)(use?.http_version)) === 1 || value === 2) {
+            this.keepAlive = typeof (value = agent === null || agent === void 0 ? void 0 : agent.keep_alive) === 'boolean' ? value : KEEP_ALIVE;
+            this.acceptEncoding = typeof (value = use === null || use === void 0 ? void 0 : use.accept_encoding) === 'boolean' ? value : ACCEPT_ENCODING;
+            if ((value = (0, util_1.asInt)(use === null || use === void 0 ? void 0 : use.http_version)) === 1 || value === 2) {
                 this[kHttpVersion] = value;
             }
-            this[kIpVersion] = (value = (0, util_1.asInt)(data.dns?.family)) && (value === 4 || value === 6) ? value : 0;
-            if ((value = (0, util_1.fromSeconds)(agent?.timeout)) >= 0) {
+            this[kIpVersion] = (value = (0, util_1.asInt)((_o = data.dns) === null || _o === void 0 ? void 0 : _o.family)) && (value === 4 || value === 6) ? value : 0;
+            if ((value = (0, util_1.fromSeconds)(agent === null || agent === void 0 ? void 0 : agent.timeout)) >= 0) {
                 this[kAgentTimeout] = value;
             }
             else {
@@ -707,12 +709,13 @@ class Request extends module_1.default {
         this.module = data;
     }
     flushLog() {
+        var _o;
         const log = this._logQueued;
         if (this[kSingleton]) {
             log.length = 0;
         }
         else {
-            if (log.length && !this.host?.aborted) {
+            if (log.length && !((_o = this.host) === null || _o === void 0 ? void 0 : _o.aborted)) {
                 const output = [];
                 let count = 0;
                 this[kConnectHttp].forEach((protocol, index) => {
@@ -1071,8 +1074,9 @@ class Request extends module_1.default {
         if (!module_1.default.createDir(pathname)) {
             return Promise.reject((0, types_1.errorMessage)("aria2", "Path is not a directory", pathname));
         }
-        silent ?? (silent = this[kSingleton]);
+        silent !== null && silent !== void 0 ? silent : (silent = this[kSingleton]);
         return new Promise((resolve, reject) => {
+            var _o;
             let protocol, origin, username, password;
             if (uri instanceof URL) {
                 ({ protocol, origin, username, password, href: uri } = uri);
@@ -1130,7 +1134,7 @@ class Request extends module_1.default {
                 '--file-allocation=' + ARIA2.FILE_ALLOCATION,
                 '--max-tries=' + (retryLimit + 1)
             ];
-            const ignoreOpt = (...values) => !binOpts?.some(item => values.includes(item));
+            const ignoreOpt = (...values) => !(binOpts === null || binOpts === void 0 ? void 0 : binOpts.some(item => values.includes(item)));
             if (ARIA2.MAX_CONCURRENT_DOWNLOADS) {
                 opts.push('--max-concurrent-downloads=' + ARIA2.MAX_CONCURRENT_DOWNLOADS);
             }
@@ -1179,7 +1183,7 @@ class Request extends module_1.default {
                     }
                 }
                 if (origin) {
-                    const secure = this[kCerts]?.[1][origin] || (this.host ? TLS.FILE[origin] : null);
+                    const secure = ((_o = this[kCerts]) === null || _o === void 0 ? void 0 : _o[1][origin]) || (this.host ? TLS.FILE[origin] : null);
                     if (secure) {
                         if (secure.ca && ignoreOpt('--ca-certificate')) {
                             args.push(`--ca-certificate="${escapeQuote(secure.ca)}"`);
@@ -1329,7 +1333,7 @@ class Request extends module_1.default {
                                     }
                                     else {
                                         const current = (0, types_1.getLogCurrent)();
-                                        progressBar = current?.type === 128 && current.title === "aria2";
+                                        progressBar = (current === null || current === void 0 ? void 0 : current.type) === 128 && current.title === "aria2";
                                     }
                                     this.formatMessage(128, "aria2", ['Downloading...', (0, types_1.formatTime)(startTime, true)], (PLATFORM_WIN32 ? 'taskkill /f /pid' : 'kill') + ` ${item[0]} -> ` + item[1], { ...module_1.default.LOG_STYLE_INFO, progressBar, broadcastId });
                                 }
@@ -1368,7 +1372,8 @@ class Request extends module_1.default {
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _o, _p;
+        var _o;
+        var _p, _q;
         let { host, url, httpVersion, method = 'GET', encoding, format, headers, postData, keepAlive, agentTimeout, socketPath, timeout = this._config.connectTimeout, outStream } = options;
         const getting = method === 'GET';
         const posting = method === 'POST';
@@ -1423,7 +1428,7 @@ class Request extends module_1.default {
                 case 204:
                     return;
             }
-            const chunkSize = outStream?.writableHighWaterMark;
+            const chunkSize = outStream === null || outStream === void 0 ? void 0 : outStream.writableHighWaterMark;
             let pipeTo;
             switch (contentEncoding.trim().toLowerCase()) {
                 case 'gzip':
@@ -1459,17 +1464,17 @@ class Request extends module_1.default {
         const proxy = this.proxyOf(uri, localhost);
         const version = this.httpVersion;
         let request, ca, cert, key, minVersion, baseHeaders = this.headersOf(uri);
-        if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
-            (_o = (headers || (headers = {})))['accept-encoding'] || (_o['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+        if (getting && this.acceptEncoding && !localhost && !(baseHeaders === null || baseHeaders === void 0 ? void 0 : baseHeaders['accept-encoding'])) {
+            (_p = (headers || (headers = {})))['accept-encoding'] || (_p['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
         }
         if (secure) {
-            const certs = this[kCerts]?.[0][origin] || (this.host ? TLS.TEXT[origin] : null);
+            const certs = ((_o = this[kCerts]) === null || _o === void 0 ? void 0 : _o[0][origin]) || (this.host ? TLS.TEXT[origin] : null);
             if (certs) {
                 ({ ca, cert, key, version: minVersion } = certs);
             }
         }
         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 ? { maxFrameSize: 16777215, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = ((_q = this[kSession][0])[origin] || (_q[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { maxFrameSize: 16777215, 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);
@@ -1553,8 +1558,8 @@ class Request extends module_1.default {
                     const pkg = secure ? 'https-proxy-agent' : 'http-proxy-agent';
                     try {
                         const { protocol, hostname: proxyname, port, username, password, href } = proxy.host;
-                        keepAlive ?? (keepAlive = proxy.keepAlive || false);
-                        agentTimeout ?? (agentTimeout = proxy.agentTimeout);
+                        keepAlive !== null && keepAlive !== void 0 ? keepAlive : (keepAlive = proxy.keepAlive || false);
+                        agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = proxy.agentTimeout);
                         agent = require(pkg)(keepAlive || agentTimeout > 0 ? { protocol, hostname: proxyname, port, username, password, keepAlive, timeout: agentTimeout } : href);
                         const proxyHeaders = this[kHeaders] && getBaseHeaders(href, this[kHeaders]) || getBaseHeaders(href, HTTP.HEADERS);
                         if (proxyHeaders) {
@@ -1573,7 +1578,7 @@ class Request extends module_1.default {
                 }
                 else if (agentTimeout !== 0) {
                     keepAlive = this.keepAlive || false;
-                    agentTimeout ?? (agentTimeout = this.agentTimeout);
+                    agentTimeout !== null && agentTimeout !== void 0 ? agentTimeout : (agentTimeout = this.agentTimeout);
                     if (keepAlive || agentTimeout > 0) {
                         agent = new (secure ? https.Agent : http.Agent)({ keepAlive, timeout: agentTimeout });
                     }
@@ -1597,6 +1602,7 @@ class Request extends module_1.default {
                 lookup: this.lookupDns(hostname),
                 agent
             }, response => {
+                var _o;
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
                 if (this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 && statusCode < 300) {
@@ -1632,7 +1638,7 @@ class Request extends module_1.default {
                         source.on('error', err => request.emit('error', err));
                     }
                     if (!posting) {
-                        if (version === 2 && incoming.upgrade?.includes('h2')) {
+                        if (version === 2 && ((_o = incoming.upgrade) === null || _o === void 0 ? void 0 : _o.includes('h2'))) {
                             host.version = 2;
                         }
                         else if (!host.didAltSvc(1)) {
@@ -1906,19 +1912,21 @@ class Request extends module_1.default {
                         downloadUri.call(this, href);
                     };
                     const acceptResponse = (headers) => {
+                        var _o;
                         if ('outHeaders' in opts) {
                             opts.outHeaders = headers;
                         }
                         if ('outFilename' in opts) {
                             opts.outFilename = (0, util_1.parseHeader)(headers, 'content-disposition');
                         }
-                        const buffering = request.connected?.call(client, headers);
+                        const buffering = (_o = request.connected) === null || _o === void 0 ? void 0 : _o.call(client, headers);
                         const pipeline = pipeTo ? !(0, types_1.isString)(pipeTo) : false;
                         const enabled = buffering !== false && !pipeline;
                         const readTimeout = this.readTimeout;
                         let mibsTime, delayTime;
                         if (log || readTimeout > 0) {
                             client.once('readable', () => {
+                                var _o;
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
                                         abortResponse();
@@ -1926,7 +1934,7 @@ class Request extends module_1.default {
                                     }, readTimeout);
                                 }
                                 if (log) {
-                                    switch (this.settings?.time_format || LOG_TIMEFORMAT) {
+                                    switch (((_o = this.settings) === null || _o === void 0 ? void 0 : _o.time_format) || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
                                             break;
@@ -2256,7 +2264,8 @@ class Request extends module_1.default {
         this[kDownloading].clear();
     }
     matchStatus(code, url, headers, request, options) {
-        const status = this[kStatusOn]?.get(code);
+        var _o;
+        const status = (_o = this[kStatusOn]) === null || _o === void 0 ? void 0 : _o.get(code);
         if (status) {
             const href = url.href;
             const called = new Set();
@@ -2281,7 +2290,7 @@ class Request extends module_1.default {
     }
     matchHeaders(url, headers, request, options) {
         const on = this[kHeadersOn];
-        if (on?.size) {
+        if (on === null || on === void 0 ? void 0 : on.size) {
             const href = url.href;
             const called = new Map();
             for (const [name, item] of on) {
@@ -2312,13 +2321,14 @@ class Request extends module_1.default {
         return true;
     }
     set agentTimeout(value) {
+        var _o, _p;
         if (value > 0) {
             this[kAgentTimeout] = value;
-            this.keepAlive ?? (this.keepAlive = true);
+            (_o = this.keepAlive) !== null && _o !== void 0 ? _o : (this.keepAlive = true);
         }
         else {
             this[kAgentTimeout] = 0;
-            this.keepAlive ?? (this.keepAlive = false);
+            (_p = this.keepAlive) !== null && _p !== void 0 ? _p : (this.keepAlive = false);
         }
     }
     get agentTimeout() {

package/package.json

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