pinokiod 3.16.2 → 3.16.3

package/kernel/gitconfig_template

@@ -9,3 +9,6 @@
   smudge = git-lfs smudge -- %f
   process = git-lfs filter-process
   required = true
+[user]
+  name = pinokio
+  email = pinokio

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.16.2",
+  "version": "3.16.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,6 +37,7 @@
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",
     "https": "^1.0.0",
+    "ini": "^5.0.0",
     "isomorphic-git": "^1.23.0",
     "jimini": "^0.0.8",
     "jsdom": "^24.0.0",

package/server/index.js

@@ -25,6 +25,7 @@ const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
 const marked = require('marked')
 const multer = require('multer');
+const ini = require('ini')
 //const localtunnel = require('localtunnel');
 //const ngrok = require("@ngrok/ngrok");
 
@@ -167,9 +168,11 @@ class Server {
               let _filepath = uri_path.split("/").filter(x=>x).slice(1)
               let filepath = this.kernel.path(..._filepath)
               let id = `${filepath}?cwd=${cwd}`
+              obj.script_id = id
               //if (this.kernel.api.running[filepath]) {
               if (this.kernel.api.running[id]) {
                 obj.display = "indent"
+                console.log("OBJ", obj)
                 running_dynamic.push(obj)
               }
             }
@@ -1584,6 +1587,7 @@ class Server {
     */
     if (keypath) {
       config.href = base.href + "/" + keypath.join("/") + "?path=" + base.cwd
+      config.script_id = this.kernel.path(keypath) + "?cwd=" + base.cwd
     }
     return config
   }
@@ -1734,6 +1738,7 @@ 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)
           if (shell) {
             menuitem.running = true
@@ -1889,6 +1894,10 @@ class Server {
           }
         }
 
+        if (menuitem.shell_id) {
+          config.menu[i].shell_id = menuitem.shell_id
+        }
+
 
       }
 
@@ -3106,7 +3115,11 @@ class Server {
         }]
       }
 
+      const gitConfigPath = this.kernel.path("gitconfig")
+      const content = await fs.promises.readFile(gitConfigPath, 'utf-8');
+      const gitconfig = ini.parse(content);
       res.render("github", {
+        gitconfig,
         hosts,
         readme,
         portal: this.portal,
@@ -3132,6 +3145,30 @@ class Server {
 //        }]
       })
     }))
+    this.app.post("/github/config", ex(async (req, res) => {
+      const gitConfigPath = this.kernel.path("gitconfig")
+      const content = await fs.promises.readFile(gitConfigPath, 'utf-8');
+      const gitconfig = ini.parse(content);
+      function set(obj, path, value) {
+        const keys = path.split('.');
+        let current = obj;
+        for (let i = 0; i < keys.length - 1; i++) {
+          const k = keys[i];
+          if (!(k in current) || typeof current[k] !== 'object') {
+            current[k] = {};
+          }
+          current = current[k];
+        }
+        current[keys[keys.length - 1]] = value;
+      }
+      for(let key in req.body) {
+        set(gitconfig, key, req.body[key])
+      }
+      let text = ini.stringify(gitconfig)
+      await fs.promises.writeFile(gitConfigPath, text)
+      res.json({ success: true })
+
+    }))
     this.app.get("/github/status", ex(async (req, res) => {
       let id = "gh_status"
       let params = new URLSearchParams()
@@ -3336,7 +3373,6 @@ class Server {
       console.log({ wait, cr })
 
       let current = req.query.callback || req.originalUrl
-      console.log("render setup", { current })
 
 //      console.log("2", { requirements_pending, install_required })
 //      if (!requirements_pending && !install_required) {
@@ -4391,7 +4427,6 @@ class Server {
         } else if (req.body.type === 'env') {
           let envpath = this.kernel.path("ENVIRONMENT")
           let str = await Environment.ENV("system", this.kernel.homedir)
-          console.log({ str })
           await fs.promises.writeFile(path.resolve(this.kernel.homedir, "ENVIRONMENT"), str)
           res.json({ success: true })
         } else if (req.body.type === 'browser-cache') {

package/server/public/style.css

@@ -227,6 +227,12 @@ body.dark .type-tabs {
   padding: 15px;
   */
 }
+.navheader a:hover, .navheader button:hover {
+  color: royalblue;
+}
+.navheader a, .navheader button {
+  cursor: pointer;
+}
 .navheader .btn2 {
   text-transform: lowercase;
 }

package/server/views/app.ejs

@@ -369,13 +369,18 @@ body.dark .frame-link.selected {
   padding: 5px;
   */
 }
+.loader {
+  flex-shrink: 0;
+}
 .loader .btn:hover {
   color: royalblue;
   border-color: royalblue;
 }
 .loader .btn {
   padding: 4px 8px;
+  /*
   border: 1px solid rgba(255,255,255,0.3);
+  */
 }
 .frame-link .tab {
   flex-grow: 1;
@@ -738,17 +743,17 @@ body.dark .appcanvas {
 <body class='<%=theme%>' data-platform="<%=platform%>" data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <input type='url' id='location' readonly value="<%=execUrl%>">
 <a id='open-location' target="_blank" features="browser"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
@@ -1441,7 +1446,9 @@ body.dark .appcanvas {
       move: true,
       edit: true,
       redirect: (new_path) => {
-        return "./" + new_path
+        let u = location.href.replace(/(\/pinokio\/browser\/)[^\/]+(?=\/|$)/, `$1${new_path}`)
+        debugger
+        return u
       }
     })
   })
@@ -1458,7 +1465,9 @@ body.dark .appcanvas {
       <% } %>
       edit: true,
       redirect: (new_path) => {
-        return "./" + new_path
+        let u = location.href.replace(/(\/pinokio\/browser\/)[^\/]+(?=\/|$)/, `$1${new_path}`)
+        debugger
+        return u
       }
     })
   })
