The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Fix logs (#3761)
Kiran K0d3b0cc8f07f
diff --git a/apps/web/app/(ee)/api/track/open/route.ts b/apps/web/app/(ee)/api/track/open/route.tsindex 3ea39948a4..daaeddc6f6 100644--- a/apps/web/app/(ee)/api/track/open/route.ts+++ b/apps/web/app/(ee)/api/track/open/route.ts@@ -162,16 +162,18 @@ export const POST = withAxiom(async (req) => {headers: COMMON_CORS_HEADERS,});- captureRequestLog({- req: reqForLog,- response: jsonResponse,- workspace: { id: workspaceId },- session: undefined,- token: null,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response: jsonResponse,+ workspace: { id: workspaceId },+ session: undefined,+ token: null,+ url,+ requestHeaders,+ startTime,+ }),+ );return jsonResponse;} catch (error) {@@ -181,16 +183,18 @@ export const POST = withAxiom(async (req) => {);if (workspaceId) {- captureRequestLog({- req: reqForLog,- response: errorResponse,- workspace: { id: workspaceId },- session: undefined,- token: null,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response: errorResponse,+ workspace: { id: workspaceId },+ session: undefined,+ token: null,+ url,+ requestHeaders,+ startTime,+ }),+ );}return errorResponse;diff --git a/apps/web/lib/api-logs/capture-request-log.ts b/apps/web/lib/api-logs/capture-request-log.tsindex 2112b7dc8f..7cf1cdd059 100644--- a/apps/web/lib/api-logs/capture-request-log.ts+++ b/apps/web/lib/api-logs/capture-request-log.ts@@ -1,5 +1,4 @@import { WorkspaceWithUsers } from "@/lib/types";-import { waitUntil } from "@vercel/functions";import { TokenCacheItem } from "../auth/token-cache";import { Session } from "../auth/utils";import { HTTP_MUTATION_METHODS, ROUTE_PATTERNS } from "./constants";@@ -37,7 +36,7 @@ export function getRoutePattern(path: string): string {return "unknown";}-export function captureRequestLog({+export async function captureRequestLog({req,response,workspace,@@ -69,33 +68,29 @@ export function captureRequestLog({const duration = Date.now() - startTime;const responseClone = response.clone();- waitUntil(- (async () => {- let requestBody = null;- let responseBody = null;+ let requestBody = null;+ let responseBody = null;- try {- requestBody = await req.json();- } catch {}+ try {+ requestBody = await req.json();+ } catch {}- try {- responseBody = await responseClone.json();- } catch {}+ try {+ responseBody = await responseClone.json();+ } catch {}- await recordApiLog({- workspaceId: workspace.id,- method: req.method,- path: url.pathname,- routePattern,- statusCode: response.status,- duration,- userAgent: requestHeaders.get("user-agent"),- requestBody,- responseBody,- tokenId: token?.id ?? null,- userId: session?.user?.id ?? null,- requestType: "api",- });- })(),- );+ return await recordApiLog({+ workspaceId: workspace.id,+ method: req.method,+ path: url.pathname,+ routePattern,+ statusCode: response.status,+ duration,+ userAgent: requestHeaders.get("user-agent"),+ requestBody,+ responseBody,+ tokenId: token?.id ?? null,+ userId: session?.user?.id ?? null,+ requestType: "api",+ });}diff --git a/apps/web/lib/api-logs/capture-webhook-log.ts b/apps/web/lib/api-logs/capture-webhook-log.tsindex 49a6fc9965..d098b92aa0 100644--- a/apps/web/lib/api-logs/capture-webhook-log.ts+++ b/apps/web/lib/api-logs/capture-webhook-log.ts@@ -33,6 +33,7 @@ export async function captureWebhookLog({userAgent: string | null;}) {const actor = WEBHOOK_REQUEST_ACTORS_BY_PATH[path];+return await recordApiLog({workspaceId,method,diff --git a/apps/web/lib/auth/publishable-key.ts b/apps/web/lib/auth/publishable-key.tsindex 9a8540a114..ff74fa6dc8 100644--- a/apps/web/lib/auth/publishable-key.ts+++ b/apps/web/lib/auth/publishable-key.ts@@ -5,6 +5,7 @@ import { ratelimit } from "@/lib/upstash";import { prisma } from "@dub/prisma";import { Project } from "@dub/prisma/client";import { getSearchParams } from "@dub/utils";+import { waitUntil } from "@vercel/functions";import { headers } from "next/headers";import { COMMON_CORS_HEADERS } from "../api/cors";@@ -114,16 +115,18 @@ export const withPublishableKey = (workspace,});- captureRequestLog({- req: reqForLog,- response,- workspace,- session: undefined,- token: null,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response,+ workspace,+ session: undefined,+ token: null,+ url,+ requestHeaders,+ startTime,+ }),+ );return response;} else {@@ -139,16 +142,18 @@ export const withPublishableKey = ();if (workspace) {- captureRequestLog({- req: reqForLog,- response: errorResponse,- workspace,- session: undefined,- token: null,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response: errorResponse,+ workspace,+ session: undefined,+ token: null,+ url,+ requestHeaders,+ startTime,+ }),+ );}return errorResponse;diff --git a/apps/web/lib/auth/workspace.ts b/apps/web/lib/auth/workspace.tsindex d3efda76cb..3380c1f858 100644--- a/apps/web/lib/auth/workspace.ts+++ b/apps/web/lib/auth/workspace.ts@@ -357,6 +357,9 @@ export const withWorkspace = (// workspace doesn't existif (!workspace || !workspace.users) {+ // Clear so the catch path won't record this error against a partial/wrong workspace.+ workspace = undefined;+throw new DubApiError({code: "not_found",message: "Workspace not found.",@@ -478,16 +481,18 @@ export const withWorkspace = (});if (workspace) {- captureRequestLog({- req: reqForLog,- response,- workspace,- session,- token,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response,+ workspace,+ session,+ token,+ url,+ requestHeaders,+ startTime,+ }),+ );}return response;@@ -498,16 +503,18 @@ export const withWorkspace = ();if (workspace) {- captureRequestLog({- req: reqForLog,- response: errorResponse,- workspace,- session,- token,- url,- requestHeaders,- startTime,- });+ waitUntil(+ captureRequestLog({+ req: reqForLog,+ response: errorResponse,+ workspace,+ session,+ token,+ url,+ requestHeaders,+ startTime,+ }),+ );}return errorResponse;diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsxindex 61d3068d61..6212203d09 100644--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx@@ -37,6 +37,7 @@ import {ShieldCheck,ShieldKeyhole,Sliders,+ StackY3,Tag,Trophy,UserCheck,@@ -406,6 +407,11 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {icon: Key,href: `/${slug}/settings/tokens`,},+ {+ name: "Logs",+ icon: StackY3,+ href: `/${slug}/settings/logs`,+ },{name: "Tracking",icon: MarketingTarget,diff --git a/packages/utils/src/constants/reserved-slugs.ts b/packages/utils/src/constants/reserved-slugs.tsindex fe9ab63964..5d14d6b8c3 100644--- a/packages/utils/src/constants/reserved-slugs.ts+++ b/packages/utils/src/constants/reserved-slugs.ts@@ -11,6 +11,8 @@ export const RESERVED_SLUGS = ["share","deeplink","robots.txt",+ "undefined",+ "null","proxy","account","api",