pinokiod 3.23.0 → 3.24.0

package/server/index.js

@@ -188,8 +188,17 @@ class Server {
               }
             }
           } else if (key === "shell") {
-            let shell_id = this.get_shell_id(name, indexPath, obj[key])
-            if (this.kernel.api.running[shell_id]) {
+            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"
               running_dynamic.push(obj)
@@ -576,18 +585,33 @@ 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)
-      this.running_dynamic(name, plugin.menu)
-      plugin_menu = plugin.menu
+      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
     }
+
+    let posix_path = Util.p2u(this.kernel.path("api", name))
+    let dev_link
+    if (posix_path.startsWith("/")) {
+      dev_link = "/d" + posix_path
+    } else {
+      dev_link = "/d/" + posix_path
+    }
+
     const result = {
+      dev_link,
       minimized: menu_hidden,
 //      repos,
       current_urls,
@@ -1351,6 +1375,7 @@ 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)
@@ -1360,19 +1385,30 @@ class Server {
             let is_running
             let api_path = this.kernel.path("api")
             if (this.is_subpath(api_path, key)) {
+              // normal api script at path p
               if (this.is_subpath(p, key)) {
                 is_running = true
               }
             } else {
               if (key.endsWith(p)) {
+                // global scripts that run in the path p
                 is_running = true
               } else {
-                if (!path.isAbsolute(key)) {
-                  let chunks = key.split("_")
+                // 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
-                    if (folder === items[i].name) {
+                    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
                     }
                   }
@@ -1387,6 +1423,7 @@ 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]) 
@@ -1416,7 +1453,11 @@ class Server {
               } else {
                 let shell = this.kernel.shell.find({
                   filter: (shell) => {
-                    return shell.id.startsWith(items[i].name + "_")
+                    //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 + "_")
                   }
                 })
                 if (shell.length > 0) {
@@ -1843,7 +1884,10 @@ class Server {
           } else {
             currentIndexPath = "" + i
           }
-          let shell_id = this.get_shell_id(name, currentIndexPath, rendered)
+          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
@@ -1853,12 +1897,12 @@ class Server {
 //            shell_id = encodeURIComponent(`${name}_${i}_${hash}`)
 //          }
           menuitem.href = "/shell/" + shell_id + "?" + params.toString()
-          menuitem.shell_id = shell_id
-          let shell = this.kernel.shell.get(shell_id)
+          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 decoded_shell_id = decodeURIComponent(shell_id)
             let shell = this.kernel.shell.get(decoded_shell_id)
             if (shell) {
               menuitem.running = true
@@ -2494,7 +2538,16 @@ class Server {
         info.cwd = () => {
           return filepath
         }
-        let menu = await this.kernel.plugin.config.menu(this.kernel, info)
+        let menu = this.kernel.plugin.config.menu.map((item) => {
+          return {
+            params: {
+              cwd: filepath
+            },
+            ...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
         await this.renderMenu(uri, filepath, plugin, [])
@@ -2526,11 +2579,24 @@ class Server {
           let cached = this.kernel.plugin.cache[name]
           return cached
         } else {
-          let info = new Info(this.kernel)
-          info.caller = () => {
-            return this.kernel.path("api", name, "pinokio.js")
-          }
-          let menu = await this.kernel.plugin.config.menu(this.kernel, info)
+//          let info = new Info(this.kernel)
+//          info.caller = () => {
+//            return this.kernel.path("api", name, "pinokio.js")
+//          }
+//          let menu = await this.kernel.plugin.config.menu(this.kernel, info)
+
+          let menu = this.kernel.plugin.config.menu.map((item) => {
+            return {
+              params: {
+                //cwd: this.kernel.path("api", name, "pinokio.js")
+                cwd: this.kernel.path("api", name)
+              },
+              ...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, [])
@@ -3061,7 +3127,10 @@ class Server {
 
 //      console.log("this.kernel.proto.init")
 //      await this.kernel.proto.init()
+      let list = this.getPeerInfo()
       res.render("init/index", {
+        list,
+        current_host: this.kernel.peer.host,
         cwd: this.kernel.path("api"),
         name: null,
 //        name: req.params.name,
@@ -3527,7 +3596,12 @@ class Server {
       */
 
       // create a new term from cwd
-      let id = decodeURIComponent(req.params.id)
+
+      /*
+      GET /shell/:unix_path => shell id: 'shell/:unix_path'
+      */
+
+      let id = "shell/" + 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
@@ -4368,7 +4442,6 @@ class Server {
 
       const items = await Util.parse_env_detail(filepath)
 
-
       res.render("env_editor", {
         home: true,
         config: null,
@@ -4436,8 +4509,26 @@ class Server {
         })
       } else {
 
+        let gitRemote = null
+        try {
+          //const repositoryPath = this.kernel.path(pathComponents[0], pathComponents[1])
+          //const repositoryPath = this.kernel.path(pathComponents[0])
+          const repositoryPath = path.resolve(this.kernel.api.userdir, api_path)
+          console.log({ repositoryPath })
+          gitRemote = await git.getConfig({
+            fs,
+            http,
+            dir: repositoryPath,
+            path: 'remote.origin.url'
+          })
+        } catch (e) {
+          console.log("ERROR", e)
+        }
+
+console.log("gitRemote", gitRemote)
 
         res.render("env_editor", {
+          gitRemote,
           home: null,
           config,
           name,
@@ -4873,6 +4964,90 @@ class Server {
         agent: this.agent,
       })
     }))
+    this.app.get("/d/*", ex(async (req, res) => {
+      let filepath = Util.u2p(req.params[0])
+      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
+      } catch (e) {
+        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) {
+            let parsed = path.parse(venv)
+            terminals.push({
+              icon: "fa-brands fa-python",
+              title: "[venv] " + parsed.name,
+              shell: {
+                venv: venv,
+                input: true,
+              }
+            })
+          }
+        } catch (e) {
+          console.log(e)
+        }
+        terminal = {
+          icon: "fa-solid fa-terminal",
+          text: "Terminal",
+          menu: terminals
+        }
+      } else {
+        terminal = {
+          icon: "fa-solid fa-terminal",
+          text: "Terminal",
+          menu: [{
+            icon: "fa-solid fa-terminal",
+            title: `Terminal (${filepath})`,
+            shell: {
+              input: true
+            }
+          }]
+        }
+      }
+
+      let dynamic = [
+        terminal,
+        {
+          icon: "fa-solid fa-robot",
+          text: "Build with AI",
+          menu: plugin_menu
+        }
+      ]
+
+      console.log("### dynamic", JSON.stringify(dynamic, null, 2))
+
+      res.render("d", {
+        retry,
+        current_urls,
+        docs: this.docs,
+        portal: this.portal,
+        install: this.install,
+        agent: this.agent,
+        theme: this.theme,
+        //dynamic: plugin_menu
+        dynamic,
+      })
+    }))
     this.app.get("/dev/*", ex(async (req, res) => {
       console.log("GET /dev/*", req.params)
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
@@ -5015,21 +5190,23 @@ 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 = ""
+      console.log("plugin", JSON.stringify(plugin, null, 2))
+      let plugin_menu
       if (plugin) {
-        let html = ""
         if (plugin && plugin.menu && Array.isArray(plugin.menu)) {
           plugin = structuredClone(plugin)
-          this.running_dynamic(req.params.name, plugin.menu)
+          plugin_menu = this.running_dynamic(req.params.name, plugin.menu)
           html = await new Promise((resolve, reject) => {
-            ejs.renderFile(path.resolve(__dirname, "views/partials/dynamic.ejs"), { dynamic: plugin.menu }, (err, html) => {
+            ejs.renderFile(path.resolve(__dirname, "views/partials/dynamic.ejs"), { dynamic: plugin_menu }, (err, html) => {
               resolve(html)
             })
           })
         }
-        res.send(html)
       } else {
-        res.send("")
       }
+      console.log({ html })
+      res.send(html)
     }))
     this.app.get("/pinokio/ai/:name", ex(async (req, res) => {
       /*

package/server/public/style.css

@@ -659,10 +659,14 @@ form.search {
   margin: 0;
   display: flex;
   flex-grow: 1;
+  padding: 10px 0;
   /*
   padding: 0 10px 20px;
   */
+
+  /*
   padding: 0 10px 10px;
+  */
   /*
   padding: 10px 20px 10px;
   */
@@ -726,6 +730,16 @@ form.search {
   font-weight: bold;
   font-size: 26px;
 }
+.btn-tab {
+  padding: 10px 20px;
+  display: flex;
+  justify-content: center;
+  gap: 5px;
+}
+.btn-tab .btn {
+  text-align: center;
+  box-sizing: border-box;
+}
 body.dark form.search input[type=search] {
   border: none;
   background: rgba(255,255,255,0.1);
@@ -733,11 +747,14 @@ body.dark form.search input[type=search] {
 }
 form.search input[type=search] {
   flex-grow: 1;
+  padding: 10px;
+  /*
   padding: 8px 10px;
+  */
   /*
   margin: 0 0 0 10px;
-  */
   margin: 0 10px;
+  */
   /*
   border-radius: 6px 0 0 6px;
   */
@@ -1156,7 +1173,9 @@ body.dark .offline .indicator {
 .container {
   flex-grow: 1;
   box-sizing: border-box;
+  /*
   padding: 0 20px;
+  */
 /*
   max-width: var(--content-width);
   margin: 20px auto;
@@ -1385,6 +1404,12 @@ body.dark .line.align-top h3 .col .title a {
   color: yellowgreen;
   */
 }
+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);
+}
 .running-apps .line.align-top h3 .col .title i {
   color: yellowgreen;
 }

package/server/socket.js

@@ -62,6 +62,8 @@ class Socket {
           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
@@ -351,17 +353,38 @@ class Socket {
           key: facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
           key: audioplay_0.0_a56eb7d48c9e96d8a5217d625d83d204
 
+          key: shell:/Users/x/pinokio/api/comfy.git_0.0.0_session_6e89dd5ef73b94e728634729d08a3cf1
+
       */
 
-      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)
+      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]
+          let logpath = path.resolve(cwd, "logs/shell")
+          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)
+      //}
     }
   }
 }