@cleandns/whois-rdap 1.0.15 → 1.0.17

package/dist/index.d.ts

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

package/dist/index.js

@@ -10,11 +10,12 @@ const eventMap = new Map([
     ["expiration", "expires"],
     ["expiration date", "expires"],
 ]);
-export async function whois(domain, options = { fetch: fetch }) {
+export async function whois(origDomain, options = { fetch: fetch }) {
     var _a, _b, _c, _d, _e, _f;
     const fetch = options.fetch;
+    let domain = origDomain;
     let url = null;
-    [domain, url] = await tldToRdap(domain);
+    [domain, url] = await tldToRdap(origDomain);
     const response = {
         found: false,
         registrar: { id: 0, name: null },
@@ -87,10 +88,11 @@ export async function whois(domain, options = { fetch: fetch }) {
                     ((_d = pubIds.find((id) => id.type === "IANA Registrar ID")) === null || _d === void 0 ? void 0 : _d.Identifier) ||
                     ((_e = pubIds.find((id) => id.type === "IANA Registrar ID")) === null || _e === void 0 ? void 0 : _e.identifier);
                 if (reg) {
+                    console.log(ent.vcardArray);
                     const id = reg;
-                    const name = parseInt(id) == id
-                        ? (_f = (await ianaIdToRegistrar(parseInt(id)))) === null || _f === void 0 ? void 0 : _f.name
-                        : findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], reg);
+                    const name = (parseInt(id) == id
+                        && ((_f = (await ianaIdToRegistrar(parseInt(id)))) === null || _f === void 0 ? void 0 : _f.name))
+                        || findInObject(ent.vcardArray, (el) => Array.isArray(el) && (el[0] === "fn" || el[0] === "org"), (el) => el[3], reg);
                     const email = ((_g = [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], ""))
@@ -102,9 +104,9 @@ export async function whois(domain, options = { fetch: fetch }) {
             if (domain.endsWith(".is") &&
                 (((_h = ent.roles) === null || _h === void 0 ? void 0 : _h.includes("technical")) || ent.role === "technical")) {
                 const id = ent.handle;
-                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], id);
+                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], id);
                 const email = ((_k = [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], ""))

package/dist/port43.js

@@ -21,9 +21,10 @@ export function determinePort43Domain(actor) {
     return [actor, "", null];
 }
 export async function port43(actor) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const [domain, tld, whoisServer] = determinePort43Domain(actor);
     const opts = whoisServer;
+    const isWwww = opts === null || opts === void 0 ? void 0 : opts.url;
     const server = (opts === null || opts === void 0 ? void 0 : opts.host) || opts || null;
     const query = (opts === null || opts === void 0 ? void 0 : opts.query)
         ? opts.query.replace("$addr", domain)
@@ -43,14 +44,21 @@ export async function port43(actor) {
     }
     let port43response = "";
     try {
-        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(/^[ \t]+/gm, "");
-        await promiseSocket.end();
+        if (isWwww) {
+            port43response = (await fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
+            response.server = (_a = opts.url.match('//(.*?)/')) === null || _a === void 0 ? void 0 : _a[1];
+        }
+        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(/^[ \t]+/gm, "");
+            await promiseSocket.end();
+        }
     }
     catch (error) {
         response.found = false;
@@ -63,7 +71,7 @@ export async function port43(actor) {
         return response;
     }
     let m;
-    const parser = port43parsers[tld] || ((_a = Object.entries(port43parsers).find(([t]) => tld.endsWith('.' + t))) === null || _a === void 0 ? void 0 : _a[1]);
+    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);
     }
