@wizeworks/lens-cloud 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/routes/issues.d.ts

@@ -0,0 +1,4 @@
+import type { Ctx } from "../app.js";
+import type { Router } from "../http/router.js";
+export declare function issueRoutes(r: Router<Ctx>): void;
+//# sourceMappingURL=issues.d.ts.map

package/dist/routes/issues.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"issues.d.ts","sourceRoot":"","sources":["../../src/routes/issues.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA6BhD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAEhD"}

package/dist/routes/issues.js

@@ -0,0 +1,34 @@
+import { applyIssueChange, parseIssueChange } from "@wizeworks/lens-core";
+import { requireProject } from "../auth/principal.js";
+import { fail, readJsonBody, sendJson } from "../http/http.js";
+import { audit } from "../repo/audit.js";
+import { assignableMembers, issueOf, listIssues, saveIssue } from "../repo/issues.js";
+import { forgetModels } from "./models.js";
+/** `GET api/projects/:project/issues`: every issue state, and the members issues can be assigned to. */
+async function list(ctx) {
+    const { project } = await requireProject(ctx, ctx.params.project);
+    const [issues, members] = await Promise.all([listIssues(ctx.app.db, project.id), assignableMembers(ctx.app.db, project.orgId)]);
+    sendJson(ctx.res, 200, { issues, members });
+}
+/** `POST api/projects/:project/issues`: resolve, ignore, reopen, or assign one error group or insight. Members who can write only. */
+async function change(ctx) {
+    const { project, actor } = await requireProject(ctx, ctx.params.project, "write");
+    const c = parseIssueChange(await readJsonBody(ctx.req));
+    if (typeof c === "string")
+        return fail(400, c);
+    if (c.action === "assign" && c.assignee && !(await assignableMembers(ctx.app.db, project.orgId)).some((m) => m.id === c.assignee))
+        fail(400, "Assign to a member of this organization.");
+    const now = ctx.app.config.now();
+    const next = await ctx.app.db.tx(async (q) => {
+        const state = applyIssueChange(await issueOf(q, project.id, c.kind, c.key), c, now);
+        await saveIssue(q, project.id, c.kind, c.key, state, actor);
+        await audit(q, project.orgId, actor, `issue.${c.action}`, { projectId: project.id, name: project.name, kind: c.kind, key: c.key, ...(c.untilMs ? { untilMs: c.untilMs } : {}), ...(c.assignee ? { assignee: c.assignee } : {}) }, now);
+        return state;
+    });
+    forgetModels(project.id);
+    sendJson(ctx.res, 200, { issue: next });
+}
+export function issueRoutes(r) {
+    r.on("GET", "api/projects/:project/issues", list).on("POST", "api/projects/:project/issues", change);
+}
+//# sourceMappingURL=issues.js.map

package/dist/routes/issues.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"issues.js","sourceRoot":"","sources":["../../src/routes/issues.ts"],"names":[],"mappings":"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"}

package/dist/routes/keys.d.ts

@@ -0,0 +1,4 @@
+import type { Ctx } from "../app.js";
+import type { Router } from "../http/router.js";
+export declare function keyRoutes(r: Router<Ctx>): void;
+//# sourceMappingURL=keys.d.ts.map

package/dist/routes/keys.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/routes/keys.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAgEhD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAE9C"}

package/dist/routes/keys.js

