@e-mc/request 0.7.1 → 0.7.3

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2023 Sukina
+
+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,5 +1,7 @@
-### @e-mc/request
+# @e-mc/request
 
-### LICENSE
+PEP 402 - Forever 2056
 
-BSD 3-Clause
+## LICENSE
+
+MIT

package/http/host/index.js

@@ -2,7 +2,7 @@
 var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tls = require("tls");
-const types_1 = require("../../../types");
+const types_1 = require("@e-mc/types");
 const kProtocol = Symbol('protocol');
 const kSecure = Symbol('secure');
 const kHostname = Symbol('hostname');
@@ -85,15 +85,15 @@ class HttpHost {
             }
         }
         this[kVersion] = 1;
-        this[kVersionData].forEach(version => version[4 /* HOST_VERSION.ALT_SVC */] = 0);
+        this[kVersionData].forEach(version => version[4] = 0);
     }
     async hasProtocol(version) {
         if (version > 1) {
             const data = this[kVersionData][version - 1];
             if (!data || !this.secure) {
-                return 0 /* QUERY_RESULT.FAIL */;
+                return 0;
             }
-            const status = data[3 /* HOST_VERSION.ALPN */];
+            const status = data[3];
             switch (status) {
                 case 0:
                 case 1:
@@ -102,19 +102,19 @@ class HttpHost {
                     return this._tlsConnect || (this._tlsConnect = new Promise(resolve => {
                         const alpn = 'h' + version;
                         const socket = tls.connect(+this.port, this.hostname, { ALPNProtocols: [alpn], requestCert: true, rejectUnauthorized: false }, () => {
-                            resolve(data[3 /* HOST_VERSION.ALPN */] = alpn === socket.alpnProtocol ? 1 /* QUERY_RESULT.OK */ : 0 /* QUERY_RESULT.FAIL */);
+                            resolve(data[3] = alpn === socket.alpnProtocol ? 1 : 0);
                             this._tlsConnect = null;
                         });
                         socket
                             .setNoDelay(false)
-                            .setTimeout(10000 /* HOST.TIMEOUT */)
+                            .setTimeout(10000)
                             .on('timeout', () => {
                             if (this._tlsConnect) {
-                                if (this.error(version) >= 10 /* HOST.MAX_ERROR */) {
-                                    resolve(data[3 /* HOST_VERSION.ALPN */] = 0 /* QUERY_RESULT.FAIL */);
+                                if (this.error(version) >= 10) {
+                                    resolve(data[3] = 0);
                                 }
                                 else {
-                                    resolve(2 /* QUERY_RESULT.TIMEOUT */);
+                                    resolve(2);
                                 }
                                 this._tlsConnect = null;
                             }
@@ -122,36 +122,36 @@ class HttpHost {
                         })
                             .on('error', () => {
                             this.failed(version);
-                            resolve(data[3 /* HOST_VERSION.ALPN */] = 0 /* QUERY_RESULT.FAIL */);
+                            resolve(data[3] = 0);
                             this._tlsConnect = null;
                         })
                             .end();
                     }));
             }
         }
-        return 1 /* QUERY_RESULT.OK */;
+        return 1;
     }
     success(version, status) {
         const data = this[kVersionData][version - 1];
-        return status ? data[0 /* HOST_VERSION.SUCCESS */] : ++data[0 /* HOST_VERSION.SUCCESS */];
+        return status ? data[0] : ++data[0];
     }
     failed(version, status) {
         const data = this[kVersionData][version - 1];
         if (status) {
-            return data[1 /* HOST_VERSION.FAILED */];
+            return data[1];
         }
         this.clearAltSvc(version);
-        return ++data[1 /* HOST_VERSION.FAILED */];
+        return ++data[1];
     }
     error(version, status) {
         const data = this[kVersionData][version - 1];
         if (status) {
-            return data[2 /* HOST_VERSION.ERROR */];
+            return data[2];
         }
-        if (data[4 /* HOST_VERSION.ALT_SVC */] !== 2) {
+        if (data[4] !== 2) {
             this.closeAltSvc(true);
         }
-        return ++data[2 /* HOST_VERSION.ERROR */];
+        return ++data[2];
     }
     upgrade(version, altSvc) {
         if (altSvc && this.secure) {
@@ -162,11 +162,11 @@ class HttpHost {
             const data = this[kVersionData];
             for (let i = data.length - 1; i >= version; --i) {
                 const host = data[i];
-                if (host[4 /* HOST_VERSION.ALT_SVC */] === 0) {
+                if (host[4] === 0) {
                     continue;
                 }
                 const increment = (flag) => {
-                    host[4 /* HOST_VERSION.ALT_SVC */] = flag;
+                    host[4] = flag;
                     if (this[kVersion] < i + 1) {
                         this[kVersion] = i + 1;
                         return true;
@@ -192,7 +192,7 @@ class HttpHost {
                         addresses.push([
                             address,
                             port,
-                            ma >= 2592000 /* TIMEOUT.MA */ ? NaN : time + Math.min(ma * 1000 /* TIME.S */, 2147483647 /* TIMEOUT.LIMIT */),
+                            ma >= 2592000 ? NaN : time + Math.min(ma * 1000, 2147483647),
                             i + 1,
                             match[3].includes('persist=1')
                         ]);
@@ -229,7 +229,7 @@ class HttpHost {
         }
     }
     didAltSvc(version) {
-        return this[kVersionData][version][4 /* HOST_VERSION.ALT_SVC */] !== -1;
+        return this[kVersionData][version][4] !== -1;
     }
     nextAltSvc() {
         const queue = this[kAltSvcQueue].shift();
@@ -279,20 +279,20 @@ class HttpHost {
             this.closeAltSvc();
             this[kAltSvcQueue] = [];
             this[kAltSvcError] = [];
-            this[kVersionData].forEach(item => item[3 /* HOST_VERSION.ALPN */] && (item[4 /* HOST_VERSION.ALT_SVC */] = -1));
+            this[kVersionData].forEach(item => item[3] && (item[4] = -1));
         }
     }
     flagAltSvc(version, value) {
-        this[kVersionData][version - 1][4 /* HOST_VERSION.ALT_SVC */] = value;
+        this[kVersionData][version - 1][4] = value;
     }
     reset() {
         this.clearAltSvc();
         this[kVersionData].forEach((item, index) => {
-            item[0 /* HOST_VERSION.SUCCESS */] = 0;
-            item[1 /* HOST_VERSION.FAILED */] = 0;
-            item[2 /* HOST_VERSION.ERROR */] = 0;
+            item[0] = 0;
+            item[1] = 0;
+            item[2] = 0;
             if (index > 0) {
-                item[3 /* HOST_VERSION.ALPN */] = -1;
+                item[3] = -1;
             }
         });
     }

package/index.js

@@ -15,11 +15,11 @@ const qs = require("querystring");
 const combined = require("combined-stream");
 const yaml = require("js-yaml");
 const which = require("which");
-const lib_v4_1 = require("../module/lib-v4");
-const types_1 = require("../types");
-const module_1 = require("../module");
-const host_1 = require("./http/host");
-const util_1 = require("./util");
+const lib_v4_1 = require("@e-mc/module/lib-v4");
+const types_1 = require("@e-mc/types");
+const module_1 = require("@e-mc/module");
+const host_1 = require("@e-mc/request/http/host");
+const util_1 = require("@e-mc/request/util");
 const kSession = Symbol('session');
 const kHttpVersion = Symbol('httpVersion');
 const kIpVersion = Symbol('ipVersion');
@@ -177,7 +177,7 @@ function resetHttpHost(version) {
                 const host = HTTP.HOST[origin];
                 if (host.secure && host.version === 1) {
                     const failed = host.failed(2, true);
-                    if (failed === 0 && host.failed(2, true) < 10 /* HOST.MAX_ERROR */ || failed < 3 /* HOST.MAX_FAILED */ && host.success(2, true) > 0) {
+                    if (failed === 0 && host.failed(2, true) < 10 || failed < 3 && host.success(2, true) > 0) {
                         host.version = version;
                     }
                 }
@@ -272,7 +272,7 @@ class Request extends module_1.default {
         return parent ? super.purgeMemory(percent, limit) : Promise.resolve(0);
     }
     static loadSettings(settings, password) {
-        if (!this.enabled("process.password" /* KEY_NAME.PROCESS_PASSWORD */) || super.loadSettings({ process: settings.process }, password)) {
+        if (!this.enabled("process.password") || super.loadSettings({ process: settings.process }, password)) {
             const { request, download } = settings;
             if (download && (0, types_1.isPlainObject)(download.aria2)) {
                 let { bin, exec, update_status, max_concurrent_downloads, max_connection_per_server, bt_stop_timeout, bt_tracker_connect_timeout, bt_tracker_timeout, min_split_size, disk_cache, lowest_speed_limit, always_resume, file_allocation, conf_path } = download.aria2;
@@ -397,9 +397,9 @@ class Request extends module_1.default {
                         break;
                 }
             }
-            LOG_HTTP = this.hasLogType(1024 /* LOG_TYPE.HTTP */);
-            LOG_TIMEPROCESS = this.hasLogType(256 /* LOG_TYPE.TIME_PROCESS */);
-            LOG_STDOUT = module_1.default.hasLogType(32768 /* LOG_TYPE.STDOUT */);
+            LOG_HTTP = this.hasLogType(1024);
+            LOG_TIMEPROCESS = this.hasLogType(256);
+            LOG_STDOUT = module_1.default.hasLogType(32768);
             return true;
         }
         return false;
@@ -414,151 +414,151 @@ class Request extends module_1.default {
         return this.readCACert(value, cache);
     }
     static isCert(value) {
-        return (0, types_1.isString)(value) && (value = value.trim()) ? value.indexOf('\n') !== -1 && value.startsWith('---') && value.endsWith('---') : false;
+        return (0, types_1.isString)(value) && (value = value.trim()) ? value.includes('\n') && value.startsWith('---') && value.endsWith('---') : false;
     }
     static fromURL(url, value) {
         if (this.isURL(value)) {
             return value;
         }
         const auth = host_1.default.formatBasicAuth(url);
-        return url.protocol + '//' + (auth && (auth + '@')) + url.hostname + (url.port ? ':' + url.port : '') + (value[0] !== '/' ? '/' : '') + value;
+        return url.protocol + '//' + (auth && (auth + '@')) + url.hostname + (url.port ? ':' + url.port : '') + (!value.startsWith('/') ? '/' : '') + value;
     }
     static fromStatusCode(value) {
         if ((value = +value) < 200) {
             switch (value) {
-                case 100 /* HTTP_STATUS.CONTINUE */:
+                case 100:
                     return 'Continue';
-                case 101 /* HTTP_STATUS.SWITCHING_PROTOCOL */:
+                case 101:
                     return 'Switching Protocol';
-                case 102 /* HTTP_STATUS.PROCESSING */:
+                case 102:
                     return 'Processing';
-                case 103 /* HTTP_STATUS.EARLY_HINTS */:
+                case 103:
                     return 'Early Hints';
             }
         }
         else if (value < 300) {
             switch (value) {
-                case 200 /* HTTP_STATUS.OK */:
+                case 200:
                     return 'OK';
-                case 201 /* HTTP_STATUS.CREATED */:
+                case 201:
                     return 'Created';
-                case 202 /* HTTP_STATUS.ACCEPTED */:
+                case 202:
                     return 'Accepted';
-                case 203 /* HTTP_STATUS.NON_AUTHORITATIVE_INFORMATION */:
+                case 203:
                     return 'Non-Authoritative Information';
-                case 204 /* HTTP_STATUS.NO_CONTENT */:
+                case 204:
                     return 'No Content';
-                case 205 /* HTTP_STATUS.RESET_CONTENT */:
+                case 205:
                     return 'Reset Content';
-                case 206 /* HTTP_STATUS.PARTIAL_CONTENT */:
+                case 206:
                     return 'Partial Content';
             }
         }
         else if (value < 400) {
             switch (value) {
-                case 300 /* HTTP_STATUS.MULTIPLE_CHOICES */:
+                case 300:
                     return 'Multiple Choice';
-                case 301 /* HTTP_STATUS.MOVED_PERMANENTLY */:
+                case 301:
                     return 'Moved Permanently';
-                case 302 /* HTTP_STATUS.FOUND */:
+                case 302:
                     return 'Found';
-                case 303 /* HTTP_STATUS.SEE_OTHER */:
+                case 303:
                     return 'See Other';
-                case 304 /* HTTP_STATUS.NOT_MODIFIED */:
+                case 304:
                     return 'Not Modified';
-                case 305 /* HTTP_STATUS.USE_PROXY */:
+                case 305:
                     return 'Use Proxy';
-                case 307 /* HTTP_STATUS.TEMPORARY_REDIRECT */:
+                case 307:
                     return 'Temporary Redirect';
-                case 308 /* HTTP_STATUS.PERMANENT_REDIRECT */:
+                case 308:
                     return 'Permanent Redirect';
             }
         }
         else if (value < 500) {
             switch (value) {
-                case 400 /* HTTP_STATUS.BAD_REQUEST */:
+                case 400:
                     return 'Bad Request';
-                case 401 /* HTTP_STATUS.UNAUTHORIZED */:
+                case 401:
                     return 'Upgrade Required';
-                case 402 /* HTTP_STATUS.PAYMENT_REQUIRED */:
+                case 402:
                     return 'Payment Required';
-                case 403 /* HTTP_STATUS.FORBIDDEN */:
+                case 403:
                     return 'Forbidden';
-                case 404 /* HTTP_STATUS.NOT_FOUND */:
+                case 404:
                     return 'Not Found';
-                case 405 /* HTTP_STATUS.METHOD_NOT_ALLOWED */:
+                case 405:
                     return 'Method Not Allowed';
-                case 406 /* HTTP_STATUS.NOT_ACCEPTABLE */:
+                case 406:
                     return 'Not Acceptable';
-                case 407 /* HTTP_STATUS.PROXY_AUTHENTICATION_REQUIRED */:
+                case 407:
                     return 'Proxy Authentication Required';
-                case 408 /* HTTP_STATUS.REQUEST_TIMEOUT */:
+                case 408:
                     return 'Request Timeout';
-                case 409 /* HTTP_STATUS.CONFLICT */:
+                case 409:
                     return 'Conflict';
-                case 410 /* HTTP_STATUS.GONE */:
+                case 410:
                     return 'Gone';
-                case 411 /* HTTP_STATUS.LENGTH_REQUIRED */:
+                case 411:
                     return 'Length Required';
-                case 412 /* HTTP_STATUS.PRECONDITION_FAILED */:
+                case 412:
                     return 'Precondition Failed';
-                case 413 /* HTTP_STATUS.PAYLOAD_TOO_LARGE */:
+                case 413:
                     return 'Payload Too Large';
-                case 414 /* HTTP_STATUS.REQUEST_URI_TOO_LONG */:
+                case 414:
                     return 'URI Too Long';
-                case 415 /* HTTP_STATUS.UNSUPPORTED_MEDIA_TYPE */:
+                case 415:
                     return 'Unsupported Media Type';
-                case 416 /* HTTP_STATUS.RANGE_NOT_SATISFIABLE */:
+                case 416:
                     return 'Range Not Satisfiable';
-                case 417 /* HTTP_STATUS.EXPECTATION_FAILED */:
+                case 417:
                     return 'Expectation Failed';
-                case 421 /* HTTP_STATUS.MISDIRECTED_REQUEST */:
+                case 421:
                     return 'Misdirected Request';
-                case 422 /* HTTP_STATUS.UNPROCESSABLE_ENTITY */:
+                case 422:
                     return 'Unprocessable Entity';
-                case 423 /* HTTP_STATUS.LOCKED */:
+                case 423:
                     return 'Locked';
-                case 424 /* HTTP_STATUS.FAILED_DEPENDENCY */:
+                case 424:
                     return 'Failed Dependency';
-                case 426 /* HTTP_STATUS.UPGRADE_REQUIRED */:
+                case 426:
                     return 'Upgrade Required';
-                case 428 /* HTTP_STATUS.PRECONDITION_REQUIRED */:
+                case 428:
                     return 'Precondition Required';
-                case 429 /* HTTP_STATUS.TOO_MANY_REQUESTS */:
+                case 429:
                     return 'Too Many Requests';
-                case 431 /* HTTP_STATUS.REQUEST_HEADER_FIELDS_TOO_LARGE */:
+                case 431:
                     return 'Request Header Fields Too Large';
-                case 451 /* HTTP_STATUS.UNAVAILABLE_FOR_LEGAL_REASONS */:
+                case 451:
                     return 'Unavailable For Legal Reasons';
             }
         }
         else {
             switch (value) {
-                case 500 /* HTTP_STATUS.INTERNAL_SERVER_ERROR */:
+                case 500:
                     return 'Internal Server Error';
-                case 501 /* HTTP_STATUS.NOT_IMPLEMENTED */:
+                case 501:
                     return 'Not Implemented';
-                case 502 /* HTTP_STATUS.BAD_GATEWAY */:
+                case 502:
                     return 'Bad Gateway';
-                case 503 /* HTTP_STATUS.SERVICE_UNAVAILABLE */:
+                case 503:
                     return 'Service Unavailable';
-                case 504 /* HTTP_STATUS.GATEWAY_TIMEOUT */:
+                case 504:
                     return 'Gateway Timeout';
-                case 505 /* HTTP_STATUS.HTTP_VERSION_NOT_SUPPORTED */:
+                case 505:
                     return 'HTTP Version Not Supported';
-                case 506 /* HTTP_STATUS.VARIANT_ALSO_NEGOTIATES */:
+                case 506:
                     return 'Variant Also Negotiates';
-                case 507 /* HTTP_STATUS.INSUFFICIENT_STORAGE */:
+                case 507:
                     return 'Insufficient Storage';
-                case 508 /* HTTP_STATUS.LOOP_DETECTED */:
+                case 508:
                     return 'Loop Detected';
-                case 510 /* HTTP_STATUS.NOT_EXTENDED */:
+                case 510:
                     return 'Not Extended';
-                case 511 /* HTTP_STATUS.NETWORK_AUTHENTICATION_REQUIRED */:
+                case 511:
                     return 'Network Authentication Required';
             }
         }
-        return "Unknown" /* ERR_MESSAGE.UNKNOWN */;
+        return "Unknown";
     }
     static defineHttpAgent(options) {
         const { keepAlive, timeout = 0 } = options;
@@ -615,13 +615,14 @@ class Request extends module_1.default {
         this.startTime = Date.now();
         this.readExpect = 'none';
         this.proxy = null;
-        this._moduleName = "request" /* VALUES.MODULE */;
+        this._moduleName = "request";
+        this._threadable = true;
         this._config = {
-            timeout: 60000 /* TIME.m */,
-            connectTimeout: 20 * 1000 /* TIME.S */,
+            timeout: 60000,
+            connectTimeout: 20 * 1000,
             redirectLimit: 10,
-            retryWait: 1000 /* TIME.S */,
-            retryAfter: 30 * 1000 /* TIME.S */,
+            retryWait: 1000,
+            retryAfter: 30 * 1000,
             retryLimit: 5
         };
         this[_a] = false;
@@ -702,7 +703,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;
@@ -711,12 +712,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;
@@ -729,7 +735,7 @@ class Request extends module_1.default {
                             module_1.default.formatMessage(...message);
                         }
                         else {
-                            this.formatMessage(1024 /* LOG_TYPE.HTTP */, title, [origin, 'downloads: ' + downloads.toString().padStart(width)], '', options);
+                            this.formatMessage(1024, title, [origin, 'downloads: ' + downloads.toString().padStart(width)], '', options);
                             messages.forEach(args => {
                                 args[4].titleIndent = true;
                                 module_1.default.formatMessage(...args);
@@ -759,7 +765,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);
             }
@@ -769,8 +775,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;
@@ -791,7 +797,7 @@ class Request extends module_1.default {
                         this._config.redirectLimit = redirectLimit;
                     }
                     if (retryWait >= 0) {
-                        this._config.retryWait = Math.min(retryWait, 600 * 1000 /* TIME.S */);
+                        this._config.retryWait = Math.min(retryWait, 600 * 1000);
                     }
                     if (retryAfter >= 0) {
                         this._config.retryAfter = Math.min(retryAfter, module_1.default.MAX_TIMEOUT);
@@ -930,9 +936,9 @@ class Request extends module_1.default {
         const headers = this[kHeaders];
         return headers && getBaseHeaders(uri, headers) || (this.host ? getBaseHeaders(uri, HTTP.HEADERS) : undefined);
     }
-    aria2c(uri, options) {
+    async aria2c(uri, options) {
         if (!ARIA2.BIN) {
-            return Promise.reject((0, types_1.errorMessage)("aria2" /* VALUES.ARIA2 */, "Binary not found" /* ERR_MESSAGE.NOTFOUND_BINARY */));
+            return Promise.reject((0, types_1.errorMessage)("aria2", "Binary not found"));
         }
         if (typeof uri === 'string' && module_1.default.isURL(uri)) {
             try {
@@ -1000,15 +1006,15 @@ class Request extends module_1.default {
         }
         if (!(0, types_1.isString)(pathname)) {
             if (this.host) {
-                return Promise.reject((0, types_1.errorMessage)("aria2" /* VALUES.ARIA2 */, "Invalid parameters" /* ERR_MESSAGE.PARAMETERS */, 'pathname'));
+                return Promise.reject((0, types_1.errorMessage)("aria2", "Invalid parameters", 'pathname'));
             }
             pathname = process.cwd();
         }
         if ((this.host || this.hasOwnPermission()) && !this.canWrite(pathname = path.resolve(pathname.trim()))) {
-            return Promise.reject((0, types_1.errorMessage)("aria2" /* VALUES.ARIA2 */, "Unsupported access" /* ERR_MESSAGE.UNSUPPORTED_ACCESS */, pathname));
+            return Promise.reject((0, types_1.errorMessage)("aria2", "Unsupported access", pathname));
         }
         if (!module_1.default.createDir(pathname)) {
-            return Promise.reject((0, types_1.errorMessage)("aria2" /* VALUES.ARIA2 */, "Path is not a directory" /* ERR_MESSAGE.NOT_DIRECTORY */, pathname));
+            return Promise.reject((0, types_1.errorMessage)("aria2", "Path is not a directory", pathname));
         }
         silent ?? (silent = this[kSingleton]);
         return new Promise((resolve, reject) => {
@@ -1173,11 +1179,11 @@ class Request extends module_1.default {
                 args = binOpts.concat(args);
             }
             if (args.length) {
-                if (module_1.default.hasLogType(32768 /* LOG_TYPE.STDOUT */)) {
-                    this.formatMessage(32768 /* LOG_TYPE.STDOUT */, 'ARIA2', ARIA2.BIN, args.join(' '), { ...module_1.default.LOG_STYLE_WARN });
+                if (module_1.default.hasLogType(32768)) {
+                    this.formatMessage(32768, 'ARIA2', ARIA2.BIN, args.join(' '), { ...module_1.default.LOG_STYLE_WARN });
                 }
                 else {
-                    this.addLog(types_1.STATUS_TYPE.INFO, path.basename(ARIA2.BIN) + ' ' + args.join(' '), "aria2" /* VALUES.ARIA2 */);
+                    this.addLog(types_1.STATUS_TYPE.INFO, path.basename(ARIA2.BIN) + ' ' + args.join(' '), "aria2");
                 }
             }
             opts.push(`"${escapeQuote(uri)}"`);
@@ -1221,18 +1227,18 @@ class Request extends module_1.default {
                                     break;
                                 }
                             case 'ERR':
-                                fs.unlink(file, err => err && !silent && !this[kSingleton] && this.writeFail(["Unable to delete file" /* ERR_MESSAGE.DELETE_FILE */, path.basename(file)], err, { type: 32 /* LOG_TYPE.FILE */, fatal: false }));
+                                fs.unlink(file, err => err && !silent && !this[kSingleton] && this.writeFail(["Unable to delete file", path.basename(file)], err, { type: 32, fatal: false }));
                                 break;
                         }
                     }
                     if (result.length && !silent && LOG_HTTP && LOG_TIMEPROCESS) {
-                        this.writeTimeProcess("aria2" /* VALUES.ARIA2 */, uri, startTime, { type: 1024 /* LOG_TYPE.HTTP */, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
+                        this.writeTimeProcess("aria2", uri, startTime, { type: 1024, queue: true, messageUnit, messageUnitMinWidth: 9, bypassLog: true });
                     }
-                    this.addLog(result.length ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2" /* VALUES.ARIA2 */, uri);
+                    this.addLog(result.length ? types_1.STATUS_TYPE.INFO : types_1.STATUS_TYPE.ERROR, out, currentTime, currentTime - startTime, "aria2", uri);
                     resolve(result);
                 }
                 else {
-                    reject((0, types_1.errorValue)(message || "Unknown" /* ERR_MESSAGE.UNKNOWN */, 'Exit status: ' + code));
+                    reject((0, types_1.errorValue)(message || "Unknown", 'Exit status: ' + code));
                 }
             })
                 .on('error', err => errorResponse(pid, err));
@@ -1268,9 +1274,9 @@ class Request extends module_1.default {
                                     }
                                     else {
                                         const current = (0, types_1.getLogCurrent)();
-                                        progressBar = current?.type === 128 /* LOG_TYPE.TIME_ELAPSED */ && current.title === "aria2" /* VALUES.ARIA2 */;
+                                        progressBar = current?.type === 128 && current.title === "aria2";
                                     }
-                                    this.formatMessage(128 /* LOG_TYPE.TIME_ELAPSED */, "aria2" /* VALUES.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 });
+                                    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 });
                                 }
                                 ARIA2.PID_QUEUE.push(item);
                             }
@@ -1278,17 +1284,17 @@ class Request extends module_1.default {
                                 clearTimer();
                             }
                         }
-                    }, (ARIA2.UPDATE_STATUS || 30) * 1000 /* TIME.S */);
+                    }, (ARIA2.UPDATE_STATUS || 30) * 1000);
                 }
                 ARIA2.PID_QUEUE.push([pid, uri, this.broadcastId || undefined]);
             }
         });
     }
-    json(uri, options = {}) {
+    async json(uri, options = {}) {
         options.format = 'json';
         return this.get(uri, options);
     }
-    pipe(uri, to, options = {}) {
+    async pipe(uri, to, options = {}) {
         options.pipeTo = to;
         return this.get(uri, options);
     }
@@ -1357,9 +1363,9 @@ class Request extends module_1.default {
         }
         const checkEncoding = (response, statusCode, contentEncoding = '') => {
             switch (statusCode) {
-                case 206 /* HTTP_STATUS.PARTIAL_CONTENT */:
+                case 206:
                     request.emit('error', new Error('[ABORT] Partial content'));
-                case 204 /* HTTP_STATUS.NO_CONTENT */:
+                case 204:
                     return;
             }
             const chunkSize = outStream?.writableHighWaterMark;
@@ -1408,7 +1414,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 = ((_m = this[kSession][0])[origin] || (_m[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 = ((_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 });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1417,7 +1423,7 @@ class Request extends module_1.default {
                 request.on('response', response => {
                     connected = true;
                     const statusCode = response[':status'];
-                    if (statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                    if (statusCode >= 200 && statusCode < 300) {
                         if (emitter = checkEncoding(request, statusCode, response['content-encoding'])) {
                             for (const event in listenerMap) {
                                 listenerMap[event].forEach(listener => {
@@ -1500,7 +1506,7 @@ class Request extends module_1.default {
                         }
                     }
                     catch (err) {
-                        this.checkPackage(err, pkg, "Unknown" /* ERR_MESSAGE.UNKNOWN */);
+                        this.checkPackage(err, pkg, "Unknown");
                     }
                 }
                 else if (keepAlive === false) {
@@ -1536,7 +1542,7 @@ class Request extends module_1.default {
                 agent
             }, response => {
                 const statusCode = response.statusCode;
-                if ((getting || posting) && statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                if ((getting || posting) && statusCode >= 200 && statusCode < 300) {
                     const incoming = response.headers;
                     let source = checkEncoding(response, statusCode, incoming['content-encoding']);
                     if (source) {
@@ -1630,7 +1636,7 @@ class Request extends module_1.default {
                 options = contentType;
                 contentType = undefined;
             }
-            if (Array.isArray(data) && (!contentType || contentType === "multipart/form-data" /* MIME.MULTIPART */)) {
+            if (Array.isArray(data) && (!contentType || contentType === "multipart/form-data")) {
                 parts = data;
                 data = undefined;
             }
@@ -1656,23 +1662,23 @@ class Request extends module_1.default {
                 delete headers[attr];
             }
         }
-        if (parts || contentType === "multipart/form-data" /* MIME.MULTIPART */ || contentType === 'form-data') {
+        if (parts || contentType === "multipart/form-data" || contentType === 'form-data') {
             let valid;
             if ((0, types_1.isArray)(parts)) {
                 const write = combined.create();
                 const boundary = (0, types_1.generateUUID)().replace(/-/g, '');
-                contentType = "multipart/form-data" /* MIME.MULTIPART */ + `; boundary="${boundary}"`;
+                contentType = "multipart/form-data" + `; boundary="${boundary}"`;
                 let contentLength = 0;
                 const createPart = (name, filename, type) => {
-                    const form = ["--" /* FORM_DATA.BOUNDARY_HASH */ + boundary, `Content-Disposition: form-data; name="${escapeQuote(name)}"` + (filename ? `; filename="${escapeQuote(filename)}"` : ''), "\r\n" /* FORM_DATA.CRLF */];
+                    const form = ["--" + boundary, `Content-Disposition: form-data; name="${escapeQuote(name)}"` + (filename ? `; filename="${escapeQuote(filename)}"` : ''), "\r\n"];
                     if (type) {
                         form.splice(2, 0, 'Content-Type: ' + type);
                     }
-                    return form.join("\r\n" /* FORM_DATA.CRLF */);
+                    return form.join("\r\n");
                 };
                 const addValue = (name, value) => {
                     if (value !== undefined) {
-                        const disposition = createPart(name) + module_1.default.asString(value) + "\r\n" /* FORM_DATA.CRLF */;
+                        const disposition = createPart(name) + module_1.default.asString(value) + "\r\n";
                         write.append(disposition);
                         contentLength += Buffer.byteLength(disposition);
                     }
@@ -1702,7 +1708,7 @@ class Request extends module_1.default {
                                 target = Buffer.concat(chunks);
                             }
                             if (!Buffer.isBuffer(target)) {
-                                throw (0, types_1.errorMessage)('File', "Unknown" /* ERR_MESSAGE.UNKNOWN */, "multipart/form-data" /* MIME.MULTIPART */);
+                                throw (0, types_1.errorMessage)('File', "Unknown", "multipart/form-data");
                             }
                             if (!type || !filename) {
                                 const result = await module_1.default.resolveMime(target);
@@ -1718,11 +1724,11 @@ class Request extends module_1.default {
                                     filename = (0, types_1.generateUUID)() + '.' + ext;
                                 }
                             }
-                            const disposition = createPart(name, filename, type || "application/octet-stream" /* MIME.OCTET_STREAM */);
+                            const disposition = createPart(name, filename, type || "application/octet-stream");
                             write.append(disposition);
                             write.append(target);
-                            write.append("\r\n" /* FORM_DATA.CRLF */);
-                            contentLength += Buffer.byteLength(disposition) + target.length + 2 /* FORM_DATA.CRLF_LENGTH */;
+                            write.append("\r\n");
+                            contentLength += Buffer.byteLength(disposition) + target.length + 2;
                             valid = true;
                         }
                         catch (err) {
@@ -1734,13 +1740,13 @@ class Request extends module_1.default {
                     }
                 }
                 if (valid) {
-                    write.append("--" /* FORM_DATA.BOUNDARY_HASH */ + boundary + "--" /* FORM_DATA.BOUNDARY_HASH */ + "\r\n" /* FORM_DATA.CRLF */);
-                    headers['content-length'] = (contentLength + 38 /* FORM_DATA.BOUNDARY_LENGTH */).toString();
+                    write.append("--" + boundary + "--" + "\r\n");
+                    headers['content-length'] = (contentLength + 38).toString();
                     data = write;
                 }
             }
             if (!valid) {
-                return Promise.reject((0, types_1.errorValue)('No files were detected', "multipart/form-data" /* MIME.MULTIPART */));
+                return Promise.reject((0, types_1.errorValue)('No files were detected', "multipart/form-data"));
             }
         }
         else {
@@ -1750,22 +1756,22 @@ class Request extends module_1.default {
             if (!(0, types_1.isPlainObject)(data)) {
                 data = module_1.default.asString(data);
             }
-            else if (contentType === "application/x-www-form-urlencoded" /* MIME.URLENCODED */) {
+            else if (contentType === "application/x-www-form-urlencoded") {
                 data = qs.stringify(data);
             }
             else {
                 data = JSON.stringify(data);
-                contentType || (contentType = "application/json" /* MIME.JSON */);
+                contentType || (contentType = "application/json");
             }
             headers['content-length'] = Buffer.byteLength(data, (0, types_1.getEncoding)(dataEncoding)).toString();
         }
         options.method = 'POST';
         options.httpVersion = 1;
         options.postData = data;
-        headers['content-type'] = contentType || "text/plain" /* MIME.TEXT */;
+        headers['content-type'] = contentType || "text/plain";
         return this.get(uri, options);
     }
-    get(uri, options = {}) {
+    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);
@@ -1800,7 +1806,7 @@ class Request extends module_1.default {
                     }
                     if (pipeTo) {
                         if ((0, types_1.isString)(pipeTo)) {
-                            outStream = fs.createWriteStream(pipeTo, { emitClose: false, highWaterMark: request.host.localhost ? 65536 /* CONSTANTS.CHUNK_SIZE_LOCAL */ : 4096 /* CONSTANTS.CHUNK_SIZE */ });
+                            outStream = fs.createWriteStream(pipeTo, { emitClose: false, highWaterMark: request.host.localhost ? 65536 : 4096 });
                             request.outStream = outStream;
                         }
                         else {
@@ -1816,9 +1822,9 @@ class Request extends module_1.default {
                     ({ httpVersion, outAbort } = request);
                     const isAborted = () => client.destroyed || httpVersion === 2 && client.aborted;
                     const isRetry = (value) => (0, util_1.isRetryable)(value) && ++retries <= this._config.retryLimit;
-                    const isUnsupported = (value) => value === 421 /* HTTP_STATUS.MISDIRECTED_REQUEST */ || value === 505 /* HTTP_STATUS.HTTP_VERSION_NOT_SUPPORTED */;
+                    const isUnsupported = (value) => value === 421 || value === 505;
                     const isDowngrade = (err) => err instanceof Error && (err.code === 'ERR_HTTP2_ERROR' || isUnsupported(Math.abs(err.errno)));
-                    const formatWarning = (message) => LOG_HTTP && !silent && this.formatMessage(1024 /* LOG_TYPE.HTTP */, 'HTTP' + httpVersion, [message, host.origin], url.toString(), { titleBgColor: 'bgGrey', titleColor: 'yellow' });
+                    const formatWarning = (message) => LOG_HTTP && !silent && this.formatMessage(1024, 'HTTP' + httpVersion, [message, host.origin], url.toString(), { titleBgColor: 'bgGrey', titleColor: 'yellow' });
                     const formatNgFlags = (value, statusCode, location) => location ? `Using HTTP 1.1 for URL redirect (${location})` : formatStatus(statusCode, value ? 'NGHTTP2 Error ' + value : '');
                     const abortResponse = () => {
                         if (closed) {
@@ -1858,7 +1864,7 @@ class Request extends module_1.default {
                                 if (readTimeout > 0) {
                                     timeout = setTimeout(() => {
                                         abortResponse();
-                                        throwError((0, types_1.errorValue)("Timeout was exceeded" /* ERR_MESSAGE.TIMEOUT */, href.toString()));
+                                        throwError((0, types_1.errorValue)("Timeout was exceeded", href.toString()));
                                     }, readTimeout);
                                 }
                                 if (log) {
@@ -1918,19 +1924,19 @@ class Request extends module_1.default {
                                     }
                                 }
                                 if (mibsTime) {
-                                    const unit = (Buffer.byteLength(buffer, encoding) * 8) / ((0, types_1.convertTime)(process.hrtime(mibsTime)) * 1000 /* TIME.S */);
+                                    const unit = (Buffer.byteLength(buffer, encoding) * 8) / ((0, types_1.convertTime)(process.hrtime(mibsTime)) * 1000);
                                     if (unit < 1) {
-                                        messageUnit = Math.ceil(unit * 1000 /* TIME.S */) + 'KiB/s';
+                                        messageUnit = Math.ceil(unit * 1000) + 'KiB/s';
                                     }
-                                    else if (unit < 1000 /* TIME.S */) {
+                                    else if (unit < 1000) {
                                         messageUnit = unit.toPrecision(3) + 'MiB/s';
                                     }
                                     else {
-                                        messageUnit = (unit / 1000 /* TIME.S */).toPrecision(3) + 'GiB/s';
+                                        messageUnit = (unit / 1000).toPrecision(3) + 'GiB/s';
                                     }
                                 }
                                 if (typeof buffer === 'string') {
-                                    if (buffer[0] === '\uFEFF' && encoding !== 'utf16le') {
+                                    if (buffer.startsWith('\uFEFF') && encoding !== 'utf16le') {
                                         buffer = buffer.substring(1);
                                     }
                                     if (outFormat) {
@@ -1960,7 +1966,7 @@ class Request extends module_1.default {
                                         }
                                         catch (err) {
                                             if (!silent && !this[kSingleton] && !(packageName && this.checkPackage(err, packageName))) {
-                                                this.writeFail(['Unable to parse URI response', format], err, 1024 /* LOG_TYPE.HTTP */);
+                                                this.writeFail(['Unable to parse URI response', format], err, 1024);
                                             }
                                             result = null;
                                         }
@@ -1980,7 +1986,7 @@ class Request extends module_1.default {
                             }
                             resolve(result);
                             if (log) {
-                                this.writeTimeProcess('HTTP' + httpVersion, request.statusMessage || url.toString(), startTime, { type: 1024 /* LOG_TYPE.HTTP */, queue: !!this.host, titleBgColor, messageUnit, messageUnitMinWidth: 9, delayTime, bypassLog: LOG_STDOUT });
+                                this.writeTimeProcess('HTTP' + httpVersion, request.statusMessage || url.toString(), startTime, { type: 1024, queue: !!this.host, titleBgColor, messageUnit, messageUnitMinWidth: 9, delayTime, bypassLog: LOG_STDOUT });
                             }
                         });
                         host.success(httpVersion);
@@ -2055,7 +2061,7 @@ class Request extends module_1.default {
                                 host.failed(2);
                                 if (host.version > 1) {
                                     if (!silent) {
-                                        this.formatMessage(1024 /* LOG_TYPE.HTTP */, 'HTTP2', ['Unsupported protocol', host.origin], message, { failed: true });
+                                        this.formatMessage(1024, 'HTTP2', ['Unsupported protocol', host.origin], message, { failed: true });
                                     }
                                     host.version = 1;
                                 }
@@ -2068,18 +2074,18 @@ class Request extends module_1.default {
                                 return;
                             }
                             const statusCode = headers[':status'];
-                            if (statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                            if (statusCode < 300) {
                                 acceptResponse(headers);
                             }
-                            else if (statusCode < 400 /* HTTP_STATUS.BAD_REQUEST */) {
+                            else if (statusCode < 400) {
                                 redirectResponse(statusCode, headers.location);
                             }
-                            else if (statusCode === 401 /* HTTP_STATUS.UNAUTHORIZED */ ||
-                                statusCode === 402 /* HTTP_STATUS.PAYMENT_REQUIRED */ ||
-                                statusCode === 403 /* HTTP_STATUS.FORBIDDEN */ ||
-                                statusCode === 404 /* HTTP_STATUS.NOT_FOUND */ ||
-                                statusCode === 407 /* HTTP_STATUS.PROXY_AUTHENTICATION_REQUIRED */ ||
-                                statusCode === 410 /* HTTP_STATUS.GONE */) {
+                            else if (statusCode === 401 ||
+                                statusCode === 402 ||
+                                statusCode === 403 ||
+                                statusCode === 404 ||
+                                statusCode === 407 ||
+                                statusCode === 410) {
                                 throwError(formatStatus(statusCode), outAbort);
                             }
                             else if (isRetry(statusCode)) {
@@ -2115,10 +2121,10 @@ class Request extends module_1.default {
                                 return;
                             }
                             switch (!isDowngrade(err) && await host.hasProtocol(2)) {
-                                case 1 /* QUERY_RESULT.OK */:
+                                case 1:
                                     errorResponse(err);
                                     break;
-                                case 2 /* QUERY_RESULT.TIMEOUT */:
+                                case 2:
                                     retryDownload(false, err);
                                     break;
                                 default:
@@ -2134,10 +2140,10 @@ class Request extends module_1.default {
                                 return;
                             }
                             const statusCode = res.statusCode;
-                            if (statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                            if (statusCode < 300) {
                                 acceptResponse(res.headers);
                             }
-                            else if (statusCode < 400 /* HTTP_STATUS.BAD_REQUEST */) {
+                            else if (statusCode < 400) {
                                 redirectResponse(statusCode, res.headers.location);
                             }
                             else if (isRetry(statusCode)) {
@@ -2167,7 +2173,7 @@ class Request extends module_1.default {
                             retryTimeout();
                         }
                         else {
-                            throwError(formatStatus(408 /* HTTP_STATUS.REQUEST_TIMEOUT */));
+                            throwError(formatStatus(408));
                         }
                     });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Request constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
     "directory": "src/request"
   },
   "keywords": [
@@ -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.7.1",
-    "@e-mc/types": "0.7.1",
+    "@e-mc/module": "0.7.3",
+    "@e-mc/types": "0.7.3",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "which": "^2.0.2"

package/util.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fromSeconds = exports.asFloat = exports.asInt = exports.trimPath = exports.isRetryable = exports.checkRetryable = exports.hasBasicAuth = exports.getBasicAuth = exports.normalizeHeaders = exports.parseHeader = void 0;
-const module_1 = require("../module");
-const types_1 = require("../types");
+const module_1 = require("@e-mc/module");
+const types_1 = require("@e-mc/types");
 const safeInt = (value) => value >= 0 ? Math.min(value, Number.MAX_SAFE_INTEGER) : NaN;
 function parseHeader(headers, name) {
     const value = headers[name];
@@ -87,19 +87,19 @@ function checkRetryable(err) {
 exports.checkRetryable = checkRetryable;
 function isRetryable(value, timeout) {
     switch (value) {
-        case 408 /* HTTP_STATUS.REQUEST_TIMEOUT */:
-        case 504 /* HTTP_STATUS.GATEWAY_TIMEOUT */:
-        case 522 /* HTTP_STATUS.CONNECTION_TIMED_OUT */:
-        case 524 /* HTTP_STATUS.A_TIMEOUT_OCCURRED */:
+        case 408:
+        case 504:
+        case 522:
+        case 524:
             if (timeout) {
                 return true;
             }
-        case 429 /* HTTP_STATUS.TOO_MANY_REQUESTS */:
-        case 499 /* HTTP_STATUS.CLIENT_CLOSED_REQUEST */:
-        case 500 /* HTTP_STATUS.INTERNAL_SERVER_ERROR */:
-        case 502 /* HTTP_STATUS.BAD_GATEWAY */:
-        case 503 /* HTTP_STATUS.SERVICE_UNAVAILABLE */:
-        case 521 /* HTTP_STATUS.WEB_SERVER_IS_DOWN */:
+        case 429:
+        case 499:
+        case 500:
+        case 502:
+        case 503:
+        case 521:
             if (!timeout) {
                 return true;
             }
@@ -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);
         case 'number':
-            return safeInt(value * 1000 /* TIME.S */);
+            return safeInt(Math.trunc(value) * 1000);
         default:
             return NaN;
     }