@codemem/server 0.21.2 → 0.22.0-alpha.2

package/dist/index.js

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { CODEMEM_CONFIG_ENV_OVERRIDES, DEFAULT_TIME_WINDOW_S, MemoryStore, VERSION, applyReplicationOps, buildFilterClausesWithContext, buildRawEventEnvelopeFromHook, cleanupNonces, coordinatorCreateInviteAction, coordinatorImportInviteAction, coordinatorReviewJoinRequestAction, coordinatorStatusSnapshot, ensureDeviceIdentity, extractReplicationOps, fingerprintPublicKey, fromJson, getCodememConfigPath, getCodememEnvOverrides, getSyncResetState, listCoordinatorJoinRequests, listObserverProviderOptions, loadMemorySnapshotPageForPeer, loadReplicationOpsForPeer, parseStrictInteger, probeAvailableCredentials, readCodememConfigFile, readCoordinatorSyncConfig, recordNonce, resolveDbPath, schema, stripJsonComments, stripPrivateObj, stripTrailingCommas, verifySignature, writeCodememConfigFile } from "@codemem/core";
+import { CODEMEM_CONFIG_ENV_OVERRIDES, DEFAULT_TIME_WINDOW_S, MemoryStore, VERSION, applyReplicationOps, buildFilterClausesWithContext, buildRawEventEnvelopeFromHook, cleanupNonces, coordinatorCreateInviteAction, coordinatorImportInviteAction, coordinatorReviewJoinRequestAction, coordinatorStatusSnapshot, ensureDeviceIdentity, extractReplicationOps, fingerprintPublicKey, fromJson, getCodememConfigPath, getCodememEnvOverrides, getSyncResetState, listCoordinatorJoinRequests, listObserverProviderOptions, loadMemorySnapshotPageForPeer, loadReplicationOpsForPeer, lookupCoordinatorPeers, mergeAddresses, parseStrictInteger, probeAvailableCredentials, readCodememConfigFile, readCoordinatorSyncConfig, recordNonce, resolveDbPath, schema, stripJsonComments, stripPrivateObj, stripTrailingCommas, verifySignature, writeCodememConfigFile } from "@codemem/core";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { Hono } from "hono";
 import { createMiddleware } from "hono/factory";
@@ -1309,6 +1309,101 @@ function parseOpPayload(op) {
 		return null;
 	}
 }
+function redactCoordinatorStatus(coordinator, showDiag) {
+	if (showDiag) return coordinator;
+	const discovered = Array.isArray(coordinator.discovered_devices) ? coordinator.discovered_devices.map((item) => {
+		if (!item || typeof item !== "object") return item;
+		const record = item;
+		return {
+			device_id: record.device_id,
+			display_name: record.display_name ?? null,
+			groups: Array.isArray(record.groups) ? record.groups : [],
+			last_seen_at: record.last_seen_at ?? null,
+			expires_at: record.expires_at ?? null,
+			stale: Boolean(record.stale),
+			fingerprint: null,
+			addresses: []
+		};
+	}) : [];
+	return {
+		...coordinator,
+		discovered_devices: discovered
+	};
+}
+async function acceptDiscoveredPeer(store, input) {
+	const config = readCoordinatorSyncConfig();
+	if (!config.syncEnabled || !config.syncCoordinatorUrl || config.syncCoordinatorGroups.length === 0) return {
+		ok: false,
+		status: 400,
+		error: "coordinator_not_configured",
+		detail: "Coordinator must be configured before accepting discovered peers."
+	};
+	const match = (await lookupCoordinatorPeers(store, config)).find((peer) => String(peer.device_id ?? "").trim() === input.peerDeviceId && String(peer.fingerprint ?? "").trim() === input.fingerprint);
+	if (!match) return {
+		ok: false,
+		status: 404,
+		error: "discovered_peer_not_found",
+		detail: "That discovered device is no longer available. Refresh sync status and try again."
+	};
+	const nextFingerprint = String(match.fingerprint ?? "").trim();
+	const nextName = String(match.display_name ?? "").trim() || null;
+	const nextAddresses = Array.isArray(match.addresses) ? match.addresses.filter((value) => typeof value === "string") : [];
+	const d = drizzle(store.db, { schema });
+	const now = (/* @__PURE__ */ new Date()).toISOString();
+	return store.db.transaction(() => {
+		const existing = d.select({
+			peer_device_id: schema.syncPeers.peer_device_id,
+			pinned_fingerprint: schema.syncPeers.pinned_fingerprint,
+			addresses_json: schema.syncPeers.addresses_json
+		}).from(schema.syncPeers).where(eq(schema.syncPeers.peer_device_id, input.peerDeviceId)).get();
+		const existingFingerprint = String(existing?.pinned_fingerprint ?? "").trim();
+		if (existing && existingFingerprint && existingFingerprint !== nextFingerprint) return {
+			ok: false,
+			status: 409,
+			error: "peer_conflict",
+			detail: "An existing peer with this device id is pinned to a different fingerprint. Remove or repair the old peer before accepting this discovered device."
+		};
+		const existingAddresses = (() => {
+			try {
+				const raw = JSON.parse(String(existing?.addresses_json ?? "[]"));
+				return Array.isArray(raw) ? raw.filter((value) => typeof value === "string") : [];
+			} catch {
+				return [];
+			}
+		})();
+		const addressesJson = JSON.stringify(mergeAddresses(existingAddresses, nextAddresses));
+		if (!existing) {
+			d.insert(schema.syncPeers).values({
+				peer_device_id: input.peerDeviceId,
+				name: nextName,
+				pinned_fingerprint: nextFingerprint || null,
+				addresses_json: addressesJson,
+				created_at: now,
+				last_seen_at: now
+			}).run();
+			return {
+				ok: true,
+				peer_device_id: input.peerDeviceId,
+				created: true,
+				updated: false,
+				name: nextName
+			};
+		}
+		d.update(schema.syncPeers).set({
+			name: nextName,
+			pinned_fingerprint: nextFingerprint || existing.pinned_fingerprint || null,
+			addresses_json: addressesJson,
+			last_seen_at: now
+		}).where(eq(schema.syncPeers.peer_device_id, input.peerDeviceId)).run();
+		return {
+			ok: true,
+			peer_device_id: input.peerDeviceId,
+			created: false,
+			updated: true,
+			name: nextName
+		};
+	})();
+}
 function isSharedVisibility(payload) {
 	if (!payload) return false;
 	let visibility = String(payload.visibility ?? "").trim().toLowerCase();
@@ -1539,6 +1634,43 @@ function syncProtocolRoutes(getStore) {
 			return c.json({ error: "internal_error" }, 500);
 		}
 	});
