pinokiod 3.24.0 → 3.25.0

package/server/index.js

@@ -188,16 +188,9 @@ class Server {
               }
             }
           } else if (key === "shell") {
-            console.log("CHECK SHELL", { name, indexPath, key })
-            console.log("obj", obj)
-            console.log("running", this.kernel.api.running)
             let unix_path = Util.p2u(this.kernel.path("api", name))
-            console.log({ unix_path })
             let shell_id = this.get_shell_id(unix_path, indexPath, obj[key])
-
-            console.log("SHELL ID 2", shell_id)
             let decoded_shell_id = decodeURIComponent(shell_id)
-            console.log({ shell_id, decoded_shell_id })
             if (this.kernel.api.running["shell/" + decoded_shell_id]) {
               obj.running = true
               obj.display = "indent"
@@ -431,34 +424,8 @@ class Server {
 //    }
 
 
-    if (config.init_required) {
-      res.redirect("/init/" + name)
-      return
-        
-//      // none of the pinokio.js, pinokio.json, pinokio_meta.json exists => need to initialize
-//      // if there is no menu, display all files
-//      let p = this.kernel.path("api", name)
-//      let files = await fs.promises.readdir(p, { withFileTypes: true })
-//      files = files.filter((file) => {
-//        return file.name.endsWith(".json") || file.name.endsWith(".js")
-//      }).filter((file) => {
-//        return file.name !== "pinokio.js" && file.name !== "pinokio.json" && file.name !== "pinokio_meta.json"
-//      })
-//      config = {
-//        init_required: true,
-//        icon: config.icon,
-//        title: name, 
-//        menu: files.map((file) => {
-//          return {
-//            text: file.name,
-//            href: file.name
-//          }
-//        })
-//      }
-//      let uri = this.kernel.path("api")
-//      await this.renderMenu(uri, name, config, [])
-    } else {
-      let menu = config.menu || []
+    let menu = config.menu || []
+    try {
       if (typeof config.menu === "function") {
         if (config.menu.constructor.name === "AsyncFunction") {
           config.menu = await config.menu(this.kernel, this.kernel.info)
@@ -466,11 +433,14 @@ class Server {
           config.menu = config.menu(this.kernel, this.kernel.info)
         }
       }
+    } catch (e) {
+      err = e.stack
+      config.menu = []
+    }
 
-      let uri = this.kernel.path("api")
-      await this.renderMenu(uri, name, config, [])
+    let uri = this.kernel.path("api")
+    await this.renderMenu(uri, name, config, [])
 
-    }
 
     let platform = os.platform()
 
@@ -585,18 +555,10 @@ class Server {
 
     let plugin_menu = null
     let plugin = await this.getPlugin(name)
-    console.log(">>> Plugin", plugin)
     if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
-      console.log(">>> 2")
       plugin = structuredClone(plugin)
       plugin_menu = this.running_dynamic(name, plugin.menu)
-      console.log("GOT THE PLUGIN MENU")
-
-//      plugin_menu = plugin.menu
     }
-    console.log("PLUGIN_MENU", plugin_menu)
-
-        
     let menu_hidden = false
     if (this.menu_hidden[name] && this.menu_hidden[name][type]) {
       menu_hidden = true
@@ -686,7 +648,6 @@ class Server {
   is_subpath(parent, child) {
     const relative = path.relative(parent, child);
     let check = !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
-    console.log({ relative, parent, child, check })
     return check
   }
   async render(req, res, pathComponents, meta) {
@@ -1375,7 +1336,6 @@ class Server {
           }
           // check if there is a running process with this folder name
           let runningApps = new Set()
-          console.log("RUNNING", this.kernel.api.running)
           for(let key in this.kernel.api.running) {
             //let p = this.kernel.path("api", items[i].name) + path.sep
             let p = this.kernel.path("api", items[i].name)
@@ -1396,23 +1356,17 @@ class Server {
               } else {
                 // shell sessions
                 if (key.startsWith("shell/")) {
-//                if (!path.isAbsolute(key)) {
                   let unix_path = key.slice(6)
                   let native_path = Util.u2p(unix_path)
                   let chunks = native_path.split("_")
                   if (chunks.length > 1) {
                     let folder = chunks[0]
-                    console.log({ chunks, folder, item: items[i] })
                     /// if the folder name matches, it's running
                     let item_path = this.kernel.path("api", items[i].name)
-                    console.log({ item_path, folder })
                     if (item_path === folder) {
-                      console.log("is_running = true")
-//                    if (folder === items[i].name) {
                       is_running = true
                     }
                   }
-
                 }
               }
             }
@@ -1423,7 +1377,6 @@ class Server {
             //    => check inlcludes and endsWith
 
             //if (key.includes(p) && key.endsWith(p)) {
-            console.log("is_running", is_running)
             if (is_running) {
               // add to running
               running.push(items[i]) 
@@ -1453,10 +1406,8 @@ class Server {
               } else {
                 let shell = this.kernel.shell.find({
                   filter: (shell) => {
-                    //return shell.id.startsWith(items[i].name + "_")
                     let item_path = this.kernel.path("api", items[i].name)
                     let unix_item_path = Util.p2u(item_path)
-                    console.log("startsWith", { item_path, unix_item_path, id: shell.id })
                     return shell.id.startsWith("shell/" + unix_item_path + "_")
                   }
                 })
@@ -1747,6 +1698,89 @@ class Server {
     }
     return config
   }
+  renderShell(cwd, indexPath, subIndexPath, menuitem) {
+    if (menuitem.shell) {
+      /*
+        shell :- {
+          id (optional),
+          path (required),    // api, bin, quick, network, api/
+          message (optional), // if not specified, start an empty shell
+          venv,
+          input,              // input mode if true
+          callback,           // callback url after shutting down
+          kill,               // when to kill (regular expression)
+        }
+      */
+
+      let rendered = this.kernel.template.render(menuitem.shell, {})
+      let params = new URLSearchParams()
+//          if (rendered.id) {
+//            params.set("id", encodeURIComponent(rendered.id))
+//          } else {
+//            let shell_id = "sh_" + name + "_" + i
+//            params.set("id", encodeURIComponent(shell_id))
+//          }
+      if (rendered.path) {
+        params.set("path", encodeURIComponent(this.kernel.api.filePath(rendered.path, cwd)))
+      } else {
+        params.set("path", encodeURIComponent(cwd))
+      }
+      if (rendered.message) params.set("message", encodeURIComponent(rendered.message))
+      if (rendered.venv) params.set("venv", encodeURIComponent(rendered.venv))
+      if (rendered.input) params.set("input", true)
+      if (rendered.callback) params.set("callback", encodeURIComponent(rendered.callback))
+      if (rendered.callback_target) params.set("callback_target", rendered_callback_target)
+      if (rendered.kill) params.set("kill", encodeURIComponent(rendered.kill))
+      if (rendered.done) params.set("done", encodeURIComponent(rendered.done))
+      if (rendered.env) {
+        for(let key in rendered.env) {
+          let env_key = "env." + key
+          params.set(env_key, rendered.env[key])
+        }
+      }
+      if (rendered.conda) {
+        for(let key in rendered.conda) {
+          let conda_key = "conda." + key
+          params.set(conda_key, rendered.conda[key])
+        }
+      }
+
+      // deterministic shell id generation
+      // `${api_path}_${i}_${hash}`
+      let currentIndexPath
+      if (indexPath) {
+        currentIndexPath = indexPath + "." + subIndexPath
+      } else {
+        currentIndexPath = "" + subIndexPath
+      }
+      let unix_path = Util.p2u(cwd)
+      let shell_id = this.get_shell_id(unix_path, currentIndexPath, rendered)
+
+      console.log("SHELL ID 1", shell_id)
+
+//          let hash = crypto.createHash('md5').update(JSON.stringify(rendered)).digest('hex')
+//          let shell_id
+//          if (rendered.id) {
+//            shell_id = encodeURIComponent(`${name}_${rendered.id}`)
+//          } else {
+//            shell_id = encodeURIComponent(`${name}_${i}_${hash}`)
+//          }
+      menuitem.href = "/shell/" + shell_id + "?" + params.toString()
+      let decoded_shell_id = decodeURIComponent(shell_id)
+      let shell = this.kernel.shell.get(decoded_shell_id)
+      menuitem.shell_id = "shell/" + decoded_shell_id
+      if (shell) {
+        menuitem.running = true
+      } else {
+        let shell = this.kernel.shell.get(decoded_shell_id)
+        if (shell) {
+          menuitem.running = true
+        }
+      }
+    }
+    console.log("renderShell", menuitem)
+    return menuitem
+  }
 
   async renderMenu(uri, name, config, pathComponents, indexPath) {
     if (config.menu) {
@@ -1830,84 +1864,8 @@ class Server {
 
 
         if (menuitem.shell) {
-          /*
-            shell :- {
-              id (optional),
-              path (required),    // api, bin, quick, network, api/
-              message (optional), // if not specified, start an empty shell
-              venv,
-              input,              // input mode if true
-              callback,           // callback url after shutting down
-              kill,               // when to kill (regular expression)
-            }
-          */
-
-          let rendered = this.kernel.template.render(menuitem.shell, {})
-          let params = new URLSearchParams()
-//          if (rendered.id) {
-//            params.set("id", encodeURIComponent(rendered.id))
-//          } else {
-//            let shell_id = "sh_" + name + "_" + i
-//            params.set("id", encodeURIComponent(shell_id))
-//          }
           let basePath = this.kernel.path("api", name)
-          if (rendered.path) {
-            params.set("path", encodeURIComponent(this.kernel.api.filePath(rendered.path, basePath)))
-          } else {
-            params.set("path", encodeURIComponent(basePath))
-          }
-          if (rendered.message) params.set("message", encodeURIComponent(rendered.message))
-          if (rendered.venv) params.set("venv", encodeURIComponent(rendered.venv))
-          if (rendered.input) params.set("input", true)
-          if (rendered.callback) params.set("callback", encodeURIComponent(rendered.callback))
-          if (rendered.callback_target) params.set("callback_target", rendered_callback_target)
-          if (rendered.kill) params.set("kill", encodeURIComponent(rendered.kill))
-          if (rendered.done) params.set("done", encodeURIComponent(rendered.done))
-          if (rendered.env) {
-            for(let key in rendered.env) {
-              let env_key = "env." + key
-              params.set(env_key, rendered.env[key])
-            }
-          }
-          if (rendered.conda) {
-            for(let key in rendered.conda) {
-              let conda_key = "conda." + key
-              params.set(conda_key, rendered.conda[key])
-            }
-          }
-
-          // deterministic shell id generation
-          // `${api_path}_${i}_${hash}`
-          let currentIndexPath
-          if (indexPath) {
-            currentIndexPath = indexPath + "." + i
-          } else {
-            currentIndexPath = "" + i
-          }
-          let unix_path = Util.p2u(this.kernel.path("api", name))
-          let shell_id = this.get_shell_id(unix_path, currentIndexPath, rendered)
-
-          console.log("SHELL ID 1", shell_id)
-
-//          let hash = crypto.createHash('md5').update(JSON.stringify(rendered)).digest('hex')
-//          let shell_id
-//          if (rendered.id) {
-//            shell_id = encodeURIComponent(`${name}_${rendered.id}`)
-//          } else {
-//            shell_id = encodeURIComponent(`${name}_${i}_${hash}`)
-//          }
-          menuitem.href = "/shell/" + shell_id + "?" + params.toString()
-          let decoded_shell_id = decodeURIComponent(shell_id)
-          let shell = this.kernel.shell.get(decoded_shell_id)
-          menuitem.shell_id = "shell/" + decoded_shell_id
-          if (shell) {
-            menuitem.running = true
-          } else {
-            let shell = this.kernel.shell.get(decoded_shell_id)
-            if (shell) {
-              menuitem.running = true
-            }
-          }
+          this.renderShell(basePath, indexPath, i, menuitem)
         }
 
         if (menuitem.href) {
@@ -2022,9 +1980,7 @@ class Server {
               config.menu[i].btn = menuitem.html
             }
           } else if (menuitem.hasOwnProperty("text")) {
-            if (menuitem.hasOwnProperty("icon")) {
-              menuitem.html = `<i class="${menuitem.icon}"></i> ${menuitem.text}` 
-            } else if (menuitem.hasOwnProperty("image")) {
+            if (menuitem.hasOwnProperty("image")) {
               let imagePath
               if (menuitem.image.startsWith("/")) {
                 imagePath = menuitem.image
@@ -2032,6 +1988,8 @@ class Server {
                 imagePath = `/api/${name}/${menuitem.image}?raw=true`
               }
               menuitem.html = `<img class='menu-item-image' src='${imagePath}' /> ${menuitem.text}`
+            } else if (menuitem.hasOwnProperty("icon")) {
+              menuitem.html = `<i class="${menuitem.icon}"></i> ${menuitem.text}` 
             } else {
               menuitem.html = `${menuitem.text}` 
             }
@@ -2546,7 +2504,6 @@ class Server {
             ...item
           }
         })
-        console.log("MENU 1", JSON.stringify(menu, null, 2))
 //        let menu = await this.kernel.plugin.config.menu(this.kernel, info)
         let plugin = { menu }
         let uri = filepath
@@ -2594,9 +2551,6 @@ class Server {
               ...item
             }
           })
-
-          console.log("MENU 2", JSON.stringify(menu, null, 2))
-
           let plugin = { menu }
           let uri = this.kernel.path("api")
           await this.renderMenu(uri, name, plugin, [])
@@ -2913,6 +2867,44 @@ class Server {
 
     //let home = this.kernel.homedir
     //let home = this.kernel.store.get("home")
+    this.app.get("/launch", ex(async (req, res) => {
+      // parse the url
+      /*
+      is it https://<name>.localhost ?
+        - is <name> already installed?
+          - yes: display
+          - no: 404
+      else: 404
+      */
+      let url = req.query.url
+      let u = new URL(url)
+      let host = u.host
+      if (host.endsWith(".localhost")) {
+        let name = host.replace(/\.localhost$/, '')
+        let api_path = this.kernel.path("api", name)
+        let exists = await this.exists(api_path)
+        if (exists) {
+          let meta = await this.kernel.api.meta(name)
+          res.render("start", {
+            logo: this.logo,
+            theme: this.theme,
+            agent: this.agent,
+            name: meta.title,
+            image: meta.icon,
+            link: "/p/" + name 
+          })
+          return
+        }
+      }
+      res.render("start", {
+        logo: this.logo,
+        theme: this.theme,
+        agent: this.agent,
+        name: "Does not exist",
+        image: "/pinokio-black.png",
+        link: null
+      })
+    }))
     this.app.get("/", ex(async (req, res) => {
       // check bin folder
 //      let bin_path = this.kernel.path("bin/miniconda")
@@ -3128,8 +3120,11 @@ class Server {
 //      console.log("this.kernel.proto.init")
 //      await this.kernel.proto.init()
       let list = this.getPeerInfo()
+      let ai = await this.kernel.proto.ai()
+      console.log("ai", ai)
       res.render("init/index", {
         list,
+        ai,
         current_host: this.kernel.peer.host,
         cwd: this.kernel.path("api"),
         name: null,
@@ -3798,7 +3793,6 @@ class Server {
         if (item.name === req.params.name) {
           processes = item.processes
           host = item.host
-          console.log("matched", processes)
           peer = item
         }
       }
@@ -4524,9 +4518,6 @@ class Server {
         } catch (e) {
           console.log("ERROR", e)
         }
-
-console.log("gitRemote", gitRemote)
-
         res.render("env_editor", {
           gitRemote,
           home: null,
@@ -4969,7 +4960,6 @@ console.log("gitRemote", gitRemote)
       let plugin = await this.getPluginGlobal(filepath)
       let html = ""
       let plugin_menu
-      console.log("*********** plugin", plugin)
       try {
         plugin_menu = plugin.menu
         //plugin_menu = plugin.menu[0].menu
@@ -4977,65 +4967,99 @@ console.log("gitRemote", gitRemote)
         plugin_menu = []
       }
       let current_urls = await this.current_urls(req.originalUrl.slice(1))
-      console.log("RUNNING", this.kernel.api.running)
-      console.log("DYNAMIC", JSON.stringify(plugin_menu, null, 2))
       let retry = false
       // if plugin_menu is empty, try again in 1 sec
       if (plugin_menu.length === 0) {
         retry = true
       }
-
       let venvs = await Util.find_venv(filepath)
-      console.log({ venvs, filepath })
       let terminal
-
       if (venvs.length > 0) {
         let terminals = []
         try {
-          for(let venv of venvs) {
+          for(let i=0; i<venvs.length; i++) {
+            let venv = venvs[i]
             let parsed = path.parse(venv)
-            terminals.push({
+            terminals.push(this.renderShell(filepath, i, 0, {
               icon: "fa-brands fa-python",
-              title: "[venv] " + parsed.name,
+              title: "Python virtual environment",
+              subtitle: this.kernel.path("api", parsed.name),
+              type: "Start",
               shell: {
                 venv: venv,
                 input: true,
               }
-            })
+            }))
           }
         } catch (e) {
           console.log(e)
         }
         terminal = {
           icon: "fa-solid fa-terminal",
-          text: "Terminal",
+          title: "Open web terminal",
+          subtitle: "Open the terminal in the browser",
           menu: terminals
         }
       } else {
         terminal = {
           icon: "fa-solid fa-terminal",
-          text: "Terminal",
-          menu: [{
+          title: "Open web terminal",
+          subtitle: "Work with the terminal directly in the browser",
+          menu: [this.renderShell(filepath, 0, 0, {
             icon: "fa-solid fa-terminal",
-            title: `Terminal (${filepath})`,
+            title: "Terminal",
+            subtitle: filepath,
+            type: "Start",
             shell: {
               input: true
             }
-          }]
+          })]
         }
       }
 
+      let exec_menus = []
+      let shell_menus = []
+      if (plugin_menu.length > 0) {
+        for(let item of plugin_menu) {
+          // if shell.run method exists
+          // if exec method exists 
+          let mode
+          for(let step of item.run) {
+            if (step.method === "exec") {
+              mode = "exec" 
+              break
+            }
+            if (step.method === "shell.run") {
+              mode = "shell"
+              break
+            }
+          }
+          if (mode === "exec") {
+            item.type = "Open"
+            exec_menus.push(item)
+          } else if (mode === "shell") {
+            item.type = "Start"
+            shell_menus.push(item)
+          }
+        }
+        exec_menus.sort((a, b) => { return a > b })
+        shell_menus.sort((a, b) => { return a > b })
+      }
       let dynamic = [
-        terminal,
         {
           icon: "fa-solid fa-robot",
-          text: "Build with AI",
-          menu: plugin_menu
-        }
+          title: "Get started building with AI",
+          subtitle: "Start making changes to this project using AI",
+          menu: shell_menus
+        },
+        {
+          icon: "fa-solid fa-arrow-up-right-from-square",
+          title: "Open in external apps",
+          subtitle: "Open this project in 3rd party apps",
+          menu: exec_menus
+        },
+        terminal,
       ]
-
-      console.log("### dynamic", JSON.stringify(dynamic, null, 2))
-
       res.render("d", {
         retry,
         current_urls,
@@ -5203,9 +5227,7 @@ console.log("gitRemote", gitRemote)
             })
           })
         }
-      } else {
       }
-      console.log({ html })
       res.send(html)
     }))
     this.app.get("/pinokio/ai/:name", ex(async (req, res) => {

package/server/public/style.css

@@ -1408,7 +1408,7 @@ body.dark .not-running-apps .line.align-top h3 .col .title i {
   color: rgba(255,255,255,0.4);
 }
 .not-running-apps .line.align-top h3 .col .title i {
-  color: rgba(0,0,0,0.04);
+  color: rgba(0,0,0,0.4);
 }
 .running-apps .line.align-top h3 .col .title i {
   color: yellowgreen;

package/server/socket.js

@@ -61,9 +61,6 @@ class Socket {
           // link git every time before processing
           await this.parent.kernel.api.init()
           // look for repos that match
-
-          console.log("REQ", req)
-
           if (req.uri) {
             if (req.mode === "open") {
               // get the default script and respond
@@ -359,15 +356,9 @@ class Socket {
 
       if (key.startsWith("shell/")) {
         let unix_id = key.slice(6)
-        console.log({ key, unix_id })
-
         let unix_path = unix_id.split("_")[0]
         let native_path = Util.u2p(unix_path)
-
         let native_path_exists = await new Promise(r=>fs.access(native_path, fs.constants.F_OK, e => r(!e)))
-
-        console.log({ unix_path, native_path, native_path_exists })
-
         if (native_path_exists) {
           let cwd = native_path
           let session = this.sessions[key]
@@ -375,16 +366,6 @@ class Socket {
           await Util.log(logpath, buf, session)
         }
       }
-
-      //let api_name = key.split("_")[0]
-      //let api_path = this.parent.kernel.path("api", api_name)
-      //let api_path_exists = await new Promise(r=>fs.access(api_path, fs.constants.F_OK, e => r(!e)))
-      //if (api_path_exists) {
-      //  let cwd = api_path
-      //  let session = this.sessions[key]
-      //  let logpath = path.resolve(cwd, "logs/shell")
-      //  await Util.log(logpath, buf, session)
-      //}
     }
   }
 }