owlservable 0.2.9 → 0.2.11

package/auto.cjs

@@ -1 +1 @@
-require('./index.cjs').init()
+require('./index.cjs').init({ save: true })

package/auto.js

@@ -1,2 +1,2 @@
 import { init } from './index.js'
-init()
+init({ save: true })

package/dashboard.html

@@ -227,20 +227,21 @@ function detailHtml(r){
 }
 
 function addRow(r,prepend){
-  total++;if(!r.status||r.error)errs++;sumMs+=r.latency||0;
+  if(!r.pending){total++;if(!r.status||r.error)errs++;sumMs+=r.latency||0;}
   if(r.tokens)totalTok+=r.tokens.total||0;
   storeSize=Math.min(storeSize+1,500);
   nReq.textContent=total;nErr.textContent=errs;
-  nLat.textContent=fms(Math.round(sumMs/total));
+  nLat.textContent=total?fms(Math.round(sumMs/total)):'—';
   nTok.textContent=fn(totalTok);nStore.textContent=storeSize+'/500';
   var method=r.method||'GET',parts=splitUrl(r.url||'');
-  var sTxt=r.status||(r.error?'ERR':'—');
+  var statusHtml=r.pending?'<span class="pending" title="in-flight"></span>':'<span class="badge '+sc(r.status)+'">'+esc(r.status||(r.error?'ERR':'—'))+'</span>';
+  var latHtml=r.pending?'<span class="muted">…</span>':fms(r.latency||0);
   var tr=document.createElement('tr');tr.className='req new';tr.dataset.id=r.id;
   tr.innerHTML=
     '<td class="c-time muted">'+ftime(r.timestamp)+'</td>'+
     '<td class="c-method"><span class="'+esc(method)+'">'+esc(method)+'</span></td>'+
-    '<td class="c-status"><span class="badge '+sc(r.status)+'">'+esc(sTxt)+'</span></td>'+
-    '<td class="c-lat muted">'+fms(r.latency||0)+'</td>'+
+    '<td class="c-status">'+statusHtml+'</td>'+
+    '<td class="c-lat muted">'+latHtml+'</td>'+
     '<td class="c-tok">'+tokHtml(r)+'</td>'+
     '<td class="c-url" title="'+esc(r.url||'')+'"><span class="muted">'+esc(parts.host)+'</span>'+esc(parts.path)+'</td>';
   var dtd=document.createElement('td');dtd.colSpan=6;dtd.innerHTML=detailHtml(r);
@@ -257,9 +258,18 @@ 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;
+  var wasPending=e.data.pending;
   Object.assign(e.data,patch);
+  if(wasPending&&!e.data.pending){
+    total++;if(!e.data.status||e.data.error)errs++;sumMs+=e.data.latency||0;
+    nReq.textContent=total;nErr.textContent=errs;
+    nLat.textContent=total?fms(Math.round(sumMs/total)):'—';
+    e.tr.querySelector('.c-status').innerHTML='<span class="badge '+sc(e.data.status)+'">'+esc(e.data.status||(e.data.error?'ERR':'—'))+'</span>';
+    e.tr.querySelector('.c-lat').innerHTML=fms(e.data.latency||0);
+  }
   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 +317,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'){
@@ -352,6 +362,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{var e=byId[r.id];if((e.data.pending&&!r.pending)||(e.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() })
@@ -163,18 +165,19 @@ function patchFetch() {
       reqBody = bodyFromInit(init?.body ?? null)
     } catch (_) {}
 
+    const r = addRequest({ url, method, status: null, latency: null, reqBody, metaPending: false, pending: true })
     const start = Date.now()
     try {
       const res    = await orig.call(this, input, init)
       const ct     = res.headers.get('content-type') || ''
       const isJson = ct.includes('application/json')
       const isSse  = ct.includes('text/event-stream')
-      const r      = addRequest({ url, method, status: res.status, latency: Date.now() - start, reqBody, metaPending: isJson || isSse })
+      updateRequest(r.id, { status: res.status, latency: Date.now() - start, pending: false, metaPending: isJson || isSse })
       if (r && isJson) handleJsonResponse(r, () => res.clone().text())
       if (r && isSse)  handleSseResponse(r,  () => res.clone().text())
       return res
     } catch (err) {
-      try { addRequest({ url, method, status: 0, latency: Date.now() - start, reqBody, error: err.message }) } catch (_) {}
+      try { updateRequest(r.id, { status: 0, latency: Date.now() - start, pending: false, error: err.message }) } catch (_) {}
       throw err
     }
   }
@@ -196,6 +199,7 @@ function patchHttpModule(mod, protocol) {
     } catch (_) {}
 
     const req = orig.apply(mod, args)
+    const r = addRequest({ url, method: method.toUpperCase(), status: null, latency: null, reqBody: null, metaPending: false, pending: true })
     const reqChunks = []; let reqSize = 0
     const origWrite = req.write
     req.write = function(chunk, encoding, cb) {
@@ -213,8 +217,7 @@ function patchHttpModule(mod, protocol) {
         const reqBody = reqSize > 0 ? reqChunks.join('').slice(0, MAX_REQ_BODY) : null
         const ct      = res.headers['content-type'] || ''
         const isJson  = ct.includes('application/json')
-        const isSse   = ct.includes('text/event-stream')
-        const r       = addRequest({ url, method: method.toUpperCase(), status: res.statusCode, latency: Date.now() - start, reqBody, metaPending: isJson })
+        updateRequest(r.id, { status: res.statusCode, latency: Date.now() - start, reqBody, pending: false, metaPending: isJson })
         if (r && isJson) {
           try {
             const chunks = []; let size = 0
@@ -225,12 +228,11 @@ function patchHttpModule(mod, protocol) {
               res.once('error', reject)
             })
             if (isJson) handleJsonResponse(r, getText)
-            if (isSse)  handleSseResponse(r,  getText)
           } catch (_) { updateRequest(r.id, { metaPending: false }) }
         }
       })
       req.once('error', err => {
-        try { addRequest({ url, method: method.toUpperCase(), status: 0, latency: Date.now() - start, error: err.message }) } catch (_) {}
+        try { updateRequest(r.id, { status: 0, latency: Date.now() - start, pending: false, error: err.message }) } catch (_) {}
       })
     } catch (_) {}
 
