@volter/supercode-teams 0.2.30 → 0.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.30",
+  "version": "0.2.32",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",

package/server/harness-routes.mjs

@@ -117,17 +117,28 @@ async function listSessions(api,res,auth,url,requestId,search){
   const query=qobj(url);
   search?validateSearchQuery(query):validateListQuery(query);
   const normalizedQuery=Object.fromEntries(Object.entries(query).filter(([key])=>key!=='cursor'));
+  // Every sync writes a session a new version (and its messages again), so a page reads only the versions it can
+  // show: each session's current one, and those a cursor's snapshot names; messages only for a search. Reading every
+  // version of every session made the list outgrow the Worker's memory.
+  const cursorKey=query.cursor?[cursorHash(query.cursor),auth.team_id,auth.principal_id]:null;
+  const cursorVersions="json_each(COALESCE((SELECT snapshot_json FROM cursors WHERE id=? AND team_id=? AND principal_id=? AND kind IN ('list','search')),'[]')) j";
   const statements=[];
-  if(query.cursor)statements.push({kind:'one',sql:'SELECT * FROM cursors WHERE id=? AND team_id=? AND principal_id=?',params:[cursorHash(query.cursor),auth.team_id,auth.principal_id]});
+  if(cursorKey)statements.push({kind:'one',sql:'SELECT * FROM cursors WHERE id=? AND team_id=? AND principal_id=?',params:cursorKey});
   statements.push(
     {kind:'one',sql:'SELECT auth_epoch,journal_revision FROM teams WHERE id=?',params:[auth.team_id]},
     {kind:'one',sql:'SELECT revoked_at,expires_at FROM credentials WHERE id=?',params:[auth.credential_id]},
     {kind:'one',sql:'SELECT role,active FROM memberships WHERE team_id=? AND principal_id=?',params:[auth.team_id,auth.principal_id]},
-    {kind:'query',sql:'SELECT s.*,v.revision version_revision,v.descriptor_json,v.sort_at FROM sessions s JOIN session_versions v ON v.team_id=s.team_id AND v.session_id=s.id WHERE s.team_id=? AND s.deleted_at IS NULL ORDER BY v.sort_at DESC,s.id ASC',params:[auth.team_id]},
-    {kind:'query',sql:'SELECT * FROM session_grants WHERE team_id=?',params:[auth.team_id]},
-    {kind:'query',sql:'SELECT id,session_id,revision,recorded_at,search_text FROM messages WHERE team_id=?',params:[auth.team_id]}
+    {kind:'query',sql:'SELECT s.*,v.revision version_revision,v.descriptor_json,v.sort_at FROM sessions s JOIN session_versions v ON v.team_id=s.team_id AND v.session_id=s.id AND v.revision=s.revision WHERE s.team_id=? AND s.deleted_at IS NULL ORDER BY v.sort_at DESC,s.id ASC',params:[auth.team_id]},
+    {kind:'query',sql:'SELECT * FROM session_grants WHERE team_id=?',params:[auth.team_id]}
   );
-  const values=await api.store.snapshot(statements),offset=query.cursor?1:0,cursor=query.cursor?values[0]:null,team=values[offset],credential=values[offset+1],membership=values[offset+2],rows=values[offset+3],allGrants=values[offset+4],allMessages=values[offset+5];
+  if(cursorKey)statements.push({kind:'query',sql:`SELECT s.*,v.revision version_revision,v.descriptor_json,v.sort_at FROM ${cursorVersions} JOIN session_versions v ON v.team_id=? AND v.session_id=json_extract(j.value,'$[0]') AND v.revision=json_extract(j.value,'$[1]') JOIN sessions s ON s.team_id=v.team_id AND s.id=v.session_id WHERE s.deleted_at IS NULL AND v.revision<>s.revision`,params:[...cursorKey,auth.team_id]});
+  if(search){
+    statements.push({kind:'query',sql:'SELECT m.id,m.session_id,m.revision,m.recorded_at,m.search_text FROM sessions s JOIN messages m ON m.team_id=s.team_id AND m.session_id=s.id AND m.revision=s.revision WHERE s.team_id=? AND s.deleted_at IS NULL',params:[auth.team_id]});
+    if(cursorKey)statements.push({kind:'query',sql:`SELECT m.id,m.session_id,m.revision,m.recorded_at,m.search_text FROM ${cursorVersions} JOIN messages m ON m.team_id=? AND m.session_id=json_extract(j.value,'$[0]') AND m.revision=json_extract(j.value,'$[1]') JOIN sessions s ON s.team_id=m.team_id AND s.id=m.session_id WHERE s.deleted_at IS NULL AND m.revision<>s.revision`,params:[...cursorKey,auth.team_id]});
+  }
+  const values=await api.store.snapshot(statements),offset=cursorKey?1:0,cursor=cursorKey?values[0]:null,team=values[offset],credential=values[offset+1],membership=values[offset+2],currentRows=values[offset+3],allGrants=values[offset+4];
+  let at=offset+5;const olderRows=cursorKey?values[at++]:[],allMessages=search?[...values[at++],...(cursorKey?values[at++]:[])]:[];
+  const rows=[...currentRows,...olderRows],currentById=new Map(currentRows.map(row=>[row.id,row]));
   const boundaryNow=api.clock.nowMs();
   if(!membership?.active||credential?.revoked_at!=null||(credential?.expires_at!=null&&credential.expires_at<=boundaryNow))fail(401,'authentication_required','authentication required');
   let tuples;
@@ -140,7 +151,7 @@ async function listSessions(api,res,auth,url,requestId,search){
   for(const message of allMessages){const key=`${message.session_id}:${message.revision}`,list=messagesByVersion.get(key)??[];list.push(message);messagesByVersion.set(key,list);}
   const hits=[],hitTuples=[];
   for(const [id,revision]of tuples){
-    const row=rowByVersion.get(`${id}:${revision}`),current=rows.find(candidate=>candidate.id===id&&candidate.revision===candidate.version_revision);
+    const row=rowByVersion.get(`${id}:${revision}`),current=currentById.get(id);
     if(!row||!current||current.canonical_id||!await canReadMerged(api,{...auth,now:boundaryNow},current))continue;
     const view=await readerProjection(api,auth,row);
     if(query.user&&(query.user==='me'?auth.principal_id:query.user)!==view.user?.principal_id)continue;

package/server/store-core.mjs

@@ -84,7 +84,9 @@ export function createStoreHandlers({ all, get, run, tx }) {
       ordinals=all('SELECT ordinal FROM messages WHERE team_id=? AND session_id=? AND revision=? ORDER BY ordinal',[teamId,session.id,revision]).map(row=>row.ordinal);
     }
     const pageOrdinals=ordinals.slice(-tail),remaining=ordinals.slice(0,-tail);
-    const rows=pageOrdinals.length?all(`SELECT * FROM messages WHERE team_id=? AND session_id=? AND revision=? AND ordinal IN (${pageOrdinals.map(()=>'?').join(',')}) ORDER BY ordinal`,[teamId,session.id,revision,...pageOrdinals]):[];
+    // A page is a run of one revision's ordinals, read as a range: a hosted SQLite binds at most 100 variables, and a
+    // page of more messages than that, as an IN list, failed ("too many SQL variables").
+    const rows=pageOrdinals.length?all('SELECT * FROM messages WHERE team_id=? AND session_id=? AND revision=? AND ordinal>=? AND ordinal<=? ORDER BY ordinal',[teamId,session.id,revision,pageOrdinals[0],pageOrdinals[pageOrdinals.length-1]]).filter(row=>pageOrdinals.includes(row.ordinal)):[];
     const version=get('SELECT descriptor_json FROM session_versions WHERE team_id=? AND session_id=? AND revision=?',[teamId,session.id,revision]);
     if(!version)domainError(404,'not_found','session revision not found');
     let descriptorJson=version.descriptor_json;