@cleandns/whois-rdap 1.0.8 → 1.0.10

package/dist/index.js

@@ -8,6 +8,7 @@ const eventMap = new Map([
     ["registration", "created"],
     ["last changed", "updated"],
     ["expiration", "expires"],
+    ["expiration date", "expires"],
 ]);
 export async function whois(domain, options = { fetch: fetch }) {
     var _a, _b, _c, _d, _e, _f;
@@ -125,7 +126,7 @@ export async function whois(domain, options = { fetch: fetch }) {
     // nameservers
     response.nameservers = findNameservers((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.nameservers) || (thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.nameservers) || []);
     // ts
-    response.ts = findTimestamps((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.events) || (thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.events) || []);
+    response.ts = findTimestamps([...((thickResponse === null || thickResponse === void 0 ? void 0 : thickResponse.events) || []), ...((thinResponse === null || thinResponse === void 0 ? void 0 : thinResponse.events) || [])]);
     return response;
 }
 function findStatus(statuses, domain) {
@@ -165,7 +166,7 @@ function findTimestamps(values) {
         events = Object.values(values);
     }
     for (const [event, field] of eventMap) {
-        const date = events.find((ev) => ev.eventAction === event);
+        const date = events.find((ev) => ev.eventAction.toLocaleLowerCase() === event);
         if (date === null || date === void 0 ? void 0 : date.eventDate) {
             ts[field] = new Date(date.eventDate.toString().replace(/\+0000Z$/, 'Z'));
         }
@@ -173,5 +174,5 @@ function findTimestamps(values) {
     return ts;
 }
 // await whois(process.argv[2]).then((r) =>
-//   console.log(JSON.stringify(r, null, 2))
+//   console.log(JSON.stringify(r, undefined, 2))
 // );

package/dist/port43.js

@@ -8,19 +8,20 @@ export function determinePort43Domain(actor) {
     const parsed = parseDomain(actor);
     if (parsed.type === ParseResultType.Listed) {
         let tld = parsed.topLevelDomains.join(".");
-        if (port43servers[tld]) {
+        if (port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]) {
             const domain = parsed.domain + "." + tld;
-            return [domain, tld, port43servers[tld]];
+            return [domain, tld, port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]];
         }
         tld = parsed.icann.topLevelDomains.join(".");
-        if (port43servers[tld]) {
+        if (port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]) {
             const domain = parsed.icann.domain + "." + tld;
-            return [domain, tld, port43servers[tld]];
+            return [domain, tld, port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]];
         }
     }
     return [actor, "", null];
 }
 export async function port43(actor) {
+    var _a;
     const [domain, tld, whoisServer] = determinePort43Domain(actor);
     const opts = whoisServer;
     const server = (opts === null || opts === void 0 ? void 0 : opts.host) || opts || null;
@@ -62,8 +63,9 @@ export async function port43(actor) {
         return response;
     }
     let m;
-    if (port43parsers[tld]) {
-        port43parsers[tld](port43response, response);
+    const parser = port43parsers[tld] || ((_a = Object.entries(port43parsers).find(([t]) => tld.endsWith('.' + t))) === null || _a === void 0 ? void 0 : _a[1]);
+    if (parser) {
+        await parser(port43response, response);
     }
     !response.registrar.name &&
         (m = port43response.match(/^(?:Registrar(?: Name)?|registrar_name|registrar):[ \t]*(\S.+)/m)) &&

package/dist/port43servers.js

@@ -572,6 +572,7 @@ export const port43servers = {
     as: "whois.nic.as",
     "priv.at": "whois.nic.priv.at",
     at: "whois.nic.at",
+    "*.au": "whois.auda.org.au",
     au: "whois.auda.org.au",
     aw: "whois.nic.aw",
     ax: "whois.ax",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@cleandns/whois-rdap",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
-    "publish": "npm run build && npm version patch && npm publish"
+    "upload": "npm run build && npm version patch && npm publish"
   },
   "repository": {
     "type": "git",

package/src/index.ts

@@ -10,6 +10,7 @@ const eventMap = new Map<string, WhoisTimestampFields>([
   ["registration", "created"],
   ["last changed", "updated"],
   ["expiration", "expires"],
+  ["expiration date", "expires"],
 ]);
 
 export async function whois(domain: string, options: WhoisOptions = { fetch: fetch }): Promise<WhoisResponse> {
@@ -182,7 +183,7 @@ export async function whois(domain: string, options: WhoisOptions = { fetch: fet
 
   // ts
   response.ts = findTimestamps(
-    thickResponse?.events || thinResponse?.events || []
+    [ ...(thickResponse?.events || []), ...(thinResponse?.events || []) ]
   );
 
   return response;
@@ -231,7 +232,7 @@ function findTimestamps(values: any[]) {
   }
 
   for (const [event, field] of eventMap) {
-    const date = events.find((ev: any) => ev.eventAction === event);
+    const date = events.find((ev: any) => ev.eventAction.toLocaleLowerCase() === event);
     if (date?.eventDate) {
       ts[field] = new Date(date.eventDate.toString().replace(/\+0000Z$/, 'Z'));
     }
@@ -241,5 +242,5 @@ function findTimestamps(values: any[]) {
 }
 
 // await whois(process.argv[2]).then((r) =>
-//   console.log(JSON.stringify(r, null, 2))
+//   console.log(JSON.stringify(r, undefined, 2))
 // );

package/src/port43.ts

@@ -11,15 +11,15 @@ export function determinePort43Domain(actor: string) {
 
   if (parsed.type === ParseResultType.Listed) {
     let tld = parsed.topLevelDomains.join(".");
-    if (port43servers[tld]) {
+    if (port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]) {
       const domain = parsed.domain + "." + tld;
-      return [domain, tld, port43servers[tld]];
+      return [domain, tld, port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]];
     }
 
     tld = parsed.icann.topLevelDomains.join(".");
-    if (port43servers[tld]) {
+    if (port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]) {
       const domain = parsed.icann.domain + "." + tld;
-      return [domain, tld, port43servers[tld]];
+      return [domain, tld, port43servers[tld] || port43servers[tld.replace(/^[^.]+\./, "*.")]];
     }
   }
 
@@ -80,8 +80,10 @@ export async function port43(actor: string): Promise<WhoisResponse> {
 
   let m;
 
-  if (port43parsers[tld]) {
-    port43parsers[tld](port43response, response);
+  const parser = port43parsers[tld] || Object.entries(port43parsers).find(([t]) => tld.endsWith('.' + t))?.[1];
+
+  if (parser) {
+      await parser(port43response, response);
   }
 
   !response.registrar.name &&

package/src/port43servers.ts

@@ -616,6 +616,7 @@ export const port43servers: Record<string, any> = {
   as: "whois.nic.as",
   "priv.at": "whois.nic.priv.at",
   at: "whois.nic.at",
+  "*.au": "whois.auda.org.au",
   au: "whois.auda.org.au",
   aw: "whois.nic.aw",
   ax: "whois.ax",