Full Toolkit for Next-Level Domain Analysis
Configure T3 Env 🔧
Felix Wotschofsky86e430fe3520
diff --git a/app/(landing)/opengraph-image.tsx b/app/(landing)/opengraph-image.tsxindex f5b26ba..b854cef 100644--- a/app/(landing)/opengraph-image.tsx+++ b/app/(landing)/opengraph-image.tsx@@ -1,5 +1,7 @@import { ImageResponse } from 'next/og';+import { env } from '@/env';+export const runtime = 'edge';export const contentType = 'image/png';@@ -12,8 +14,8 @@ const interBoldFontP = fetch().then((res) => res.arrayBuffer());const publicUrl =- process.env.SITE_URL ||- (process.env.VERCEL_URL && `https://${process.env.VERCEL_URL}`) ||+ env.SITE_URL ||+ (env.VERCEL_URL && `https://${env.VERCEL_URL}`) ||'http://localhost:3000';export const handler = async () => {diff --git a/app/api/internal/resolve/base.ts b/app/api/internal/resolve/base.tsindex 076c33d..257f4bd 100644--- a/app/api/internal/resolve/base.ts+++ b/app/api/internal/resolve/base.ts@@ -1,15 +1,16 @@+import { env } from '@/env';import { ALL_RECORD_TYPES, type RecordType } from '@/lib/resolvers/base';import { CloudflareDoHResolver } from '@/lib/resolvers/cloudflare';import { GoogleDoHResolver } from '@/lib/resolvers/google';-if (process.env.NODE_ENV === 'production' && !process.env.INTERNAL_API_SECRET) {+if (env.NODE_ENV === 'production' && !env.INTERNAL_API_SECRET) {throw new Error('INTERNAL_API_SECRET is required in production');}export const handler = async (request: Request) => {if (- process.env.INTERNAL_API_SECRET &&- process.env.INTERNAL_API_SECRET !== request.headers.get('authorization')+ env.INTERNAL_API_SECRET &&+ env.INTERNAL_API_SECRET !== request.headers.get('authorization')) {return Response.json({diff --git a/app/layout.tsx b/app/layout.tsxindex 6ef0614..d92c660 100644--- a/app/layout.tsx+++ b/app/layout.tsx@@ -4,6 +4,8 @@ import type { FC, ReactNode } from 'react';import { Toaster } from '@/components/ui/sonner';+import { env } from '@/env';+import { Footer } from './_components/footer';import { Header } from './_components/header';import './globals.css';@@ -16,7 +18,7 @@ export const viewport: Viewport = {};export const metadata = {- metadataBase: process.env.SITE_URL ? new URL(process.env.SITE_URL) : null,+ metadataBase: env.SITE_URL ? new URL(env.SITE_URL) : null,title: 'Domain Digger: DNS, WHOIS lookup & more',description:'Domain Digger is the full open-source toolkit for next-level domain analysis, providing detailed DNS, IP, WHOIS data, and SSL/TLS history in a user-friendly, no-install interface.',diff --git a/app/lookup/[domain]/(dns)/opengraph-image.tsx b/app/lookup/[domain]/(dns)/opengraph-image.tsxindex 5a8c371..954a2e1 100644--- a/app/lookup/[domain]/(dns)/opengraph-image.tsx+++ b/app/lookup/[domain]/(dns)/opengraph-image.tsx@@ -1,5 +1,7 @@import { ImageResponse } from 'next/og';+import { env } from '@/env';+export const runtime = 'edge';export const contentType = 'image/png';@@ -12,8 +14,8 @@ const interBoldFontP = fetch().then((res) => res.arrayBuffer());const publicUrl =- process.env.SITE_URL ||- (process.env.VERCEL_URL && `https://${process.env.VERCEL_URL}`) ||+ env.SITE_URL ||+ (env.VERCEL_URL && `https://${env.VERCEL_URL}`) ||'http://localhost:3000';export const handler = async ({ params }: { params: { domain: string } }) => {diff --git a/app/providers.tsx b/app/providers.tsxindex ba25d18..022d08e 100644--- a/app/providers.tsx+++ b/app/providers.tsx@@ -5,6 +5,8 @@ import { ThemeProvider } from 'next-themes';import { type FC, type ReactNode } from 'react';import { SWRConfig } from 'swr';+import { env } from '@/env';+type CustomizedPlausibleProviderProps = {children: ReactNode;};@@ -12,15 +14,15 @@ type CustomizedPlausibleProviderProps = {const CustomizedPlausibleProvider: FC<CustomizedPlausibleProviderProps> = ({children,}) => {- if (!process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN) {+ if (!env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN) {return children;}return (<PlausibleProvider- customDomain={process.env.NEXT_PUBLIC_PLAUSIBLE_HOST}+ customDomain={env.NEXT_PUBLIC_PLAUSIBLE_HOST}trackOutboundLinks- domain={process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}+ domain={env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN}>{children}</PlausibleProvider>diff --git a/app/sitemap.ts b/app/sitemap.tsindex a3aae94..c11eb63 100644--- a/app/sitemap.ts+++ b/app/sitemap.ts@@ -1,11 +1,11 @@import type { MetadataRoute } from 'next';import { parse as parseTldts } from 'tldts';+import { env } from '@/env';import { EXAMPLE_DOMAINS } from '@/lib/data';import { getTopDomains } from '@/lib/search';import { deduplicate } from '@/lib/utils';-const SITE_URL = process.env.SITE_URL;const RESULTS_SUBPATHS = ['', '/certs', '/map', '/subdomains', '/whois'];const getSitemapPaths = async () => {@@ -28,7 +28,7 @@ const getSitemapPaths = async () => {};const sitemap = async (): Promise<MetadataRoute.Sitemap> => {- if (!SITE_URL) {+ if (!env.SITE_URL) {return [];}@@ -36,13 +36,13 @@ const sitemap = async (): Promise<MetadataRoute.Sitemap> => {return [{- url: SITE_URL,+ url: env.SITE_URL,lastModified: new Date(),changeFrequency: 'monthly' as const,priority: 1,},...paths.map((url) => ({- url: SITE_URL + url,+ url: env.SITE_URL + url,lastModified: new Date(),changeFrequency: 'always' as const,priority: 0.5,diff --git a/env.ts b/env.tsnew file mode 100644index 0000000..9dd0be4--- /dev/null+++ b/env.ts@@ -0,0 +1,29 @@+import { createEnv } from '@t3-oss/env-nextjs';+import { vercel } from '@t3-oss/env-nextjs/presets';+import { z } from 'zod';++export const env = createEnv({+ extends: [vercel],+ server: {+ NODE_ENV: z.enum(['production']).optional(),++ SITE_URL: z.string().url().optional(),+ INTERNAL_API_SECRET: z.string().min(1),++ UPSTASH_REDIS_REST_URL: z.string().url(),+ UPSTASH_REDIS_REST_TOKEN: z.string().min(1),++ GOOGLE_SERVICE_KEY_B64: z.string().optional(),+ BIGQUERY_DATASET: z.string().optional(),+ BIGQUERY_LOCATION: z.string().optional(),+ },+ client: {+ NEXT_PUBLIC_PLAUSIBLE_DOMAIN: z.string().optional(),+ NEXT_PUBLIC_PLAUSIBLE_HOST: z.string().optional(),+ },+ experimental__runtimeEnv: {+ NEXT_PUBLIC_PLAUSIBLE_DOMAIN: process.env.NEXT_PUBLIC_PLAUSIBLE_DOMAIN,+ NEXT_PUBLIC_PLAUSIBLE_HOST: process.env.NEXT_PUBLIC_PLAUSIBLE_HOST,+ },+ emptyStringAsUndefined: true,+});diff --git a/lib/bigquery.ts b/lib/bigquery.tsindex 7057eb1..fb0475c 100644--- a/lib/bigquery.ts+++ b/lib/bigquery.ts@@ -1,9 +1,10 @@-// @ts-expect-errorimport { getAccessToken } from 'web-auth-library/google';-const credentials = process.env.GOOGLE_SERVICE_KEY_B64+import { env } from '@/env';++const credentials = env.GOOGLE_SERVICE_KEY_B64? (JSON.parse(- Buffer.from(process.env.GOOGLE_SERVICE_KEY_B64, 'base64').toString()+ Buffer.from(env.GOOGLE_SERVICE_KEY_B64, 'base64').toString()) as {type: 'service_account';project_id: string;@@ -22,6 +23,7 @@ export const insertRows = async ({rows: Record<string, any>[];}): Promise<void> => {const accessToken = await getAccessToken({+ // @ts-expect-error still workscredentials: credentials,scope: 'https://www.googleapis.com/auth/cloud-platform',});@@ -58,6 +60,7 @@ export const query = async ({params?: Record<string, string>;}): Promise<any[]> => {const accessToken = await getAccessToken({+ // @ts-expect-error still workscredentials: credentials,scope: 'https://www.googleapis.com/auth/bigquery',});@@ -85,7 +88,7 @@ export const query = async ({body: JSON.stringify({kind: 'bigquery#queryRequest',useLegacySql: false,- location: process.env.BIGQUERY_LOCATION,+ location: env.BIGQUERY_LOCATION,query,parameterMode: 'NAMED',queryParameters,diff --git a/lib/resolvers/internal.test.ts b/lib/resolvers/internal.test.tsindex d3a355e..8d84f97 100644--- a/lib/resolvers/internal.test.ts+++ b/lib/resolvers/internal.test.ts@@ -6,12 +6,16 @@ global.fetch = vi.fn();describe('InternalDoHResolver', () => {beforeAll(() => {- vi.stubEnv('SITE_URL', 'https://example.com');- vi.stubEnv('INTERNAL_API_SECRET', 'secret');+ vi.mock('@/env', () => ({+ env: {+ SITE_URL: 'https://example.com',+ INTERNAL_API_SECRET: 'secret',+ },+ }));});afterAll(() => {- vi.unstubAllEnvs();+ vi.resetAllMocks();});it('should successfully resolve DNS records', async () => {diff --git a/lib/resolvers/internal.ts b/lib/resolvers/internal.tsindex d20acb2..78610af 100644--- a/lib/resolvers/internal.ts+++ b/lib/resolvers/internal.ts@@ -1,3 +1,5 @@+import { env } from '@/env';+import {DnsResolver,type RawRecord,@@ -15,8 +17,8 @@ export class InternalDoHResolver extends DnsResolver {private getBaseUrl(location: string) {const baseUrl = new URL(- process.env.SITE_URL ||- (process.env.VERCEL_URL && `https://${process.env.VERCEL_URL}`) ||+ env.SITE_URL ||+ (env.VERCEL_URL && `https://${env.VERCEL_URL}`) ||'http://localhost:3000');baseUrl.pathname = `/api/internal/resolve/${location}`;@@ -24,13 +26,13 @@ export class InternalDoHResolver extends DnsResolver {}private get requestInit() {- if (!process.env.INTERNAL_API_SECRET) {+ if (!env.INTERNAL_API_SECRET) {return {};}return {headers: {- Authorization: process.env.INTERNAL_API_SECRET,+ Authorization: env.INTERNAL_API_SECRET,},};}diff --git a/lib/search.ts b/lib/search.tsindex ca2f794..c355dfa 100644--- a/lib/search.ts+++ b/lib/search.ts@@ -1,3 +1,4 @@+import { env } from '@/env';import { bigquery } from '@/lib/bigquery';import { getBaseDomain } from '@/lib/utils';@@ -16,7 +17,7 @@ export const recordLookup = async (payload: LookupLogPayload) => {await bigquery.insertRows({- datasetName: process.env.BIGQUERY_DATASET!,+ datasetName: env.BIGQUERY_DATASET!,tableName: 'lookups',rows: [{@@ -44,7 +45,7 @@ export const getSearchSuggestions = async (query: string) => {return [];}- const tableName = `\`${bigquery.projectId}.${process.env.BIGQUERY_DATASET}.lookups\``;+ const tableName = `\`${bigquery.projectId}.${env.BIGQUERY_DATASET}.lookups\``;const results = await bigquery.query({query: `SELECT baseDomain@@ -67,7 +68,7 @@ export const getTopDomains = async (count: number) => {return [];}- const tableName = `\`${bigquery.projectId}.${process.env.BIGQUERY_DATASET}.lookups\``;+ const tableName = `\`${bigquery.projectId}.${env.BIGQUERY_DATASET}.lookups\``;const results = await bigquery.query({query: `SELECT baseDomaindiff --git a/package.json b/package.jsonindex 71aa573..dfb2154 100644--- a/package.json+++ b/package.json@@ -23,6 +23,7 @@"@radix-ui/react-slot": "^1.0.2","@radix-ui/react-tabs": "^1.0.4","@radix-ui/react-tooltip": "^1.0.7",+ "@t3-oss/env-nextjs": "^0.9.2","@types/punycode": "^2.1.4","@types/validator": "^13.11.9","@uidotdev/usehooks": "^2.4.1",@@ -61,7 +62,8 @@"validator": "^13.11.0","vaul": "^0.9.0","web-auth-library": "^1.0.3",- "whoiser": "^1.17.3"+ "whoiser": "^1.17.3",+ "zod": "^3.22.4"},"devDependencies": {"@svgr/webpack": "^8.1.0",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 4830ea1..486585a 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -29,6 +29,9 @@ dependencies:'@radix-ui/react-tooltip':specifier: ^1.0.7version: 1.0.7(@types/[email protected])(@types/[email protected])([email protected])([email protected])+ '@t3-oss/env-nextjs':+ specifier: ^0.9.2+ version: 0.9.2([email protected])([email protected])'@types/punycode':specifier: ^2.1.4version: 2.1.4@@ -146,6 +149,9 @@ dependencies:whoiser:specifier: ^1.17.3version: 1.17.3+ zod:+ specifier: ^3.22.4+ version: 3.22.4devDependencies:'@svgr/webpack':@@ -2959,6 +2965,33 @@ packages:tslib: 2.6.2dev: false+ resolution: {integrity: sha512-KgWXljUTHgO3o7GMZQPAD5+P+HqpauMNNHowlm7V2b9IeMitSUpNKwG6xQrup/xARWHTdxRVIl0mSI4wCevQhQ==}+ peerDependencies:+ typescript: '>=5.0.0'+ zod: ^3.0.0+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ typescript: 5.4.2+ zod: 3.22.4+ dev: false++ resolution: {integrity: sha512-dklHrgKLESStNVB67Jdbu6osxDYA+xNKaPBRerlnkEvzbCccSKMvZENx6EZebJuR4snqB3/yRykNMn/bdIAyiQ==}+ peerDependencies:+ typescript: '>=5.0.0'+ zod: ^3.0.0+ peerDependenciesMeta:+ typescript:+ optional: true+ dependencies:+ '@t3-oss/env-core': 0.9.2([email protected])([email protected])+ typescript: 5.4.2+ zod: 3.22.4+ dev: false+/@trivago/[email protected]([email protected]):resolution: {integrity: sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==}peerDependencies:@@ -7035,7 +7068,6 @@ packages:resolution: {integrity: sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==}engines: {node: '>=14.17'}hasBin: true- dev: trueresolution: {integrity: sha512-HGyF79+/qZ4soRvM+nHERR2pJ3VXDZ/8sL1uLahdgEDf580NkgiWOxLk33FetExqOWp352JZRsgXbG/4MaGOSg==}@@ -7406,3 +7438,7 @@ packages:resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}engines: {node: '>=12.20'}dev: true++ resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==}+ dev: falsediff --git a/tsconfig.json b/tsconfig.jsonindex e06a445..23ba4fd 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -9,7 +9,7 @@"noEmit": true,"esModuleInterop": true,"module": "esnext",- "moduleResolution": "node",+ "moduleResolution": "bundler","resolveJsonModule": true,"isolatedModules": true,"jsx": "preserve",