@goodandready/dsh-cron 0.3.24 → 0.3.25

package/lib/api-item.js

@@ -21,7 +21,8 @@ export async function handleTaskItem({ store, scheduler, req, res, url, id, acti
   }
 
   if (req.method === 'GET') {
-    if (action === 'stream') {
+    // Both /dsh-cron/tasks/:id/stream and /dsh-cron/tasks/:id/logs/stream (#392)
+    if (action === 'stream' || (action === 'logs' && subAction === 'stream')) {
       logStreamer.handleSseRequest(id, req, res);
       return;
     }

package/lib/client.js

@@ -2736,14 +2736,46 @@ if (window.__dshLiveLogsEvtSource) {
 try { window.__dshLiveLogsEvtSource.close(); } catch (e) { void e; }
 window.__dshLiveLogsEvtSource = null;
 }
+if (window.__dshLiveLogsPollTimer) {
+clearInterval(window.__dshLiveLogsPollTimer);
+window.__dshLiveLogsPollTimer = null;
+}
 setLiveLogsTaskId(task.id);
 setLiveLogsTaskTitle(task.title || task.id);
 setLiveLogsLines([]);
 setLiveLogsStatus(task.running ? 'connecting' : 'idle');
 setLiveLogsCompleted(false);
 setLiveLogsModalOpen(true);
+const startPollingFallback = () => {
+if (window.__dshLiveLogsPollTimer) return;
+const pollFn = () => {
+fetchJsonWithTimeout('/dsh-cron/tasks/' + encodeURIComponent(task.id) + '/history?limit=1')
+.then((data) => {
+if (data && data.history && data.history.length > 0) {
+const lastRun = data.history[0];
+if (lastRun.output || lastRun.error) {
+const text = lastRun.output || lastRun.error;
+setLiveLogsLines([{ chunk: text, stream: lastRun.error ? 'stderr' : 'stdout', ts: lastRun.at }]);
+}
+if (lastRun.status) {
+setLiveLogsStatus(lastRun.status);
+setLiveLogsCompleted(true);
+if (window.__dshLiveLogsPollTimer) {
+clearInterval(window.__dshLiveLogsPollTimer);
+window.__dshLiveLogsPollTimer = null;
+}
+}
+}
+})
+.catch(() => {});
+};
+pollFn();
+window.__dshLiveLogsPollTimer = setInterval(pollFn, 2000);
+};
+if (typeof EventSource !== 'undefined') {
 try {
-const es = new EventSource('/dsh-cron/tasks/' + encodeURIComponent(task.id) + '/stream');
+const streamUrl = '/dsh-cron/tasks/' + encodeURIComponent(task.id) + '/logs/stream';
+const es = new EventSource(streamUrl);
 window.__dshLiveLogsEvtSource = es;
 es.addEventListener('init', (e) => {
 try {
@@ -2767,12 +2799,21 @@ try { es.close(); } catch (e) { void e; }
 window.__dshLiveLogsEvtSource = null;
 });
 es.onerror = () => {
-setLiveLogsStatus((curr) => curr === 'running' ? 'completed' : 'closed');
 try { es.close(); } catch (e) { void e; }
 window.__dshLiveLogsEvtSource = null;
+setLiveLogsStatus((curr) => {
+if (curr === 'running' || curr === 'connecting') {
+startPollingFallback();
+return curr;
+}
+return 'completed';
+});
 };
 } catch (err) {
-setLiveLogsStatus('error');
+startPollingFallback();
+}
+} else {
+startPollingFallback();
 }
 }
 function handleCloseLiveLogs() {
@@ -2780,6 +2821,10 @@ if (window.__dshLiveLogsEvtSource) {
 try { window.__dshLiveLogsEvtSource.close(); } catch (e) { void e; }
 window.__dshLiveLogsEvtSource = null;
 }
+if (window.__dshLiveLogsPollTimer) {
+clearInterval(window.__dshLiveLogsPollTimer);
+window.__dshLiveLogsPollTimer = null;
+}
 setLiveLogsModalOpen(false);
 }
 const openAnalyticsDigest = async (days = 7) => {

package/lib/log-streamer.js

@@ -50,12 +50,15 @@ export class LogStreamer extends EventEmitter {
       ts: Date.now(),
     };
 
+    entry.eventSeq = (entry.eventSeq || 0) + 1;
+    item.id = entry.eventSeq;
+
     entry.buffer.push(item);
     if (entry.buffer.length > MAX_BUFFER_LINES) {
       entry.buffer.shift();
     }
 
-    const ssePayload = `event: log\ndata: ${JSON.stringify(item)}\n\n`;
+    const ssePayload = `id: ${item.id}\nevent: log\ndata: ${JSON.stringify(item)}\n\n`;
     for (const res of entry.subscribers) {
       try {
         res.write(ssePayload);
@@ -111,12 +114,17 @@ export class LogStreamer extends EventEmitter {
 
     const entry = this.streams.get(taskId);
 
+    // Support W3C Last-Event-ID for reconnection (#392)
+    const lastEventIdStr = req?.headers ? req.headers['last-event-id'] : undefined;
+    const lastEventId = lastEventIdStr ? parseInt(lastEventIdStr, 10) : 0;
+    const effectiveLogs = (entry?.buffer || []).filter((item) => !lastEventId || (item.id && item.id > lastEventId));
+
     // Initial event with current state and buffered logs
     const initData = {
       taskId,
       runId: entry?.runId || null,
       status: entry ? (entry.completed ? 'completed' : 'running') : 'idle',
-      bufferedLogs: entry?.buffer || [],
+      bufferedLogs: effectiveLogs,
     };
     res.write(`event: init\ndata: ${JSON.stringify(initData)}\n\n`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goodandready/dsh-cron",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Background automation runner for DSH: isolated agent runs, script/HTTP/SSH/Docker runtimes, cost guard, notifications, heartbeats.",
   "type": "module",
   "main": "lib/index.js",
@@ -23,7 +23,8 @@
     "build:client": "node scripts/build-client.mjs",
     "pretest": "node scripts/build-client.mjs",
     "preflight": "node scripts/ci-preflight.mjs",
-    "test:engine": "node scripts/test-engines.mjs"
+    "test:engine": "node scripts/test-engines.mjs",
+    "build:client:check": "node scripts/build-client.mjs --check"
   },
   "keywords": [
     "dsh",
@@ -108,6 +109,7 @@
     "@deepseek-ai/dsh-session": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
     "@deepseek-ai/dsh-settings": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
     "@deepseek-ai/dsh-tools": ">=0.1.0-rc.6 <0.1.1 || >=0.1.1-rc.1 <0.1.2 || >=0.1.2-alpha.1 <1.0.0",
-    "@deepseek-ai/schemastery": "^3.18.1"
+    "@deepseek-ai/schemastery": "^3.18.1",
+    "esbuild": "^0.28.2"
   }
 }