@cleandns/whois-rdap 1.0.31 → 1.0.33

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/port43.js

@@ -50,15 +50,21 @@ export async function port43(actor) {
         }
         else {
             response.server = server;
-            const promiseSocket = new PromiseSocket(new Socket());
-            promiseSocket.setTimeout(5 * 1000);
-            await promiseSocket.connect(port, server);
-            await promiseSocket.write(query);
-            port43response = (await promiseSocket.readAll())
-                .toString()
-                .replace(/\r/g, "")
-                .replace(/^[ \t]+/gm, "");
-            await promiseSocket.end();
+            port43response = await fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
+                var _a;
+                return ((_a = r.match(/<pre class="df-raw" id="registryData">(.*?)<\/pre>/s)) === null || _a === void 0 ? void 0 : _a[1]) || "";
+            });
+            if (port43response === '') {
+                const promiseSocket = new PromiseSocket(new Socket());
+                promiseSocket.setTimeout(5 * 1000);
+                await promiseSocket.connect(port, server);
+                await promiseSocket.write(query);
+                port43response = (await promiseSocket.readAll())
+                    .toString()
+                    .replace(/\r/g, "")
+                    .replace(/^[ \t]+/gm, "");
+                await promiseSocket.end();
+            }
         }
     }
     catch (error) {

package/dist/utils/tldToRdap.js

@@ -60,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.31",
+  "version": "1.0.33",
   "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/port43.ts

@@ -60,15 +60,21 @@ export async function port43(actor: string): Promise<WhoisResponse> {
     }
     else {
       response.server = server;
-      const promiseSocket = new PromiseSocket(new Socket());
-      promiseSocket.setTimeout(5 * 1000);
-      await promiseSocket.connect(port, server);
-      await promiseSocket.write(query);
-      port43response = (await promiseSocket.readAll())!
-        .toString()
-        .replace(/\r/g, "")
-        .replace(/^[ \t]+/gm, "");
-      await promiseSocket.end();
+      port43response = await fetch(`https://www.whois.com/whois/${domain}`).then(r => r.text()).then((r) => {
+        return r.match(/<pre class="df-raw" id="registryData">(.*?)<\/pre>/s)?.[1] || "";
+      });
+
+      if (port43response === '') {
+        const promiseSocket = new PromiseSocket(new Socket());
+        promiseSocket.setTimeout(5 * 1000);
+        await promiseSocket.connect(port, server);
+        await promiseSocket.write(query);
+        port43response = (await promiseSocket.readAll())!
+          .toString()
+          .replace(/\r/g, "")
+          .replace(/^[ \t]+/gm, "");
+        await promiseSocket.end();
+      }
     }
   } catch (error: any) {
     console.warn(port, server, query);

package/src/utils/tldToRdap.ts

@@ -73,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;
+  }
 };