@@ -0,0 +1,70 @@
+import { requireOrg } from "../auth/principal.js";
+import { fail, readJsonBody, sendJson, str } from "../http/http.js";
+import { audit } from "../repo/audit.js";
+import { createKey, keyInOrg, listProjects, revokeKey, rotateKey, scopesFor } from "../repo/projects.js";
+const DAY_MS = 86_400_000;
+const MAX_DAYS = 3650;
+/** How long a rotated key's old secret keeps working, unless the body sets `graceHours` (0 to 168). */
+const GRACE_HOURS = 24;
+const now = (ctx) => ctx.app.config.now();
+function daysOf(raw) {
+    if (raw === undefined || raw === null || raw === "")
+        return null;
+    const n = Number(raw);
+    if (!Number.isInteger(n) || n < 1 || n > MAX_DAYS)
+        fail(400, `A key expires in 1 to ${MAX_DAYS} days, or never.`);
+    return n;
+}
+function scopesOf(kind, raw) {
+    try {
+        return scopesFor(kind, raw);
+    }
+    catch (err) {
+        return fail(400, err instanceof Error ? err.message : "Invalid scopes.");
+    }
+}
+/** Ingest keys belong to one project. Read keys name the projects they may read. */
+async function newKey(ctx) {
+    const org = ctx.params.org;
+    const { user } = await requireOrg(ctx, org, "manage");
+    const body = await readJsonBody(ctx.req);
+    const kind = body.kind;
+    if (kind !== "ingest" && kind !== "read")
+        fail(400, 'Set kind to "ingest" or "read".');
+    const known = new Set((await listProjects(ctx.app.db, org)).map((p) => p.id));
+    const ids = Array.isArray(body.projectIds) ? body.projectIds.filter((id) => typeof id === "string" && known.has(id)) : [];
+    if (ids.length === 0 || (kind === "ingest" && ids.length !== 1))
+        fail(400, "Pick one project for an ingest key, or one or more for a read key.");
+    const scopes = scopesOf(kind, body.scopes);
+    const days = daysOf(body.expiresInDays);
+    const expiresMs = days === null ? null : now(ctx) + days * DAY_MS;
+    const key = await createKey(ctx.app.db, org, kind, str(body, "name", false), ids, user.id, now(ctx), { scopes, expiresMs });
+    await audit(ctx.app.db, org, `user:${user.id}`, "key.create", { keyId: key.id, kind, projectIds: ids, scopes, expiresMs }, now(ctx));
+    sendJson(ctx.res, 201, { ...key, expiresMs });
+}
+/** A new secret for the same key; the old one stops after the grace period. */
+async function rotate(ctx) {
+    const { org, key: keyId } = ctx.params;
+    const { user } = await requireOrg(ctx, org, "manage");
+    const old = await keyInOrg(ctx.app.db, org, keyId);
+    if (!old)
+        return fail(404, "Key not found.");
+    const hours = Number((await readJsonBody(ctx.req)).graceHours ?? GRACE_HOURS);
+    if (!Number.isFinite(hours) || hours < 0 || hours > 168)
+        fail(400, "The grace period is 0 to 168 hours.");
+    const key = await ctx.app.db.tx((q) => rotateKey(q, org, old, user.id, now(ctx), hours * 3_600_000));
+    await audit(ctx.app.db, org, `user:${user.id}`, "key.rotate", { keyId: key.id, from: old.id, graceHours: hours }, now(ctx));
+    sendJson(ctx.res, 201, key);
+}
+async function dropKey(ctx) {
+    const { org, key } = ctx.params;
+    const { user } = await requireOrg(ctx, org, "manage");
+    if (!(await revokeKey(ctx.app.db, org, key, now(ctx))))
+        fail(404, "Key not found.");
+    await audit(ctx.app.db, org, `user:${user.id}`, "key.revoke", { keyId: key }, now(ctx));
+    sendJson(ctx.res, 200, { ok: true });
+}
+export function keyRoutes(r) {
+    r.on("POST", "api/orgs/:org/keys", newKey).on("POST", "api/orgs/:org/keys/:key/rotate", rotate).on("DELETE", "api/orgs/:org/keys/:key", dropKey);
+}
+//# sourceMappingURL=keys.js.map

package/dist/routes/keys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/routes/keys.ts"],"names":[],"mappings":"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"}

package/dist/routes/mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAGrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AA2ChD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAE9C"}
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAMrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAkHhD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAE9C"}

package/dist/routes/mcp.js

@@ -1,44 +1,98 @@
-import { toSummary } from "@wizeworks/lens-core";
 import { parseJson, readBody } from "@wizeworks/lens-hub/kit";
-import { DEFAULT_N_PLUS_ONE, DEFAULT_SLOW_QUERY_MS, handleMcp } from "@wizeworks/lens-node/kit";
-import { principalOf, requireProject } from "../auth/principal.js";
-import { fail } from "../http/http.js";
+import { handleMcp } from "@wizeworks/lens-node/kit";
+import { joinScope } from "../auth/join-scope.js";
+import { OAUTH_SCOPES } from "../auth/oauth.js";
+import { appPrincipalOf } from "../auth/oauth-access.js";
+import { bearerOf, fail, sendJson } from "../http/http.js";
+import { listEvents } from "../repo/alert-events.js";
+import { listRules } from "../repo/alerts.js";
 import { audit } from "../repo/audit.js";
