@codemem/server 0.22.3 → 0.22.4

package/dist/index.js

@@ -6,7 +6,7 @@ import { Hono } from "hono";
 import { createMiddleware } from "hono/factory";
 import { RateLimiter } from "limiter";
 import { homedir } from "node:os";
-import { count, desc, eq, inArray, isNotNull, max, ne } from "drizzle-orm";
+import { and, count, desc, eq, inArray, isNotNull, max, ne } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/better-sqlite3";
 import { createHash, randomUUID } from "node:crypto";
 import net from "node:net";
@@ -1880,7 +1880,7 @@ function syncProtocolRoutes(getStore, opts = {}) {
 			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;
+			const limit = Number.isFinite(rawLimit) ? Math.max(1, Math.min(rawLimit, 5e3)) : 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, {
@@ -2036,7 +2036,7 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 			});
 			const peersMap = {};
 			for (const peer of peersItems) peersMap[String(peer.peer_device_id)] = peer.status;
-			const attemptsItems = d.select({
+			const attemptRows = d.select({
 				peer_device_id: schema.syncAttempts.peer_device_id,
 				ok: schema.syncAttempts.ok,
 				error: schema.syncAttempts.error,
@@ -2044,11 +2044,20 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 				finished_at: schema.syncAttempts.finished_at,
 				ops_in: schema.syncAttempts.ops_in,
 				ops_out: schema.syncAttempts.ops_out
-			}).from(schema.syncAttempts).orderBy(desc(schema.syncAttempts.finished_at)).limit(25).all().map((row) => ({
-				...row,
-				status: attemptStatus(row),
-				address: null
-			}));
+			}).from(schema.syncAttempts).orderBy(desc(schema.syncAttempts.finished_at)).limit(25).all();
+			const peerAddressMap = /* @__PURE__ */ new Map();
+			store.db.prepare("SELECT peer_device_id, addresses_json FROM sync_peers").all().forEach((peerRow) => {
+				const addrs = safeJsonList(peerRow.addresses_json);
+				if (addrs.length) peerAddressMap.set(String(peerRow.peer_device_id ?? ""), addrs);
+			});
+			const attemptsItems = attemptRows.map((row) => {
+				const addrs = showDiag ? peerAddressMap.get(String(row.peer_device_id ?? "")) : void 0;
+				return {
+					...row,
+					status: attemptStatus(row),
+					address: addrs?.length ? addrs[0] : null
+				};
+			});
 			const latestAttemptError = String(attemptsItems[0]?.error || "").trim();
 			const statusBlock = {
 				...statusPayload,
@@ -2118,7 +2127,7 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 			const d = drizzle(store.db, { schema });
 			const includeMerged = queryBool(c.req.query("includeMerged"));
 			const query = d.select().from(schema.actors);
-			const rows = includeMerged ? query.orderBy(schema.actors.display_name).all() : query.where(ne(schema.actors.status, "merged")).orderBy(schema.actors.display_name).all();
+			const rows = includeMerged ? query.orderBy(schema.actors.display_name).all() : query.where(and(ne(schema.actors.status, "merged"), ne(schema.actors.status, "deactivated"))).orderBy(schema.actors.display_name).all();
 			return c.json({ items: rows });
 		}
 	});
@@ -2371,7 +2380,7 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 		if (!primary || !secondary) return c.json({ error: "actor not found" }, 404);
 		if (primary.status !== "active") return c.json({ error: "primary actor not active" }, 409);
 		if (secondary.status !== "active") return c.json({ error: "secondary actor not active" }, 409);
-		if (secondary.is_local) return c.json({ error: "cannot merge local actor" }, 409);
+		if (secondary.is_local && secondary.actor_id === store.actorId) return c.json({ error: "cannot merge this device's own local actor" }, 409);
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const mergedCount = store.db.transaction(() => {
 			const peerUpdate = d.update(schema.syncPeers).set({ actor_id: primaryActorId }).where(eq(schema.syncPeers.actor_id, secondaryActorId)).run();
@@ -2385,6 +2394,29 @@ function syncRoutes(getStore, getSyncRuntimeStatus) {
 		})();
 		return c.json({ merged_count: mergedCount });
 	});
+	app.post("/api/sync/actors/deactivate", async (c) => {
+		const store = getStore();
+		let body;
+		try {
+			body = await c.req.json();
+		} catch {
+			return c.json({ error: "invalid json" }, 400);
+		}
+		const actorId = String(body.actor_id ?? "").trim();
+		if (!actorId) return c.json({ error: "actor_id required" }, 400);
+		if (actorId === store.actorId) return c.json({ error: "cannot deactivate this device's own local actor" }, 409);
+		const d = drizzle(store.db, { schema });
+		const actor = d.select().from(schema.actors).where(eq(schema.actors.actor_id, actorId)).get();
+		if (!actor) return c.json({ error: "actor not found" }, 404);
+		if (actor.status !== "active") return c.json({ error: "actor not active" }, 409);
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		d.update(schema.actors).set({
+			status: "deactivated",
+			updated_at: now
+		}).where(eq(schema.actors.actor_id, actorId)).run();
+		d.update(schema.syncPeers).set({ actor_id: null }).where(eq(schema.syncPeers.actor_id, actorId)).run();
+		return c.json({ ok: true });
+	});
 	app.post("/api/sync/legacy-devices/claim", async (c) => {
 		const store = getStore();
 		let body;