@@ -383,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() })
@@ -163,18 +165,19 @@ function patchFetch() {
       reqBody = bodyFromInit(init?.body ?? null)
     } catch (_) {}
 
+    const r = addRequest({ url, method, status: null, latency: null, reqBody, metaPending: false, pending: true })
     const start = Date.now()
     try {
       const res    = await orig.call(this, input, init)
       const ct     = res.headers.get('content-type') || ''
       const isJson = ct.includes('application/json')
       const isSse  = ct.includes('text/event-stream')
-      const r      = addRequest({ url, method, status: res.status, latency: Date.now() - start, reqBody, metaPending: isJson || isSse })
+      updateRequest(r.id, { status: res.status, latency: Date.now() - start, pending: false, metaPending: isJson || isSse })
       if (r && isJson) handleJsonResponse(r, () => res.clone().text())
       if (r && isSse)  handleSseResponse(r,  () => res.clone().text())
       return res
     } catch (err) {
-      try { addRequest({ url, method, status: 0, latency: Date.now() - start, reqBody, error: err.message }) } catch (_) {}
+      try { updateRequest(r.id, { status: 0, latency: Date.now() - start, pending: false, error: err.message }) } catch (_) {}
       throw err
     }
   }
@@ -196,6 +199,7 @@ function patchHttpModule(mod, protocol) {
     } catch (_) {}
 
     const req = orig.apply(mod, args)
+    const r = addRequest({ url, method: method.toUpperCase(), status: null, latency: null, reqBody: null, metaPending: false, pending: true })
     const reqChunks = []; let reqSize = 0
     const origWrite = req.write
     req.write = function(chunk, encoding, cb) {
@@ -213,8 +217,7 @@ function patchHttpModule(mod, protocol) {
         const reqBody = reqSize > 0 ? reqChunks.join('').slice(0, MAX_REQ_BODY) : null
         const ct      = res.headers['content-type'] || ''
         const isJson  = ct.includes('application/json')
-        const isSse   = ct.includes('text/event-stream')
-        const r       = addRequest({ url, method: method.toUpperCase(), status: res.statusCode, latency: Date.now() - start, reqBody, metaPending: isJson })
+        updateRequest(r.id, { status: res.statusCode, latency: Date.now() - start, reqBody, pending: false, metaPending: isJson })
         if (r && isJson) {
           try {
             const chunks = []; let size = 0
@@ -225,12 +228,11 @@ function patchHttpModule(mod, protocol) {
               res.once('error', reject)
             })
             if (isJson) handleJsonResponse(r, getText)
-            if (isSse)  handleSseResponse(r,  getText)
           } catch (_) { updateRequest(r.id, { metaPending: false }) }
         }
       })
       req.once('error', err => {
-        try { addRequest({ url, method: method.toUpperCase(), status: 0, latency: Date.now() - start, error: err.message }) } catch (_) {}
+        try { updateRequest(r.id, { status: 0, latency: Date.now() - start, pending: false, error: err.message }) } catch (_) {}
       })
     } catch (_) {}
 
@@ -383,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.9",
+  "version": "0.2.11",
   "description": "Minimalist Observability Platform. Zero config, zero dependencies.",
   "type": "module",
   "main": "index.js",