@volter/teams 0.1.30 → 0.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/teams",
-  "version": "0.1.30",
+  "version": "0.1.32",
   "type": "module",
   "description": "Volter Teams, the neutral team plane: machine identity and daemon core, the local door and server link, admission from machine grants, product doors, and the Teams server's neutral routes (company RFC 0008).",
   "license": "MIT",

package/server/core.mjs

@@ -57,16 +57,13 @@ export async function bootstrapServer(api,{initTeam,bootstrap}){
 }
 
 /** Expire cursors, idempotency records, staged captures and uploads, and old journal rows. */
-export async function maintain(api){const now=api.clock.nowMs();await api.store.transaction([
-        {sql:'DELETE FROM cursors WHERE expires_at<=?',params:[now]},
-        {sql:'DELETE FROM global_cursors WHERE expires_at<=?',params:[now]},
-        {sql:'DELETE FROM global_idempotency WHERE expires_at<=?',params:[now]},
-        {sql:'INSERT OR IGNORE INTO capture_expiries(team_id,source_id,id,expired_at) SELECT team_id,source_id,id,? FROM captures WHERE state=\'staging\' AND created_at+86400000<=?',params:[now,now]},
-        {sql:'DELETE FROM captures WHERE state=\'staging\' AND created_at+86400000<=?',params:[now]},
-        {sql:'INSERT OR IGNORE INTO capture_expiries(team_id,source_id,id,expired_at) SELECT team_id,source_id,id,? FROM uploads WHERE committed=0 AND created_at+86400000<=?',params:[now,now]},
-        {sql:'DELETE FROM uploads WHERE committed=0 AND created_at+86400000<=?',params:[now]},
-        {sql:'DELETE FROM journal WHERE created_at+86400000<=?',params:[now]},
-      ]);
+export async function maintain(api){const now=api.clock.nowMs();
+  // Deletes go first, each in a transaction of its own: on a full database an insert fails, and a run that begins
+  // with one never reaches the deletes that would make room.
+  // A committed capture's parts are its messages in transit; once committed, the session's version holds them, so
+  // they go (a backlog of them filled the database).
+  const parts=await api.store.query(`SELECT p.team_id,p.capture_id,p.part_index FROM capture_parts p JOIN captures c ON c.team_id=p.team_id AND c.id=p.capture_id WHERE c.state='committed' LIMIT ${PART_PRUNE_BATCH}`,[]);
+  for(let at=0;at<parts.length;at+=50)await api.store.transaction(parts.slice(at,at+50).map(({team_id,capture_id,part_index})=>({sql:'DELETE FROM capture_parts WHERE team_id=? AND capture_id=? AND part_index=?',params:[team_id,capture_id,part_index]})));
   // Every capture writes its session a new version with a full copy of its messages, so versions pile up (hundreds
   // per session) until listing them outgrew a Worker's memory. Kept: each session's current version, the newest
   // version from each of its sources (the next capture and a correlation read that one), and every version an
@@ -77,13 +74,23 @@ export async function maintain(api){const now=api.clock.nowMs();await api.store.
     AND NOT EXISTS (SELECT 1 FROM cursors c, json_each(c.snapshot_json) j WHERE c.team_id=v.team_id AND c.kind IN ('list','search') AND c.expires_at>? AND json_extract(j.value,'$[0]')=v.session_id AND json_extract(j.value,'$[1]')=v.revision)
     AND NOT EXISTS (SELECT 1 FROM cursors c WHERE c.team_id=v.team_id AND c.kind='history' AND c.expires_at>? AND json_extract(c.snapshot_json,'$.session_id')=v.session_id AND json_extract(c.snapshot_json,'$.revision')=v.revision)
     LIMIT ${VERSION_PRUNE_BATCH}`,[now,now]);
-  // A committed capture's parts are its messages in transit; once committed, the session's version holds them, so
-  // they go (a backlog of them filled the database).
-  const parts=await api.store.query(`SELECT p.team_id,p.capture_id,p.part_index FROM capture_parts p JOIN captures c ON c.team_id=p.team_id AND c.id=p.capture_id WHERE c.state='committed' LIMIT ${PART_PRUNE_BATCH}`,[]);
-  if(parts.length)await api.store.transaction(parts.map(({team_id,capture_id,part_index})=>({sql:'DELETE FROM capture_parts WHERE team_id=? AND capture_id=? AND part_index=?',params:[team_id,capture_id,part_index]})));
-  if(stale.length)await api.store.transaction(stale.flatMap(({team_id,session_id,revision})=>['messages','session_artifacts','session_versions'].map(table=>({sql:`DELETE FROM ${table} WHERE team_id=? AND session_id=? AND revision=?`,params:[team_id,session_id,revision]}))));
-  return {pruned_versions:stale.length,pruned_parts:parts.length,backlog:stale.length>=VERSION_PRUNE_BATCH||parts.length>=PART_PRUNE_BATCH};}
+  for(const {team_id,session_id,revision} of stale)await api.store.transaction(['messages','session_artifacts','session_versions'].map(table=>({sql:`DELETE FROM ${table} WHERE team_id=? AND session_id=? AND revision=?`,params:[team_id,session_id,revision]})));
+  await api.store.transaction([
+        {sql:'DELETE FROM cursors WHERE expires_at<=?',params:[now]},
+        {sql:'DELETE FROM global_cursors WHERE expires_at<=?',params:[now]},
+        {sql:'DELETE FROM global_idempotency WHERE expires_at<=?',params:[now]},
+        {sql:'DELETE FROM journal WHERE created_at+86400000<=?',params:[now]},
+      ]).catch(()=>{});
+  await api.store.transaction([
+        {sql:'INSERT OR IGNORE INTO capture_expiries(team_id,source_id,id,expired_at) SELECT team_id,source_id,id,? FROM captures WHERE state=\'staging\' AND created_at+86400000<=?',params:[now,now]},
+        {sql:'DELETE FROM captures WHERE state=\'staging\' AND created_at+86400000<=?',params:[now]},
+        {sql:'INSERT OR IGNORE INTO capture_expiries(team_id,source_id,id,expired_at) SELECT team_id,source_id,id,? FROM uploads WHERE committed=0 AND created_at+86400000<=?',params:[now,now]},
+        {sql:'DELETE FROM uploads WHERE committed=0 AND created_at+86400000<=?',params:[now]},
+      ]).catch(()=>{});
+  const result={pruned_versions:stale.length,pruned_parts:parts.length,backlog:stale.length>=VERSION_PRUNE_BATCH||parts.length>=PART_PRUNE_BATCH};
+  if(result.pruned_versions||result.pruned_parts)console.log(`maintain: pruned ${result.pruned_parts} parts, ${result.pruned_versions} versions${result.backlog?' (backlog)':''}`);
+  return result;}
 /** Session versions `maintain` removes per run: small enough for one Durable Object alarm; a backlog runs again in seconds. */
-const VERSION_PRUNE_BATCH=200;
+const VERSION_PRUNE_BATCH=20;
 /** Committed capture parts `maintain` removes per run. */
-const PART_PRUNE_BATCH=500;
+const PART_PRUNE_BATCH=50;