@cleandns/whois-rdap 1.0.7 → 1.0.9

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(BSON.EJSON.stringify(r, undefined, 2))
 // );

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@cleandns/whois-rdap",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "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(BSON.EJSON.stringify(r, undefined, 2))
 // );