Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

perf(web): simplify observability and prepare navigation metadata (#893)

Generd78aa63abd2f
diff --git a/src/app/scripts/bundle.ts b/src/app/scripts/bundle.ts
index 94a7a547f..45af97631 100644
--- a/src/app/scripts/bundle.ts
+++ b/src/app/scripts/bundle.ts
@@ -60,7 +60,8 @@ rewriteAbsolutePaths(webDest);
cpSync(join(webSrc, "wrangler.toml"), join(webDest, "wrangler.toml"));
cpSync(join(webSrc, "custom-worker.ts"), join(webDest, "custom-worker.ts"));
mkdirSync(join(webDest, "src", "lib"), { recursive: true });
-for (const runtimeFile of ["worker-runtime.ts", "public-worker-response.ts"]) {
+mkdirSync(join(webDest, "src", "lib", "observability"), { recursive: true });
+for (const runtimeFile of ["worker-runtime.ts", "public-worker-response.ts", "observability/build.ts", "observability/coverage.ts", "observability/schema.ts"]) {
cpSync(
join(webSrc, "src", "lib", runtimeFile),
join(webDest, "src", "lib", runtimeFile),
diff --git a/src/app/test/packed-artifact.test.ts b/src/app/test/packed-artifact.test.ts
index dd2ac14dd..73c89daef 100644
--- a/src/app/test/packed-artifact.test.ts
+++ b/src/app/test/packed-artifact.test.ts
@@ -80,6 +80,13 @@ describe("packed artifact verifier", () => {
join(monoRoot, "src", "web", "src", "lib", "public-worker-response.ts"),
join(webDest, "src", "lib", "public-worker-response.ts"),
);
+ expect(mkdirSync).toHaveBeenCalledWith(join(webDest, "src", "lib", "observability"), { recursive: true });
+ for (const name of ["build.ts", "coverage.ts", "schema.ts"]) {
+ expect(cpSync).toHaveBeenCalledWith(
+ join(monoRoot, "src", "web", "src", "lib", "observability", name),
+ join(webDest, "src", "lib", "observability", name),
+ );
+ }
});
it("derives the missing-runtime negative control from the candidate and validates both outcomes", () => {
diff --git a/src/web/blog/src/app/blog/observability.dom.test.tsx b/src/web/blog/src/app/blog/observability.dom.test.tsx
index e10cde53a..144216e82 100644
--- a/src/web/blog/src/app/blog/observability.dom.test.tsx
+++ b/src/web/blog/src/app/blog/observability.dom.test.tsx
@@ -42,14 +42,14 @@ afterEach(async () => {
vi.unstubAllGlobals();
});
-it("executes the actual index loader and renders ordered featured/recent links before reporting unknown SSR evidence", async () => {
+it("executes the actual index loader and renders ordered featured/recent links before reporting committed content", async () => {
const navigation = beginNavigation("/blog")!;
render(await BlogPage());
expect(screen.getByRole("heading", { level: 1, name: "Blog" })).toBeVisible();
expect(screen.getByRole("region", { name: "Featured article" })).toHaveTextContent("Local AI agents");
expect(screen.getByRole("link", { name: /Human-AI Collaboration/ })).toHaveAttribute("href", "/blog/introducing-alook");
await waitFor(() => expect(ready(navigation.id)).toHaveLength(1));
- expect(ready(navigation.id)[0]!.attributes).toMatchObject({ region: "page", route_template: "/blog", source: "unknown", freshness: "unknown", data_version: "ssr_committed" });
+ expect(ready(navigation.id)[0]!.attributes).toMatchObject({ region: "page", route_template: "/blog" });
expect(navigation.done).toBe(true);
});
diff --git a/src/web/blog/src/instrumentation-client.dom.test.tsx b/src/web/blog/src/instrumentation-client.dom.test.tsx
index b854aa94c..d1e5fadff 100644
--- a/src/web/blog/src/instrumentation-client.dom.test.tsx
+++ b/src/web/blog/src/instrumentation-client.dom.test.tsx
@@ -52,7 +52,7 @@ it("boots the actual Blog entry with the native resumed session and exports its
});
await act(async () => { await vi.advanceTimersByTimeAsync(1500); });
const exported = sent.flatMap(body => body.events ?? []).filter(event => event.attributes?.action_id === navigation.id);
- expect(exported.map(event => event.name)).toEqual(expect.arrayContaining(["action.start", "navigation.intent", "navigation.commit", "region.read", "region.ready_commit", "action.finish"]));
+ expect(exported.map(event => event.name)).toEqual(expect.arrayContaining(["action.start", "navigation.intent", "navigation.commit", "region.ready_commit", "action.finish"]));
expect(exported.filter(event => event.name === "action.finish").map(event => event.attributes?.outcome)).toEqual(["success"]);
for (const event of exported) expect(event.attributes).toMatchObject({ session_id: prior.sessionId, frontend_surface: "blog", route_template: "/blog/[slug]", navigation_id: navigation.navigationId });
for (const body of sent) expect(body).toMatchObject({ meta: { sdk: { name: "faro-web", version: "2.12.1" }, session: { id: prior.sessionId } } });
diff --git a/src/web/custom-worker.ts b/src/web/custom-worker.ts
index 68bcd886e..d8431c848 100644
--- a/src/web/custom-worker.ts
+++ b/src/web/custom-worker.ts
@@ -3,8 +3,13 @@
// @ts-ignore — generated at build time, may not exist yet
import openNextHandler from "./.open-next/worker.js"
import { createWebWorkerHandler } from "./src/lib/worker-runtime"
+import type { NextConfig } from "next"
+import { resolveObservationBuild } from "./src/lib/observability/build"
+// @ts-ignore — generated by Next build before the Worker bundle
+import requiredServerFiles from "./.open-next/server-functions/default/src/web/.next/required-server-files.json"
// @ts-ignore — generated at build time, may not exist yet
export { DOQueueHandler } from "./.open-next/worker.js"
-export default createWebWorkerHandler(openNextHandler as ExportedHandler<CloudflareEnv>)
+const build = resolveObservationBuild((requiredServerFiles as { config: Pick<NextConfig, "env"> }).config.env ?? {})
+export default createWebWorkerHandler(openNextHandler as ExportedHandler<CloudflareEnv>, build)
diff --git a/src/web/next.config.ts b/src/web/next.config.ts
index a5ed3e9cb..a32c3fa47 100644
--- a/src/web/next.config.ts
+++ b/src/web/next.config.ts
@@ -2,15 +2,19 @@ import type { NextConfig } from "next";
import path from "node:path";
import { readFileSync } from "node:fs";
import { withSerwist } from "@serwist/turbopack";
+import { resolveObservationBuild } from "./src/lib/observability/build";
const pkg = JSON.parse(readFileSync(path.resolve(__dirname, "package.json"), "utf-8"));
const daemonPkg = JSON.parse(readFileSync(path.resolve(__dirname, "../daemon/package.json"), "utf-8"));
+const observation = resolveObservationBuild(process.env);
const nextConfig: NextConfig = {
images: { unoptimized: true },
env: {
NEXT_PUBLIC_APP_VERSION: pkg.version,
NEXT_PUBLIC_LATEST_DAEMON_VERSION: daemonPkg.version,
+ NEXT_PUBLIC_FARO_RELEASE: observation.release ?? "",
+ NEXT_PUBLIC_FARO_ENVIRONMENT: observation.environment ?? "",
},
// Prevent the bundler from creating duplicate copies of @better-auth/core,
// which breaks AsyncLocalStorage-based request state (dual module hazard).
diff --git a/src/web/src/app/c/QueryProvider.observability.dom.test.tsx b/src/web/src/app/c/QueryProvider.observability.dom.test.tsx
index f50d5c137..93121975c 100644
--- a/src/web/src/app/c/QueryProvider.observability.dom.test.tsx
+++ b/src/web/src/app/c/QueryProvider.observability.dom.test.tsx
@@ -5,7 +5,6 @@ import { afterEach, beforeEach, expect, it, vi } from "vitest"
import { act, render, waitFor } from "@/test/react-dom-harness"
import { clearAllPersistedCaches, createIdbPersister, PERSIST_BUSTER, PERSIST_CACHE_PREFIX } from "@/lib/query-persister"
import { communityKeys } from "@/lib/query-keys"
-import { valueEvidence } from "@/lib/observability/data-source"
import { setTelemetryUser } from "@/lib/observability/client"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "@/lib/observability/telemetry"
import { getCommunityDbRegistry } from "@/lib/community-db/collections"
@@ -84,12 +83,11 @@ it("attributes a delayed real IDB snapshot only after the actual Provider hydrat
await act(async () => read.release())
await waitFor(() => expect(restoring.get("account-a")).toBe(false))
expect(client.getQueryData(key("account-a"))).toEqual([expect.objectContaining({ userId: "account-a" })])
- expect(valueEvidence(client, client.getQueryData(key("account-a"))).source).toBe("restored_idb")
expect(events.filter(event => event.name === "cache.restore.finish").map(event => [event.attributes.phase, event.attributes.outcome])).toEqual([["idb_read", "hit"], ["deserialize", "hit"], ["hydrate", "success"]])
expect(JSON.stringify(events)).not.toContain("Private")
})
-it("the actual retired Provider's delayed IDB callback cannot tag or report into the replacement account", async () => {
+it("the actual retired Provider's delayed IDB callback cannot report into the replacement account", async () => {
const read = holdRead("account-a")
mounted = render(<App id="account-a" />)
await waitFor(() => expect(read.pending()).toBe(true))
@@ -100,7 +98,6 @@ it("the actual retired Provider's delayed IDB callback cannot tag or report into
const replacement = clients.get("account-b")!
expect(replacement).not.toBe(original)
const replacementData = replacement.getQueryData(key("account-b"))
- expect(valueEvidence(replacement, replacementData).source).toBe("restored_idb")
const prior = events.filter(event => event.name.startsWith("cache.restore."))
const builds = vi.spyOn(original.getQueryCache(), "build")
const clears = vi.spyOn(original, "clear")
@@ -111,7 +108,6 @@ it("the actual retired Provider's delayed IDB callback cannot tag or report into
expect(events.filter(event => event.name.startsWith("cache.restore."))).toEqual(prior)
expect(replacement.getQueryData(key("account-b"))).toBe(replacementData)
expect(replacement.getQueryData(key("account-a"))).toBeUndefined()
- expect(valueEvidence(replacement, replacementData).source).toBe("restored_idb")
})
it("regrant during a real Provider restore preserves business hydration without borrowing old telemetry admission", async () => {
@@ -128,6 +124,5 @@ it("regrant during a real Provider restore preserves business hydration without
await act(async () => read.release())
await waitFor(() => expect(restoring.get("account-a")).toBe(false))
expect(client.getQueryData(key("account-a"))).toEqual([expect.objectContaining({ userId: "account-a" })])
- expect(valueEvidence(client, client.getQueryData(key("account-a"))).source).toBe("unknown")
expect(events.filter(event => event.name.startsWith("cache.restore."))).toEqual([])
})
diff --git a/src/web/src/app/c/QueryProvider.tsx b/src/web/src/app/c/QueryProvider.tsx
index 75432c0ad..061051fe2 100644
--- a/src/web/src/app/c/QueryProvider.tsx
+++ b/src/web/src/app/c/QueryProvider.tsx
@@ -218,7 +218,7 @@ function ScopedQueryProvider({
<PersistQueryClientProvider
client={queryClient}
onSuccess={() => {
- if (communityDb.runtime.lifecycle.get().active) observeHydration(persister, queryClient)
+ if (communityDb.runtime.lifecycle.get().active) observeHydration(persister)
else discardHydration(persister)
// `onSuccess` runs after hydrate and before `isRestoring` becomes
// false. Freeze which canonical collections came from that restore so
diff --git a/src/web/src/app/c/invite/[token]/invite-accept-client.tsx b/src/web/src/app/c/invite/[token]/invite-accept-client.tsx
index 433c064e7..9d6581c3c 100644
--- a/src/web/src/app/c/invite/[token]/invite-accept-client.tsx
+++ b/src/web/src/app/c/invite/[token]/invite-accept-client.tsx
@@ -1,6 +1,6 @@
"use client"
-import { useObservedQueryRegion } from "@/lib/observability/query-regions"
+import { useObservedRegion } from "@/lib/observability/regions"
import { createStore } from "@tanstack/react-store";
import { useCallback, useEffect, useMemo } from "react"
import { useQuery, useMutation } from "@tanstack/react-query"
@@ -54,7 +54,7 @@ function InviteAcceptInner({ token }: { token: string }) {
...options, onUnauthorized: async () => { options.assertActive?.(); return false },
}), signal),
})
- useObservedQueryRegion("page", query)
+ useObservedRegion("page", !query.isPending && query.data !== undefined, 1)
const info = query.data
const loading = query.isPending
const error = query.error ? { message: query.error instanceof Error ? query.error.message : "This invite is no longer valid", dead: isDeadInvite(query.error) } : null
diff --git a/src/web/src/app/device/page.tsx b/src/web/src/app/device/page.tsx
index 16ed5f43d..273432b73 100644
--- a/src/web/src/app/device/page.tsx
+++ b/src/web/src/app/device/page.tsx
@@ -69,7 +69,7 @@ function DeviceAuthPageInner() {
const step: Step = currentDecision?.isSuccess ? currentDecision.data === "approve" ? "done" : "denied"
: verification.isFetching ? "loading" : verification.isSuccess ? "approve" : "code"
- useObservedRegion("page", !isPending && !!session && step !== "loading", { source: "unknown", version: step, freshness: "unknown", count: 1 })
+ useObservedRegion("page", !isPending && !!session && step !== "loading", 1)
useEffect(() => {
if (!isPending && !session) {
const original = source.capture()
diff --git a/src/web/src/app/pricing/pricing-client.tsx b/src/web/src/app/pricing/pricing-client.tsx
index f8f8483d9..113e63f5f 100644
--- a/src/web/src/app/pricing/pricing-client.tsx
+++ b/src/web/src/app/pricing/pricing-client.tsx
@@ -1,7 +1,6 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { valueEvidence, mergeEvidence } from "@/lib/observability/data-source"
import { useEffect, useRef, type RefObject } from "react"
import { useRouter, useSearchParams } from "next/navigation"
@@ -40,7 +39,7 @@ function PricingContent({ signedIn, sessionPending, sessionError, viewTrackedRef
const offer = (plan: string) => paymentOffer(plan) ?? catalog.data?.offers.find((item) => item.plan.id === plan)
const selected = offer(search.get("plan") ?? "")
const busy = sessionPending || billing.isBusy || catalog.isPending || (signedIn && billing.isPending)
- useObservedRegion("billing", !busy && !catalog.isError && !sessionError, { ...mergeEvidence([valueEvidence(owner.queryClient, catalog.data), valueEvidence(owner.queryClient, billing.data)]), count: 1 })
+ useObservedRegion("billing", !busy && !catalog.isError && !sessionError, 1)
const unavailable = sessionError || catalog.isError || (signedIn && billing.isError)
const disabled = (plan: string) => busy || unavailable || (plan !== "free" && (
!offer(plan) || (signedIn && !paymentOffer(plan)) || (!summary?.isFounder && summary?.plan.id === plan) || summary?.subscription?.scheduledChange?.plan.id === plan
diff --git a/src/web/src/components/community/bots/bot-list-controller.ts b/src/web/src/components/community/bots/bot-list-controller.ts
index 48da94bd9..d7c37769d 100644
--- a/src/web/src/components/community/bots/bot-list-controller.ts
+++ b/src/web/src/components/community/bots/bot-list-controller.ts
@@ -1,6 +1,5 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { mergeEvidence, viewEvidence } from "@/lib/observability/data-source"
import { useCommunityRuntime } from "@/stores/community/runtime"
import { createStore, useSelector, useAtom, useCreateAtom } from "@tanstack/react-store";
@@ -57,7 +56,7 @@ export function useBotListController(): BotListController {
window.history.pushState(null, "", `${next.pathname}${next.search}${next.hash}`)
}
const { machines, isLoading: machinesLoading } = useMachines()
- useObservedRegion("bots", botsResolved && (!(isLoading || machinesLoading) || bots.length > 0), { ...mergeEvidence([viewEvidence(bots), viewEvidence(machines)]), count: bots.length })
+ useObservedRegion("bots", botsResolved && (!(isLoading || machinesLoading) || bots.length > 0), bots.length)
const profilesByUserId = useCanonicalProfilesByUserId(bots.map((bot) => bot.id))
const [createOpen, setCreateOpen] = useAtom(useCreateAtom(false))
const [editingBotId, setEditingBotId] = useAtom(useCreateAtom<string | null>(null))
diff --git a/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx b/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx
index 29a629c96..88410bc5a 100644
--- a/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx
+++ b/src/web/src/components/community/channels/channel-sidebar-tree-owner.tsx
@@ -1,7 +1,6 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence } from "@/lib/observability/data-source"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useEffect } from "react"
@@ -102,7 +101,7 @@ export function ChannelSidebarTreeOwner({
...sidebarProps
}: ChannelSidebarTreeOwnerProps) {
const tree = useChannelTree(categories)
- useObservedRegion("sidebar", true, viewEvidence(categories))
+ useObservedRegion("sidebar", true, categories.length)
return (
<div
diff --git a/src/web/src/components/community/channels/forum-view.tsx b/src/web/src/components/community/channels/forum-view.tsx
index 46cac45b8..da226e345 100644
--- a/src/web/src/components/community/channels/forum-view.tsx
+++ b/src/web/src/components/community/channels/forum-view.tsx
@@ -1,6 +1,6 @@
"use client"
-import { useObservedRegion, windowEvidence } from "@/lib/observability/regions"
+import { useObservedRegion } from "@/lib/observability/regions"
import { visibleVirtualItems } from "@/lib/observability/virtual-window"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useCallback, useLayoutEffect, useRef } from "react"
@@ -247,7 +247,7 @@ export function ForumView({
initialRect: { width: 0, height: 800 },
})
const observedPosts = visibleVirtualItems(virtualizer).flatMap(item => posts[item.index] ? [posts[item.index]] : [])
- useObservedRegion("forum", (!loading || posts.length > 0) && (!posts.length || observedPosts.length > 0), windowEvidence(observedPosts, posts))
+ useObservedRegion("forum", (!loading || posts.length > 0) && (!posts.length || observedPosts.length > 0), observedPosts.length)
const filterTags = availableTags.length > 0
? availableTags
: [...new Set(posts.flatMap((post) => post.tags))]
diff --git a/src/web/src/components/community/machines/machine-list.tsx b/src/web/src/components/community/machines/machine-list.tsx
index efca0fc84..f4a6d52ae 100644
--- a/src/web/src/components/community/machines/machine-list.tsx
+++ b/src/web/src/components/community/machines/machine-list.tsx
@@ -36,7 +36,6 @@ import { MachineCard, MachineCardFrame } from "./machine-card"
import { PairMachineSheet, type PairMachineSheetMode } from "./pair-machine-sheet"
import { ConnectTile } from "@/components/community/onboarding-tiles/connect-tile"
import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence } from "@/lib/observability/data-source"
import { useMachines, machinesQueryFn, replaceMachines, type MachinesResponse } from "@/hooks/community/use-machines"
import { useBots } from "@/hooks/community/use-bots"
import { usePendingMachineTokenId } from "@/stores/community"
@@ -216,7 +215,7 @@ export function MachineList({ onBack }: { onBack?: () => void } = {}) {
const origin = useCommunityMutationOrigin()
const source = useCommunityViewSource("machine-list")
const { machines, data: machinesData, isLoading: machinesLoading } = useMachines()
- useObservedRegion("machines", machinesData !== undefined && !machinesLoading, viewEvidence(machines))
+ useObservedRegion("machines", machinesData !== undefined && !machinesLoading, machines.length)
const capacity = machinesData?.machineCapacity ?? null
const [limitOpen, setLimitOpen] = useAtom(useCreateAtom(false))
const viewPlan = useCallback(() => {
diff --git a/src/web/src/components/community/members/member-list.tsx b/src/web/src/components/community/members/member-list.tsx
index b4763dd52..d4f9d2bec 100644
--- a/src/web/src/components/community/members/member-list.tsx
+++ b/src/web/src/components/community/members/member-list.tsx
@@ -1,6 +1,4 @@
"use client"
-
-import { useObservedRegion, windowEvidence } from "@/lib/observability/regions"
import { createStore, useSelector } from "@tanstack/react-store"
import { useMutation, useQueryClient } from "@tanstack/react-query"
import { useCommunityViewSource } from "@/hooks/community/use-community-view-source"
@@ -132,7 +130,6 @@ export function MemberList({
onSetRole?: (memberId: string, role: Role) => void
onKick?: (memberId: string, assert?: MemberOriginalView) => Promise<unknown> | void
}) {
- useObservedRegion("members", !loading, windowEvidence(members, members))
const source = useCommunityViewSource("member-list:" + scopeId)
const client = useQueryClient()
const commandKey = ["community", "member-list-command", scopeId]
diff --git a/src/web/src/components/community/messages/attachment-preview-sheet.tsx b/src/web/src/components/community/messages/attachment-preview-sheet.tsx
index 41ed69a9c..d20b5916f 100644
--- a/src/web/src/components/community/messages/attachment-preview-sheet.tsx
+++ b/src/web/src/components/community/messages/attachment-preview-sheet.tsx
@@ -1,6 +1,5 @@
"use client"
-import { useObservedQueryRegion } from "@/lib/observability/query-regions"
import { useQuery } from "@tanstack/react-query"
import { applicationKey, assertApplicationOwner, captureApplicationOwner, useApplicationOwner } from "@/lib/application-owner"
import dynamic from "next/dynamic"
@@ -185,8 +184,6 @@ export function AttachmentPreviewSheet({
: unavailable ? { status: "error", content: null, error: unavailable }
: content.isError ? { status: "error", content: null, error: content.error instanceof Error ? content.error.message : "Couldn’t load this attachment" }
: content.data ?? { status: "loading", content: null, error: null }
-
- useObservedQueryRegion("file_preview", content, undefined, open && preview.status === "ready" && presentation?.previewKind === "text")
const size = selected
? formatAttachmentSize(selected.sizeBytes) || selected.size
: ""
diff --git a/src/web/src/components/community/messages/code-preview.tsx b/src/web/src/components/community/messages/code-preview.tsx
index 4a88aa949..a8245c29e 100644
--- a/src/web/src/components/community/messages/code-preview.tsx
+++ b/src/web/src/components/community/messages/code-preview.tsx
@@ -1,8 +1,5 @@
"use client"
-
-import { useObservedRegion } from "@/lib/observability/regions"
-import { valueEvidence } from "@/lib/observability/data-source"
-import { useQuery, useQueryClient } from "@tanstack/react-query"
+import { useQuery } from "@tanstack/react-query"
import { useCommunityViewSource } from "@/hooks/community/use-community-view-source"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useEffect, useRef, type CSSProperties } from "react"
@@ -97,8 +94,6 @@ export function CodePreview({
},
})
const highlight: CodeHighlightResult = query.data ?? { kind: "plain", lines: null, reason: null }
- const client = useQueryClient()
- useObservedRegion("file_preview", !query.isPending && !query.isError, valueEvidence(client, query.data))
const highlighting = query.isFetching
const [wrap, setWrap] = useAtom(useCreateAtom(false))
const [copyState, setCopyState] = useAtom(useCreateAtom<"idle" | "copied" | "failed">("idle"))
diff --git a/src/web/src/components/community/messages/message-list.tsx b/src/web/src/components/community/messages/message-list.tsx
index 0d75f6ff3..364d68016 100644
--- a/src/web/src/components/community/messages/message-list.tsx
+++ b/src/web/src/components/community/messages/message-list.tsx
@@ -1,9 +1,7 @@
"use client"
import { isConversationAccessError } from "@/lib/community/conversation-read"
-import { useCanonicalProfilesByUserId } from "@/lib/community-db/projections"
-import { mergeEvidence, viewEvidence } from "@/lib/observability/data-source"
-import { useObservedRegion, windowEvidence } from "@/lib/observability/regions"
+import { useObservedRegion } from "@/lib/observability/regions"
import { visibleVirtualItems } from "@/lib/observability/virtual-window"
import { useLayoutEffect } from "react"
import { useMessageListController } from "./message-list-controller"
@@ -29,9 +27,7 @@ export function MessageList({
}
const controller = useMessageListController(resolvedProps)
const visible = visibleVirtualItems(controller.virtualizer).flatMap(item => { const row = controller.items[item.index]; return row?.kind === "message" ? [row.m] : [] })
- const profiles = useCanonicalProfilesByUserId(visible.flatMap(message => [message.authorId, message.replyTo?.authorId].filter((id): id is string => !!id)))
- const evidence = windowEvidence(visible, props.messages)
- useObservedRegion("messages", controller.initialPosition.contentVisible && controller.initialPosition.contentInteractive && !resolvedProps.initialLoadError && (!props.messages.length || visible.length > 0), { ...mergeEvidence([evidence, ...[...profiles.values()].map(viewEvidence)]), count: visible.length })
+ useObservedRegion("messages", controller.initialPosition.contentVisible && controller.initialPosition.contentInteractive && !resolvedProps.initialLoadError && (!props.messages.length || visible.length > 0), visible.length)
const footerSlot = useConversationFooterSlot()
const setSelectionActive = footerSlot?.setSelectionActive
useLayoutEffect(() => {
diff --git a/src/web/src/components/community/messages/pdf-preview.tsx b/src/web/src/components/community/messages/pdf-preview.tsx
index 48093dc2a..136ddf86a 100644
--- a/src/web/src/components/community/messages/pdf-preview.tsx
+++ b/src/web/src/components/community/messages/pdf-preview.tsx
@@ -12,8 +12,6 @@ import {
type PDFPageProxy,
type RenderTask,
} from "pdfjs-dist/legacy/build/pdf.mjs"
-import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence, type Evidence } from "@/lib/observability/data-source"
import { tid } from "@/lib/community/testids"
export const MAX_PDF_CANVAS_PIXELS = 4_000_000
@@ -87,12 +85,10 @@ function PdfPage({
document,
pageNumber,
availableWidth,
- evidence,
}: {
document: PDFDocumentProxy
pageNumber: number
availableWidth: number
- evidence: Evidence
}) {
const containerRef = useRef<HTMLElement>(null)
const canvasRef = useRef<HTMLCanvasElement>(null)
@@ -171,8 +167,6 @@ function PdfPage({
}
}, [availableWidth, document, nearby, pageNumber, setAspectRatio, setStatus])
- useObservedRegion("file_preview", pageNumber === 1 && status === "ready", { ...evidence, count: 1 })
-
return (
<section
ref={containerRef}
@@ -201,7 +195,7 @@ function PdfPage({
)
}
-function PdfPages({ document, evidence }: { document: PDFDocumentProxy; evidence: Evidence }) {
+function PdfPages({ document }: { document: PDFDocumentProxy }) {
const pagesRef = useRef<HTMLDivElement>(null)
const availableWidth = useElementWidth(pagesRef)
@@ -214,7 +208,6 @@ function PdfPages({ document, evidence }: { document: PDFDocumentProxy; evidence
document={document}
pageNumber={index + 1}
availableWidth={availableWidth}
- evidence={evidence}
/>
))}
</div>
@@ -292,7 +285,7 @@ export function PdfPreview({ data }: { data: Uint8Array<ArrayBuffer> }) {
</div>
)}
{state.status === "ready" && (
- <PdfPages document={state.document} evidence={viewEvidence(data)} />
+ <PdfPages document={state.document} />
)}
</div>
)
diff --git a/src/web/src/components/community/messages/thread-opener.tsx b/src/web/src/components/community/messages/thread-opener.tsx
index 2e3a1d78b..e5f08be30 100644
--- a/src/web/src/components/community/messages/thread-opener.tsx
+++ b/src/web/src/components/community/messages/thread-opener.tsx
@@ -1,6 +1,4 @@
"use client"
-import { useObservedRegion } from "@/lib/observability/regions"
-import { mergeEvidence, viewEvidence } from "@/lib/observability/data-source"
import { MessagesSquare, ArrowUpRight } from "lucide-react"
import { Avatar } from "../avatar"
@@ -70,7 +68,6 @@ export function ThreadOpener({
serverId,
})
const authorProfile = useCanonicalCommunityProfile(msg?.authorId)
- useObservedRegion("thread_opener", !isLoading && !isError && !!msg, { ...mergeEvidence([viewEvidence(msg), viewEvidence(authorProfile)]), count: msg ? 1 : 0 })
const mentionText = msg ? resolveAuthorMentionText?.(msg.authorId) ?? null : null
const avatarMention = useMobileAvatarMention({
onMention: mentionText && onInsertMentionText
diff --git a/src/web/src/components/community/settings/server-settings-channels.tsx b/src/web/src/components/community/settings/server-settings-channels.tsx
index 5e65d7a7b..5f8e2a3c0 100644
--- a/src/web/src/components/community/settings/server-settings-channels.tsx
+++ b/src/web/src/components/community/settings/server-settings-channels.tsx
@@ -1,7 +1,6 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence } from "@/lib/observability/data-source"
import { useAtom, useCreateAtom } from "@tanstack/react-store"
import { ChevronDown, Lock } from "lucide-react"
@@ -25,7 +24,7 @@ function groupChannels(channels: AdminChannel[]) {
export function ServerSettingsChannels({ serverId }: { serverId: string }) {
const [collapsed, setCollapsed] = useAtom(useCreateAtom<Set<string>>(new Set<string>()))
const { channels, isError, isFetching, refetch, forbidden } = useServerAdminChannels(serverId, true)
- useObservedRegion("settings", !!channels && !forbidden, { ...viewEvidence(channels), count: channels?.length ?? 0 })
+ useObservedRegion("settings", !!channels && !forbidden, channels?.length ?? 0)
const retry = () => { void refetch() }
if (forbidden) return <p role="alert" className="text-sm text-muted-foreground">Only server administrators can view channels.</p>
diff --git a/src/web/src/components/community/settings/server-settings.tsx b/src/web/src/components/community/settings/server-settings.tsx
index 5f452d6ce..cff1993e7 100644
--- a/src/web/src/components/community/settings/server-settings.tsx
+++ b/src/web/src/components/community/settings/server-settings.tsx
@@ -1,7 +1,6 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence } from "@/lib/observability/data-source"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useEffect, useRef } from "react"
@@ -89,7 +88,7 @@ export function ServerSettings({
// their tab is open, never on settings mount or via WS.
const { invites, isLoading: invitesLoading } = useInvites(serverId, section === "invites")
- useObservedRegion("settings", visibleSection === "members" ? !membersLoading : visibleSection === "invites" ? !invitesLoading : visibleSection !== "channels", visibleSection === "members" ? viewEvidence(members) : visibleSection === "invites" ? viewEvidence(invites) : { source: "unknown", version: "settings_" + visibleSection, freshness: "unknown", count: 1 })
+ useObservedRegion("settings", visibleSection === "members" ? !membersLoading : visibleSection === "invites" ? !invitesLoading : visibleSection !== "channels", visibleSection === "members" ? members.length : visibleSection === "invites" ? invites.length : 1)
const nav: SettingsShellTab<SettingsSection>[] = [
{ value: "overview", label: "Overview", icon: Settings },
diff --git a/src/web/src/components/community/settings/user-settings.tsx b/src/web/src/components/community/settings/user-settings.tsx
index 53018fb49..d8dc0ff72 100644
--- a/src/web/src/components/community/settings/user-settings.tsx
+++ b/src/web/src/components/community/settings/user-settings.tsx
@@ -2,7 +2,6 @@
import type { CommunityProfile } from "@/lib/community/models/people"
import { useObservedRegion } from "@/lib/observability/regions"
-import { useObservedQueryRegion } from "@/lib/observability/query-regions"
import { useAtom, useCreateAtom, useCreateStore } from "@tanstack/react-store";
import { useEffect, useLayoutEffect } from "react"
@@ -91,7 +90,7 @@ export function AdvancedSettings() {
const size = useQuery({ queryKey: CACHE_SIZE_QUERY_KEY, queryFn: ({ signal }) => getPersistedCacheSizeBytes(signal), retry: false, staleTime: 0 })
const clear = useMutation({ meta: { observabilityAction: "cache.clear" }, mutationFn: clearAllPersistedCaches })
const clearing = clear.isPending
- useObservedQueryRegion("settings", size, 1)
+ useObservedRegion("settings", !size.isPending && size.data !== undefined, 1)
const cacheSize = size.isPending ? "loading" : size.isError ? "unavailable" : size.data
const view = useCreateStore({ active: true, generation: 0 })
const webVersion = process.env.NEXT_PUBLIC_APP_VERSION
@@ -209,7 +208,7 @@ export function UserSettings({ initialTab = "profile", billingReturn = null, onC
useEffect(() => { setTab(initialTab) }, [initialTab, setTab])
const billing = useBilling(billingReturn, tab === "billing")
const [deletionOpen, setDeletionOpen] = useAtom(useCreateAtom(false))
- useObservedRegion("settings", tab !== "billing" && tab !== "advanced", { source: "unknown", version: "settings_" + tab, freshness: "unknown", count: 1 })
+ useObservedRegion("settings", tab !== "billing" && tab !== "advanced", 1)
const dirty =
name !== baseline.name ||
diff --git a/src/web/src/components/community/shell/community-inbox-popover.tsx b/src/web/src/components/community/shell/community-inbox-popover.tsx
index 73ba4be69..3e5bbc60d 100644
--- a/src/web/src/components/community/shell/community-inbox-popover.tsx
+++ b/src/web/src/components/community/shell/community-inbox-popover.tsx
@@ -1,5 +1,4 @@
-import { useObservedRegion } from "@/lib/observability/regions"
-import { mergeEvidence, viewEvidence } from "@/lib/observability/data-source"
+
import { Bookmark, Check, ChevronRight, Inbox, LoaderCircle, MoreHorizontal, Trash2, X } from "lucide-react"
import { stripInlineMarkup } from "@alook/shared"
import { EntityIcon } from "../entity-icon"
@@ -144,7 +143,6 @@ function UnreadsTab({ friendRequests, servers, dms, loading, error, onRetry, onO
getScrollOffset?: (tab: InboxTab) => number
onScrollOffsetChange?: (tab: InboxTab, scrollTop: number) => void
}) {
- useObservedRegion("inbox", !loading && !error, { ...mergeEvidence([viewEvidence(servers), viewEvidence(dms), viewEvidence(friendRequests)]), count: servers.length + dms.length + friendRequests.length })
const visibleDms = dms
const visibleServers = servers.map((server) => ({
server,
@@ -314,7 +312,6 @@ function MentionsTab({ mentions, loading, error, onRetry, onOpenMention, onDelet
getScrollOffset?: (tab: InboxTab) => number
onScrollOffsetChange?: (tab: InboxTab, scrollTop: number) => void
}) {
- useObservedRegion("inbox", !loading && !error, viewEvidence(mentions))
const visibleMentions = mentions
return (
<InboxScrollBody tab="mentions" getScrollOffset={getScrollOffset} onScrollOffsetChange={onScrollOffsetChange}>
@@ -380,7 +377,6 @@ function MarkedTab({ marked, loading, onOpenMarked, onUnmark, profilesByUserId,
getScrollOffset?: (tab: InboxTab) => number
onScrollOffsetChange?: (tab: InboxTab, scrollTop: number) => void
}) {
- useObservedRegion("inbox", !loading, viewEvidence(marked))
return (
<InboxScrollBody tab="marked" getScrollOffset={getScrollOffset} onScrollOffsetChange={onScrollOffsetChange}>
{loading && marked.length === 0 && <InboxRowsSkeleton />}
diff --git a/src/web/src/components/community/shell/community-navigation-link.tsx b/src/web/src/components/community/shell/community-navigation-link.tsx
index 95a1e561e..1e7623523 100644
--- a/src/web/src/components/community/shell/community-navigation-link.tsx
+++ b/src/web/src/components/community/shell/community-navigation-link.tsx
@@ -4,6 +4,8 @@ import Link from "next/link"
import { useLayoutEffect, type ComponentProps } from "react"
import { createStore, useAtom, useCreateAtom, useSelector } from "@tanstack/react-store"
import { useOptionalCommunityDbRegistry } from "@/lib/community-db/projections"
+import { prepareNavigationMetadata } from "@/lib/community/navigation-metadata"
+import { beginNavigationPrefetch } from "@/lib/observability/context"
const absentLifecycle = createStore({ active: true, generation: 0 })
@@ -29,7 +31,11 @@ export function CommunityNavigationLink({
useLayoutEffect(() => { setIntent(null) }, [href, registry, lifecycle.generation, setIntent])
const enabled = lifecycle.active && !navigationDisabled
const warm = () => {
- if (enabled && !active) setIntent({ href, registry, generation: lifecycle.generation })
+ if (enabled && !active) {
+ beginNavigationPrefetch(href)
+ if (registry) void prepareNavigationMetadata(registry.queryClient, href, "prefetch")
+ setIntent({ href, registry, generation: lifecycle.generation })
+ }
}
const prefetched = enabled && !active && (prefetchMode === "visible"
|| (intent?.href === href && intent.registry === registry && intent.generation === lifecycle.generation))
diff --git a/src/web/src/components/community/shell/dm-sidebar-slot.tsx b/src/web/src/components/community/shell/dm-sidebar-slot.tsx
index fb48e195c..60d2df5e1 100644
--- a/src/web/src/components/community/shell/dm-sidebar-slot.tsx
+++ b/src/web/src/components/community/shell/dm-sidebar-slot.tsx
@@ -1,6 +1,5 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence, mergeEvidence } from "@/lib/observability/data-source"
import { useCommunityRuntime } from "@/stores/community/runtime"
@@ -29,7 +28,7 @@ function MeSidebar() {
isLoading: dmsLoading,
} = useDms()
const { blocked } = useFriends()
- useObservedRegion("sidebar", !dmsLoading, { ...mergeEvidence([viewEvidence(dms), viewEvidence(blocked)]), count: dms.length })
+ useObservedRegion("sidebar", !dmsLoading, dms.length)
const friendRequestCount = useInboxUnreads().friendRequests.length
const currentChannelId = useCurrentChannelId()
diff --git a/src/web/src/components/community/shell/server-rail.tsx b/src/web/src/components/community/shell/server-rail.tsx
index 1b41cd71b..c4a58a753 100644
--- a/src/web/src/components/community/shell/server-rail.tsx
+++ b/src/web/src/components/community/shell/server-rail.tsx
@@ -1,7 +1,4 @@
"use client"
-
-import { useObservedRegion } from "@/lib/observability/regions"
-import { viewEvidence, mergeEvidence } from "@/lib/observability/data-source"
import { useCommunityRuntime } from "@/stores/community/runtime"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
@@ -144,7 +141,6 @@ export const ServerRail = memo(function ServerRail({
onOpenSettings?: (serverId: string) => void
onOpenInvitePopover?: (serverId: string) => void
}) {
- useObservedRegion("rail", !serversLoading, { ...mergeEvidence([viewEvidence(servers), viewEvidence(folders)]), count: servers.length + folders.length })
const expandedAtom = useCreateAtom<string[]>([])
const [expanded, setExpanded] = useAtom(expandedAtom)
const collapsedAtom = useCreateAtom(new Set<string>())
diff --git a/src/web/src/components/community/shell/server-sidebar-slot.tsx b/src/web/src/components/community/shell/server-sidebar-slot.tsx
index 000526c0f..b496331f2 100644
--- a/src/web/src/components/community/shell/server-sidebar-slot.tsx
+++ b/src/web/src/components/community/shell/server-sidebar-slot.tsx
@@ -1,5 +1,4 @@
"use client"
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { useAtom, useCreateAtom, useSelector } from "@tanstack/react-store";
import { getCommunityRuntime } from "@/stores/community/runtime"
@@ -363,7 +362,6 @@ function ServerSidebar({ serverId }: { serverId: string }) {
: { ...channel, unread: forumSidebar.parentUnread[channel.id] },
),
})), [forumSidebar.parentUnread, sidebarCategories])
- deriveView(categories, [viewEvidence(sidebarCategories), viewEvidence(forumSidebar.threads)])
const sidebarDataReady = Boolean(currentServer)
const channelTreeScopeKey = `server:${serverId}`
diff --git a/src/web/src/components/community/shell/use-community-navigation-controller.ts b/src/web/src/components/community/shell/use-community-navigation-controller.ts
index 5f1cd8ccc..c4f741490 100644
--- a/src/web/src/components/community/shell/use-community-navigation-controller.ts
+++ b/src/web/src/components/community/shell/use-community-navigation-controller.ts
@@ -1,6 +1,7 @@
"use client"
import { beginNavigation, navigationNoop } from "@/lib/observability/context"
+import { prepareNavigationMetadata } from "@/lib/community/navigation-metadata"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { useCallback, useEffect, useLayoutEffect, useRef } from "react"
@@ -96,6 +97,7 @@ export function useCommunityNavigationController(
const push = useCallback((href: string) => {
if (href === publishedHref && !navigationPending) { navigationNoop(href); return }
beginNavigation(href)
+ void prepareNavigationMetadata(queryClient, href, "foreground")
supersedeNavigationIntent(gateRef.current)
cancelActiveConversationNavigationProof(queryClient)
pendingBaselineRevisionRef.current = committedFrame.revision
@@ -113,6 +115,7 @@ export function useCommunityNavigationController(
const pushImmediate = useCallback((href: string) => {
if (href === publishedHref && !navigationPending) { navigationNoop(href); return }
beginNavigation(href)
+ void prepareNavigationMetadata(queryClient, href, "foreground")
supersedeNavigationIntent(gateRef.current)
pendingBaselineRevisionRef.current = committedFrame.revision
pendingBaselineLeafRef.current = committedFrame.leafKey
@@ -123,11 +126,12 @@ export function useCommunityNavigationController(
setPendingHref(href)
})
router.push(href)
- }, [committedFrame.leafKey, committedFrame.revision, navigationPending, publishedHref, router, setNavigationPending, setPendingHref])
+ }, [committedFrame.leafKey, committedFrame.revision, navigationPending, publishedHref, queryClient, router, setNavigationPending, setPendingHref])
const replace = useCallback((href: string) => {
if (href === publishedHref && !navigationPending) { navigationNoop(href); return }
beginNavigation(href)
+ void prepareNavigationMetadata(queryClient, href, "foreground")
supersedeNavigationIntent(gateRef.current)
cancelActiveConversationNavigationProof(queryClient)
pendingBaselineRevisionRef.current = committedFrame.revision
@@ -151,6 +155,7 @@ export function useCommunityNavigationController(
return
}
beginNavigation(href)
+ void prepareNavigationMetadata(queryClient, href, "foreground")
setPendingHref(href)
router.push(href)
})
diff --git a/src/web/src/components/community/social/friends-page.tsx b/src/web/src/components/community/social/friends-page.tsx
index e8ed37eb6..0fd3632e3 100644
--- a/src/web/src/components/community/social/friends-page.tsx
+++ b/src/web/src/components/community/social/friends-page.tsx
@@ -1,6 +1,5 @@
"use client"
import { useObservedRegion } from "@/lib/observability/regions"
-import { mergeEvidence, viewEvidence } from "@/lib/observability/data-source"
import { getCommunityDbRegistry } from "@/lib/community-db/collections"
import { useQuery, useQueryClient } from "@tanstack/react-query"
@@ -69,7 +68,7 @@ export function FriendsPage({
onBlock?: (id: string) => void
onDm?: (userId: string) => void
}) {
- useObservedRegion("friends", !loading, { ...mergeEvidence([viewEvidence(friends), viewEvidence(pending), viewEvidence(blocked)]), count: friends.length + pending.length + blocked.length })
+ useObservedRegion("friends", !loading, friends.length + pending.length + blocked.length)
const profileQueryClient = useQueryClient()
const [filter, setFilter] = useAtom(useCreateAtom(""))
const filteredFriends = useMemo(() => {
diff --git a/src/web/src/hooks/community/channel-metadata.ts b/src/web/src/hooks/community/channel-metadata.ts
index b6e6aef35..a0bfa38ac 100644
--- a/src/web/src/hooks/community/channel-metadata.ts
+++ b/src/web/src/hooks/community/channel-metadata.ts
@@ -1,4 +1,4 @@
-import { apiFetch } from "@/lib/api/client"
+import { apiFetch, type ApiRequestOptions } from "@/lib/api/client"
import { queryOptions, type QueryClient } from "@tanstack/react-query"
import { communityKeys } from "@/lib/query-keys"
import { retryConversationRead, withConversationReadDeadline } from "@/lib/community/conversation-read"
@@ -33,6 +33,7 @@ export async function fetchChannelMetadata(
channelId: string,
signal?: AbortSignal,
token = captureChannelMetadataToken(queryClient, channelId),
+ observation?: ApiRequestOptions["observation"],
) {
return withConversationReadDeadline(signal, async (readSignal) => {
const queryKey = communityKeys.channelMeta(serverId, channelId)
@@ -48,7 +49,7 @@ export async function fetchChannelMetadata(
assertActive()
let meta: ChannelMetadata
try {
- const response = await apiFetch<ChannelMetadata>(`/api/community/channels/${encodeURIComponent(channelId)}`, communityRequestOptions(queryClient, token, readSignal, assertActive))
+ const response = await apiFetch<ChannelMetadata>(`/api/community/channels/${encodeURIComponent(channelId)}`, { ...communityRequestOptions(queryClient, token, readSignal, assertActive), ...(observation && { observation }) })
meta = { ...response, ...normalizeCommunityChannelIdentity(response) }
assertActive()
} catch (error) {
@@ -71,13 +72,13 @@ export async function fetchChannelMetadata(
})
}
-export function channelMetadataOptions(queryClient: QueryClient, serverId: string | null, channelId: string) {
+export function channelMetadataOptions(queryClient: QueryClient, serverId: string | null, channelId: string, observation?: ApiRequestOptions["observation"]) {
const queryKey = communityKeys.channelMeta(serverId, channelId)
return queryOptions({
queryKey,
queryFn: async ({ signal }): Promise<ChannelMetadataResource> => {
const token = captureChannelMetadataToken(queryClient, channelId)
- const metadata = await fetchChannelMetadata(queryClient, serverId, channelId, signal, token)
+ const metadata = await fetchChannelMetadata(queryClient, serverId, channelId, signal, token, observation)
publishCommunityChannelMetadata(queryClient, { metadata, proof: { token, signal } })
const canRead = !metadata.archived && metadata.accessDecision?.canRead !== false
if (!canRead) retireCommunityChannelReading(token.registry!, channelId, { reason: "read-denied", serverId, preserveQuery: queryClient.getQueryCache().find({ queryKey, exact: true }) })
diff --git a/src/web/src/hooks/community/community-ws/registry.ts b/src/web/src/hooks/community/community-ws/registry.ts
index c7625c036..2e9866a38 100644
--- a/src/web/src/hooks/community/community-ws/registry.ts
+++ b/src/web/src/hooks/community/community-ws/registry.ts
@@ -1,7 +1,6 @@
import { getCommunityRuntime } from "@/stores/community/runtime"
import { telemetryId } from "@/lib/observability/context"
-import { withSource } from "@/lib/observability/data-source"
import { emitTelemetry } from "@/lib/observability/telemetry"
import type { CommunityWsEvent } from "@alook/shared"
@@ -168,7 +167,7 @@ export function dispatchCommunityWsEvents(
})
}
const receipts: Array<{ id: string; start: number; type: CommunityEventType }> = []
- try { withSource(context.queryClient, "ws", () => runCommunityWsProjectionTransaction(context.queryClient, (projection) => {
+ try { runCommunityWsProjectionTransaction(context.queryClient, (projection) => {
const handlerContext: CommunityWsHandlerContext = {
...context,
projection,
@@ -189,10 +188,8 @@ export function dispatchCommunityWsEvents(
const entry = communityWsRegistry[event.type] as RegistryEntry<typeof event.type>
const receipt = { id: telemetryId(), start: performance.now(), type: event.type }
receipts.push(receipt)
- withSource(context.queryClient, "ws", () => {
- entry.handler(event, handlerContext)
- if (event.type !== "community:message.create") projectCommunityWsEventToDb(context.queryClient, event)
- }, receipt)
+ entry.handler(event, handlerContext)
+ if (event.type !== "community:message.create") projectCommunityWsEventToDb(context.queryClient, event)
if ([
"community:server.delete",
"community:channel.delete",
@@ -202,7 +199,7 @@ export function dispatchCommunityWsEvents(
scheduleAccountAttentionReconcile(context.queryClient)
}
}
- })) } catch (error) {
+ }) } catch (error) {
for (const receipt of receipts) emitTelemetry("ws.event_applied", { ws_event_id: receipt.id, event_type: receipt.type, duration_ms: performance.now() - receipt.start, source: "ws", outcome: "partial", eligibility: "unknown" })
throw error
}
diff --git a/src/web/src/hooks/community/observability-consumers.dom.test.tsx b/src/web/src/hooks/community/observability-consumers.dom.test.tsx
index 995601a9b..725e86e41 100644
--- a/src/web/src/hooks/community/observability-consumers.dom.test.tsx
+++ b/src/web/src/hooks/community/observability-consumers.dom.test.tsx
@@ -11,13 +11,12 @@ import { useUploadUserAvatar } from "./mutations/profile"
import { useJoinServer } from "./mutations/servers"
import { useSetBotNotificationSetting } from "./use-notification-settings"
import { communityKeys } from "@/lib/query-keys"
-import { tagValue, viewEvidence } from "@/lib/observability/data-source"
import { configureTelemetry, retireTelemetry } from "@/lib/observability/telemetry"
const api = vi.fn()
vi.mock("@/lib/api/client", () => ({ apiFetch: (...args: unknown[]) => api(...args), toastApiError: vi.fn() }))
beforeEach(() => { api.mockReset() })
-it("projects the native machines query and retains its actual cache evidence", async () => {
+it("projects the native machines query and retains its original cache values", async () => {
const { client, registry } = await createCommunityQueryOwner()
const wrapper = ({ children }: PropsWithChildren) => createElement(CommunityTestProvider, { client, registry }, children)
configureTelemetry({ session_id: "machines-session" }, true)
@@ -25,10 +24,8 @@ it("projects the native machines query and retains its actual cache evidence", a
const rendered = renderHook(() => useMachines({ enabled: false }), { wrapper })
expect(rendered.result.current.machines).toEqual([])
const data = { machines: [{ id: "machine-a", hostname: "host" }] }
- tagValue(client, data, "network")
act(() => client.setQueryData(communityKeys.machines(), data))
await waitFor(() => expect(rendered.result.current.machines).toBe(data.machines))
- expect(viewEvidence(rendered.result.current.machines).source).toBe("network")
expect(api).not.toHaveBeenCalled()
rendered.unmount()
} finally { retireTelemetry() }
diff --git a/src/web/src/hooks/community/use-billing.ts b/src/web/src/hooks/community/use-billing.ts
index 072ae1686..dcbd96e97 100644
--- a/src/web/src/hooks/community/use-billing.ts
+++ b/src/web/src/hooks/community/use-billing.ts
@@ -1,6 +1,6 @@
"use client"
-import { useObservedQueryRegion } from "@/lib/observability/query-regions"
+import { useObservedRegion } from "@/lib/observability/regions"
import { emitTelemetry } from "@/lib/observability/telemetry"
import { useEffect, useLayoutEffect, useCallback, useMemo } from "react"
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"
@@ -73,7 +73,7 @@ export function useBilling(returnFrom: BillingReturn = null, enabled = false, ap
staleTime: 30_000, refetchOnWindowFocus: true,
refetchInterval: state.polling ? 2_000 : false, retry: false,
})
- useObservedQueryRegion("billing", query, undefined, enabled)
+ useObservedRegion("billing", (enabled) && !query.isPending && query.data !== undefined, undefined)
const invalidateDependents = useCallback(() => {
if (!registry) return
void qc.invalidateQueries({ queryKey: communityKeys.bots() })
diff --git a/src/web/src/hooks/community/use-bots.ts b/src/web/src/hooks/community/use-bots.ts
index b066805b7..24f5ac0a0 100644
--- a/src/web/src/hooks/community/use-bots.ts
+++ b/src/web/src/hooks/community/use-bots.ts
@@ -1,6 +1,4 @@
"use client"
-
-import { deriveView, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
import { resolveActionName } from "@/lib/observability/actions"
import { useQuery,useMutation,useQueryClient,type UseQueryResult,type Query,type QueryKey,type MutateOptions } from "@tanstack/react-query"
import type { ApiRequestOptions } from "@/lib/api/client"
@@ -86,7 +84,6 @@ function botProfilePatch(bot: Pick<BotSummary, "id" | "name" | "image" | "avatar
}
export function useBots(): UseQueryResult<BotsResourceResponse> & { bots: BotSummary[] } {
- const queryClient = useQueryClient()
const query = useQuery({
queryKey: communityKeys.bots(),
queryFn: async ({ client, signal }): Promise<BotsResourceResponse> => {
@@ -97,9 +94,8 @@ export function useBots(): UseQueryResult<BotsResourceResponse> & { bots: BotSum
const profiles = useCanonicalProfilesByUserId(query.data?.bots.map((bot) => bot.id) ?? [])
const bots = useMemo(() => (query.data?.bots ?? []).map((bot) => {
const profile = readCommunityProfile(profiles.get(bot.id), bot.id)
- return deriveView({ ...bot, name: profile.name, description: profile.aboutMe, image: profile.avatar, avatarVersion: profile.avatarVersion, presence: profile.presence }, [valueEvidence(queryClient, query.data), viewEvidence(profile)])
- }), [profiles, query.data, queryClient])
- deriveView(bots, [valueEvidence(queryClient, query.data), ...bots.map(viewEvidence)])
+ return { ...bot, name: profile.name, description: profile.aboutMe, image: profile.avatar, avatarVersion: profile.avatarVersion, presence: profile.presence }
+ }), [profiles, query.data])
return { ...query, bots }
}
diff --git a/src/web/src/hooks/community/use-channel-members.ts b/src/web/src/hooks/community/use-channel-members.ts
index 268a6dcb3..709cfb719 100644
--- a/src/web/src/hooks/community/use-channel-members.ts
+++ b/src/web/src/hooks/community/use-channel-members.ts
@@ -1,7 +1,5 @@
"use client"
-import { deriveView, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
-
import { useNativeMutationFacade } from "@/hooks/use-native-mutation-facade"
import { useCallback,useMemo } from "react"
@@ -110,16 +108,14 @@ export function useChannelMembers(channelId: string, enabled = true, serverId?:
const member = byUser.get(participant.userId)
if (query.data?.serverId !== null && !member?.memberId) return []
const profile = readCommunityProfile(profiles.get(participant.userId), participant.userId)
- return [deriveView({ id: member?.memberId ?? participant.userId, userId: participant.userId, name: member?.nickname ?? profile.name, discriminator: profile.discriminator, avatar: profile.avatar, avatarVersion: profile.avatarVersion, role: member ? member.role as CommunityRole : null, sub: "", status: member?.viewer ? "online" : profile.presence, statusEmoji: profile.statusEmoji ?? null, statusText: profile.statusText ?? "", source: participant.source ?? "explicit", isCreator: participant.isCreator ?? false }, [viewEvidence(member), viewEvidence(participant), viewEvidence(profile)])]
+ return [{ id: member?.memberId ?? participant.userId, userId: participant.userId, name: member?.nickname ?? profile.name, discriminator: profile.discriminator, avatar: profile.avatar, avatarVersion: profile.avatarVersion, role: member ? member.role as CommunityRole : null, sub: "", status: member?.viewer ? "online" : profile.presence, statusEmoji: profile.statusEmoji ?? null, statusText: profile.statusText ?? "", source: participant.source ?? "explicit", isCreator: participant.isCreator ?? false }]
})
}, [profiles, memberships, roster, query.data?.serverId])
- deriveView(members, [valueEvidence(client, query.data), ...members.map(viewEvidence)], members.length)
const data = useMemo(() => query.data ? { members } : undefined, [query.data, members])
return { ...query, data, members } as UseQueryResult<{ members: ChannelMember[] }> & { members: ChannelMember[] }
}
export function useAddableMembers(serverId: string, channelId: string, enabled = true): UseQueryResult<{ members: AddableMember[] }> & { members: AddableMember[] } {
- const client = useQueryClient()
const active = enabled && !!serverId && !!channelId
const query = useQuery({ queryKey: communityKeys.channelAddableMembers(channelId), queryFn: (context) => addableMembersQueryFn(serverId, channelId, context), enabled: active, subscribed: active })
const ids = useMemo(() => query.data?.members ?? [], [query.data?.members])
@@ -136,7 +132,6 @@ export function useAddableMembers(serverId: string, channelId: string, enabled =
return [{ userId: identity.userId, name: member.nickname ?? profile.name, discriminator: profile.discriminator, avatar: profile.avatar, avatarVersion: profile.avatarVersion }]
})
}, [ids, profiles, memberships, roster])
- deriveView(members, [valueEvidence(client, query.data), ...members.map(viewEvidence)], members.length)
const data = useMemo(() => query.data ? { members } : undefined, [query.data, members])
return { ...query, data, members } as UseQueryResult<{ members: AddableMember[] }> & { members: AddableMember[] }
}
diff --git a/src/web/src/hooks/community/use-channel-metadata.dom.test.ts b/src/web/src/hooks/community/use-channel-metadata.dom.test.ts
index 437b898b1..f19319ad1 100644
--- a/src/web/src/hooks/community/use-channel-metadata.dom.test.ts
+++ b/src/web/src/hooks/community/use-channel-metadata.dom.test.ts
@@ -8,6 +8,8 @@ import { createCommunityDbRegistry, registerCommunityDbRegistry, type CommunityD
import { CommunityDbProvider, useDmProjection } from "@/lib/community-db/projections"
import { applyCommunityDmBlockAccess, assertCommunityLiveSnapshotTokenCurrent, publishCommunityMessages, captureCommunityLiveSnapshotToken, ingestDms, publishCommunityLiveSnapshot } from "@/lib/community-db/sync"
import { channelMetadataOptions, captureChannelMetadataToken, isChannelMetadataTokenCurrent } from "./channel-metadata"
+import { prepareNavigationMetadata } from "@/lib/community/navigation-metadata"
+import { retireCommunityAccount } from "@/lib/community/account-cache-lifecycle"
import { useChannelMetadata } from "./use-channel-metadata"
import { useDmReadStateSnapshot } from "./use-dm-read-state"
import { startConversationNavigationWarmup } from "@/lib/community/conversation-navigation-warmup"
@@ -594,3 +596,51 @@ it("retires a protected archived channel and clears its exact flat navigation me
expect(client.getQueryData(communityKeys.channelMeta("server-1", post.id))).toMatchObject({ id: post.id })
route.unmount()
})
+
+
+describe("navigation intent metadata with the real account Provider", () => {
+ it("joins the route to one native Query before commit without entry, messages or read work", async () => {
+ const { client, registry, wrapper } = await fixture()
+ ingestDms(registry, dms)
+ const request = deferred<typeof metadata>()
+ apiFetch.mockReturnValue(request.promise)
+ const warming = prepareNavigationMetadata(client, "/c/me/dm-a", "prefetch")
+ await waitFor(() => expect(apiFetch).toHaveBeenCalledOnce())
+ const mounted = renderHook(() => useChannelMetadata(null, metadata.id), { wrapper })
+ expect(mounted.result.current.canRead).toBe(false)
+ expect(apiFetch).toHaveBeenCalledOnce()
+ await act(async () => { request.resolve(metadata); await warming })
+ await waitFor(() => expect(mounted.result.current.canRead).toBe(true))
+ expect(apiFetch.mock.calls.map(([path]) => path)).toEqual(["/api/community/channels/dm-a"])
+ expect(registry.collections.readStates.size).toBe(0)
+ expect(registry.collections.messages.size).toBe(0)
+ mounted.unmount()
+ })
+
+ it("does not warm unknown, archived, other-scope or blocked identities", async () => {
+ const { client, registry } = await fixture()
+ ingestDms(registry, dms)
+ for (const href of ["/c/me/unknown", "/c/channels/other/dm-a", "https://outside.test/c/me/dm-a"]) {
+ expect(prepareNavigationMetadata(client, href, "prefetch")).toBeUndefined()
+ }
+ applyCommunityDmBlockAccess(registry, "peer", true)
+ expect(prepareNavigationMetadata(client, "/c/me/dm-a", "prefetch")).toBeUndefined()
+ expect(apiFetch).not.toHaveBeenCalled()
+ })
+
+ it("keeps a late intent response retired after account logout", async () => {
+ const { client, registry } = await fixture()
+ ingestDms(registry, dms)
+ const before = registry.collections.channels.get(metadata.id)
+ const request = deferred<typeof metadata>()
+ apiFetch.mockReturnValue(request.promise)
+ const warming = prepareNavigationMetadata(client, "/c/me/dm-a", "prefetch")
+ await waitFor(() => expect(apiFetch).toHaveBeenCalledOnce())
+ retireCommunityAccount(registry)
+ request.resolve(metadata)
+ await warming
+ expect(client.getQueryData(metadataKey)).toBeUndefined()
+ expect(registry.collections.channels.get(metadata.id)).toEqual(before)
+ expect(prepareNavigationMetadata(client, "/c/me/dm-a", "foreground")).toBeUndefined()
+ })
+})
diff --git a/src/web/src/hooks/community/use-dms.ts b/src/web/src/hooks/community/use-dms.ts
index 48fdbb529..569fb7dca 100644
--- a/src/web/src/hooks/community/use-dms.ts
+++ b/src/web/src/hooks/community/use-dms.ts
@@ -1,6 +1,4 @@
"use client"
-
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { getCommunityDbRegistry } from "@/lib/community-db/collections"
@@ -146,7 +144,6 @@ export function useDms(enabled = true): UseQueryResult<{ ids: string[] }> & { dm
}
}))
}, [attentionScopes, dbDms, profilesByUserId])
- deriveView(dms, [viewEvidence(dbDms), viewEvidence(attentionScopes), ...dms.map(dm => viewEvidence(profilesByUserId.get(dm.userId)))])
return {
...query,
dms,
diff --git a/src/web/src/hooks/community/use-forum-feed.ts b/src/web/src/hooks/community/use-forum-feed.ts
index b5ee1a878..62d9c84ca 100644
--- a/src/web/src/hooks/community/use-forum-feed.ts
+++ b/src/web/src/hooks/community/use-forum-feed.ts
@@ -1,6 +1,4 @@
"use client"
-
-import { deriveView, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
import { useCallback, useEffect, useMemo } from "react"
import { createStore, useAtom, useCreateAtom } from "@tanstack/react-store"
import { useInfiniteQuery, useIsMutating, useQueryClient, type Query } from "@tanstack/react-query"
@@ -78,12 +76,12 @@ export function mapForumFeedPages(pages: ForumFeedPage[], messages: ReadonlyMap<
if (byId.has(window.id)) continue
const thread = channels.get(window.id), opener = window.openerMessageId ? messages.get(window.openerMessageId) : undefined
if (!thread || !opener || thread.parentMessageId !== opener.id || !forumFeedMatchesTags(filter, thread.tags)) continue
- byId.set(thread.id, deriveView({
+ byId.set(thread.id, {
...projectThread(thread, opener, "forum"), authorId: opener.authorId ?? thread.creatorId ?? "",
authorAvatar: opener.authorAvatar ?? avatarInitial(opener.authorName ?? ""), authorAvatarVersion: opener.authorAvatarVersion ?? 0,
openerMessageId: opener.id, ...(opener.createdAt === undefined ? {} : { openerCreatedAt: opener.createdAt }), tags: thread.tags, preview: thread.preview ?? "",
participants: window.participantIds.map((id) => { const profile = readCommunityProfile(profiles.get(id), id); return { id, name: profile.name, avatar: profile.avatar, avatarVersion: profile.avatarVersion } }), participantCount: thread.participantCount ?? 0,
- }, [viewEvidence(thread), viewEvidence(opener), ...window.participantIds.map(id => viewEvidence(profiles.get(id)))]))
+ })
}
return [...byId.values()].sort((a, b) => compareAsciiSqliteBinary(channels.get(b.id)?.createdAt ?? "", channels.get(a.id)?.createdAt ?? "") || compareAsciiSqliteBinary(b.id, a.id))
}
@@ -107,6 +105,5 @@ export function useForumFeed(serverId: string, channelId: string) {
const messageIds = useMemo(() => [...new Set(query.data?.pages.flatMap((page) => page.threads.flatMap((thread) => thread.openerMessageId ? [thread.openerMessageId] : [])) ?? [])], [query.data?.pages])
const messages = useCanonicalMessagesById(messageIds)
const posts = useMemo(() => mapForumFeedPages(query.data?.pages ?? [], messages ?? new Map(), channels, profiles, selectedTag), [query.data?.pages, messages, channels, profiles, selectedTag])
- deriveView(posts, [valueEvidence(queryClient, query.data), ...posts.map(viewEvidence)], posts.length)
return { ...query, posts, tag, selectTag, availableTags: tagsQuery.data?.tags ?? [], hasMoreOlder: query.hasNextPage, isFetchingOlder: query.isFetchingNextPage, fetchOlder: () => { void query.fetchNextPage() } }
}
diff --git a/src/web/src/hooks/community/use-forum-sidebar-threads.ts b/src/web/src/hooks/community/use-forum-sidebar-threads.ts
index 42ac3df38..45b6f02c8 100644
--- a/src/web/src/hooks/community/use-forum-sidebar-threads.ts
+++ b/src/web/src/hooks/community/use-forum-sidebar-threads.ts
@@ -1,5 +1,4 @@
"use client"
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { useAtom,useCreateAtom } from "@tanstack/react-store"
import { useTrustedRestoredForumProjection } from "@/lib/community-db/projections"
import { getCommunityRuntime } from "@/stores/community/runtime"
@@ -610,8 +609,6 @@ export function useForumSidebarThreads(
)
return () => globalThis.clearTimeout(timeout)
}, [projection.threads, retainId, serverNowMs, setClockNowMs])
-
- deriveView(projection.threads, [viewEvidence(canonical?.threads), viewEvidence(attentionScopes)])
return {
...query,
threads: projection.threads,
diff --git a/src/web/src/hooks/community/use-friends.ts b/src/web/src/hooks/community/use-friends.ts
index c4c49c557..eae1d1f4f 100644
--- a/src/web/src/hooks/community/use-friends.ts
+++ b/src/web/src/hooks/community/use-friends.ts
@@ -1,10 +1,8 @@
"use client"
-
-import { collectionEvidence, deriveView, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
import { getCommunityDbRegistry } from "@/lib/community-db/collections"
import type { QueryFunctionContext } from "@tanstack/react-query"
-import { useQueryClient, useQuery, keepPreviousData, type UseQueryResult } from "@tanstack/react-query"
+import { useQuery, keepPreviousData, type UseQueryResult } from "@tanstack/react-query"
import { useMemo } from "react"
import { apiFetch } from "@/lib/api/client"
import {
@@ -109,8 +107,6 @@ export function useFriends(): UseQueryResult<{ ids: string[] }> & {
pending: PendingRequest[]
blocked: BlockedUser[]
} {
- const client = useQueryClient()
- const registry = getCommunityDbRegistry(client)
const query = useQuery({
queryKey: communityKeys.friends(),
queryFn: friendsQueryFn,
@@ -129,10 +125,6 @@ export function useFriends(): UseQueryResult<{ ids: string[] }> & {
}
return { friends, pending, blocked }
}, [rows, profilesByUserId, query.data?.ids])
- const evidence = [valueEvidence(client, query.data), ...(registry ? [collectionEvidence(client, "friendships", rows.map(row => row.id), rows)] : []), ...rows.map(row => viewEvidence(profilesByUserId.get(row.userId)))]
- deriveView(friends, evidence)
- deriveView(pending, evidence)
- deriveView(blocked, evidence)
return { ...query, friends, pending, blocked }
}
diff --git a/src/web/src/hooks/community/use-inbox.ts b/src/web/src/hooks/community/use-inbox.ts
index 8f56df8e0..3644931df 100644
--- a/src/web/src/hooks/community/use-inbox.ts
+++ b/src/web/src/hooks/community/use-inbox.ts
@@ -1,8 +1,5 @@
"use client"
import { useSelector } from "@tanstack/react-store"
-
-
-import { deriveView, viewEvidence, valueEvidence } from "@/lib/observability/data-source"
import { useMemo } from "react"
import {
keepPreviousData,
@@ -248,9 +245,7 @@ export function useInboxAttention() {
for (const mention of mentions) conversations.add(mention.channelId ?? mention.id)
const exactAttentionCount = conversations.size + friendRequests.length
- const inputs = [viewEvidence(query.scopes), viewEvidence(query.items), ...query.scopes.flatMap(scope => [viewEvidence(channelsById.get(scope.channelId)), viewEvidence(serversById.get(scope.serverId ?? ""))]), ...mentions.map(row => viewEvidence(messagesById?.get(row.m.id)))]
- for (const values of [servers, dms, mentions, friendRequests]) deriveView(values, inputs, values.length)
- return deriveView({ servers, dms, mentions, friendRequests, exactAttentionCount }, inputs, exactAttentionCount)
+ return { servers, dms, mentions, friendRequests, exactAttentionCount }
}, [
channelsById,
dmProjection,
@@ -330,7 +325,6 @@ export function useInboxMarked(enabled: boolean): UseQueryResult<MarkedWindowRes
return message ? [{ ...marked, m: message }] : []
})
}, [canonicalMessages, query.data?.marked, markedAccess, pendingMarks])
- deriveView(marked, [valueEvidence(queryClient, query.data), ...marked.map(row => viewEvidence(row.m))], marked.length)
return { ...query, marked }
}
diff --git a/src/web/src/hooks/community/use-machines.ts b/src/web/src/hooks/community/use-machines.ts
index f18d2d59a..53f550e23 100644
--- a/src/web/src/hooks/community/use-machines.ts
+++ b/src/web/src/hooks/community/use-machines.ts
@@ -1,7 +1,5 @@
"use client"
-
-import { deriveView, valueEvidence } from "@/lib/observability/data-source"
-import { useQueryClient, useQuery, type QueryFunctionContext, type UseQueryResult, type UseQueryOptions } from "@tanstack/react-query"
+import { useQuery, type QueryFunctionContext, type UseQueryResult, type UseQueryOptions } from "@tanstack/react-query"
import { isPresenceOnline } from "@alook/shared"
import { communityRequestOptions } from "@/lib/community-db/sync"
import { apiFetch } from "@/lib/api/client"
@@ -74,13 +72,11 @@ export const machinesQueryFn = (context: QueryFunctionContext) =>
export function useMachines(options?: Pick<UseQueryOptions<MachinesResponse>, "enabled" | "subscribed" | "refetchInterval">): UseQueryResult<MachinesResponse> & {
machines: MachineSummary[]
} {
- const client = useQueryClient()
const query = useQuery({
queryKey: communityKeys.machines(),
queryFn: machinesQueryFn,
...options,
})
const machines = query.data?.machines ?? (EMPTY_MACHINES as MachineSummary[])
- deriveView(machines, [valueEvidence(client, query.data)])
return { ...query, machines }
}
diff --git a/src/web/src/hooks/community/use-messages.ts b/src/web/src/hooks/community/use-messages.ts
index ba3abece2..07cc1a4ae 100644
--- a/src/web/src/hooks/community/use-messages.ts
+++ b/src/web/src/hooks/community/use-messages.ts
@@ -1,5 +1,4 @@
"use client"
-import { deriveView, mergeEvidence, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
import { useAtom, useCreateAtom } from "@tanstack/react-store";
import { getCommunityRuntime } from "@/stores/community/runtime"
@@ -162,7 +161,7 @@ async function fetchMessagesTransport(
if (isMessageSurfaceReceipt(surfaceReceipt)) {
options?.onSurfaceReceipt?.(surfaceReceipt)
}
- return deriveView(page, [viewEvidence(transport)])
+ return page
}
export const channelMessagesQueryFn =
@@ -820,12 +819,8 @@ function useMessagesInner(
typeof message.seq === "number" ? [[message.id, message as CanonicalMessage] as const] : [])), [projection.messages])
const messages = useMemo<Msg[]>(() => {
const selected = projection.windowIds.flatMap((id) => { const message = canonicalById.get(id); return message ? [message] : [] }).sort((a, b) => a.seq - b.seq)
- const root = valueEvidence(queryClient, query.data)
- const window = transportWindowObserved
- ? root.source === "unknown" ? mergeEvidence(query.data?.pages.map(viewEvidence) ?? []) : root
- : mergeEvidence(selected.map(viewEvidence))
- return deriveView(selected, [window, ...selected.map(viewEvidence)])
- }, [query.data, projection.windowIds, canonicalById, queryClient, transportWindowObserved])
+ return selected
+ }, [projection.windowIds, canonicalById])
const latestSeq = useMemo<number>(() => {
if (!query.data) return 0
@@ -967,7 +962,6 @@ function useMessageSurface(channelId: string | null, opts: MessagesOpts | Channe
messageMatchesTag(message, tag)),
[canonicalBase, tag, state, base.canonicalById],
)
- deriveView(messages, [viewEvidence(base.messages), ...messages.map(viewEvidence)])
useEffect(() => {
if (!channelId || base.data === undefined) return
commitConversationNavigationProof(queryClient, channelId, accessEpoch)
diff --git a/src/web/src/hooks/community/use-server-members.ts b/src/web/src/hooks/community/use-server-members.ts
index 1ad59806d..d7d434aed 100644
--- a/src/web/src/hooks/community/use-server-members.ts
+++ b/src/web/src/hooks/community/use-server-members.ts
@@ -1,7 +1,5 @@
"use client"
-import { deriveView, valueEvidence, viewEvidence } from "@/lib/observability/data-source"
-
import { useEffect, useMemo } from "react"
import { createStore, useSelector } from "@tanstack/react-store"
import { useInfiniteQuery, useMutationState, useQueryClient, replaceEqualDeep, type InfiniteData, type Query, type QueryKey, type QueryClient } from "@tanstack/react-query"
@@ -431,10 +429,9 @@ export function useServerMembers(serverId: string | null): UseServerMembers {
const row = byUser.get(identity.userId)
if (!row || row.memberId !== identity.id) return []
const profile = readCommunityProfile(profiles.get(identity.userId), identity.userId)
- return [deriveView({ id: identity.id, userId: identity.userId, name: row.nickname ?? profile.name, discriminator: profile.discriminator, avatar: profile.avatar, avatarVersion: profile.avatarVersion, role: row.role as CommunityRole, status: row.viewer ? "online" as const : profile.presence, sub: "", statusEmoji: profile.statusEmoji, statusText: profile.statusText }, [viewEvidence(row), viewEvidence(profile)])]
+ return [{ id: identity.id, userId: identity.userId, name: row.nickname ?? profile.name, discriminator: profile.discriminator, avatar: profile.avatar, avatarVersion: profile.avatarVersion, role: row.role as CommunityRole, status: row.viewer ? "online" as const : profile.presence, sub: "", statusEmoji: profile.statusEmoji, statusText: profile.statusText }]
})
}, [identities, memberships, profiles])
- deriveView(members, [valueEvidence(queryClient, data), ...members.map(viewEvidence)], members.length)
const active = searching ? search : infinite
const pendingKicks = useMutationState({ filters: { mutationKey: ["community", "member-command"], status: "pending" }, select: (mutation) => {
const variables = mutation.state.variables as { kind: string; input: { serverId: string; memberId: string } }
diff --git a/src/web/src/hooks/community/use-servers.ts b/src/web/src/hooks/community/use-servers.ts
index 8558465c5..fa0907735 100644
--- a/src/web/src/hooks/community/use-servers.ts
+++ b/src/web/src/hooks/community/use-servers.ts
@@ -1,5 +1,4 @@
"use client"
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { communityRequestOptions } from "@/lib/community/account-cache-lifecycle"
import { conversationReadRetryPolicy, withConversationReadDeadline } from "@/lib/community/conversation-read"
import { useSelector } from "@tanstack/react-store"
@@ -201,7 +200,6 @@ export function useServers(): UseQueryResult<string[]> & { servers: Server[]; is
return unread === server.unread && mentions === server.mentions ? server : { ...server, unread, mentions }
})
}, [attentionScopes, dbRail?.servers, serverAccess])
- deriveView(servers, [viewEvidence(dbRail?.servers), viewEvidence(attentionScopes)])
void structuralGeneration
const state = registry?.runtime.ws.get()
return {
@@ -421,8 +419,7 @@ export function useServer(
changed = true
return { ...category, channels }
})
- deriveView(categories, [viewEvidence(source.categories), viewEvidence(attentionScopes)])
- return changed ? deriveView({ ...source, categories }, [viewEvidence(source), viewEvidence(categories)]) : source
+ return changed ? { ...source, categories } : source
}, [attentionScopes, dbServer, serverId])
return {
...query,
diff --git a/src/web/src/lib/auth-response-cookies.test.ts b/src/web/src/lib/auth-response-cookies.test.ts
new file mode 100644
index 000000000..03aecc0fb
--- /dev/null
+++ b/src/web/src/lib/auth-response-cookies.test.ts
@@ -0,0 +1,139 @@
+import { DatabaseSync } from "node:sqlite"
+import { readFileSync } from "node:fs"
+import { createHmac } from "node:crypto"
+import { afterEach, describe, expect, it, vi } from "vitest"
+import { NextRequest } from "next/server"
+import { createAuth, observeAuthSession } from "./auth"
+import { authResponseCookies } from "./auth-response-cookies"
+
+const secret = "fixture-only-navigation-session-secret-163"
+afterEach(() => vi.restoreAllMocks())
+
+describe("same-request signed session refresh", () => {
+ it("leaves requests without a refresh on the original Next pass-through path", () => {
+ const response = authResponseCookies(new NextRequest("https://fixture.test/c", { headers: { Cookie: "session=signed" } }), new Headers())
+ expect(response.headers.get("x-middleware-next")).toBe("1")
+ expect(response.headers.has("x-middleware-override-headers")).toBe(false)
+ expect(response.headers.getSetCookie()).toEqual([])
+ })
+ it.each([false, true])("keeps the original streamed POST readable with refresh=%s", async (refresh) => {
+ const payload = '{"message":"fixture body 中文"}'
+ const bytes = new TextEncoder().encode(payload)
+ const request = new NextRequest("https://fixture.test/c/channels/server/conversation", {
+ method: "POST", headers: { Cookie: "session=old; expired=old; preference=keep", "Content-Type": "application/json" },
+ body: new ReadableStream({ start(controller) {
+ controller.enqueue(bytes.subarray(0, 9))
+ controller.enqueue(bytes.subarray(9))
+ controller.close()
+ } }),
+ })
+ const body = request.body!
+ const clone = vi.spyOn(request, "clone")
+ const reader = vi.spyOn(body, "getReader")
+ const headers = new Headers()
+ if (refresh) {
+ headers.append("Set-Cookie", "session=refreshed; HttpOnly; Path=/; Max-Age=300")
+ headers.append("Set-Cookie", "expired=; HttpOnly; Path=/; Max-Age=0")
+ }
+ expect(body.locked).toBe(false)
+ expect(request.bodyUsed).toBe(false)
+ const response = authResponseCookies(request, headers)
+ expect(request.method).toBe("POST")
+ expect(request.body).toBe(body)
+ expect(body.locked).toBe(false)
+ expect(request.bodyUsed).toBe(false)
+ expect(clone).not.toHaveBeenCalled()
+ expect(reader).not.toHaveBeenCalled()
+ expect(request.headers.get("Cookie")).toBe("session=old; expired=old; preference=keep")
+ expect(response.headers.getSetCookie()).toEqual(headers.getSetCookie())
+ if (refresh) {
+ expect(response.headers.get("x-middleware-request-cookie")).toBe("session=refreshed; preference=keep")
+ expect(response.headers.get("x-middleware-request-content-type")).toBe("application/json")
+ } else expect(response.headers.has("x-middleware-override-headers")).toBe(false)
+ expect(await request.text()).toBe(payload)
+ })
+ it("preserves chunk updates, deletes expired chunks and returns every Set-Cookie", () => {
+ const request = new NextRequest("https://fixture.test/c", { headers: { Cookie: "session=old; cache.0=old; cache.1=tail; preference=keep" } })
+ const headers = new Headers()
+ headers.append("Set-Cookie", "cache.0=new; HttpOnly; Path=/; Max-Age=300")
+ headers.append("Set-Cookie", "cache.1=; HttpOnly; Path=/; Max-Age=0")
+ headers.append("Set-Cookie", "session=; HttpOnly; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT")
+ headers.append("Set-Cookie", "maxAgeWins=signed%2Fbytes%3D; Path=/; Max-Age=300; Expires=Thu, 01 Jan 1970 00:00:00 GMT")
+ const response = authResponseCookies(request, headers)
+ const forwarded = new NextRequest(request, { headers: { Cookie: response.headers.get("x-middleware-request-cookie")! } })
+ expect(forwarded.cookies.get("cache.0")?.value).toBe("new")
+ expect(forwarded.cookies.has("cache.1")).toBe(false)
+ expect(forwarded.cookies.has("session")).toBe(false)
+ expect(forwarded.cookies.get("preference")?.value).toBe("keep")
+ expect(response.headers.get("x-middleware-request-cookie")).toContain("maxAgeWins=signed%2Fbytes%3D")
+ expect(response.headers.getSetCookie()).toEqual(headers.getSetCookie())
+ expect(request.cookies.get("session")?.value).toBe("old")
+ })
+
+ it("uses real BetterAuth and SQLite to avoid a second lookup after an expired cache refresh", async () => {
+ const sqlite = new DatabaseSync(":memory:")
+ try {
+ sqlite.exec(`CREATE TABLE user (id TEXT PRIMARY KEY, name TEXT, email TEXT, emailVerified INTEGER, image TEXT, createdAt INTEGER, updatedAt INTEGER, discriminator TEXT, isBot INTEGER, deletedAt TEXT);
+ CREATE TABLE session (id TEXT PRIMARY KEY, token TEXT, userId TEXT, expiresAt INTEGER, createdAt INTEGER, updatedAt INTEGER, ipAddress TEXT, userAgent TEXT);`)
+ sqlite.exec(readFileSync(new URL("../../migrations/0001_schema.sql", import.meta.url), "utf8"))
+ sqlite.exec(readFileSync(new URL("../../migrations/0035_device_code_table.sql", import.meta.url), "utf8"))
+ const now = Date.now()
+ sqlite.prepare("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run("viewer-a", "Viewer", "[email protected]", 1, null, new Date(now).toISOString(), new Date(now).toISOString(), "0001", 0, null)
+ sqlite.prepare("INSERT INTO session VALUES (?, ?, ?, ?, ?, ?, ?, ?)").run("session-a", "fixture-token", "viewer-a", new Date(now + 30 * 86400000).toISOString(), new Date(now).toISOString(), new Date(now).toISOString(), null, null)
+ const auth = createAuth({ DB: sqlite, NODE_ENV: "production", BETTER_AUTH_URL: "https://fixture.test", BETTER_AUTH_SECRET: secret } as unknown as Env)
+ const context = await auth.$context
+ const find = vi.spyOn(context.internalAdapter, "findSession")
+ const signed = encodeURIComponent("fixture-token." + createHmac("sha256", secret).update("fixture-token").digest("base64"))
+ const first = new NextRequest("https://fixture.test/c", { headers: { Cookie: `${context.authCookies.sessionToken.name}=${signed}` } })
+ let ready!: (value: typeof context) => void
+ const pendingContext = new Promise<typeof context>(resolve => { ready = resolve })
+ const execute = vi.fn(() => auth.api.getSession({ headers: first.headers, returnHeaders: true }))
+ const pendingSession = observeAuthSession({ ...auth, $context: pendingContext }, execute)
+ await Promise.resolve()
+ expect(execute).not.toHaveBeenCalled()
+ ready(context)
+ const initial = await pendingSession
+ expect(execute).toHaveBeenCalledOnce()
+ const sessionFailure = new Error("fixture session failure")
+ await expect(observeAuthSession(auth, () => Promise.reject(sessionFailure))).rejects.toBe(sessionFailure)
+ const contextFailure = new Error("fixture context failure")
+ const blocked = vi.fn(() => auth.api.getSession({ headers: first.headers }))
+ await expect(observeAuthSession({ ...auth, $context: Promise.reject(contextFailure) }, blocked)).rejects.toBe(contextFailure)
+ expect(blocked).not.toHaveBeenCalled()
+ expect(initial.response?.user.id).toBe("viewer-a")
+ expect(find).toHaveBeenCalledTimes(1)
+ const cached = authResponseCookies(first, initial.headers).headers.get("x-middleware-request-cookie")!
+ find.mockClear()
+ await auth.api.getSession({ headers: new Headers({ Cookie: cached }) })
+ expect(find).not.toHaveBeenCalled()
+ vi.spyOn(Date, "now").mockReturnValue(now + 301000)
+ const stale = new NextRequest(first, { headers: { Cookie: cached } })
+ const refresh = await auth.api.getSession({ headers: stale.headers, returnHeaders: true })
+ expect(refresh.response?.user.id).toBe("viewer-a")
+ expect(find).toHaveBeenCalledTimes(1)
+ await auth.api.getSession({ headers: stale.headers })
+ expect(find).toHaveBeenCalledTimes(2)
+ const forwarded = authResponseCookies(stale, refresh.headers)
+ const session = await auth.api.getSession({ headers: new Headers({ Cookie: forwarded.headers.get("x-middleware-request-cookie")! }) })
+ expect(session?.user.id).toBe("viewer-a")
+ expect(find).toHaveBeenCalledTimes(2)
+ const absent = await auth.api.getSession({ headers: new Headers() })
+ expect(absent).toBeNull()
+ const onlyCache = new NextRequest(stale, { headers: { Cookie: forwarded.headers.get("x-middleware-request-cookie")! } })
+ onlyCache.cookies.delete(context.authCookies.sessionToken.name)
+ expect(await auth.api.getSession({ headers: onlyCache.headers })).toBeNull()
+ sqlite.prepare("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)").run("viewer-b", "Other", "[email protected]", 1, null, new Date(now).toISOString(), new Date(now).toISOString(), "0002", 0, null)
+ sqlite.prepare("INSERT INTO session VALUES (?, ?, ?, ?, ?, ?, ?, ?)").run("session-b", "other-token", "viewer-b", new Date(now + 30 * 86400000).toISOString(), new Date(now).toISOString(), new Date(now).toISOString(), null, null)
+ const otherSigned = encodeURIComponent("other-token." + createHmac("sha256", secret).update("other-token").digest("base64"))
+ const otherRequest = new NextRequest(first, { headers: { Cookie: `${context.authCookies.sessionToken.name}=${otherSigned}` } })
+ const [a, b] = await Promise.all([
+ auth.api.getSession({ headers: new Headers({ Cookie: forwarded.headers.get("x-middleware-request-cookie")! }) }),
+ auth.api.getSession({ headers: otherRequest.headers, returnHeaders: true }),
+ ])
+ expect(a?.user.id).toBe("viewer-a")
+ expect(b.response?.user.id).toBe("viewer-b")
+ const otherForwarded = authResponseCookies(otherRequest, b.headers)
+ expect((await auth.api.getSession({ headers: new Headers({ Cookie: otherForwarded.headers.get("x-middleware-request-cookie")! }) }))?.user.id).toBe("viewer-b")
+ } finally { sqlite.close() }
+ })
+})
diff --git a/src/web/src/lib/auth-response-cookies.ts b/src/web/src/lib/auth-response-cookies.ts
new file mode 100644
index 000000000..6071f700f
--- /dev/null
+++ b/src/web/src/lib/auth-response-cookies.ts
@@ -0,0 +1,18 @@
+import { NextRequest, NextResponse } from "next/server"
+import { applySetCookies, parseSetCookieHeader } from "better-auth/cookies"
+
+export function authResponseCookies(request: NextRequest, headers: Headers) {
+ const setCookies = headers.getSetCookie()
+ if (!setCookies.length) return NextResponse.next()
+ const forwardedHeaders = new Headers(request.headers)
+ applySetCookies(forwardedHeaders, setCookies)
+ const forwarded = new NextRequest(request.url, { headers: forwardedHeaders })
+ for (const [name, cookie] of parseSetCookieHeader(setCookies.join(", "))) {
+ if (cookie["max-age"] !== undefined ? cookie["max-age"] <= 0 : cookie.expires && cookie.expires.getTime() <= Date.now()) {
+ forwarded.cookies.delete(name)
+ }
+ }
+ const response = NextResponse.next({ request: { headers: forwarded.headers } })
+ for (const cookie of setCookies) response.headers.append("Set-Cookie", cookie)
+ return response
+}
diff --git a/src/web/src/lib/auth.ts b/src/web/src/lib/auth.ts
index 1852a1881..390cfc1fe 100644
--- a/src/web/src/lib/auth.ts
+++ b/src/web/src/lib/auth.ts
@@ -1,3 +1,4 @@
+import { annotateWorkerSpan, observeWorkerOperation } from "./observability/worker"
import { betterAuth } from "better-auth"
import { emailOTP, deviceAuthorization, bearer, oneTimeToken } from "better-auth/plugins"
import { getCloudflareContext } from "@opennextjs/cloudflare"
@@ -461,9 +462,16 @@ function authVersionId(env: Env): string | undefined {
* API call and are never retained here.
*/
export function getAuth(env: Env): AuthInstance {
+ return observeWorkerOperation("auth.instance", {}, () => resolveAuthInstance(env))
+}
+
+function resolveAuthInstance(env: Env): AuthInstance {
const versionId = authVersionId(env)
const mode = resolveMode({ nodeEnv: env.NODE_ENV ?? process.env.NODE_ENV })
- if (!versionId && mode === "production") return createAuth(env)
+ if (!versionId && mode === "production") {
+ annotateWorkerSpan({ auth_instance: "request_local", auth_reuse_reason: "version_missing" })
+ return createAuth(env)
+ }
const lifecycleVersion = versionId ?? "local-module"
const configuration = authConfiguration(env)
@@ -472,11 +480,19 @@ export function getAuth(env: Env): AuthInstance {
|| authLifecycleEntry.versionId !== lifecycleVersion
|| !sameAuthConfiguration(authLifecycleEntry.configuration, configuration)
) {
+ annotateWorkerSpan({ auth_instance: "created", auth_reuse_reason: !authLifecycleEntry ? "cold" : authLifecycleEntry.versionId !== lifecycleVersion ? "version_changed" : "configuration_changed" })
authLifecycleEntry = {
configuration,
versionId: lifecycleVersion,
auth: createAuth(env),
}
+ } else {
+ annotateWorkerSpan({ auth_instance: "reused", auth_reuse_reason: "match" })
}
return authLifecycleEntry.auth
}
+
+export async function observeAuthSession<T>(auth: AuthInstance, execute: () => Promise<T>): Promise<T> {
+ await observeWorkerOperation("auth.context_ready", {}, () => auth.$context)
+ return observeWorkerOperation("auth.get_session", {}, execute)
+}
diff --git a/src/web/src/lib/community-db/projections-unowned.dom.test.ts b/src/web/src/lib/community-db/projections-unowned.dom.test.ts
index 2a827a7ca..828a2c574 100644
--- a/src/web/src/lib/community-db/projections-unowned.dom.test.ts
+++ b/src/web/src/lib/community-db/projections-unowned.dom.test.ts
@@ -1,7 +1,6 @@
import { expect, it, vi } from "vitest"
import { renderHook } from "@/test/react-dom-harness"
import { configureTelemetry, retireTelemetry } from "@/lib/observability/telemetry"
-import { viewEvidence } from "@/lib/observability/data-source"
vi.mock("@tanstack/react-db", async importOriginal => {
const real = await importOriginal<typeof import("@tanstack/react-db")>()
@@ -13,7 +12,6 @@ it("does not attribute an upstream cached tree snapshot to an absent community o
try {
const rendered = renderHook(() => useServerTreeProjection("server-a"))
expect(rendered.result.current).toMatchObject({ id: "server-a", name: "Unowned snapshot", categories: [] })
- expect(viewEvidence(rendered.result.current).source).toBe("unknown")
rendered.unmount()
} finally { retireTelemetry() }
})
diff --git a/src/web/src/lib/community-db/projections.ts b/src/web/src/lib/community-db/projections.ts
index 822f4c49a..733ad70ff 100644
--- a/src/web/src/lib/community-db/projections.ts
+++ b/src/web/src/lib/community-db/projections.ts
@@ -17,7 +17,6 @@ import type { ChannelRefDirectory } from "@/lib/community/channel-ref"
import type { CommunityDbRegistry } from "./collections"
import { useCommunityPreviewProfiles } from "@/stores/community/profile-preview"
import { MAX_PERSISTED_MESSAGES_PER_SCOPE } from "@/lib/query-persister"
-import { collectionEvidence, deriveView, sourceEvidence, tagView, viewEvidence } from "@/lib/observability/data-source"
import type {
CommunityCollectionName,
@@ -30,28 +29,10 @@ import type {
ServerRow,
} from "./schema"
-function annotateRows<T extends object>(registry: CommunityDbRegistry | null, collection: string, rows: T[] | undefined): T[] | undefined {
- if (!registry || !rows) return rows
- const key = (row: T) => String((row as Record<string, unknown>).id ?? (row as Record<string, unknown>).userId ?? (row as Record<string, unknown>).scopeId)
- for (const row of rows) tagView(row, collectionEvidence(registry.queryClient, collection, [key(row)], [row]))
- return tagView(rows, collectionEvidence(registry.queryClient, collection, rows.map(key), rows))
-}
-
-const presenceVersions = new WeakMap<CommunityDbRegistry, Map<string, { value: string; token: object }>>()
-function presenceVersion(registry: CommunityDbRegistry, userId: string, value: string) {
- let entries = presenceVersions.get(registry)
- if (!entries) { entries = new Map(); presenceVersions.set(registry, entries) }
- const old = entries.get(userId)
- const token = old?.value === value ? old.token : {}
- entries.set(userId, { value, token })
- if (entries.size > 2048) entries.delete(entries.keys().next().value!)
- return sourceEvidence(token, "ws")
-}
-
-function projectedMessage(registry: CommunityDbRegistry | null, message: MessageRow, child?: ChannelRow): Msg {
+function projectedMessage(message: MessageRow, child?: ChannelRow): Msg {
const { channelId: _channelId, replyToId: _replyToId, ...model } = message
const value = { ...model, ...(child ? { thread: { id: child.id, name: child.name, messageCount: child.messageCount ?? 0, lastReplyAt: child.lastMessageAt ?? undefined, tags: child.tags, preview: child.preview, participantCount: child.participantCount } } : {}) } as Msg
- return registry ? deriveView(value, [collectionEvidence(registry.queryClient, "messages", [message.id], [message]), ...(child ? [collectionEvidence(registry.queryClient, "channels", [child.id], [child])] : [])]) : value
+ return value
}
let communityDbContext: Context<CommunityDbRegistry | null> | null = null
@@ -124,8 +105,8 @@ function useCollectionQuery<N extends CommunityCollectionName>(name: N, where?:
}
function useCollectionRows<N extends CommunityCollectionName>(name: N, where?: CollectionWhere<N>) {
- const { registry, data } = useCollectionQuery(name, where)
- return annotateRows(registry, name, data)
+ const { data } = useCollectionQuery(name, where)
+ return data
}
function useServerRows(serverId?: string) {
@@ -215,21 +196,11 @@ export function useServerRailProjection() {
}] : []
}),
}))
- deriveView(servers, [
- collectionEvidence(rows.registry.queryClient, "servers", rows.servers.map(row => row.id), rows.servers),
- collectionEvidence(rows.registry.queryClient, "serverMemberships", rows.serverMemberships.map(row => row.id), rows.serverMemberships),
- ])
- deriveView(folders, [
- viewEvidence(servers),
- collectionEvidence(rows.registry.queryClient, "folders", (rows.folders ?? []).map(row => row.id), rows.folders ?? []),
- collectionEvidence(rows.registry.queryClient, "folderItems", (rows.folderItems ?? []).map(row => row.id), rows.folderItems ?? []),
- ])
- return deriveView({ servers, folders }, [viewEvidence(servers), viewEvidence(folders)], servers.length + folders.length)
+ return { servers, folders }
}, [rows.registry, rows.servers, rows.serverMemberships, rows.folders, rows.folderItems])
}
export function useServerTreeProjection(serverId: string | null) {
- const registry = useOptionalCommunityDbRegistry()
const rows = {
servers: useServerRows(serverId ?? ""),
categories: useCategoryRows(serverId ?? ""),
@@ -274,18 +245,13 @@ export function useServerTreeProjection(serverId: string | null) {
if (uncategorized.length > 0) {
categories.push({ id: "__uncategorized__", name: "", private: false, channels: uncategorized })
}
- if (registry) deriveView(categories, [collectionEvidence(registry.queryClient, "categories", rows.categories.map(row => row.id), rows.categories), collectionEvidence(registry.queryClient, "channels", channels.map(row => row.id), channels)], channels.length)
const view = {
id: server.id, name: server.name, discriminator: server.discriminator,
description: server.description, icon: server.icon, official: server.official,
ownerId: server.ownerId, categories,
}
- return registry ? deriveView(view, [
- collectionEvidence(registry.queryClient, "servers", [server.id], [server]),
- collectionEvidence(registry.queryClient, "categories", rows.categories.map(row => row.id), rows.categories),
- collectionEvidence(registry.queryClient, "channels", channels.map(row => row.id), channels),
- ], channels.length) : view
- }, [rows.servers, rows.categories, rows.channels, serverId, registry])
+ return view
+ }, [rows.servers, rows.categories, rows.channels, serverId])
}
export function useDmProjection() {
@@ -333,7 +299,7 @@ export function useDmProjection() {
: { lastUnreadSeq: channel.lastUnreadSeq ?? readState?.lastReadSeq }),
}]
}))
- return deriveView(result, [viewEvidence(rows.channels), viewEvidence(rows.channelMemberships), collectionEvidence(rows.registry!.queryClient, "profiles", rows.profiles.map(row => row.userId), rows.profiles), collectionEvidence(rows.registry!.queryClient, "readStates", (rows.readStates ?? []).map(row => row.channelId), rows.readStates)])
+ return result
}, [rows.registry, rows.channels, rows.channelMemberships, rows.profiles, rows.readStates])
}
@@ -359,23 +325,23 @@ function useJoinedMessageQuery(channelId: string | null | undefined, ids?: reado
}
export function useMessageProjection(channelId: string | null, ids?: readonly string[]) {
- const { registry, data } = useJoinedMessageQuery(channelId, ids)
+ const { data } = useJoinedMessageQuery(channelId, ids)
return useMemo(() => {
if (!channelId || !data) return undefined
const messages = data
.sort((a, b) => (a.message.seq ?? 0) - (b.message.seq ?? 0))
.map(({ message, child }) => {
- return projectedMessage(registry, message, child)
+ return projectedMessage(message, child)
})
- return deriveView(messages, messages.map(viewEvidence))
- }, [channelId, data, registry])
+ return messages
+ }, [channelId, data])
}
export function useCanonicalMessagesById(ids?: readonly string[]): ReadonlyMap<string, Msg> | undefined {
const { registry, data } = useJoinedMessageQuery(undefined, ids)
return useMemo(() => !registry ? undefined : new Map(
(data ?? []).map(({ message, child }) => {
- return [message.id, projectedMessage(registry, message, child)]
+ return [message.id, projectedMessage(message, child)]
}),
), [registry, data])
}
@@ -468,27 +434,26 @@ export function useCanonicalProfilesByUserId(userIds?: readonly string[]): Reado
if (previewProfiles) return previewProfiles
const merged = new Map<string, CommunityProfile>()
for (const [userId, profile] of canonicalProfiles) {
- merged.set(userId, registry ? deriveView({ ...profile, id: userId }, [collectionEvidence(registry.queryClient, "profiles", [userId], [profile])]) : { ...profile, id: userId })
+ merged.set(userId, { ...profile, id: userId })
}
for (const [userId, presence] of livePresence ?? []) {
if (presence === undefined) continue
const prior = merged.get(userId)
const value = { ...prior, id: userId, presence }
- const presenceEvidence = registry ? presenceVersion(registry, userId, presence) : viewEvidence(value)
- merged.set(userId, deriveView(value, [...(prior ? [viewEvidence(prior)] : []), presenceEvidence]))
+ merged.set(userId, value)
}
return merged
- }, [canonicalProfiles, livePresence, previewProfiles, registry])
+ }, [canonicalProfiles, livePresence, previewProfiles])
}
export function useServerMemberRows(serverId: string | null, userIds: readonly string[]) {
- const { registry, data } = useCollectionQuery("serverMemberships", ({ row }) => and(eq(row.serverId, serverId), inArray(row.userId, [...userIds])), !!serverId)
- return annotateRows(registry, "serverMemberships", data ?? [])!
+ const { data } = useCollectionQuery("serverMemberships", ({ row }) => and(eq(row.serverId, serverId), inArray(row.userId, [...userIds])), !!serverId)
+ return data ?? []
}
export function useChannelRosterRows(channelId: string, relation: "access" | "notify") {
- const { registry, data } = useCollectionQuery("channelMemberships", ({ row }) => and(eq(row.channelId, channelId), eq(row.relation, relation)), !!channelId)
- return annotateRows(registry, "channelMemberships", data ?? [])!
+ const { data } = useCollectionQuery("channelMemberships", ({ row }) => and(eq(row.channelId, channelId), eq(row.relation, relation)), !!channelId)
+ return data ?? []
}
export function useCanonicalCommunityProfile(userId: string | null | undefined) {
@@ -500,21 +465,18 @@ export function useCanonicalCommunityProfile(userId: string | null | undefined)
if (!userId) return undefined
if (preview) return preview.get(userId)
if (!profile && !presence) return undefined
- return deriveView({ ...profile, id: userId, ...(presence ? { presence } : {}) }, [
- ...(profile && registry ? [collectionEvidence(registry.queryClient, "profiles", [profile.userId], [profile])] : []),
- ...(presence && registry ? [presenceVersion(registry, userId, presence)] : []),
- ])
- }, [userId, preview, profile, presence, registry])
+ return { ...profile, id: userId, ...(presence ? { presence } : {}) }
+ }, [userId, preview, profile, presence])
}
export function useAttentionScopes(): readonly AttentionScopeRow[] {
- const { registry, data } = useCollectionQuery("attentionScopes")
- return annotateRows(registry, "attentionScopes", data ?? [])!
+ const { data } = useCollectionQuery("attentionScopes")
+ return data ?? []
}
export function useAttentionItems(): readonly AttentionItemRow[] {
- const { registry, data } = useCollectionQuery("attentionItems")
- return annotateRows(registry, "attentionItems", data ?? [])!
+ const { data } = useCollectionQuery("attentionItems")
+ return data ?? []
}
export function useChannelRefDirectoryProjection(): ChannelRefDirectory | undefined {
@@ -561,7 +523,6 @@ export function useForumSidebarProjection(
) return undefined
const { threads, parentUnread } = projectForumSidebar(rows.channels, rows.channelMemberships, rows.messages,
rows.registry.accountId, serverId, retainId, serverNowMs)
- deriveView(threads, [viewEvidence(rows.channels), viewEvidence(rows.channelMemberships), viewEvidence(rows.messages)])
- return deriveView({ threads, parentUnread }, [viewEvidence(threads)], threads.length)
+ return { threads, parentUnread }
}, [serverNowMs, rows.registry, rows.channels, rows.channelMemberships, rows.messages, serverId, retainId])
}
diff --git a/src/web/src/lib/community-db/sync.ts b/src/web/src/lib/community-db/sync.ts
index 458feb309..4b86bd92d 100644
--- a/src/web/src/lib/community-db/sync.ts
+++ b/src/web/src/lib/community-db/sync.ts
@@ -1,5 +1,4 @@
import type { Transaction } from "@tanstack/react-db"
-import { currentSource, withSource } from "@/lib/observability/data-source"
import { communityRequestOptions as qualifiedCommunityRequestOptions } from "@/lib/community/account-cache-lifecycle"
import { isAbortError } from "@/lib/errors"
import { isOwnerServerDeleteScopeEvictionBlocked } from "@/lib/community/eject-server"
@@ -261,7 +260,7 @@ function withCanonicalWriteContext<T>(
const previous = canonicalWriteContexts.get(queryClient)
canonicalWriteContexts.set(queryClient, context)
try {
- return withSource(queryClient, currentSource(queryClient) === "ws" ? "ws" : context.kind === "query" ? "network" : "local_mutation", publish)
+ return publish()
} finally {
if (previous) canonicalWriteContexts.set(queryClient, previous)
else canonicalWriteContexts.delete(queryClient)
diff --git a/src/web/src/lib/community-db/write.ts b/src/web/src/lib/community-db/write.ts
index 34938da9d..d39867bb6 100644
--- a/src/web/src/lib/community-db/write.ts
+++ b/src/web/src/lib/community-db/write.ts
@@ -2,7 +2,6 @@ import { replaceEqualDeep } from "@tanstack/react-query"
import { hasVirtualProps } from "@tanstack/react-db"
import { communityKeys } from "@/lib/query-keys"
import type { CommunityDbRegistry } from "./collections"
-import { recordRows } from "@/lib/observability/data-source"
function businessRow<T extends object>(row: T): T {
return hasVirtualProps(row)
@@ -35,7 +34,6 @@ export function writeCommunityCollectionRows<T extends object>(
communityKeys.communityDbCollection(registry.scopeId, name),
next,
)
- recordRows(registry.queryClient, name, registry.queryClient.getQueryData<T[]>(communityKeys.communityDbCollection(registry.scopeId, name)) ?? rows, getKey)
return
}
const previousByKey = committed === undefined ? undefined : new Map(committed.map((row) => [collection.getKeyFromItem(row), row]))
@@ -48,12 +46,10 @@ export function writeCommunityCollectionRows<T extends object>(
return replaceEqualDeep(previousData, row) !== previousData
})
if (removed.length === 0 && changed.length === 0) {
- recordRows(registry.queryClient, name, rows, getKey)
return
}
collection.utils.writeBatch(() => {
if (removed.length > 0) collection.utils.writeDelete(removed)
if (changed.length > 0) collection.utils.writeUpsert(changed)
})
- recordRows(registry.queryClient, name, rows, getKey)
}
diff --git a/src/web/src/lib/community/message-list-items.ts b/src/web/src/lib/community/message-list-items.ts
index 0a345457e..2c67a491f 100644
--- a/src/web/src/lib/community/message-list-items.ts
+++ b/src/web/src/lib/community/message-list-items.ts
@@ -1,4 +1,3 @@
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { dateKey, formatDateLabel } from "./format-time"
import type { Msg, RenderMsg } from "./models/message"
@@ -36,7 +35,7 @@ export function flattenMessageItems(
&& prev.createdAt && m.createdAt && (new Date(m.createdAt).getTime() - new Date(prev.createdAt).getTime()) < MESSAGE_GROUP_WINDOW_MS)
items.push({
kind: "message",
- m: deriveView({ ...m, grouped }, [viewEvidence(m)]),
+ m: { ...m, grouped },
key: messageDisplayKey(m),
...(showDateDivider ? { dateLabel: formatDateLabel(m.createdAt!) } : {}),
...(isNewDivider ? { newDivider: true } : {}),
diff --git a/src/web/src/lib/community/message-stream.ts b/src/web/src/lib/community/message-stream.ts
index 929120521..323f6f248 100644
--- a/src/web/src/lib/community/message-stream.ts
+++ b/src/web/src/lib/community/message-stream.ts
@@ -1,4 +1,3 @@
-import { deriveView, sourceEvidence, viewEvidence } from "@/lib/observability/data-source"
import type { Msg, SendAttachment } from "@/lib/community/models/message"
import type { MentionType, CommunityMessageResource } from "@alook/shared"
import { presentMessageAttachment } from "@/lib/community/attachment-presentation"
@@ -126,12 +125,12 @@ function upsertLiveCanonical(liveIds: Set<string>, message: CanonicalMessage, re
}
export function materializeIntent(intent: OutboxIntent): Msg {
- return deriveView({
+ return {
...intent.message,
id: intent.tempId,
clientNonce: intent.nonce,
failed: intent.status === "failed" || intent.uploadStatus === "failed",
- }, [sourceEvidence(intent, "local_mutation")])
+ }
}
function localUploadAttachments(
@@ -194,7 +193,7 @@ export function materializeMessageStream(
for (const id of overlay.liveIds) {
const message = canonical.get(id)
if (message) upsertMaterialized(byId, idByIdentity, {
- message: deriveView({ ...message, failed: false }, [viewEvidence(message)]),
+ message: { ...message, failed: false },
})
}
for (const message of baseMessages) {
diff --git a/src/web/src/lib/community/models/message.ts b/src/web/src/lib/community/models/message.ts
index 4cdb2d2a1..62433fe4f 100644
--- a/src/web/src/lib/community/models/message.ts
+++ b/src/web/src/lib/community/models/message.ts
@@ -1,6 +1,5 @@
import { z } from "zod"
import type { CommunityChannelResource, CommunityMessageResource, CommunityMessageAttachment, CommunityMessagesRead } from "@alook/shared"
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
// ── Messages ───────────────────────────────────────────────────────────────
type AttachmentMetadata = Pick<CommunityMessageAttachment, "name" | "url" | "contentType" | "sizeBytes">
@@ -119,7 +118,7 @@ export type MessagesWindowPage = Omit<MessagesPage, "messages"> & { messages: Ar
export function messageWindowPage(page: MessagesPage): MessagesWindowPage {
const newest = [...page.messages].filter((message) => message.createdAt).sort((a, b) => (a.createdAt ?? "").localeCompare(b.createdAt ?? "") || a.id.localeCompare(b.id)).at(-1)
- return deriveView({ ...page, messages: page.messages.map((message) => ({ id: message.id, ...(message.seq === undefined ? {} : { seq: message.seq }) })), ...(newest?.createdAt ? { newestCursor: `${newest.createdAt}|${newest.id}` } : {}) }, [viewEvidence(page)])
+ return { ...page, messages: page.messages.map((message) => ({ id: message.id, ...(message.seq === undefined ? {} : { seq: message.seq }) })), ...(newest?.createdAt ? { newestCursor: `${newest.createdAt}|${newest.id}` } : {}) }
}
// Discriminated pageParam. The queryFn dispatches on `mode` — the URL param
diff --git a/src/web/src/lib/community/navigation-metadata.ts b/src/web/src/lib/community/navigation-metadata.ts
new file mode 100644
index 000000000..00249545e
--- /dev/null
+++ b/src/web/src/lib/community/navigation-metadata.ts
@@ -0,0 +1,25 @@
+import { noop, type QueryClient } from "@tanstack/react-query"
+import { channelMetadataOptions, isChannelMetadataTokenCurrent, type ChannelMetadataResource } from "@/hooks/community/channel-metadata"
+import { getCommunityDbRegistry } from "@/lib/community-db/collections"
+import { channelMembershipKey } from "@/lib/community-db/schema"
+import { resolveCommunityModulePlan } from "./community-route"
+import { prefetchForHref, navigationForHref } from "@/lib/observability/context"
+
+export function prepareNavigationMetadata(queryClient: QueryClient, href: string, intent: "prefetch" | "foreground") {
+ const registry = getCommunityDbRegistry(queryClient)
+ if (!registry?.accountId || !registry.runtime.lifecycle.get().active) return
+ const main = resolveCommunityModulePlan(href).main
+ if (main.kind !== "dm" && main.kind !== "server-conversation") return
+ const channelId = main.kind === "dm" ? main.dmId : main.leafId
+ const serverId = main.kind === "dm" ? null : main.serverId
+ const channel = registry.collections.channels.get(channelId)
+ if (!channel || channel.pending || channel.archived || (channel.serverId ?? null) !== serverId
+ || (main.kind === "dm") !== (channel.type === "dm")
+ || !registry.collections.channelMemberships.has(channelMembershipKey(channelId, registry.accountId, "access"))
+ || registry.runtime.ws.actions.isChannelAccessRevoked(channelId, serverId)) return
+ const action = intent === "prefetch" ? prefetchForHref(href) : navigationForHref(href)
+ const options = channelMetadataOptions(queryClient, serverId, channelId, { action, reason: intent })
+ const cached = queryClient.getQueryData<ChannelMetadataResource>(options.queryKey)
+ return queryClient.query({ ...options,
+ staleTime: cached?.readProof && isChannelMetadataTokenCurrent(cached.readProof) ? Infinity : 0 }).catch(noop)
+}
diff --git a/src/web/src/lib/community/profile-read.ts b/src/web/src/lib/community/profile-read.ts
index 08398e471..8a659ac51 100644
--- a/src/web/src/lib/community/profile-read.ts
+++ b/src/web/src/lib/community/profile-read.ts
@@ -1,4 +1,3 @@
-import { deriveView, viewEvidence } from "@/lib/observability/data-source"
import { avatarInitial } from "@/lib/community/avatar"
import type { CommunityProfile } from "@/lib/community/models/people"
@@ -7,7 +6,7 @@ export function readCommunityProfile(
userId: string,
) {
const name = profile?.name ?? "Deleted user"
- return deriveView({
+ return {
id: userId,
name,
discriminator: profile?.discriminator ?? "",
@@ -17,5 +16,5 @@ export function readCommunityProfile(
statusEmoji: profile?.statusEmoji,
statusText: profile?.statusText,
presence: profile?.presence ?? "offline" as const,
- }, [viewEvidence(profile)])
+ }
}
diff --git a/src/web/src/lib/community/profile-seed.ts b/src/web/src/lib/community/profile-seed.ts
index 33e7184ff..2f4482da0 100644
--- a/src/web/src/lib/community/profile-seed.ts
+++ b/src/web/src/lib/community/profile-seed.ts
@@ -14,7 +14,6 @@ import {
} from "@/lib/community-db/collections"
import { profileSchema, type ProfileRow } from "@/lib/community-db/schema"
import { writeCommunityCollectionRows } from "@/lib/community-db/write"
-import { currentSource, withSource } from "@/lib/observability/data-source"
import { captureCommunityLiveSnapshotToken } from "@/lib/community-db/sync"
type ProfileFieldRevisions = {
@@ -210,7 +209,7 @@ export function writeCommunityProfilePatches(
if (advanced && writeRevision !== null) revisions.revision = writeRevision
if (advanced) revisionStore.setState(() => revisions)
const rows = [...profiles.values()]
- withSource(registry.queryClient, currentSource(registry.queryClient) === "ws" ? "ws" : options?.snapshot ? "network" : options?.command ? "local_mutation" : "unknown", () => writeCommunityCollectionRows(registry, "profiles", rows, (row) => row.userId))
+ writeCommunityCollectionRows(registry, "profiles", rows, (row) => row.userId)
}
export async function loadAndSeedProfiles<T>(
diff --git a/src/web/src/lib/middleware/auth.ts b/src/web/src/lib/middleware/auth.ts
index b8dbb8058..fefc7afdd 100644
--- a/src/web/src/lib/middleware/auth.ts
+++ b/src/web/src/lib/middleware/auth.ts
@@ -1,3 +1,4 @@
+import { observeWorkerOperation } from "@/lib/observability/worker"
import { NextRequest, NextResponse } from "next/server"
import { getCloudflareContext } from "@opennextjs/cloudflare"
import { queries } from "@alook/shared"
@@ -139,10 +140,10 @@ async function resolveSession(
for (let attempt = 0; attempt < 2; attempt++) {
try {
- sessionResult = await auth.api.getSession({
+ sessionResult = await observeWorkerOperation("auth.get_session", {}, () => auth.api.getSession({
headers: req.headers,
returnHeaders: true,
- }) as { headers: Headers; response: Awaited<ReturnType<typeof auth.api.getSession>> }
+ })) as { headers: Headers; response: Awaited<ReturnType<typeof auth.api.getSession>> }
lastErr = undefined
break
} catch (err) {
diff --git a/src/web/src/lib/observability/browser.dom.test.ts b/src/web/src/lib/observability/browser.dom.test.ts
index 162bf4b44..d05685b12 100644
--- a/src/web/src/lib/observability/browser.dom.test.ts
+++ b/src/web/src/lib/observability/browser.dom.test.ts
@@ -1,7 +1,6 @@
import { afterEach, beforeEach, expect, it, vi } from "vitest"
import { act } from "@/test/react-dom-harness"
-import type { Faro } from "@grafana/faro-web-sdk"
-import { installBrowserObservers } from "./browser"
+import { installLongTaskObserver } from "./browser"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "./telemetry"
const events: Array<{ name: string; attributes: Record<string, string> }> = []
@@ -10,62 +9,36 @@ beforeEach(() => {
events.length = 0
act(() => configureTelemetry({ session_id: "browser-session" }, true))
installTelemetrySink(event => events.push(event))
- vi.spyOn(performance, "getEntriesByType").mockReturnValue([])
})
afterEach(() => { dispose?.(); dispose = undefined; retireTelemetry(); vi.unstubAllGlobals(); vi.restoreAllMocks() })
-it("redacts browser errors and rejections, excludes private frames and stops retired listeners", () => {
- const pushError = vi.fn(), faro = { api: { pushError } } as unknown as Faro
- dispose = installBrowserObservers(faro, "https://collector.example/collect/public")
- const prevent = (event: Event) => event.preventDefault()
- window.addEventListener("error", prevent)
- try {
- window.dispatchEvent(new ErrorEvent("error", { error: new TypeError("private-body"), message: "private-body", filename: window.location.origin + "/_next/static/chunks/a.js?token=private", lineno: 4, colno: 8, cancelable: true }))
- window.dispatchEvent(new ErrorEvent("error", { filename: "http://[", cancelable: true }))
- const rejection = new Event("unhandledrejection")
- Object.defineProperty(rejection, "reason", { value: new RangeError("private-rejection") })
- window.dispatchEvent(rejection)
- expect(pushError).toHaveBeenCalledTimes(3)
- expect(pushError.mock.calls[0]![1]).toMatchObject({ type: "TypeError", stackFrames: [{ filename: window.location.origin + "/_next/static/chunks/a.js", function: "[redacted]", lineno: 4, colno: 8 }] })
- expect(pushError.mock.calls[1]![1]).toMatchObject({ type: "Error", stackFrames: [] })
- expect(pushError.mock.calls[2]![1]).toMatchObject({ type: "RangeError", stackFrames: [] })
- expect(pushError.mock.calls.every(([error]) => error.message === "[redacted]")).toBe(true)
- retireTelemetry(); configureTelemetry({ session_id: "new-session" }, true)
- window.dispatchEvent(rejection)
- window.dispatchEvent(new ErrorEvent("error", { cancelable: true }))
- expect(pushError).toHaveBeenCalledTimes(3)
- } finally { window.removeEventListener("error", prevent) }
-})
-it("reports eligible resources with explicit kinds while excluding collector, old entries and retired callbacks", () => {
- const callbacks = new Map<string, (list: PerformanceObserverEntryList) => void>(), disconnect = vi.fn()
+it("reports only admitted long tasks and disconnects the retired observer", () => {
+ let callback!: (list: PerformanceObserverEntryList) => void
+ const disconnect = vi.fn()
class Observer {
- static supportedEntryTypes = ["resource", "longtask"]
- constructor(private callback: (list: PerformanceObserverEntryList) => void) {}
- observe({ type }: { type: string }) { callbacks.set(type, this.callback) }
+ static supportedEntryTypes = ["longtask"]
+ constructor(handler: typeof callback) { callback = handler }
+ observe = vi.fn()
disconnect = disconnect
}
vi.stubGlobal("PerformanceObserver", Observer)
- dispose = installBrowserObservers({ api: { pushError: vi.fn() } } as unknown as Faro, "https://collector.example/collect/public", 10)
- const resource = (name: string, startTime = 20) => ({ name, startTime, duration: 8, transferSize: 12, encodedBodySize: 10, decodedBodySize: 14 }) as PerformanceEntry
- const send = (type: string, entries: PerformanceEntry[]) => callbacks.get(type)!({ getEntries: () => entries } as PerformanceObserverEntryList)
- send("resource", [resource("https://collector.example/collect/public"), resource("/collect/private"), resource("/api/agents", 0), resource("http://["), resource("/api/agents?token=private"), resource("/c/me/machines?_rsc=private"), resource("/_next/static/chunks/a.js?token=private"), resource("https://private.example/private")])
- expect(events.filter(event => event.name === "resource.finish").map(event => event.attributes.request_kind)).toEqual(["api", "rsc", "resource", "external"])
- expect(JSON.stringify(events)).not.toContain("private")
- send("longtask", [resource("longtask", 0), resource("longtask", 20)])
- expect(events.filter(event => event.name === "main_thread.longtask")).toHaveLength(1)
- const count = events.length
+ dispose = installLongTaskObserver(10)
+ const send = (startTime: number) => callback({ getEntries: () => [{ startTime, duration: 80 }] } as PerformanceObserverEntryList)
+ send(0); send(20)
+ expect(events).toHaveLength(1)
+ expect(events[0]).toMatchObject({ name: "main_thread.longtask", attributes: { start_ms: "20", duration_ms: "80" } })
retireTelemetry(); configureTelemetry({ session_id: "new-session" }, true)
- send("resource", [resource("/api/agents")])
- expect(events).toHaveLength(count)
+ send(30)
+ expect(events).toHaveLength(1)
dispose(); dispose = undefined
- expect(disconnect).toHaveBeenCalledTimes(2)
+ expect(disconnect).toHaveBeenCalledOnce()
})
-it("reports unsupported and throwing observer capabilities without breaking content", () => {
+it.each(["unsupported", "throwing"])("reports a %s platform without breaking content", mode => {
class Observer {
- static supportedEntryTypes = ["resource", "longtask"]
+ static supportedEntryTypes = mode === "unsupported" ? [] : ["longtask"]
constructor() { throw new Error("unavailable") }
}
vi.stubGlobal("PerformanceObserver", Observer)
- dispose = installBrowserObservers({ api: { pushError: vi.fn() } } as unknown as Faro, "https://collector.example/collect/public")
- expect(events).toHaveLength(2)
- expect(events.every(event => event.name === "telemetry.coverage" && event.attributes.capability === "unavailable")).toBe(true)
+ dispose = installLongTaskObserver()
+ expect(events).toHaveLength(1)
+ expect(events[0]).toMatchObject({ name: "telemetry.coverage", attributes: { capability: "unavailable" } })
})
diff --git a/src/web/src/lib/observability/browser.ts b/src/web/src/lib/observability/browser.ts
index f8ce92aae..1040ae1d7 100644
--- a/src/web/src/lib/observability/browser.ts
+++ b/src/web/src/lib/observability/browser.ts
@@ -1,50 +1,20 @@
-import type { Faro } from "@grafana/faro-web-sdk"
-import { routeTemplate } from "./coverage"
import { emitTelemetry, isTelemetryEligible, telemetryGeneration } from "./telemetry"
-export function installBrowserObservers(faro: Faro, collector: string, since = 0) {
+export function installLongTaskObserver(since = 0) {
const generation = telemetryGeneration()
- const active = () => isTelemetryEligible() && generation === telemetryGeneration()
- const error = (event: ErrorEvent) => {
- if (!active()) return
- const frames = []
- try {
- const url = new URL(event.filename, window.location.origin)
- if (url.origin === window.location.origin && /^\/(?:blog-static\/)?_next\/static\/[a-zA-Z0-9_./-]+\.js$/.test(url.pathname)) frames.push({ filename: url.origin + url.pathname, function: "[redacted]", lineno: event.lineno, colno: event.colno })
- } catch {}
- faro.api.pushError(new Error("[redacted]"), { type: event.error instanceof Error ? event.error.name : "Error", stackFrames: frames, skipDedupe: true })
+ if (typeof PerformanceObserver === "undefined" || !PerformanceObserver.supportedEntryTypes?.includes("longtask")) {
+ emitTelemetry("telemetry.coverage", { capability: "unavailable", phase: "background" })
+ return () => {}
}
- const rejection = (event: PromiseRejectionEvent) => {
- if (!active()) return
- faro.api.pushError(new Error("[redacted]"), { type: event.reason instanceof Error ? event.reason.name : "Error", stackFrames: [], skipDedupe: true })
+ try {
+ const observer = new PerformanceObserver(list => {
+ if (!isTelemetryEligible() || generation !== telemetryGeneration()) return
+ for (const entry of list.getEntries()) if (entry.startTime >= since) emitTelemetry("main_thread.longtask", { start_ms: entry.startTime, duration_ms: entry.duration, phase: "background", capability: "limited" })
+ })
+ observer.observe({ type: "longtask", buffered: true })
+ return () => observer.disconnect()
+ } catch {
+ emitTelemetry("telemetry.coverage", { capability: "unavailable", phase: "background" })
+ return () => {}
}
- window.addEventListener("error", error)
- window.addEventListener("unhandledrejection", rejection)
- const observers: PerformanceObserver[] = []
- const observe = (type: string, callback: (entry: PerformanceEntry) => void) => {
- if (typeof PerformanceObserver === "undefined" || !PerformanceObserver.supportedEntryTypes?.includes(type)) {
- emitTelemetry("telemetry.coverage", { capability: "unavailable", phase: "transport", request_kind: type === "resource" ? "resource" : "unknown" })
- return
- }
- try {
- const observer = new PerformanceObserver(list => { if (active()) for (const entry of list.getEntries()) callback(entry) })
- observer.observe({ type, buffered: true })
- observers.push(observer)
- } catch { emitTelemetry("telemetry.coverage", { capability: "unavailable", phase: "transport" }) }
- }
- observe("resource", entry => {
- try {
- const url = new URL(entry.name, window.location.origin)
- if (url.href === collector || url.pathname.startsWith("/collect/")) return
- const resource = entry as PerformanceResourceTiming
- if (resource.startTime < since) return
- const template = routeTemplate(url.href, window.location.origin)
- const kind = url.origin !== window.location.origin ? "external" : url.searchParams.has("_rsc") ? "rsc" : url.pathname.startsWith("/api/") ? "api" : "resource"
- emitTelemetry("resource.finish", { route_template: template, request_kind: kind, start_ms: resource.startTime, duration_ms: resource.duration, transfer_bytes: resource.transferSize, encoded_bytes: resource.encodedBodySize, decoded_bytes: resource.decodedBodySize, cache_stage: "http", source: "unknown", capability: "limited", phase: "background", outcome: "observed" })
- } catch {}
- })
- observe("longtask", entry => { if (entry.startTime >= since) emitTelemetry("main_thread.longtask", { start_ms: entry.startTime, duration_ms: entry.duration, phase: "background", capability: "limited" }) })
- const navigation = performance.getEntriesByType("navigation")[0] as PerformanceNavigationTiming | undefined
- if (navigation && navigation.startTime >= since) emitTelemetry("resource.finish", { route_template: routeTemplate(window.location.href, window.location.origin), request_kind: "document", start_ms: navigation.startTime, duration_ms: navigation.duration, phase: "background", capability: "limited", source: "unknown", outcome: "observed" })
- return () => { window.removeEventListener("error", error); window.removeEventListener("unhandledrejection", rejection); for (const observer of observers) observer.disconnect() }
}
diff --git a/src/web/src/lib/observability/build.test.ts b/src/web/src/lib/observability/build.test.ts
new file mode 100644
index 000000000..58e6d0ab1
--- /dev/null
+++ b/src/web/src/lib/observability/build.test.ts
@@ -0,0 +1,10 @@
+import { expect, it } from "vitest"
+import { resolveObservationBuild } from "./build"
+
+it("uses a full CI source SHA and marks absent or invalid provenance explicitly", () => {
+ expect(resolveObservationBuild({ WORKERS_CI_COMMIT_SHA: "a".repeat(40), NEXT_PUBLIC_FARO_RELEASE: "b".repeat(40), NEXT_PUBLIC_FARO_ENVIRONMENT: "qa" }))
+ .toEqual({ release: "a".repeat(40), environment: "qa", release_status: "present", environment_status: "present" })
+ expect(resolveObservationBuild({ WORKERS_CI_COMMIT_SHA: "abbreviated", GITHUB_SHA: "b".repeat(40), NEXT_PUBLIC_FARO_ENVIRONMENT: "development" }).release).toBe("b".repeat(40))
+ expect(resolveObservationBuild({ NEXT_PUBLIC_FARO_RELEASE: "0.1.46", NEXT_PUBLIC_FARO_ENVIRONMENT: "private" }))
+ .toEqual({ release: undefined, environment: undefined, release_status: "missing", environment_status: "missing" })
+})
diff --git a/src/web/src/lib/observability/build.ts b/src/web/src/lib/observability/build.ts
new file mode 100644
index 000000000..021349f4b
--- /dev/null
+++ b/src/web/src/lib/observability/build.ts
@@ -0,0 +1,8 @@
+import { cleanAttributes } from "./schema"
+
+export function resolveObservationBuild(env: Record<string, string | undefined>) {
+ const release = [env.WORKERS_CI_COMMIT_SHA, env.CF_PAGES_COMMIT_SHA, env.GITHUB_SHA, env.NEXT_PUBLIC_FARO_RELEASE]
+ .find(value => value && /^[0-9a-f]{40}$/.test(value))
+ const environment = cleanAttributes({ environment: env.NEXT_PUBLIC_FARO_ENVIRONMENT }).environment
+ return { release, environment, release_status: release ? "present" : "missing", environment_status: environment ? "present" : "missing" }
+}
diff --git a/src/web/src/lib/observability/client-document-restore.dom.test.tsx b/src/web/src/lib/observability/client-document-restore.dom.test.tsx
index 5182bf19f..2c3523c91 100644
--- a/src/web/src/lib/observability/client-document-restore.dom.test.tsx
+++ b/src/web/src/lib/observability/client-document-restore.dom.test.tsx
@@ -4,7 +4,7 @@ import type { Faro } from "@grafana/faro-web-sdk"
import { afterEach, expect, it, vi } from "vitest"
import { act, render } from "@/test/react-dom-harness"
import { announceAnalyticsConsent } from "../analytics-consent"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
const native = vi.hoisted(() => ({ faro: undefined as Faro | undefined }))
const router = vi.hoisted(() => ({ pathname: "/" }))
@@ -53,7 +53,7 @@ it("retires the old document before native resume, then exports one original Bac
queryClient.setQueryData([forum], [{ id: "post-a" }]); queryClient.setQueryData([text], [])
function Content() {
const query = useQuery({ queryKey: [router.pathname], queryFn: async () => [], staleTime: Infinity })
- useObservedQueryRegion(router.pathname === forum ? "forum" : "messages", query, query.data?.length)
+ useObservedRegion(router.pathname === forum ? "forum" : "messages", !query.isPending && query.data !== undefined, query.data?.length)
return <p>{router.pathname === forum ? "forum" : "empty text"}</p>
}
function Root() {
diff --git a/src/web/src/lib/observability/client.dom.test.ts b/src/web/src/lib/observability/client.dom.test.ts
index 633d41d0d..9264da2fb 100644
--- a/src/web/src/lib/observability/client.dom.test.ts
+++ b/src/web/src/lib/observability/client.dom.test.ts
@@ -3,11 +3,11 @@ import { act } from "@/test/react-dom-harness"
import type { Faro } from "@grafana/faro-web-sdk"
import { announceAnalyticsConsent } from "../analytics-consent"
-const native = vi.hoisted(() => ({ faro: undefined as Faro | undefined, release: undefined as (() => void) | undefined, vitals: undefined as unknown }))
+const native = vi.hoisted(() => ({ faro: undefined as Faro | undefined, release: undefined as (() => void) | undefined, vitals: undefined as unknown, initialize: undefined as unknown, defaults: [] as string[] }))
vi.mock("@grafana/faro-web-sdk", async importOriginal => {
const real = await importOriginal<typeof import("@grafana/faro-web-sdk")>()
await new Promise<void>(resolve => { native.release = resolve })
- return { ...real, getWebInstrumentations: (...args: Parameters<typeof real.getWebInstrumentations>) => { const all = real.getWebInstrumentations(...args); native.vitals = all.find(item => item.name.endsWith("instrumentation-web-vitals")); return all }, initializeFaro: (...args: Parameters<typeof real.initializeFaro>) => { native.faro = real.initializeFaro(...args); return native.faro } }
+ return { ...real, getWebInstrumentations: (...args: Parameters<typeof real.getWebInstrumentations>) => { const all = real.getWebInstrumentations(...args); native.vitals = all.find(item => item.name.endsWith("instrumentation-web-vitals")); native.initialize = (native.vitals as { initialize?: unknown })?.initialize; native.defaults = all.map(item => item.name); return all }, initializeFaro: (...args: Parameters<typeof real.initializeFaro>) => { native.faro = real.initializeFaro(...args); return native.faro } }
})
afterEach(() => { document.cookie = "alook_analytics_consent=v1.denied; path=/"; announceAnalyticsConsent("denied"); vi.useRealTimers(); vi.unstubAllEnvs(); vi.unstubAllGlobals() })
it("real Faro sessions align after interrupted import, regrant, account changes, expiry and reload metadata", async () => {
@@ -36,6 +36,8 @@ it("real Faro sessions align after interrupted import, regrant, account changes,
native.release?.()
for (let i = 0; i < 10; i++) await vi.advanceTimersByTimeAsync(0)
expect(isTelemetryEligible()).toBe(true)
+ expect((native.vitals as { initialize: unknown }).initialize).toBe(native.initialize)
+ expect(native.defaults).toEqual(expect.arrayContaining(["@grafana/faro-web-sdk:instrumentation-errors", "@grafana/faro-web-sdk:instrumentation-performance", "@grafana/faro-web-sdk:instrumentation-navigation"]))
const session = native.faro!.api.getSession()!.id
expect(session).not.toBe("previous-document")
emitTelemetry("business.result", { outcome: "success" })
@@ -56,6 +58,7 @@ it("real Faro sessions align after interrupted import, regrant, account changes,
router.onRouterTransitionStart("/c/me/machines")
const gesture = navigationForHref("/c/me/machines")!
finishAction(gesture, "success")
+ button.addEventListener("click", () => queueMicrotask(() => { button.textContent = "Command complete" }))
button.click()
await vi.advanceTimersByTimeAsync(1500)
expect(JSON.stringify(sent.slice(beforeGesture))).toContain("ui_interaction")
@@ -65,7 +68,7 @@ it("real Faro sessions align after interrupted import, regrant, account changes,
const beforeVitals = sent.length
vitals.api.pushMeasurement({ type: "web-vitals", values: { lcp: 12, cls: 0, private: 88, inp: Infinity } })
await vi.advanceTimersByTimeAsync(1500)
- expect(JSON.stringify(sent.slice(beforeVitals))).toContain('"lcp":12')
+ expect(JSON.stringify(sent.slice(beforeVitals))).not.toContain('"lcp":12')
expect(JSON.stringify(sent.slice(beforeVitals))).not.toContain('"private":88')
collectorStatus = 429
emitTelemetry("business.result", { outcome: "error" })
@@ -74,8 +77,8 @@ it("real Faro sessions align after interrupted import, regrant, account changes,
const beforeRecovery = sent.length
emitTelemetry("business.result", { outcome: "success" })
await vi.advanceTimersByTimeAsync(3000)
- expect(JSON.stringify(sent.slice(beforeRecovery))).toContain("delivery_failure_count")
- expect(JSON.stringify(sent.slice(beforeRecovery))).toContain("rate_limit")
+ expect(JSON.stringify(sent.slice(beforeRecovery))).toContain("business.result")
+ expect(JSON.stringify(sent.slice(beforeRecovery))).not.toContain("delivery_failure_count")
controls.remove()
const generation = telemetryGeneration()
emitTelemetry("business.result", { action_name: "message.edit", outcome: "success" })
@@ -88,6 +91,8 @@ it("real Faro sessions align after interrupted import, regrant, account changes,
await vi.advanceTimersByTimeAsync(1500)
expect(JSON.stringify(sent.slice(beforeAccount))).not.toContain("message.edit")
expect(JSON.stringify(sent.slice(beforeAccount))).toContain("message.pin")
+ expect((native.vitals as { initialize: unknown }).initialize).toBe(native.initialize)
+ expect(native.faro!.instrumentations.instrumentations.filter(item => item.name.endsWith("instrumentation-web-vitals"))).toHaveLength(1)
const accountSession = native.faro!.api.getSession()!.id
vi.setSystemTime(Date.now() + 5 * 60 * 60 * 1000)
const beforeExpiry = sent.length
diff --git a/src/web/src/lib/observability/client.ts b/src/web/src/lib/observability/client.ts
index 30e590791..0f09ddc7a 100644
--- a/src/web/src/lib/observability/client.ts
+++ b/src/web/src/lib/observability/client.ts
@@ -1,17 +1,18 @@
-import type { Faro, Instrumentation, FetchTransport } from "@grafana/faro-web-sdk"
+import type { Faro, FetchTransport } from "@grafana/faro-web-sdk"
import type { getDefaultOTELInstrumentations } from "@grafana/faro-web-tracing"
import { isMobile, isTauri } from "@alook/shared"
import { ANALYTICS_CONSENT_CHANGE_EVENT, hasAnalyticsConsent } from "../analytics-consent"
import { capabilityLimits, routeTemplate } from "./coverage"
-import { actionSequence, beginNavigation, clearActions, finishAction, installActionSpans, startAction, telemetryId } from "./context"
+import { actionSequence, beginNavigation, clearActions, installActionSpans, telemetryId } from "./context"
import { alignInitialTelemetrySession, configureTelemetry, emitTelemetry, installTelemetrySink, isTelemetryEligible, telemetryGeneration, reportTelemetryDrops, retireTelemetry } from "./telemetry"
import { sanitizeItem } from "./sanitize"
-import { installBrowserObservers } from "./browser"
+import { installLongTaskObserver } from "./browser"
import { resolveCommunityModulePlan } from "../community/community-route"
-import { cleanAttributes } from "./schema"
+import { observeTransportSpan, finishTransportSpan, installNavigationFetchContext } from "./requests"
import { resolveFrontendIdentity } from "./runtime"
+import { resolveObservationBuild } from "./build"
-type BuildProfile = { url?: string; environment?: string; release?: string }
+type BuildProfile = { url?: string; environment?: string; release?: string; release_status: string; environment_status: string }
function validBuildProfile(profile: BuildProfile) {
try {
const url = new URL(profile.url ?? "")
@@ -20,7 +21,7 @@ function validBuildProfile(profile: BuildProfile) {
}
const build: BuildProfile = {
url: process.env.NEXT_PUBLIC_FARO_COLLECTOR_URL,
- ...cleanAttributes({ environment: process.env.NEXT_PUBLIC_FARO_ENVIRONMENT, release: process.env.NEXT_PUBLIC_FARO_RELEASE }),
+ ...resolveObservationBuild({ NEXT_PUBLIC_FARO_ENVIRONMENT: process.env.NEXT_PUBLIC_FARO_ENVIRONMENT, NEXT_PUBLIC_FARO_RELEASE: process.env.NEXT_PUBLIC_FARO_RELEASE }),
}
let started = false
let documentSuspended = false
@@ -31,12 +32,12 @@ let sessionId = ""
let load: Promise<void> | undefined
let pendingReconcile = false
let pendingInitialNavigation = false
-let deliveryFailures = 0
-let deliveryFailureReason = "unknown"
let makeTransport: (() => FetchTransport) | undefined
+let stopNavigationFetch: (() => void) | undefined
let stopBrowser: (() => void) | undefined
+let documentVitalsEligible = hasAnalyticsConsent()
let eligibleSince = 0
-let vitalsInitialized = false
+let eligibleTimestamp = Date.now() - (typeof performance === "undefined" ? 0 : performance.now())
let identity = resolveFrontendIdentity("web", false, false, process.env.NEXT_PUBLIC_APP_VERSION)
let userKey: string | undefined
let identityEstablished = false
@@ -44,10 +45,11 @@ let identityRevision = 0
let mayResumeNativeSession = hasAnalyticsConsent()
let clearNativeSession: (() => void) | undefined
let httpInstrumentations: ReturnType<typeof getDefaultOTELInstrumentations> = []
-let webInstrumentations: Instrumentation[] = []
const pageId = telemetryId()
function deactivate() {
+ stopNavigationFetch?.()
+ stopNavigationFetch = undefined
retireTelemetry()
clearActions()
installActionSpans(undefined)
@@ -58,12 +60,10 @@ function deactivate() {
controller?.abort()
transport = undefined
controller = undefined
- deliveryFailures = 0
- deliveryFailureReason = "unknown"
for (const instrumentation of httpInstrumentations.flat()) instrumentation.disable()
}
function configure() {
- configureTelemetry({ release: build.release, environment: build.environment, ...identity, page_instance_id: pageId, session_id: sessionId, user_key: userKey }, true)
+ configureTelemetry({ release: build.release, environment: build.environment, release_status: build.release_status, environment_status: build.environment_status, ...identity, page_instance_id: pageId, session_id: sessionId, user_key: userKey }, true)
}
async function activate() {
if (documentSuspended || !hasAnalyticsConsent() || !validBuildProfile(build)) return
@@ -83,16 +83,7 @@ async function activate() {
mayResumeNativeSession = false
makeTransport = () => {
controller = new AbortController()
- const ownerSession = sessionId
- class ObservedFetchTransport extends NativeFetchTransport {
- override logError(...args: Parameters<FetchTransport["logError"]>) {
- if (ownerSession !== sessionId || !isTelemetryEligible()) return
- deliveryFailures = Math.min(deliveryFailures + 1, 1_000_000)
- const detail = args.find(value => value && typeof value === "object") as Record<string, unknown> | undefined
- deliveryFailureReason = detail?.status === 429 ? "rate_limit" : detail?.kind === "http" || typeof detail?.status === "number" ? "http_error" : detail?.kind === "timeout" ? "timeout" : detail?.kind === "aborted" ? "abort" : String(args[0]).includes("retries exhausted") ? "retries_exhausted" : "unknown"
- }
- }
- return new ObservedFetchTransport({ url: build.url!, bufferSize: 16, concurrency: 2, retry: { maxAttempts: 2, initialBackoffMs: 1000, maxBackoffMs: 5000 }, requestTimeoutMs: 5000, requestOptions: { signal: controller.signal, credentials: "omit" } })
+ return new NativeFetchTransport({ url: build.url!, bufferSize: 16, concurrency: 2, retry: { maxAttempts: 2, initialBackoffMs: 1000, maxBackoffMs: 5000 }, requestTimeoutMs: 5000, requestOptions: { signal: controller.signal, credentials: "omit" } })
}
transport = makeTransport()
if (!faro) {
@@ -100,24 +91,8 @@ async function activate() {
let storedScope: string | undefined
try { storedScope = VolatileSessionsManager.fetchUserSession()?.sessionMeta?.attributes?.alook_account } catch { clearNativeSession() }
if (!mayResume || storedScope !== accountScope) clearNativeSession()
- httpInstrumentations = createHttp({ ignoreUrls: [build.url!], propagateTraceHeaderCorsUrls: [new RegExp("^" + window.location.origin.replace(/[.*+?^$(){}|[\]\\]/g, "\\$&") + "/")] })
- const defaults = getWebInstrumentations({ captureConsole: false, enableContentSecurityPolicyInstrumentation: false, enablePerformanceInstrumentation: false })
- const vitals = defaults.find(instrumentation => instrumentation.name.endsWith("instrumentation-web-vitals"))
- if (vitals) {
- const initialize = vitals.initialize
- vitals.initialize = function () {
- if (vitalsInitialized) return
- vitalsInitialized = true
- const original = this.api.pushMeasurement
- this.api = { ...this.api, pushMeasurement: (measurement, options) => {
- if (!hasAnalyticsConsent() || !isTelemetryEligible()) return
- const values = Object.fromEntries(Object.entries(measurement.values).filter(([key,value]) => /^(lcp|cls|inp|fcp|ttfb)$/.test(key) && typeof value === "number" && Number.isFinite(value)))
- if (Object.keys(values).length) original({ type: "web-vitals", values }, { skipDedupe: options?.skipDedupe })
- } }
- initialize.call(this)
- }
- }
- webInstrumentations = defaults.filter(instrumentation => !instrumentation.name.endsWith("instrumentation-errors") && !instrumentation.name.endsWith("instrumentation-navigation"))
+ httpInstrumentations = createHttp({ fetchInstrumentationOptions: { requestHook: observeTransportSpan, applyCustomAttributesOnSpan: (span, _request, result) => finishTransportSpan(span, result) }, ignoreUrls: [build.url!], propagateTraceHeaderCorsUrls: [new RegExp("^" + window.location.origin.replace(/[.*+?^$(){}|[\]\\]/g, "\\$&") + "/")] })
+ const defaults = getWebInstrumentations({ captureConsole: false, enableContentSecurityPolicyInstrumentation: false, enablePerformanceInstrumentation: true })
const initialTransport = transport
faro = initializeFaro({
app: { name: "alook-web", version: identity.app_version, release: build.release, environment: build.environment },
@@ -125,13 +100,15 @@ async function activate() {
dedupe: false,
internalLoggerLevel: InternalLoggerLevel.OFF,
transports: [transport],
- instrumentations: [...webInstrumentations, new TracingInstrumentation({ instrumentations: httpInstrumentations })],
+ instrumentations: [...defaults, new TracingInstrumentation({ instrumentations: httpInstrumentations })],
sessionTracking: { enabled: true, persistent: false, samplingRate: 1, generateSessionId: telemetryId, session: { attributes: { alook_account: accountScope } }, onSessionChange: (_previous, next) => { if (next.id) adoptNativeSession(next.id) } },
pageTracking: { generatePageId: () => pageId },
trackGeolocation: false,
+ trackResources: true,
+ ignoreUrls: [build.url!],
webVitalsInstrumentation: { trackAttributionSources: false },
batching: { enabled: true, itemLimit: 40, sendTimeout: 1000 },
- beforeSend: item => hasAnalyticsConsent() && isTelemetryEligible() ? sanitizeItem(item, sessionId, window.location.origin, identity) : null,
+ beforeSend: item => hasAnalyticsConsent() && isTelemetryEligible() ? sanitizeItem(item, sessionId, window.location.origin, identity, eligibleTimestamp, documentVitalsEligible) : null,
})
const initialized = faro?.api.getSession()
if (!faro || !initialized?.id || !/^[a-zA-Z0-9_-]{1,80}$/.test(initialized.id) || initialized.attributes?.alook_account !== accountScope) { deactivate(); return }
@@ -153,22 +130,19 @@ async function activate() {
faro.api.setSession({ id: capturedSession, attributes: { isSampled: "true", alook_account: userKey ?? "anon" } })
}
if (!faro) { deactivate(); return }
- installActionSpans((name, attributes, startTime) => {
+ installActionSpans((name, attributes, startTime, links) => {
if (!isTelemetryEligible()) return
- return faro?.api.getOTEL()?.trace.getTracer("alook.frontend").startSpan(name, { attributes, startTime })
+ return faro?.api.getOTEL()?.trace.getTracer("alook.frontend").startSpan(name, { attributes, startTime, links })
})
connectSink()
- stopBrowser = installBrowserObservers(faro, build.url!, eligibleSince)
+ stopNavigationFetch = installNavigationFetchContext()
+ stopBrowser = installLongTaskObserver(eligibleSince)
+ if (!documentVitalsEligible) emitTelemetry("telemetry.coverage", { capability: "limited", request_kind: "document", phase: "background" })
emitTelemetry("telemetry.coverage", { collection_rate: 1, eligibility: "eligible", capability: "available", count: Object.keys(capabilityLimits).length })
}
function connectSink() {
installTelemetrySink(event => {
if (!hasAnalyticsConsent() || !isTelemetryEligible()) return
- if (deliveryFailures) {
- const count = deliveryFailures
- deliveryFailures = 0
- faro?.api.pushEvent("telemetry.coverage", { delivery_failure_count: String(count), delivery_failure_reason: deliveryFailureReason, outcome: "error", capability: "limited", session_id: sessionId, ...identity }, "alook.frontend", { skipDedupe: true })
- }
faro?.api.pushEvent(event.name, event.attributes, "alook.frontend", { skipDedupe: true, timestampOverwriteMs: event.timestamp })
})
}
@@ -180,19 +154,18 @@ function adoptNativeSession(next: string) {
if (transport) faro?.transports.remove(transport)
controller?.abort()
sessionId = next
- deliveryFailures = 0
- deliveryFailureReason = "unknown"
eligibleSince = performance.now()
+ eligibleTimestamp = Date.now()
configure()
transport = makeTransport?.()
if (transport) faro?.transports.add(transport)
connectSink()
- if (faro) stopBrowser = installBrowserObservers(faro, build.url!, eligibleSince)
+ if (faro) stopBrowser = installLongTaskObserver(eligibleSince)
emitTelemetry("telemetry.coverage", { eligibility: "eligible", capability: "available", phase: "auth" })
}
function reconcile() {
if (documentSuspended) return
- if (!hasAnalyticsConsent()) { mayResumeNativeSession = false; clearNativeSession?.(); deactivate(); return }
+ if (!hasAnalyticsConsent()) { documentVitalsEligible = false; mayResumeNativeSession = false; clearNativeSession?.(); deactivate(); return }
if (load) { pendingReconcile = true; return }
if (isTelemetryEligible()) return
load = activate().catch(() => { deactivate() }).finally(() => {
@@ -209,6 +182,7 @@ export function setTelemetryUser(key: string | null) {
if (!firstIdentity || faro) { mayResumeNativeSession = false; clearNativeSession?.() }
const wasEligible = isTelemetryEligible()
deactivate()
+ if (!firstIdentity) { eligibleSince = performance.now(); eligibleTimestamp = Date.now() }
userKey = next
sessionId = telemetryId()
if (wasEligible || hasAnalyticsConsent()) reconcile()
@@ -222,13 +196,14 @@ export function bootstrapObservability(nextSurface: "web" | "blog") {
started = true
identity = resolveFrontendIdentity(nextSurface, isTauri(), isMobile(), process.env.NEXT_PUBLIC_APP_VERSION)
pendingInitialNavigation = hasAnalyticsConsent() && validBuildProfile(build)
- window.addEventListener(ANALYTICS_CONSENT_CHANGE_EVENT, () => { eligibleSince = performance.now(); if (!hasAnalyticsConsent()) pendingInitialNavigation = false; reconcile() })
+ window.addEventListener(ANALYTICS_CONSENT_CHANGE_EVENT, () => { eligibleSince = performance.now(); eligibleTimestamp = Date.now(); if (!hasAnalyticsConsent()) pendingInitialNavigation = false; reconcile() })
window.addEventListener("popstate", () => { if (isTelemetryEligible()) beginNavigation(window.location.href) })
document.addEventListener("visibilitychange", () => {
if (isTelemetryEligible()) { reportTelemetryDrops("transport_failure"); emitTelemetry("telemetry.coverage", { visibility: document.visibilityState, capability: "limited" }) }
})
window.addEventListener("pagehide", () => {
documentSuspended = true
+ documentVitalsEligible = false
pendingInitialNavigation = false
deactivate()
}, { capture: true })
@@ -239,6 +214,7 @@ export function bootstrapObservability(nextSurface: "web" | "blog") {
mayResumeNativeSession = false
clearNativeSession?.()
eligibleSince = performance.now()
+ eligibleTimestamp = Date.now()
deactivate()
reconcile()
}, { capture: true })
@@ -251,9 +227,7 @@ export function bootstrapObservability(nextSurface: "web" | "blog") {
const before = actionSequence(), generation = telemetryGeneration()
queueMicrotask(() => {
if (!isTelemetryEligible() || generation !== telemetryGeneration() || actionSequence() !== before) return
- const action = startAction("ui_interaction", { phase: "interaction" })
- if (!faro?.api.getActiveUserAction()) faro?.api.startUserAction("ui_interaction", { session_id: sessionId })
- finishAction(action, "observed", { phase: "interaction" })
+ try { if (!faro?.api.getActiveUserAction()) faro?.api.startUserAction("ui_interaction", { session_id: sessionId }) } catch {}
})
}
}, { capture: true, passive: true })
diff --git a/src/web/src/lib/observability/clock.ts b/src/web/src/lib/observability/clock.ts
new file mode 100644
index 000000000..17d24c26b
--- /dev/null
+++ b/src/web/src/lib/observability/clock.ts
@@ -0,0 +1,11 @@
+import type { HrTime } from "@opentelemetry/api"
+
+export function observationEpoch(now = performance.now()) {
+ return performance.timeOrigin + now
+}
+
+export function observationTime(now: number): HrTime {
+ const epoch = observationEpoch(now)
+ const seconds = Math.floor(epoch / 1000)
+ return [seconds, Math.floor((epoch - seconds * 1000) * 1e6)]
+}
diff --git a/src/web/src/lib/observability/context.test.ts b/src/web/src/lib/observability/context.test.ts
index 9bea133c0..75f29a680 100644
--- a/src/web/src/lib/observability/context.test.ts
+++ b/src/web/src/lib/observability/context.test.ts
@@ -1,7 +1,8 @@
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"
import { bindCommandAction, beginNavigation, clearActions, commandObservation, finishAction, startAction, installActionSpans, navigationForHref, commitNavigation, committedNavigationPathname } from "./context"
import { alignInitialTelemetrySession, configureTelemetry, emitTelemetry, installTelemetrySink, retireTelemetry, telemetryGeneration } from "./telemetry"
-import type { Span } from "@opentelemetry/api"
+import { observationEpoch, observationTime } from "./clock"
+import type { Span, HrTime } from "@opentelemetry/api"
import { startRequest, requestHeaders, readObservedResponse } from "./requests"
import { resolveActionName } from "./actions"
@@ -83,6 +84,24 @@ describe("original observation ownership", () => {
finishAction(c, "success"); finishAction(a, "success"); finishAction(b, "success")
expect(events.filter(event => event.name === "action.finish").map(event => event.attributes.outcome)).toEqual(["superseded", "superseded", "success"])
})
+ it("keeps business stage durations and epoch timestamps stable across wall-clock changes", () => {
+ let now = 100
+ vi.spyOn(performance, "now").mockImplementation(() => now)
+ const end = vi.fn()
+ const factory = vi.fn(() => ({ end, setAttribute: vi.fn() } as unknown as Span))
+ installActionSpans(factory)
+ const action = beginNavigation("/c/me/bots")!
+ now = 150
+ vi.setSystemTime(Date.now() - 86_400_000)
+ finishAction(action, "success", { phase: "primary", region: "bots" })
+ expect(events.at(-1)?.attributes.duration_ms).toBe("50")
+ expect(end).toHaveBeenCalledWith(observationTime(150))
+ const emitted: Array<{ timestamp: number }> = []
+ installTelemetrySink(event => emitted.push(event))
+ emitTelemetry("business.result", { outcome: "success" })
+ expect(emitted[0]?.timestamp).toBe(observationEpoch(150))
+ vi.restoreAllMocks()
+ })
it("bounds pre-SDK events and separates event drops from delivery failures", () => {
retireTelemetry(); configureTelemetry({ session_id: "session-c" }, true); events.length = 0
for (let i = 0; i < 300; i++) emitTelemetry("telemetry.coverage", { count: i })
@@ -195,10 +214,10 @@ describe("original observation ownership", () => {
const request = startRequest("/api/agents", { observation: { action: second, reason: "router" } })
vi.advanceTimersByTime(660)
const spans = [first, second].map((_action, index) => ({ spanContext: () => ({ traceId: String(index + 1).repeat(32), spanId: String(index + 1).repeat(16) }), setAttribute: vi.fn(), end: vi.fn() }))
- const factory = vi.fn((_name: string, _fields: Record<string, string>, _start: number) => spans[factory.mock.calls.length - 1] as unknown as Span)
+ const factory = vi.fn((_name: string, _fields: Record<string, string>, _start: HrTime) => spans[factory.mock.calls.length - 1] as unknown as Span)
installActionSpans(factory)
- expect(factory.mock.calls.map(call => call[2])).toEqual([performance.timeOrigin, performance.timeOrigin + second.start])
- expect(spans[0]!.end).toHaveBeenCalledWith(performance.timeOrigin + 240)
+ expect(factory.mock.calls.map(call => call[2])).toEqual([observationTime(0), observationTime(second.start)])
+ expect(spans[0]!.end).toHaveBeenCalledWith(observationTime(240))
expect(spans[0]!.setAttribute).toHaveBeenCalledWith("outcome", "success")
expect(spans[1]!.end).not.toHaveBeenCalled()
requestHeaders(request, new Response(null, { status: 204 }))
@@ -209,7 +228,7 @@ describe("original observation ownership", () => {
expect(owned.length).toBeGreaterThan(0)
expect(owned.every(event => event.attributes.trace_id === String(index + 1).repeat(32) && event.attributes.span_id === String(index + 1).repeat(16))).toBe(true)
}
- expect(spans[1]!.end).toHaveBeenCalledWith(performance.timeOrigin + 900)
+ expect(spans[1]!.end).toHaveBeenCalledWith(observationTime(900))
installActionSpans(factory)
expect(factory).toHaveBeenCalledTimes(2)
})
@@ -235,7 +254,7 @@ describe("original observation ownership", () => {
finishAction(action, "success", { phase: "primary", region: "bots" })
const end = vi.fn()
installActionSpans(() => ({ end, setAttribute: () => { throw new Error("unavailable") } } as unknown as Span))
- expect(end).toHaveBeenCalledWith(performance.timeOrigin + 50)
+ expect(end).toHaveBeenCalledWith(observationTime(50))
})
it("discards deferred binding when the factory retires its original account", () => {
retireTelemetry(); clearActions(); configureTelemetry({ session_id: "pending" }, true)
diff --git a/src/web/src/lib/observability/context.ts b/src/web/src/lib/observability/context.ts
index 7e2259be4..7d8355b24 100644
--- a/src/web/src/lib/observability/context.ts
+++ b/src/web/src/lib/observability/context.ts
@@ -1,12 +1,15 @@
-import type { Span } from "@opentelemetry/api"
+import { isSpanContextValid, type Span, type HrTime, type Link } from "@opentelemetry/api"
+import { observationTime } from "./clock"
import { routeTemplate, actionNames } from "./coverage"
import { emitTelemetry, isTelemetryEligible, isNativeSessionContinuation, telemetryGeneration, notifyObservation, linkQueuedActionTrace } from "./telemetry"
import { cleanAttributes, type Attributes } from "./schema"
-export type Action = { id: string; navigationId?: string; navigationKind?: "document" | "route"; name: string; route: string; start: number; generation: number; done: boolean; end?: number; outcome?: Attributes["outcome"]; span?: Span; timer?: ReturnType<typeof setTimeout> }
-let makeSpan: ((name: string, attributes: Record<string, string>, startTime: number) => Span | undefined) | undefined
+export type Action = { id: string; navigationId?: string; navigationKind?: "document" | "route"; name: string; route: string; start: number; generation: number; done: boolean; end?: number; outcome?: Attributes["outcome"]; span?: Span; timer?: ReturnType<typeof setTimeout>; prefetch?: Action }
+let makeSpan: ((name: string, attributes: Record<string, string>, startTime: HrTime, links: Link[]) => Span | undefined) | undefined
const live = new Set<Action>()
const deferred = new Set<Action>()
+let prefetch: Action | undefined
+let prefetchHref: string | undefined
let navigation: Action | undefined
let navigationHref: string | undefined
let committedHref: string | undefined
@@ -23,7 +26,7 @@ export function installActionSpans(factory: typeof makeSpan) {
deferred.delete(action)
if (!isTelemetryEligible() || action.generation !== telemetryGeneration()) continue
let span: Span | undefined
- try { span = factory(action.name, cleanAttributes(actionAttributes(action)), performance.timeOrigin + action.start) } catch {}
+ try { span = factory(action.name, cleanAttributes(actionAttributes(action)), observationTime(action.start), actionLinks(action)) } catch {}
if (!isTelemetryEligible() || action.generation !== telemetryGeneration()) { try { span?.end() } catch {}; continue }
action.span = span
const attributes = actionAttributes(action)
@@ -31,18 +34,18 @@ export function installActionSpans(factory: typeof makeSpan) {
if (action.done && action.end !== undefined) {
const outcome = cleanAttributes({ outcome: action.outcome }).outcome
if (outcome !== undefined) { try { span?.setAttribute("outcome", outcome) } catch {} }
- try { span?.end(performance.timeOrigin + action.end) } catch {}
+ try { span?.end(observationTime(action.end)) } catch {}
}
}
}
-export function startAction(name: string, attributes: Attributes = {}, start = performance.now()): Action | undefined {
+export function startAction(name: string, attributes: Attributes = {}, start = performance.now(), sourcePrefetch?: Action): Action | undefined {
if (!isTelemetryEligible() || !names.has(name)) return
if (live.size >= 64) finishAction(live.values().next().value, "cancelled")
- const action: Action = { id: telemetryId(), name, route: String(attributes.route_template ?? currentRoute()), start, generation: telemetryGeneration(), done: false }
+ const action: Action = { id: telemetryId(), name, route: String(attributes.route_template ?? currentRoute()), start, generation: telemetryGeneration(), done: false, prefetch: sourcePrefetch }
if (name === "navigation") { action.navigationId = telemetryId(); action.navigationKind = attributes.navigation_kind === "document" ? "document" : "route" }
const fields = actionAttributes(action)
- try { action.span = makeSpan?.(name, cleanAttributes(fields), performance.timeOrigin + action.start) } catch {}
+ try { action.span = makeSpan?.(name, cleanAttributes(fields), observationTime(action.start), actionLinks(action)) } catch {}
if (!isTelemetryEligible() || (action.generation !== telemetryGeneration() && !isNativeSessionContinuation(action.generation))) {
try { action.span?.end() } catch {}
return
@@ -50,7 +53,7 @@ export function startAction(name: string, attributes: Attributes = {}, start = p
action.generation = telemetryGeneration()
sequence++
live.add(action)
- if (action.navigationId && !action.span) {
+ if ((action.navigationId || name === "navigation.prefetch") && !action.span) {
if (deferred.size >= 64) deferred.delete(deferred.values().next().value!)
deferred.add(action)
}
@@ -58,10 +61,15 @@ export function startAction(name: string, attributes: Attributes = {}, start = p
action.timer = setTimeout(() => finishAction(action, "timeout"), 30_000)
return action
}
+function actionLinks(action: Action): Link[] {
+ const source = action.prefetch
+ if (!source || source.generation !== action.generation) return []
+ try { const context = source.span?.spanContext(); return context && isSpanContextValid(context) ? [{ context, attributes: { relationship: "prefetch" } }] : [] } catch { return [] }
+}
export function actionAttributes(action?: Action): Attributes {
let span
try { span = action?.span?.spanContext() } catch {}
- return action ? { trace_id: span?.traceId, span_id: span?.spanId, action_id: action.id, navigation_id: action.navigationId, navigation_kind: action.navigationKind, action_name: action.name, route_template: action.route, start_ms: action.start } : {}
+ return action ? { trace_id: span?.traceId, span_id: span?.spanId, action_id: action.id, navigation_id: action.navigationId, navigation_kind: action.navigationKind, prefetch_action_id: action.prefetch?.id, action_name: action.name, route_template: action.route, start_ms: action.start } : {}
}
export function finishAction(action: Action | undefined, outcome: Attributes["outcome"], fields: Attributes = {}) {
if (!action || action.done) return
@@ -79,12 +87,14 @@ export function finishAction(action: Action | undefined, outcome: Attributes["ou
try { action.span?.setAttribute("outcome", safeOutcome) } catch {}
}
}
- try { action.span?.end(performance.timeOrigin + action.end) } catch {}
+ try { action.span?.end(observationTime(action.end)) } catch {}
if (action === navigation) notifyObservation()
}
export function clearActions() {
for (const action of live) finishAction(action, "cancelled")
deferred.clear()
+ prefetch = undefined
+ prefetchHref = undefined
navigation = undefined
navigationHref = undefined
gesturePending = false
@@ -93,6 +103,18 @@ function normalizedHref(href: string) {
const origin = typeof window === "undefined" ? "https://alook.ai" : window.location.origin
try { const url = new URL(href, origin); return url.origin === origin ? url.pathname + url.search : undefined } catch { return undefined }
}
+export function beginNavigationPrefetch(href: string) {
+ const target = normalizedHref(href)
+ if (!target || !isTelemetryEligible()) return
+ if (prefetchHref === target && prefetch?.generation === telemetryGeneration() && !prefetch.done) return prefetch
+ finishAction(prefetch, "superseded")
+ prefetch = startAction("navigation.prefetch", { route_template: routeTemplate(href, typeof window === "undefined" ? "https://alook.ai" : window.location.origin) })
+ prefetchHref = target
+ return prefetch
+}
+export function prefetchForHref(href: string) {
+ return prefetch?.generation === telemetryGeneration() && prefetchHref === normalizedHref(href) ? prefetch : undefined
+}
export function beginNavigation(href: string, phase: "intent" | "transport" | "gesture" | "document" = "intent") {
if (!isTelemetryEligible()) return
const target = normalizedHref(href)
@@ -103,7 +125,8 @@ export function beginNavigation(href: string, phase: "intent" | "transport" | "g
return navigation
}
finishAction(navigation, "superseded")
- navigation = startAction("navigation", { route_template: routeTemplate(href, typeof window === "undefined" ? "https://alook.ai" : window.location.origin), navigation_kind: phase === "document" ? "document" : "route" }, phase === "document" ? 0 : performance.now())
+ navigation = startAction("navigation", { route_template: routeTemplate(href, typeof window === "undefined" ? "https://alook.ai" : window.location.origin), navigation_kind: phase === "document" ? "document" : "route" }, phase === "document" ? 0 : performance.now(), prefetchForHref(href))
+ if (navigation?.prefetch) finishAction(navigation.prefetch, "observed")
if (!navigation) return
navigationHref = target
gesturePending = phase === "gesture"
diff --git a/src/web/src/lib/observability/coverage.test.ts b/src/web/src/lib/observability/coverage.test.ts
index d6af4e7d3..d08adb988 100644
--- a/src/web/src/lib/observability/coverage.test.ts
+++ b/src/web/src/lib/observability/coverage.test.ts
@@ -2,7 +2,7 @@ import { readFileSync, readdirSync } from "node:fs"
import { resolve, relative } from "node:path"
import ts from "typescript"
import { expect, it } from "vitest"
-import { actionNames, pageRoutes, mutationCoverage, facadeCoverage } from "./coverage"
+import { actionNames, pageRoutes } from "./coverage"
import { actionVariants } from "./actions"
const web = resolve(import.meta.dirname, "../../..")
@@ -11,7 +11,7 @@ it("keeps the route whitelist aligned with both builds and parallel route slots"
const routes = new Set(["src/app", "blog/src/app"].flatMap(root => files(resolve(web, root)).filter(file => file.endsWith("/page.tsx")).map(file => "/" + relative(resolve(web, root), file).split("/").slice(0, -1).filter(segment => !segment.startsWith("(") && !segment.startsWith("@")).join("/"))))
expect([...routes].sort()).toEqual([...pageRoutes].sort())
})
-it("requires every native mutation owner in the inventory and every semantic variant on the whitelist", () => {
+it("keeps existing mutation owners inventoried and semantic variants on the whitelist", () => {
const inventory = new Set<string>([...mutationCoverage, ...facadeCoverage].map(entry => entry.file))
for (const file of files(resolve(web, "src"))) {
if (/\.test\./.test(file) || file.includes("/test/")) continue
@@ -19,7 +19,6 @@ it("requires every native mutation owner in the inventory and every semantic var
const visit = (node: ts.Node) => {
if (ts.isCallExpression(node) && ["useMutation", "useCommunityCommandMutation"].includes(node.expression.getText(source))) {
expect(inventory.has("src/web/" + relative(web, file)), file).toBe(true)
- expect(node.arguments.map(argument => argument.getText(source)).join(" "), file).toContain("observabilityAction")
}
ts.forEachChild(node, visit)
}
@@ -27,3 +26,319 @@ it("requires every native mutation owner in the inventory and every semantic var
}
for (const variants of Object.values(actionVariants)) for (const name of Object.values(variants)) expect(actionNames as readonly string[]).toContain(name)
})
+
+const mutationCoverage = [
+ {
+ "file": "src/web/src/app/c/invite/[token]/invite-accept-client.tsx",
+ "owner": "InviteAcceptInner",
+ "action": "server.invite.accept"
+ },
+ {
+ "file": "src/web/src/app/device/page.tsx",
+ "owner": "DeviceAuthPageInner",
+ "action": "device.authorization.command"
+ },
+ {
+ "file": "src/web/src/components/community/machines/machine-list.tsx",
+ "owner": "MachineList",
+ "action": "machine.command"
+ },
+ {
+ "file": "src/web/src/components/community/machines/pair-machine-sheet.tsx",
+ "owner": "PairMachineSheet",
+ "action": "machine.pair.generate"
+ },
+ {
+ "file": "src/web/src/components/community/machines/pair-machine-sheet.tsx",
+ "owner": "PairMachineSheet",
+ "action": "machine.pair.launch"
+ },
+ {
+ "file": "src/web/src/components/community/members/add-members-dialog.tsx",
+ "owner": "AddMembersDialog",
+ "action": "channel.members.add"
+ },
+ {
+ "file": "src/web/src/components/community/members/member-list.tsx",
+ "owner": "MemberList",
+ "action": "member.management.command"
+ },
+ {
+ "file": "src/web/src/components/community/messages/create-forum-thread.tsx",
+ "owner": "CreateForumThread",
+ "action": "forum.thread.create"
+ },
+ {
+ "file": "src/web/src/components/community/messages/message-share-dialog.tsx",
+ "owner": "MessageShareDialog",
+ "action": "message.export"
+ },
+ {
+ "file": "src/web/src/components/community/messages/use-composer-controller.ts",
+ "owner": "useComposerController",
+ "action": "message.compose.send"
+ },
+ {
+ "file": "src/web/src/components/community/onboarding/community-onboarding-form.tsx",
+ "owner": "CommunityOnboardingForm",
+ "action": "community.onboarding.initialize"
+ },
+ {
+ "file": "src/web/src/components/community/onboarding/onboarding-machine-dialog.tsx",
+ "owner": "OnboardingMachineDialog",
+ "action": "machine.pair.generate"
+ },
+ {
+ "file": "src/web/src/components/community/settings/account-deletion-flow.tsx",
+ "owner": "AccountDeletionFlow",
+ "action": "account.deletion.command"
+ },
+ {
+ "file": "src/web/src/components/community/settings/user-settings.tsx",
+ "owner": "AdvancedSettings",
+ "action": "cache.clear"
+ },
+ {
+ "file": "src/web/src/components/community/social/invite-dialog.tsx",
+ "owner": "InviteDialog",
+ "action": "invitation.send"
+ },
+ {
+ "file": "src/web/src/components/community/social/invite-dialog.tsx",
+ "owner": "InviteDialog",
+ "action": "invitation.copy"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/dm.ts",
+ "owner": "useCreateOrGetDm",
+ "action": "dm.open"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/forum.ts",
+ "owner": "useCreateForumThread",
+ "action": "forum.thread.create"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/forum.ts",
+ "owner": "useUpdatePostTags",
+ "action": "forum.tags.update"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/forum.ts",
+ "owner": "useDeleteForumThread",
+ "action": "forum.thread.delete"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/invites.ts",
+ "owner": "useResolveOrCreateInvite",
+ "action": "server.invite.resolve"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/invites.ts",
+ "owner": "useRevokeInvite",
+ "action": "server.invite.revoke"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/members.ts",
+ "owner": "useMemberCommand",
+ "action": "server.member.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/message-memberships.ts",
+ "owner": "usePinCommand",
+ "action": "message.pin.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/message-memberships.ts",
+ "owner": "useMarkCommand",
+ "action": "message.mark.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/message-reactions.ts",
+ "owner": "useReactionIntent",
+ "action": "message.reaction.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useEditMessage",
+ "action": "message.edit"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useSendMessage",
+ "action": "channel.message.send"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useSendDmMessage",
+ "action": "dm.message.send"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useCreateThread",
+ "action": "message.thread.create"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useMarkAllInboxRead",
+ "action": "inbox.read_all"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/messages.ts",
+ "owner": "useDeleteMention",
+ "action": "mention.dismiss"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/notifications.ts",
+ "owner": "useNotificationCommand",
+ "action": "notification.settings.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/profile.ts",
+ "owner": "useUpdateProfile",
+ "action": "profile.update"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/profile.ts",
+ "owner": "useUploadUserAvatar",
+ "action": "profile.avatar.upload"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/uploads.ts",
+ "owner": "useUploadFile",
+ "action": "attachment.upload"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-account-sign-out.ts",
+ "owner": "useAccountSignOut",
+ "action": "account.sign_out"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-billing.ts",
+ "owner": "useBilling",
+ "action": "billing.redirect"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-billing.ts",
+ "owner": "useBilling",
+ "action": "billing.change.cancel"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-bot-bug-report.ts",
+ "owner": "useBotBugReport",
+ "action": "bot.bug_report.submit"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-bots.ts",
+ "owner": "useBotCommand",
+ "action": "bot.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-channel-members.ts",
+ "owner": "useChannelMemberCommand",
+ "action": "channel.member.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-community-command-mutation.ts",
+ "owner": "useCommunityCommandMutation",
+ "action": "community.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/use-notification-settings.ts",
+ "owner": "useSetBotNotificationSetting",
+ "action": "bot.notification.update"
+ },
+ {
+ "file": "src/web/src/hooks/use-file-attachments.ts",
+ "owner": "useFileAttachments",
+ "action": "attachment.prepare"
+ }
+] as const
+
+const facadeCoverage = [
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useCreateChannel",
+ "action": "channel.create"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useRenameChannel",
+ "action": "channel.rename"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useMoveChannel",
+ "action": "channel.move"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useDeleteChannel",
+ "action": "channel.delete"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useCreateCategory",
+ "action": "category.create"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useUpdateCategory",
+ "action": "category.update"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useDeleteCategory",
+ "action": "category.delete"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useReorderCategories",
+ "action": "category.reorder"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/channels.ts",
+ "owner": "useReorderChannels",
+ "action": "channel.reorder"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/friends.ts",
+ "owner": "useFriendCommand",
+ "action": "friend.command"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/server-rail.ts",
+ "owner": "useServerRailCommit",
+ "action": "server.rail.reorder"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useCreateServer",
+ "action": "server.create"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useJoinServer",
+ "action": "server.join"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useLeaveServer",
+ "action": "server.leave"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useDeleteServer",
+ "action": "server.delete"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useUpdateServer",
+ "action": "server.update"
+ },
+ {
+ "file": "src/web/src/hooks/community/mutations/servers.ts",
+ "owner": "useUploadServerIcon",
+ "action": "server.icon.upload"
+ }
+] as const
diff --git a/src/web/src/lib/observability/coverage.ts b/src/web/src/lib/observability/coverage.ts
index 30ef1408e..699ec2fa8 100644
--- a/src/web/src/lib/observability/coverage.ts
+++ b/src/web/src/lib/observability/coverage.ts
@@ -359,6 +359,7 @@ export const actionNames = [
"message.unpin",
"message_send",
"navigation",
+ "navigation.prefetch",
"notification.channel.update",
"notification.server.update",
"notification.settings.command",
@@ -392,322 +393,6 @@ export const actionNames = [
"user.unblock"
] as const
-export const mutationCoverage = [
- {
- "file": "src/web/src/app/c/invite/[token]/invite-accept-client.tsx",
- "owner": "InviteAcceptInner",
- "action": "server.invite.accept"
- },
- {
- "file": "src/web/src/app/device/page.tsx",
- "owner": "DeviceAuthPageInner",
- "action": "device.authorization.command"
- },
- {
- "file": "src/web/src/components/community/machines/machine-list.tsx",
- "owner": "MachineList",
- "action": "machine.command"
- },
- {
- "file": "src/web/src/components/community/machines/pair-machine-sheet.tsx",
- "owner": "PairMachineSheet",
- "action": "machine.pair.generate"
- },
- {
- "file": "src/web/src/components/community/machines/pair-machine-sheet.tsx",
- "owner": "PairMachineSheet",
- "action": "machine.pair.launch"
- },
- {
- "file": "src/web/src/components/community/members/add-members-dialog.tsx",
- "owner": "AddMembersDialog",
- "action": "channel.members.add"
- },
- {
- "file": "src/web/src/components/community/members/member-list.tsx",
- "owner": "MemberList",
- "action": "member.management.command"
- },
- {
- "file": "src/web/src/components/community/messages/create-forum-thread.tsx",
- "owner": "CreateForumThread",
- "action": "forum.thread.create"
- },
- {
- "file": "src/web/src/components/community/messages/message-share-dialog.tsx",
- "owner": "MessageShareDialog",
- "action": "message.export"
- },
- {
- "file": "src/web/src/components/community/messages/use-composer-controller.ts",
- "owner": "useComposerController",
- "action": "message.compose.send"
- },
- {
- "file": "src/web/src/components/community/onboarding/community-onboarding-form.tsx",
- "owner": "CommunityOnboardingForm",
- "action": "community.onboarding.initialize"
- },
- {
- "file": "src/web/src/components/community/onboarding/onboarding-machine-dialog.tsx",
- "owner": "OnboardingMachineDialog",
- "action": "machine.pair.generate"
- },
- {
- "file": "src/web/src/components/community/settings/account-deletion-flow.tsx",
- "owner": "AccountDeletionFlow",
- "action": "account.deletion.command"
- },
- {
- "file": "src/web/src/components/community/settings/user-settings.tsx",
- "owner": "AdvancedSettings",
- "action": "cache.clear"
- },
- {
- "file": "src/web/src/components/community/social/invite-dialog.tsx",
- "owner": "InviteDialog",
- "action": "invitation.send"
- },
- {
- "file": "src/web/src/components/community/social/invite-dialog.tsx",
- "owner": "InviteDialog",
- "action": "invitation.copy"
- },
- {
- "file": "src/web/src/hooks/community/mutations/dm.ts",
- "owner": "useCreateOrGetDm",
- "action": "dm.open"
- },
- {
- "file": "src/web/src/hooks/community/mutations/forum.ts",
- "owner": "useCreateForumThread",
- "action": "forum.thread.create"
- },
- {
- "file": "src/web/src/hooks/community/mutations/forum.ts",
- "owner": "useUpdatePostTags",
- "action": "forum.tags.update"
- },
- {
- "file": "src/web/src/hooks/community/mutations/forum.ts",
- "owner": "useDeleteForumThread",
- "action": "forum.thread.delete"
- },
- {
- "file": "src/web/src/hooks/community/mutations/invites.ts",
- "owner": "useResolveOrCreateInvite",
- "action": "server.invite.resolve"
- },
- {
- "file": "src/web/src/hooks/community/mutations/invites.ts",
- "owner": "useRevokeInvite",
- "action": "server.invite.revoke"
- },
- {
- "file": "src/web/src/hooks/community/mutations/members.ts",
- "owner": "useMemberCommand",
- "action": "server.member.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/message-memberships.ts",
- "owner": "usePinCommand",
- "action": "message.pin.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/message-memberships.ts",
- "owner": "useMarkCommand",
- "action": "message.mark.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/message-reactions.ts",
- "owner": "useReactionIntent",
- "action": "message.reaction.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useEditMessage",
- "action": "message.edit"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useSendMessage",
- "action": "channel.message.send"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useSendDmMessage",
- "action": "dm.message.send"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useCreateThread",
- "action": "message.thread.create"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useMarkAllInboxRead",
- "action": "inbox.read_all"
- },
- {
- "file": "src/web/src/hooks/community/mutations/messages.ts",
- "owner": "useDeleteMention",
- "action": "mention.dismiss"
- },
- {
- "file": "src/web/src/hooks/community/mutations/notifications.ts",
- "owner": "useNotificationCommand",
- "action": "notification.settings.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/profile.ts",
- "owner": "useUpdateProfile",
- "action": "profile.update"
- },
- {
- "file": "src/web/src/hooks/community/mutations/profile.ts",
- "owner": "useUploadUserAvatar",
- "action": "profile.avatar.upload"
- },
- {
- "file": "src/web/src/hooks/community/mutations/uploads.ts",
- "owner": "useUploadFile",
- "action": "attachment.upload"
- },
- {
- "file": "src/web/src/hooks/community/use-account-sign-out.ts",
- "owner": "useAccountSignOut",
- "action": "account.sign_out"
- },
- {
- "file": "src/web/src/hooks/community/use-billing.ts",
- "owner": "useBilling",
- "action": "billing.redirect"
- },
- {
- "file": "src/web/src/hooks/community/use-billing.ts",
- "owner": "useBilling",
- "action": "billing.change.cancel"
- },
- {
- "file": "src/web/src/hooks/community/use-bot-bug-report.ts",
- "owner": "useBotBugReport",
- "action": "bot.bug_report.submit"
- },
- {
- "file": "src/web/src/hooks/community/use-bots.ts",
- "owner": "useBotCommand",
- "action": "bot.command"
- },
- {
- "file": "src/web/src/hooks/community/use-channel-members.ts",
- "owner": "useChannelMemberCommand",
- "action": "channel.member.command"
- },
- {
- "file": "src/web/src/hooks/community/use-community-command-mutation.ts",
- "owner": "useCommunityCommandMutation",
- "action": "community.command"
- },
- {
- "file": "src/web/src/hooks/community/use-notification-settings.ts",
- "owner": "useSetBotNotificationSetting",
- "action": "bot.notification.update"
- },
- {
- "file": "src/web/src/hooks/use-file-attachments.ts",
- "owner": "useFileAttachments",
- "action": "attachment.prepare"
- }
-] as const
-
-export const facadeCoverage = [
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useCreateChannel",
- "action": "channel.create"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useRenameChannel",
- "action": "channel.rename"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useMoveChannel",
- "action": "channel.move"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useDeleteChannel",
- "action": "channel.delete"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useCreateCategory",
- "action": "category.create"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useUpdateCategory",
- "action": "category.update"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useDeleteCategory",
- "action": "category.delete"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useReorderCategories",
- "action": "category.reorder"
- },
- {
- "file": "src/web/src/hooks/community/mutations/channels.ts",
- "owner": "useReorderChannels",
- "action": "channel.reorder"
- },
- {
- "file": "src/web/src/hooks/community/mutations/friends.ts",
- "owner": "useFriendCommand",
- "action": "friend.command"
- },
- {
- "file": "src/web/src/hooks/community/mutations/server-rail.ts",
- "owner": "useServerRailCommit",
- "action": "server.rail.reorder"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useCreateServer",
- "action": "server.create"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useJoinServer",
- "action": "server.join"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useLeaveServer",
- "action": "server.leave"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useDeleteServer",
- "action": "server.delete"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useUpdateServer",
- "action": "server.update"
- },
- {
- "file": "src/web/src/hooks/community/mutations/servers.ts",
- "owner": "useUploadServerIcon",
- "action": "server.icon.upload"
- }
-] as const
-
export const capabilityLimits = {
auth_worker: "separate status HTML has no consent-aware client bundle",
external_oauth: "in-app handoff and return only",
diff --git a/src/web/src/lib/observability/data-source.test.ts b/src/web/src/lib/observability/data-source.test.ts
deleted file mode 100644
index b1adf3948..000000000
--- a/src/web/src/lib/observability/data-source.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from "vitest"
-import { QueryClient } from "@tanstack/react-query"
-import { collectionEvidence, recordRows, disposeSources, tagView, viewEvidence, mergeEvidence, observedValueSource, withSource, sourceEvidence } from "./data-source"
-import { configureTelemetry, retireTelemetry } from "./telemetry"
-
-describe("actual row and window provenance", () => {
- let client: QueryClient
- beforeEach(() => { client = new QueryClient(); configureTelemetry({}, true) })
- afterEach(() => { retireTelemetry(); disposeSources(client); client.clear() })
- it("preserves unchanged IDB versions through validation, replaces changed fields conservatively", () => {
- const cached = [{ id: "one", content: "private", reaction: 0 }, { id: "two", content: "private", reaction: 0 }]
- recordRows(client, "messages", cached, row => row.id, "restored_idb")
- const initial = collectionEvidence(client, "messages", ["one"])
- expect(initial.source).toBe("restored_idb")
- recordRows(client, "messages", cached.map(row => ({ ...row })), row => row.id, "network")
- const validated = collectionEvidence(client, "messages", ["one"])
- expect(validated.version).toBe(initial.version)
- expect(validated.source).toBe("restored_idb")
- expect(validated.freshness).toBe("validated")
- recordRows(client, "messages", [{ ...cached[0]!, reaction: 1 }, cached[1]!], row => row.id, "ws")
- expect(collectionEvidence(client, "messages", ["one"]).source).toBe("mixed")
- expect(collectionEvidence(client, "messages", ["two"]).source).toBe("restored_idb")
- expect(collectionEvidence(client, "messages", ["one"]).version).not.toBe(initial.version)
- })
- it("marks an untracked optimistic row unknown, never reuses IDB labels on it", () => {
- const row = { id: "one", content: "original" }
- recordRows(client, "messages", [row], item => item.id, "restored_idb")
- expect(collectionEvidence(client, "messages", ["one"], [{ ...row, content: "edited" }]).source).toBe("unknown")
- })
- it("gives local preference snapshots stable versions while retaining unknown provenance", () => {
- const one = {}, two = {}
- const first = sourceEvidence(one, "unknown")
- expect(first.version).not.toBe("unknown")
- expect(sourceEvidence(one, "unknown")).toEqual(first)
- expect(sourceEvidence(two, "unknown")).toMatchObject({ source: "unknown" })
- expect(sourceEvidence(two, "unknown").version).not.toBe(first.version)
- })
- it("binds snapshots to rendered values; later writes cannot mutate an old snapshot", () => {
- recordRows(client, "messages", [{ id: "one", content: "old" }], item => item.id, "restored_idb")
- const view = tagView({}, collectionEvidence(client, "messages", ["one"]))
- recordRows(client, "messages", [{ id: "one", content: "new" }], item => item.id, "network")
- expect(viewEvidence(view).source).toBe("restored_idb")
- expect(viewEvidence(view).version).not.toBe(collectionEvidence(client, "messages", ["one"]).version)
- })
- it("carries the original WS apply receipt into the actual rendered row and expires it on retirement", () => {
- const row = { id: "one", content: "changed" }
- withSource(client, "ws", () => recordRows(client, "messages", [row], item => item.id), { id: "event-a", start: 10 })
- const rendered = tagView({}, collectionEvidence(client, "messages", ["one"], [row]))
- expect(viewEvidence(rendered)).toMatchObject({ wsEventId: "event-a", wsStart: 10, source: "ws" })
- retireTelemetry(); configureTelemetry({}, true)
- expect(viewEvidence(rendered).wsEventId).toBeUndefined()
- })
- it("handles authoritative empty, deletion, owner retirement and mixed joins", () => {
- recordRows(client, "messages", [], (row: {id:string}) => row.id, "network")
- expect(collectionEvidence(client, "messages", []).source).toBe("network")
- recordRows(client, "profiles", [{ id: "one" }], row => row.id, "restored_idb")
- const joined = mergeEvidence([collectionEvidence(client,"profiles",["one"]), collectionEvidence(client,"messages",[])])
- expect(joined.source).toBe("mixed")
- recordRows(client, "profiles", [], (row: {id:string})=>row.id,"ws")
- expect(collectionEvidence(client,"profiles",["one"]).source).toBe("unknown")
- disposeSources(client)
- expect(collectionEvidence(client,"profiles",[]).source).toBe("unknown")
- })
- it("classifies a composed response by its actual child view evidence", () => {
- const cached = tagView([], sourceEvidence({}, "restored_idb"))
- const live = tagView({}, sourceEvidence({}, "network"))
- expect(observedValueSource({ cached })).toBe("restored_idb")
- expect(observedValueSource({ cached, live })).toBe("mixed")
- expect(observedValueSource({ cached, untracked: {} })).toBe("mixed")
- })
-
-})
diff --git a/src/web/src/lib/observability/data-source.ts b/src/web/src/lib/observability/data-source.ts
deleted file mode 100644
index febfa731b..000000000
--- a/src/web/src/lib/observability/data-source.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { replaceEqualDeep, type QueryClient } from "@tanstack/react-query"
-import { emitTelemetry, isTelemetryEligible, telemetryGeneration } from "./telemetry"
-import type { Source } from "./schema"
-
-export type Evidence = { source: Source; version: string; freshness: "restored" | "validated" | "changed" | "unknown"; count: number; wsEventId?: string; wsStart?: number }
-type RowEvidence = Evidence & { value: object; fields: Map<string, Source> }
-type Diagnostics = { generation: number; revision: number; collections: Map<string, Map<string, RowEvidence>>; empty: Map<string, Evidence>; scope?: Source; origin?: { id: string; start: number }; values: WeakMap<object, Evidence> }
-const owners = new WeakMap<QueryClient, Diagnostics>()
-const views = new WeakMap<object, { generation: number; evidence: Evidence }>()
-let viewRevision = 0
-const unknown = (count = 0): Evidence => ({ source: "unknown", version: "unknown", freshness: "unknown", count })
-function owner(client: QueryClient) {
- let state = owners.get(client)
- if (!state || state.generation !== telemetryGeneration()) {
- state = { generation: telemetryGeneration(), revision: 0, collections: new Map(), empty: new Map(), values: new WeakMap() }
- owners.set(client, state)
- }
- return state
-}
-function plain(row: object): Record<string, unknown> { return Object.fromEntries(Object.entries(row).filter(([key]) => !key.startsWith("$"))) }
-export function mergeEvidence(evidence: readonly Evidence[]): Evidence {
- if (!evidence.length) return unknown()
- const sources = new Set(evidence.map(item => item.source))
- const ws = evidence.filter(item => item.wsStart !== undefined).sort((a,b) => b.wsStart! - a.wsStart!)[0]
- return {
- ...(ws ? { wsEventId: ws.wsEventId, wsStart: ws.wsStart } : {}),
- source: sources.size === 1 ? evidence[0]!.source : "mixed",
- version: evidenceVersion(evidence),
- freshness: evidence.some(item => item.freshness === "unknown") ? "unknown" : evidence.every(item => item.freshness === "restored") ? "restored" : evidence.every(item => item.freshness === "validated") ? "validated" : "changed",
- count: evidence.reduce((sum,item) => sum + item.count, 0),
- }
-}
-function evidenceVersion(evidence: readonly Evidence[]) {
- let hash = 2166136261
- for (const item of evidence) for (const character of item.version + ":" + item.source + ":" + item.count + ";") hash = Math.imul(hash ^ character.charCodeAt(0), 16777619) >>> 0
- return String(evidence.length) + "_" + String(hash)
-}
-export function withSource<T>(client: QueryClient, source: Source, effect: () => T, origin?: { id: string; start: number }): T {
- if (!isTelemetryEligible()) return effect()
- const state = owner(client), previous = state.scope, previousOrigin = state.origin
- state.scope = source
- state.origin = origin ?? (source === previous ? previousOrigin : undefined)
- try { return effect() } finally { state.scope = previous; state.origin = previousOrigin }
-}
-export function currentSource(client: QueryClient): Source { return owners.get(client)?.scope ?? "unknown" }
-export function recordRows<T extends object>(client: QueryClient, collection: string, rows: readonly T[], getKey: (row: T) => string, source = currentSource(client)) {
- if (!isTelemetryEligible()) return
- const state = owner(client)
- const previous = state.collections.get(collection) ?? new Map<string, RowEvidence>()
- const next = new Map<string, RowEvidence>()
- let changed = 0
- for (const row of rows) {
- const key = getKey(row), old = previous.get(key)
- const value = plain(row)
- if (old && !(source === "restored_idb" && old.source === "unknown")) {
- const prior = plain(old.value)
- if (replaceEqualDeep(prior, value) === prior) {
- const evidence = { ...old, value: row, freshness: source === "network" ? "validated" as const : old.freshness }
- next.set(key, evidence)
- state.values.set(row, evidence)
- continue
- }
- }
- const fields = new Map<string, Source>()
- const prior = old ? plain(old.value) : {}
- for (const field of Object.keys(value)) fields.set(field, old && replaceEqualDeep(prior[field], value[field]) === prior[field] ? old.fields.get(field) ?? "unknown" : source)
- const sources = new Set(fields.values())
- const ws = source === "ws" && state.origin ? { wsEventId: state.origin.id, wsStart: state.origin.start } : sources.has("ws") && old?.wsEventId ? { wsEventId: old.wsEventId, wsStart: old.wsStart } : {}
- const evidence: RowEvidence = { ...ws, value: row, fields, source: sources.size === 1 ? [...sources][0]! : "mixed", version: String(++state.revision), freshness: source === "restored_idb" ? "restored" : "changed", count: 1 }
- next.set(key, evidence)
- state.values.set(row, evidence)
- changed++
- }
- const removed = [...previous.keys()].filter(key => !next.has(key)).length
- state.collections.set(collection, next)
- const oldEmpty = state.empty.get(collection)
- const emptyChanged = !rows.length && (!oldEmpty || oldEmpty.source !== source || previous.size > 0)
- if (emptyChanged) state.empty.set(collection, { ...(source === "ws" && state.origin ? { wsEventId: state.origin.id, wsStart: state.origin.start } : {}), source, version: String(++state.revision), freshness: source === "restored_idb" ? "restored" : "changed", count: 0 })
- else if (rows.length) state.empty.delete(collection)
- if (changed || removed || emptyChanged) emitTelemetry("data.publish", { ws_event_id: state.origin?.id, source, data_version: String(state.revision), changed_count: changed, removed_count: removed, row_count: rows.length, eligibility: "eligible", freshness: source === "restored_idb" ? "restored" : "changed" })
-}
-export function collectionEvidence(client: QueryClient, collection: string, keys: readonly string[], actual?: readonly object[]): Evidence {
- if (!isTelemetryEligible()) return unknown()
- const state = owner(client), map = state.collections.get(collection)
- if (!keys.length) return state.empty.get(collection) ?? unknown()
- const evidence = keys.map((key,index) => {
- const item = map?.get(key)
- if (!item) return unknown(1)
- if (actual?.[index]) {
- const prior = plain(item.value)
- if (replaceEqualDeep(prior, plain(actual[index]!)) !== prior) return unknown(1)
- }
- return item
- })
- return mergeEvidence(evidence)
-}
-export function tagValue(client: QueryClient, value: unknown, source: Source, previous?: unknown) {
- if (!isTelemetryEligible() || !value || typeof value !== "object") return
- const state = owner(client), existing = state.values.get(value)
- if (existing && !(source === "restored_idb" && existing.source === "unknown")) { if (source === "network") state.values.set(value, { ...existing, freshness: "validated" }); return }
- const prior = previous && typeof previous === "object" ? state.values.get(previous) : undefined
- state.values.set(value, { ...(source === "ws" && state.origin ? { wsEventId: state.origin.id, wsStart: state.origin.start } : {}), source: prior && prior.source !== source ? "mixed" : source, version: String(++state.revision), freshness: source === "restored_idb" ? "restored" : "changed", count: Array.isArray(value) ? value.length : 1 })
-}
-export function valueEvidence(client: QueryClient, value: unknown): Evidence { return value && typeof value === "object" ? owner(client).values.get(value) ?? viewEvidence(value) : unknown() }
-export function tagView<T extends object>(value: T, evidence: Evidence): T { if (isTelemetryEligible()) views.set(value, { generation: telemetryGeneration(), evidence }); return value }
-export function viewEvidence(value: unknown): Evidence {
- if (!value || typeof value !== "object") return unknown()
- const entry = views.get(value)
- return isTelemetryEligible() && entry?.generation === telemetryGeneration() ? entry.evidence : unknown(Array.isArray(value) ? value.length : 1)
-}
-export function sourceEvidence(value: object, source: Source): Evidence {
- const current = viewEvidence(value)
- if (current.source === source && current.version !== "unknown") return current
- const evidence: Evidence = { source, version: "v_" + String(++viewRevision), freshness: source === "restored_idb" ? "restored" : "changed", count: Array.isArray(value) ? value.length : 1 }
- tagView(value, evidence)
- return evidence
-}
-export function deriveView<T extends object>(value: T, inputs: readonly Evidence[], count = Array.isArray(value) ? value.length : 1): T {
- return tagView(value, { ...mergeEvidence(inputs), count })
-}
-export function forgetCollection(client: QueryClient, collection: string) { const state = owners.get(client); state?.collections.delete(collection); state?.empty.delete(collection) }
-export function disposeSources(client: QueryClient) { owners.delete(client) }
-
-export function tagNetworkResponse(value: unknown) {
- if (!isTelemetryEligible()) return
- const seen = new WeakSet<object>()
- let budget = 4096
- const visit = (input: unknown, depth: number) => {
- if (!input || typeof input !== "object" || seen.has(input) || depth > 8 || budget-- < 1) return
- seen.add(input)
- sourceEvidence(input, "network")
- for (const child of Object.values(input)) visit(child, depth + 1)
- }
- visit(value, 0)
-}
-export function observedValueSource(value: unknown): Source {
- const direct = viewEvidence(value)
- if (direct.source !== "unknown") return direct.source
- if (!value || typeof value !== "object") return "unknown"
- const children = Object.values(value).slice(0, 256).filter(child => child && typeof child === "object")
- if (!children.length) return "unknown"
- return mergeEvidence(children.map(viewEvidence)).source
-}
diff --git a/src/web/src/lib/observability/navigation-history-consent.dom.test.tsx b/src/web/src/lib/observability/navigation-history-consent.dom.test.tsx
index 2b803c519..9252b34e5 100644
--- a/src/web/src/lib/observability/navigation-history-consent.dom.test.tsx
+++ b/src/web/src/lib/observability/navigation-history-consent.dom.test.tsx
@@ -4,7 +4,7 @@ import { QueryClient, QueryClientProvider, useQuery } from "@tanstack/react-quer
import { afterEach, expect, it, vi } from "vitest"
import { act, render } from "@/test/react-dom-harness"
import { announceAnalyticsConsent } from "../analytics-consent"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
import type { Action } from "./context"
const router = vi.hoisted(() => ({ pathname: "/" }))
@@ -46,7 +46,7 @@ it("retains real renderer ownership through late grant and revoke/regrant withou
function Content() {
const pathname = usePathname()
const query = useQuery({ queryKey: [pathname], queryFn: async () => [], staleTime: Infinity })
- useObservedQueryRegion(pathname === forum ? "forum" : "messages", query, query.data?.length)
+ useObservedRegion(pathname === forum ? "forum" : "messages", !query.isPending && query.data !== undefined, query.data?.length)
return <p>{pathname === forum ? "forum" : "empty text"}</p>
}
function Root() {
diff --git a/src/web/src/lib/observability/navigation-history.dom.test.tsx b/src/web/src/lib/observability/navigation-history.dom.test.tsx
index dc9c04f00..eb750fc7a 100644
--- a/src/web/src/lib/observability/navigation-history.dom.test.tsx
+++ b/src/web/src/lib/observability/navigation-history.dom.test.tsx
@@ -4,7 +4,7 @@ import { QueryClient, QueryClientProvider, useQuery } from "@tanstack/react-quer
import { afterEach, expect, it, vi } from "vitest"
import { act, render } from "@/test/react-dom-harness"
import { announceAnalyticsConsent } from "../analytics-consent"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
import type { Action } from "./context"
const router = vi.hoisted(() => ({ pathname: "/" }))
@@ -47,7 +47,7 @@ it("keeps one original Back span until the text frame commits, ignoring the outg
function Content() {
const pathname = usePathname()
const query = useQuery({ queryKey: [pathname], queryFn: async () => [], staleTime: Infinity })
- useObservedQueryRegion(pathname === forum ? "forum" : "messages", query, query.data?.length)
+ useObservedRegion(pathname === forum ? "forum" : "messages", !query.isPending && query.data !== undefined, query.data?.length)
return <p>{pathname === forum ? "forum" : "empty text"}</p>
}
function Root() {
diff --git a/src/web/src/lib/observability/navigation-ready-consent.dom.test.tsx b/src/web/src/lib/observability/navigation-ready-consent.dom.test.tsx
index 6a0d70499..d5b5dda88 100644
--- a/src/web/src/lib/observability/navigation-ready-consent.dom.test.tsx
+++ b/src/web/src/lib/observability/navigation-ready-consent.dom.test.tsx
@@ -23,7 +23,7 @@ it("does not backfill a pre-consent document visit and observes only later eligi
vi.stubGlobal("fetch", fetch)
document.cookie = "alook_analytics_consent=v1.denied; path=/"
const { bootstrapObservability, onObservedRouterTransition } = await import("./client")
- function Content() { useObservedRegion("page", true, { source: "unknown", version: "static", freshness: "unknown", count: 1 }); return <p>Ready page</p> }
+ function Content() { useObservedRegion("page", true, 1); return <p>Ready page</p> }
await act(async () => { bootstrapObservability("web"); view = render(<Content />) })
expect(fetch).not.toHaveBeenCalled()
await act(async () => { document.cookie = "alook_analytics_consent=v1.granted; path=/"; announceAnalyticsConsent("granted") })
diff --git a/src/web/src/lib/observability/navigation-ready-trace.dom.test.tsx b/src/web/src/lib/observability/navigation-ready-trace.dom.test.tsx
index 66a4dd14d..2d89ad2ce 100644
--- a/src/web/src/lib/observability/navigation-ready-trace.dom.test.tsx
+++ b/src/web/src/lib/observability/navigation-ready-trace.dom.test.tsx
@@ -3,7 +3,7 @@ import { QueryClient, QueryClientProvider, useQuery } from "@tanstack/react-quer
import { afterEach, expect, it, vi } from "vitest"
import { act, render } from "@/test/react-dom-harness"
import { announceAnalyticsConsent } from "../analytics-consent"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
const native = vi.hoisted(() => ({ release: undefined as (() => void) | undefined }))
vi.mock("@grafana/faro-web-sdk", async importOriginal => {
@@ -40,7 +40,7 @@ it("binds the initial navigation before ready and parents a real native HTTP spa
const data = new Promise<never[]>(done => { resolve = done })
function Content() {
const query = useQuery({ queryKey: ["messages"], queryFn: () => data, staleTime: Infinity })
- useObservedQueryRegion("messages", query, query.data?.length)
+ useObservedRegion("messages", !query.isPending && query.data !== undefined, query.data?.length)
return <p>{query.isPending ? "loading" : "empty"}</p>
}
function Root() {
@@ -80,5 +80,10 @@ it("binds the initial navigation before ready and parents a real native HTTP spa
const ready = events.filter(event => event.name === "navigation.ready")
expect(ready).toHaveLength(1)
expect(ready[0]?.attributes).toMatchObject({ navigation_kind: "document", start_ms: "0", duration_ms: "1250", trace_id: parent.traceId, span_id: parent.spanId, action_id: navigation.id })
- expect(events.filter(event => event.name.startsWith("request.")).every(event => event.attributes.trace_id === parent.traceId && event.attributes.span_id === parent.spanId)).toBe(true)
+ const http = spans.find(span => span.parentSpanId === parent.spanId)!
+ const requests = events.filter(event => event.name.startsWith("request."))
+ expect(requests.map(event => event.name)).toEqual(["request.start", "request.headers", "request.finish"])
+ expect(requests[0]?.attributes).toMatchObject({ trace_id: parent.traceId, span_id: parent.spanId })
+ expect(requests[1]?.attributes).toMatchObject({ trace_id: parent.traceId, span_id: http.spanId, request_id: requests[0]!.attributes.request_id })
+ expect(requests[2]?.attributes).toMatchObject({ trace_id: parent.traceId, span_id: http.spanId, request_id: requests[0]!.attributes.request_id })
})
diff --git a/src/web/src/lib/observability/navigation-ready.dom.test.tsx b/src/web/src/lib/observability/navigation-ready.dom.test.tsx
index d003ca83e..b3192e4a7 100644
--- a/src/web/src/lib/observability/navigation-ready.dom.test.tsx
+++ b/src/web/src/lib/observability/navigation-ready.dom.test.tsx
@@ -3,7 +3,8 @@ import { QueryClient, QueryClientProvider, useQuery } from "@tanstack/react-quer
import { afterEach, expect, it, vi } from "vitest"
import { act, render } from "@/test/react-dom-harness"
import { announceAnalyticsConsent } from "../analytics-consent"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
+import { observationEpoch } from "./clock"
const native = vi.hoisted(() => ({ release: undefined as (() => void) | undefined }))
vi.mock("@grafana/faro-web-sdk", async importOriginal => {
@@ -41,14 +42,14 @@ it("retains real ready time before a delayed SDK and records each later route on
client.setQueryData(["messages"], []); client.setQueryData(["forum"], [])
function Content({ region }: { region: "messages" | "forum" }) {
const query = useQuery({ queryKey: [region], queryFn: async () => [], staleTime: Infinity })
- useObservedQueryRegion(region, query, query.data?.length)
+ useObservedRegion(region, !query.isPending && query.data !== undefined, query.data?.length)
return <p>{region}: {query.isPending ? "loading" : "empty"}</p>
}
function Root({ region }: { region: "messages" | "forum" }) {
useLayoutEffect(() => setTelemetryUser("account-a"), [])
return <QueryClientProvider client={client!}><Content region={region} /></QueryClientProvider>
}
- const readyAt = Date.now()
+ const readyAt = Math.floor(observationEpoch())
await act(async () => { bootstrapObservability("web"); view = render(<Root region="messages" />) })
await vi.waitFor(() => expect(native.release).toBeTypeOf("function"))
expect(navigationForHref(window.location.href)).toBeUndefined()
diff --git a/src/web/src/lib/observability/navigation-rsc.dom.test.ts b/src/web/src/lib/observability/navigation-rsc.dom.test.ts
new file mode 100644
index 000000000..1ccf4b3a4
--- /dev/null
+++ b/src/web/src/lib/observability/navigation-rsc.dom.test.ts
@@ -0,0 +1,103 @@
+import { afterEach, expect, it, vi } from "vitest"
+import { announceAnalyticsConsent } from "../analytics-consent"
+import { act } from "@/test/react-dom-harness"
+
+afterEach(async () => {
+ document.cookie = "alook_analytics_consent=v1.denied; path=/"
+ announceAnalyticsConsent("denied")
+ await vi.advanceTimersByTimeAsync(0)
+ window.history.replaceState(null, "", "/")
+ vi.useRealTimers(); vi.restoreAllMocks(); vi.unstubAllEnvs(); vi.unstubAllGlobals()
+})
+
+it("observes native RSC headers and streamed completion and links a click to its real prefetch context", async () => {
+ vi.useFakeTimers(); sessionStorage.clear()
+ vi.stubEnv("NEXT_PUBLIC_FARO_COLLECTOR_URL", "https://collector.example/collect/public")
+ vi.stubEnv("NEXT_PUBLIC_FARO_RELEASE", "a".repeat(40)); vi.stubEnv("NEXT_PUBLIC_FARO_ENVIRONMENT", "qa")
+ vi.spyOn(performance, "getEntriesByType").mockReturnValue([])
+ let body!: ReadableStreamDefaultController<Uint8Array>
+ const response = new Response(new ReadableStream<Uint8Array>({ start(controller) { body = controller } }), { headers: { "content-type": "text/x-component", "cf-ray": "a".repeat(16) + "-SJC" } })
+ const clone = vi.spyOn(response, "clone")
+ const sent: unknown[] = []
+ let injected: Headers | undefined
+ const fetchFailure = new Error("PRIVATE failed RSC fetch")
+ const originalFetch = vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+ if (String(input).startsWith("https://collector.example/")) {
+ if (init?.body) sent.push(JSON.parse(String(init.body)))
+ return new Response(null, { status: 204 })
+ }
+ injected = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined))
+ if (String(input).includes("FAILED_PRIVATE")) throw fetchFailure
+ return response
+ })
+ vi.stubGlobal("fetch", originalFetch)
+ document.cookie = "alook_analytics_consent=v1.granted; path=/"
+ window.history.replaceState(null, "", "/c/me")
+ const { bootstrapObservability, setTelemetryUser } = await import("./client")
+ const { beginNavigationPrefetch, beginNavigation, finishAction } = await import("./context")
+ const { isTelemetryEligible } = await import("./telemetry")
+ await act(async () => { bootstrapObservability("web"); setTelemetryUser("account-a"); await vi.advanceTimersByTimeAsync(1500) })
+ await vi.waitFor(() => expect(isTelemetryEligible()).toBe(true))
+ const probe = beginNavigationPrefetch("/c/me/bots")!
+ await vi.waitFor(() => expect(probe.span).toBeDefined())
+ const href = "/c/channels/server-a/channel-a"
+ const prefetch = beginNavigationPrefetch(href)!
+ const parent = prefetch.span!.spanContext()
+ const returned = await window.fetch(window.location.origin + href + "?_rsc=PRIVATE", { headers: { "next-router-prefetch": "1" } })
+ expect(returned).toBe(response)
+ expect(returned.bodyUsed).toBe(false)
+ expect(clone).toHaveBeenCalledOnce()
+ expect(injected?.get("traceparent")).toMatch(new RegExp(`^00-${parent.traceId}-[0-9a-f]{16}-01$`))
+ await vi.advanceTimersByTimeAsync(1500)
+ const events: Array<{ name: string; attributes: Record<string, string> }> = []
+ const spans: Array<Record<string, unknown>> = []
+ const visit = (value: unknown) => {
+ if (!value || typeof value !== "object") return
+ const record = value as Record<string, unknown>
+ if (typeof record.spanId === "string" && typeof record.name === "string") spans.push(record)
+ if (Array.isArray(record.events)) events.push(...record.events as typeof events)
+ for (const child of Object.values(record)) visit(child)
+ }
+ visit(sent)
+ const requests = () => events.filter(event => event.attributes.action_id === prefetch.id && event.name.startsWith("request."))
+ expect(requests().map(event => event.name)).toEqual(["request.start", "request.headers"])
+ const navigation = beginNavigation(href)!
+ expect(navigation.prefetch).toBe(prefetch)
+ expect(navigation.span!.spanContext().traceId).not.toBe(parent.traceId)
+ body.enqueue(new TextEncoder().encode("PRIVATE RSC content")); body.close()
+ expect(await returned.text()).toBe("PRIVATE RSC content")
+ await vi.advanceTimersByTimeAsync(0)
+ finishAction(navigation, "success", { phase: "primary", region: "messages" })
+ await vi.advanceTimersByTimeAsync(5000)
+ events.length = 0; spans.length = 0; visit(sent)
+ expect(requests().map(event => event.name)).toEqual(["request.start", "request.headers", "request.finish"])
+ expect(requests().at(-1)?.attributes).toMatchObject({ phase: "body", outcome: "observed", request_kind: "rsc" })
+ const http = spans.find(span => span.parentSpanId === parent.spanId)!
+ expect(http).toMatchObject({ traceId: parent.traceId })
+ expect(requests().at(-1)?.attributes.span_id).toBe(http.spanId)
+ expect(spans.find(span => span.spanId === navigation.span!.spanContext().spanId)?.links)
+ .toEqual([{ traceId: parent.traceId, spanId: parent.spanId, attributes: [], droppedAttributesCount: 0 }])
+ expect(JSON.stringify(sent)).not.toContain("PRIVATE")
+ expect(JSON.stringify(sent)).toContain("a".repeat(40))
+ expect(clone).toHaveBeenCalledOnce()
+ const failedAction = beginNavigation("/c/me/friends")!
+ await expect(window.fetch(window.location.origin + "/c/me/friends?_rsc=FAILED_PRIVATE")).rejects.toBe(fetchFailure)
+ finishAction(failedAction, "error")
+ await vi.advanceTimersByTimeAsync(5000)
+ events.length = 0; spans.length = 0; visit(sent)
+ const failedRequests = events.filter(event => event.attributes.action_id === failedAction.id && event.name.startsWith("request."))
+ expect(failedRequests.map(event => event.name)).toEqual(["request.start", "request.finish"])
+ expect(failedRequests.at(-1)?.attributes).toMatchObject({ phase: "headers", outcome: "error", request_kind: "rsc" })
+ expect(JSON.stringify(sent)).not.toContain("PRIVATE")
+ expect(clone).toHaveBeenCalledOnce()
+ const activeFetch = window.fetch
+ const delivered = sent.length
+ document.cookie = "alook_analytics_consent=v1.denied; path=/"; announceAnalyticsConsent("denied")
+ await vi.advanceTimersByTimeAsync(0)
+ expect(window.fetch).not.toBe(activeFetch)
+ await window.fetch(window.location.origin + href + "?_rsc=PRIVATE", { headers: { "next-router-prefetch": "1" } })
+ expect(injected?.has("traceparent")).toBe(false)
+ await vi.advanceTimersByTimeAsync(5000)
+ expect(sent).toHaveLength(delivered)
+ expect(clone).toHaveBeenCalledOnce()
+})
diff --git a/src/web/src/lib/observability/query-observer.test.ts b/src/web/src/lib/observability/query-observer.test.ts
index 98f69a724..8d5223c7d 100644
--- a/src/web/src/lib/observability/query-observer.test.ts
+++ b/src/web/src/lib/observability/query-observer.test.ts
@@ -3,28 +3,31 @@ import { createMessageStreamStore } from "@/stores/community/message-stream-stor
import { QueryClient } from "@tanstack/react-query"
import { observeQueryClient, disposeQueryDiagnostics } from "./query-observer"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "./telemetry"
-import { valueEvidence, withSource } from "./data-source"
import { commandObservation, clearActions } from "./context"
-import { startRequest, requestHeaders, readObservedResponse } from "./requests"
let client: QueryClient
const events: Array<{ name: string; attributes: Record<string, string> }> = []
beforeEach(() => { client = observeQueryClient(new QueryClient()); events.length = 0; configureTelemetry({ session_id: "session-a" }, true); installTelemetrySink(event => events.push(event)) })
afterEach(() => { retireTelemetry(); clearActions(); disposeQueryDiagnostics(client); client.clear() })
-it("distinguishes actual HTTP values from local Query functions and manual WS writes", async () => {
- const queryKey = ["remote"]
- const remote = await client.query({ queryKey, queryFn: async () => {
- const request = startRequest("/api/agents"), response = new Response('[{"id":"private"}]')
- requestHeaders(request, response)
- return readObservedResponse(response, () => response.json())
- } })
- expect(valueEvidence(client, remote).source).toBe("network")
- const local = await client.query({ queryKey: ["local"], queryFn: () => ({ status: "rendered" }) })
- expect(valueEvidence(client, local).source).toBe("unknown")
- withSource(client, "ws", () => client.setQueryData(queryKey, [{ id: "private", changed: true }]))
- expect(valueEvidence(client, client.getQueryData(queryKey)).source).toBe("mixed")
+it("observes unlabelled Query and Mutation lifecycles without reading keys, values or variables", async () => {
+ const value = { content: "private-body" }
+ expect(await client.query({ queryKey: ["private-key"], queryFn: () => value })).toBe(value)
+ const mutation = client.getMutationCache().build(client, { mutationFn: async (input: typeof value) => input })
+ expect(await mutation.execute(value)).toBe(value)
+ expect(events.filter(event => event.name === "query.lifecycle").map(event => event.attributes.outcome)).toEqual(["observed", "success"])
+ expect(events.filter(event => event.name === "action.start").map(event => event.attributes.action_name)).toEqual(["command.unknown"])
+ expect(events.filter(event => event.name === "action.finish")).toHaveLength(1)
expect(JSON.stringify(events)).not.toContain("private")
})
+it("does not send late Query terminals into a replacement session", async () => {
+ let resolve!: (value: object) => void
+ const pending = client.query({ queryKey: ["private"], queryFn: () => new Promise<object>(done => { resolve = done }) })
+ await Promise.resolve()
+ retireTelemetry(); configureTelemetry({ session_id: "session-b" }, true); installTelemetrySink(event => events.push(event))
+ events.length = 0
+ resolve({ private: true }); await pending
+ expect(events).toEqual([])
+})
it("uses native mutation pending/terminal events once and binds each original request token", async () => {
const one = { original: {} }, two = { original: {} }
let resolve!: () => void
diff --git a/src/web/src/lib/observability/query-observer.ts b/src/web/src/lib/observability/query-observer.ts
index dde74e5f3..646800c9a 100644
--- a/src/web/src/lib/observability/query-observer.ts
+++ b/src/web/src/lib/observability/query-observer.ts
@@ -3,27 +3,23 @@ import { messageObservation, disposeMessageObservations } from "./messages"
import { actionNames } from "./coverage"
import { resolveActionName } from "./actions"
import { startAction, finishAction, bindCommandAction, type Action } from "./context"
-import { currentSource, disposeSources, forgetCollection, tagValue, observedValueSource } from "./data-source"
-import { isTelemetryEligible, emitTelemetry } from "./telemetry"
+import { isTelemetryEligible, emitTelemetry, telemetryGeneration } from "./telemetry"
const clients = new WeakMap<QueryClient, () => void>()
const allowed = new Set<string>(actionNames)
export function observeQueryClient(client: QueryClient) {
if (clients.has(client)) return client
const actions = new WeakMap<Mutation, Action>()
- const data = new WeakMap<Query, unknown>()
+ const queries = new WeakMap<Query, number>()
const stopQueries = client.getQueryCache().subscribe(event => {
- if (!isTelemetryEligible()) return
- if (event.type === "removed") {
- data.delete(event.query)
- if (event.query.queryKey[0] === "community" && event.query.queryKey[1] === "db") forgetCollection(client, String(event.query.queryKey[3]))
- return
- }
- if (event.type !== "updated" || event.action.type !== "success") return
- const query = event.query, value = query.state.data, previous = data.get(query)
- const source = event.action.manual ? currentSource(client) : observedValueSource(value)
- tagValue(client, value, source, previous)
- data.set(query, value)
+ if (event.type === "removed") { queries.delete(event.query); return }
+ if (event.type !== "updated") return
+ if (event.action.type === "fetch") queries.set(event.query, isTelemetryEligible() ? telemetryGeneration() : -1)
+ else if (!["success", "error"].includes(event.action.type)) return
+ const admitted = queries.get(event.query) === telemetryGeneration()
+ if (event.action.type !== "fetch") queries.delete(event.query)
+ if (!isTelemetryEligible() || !admitted) return
+ emitTelemetry("query.lifecycle", { phase: "background", cache_stage: "query", outcome: event.action.type === "fetch" ? "observed" : event.action.type })
})
const stopMutations = client.getMutationCache().subscribe(event => {
if (event.type !== "updated") return
@@ -37,14 +33,13 @@ export function observeQueryClient(client: QueryClient) {
const accepted = ["channel.message.send", "dm.message.send"].includes(name) ? messageObservation(client, input.nonce) : undefined
const action = accepted ?? startAction(allowed.has(name) ? name : "command.unknown")
if (action) { actions.set(mutation, action); bindCommandAction(mutation.state.variables, action) }
- if (name === "command.unknown") emitTelemetry("telemetry.coverage", { capability: "limited", action_name: name })
} else if (event.action.type === "success" || event.action.type === "error") {
const error = mutation.state.error
finishAction(actions.get(mutation), event.action.type === "success" ? "success" : error instanceof Error && error.name === "AbortError" ? "cancelled" : "error", { phase: "primary" })
actions.delete(mutation)
}
})
- clients.set(client, () => { stopQueries(); stopMutations(); disposeSources(client); disposeMessageObservations(client); clients.delete(client) })
+ clients.set(client, () => { stopQueries(); stopMutations(); disposeMessageObservations(client); clients.delete(client) })
return client
}
export function disposeQueryDiagnostics(client: QueryClient) { clients.get(client)?.() }
diff --git a/src/web/src/lib/observability/query-regions.ts b/src/web/src/lib/observability/query-regions.ts
deleted file mode 100644
index e2c14daaa..000000000
--- a/src/web/src/lib/observability/query-regions.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-"use client"
-
-import { useQueryClient } from "@tanstack/react-query"
-import { valueEvidence, type Evidence } from "./data-source"
-import { useObservedRegion } from "./regions"
-import type { Attributes } from "./schema"
-
-type Resource = { data: unknown; isPending: boolean; isError?: boolean; dataUpdatedAt?: number }
-export function useObservedQueryRegion(region: Attributes["region"], resource: Resource, count?: number, ready = true) {
- const client = useQueryClient()
- const evidence: Evidence = resource.data && typeof resource.data === "object" ? valueEvidence(client, resource.data) : { source: "unknown", version: "query_" + String(resource.dataUpdatedAt ?? 0), freshness: "unknown", count: resource.data == null ? 0 : 1 }
- useObservedRegion(region, ready && !resource.isPending && resource.data !== undefined, { ...evidence, ...(count === undefined ? {} : { count }) })
-}
diff --git a/src/web/src/lib/observability/regions.dom.test.tsx b/src/web/src/lib/observability/regions.dom.test.tsx
index ec4de2326..7070b4aa0 100644
--- a/src/web/src/lib/observability/regions.dom.test.tsx
+++ b/src/web/src/lib/observability/regions.dom.test.tsx
@@ -5,7 +5,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "./telemetry"
import { clearActions } from "./context"
import { observeQueryClient, disposeQueryDiagnostics } from "./query-observer"
-import { useObservedQueryRegion } from "./query-regions"
+import { useObservedRegion } from "./regions"
import { startRequest, requestHeaders, readObservedResponse } from "./requests"
vi.mock("next/navigation", () => ({ usePathname: () => "/", useSearchParams: () => new URLSearchParams() }))
@@ -18,7 +18,7 @@ async function emptyResponse() {
}
function Panel({ name }: { name: string }) {
const resource = useQuery({ queryKey: [name], queryFn: emptyResponse })
- useObservedQueryRegion(name === "active" ? "messages" : "settings", resource, resource.data?.length)
+ useObservedRegion(name === "active" ? "messages" : "settings", !resource.isPending && resource.data !== undefined, resource.data?.length)
return <p>{name}: {resource.isPending ? "loading" : "empty"}</p>
}
afterEach(async () => { await act(async () => { retireTelemetry(); clearActions(); disposeQueryDiagnostics(client); client.clear() }) })
@@ -32,7 +32,7 @@ it("observes actual settled empty Query values only after a retained Base UI pan
await waitFor(() => expect(events.filter(event => event.name === "region.ready_commit" && event.attributes.region === "messages")).toHaveLength(1))
expect(events.filter(event => event.name === "region.ready_commit" && event.attributes.region === "settings")).toHaveLength(0)
const empty = events.find(event => event.name === "region.ready_commit")!
- expect(empty.attributes).toMatchObject({ row_count: "0", outcome: "empty", source: "network" })
+ expect(empty.attributes).toMatchObject({ row_count: "0", outcome: "empty" })
await setupUser().click(screen.getByRole("tab", { name: "Retained" }))
await waitFor(() => expect(events.filter(event => event.name === "region.ready_commit" && event.attributes.region === "settings")).toHaveLength(1))
await act(async () => { view.rerender(<QueryClientProvider client={client}><Tabs defaultValue="active"><TabsList><TabsTrigger value="active">Active</TabsTrigger><TabsTrigger value="retained">Retained</TabsTrigger></TabsList><TabsContent value="active" keepMounted><Panel name="active" /></TabsContent><TabsContent value="retained" keepMounted><Panel name="retained" /></TabsContent></Tabs></QueryClientProvider>) })
diff --git a/src/web/src/lib/observability/regions.tsx b/src/web/src/lib/observability/regions.tsx
index 5d2763e18..fc6aa00fe 100644
--- a/src/web/src/lib/observability/regions.tsx
+++ b/src/web/src/lib/observability/regions.tsx
@@ -1,49 +1,37 @@
"use client"
-import { createContext, useContext, type ReactNode, Suspense, useEffect, useMemo, useRef, useSyncExternalStore } from "react"
+import { createContext, useContext, type ReactNode, Suspense, useEffect, useRef, useSyncExternalStore } from "react"
import { usePathname, useSearchParams } from "next/navigation"
import { commitNavigation, committedNavigationPathname, currentRoute, navigationForHref, finishAction, actionAttributes } from "./context"
import { emitTelemetry, isTelemetryEligible, telemetryGeneration, subscribeObservation, observationSnapshot } from "./telemetry"
-import { viewEvidence, mergeEvidence, type Evidence } from "./data-source"
import type { Attributes } from "./schema"
-export function windowEvidence(values: readonly unknown[], emptySource?: unknown): Evidence {
- return values.length ? { ...mergeEvidence(values.map(viewEvidence)), count: values.length } : { ...viewEvidence(emptySource ?? values), count: 0 }
-}
const visibility = createContext(true)
export function ObservedRegionVisibility({ visible, children }: { visible: boolean; children: ReactNode }) {
const parent = useContext(visibility)
return <visibility.Provider value={parent && visible}>{children}</visibility.Provider>
}
-export function useObservedRegion(region: Attributes["region"], ready: boolean, evidence: Evidence) {
+export function useObservedRegion(region: Attributes["region"], ready: boolean, count?: number) {
const visible = useContext(visibility)
- const revision = useSyncExternalStore(subscribeObservation, observationSnapshot, () => 0)
+ useSyncExternalStore(subscribeObservation, observationSnapshot, () => 0)
const href = typeof window === "undefined" ? "/" : window.location.pathname + window.location.search
- const signature = evidence.version + ":" + evidence.source + ":" + evidence.freshness + ":" + evidence.count + ":" + (evidence.wsEventId ?? "")
- const rendered = useMemo(() => ({ ...evidence, signature, observationRevision: revision, pathname: committedNavigationPathname(), route: currentRoute(), href, action: navigationForHref(href), generation: telemetryGeneration() }), [evidence, signature, href, revision])
+ const pathname = committedNavigationPathname(), route = currentRoute(), navigation = navigationForHref(href), generation = telemetryGeneration(), eligible = isTelemetryEligible()
const emitted = useRef("")
useEffect(() => {
- if (!visible || !ready || !isTelemetryEligible() || rendered.generation !== telemetryGeneration() || rendered.href !== window.location.pathname + window.location.search) return
- if (rendered.pathname !== undefined && rendered.pathname !== window.location.pathname) return
- const action = rendered.action && !rendered.action.done ? rendered.action : undefined
- const baseIdentity = String(rendered.generation) + ":" + rendered.href + ":" + rendered.signature + ":"
+ if (!visible || !ready || !eligible || !isTelemetryEligible() || generation !== telemetryGeneration() || href !== window.location.pathname + window.location.search) return
+ if (pathname !== undefined && pathname !== window.location.pathname) return
+ const action = navigation && !navigation.done ? navigation : undefined
+ const selectorReady = region === "sidebar" && ["/c/me", "/c/channels/[serverId]"].includes(route)
+ if (!selectorReady && ["shell", "rail", "sidebar", "members", "thread_opener"].includes(String(region))) return
+ const baseIdentity = String(generation) + ":" + href + ":"
const identity = baseIdentity + (action?.id ?? "")
if (identity === emitted.current || (!action && emitted.current.startsWith(baseIdentity))) return
emitted.current = identity
- const fields = { ...actionAttributes(action), region, ws_event_id: rendered.wsEventId, ws_duration_ms: rendered.wsStart === undefined ? undefined : performance.now() - rendered.wsStart, route_template: rendered.route, source: rendered.source, data_version: rendered.version, freshness: rendered.freshness, row_count: rendered.count, eligibility: "eligible", outcome: rendered.count ? "success" : "empty", phase: action ? "primary" : "background" }
- emitTelemetry("region.read", fields)
+ const fields = { ...actionAttributes(action), region, route_template: route, row_count: count, eligibility: "eligible", outcome: count === 0 ? "empty" : "success", phase: "primary" }
emitTelemetry("region.ready_commit", fields)
- const selectorReady = region === "sidebar" && ["/c/me", "/c/channels/[serverId]"].includes(rendered.route)
- if (selectorReady || !["shell", "rail", "sidebar", "members", "thread_opener"].includes(String(region))) finishAction(action, "success", { region, phase: "primary" })
- if (document.visibilityState !== "visible" || typeof requestAnimationFrame !== "function") {
- emitTelemetry("region.frame_estimate", { ...fields, capability: "unavailable", visibility: document.visibilityState })
- return
- }
- const start = performance.now()
- const handle = requestAnimationFrame(() => { if (rendered.generation === telemetryGeneration() && isTelemetryEligible()) emitTelemetry("region.frame_estimate", { ...fields, duration_ms: performance.now() - start, phase: "frame", capability: "limited", visibility: document.visibilityState }) })
- return () => cancelAnimationFrame(handle)
- }, [visible, ready, region, rendered, signature])
+ finishAction(action, "success", { region, phase: "primary" })
+ }, [visible, ready, region, count, pathname, route, navigation, generation, eligible, href])
}
function RouteCommit() {
const pathname = usePathname(), search = useSearchParams().toString()
@@ -57,6 +45,6 @@ export function ObservedRouteCommit() { return <Suspense fallback={null}><RouteC
export function ObservedStaticContent({ pathname }: { pathname?: string }) {
const ready = pathname === undefined || (typeof window !== "undefined" && pathname === window.location.pathname)
- useObservedRegion("page", ready, { source: "unknown", version: "ssr_committed", freshness: "unknown", count: 1 })
+ useObservedRegion("page", ready, 1)
return null
}
diff --git a/src/web/src/lib/observability/requests.ts b/src/web/src/lib/observability/requests.ts
index 59280576b..f332ea6ab 100644
--- a/src/web/src/lib/observability/requests.ts
+++ b/src/web/src/lib/observability/requests.ts
@@ -1,29 +1,67 @@
-import { actionAttributes, telemetryId, type Action } from "./context"
+import { actionAttributes, telemetryId, navigationForHref, prefetchForHref, type Action } from "./context"
import { routeTemplate } from "./coverage"
import { emitTelemetry, isTelemetryEligible, telemetryGeneration } from "./telemetry"
-import { tagNetworkResponse } from "./data-source"
-import type { Attributes } from "./schema"
-import { context, trace } from "@opentelemetry/api"
+import { cleanAttributes, type Attributes } from "./schema"
+import { context, trace, createContextKey, type Span } from "@opentelemetry/api"
export type RequestObservation = { id: string; start: number; generation: number; fields: Attributes; done: boolean; action?: Action }
const responses = new WeakMap<Response, RequestObservation>()
-export function startRequest(path: string, options?: { method?: string; observation?: { action?: Action; reason?: Attributes["request_reason"] } }): RequestObservation | undefined {
+const requestContext = createContextKey("alook.request")
+const transportRequests = new WeakMap<Span, RequestObservation>()
+export function startRequest(path: string, options?: { method?: string; kind?: Attributes["request_kind"]; observation?: { action?: Action; reason?: Attributes["request_reason"] } }): RequestObservation | undefined {
if (!isTelemetryEligible()) return
const origin = typeof window === "undefined" ? "https://alook.ai" : window.location.origin
- const fields = { ...actionAttributes(options?.observation?.action), route_template: routeTemplate(path, origin), method: options?.method ?? "GET", request_reason: options?.observation?.reason ?? "unknown", request_kind: "api", eligibility: "unknown" }
+ const fields = { ...actionAttributes(options?.observation?.action), route_template: routeTemplate(path, origin), method: options?.method ?? "GET", request_reason: options?.observation?.reason ?? "unknown", request_kind: options?.kind ?? "api", eligibility: "unknown" }
const request = { id: telemetryId(), start: performance.now(), generation: telemetryGeneration(), fields, done: false, action: options?.observation?.action }
emitTelemetry("request.start", { ...fields, request_id: request.id, start_ms: request.start })
return request
}
export function runObservedFetch<T>(request: RequestObservation | undefined, execute: () => T): T {
const action = request?.action
- return action?.span && !action.done && action.generation === telemetryGeneration() && isTelemetryEligible()
- ? context.with(trace.setSpan(context.active(), action.span), execute)
- : execute()
+ if (!request || request.generation !== telemetryGeneration() || !isTelemetryEligible()) return execute()
+ const original = context.active().setValue(requestContext, request)
+ return context.with(action?.span && action.generation === request.generation ? trace.setSpan(original, action.span) : original, execute)
+}
+
+export function observeTransportSpan(span: Span) {
+ const request = context.active().getValue(requestContext) as RequestObservation | undefined
+ if (!request || request.generation !== telemetryGeneration() || !isTelemetryEligible()) return
+ transportRequests.set(span, request)
+ const native = span.spanContext()
+ request.fields = { ...request.fields, trace_id: native.traceId, span_id: native.spanId }
+ for (const [key, value] of Object.entries(cleanAttributes({ ...request.fields, request_id: request.id }))) span.setAttribute(key, value)
+}
+
+export function finishTransportSpan(span: Span, result: unknown) {
+ const request = transportRequests.get(span)
+ transportRequests.delete(span)
+ if (request?.fields.request_kind !== "rsc") return
+ finishRequest(request, result instanceof Response ? "observed" : "error", result instanceof Response || request.fields.status !== undefined ? "body" : "headers")
+}
+
+export function installNavigationFetchContext() {
+ const original = window.fetch
+ const observed: typeof fetch = (input, init) => {
+ let url: URL
+ try { url = new URL(input instanceof Request ? input.url : String(input), window.location.origin) } catch { return original(input, init) }
+ if (url.origin !== window.location.origin || !url.searchParams.has("_rsc") || !isTelemetryEligible()) return original(input, init)
+ url.searchParams.delete("_rsc")
+ const href = url.pathname + url.search
+ const headers = new Headers(init?.headers ?? (input instanceof Request ? input.headers : undefined))
+ const prefetch = headers.has("next-router-prefetch") || headers.get("purpose") === "prefetch"
+ const action = prefetch ? prefetchForHref(href) : navigationForHref(href)
+ const request = startRequest(url.href, { kind: "rsc", observation: { action, reason: prefetch ? "prefetch" : "router" } })
+ return runObservedFetch(request, () => original(input, init)).then(response => {
+ requestHeaders(request, response)
+ return response
+ }, error => { finishRequest(request, "error", "headers"); throw error })
+ }
+ window.fetch = observed
+ return () => { if (window.fetch === observed) window.fetch = original }
}
function fields(request?: RequestObservation): Attributes {
const current = request?.action?.generation === telemetryGeneration() ? actionAttributes(request.action) : {}
- return request ? { ...request.fields, trace_id: current.trace_id ?? request.fields.trace_id, span_id: current.span_id ?? request.fields.span_id, request_id: request.id, start_ms: request.start, duration_ms: performance.now() - request.start } : {}
+ return request ? { ...request.fields, trace_id: request.fields.trace_id ?? current.trace_id, span_id: request.fields.span_id ?? current.span_id, request_id: request.id, start_ms: request.start, duration_ms: performance.now() - request.start } : {}
}
export function requestHeaders(request: RequestObservation | undefined, response: Response) {
if (!request || request.generation !== telemetryGeneration()) return
@@ -50,7 +88,6 @@ export async function readObservedResponse<T>(response: Response, read: () => Pr
const value = await read()
requestBodyParsed(response)
try { qualify?.() } catch (error) { requestRejected(request); throw error }
- if (request?.generation === telemetryGeneration()) tagNetworkResponse(value)
finishRequest(request, "success", "body", "eligible")
return value
} catch (error) {
diff --git a/src/web/src/lib/observability/restore.test.ts b/src/web/src/lib/observability/restore.test.ts
index 3172f9ea4..24654b9e9 100644
--- a/src/web/src/lib/observability/restore.test.ts
+++ b/src/web/src/lib/observability/restore.test.ts
@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, it } from "vitest"
import { hashKey, hydrate, QueryClient } from "@tanstack/react-query"
import type { PersistedClient } from "@tanstack/react-query-persist-client"
import { observeRestoreRead, observeRestoreDecode, observeHydration } from "./restore"
-import { valueEvidence } from "./data-source"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "./telemetry"
const snapshot = (): PersistedClient => ({ timestamp: Date.now(), buster: "current", clientState: { mutations: [], queries: [{ queryKey: ["community", "db", "account-a", "messages"], queryHash: hashKey(["community", "db", "account-a", "messages"]), state: { data: [{ id: "one", content: "private" }], dataUpdatedAt: Date.now(), dataUpdateCount: 1, error: null, errorUpdatedAt: 0, errorUpdateCount: 0, fetchFailureCount: 0, fetchFailureReason: null, fetchMeta: null, isInvalidated: false, status: "success", fetchStatus: "idle" } }] } })
@@ -12,13 +11,12 @@ describe("restore observation admission", () => {
const activate = (id: string) => { configureTelemetry({ session_id: id }, true); installTelemetrySink(event => events.push(event)) }
beforeEach(() => { client = new QueryClient(); events.length = 0; activate("session-a") })
afterEach(() => { retireTelemetry(); client.clear() })
- it("tags only the unchanged snapshot actually hydrated in the admitted generation", async () => {
+ it("reports actual restore phases without tagging hydrated values", async () => {
const persister = {}, data = snapshot()
await observeRestoreRead(async () => JSON.stringify(data), persister)
const decoded = observeRestoreDecode(persister, () => data, "current", 10000)
- hydrate(client, decoded.clientState); observeHydration(persister, client)
+ hydrate(client, decoded.clientState); observeHydration(persister)
expect(events.filter(event => event.name === "cache.restore.finish").map(event => event.attributes.outcome)).toEqual(["hit", "hit", "success"])
- expect(valueEvidence(client, client.getQueryData(["community", "db", "account-a", "messages"])).source).toBe("restored_idb")
expect(JSON.stringify(events)).not.toContain("private")
})
it("does not emit a late read, decode or hydrate into a regranted account session", async () => {
@@ -28,9 +26,8 @@ describe("restore observation admission", () => {
retireTelemetry(); activate("session-b"); events.length = 0
resolve(JSON.stringify(data)); await reading
const decoded = observeRestoreDecode(persister, () => data, "current", 10000)
- hydrate(client, decoded.clientState); observeHydration(persister, client)
+ hydrate(client, decoded.clientState); observeHydration(persister)
expect(events).toEqual([])
- expect(valueEvidence(client, client.getQueryData(["community", "db", "account-a", "messages"])).source).toBe("unknown")
})
it("rejects an old hydration-helper callback and preserves a fresh replacement query", async () => {
const persister = {}, data = snapshot()
@@ -38,7 +35,7 @@ describe("restore observation admission", () => {
observeRestoreDecode(persister, () => data, "current", 10000)
retireTelemetry(); activate("session-b"); events.length = 0
client.setQueryData(["community", "db", "account-a", "messages"], [{ id: "new" }])
- observeHydration(persister, client)
+ observeHydration(persister)
expect(events).toEqual([])
expect(client.getQueryData(["community", "db", "account-a", "messages"])).toEqual([{ id: "new" }])
})
diff --git a/src/web/src/lib/observability/restore.ts b/src/web/src/lib/observability/restore.ts
index 76e13b4de..572128524 100644
--- a/src/web/src/lib/observability/restore.ts
+++ b/src/web/src/lib/observability/restore.ts
@@ -1,10 +1,8 @@
-import type { QueryClient } from "@tanstack/react-query"
import type { PersistedClient } from "@tanstack/react-query-persist-client"
-import { recordRows, tagValue } from "./data-source"
import { emitTelemetry, isTelemetryEligible, telemetryGeneration } from "./telemetry"
import { telemetryId } from "./context"
-const restored = new WeakMap<object, { snapshot: PersistedClient; start: number; id: string; generation: number }>()
+const restored = new WeakMap<object, { count: number; start: number; id: string; generation: number }>()
const reads = new WeakMap<object, Array<{ generation: number; eligible: boolean }>>()
export async function observeRestoreRead<T>(operation: () => Promise<T>, persister?: object): Promise<T> {
const generation = telemetryGeneration(), eligible = isTelemetryEligible()
@@ -36,7 +34,7 @@ export function observeRestoreDecode(persister: object, operation: () => Persist
const outcome = snapshot.buster !== expectedBuster ? "buster" : Date.now() - snapshot.timestamp > maxAge || !snapshot.timestamp ? "expired" : "hit"
if (eligible && generation === telemetryGeneration()) {
emitTelemetry("cache.restore.finish", { request_id: id, phase: "deserialize", outcome, duration_ms: performance.now() - start, count: snapshot.clientState.queries.length })
- if (outcome === "hit") restored.set(persister, { snapshot, start: performance.now(), id: telemetryId(), generation })
+ if (outcome === "hit") restored.set(persister, { count: snapshot.clientState.queries.length, start: performance.now(), id: telemetryId(), generation })
}
return snapshot
} catch (error) {
@@ -44,20 +42,11 @@ export function observeRestoreDecode(persister: object, operation: () => Persist
throw error
}
}
-export function observeHydration(persister: object, client: QueryClient) {
+export function observeHydration(persister: object) {
const evidence = restored.get(persister)
restored.delete(persister)
if (!evidence || !isTelemetryEligible() || evidence.generation !== telemetryGeneration()) return
- let count = 0
emitTelemetry("cache.restore.start", { request_id: evidence.id, start_ms: evidence.start, phase: "hydrate" })
- for (const restoredQuery of evidence.snapshot.clientState.queries) {
- const query = client.getQueryCache().find({ queryKey: restoredQuery.queryKey, exact: true })
- if (!query || query.state.data !== restoredQuery.state.data || query.state.dataUpdatedAt <= 0) continue
- tagValue(client, query.state.data, "restored_idb")
- const key = query.queryKey
- if (key[0] === "community" && key[1] === "db" && Array.isArray(query.state.data)) recordRows(client, String(key[3]), query.state.data, row => String(row.id ?? row.userId ?? row.channelId ?? row.scopeId), "restored_idb")
- count++
- }
- emitTelemetry("cache.restore.finish", { request_id: evidence.id, phase: "hydrate", source: "restored_idb", outcome: count ? "success" : "miss", count, duration_ms: performance.now() - evidence.start })
+ emitTelemetry("cache.restore.finish", { request_id: evidence.id, phase: "hydrate", outcome: "success", count: evidence.count, duration_ms: performance.now() - evidence.start })
}
export function discardHydration(persister: object) { restored.delete(persister); reads.delete(persister) }
diff --git a/src/web/src/lib/observability/sanitize.test.ts b/src/web/src/lib/observability/sanitize.test.ts
index cc09842ab..299f35bf4 100644
--- a/src/web/src/lib/observability/sanitize.test.ts
+++ b/src/web/src/lib/observability/sanitize.test.ts
@@ -55,6 +55,17 @@ describe("outbound whitelist", () => {
expect(JSON.stringify(clean)).toContain("/api/community/messages/[id]")
expect(sanitizeTrace({ resourceSpans: [{ scopeSpans: [{ spans: [span] }] }] }, "new-session", origin)).toBeNull()
})
+ it("retains real link IDs while rejecting zero IDs and private link metadata", () => {
+ const span = { traceId: "a".repeat(32), spanId: "b".repeat(16), name: "navigation", startTimeUnixNano: "1000000000", endTimeUnixNano: "2000000000",
+ attributes: [{ key: "session.id", value: { stringValue: session } }], links: [
+ { traceId: "c".repeat(32), spanId: "d".repeat(16), traceState: "SECRET", attributes: [{ key: "private", value: "SECRET" }] },
+ { traceId: "0".repeat(32), spanId: "d".repeat(16) },
+ { traceId: "c".repeat(32), spanId: "0".repeat(16) },
+ ] }
+ const clean = sanitizeTrace({ resourceSpans: [{ scopeSpans: [{ spans: [span] }] }] }, session, origin)!
+ expect(clean.resourceSpans[0]!.scopeSpans[0]!.spans[0]!.links).toEqual([{ traceId: "c".repeat(32), spanId: "d".repeat(16), attributes: [], droppedAttributesCount: 0 }])
+ expect(JSON.stringify(clean)).not.toContain("SECRET")
+ })
it("omits unknown HTTP methods without changing internal or real HTTP span identity", () => {
const base = { traceId: "a".repeat(32), spanId: "b".repeat(16), name: "dm.message.send", kind: 1, startTimeUnixNano: "1000000000", endTimeUnixNano: "2000000000" }
const clean = (method?: unknown, legacy = false) => sanitizeTrace({ resourceSpans: [{ scopeSpans: [{ spans: [{
@@ -104,7 +115,7 @@ describe("outbound whitelist", () => {
expect(sanitizeItem(measurement("web-vitals", { LCP: 10, cls: 0, SECRET: 1, inp: NaN, fcp: -1 }), session, origin)?.payload).toEqual({ type: "web-vitals", timestamp: "2026-10-05T00:00:00Z", values: { LCP: 10, cls: 0 } })
expect(sanitizeItem(measurement("arbitrary", { LCP: 10 }), session, origin)).toBeNull()
expect(sanitizeItem(measurement("web-vitals", { SECRET: 1 }), session, origin)).toBeNull()
- const exception = { type: "exception", meta, payload: { type: "Error", value: "SECRET", stacktrace: { frames: [{ filename: "http://[", lineno: 3 }] } } } as TransportItem
+ const exception = { type: "exception", meta, payload: { timestamp: "2026-10-05T00:00:00Z", type: "Error", value: "SECRET", stacktrace: { frames: [{ filename: "http://[", lineno: 3 }] } } } as TransportItem
expect(sanitizeItem(exception, session, origin)?.payload).toMatchObject({ value: "[redacted]", stacktrace: { frames: [] } })
expect(sanitizeItem({ type: "unknown", meta, payload: {} } as unknown as TransportItem, session, origin)).toBeNull()
})
@@ -128,8 +139,8 @@ describe("outbound whitelist", () => {
const variants = [
{ type: "event", payload: { name: "session_start", attributes: spoofed } },
{ type: "event", payload: { name: "business.result", attributes: spoofed } },
- { type: "measurement", payload: { type: "web-vitals", values: { lcp: 10 } } },
- { type: "exception", payload: { type: "Error", value: "SECRET" } },
+ { type: "measurement", payload: { timestamp: "2026-10-05T00:00:00Z", type: "web-vitals", values: { lcp: 10 } } },
+ { type: "exception", payload: { timestamp: "2026-10-05T00:00:00Z", type: "Error", value: "SECRET" } },
{ type: "trace", payload: { resourceSpans: [{ scopeSpans: [{ spans: [span] }] }] } },
]
for (const variant of variants) {
@@ -167,4 +178,27 @@ describe("outbound whitelist", () => {
expect(trace.resourceSpans[0]!.scopeSpans[0]!.spans[0]!.attributes).toContainEqual({ key: "frontend_surface", value: { stringValue: "webview" } })
})
+ it.each(["faro.performance.resource", "faro.performance.navigation"])("filters native %s without exposing URLs, DOM targets or server timing", name => {
+ const time = Date.parse("2026-10-05T00:00:00Z")
+ const item = { type: "event", meta, payload: { name, timestamp: new Date(time).toISOString(), attributes: { name: origin + "/api/community/messages/SECRET?token=SECRET", duration: "12", transferSize: "40", requestTime: "Infinity", httpHost: "SECRET", serverTiming: "SECRET", target: "SECRET" } } } as TransportItem
+ const clean = sanitizeItem(item, session, origin, undefined, time)!
+ expect(clean.payload).toMatchObject({ name, attributes: { name: "/api/community/messages/[id]", route_template: "/api/community/messages/[id]", duration: "12", transferSize: "40" } })
+ expect(JSON.stringify(clean)).not.toContain("SECRET")
+ expect(JSON.stringify(clean)).not.toContain("Infinity")
+ expect(sanitizeItem(item, session, origin, undefined, time + 1)).toBeNull()
+ })
+ it("drops unqualified document vitals and removes account identity from permitted document measurements", () => {
+ const item = { type: "measurement", meta: { ...meta, user: { id: "account-a" } }, payload: { type: "web-vitals", timestamp: "2026-10-05T00:00:00Z", values: { lcp: 10 }, context: { element: "SECRET" } } } as TransportItem
+ const clean = sanitizeItem(item, session, origin)!
+ expect(clean.meta).not.toHaveProperty("user")
+ expect(clean.payload).not.toHaveProperty("context")
+ expect(sanitizeItem(item, session, origin, undefined, 0, false)).toBeNull()
+ })
+ it("rejects native HTTP events and spans whose real start precedes the current admission", () => {
+ const item = { type: "event", meta, payload: { name: "faro.tracing.fetch", timestamp: new Date(2000).toISOString(), attributes: { "session.id": session, duration_ns: "1000000000" } } } as TransportItem
+ expect(sanitizeItem(item, session, origin, undefined, 1500)).toBeNull()
+ const span = { traceId: "a".repeat(32), spanId: "b".repeat(16), name: "navigation", startTimeUnixNano: "1000000000", endTimeUnixNano: "2000000000", attributes: [{ key: "session.id", value: { stringValue: session } }] }
+ expect(sanitizeTrace({ resourceSpans: [{ scopeSpans: [{ spans: [span] }] }] }, session, origin, undefined, 1500)).toBeNull()
+ })
+
})
diff --git a/src/web/src/lib/observability/sanitize.ts b/src/web/src/lib/observability/sanitize.ts
index 9fcaad64d..3a086f397 100644
--- a/src/web/src/lib/observability/sanitize.ts
+++ b/src/web/src/lib/observability/sanitize.ts
@@ -2,18 +2,20 @@ import type { TransportItem, EventEvent, ExceptionEvent, MeasurementEvent, Trace
import { actionNames, routeTemplate } from "./coverage"
import { cleanAttributes, eventNames } from "./schema"
import type { FrontendIdentity } from "./runtime"
+import { resolveObservationBuild } from "./build"
const actions = new Set<string>(actionNames)
-const events = new Set<string>([...eventNames, "session_start", "session_resume", "session_extend", "faro.user.action", "faro.tracing.fetch", "faro.tracing.xml-http-request"])
+const events = new Set<string>([...eventNames, "session_start", "session_resume", "session_extend", "faro.user.action", "faro.tracing.fetch", "faro.tracing.xml-http-request", "faro.performance.resource", "faro.performance.navigation"])
const errors = new Set(["Error", "TypeError", "RangeError", "SyntaxError", "ReferenceError", "URIError", "AbortError", "DOMException"])
const numeric = (value: unknown) => typeof value === "number" && Number.isFinite(value) && value >= 0
const record = (value: unknown): Record<string, unknown> => value && typeof value === "object" ? value as Record<string, unknown> : {}
const array = (value: unknown): unknown[] => Array.isArray(value) ? value : []
-const hex = (value: unknown, size: number) => typeof value === "string" && new RegExp("^[0-9a-f]{" + size + "}$").test(value) ? value : undefined
+const hex = (value: unknown, size: number) => typeof value === "string" && new RegExp("^[0-9a-f]{" + size + "}$").test(value) && !/^0+$/.test(value) ? value : undefined
const nano = (value: unknown) => typeof value === "string" && /^\d{1,22}$/.test(value) ? value : undefined
-export function sanitizeTrace(input: unknown, sessionId: string, origin: string, identity?: Partial<FrontendIdentity>) {
- const canonical = identity ? { frontend_surface: identity.frontend_surface, client_platform: identity.client_platform, app_version: identity.app_version } : {}
+export function sanitizeTrace(input: unknown, sessionId: string, origin: string, identity?: Partial<FrontendIdentity> & { release?: string; environment?: string }, since = 0) {
+ const canonical = { ...(identity ? { frontend_surface: identity.frontend_surface, client_platform: identity.client_platform, app_version: identity.app_version } : {}),
+ ...resolveObservationBuild({ NEXT_PUBLIC_FARO_RELEASE: identity?.release, NEXT_PUBLIC_FARO_ENVIRONMENT: identity?.environment }) }
const context = cleanAttributes(canonical)
const resources = array(record(input).resourceSpans).flatMap(resource => {
const scopes = array(record(resource).scopeSpans).flatMap(scope => {
@@ -38,6 +40,8 @@ export function sanitizeTrace(input: unknown, sessionId: string, origin: string,
const traceId = hex(span.traceId, 32), spanId = hex(span.spanId, 16)
const startTimeUnixNano = nano(span.startTimeUnixNano), endTimeUnixNano = nano(span.endTimeUnixNano)
if (!traceId || !spanId || !startTimeUnixNano || !endTimeUnixNano) return []
+ const businessAction = actions.has(String(span.name)) && fields.action_name === span.name && typeof fields.action_id === "string" && /^[a-zA-Z0-9_-]{1,80}$/.test(fields.action_id)
+ if (!businessAction && Number(startTimeUnixNano) / 1e6 < since) return []
return [{
traceId, spanId, parentSpanId: hex(span.parentSpanId, 16),
name: actions.has(String(span.name)) ? String(span.name) : (method ? method + " " : "") + String(template),
@@ -47,7 +51,10 @@ export function sanitizeTrace(input: unknown, sessionId: string, origin: string,
attributes: Object.entries(attributes).map(([key,value]) => ({ key, value: { stringValue: value } })),
status: { code: (Number(record(span.status).code) === 2 ? 2 : 0) as 0 | 2 },
droppedAttributesCount: 0, droppedEventsCount: 0, droppedLinksCount: 0,
- events: [], links: [],
+ events: [], links: array(span.links).flatMap(raw => {
+ const link = record(raw), traceId = hex(link.traceId, 32), spanId = hex(link.spanId, 16)
+ return traceId && spanId ? [{ traceId, spanId, attributes: [], droppedAttributesCount: 0 }] : []
+ }),
}]
})
return spans.length ? [{ scope: { name: "alook.frontend" }, spans }] : []
@@ -58,7 +65,7 @@ export function sanitizeTrace(input: unknown, sessionId: string, origin: string,
return resources.length ? { resourceSpans: resources } : null
}
-export function sanitizeItem(item: TransportItem, sessionId: string, origin: string, identity?: Partial<FrontendIdentity>): TransportItem | null {
+export function sanitizeItem(item: TransportItem, sessionId: string, origin: string, identity?: Partial<FrontendIdentity>, since = 0, documentVitalsEligible = true): TransportItem | null {
if (item.meta.session?.id !== sessionId) return null
const sdk = item.meta.sdk
if (sdk?.name !== "faro-web" || !/^\d{1,3}\.\d{1,3}\.\d{1,3}(?:-[a-zA-Z0-9.-]{1,32})?$/.test(sdk.version ?? "")) return null
@@ -69,7 +76,7 @@ export function sanitizeItem(item: TransportItem, sessionId: string, origin: str
sdk: { name: sdk.name, version: sdk.version },
app: { name: "alook-web", version, ...cleanAttributes({ release: item.meta.app?.release, environment: item.meta.app?.environment }) },
session: { id: sessionId, attributes: { isSampled: "true", ...context } },
- page: { id: item.meta.page?.id, url: origin + routeTemplate(item.meta.page?.url ?? "/", origin) },
+ page: { id: item.meta.page?.id && /^[a-zA-Z0-9_-]{1,80}$/.test(item.meta.page.id) ? item.meta.page.id : undefined, url: origin + routeTemplate(item.meta.page?.url ?? "/", origin) },
...(item.meta.user?.id && /^[a-zA-Z0-9_-]{8,64}$/.test(item.meta.user.id) ? { user: { id: item.meta.user.id } } : {}),
}
if (item.type === "log") return null
@@ -79,14 +86,28 @@ export function sanitizeItem(item: TransportItem, sessionId: string, origin: str
if (payload.name.startsWith("faro.tracing.") && payload.attributes?.["session.id"] !== sessionId) return null
if (payload.attributes?.session_id && payload.attributes.session_id !== sessionId) return null
const attrs = cleanAttributes({ ...payload.attributes, ...canonical })
+ if (payload.name.startsWith("faro.performance.")) {
+ if (!(Date.parse(payload.timestamp) >= since)) return null
+ const fields = payload.attributes ?? {}
+ const template = routeTemplate(fields.name ?? "", origin)
+ attrs.name = template
+ Object.assign(attrs, cleanAttributes({ route_template: template, request_kind: payload.name === "faro.performance.navigation" ? "document" : "resource" }))
+ for (const key of ["duration", "tcpHandshakeTime", "dnsLookupTime", "tlsNegotiationTime", "redirectTime", "requestTime", "responseTime", "fetchTime", "serviceWorkerTime", "decodedBodySize", "encodedBodySize", "ttfb", "transferSize", "pageLoadTime", "documentParsingTime", "domProcessingTime", "domContentLoadHandlerTime", "onLoadTime"]) {
+ const value = fields[key]
+ if (typeof value === "string" && value.trim() !== "" && numeric(Number(value))) attrs[key] = String(Number(value))
+ }
+ if (numeric(Number(fields.responseStatus)) && Number(fields.responseStatus) <= 599) attrs.responseStatus = String(Number(fields.responseStatus))
+ }
if (payload.name.startsWith("faro.tracing.")) {
const fields = payload.attributes ?? {}
+ if (!(Date.parse(payload.timestamp) - Number(fields.duration_ns) / 1e6 >= since)) return null
const url = String(fields["url.full"] ?? fields["http.url"] ?? "")
let kind = "unknown"
try { const parsed = new URL(url, origin); kind = parsed.origin !== origin ? "external" : parsed.searchParams.has("_rsc") ? "rsc" : parsed.pathname.startsWith("/api/") ? "api" : "resource" } catch {}
Object.assign(attrs, cleanAttributes({ route_template: routeTemplate(url, origin), request_kind: kind, duration_ms: Number(fields.duration_ns) / 1e6, method: fields["http.request.method"] ?? fields["http.method"], status: fields["http.response.status_code"] ?? fields["http.status_code"], session_id: sessionId }))
}
if (payload.name === "faro.user.action") {
+ if (!(Number(payload.attributes?.userActionStartTime) >= since)) return null
const name = payload.attributes?.["userActionName"]
if (!name || !actions.has(name)) return null
attrs.userActionName = name
@@ -95,10 +116,11 @@ export function sanitizeItem(item: TransportItem, sessionId: string, origin: str
if (numeric(value)) attrs[field] = String(value)
}
}
- return { ...item, meta, payload: { name: payload.name, timestamp: payload.timestamp, domain: "alook.frontend", attributes: { ...attrs, ...context }, ...(payload.trace && hex(payload.trace.trace_id, 32) && hex(payload.trace.span_id, 16) ? { trace: payload.trace } : {}) } }
+ return { ...item, meta, payload: { name: payload.name, timestamp: payload.timestamp, domain: "alook.frontend", attributes: { ...attrs, ...context }, ...(payload.trace && hex(payload.trace.trace_id, 32) && hex(payload.trace.span_id, 16) ? { trace: { trace_id: payload.trace.trace_id, span_id: payload.trace.span_id } } : {}) } }
}
if (item.type === "exception") {
const payload = item.payload as ExceptionEvent
+ if (!(Date.parse(payload.timestamp) >= since)) return null
return { ...item, meta, payload: { timestamp: payload.timestamp, type: errors.has(payload.type) ? payload.type : "Error", value: "[redacted]", stacktrace: { frames: (payload.stacktrace?.frames ?? []).slice(0,20).flatMap(frame => {
try {
const url = new URL(frame.filename, origin)
@@ -109,12 +131,13 @@ export function sanitizeItem(item: TransportItem, sessionId: string, origin: str
}
if (item.type === "measurement") {
const payload = item.payload as MeasurementEvent
- if (payload.type !== "web-vitals") return null
+ if (!documentVitalsEligible || payload.type !== "web-vitals" || !(Date.parse(payload.timestamp) >= since)) return null
const values = Object.fromEntries(Object.entries(payload.values).filter(([key,value]) => /^(LCP|CLS|INP|FCP|TTFB|FID|lcp|cls|inp|fcp|ttfb|fid)$/.test(key) && numeric(value)))
- return Object.keys(values).length ? { ...item, meta, payload: { type: payload.type, timestamp: payload.timestamp, values } } : null
+ const { user: _user, ...documentMeta } = meta
+ return Object.keys(values).length ? { ...item, meta: documentMeta, payload: { type: payload.type, timestamp: payload.timestamp, values } } : null
}
if (item.type === "trace") {
- const payload = sanitizeTrace(item.payload, sessionId, origin, identity)
+ const payload = sanitizeTrace(item.payload, sessionId, origin, { ...identity, release: item.meta.app?.release, environment: item.meta.app?.environment }, since)
return payload ? { ...item, meta, payload: payload as TraceEvent } : null
}
return null
diff --git a/src/web/src/lib/observability/schema.ts b/src/web/src/lib/observability/schema.ts
index e4ad20a8f..9501c5c0f 100644
--- a/src/web/src/lib/observability/schema.ts
+++ b/src/web/src/lib/observability/schema.ts
@@ -2,40 +2,43 @@ import { actionNames, apiRoutes, pageRoutes } from "./coverage"
export const eventNames = [
"action.start", "action.finish", "navigation.intent", "navigation.commit", "navigation.ready",
- "cache.restore.start", "cache.restore.finish", "region.read",
- "region.ready_commit", "region.frame_estimate", "request.start", "request.headers",
+ "cache.restore.start", "cache.restore.finish", "query.lifecycle",
+ "region.ready_commit", "request.start", "request.headers",
"request.body_parsed", "request.finish", "data.publish", "data.response_rejected",
"ws.connect", "ws.ready", "ws.close", "ws.reconnect", "ws.event_applied",
- "resource.finish", "main_thread.longtask", "telemetry.coverage", "telemetry.drop", "business.result", "message.milestone",
+ "main_thread.longtask", "telemetry.coverage", "telemetry.drop", "business.result", "message.milestone",
] as const
export type TelemetryEvent = typeof eventNames[number]
export type Attributes = Record<string, string | number | boolean | undefined>
-export type Source = "restored_idb" | "network" | "ws" | "local_mutation" | "mixed" | "unknown"
const names = new Set<string>(actionNames)
const routes = new Set<string>([...pageRoutes, ...apiRoutes, "/external", "/unmapped", "/_next/resource"])
const enumValues: Record<string, ReadonlySet<string>> = Object.fromEntries(Object.entries({
- environment: ["production", "qa"],
+ environment: ["production", "qa", "development"],
+ worker_version_status: ["present", "missing"],
+ release_status: ["present", "missing"],
+ environment_status: ["present", "missing"],
+ trace_context: ["received", "missing"],
+ auth_instance: ["created", "reused", "request_local"],
+ auth_reuse_reason: ["cold", "version_changed", "configuration_changed", "version_missing", "match"],
frontend_surface: ["web", "blog", "webview"],
client_platform: ["browser", "desktop", "mobile"],
navigation_kind: ["document", "route"],
phase: ["intent", "headers", "body", "read", "primary", "background", "hydrate", "idb_read", "deserialize", "commit", "frame", "interaction", "optimistic", "ack", "upload", "transport", "auth", "token", "validation"],
outcome: ["success", "error", "cancelled", "superseded", "timeout", "noop", "observed", "unknown", "empty", "miss", "hit", "expired", "buster", "rejected", "disabled", "unavailable", "partial"],
source: ["restored_idb", "network", "ws", "local_mutation", "mixed", "unknown"],
- freshness: ["restored", "validated", "changed", "unknown"],
eligibility: ["eligible", "rejected", "unknown", "denied"],
- request_reason: ["foreground", "background", "restore_invalidate", "pagination", "command", "router", "unknown"],
+ request_reason: ["foreground", "prefetch", "background", "restore_invalidate", "pagination", "command", "router", "unknown"],
request_kind: ["api", "rsc", "resource", "document", "external", "unknown"],
method: ["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD", "OPTIONS"],
region: ["shell", "rail", "sidebar", "messages", "forum", "thread_opener", "friends", "bots", "machines", "members", "settings", "billing", "file_preview", "inbox", "page"],
visibility: ["visible", "hidden", "unknown"],
capability: ["available", "limited", "unavailable"],
drop_reason: ["early_queue_full", "transport_failure", "withdrawal", "account_switch", "stale_session", "sdk_load", "invalid_config", "unload_unknown"],
- delivery_failure_reason: ["queue_full", "retries_exhausted", "rate_limit", "http_error", "network", "timeout", "abort", "unknown"],
cache_stage: ["idb", "query", "router", "http", "canonical"],
}).map(([key, values]) => [key, new Set(values)]))
-const numberFields = new Set(["start_ms", "duration_ms", "ws_duration_ms", "count", "row_count", "changed_count", "removed_count", "status", "schema_version", "revision", "attempt", "collection_rate", "drop_count", "delivery_failure_count", "transfer_bytes", "encoded_bytes", "decoded_bytes"])
-const idFields = new Set(["ws_event_id", "session_id", "page_instance_id", "action_id", "navigation_id", "request_id", "data_version", "user_key"])
+const numberFields = new Set(["start_ms", "duration_ms", "count", "row_count", "changed_count", "removed_count", "status", "schema_version", "revision", "attempt", "collection_rate", "drop_count", "transfer_bytes", "encoded_bytes", "decoded_bytes"])
+const idFields = new Set(["ws_event_id", "session_id", "page_instance_id", "action_id", "navigation_id", "request_id", "prefetch_action_id", "worker_version", "user_key"])
export function cleanAttributes(input: Record<string, unknown>): Record<string, string> {
const result: Record<string, string> = {}
@@ -50,8 +53,8 @@ export function cleanAttributes(input: Record<string, unknown>): Record<string,
else if (key === "route_template" && routes.has(text)) result[key] = text
else if (key === "action_name" && names.has(text)) result[key] = text
else if (key === "cf_ray" && /^[0-9a-f]{16}-[A-Z]{3}$/.test(text)) result[key] = text
- else if (key === "trace_id" && /^[0-9a-f]{32}$/.test(text)) result[key] = text
- else if (key === "span_id" && /^[0-9a-f]{16}$/.test(text)) result[key] = text
+ else if ((key === "trace_id" || key === "upstream_trace_id") && /^[0-9a-f]{32}$/.test(text)) result[key] = text
+ else if ((key === "span_id" || key === "upstream_span_id") && /^[0-9a-f]{16}$/.test(text)) result[key] = text
else if (key === "event_type" && /^(community:|connection\.|auth\.)[a-z_.]{1,50}$/.test(text)) result[key] = text
}
return result
diff --git a/src/web/src/lib/observability/telemetry.ts b/src/web/src/lib/observability/telemetry.ts
index 0ea4d74ff..e4c4c893d 100644
--- a/src/web/src/lib/observability/telemetry.ts
+++ b/src/web/src/lib/observability/telemetry.ts
@@ -1,4 +1,5 @@
import { cleanAttributes, type Attributes, type TelemetryEvent } from "./schema"
+import { observationEpoch } from "./clock"
type RecordEvent = { name: TelemetryEvent; attributes: Record<string, string>; timestamp: number }
type Sink = (event: RecordEvent) => void
@@ -54,7 +55,7 @@ export function retireTelemetry(reason: "boundary" | "native_session" = "boundar
export function isNativeSessionContinuation(original: number) { return eligible && nativeContinuationFrom === original }
export function emitTelemetry(name: TelemetryEvent, attributes: Attributes = {}) {
if (!eligible) return
- const event = { name, attributes: cleanAttributes({ ...base, ...attributes, schema_version: 1 }), timestamp: Date.now() }
+ const event = { name, attributes: cleanAttributes({ ...base, ...attributes, schema_version: 1 }), timestamp: observationEpoch() }
if (sink) { try { sink(event) } catch { dropped++ } }
else if (queue.length < LIMIT) queue.push(event)
else dropped++
diff --git a/src/web/src/lib/observability/virtual-window.dom.test.tsx b/src/web/src/lib/observability/virtual-window.dom.test.tsx
index b16dccd61..7553ce8b5 100644
--- a/src/web/src/lib/observability/virtual-window.dom.test.tsx
+++ b/src/web/src/lib/observability/virtual-window.dom.test.tsx
@@ -4,8 +4,7 @@ import { afterEach, beforeEach, expect, it, vi } from "vitest"
import { act, fireEvent, render, waitFor } from "@/test/react-dom-harness"
import { COMMUNITY_VIRTUALIZER_REACT_OPTIONS } from "@/hooks/community/virtualizer-react-options"
import { VirtualRows } from "@/components/community/messages/virtual-cursor-list"
-import { tagView, type Evidence } from "./data-source"
-import { useObservedRegion, windowEvidence } from "./regions"
+import { useObservedRegion } from "./regions"
import { configureTelemetry, installTelemetrySink, retireTelemetry } from "./telemetry"
import { visibleVirtualItems } from "./virtual-window"
@@ -39,13 +38,11 @@ function WindowPanel({ rows, overscan, attached = true }: { rows: Row[]; oversca
})
useLayoutEffect(() => { native = virtualizer })
const selected = visibleVirtualItems(virtualizer).map(item => rows[item.index]!)
- useObservedRegion("messages", selected.length > 0, windowEvidence(selected, rows))
+ useObservedRegion("messages", selected.length > 0, selected.length)
return attached ? <div ref={bind} data-testid="viewport"><VirtualRows items={rows} virtualizer={virtualizer} itemKey={row => row.id} renderItem={row => <p>{row.id}</p>} /></div> : null
}
function rows() {
- return Array.from({ length: 20 }, (_, index) => tagView({ id: "row-" + index }, {
- source: "network", version: String(index), freshness: "changed", count: 1,
- }))
+ return Array.from({ length: 20 }, (_, index) => ({ id: "row-" + index }))
}
const ready = () => events.filter(event => event.name === "region.ready_commit")
const indexes = () => visibleVirtualItems(native).map(item => item.index)
@@ -65,34 +62,27 @@ afterEach(async () => {
vi.unstubAllGlobals()
})
-it.each([8, 5])("excludes mounted overscan %s from source, version and WS receipt until it enters the viewport", async overscan => {
+it.each([8, 5])("excludes mounted overscan %s from initial ready and emits no background update signals", async overscan => {
const values = rows()
- const ws: Evidence = { source: "ws", version: "ws-outside", freshness: "changed", count: 1, wsEventId: "outside-receipt", wsStart: performance.now() }
- values[8] = tagView({ id: "row-8" }, ws)
mounted = render(<WindowPanel rows={values} overscan={overscan} />)
await waitFor(() => expect(ready().at(-1)?.attributes.row_count).toBe("2"))
expect(indexes()).toEqual([5, 6])
expect(native.getVirtualItems().some(item => item.index === 8)).toBe(true)
expect(mounted.getByText("row-8")).toBeInTheDocument()
- expect(ready().at(-1)!.attributes).toMatchObject({ source: "network", row_count: "2" })
- expect(ready().at(-1)!.attributes.ws_event_id).toBeUndefined()
- const initialVersion = ready().at(-1)!.attributes.data_version
- values[8] = tagView({ id: "row-8" }, { ...ws, version: "ws-outside-new", wsEventId: "new-outside-receipt" })
+ values[8] = { id: "updated-row-8" }
mounted.rerender(<WindowPanel rows={values} overscan={overscan} />)
expect(ready()).toHaveLength(1)
- expect(ready()[0]!.attributes.data_version).toBe(initialVersion)
+ expect(ready()[0]!.attributes).not.toHaveProperty("data_version")
+ expect(ready()[0]!.attributes).not.toHaveProperty("ws_event_id")
const viewport = mounted.getByTestId("viewport")
await act(async () => { viewport.scrollTop = 650; fireEvent.scroll(viewport) })
await waitFor(() => expect(indexes()).toEqual([6, 7, 8]))
- expect(ready().at(-1)!.attributes).toMatchObject({ source: "mixed", row_count: "3", ws_event_id: "new-outside-receipt" })
- expect(ready().at(-1)!.attributes.data_version).not.toBe(initialVersion)
await act(async () => {
height = 50
observers.get(viewport)!([], {} as ResizeObserver)
})
await waitFor(() => expect(indexes()).toEqual([6]))
- expect(ready().at(-1)!.attributes).toMatchObject({ source: "network", row_count: "1" })
- expect(ready().at(-1)!.attributes.ws_event_id).toBeUndefined()
+ expect(ready()).toHaveLength(1)
})
it("counts partial rows and excludes rows touching only an outside boundary", async () => {
diff --git a/src/web/src/lib/observability/worker.test.ts b/src/web/src/lib/observability/worker.test.ts
new file mode 100644
index 000000000..fe53384f9
--- /dev/null
+++ b/src/web/src/lib/observability/worker.test.ts
@@ -0,0 +1,51 @@
+import { afterEach, expect, it, vi } from "vitest"
+import { observeWorkerOperation } from "./worker"
+import { resolveObservationBuild } from "./build"
+import { createWebWorkerHandler, workerRequestAttributes } from "../worker-runtime"
+
+const native = vi.hoisted(() => ({ tracing: undefined as ExecutionContext["tracing"] | undefined }))
+vi.mock("@opennextjs/cloudflare", () => ({ getCloudflareContext: () => ({ ctx: { tracing: native.tracing } }) }))
+afterEach(() => { native.tracing = undefined; vi.unstubAllEnvs() })
+
+it("passes execution to native request spans and filters private attributes", async () => {
+ const span = { setAttribute: vi.fn() }
+ const enterSpan = vi.fn((_name: string, run: (span: unknown) => unknown) => run(span))
+ native.tracing = { enterSpan } as unknown as ExecutionContext["tracing"]
+ const value = Promise.resolve("same-result")
+ expect(observeWorkerOperation("auth.get_session", { auth_instance: "reused", token: "PRIVATE" }, () => value)).toBe(value)
+ expect(await value).toBe("same-result")
+ expect(enterSpan).toHaveBeenCalledOnce()
+ expect(span.setAttribute.mock.calls).toEqual([["auth_instance", "reused"]])
+ native.tracing = undefined
+ expect(observeWorkerOperation("auth.get_session", {}, () => value)).toBe(value)
+})
+
+it("records received trace context and actual Worker version without claiming a native parent", () => {
+ const build = resolveObservationBuild({ NEXT_PUBLIC_FARO_RELEASE: "a".repeat(40), NEXT_PUBLIC_FARO_ENVIRONMENT: "qa" })
+ const request = new Request("https://fixture.test/c/me?token=PRIVATE", { headers: { traceparent: `00-${"b".repeat(32)}-${"c".repeat(16)}-01`, tracestate: "PRIVATE" } })
+ const fields = workerRequestAttributes(request, { CF_VERSION_METADATA: { id: "real-version" } } as Env, build)
+ expect(fields).toMatchObject({ release: "a".repeat(40), environment: "qa", worker_version: "real-version", trace_context: "received", upstream_trace_id: "b".repeat(32), upstream_span_id: "c".repeat(16) })
+ expect(fields).not.toHaveProperty("parent_span_id")
+ expect(JSON.stringify(fields)).not.toContain("PRIVATE")
+ for (const traceparent of ["bad", `00-${"0".repeat(32)}-${"c".repeat(16)}-01`]) {
+ expect(workerRequestAttributes(new Request(request, { headers: { traceparent } }), {} as Env, build)).toMatchObject({ trace_context: "missing", worker_version_status: "missing", upstream_trace_id: undefined })
+ }
+})
+
+it("uses explicit missing build provenance when the caller supplies no profile", async () => {
+ vi.stubEnv("GITHUB_SHA", "a".repeat(40))
+ vi.stubEnv("NEXT_PUBLIC_FARO_ENVIRONMENT", "production")
+ const response = new Response("same-body")
+ const fetch = vi.fn(async () => response)
+ const setAttribute = vi.fn()
+ const enterSpan = vi.fn((_name: string, execute: (span: unknown) => unknown) => execute({ setAttribute }))
+ const handler = createWebWorkerHandler({ fetch })
+ const returned = await handler.fetch!(new Request("https://fixture.test/c/me"), {} as CloudflareEnv,
+ { tracing: { enterSpan } } as unknown as ExecutionContext)
+ expect(returned).toBe(response)
+ expect(await returned.text()).toBe("same-body")
+ expect(fetch).toHaveBeenCalledOnce()
+ expect(Object.fromEntries(setAttribute.mock.calls)).toMatchObject({ release_status: "missing", environment_status: "missing", worker_version_status: "missing" })
+ expect(JSON.stringify(setAttribute.mock.calls)).not.toContain("a".repeat(40))
+ expect(JSON.stringify(setAttribute.mock.calls)).not.toContain("production")
+})
diff --git a/src/web/src/lib/observability/worker.ts b/src/web/src/lib/observability/worker.ts
new file mode 100644
index 000000000..7c18a4fbd
--- /dev/null
+++ b/src/web/src/lib/observability/worker.ts
@@ -0,0 +1,20 @@
+import { getCloudflareContext } from "@opennextjs/cloudflare"
+import { cleanAttributes, type Attributes } from "./schema"
+
+function requestTracing() {
+ try { return getCloudflareContext().ctx.tracing } catch { return undefined }
+}
+
+export function annotateWorkerSpan(attributes: Attributes) {
+ const span = requestTracing()?.getActiveSpan()
+ if (span?.isTraced) for (const [key, value] of Object.entries(cleanAttributes(attributes))) span.setAttribute(key, value)
+}
+
+export function observeWorkerOperation<T>(name: string, attributes: Attributes, execute: () => T): T {
+ const tracing = requestTracing()
+ if (!tracing) return execute()
+ return tracing.enterSpan(name, (span) => {
+ for (const [key, value] of Object.entries(cleanAttributes(attributes))) span.setAttribute(key, value)
+ return execute()
+ })
+}
diff --git a/src/web/src/lib/session.test.ts b/src/web/src/lib/session.test.ts
index ea6d2a1aa..33b3c1cbc 100644
--- a/src/web/src/lib/session.test.ts
+++ b/src/web/src/lib/session.test.ts
@@ -10,6 +10,7 @@ vi.mock("next/headers", () => ({ headers: mockHeaders }));
const mockGetSession = vi.fn();
vi.mock("@/lib/auth", () => ({
getAuth: vi.fn(() => ({ api: { getSession: mockGetSession } })),
+ observeAuthSession: (_auth: unknown, execute: () => Promise<unknown>) => execute(),
}));
import { getSession, requireSession } from "./session";
diff --git a/src/web/src/lib/session.ts b/src/web/src/lib/session.ts
index 235308e1a..7a7ac5fa7 100644
--- a/src/web/src/lib/session.ts
+++ b/src/web/src/lib/session.ts
@@ -1,11 +1,12 @@
import { headers } from "next/headers"
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { getAuth } from "@/lib/auth"
+import { getAuth, observeAuthSession } from "@/lib/auth"
export async function getSession() {
const { env } = await getCloudflareContext({ async: true })
const auth = getAuth(env as Env)
- return auth.api.getSession({ headers: await headers() })
+ const requestHeaders = await headers()
+ return observeAuthSession(auth, () => auth.api.getSession({ headers: requestHeaders }))
}
export async function requireSession() {
diff --git a/src/web/src/lib/worker-runtime.ts b/src/web/src/lib/worker-runtime.ts
index 52220db7b..9aa9a3125 100644
--- a/src/web/src/lib/worker-runtime.ts
+++ b/src/web/src/lib/worker-runtime.ts
@@ -1,3 +1,6 @@
+import { cleanAttributes, type Attributes } from "./observability/schema"
+import { routeTemplate } from "./observability/coverage"
+import { resolveObservationBuild } from "./observability/build"
import { finalizePublicWorkerResponse } from "./public-worker-response"
const PUBLIC_DOCUMENTS = new Set(["/", "/pricing", "/privacy", "/templates"])
@@ -8,6 +11,7 @@ function isPublicRoute(pathname: string): boolean {
export function createWebWorkerHandler(
openNextHandler: ExportedHandler<CloudflareEnv>,
+ build = resolveObservationBuild({}),
): ExportedHandler<CloudflareEnv> {
return {
async fetch(request, env, ctx) {
@@ -19,8 +23,24 @@ export function createWebWorkerHandler(
return env.WS_DO_WORKER.fetch(request)
}
- const response = await openNextHandler.fetch!(request, env, ctx)
- return finalizePublicWorkerResponse(response, isPublicRoute(url.pathname), request)
+ const execute = async () => {
+ const response = await openNextHandler.fetch!(request, env, ctx)
+ return finalizePublicWorkerResponse(response, isPublicRoute(url.pathname), request)
+ }
+ return ctx.tracing ? ctx.tracing.enterSpan("web.request", span => {
+ const fields = cleanAttributes({ ...workerRequestAttributes(request, env, build), route_template: routeTemplate(request.url, url.origin), request_kind: url.searchParams.has("_rsc") ? "rsc" : url.pathname.startsWith("/api/") ? "api" : "document" })
+ for (const [key, value] of Object.entries(fields)) span.setAttribute(key, value)
+ return execute()
+ }) : execute()
},
}
}
+
+export function workerRequestAttributes(request: Request, env: Pick<Env, "CF_VERSION_METADATA">, build: ReturnType<typeof resolveObservationBuild>): Attributes {
+ const parent = /^00-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})$/.exec(request.headers.get("traceparent") ?? "")
+ const valid = parent && !/^0+$/.test(parent[1]!) && !/^0+$/.test(parent[2]!)
+ return { ...build,
+ worker_version: env.CF_VERSION_METADATA?.id, worker_version_status: env.CF_VERSION_METADATA?.id ? "present" : "missing",
+ upstream_trace_id: valid ? parent[1] : undefined, upstream_span_id: valid ? parent[2] : undefined,
+ trace_context: valid ? "received" : "missing" }
+}
diff --git a/src/web/src/middleware.test.ts b/src/web/src/middleware.test.ts
index 08dca1c82..979e6c254 100644
--- a/src/web/src/middleware.test.ts
+++ b/src/web/src/middleware.test.ts
@@ -9,6 +9,7 @@ vi.mock("@opennextjs/cloudflare", () => ({
const mockGetSession = vi.fn();
vi.mock("@/lib/auth", () => ({
getAuth: vi.fn(() => ({ api: { getSession: mockGetSession } })),
+ observeAuthSession: vi.fn((_auth, execute) => execute()),
}));
import { config, middleware } from "./middleware";
@@ -77,6 +78,7 @@ describe("middleware", () => {
// NextResponse.next() — no redirect location
expect(res.headers.get("location")).toBeNull();
expect(res.headers.get("set-cookie")).toContain("session=abc");
+ expect(res.headers.get("x-middleware-request-cookie")).toBe("session=abc");
});
it("does not require auth for unlisted public paths", async () => {
diff --git a/src/web/src/middleware.ts b/src/web/src/middleware.ts
index 4da21b12b..493ccbaed 100644
--- a/src/web/src/middleware.ts
+++ b/src/web/src/middleware.ts
@@ -1,7 +1,8 @@
import { NextRequest, NextResponse } from "next/server"
import { getCloudflareContext } from "@opennextjs/cloudflare"
-import { getAuth } from "@/lib/auth"
+import { getAuth, observeAuthSession } from "@/lib/auth"
import { safeRedirectPath } from "@/lib/safe-redirect"
+import { authResponseCookies } from "@/lib/auth-response-cookies"
const AUTH_REQUIRED_PREFIXES = ["/c/"]
@@ -32,10 +33,10 @@ export async function middleware(request: NextRequest) {
if (needsAuth) {
const { env } = await getCloudflareContext({ async: true })
const auth = getAuth(env as Env)
- const result = await auth.api.getSession({
+ const result = await observeAuthSession(auth, () => auth.api.getSession({
headers: request.headers,
returnHeaders: true,
- }) as { headers: Headers; response: unknown } | null
+ })) as { headers: Headers; response: unknown } | null
if (!result?.response) {
const signInUrl = new URL("/sign-in", request.url)
@@ -43,20 +44,16 @@ export async function middleware(request: NextRequest) {
return NextResponse.redirect(signInUrl)
}
- const res = NextResponse.next()
- for (const cookie of result.headers.getSetCookie()) {
- res.headers.append("Set-Cookie", cookie)
- }
- return res
+ return authResponseCookies(request, result.headers)
}
if (pathname === "/sign-in" || pathname === "/sign-up") {
const { env } = await getCloudflareContext({ async: true })
const auth = getAuth(env as Env)
- const result = await auth.api.getSession({
+ const result = await observeAuthSession(auth, () => auth.api.getSession({
headers: request.headers,
returnHeaders: true,
- }) as { headers: Headers; response: unknown } | null
+ })) as { headers: Headers; response: unknown } | null
if (result?.response) {
const redirect = request.nextUrl.searchParams.get("redirect")
diff --git a/src/web/src/stores/community/message-stream-store.ts b/src/web/src/stores/community/message-stream-store.ts
index c655763a3..b473f9652 100644
--- a/src/web/src/stores/community/message-stream-store.ts
+++ b/src/web/src/stores/community/message-stream-store.ts
@@ -1,4 +1,3 @@
-import { sourceEvidence } from "@/lib/observability/data-source"
import { beginMessageObservation, messageMilestone, disposeMessageObservations } from "@/lib/observability/messages"
import { createStore } from "@tanstack/store"
import {
@@ -62,7 +61,6 @@ export function createMessageStreamStore(readMessages: () => Pick<ReadonlyMap<st
const overlay = current.entries.get(key)?.state ?? EMPTY_STORED
if (event.type === "retry" && overlay.outboxByNonce.has(event.nonce)) beginMessageObservation(diagnosticOwner, event.nonce, scope.kind)
const applied = event.type === "postAck" ? { type: "wsMessage" as const, message: { ...event.message, clientNonce: event.nonce } } : event
- if (applied.type === "wsMessage") sourceEvidence(applied.message, event.type === "postAck" ? "network" : "ws")
const transition = reduceMessageOverlay(overlay, applied, readMessages())
if (transition.state !== overlay) {
const entries = new Map(current.entries)
diff --git a/src/web/src/test-runtime/custom-worker.test.ts b/src/web/src/test-runtime/custom-worker.test.ts
index 8c46e2308..20a87c750 100644
--- a/src/web/src/test-runtime/custom-worker.test.ts
+++ b/src/web/src/test-runtime/custom-worker.test.ts
@@ -1,5 +1,7 @@
import handler, { DOQueueHandler } from "../../custom-worker"
-import { describe, expect, it, vi } from "vitest"
+import { afterEach, describe, expect, it, vi } from "vitest"
+
+afterEach(() => vi.unstubAllEnvs())
describe("custom Worker composition", () => {
it("composes the generated OpenNext module with the production runtime seam", async () => {
@@ -18,4 +20,19 @@ describe("custom Worker composition", () => {
expect(response.headers.get("Cache-Control")).toBe("public, max-age=0, must-revalidate")
expect(wsFetch).not.toHaveBeenCalled()
})
+
+ it("uses the resolved Next build provenance on the first request before OpenNext initializes process.env", async () => {
+ vi.stubEnv("NEXT_PUBLIC_FARO_RELEASE", "b".repeat(40))
+ vi.stubEnv("NEXT_PUBLIC_FARO_ENVIRONMENT", "production")
+ const setAttribute = vi.fn()
+ const enterSpan = vi.fn((_name: string, run: (span: unknown) => unknown) => run({ setAttribute }))
+ const response = await handler.fetch!(new Request("https://worker.test/c/me?_rsc=PRIVATE"),
+ { CF_VERSION_METADATA: { id: "actual-worker-version" } } as unknown as CloudflareEnv,
+ { tracing: { enterSpan } } as unknown as ExecutionContext)
+ expect(response.headers.get("x-open-next")).toBe("node-stub")
+ expect(enterSpan.mock.calls[0]?.[0]).toBe("web.request")
+ expect(Object.fromEntries(setAttribute.mock.calls)).toMatchObject({ release: "a".repeat(40), environment: "qa", worker_version: "actual-worker-version", request_kind: "rsc" })
+ expect(JSON.stringify(setAttribute.mock.calls)).not.toContain("PRIVATE")
+ expect(JSON.stringify(setAttribute.mock.calls)).not.toContain("b".repeat(40))
+ })
})
diff --git a/src/web/test-runtime/next-config-stub.json b/src/web/test-runtime/next-config-stub.json
new file mode 100644
index 000000000..bdf9bb327
--- /dev/null
+++ b/src/web/test-runtime/next-config-stub.json
@@ -0,0 +1,9 @@
+{
+ "version": 1,
+ "config": {
+ "env": {
+ "NEXT_PUBLIC_FARO_RELEASE": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+ "NEXT_PUBLIC_FARO_ENVIRONMENT": "qa"
+ }
+ }
+}
diff --git a/src/web/vitest.config.ts b/src/web/vitest.config.ts
index 7d313ccff..0d4320f79 100644
--- a/src/web/vitest.config.ts
+++ b/src/web/vitest.config.ts
@@ -8,6 +8,7 @@ export default mergeConfig(shared, defineConfig({
"@": path.resolve(__dirname, "src"),
"@blog": path.resolve(__dirname, "blog/src"),
"./.open-next/worker.js": path.resolve(__dirname, "src/test-runtime/open-next-node-stub.ts"),
+ "./.open-next/server-functions/default/src/web/.next/required-server-files.json": path.resolve(__dirname, "test-runtime/next-config-stub.json"),
},
},
test: {
diff --git a/src/web/vitest.dom.config.ts b/src/web/vitest.dom.config.ts
index 81242687a..9767b6c7a 100644
--- a/src/web/vitest.dom.config.ts
+++ b/src/web/vitest.dom.config.ts
@@ -8,6 +8,7 @@ export default mergeConfig(shared, defineConfig({
"@": path.resolve(__dirname, "src"),
"@blog": path.resolve(__dirname, "blog/src"),
"./.open-next/worker.js": path.resolve(__dirname, "src/test-runtime/open-next-node-stub.ts"),
+ "./.open-next/server-functions/default/src/web/.next/required-server-files.json": path.resolve(__dirname, "test-runtime/next-config-stub.json"),
},
},
test: {
diff --git a/src/web/vitest.runtime.config.mts b/src/web/vitest.runtime.config.mts
index d49016e50..5334ccaf0 100644
--- a/src/web/vitest.runtime.config.mts
+++ b/src/web/vitest.runtime.config.mts
@@ -8,6 +8,7 @@ export default defineProject({
resolve: {
alias: {
"@": path.resolve(import.meta.dirname, "src"),
+ "./.open-next/server-functions/default/src/web/.next/required-server-files.json": path.resolve(import.meta.dirname, "test-runtime/next-config-stub.json"),
"./.open-next/worker.js": path.resolve(
import.meta.dirname,
"test-runtime/open-next-worker-stub.ts",