@volter/teams 0.1.34 → 0.1.36

package/viewer/viewer.mjs

@@ -5,6 +5,7 @@
 // showing where it is.
 import { attachBrowserPane, openBrowserMachine, openBrowserSession, sendBrowserTurn } from './channel.mjs';
 import { StreamRpc } from './stream-rpc.mjs';
+import { followTeamSession } from './session-follow.mjs';
 
 const $ = (id) => document.getElementById(id);
 const decoder = new TextDecoder();
@@ -155,7 +156,6 @@ async function showSession(session, control) {
       } catch (error) { status(`Not delivered: ${error.message}`); return false; } finally { view.update({ sending: false }); }
     },
   });
-  const headers = async () => ({ Authorization: `Bearer ${await freshToken()}` });
   applyLabels = () => view.update({ ...labels });
   applyLabels();
   const HARNESSES = { 'claude-code': 'Claude Code', codex: 'Codex', gemini: 'Gemini CLI', goose: 'Goose', opencode: 'OpenCode', pi: 'Pi', grok: 'Grok' };
@@ -170,56 +170,18 @@ async function showSession(session, control) {
       scope: control ? 'control' : 'view', working: body.working ?? null,
     } }, '*');
   };
-  let reading = null;
-  const read = () => (reading ??= (async () => {
-    try {
-      const response = await fetch(`${base}/messages?tail=300`, { headers: await headers() });
-      if (!response.ok) throw Object.assign(new Error(`reading the session failed (${response.status})`), { stage: 'read', status: response.status });
-      const body = await response.json();
-      apply(body);
-      return body;
-    } finally { reading = null; }
-  })());
-  // The snapshot is read whole (a busy session's is over the follow stream's 1 MB buffer, which ended the stream
-  // before it was sent); the follow stream then carries only the events after that snapshot's cursor, and each one
-  // means "read again". It ends when the token does or the connection drops, and is reopened from where it left off.
-  let cursor = null;
-  for (;;) {
-    try {
-      if (!cursor) cursor = String((await read()).event_cursor ?? '') || null;
-      const response = await fetch(`${base}/events?${cursor ? `after=${encodeURIComponent(cursor)}` : 'tail=1'}`, { headers: await headers() });
-      if (!response.ok) throw Object.assign(new Error(`following the session failed (${response.status})`), { stage: 'follow', status: response.status });
-      view.update({ live: true });
-      status('');
-      const reader = response.body.getReader();
-      let buffer = '';
-      for (;;) {
-        const { value, done } = await reader.read();
-        if (done) break;
-        buffer += decoder.decode(value, { stream: true });
-        let end;
-        while ((end = buffer.indexOf('\n\n')) >= 0) {
-          const block = buffer.slice(0, end);
-          buffer = buffer.slice(end + 2);
-          const data = block.split('\n').filter((line) => line.startsWith('data:')).map((line) => line.slice(5).trimStart()).join('\n');
-          if (!data) continue;
-          const event = JSON.parse(data);
-          if (event.cursor) cursor = event.cursor;
-          // The server ends a stream it can no longer resume (a slow reader, a retired cursor): start from a snapshot.
-          if (event.terminal && event.type === 'resync_required') cursor = null;
-          if (event.type === 'snapshot') apply(event.data);
-          else if (event.type === 'session_changed') read().catch((error) => failed('read', error, error.status ?? null));
-          else if (event.type === 'session_deleted') { view.update({ live: false, status: 'error', error: 'This session was deleted.' }); return; }
-        }
-      }
-    } catch (error) {
-      failed(error.stage ?? 'follow', error, error.status ?? null);
+  // The session, live: its snapshot, then its follow stream (session-follow.mjs, as a workplace drawing it itself uses).
+  followTeamSession({
+    origin: location.origin, teamId: session.team, sessionId: session.id, token: freshToken,
+    onSnapshot: apply,
+    onLive: (live) => { view.update({ live }); if (live) status(''); },
+    onError: ({ stage, status: code, message, snapshot }) => {
+      failed(stage, message, code);
       // Nothing drawn yet: the transcript says why instead of loading forever.
-      if (!cursor) view.update({ status: 'error', error: error.message });
-    }
-    view.update({ live: false });
-    await new Promise((resolve) => setTimeout(resolve, 2000));
-  }
+      if (!snapshot) view.update({ status: 'error', error: message });
+    },
+    onDeleted: () => view.update({ live: false, status: 'error', error: 'This session was deleted.' }),
+  });
 }
 
 async function showPane(connect, key, control) {