cursedbelt-server 4.26.1 → 4.28.0

package/src/server/sharing/store.ts

@@ -49,25 +49,25 @@ import {
 	strongerAccess,
 } from "cursedbelt-core/sharing/model";
 import { runMigrations } from "../migration/runner.js";
-import {
-	SHARE_EVENTS_TABLE,
-	SHARE_GRANTS_TABLE,
-	SHARE_GROUPS_TABLE,
-	SHARE_GROUP_MEMBERS_TABLE,
-	SHARE_MIGRATIONS,
-} from "./migrations.js";
+import type { GrantInput, RevokeInput, ShareEventQuery, ShareTarget } from "./contract.js";
+import { SHARE_MIGRATIONS } from "./migrations.js";
 import { sharedResourceSql } from "./sql.js";
-
-/** Shorthand for the common subject. `group(id)` is its sibling. */
-export const user = (id: string): ShareSubject => ({ type: "user", id });
-export const group = (id: string): ShareSubject => ({ type: "group", id });
-
-/** A resource within the store's own app — the `app` half is supplied by the
- *  store, so a caller cannot mistakenly write a grant into another app's rows. */
-export interface ShareTarget {
-	kind: string;
-	id: string;
-}
+import {
+	type EventRow,
+	eventLimit,
+	eventsWhere,
+	type GrantRow,
+	type GroupMemberRow,
+	type GroupRow,
+	SHARE_SQL,
+	toEvent,
+	toGrant,
+} from "./statements.js";
+
+// The contract has no driver in it, so `./d1.ts` (which runs on `workerd`) shares it without
+// reaching this file. Re-exported so `cursedbelt-server/sharing` is unchanged.
+export { group, user } from "./contract.js";
+export type { GrantInput, RevokeInput, ShareEventQuery, ShareTarget } from "./contract.js";
 
 export interface ShareStoreOptions {
 	db: Database;
@@ -93,79 +93,6 @@ export interface ShareStoreOptions {
 	now?: () => string;
 }
 
-interface GrantRow {
-	app: string;
-	kind: string;
-	resource_id: string;
-	subject_type: "user" | "group";
-	subject_id: string;
-	level: ShareLevel;
-	granted_by: string;
-	granted_at: string;
-	note: string;
-}
-
-interface EventRow {
-	event_id: number;
-	at: string;
-	action: ShareAction;
-	app: string | null;
-	kind: string | null;
-	resource_id: string | null;
-	subject_type: "user" | "group";
-	subject_id: string;
-	level: ShareLevel | null;
-	previous_level: ShareLevel | null;
-	actor: string;
-	note: string;
-}
-
-const toGrant = (row: GrantRow): ShareGrant => ({
-	resource: { app: row.app, kind: row.kind, id: row.resource_id },
-	subject: { type: row.subject_type, id: row.subject_id },
-	level: row.level,
-	grantedBy: row.granted_by,
-	grantedAt: row.granted_at,
-	note: row.note,
-});
-
-const toEvent = (row: EventRow): ShareEvent => ({
-	id: row.event_id,
-	at: row.at,
-	action: row.action,
-	resource:
-		row.app === null || row.kind === null || row.resource_id === null
-			? null
-			: { app: row.app, kind: row.kind, id: row.resource_id },
-	subject: { type: row.subject_type, id: row.subject_id },
-	level: row.level,
-	previousLevel: row.previous_level,
-	actor: row.actor,
-	note: row.note,
-});
-
-export interface GrantInput extends ShareTarget {
-	subject: ShareSubject;
-	level: ShareLevel;
-	grantedBy: string;
-	note?: string;
-}
-
-export interface RevokeInput extends ShareTarget {
-	subject: ShareSubject;
-	revokedBy: string;
-	note?: string;
-}
-
-export interface ShareEventQuery {
-	kind?: string;
-	id?: string;
-	subject?: ShareSubject;
-	/** Newest first, capped. Default 200 — a panel shows a page, and an unbounded
-	 *  audit read on a busy resource is the query that times out in production. */
-	limit?: number;
-}
-
 export type ShareStore = ReturnType<typeof createShareStore>;
 
 /**
@@ -204,11 +131,7 @@ export function createShareStore(options: ShareStoreOptions) {
 		note?: string;
 		at: string;
 	}): ShareEvent => {
-		db.query(
-			`INSERT INTO ${SHARE_EVENTS_TABLE}
-			   (at, action, app, kind, resource_id, subject_type, subject_id, level, previous_level, actor, note)
-			 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-		).run(
+		db.query(SHARE_SQL.insertEvent).run(
 			input.at,
 			input.action,
 			input.resource?.app ?? null,
@@ -242,10 +165,7 @@ export function createShareStore(options: ShareStoreOptions) {
 
 	const readGrant = (target: ShareTarget, subject: ShareSubject): ShareGrant | null => {
 		const row = db
-			.query(
-				`SELECT * FROM ${SHARE_GRANTS_TABLE}
-				 WHERE app = ? AND kind = ? AND resource_id = ? AND subject_type = ? AND subject_id = ?`,
-			)
+			.query(SHARE_SQL.selectGrant)
 			.get(app, target.kind, target.id, subject.type, subject.id) as GrantRow | null;
 		return row ? toGrant(row) : null;
 	};
@@ -270,14 +190,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const events: ShareEvent[] = [];
 			const grant = db.transaction((): ShareGrant => {
 				const existing = readGrant(input, subject);
-				db.query(
-					`INSERT INTO ${SHARE_GRANTS_TABLE}
-					   (app, kind, resource_id, subject_type, subject_id, level, granted_by, granted_at, note)
-					 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-					 ON CONFLICT (app, kind, resource_id, subject_type, subject_id)
-					 DO UPDATE SET level = excluded.level, granted_by = excluded.granted_by,
-					               granted_at = excluded.granted_at, note = excluded.note`,
-				).run(
+				db.query(SHARE_SQL.upsertGrant).run(
 					app,
 					input.kind,
 					input.id,
@@ -324,10 +237,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const removed = db.transaction((): ShareLevel | null => {
 				const existing = readGrant(input, subject);
 				if (!existing) return null;
-				db.query(
-					`DELETE FROM ${SHARE_GRANTS_TABLE}
-					 WHERE app = ? AND kind = ? AND resource_id = ? AND subject_type = ? AND subject_id = ?`,
-				).run(app, input.kind, input.id, subject.type, subject.id);
+				db.query(SHARE_SQL.deleteGrant).run(app, input.kind, input.id, subject.type, subject.id);
 				events.push(
 					recordEvent({
 						action: "revoke",
@@ -359,12 +269,10 @@ export function createShareStore(options: ShareStoreOptions) {
 			const events: ShareEvent[] = [];
 			const count = db.transaction((): number => {
 				const rows = db
-					.query(`SELECT * FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND kind = ? AND resource_id = ?`)
+					.query(SHARE_SQL.selectResourceGrants)
 					.all(app, target.kind, target.id) as GrantRow[];
 				if (rows.length === 0) return 0;
-				db.query(
-					`DELETE FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND kind = ? AND resource_id = ?`,
-				).run(app, target.kind, target.id);
+				db.query(SHARE_SQL.deleteResourceGrants).run(app, target.kind, target.id);
 				for (const row of rows) {
 					events.push(
 						recordEvent({
@@ -392,14 +300,10 @@ export function createShareStore(options: ShareStoreOptions) {
 			const events: ShareEvent[] = [];
 			const count = db.transaction((): number => {
 				const rows = db
-					.query(
-						`SELECT * FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND subject_type = ? AND subject_id = ?`,
-					)
+					.query(SHARE_SQL.selectSubjectGrants)
 					.all(app, normal.type, normal.id) as GrantRow[];
 				if (rows.length === 0) return 0;
-				db.query(
-					`DELETE FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND subject_type = ? AND subject_id = ?`,
-				).run(app, normal.type, normal.id);
+				db.query(SHARE_SQL.deleteSubjectGrants).run(app, normal.type, normal.id);
 				for (const row of rows) {
 					events.push(
 						recordEvent({
@@ -421,16 +325,7 @@ export function createShareStore(options: ShareStoreOptions) {
 
 		/** Who can see this record, strongest first then oldest — the panel's read. */
 		listForResource(target: ShareTarget): ShareGrant[] {
-			const rows = db
-				.query(
-					`SELECT * FROM ${SHARE_GRANTS_TABLE}
-					 WHERE app = ? AND kind = ? AND resource_id = ?
-					 -- Strongest first, then oldest. Spelled as a CASE rather than an
-					 -- ORDER BY on level, which happens to work only because 'write'
-					 -- sorts after 'read' and would silently mis-order a third level.
-					 ORDER BY CASE level WHEN 'write' THEN 0 ELSE 1 END, granted_at ASC`,
-				)
-				.all(app, target.kind, target.id) as GrantRow[];
+			const rows = db.query(SHARE_SQL.listForResource).all(app, target.kind, target.id) as GrantRow[];
 			return rows.map(toGrant);
 		},
 
@@ -438,13 +333,7 @@ export function createShareStore(options: ShareStoreOptions) {
 		 *  NOT expanded here; use {@link resourceIdsFor} for the resolved answer. */
 		listForSubject(subject: ShareSubject): ShareGrant[] {
 			const normal = normalized(subject);
-			const rows = db
-				.query(
-					`SELECT * FROM ${SHARE_GRANTS_TABLE}
-					 WHERE app = ? AND subject_type = ? AND subject_id = ?
-					 ORDER BY granted_at DESC`,
-				)
-				.all(app, normal.type, normal.id) as GrantRow[];
+			const rows = db.query(SHARE_SQL.listForSubject).all(app, normal.type, normal.id) as GrantRow[];
 			return rows.map(toGrant);
 		},
 
@@ -459,13 +348,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const subjectId = normalizeSubjectId("user", viewer.subjectId);
 			if (!subjectId) return "none";
 			const rows = db
-				.query(
-					`SELECT level FROM ${SHARE_GRANTS_TABLE}
-					 WHERE app = ? AND kind = ? AND resource_id = ?
-					   AND ( (subject_type = 'user' AND subject_id = ?)
-					      OR (subject_type = 'group' AND subject_id IN
-					          (SELECT group_id FROM ${SHARE_GROUP_MEMBERS_TABLE} WHERE subject_id = ?)) )`,
-				)
+				.query(SHARE_SQL.accessFor)
 				.all(app, target.kind, target.id, subjectId, subjectId) as { level: ShareLevel }[];
 			let access: ShareAccess = "none";
 			for (const row of rows) access = strongerAccess(access, row.level);
@@ -479,14 +362,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			if (!subjectId) return [];
 			const levels = levelsMeeting(atLeast);
 			const rows = db
-				.query(
-					`SELECT DISTINCT resource_id FROM ${SHARE_GRANTS_TABLE}
-					 WHERE app = ? AND kind = ? AND level IN (${levels.map(() => "?").join(", ")})
-					   AND ( (subject_type = 'user' AND subject_id = ?)
-					      OR (subject_type = 'group' AND subject_id IN
-					          (SELECT group_id FROM ${SHARE_GROUP_MEMBERS_TABLE} WHERE subject_id = ?)) )
-					 ORDER BY resource_id`,
-				)
+				.query(SHARE_SQL.resourceIdsFor(levels.length))
 				.all(app, kind, ...levels, subjectId, subjectId) as { resource_id: string }[];
 			return rows.map((row) => row.resource_id);
 		},
@@ -505,11 +381,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const at = clock();
 			const events: ShareEvent[] = [];
 			const created = db.transaction((): ShareGroup => {
-				db.query(
-					`INSERT INTO ${SHARE_GROUPS_TABLE} (group_id, name, created_by, created_at, note)
-					 VALUES (?, ?, ?, ?, ?)
-					 ON CONFLICT (group_id) DO UPDATE SET name = excluded.name, note = excluded.note`,
-				).run(id, input.name, input.createdBy, at, input.note ?? "");
+				db.query(SHARE_SQL.upsertGroup).run(id, input.name, input.createdBy, at, input.note ?? "");
 				events.push(
 					recordEvent({
 						action: "group.create",
@@ -538,7 +410,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const at = clock();
 			const events: ShareEvent[] = [];
 			db.transaction(() => {
-				db.query(`UPDATE ${SHARE_GROUPS_TABLE} SET name = ? WHERE group_id = ?`).run(name, groupId);
+				db.query(SHARE_SQL.renameGroup).run(name, groupId);
 				events.push(
 					recordEvent({
 						action: "group.rename",
@@ -568,14 +440,8 @@ export function createShareStore(options: ShareStoreOptions) {
 			const at = clock();
 			const events: ShareEvent[] = [];
 			db.transaction(() => {
-				const grants = db
-					.query(
-						`SELECT * FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND subject_type = 'group' AND subject_id = ?`,
-					)
-					.all(app, groupId) as GrantRow[];
-				db.query(
-					`DELETE FROM ${SHARE_GRANTS_TABLE} WHERE app = ? AND subject_type = 'group' AND subject_id = ?`,
-				).run(app, groupId);
+				const grants = db.query(SHARE_SQL.selectGroupGrants).all(app, groupId) as GrantRow[];
+				db.query(SHARE_SQL.deleteGroupGrants).run(app, groupId);
 				for (const row of grants) {
 					events.push(
 						recordEvent({
@@ -589,7 +455,7 @@ export function createShareStore(options: ShareStoreOptions) {
 						}),
 					);
 				}
-				db.query(`DELETE FROM ${SHARE_GROUPS_TABLE} WHERE group_id = ?`).run(groupId);
+				db.query(SHARE_SQL.deleteGroup).run(groupId);
 				events.push(
 					recordEvent({
 						action: "group.delete",
@@ -606,15 +472,7 @@ export function createShareStore(options: ShareStoreOptions) {
 		},
 
 		listGroups(): ShareGroup[] {
-			const rows = db
-				.query(`SELECT * FROM ${SHARE_GROUPS_TABLE} ORDER BY name`)
-				.all() as {
-				group_id: string;
-				name: string;
-				created_by: string;
-				created_at: string;
-				note: string;
-			}[];
+			const rows = db.query(SHARE_SQL.listGroups).all() as GroupRow[];
 			return rows.map((row) => ({
 				id: row.group_id,
 				name: row.name,
@@ -631,10 +489,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const at = clock();
 			const events: ShareEvent[] = [];
 			db.transaction(() => {
-				db.query(
-					`INSERT INTO ${SHARE_GROUP_MEMBERS_TABLE} (group_id, subject_id, added_by, added_at)
-					 VALUES (?, ?, ?, ?) ON CONFLICT (group_id, subject_id) DO NOTHING`,
-				).run(id, member, actor, at);
+				db.query(SHARE_SQL.insertMember).run(id, member, actor, at);
 				events.push(
 					recordEvent({
 						action: "group.join",
@@ -656,9 +511,7 @@ export function createShareStore(options: ShareStoreOptions) {
 			const at = clock();
 			const events: ShareEvent[] = [];
 			db.transaction(() => {
-				db.query(
-					`DELETE FROM ${SHARE_GROUP_MEMBERS_TABLE} WHERE group_id = ? AND subject_id = ?`,
-				).run(id, member);
+				db.query(SHARE_SQL.deleteMember).run(id, member);
 				events.push(
 					recordEvent({
 						action: "group.leave",
@@ -676,15 +529,8 @@ export function createShareStore(options: ShareStoreOptions) {
 
 		listGroupMembers(groupId: string): ShareGroupMember[] {
 			const rows = db
-				.query(
-					`SELECT * FROM ${SHARE_GROUP_MEMBERS_TABLE} WHERE group_id = ? ORDER BY subject_id`,
-				)
-				.all(normalizeSubjectId("group", groupId)) as {
-				group_id: string;
-				subject_id: string;
-				added_by: string;
-				added_at: string;
-			}[];
+				.query(SHARE_SQL.listMembers)
+				.all(normalizeSubjectId("group", groupId)) as GroupMemberRow[];
 			return rows.map((row) => ({
 				groupId: row.group_id,
 				subjectId: row.subject_id,
@@ -697,11 +543,7 @@ export function createShareStore(options: ShareStoreOptions) {
 		groupIdsFor(subjectId: string): string[] {
 			const member = normalizeSubjectId("user", subjectId);
 			if (!member) return [];
-			const rows = db
-				.query(
-					`SELECT group_id FROM ${SHARE_GROUP_MEMBERS_TABLE} WHERE subject_id = ? ORDER BY group_id`,
-				)
-				.all(member) as { group_id: string }[];
+			const rows = db.query(SHARE_SQL.groupIdsFor).all(member) as { group_id: string }[];
 			return rows.map((row) => row.group_id);
 		},
 
@@ -709,28 +551,11 @@ export function createShareStore(options: ShareStoreOptions) {
 
 		/** The trail, newest first. Filter by resource, by subject, or neither. */
 		events(query: ShareEventQuery = {}): ShareEvent[] {
-			const clauses = ["app IS NULL OR app = ?"];
-			const params: (string | number)[] = [app];
-			if (query.kind !== undefined) {
-				clauses.push("kind = ?");
-				params.push(query.kind);
-			}
-			if (query.id !== undefined) {
-				clauses.push("resource_id = ?");
-				params.push(query.id);
-			}
-			if (query.subject) {
-				const normal = normalized(query.subject);
-				clauses.push("subject_type = ? AND subject_id = ?");
-				params.push(normal.type, normal.id);
-			}
-			const where = clauses.map((clause) => `(${clause})`).join(" AND ");
-			const limit = Math.max(1, Math.min(query.limit ?? 200, 1000));
-			const rows = db
-				.query(
-					`SELECT * FROM ${SHARE_EVENTS_TABLE} WHERE ${where} ORDER BY event_id DESC LIMIT ?`,
-				)
-				.all(...params, limit) as EventRow[];
+			const { where, params } = eventsWhere(app, {
+				...query,
+				subject: query.subject ? normalized(query.subject) : undefined,
+			});
+			const rows = db.query(SHARE_SQL.events(where)).all(...params, eventLimit(query.limit)) as EventRow[];
 			return rows.map(toEvent);
 		},
 	};

package/src/server/telemetryIsWorkerSafe.spec.ts

@@ -89,3 +89,67 @@ describe('cursedbelt-server/telemetry', () => {
 		expect(found).toEqual(['bun:sqlite']);
 	});
 });
+
+describe('🔴 cursedbelt-server/engagement/d1 — a Worker mounts it (task 2096)', () => {
+	test('reaches no `bun:` module at runtime — not the store, not the Bun-only barrel', () => {
+		const { files, bunImports } = runtimeGraph(join(import.meta.dir, 'engagement', 'd1.ts'));
+		expect(bunImports).toEqual([]);
+		// Not vacuous: the policy and the manifest rule are both in the graph, and the store is not.
+		expect(files.some((f) => f.endsWith('engagement/policy.ts'))).toBe(true);
+		expect(files.some((f) => f.endsWith('engagement/manifestPlaces.ts'))).toBe(true);
+		expect(files.some((f) => f.endsWith('engagement/store.ts'))).toBe(false);
+	});
+
+	test("its export map's `import` is the real module, not the Bun-only refusal", () => {
+		const pkg = JSON.parse(readFileSync(join(import.meta.dir, '..', '..', 'package.json'), 'utf8')) as {
+			exports: Record<string, { import?: string }>;
+		};
+		expect(pkg.exports['./engagement/d1']?.import).toBe('./dist/server/engagement/d1.js');
+	});
+});
+
+/**
+ * The three D1 halves `apps/family`'s Worker port needs (task 393). Each sits beside a sync
+ * store that is `bun:sqlite` by construction, so the walk also proves the split held: the
+ * driver-free modules they share are IN the graph, and the Bun-only siblings are NOT.
+ */
+describe('🔴 cursedbelt-server/{sharing,activity,notifications}/d1 — a Worker imports them (task 393)', () => {
+	const pkg = JSON.parse(readFileSync(join(import.meta.dir, '..', '..', 'package.json'), 'utf8')) as {
+		exports: Record<string, { import?: string; source?: string }>;
+	};
+	const CASES = [
+		{
+			subpath: './sharing/d1',
+			entry: join(import.meta.dir, 'sharing', 'd1.ts'),
+			reaches: ['sharing/statements.ts', 'sharing/schema.ts', 'sharing/sql.ts', 'sharing/contract.ts'],
+			never: ['sharing/store.ts', 'sharing/migrations.ts', 'migration/runner.ts'],
+		},
+		{
+			subpath: './activity/d1',
+			entry: join(import.meta.dir, 'activity', 'd1.ts'),
+			reaches: ['activity/query.ts', 'activity/schema.ts', 'activity/shareSource.ts', 'sharing/schema.ts'],
+			never: ['activity/store.ts', 'activity/migrations.ts', 'sharing/migrations.ts', 'migration/runner.ts'],
+		},
+		{
+			subpath: './notifications/d1',
+			entry: join(import.meta.dir, 'notifications', 'd1.ts'),
+			reaches: ['notifications/routes.ts'],
+			never: ['notifications/service.ts', 'notifications/migrations.ts', 'notifications/hub.ts'],
+		},
+	] as const;
+
+	for (const { subpath, entry, reaches, never } of CASES) {
+		test(`${subpath} reaches no \`bun:\` module at runtime, and none of its Bun-only siblings`, () => {
+			const { files, bunImports } = runtimeGraph(entry);
+			expect(bunImports).toEqual([]);
+			for (const file of reaches) expect({ file, reached: files.some((f) => f.endsWith(file)) }).toEqual({ file, reached: true });
+			for (const file of never) expect({ file, reached: files.some((f) => f.endsWith(file)) }).toEqual({ file, reached: false });
+		});
+
+		test(`${subpath}'s export map points at the real module, not the Bun-only refusal`, () => {
+			const rel = entry.split('/src/server/')[1]?.replace(/\.ts$/, '');
+			expect(pkg.exports[subpath]?.import).toBe(`./dist/server/${rel}.js`);
+			expect(pkg.exports[subpath]?.source).toBe(`./src/server/${rel}.ts`);
+		});
+	}
+});