@e-mc/request 0.8.1 → 0.8.3

package/README.md

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

package/index.js

@@ -1,5 +1,5 @@
 "use strict";
-var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
@@ -33,10 +33,11 @@ const kHostInfo = Symbol('hostInfo');
 const kConnectDns = Symbol('connectDns');
 const kPendingDns = Symbol('pendingDns');
 const kConnectHttp = Symbol('connectHttp');
+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, 4);
+const SUPPORT_ABORTSIGNAL = module_1.default.supported(15, 3) || module_1.default.supported(14, 17, 0, true);
 const HTTP = {
     HOST: {},
     HEADERS: {},
@@ -104,17 +105,18 @@ function getBaseHeaders(uri, headers) {
         return result[0][1];
     }
 }
-function setDnsCache(hostname, value) {
-    if (DNS.EXPIRES > 0 && !DNS.CACHE[hostname]) {
+function setDnsCache(hostname, value, expires) {
+    expires ?? (expires = DNS.EXPIRES);
+    if (expires > 0 && !DNS.CACHE[hostname]) {
         DNS.CACHE[hostname] = value;
-        if (DNS.EXPIRES !== Infinity) {
+        if (expires !== Infinity) {
             const timeout = setTimeout(() => {
                 const index = DNS.TIMEOUT.findIndex(item => item === timeout);
                 if (index !== -1) {
                     DNS.TIMEOUT.splice(index, 1);
                 }
                 DNS.CACHE[hostname] = undefined;
-            }, DNS.EXPIRES);
+            }, expires);
             DNS.TIMEOUT.push(timeout);
         }
     }
@@ -259,6 +261,15 @@ function validateCerts(certs) {
     }
     return [text, file];
 }
+function abortHeaders(href, request, options) {
+    const reason = (0, types_1.errorValue)("Aborted by client" /* ERR_MESSAGE.ABORTED_CLIENT */, href);
+    const outAbort = options.outAbort;
+    if (outAbort) {
+        outAbort.abort(reason);
+        this[kDownloading].delete(outAbort);
+    }
+    request.destroy(reason);
+}
 class Request extends module_1.default {
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (percent >= 1) {
@@ -522,6 +533,8 @@ class Request extends module_1.default {
                     return 'Locked';
                 case 424 /* HTTP_STATUS.FAILED_DEPENDENCY */:
                     return 'Failed Dependency';
+                case 425 /* HTTP_STATUS.TOO_EARLY */:
+                    return 'Too Early';
                 case 426 /* HTTP_STATUS.UPGRADE_REQUIRED */:
                     return 'Upgrade Required';
                 case 428 /* HTTP_STATUS.PRECONDITION_REQUIRED */:
@@ -554,6 +567,8 @@ class Request extends module_1.default {
                     return 'Insufficient Storage';
                 case 508 /* HTTP_STATUS.LOOP_DETECTED */:
                     return 'Loop Detected';
+                case 509 /* HTTP_STATUS.BANDWIDTH_LIMIT_EXCEEDED */:
+                    return 'Bandwidth Limit Exceeded';
                 case 510 /* HTTP_STATUS.NOT_EXTENDED */:
                     return 'Not Extended';
                 case 511 /* HTTP_STATUS.NETWORK_AUTHENTICATION_REQUIRED */:
@@ -634,10 +649,11 @@ class Request extends module_1.default {
         this[_e] = Object.create(null);
         this[_f] = Object.create(null);
         this[_g] = [{}, {}];
-        this[_h] = new Set();
-        this[_j] = {};
-        this[_k] = [Object.create(null)];
-        this[_l] = new Map();
+        this[_h] = null;
+        this[_j] = null;
+        this[_k] = new Set();
+        this[_l] = {};
+        this[_m] = [Object.create(null)];
         if ((0, types_1.isPlainObject)(data)) {
             const { headers, read_timeout, agent, use, connect, certs } = data;
             const timeout = (0, util_1.fromSeconds)(data.timeout);
@@ -826,8 +842,11 @@ class Request extends module_1.default {
         }
         return this;
     }
-    addDns(hostname, address, family) {
+    addDns(hostname, address, family, timeout) {
         switch (family) {
+            case 4:
+            case 6:
+                break;
             case 'IPv4':
                 family = 4;
                 break;
@@ -835,6 +854,9 @@ class Request extends module_1.default {
                 family = 6;
                 break;
             default:
+                if (typeof family === 'number' && timeout === undefined) {
+                    timeout = family;
+                }
                 if (net.isIPv4(address)) {
                     family = 4;
                 }
@@ -846,17 +868,17 @@ class Request extends module_1.default {
                 }
                 break;
         }
-        setDnsCache(hostname, this[kConnectDns][hostname] = [{ address, family }]);
+        setDnsCache(hostname, this[kConnectDns][hostname] = [{ address, family }], timeout);
     }
     lookupDns(hostname) {
-        var _m;
+        var _o;
         const resolved = this[kConnectDns][hostname] || DNS.CACHE[hostname];
         if (resolved) {
             return (...args) => {
                 return SUPPORT_NODEJS20 ? args[2](null, resolved) : args[2](null, resolved[0].address, resolved[0].family);
             };
         }
-        const pending = (_m = this[kPendingDns])[hostname] || (_m[hostname] = []);
+        const pending = (_o = this[kPendingDns])[hostname] || (_o[hostname] = []);
         return (value, options, callback) => {
             if (pending.push(callback) === 1) {
                 const configure = (family) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
@@ -928,13 +950,29 @@ class Request extends module_1.default {
             }
         }
     }
+    statusOn(code, patternUrl = '*', callback) {
+        if (typeof patternUrl === 'function') {
+            callback = patternUrl;
+            patternUrl = '*';
+        }
+        if ((0, types_1.isString)(patternUrl) && typeof callback === 'function') {
+            const on = this[kStatusOn] || (this[kStatusOn] = new Map());
+            for (const item of !Array.isArray(code) ? [code] : code) {
+                let status = on.get(item);
+                if (!status) {
+                    on.set(item, status = []);
+                }
+                status.push([patternUrl, callback]);
+            }
+        }
+    }
     headersOn(name, patternUrl = '*', callback) {
         if (typeof patternUrl === 'function') {
             callback = patternUrl;
             patternUrl = '*';
         }
         if ((0, types_1.isString)(patternUrl) && typeof callback === 'function') {
-            const on = this[kHeadersOn];
+            const on = this[kHeadersOn] || (this[kHeadersOn] = new Map());
             for (const item of !Array.isArray(name) ? [name] : name) {
                 let headers = on.get(item);
                 if (!headers) {
@@ -1311,21 +1349,21 @@ class Request extends module_1.default {
         return this.get(uri, options);
     }
     opts(url, options) {
-        var _m, _o, _p, _q;
+        var _o, _p, _q, _r;
         if (typeof url === 'string') {
             url = new URL(url);
         }
         let host;
         if (this.host) {
-            host = (_m = HTTP.HOST)[_o = url.origin] || (_m[_o] = new host_1.default(url, HTTP.VERSION));
+            host = (_o = HTTP.HOST)[_p = url.origin] || (_o[_p] = new host_1.default(url, HTTP.VERSION));
         }
         else {
-            host = (_p = this[kHostInfo])[_q = url.origin] || (_p[_q] = new host_1.default(url, this.httpVersion || 1));
+            host = (_q = this[kHostInfo])[_r = url.origin] || (_q[_r] = new host_1.default(url, this.httpVersion || 1));
         }
         return { ...options, host, url };
     }
     open(uri, options) {
-        var _m, _o;
+        var _o, _p;
         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';
@@ -1417,7 +1455,7 @@ class Request extends module_1.default {
         const version = this.httpVersion;
         let request, ca, cert, key, minVersion, baseHeaders = this.headersOf(uri);
         if (getting && this.acceptEncoding && !localhost && !baseHeaders?.['accept-encoding']) {
-            (_m = (headers || (headers = {})))['accept-encoding'] || (_m['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
+            (_o = (headers || (headers = {})))['accept-encoding'] || (_o['accept-encoding'] = 'gzip, deflate, br' + (LIB_ZSTD ? ', zstd' : ''));
         }
         if (secure) {
             const certs = this[kCerts]?.[0][origin] || (this.host ? TLS.TEXT[origin] : null);
@@ -1426,7 +1464,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 = ((_o = this[kSession][0])[origin] || (_o[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { initialWindowSize: 4294967295 /* CONSTANTS.INITIAL_WINDOW_SIZE */, maxFrameSize: 16777215 /* CONSTANTS.MAX_FRAME_SIZE */, enablePush: false } : { enablePush: false } }))).request({ ...baseHeaders, ...host_1.default.getBasicAuth(url), ...headers, ':path': pathname, ':method': method });
+            request = ((_p = this[kSession][0])[origin] || (_p[origin] = http2.connect(origin, { lookup: this.lookupDns(hostname), ca, cert, key, minVersion, settings: localhost ? { 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 });
             if (getting) {
                 const listenerMap = {};
                 const onEvent = request.on.bind(request);
@@ -1435,7 +1473,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 (this.matchStatus(statusCode, url, response, request, options) && statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
                         if (emitter = checkEncoding(request, statusCode, response['content-encoding'])) {
                             for (const event in listenerMap) {
                                 listenerMap[event].forEach(listener => {
@@ -1463,7 +1501,7 @@ class Request extends module_1.default {
                     this.matchHeaders(url, response, request, options);
                 });
                 request.on = function (event, listener) {
-                    var _m;
+                    var _o;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -1473,7 +1511,7 @@ class Request extends module_1.default {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_m = event + '-on'] || (listenerMap[_m] = [])).push(listener);
+                                (listenerMap[_o = event + '-on'] || (listenerMap[_o] = [])).push(listener);
                             }
                         default:
                             onEvent(event, listener);
@@ -1482,7 +1520,7 @@ class Request extends module_1.default {
                     return this;
                 };
                 request.once = function (event, listener) {
-                    var _m;
+                    var _o;
                     switch (event) {
                         case 'data':
                         case 'error':
@@ -1492,7 +1530,7 @@ class Request extends module_1.default {
                                 break;
                             }
                             if (!connected) {
-                                (listenerMap[_m = event + '-once'] || (listenerMap[_m] = [])).push(listener);
+                                (listenerMap[_o = event + '-once'] || (listenerMap[_o] = [])).push(listener);
                             }
                         default:
                             onceEvent(event, listener);
@@ -1556,7 +1594,7 @@ class Request extends module_1.default {
             }, response => {
                 const statusCode = response.statusCode;
                 const incoming = response.headers;
-                if ((getting || posting) && statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
+                if (this.matchStatus(statusCode, url, incoming, request, options) && (getting || posting) && statusCode >= 200 /* HTTP_STATUS.OK */ && statusCode < 300 /* HTTP_STATUS.MULTIPLE_CHOICES */) {
                     let source = checkEncoding(response, statusCode, incoming['content-encoding']);
                     if (source) {
                         source.once('finish', () => request.emit('end'));
@@ -1788,7 +1826,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.encoding);
         }
         return new Promise((resolve, reject) => {
             const { silent = this[kSingleton], pipeTo } = opts;
@@ -2217,9 +2255,33 @@ class Request extends module_1.default {
         });
         this[kDownloading].clear();
     }
+    matchStatus(code, url, headers, request, options) {
+        const status = this[kStatusOn]?.get(code);
+        if (status) {
+            const href = url.href;
+            const called = new Set();
+            for (const [pattern, callback] of status) {
+                if (pattern === '*' || pm.isMatch(href, pattern)) {
+                    called.add(callback);
+                }
+            }
+            for (const callback of called) {
+                try {
+                    if (callback(code, headers, url) === true) {
+                        abortHeaders.call(this, href, request, options);
+                        return false;
+                    }
+                }
+                catch (err) {
+                    this.writeFail(["Unable to process headers" /* ERR_HTTP.HEADERS */, url.origin], err, { type: 1024 /* LOG_TYPE.HTTP */, abortable: this.abortable, fatal: false });
+                }
+            }
+        }
+        return true;
+    }
     matchHeaders(url, headers, request, options) {
         const on = this[kHeadersOn];
-        if (on.size) {
+        if (on?.size) {
             const href = url.href;
             const called = new Map();
             for (const [name, item] of on) {
@@ -2238,21 +2300,16 @@ class Request extends module_1.default {
             for (const [callback, data] of called) {
                 try {
                     if (callback(data, url) === true) {
-                        const reason = (0, types_1.errorValue)("Aborted by client" /* ERR_MESSAGE.ABORTED_CLIENT */, href);
-                        const outAbort = options.outAbort;
-                        if (outAbort) {
-                            outAbort.abort(reason);
-                            this[kDownloading].delete(outAbort);
-                        }
-                        request.destroy(reason);
-                        return;
+                        abortHeaders.call(this, href, request, options);
+                        return false;
                     }
                 }
                 catch (err) {
-                    this.writeFail(['Unable to process headers', url.origin], err, { type: 1024 /* LOG_TYPE.HTTP */, abortable: this.abortable, fatal: false });
+                    this.writeFail(["Unable to process headers" /* ERR_HTTP.HEADERS */, url.origin], err, { type: 1024 /* LOG_TYPE.HTTP */, abortable: this.abortable, fatal: false });
                 }
             }
         }
+        return true;
     }
     set agentTimeout(value) {
         if (value > 0) {
@@ -2291,11 +2348,11 @@ class Request extends module_1.default {
         return this[kIpVersion];
     }
     get settings() {
-        var _m;
-        return (_m = this.module).settings || (_m.settings = {});
+        var _o;
+        return (_o = this.module).settings || (_o.settings = {});
     }
 }
-_a = kSingleton, _b = kHttpVersion, _c = kHeaders, _d = kCerts, _e = kConnectDns, _f = kPendingDns, _g = kConnectHttp, _h = kDownloading, _j = kHostInfo, _k = kSession, _l = kHeadersOn;
+_a = kSingleton, _b = kHttpVersion, _c = kHeaders, _d = kCerts, _e = kConnectDns, _f = kPendingDns, _g = kConnectHttp, _h = kStatusOn, _j = kHeadersOn, _k = kDownloading, _l = kHostInfo, _m = kSession;
 exports.default = Request;
 
 if (exports.default) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/request",
-  "version": "0.8.1",
+  "version": "0.8.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": [
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.1",
-    "@e-mc/types": "0.8.1",
+    "@e-mc/module": "0.8.3",
+    "@e-mc/types": "0.8.3",
     "combined-stream": "^1.0.8",
     "js-yaml": "^4.1.0",
     "picomatch": "^3.0.1",