@cleandns/whois-rdap 1.0.40 → 1.0.46

package/dist/index.js

@@ -41,23 +41,24 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         url = "https://rdap.org";
     }
     const type = domain.match(/[^\d.]/) ? "domain" : "ip";
+    let thinResponse = null;
     const thinRdap = `${url}/${type}/${domain}`;
     // console.log(`fetching thin RDAP: ${thinRdap}`);
-    let thinResponse = await _fetch(thinRdap)
+    thinResponse = await _fetch(thinRdap)
         .then((r) => r.json())
         .catch(() => null);
     if (thinResponse && !thinResponse.errorCode) {
     }
-    else {
+    else if (!options.server) {
         return response;
     }
     if ((_a = thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.rdapConformance) === null || _a === void 0 ? void 0 : _a["0"]) {
         thinResponse = fixArrays(thinResponse);
     }
-    const selfRdap = (_b = thinResponse.links) === null || _b === void 0 ? void 0 : _b.find((link) => link.rel === "self");
-    const thickRdap = (_d = (_c = thinResponse.links) === null || _c === void 0 ? void 0 : _c.find((link) => link.href !== (selfRdap === null || selfRdap === void 0 ? void 0 : selfRdap.href) &&
+    const selfRdap = (_b = thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.links) === null || _b === void 0 ? void 0 : _b.find((link) => link.rel === "self");
+    const thickRdap = ((_d = (_c = thinResponse.links) === null || _c === void 0 ? void 0 : _c.find((link) => link.href !== (selfRdap === null || selfRdap === void 0 ? void 0 : selfRdap.href) &&
         link.rel === "related" &&
-        link.type === "application/rdap+json")) === null || _d === void 0 ? void 0 : _d.href.replace("/domain/domain/", "/domain/");
+        link.type === "application/rdap+json")) === null || _d === void 0 ? void 0 : _d.href.replace("/domain/domain/", "/domain/")) || `${options.server}/domain/${domain}`;
     let thickResponse = null;
     if (!options.thinOnly && thickRdap) {
         // console.log(`fetching thick RDAP: ${thickRdap}`);
@@ -216,7 +217,9 @@ function findStatus(statuses, domain) {
         ? statuses
         : statuses && typeof statuses === "object"
             ? Object.keys(statuses)
-            : (statuses || "").trim().split(/\s*,\s*/)).map((status) => normalizeWhoisStatus(status));
+            : typeof statuses === "string"
+                ? statuses.trim().split(/\s*,\s*/)
+                : []).map((status) => normalizeWhoisStatus(status));
 }
 function findNameservers(values) {
     let nameservers = [];

package/dist/test.js

@@ -1,2 +1,2 @@
 import { whois } from "./index.js";
-whois(process.argv[2], { thinOnly: Boolean(process.argv[3]) }).then((r) => console.log(JSON.stringify(r, undefined, 2)));
+whois(process.argv[2], { thinOnly: Boolean(process.argv[3]), server: process.argv[4] }).then((r) => console.log(JSON.stringify(r, undefined, 2)));

package/package.json

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

package/src/index.ts

@@ -40,7 +40,7 @@ export async function whois(
     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 (!isLive) url = null;
   }
 
   if (url === null) {
@@ -51,15 +51,16 @@ export async function whois(
   }
 
   const type = domain.match(/[^\d.]/) ? "domain" : "ip";
-
+  let thinResponse: any = null;
   const thinRdap = `${url}/${type}/${domain}`;
+
   // console.log(`fetching thin RDAP: ${thinRdap}`);
 
-  let thinResponse = await _fetch(thinRdap)
+  thinResponse = await _fetch(thinRdap)
     .then((r) => r.json() as any)
     .catch(() => null);
   if (thinResponse && !thinResponse.errorCode) {
-  } else {
+  } else if (!options.server) {
     return response;
   }
 
@@ -67,7 +68,8 @@ export async function whois(
     thinResponse = fixArrays(thinResponse);
   }
 
-  const selfRdap = thinResponse.links?.find((link: any) => link.rel === "self");
+  const selfRdap = thinResponse?.links?.find((link: any) => link.rel === "self");
+
   const thickRdap = thinResponse.links
     ?.find(
       (link: any) =>
@@ -75,7 +77,7 @@ export async function whois(
         link.rel === "related" &&
         link.type === "application/rdap+json"
     )
-    ?.href.replace("/domain/domain/", "/domain/");
+    ?.href.replace("/domain/domain/", "/domain/") || `${options.server}/domain/${domain}`;
 
   let thickResponse: any = null;
 
@@ -333,7 +335,9 @@ function findStatus(statuses: string | string[], domain: string): string[] {
     ? statuses
     : statuses && typeof statuses === "object"
       ? Object.keys(statuses)
-      : (statuses || "").trim().split(/\s*,\s*/)
+      : typeof statuses === "string"
+        ? statuses.trim().split(/\s*,\s*/)
+        : []
   ).map((status) => normalizeWhoisStatus(status));
 }
 

package/src/test.ts

@@ -1,5 +1,5 @@
 import { whois } from "./index.js";
 
-whois(process.argv[2], { thinOnly: Boolean(process.argv[3]) }).then((r) =>
+whois(process.argv[2], { thinOnly: Boolean(process.argv[3]), server: process.argv[4] }).then((r) =>
   console.log(JSON.stringify(r, undefined, 2))
 );

package/whois.d.ts

@@ -3,6 +3,7 @@ export type WhoisTimestampFields = "created" | "updated" | "expires";
 export type WhoisOptions = Partial<{
   fetch: typeof fetch;
   thinOnly: boolean;
+  server: string;
 }>;
 
 export type WhoisResponse = {