+	app.get("/v1/snapshot", (c) => {
+		const store = getStore();
+		const auth = authorizeSyncRequest(store, c.req, Buffer.alloc(0));
+		if (!auth.ok) return c.json(unauthorizedPayload(auth.reason), 401);
+		try {
+			const rawGeneration = c.req.query("generation");
+			const generation = rawGeneration != null && rawGeneration.trim().length > 0 ? Number.parseInt(rawGeneration, 10) : null;
+			const snapshotId = c.req.query("snapshot_id") ?? null;
+			const baselineCursor = c.req.query("baseline_cursor") ?? null;
+			const pageToken = c.req.query("page_token") ?? null;
+			const rawLimit = Number.parseInt(c.req.query("limit") ?? "200", 10);
+			const limit = Number.isFinite(rawLimit) ? Math.max(1, Math.min(rawLimit, 1e3)) : 200;
+			if (generation == null || !Number.isFinite(generation)) return c.json({ error: "missing_generation" }, 400);
+			if (!snapshotId) return c.json({ error: "missing_snapshot_id" }, 400);
+			const result = loadMemorySnapshotPageForPeer(store.db, {
+				generation,
+				snapshotId,
+				baselineCursor,
+				pageToken,
+				limit,
+				peerDeviceId: auth.deviceId
+			});
+			return c.json({
+				generation: result.boundary.generation,
+				snapshot_id: result.boundary.snapshot_id,
+				baseline_cursor: result.boundary.baseline_cursor,
+				retained_floor_cursor: result.boundary.retained_floor_cursor,
+				items: result.items,
+				next_page_token: result.nextPageToken,
+				has_more: result.hasMore
+			});
+		} catch (err) {
+			const message = err instanceof Error ? err.message : "";
+			if (message === "generation_mismatch" || message === "boundary_mismatch") return c.json({ error: message }, 409);
+			return c.json({ error: "internal_error" }, 500);
+		}
+	});
 	app.post("/v1/ops", async (c) => {
 		const store = getStore();
 		const raw = Buffer.from(await c.req.arrayBuffer());
@@ -1574,49 +1706,6 @@ function syncProtocolRoutes(getStore) {
 			skipped: result.skipped + filteredInbound.skipped
 		});
 	});