@@ -1476,7 +1485,9 @@ body.dark .appcanvas {
       copy: true,
       edit: true,
       redirect: (new_path) => {
-        return "./" + new_path
+        let u = location.href.replace(/(\/pinokio\/browser\/)[^\/]+(?=\/|$)/, `$1${new_path}`)
+        debugger
+        return u
       }
     })
     /*
@@ -1614,34 +1625,97 @@ body.dark .appcanvas {
     if (target) {
       e.preventDefault()
       e.stopPropagation()
-      let link = target.closest("[href]")
-      let src = new URL(link.href).pathname
-      target.querySelector("i.fa-square").className = "fa-solid fa-check"
-      n.Noty({
-        text: `stopping ${src}`,
-        silent: true,
-        timeout: 2000
-      })
-      console.log("src", src)
-
-      let socket = new Socket()
-      socket.run({
-        method: "kernel.api.stop",
-        params: {
-          uri: "~" + src
-        }
-      }, (packet) => {
-        if (packet.type === "result") {
-          socket.close()
+      let shell = target.closest("[data-shell]")
+      if (shell) {
+        debugger
+        let shell_id = shell.getAttribute("data-shell")
+        n.Noty({
+          text: `stopping shell`,
+          silent: true,
+          timeout: 2000
+        })
+        let socket = new Socket()
+        socket.run({
+          method: "kernel.bin.shell_kill",
+          params: {
+            id: shell_id 
+          }
+        }, (packet) => {
+          console.log("packet", packet)
+          if (packet.type === "result") {
+            socket.close()
+            n.Noty({
+              timeout: 2000,
+              text: `stopped`,
+              silent: true
+            })
+            console.log("Refresh 4")
+            refresh(true)
+          }
+        })
+      } else {
+        let script = target.closest("[data-script]")
+        if (script) {
+          let script_id = script.getAttribute("data-script")
+          target.querySelector("i.fa-square").className = "fa-solid fa-check"
           n.Noty({
-            timeout: 2000,
-            text: `stopped`,
-            silent: true
+            text: `stopping script`,
+            silent: true,
+            timeout: 2000
           })
-          console.log("Refresh 4")
-          refresh(true)
+
+          let socket = new Socket()
+          socket.run({
+            method: "kernel.api.stop",
+            params: {
+              id: script_id
+            }
+          }, (packet) => {
+            if (packet.type === "result") {
+              socket.close()
+              n.Noty({
+                timeout: 2000,
+                text: `stopped`,
+                silent: true
+              })
+              console.log("Refresh 4")
+              refresh(true)
+            }
+          })
+        } else {
+          let link = target.closest("[href]")
+          debugger
+          if (link) {
+            let src = new URL(link.href).pathname
+            target.querySelector("i.fa-square").className = "fa-solid fa-check"
+            n.Noty({
+              text: `stopping ${src}`,
+              silent: true,
+              timeout: 2000
+            })
+            console.log("src", src)
+
+            let socket = new Socket()
+            socket.run({
+              method: "kernel.api.stop",
+              params: {
+                uri: "~" + src
+              }
+            }, (packet) => {
+              if (packet.type === "result") {
+                socket.close()
+                n.Noty({
+                  timeout: 2000,
+                  text: `stopped`,
+                  silent: true
+                })
+                console.log("Refresh 4")
+                refresh(true)
+              }
+            })
+          }
         }
-      })
+      }
 
       return
     }

package/server/views/connect/x.ejs

@@ -191,16 +191,16 @@ pre {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
   <button id='new-window' title='open a new window' class='btn2' data-agent="<%=agent%>"><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>

package/server/views/connect.ejs

@@ -226,16 +226,16 @@ body.dark .config {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/download.ejs

@@ -111,16 +111,16 @@ body.frozen {
 <% } %>
 <header class='grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/explore.ejs

@@ -120,16 +120,16 @@ body main iframe {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/file_explorer.ejs

@@ -162,7 +162,7 @@ body.dark .browser-options-row {
 <header class='navheader grabbable'>
 <h1>
 <% if (ishome) { %>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><i class="fa-solid fa-chevron-left"></i></button>
 <button class='btn2' id='forward'><i class="fa-solid fa-chevron-right"></i></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>

package/server/views/github.ejs

@@ -112,6 +112,29 @@ main {
   width: 100%;
   align-items: center;
 }
+.setup-items .gitconfig .field input {
+  padding: 10px;
+  box-sizing: border-box;
+  border: 1px solid silver;
+  width: 100%;
+
+}
+.setup-items .gitconfig .field {
+  padding-bottom: 15px;
+}
+.setup-items .gitconfig label {
+  display: block;
+  margin-bottom: 5px;
+}
+.setup-items .gitconfig-footer .btn {
+  margin: 0 0 5px;
+}
+.setup-items .gitconfig {
+  flex-grow: 1;
+  padding: 30px;
+  background: rgba(0,0,0,0.04) !important;
+  margin-bottom: 20px;
+}
 .setup-items pre {
   width: 100%;
   padding: 30px;
@@ -182,16 +205,16 @@ hr {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
@@ -205,6 +228,22 @@ hr {
   <div class='head'>
     <h3><i class="fa-brands fa-github"></i><br><br>Connect with Github</h3>
   </div>
+  <div class='setup-items'>
+    <form class='gitconfig'>
+      <div class='field'>
+        <label>username</label>
+        <input id='username' type='text' value="<%=gitconfig.user && gitconfig.user.name ? gitconfig.user.name : ''%>">
+      </div>
+      <div class='field'>
+        <label>email</label>
+        <input id='email' type='text' value="<%=gitconfig.user && gitconfig.user.email ? gitconfig.user.email : ''%>">
+      </div>
+      <div class='gitconfig-footer'>
+        <button class='btn'>Update</button>
+        <div>gitconfig stored in ~/pinokio/gitconfig file </div>
+      </div>
+    </form>
+  </div>
   <div class='setup-items'>
     <% if (hosts.length > 0) { %>
       <pre><%=hosts%></pre>
@@ -223,5 +262,26 @@ hr {
     <div id='readme'><%-readme%></div>
   </div>
 </main>
+<script>
+document.querySelector("form.gitconfig").addEventListener("submit", (e) => {
+  e.preventDefault()
+  e.stopPropagation()
+  fetch("/github/config", {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      "user.name": document.querySelector("#username").value,
+      "user.email": document.querySelector("#email").value
+    })
+  }).then((res) => {
+    return res.json()
+  }).then((res) => {
+    alert("Updated")
+    location.href = location.href
+  })
+})
+</script>
 </body>
 </html>

package/server/views/help.ejs

@@ -253,14 +253,14 @@ body.dark .item .tile .badge {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
   <button id='new-window' title='open a new window' class='btn2' data-agent="<%=agent%>"><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>

package/server/views/index.ejs

@@ -243,7 +243,7 @@ body.dark .open-menu, body.dark .browse {
 <header class='navheader grabbable'>
 <h1>
 <% if (ishome) { %>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
@@ -251,7 +251,6 @@ body.dark .open-menu, body.dark .browse {
 <!--
 <a href="/new" class='btn2'><div><i class='fa-solid fa-folder-plus'></i></div><div>Create</div></a>
 -->
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <!--
@@ -273,6 +272,7 @@ body.dark .open-menu, body.dark .browse {
 </form>
 <% if (ishome) { %>
   <div class='nav-btns'>
+    <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
     <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
     <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
     <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/network.ejs

@@ -401,16 +401,16 @@ input:checked + .slider:before {
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/partials/dynamic.ejs

@@ -35,12 +35,14 @@
           </div>
         </a>
       <% } else { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index+4%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>' <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
           <div class='tab'><%-item.btn%></div>
           <% if (item.running) { %>
+            <!--
             <div class='loader shutdown online'>
             </div>
-            <div class='loader shutdown hidden'>
+            -->
+            <div class='loader shutdown'>
               <button class='btn'>
               <i class="fa-solid fa-square"></i> Stop
               </button>

package/server/views/partials/menu.ejs

@@ -50,12 +50,14 @@
           </div>
         </a>
       <% } else { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>' <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%>>
           <div class='tab'><%-item.btn%></div>
           <% if (item.running) { %>
+            <!--
             <div class='loader shutdown online'>
             </div>
-            <div class='loader shutdown hidden'>
+            -->
+            <div class='loader shutdown'>
               <!--
               <i class='fa-solid fa-spin fa-circle-notch'></i>
               <i class="fa-solid fa-chevron-right"></i>

package/server/views/settings.ejs

@@ -268,12 +268,11 @@ body.dark .keys pre {
   -->
 <header class='navheader grabbable'>
 <h1>
-<a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+<a class='home' href="/"><i class="fa-solid fa-house"></i></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
 <button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
-<a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
 <a href="/network" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>Network</div></a>
 <a href="/connect" class='btn2'><div><i class="fa-solid fa-circle-user"></i></div><div>Connect</div></a>
 <% paths.forEach((path) => { %>
@@ -285,6 +284,7 @@ body.dark .keys pre {
 <% }) %>
 <div class='flexible'></div>
 <div class='nav-btns'>
+  <a class='btn2' id='explore' href="/?mode=explore"><div><i class="fa-solid fa-magnifying-glass"></i></div><div>Discover</div></a>
   <a class='btn2' href="<%=portal%>" target="_blank"><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>

package/server/views/shell.ejs

@@ -185,6 +185,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.dirty = true
     }
     finished() {
+      debugger
     /*
       n.Noty({
         text: `[Success] All steps complete`,
@@ -327,6 +328,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               this.write("\r\n")
             }
             if (packet.data.type === "shell.kill") {
+              debugger
               this.socket.close()
             }
             if (packet.data.type === "emit2") {
@@ -345,6 +347,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".starting-btn").classList.add("hidden")
             document.querySelector(".stop-btn").classList.remove("hidden")
           } else if (packet.type === 'disconnect') {
+            debugger
             console.log("refreshParent", packet)
             refreshParent(packet)
             this.term.write("\r\nDisconnected...\r\n")
@@ -612,8 +615,10 @@ document.addEventListener("DOMContentLoaded", async () => {
           refreshParent({
             type: "disconnect"
           })
+          document.querySelector(".play-btn").classList.remove("hidden")
           document.querySelector(".stop-btn").classList.add("hidden")
-          document.querySelector(".stopped-btn").classList.remove("hidden")
+          document.querySelector(".stopped-btn").classList.add("hidden")
+          debugger
           <% if (kill_message) { %>
             n.Noty({
               text: "<%-kill_message%>",
@@ -803,17 +808,26 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.querySelector(".play-btn").classList.add("hidden")
     document.querySelector(".starting-btn").classList.remove("hidden")
     await rpc.run()
+    document.querySelector(".play-btn").classList.remove("hidden")
+    document.querySelector(".stop-btn").classList.add("hidden")
   })
+    debugger
   <% if (running) { %>
     // if running, connect
-    rpc.run("listen")
+    rpc.run("listen").then(() => {
+      document.querySelector(".play-btn").classList.remove("hidden")
+      document.querySelector(".stop-btn").classList.add("hidden")
+    })
     // hide play button
     document.querySelector(".play-btn").classList.add("hidden")
     // show stop button
     document.querySelector(".stop-btn").classList.remove("hidden")
   <% } else { %>
     // if not running, start
-    rpc.run()
+    rpc.run().then(() => {
+      document.querySelector(".play-btn").classList.remove("hidden")
+      document.querySelector(".stop-btn").classList.add("hidden")
+    })
     // show starting button
     document.querySelector(".starting-btn").classList.remove("hidden")
   <% } %>