Merge pull request #5484 from chromoxdor/filter-weblog

[LOG] Adding a filter for the weblog

Author: TD-er

src/src/Static/WebStaticData.h

@@ -341,12 +341,12 @@ static const char jsClipboardCopyPart2[] PROGMEM = {
   // "if(t==null){i= max_loop + 1;"
   "if(t==null){i=101;"
   "}else{"
-  "cb+=t.innerHTML.replace(/<[Bb][Rr]\\s*\\/?>/gim,'\\n')+'"
+  "const visibleLines=Array.from(t.children).filter((e=>null!==e.offsetParent)).map((e=>e.innerHTML));visibleLines.length>0&&(cb+=visibleLines.join('\\n').replace(/<[Bb][Rr]\\s*\\/?>/gim,'\\n')+'"
 };
 
 //Fix HTML
 static const char jsClipboardCopyPart3[] PROGMEM = {
-  "';}}"
+  "');}}"
   "cb=cb.replace(/<\\/[Dd][Ii][Vv]\\s*\\/?>/gim,'\\n');"
   "cb=cb.replace(/<[^>]*>/gim,'');"
   "var ti=document.createElement('textarea');"
@@ -381,38 +381,90 @@ static const char jsSplitMultipleFields[] PROGMEM = {
 #ifdef WEBSERVER_INCLUDE_JS
 static const char DATA_UPDATE_SENSOR_VALUES_DEVICE_PAGE_JS[] PROGMEM = {
   "function elId(e){return document.getElementById(e)}"
-  "function loopDeLoop(e,s){var o,a,n=0;isNaN(s)&&(s=1),null==e&&(e=1e3),"
-  "i=setInterval(function(){if(n>0){clearInterval(i);return}"
-  "++s>1||fetch('/json?view=sensorupdate').then(function(s){var n;if(200!==s.status){console.log('Looks like there was a problem. Status Code: '+s.status);return}"
-  "s.json().then(function(s){e=s.TTL;"
+  "loopDeLoop(1000);"
+  "const SENSOR_URL='/json?view=sensorupdate';"
+  "function loopDeLoop(e=1000){setTimeout(function(){fetch(SENSOR_URL)"
+  ".then(e=>{if(!e.ok)throw new Error(e.status);return e.json()})"
+  ".then(o=>{e=o.TTL||e;"
   #if (defined(FEATURE_TASKVALUE_UNIT_OF_MEASURE) && FEATURE_TASKVALUE_UNIT_OF_MEASURE) || (defined(FEATURE_STRING_VARIABLES) && FEATURE_STRING_VARIABLES)
-  "var r=void 0===s.ShowUoM||s.ShowUoM&&'false'!==s.ShowUoM;"
+  "const n=void 0===o.ShowUoM||o.ShowUoM&&'false'!==o.ShowUoM;"
   #endif // if (defined(FEATURE_TASKVALUE_UNIT_OF_MEASURE) && FEATURE_TASKVALUE_UNIT_OF_MEASURE) || (defined(FEATURE_STRING_VARIABLES) && FEATURE_STRING_VARIABLES)
-  "for(o=0;o<s.Sensors.length;o++)if(s.Sensors[o].hasOwnProperty('TaskValues'))"
-  "for(a=0;a<s.Sensors[o].TaskValues.length;a++)try{n=s.Sensors[o].TaskValues[a].Value}catch(l){n=l.name}"
-  "finally{if('TypeError'!==n){var u=s.Sensors[o].TaskValues[a].Value,t=s.Sensors[o].TaskValues[a].NrDecimals;t<255&&(u=parseFloat(u).toFixed(t));"
+  "for(let i=0;i<o.Sensors.length;i++){const t=o.Sensors[i];"
+  "if(t.TaskValues)for(let j=0;j<t.TaskValues.length;j++){const r=t.TaskValues[j];"
+  "if(!r||null==r.Value)continue;"
+  "let s=r.Value;const d=r.NrDecimals;"
+  "d<255&&(s=parseFloat(s).toFixed(d));"
   #if (defined(FEATURE_TASKVALUE_UNIT_OF_MEASURE) && FEATURE_TASKVALUE_UNIT_OF_MEASURE) || (defined(FEATURE_STRING_VARIABLES) && FEATURE_STRING_VARIABLES)
-  "var $=s.Sensors[o].TaskValues[a].UoM,T=s.Sensors[o].TaskValues[a].Presentation;T?u=T:$&&r&&(u+=' '+$);"
+  "r.Presentation?s=r.Presentation:"
+  "r.UoM&&n&&(s+=' '+r.UoM);"  
   #endif // if (defined(FEATURE_TASKVALUE_UNIT_OF_MEASURE) && FEATURE_TASKVALUE_UNIT_OF_MEASURE) || (defined(FEATURE_STRING_VARIABLES) && FEATURE_STRING_VARIABLES)
-  "var S='value_'+(s.Sensors[o].TaskNumber-1)+'_'+(s.Sensors[o].TaskValues[a].ValueNumber-1),"
-  "k='valuename_'+(s.Sensors[o].TaskNumber-1)+'_'+(s.Sensors[o].TaskValues[a].ValueNumber-1),"
-  "V=elId(S),f=elId(k);V&&(V.innerHTML=u),"
-  "f&&(f.innerHTML=s.Sensors[o].TaskValues[a].Name+':')}}"
-  "clearInterval(i),loopDeLoop(e,0)})}).catch(function(s){console.log(s.message),e=5e3,clearInterval(i),loopDeLoop(e,0)}),n=1},e)}"
-  "loopDeLoop(1e3,0);"
+  "const l=t.TaskNumber-1+'_'+(r.ValueNumber-1),"
+  "a=elId('value_'+l);"
+  "a&&(a.innerHTML=s);"
+  "const u=elId('valuename_'+l);"
+  "u&&(u.innerHTML=r.Name+':')"
+  "}}loopDeLoop(e)})"
+  ".catch(e=>{loopDeLoop(5000)})},e)}"
 };
 #endif // WEBSERVER_INCLUDE_JS
 
 #ifdef WEBSERVER_INCLUDE_JS
 static const char DATA_FETCH_AND_PARSE_LOG_JS[] PROGMEM = {
-  "function elId(e){return document.getElementById(e)}"
-  "function getBrowser(){var e,o=navigator.userAgent,r=o.match(/(opera|chrome|safari|firefox|msie|trident(?=\\/))\\/?\\s*(\\d+)/i)||[];return/trident/i.test(r[1])?{name:'IE',version:(e=/\brv[ :]+(\\d+)/g.exec(o)||[])[1]||''}:'Chrome'===r[1]&&null!=(e=o.match(/\bOPR|Edge\\/(\\d+)/))?{name:'Opera',version:e[1]}:(r=r[2]?[r[1],r[2]]:[navigator.appName,navigator.appVersion,'-?'],null!=(e=o.match(/version\\/(\\d+)/i))&&r.splice(1,1,e[1]),{name:r[0],version:r[1]})}"
-  "var browser=getBrowser(),currentBrowser=browser.name+browser.version;textToDisplay=(browser.name=browser.version<12)?'Error: '+currentBrowser+' is not supported! Please try a modern web browser.':'Fetching log entries...',elId('copyText_1').innerHTML=textToDisplay,loopDeLoop(1e3,0);var logLevel=['Unused','Error','Info','Debug','Debug More','Undefined','Undefined','Undefined','Undefined','Debug Dev'];"
-  "function loopDeLoop(e,o){let r='copyText_1';isNaN(o)&&(o=1),null==e&&(e=1e3),scrolling_type=e<=500?'auto':'smooth';var n,t,i='',l=0,"
-  "s=setInterval(function(){if(l>0){clearInterval(s);return}++o>1?l=1:fetch('/logjson').then(function(o){if(200!==o.status){console.log('Looks like there was a problem. Status Code: '+o.status);return}o.json()"
-  ".then(function(o){var l;for(null==t&&(t=''),n=0;n<o.Log.nrEntries;++n)try{l=o.Log.Entries[n].timestamp}catch(a){l=a.name}finally{'TypeError'!==l&&(i=o.Log.Entries[n].timestamp,t+='<div class=level_'+o.Log.Entries[n].level+' id='+i+'><font color=\"gray\">'+o.Log.Entries[n].timestamp+':</font> '+o.Log.Entries[n].text+'</div>')}e=o.Log.TTL,''!==t&&('Fetching log entries...'==elId(r).innerHTML&&(elId(r).innerHTML=''),elId(r).innerHTML+=t),t='',!0==(autoscroll_on=elId('autoscroll').checked)&&''!==i&&elId(i).scrollIntoView({behavior:scrolling_type}),elId('current_loglevel').innerHTML='Logging: '+logLevel[o.Log.SettingsWebLogLevel]+' ('+o.Log.SettingsWebLogLevel+')',clearInterval(s),"
-  "loopDeLoop(e,0)})}).catch(function(o){elId(r).innerHTML+='<div>>> '+o.message+' <<</div>',autoscroll_on=elId('autoscroll').checked,elId(r).scrollTop=elId(r).scrollHeight,e=5e3,clearInterval(s),"
-  "loopDeLoop(e,0)}),l=1},e)}"
+"function elId(e){return document.getElementById(e)}"
+"window.fetch?ct1.textContent='Fetching log entries...':"
+"ct1.textContent='Error: This browser is not supported. Please use a modern browser.';"
+"const logLevel={0:'Unused',1:'Error',2:'Info',3:'Debug',4:'Debug More',9:'Debug Dev'};"
+"function loopDeLoop(e=1000){setTimeout(function(){fetch('/logjson')"
+".then(e=>{if(!e.ok)throw Error(e.status);return e.json()})"
+".then(t=>{let o='';"
+"for(let l=0;l<t.Log.nrEntries;l++){let i=t.Log.Entries[l];"
+"i&&i.timestamp&&(o+=`<div class=level_${i.level}>"
+"<font color='gray'>${i.timestamp}:</font> ${i.text}</div>`)}"
+"e=t.Log.TTL||e;"
+"o&&(ct1.textContent==='Fetching log entries...'&&(ct1.innerHTML=''),ct1.innerHTML+=o);"
+"applyLogFilter();"
+"elId('autoscroll')?.checked&&ct1.scrollTo({top:ct1.scrollHeight,behavior:e<=500?'auto':'smooth'});"
+"let n=t.Log.SettingsWebLogLevel,r=logLevel[n]??'Undefined';"
+"elId('current_loglevel').textContent=`Logging: ${r} (${n})`;"
+"loopDeLoop(e)})"
+".catch(e=>{ct1.innerHTML+=`<div>>> ${e.message} <<</div>`;"
+"ct1.scrollTop=ct1.scrollHeight;loopDeLoop(5000)})},e)}"
+"function applyLogFilter(){"
+"let e=elId('logfilter').value.split(';').map(e=>e.trim()).filter(Boolean),"
+"t=document.querySelectorAll('#copyText_1 > div'),"
+"o=e.some(e=>!e.startsWith('!'));"
+"for(let l of t){"
+"l.dataset.originalHtml||(l.dataset.originalHtml=l.innerHTML);"
+"let i=l.dataset.originalHtml,n=l.textContent.toLowerCase(),r=[],s=!1,a=!o;"
+"for(let c of e){"
+"if(c.startsWith('!')){let g=c.slice(1);"
+"if(!g.includes('&')||g.startsWith('&')||g.endsWith('&')){"
+"if(g&&n.includes(g.toLowerCase())){s=!0;break}}"
+"else{let f=g.split('&').map(e=>e.trim()).filter(Boolean),u=-1,d=!0;"
+"for(let p of f){let h=n.indexOf(p.toLowerCase(),u+1);if(h===-1){d=!1;break}u=h}"
+"if(d){s=!0;break}}continue}"
+"if(c.includes('&')&&!c.startsWith('&')&&!c.endsWith('&')){"
+"let L=c.split('&').map(e=>e.trim()).filter(Boolean);"
+"if(L.length>=2){let _=-1,$=!0;"
+"for(let b of L){let m=n.indexOf(b.toLowerCase(),_+1);if(m===-1){$=!1;break}_=m}"
+"if($){r.push(...L),a=!0;break}}continue}"
+"if(n.includes(c.toLowerCase())){r.push(c),a=!0;break}}"
+"if(s||!a){l.style.display='none';continue}"
+"l.style.display='';l.innerHTML=highlightOutsideTags(i,r)}}"
+"function highlightOutsideTags(e,t){if(!t.length)return e;"
+"let o='',l=!1,i=0;"
+"for(;i<e.length;){let n=e[i];"
+"if('<'===n&&(l=!0),'>'===n){l=!1;o+=n;i++;continue}"
+"if(!l){let r=!1;"
+"for(let s of t){let a=e.slice(i,i+s.length);"
+"if(a.toLowerCase()===s.toLowerCase()){"
+"o+=`<span style='background-color: #bb9300;color: black;'>${a}</span>`;"
+"i+=s.length;r=!0;break}}"
+"if(r)continue}"
+"o+=n;i++}return o}"
+"loopDeLoop(1000);"
+"const input=document.getElementById('logfilter');"
+"input&&(input.placeholder='\"!\"=exclude \";\"=or \"&\"=and (e.g. !act)');"
 };
 #endif // WEBSERVER_INCLUDE_JS
 

src/src/WebServer/Log.cpp

@@ -6,6 +6,7 @@
 #include "../WebServer/JSON.h"
 #include "../WebServer/Markup.h"
 #include "../WebServer/Markup_Buttons.h"
+#include "../WebServer/Markup_Forms.h"
 
 #include "../DataStructs/LogBuffer.h"
 #include "../DataStructs/TimingStats.h"
@@ -35,6 +36,7 @@ void handle_log() {
             "</TR></table><div  id='current_loglevel' style='font-weight: bold;'>Logging: </div><div class='logviewer' id='copyText_1'></div>"));
   addHtml(F("Autoscroll: "));
   addCheckBox(F("autoscroll"), true);
+  addFormTextBox(F("Filter"), F("logfilter"), "", 30);
   addHtml(F("<BR></body>"));
 
   serve_JS(JSfiles_e::FetchAndParseLog);