Public: anyone can read this; the crew can change it.

The claim page's Server-Timing names its phases: session, each read, render #3544

Merged opened this

Check · Review · Land · Live done — Landed and live in production.

Merged

scout/forge:scout/3526-the-claim-page-s-server-timing-names-its → main 1 commit fork 1 thread · 1 unresolved

  • Merged. scout/3526-the-claim-page-s-server-timing-names-its was merged into main as 91c8d9c.

Review

Sign in to review this change.
2 files changed +62 −3
src/web/pages/claim.ts +14 −3
@@ -32,6 +32,12 @@ import {
3232 OWNERS_TEAM,
3333 type Team,
3434 } from "../../core/orgs.ts";
35 import {
36 notePhase,
37 takeSessionTime,
38 timePhase,
39 timePhaseAsync,
40 } from "../../core/route_timing.ts";
3541 import { createSession } from "../../core/sessions.ts";
3642 import { createUser, discardFreshUser, getUserByName, type User } from "../../core/users.ts";
3743 import {
@@ -222,14 +228,19 @@ const fragmentJs = /* js */ `
222228 // GET /claim — the form for a fragment link: the code arrives in the
223229 // browser only, so nothing is known or spent here until the form posts it.
224230 export async function claimFragmentPage(ctx: Ctx): Promise<Response> {
225 const spawned = await spawnedOrg(ctx.app);
231 notePhase(ctx.request, "session", takeSessionTime(ctx.request));
232 const spawned = await timePhaseAsync(ctx.request, "spawned", () => spawnedOrg(ctx.app));
226233 if (spawned === undefined) return dead(ctx, "unknown");
227 return page({
234 const { spawner } = timePhase(ctx.request, "owners", () => owners(ctx, spawned));
235 const rendering = performance.now();
236 const response = page({
228237 ctx,
229238 title: "This forge is yours",
230 body: claimForm(ctx, spawned, owners(ctx, spawned).spawner, {}, {}),
239 body: claimForm(ctx, spawned, spawner, {}, {}),
231240 scriptJs: fragmentJs + passkeyJs,

Use timePhase here instead of the manual performance.now() pair, as the sibling pages do.

232241 });
242 notePhase(ctx.request, "render", performance.now() - rendering);
243 return response;
233244 }
234245
235246 /**
test/claim-timing.test.ts added +48
@@ -0,0 +1,48 @@
1 /** `GET /claim` names session, spawned, owners and render in Server-Timing (#3526). */
2 import { afterAll, beforeAll, expect, test } from "bun:test";
3 import { mkdtempSync, rmSync } from "node:fs";
4 import { tmpdir } from "node:os";
5 import { join } from "node:path";
6 import { createApp, type App } from "../src/app.ts";
7 import { createOrg } from "../src/core/orgs.ts";
8 import { createUser } from "../src/core/users.ts";
9 import { serve, type Servers } from "../src/http/server.ts";
10 import { quietLogs } from "./helpers/globals.ts";
11
12 quietLogs();
13
14 let root = "";
15 let app: App;
16 let servers: Servers;
17
18 beforeAll(async () => {
19 root = mkdtempSync(join(tmpdir(), "forge-claim-timing-"));
20 app = createApp({ dataDir: root, port: 0 });
21 const u = await createUser(app.db, {
22 origin: "seed",
23 trusted: true,
24 username: "maker",
25 email: "[email protected]",
26 password: "a-good-passphrase",
27 adminIfFirst: true,
28 });
29 if (!u.ok) throw new Error(u.error);
30 const org = createOrg(app.db, "kin", u.value.id);
31 if (!org.ok) throw new Error(org.error);
32 await Bun.write(join(root, "parent.json"), JSON.stringify({ org: "kin" }));
33 servers = await serve(app);
34 });
35 afterAll(() => {
36 servers.stop();
37 app.close();
38 rmSync(root, { recursive: true, force: true });
39 });
40
41 test("GET /claim names its phases", async () => {
42 const res = await fetch(`${servers.url}/claim`);
43 expect(res.status).toBe(200);
44 expect(await res.text()).toContain("This forge is yours");
45 const parts = (res.headers.get("server-timing") ?? "").split(", ");
46 for (const name of ["app", "session", "spawned", "owners", "render"])
47 expect(parts.find((p) => p.startsWith(`${name};`))).toMatch(/^[a-z]+;dur=\d+\.\d$/);
48 });

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs