use modified whois API with better error handling

aelew · Feb 6, 2024 · 44fe62d · 44fe62d
1 parent 9efff18
commit 44fe62d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/app/(tools)/(domain)/whois/[domain]/page.tsx b/src/app/(tools)/(domain)/whois/[domain]/page.tsx
@@ -54,7 +54,11 @@ export default async function WhoisLookupResultPage({
   }
 
   const result = await getCachedWhoisLookup(domain);
-  if (!result) {
+  if (!result.success) {
+    if (result.error !== 'domain_not_found') {
+      // TODO: Add some kind of component that shows the error code
+      notFound();
+    }
     return (
       <>
         <DomainHeader domain={domain} searchAgainForm={WhoisLookupForm} />

diff --git a/src/lib/ip.ts b/src/lib/ip.ts
@@ -53,9 +53,11 @@ export async function getIPData(query: string) {
   let result;
   try {
     result = await ky
-      .get(`https://api.aelew.dev/ip/${encodeURIComponent(query)}`)
+      .get(`https://api.aelew.dev/ip/${encodeURIComponent(query)}`, {
+        throwHttpErrors: false
+      })
       .json<IPResult>();
-  } catch (err) {
+  } catch {
     result = {
       success: false,
       error: 'internal_server_error'

diff --git a/src/lib/whois.ts b/src/lib/whois.ts
@@ -16,7 +16,8 @@ export type ContactInfo = {
   email?: string;
 };
 
-type WhoisResult = {
+type WhoisSuccessResult = {
+  success: true;
   domain: {
     id: string;
     domain: string;
@@ -46,14 +47,23 @@ type WhoisResult = {
   billing?: ContactInfo;
 };
 
+export type WhoisErrorResult = { success: false; error: string };
+
+export type WhoisResult = WhoisSuccessResult | WhoisErrorResult;
+
 export async function getWhoisData(query: string) {
   let result;
   try {
     result = await ky
-      .get(`https://who-dat.as93.net/${encodeURIComponent(query)}`)
+      .get(`https://api.aelew.dev/whois/${encodeURIComponent(query)}`, {
+        throwHttpErrors: false
+      })
       .json<WhoisResult>();
   } catch {
-    result = null;
+    result = {
+      success: false,
+      error: 'internal_server_error'
+    } as const;
   }
   return result;
 }