Full Toolkit for Next-Level Domain Analysis
Reduce amounts of DNS lookups for map page 👌
Felix Wotschofsky2aa987eac8c8
diff --git a/app/api/internal/resolve/base.ts b/app/api/internal/resolve/base.tsindex 4c8e58e..076c33d 100644--- a/app/api/internal/resolve/base.ts+++ b/app/api/internal/resolve/base.ts@@ -1,4 +1,4 @@-import { RECORD_TYPES, type RecordType } from '@/lib/resolvers/base';+import { ALL_RECORD_TYPES, type RecordType } from '@/lib/resolvers/base';import { CloudflareDoHResolver } from '@/lib/resolvers/cloudflare';import { GoogleDoHResolver } from '@/lib/resolvers/google';@@ -62,7 +62,7 @@ export const handler = async (request: Request) => {for (const type of types) {// @ts-expect-error- if (!RECORD_TYPES.includes(type)) {+ if (!ALL_RECORD_TYPES.includes(type)) {return Response.json({error: true,diff --git a/app/lookup/[domain]/(dns)/page.tsx b/app/lookup/[domain]/(dns)/page.tsxindex bdefa30..ac59a48 100644--- a/app/lookup/[domain]/(dns)/page.tsx+++ b/app/lookup/[domain]/(dns)/page.tsx@@ -3,6 +3,7 @@ import { redirect, RedirectType } from 'next/navigation';import type { FC } from 'react';import { getRecordContextEntries } from '@/lib/record-context';+import { ALL_RECORD_TYPES } from '@/lib/resolvers/base';import { getResolverFromName } from '@/lib/resolvers/utils';import { DnsTable } from './_components/dns-table';@@ -52,7 +53,7 @@ const LookupDomain: FC<LookupDomainProps> = async ({}const resolver = getResolverFromName(resolverName, locationName);- const records = await resolver.resolveAllRecords(domain);+ const records = await resolver.resolveRecordTypes(domain, ALL_RECORD_TYPES);const subvalues = await getRecordContextEntries(records);const hasResults =diff --git a/lib/map.ts b/lib/map.tsindex 9062248..fc96000 100644--- a/lib/map.ts+++ b/lib/map.ts@@ -1,12 +1,17 @@import { REGIONS } from '@/lib/data';import { InternalDoHResolver } from '@/lib/resolvers/internal';+const DISPLAYED_RECORD_TYPES = ['A', 'AAAA', 'CNAME'] as const;+export const getGlobalLookupResults = (domain: string) =>Promise.all(Object.entries(REGIONS).map(async ([code, data]) => {const resolver = new InternalDoHResolver(code, 'cloudflare');// TODO Optimize this to only required records- const results = await resolver.resolveAllRecords(domain);+ const results = await resolver.resolveRecordTypes(+ domain,+ DISPLAYED_RECORD_TYPES+ );return {...data,diff --git a/lib/resolvers/base.test.ts b/lib/resolvers/base.test.tsindex 9e6d5d5..6d1c14a 100644--- a/lib/resolvers/base.test.ts+++ b/lib/resolvers/base.test.ts@@ -1,9 +1,9 @@import { describe, expect, it } from 'vitest';import {+ ALL_RECORD_TYPES,DnsResolver,type RawRecord,- RECORD_TYPES,type RecordType,} from './base';@@ -41,22 +41,41 @@ describe('DnsResolver', () => {});});- describe('resolveAllRecords', () => {+ describe('resolveRecordTypes', () => {it('should resolve all supported record types for a domain', async () => {const resolver = new MockResolver();- const resolvedRecords = await resolver.resolveAllRecords('example.com');+ const resolvedRecords = await resolver.resolveRecordTypes(+ 'example.com',+ ALL_RECORD_TYPES+ );// Ensure all record types are present and have the expected data- RECORD_TYPES.forEach((type) => {+ ALL_RECORD_TYPES.forEach((type) => {expect(resolvedRecords[type]).toBeDefined();expect(resolvedRecords[type][0].type).toBe(type);});// Ensure all and only the expected keys are present- const expectedKeys = RECORD_TYPES;+ const expectedKeys = ALL_RECORD_TYPES;const resolvedKeys = Object.keys(resolvedRecords);expect(resolvedKeys.toSorted()).toEqual(expectedKeys.toSorted());});++ it('should resolve only specified record types for a domain', async () => {+ const resolver = new MockResolver();++ const resolvedRecords = await resolver.resolveRecordTypes('example.com', [+ 'A',+ 'AAAA',+ ]);++ // Ensure only the specified record types are present+ expect(Object.keys(resolvedRecords).toSorted()).toEqual(['A', 'AAAA']);++ // Ensure the specified record types have the expected data+ expect(resolvedRecords['A'][0].data).toBe('data-for-A');+ expect(resolvedRecords['AAAA'][0].data).toBe('data-for-AAAA');+ });});});diff --git a/lib/resolvers/base.ts b/lib/resolvers/base.tsindex d557a1d..03c58be 100644--- a/lib/resolvers/base.ts+++ b/lib/resolvers/base.ts@@ -1,4 +1,4 @@-export const RECORD_TYPES = [+export const ALL_RECORD_TYPES = ['A','AAAA','CAA',@@ -30,7 +30,7 @@ export const RECORD_TYPES_BY_DECIMAL = {16: 'TXT',} as const;-export type RecordType = (typeof RECORD_TYPES)[number];+export type RecordType = (typeof ALL_RECORD_TYPES)[number];export type RawRecord = {name: string;@@ -47,12 +47,15 @@ export abstract class DnsResolver {type: RecordType): Promise<RawRecord[]>;- public async resolveAllRecords(domain: string): Promise<ResolvedRecords> {+ public async resolveRecordTypes(+ domain: string,+ types: readonly RecordType[]+ ): Promise<ResolvedRecords> {const results = await Promise.all(- RECORD_TYPES.map((type) => this.resolveRecordType(domain, type))+ types.map((type) => this.resolveRecordType(domain, type)));- return RECORD_TYPES.reduce(+ return types.reduce((res, type, index) => ({...res,[type]: results[index],diff --git a/lib/resolvers/internal.ts b/lib/resolvers/internal.tsindex f6280c1..d20acb2 100644--- a/lib/resolvers/internal.ts+++ b/lib/resolvers/internal.ts@@ -1,7 +1,6 @@import {DnsResolver,type RawRecord,- RECORD_TYPES,type RecordType,type ResolvedRecords,} from './base';@@ -56,10 +55,13 @@ export class InternalDoHResolver extends DnsResolver {return results[type];}- public async resolveAllRecords(domain: string): Promise<ResolvedRecords> {+ public async resolveRecordTypes(+ domain: string,+ types: readonly RecordType[]+ ): Promise<ResolvedRecords> {const url = this.getBaseUrl(this.location);url.searchParams.set('resolver', this.resolver);- RECORD_TYPES.forEach((type) => url.searchParams.append('type', type));+ types.forEach((type) => url.searchParams.append('type', type));url.searchParams.set('domain', domain);const response = await fetch(url, this.requestInit);