@e-mc/request 0.6.2 → 0.6.3

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

@@ -132,7 +132,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 {
@@ -271,6 +271,7 @@ class Request extends module_1.default {
         return parent ? super.purgeMemory(percent, limit) : Promise.resolve(0);
     }
     static loadSettings(settings, password) {
+        var _l;
         if (!this.enabled("process.password") || super.loadSettings({ process: settings.process }, password)) {
             const { request, download } = settings;
             if (download && (0, types_1.isPlainObject)(download.aria2)) {
@@ -387,7 +388,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 = (_l = request.settings) === null || _l === void 0 ? void 0 : _l.time_format;
                 switch (time_format) {
                     case 'readable':
                     case 'relative':
@@ -609,6 +610,7 @@ class Request extends module_1.default {
         return ARIA2.BIN;
     }
     constructor(data) {
+        var _l;
         super();
         this.startTime = Date.now();
         this.readExpect = 'none';
@@ -638,13 +640,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)((_l = data.dns) === null || _l === void 0 ? void 0 : _l.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 {
@@ -686,6 +688,7 @@ class Request extends module_1.default {
         this.module = data;
     }
     flushLog() {
+        var _l;
         if (this[kSingleton]) {
             this._logQueued.length = 0;
             if (LOG_HTTP) {
@@ -717,7 +720,7 @@ class Request extends module_1.default {
                     count = Math.max(count, value);
                 }
             });
-            if (!this.host?.aborted) {
+            if (!((_l = this.host) === null || _l === void 0 ? void 0 : _l.aborted)) {
                 output.sort((a, b) => {
                     if (a[2] === b[2]) {
                         return a[1] < b[1] ? -1 : 1;
@@ -1016,8 +1019,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 _l;
             let protocol, origin, username, password;
             if (uri instanceof URL) {
                 ({ protocol, origin, username, password, href: uri } = uri);
@@ -1075,7 +1079,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);
             }
@@ -1124,7 +1128,7 @@ class Request extends module_1.default {
                     }
                 }
                 if (origin) {
-                    const secure = this[kCerts]?.[1][origin] || (this.host ? TLS.FILE[origin] : null);
+                    const secure = ((_l = this[kCerts]) === null || _l === void 0 ? void 0 : _l[1][origin]) || (this.host ? TLS.FILE[origin] : null);
                     if (secure) {
                         if (secure.ca && ignoreOpt('--ca-certificate')) {
                             args.push(`--ca-certificate="${escapeQuote(secure.ca)}"`);
@@ -1269,7 +1273,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 });
                                 }
@@ -1308,7 +1312,8 @@ class Request extends module_1.default {
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _l, _m;
+        var _l;
+        var _m, _o;
         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';
@@ -1363,7 +1368,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':
@@ -1399,17 +1404,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']) {
-            (_l = (headers || (headers = {})))['accept-encoding'] || (_l['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+        if (getting && this.acceptEncoding && !localhost && !(baseHeaders === null || baseHeaders === void 0 ? void 0 : baseHeaders['accept-encoding'])) {
+            (_m = (headers || (headers = {})))['accept-encoding'] || (_m['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
         }
         if (secure) {
-            const certs = this[kCerts]?.[0][origin] || (this.host ? TLS.TEXT[origin] : null);
+            const certs = ((_l = this[kCerts]) === null || _l === void 0 ? void 0 : _l[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 = ((_m = this[kSession][0])[origin] || (_m[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 = ((_o = this[kSession][0])[origin] || (_o[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);
@@ -1492,8 +1497,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) {
@@ -1512,7 +1517,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 });
                     }
@@ -1536,6 +1541,7 @@ class Request extends module_1.default {
                 lookup: this.lookupDns(hostname),
                 agent
             }, response => {
+                var _l;
                 const statusCode = response.statusCode;
                 if ((getting || posting) && statusCode >= 200 && statusCode < 300) {
                     const incoming = response.headers;
@@ -1571,7 +1577,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 && ((_l = incoming.upgrade) === null || _l === void 0 ? void 0 : _l.includes('h2'))) {
                             host.version = 2;
                         }
                         else if (!host.didAltSvc(1)) {
@@ -1769,7 +1775,7 @@ class Request extends module_1.default {
     async get(uri, options = {}) {
         const opts = (typeof options === 'string' ? { format: options, encoding: 'utf-8' } : options);
         if (this.readExpect === 'string') {
-            opts.encoding = (0, types_1.getEncoding)(opts?.encoding);
+            opts.encoding = (0, types_1.getEncoding)(opts === null || opts === void 0 ? void 0 : opts.encoding);
         }
         return new Promise((resolve, reject) => {
             const { silent = this[kSingleton], pipeTo } = opts;
@@ -1843,19 +1849,21 @@ class Request extends module_1.default {
                         downloadUri.call(this, href);
                     };
                     const acceptResponse = (headers) => {
+                        var _l;
                         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 = (_l = request.connected) === null || _l === void 0 ? void 0 : _l.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 _l;
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
                                         abortResponse();
@@ -1866,7 +1874,7 @@ class Request extends module_1.default {
                                     if (buffering === false) {
                                         mibsTime = process.hrtime();
                                     }
-                                    switch (this.settings?.time_format || LOG_TIMEFORMAT) {
+                                    switch (((_l = this.settings) === null || _l === void 0 ? void 0 : _l.time_format) || LOG_TIMEFORMAT) {
                                         case 'readable':
                                             delayTime = process.hrtime(startTime);
                                             break;
@@ -2193,13 +2201,14 @@ class Request extends module_1.default {
         this[kDownloading].clear();
     }
     set agentTimeout(value) {
+        var _l, _m;
         if (value > 0) {
             this[kAgentTimeout] = value;
-            this.keepAlive ?? (this.keepAlive = true);
+            (_l = this.keepAlive) !== null && _l !== void 0 ? _l : (this.keepAlive = true);
         }
         else {
             this[kAgentTimeout] = 0;
-            this.keepAlive ?? (this.keepAlive = false);
+            (_m = this.keepAlive) !== null && _m !== void 0 ? _m : (this.keepAlive = false);
         }
     }
     get agentTimeout() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.6.2",
-    "@e-mc/types": "0.6.2",
+    "@e-mc/module": "0.6.3",
+    "@e-mc/types": "0.6.3",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"