@e-mc/request 0.4.2 → 0.5.1

package/index.js

@@ -33,6 +33,7 @@ const kConnectDns = Symbol('connectDns');
 const kPendingDns = Symbol('pendingDns');
 const kConnectHttp = Symbol('connectHttp');
 const PLATFORM_WIN32 = process.platform === 'win32';
+const SUPPORT_NODEJS20 = module_1.default.supported(20);
 const SUPPORT_ABORTSIGNAL = module_1.default.supported(15, 4);
 const HTTP = {
     HOST: {},
@@ -570,7 +571,7 @@ class Request extends module_1.default {
         for (const hostname in resolve) {
             let { address, family: ipv } = resolve[hostname];
             if (address && (ipv = ipv && ((ipv = +ipv) === 4 || ipv === 6) ? ipv : net.isIPv6(address) ? 6 : net.isIPv4(address) ? 4 : 0)) {
-                DNS.CACHE[hostname] = [address, ipv];
+                DNS.CACHE[hostname] = [{ address, family: ipv }];
             }
         }
     }
@@ -815,14 +816,16 @@ class Request extends module_1.default {
                     }
                     break;
             }
-            setDnsCache(hostname, this[kConnectDns][hostname] = [address, family]);
+            setDnsCache(hostname, this[kConnectDns][hostname] = [{ address, family }]);
         }
     }
     lookupDns(hostname) {
         var _l;
         const resolved = this[kConnectDns][hostname] || DNS.CACHE[hostname];
         if (resolved) {
-            return (...args) => args[2](null, ...resolved);
+            return (...args) => {
+                return SUPPORT_NODEJS20 ? args[2](null, resolved) : args[2](null, resolved[0].address, resolved[0].family);
+            };
         }
         const pending = (_l = this[kPendingDns])[hostname] || (_l[hostname] = []);
         return (value, options, callback) => {
@@ -830,17 +833,23 @@ class Request extends module_1.default {
                 const configure = (family) => family === 0 ? options : { family, hints: family === 6 ? dns.V4MAPPED : 0 };
                 const success = (connected) => {
                     setDnsCache(value, this[kConnectDns][value] = connected);
-                    pending.forEach(cb => cb(null, ...connected));
+                    if (SUPPORT_NODEJS20) {
+                        pending.forEach(cb => cb(null, connected));
+                    }
+                    else {
+                        const { address, family } = connected[0];
+                        pending.forEach(cb => cb(null, address, family));
+                    }
                     pending.length = 0;
                 };
                 const failed = (err) => {
-                    pending.forEach(cb => cb(err, '', 0));
+                    pending.forEach(cb => SUPPORT_NODEJS20 ? cb(err, []) : cb(err, '', 0));
                     pending.length = 0;
                 };
                 let ipVersion = this.ipVersion;
                 dns.lookup(value, configure(ipVersion), (err, address, family) => {
                     if (!err) {
-                        success([address, family]);
+                        success(typeof address === 'string' ? [{ address, family }] : address);
                     }
                     else {
                         switch (err.code) {
@@ -865,7 +874,7 @@ class Request extends module_1.default {
                         }
                         dns.lookup(value, configure(ipVersion), (err, address, family) => {
                             if (!err) {
-                                success([address, family]);
+                                success(typeof address === 'string' ? [{ address, family }] : address);
                             }
                             else {
                                 failed(err);

package/package.json

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