pinokiod 3.10.0 → 3.10.2

package/kernel/info.js

@@ -6,6 +6,7 @@ info.path(...args)
 */
 const path = require('path')
 const fs = require("fs")
+const Util = require('./util')
 class Info {
   constructor(kernel) {
     this.kernel = kernel
@@ -26,6 +27,11 @@ class Info {
       Error.prepareStackTrace = _prepareStackTrace;
     }
   }
+  async venv(_cwd) {
+    let cwd = _cwd || this.cwd()
+    let venv = await Util.find_venv(cwd)
+    return venv
+  }
   cwd() {
     return path.dirname(this.caller())
   }

package/kernel/plugin.js

@@ -4,7 +4,9 @@ class Plugin {
     this.kernel = kernel
   }
   async init() {
+    console.log("Plugin.init")
     if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
+      console.log("INSTALLED")
       // if ~/pinokio/prototype doesn't exist, clone
       let exists = await this.kernel.exists("plugin")
       if (!exists) {
@@ -15,10 +17,13 @@ class Plugin {
           process.stdout.write(e.raw)
         })
       }
+      console.log("#################")
 
       let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
       let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
+      console.log("pinokiojs", pinokiojs)
       this.config = await this.kernel.require(pinokiojs)
+      console.log("this.config", this.config)
     }
   }
   async update() {

package/kernel/prototype.js

@@ -12,7 +12,7 @@ class Proto {
     if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
 
       // if ~/pinokio/prototype doesn't exist, clone
-      let exists = await this.kernel.exists("prototype")
+      let exists = await this.kernel.exists("prototype/system")
       if (!exists) {
         console.log("prototype doesn't exist. cloning...")
         await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
@@ -27,16 +27,21 @@ class Proto {
 
       let pinokiojs_path = this.kernel.path("prototype/system/pinokio.js")
       let config = await this.kernel.require(pinokiojs_path)
+      console.log("--config", config)
       this.config = config
 
-      this.config.menu.push({
-        icon: "fa-solid fa-rotate",
-        text: "Update",
-        shell: {
-          message: "git pull",
-          path: this.kernel.path("prototype/system")
-        }
-      })
+      if (this.config.menu) {
+        this.config.menu.push({
+          icon: "fa-solid fa-rotate",
+          text: "Update",
+          shell: {
+            message: "git pull",
+            path: this.kernel.path("prototype/system")
+          }
+        })
+      }
+
+
 
 
 

package/package.json

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

package/server/index.js

@@ -146,6 +146,7 @@ class Server {
           } else {
             newIndexPath = "" + i
           }
+          console.log({ item, i, indexPath, newIndexPath })
           traverse(item, newIndexPath);
         }
       } else if (obj !== null && typeof obj === 'object') {
@@ -174,7 +175,9 @@ class Server {
               }
             }
           } else if (key === "shell") {
+            console.log("shell", key, obj[key], indexPath)
             let shell_id = this.get_shell_id(name, indexPath, obj[key])
+            console.log("shell_id", shell_id, this.kernel.api.running[shell_id], this.kernel.api.running)
             if (this.kernel.api.running[shell_id]) {
               obj.display = "indent"
               running_dynamic.push(obj)
@@ -475,6 +478,7 @@ class Server {
       feed = this.newsfeed(gitRemote)
     }
 
+    await this.kernel.plugin.init()
     let plugin = await this.getPlugin(name)
     let plugin_menu = null
     if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
@@ -1722,7 +1726,9 @@ class Server {
           } else {
             currentIndexPath = "" + i
           }
+          console.log(">>", { indexPath, currentIndexPath, i })
           let shell_id = this.get_shell_id(name, currentIndexPath, rendered)
+          console.log(">>", { name, shell_id, })
 
 
 //          let hash = crypto.createHash('md5').update(JSON.stringify(rendered)).digest('hex')
@@ -3049,6 +3055,7 @@ class Server {
 //      params.set("kill", "/Logged in/i")
       params.set("kill_message", "Click to return home")
       params.set("callback", encodeURIComponent("/github"))
+      params.set("target", "_top")
       params.set("id", id)
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
@@ -3063,6 +3070,7 @@ class Server {
       params.set("kill_message", "Click to return home")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
+      params.set("target", "_top")
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
     }))
@@ -3086,6 +3094,7 @@ class Server {
       params.set("kill_message", "Your Github account is now connected.")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
+      params.set("target", "_top")
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
     }))
