@cleandns/whois-rdap 1.0.3 → 1.0.4

package/dist/index.js

@@ -9,7 +9,6 @@ const eventMap = new Map([
     ["last changed", "updated"],
     ["expiration", "expires"],
 ]);
-whois(process.argv[2]).then((r) => console.log(r));
 export async function whois(domain, options = { fetch: fetch }) {
     var _a, _b, _c, _d, _e, _f;
     const fetch = options.fetch;
@@ -113,10 +112,10 @@ export async function whois(domain, options = { fetch: fetch }) {
     // registrar
     const { events, ...registrar } = registrars.sort((a, b) => {
         var _a, _b;
-        // console.warn({ a, b });
         const aDate = ((_a = a.events.find((ev) => ev.eventAction === "registration")) === null || _a === void 0 ? void 0 : _a.eventDate) || 0;
         const bDate = ((_b = b.events.find((ev) => ev.eventAction === "registration")) === null || _b === void 0 ? void 0 : _b.eventDate) || 0;
-        return new Date(bDate).valueOf() - new Date(aDate).valueOf();
+        console.log({ aDate, bDate });
+        return new Date(bDate.replace(/\+0000Z$/, 'Z')).valueOf() - new Date(aDate.replace(/\+0000Z$/, 'Z')).valueOf();
     })[0] || { id: 0, name: "" };
     response.registrar = registrar;
     // reseller
@@ -169,12 +168,9 @@ function findTimestamps(values) {
     for (const [event, field] of eventMap) {
         const date = events.find((ev) => ev.eventAction === event);
         if (date === null || date === void 0 ? void 0 : date.eventDate) {
-            console.log(date);
-            ts[field] = new Date(date.eventDate);
+            ts[field] = new Date(date.eventDate.replace(/\+0000Z$/, 'Z'));
         }
     }
     return ts;
 }
-// await whois(process.argv[2]).then((r) =>
-//   console.log(JSON.stringify(r, null, 2))
-// );
+await whois(process.argv[2]).then((r) => console.log(JSON.stringify(r, null, 2)));

package/package.json

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

package/src/index.ts

@@ -155,14 +155,13 @@ export async function whois(domain: string, options: WhoisOptions = { fetch: fet
 
   // registrar
   const { events, ...registrar } = registrars.sort((a: any, b: any) => {
-    // console.warn({ a, b });
     const aDate =
       a.events.find((ev: any) => ev.eventAction === "registration")
         ?.eventDate || 0;
     const bDate =
       b.events.find((ev: any) => ev.eventAction === "registration")
         ?.eventDate || 0;
-    return new Date(bDate).valueOf() - new Date(aDate).valueOf();
+    return new Date(bDate.replace(/\+0000Z$/, 'Z')).valueOf() - new Date(aDate.replace(/\+0000Z$/, 'Z')).valueOf();
   })[0] || { id: 0, name: "" };
   response.registrar = registrar;
 
@@ -234,7 +233,7 @@ function findTimestamps(values: any[]) {
   for (const [event, field] of eventMap) {
     const date = events.find((ev: any) => ev.eventAction === event);
     if (date?.eventDate) {
-      ts[field] = new Date(date.eventDate.replace(/0000Z$/, 'Z'));
+      ts[field] = new Date(date.eventDate.replace(/\+0000Z$/, 'Z'));
     }
   }