@cleandns/whois-rdap 1.0.52 → 1.0.57

package/.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: Test
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18, 20, 22]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 9
+
+      - name: Setup Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm run build
+
+      - name: Run tests
+        run: pnpm test

package/dist/index.d.ts

@@ -1,2 +1,4 @@
-import { WhoisOptions, WhoisResponse } from "../whois.js";
+import "./polyfills.js";
+import { WhoisOptions, WhoisResponse, WhoisTimestampFields } from "../whois.js";
+export declare const eventMap: Map<string, WhoisTimestampFields>;
 export declare function whois(origDomain: string, options?: WhoisOptions): Promise<WhoisResponse>;

package/dist/index.js

@@ -1,12 +1,21 @@
+// Polyfills for Node.js 18 compatibility
+import "./polyfills.js";
 import { parseIpResponse } from "./ip.js";
 import { determinePort43Domain, port43 } from "./port43.js";
 import { findInObject } from "./utils/findInObject.js";
 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([
+import { toArray } from "./utils/toArray.js";
+import { validateDomain } from "./utils/validateDomain.js";
+import { findStatus } from "./utils/findStatus.js";
+import { findNameservers } from "./utils/findNameservers.js";
+import { findTimestamps } from "./utils/findTimestamps.js";
+import createDebug from "debug";
+// Debug logger - enable with DEBUG=whois:* environment variable
+const debug = createDebug("whois:rdap");
+export const eventMap = new Map([
     ["registration", "created"],
     ["last changed", "updated"],
     ["expiration", "expires"],
@@ -15,9 +24,26 @@ const eventMap = new Map([
 export async function whois(origDomain, options = { fetch: fetch, thinOnly: false }) {
     var _a, _b, _c, _d, _e, _f;
     const _fetch = options.fetch || fetch;
-    let domain = origDomain;
+    // Validate and sanitize input
+    let domain;
+    try {
+        domain = validateDomain(origDomain);
+    }
+    catch (e) {
+        return {
+            found: false,
+            statusCode: 400,
+            error: e.message,
+            registrar: { id: 0, name: null },
+            reseller: null,
+            status: [],
+            statusDelta: [],
+            nameservers: [],
+            ts: { created: null, updated: null, expires: null },
+        };
+    }
     let url = null;
-    [domain, url] = await tldToRdap(origDomain);
+    [domain, url] = await tldToRdap(domain);
     const response = {
         found: false,
         statusCode: 0,
@@ -48,7 +74,6 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     thinResponse = await _fetch(thinRdap)
         .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();
         }
@@ -56,7 +81,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         return null;
     })
         .catch((error) => {
-        console.warn(`thin RDAP lookup failure: ${error.message}`);
+        debug("thin RDAP lookup failure for %s: %s", domain, error.message);
         return null;
     });
     if (thinResponse && !thinResponse.errorCode) {
@@ -68,12 +93,16 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         thinResponse = fixArrays(thinResponse);
     }
     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) &&
+    // Find the thick RDAP URL from the thin response's links
+    const thickRdapFromLinks = (_d = (_c = thinResponse === null || thinResponse === void 0 ? void 0 : 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/")) || `${options.server}/domain/${domain}`;
+        link.type === "application/rdap+json")) === null || _d === void 0 ? void 0 : _d.href.replace("/domain/domain/", "/domain/");
+    // Only use options.server as fallback if it's actually defined
+    // This prevents constructing invalid URLs like "undefined/domain/example.com"
+    const thickRdap = thickRdapFromLinks || (options.server ? `${options.server}/domain/${domain}` : null);
     let thickResponse = null;
     if (!options.thinOnly && thickRdap) {
-        // console.log(`fetching thick RDAP: ${thickRdap}`);
+        debug("fetching thick RDAP: %s", thickRdap);
         thickResponse = await _fetch(thickRdap)
             .then((r) => r.json())
             .catch(() => null);
@@ -81,7 +110,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         }
         else {
             thickResponse = null;
-            // console.warn(`thick RDAP failed for ${domain}`);
+            debug("thick RDAP failed for %s", domain);
         }
     }
     if ((_e = thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.rdapConformance) === null || _e === void 0 ? void 0 : _e["0"]) {
@@ -90,11 +119,14 @@ 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, _w, _x, _y, _z;
-        for (const ent of [
-            ...(response.entities || []),
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2;
+        // Use toArray to safely handle entities that might not be iterable
+        const entities = toArray(response.entities);
+        const entityList = [
+            ...entities,
             response.entity ? { events: response.events, ...response.entity } : null,
-        ].filter(Boolean)) {
+        ].filter(Boolean);
+        for (const ent of entityList) {
             if (((_a = ent.roles) === null || _a === void 0 ? void 0 : _a.includes("registrar")) || ent.role === "registrar") {
                 const pubIds = [];
                 if (ent.publicIds) {
@@ -116,53 +148,59 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
                     || ((_h = pubIds.find((id) => id.type === "Registry Identifier")) === null || _h === void 0 ? void 0 : _h.identifier)
                     || pubIds.find((id) => id.type === "IANA Registrar ID");
                 if (reg) {
-                    // console.log(ent.vcardArray);
                     const id = typeof reg === 'object' ? 0 : reg;
                     const name = (parseInt(id) == id
                         && ((_j = (await ianaIdToRegistrar(parseInt(id)))) === null || _j === void 0 ? void 0 : _j.name))
                         || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], reg);
-                    const email = ((_k = [ent, ...(ent.entities || [])]
+                    // Safely handle ent.entities
+                    const entEntities = toArray(ent.entities);
+                    const email = ((_k = [ent, ...entEntities]
                         .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 || _k === void 0 ? void 0 : _k[0]) || "";
-                    const abuseEmail = ((_l = [ent, ...(ent.entities || [])]
+                    const abuseEmail = ((_l = [ent, ...entEntities]
                         .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                         .map((e) => findInObject(e.vcardArray, (el) => { var _a; return Array.isArray(el) && ((_a = e.roles) === null || _a === void 0 ? void 0 : _a.includes("abuse")) && el[0] === "email"; }, (el) => el[3], ""))
                         .filter(Boolean)) === null || _l === void 0 ? void 0 : _l[0]) || "";
                     const events = ent.events || response.events || ent.enents || response.enents;
                     registrars.push({ id, name, email, abuseEmail, events });
                 }
-                // handles .ca
+                // handles .ca - with safe optional chaining
                 else if (((_p = (_o = (_m = ent.vcardArray) === null || _m === void 0 ? void 0 : _m[1]) === null || _o === void 0 ? void 0 : _o[3]) === null || _p === void 0 ? void 0 : _p[3]) === 'registrar') {
-                    const email = ((_q = [ent, ...(ent.entities || [])]
+                    const entEntities = toArray(ent.entities);
+                    const email = ((_q = [ent, ...entEntities]
                         .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]) || "";
-                    const abuseEmail = ((_r = [ent, ...(ent.entities || [])]
+                    const abuseEmail = ((_r = [ent, ...entEntities]
                         .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                         .map((e) => findInObject(e.vcardArray, (el) => { var _a; return Array.isArray(el) && ((_a = e.roles) === null || _a === void 0 ? void 0 : _a.includes("abuse")) && el[0] === "email"; }, (el) => el[3], ""))
                         .filter(Boolean)) === null || _r === void 0 ? void 0 : _r[0]) || "";
-                    registrars.push({ id: 0, name: ent.vcardArray[1][1][3], email, abuseEmail, events: ent.events || response.events || ent.enents || response.enents });
+                    const vcardName = ((_u = (_t = (_s = ent.vcardArray) === null || _s === void 0 ? void 0 : _s[1]) === null || _t === void 0 ? void 0 : _t[1]) === null || _u === void 0 ? void 0 : _u[3]) || '';
+                    registrars.push({ id: 0, name: vcardName, email, abuseEmail, events: ent.events || response.events || ent.enents || response.enents });
                 }
-                // handles .si
-                else if (ent.vcardArray && ent.vcardArray[1] && ent.vcardArray[1].find((el) => el[0] === 'fn')) {
-                    const email = ((_s = [ent, ...(ent.entities || [])]
+                // handles .si - with safe array access
+                else if (ent.vcardArray && Array.isArray(ent.vcardArray[1]) && ent.vcardArray[1].find((el) => el[0] === 'fn')) {
+                    const entEntities = toArray(ent.entities);
+                    const email = ((_v = [ent, ...entEntities]
                         .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 || _s === void 0 ? void 0 : _s[0]) || "";
-                    const abuseEmail = ((_t = [ent, ...(ent.entities || [])]
+                        .filter(Boolean)) === null || _v === void 0 ? void 0 : _v[0]) || "";
+                    const abuseEmail = ((_w = [ent, ...entEntities]
                         .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                         .map((e) => findInObject(e.vcardArray, (el) => { var _a; return Array.isArray(el) && ((_a = e.roles) === null || _a === void 0 ? void 0 : _a.includes("abuse")) && el[0] === "email"; }, (el) => el[3], ""))
-                        .filter(Boolean)) === null || _t === void 0 ? void 0 : _t[0]) || "";
+                        .filter(Boolean)) === null || _w === void 0 ? void 0 : _w[0]) || "";
                     if (ent.handle && ent.handle.toString().match(/^\d+$/)) {
                         const id = ent.handle;
                         const name = (parseInt(id) == id
-                            && ((_u = (await ianaIdToRegistrar(parseInt(id)))) === null || _u === void 0 ? void 0 : _u.name))
+                            && ((_x = (await ianaIdToRegistrar(parseInt(id)))) === null || _x === void 0 ? void 0 : _x.name))
                             || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], id);
                         registrars.push({ id, name, email, abuseEmail, events: ent.events || response.events || ent.enents || response.enents });
                     }
                     else {
-                        registrars.push({ id: ent.handle || 0, name: ent.vcardArray[1].find((el) => el[0] === 'fn')[3], email, abuseEmail, events: ent.events || response.events || ent.enents || response.enents });
+                        const fnEntry = ent.vcardArray[1].find((el) => el[0] === 'fn');
+                        const name = fnEntry ? fnEntry[3] : ent.handle || '';
+                        registrars.push({ id: ent.handle || 0, name, email, abuseEmail, events: ent.events || response.events || ent.enents || response.enents });
                     }
                 }
                 // handles .ar
@@ -171,23 +209,24 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
                 }
             }
             if (domain.endsWith(".is") &&
-                (((_v = ent.roles) === null || _v === void 0 ? void 0 : _v.includes("technical")) || ent.role === "technical")) {
+                (((_y = ent.roles) === null || _y === void 0 ? void 0 : _y.includes("technical")) || ent.role === "technical")) {
                 const id = ent.handle;
                 const name = (parseInt(id) == id
-                    && ((_w = (await ianaIdToRegistrar(parseInt(id)))) === null || _w === void 0 ? void 0 : _w.name))
+                    && ((_z = (await ianaIdToRegistrar(parseInt(id)))) === null || _z === void 0 ? void 0 : _z.name))
                     || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], id);
-                const email = ((_x = [ent, ...(ent.entities || [])]
+                const entEntities = toArray(ent.entities);
+                const email = ((_0 = [ent, ...entEntities]
                     .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 || _x === void 0 ? void 0 : _x[0]) || "";
-                const abuseEmail = ((_y = [ent, ...(ent.entities || [])]
+                    .filter(Boolean)) === null || _0 === void 0 ? void 0 : _0[0]) || "";
+                const abuseEmail = ((_1 = [ent, ...entEntities]
                     .filter((e) => e === null || e === void 0 ? void 0 : e.vcardArray)
                     .map((e) => findInObject(e.vcardArray, (el) => { var _a; return Array.isArray(el) && ((_a = e.roles) === null || _a === void 0 ? void 0 : _a.includes("abuse")) && el[0] === "email"; }, (el) => el[3], ""))
-                    .filter(Boolean)) === null || _y === void 0 ? void 0 : _y[0]) || "";
+                    .filter(Boolean)) === null || _1 === void 0 ? void 0 : _1[0]) || "";
                 const events = ent.events || response.events || ent.enents || response.enents;
                 registrars.push({ id, name, email, abuseEmail, events });
             }
-            if ((((_z = ent.roles) === null || _z === void 0 ? void 0 : _z.includes("reseller")) || ent.role === "reseller") &&
+            if ((((_2 = ent.roles) === null || _2 === void 0 ? void 0 : _2.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], "");
@@ -240,57 +279,3 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         parseIpResponse(domain, thinResponse, response);
     return response;
 }
-function findStatus(statuses, domain) {
-    // console.warn({ domain, statuses });
-    return (Array.isArray(statuses)
-        ? statuses
-        : statuses && typeof statuses === "object"
-            ? Object.keys(statuses)
-            : typeof statuses === "string"
-                ? statuses.trim().split(/\s*,\s*/)
-                : []).map((status) => normalizeWhoisStatus(status));
-}
-function findNameservers(values) {
-    let nameservers = [];
-    if (Array.isArray(values)) {
-        nameservers = values;
-    }
-    else if (typeof values === "object") {
-        nameservers = Object.values(values);
-    }
-    return nameservers
-        .map((ns) => { var _a; return ns.ldhName || ns.ldnName || ((_a = ns.ipAddresses) === null || _a === void 0 ? void 0 : _a.v4); })
-        .flat()
-        .filter((ns) => ns)
-        .map((ns) => (ns.stringValue || ns).toLocaleLowerCase())
-        .sort();
-}
-function findTimestamps(values) {
-    const ts = {
-        created: null,
-        updated: null,
-        expires: null,
-    };
-    let events = [];
-    if (Array.isArray(values)) {
-        events = values;
-    }
-    else if (typeof values === "object") {
-        events = Object.values(values);
-    }
-    for (const [event, field] of eventMap) {
-        events.find((ev) => {
-            var _a;
-            const isMatch = ((_a = ev === null || ev === void 0 ? void 0 : ev.eventAction) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === event && ev.eventDate;
-            if (isMatch) {
-                const d = new Date(ev.eventDate.toString().replace(/\+0000Z$/, "Z"));
-                // console.log(field, ev.eventDate, d);
-                if (!isNaN(d.valueOf())) {
-                    ts[field] = d;
-                    return true;
-                }
-            }
-        });
-    }
-    return ts;
-}

package/dist/index.test.d.ts

@@ -0,0 +1 @@
+import "./polyfills.js";