@cleandns/whois-rdap 1.0.33 → 1.0.35

package/dist/index.js

@@ -5,6 +5,7 @@ import { fixArrays } from "./utils/fixArrays.js";
 import { ianaIdToRegistrar } from "./utils/ianaIdToRegistrar.js";
 import { tldToRdap } from "./utils/tldToRdap.js";
 import { normalizeWhoisStatus } from "./whoisStatus.js";
+import { resolve4 } from "dns/promises";
 const eventMap = new Map([
     ["registration", "created"],
     ["last changed", "updated"],
@@ -26,9 +27,16 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         nameservers: [],
         ts: { created: null, updated: null, expires: null },
     };
+    if (url !== null) {
+        const host = new URL(url).host;
+        /* check for A record via DNS lookup */
+        const isLive = await resolve4(host).then((r) => Boolean(r === null || r === void 0 ? void 0 : r.length)).catch(() => false);
+        if (!isLive)
+            url = null;
+    }
     if (url === null) {
         if (determinePort43Domain(domain)[2]) {
-            return port43(domain);
+            return port43(domain, _fetch);
         }
         url = "https://rdap.org";
     }

package/dist/port43.d.ts

@@ -1,3 +1,3 @@
 import { WhoisResponse } from "../whois.js";
 export declare function determinePort43Domain(actor: string): any[];
-export declare function port43(actor: string): Promise<WhoisResponse>;
+export declare function port43(actor: string, _fetch: typeof fetch): Promise<WhoisResponse>;

package/dist/port43.js

@@ -20,7 +20,7 @@ export function determinePort43Domain(actor) {
     }
     return [actor, "", null];
 }
-export async function port43(actor) {
+export async function port43(actor, _fetch) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const [domain, tld, whoisServer] = determinePort43Domain(actor);
     const opts = whoisServer;
@@ -45,12 +45,12 @@ export async function port43(actor) {
     let port43response = "";
     try {
         if (isWwww) {
-            port43response = (await fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
+            port43response = (await _fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
             response.server = (_a = opts.url.match('//(.*?)/')) === null || _a === void 0 ? void 0 : _a[1];
         }
         else {
             response.server = server;
-            port43response = await fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
+            port43response = await _fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
                 var _a;
                 return ((_a = r.match(/<pre class="df-raw" id="registryData">(.*?)<\/pre>/s)) === null || _a === void 0 ? void 0 : _a[1]) || "";
             });
@@ -102,6 +102,10 @@ export async function port43(actor) {
     !response.reseller &&
         (m = port43response.match(/^(?:Reseller(?: Name)?|reseller_name|reseller):[ \t]*(\S.+)/im)) &&
         (response.reseller = m[1].trim());
+    console.log(port43response);
+    // Updated Date: 2024-11-21T13:42:54Z
+    // Creation Date: 2017-12-16T02:11:08Z
+    // Registry Expiry Date: 2031-07-10T02:11:08Z
     !response.ts.updated &&
         (m = port43response.match(/^(?:Last Modified|Updated Date|Last updated on|domain_datelastmodified|last-update|modified|last modified)\.*:[ \t]*(\S.+)/im)) &&
         (response.ts.updated = new Date(reformatDate(m[1])) || null);

package/dist/port43servers.js

@@ -173,9 +173,10 @@ export const port43servers = {
     "*.lk": {
         url: `https://www.domains.lk/wp-content/themes/bridge-child/getDomainData.php?domainname=%%domain%%`,
     },
-    "it.com": {
-        url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
-    },
+    "it.com": "whois.it.com",
+    // "it.com": {
+    //   url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
+    // },
     com: {
         host: "whois.verisign-grs.com",
         query: "DOMAIN $addr\r\n",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cleandns/whois-rdap",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "",
   "type": "module",
   "main": "dist/index.js",

package/src/index.ts

@@ -6,6 +6,7 @@ import { fixArrays } from "./utils/fixArrays.js";
 import { ianaIdToRegistrar } from "./utils/ianaIdToRegistrar.js";
 import { tldToRdap } from "./utils/tldToRdap.js";
 import { normalizeWhoisStatus } from "./whoisStatus.js";
+import { resolve4 } from "dns/promises";
 
 const eventMap = new Map<string, WhoisTimestampFields>([
   ["registration", "created"],
@@ -35,9 +36,16 @@ export async function whois(
     ts: { created: null, updated: null, expires: null },
   };
 
+  if (url !== null) {
+    const host = new URL(url).host;
+    /* check for A record via DNS lookup */
+    const isLive = await resolve4(host).then((r) => Boolean(r?.length)).catch(() => false);
+    if (! isLive) url = null;
+  }
+
   if (url === null) {
     if (determinePort43Domain(domain)[2]) {
-      return port43(domain);
+      return port43(domain, _fetch);
     }
     url = "https://rdap.org";
   }

package/src/port43.ts

@@ -26,7 +26,7 @@ export function determinePort43Domain(actor: string) {
   return [actor, "", null];
 }
 
-export async function port43(actor: string): Promise<WhoisResponse> {
+export async function port43(actor: string, _fetch: typeof fetch): Promise<WhoisResponse> {
   const [domain, tld, whoisServer] = determinePort43Domain(actor);
   const opts = whoisServer;
   const isWwww = opts?.url;
@@ -55,12 +55,12 @@ export async function port43(actor: string): Promise<WhoisResponse> {
 
   try {
     if (isWwww) {
-      port43response = (await fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
+      port43response = (await _fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
       response.server = opts.url.match('//(.*?)/')?.[1];
     }
     else {
       response.server = server;
-      port43response = await fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
+      port43response = await _fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
         return r.match(/<pre class="df-raw" id="registryData">(.*?)<\/pre>/s)?.[1] || "";
       });
 
@@ -135,6 +135,12 @@ export async function port43(actor: string): Promise<WhoisResponse> {
     )) &&
     (response.reseller = m[1].trim());
 
+    console.log(port43response)
+
+// Updated Date: 2024-11-21T13:42:54Z
+// Creation Date: 2017-12-16T02:11:08Z
+// Registry Expiry Date: 2031-07-10T02:11:08Z
+
   !response.ts.updated &&
     (m = port43response.match(
       /^(?:Last Modified|Updated Date|Last updated on|domain_datelastmodified|last-update|modified|last modified)\.*:[ \t]*(\S.+)/im

package/src/port43servers.ts

@@ -217,9 +217,10 @@ export const port43servers: Record<string, any> = {
     url: `https://www.domains.lk/wp-content/themes/bridge-child/getDomainData.php?domainname=%%domain%%`,
   },
 
-  "it.com": {
-    url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
-  },
+  "it.com": "whois.it.com",
+  // "it.com": {
+  //   url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
+  // },
 
   com: {
     host: "whois.verisign-grs.com",