@cleandns/whois-rdap 1.0.19 → 1.0.21

package/dist/index.js

@@ -12,7 +12,7 @@ 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;
+    const _fetch = options.fetch || fetch;
     let domain = origDomain;
     let url = null;
     [domain, url] = await tldToRdap(origDomain);
@@ -21,6 +21,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         registrar: { id: 0, name: null },
         reseller: null,
         status: [],
+        statusDelta: [],
         nameservers: [],
         ts: { created: null, updated: null, expires: null },
     };
@@ -32,7 +33,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     }
     const thinRdap = `${url}/domain/${domain}`;
     // console.log(`fetching thin RDAP: ${thinRdap}`);
-    let thinResponse = await fetch(thinRdap)
+    let thinResponse = await _fetch(thinRdap)
         .then((r) => r.json())
         .catch(() => null);
     if (thinResponse && !thinResponse.errorCode) {
@@ -50,7 +51,7 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     let thickResponse = null;
     if (!options.thinOnly && thickRdap) {
         // console.log(`fetching thick RDAP: ${thickRdap}`);
-        thickResponse = await fetch(thickRdap)
+        thickResponse = await _fetch(thickRdap)
             .then((r) => r.json())
             .catch(() => null);
         if (thickResponse && !thickResponse.errorCode && !thickResponse.error) {
@@ -145,7 +146,17 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
     const reseller = ((_f = resellers[0]) === null || _f === void 0 ? void 0 : _f.name) || "";
     response.reseller = reseller;
     // status
-    response.status = findStatus((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.status) || (thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.status) || [], domain);
+    const statusThin = findStatus((thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.status) || [], domain);
+    const statusThick = findStatus((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.status) || [], domain);
+    response.status = [...new Set([...statusThin, ...statusThick])];
+    response.statusDelta = [];
+    for (const status of response.status) {
+        const thin = statusThin.includes(status) || statusThin.includes(status.replace(/^client/, "server")) || statusThin.includes(status.replace(/^server/, "client"));
+        const thick = statusThick.includes(status) || statusThick.includes(status.replace(/^client/, "server")) || statusThick.includes(status.replace(/^server/, "client"));
+        if (thin !== thick) {
+            response.statusDelta.push({ status, thin, thick });
+        }
+    }
     // nameservers
     response.nameservers = findNameservers((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.nameservers) || (thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.nameservers) || []);
     // ts

package/dist/whoisStatus.js

@@ -28,7 +28,7 @@ const statusMap = {
     'deleteprohibited': 'client delete prohibited',
     'renewprohibited': 'client renew prohibited',
     'transferprohibited': 'client transfer prohibited',
-    'updatedprohibited': 'client update prohibited',
+    'updateprohibited': 'client update prohibited',
 };
 export function normalizeWhoisStatus(status) {
     status = (status || "").toLocaleLowerCase();

package/package.json

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

package/src/index.ts

@@ -17,7 +17,7 @@ export async function whois(
   origDomain: string,
   options: WhoisOptions = { fetch: fetch, thinOnly: false }
 ): Promise<WhoisResponse> {
-  const fetch = options.fetch!;
+  const _fetch = options.fetch || fetch;
 
   let domain = origDomain;
   let url: string | null = null;
@@ -29,6 +29,7 @@ export async function whois(
     registrar: { id: 0, name: null },
     reseller: null,
     status: [],
+    statusDelta: [],
     nameservers: [],
     ts: { created: null, updated: null, expires: null },
   };
@@ -43,7 +44,7 @@ export async function whois(
   const thinRdap = `${url}/domain/${domain}`;
   // console.log(`fetching thin RDAP: ${thinRdap}`);
 
-  let thinResponse = await fetch(thinRdap)
+  let thinResponse = await _fetch(thinRdap)
     .then((r) => r.json() as any)
     .catch(() => null);
   if (thinResponse && !thinResponse.errorCode) {
@@ -69,7 +70,7 @@ export async function whois(
 
   if (!options.thinOnly && thickRdap) {
     // console.log(`fetching thick RDAP: ${thickRdap}`);
-    thickResponse = await fetch(thickRdap)
+    thickResponse = await _fetch(thickRdap)
       .then((r) => r.json() as any)
       .catch(() => null);
     if (thickResponse && !thickResponse.errorCode && !thickResponse.error) {
@@ -229,10 +230,18 @@ export async function whois(
   response.reseller = reseller;
 
   // status
-  response.status = findStatus(
-    thickResponse?.status || thinResponse?.status || [],
-    domain
-  );
+  const statusThin = findStatus(thinResponse?.status || [], domain);
+  const statusThick = findStatus(thickResponse?.status || [], domain);
+  response.status = [...new Set ([...statusThin, ...statusThick])];
+
+  response.statusDelta = [];
+  for (const status of response.status) {
+    const thin = statusThin.includes(status) || statusThin.includes(status.replace(/^client/, "server")) || statusThin.includes(status.replace(/^server/, "client"));
+    const thick = statusThick.includes(status) || statusThick.includes(status.replace(/^client/, "server")) || statusThick.includes(status.replace(/^server/, "client"));
+    if (thin !== thick) {
+      response.statusDelta.push({ status, thin, thick });
+    }
+  }
 
   // nameservers
   response.nameservers = findNameservers(

package/src/whoisStatus.ts

@@ -34,7 +34,7 @@ const statusMap: Record<string,string> = {
   'deleteprohibited': 'client delete prohibited',
   'renewprohibited': 'client renew prohibited',
   'transferprohibited': 'client transfer prohibited',
-  'updatedprohibited': 'client update prohibited',
+  'updateprohibited': 'client update prohibited',
 };
 
 export function normalizeWhoisStatus(status: string) {

package/whois.d.ts

@@ -14,10 +14,11 @@ export type WhoisResponse = {
   };
   reseller: string | null;
   status: string[];
+  statusDelta?: { status: string; thin: boolean; thick: boolean }[];
   nameservers: string[];
   ts: {
     created: Date | null;
     updated: Date | null;
     expires: Date | null;
-  }
+  };
 };