pinokiod 3.19.65 → 3.19.67

package/kernel/api/index.js

@@ -214,7 +214,11 @@ class Api {
 
 
     // stop all shell processes connected to the uri
-    this.kernel.shell.kill({ group: requestPath })
+    if (req.params.id) {
+      this.kernel.shell.kill({ group: req.params.id })
+    } else {
+      this.kernel.shell.kill({ group: requestPath })
+    }
 
     // if any process is in a "wait" state, resume it
     this.kernel.resumeprocess(requestPath)

package/kernel/api/shell/index.js

@@ -48,7 +48,11 @@ class Shell {
 
     let options = {}
     if (req.cwd) options.cwd = req.cwd
-    if (req.parent && req.parent.path) options.group = req.parent.path
+    if (req.parent && req.parent.id) {
+      options.group = req.parent.id
+    } else if (req.parent && req.parent.path) {
+      options.group = req.parent.path
+    }
     let id = await kernel.shell.start(req.params, options, ondata)
     return id
     //let id = await kernel.shell.start(req.params, options)
@@ -123,7 +127,11 @@ class Shell {
     }
     let options = {}
     if (req.cwd) options.cwd = req.cwd
-    if (req.parent && req.parent.path) options.group = req.parent.path
+    if (req.parent && req.parent.id) {
+      options.group = req.parent.id
+    } else if (req.parent && req.parent.path) {
+      options.group = req.parent.path
+    }
     if (req.client) {
       req.params.rows = req.client.rows
       req.params.cols = req.client.cols

package/kernel/bin/index.js

@@ -41,6 +41,7 @@ class Bin {
     this.platform = os.platform()
   }
   async shell_kill(params, ondata) {
+    console.log("shell_kill", params)
     this.kernel.shell.kill(params.params)
   }
   async shell_start(params, ondata) {

package/kernel/shells.js

@@ -459,6 +459,7 @@ class Shells {
         }
       }
     } else if (request.group) {
+//      console.log("kill group", this.shells)
       // kill all shells for the scriptpath
       let shells = []
       for(let i=0; i<this.shells.length; i++) {

package/package.json

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

package/server/index.js

@@ -366,6 +366,8 @@ class Server {
   }
 
   async chrome(req, res, type) {
+    let d = Date.now()
+    console.time("1 chrome " + d)
     let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
       bin: this.kernel.bin.preset("dev"),
     })
@@ -373,6 +375,7 @@ class Server {
       res.redirect(`/setup/dev?callback=${req.originalUrl}`)
       return
     }
+    console.timeEnd("1 chrome " + d)
 
     let name = req.params.name
     let config = await this.kernel.api.meta(name)
@@ -487,17 +490,22 @@ class Server {
 //      }
 //    }
 
+    console.time("2 chrome " + d)
     await this.init_env("api/" + name)
+    console.timeEnd("2 chrome " + d)
 
+    console.time("3 chrome " + d)
     let mode = "run"
     if (req.query && req.query.mode) {
       mode = req.query.mode
     }
     const env = await this.kernel.env("api/" + name)
+    console.timeEnd("3 chrome " + d)
 
     // profile + feed
     const repositoryPath = path.resolve(this.kernel.api.userdir, name)
 
+    console.time("4 chrome " + d)
     try {
       await git.resolveRef({ fs, dir: repositoryPath, ref: 'HEAD' });
     } catch (err) {
@@ -506,7 +514,9 @@ class Server {
       await git.init({ fs, dir: repositoryPath });
     }
 
+    console.timeEnd("4 chrome " + d)
 
+    console.time("5 chrome " + d)
     let gitRemote = await git.getConfig({ fs, http, dir: repositoryPath, path: 'remote.origin.url' })
     let profile
     let feed
@@ -520,11 +530,13 @@ class Server {
       profile = this.profile(gitRemote)
       feed = this.newsfeed(gitRemote)
     }
+    console.timeEnd("5 chrome " + d)
 
     // git
 
     let c = this.kernel.path("api", name)
 
+    console.time("6 chrome " + d)
     await this.kernel.plugin.init()
     let plugin = await this.getPlugin(name)
     let plugin_menu = null
@@ -540,6 +552,7 @@ class Server {
 //      repos,
       current_urls,
       path: this.kernel.path("api", name),
+      log_path: this.kernel.path("api", name, "logs"),
       plugin_menu,
       portal: this.portal,
       install: this.install,
@@ -568,12 +581,16 @@ class Server {
       theme: this.theme,
       agent: this.agent,
       src: "/_api/" + name,
+      logs: "/_api/" + name + "/logs",
       execUrl: "/api/" + name,
 //      rawpath,
     }
+    console.timeEnd("6 chrome " + d)
+    console.time("7 chrome " + d)
     if (!this.kernel.proto.config) {
       await this.kernel.proto.init()
     }
+    console.timeEnd("7 chrome " + d)
     res.render("app", result)
   }
   getVariationUrls(req) {
@@ -4367,8 +4384,8 @@ class Server {
       }
       res.json({ config: this.xterm })
     }))
-    this.app.get("/du/:name", ex(async (req, res) => {
-      let p = this.kernel.path("api", req.params.name)
+    this.app.get("/du/*", ex(async (req, res) => {
+      let p = this.kernel.path("api", req.params[0])
       try {
         let d1 = await Util.du(p)
         res.json({ du: d1 })

package/server/socket.js

@@ -4,6 +4,7 @@ const Util = require("../kernel/util")
 class Socket {
   constructor(parent) {
     this.buffer = {}
+    this.old_buffer = {}
     this.sessions = {}
     this.connected = {}
     this.active_shell = {}

package/server/views/app.ejs

@@ -836,11 +836,15 @@ body.dark .appcanvas {
   <div class='m n system' data-type="n">
     <a target="<%=src%>" href="<%=src%>" class='btn header-item frame-link' data-index="0" data-mode="refresh">
       <div class='tab'>
-        <i class="fa-regular fa-folder-open"></i> Files <div class='disk-usage'></div>
+        <i class="fa-regular fa-folder-open"></i> Files
       </div>
-      <div class='loader'>
-        <i id='open-folder' data-filepath="<%=path%>" class="fa-solid fa-up-right-from-square"></i>
+        <div class='disk-usage' data-path="/"></div>
+    </a>
+    <a target="<%=logs%>" href="<%=logs%>" class='btn header-item frame-link' data-index="1" data-mode="refresh">
+      <div class='tab'>
+        <i class="fa-solid fa-clock-rotate-left"></i> Logs
       </div>
+      <div class='disk-usage' data-path="/logs"></div>
     </a>
     <% if (profile || feed) { %>
       <div class='btn header-item frame-link revealer' data-group='.info-group'>
@@ -1879,9 +1883,10 @@ body.dark .appcanvas {
 
 
   })
-  const refresh_du = () => {
+  const refresh_du = (path) => {
     console.log("REFRESH DU")
-    fetch("/du/<%=name%>").then((res) => {
+    let url = path ? `/du/<%=name%>/${path}` : `/du/<%=name%>`
+    fetch(url).then((res) => {
       return res.json()
     }).then((res) => {
       if (res.du > 0) {
@@ -1899,7 +1904,8 @@ body.dark .appcanvas {
           val = `${Math.floor(res.du/k * 100) / 100} KB`
         }
         console.log("DU VAL", val)
-        document.querySelector(".disk-usage").innerHTML = val
+        let selector = `.disk-usage[data-path='/${path || ""}']`
+        document.querySelector(selector).innerHTML = val
       } else {
       }
     })
@@ -2032,6 +2038,7 @@ body.dark .appcanvas {
             }
             if (event.data.type === 'result') {
               refresh_du()
+              refresh_du("logs")
             }
           }
         } else {
@@ -2044,6 +2051,7 @@ body.dark .appcanvas {
 
   });
   refresh_du()
+  refresh_du("logs")
   <% if (type !== 'run') { %>
     debugger
     fetch("<%=repos%>").then((res) => {

package/server/views/file_explorer.ejs

@@ -194,7 +194,7 @@ body.dark .browser-options-row {
 </h1>
 <% if (!ishome) { %>
   <div class='runner'>
-    <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View Folder</button>
+    <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-square-arrow-up-right"></i>&nbsp;&nbsp;Open in File Explorer</button>
   </div>
 <% } %>
 <% if (display.includes("dependencies")) { %>

package/server/views/index.ejs

@@ -798,19 +798,19 @@ if (document.querySelector("form input[type=search]")) {
 // if launch_complete is false => not finished launching. wait until it's complete, and then refresh
 // autolaunch display update
 <% if (!launch_complete) { %>
-  let interval = setInterval(async () => {
-    let res = await fetch("/pinokio/info").then((res) => {
-      return res.json()
-    })
-    if (res.launch_complete) {
-      debugger
-      console.log("launched")
-      clearInterval(interval)
-      location.href = location.href
-    } else {
-      console.log("not yet launched")
-    }
-  }, 1000)
+//  let interval = setInterval(async () => {
+//    let res = await fetch("/pinokio/info").then((res) => {
+//      return res.json()
+//    })
+//    if (res.launch_complete) {
+//      debugger
+//      console.log("launched")
+//      clearInterval(interval)
+//      location.href = location.href
+//    } else {
+//      console.log("not yet launched")
+//    }
+//  }, 1000)
 <% } %>
 document.addEventListener("keydown", (e) => {
   e = e || window.event;