-import { getTrace, queryTraces } from "../repo/trace-read.js";
+import { keyAllows, keyByToken, projectInOrg } from "../repo/projects.js";
+import { projectTags } from "../repo/tags.js";
 import { projectMetrics } from "./metrics.js";
+import { projectPage } from "./models.js";
+import { resourceMetadataUrl } from "./oauth-meta.js";
+import { thresholdsOf } from "../repo/settings.js";
 /** Traces the MCP tools search through, newest first. */
 const MCP_RECENT = 500;
-/** The project to read: `?project=`, or the only project of the read key. */
-async function projectId(ctx) {
-    const id = ctx.url.searchParams.get("project");
-    if (id)
-        return id;
-    const p = await principalOf(ctx);
-    if (p?.kind === "key" && p.key.projectIds.length === 1)
-        return p.key.projectIds[0];
-    return fail(400, "Add ?project=<project id>. Read keys for one project do not need it.");
-}
-/** `POST /_wizelens/mcp`: the same read-only tools as the add-ons, for one project. Needs a read key: agents get only what it allows. */
-async function mcp(ctx) {
-    if ((await principalOf(ctx))?.kind !== "key")
-        fail(401, "Send a read key: Authorization: Bearer wl_rk_...");
-    const access = await requireProject(ctx, await projectId(ctx));
+/** Newest alert events get_alerts lists. */
+const ALERT_EVENTS = 50;
+/** One project's data. Its recent traces load only when a tool asks, once per request. */
+async function projectSource(ctx, access, r, writes) {
     const { project, actor } = access;
-    const db = ctx.app.db;
-    const recent = await queryTraces(db, { projectId: project.id, limit: MCP_RECENT });
-    const writes = [];
-    const data = {
+    const { db, telemetry } = ctx.app;
+    const scope = await joinScope(db, access);
+    let recent;
+    const traces = () => (recent ??= telemetry.traces({ projectId: project.id, limit: MCP_RECENT }));
+    return {
         service: project.name,
         version: ctx.app.version,
-        slowQueryMs: DEFAULT_SLOW_QUERY_MS,
-        nPlusOneThreshold: DEFAULT_N_PLUS_ONE,
-        list: (limit) => recent.slice(0, limit).map(toSummary),
-        all: () => recent,
-        get: (traceId) => getTrace(db, project.id, traceId),
-        metrics: (range, params) => projectMetrics(db, project.id, range, params, { now: ctx.app.config.now() }),
+        ...thresholdsOf(ctx.app.config, await ctx.app.settings.get(project.id)),
+        all: traces,
+        get: (traceId, federate) => telemetry.joinedTrace(project.id, federate ? scope : [project.id], traceId),
+        metrics: (range, params) => projectMetrics(telemetry, project.id, range, params, { now: ctx.app.config.now() }),
+        search: (q) => telemetry.search(project.id, q),
+        suggest: (r) => telemetry.suggest(project.id, r),
+        page: (page, range, params) => projectPage(ctx.app, project, page, range, params),
+        alerts: async () => ({ rules: await listRules(db, project.id), events: await listEvents(db, project.id, ALERT_EVENTS) }),
+        now: () => ctx.app.config.now(),
+        tags: () => projectTags(db, project.id),
         // Every tool call is kept in the organization's audit log.
-        audit: (line) => void writes.push(audit(db, project.orgId, actor, "mcp.call", { projectId: project.id, line }, ctx.app.config.now())),
+        audit: (line) => void writes.push(audit(db, project.orgId, actor, "mcp.call", { projectId: project.id, line, ...(r.via ? { app: r.via } : {}) }, ctx.app.config.now())),
+    };
+}
+/** One of the reader's projects, or 404. */
+async function accessOf(ctx, r, projectId) {
+    const project = r.projectIds.includes(projectId) ? await projectInOrg(ctx.app.db, r.orgId, projectId) : undefined;
+    if (!project)
+        return fail(404, "Project not found.");
+    return { project, actor: r.actor, role: "viewer", principal: r.principal };
+}
+/** Several projects: the tools take a `project` argument, and list_projects names them. */
+async function projectsSource(ctx, r, writes) {
+    const { db } = ctx.app;
+    const projects = await db.query("SELECT id, name FROM projects WHERE org_id = $1 AND id = ANY($2) ORDER BY name", [r.orgId, [...r.projectIds]]);
+    return {
+        service: "wizelens-cloud",
+        version: ctx.app.version,
+        slowQueryMs: ctx.app.config.slowQueryMs,
+        nPlusOneThreshold: ctx.app.config.nPlusOneThreshold,
+        metrics: true,
+        overview: true,
+        alerts: true,
+        projects,
+        open: async (id) => projectSource(ctx, await accessOf(ctx, r, id), r, writes),
+        audit: (line) => void writes.push(audit(db, r.orgId, r.actor, "mcp.call", { line, ...(r.via ? { app: r.via } : {}) }, ctx.app.config.now())),
     };
+}
+/** `?project=`, or the only project, reads one project. Otherwise every project the reader has. */
+async function sourceOf(ctx, r, writes) {
+    const id = ctx.url.searchParams.get("project") ?? (r.projectIds.length === 1 ? r.projectIds[0] : undefined);
+    return id ? projectSource(ctx, await accessOf(ctx, r, id), r, writes) : projectsSource(ctx, r, writes);
+}
+/** 401 with the RFC 9728 pointer, so an MCP client can find where to sign in. */
+function unauthorized(ctx, invalid) {
+    const scope = OAUTH_SCOPES.join(" ");
+    const challenge = `Bearer resource_metadata="${resourceMetadataUrl(ctx.app, ctx.req)}", scope="${scope}"${invalid ? ', error="invalid_token"' : ""}`;
+    sendJson(ctx.res, 401, { error: "Connect with OAuth (your MCP client signs you in), or send a read key: Authorization: Bearer wl_rk_..." }, { "WWW-Authenticate": challenge });
+}
+/** The reader behind a bearer token: a read key (`wl_rk_`), else an OAuth access token. */
+async function readerOf(ctx, bearer) {
+    if (bearer.startsWith("wl_rk_")) {
+        const key = await keyByToken(ctx.app.db, bearer, ctx.app.config.now());
+        return key?.kind === "read" && keyAllows(key, "mcp") ? { orgId: key.orgId, projectIds: key.projectIds, actor: `key:${key.id}`, principal: { kind: "key", key } } : undefined;
+    }
+    const app = await appPrincipalOf(ctx, bearer);
+    return app && { orgId: app.orgId, projectIds: app.principal.projectIds, actor: `user:${app.principal.userId}`, via: app.principal.app, principal: app.principal };
+}
+/** `POST /_wizelens/mcp`: the same read-only tools as the add-ons, for a read key or a connected app. */
+async function mcp(ctx) {
+    const bearer = bearerOf(ctx.req);
+    const reader = bearer ? await readerOf(ctx, bearer) : undefined;
+    if (!reader)
+        return unauthorized(ctx, !!bearer);
+    const writes = [];
+    const data = await sourceOf(ctx, reader, writes);
     const body = ctx.req.method === "POST" ? parseJson(await readBody(ctx.req)) : undefined;
     await handleMcp(data, ctx.req, ctx.res, body);
     // The audit lines are written before this request is done; a failed write is logged, never lost silently.

package/dist/routes/mcp.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"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"}

package/dist/routes/me.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"me.d.ts","sourceRoot":"","sources":["../../src/routes/me.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAIrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAqChD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAE7C"}
+{"version":3,"file":"me.d.ts","sourceRoot":"","sources":["../../src/routes/me.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAIrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAiDhD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAE7C"}

package/dist/routes/me.js

@@ -2,22 +2,32 @@ import { blockingOrgs, ownedOrgs } from "../auth/delete-user.js";
 import { sessionOf } from "../auth/principal.js";
 import { fail, sendJson } from "../http/http.js";
 import { orgsOfUser } from "../repo/orgs.js";
+import { effectiveRole, listProjectRoles } from "../repo/project-roles.js";
 import { listProjects } from "../repo/projects.js";
 import { userCount } from "../repo/users.js";
-/** The signed-in person's organizations, each with its projects. */
+/** The signed-in person's organizations, each with the projects they may see and their role on each. */
 async function orgsWithProjects(ctx, userId) {
-    const orgs = await orgsOfUser(ctx.app.db, userId);
-    return Promise.all(orgs.map(async (o) => ({ ...o, projects: await listProjects(ctx.app.db, o.id) })));
+    const db = ctx.app.db;
+    const orgs = await orgsOfUser(db, userId);
+    const plan = (p) => (ctx.app.billing.on ? p : "unlimited");
+    return Promise.all(orgs.map(async (o) => {
+        const own = new Map((await listProjectRoles(db, o.id)).filter((r) => r.userId === userId).map((r) => [r.projectId, r.role]));
+        const projects = (await listProjects(db, o.id)).flatMap((p) => {
+            const role = effectiveRole(o.role, own.get(p.id));
+            return role ? [{ ...p, role }] : [];
+        });
+        return { ...o, plan: plan(o.plan), projects };
+    }));
 }
 /** True once any organization has an SSO provider with a proven domain, so the sign-in page offers single sign-on. */
 async function ssoReady(ctx) {
     const [row] = await ctx.app.db.query("SELECT EXISTS (SELECT 1 FROM sso_providers WHERE domain_verified) AS ready");
     return row?.ready === true;
 }
-/** Who is signed in, whether setup is needed, how sign-up works, whether mail goes out, and whether SSO is on. Sign-in itself is Better Auth's (api/auth/). */
+/** Who is signed in, whether setup is needed, how sign-up works, whether mail goes out, whether SSO and billing are on. Sign-in itself is Better Auth's (api/auth/). */
 async function me(ctx) {
     const s = await sessionOf(ctx);
-    const base = { signedIn: !!s, needsSetup: (await userCount(ctx.app.db)) === 0, signup: ctx.app.config.signup, mail: ctx.app.mailer.live, sso: await ssoReady(ctx) };
+    const base = { signedIn: !!s, needsSetup: (await userCount(ctx.app.db)) === 0, signup: ctx.app.config.signup, mail: ctx.app.mailer.live, sso: await ssoReady(ctx), billing: ctx.app.billing.on };
     if (!s)
         return sendJson(ctx.res, 200, base);
     const owned = await ownedOrgs(ctx.app.db, s.user.id);

package/dist/routes/me.js.map

@@ -1 +1 @@
-{"version":3,"file":"me.js","sourceRoot":"","sources":["../../src/routes/me.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"me.js","sourceRoot":"","sources":["../../src/routes/me.ts"],"names":[],"mappings":"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"}

package/dist/routes/metrics.d.ts

@@ -1,10 +1,10 @@
 import { type MetricsModel, type TimeRange } from "@wizeworks/lens-core";
 import type { Ctx } from "../app.js";
-import type { Queryable } from "../db/db.js";
+import type { TelemetryStore } from "../telemetry/store.js";
 /** Model parameters from the query: the metric, service, grouping, stat, and search. */
 export declare function metricParamsOf(p: URLSearchParams): Record<string, string>;
 /** The metrics page for one project, from the metric rollup tiers. */
-export declare function projectMetrics(db: Queryable, projectId: string, range: TimeRange, params: Record<string, string>, o: {
+export declare function projectMetrics(telemetry: TelemetryStore, projectId: string, range: TimeRange, params: Record<string, string>, o: {
     now: number;
     env?: string;
 }): Promise<MetricsModel>;

package/dist/routes/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/routes/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAkB,KAAK,SAAS,EAAe,MAAM,sBAAsB,CAAC;AACnH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAO7C,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOzE;AAED,sEAAsE;AACtE,wBAAsB,cAAc,CAClC,EAAE,EAAE,SAAS,EACb,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/B,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,CAKtE"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/routes/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,YAAY,EAAkB,KAAK,SAAS,EAAe,MAAM,sBAAsB,CAAC;AACnH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAK5D,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOzE;AAED,sEAAsE;AACtE,wBAAsB,cAAc,CAClC,SAAS,EAAE,cAAc,EACzB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC9B,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAC/B,OAAO,CAAC,YAAY,CAAC,CAEvB;AAED,8EAA8E;AAC9E,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,CAKtE"}

package/dist/routes/metrics.js

@@ -1,8 +1,7 @@
 import { isTimeRange, metricsModelOf, TIME_RANGES } from "@wizeworks/lens-core";
 import { fail } from "../http/http.js";
-import { loadMetricData } from "../repo/metric-read.js";
 const DAY_MS = 86_400_000;
-const PARAMS = ["metric", "service", "group", "stat", "q"];
+const PARAMS = ["metric", "service", "group", "stat", "q", "where"];
 /** Model parameters from the query: the metric, service, grouping, stat, and search. */
 export function metricParamsOf(p) {
     const out = {};
@@ -14,8 +13,8 @@ export function metricParamsOf(p) {
     return out;
 }
 /** The metrics page for one project, from the metric rollup tiers. */
-export async function projectMetrics(db, projectId, range, params, o) {
-    return metricsModelOf(await loadMetricData(db, { projectId, env: o.env }, range, params, o.now));
+export async function projectMetrics(telemetry, projectId, range, params, o) {
+    return metricsModelOf(await telemetry.metricData({ projectId, env: o.env }, range, params, o.now));
 }
 /** The range from the query, checked against the organization's retention. */
 export function metricRange(ctx, retentionDays) {

package/dist/routes/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/routes/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,cAAc,EAAkB,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AAE3D,wFAAwF;AACxF,MAAM,UAAU,cAAc,CAAC,CAAkB;IAC/C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,CAAC;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAAa,EACb,SAAiB,EACjB,KAAgB,EAChB,MAA8B,EAC9B,CAAgC;IAEhC,OAAO,cAAc,CAAC,MAAM,cAAc,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACnG,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,aAAqB;IACzD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACxD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC,CAAC;IACvE,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,aAAa,GAAG,MAAM;QAAE,IAAI,CAAC,GAAG,EAAE,wDAAwD,CAAC,CAAC;IACxH,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/routes/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAqB,cAAc,EAAkB,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnH,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAGvC,MAAM,MAAM,GAAG,UAAU,CAAC;AAC1B,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AAEpE,wFAAwF;AACxF,MAAM,UAAU,cAAc,CAAC,CAAkB;IAC/C,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,CAAC;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,sEAAsE;AACtE,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,SAAyB,EACzB,SAAiB,EACjB,KAAgB,EAChB,MAA8B,EAC9B,CAAgC;IAEhC,OAAO,cAAc,CAAC,MAAM,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;AACrG,CAAC;AAED,8EAA8E;AAC9E,MAAM,UAAU,WAAW,CAAC,GAAQ,EAAE,aAAqB;IACzD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC;IACxD,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,GAAG,EAAE,kBAAkB,KAAK,IAAI,CAAC,CAAC;IACvE,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,aAAa,GAAG,MAAM;QAAE,IAAI,CAAC,GAAG,EAAE,wDAAwD,CAAC,CAAC;IACxH,OAAO,KAAK,CAAC;AACf,CAAC"}

package/dist/routes/models.d.ts

@@ -1,4 +1,12 @@
-import type { Ctx } from "../app.js";
+import { type ModelOf, type PageName, type TimeRange } from "@wizeworks/lens-core";
+import type { CloudApp, Ctx } from "../app.js";
 import type { Router } from "../http/router.js";
+/** Drop a project's cached pages when it gets new data, so the dashboard's reload sees it. */
+export declare function forgetModels(projectId: string): void;
+/** One page's numbers for a project, from its stats tables. Cached for 15 seconds, like the dashboard's. */
+export declare function projectPage<P extends PageName>(app: CloudApp, project: {
+    id: string;
+    orgId: string;
+}, page: P, range: TimeRange, params?: Record<string, string>, env?: string): Promise<ModelOf<P>>;
 export declare function modelRoutes(r: Router<Ctx>): void;
 //# sourceMappingURL=models.d.ts.map

package/dist/routes/models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAmEhD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAEhD"}
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/routes/models.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyK,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAuE,KAAK,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC/T,OAAO,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAK/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAuBhD,8FAA8F;AAC9F,wBAAgB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAEpD;AAUD,4GAA4G;AAC5G,wBAAsB,WAAW,CAAC,CAAC,SAAS,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAmB9M;AA+CD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAEhD"}

package/dist/routes/models.js

@@ -1,8 +1,13 @@
-import { alignNow, FACT_SLOW_QUERY_MS, isPageName, isTimeRange, pageContext, runPage, TIME_RANGES } from "@wizeworks/lens-core";
+import { activeTags, alignNow, APDEX_PAGES, hostsModelOf, INFRA_PARAMS, ISSUE_PAGES, isPageName, isStructuredSearch, isTimeRange, issueStatesOf, kubeModelOf, LIST_SEARCH_KIND, pageContext, runPage, searchTraceIds, SETTLE_BEHIND_MS, TIME_RANGES } from "@wizeworks/lens-core";
 import { fail, sendJson } from "../http/http.js";
-import { cloudExecutor, cloudSettling } from "../scale-exec.js";
+import { listIssues } from "../repo/issues.js";
+import { apdexTargets } from "../repo/slos.js";
+import { projectTags } from "../repo/tags.js";
+import { listServices } from "../repo/trace-read.js";
 import { projectOf } from "./data.js";
 import { metricParamsOf, metricRange, projectMetrics } from "./metrics.js";
+import { factsWith } from "../repo/settings.js";
+import { projectRetentionMs } from "../scale-exec.js";
 const CACHE_MS = 15_000;
 const CACHE_MAX = 500;
 const DAY_MS = 86_400_000;
@@ -17,16 +22,46 @@ function remember(key, value, now) {
         cache.delete(cache.keys().next().value);
     cache.set(key, { atMs: now, value });
 }
+/** Drop a project's cached pages when it gets new data, so the dashboard's reload sees it. */
+export function forgetModels(projectId) {
+    for (const key of cache.keys())
+        if (key.startsWith(`["${projectId}",`))
+            cache.delete(key);
+}
 /** Model parameters: every query value except the ones that pick the data. */
 const paramsOf = (url) => Object.fromEntries([...url.searchParams].filter(([k]) => !RESERVED.has(k)).sort());
-async function retentionDays(ctx, orgId) {
-    const [row] = await ctx.app.db.query("SELECT retention_days AS d FROM orgs WHERE id = $1", [orgId]);
-    return row?.d ?? ctx.app.config.retentionDays;
+/** Days a project keeps data: its own retention, never past its organization's. */
+async function retentionDays(app, projectId) {
+    return (await projectRetentionMs(app.db, projectId, app.config.retentionDays)) / DAY_MS;
+}
+/** One page's numbers for a project, from its stats tables. Cached for 15 seconds, like the dashboard's. */
+export async function projectPage(app, project, page, range, params = {}, env) {
+    const days = await retentionDays(app, project.id);
+    if (TIME_RANGES[range].ms > days * DAY_MS)
+        fail(400, "This range is longer than this project keeps data.");
+    const now = alignNow(app.config.now());
+    const slowQueryMs = factsWith(app.config, await app.settings.get(project.id)).slowQueryMs;
+    const key = JSON.stringify([project.id, page, range, env, params, now, slowQueryMs]);
+    const hit = cached(key, app.config.now());
+    if (hit)
+        return hit;
+    const t = app.telemetry;
+    const pc = pageContext(range, now, params, { slowQueryMs }, await t.settling(project.id, { env, before: app.config.now() - SETTLE_BEHIND_MS }));
+    // A custom window (`from`, `to`) may start before what the organization keeps; a little slack covers snapping.
+    if (now - pc.window.from > days * DAY_MS + 15 * 60_000)
+        fail(400, "This time window starts before this project keeps data.");
+    const issues = ISSUE_PAGES.has(page) ? { issues: issueStatesOf(await listIssues(app.db, project.id)) } : {};
+    const apdex = APDEX_PAGES.has(page) ? { apdex: await apdexTargets(app.db, project.id) } : {};
+    const kind = LIST_SEARCH_KIND[page];
+    const search = kind && isStructuredSearch(params.q) ? { searchIds: await searchTraceIds((q) => t.search(project.id, q), kind, params.q, pc.window, env, activeTags(await projectTags(app.db, project.id))) } : {};
+    const value = await runPage(page, { ...pc, ...issues, ...apdex, ...search }, t.executor(project.id, days * DAY_MS, env));
+    remember(key, value, app.config.now());
+    return value;
 }
 /** `GET api/models/metrics?project=&range=&env=&metric=&service=&group=&stat=&q=`: the metrics page, from the newest points. */
 async function metrics(ctx) {
     const { project } = await projectOf(ctx);
-    const range = metricRange(ctx, await retentionDays(ctx, project.orgId));
+    const range = metricRange(ctx, await retentionDays(ctx.app, project.id));
     const now = alignNow(ctx.app.config.now());
     const env = ctx.url.searchParams.get("env") || undefined;
     const params = metricParamsOf(ctx.url.searchParams);
@@ -34,7 +69,24 @@ async function metrics(ctx) {
     const hit = cached(key, ctx.app.config.now());
     if (hit)
         return sendJson(ctx.res, 200, hit);
-    const value = await projectMetrics(ctx.app.db, project.id, range, params, { now, env });
+    const value = await projectMetrics(ctx.app.telemetry, project.id, range, params, { now, env });
+    remember(key, value, ctx.app.config.now());
+    sendJson(ctx.res, 200, value);
+}
+/** `GET api/models/hosts` and `api/models/kubernetes`: host and Kubernetes metrics with the services on them. */
+async function infra(ctx, page) {
+    const { project } = await projectOf(ctx);
+    const range = metricRange(ctx, await retentionDays(ctx.app, project.orgId));
+    const now = alignNow(ctx.app.config.now());
+    const env = ctx.url.searchParams.get("env") || undefined;
+    const params = Object.fromEntries(INFRA_PARAMS.flatMap((k) => (ctx.url.searchParams.get(k) ? [[k, ctx.url.searchParams.get(k).slice(0, 300)]] : [])));
+    const key = JSON.stringify([project.id, page, range, env, params, now]);
+    const hit = cached(key, ctx.app.config.now());
+    if (hit)
+        return sendJson(ctx.res, 200, hit);
+    const data = await ctx.app.telemetry.infraData({ projectId: project.id, env }, range, params, now);
+    const registry = (await listServices(ctx.app.db, project.id, ctx.app.config.now())).filter((s) => !env || (s.environment ?? "") === env);
+    const value = page === "hosts" ? hostsModelOf(data, registry) : kubeModelOf(data, registry);
     remember(key, value, ctx.app.config.now());
     sendJson(ctx.res, 200, value);
 }
@@ -43,27 +95,16 @@ async function model(ctx) {
     const page = ctx.params.page;
     if (page === "metrics")
         return metrics(ctx);
+    if (page === "hosts" || page === "kubernetes")
+        return infra(ctx, page);
     if (!isPageName(page))
         return fail(404, `No model named "${page}".`);
     const { project } = await projectOf(ctx);
     const range = ctx.url.searchParams.get("range") ?? "24h";
     if (!isTimeRange(range))
         return fail(400, `Unknown range "${range}".`);
-    const days = await retentionDays(ctx, project.orgId);
-    if (TIME_RANGES[range].ms > days * DAY_MS)
-        fail(400, "This range is longer than the organization keeps data.");
-    const now = alignNow(ctx.app.config.now());
     const env = ctx.url.searchParams.get("env") || undefined;
-    const params = paramsOf(ctx.url);
-    const key = JSON.stringify([project.id, page, range, env, params, now]);
-    const hit = cached(key, ctx.app.config.now());
-    if (hit)
-        return sendJson(ctx.res, 200, hit);
-    const db = ctx.app.db;
-    const pc = pageContext(range, now, params, { slowQueryMs: FACT_SLOW_QUERY_MS }, await cloudSettling(db, project.id, env));
-    const value = await runPage(page, pc, cloudExecutor(db, project.id, days * DAY_MS, env));
-    remember(key, value, ctx.app.config.now());
-    sendJson(ctx.res, 200, value);
+    sendJson(ctx.res, 200, await projectPage(ctx.app, project, page, range, paramsOf(ctx.url), env));
 }
 export function modelRoutes(r) {
     r.on("GET", "api/models/:page", model);