Skip to content

Full Toolkit for Next-Level Domain Analysis

Refactor more pages 🏗️

Felix Wotschofsky0951a8821060
diff --git a/app/lookup/[domain]/certs/page.tsx b/app/lookup/[domain]/certs/page.tsx
index dc5ba5b..7fb6272 100644
--- a/app/lookup/[domain]/certs/page.tsx
+++ b/app/lookup/[domain]/certs/page.tsx
@@ -19,6 +19,28 @@ export const runtime = 'edge';
// crt.sh located in GB, always use LHR1 for lowest latency
export const preferredRegion = 'lhr1';
+const getRelatedCerts = async (domain: string) => {
+ const requests = [lookupCerts(domain)];
+
+ const hasParentDomain = domain.split('.').filter(Boolean).length > 2;
+ if (hasParentDomain) {
+ const parentDomain = domain.split('.').slice(1).join('.');
+ requests.push(lookupCerts(`*.${parentDomain}`));
+ }
+
+ const responses = await Promise.all(requests);
+
+ const certs = responses
+ .flat()
+ .toSorted(
+ (a, b) =>
+ new Date(b.entry_timestamp).getTime() -
+ new Date(a.entry_timestamp).getTime()
+ );
+
+ return certs;
+};
+
type CertsResultsPageProps = {
params: {
domain: string;
@@ -39,23 +61,7 @@ export const generateMetadata = ({
const CertsResultsPage: FC<CertsResultsPageProps> = async ({
params: { domain },
}) => {
- const certRequests = [lookupCerts(domain)];
-
- const hasParentDomain = domain.split('.').filter(Boolean).length > 2;
- if (hasParentDomain) {
- const parentDomain = domain.split('.').slice(1).join('.');
- certRequests.push(lookupCerts(`*.${parentDomain}`));
- }
-
- const certs = await Promise.all(certRequests).then((responses) =>
- responses
- .flat()
- .sort(
- (a, b) =>
- new Date(b.entry_timestamp).getTime() -
- new Date(a.entry_timestamp).getTime()
- )
- );
+ const certs = await getRelatedCerts(domain);
if (!certs.length) {
return (
diff --git a/app/lookup/[domain]/whois/page.tsx b/app/lookup/[domain]/whois/page.tsx
index e6e96d8..5258646 100644
--- a/app/lookup/[domain]/whois/page.tsx
+++ b/app/lookup/[domain]/whois/page.tsx
@@ -15,7 +15,11 @@ const lookupWhois = async (domain: string) => {
mappedResults[key] = (result[key] as WhoisSearchResult).__raw as string;
}
- return mappedResults;
+ const filteredResults = Object.entries(mappedResults).filter(
+ ([_key, value]) => Boolean(value)
+ );
+
+ return filteredResults;
};
type WhoisResultsPageProps = {
@@ -47,14 +51,11 @@ const WhoisResultsPage: FC<WhoisResultsPageProps> = async ({
params: { domain },
searchParams: { force },
}) => {
+ const forceOriginal = force !== undefined;
const rawDomain = getDomain(domain) || domain;
+ const results = await lookupWhois(forceOriginal ? domain : rawDomain);
- const results = await lookupWhois(force !== undefined ? domain : rawDomain);
- const filteredResults = Object.entries(results).filter(([_key, value]) =>
- Boolean(value)
- );
-
- if (filteredResults.length === 0) {
+ if (results.length === 0) {
throw new Error('No results found');
}
@@ -93,7 +94,7 @@ const WhoisResultsPage: FC<WhoisResultsPageProps> = async ({
</>
))}
- {filteredResults.map(([key, value]) => (
+ {results.map(([key, value]) => (
<Fragment key={key}>
<h2 className="mb-4 mt-8 text-3xl font-bold tracking-tight">{key}</h2>
<code className="break-words">