@cleandns/whois-rdap 1.0.48 → 1.0.50

package/dist/index.js

@@ -20,6 +20,8 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     [domain, url] = await tldToRdap(origDomain);
     const response = {
         found: false,
+        statusCode: 0,
+        error: '',
         registrar: { id: 0, name: null },
         reseller: null,
         status: [],
@@ -43,10 +45,20 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     const type = domain.match(/[^\d.]/) ? "domain" : "ip";
     let thinResponse = null;
     const thinRdap = `${url}/${type}/${domain}`;
-    // console.log(`fetching thin RDAP: ${thinRdap}`);
     thinResponse = await _fetch(thinRdap)
-        .then((r) => r.json())
-        .catch(() => null);
+        .then((r) => {
+        response.statusCode = r.status;
+        // console.log({ ok: r.ok, status: r.status, statusText: r.statusText });
+        if (r.status >= 200 && r.status < 400) {
+            return r.json();
+        }
+        response.error = r.statusText;
+        return null;
+    })
+        .catch((error) => {
+        console.warn(`thin RDAP lookup failure: ${error.message}`);
+        return null;
+    });
     if (thinResponse && !thinResponse.errorCode) {
     }
     else if (!options.server) {
@@ -78,7 +90,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     const registrars = [];
     const resellers = [];
     async function extractRegistrarsAndResellers(response, url, isThick) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         for (const ent of [
             ...(response.entities || []),
             response.entity ? { events: response.events, ...response.entity } : null,
@@ -124,15 +136,15 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
                     registrars.push({ id: 0, name: ent.vcardArray[1][1][3], email, events: ent.events || response.events || ent.enents || response.enents });
                 }
                 // handles .si
-                else if ((_p = ent.vcardArray) === null || _p === void 0 ? void 0 : _p[1].find((el) => el[0] === 'fn')) {
-                    const email = ((_q = [ent, ...(ent.entities || [])]
+                else if (ent.vcardArray && ent.vcardArray[1] && ent.vcardArray[1].find((el) => el[0] === 'fn')) {
+                    const email = ((_p = [ent, ...(ent.entities || [])]
                         .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                         .map((e) => findInObject(e.vcardArray, (el) => Array.isArray(el) && el[0] === "email", (el) => el[3], ""))
-                        .filter(Boolean)) === null || _q === void 0 ? void 0 : _q[0]) || "";
+                        .filter(Boolean)) === null || _p === void 0 ? void 0 : _p[0]) || "";
                     if (ent.handle && ent.handle.toString().match(/^\d+$/)) {
                         const id = ent.handle;
                         const name = (parseInt(id) == id
-                            && ((_r = (await ianaIdToRegistrar(parseInt(id)))) === null || _r === void 0 ? void 0 : _r.name))
+                            && ((_q = (await ianaIdToRegistrar(parseInt(id)))) === null || _q === void 0 ? void 0 : _q.name))
                             || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], id);
                         registrars.push({ id, name, email, events: ent.events || response.events || ent.enents || response.enents });
                     }
@@ -146,19 +158,19 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
                 }
             }
             if (domain.endsWith(".is") &&
-                (((_s = ent.roles) === null || _s === void 0 ? void 0 : _s.includes("technical")) || ent.role === "technical")) {
+                (((_r = ent.roles) === null || _r === void 0 ? void 0 : _r.includes("technical")) || ent.role === "technical")) {
                 const id = ent.handle;
                 const name = (parseInt(id) == id
-                    && ((_t = (await ianaIdToRegistrar(parseInt(id)))) === null || _t === void 0 ? void 0 : _t.name))
+                    && ((_s = (await ianaIdToRegistrar(parseInt(id)))) === null || _s === void 0 ? void 0 : _s.name))
                     || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], id);
-                const email = ((_u = [ent, ...(ent.entities || [])]
+                const email = ((_t = [ent, ...(ent.entities || [])]
                     .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                     .map((e) => findInObject(e.vcardArray, (el) => Array.isArray(el) && el[0] === "email", (el) => el[3], ""))
-                    .filter(Boolean)) === null || _u === void 0 ? void 0 : _u[0]) || "";
+                    .filter(Boolean)) === null || _t === void 0 ? void 0 : _t[0]) || "";
                 const events = ent.events || response.events || ent.enents || response.enents;
                 registrars.push({ id, name, email, events });
             }
-            if ((((_v = ent.roles) === null || _v === void 0 ? void 0 : _v.includes("reseller")) || ent.role === "reseller") &&
+            if ((((_u = ent.roles) === null || _u === void 0 ? void 0 : _u.includes("reseller")) || ent.role === "reseller") &&
                 ent.vcardArray) {
                 // vcard objects can be unexpectedly and arbitrarily nested
                 const name = findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], "");

package/dist/port43.js

