Public: anyone can read this; the crew can change it.
An organization team's page's Server-Timing names its phases: session, each read, render #3455
Check · Review · Land · Live done — Landed and live in production.
scout/forge:scout/3425-an-organization-team-s-page-s-server-tim → main 1 commit fork
2 files
changed +73
−4
src/web/pages/org.ts +13 −4
| @@ -33,6 +33,7 @@ import { LIST_LIMIT_MAX } from "../../core/issues.ts"; | ||
| 33 | 33 | import { listReposByOwner, type Repo } from "../../core/repos.ts"; |
| 34 | 34 | import { getUserByName, hiddenFrom, type User } from "../../core/users.ts"; |
| 35 | 35 | import type { Ctx } from "../../http/context.ts"; |
| 36 | import { notePhase, takeSessionTime, timePhase } from "../../core/route_timing.ts"; | |
| 36 | 37 | import { notFoundPage, pageHead, signInFirst } from "../chrome.ts"; |
| 37 | 38 | import { field, readForm, type Form } from "../form.ts"; |
| 38 | 39 | import { html, when, type Html } from "../html.ts"; |
| @@ -511,12 +512,18 @@ export async function teamCreate(ctx: Ctx): Promise<Response> { | ||
| 511 | 512 | |
| 512 | 513 | // GET /:owner/-/teams/:team |
| 513 | 514 | export function teamPage(ctx: Ctx): Response { |
| 514 | const org = requireOrgAdmin(ctx); | |
| 515 | notePhase(ctx.request, "session", takeSessionTime(ctx.request)); | |
| 516 | const org = timePhase(ctx.request, "org", () => requireOrgAdmin(ctx)); | |
| 515 | 517 | if (!org) return notFoundPage(ctx); |
| 516 | const team = getTeam(ctx.app.db, ctx.params.team ?? ""); | |
| 518 | const team = timePhase(ctx.request, "team", () => | |
| 519 | getTeam(ctx.app.db, ctx.params.team ?? ""), | |
| 520 | ); | |
| 517 | 521 | if (!team || team.orgId !== org.id) return notFoundPage(ctx); |
| 518 | 522 | |
| 519 | const members = listTeamMembers(ctx.app.db, team.id); | |
| 523 | const members = timePhase(ctx.request, "members", () => | |
| 524 | listTeamMembers(ctx.app.db, team.id), | |
| 525 | ); | |
| 526 | const rendering = performance.now(); | |
| 520 | 527 | const teamBase = `/${org.username}/-/teams/${team.id}`; |
| 521 | 528 | // The last owner may not be removed: an org must keep an admin. |
| 522 | 529 | const protectedTeam = team.name === OWNERS_TEAM; |
| @@ -575,7 +582,7 @@ export function teamPage(ctx: Ctx): Response { | ||
| 575 | 582 | ), |
| 576 | 583 | )}`; |
| 577 | 584 | |
| 578 | return page({ | |
| 585 | const response = page({ | |
| 579 | 586 | ctx, |
| 580 | 587 | title: `${team.name} · ${org.username}`, |
| 581 | 588 | crumbs: [ |
| @@ -584,6 +591,8 @@ export function teamPage(ctx: Ctx): Response { | ||
| 584 | 591 | ], |
| 585 | 592 | body, |
| 586 | 593 | }); |
| 594 | notePhase(ctx.request, "render", performance.now() - rendering); | |
| 595 | return response; | |
| 587 | 596 | } |
| 588 | 597 | |
| 589 | 598 | /** The three team POSTs share a resolution: org, team, and a checked form. */ |
test/org-team-timing.test.ts added +60
| @@ -0,0 +1,60 @@ | ||
| 1 | /** `/:owner/-/teams/:team` names session, org, team, members and render in Server-Timing (#3425). */ | |
| 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 { createOrg } from "../src/actions/orgs.ts"; | |
| 7 | import { listTeams, OWNERS_TEAM } from "../src/core/orgs.ts"; | |
| 8 | import { createApp, type App } from "../src/app.ts"; | |
| 9 | import { createUser } from "../src/core/users.ts"; | |
| 10 | import { serve, type Servers } from "../src/http/server.ts"; | |
| 11 | import { proveAll } from "./helpers/verified.ts"; | |
| 12 | import { quietLogs } from "./helpers/globals.ts"; | |
| 13 | ||
| 14 | quietLogs(); | |
| 15 | ||
| 16 | let root = ""; | |
| 17 | let app: App; | |
| 18 | let servers: Servers; | |
| 19 | let team = ""; | |
| 20 | ||
| 21 | beforeAll(async () => { | |
| 22 | root = mkdtempSync(join(tmpdir(), "forge-org-team-timing-")); | |
| 23 | app = createApp({ dataDir: root, port: 0, forgeRepo: "alice/forge" }); | |
| 24 | const u = await createUser(app.db, { | |
| 25 | origin: "seed", | |
| 26 | trusted: true, | |
| 27 | username: "alice", | |
| 28 | email: "[email protected]", | |
| 29 | password: "a-good-passphrase", | |
| 30 | adminIfFirst: true, | |
| 31 | }); | |
| 32 | if (!u.ok) throw new Error(u.error); | |
| 33 | proveAll(app); | |
| 34 | const made = createOrg(app, u.value, "acme"); | |
| 35 | if (!made.ok) throw new Error(made.error); | |
| 36 | team = listTeams(app.db, made.value.id).find((x) => x.name === OWNERS_TEAM)!.id; | |
| 37 | servers = await serve(app); | |
| 38 | }); | |
| 39 | afterAll(() => { | |
| 40 | servers.stop(); | |
| 41 | app.close(); | |
| 42 | rmSync(root, { recursive: true, force: true }); | |
| 43 | }); | |
| 44 | ||
| 45 | test("GET /:owner/-/teams/:team names its phases", async () => { | |
| 46 | const signin = await fetch(`${servers.url}/signin`, { | |
| 47 | method: "POST", | |
| 48 | headers: { origin: servers.url }, | |
| 49 | body: new URLSearchParams({ username: "alice", password: "a-good-passphrase" }), | |
| 50 | redirect: "manual", | |
| 51 | }); | |
| 52 | const cookie = (signin.headers.get("set-cookie") ?? "").split(";")[0]!; | |
| 53 | const res = await fetch(`${servers.url}/acme/-/teams/${team}`, { headers: { cookie } }); | |
| 54 | const body = await res.text(); | |
| 55 | expect(res.status).toBe(200); | |
| 56 | expect(body).toContain("Owners"); | |
| 57 | const parts = (res.headers.get("server-timing") ?? "").split(", "); | |
| 58 | for (const name of ["app", "session", "org", "team", "members", "render"]) | |
| 59 | expect(parts.find((p) => p.startsWith(`${name};`))).toMatch(/^[a-z]+;dur=\d+\.\d$/); | |
| 60 | }); |
new above
offline