pinokiod 2.15.7 → 2.15.8

package/kernel/api/index.js

@@ -104,8 +104,6 @@ class Api {
     // 1. set the "stop" flag for the uri, so the next execution in the queue for the uri will NOT queue another task
     // 2. stream a message closing the socket
 
-
-
     let requestPath = this.filePath(req.params.uri)
 
 
@@ -715,6 +713,19 @@ class Api {
           }
 
 
+          if (result && result.error) {
+            this.ondata({
+              id: request.path,
+              type: "error",
+              data: result.response,
+              event: result.error,
+              rpc,
+              rawrpc
+            })
+            return
+          }
+
+
 
           if (result && rpc.returns) {
             // set the scope variable from the return value
@@ -879,13 +890,13 @@ class Api {
     for(let name in this.listeners) {
       this.listeners[name](packet)
     }
-    if (packet.type === 'error') {
-      this.stop({
-        params: {
-          uri: packet.id
-        }
-      })
-    }
+//    if (packet.type === 'error') {
+//      this.stop({
+//        params: {
+//          uri: packet.id
+//        }
+//      })
+//    }
   }
   listen(name, ondata) {
     this.listeners[name] = ondata

package/kernel/bin/index.js

@@ -149,9 +149,6 @@ class Bin {
       }
     }).filter(x => x)
 
-
-    console.log("****** envs", JSON.stringify(envs, null, 2))
-
     // 2. Merge module envs
     let e = {}
     for(let env of envs) {
@@ -175,8 +172,6 @@ class Bin {
       return file.endsWith(".js") && file !== "index.js" && file !== "cmake.js"
     })
 
-    console.log({ modfiles })
-
 
     this.mods = []
     for(let filename of modfiles) {
@@ -188,7 +183,6 @@ class Bin {
       let name = path.basename(filename, ".js")
       this.mods.push({ name, mod })
     }
-    console.log(">> this.mods = ", this.mods)
     // inject kernel
     for(let i=0; i<this.mods.length; i++) {
       this.mods[i].mod.kernel = this.kernel 
@@ -203,7 +197,6 @@ class Bin {
       }
       this.mod[mod.name] = mod.mod
     }
-    console.log(">> this.mod", this.mod)
 
 
 

package/kernel/shell.js

@@ -89,8 +89,6 @@ class Shell {
     // 2. env
     // default env
 
-    console.log(">>>>> process.env=", JSON.stringify(process.env, null, 2))
-
     this.env = Object.assign({}, process.env)
     // If the user has set PYTHONPATH, unset it.
     if (this.env.PYTHONPATH) {
@@ -113,6 +111,7 @@ class Shell {
     }
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
+    this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
 
     // First override this.env with system env
     let system_env = await Environment.get(this.kernel.homedir)
@@ -656,8 +655,6 @@ class Shell {
 
         config.env = this.env
 
-        console.log("CONFIG.ENV", JSON.stringify(config.env, null, 2))
-
         if (!this.ptyProcess) {
           // ptyProcess doesn't exist => create
           this.done = false

package/kernel/shells.js

@@ -28,9 +28,7 @@ class Shells {
 */
   async launch(params, options, ondata) {
     // iterate through all the envs
-    console.log("------- params.env before", JSON.stringify(params.env, null, 2))
     params.env = this.kernel.bin.envs(params.env)
-    console.log("------- params.env after", JSON.stringify(params.env, null, 2))
 
     let exec_path = (params.path ? params.path : ".")                         // use the current path if not specified
     let cwd = (options && options.cwd ? options.cwd : this.kernel.homedir)   // if cwd exists, use it. Otherwise the cwd is pinokio home folder (~/pinokio)              
@@ -39,7 +37,56 @@ class Shells {
     if (options) params.group = options.group  // set group
 
     let m
+
+    // if error doesn't exist, add default "error:" event
+    if (!params.on) {
+      params.on = []
+    }
+    // default error
+    params.on.push({
+      event: "/error:/i",
+      debug: true
+    })
+    let errors = new Set()
     let response = await sh.start(params, async (stream) => {
+      /*
+        {
+          method: "shell.run",
+          params: {
+            message,
+            on: [{
+              event: <regex>,
+              <done|kill|debug>: true
+            }],
+          }
+        }
+      */
+//      if (params.error && Array.isArray(params.error)) {
+//        for(let handler of params.error) {
+//          if (handler.event) {
+//            let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
+//            if (!/g/.test(matches[2])) {
+//              matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
+//            }
+//            let re = new RegExp(matches[1], matches[2])
+//            let line = stream.cleaned.replaceAll(/[\r\n]/g, "")
+//            //let rendered_event = [...stream.cleaned.matchAll(re)]
+//
+//            let rendered_event = [...line.matchAll(re)]
+//            // 3. if the rendered expression is truthy, run the "run" script
+//            if (rendered_event.length > 0) {
+//
+//              // if error matched, shouldn't move forard
+////              error = rendered_event
+//                console.log({ rendered_event })
+//              for(let e of rendered_event) {
+//                errors.add(e[0])
+//              }
+//
+//            }
+//          }
+//        }
+//      }
       if (params.on && Array.isArray(params.on)) {
         for(let handler of params.on) {
           // regexify
@@ -66,6 +113,11 @@ class Shells {
                 m = rendered_event[0]
                 sh.continue()
               }
+              if (handler.debug) {
+                for(let e of rendered_event) {
+                  errors.add(e[0])
+                }
+              }
             }
 //          } else if (handler.pattern === "url") {
 //            let re = /https?:\/\/[a-zA-Z0-9.:]+/g
@@ -89,11 +141,16 @@ class Shells {
       }
       ondata(stream)
     })
-    console.log("shell ended", { id: sh.id, response, stdout: response, event: m })
 
+    if (errors.size > 0) {
+      // don't return if there's an error
+      console.log("errors", Array.from(errors))
+      return { id: sh.id, response, stdout: response, event: m, error: Array.from(errors) }
+    } else {
+      // need to make a request
+      return { id: sh.id, response, stdout: response, event: m }
+    }
 
-    // need to make a request
-    return { id: sh.id, response, stdout: response, event: m }
   }
   async start(params, options, ondata) {
     params.persistent = true
@@ -203,14 +260,13 @@ class Shells {
     let info = this.shells.map((s) => {
       return { id: s.id, group: s.group, cmd: s.cmd }
     })
-    console.log("reset", this.shells.length, JSON.stringify(info, null, 2))
     if (this.shells) {
       let shells = []
       for(let i=0; i<this.shells.length; i++) {
         shells.push(this.shells[i])
       }
       for(let shell of shells) {
-        console.log("[Kill]", { id: shell.id, group: shell.group, cmd: shell.cmd })
+        console.log("[Kill Shell]", { id: shell.id, group: shell.group, cmd: shell.cmd })
         shell.kill("", true)
       }
     }

package/kernel/sysinfo.js

@@ -101,14 +101,11 @@ class Sysinfo {
       cmd = "env"
     }
 
-
-    console.log("############### DEBUGGING ENV")
-    let _res = await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
-    })
-    console.log(_res)
-    console.log("############### DEBUGGING ENV FINISH")
-
-
+//    console.log("############### DEBUGGING ENV")
+//    let _res = await this.kernel.bin.exec({ message: cmd, conda: { skip: true } }, (stream) => {
+//    })
+//    console.log(_res)
+//    console.log("############### DEBUGGING ENV FINISH")
 
     let res = await this.kernel.bin.exec({ message: cmd }, (stream) => {
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.7",
+  "version": "2.15.8",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,7 +40,7 @@
     "key-store": "^1.2.0",
     "kleur": "^4.1.5",
     "lodash": "^4.17.21",
-    "lproxy": "^0.0.12",
+    "lproxy": "^0.0.13",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",

package/server/public/mark.min.js

@@ -0,0 +1,7 @@
+/*!***************************************************
+ * mark.js v8.6.0
+ * https://github.com/julmot/mark.js
+ * Copyright (c) 2014–2017, Julian Motz
+ * Released under the MIT license https://git.io/vwTVl
+ *****************************************************/
+"use strict";function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var _extends=Object.assign||function(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)Object.prototype.hasOwnProperty.call(c,d)&&(a[d]=c[d])}return a},_createClass=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol&&a!==Symbol.prototype?"symbol":typeof a};!function(a,b,c){"function"==typeof define&&define.amd?define([],function(){return a(b,c)}):"object"===("undefined"==typeof module?"undefined":_typeof(module))&&module.exports?module.exports=a(b,c):a(b,c)}(function(a,b){var c=function(){function c(b){_classCallCheck(this,c),this.ctx=b,this.ie=!1;var d=a.navigator.userAgent;(d.indexOf("MSIE")>-1||d.indexOf("Trident")>-1)&&(this.ie=!0)}return _createClass(c,[{key:"log",value:function a(b){var c=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"debug",a=this.opt.log;this.opt.debug&&"object"===("undefined"==typeof a?"undefined":_typeof(a))&&"function"==typeof a[c]&&a[c]("mark.js: "+b)}},{key:"escapeStr",value:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")}},{key:"createRegExp",value:function(a){return a=this.escapeStr(a),Object.keys(this.opt.synonyms).length&&(a=this.createSynonymsRegExp(a)),this.opt.ignoreJoiners&&(a=this.setupIgnoreJoinersRegExp(a)),this.opt.diacritics&&(a=this.createDiacriticsRegExp(a)),a=this.createMergedBlanksRegExp(a),this.opt.ignoreJoiners&&(a=this.createIgnoreJoinersRegExp(a)),a=this.createAccuracyRegExp(a)}},{key:"createSynonymsRegExp",value:function(a){var b=this.opt.synonyms,c=this.opt.caseSensitive?"":"i";for(var d in b)if(b.hasOwnProperty(d)){var e=b[d],f=this.escapeStr(d),g=this.escapeStr(e);a=a.replace(new RegExp("("+f+"|"+g+")","gm"+c),"("+f+"|"+g+")")}return a}},{key:"setupIgnoreJoinersRegExp",value:function(a){return a.replace(/[^(|)\\]/g,function(a,b,c){var d=c.charAt(b+1);return/[(|)\\]/.test(d)||""===d?a:a+"\0"})}},{key:"createIgnoreJoinersRegExp",value:function(a){return a.split("\0").join("[\\u00ad|\\u200b|\\u200c|\\u200d]?")}},{key:"createDiacriticsRegExp",value:function(a){var b=this.opt.caseSensitive?"":"i",c=this.opt.caseSensitive?["aàáâãäåāąă","AÀÁÂÃÄÅĀĄĂ","cçćč","CÇĆČ","dđď","DĐĎ","eèéêëěēę","EÈÉÊËĚĒĘ","iìíîïī","IÌÍÎÏĪ","lł","LŁ","nñňń","NÑŇŃ","oòóôõöøō","OÒÓÔÕÖØŌ","rř","RŘ","sšśș","SŠŚȘ","tťț","TŤȚ","uùúûüůū","UÙÚÛÜŮŪ","yÿý","YŸÝ","zžżź","ZŽŻŹ"]:["aÀÁÂÃÄÅàáâãäåĀāąĄăĂ","cÇçćĆčČ","dđĐďĎ","eÈÉÊËèéêëěĚĒēęĘ","iÌÍÎÏìíîïĪī","lłŁ","nÑñňŇńŃ","oÒÓÔÕÖØòóôõöøŌō","rřŘ","sŠšśŚșȘ","tťŤțȚ","uÙÚÛÜùúûüůŮŪū","yŸÿýÝ","zŽžżŻźŹ"],d=[];return a.split("").forEach(function(e){c.every(function(c){if(c.indexOf(e)!==-1){if(d.indexOf(c)>-1)return!1;a=a.replace(new RegExp("["+c+"]","gm"+b),"["+c+"]"),d.push(c)}return!0})}),a}},{key:"createMergedBlanksRegExp",value:function(a){return a.replace(/[\s]+/gim,"[\\s]+")}},{key:"createAccuracyRegExp",value:function(a){var b=this,c=this.opt.accuracy,d="string"==typeof c?c:c.value,e="string"==typeof c?[]:c.limiters,f="";switch(e.forEach(function(a){f+="|"+b.escapeStr(a)}),d){case"partially":default:return"()("+a+")";case"complementary":return"()([^\\s"+f+"]*"+a+"[^\\s"+f+"]*)";case"exactly":return"(^|\\s"+f+")("+a+")(?=$|\\s"+f+")"}}},{key:"getSeparatedKeywords",value:function(a){var b=this,c=[];return a.forEach(function(a){b.opt.separateWordSearch?a.split(" ").forEach(function(a){a.trim()&&c.indexOf(a)===-1&&c.push(a)}):a.trim()&&c.indexOf(a)===-1&&c.push(a)}),{keywords:c.sort(function(a,b){return b.length-a.length}),length:c.length}}},{key:"getTextNodes",value:function(a){var b=this,c="",d=[];this.iterator.forEachNode(NodeFilter.SHOW_TEXT,function(a){d.push({start:c.length,end:(c+=a.textContent).length,node:a})},function(a){return b.matchesExclude(a.parentNode,!0)?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},function(){a({value:c,nodes:d})})}},{key:"matchesExclude",value:function(a,b){var c=this.opt.exclude.concat(["script","style","title","head","html"]);return b&&(c=c.concat(["*[data-markjs='true']"])),d.matches(a,c)}},{key:"wrapRangeInTextNode",value:function(a,c,d){var e=this.opt.element?this.opt.element:"mark",f=a.splitText(c),g=f.splitText(d-c),h=b.createElement(e);return h.setAttribute("data-markjs","true"),this.opt.className&&h.setAttribute("class",this.opt.className),h.textContent=f.textContent,f.parentNode.replaceChild(h,f),g}},{key:"wrapRangeInMappedTextNode",value:function(a,b,c,d,e){var f=this;a.nodes.every(function(g,h){var i=a.nodes[h+1];if("undefined"==typeof i||i.start>b){var j=function(){var i=b-g.start,j=(c>g.end?g.end:c)-g.start;if(d(g.node)){g.node=f.wrapRangeInTextNode(g.node,i,j);var k=a.value.substr(0,g.start),l=a.value.substr(j+g.start);if(a.value=k+l,a.nodes.forEach(function(b,c){c>=h&&(a.nodes[c].start>0&&c!==h&&(a.nodes[c].start-=j),a.nodes[c].end-=j)}),c-=j,e(g.node.previousSibling,g.start),!(c>g.end))return{v:!1};b=g.end}}();if("object"===("undefined"==typeof j?"undefined":_typeof(j)))return j.v}return!0})}},{key:"wrapMatches",value:function(a,b,c,d,e){var f=this,g=0===b?0:b+1;this.getTextNodes(function(b){b.nodes.forEach(function(b){b=b.node;for(var e=void 0;null!==(e=a.exec(b.textContent))&&""!==e[g];)if(c(e[g],b)){var h=e.index;if(0!==g)for(var i=1;i<g;i++)h+=e[i].length;b=f.wrapRangeInTextNode(b,h,h+e[g].length),d(b.previousSibling),a.lastIndex=0}}),e()})}},{key:"wrapMatchesAcrossElements",value:function(a,b,c,d,e){var f=this,g=0===b?0:b+1;this.getTextNodes(function(b){for(var h=void 0;null!==(h=a.exec(b.value))&&""!==h[g];){var i=h.index;if(0!==g)for(var j=1;j<g;j++)i+=h[j].length;var k=i+h[g].length;f.wrapRangeInMappedTextNode(b,i,k,function(a){return c(h[g],a)},function(b,c){a.lastIndex=c,d(b)})}e()})}},{key:"unwrapMatches",value:function(a){for(var c=a.parentNode,d=b.createDocumentFragment();a.firstChild;)d.appendChild(a.removeChild(a.firstChild));c.replaceChild(d,a),this.ie?this.normalizeTextNode(c):c.normalize()}},{key:"normalizeTextNode",value:function(a){if(a){if(3===a.nodeType)for(;a.nextSibling&&3===a.nextSibling.nodeType;)a.nodeValue+=a.nextSibling.nodeValue,a.parentNode.removeChild(a.nextSibling);else this.normalizeTextNode(a.firstChild);this.normalizeTextNode(a.nextSibling)}}},{key:"markRegExp",value:function(a,b){var c=this;this.opt=b,this.log('Searching with expression "'+a+'"');var d=0,e="wrapMatches",f=function(a){d++,c.opt.each(a)};this.opt.acrossElements&&(e="wrapMatchesAcrossElements"),this[e](a,this.opt.ignoreGroups,function(a,b){return c.opt.filter(b,a,d)},f,function(){0===d&&c.opt.noMatch(a),c.opt.done(d)})}},{key:"mark",value:function(a,b){var c=this;this.opt=b;var d=0,e="wrapMatches",f=this.getSeparatedKeywords("string"==typeof a?[a]:a),g=f.keywords,h=f.length,i=this.opt.caseSensitive?"":"i",j=function a(b){var f=new RegExp(c.createRegExp(b),"gm"+i),j=0;c.log('Searching with expression "'+f+'"'),c[e](f,1,function(a,e){return c.opt.filter(e,b,d,j)},function(a){j++,d++,c.opt.each(a)},function(){0===j&&c.opt.noMatch(b),g[h-1]===b?c.opt.done(d):a(g[g.indexOf(b)+1])})};this.opt.acrossElements&&(e="wrapMatchesAcrossElements"),0===h?this.opt.done(d):j(g[0])}},{key:"unmark",value:function(a){var b=this;this.opt=a;var c=this.opt.element?this.opt.element:"*";c+="[data-markjs]",this.opt.className&&(c+="."+this.opt.className),this.log('Removal selector "'+c+'"'),this.iterator.forEachNode(NodeFilter.SHOW_ELEMENT,function(a){b.unwrapMatches(a)},function(a){var e=d.matches(a,c),f=b.matchesExclude(a,!1);return!e||f?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},this.opt.done)}},{key:"opt",set:function(b){this._opt=_extends({},{element:"",className:"",exclude:[],iframes:!1,separateWordSearch:!0,diacritics:!0,synonyms:{},accuracy:"partially",acrossElements:!1,caseSensitive:!1,ignoreJoiners:!1,ignoreGroups:0,each:function(){},noMatch:function(){},filter:function(){return!0},done:function(){},debug:!1,log:a.console},b)},get:function(){return this._opt}},{key:"iterator",get:function(){return this._iterator||(this._iterator=new d(this.ctx,this.opt.iframes,this.opt.exclude)),this._iterator}}]),c}(),d=function(){function a(b){var c=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],d=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];_classCallCheck(this,a),this.ctx=b,this.iframes=c,this.exclude=d}return _createClass(a,[{key:"getContexts",value:function(){var a=void 0,c=[];return a="undefined"!=typeof this.ctx&&this.ctx?NodeList.prototype.isPrototypeOf(this.ctx)?Array.prototype.slice.call(this.ctx):Array.isArray(this.ctx)?this.ctx:"string"==typeof this.ctx?Array.prototype.slice.call(b.querySelectorAll(this.ctx)):[this.ctx]:[],a.forEach(function(a){var b=c.filter(function(b){return b.contains(a)}).length>0;c.indexOf(a)!==-1||b||c.push(a)}),c}},{key:"getIframeContents",value:function(a,b){var c=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){},d=void 0;try{var e=a.contentWindow;if(d=e.document,!e||!d)throw new Error("iframe inaccessible")}catch(a){c()}d&&b(d)}},{key:"onIframeReady",value:function(a,b,c){var d=this;try{!function(){var e=a.contentWindow,f="about:blank",g="complete",h=function(){var b=a.getAttribute("src").trim(),c=e.location.href;return c===f&&b!==f&&b},i=function(){var e=function e(){try{h()||(a.removeEventListener("load",e),d.getIframeContents(a,b,c))}catch(a){c()}};a.addEventListener("load",e)};e.document.readyState===g?h()?i():d.getIframeContents(a,b,c):i()}()}catch(a){c()}}},{key:"waitForIframes",value:function(a,b){var c=this,d=0;this.forEachIframe(a,function(){return!0},function(a){d++,c.waitForIframes(a.querySelector("html"),function(){--d||b()})},function(a){a||b()})}},{key:"forEachIframe",value:function(b,c,d){var e=this,f=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},g=b.querySelectorAll("iframe"),h=g.length,i=0;g=Array.prototype.slice.call(g);var j=function(){--h<=0&&f(i)};h||j(),g.forEach(function(b){a.matches(b,e.exclude)?j():e.onIframeReady(b,function(a){c(b)&&(i++,d(a)),j()},j)})}},{key:"createIterator",value:function(a,c,d){return b.createNodeIterator(a,c,d,!1)}},{key:"createInstanceOnIframe",value:function(b){return new a(b.querySelector("html"),this.iframes)}},{key:"compareNodeIframe",value:function(a,b,c){var d=a.compareDocumentPosition(c),e=Node.DOCUMENT_POSITION_PRECEDING;if(d&e){if(null===b)return!0;var f=b.compareDocumentPosition(c),g=Node.DOCUMENT_POSITION_FOLLOWING;if(f&g)return!0}return!1}},{key:"getIteratorNode",value:function(a){var b=a.previousNode(),c=void 0;return c=null===b?a.nextNode():a.nextNode()&&a.nextNode(),{prevNode:b,node:c}}},{key:"checkIframeFilter",value:function(a,b,c,d){var e=!1,f=!1;return d.forEach(function(a,b){a.val===c&&(e=b,f=a.handled)}),this.compareNodeIframe(a,b,c)?(e!==!1||f?e===!1||f||(d[e].handled=!0):d.push({val:c,handled:!0}),!0):(e===!1&&d.push({val:c,handled:!1}),!1)}},{key:"handleOpenIframes",value:function(a,b,c,d){var e=this;a.forEach(function(a){a.handled||e.getIframeContents(a.val,function(a){e.createInstanceOnIframe(a).forEachNode(b,c,d)})})}},{key:"iterateThroughNodes",value:function(a,b,c,d,e){for(var f=this,g=this.createIterator(b,a,d),h=[],i=[],j=void 0,k=void 0,l=function(){var a=f.getIteratorNode(g);return k=a.prevNode,j=a.node};l();)this.iframes&&this.forEachIframe(b,function(a){return f.checkIframeFilter(j,k,a,h)},function(b){f.createInstanceOnIframe(b).forEachNode(a,c,d)}),i.push(j);i.forEach(function(a){c(a)}),this.iframes&&this.handleOpenIframes(h,a,c,d),e()}},{key:"forEachNode",value:function(a,b,c){var d=this,e=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},f=this.getContexts(),g=f.length;g||e(),f.forEach(function(f){var h=function(){d.iterateThroughNodes(a,f,b,c,function(){--g<=0&&e()})};d.iframes?d.waitForIframes(f,h):h()})}}],[{key:"matches",value:function(a,b){var c="string"==typeof b?[b]:b,d=a.matches||a.matchesSelector||a.msMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.webkitMatchesSelector;if(d){var e=!1;return c.every(function(b){return!d.call(a,b)||(e=!0,!1)}),e}return!1}}]),a}();return a.Mark=function(a){var b=this,d=new c(a);return this.mark=function(a,c){return d.mark(a,c),b},this.markRegExp=function(a,c){return d.markRegExp(a,c),b},this.unmark=function(a){return d.unmark(a),b},this},a.Mark},window,document);

package/server/public/style.css

@@ -1593,3 +1593,29 @@ footer.status {
 .btn.red {
   background: brown !important;
 }
+
+#error-screen {
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  z-index: 100000000;
+}
+#error-screen pre {
+  padding: 20px;
+  box-sizing: border-box;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  background: royalblue;
+  color: white;
+  overflow: auto;
+}
+mark{
+  background: red;
+  color: white;
+  padding: 5px;
+  display: inline-block;
+  margin: 5px 0;
+}

package/server/views/editor.ejs

@@ -23,6 +23,7 @@
 <script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
+<script src="/mark.min.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -307,6 +308,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             this.socket.close()
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
+
           } else if (packet.type === 'connect') {
 //            document.querySelector(".terminal-container").classList.remove("hidden")
             const message = "..........Connected!\r\n"
@@ -464,13 +466,14 @@ document.addEventListener("DOMContentLoaded", async () => {
               text: `${packet.data}`,
             })
           } else if (packet.type === "error") {
+            debugger
 //            n.Noty({
 //              text: `${packet.data}`,
 //              type: "error"
 //            })
-            this.socket.close()
-//            refreshParent(packet)
-            reloadMemory()
+//            this.socket.close()
+////            refreshParent(packet)
+//            reloadMemory()
             //document.querySelector("footer").innerHTML = `<b><i class="fa-solid fa-triangle-exclamation"></i> ERROR</b><pre>${packet.data}</pre>`
             document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
@@ -481,6 +484,18 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
 
+            document.querySelector("#error-screen").classList.remove("hidden")
+            document.querySelector("#error-screen pre").textContent = packet.data
+            let instance = new Mark(document.querySelector("#error-screen pre"), {
+              separateWordSearch: false,
+              accuracy: "exactly"
+            })
+            console.log("instance", instance)
+            console.log("EVENT", packet.event)
+            instance.mark(packet.event)
+            let element = document.querySelector("mark")
+            element.scrollIntoView({ behavior: "smooth", block: "center" });
+
           } else if (packet.type === "event") {
             if (packet.data === "stop") {
               document.querySelector("footer").innerHTML = "<b>Ready</b>"
@@ -865,5 +880,8 @@ const reloadMemory = async () => {
       <footer><b>Ready</b></footer>
     <% } %>
   <% } %>
+  <div id='error-screen' class='hidden'>
+    <pre></pre>
+  </div>
 </body>
 </html>

package/server/views/fullscreen_editor.ejs

@@ -25,6 +25,7 @@
 <script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
+<script src="/mark.min.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -41,7 +42,6 @@ html {
   height: 100%;
   overflow: hidden;
 }
-
 body {
   height: 100%;
   overflow: hidden;
@@ -192,6 +192,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             rows: this.term.rows,
           }
         }, async (packet) => {
+          console.log({ packet })
           if (packet.type === 'start') {
             refreshParent(packet)
             reloadMemory()
@@ -425,9 +426,12 @@ document.addEventListener("DOMContentLoaded", async () => {
 //              text: `${packet.data}`,
 //              type: "error"
 //            })
-            this.socket.close()
-            refreshParent(packet)
-            reloadMemory()
+
+//            this.socket.close()
+//            refreshParent(packet)
+//            reloadMemory()
+
+
 
             document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
@@ -438,6 +442,22 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
 
+
+            document.querySelector("#error-screen").classList.remove("hidden")
+            document.querySelector("#error-screen pre").textContent = packet.data
+            let instance = new Mark(document.querySelector("#error-screen pre"), {
+              separateWordSearch: false,
+              accuracy: "exactly"
+            })
+            console.log("instance", instance)
+            console.log("EVENT", packet.event)
+            instance.mark(packet.event)
+            let element = document.querySelector("mark")
+            element.scrollIntoView({ behavior: "smooth", block: "center" });
+
+
+
+
           } else if (packet.type === "event") {
             if (packet.data === "stop") {
               document.querySelector("footer").innerHTML = "<b>Ready</b>"
@@ -798,5 +818,8 @@ const reloadMemory = async () => {
       <footer><b>Ready</b></footer>
     <% } %>
   <% } %>
+  <div id='error-screen' class='hidden'>
+    <pre></pre>
+  </div>
 </body>
 </html>

package/server/views/index.ejs

@@ -1006,12 +1006,16 @@ if (document.querySelector("#cloudflare")) {
   })
 }
 <% } %>
-document.querySelector("#back").addEventListener("click", (e) => {
-  history.back()
-})
-document.querySelector("#forward").addEventListener("click", (e) => {
-  history.forward()
-})
+if (document.querySelector("#back")) {
+  document.querySelector("#back").addEventListener("click", (e) => {
+    history.back()
+  })
+}
+if (document.querySelector("#forward")) {
+  document.querySelector("#forward").addEventListener("click", (e) => {
+    history.forward()
+  })
+}
 document.querySelector("#genlog").addEventListener("click", (e) => {
   e.preventDefault()
   e.stopPropagation()