-	app.get("/v1/bootstrap/memories", (c) => {
-		const store = getStore();
-		const auth = authorizeSyncRequest(store, c.req, Buffer.alloc(0));
-		if (!auth.ok) return c.json(unauthorizedPayload(auth.reason), 401);
-		const peerDeviceId = auth.deviceId;
-		try {
-			const rawLimit = Number.parseInt(c.req.query("limit") ?? "200", 10);
-			const rawGeneration = c.req.query("generation");
-			const generation = rawGeneration != null && rawGeneration.trim().length > 0 ? Number.parseInt(rawGeneration, 10) : null;
-			const snapshotId = c.req.query("snapshot_id") ?? null;
-			const baselineCursor = c.req.query("baseline_cursor") ?? null;
-			const pageToken = c.req.query("page_token") ?? null;
-			const limit = Number.isFinite(rawLimit) ? Math.max(1, Math.min(rawLimit, 1e3)) : 200;
-			const page = loadMemorySnapshotPageForPeer(store.db, {
-				limit,
-				pageToken,
-				peerDeviceId,
-				generation: Number.isFinite(generation) ? generation : null,
-				snapshotId,
-				baselineCursor
-			});
-			return c.json({
-				generation: page.boundary.generation,
-				snapshot_id: page.boundary.snapshot_id,
-				baseline_cursor: page.boundary.baseline_cursor,
-				retained_floor_cursor: page.boundary.retained_floor_cursor,
-				items: page.items,
-				next_page_token: page.nextPageToken,
-				has_more: page.hasMore
-			});
-		} catch (err) {
-			if (err instanceof Error && (err.message === "generation_mismatch" || err.message === "boundary_mismatch")) {
-				const boundary = getSyncResetState(store.db);
-				return c.json({
-					error: "reset_required",
-					reset_required: true,
-					reason: err.message,
-					...boundary
-				}, 409);
-			}
-			return c.json({ error: "internal_error" }, 500);
-		}
-	});
 	return app;
 }
 /**
@@ -1733,7 +1822,7 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 			};
 			const legacyDevices = store.claimableLegacyDeviceIds();
 			const sharingReview = store.sharingReviewSummary(project);
-			const coordinator = await coordinatorStatusSnapshot(store, config);
+			const coordinator = redactCoordinatorStatus(await coordinatorStatusSnapshot(store, config), showDiag);
 			let joinRequests = [];
 			if (includeJoinRequests && config.syncCoordinatorAdminSecret) try {
 				joinRequests = await listCoordinatorJoinRequests(config);
@@ -1866,6 +1955,42 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 			return c.json({ ok: true });
 		}
 	});
+	app.post("/api/sync/peers/accept-discovered", async (c) => {
+		const store = getStore();
+		let body;
+		try {
+			body = await c.req.json();
+		} catch {
+			return c.json({ error: "invalid json" }, 400);
+		}
+		const peerDeviceId = String(body.peer_device_id ?? "").trim();
+		const fingerprint = String(body.fingerprint ?? "").trim();
+		if (!peerDeviceId) return c.json({ error: "peer_device_id required" }, 400);
+		if (!fingerprint) return c.json({ error: "fingerprint required" }, 400);
+		try {
+			const result = await acceptDiscoveredPeer(store, {
+				peerDeviceId,
+				fingerprint
+			});
+			if (!result.ok) return c.json({
+				error: result.error,
+				detail: result.detail
+			}, { status: result.status });
+			return c.json({
+				ok: true,
+				peer_device_id: result.peer_device_id,
+				created: result.created,
+				updated: result.updated,
+				name: result.name,
+				needs_scope_review: true
+			});
+		} catch (error) {
+			return c.json({
+				error: "coordinator_lookup_failed",
+				detail: error instanceof Error ? error.message : String(error)
+			}, { status: 502 });
+		}
+	});
 	app.post("/api/sync/invites/create", async (c) => {
 		let body;
 		try {
@@ -1954,6 +2079,7 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 			const peerDeviceId = c.req.param("peer_device_id")?.trim();
 			if (!peerDeviceId) return c.json({ error: "peer_device_id required" }, 400);
 			if (!d.select({ peer_device_id: schema.syncPeers.peer_device_id }).from(schema.syncPeers).where(eq(schema.syncPeers.peer_device_id, peerDeviceId)).get()) return c.json({ error: "peer not found" }, 404);
+			d.delete(schema.replicationCursors).where(eq(schema.replicationCursors.peer_device_id, peerDeviceId)).run();
 			d.delete(schema.syncPeers).where(eq(schema.syncPeers.peer_device_id, peerDeviceId)).run();
 			return c.json({ ok: true });
 		}