pinokiod 2.15.46 → 2.15.49

package/kernel/api/index.js

@@ -10,6 +10,7 @@ const { glob, sync, hasMagic } = require('glob-gitignore')
 const fastq = require('fastq')
 const Loader = require("../loader")
 const Environment = require("../environment")
+const Util = require('../util')
 
 class Api {
   constructor(kernel) {
@@ -739,6 +740,27 @@ class Api {
               rpc,
               rawrpc
             })
+
+            // if there's an error, set the PINOKIO_SCRIPT_DEFAULT to false
+
+            /*
+              req := {
+                "method": "env.set",
+                "params": {
+                  <key>: <val>,
+                  <key>: <val>,
+                }
+              }
+            */
+            // write to current app folder's ENVIRONMENT
+            console.log("request", request)
+            let api_path = Util.api_path(request.path, this.kernel)
+            console.log("api_path", api_path)
+            let env_path = path.resolve(api_path, "ENVIRONMENT")
+            console.log("env_path", env_path)
+            await Util.update_env(env_path, {
+              PINOKIO_SCRIPT_DEFAULT: "false"
+            })
             return
           }
 

package/kernel/shells.js

@@ -63,18 +63,8 @@ class Shells {
         params_dup.message = message
         console.log("Launching Message", params_dup)
         res = await this._launch(params_dup, options, ondata)
-        // if there's an error, trigger an error event
+        // if there's an error, immediately return with the error
         if (res.error) {
-          console.log("Error exists. Trigger an error", { res })
-          ondata({
-            id: res.id,
-            type: "error",
-            data: res.response,
-            event: res.error,
-//            rpc,
-//            rawrpc
-          })
-          // if there's an error, return immediately => so it will NOT go forward and stop the script
           return res
         }
       }
@@ -160,8 +150,6 @@ class Shells {
       ondata(stream)
     })
 
-    console.log(">>>>>> RESPONSE", response)
-
     /*
       {
         method: "shell.run",
@@ -191,7 +179,6 @@ class Shells {
 
         // 2. first find the `break: false` handlers and replace the patterns with blank => so they won't be matched in the next step
         //let line = response.replaceAll(/[\r\n]/g, "")
-        console.log("checking breakpoints", breakPoints)
         for(let handler of breakPoints) {
           if (handler.event) {
             let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)
@@ -206,9 +193,6 @@ class Shells {
             }
           }
         }
-
-        console.log("Line before", line)
-
         // 3. Now with all the `break: false` (ignored patterns) gone, look for the `break: true` patterns
         for(let handler of breakPoints) {
           if (handler.event) {
@@ -218,16 +202,11 @@ class Shells {
             }
             let re = new RegExp(matches[1], matches[2])
 
-            console.log("re", re)
-
             // only the "break: true" ones
             if (handler.break) {
-              console.log("checking break handler", handler)
-
               let match;
               // Keep executing the regex on the text until no more matches are found
               while ((match = re.exec(line)) !== null) {
-                console.log("match found", match)
                 errors.add(match[0])
                 // errors.add(match.slice(1));
               }

package/kernel/util.js

@@ -140,6 +140,16 @@ const parse_env_detail = async (filename) => {
   */
   return items
 }
+const log_path = (fullpath, kernel) => {
+  let api_path = `${kernel.homedir}${path.sep}api`
+  let rel_path = path.relative(api_path, fullpath)
+  console.log({ rel_path })
+  let log_root = `${kernel.homedir}${path.sep}logs`
+  console.log({ log_root })
+  let current_log_path = path.resolve(log_root, "shell/cleaned/api", rel_path)
+  console.log({ current_log_path })
+  return current_log_path
+}
 const api_path = (fullpath, kernel) => {
   let api_path = `${kernel.homedir}${path.sep}api`
   let rel_path = path.relative(api_path, fullpath)
@@ -196,5 +206,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 module.exports = {
-  parse_env, api_path, update_env, parse_env_detail, openfs, port_running, du
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.46",
+  "version": "2.15.49",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -931,6 +931,8 @@ class Server {
             items: pre_items
           })
         } else {
+          let logpath = encodeURIComponent(Util.log_path(filepath, this.kernel))
+          console.log({ logpath })
           const result = {
             prev,
             error,
@@ -949,6 +951,7 @@ class Server {
             gitRemote,
             filename,
             filepath,
+            logpath,
             encodedFilePath: encodeURIComponent(filepath),
             schemaPath,
             uri,
@@ -2363,6 +2366,11 @@ class Server {
         apps
       })
     }))
+    this.app.get("/getlog", ex(async (req, res) => {
+      console.log("query", req.query)
+      let str = await fs.promises.readFile(req.query.logpath, "utf8")
+      res.send(str)
+    }))
     this.app.post("/proxy", ex(async (req, res) => {
       /*
         req.body := {

package/server/views/editor.ejs

@@ -742,6 +742,14 @@ document.addEventListener("DOMContentLoaded", async () => {
   document.querySelector("#close-error-screen").addEventListener('click', (e) => {
     document.querySelector("#error-screen").classList.add("hidden")
   })
+  /*
+  document.querySelector("#open-log").addEventListener("click", async (e) => {
+    let logs = await fetch("/getlog?logpath=<%=logpath%>").then((res) => {
+      return res.text()
+    })
+    console.log(logs)
+  })
+  */
 })
 const reloadMemory = async () => {
 //  let url = "/pinokio/memory?filepath=" + encodeURI("<%-filepath%>")
@@ -795,6 +803,9 @@ const reloadMemory = async () => {
       </div>
       <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
       <!--
+      <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
+      -->
+      <!--
       <button class='btn' id='source' data-editor-url="<%=editorUrl%>">Navigate</button>
       -->
       <div id='save' class='btn disabled'>

package/server/views/fullscreen_editor.ejs

@@ -432,7 +432,8 @@ document.addEventListener("DOMContentLoaded", async () => {
 
 
 
-            document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
+            //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
+            document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>ERROR</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
 //            document.querySelector("footer").classList.add("expanded")
             document.querySelector("footer i").className = "fa-solid fa-triangle-exclamation"
@@ -710,6 +711,12 @@ document.addEventListener("DOMContentLoaded", async () => {
   document.querySelector("#close-error-screen").addEventListener('click', (e) => {
     document.querySelector("#error-screen").classList.add("hidden")
   })
+//  document.querySelector("#open-log").addEventListener("click", async (e) => {
+//    let logs = await fetch("/getlog?logpath=<%=logpath%>").then((res) => {
+//      return res.text()
+//    })
+//    console.log(logs)
+//  })
 })
 const reloadMemory = async () => {
 //  let url = "/pinokio/memory?filepath=<%=encodedFilePath%>"
@@ -753,6 +760,9 @@ const reloadMemory = async () => {
         <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>
       <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
+      <!--
+      <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
+      -->
     </div>
   <% } %>
   </header>