@@ -3107,6 +3116,7 @@ class Server {
 
       // create a new term from cwd
       let id = decodeURIComponent(req.params.id)
+      let target = req.query.target ? req.query.target : null
       let cwd = this.kernel.path(this.kernel.api.filePath(decodeURIComponent(req.query.path)))
       let message = req.query.message ? decodeURIComponent(req.query.message) : null
       //let message = req.query.message ? req.query.message : null
@@ -3146,6 +3156,7 @@ class Server {
 
       let shell = this.kernel.shell.get(id)
       res.render("shell", {
+        target,
         filepath: cwd,
         theme: this.theme,
         agent: this.agent,
@@ -4069,6 +4080,7 @@ class Server {
       }
     }))
     this.app.get("/pinokio/dynamic/:name", ex(async (req, res) => {
+      await this.kernel.plugin.init()
       let plugin = await this.getPlugin(req.params.name)
       let html = ""
       if (plugin && plugin.menu && Array.isArray(plugin.menu)) {

package/server/public/commander.js

@@ -25,6 +25,9 @@ const Commander = async (config) => {
       if (config.venv) {
         search_params.set("venv", config.venv)
       }
+      if (config.target) {
+        search_params.set("target", config.target)
+      }
 
       // env
       if (config.env) {

package/server/views/network.ejs

@@ -668,6 +668,7 @@ document.querySelector("#advanced-label").addEventListener("click", (e) => {
     title: "Custom Router",
     placeholder: "enter a custom router git url",
     description: `<div>you can write your own custom routers to handle custom request handling for any port <a target="_blank" href="<%=docs%>">Learn more</a></div>`,
+    target: "_top",
     message: (url) => {
       let name = new URL(url).pathname.split("/").slice(-2).join("_")
       return encodeURIComponent(`git clone ${url} ${name}`)

package/server/views/shell.ejs

@@ -198,8 +198,6 @@ document.addEventListener("DOMContentLoaded", async () => {
         await this.socket.close()
 
         let query = Object.fromEntries(new URLSearchParams(location.search))
-        console.log(">>>>>>>> 1")
-
         let firstPacketReceived = false
         this.socket.run({
           //method: "kernel.bin.shell_start",
@@ -208,7 +206,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             message: "<%-message%>",
           <% } %>
           <% if (venv) { %>
-            venv: "<%=venv%>",
+            venv: "<%-JSON.stringify(venv).slice(1, -1)%>",
           <% } %>
           <% if (kill) { %>
             on: [{
@@ -760,8 +758,15 @@ document.addEventListener("DOMContentLoaded", async () => {
 </script>
 </head>
 <body class='<%=theme%>'>
-  <header class='navheader grabbable'>
-    <div class='navheader3'>
+  <% if (target === "_top") { %>
+    <header class='navheader grabbable'>
+  <% } else { %>
+    <header class='navheader3'>
+  <% } %>
+    <h1>
+      <% if (target === "_top") { %>
+      <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+      <% } %>
       <div class='hidden btn run play-btn'>
         <span class='play'><i class="fa-solid fa-play"></i> Start</span>
       </div>
@@ -774,7 +779,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       <div class='hidden btn stopped-btn'>
         <span class='stopped'><i class="fa-solid fa-hand"></i> Stopped</span>
       </div>
-    </div>
+    </h1>
   </header>
   <div class='terminal-container'>
     <div id='terminal'></div>