@@ -85,12 +93,12 @@ export async function port43(actor) {
     !response.ts.expires &&
         (m = port43response.match(/^(?:(?:Registry )?Expiry Date):[ \t]*(\S.+)/m)) &&
         (response.ts.expires = new Date(m[1]) || null);
-    !((_b = response.status) === null || _b === void 0 ? void 0 : _b.length) && (m = port43response.match(/^(?:Status|Domain Status|status):.*/gm)) &&
+    !((_c = response.status) === null || _c === void 0 ? void 0 : _c.length) && (m = port43response.match(/^(?:Status|Domain Status|status):.*/gm)) &&
         m.forEach((s) => {
             let m;
             (m = s.match(/^(?:Status|Domain Status|status):[ \t]*(?:<a[^>]*>)?(\S+)/m)) && response.status.push(normalizeWhoisStatus(m[1]));
         });
-    !((_c = response.nameservers) === null || _c === void 0 ? void 0 : _c.length) && (m = port43response.match(/^(?:Name Server|ns_name_\d+|namserver|nserver):.*/gm)) &&
+    !((_d = response.nameservers) === null || _d === void 0 ? void 0 : _d.length) && (m = port43response.match(/^(?:Name Server|ns_name_\d+|namserver|nserver):.*/gm)) &&
         m.forEach((s) => {
             let m;
             (m = s.match(/^(?:Name Server|ns_name_\d+|namserver|nserver):[ \t]*(\S+)/m)) && response.nameservers.push(m[1].toLowerCase());

package/dist/port43servers.js

@@ -147,6 +147,9 @@ export const port43servers = {
     "uy.com": "whois.centralnic.net",
     "web.com": "whois.centralnic.net",
     "za.com": "whois.centralnic.net",
+    "it.com": {
+        url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
+    },
     com: {
         host: "whois.verisign-grs.com",
         query: "DOMAIN $addr\r\n",

package/dist/utils/tldToRdap.js

@@ -1,6 +1,7 @@
 import { ParseResultType, parseDomain } from "parse-domain";
 const tldCache = new Map([]);
 const tldCachePresets = [
+    ["it.com", null],
     ["br.com", "https://rdap.centralnic.com/br.com"],
     ["cn.com", "https://rdap.centralnic.com/cn.com"],
     ["de.com", "https://rdap.centralnic.com/de.com"],
@@ -33,7 +34,7 @@ export async function tldToRdap(domain) {
         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(/\/$/, ''));
+                tldCache.set(tld, urls[0].replace(/\/$/, ""));
             }
         }
     }
@@ -41,11 +42,11 @@ export async function tldToRdap(domain) {
     if (parsed.type === ParseResultType.Listed) {
         let tld = parsed.topLevelDomains.join(".");
         if (tldCache.has(tld)) {
-            return [parsed.domain + '.' + tld, tldCache.get(tld)];
+            return [parsed.domain + "." + tld, tldCache.get(tld)];
         }
         tld = parsed.icann.topLevelDomains.join(".");
         if (tldCache.has(tld)) {
-            return [parsed.icann.domain + '.' + tld, tldCache.get(tld)];
+            return [parsed.icann.domain + "." + tld, tldCache.get(tld)];
         }
         // const tlds = [
         //   parsed.topLevelDomains.join("."),

package/dist/wwwservers.d.ts

@@ -0,0 +1 @@
+export declare const loadWWWServers: Record<string, string>;

package/dist/wwwservers.js

@@ -0,0 +1,3 @@
+export const loadWWWServers = {
+    "it.com": `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`
+};

package/package.json

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

package/src/index.ts

@@ -14,13 +14,15 @@ const eventMap = new Map<string, WhoisTimestampFields>([
 ]);
 
 export async function whois(
-  domain: string,
+  origDomain: string,
   options: WhoisOptions = { fetch: fetch }
 ): Promise<WhoisResponse> {
   const fetch = options.fetch!;
 
+  let domain = origDomain;
   let url: string | null = null;
-  [domain, url] = await tldToRdap(domain);
+
+  [domain, url] = await tldToRdap(origDomain);
 
   const response: WhoisResponse = {
     found: false,
@@ -115,11 +117,12 @@ export async function whois(
           pubIds.find((id: any) => id.type === "IANA Registrar ID")?.identifier;
 
         if (reg) {
+          console.log(ent.vcardArray);
           const id = reg;
           const name =
-            parseInt(id) == id
-              ? (await ianaIdToRegistrar(parseInt(id)))?.name
-              : findInObject(
+            (parseInt(id) == id
+              && (await ianaIdToRegistrar(parseInt(id)))?.name)
+              || findInObject(
                   ent.vcardArray,
                   (el: any) =>
                     Array.isArray(el) && (el[0] === "fn" || el[0] === "org"),
@@ -151,9 +154,9 @@ export async function whois(
       ) {
         const id = ent.handle;
         const name =
-          parseInt(id) == id
-            ? (await ianaIdToRegistrar(parseInt(id)))?.name
-            : findInObject(
+          (parseInt(id) == id
+            && (await ianaIdToRegistrar(parseInt(id)))?.name)
+            || findInObject(
                 ent.vcardArray,
                 (el: any) =>
                   Array.isArray(el) && (el[0] === "fn" || el[0] === "org"),

package/src/port43.ts

@@ -29,6 +29,7 @@ export function determinePort43Domain(actor: string) {
 export async function port43(actor: string): Promise<WhoisResponse> {
   const [domain, tld, whoisServer] = determinePort43Domain(actor);
   const opts = whoisServer;
+  const isWwww = opts?.url;
   const server = opts?.host || opts || null;
   const query = opts?.query
     ? opts.query.replace("$addr", domain)
@@ -53,14 +54,21 @@ export async function port43(actor: string): Promise<WhoisResponse> {
   let port43response = "";
 
   try {
-    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(/^[ \t]+/gm, "");
-    await promiseSocket.end();
+    if (isWwww) {
+      port43response = (await fetch(opts.url.replace('%%domain%%', domain)).then(r => r.text())).toString().replace(/^[ \t]+/gm, "");
+      response.server = opts.url.match('//(.*?)/')?.[1];
+    }
+    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(/^[ \t]+/gm, "");
+      await promiseSocket.end();
+    }
   } catch (error) {
     response.found = false;
   }

package/src/port43servers.ts

@@ -187,6 +187,11 @@ export const port43servers: Record<string, any> = {
   "uy.com": "whois.centralnic.net",
   "web.com": "whois.centralnic.net",
   "za.com": "whois.centralnic.net",
+
+  "it.com": {
+    url: `https://engine.itcomdomains.com/api/v1/domain/%%domain%%/whois_info`,
+  },    
+
   com: {
     host: "whois.verisign-grs.com",
     query: "DOMAIN $addr\r\n",

package/src/utils/tldToRdap.ts

@@ -1,8 +1,9 @@
 import { ParseResultType, parseDomain } from "parse-domain";
 
 type TldToRdap = [string[], string[]];
-const tldCache = new Map<string, string>([]);
-const tldCachePresets = [
+const tldCache = new Map<string, string | null>([]);
+const tldCachePresets: [string, string | null][] = [
+  ["it.com", null],
   ["br.com", "https://rdap.centralnic.com/br.com"],
   ["cn.com", "https://rdap.centralnic.com/cn.com"],
   ["de.com", "https://rdap.centralnic.com/de.com"],
@@ -27,20 +28,22 @@ const tldCachePresets = [
   ["za.com", "https://rdap.centralnic.com/za.com"],
 ];
 
-export async function tldToRdap(domain: string): Promise<[ string, string | null ]> {
+export async function tldToRdap(
+  domain: string
+): Promise<[string, string | null]> {
   if (tldCache.size === 0) {
     for (const [tld, url] of tldCachePresets) {
       tldCache.set(tld, url);
     }
 
     // console.warn(`fetching tld-to-rdap`);
-    const response: { services: TldToRdap[]; } = await fetch(
+    const response: { services: TldToRdap[] } = await fetch(
       `https://data.iana.org/rdap/dns.json`
     ).then((r) => r.json() as any);
 
     for (const [tlds, urls] of response.services) {
       for (const tld of tlds) {
-        tldCache.set(tld, urls[0].replace(/\/$/, ''));
+        tldCache.set(tld, urls[0].replace(/\/$/, ""));
       }
     }
   }
@@ -50,11 +53,11 @@ export async function tldToRdap(domain: string): Promise<[ string, string | null
   if (parsed.type === ParseResultType.Listed) {
     let tld = parsed.topLevelDomains.join(".");
     if (tldCache.has(tld)) {
-      return [ parsed.domain + '.' + tld, tldCache.get(tld)! ];
+      return [parsed.domain + "." + tld, tldCache.get(tld)!];
     }
     tld = parsed.icann.topLevelDomains.join(".");
     if (tldCache.has(tld)) {
-      return [ parsed.icann.domain + '.' + tld, tldCache.get(tld)! ];
+      return [parsed.icann.domain + "." + tld, tldCache.get(tld)!];
     }
 
     // const tlds = [
@@ -69,5 +72,5 @@ export async function tldToRdap(domain: string): Promise<[ string, string | null
     // }
   }
 
-  return [ domain, null ];
+  return [domain, null];
 }

package/whois.d.ts

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