@@ -33,6 +33,8 @@ export async function port43(actor, _fetch) {
     // console.log(`looking up ${domain} on ${server}`);
     const response = {
         found: true,
+        statusCode: 200,
+        error: '',
         registrar: { id: 0, name: null },
         reseller: null,
         status: [],
@@ -40,6 +42,9 @@ export async function port43(actor, _fetch) {
         ts: { created: null, updated: null, expires: null },
     };
     if (!server) {
+        response.found = false;
+        response.statusCode = 405;
+        response.error = "No server specified for port 43 lookup";
         return response;
     }
     let port43response = "";
@@ -70,17 +75,21 @@ export async function port43(actor, _fetch) {
     catch (error) {
         console.warn({ port, server, query, error: error.message });
         response.found = false;
+        response.statusCode = 500;
+        response.error = error.message || "Unknown error during port 43 lookup";
     }
     if (!response.found) {
         return response;
     }
     port43response = port43response.replace(/^[ \t]+/gm, "");
     // console.log(port43response);
-    if (port43response.match(/^%*\s+(NOT FOUND|No match|NO OBJECT FOUND|No entries found|No Data Found|Domain is available for registration|No information available|Status: free)\b/im)) {
+    let m;
+    if (m = port43response.match(/^%*\s*(NOT FOUND|No match|NO OBJECT FOUND|No entries found|No Data Found|Domain is available for registration|No information available|Status: free)\b/im)) {
         response.found = false;
+        response.statusCode = 404;
+        response.error = m[1].trim();
         return response;
     }
-    let m;
     const parser = port43parsers[tld] || ((_b = Object.entries(port43parsers).find(([t]) => tld.endsWith('.' + t))) === null || _b === void 0 ? void 0 : _b[1]);
     if (parser) {
         await parser(port43response, response);

package/package.json

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

package/src/index.ts

@@ -28,6 +28,8 @@ export async function whois(
 
   const response: WhoisResponse = {
     found: false,
+    statusCode: 0,
+    error: '',
     registrar: { id: 0, name: null },
     reseller: null,
     status: [],
@@ -54,11 +56,21 @@ export async function whois(
   let thinResponse: any = null;
   const thinRdap = `${url}/${type}/${domain}`;
 
-  // console.log(`fetching thin RDAP: ${thinRdap}`);
-
   thinResponse = await _fetch(thinRdap)
-    .then((r) => r.json() as any)
-    .catch(() => null);
+    .then((r) => {
+      response.statusCode = r.status;
+      // console.log({ ok: r.ok, status: r.status, statusText: r.statusText });
+      if (r.status >= 200 && r.status < 400) {
+        return r.json() as any;
+      }
+      response.error = r.statusText;
+      return null;
+    })
+    .catch((error: Error) => {
+      console.warn(`thin RDAP lookup failure: ${error.message}`);
+      return null;
+    });
+  
   if (thinResponse && !thinResponse.errorCode) {
   } else if (!options.server) {
     return response;
@@ -179,7 +191,7 @@ export async function whois(
           registrars.push({ id: 0, name: ent.vcardArray[1][1][3], email, events: ent.events || response.events || ent.enents || response.enents });
         }
         // handles .si
-        else if (ent.vcardArray?.[1].find((el: string[]) => el[0] === 'fn')) {
+        else if (ent.vcardArray && ent.vcardArray[1] && ent.vcardArray[1].find((el: string[]) => el[0] === 'fn')) {
           const email =
             [ent, ...(ent.entities || [])]
               .filter((e) => e?.vcardArray)

package/src/port43.ts

@@ -40,6 +40,8 @@ export async function port43(actor: string, _fetch: typeof fetch): Promise<Whois
 
   const response: WhoisResponse = {
     found: true,
+    statusCode: 200,
+    error: '',
     registrar: { id: 0, name: null },
     reseller: null,
     status: [],
@@ -48,6 +50,9 @@ export async function port43(actor: string, _fetch: typeof fetch): Promise<Whois
   };
 
   if (!server) {
+    response.found = false;
+    response.statusCode = 405;
+    response.error = "No server specified for port 43 lookup";
     return response;
   }
 
@@ -79,6 +84,8 @@ export async function port43(actor: string, _fetch: typeof fetch): Promise<Whois
   } catch (error: any) {
     console.warn({ port, server, query, error: error.message });
     response.found = false;
+    response.statusCode = 500;
+    response.error = error.message || "Unknown error during port 43 lookup";
   }
 
   if (!response.found) {
@@ -88,17 +95,19 @@ export async function port43(actor: string, _fetch: typeof fetch): Promise<Whois
   port43response = port43response.replace(/^[ \t]+/gm, "");
   // console.log(port43response);
 
+  let m;
+
   if (
-    port43response.match(
-      /^%*\s+(NOT FOUND|No match|NO OBJECT FOUND|No entries found|No Data Found|Domain is available for registration|No information available|Status: free)\b/im
+    m = port43response.match(
+      /^%*\s*(NOT FOUND|No match|NO OBJECT FOUND|No entries found|No Data Found|Domain is available for registration|No information available|Status: free)\b/im
     )
   ) {
     response.found = false;
+    response.statusCode = 404;
+    response.error = m[1].trim();
     return response;
   }
 
-  let m;
-
   const parser = port43parsers[tld] || Object.entries(port43parsers).find(([t]) => tld.endsWith('.' + t))?.[1];
 
   if (parser) {

package/whois.d.ts

@@ -8,6 +8,8 @@ export type WhoisOptions = Partial<{
 
 export type WhoisResponse = {
   found: boolean;
+  statusCode?: number;
+  error?: string;
   server?: string;
   registrar: {
     id: string | number;