Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Add CDN Cache to `/wellknown/` routes (#3631)

Steven Tey796b54f2edff
diff --git a/apps/web/app/[domain]/[key]/inspect/page.tsx b/apps/web/app/[domain]/[key]/inspect/page.tsx
index 856abde743..0411dc2747 100644
--- a/apps/web/app/[domain]/[key]/inspect/page.tsx
+++ b/apps/web/app/[domain]/[key]/inspect/page.tsx
@@ -81,7 +81,7 @@ export default async function InspectPage(props: {
)}
>
<LinkInspectorCard domain={domain} _key={key} url={data.url} />
- <Suspense fallback={<LinkPreviewPlaceholder />}>
+ <Suspense fallback={<LinkPreviewPlaceholder defaultUrl={data.url} />}>
<LinkPreview defaultUrl={data.url} />
</Suspense>
<a
diff --git a/apps/web/app/api/domains/[domain]/route.ts b/apps/web/app/api/domains/[domain]/route.ts
index a4742e37fe..e85f966360 100644
--- a/apps/web/app/api/domains/[domain]/route.ts
+++ b/apps/web/app/api/domains/[domain]/route.ts
@@ -28,13 +28,13 @@ const updateDomainBodySchemaExtended = updateDomainBodySchema.extend({
// GET /api/domains/[domain] – get a workspace's domain
export const GET = withWorkspace(
async ({ workspace, params }) => {
- const domainRecord = await getDomainOrThrow({
+ const domain = await getDomainOrThrow({
workspace,
domain: params.domain,
dubDomainChecks: true,
});
- return NextResponse.json(transformDomain(domainRecord));
+ return NextResponse.json(transformDomain(domain));
},
{
requiredPermissions: ["domains.read"],
@@ -44,19 +44,12 @@ export const GET = withWorkspace(
// PUT /api/domains/[domain] – edit a workspace's domain
export const PATCH = withWorkspace(
async ({ req, workspace, params }) => {
- const {
- id: domainId,
- slug: domain,
- registeredDomain,
- logo: oldLogo,
- notFoundUrl: oldNotFoundUrl,
- expiredUrl: oldExpiredUrl,
- partnerProgram,
- } = await getDomainOrThrow({
+ const existingDomain = await getDomainOrThrow({
workspace,
domain: params.domain,
dubDomainChecks: true,
});
+ const { slug: domain, registeredDomain, partnerProgram } = existingDomain;
const {
slug: newDomain,
@@ -130,17 +123,17 @@ export const PATCH = withWorkspace(
const logoUploaded = logo
? await storage.upload({
- key: `domains/${domainId}/logo_${nanoid(7)}`,
+ key: `domains/${existingDomain.id}/logo_${nanoid(7)}`,
body: logo,
})
: null;
// If logo is null, we want to delete the logo (explicitly set in the request body to null or "")
- const deleteLogo = logo === null && oldLogo;
+ const deleteLogo = logo === null && existingDomain.logo;
- const domainRecord = await prisma.domain.update({
+ const updatedDomain = await prisma.domain.update({
where: {
- slug: domain,
+ id: existingDomain.id,
},
data: {
...(domainUpdated && { slug: newDomain }),
@@ -148,7 +141,7 @@ export const PATCH = withWorkspace(
placeholder,
expiredUrl,
notFoundUrl,
- logo: deleteLogo ? null : logoUploaded?.url || oldLogo,
+ logo: deleteLogo ? null : logoUploaded?.url || existingDomain.logo,
...(assetLinks !== undefined && {
assetLinks: assetLinks ? JSON.parse(assetLinks) : Prisma.DbNull,
}),
@@ -177,7 +170,7 @@ export const PATCH = withWorkspace(
if (shouldUpdate) {
await prisma.registeredDomain.update({
where: {
- domainId: domainId,
+ domainId: existingDomain.id,
},
data: {
autoRenewalDisabledAt: autoRenew ? null : new Date(),
@@ -199,15 +192,10 @@ export const PATCH = withWorkspace(
waitUntil(
(async () => {
// remove old logo
- if (oldLogo && (logo === null || logoUploaded)) {
- await storage.delete({ key: oldLogo.replace(`${R2_URL}/`, "") });
- }
-
- if (
- (notFoundUrl !== undefined && notFoundUrl !== oldNotFoundUrl) ||
- (expiredUrl !== undefined && expiredUrl !== oldExpiredUrl)
- ) {
- revalidateTag(`notfound:${domain.toLowerCase()}`);
+ if (existingDomain.logo && (logo === null || logoUploaded)) {
+ await storage.delete({
+ key: existingDomain.logo.replace(`${R2_URL}/`, ""),
+ });
}
if (domainUpdated) {
@@ -244,10 +232,24 @@ export const PATCH = withWorkspace(
: []),
]);
}
+
+ // invalidate notfound cache
+ if (
+ (notFoundUrl !== undefined &&
+ notFoundUrl !== existingDomain.notFoundUrl) ||
+ (expiredUrl !== undefined && expiredUrl !== existingDomain.expiredUrl)
+ ) {
+ revalidateTag(`notfound:${domain.toLowerCase()}`);
+ }
+
+ // invalidate wellknown cache if any of the wellknown files have changed
+ if (appleAppSiteAssociation !== undefined || assetLinks !== undefined) {
+ revalidateTag(`wellknown:${domain.toLowerCase()}`);
+ }
})(),
);
- return NextResponse.json(transformDomain(domainRecord));
+ return NextResponse.json(transformDomain(updatedDomain));
},
{
requiredPermissions: ["domains.write"],
diff --git a/apps/web/app/wellknown/[domain]/[file]/route.ts b/apps/web/app/wellknown/[domain]/[file]/route.ts
index 127b87d634..a30913fc0f 100644
--- a/apps/web/app/wellknown/[domain]/[file]/route.ts
+++ b/apps/web/app/wellknown/[domain]/[file]/route.ts
@@ -6,8 +6,6 @@ import {
import { prismaEdge } from "@dub/prisma/edge";
import { NextRequest, NextResponse } from "next/server";
-export const runtime = "edge";
-
export async function GET(
_req: NextRequest,
props: { params: Promise<{ domain: string; file: SupportedWellKnownFiles }> },
@@ -49,5 +47,10 @@ export async function GET(
break;
}
- return NextResponse.json(response);
+ return NextResponse.json(response, {
+ headers: {
+ "Vercel-CDN-Cache-Control": "public, s-maxage=86400",
+ "Vercel-Cache-Tag": `wellknown:${domain.toLowerCase()}`,
+ },
+ });
}
diff --git a/packages/ui/src/link-preview.tsx b/packages/ui/src/link-preview.tsx
index 6249743954..d0cb3d7642 100644
--- a/packages/ui/src/link-preview.tsx
+++ b/packages/ui/src/link-preview.tsx
@@ -7,7 +7,7 @@ import { useEffect, useMemo, useRef } from "react";
import useSWR from "swr";
import { useDebounce } from "use-debounce";
import { useMediaQuery } from "./hooks";
-import { LoadingCircle, Photo } from "./icons";
+import { LoadingSpinner, Photo } from "./icons";
export function LinkPreview({ defaultUrl }: { defaultUrl?: string }) {
const searchParams = useSearchParams();
@@ -63,8 +63,8 @@ export function LinkPreview({ defaultUrl }: { defaultUrl?: string }) {
<div className="relative w-full overflow-hidden rounded-lg border border-neutral-200 bg-neutral-50 shadow-sm">
{isValidating && (
- <div className="absolute flex h-[250px] flex-col items-center justify-center space-y-4 border-b border-neutral-300 bg-neutral-50">
- <LoadingCircle />
+ <div className="absolute inset-x-0 flex h-[250px] flex-col items-center justify-center space-y-4 border-b border-neutral-300 bg-neutral-50">
+ <LoadingSpinner />
</div>
)}
{image ? (
@@ -129,7 +129,7 @@ export function LinkPreviewPlaceholder({
</div>
<div className="relative overflow-hidden rounded-md border border-neutral-300 bg-neutral-50">
<div className="absolute flex h-[250px] w-full flex-col items-center justify-center space-y-4 border-b border-neutral-300 bg-neutral-50">
- <LoadingCircle />
+ <LoadingSpinner />
</div>
</div>
</>