00cc786
@@ -48,6 +48,7 @@
import {
} from "../../core/origins.ts";
import { pinnedRepoIds } from "../../core/pins.ts";
import { getRepo, getReposByIds } from "../../core/repos.ts";
import { notePhase, takeSessionTime, timePhase } from "../../core/route_timing.ts";
import type { Ctx } from "../../http/context.ts";
import { forgeBaseUrl, oauthCallbackUri } from "../../http/api.ts";
import { qrEncode, qrSvg } from "../../design/qr.ts";
@@ -672,11 +673,20 @@
function trustedHostsCard(text: string, error?: string): Html {
// ---- the page ----
function originsView(ctx: Ctx, values: ConnectValues): Html {
function originsView(
  ctx: Ctx,
  values: ConnectValues,
  timing?: { rendering: number },
): Html {
  const user = ctx.auth.user!;
  const origins = listUserOrigins(ctx.app, user);
  const mirrors = mirrorsByOrigin(ctx.app.db, user.id);
  const apps = listOriginApps(ctx.app, user);
  // Only the page itself names its reads; the error re-renders do not.
  const read = <T>(name: string, work: () => T): T =>
    timing === undefined ? work() : timePhase(ctx.request, name, work);
  const origins = read("origins", () => listUserOrigins(ctx.app, user));
  const mirrors = read("mirrors", () => mirrorsByOrigin(ctx.app.db, user.id));
  const apps = read("apps", () => listOriginApps(ctx.app, user));
  const frozen = read("frozen", () => readFrozen(ctx));
  if (timing !== undefined) timing.rendering = performance.now();
      
        junipercrew
        24d ago
        
      
      Setting timing.rendering from inside the view is a hidden out-parameter. Consider timing originsView plus shell with one timePhase("render") around the body build, so the view needs no timing argument beyond the read wrapper.
    
  const githubConfigured = githubConnectable(ctx);
  const matched =
    values.host === ""
@@ -697,7 +707,7 @@
function originsView(ctx: Ctx, values: ConnectValues): Html {
      : html`<div class="stack">
          ${origins.map((o) => originCard(o, mirrors.get(o.id)?.count ?? 0))}
        </div>`}
    ${frozenCard(ctx)}
    ${frozenCard(frozen)}
    ${mayEditTrustedHosts(user)
      ? trustedHostsCard(
          values.trustedText ?? editableHosts().join("\n"),
@@ -743,15 +753,22 @@
function originsView(ctx: Ctx, values: ConnectValues): Html {
 * connecting an account on that host brings them back by itself, so this
 * card's only verb is the connect form beneath it.
 */
function frozenCard(ctx: Ctx): Html | null {
function readFrozen(ctx: Ctx) {
  const frozen = listDetachedMirrors(ctx.app.db, {
    ownerId: ctx.auth.user!.id,
  });
  const repos =
    frozen.length === 0
      ? (new Map() as ReturnType<typeof getReposByIds>)
      : getReposByIds(
          ctx.app.db,
          frozen.map((m) => m.repoId),
      
        junipercrew
        24d ago
        
      
      new Map() as ReturnType<typeof getReposByIds> is a cast. Typing the empty map via getReposByIds(db, []) or a typed new Map<number, Repo>() would avoid it.
    
        );
  return { frozen, repos };
}
function frozenCard({ frozen, repos }: ReturnType<typeof readFrozen>): Html | null {
  if (frozen.length === 0) return null;
  const repos = getReposByIds(
    ctx.app.db,
    frozen.map((m) => m.repoId),
  );
  return listCard(
    frozen.flatMap((m) => {
      const repo = repos.get(m.repoId);
@@ -800,6 +817,7 @@
function shell(ctx: Ctx, body: Html, status = 200): Response {
// GET /settings/origins
export function originsPage(ctx: Ctx): Response {
  notePhase(ctx.request, "session", takeSessionTime(ctx.request));
  const denied = accountOnly(ctx);
  if (denied) return denied;
  const params = ctx.url.searchParams;
@@ -832,7 +850,11 @@
export function originsPage(ctx: Ctx): Response {
        </div>`
      : null;
  return shell(ctx, html`${banner}${originsView(ctx, values)}`);
  const timing = { rendering: performance.now() };
  const view = originsView(ctx, values, timing);
  const response = shell(ctx, html`${banner}${view}`);
  notePhase(ctx.request, "render", performance.now() - timing.rendering);
  return response;
}
// POST /settings/origins/token
@@ -0,0 +1,54 @@
/** `GET /settings/origins` names session, each read and render in Server-Timing (#3423). */
import { afterAll, beforeAll, expect, test } from "bun:test";
import { mkdtempSync, rmSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { createApp, type App } from "../src/app.ts";
import { createUser } from "../src/core/users.ts";
import { serve, type Servers } from "../src/http/server.ts";
import { proveAll } from "./helpers/verified.ts";
import { quietLogs } from "./helpers/globals.ts";
quietLogs();
let root = "";
let app: App;
let servers: Servers;
beforeAll(async () => {
  root = mkdtempSync(join(tmpdir(), "forge-origins-timing-"));
  app = createApp({ dataDir: root, port: 0, forgeRepo: "alice/forge" });
  const u = await createUser(app.db, {
    origin: "seed",
    trusted: true,
    username: "alice",
    email: "[email protected]",
    password: "a-good-passphrase",
    adminIfFirst: true,
  });
  if (!u.ok) throw new Error(u.error);
  proveAll(app);
  servers = await serve(app);
});
afterAll(() => {
  servers.stop();
  app.close();
  rmSync(root, { recursive: true, force: true });
});
test("GET /settings/origins names its phases", async () => {
  const signin = await fetch(`${servers.url}/signin`, {
    method: "POST",
    headers: { origin: servers.url },
    body: new URLSearchParams({ username: "alice", password: "a-good-passphrase" }),
    redirect: "manual",
  });
  const cookie = (signin.headers.get("set-cookie") ?? "").split(";")[0]!;
  const res = await fetch(`${servers.url}/settings/origins`, { headers: { cookie } });
  const body = await res.text();
  expect(res.status).toBe(200);
  expect(body).toContain("<h1>Origins</h1>");
  const parts = (res.headers.get("server-timing") ?? "").split(", ");
  for (const name of ["app", "session", "origins", "mirrors", "apps", "frozen", "render"])
    expect(parts.find((p) => p.startsWith(`${name};`))).toMatch(/^[a-z]+;dur=\d+\.\d$/);
});
		@@ -48,6 +48,7 @@ import {
48	48	} from "../../core/origins.ts";
49	49	import { pinnedRepoIds } from "../../core/pins.ts";
50	50	import { getRepo, getReposByIds } from "../../core/repos.ts";
	51	import { notePhase, takeSessionTime, timePhase } from "../../core/route_timing.ts";
51	52	import type { Ctx } from "../../http/context.ts";
52	53	import { forgeBaseUrl, oauthCallbackUri } from "../../http/api.ts";
53	54	import { qrEncode, qrSvg } from "../../design/qr.ts";
		@@ -672,11 +673,20 @@ function trustedHostsCard(text: string, error?: string): Html {
672	673
673	674	// ---- the page ----
674	675
675		function originsView(ctx: Ctx, values: ConnectValues): Html {
	676	function originsView(
	677	ctx: Ctx,
	678	values: ConnectValues,
	679	timing?: { rendering: number },
	680	): Html {
676	681	const user = ctx.auth.user!;
677		const origins = listUserOrigins(ctx.app, user);
678		const mirrors = mirrorsByOrigin(ctx.app.db, user.id);
679		const apps = listOriginApps(ctx.app, user);
	682	// Only the page itself names its reads; the error re-renders do not.
	683	const read = <T>(name: string, work: () => T): T =>
	684	timing === undefined ? work() : timePhase(ctx.request, name, work);
	685	const origins = read("origins", () => listUserOrigins(ctx.app, user));
	686	const mirrors = read("mirrors", () => mirrorsByOrigin(ctx.app.db, user.id));
	687	const apps = read("apps", () => listOriginApps(ctx.app, user));
	688	const frozen = read("frozen", () => readFrozen(ctx));
	689	if (timing !== undefined) timing.rendering = performance.now();
		junipercrew 24d ago Setting `timing.rendering` from inside the view is a hidden out-parameter. Consider timing `originsView` plus `shell` with one timePhase("render") around the body build, so the view needs no timing argument beyond the read wrapper.
680	690	const githubConfigured = githubConnectable(ctx);
681	691	const matched =
682	692	values.host === ""
		@@ -697,7 +707,7 @@ function originsView(ctx: Ctx, values: ConnectValues): Html {
697	707	: html`<div class="stack">
698	708	${origins.map((o) => originCard(o, mirrors.get(o.id)?.count ?? 0))}
699	709	</div>`}
700		${frozenCard(ctx)}
	710	${frozenCard(frozen)}
701	711	${mayEditTrustedHosts(user)
702	712	? trustedHostsCard(
703	713	values.trustedText ?? editableHosts().join("\n"),
		@@ -743,15 +753,22 @@ function originsView(ctx: Ctx, values: ConnectValues): Html {
743	753	* connecting an account on that host brings them back by itself, so this
744	754	* card's only verb is the connect form beneath it.
745	755	*/
746		function frozenCard(ctx: Ctx): Html \| null {
	756	function readFrozen(ctx: Ctx) {
747	757	const frozen = listDetachedMirrors(ctx.app.db, {
748	758	ownerId: ctx.auth.user!.id,
749	759	});
	760	const repos =
	761	frozen.length === 0
	762	? (new Map() as ReturnType<typeof getReposByIds>)
	763	: getReposByIds(
	764	ctx.app.db,
	765	frozen.map((m) => m.repoId),
		junipercrew 24d ago `new Map() as ReturnType<typeof getReposByIds>` is a cast. Typing the empty map via getReposByIds(db, []) or a typed `new Map<number, Repo>()` would avoid it.
	766	);
	767	return { frozen, repos };
	768	}
	769
	770	function frozenCard({ frozen, repos }: ReturnType<typeof readFrozen>): Html \| null {
750	771	if (frozen.length === 0) return null;
751		const repos = getReposByIds(
752		ctx.app.db,
753		frozen.map((m) => m.repoId),
754		);
755	772	return listCard(
756	773	frozen.flatMap((m) => {
757	774	const repo = repos.get(m.repoId);
		@@ -800,6 +817,7 @@ function shell(ctx: Ctx, body: Html, status = 200): Response {
800	817
801	818	// GET /settings/origins
802	819	export function originsPage(ctx: Ctx): Response {
	820	notePhase(ctx.request, "session", takeSessionTime(ctx.request));
803	821	const denied = accountOnly(ctx);
804	822	if (denied) return denied;
805	823	const params = ctx.url.searchParams;
		@@ -832,7 +850,11 @@ export function originsPage(ctx: Ctx): Response {
832	850	</div>`
833	851	: null;
834	852
835		return shell(ctx, html`${banner}${originsView(ctx, values)}`);
	853	const timing = { rendering: performance.now() };
	854	const view = originsView(ctx, values, timing);
	855	const response = shell(ctx, html`${banner}${view}`);
	856	notePhase(ctx.request, "render", performance.now() - timing.rendering);
	857	return response;
836	858	}
837	859
838	860	// POST /settings/origins/token
		@@ -0,0 +1,54 @@
	1	/** `GET /settings/origins` names session, each read and render in Server-Timing (#3423). */
	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 { createUser } from "../src/core/users.ts";
	8	import { serve, type Servers } from "../src/http/server.ts";
	9	import { proveAll } from "./helpers/verified.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-origins-timing-"));
	20	app = createApp({ dataDir: root, port: 0, forgeRepo: "alice/forge" });
	21	const u = await createUser(app.db, {
	22	origin: "seed",
	23	trusted: true,
	24	username: "alice",
	25	email: "[email protected]",
	26	password: "a-good-passphrase",
	27	adminIfFirst: true,
	28	});
	29	if (!u.ok) throw new Error(u.error);
	30	proveAll(app);
	31	servers = await serve(app);
	32	});
	33	afterAll(() => {
	34	servers.stop();
	35	app.close();
	36	rmSync(root, { recursive: true, force: true });
	37	});
	38
	39	test("GET /settings/origins names its phases", async () => {
	40	const signin = await fetch(`${servers.url}/signin`, {
	41	method: "POST",
	42	headers: { origin: servers.url },
	43	body: new URLSearchParams({ username: "alice", password: "a-good-passphrase" }),
	44	redirect: "manual",
	45	});
	46	const cookie = (signin.headers.get("set-cookie") ?? "").split(";")[0]!;
	47	const res = await fetch(`${servers.url}/settings/origins`, { headers: { cookie } });
	48	const body = await res.text();
	49	expect(res.status).toBe(200);
	50	expect(body).toContain("<h1>Origins</h1>");
	51	const parts = (res.headers.get("server-timing") ?? "").split(", ");
	52	for (const name of ["app", "session", "origins", "mirrors", "apps", "frozen", "render"])
	53	expect(parts.find((p) => p.startsWith(`${name};`))).toMatch(/^[a-z]+;dur=\d+\.\d$/);
	54	});