@cleandns/whois-rdap 1.0.30 → 1.0.32

package/dist/index.js

@@ -1,3 +1,4 @@
+import { parseIpResponse } from "./ip.js";
 import { determinePort43Domain, port43 } from "./port43.js";
 import { findInObject } from "./utils/findInObject.js";
 import { fixArrays } from "./utils/fixArrays.js";
@@ -31,7 +32,8 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         }
         url = "https://rdap.org";
     }
-    const thinRdap = `${url}/domain/${domain}`;
+    const type = domain.match(/[^\d.]/) ? "domain" : "ip";
+    const thinRdap = `${url}/${type}/${domain}`;
     // console.log(`fetching thin RDAP: ${thinRdap}`);
     let thinResponse = await _fetch(thinRdap)
         .then((r) => r.json())
@@ -194,6 +196,8 @@ export async function whois(origDomain, options = { fetch: fetch, thinOnly: fals
         ...((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.events) || []),
         ...((thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.events) || []),
     ]);
+    if (type === 'ip')
+        parseIpResponse(domain, thinResponse, response);
     return response;
 }
 function findStatus(statuses, domain) {

package/dist/ip.d.ts

@@ -0,0 +1,2 @@
+import { WhoisResponse } from "../whois.js";
+export declare function parseIpResponse(ip: string, rdap: any, response: WhoisResponse): void;

package/dist/ip.js

@@ -0,0 +1,23 @@
+export function parseIpResponse(ip, rdap, response) {
+    var _a, _b, _c;
+    response.found = Boolean(rdap.handle);
+    const registry = rdap.port43 ? rdap.port43.match(/\.(\w+)\./)[1].toUpperCase() : '';
+    const realRdapServer = (_c = (_b = (_a = rdap.links) === null || _a === void 0 ? void 0 : _a.find(({ rel }) => rel === 'self')) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.replace(/\/ip\/.*/, '/ip/');
+    response.server = realRdapServer || 'https://rdap.org/ip/';
+    response.identity = {
+        handle: rdap.handle,
+        ipRange: {
+            start: rdap.startAddress,
+            endAddress: rdap.endAddress
+        },
+        cidr: (rdap.cidr0_cidrs || []).map((cidr) => cidr.v4prefix + '/' + cidr.length),
+        name: rdap.name,
+        type: rdap.type,
+        parent: rdap.parentHandle,
+        ip,
+    };
+    response.registrar = {
+        id: 0,
+        name: registry,
+    };
+}

package/dist/utils/tldToRdap.js

@@ -1,5 +1,5 @@
 import { ParseResultType, parseDomain } from "parse-domain";
-const tldCache = new Map([]);
+let tldCache = new Map([]);
 const tldCachePresets = [
     ["it.com", null],
     ["br.com", "https://rdap.centralnic.com/br.com"],
@@ -27,16 +27,18 @@ const tldCachePresets = [
 ];
 export async function tldToRdap(domain) {
     if (tldCache.size === 0) {
+        const tmpCache = new Map([]);
         for (const [tld, url] of tldCachePresets) {
-            tldCache.set(tld, url);
+            tmpCache.set(tld, url);
         }
         // console.warn(`fetching tld-to-rdap`);
         const response = await fetch(`https://data.iana.org/rdap/dns.json`).then((r) => r.json());
         for (const [tlds, urls] of response.services) {
             for (const tld of tlds) {
-                tldCache.set(tld, urls[0].replace(/\/$/, ""));
+                tmpCache.set(tld, urls[0].replace(/\/$/, ""));
             }
         }
+        tldCache = tmpCache;
     }
     const parsed = parseDomain(domain);
     if (parsed.type === ParseResultType.Listed) {
@@ -58,5 +60,8 @@ export async function tldToRdap(domain) {
         //   }
         // }
     }
+    else if (parsed.type === ParseResultType.Ip) {
+        return [domain, "https://rdap.org"];
+    }
     return [domain, null];
 }

package/package.json

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

package/src/index.ts

@@ -1,4 +1,5 @@
 import { WhoisOptions, WhoisResponse, WhoisTimestampFields } from "../whois.js";
+import { parseIpResponse } from "./ip.js";
 import { determinePort43Domain, port43 } from "./port43.js";
 import { findInObject } from "./utils/findInObject.js";
 import { fixArrays } from "./utils/fixArrays.js";
@@ -41,7 +42,9 @@ export async function whois(
     url = "https://rdap.org";
   }
 
-  const thinRdap = `${url}/domain/${domain}`;
+  const type = domain.match(/[^\d.]/) ? "domain" : "ip";
+
+  const thinRdap = `${url}/${type}/${domain}`;
   // console.log(`fetching thin RDAP: ${thinRdap}`);
 
   let thinResponse = await _fetch(thinRdap)
@@ -308,6 +311,8 @@ export async function whois(
     ...(thinResponse?.events || []),
   ]);
 
+  if (type === 'ip') parseIpResponse(domain, thinResponse, response);
+
   return response;
 }
 

package/src/ip.ts

@@ -0,0 +1,28 @@
+import { WhoisResponse } from "../whois.js";
+
+export function parseIpResponse(ip: string, rdap: any, response: WhoisResponse) {
+  response.found = Boolean(rdap.handle);
+
+  const registry = rdap.port43 ? rdap.port43.match(/\.(\w+)\./)[1].toUpperCase() : '';
+  const realRdapServer = rdap.links?.find(({ rel }: { rel: string }) => rel === 'self')?.value?.replace(/\/ip\/.*/, '/ip/');
+
+  response.server = realRdapServer || 'https://rdap.org/ip/';
+
+  response.identity = {
+    handle: rdap.handle,
+    ipRange: {
+      start: rdap.startAddress,
+      endAddress: rdap.endAddress
+    },
+    cidr: (rdap.cidr0_cidrs || []).map((cidr: any) => cidr.v4prefix + '/' + cidr.length),
+    name: rdap.name,
+    type: rdap.type,
+    parent: rdap.parentHandle,
+    ip,
+  };
+
+  response.registrar = {
+    id: 0,
+    name: registry,
+  };
+}

package/src/utils/tldToRdap.ts

@@ -1,7 +1,7 @@
 import { ParseResultType, parseDomain } from "parse-domain";
 
 type TldToRdap = [string[], string[]];
-const tldCache = new Map<string, string | null>([]);
+let tldCache = new Map<string, string | null>([]);
 const tldCachePresets: [string, string | null][] = [
   ["it.com", null],
   ["br.com", "https://rdap.centralnic.com/br.com"],
@@ -32,8 +32,9 @@ export async function tldToRdap(
   domain: string
 ): Promise<[string, string | null]> {
   if (tldCache.size === 0) {
+    const tmpCache = new Map<string, string | null>([]);
     for (const [tld, url] of tldCachePresets) {
-      tldCache.set(tld, url);
+      tmpCache.set(tld, url);
     }
 
     // console.warn(`fetching tld-to-rdap`);
@@ -43,9 +44,10 @@ export async function tldToRdap(
 
     for (const [tlds, urls] of response.services) {
       for (const tld of tlds) {
-        tldCache.set(tld, urls[0].replace(/\/$/, ""));
+        tmpCache.set(tld, urls[0].replace(/\/$/, ""));
       }
     }
+    tldCache = tmpCache;
   }
 
   const parsed = parseDomain(domain);
@@ -71,6 +73,9 @@ export async function tldToRdap(
     //   }
     // }
   }
+  else if (parsed.type === ParseResultType.Ip) {
+    return [domain, "https://rdap.org"];
+  }
 
   return [domain, null];
 }

package/whois.d.ts

@@ -21,4 +21,16 @@ export type WhoisResponse = {
     updated: Date | null;
     expires: Date | null;
   };
+  identity?: {
+    handle: string;
+    ipRange: {
+      start: string;
+      endAddress: string;
+    };
+    cidr: string[];
+    name: string;
+    type: string;
+    parent: string | null;
+    ip: string;
+  }
 };