pinokiod 2.1.14 → 2.1.16

package/kernel/environment.js

@@ -293,6 +293,8 @@ const ENV = async (type, homedir) => {
     }
   }
 
+  console.log({ filtered_envs, irrelevant_keys })
+
 //  let filtered_envs = envs.filter((e) => {
 //    return e.type.includes(type)
 //  })
@@ -315,9 +317,9 @@ const ENV = async (type, homedir) => {
 
     // if app environment,
     //  if e.key exists on system env, use that
-    //  if e.key does NOT exist on system env, 
+    //  if e.key does NOT exist on system env, use from the hardcoded default option
     if (type === 'app') {
-      system_env = await get(homedir)
+      system_env = await get_raw(homedir)
       if (e.key in system_env) {
         console.log(`original ${e.key}=${val}`)
         val = system_env[e.key]
@@ -331,25 +333,25 @@ const ENV = async (type, homedir) => {
     lines.push(comment+kv)
   }
 
-// In case of type: app, inherit any other custom ENVIRONMENT variable not yet included
-console.log({ irrelevant_keys })
-if (type === "app" && system_env) {
-  for(let key in system_env) {
-    if (!keys.has(key)) {
-      // the key has not been processed, need to add to the lines
-      if (irrelevant_keys.includes(key)) {
-        // if the key was explicitly stated to be not included, skip
-        console.log("irrelevant key", key)
-      } else {
-        console.log("relevant key", key)
-        let val = system_env[key]
-        let kv = `${key}=${val}`
-        lines.push(kv)
-        console.log(`inherited custom environment key from system_env: ${kv}`)
+  // In case of type: app, inherit any other custom ENVIRONMENT variable not yet included
+  console.log({ irrelevant_keys })
+  if (type === "app" && system_env) {
+    for(let key in system_env) {
+      if (!keys.has(key)) {
+        // the key has not been processed, need to add to the lines
+        if (irrelevant_keys.includes(key)) {
+          // if the key was explicitly stated to be not included, skip
+          console.log("irrelevant key", key)
+        } else {
+          console.log("relevant key", key)
+          let val = system_env[key]
+          let kv = `${key}=${val}`
+          lines.push(kv)
+          console.log(`inherited custom environment key from system_env: ${kv}`)
+        }
       }
     }
   }
-}
 
   return lines.join("\n")
 }
@@ -381,6 +383,10 @@ const get2 = async (filepath, kernel) => {
   let current_env = Object.assign({}, process.env, default_env, api_env)
   return current_env
 }
+
+// return env object
+// 1. if the value starts with ./ => convert to absolute path
+// 2. if the value is empty => don't return the kv pair for that value
 const get = async (homedir) => {
   const env_path = path.resolve(homedir, "ENVIRONMENT")
   const current_env = await Util.parse_env(env_path)
@@ -396,4 +402,16 @@ const get = async (homedir) => {
   }
   return current_env
 }
+
+const get_raw = async (homedir) => {
+  const env_path = path.resolve(homedir, "ENVIRONMENT")
+  const current_env = await Util.parse_env(env_path)
+  for(let key in current_env) {
+    let val = current_env[key]
+    if (val.trim() === "") {
+      delete current_env[key]
+    }
+  }
+  return current_env
+}
 module.exports = { ENV, get, get2, init_folders }

package/package.json

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

package/server/index.js

@@ -284,6 +284,7 @@ class Server {
       theme: this.theme,
       agent: this.agent,
       src: "/_api/" + name,
+      execUrl: "/api/" + name,
       rawpath,
     })
   }

package/server/views/editor.ejs

@@ -192,19 +192,20 @@ document.addEventListener("DOMContentLoaded", async () => {
       document.querySelector(".run .starting").classList.add("hidden")
     }
     stop() {
+      debugger;
       this.socket.run({
         method: "kernel.api.stop",
         params: {
-          //uri: "<%=execUrl%>",
-          uri: "~" + location.pathname
+          uri: "<%=execUrl%>",
+          //uri: "~" + location.pathname
         }
       }, (stream) => {
       })
     }
     save() {
       return new Promise((resolve, reject) => {
-        //let cwd = "<%=execUrl%>"
-        let cwd = "~" + location.pathname
+        let cwd = "<%=execUrl%>"
+        //let cwd = "~" + location.pathname
         debugger
         this.socket.close()
         this.socket.run({
@@ -233,8 +234,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         this.socket.run({
           //uri: location.pathname.slice(1).replace("api/", ""),
           //uri: "~" + location.pathname,
-          //uri: "<%=execUrl%>",
-          uri: "~" + location.pathname,
+          uri: "<%=execUrl%>",
+          //uri: "~" + location.pathname,
           mode,
           input: query,
           client: {
@@ -244,7 +245,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         }, async (packet) => {
           console.log("packet", packet)
           if (packet.type === 'start') {
-            refreshParent(packet)
+//            refreshParent(packet)
             reloadMemory()
             if (packet.data && packet.data.description) {
               if ('current' in packet.data) {
@@ -289,7 +290,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
           } else if (packet.type === 'disconnect') {
-            refreshParent(packet)
+//            refreshParent(packet)
             reloadMemory()
             this.term.write("\r\nNot connected...\r\n")
             document.querySelector("footer").innerHTML = "<b>Ready</b>"
@@ -357,7 +358,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               }
             */
           } else if (packet.type === "tab.open") {
-            refreshParent(packet)
+//            refreshParent(packet)
           } else if (packet.type === "browser.open") {
           /*
             {
@@ -443,7 +444,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               n.Noty(payload)
             }
           } else if (packet.type === "result") {
-            refreshParent(packet)
+//            refreshParent(packet)
             reloadMemory()
             if (packet.data) {
 //              document.querySelector("#response").innerHTML = he.escape(JSON.stringify(packet.data, null, 2))
@@ -458,7 +459,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 //              type: "error"
 //            })
             this.socket.close()
-            refreshParent(packet)
+//            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>`