owlservable 0.2.8 → 0.2.10

package/dashboard.html

@@ -257,9 +257,10 @@ function addRow(r,prepend){
 
 function applyUpdate(id,patch){
   var e=byId[id];if(!e)return;
+  var prevTok=(e.data.tokens&&e.data.tokens.total)||0;
   Object.assign(e.data,patch);
   if(patch.tokens){
-    totalTok+=patch.tokens.total||0;
+    totalTok+=(patch.tokens.total||0)-prevTok;
     nTok.textContent=fn(totalTok);
     e.tr.querySelector('.c-tok').innerHTML=tokHtml(e.data);
   }else if('metaPending' in patch&&!patch.metaPending){
@@ -307,7 +308,7 @@ function handleMsg(msg){
     msg.requests.slice().reverse().forEach(function(r){addRow(r,false);});
     renderSave(msg.save);
   }else if(msg.type==='request'){
-    addRow(msg.record,true);
+    if(!byId[msg.record.id])addRow(msg.record,true);
   }else if(msg.type==='update'){
     applyUpdate(msg.id,msg.patch);
   }else if(msg.type==='saveConfig'){
@@ -336,10 +337,14 @@ document.getElementById('btn-theme').addEventListener('click',function(){
 
 function connect(){
   var es=new EventSource('/events');
-  es.addEventListener('open',function(){dot.classList.remove('off');});
-  es.addEventListener('error',function(){dot.classList.add('off');es.close();setTimeout(connect,2000);});
+  var lastMsg=Date.now(),staleTimer=null;
+  staleTimer=setInterval(function(){if(Date.now()-lastMsg>35000){dot.classList.add('off');clearInterval(staleTimer);es.close();setTimeout(connect,1000);}},5000);
+  es.addEventListener('open',function(){dot.classList.remove('off');lastMsg=Date.now();});
+  es.addEventListener('error',function(){dot.classList.add('off');clearInterval(staleTimer);es.close();setTimeout(connect,2000);});
   es.addEventListener('message',function(e){
+    lastMsg=Date.now();
     var msg;try{msg=JSON.parse(e.data);}catch(_){return;}
+    if(msg.type==='ping')return;
     if(paused&&(msg.type==='request'||msg.type==='update')){
       pauseBuffer.push(msg);
       btnPause.title='Resume ('+pauseBuffer.length+' buffered)';
@@ -348,6 +353,23 @@ function connect(){
     try{handleMsg(msg);}catch(_){}
   });
 }
+var pollGen=1;
+function poll(){
+  fetch('/api/requests').then(function(r){return r.json();}).then(function(d){
+    var reqs=d.requests||[],gen=d.generation||1;
+    if(gen!==pollGen){
+      pollGen=gen;reset();
+      reqs.slice().reverse().forEach(function(r){addRow(r,false);});
+      renderSave(d.save);return;
+    }
+    reqs.forEach(function(r){
+      if(!byId[r.id]){addRow(r,true);}
+      else if(byId[r.id].data.metaPending&&!r.metaPending){applyUpdate(r.id,r);}
+    });
+  }).catch(function(){});
+}
+setInterval(poll,2000);
+setTimeout(poll,500);
 connect();
 })();
 </script>

package/index.cjs

@@ -17,6 +17,7 @@ emitter.setMaxListeners(100)
 
 const requests = []
 let nextId = 1
+let generation = 1
 
 function addRequest(entry) {
   try {
@@ -43,6 +44,7 @@ function updateRequest(id, patch) {
 function getRequests() { try { return requests.slice() } catch (_) { return [] } }
 
 function clearRequests() {
+  generation++
   requests.splice(0)
   if (saveState.enabled) try { fs.writeFileSync(saveState.filePath, '') } catch (_) {}
   emitter.emit('reload', { requests: [], save: getSaveInfo() })
@@ -352,12 +354,16 @@ function startDashboard(port) {
         emitter.on('update',     onUpdate)
         emitter.on('saveConfig', onSave)
         emitter.on('reload',     onReload)
-        req.on('close', () => {
+        let hb = null
+        const cleanup = () => {
+          if (hb) { clearInterval(hb); hb = null }
           emitter.off('request',    onReq)
           emitter.off('update',     onUpdate)
           emitter.off('saveConfig', onSave)
           emitter.off('reload',     onReload)
-        })
+        }
+        hb = setInterval(() => { try { res.write('data: {"type":"ping"}\n\n') } catch (_) { cleanup() } }, 15000)
+        req.on('close', cleanup)
         return
       }
 
@@ -379,6 +385,12 @@ function startDashboard(port) {
         return
       }
 
+      if (urlPath === '/api/requests' && req.method === 'GET') {
+        res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'no-cache' })
+        res.end(JSON.stringify({ requests: getRequests(), save: getSaveInfo(), generation }))
+        return
+      }
+
       if (urlPath === '/owl.png') {
         try {
           const data = fs.readFileSync(path.join(__dir, 'owl.png'))

package/index.js

@@ -17,6 +17,7 @@ emitter.setMaxListeners(100)
 
 const requests = []
 let nextId = 1
+let generation = 1
 
 function addRequest(entry) {
   try {
@@ -43,6 +44,7 @@ function updateRequest(id, patch) {
 function getRequests() { try { return requests.slice() } catch (_) { return [] } }
 
 function clearRequests() {
+  generation++
   requests.splice(0)
   if (saveState.enabled) try { fs.writeFileSync(saveState.filePath, '') } catch (_) {}
   emitter.emit('reload', { requests: [], save: getSaveInfo() })
@@ -352,12 +354,16 @@ function startDashboard(port) {
         emitter.on('update',     onUpdate)
         emitter.on('saveConfig', onSave)
         emitter.on('reload',     onReload)
-        req.on('close', () => {
+        let hb = null
+        const cleanup = () => {
+          if (hb) { clearInterval(hb); hb = null }
           emitter.off('request',    onReq)
           emitter.off('update',     onUpdate)
           emitter.off('saveConfig', onSave)
           emitter.off('reload',     onReload)
-        })
+        }
+        hb = setInterval(() => { try { res.write('data: {"type":"ping"}\n\n') } catch (_) { cleanup() } }, 15000)
+        req.on('close', cleanup)
         return
       }
 
@@ -379,6 +385,12 @@ function startDashboard(port) {
         return
       }
 
+      if (urlPath === '/api/requests' && req.method === 'GET') {
+        res.writeHead(200, { 'Content-Type': 'application/json', 'Cache-Control': 'no-cache' })
+        res.end(JSON.stringify({ requests: getRequests(), save: getSaveInfo(), generation }))
+        return
+      }
+
       if (urlPath === '/owl.png') {
         try {
           const data = fs.readFileSync(path.join(__dir, 'owl.png'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owlservable",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "Minimalist Observability Platform. Zero config, zero dependencies.",
   "type": "module",
   "main": "index.js",