pinokiod 3.19.4 → 3.19.6

package/kernel/bin/cli.js

@@ -2,16 +2,16 @@ const path = require('path')
 class CLI {
   async install(req, ondata) {
     await this.kernel.exec({
-      message: "npm install -g pinokio-cli@latest",
+      message: "npm install -g pterm@latest --force",
     }, ondata)
   }
   async installed(req, ondata) {
     console.log("Check installed")
     if (this.kernel.which('pinokio')) {
       let res = await this.kernel.exec({
-        message: "pinokio version"
+        message: "pinokio version terminal"
       }, ondata)
-      if (/.*v0\.0\.4.*/.test(res.stdout)) {
+      if (/.*pterm@0\.0\.6.*/.test(res.stdout)) {
         console.log("Installed")
         return true
       } else {
@@ -24,7 +24,7 @@ class CLI {
   }
   async uninstall(req, ondata) {
     await this.kernel.exec({
-      message: "npm uninstall -g pinokio-cli",
+      message: "npm uninstall -g pterm",
     }, ondata)
   }
 }

package/kernel/bin/index.js

@@ -630,35 +630,38 @@ class Bin {
       return res
     }
   }
-  async init_launcher(req, ondata) {
-    console.log("init_launcher", req)
-    try {
-      let projectType = req.params.projectType
-      let startType = req.params.cliType || req.params.startType
-      console.log({ projectType, startType })
-
-      let cwd = req.cwd
-      let name = req.name
-      let payload = {}
-      payload.cwd = path.resolve(cwd, name)
-      payload.input = req.params
-
-      let mod_path = path.resolve(__dirname, "../proto", projectType, startType)
-      let mod = await this.kernel.require(mod_path)
-
-      await mod(payload, ondata, this.kernel)
-
-      // copy readme
-      let readme_path = path.resolve(__dirname, "../proto/PINOKIO.md")
-      console.log("copy to", readme_path, path.resolve(cwd, name, "PINOKIO.md"))
-      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
-
-      return { success: "/p/" + name }
-    } catch (e) {
-      console.log("ERROR", e)
-      return { error: e.stack }
-    }
-  }
+//  async init_launcher(req, ondata) {
+//    console.log("init_launcher", req)
+//    try {
+//      let projectType = req.params.projectType
+//      let startType = req.params.cliType || req.params.startType
+//      console.log({ projectType, startType })
+//
+//      let cwd = req.cwd
+//      let name = req.name
+//      let payload = {}
+//      payload.cwd = path.resolve(cwd, name)
+//      payload.input = req.params
+//
+//      let mod_path = path.resolve(__dirname, "../proto", projectType, startType)
+//      let mod = await this.kernel.require(mod_path)
+//
+//      await mod(payload, ondata, this.kernel)
+//
+//      // copy readme
+//      let readme_path = path.resolve(__dirname, "../proto/PINOKIO.md")
+//      console.log("copy to", readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+//      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
+//
+//      // copy CLI.md
+//      let cli_readme_path = 
+//
+//      return { success: "/p/" + name }
+//    } catch (e) {
+//      console.log("ERROR", e)
+//      return { error: e.stack }
+//    }
+//  }
   async filepicker(req, ondata) {
     let res = await Util.filepicker(req, ondata, this.kernel)
     return res
@@ -681,7 +684,6 @@ class Bin {
     } else {
       this.client = null
     }
-    console.log("Client", this.client)
     let requirements = JSON.parse(req.params)
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
@@ -761,6 +763,7 @@ class Bin {
   async check_installed(r, dependencies) {
     if (Array.isArray(r.name)) {
       for(let name of r.name) {
+        let d = Date.now()
         let installed = await this._installed(name, r.type, dependencies)
         if (!installed) return false
       }
@@ -773,13 +776,10 @@ class Bin {
   async _installed(name, type, dependencies) {
     if (type === "conda") {
       let conda_installed = this.installed.conda.has(name)
-      console.log({ dependencies })
       let dependencies_installed = true
       for(let d of dependencies) {
-        console.log("checking dependency", d)
         if(!this.installed.conda.has(d)) {
           dependencies_installed = false
-          console.log("not installed", d)
           break
         }
       }
@@ -793,10 +793,20 @@ class Bin {
       let filepath = path.resolve(__dirname, "..", "kernel", "bin", name + ".js")
       let mod = this.mod[name]
       let installed = false
-      if (mod.installed) {
-        installed = await mod.installed()
+      if (!this.cached_mod_installed) {
+        this.cached_mod_installed = {}
+      }
+      if (this.cached_mod_installed[name] === true) {
+        return true
+      } else {
+        if (mod.installed) {
+          installed = await mod.installed()
+          if (installed) {
+            this.cached_mod_installed[name] = true
+          }
+        }
+        return installed
       }
-      return installed
     }
   }
   preset(mode) {
@@ -979,15 +989,22 @@ class Bin {
     let install_required = true
     if (!requirements_pending) {
       install_required = false
-      console.log("requirements", requirements)
       for(let i=0; i<requirements.length; i++) {
         let r = requirements[i]
         let fingerprint = JSON.stringify(r)
         let installed
-        if (this.requirements_cache[fingerprint]) {
-          console.log("USE CACHED", fingerprint)
-          installed = true
-          requirements[i].installed = true
+        if (fingerprint in this.requirements_cache) {
+          let relevant = this.relevant(r)
+          requirements[i].relevant = relevant
+          if (relevant) {
+            let dependencies
+            if (r.name === "conda") {
+              dependencies = config.bin.conda_requirements
+              requirements[i].dependencies = dependencies
+            }
+            installed = this.requirements_cache[fingerprint]
+            requirements[i].installed = this.requirements_cache[fingerprint]
+          }
         } else {
           //let installed = await this.installed(r)
           //requirements[i].installed = installed
@@ -1003,10 +1020,11 @@ class Bin {
               requirements[i].dependencies = dependencies
             }
             installed = await this.check_installed(r, dependencies)
-            if (installed) {
-              // cache if true
-              this.requirements_cache[fingerprint] = true
-            }
+            this.requirements_cache[fingerprint] = installed
+            //if (installed) {
+            //  // cache if true
+            //  this.requirements_cache[fingerprint] = true
+            //}
             requirements[i].installed = installed
           }
         }

package/kernel/index.js

@@ -277,7 +277,8 @@ class Kernel {
     return installed
   }
   async network_running() {
-    let installed = await this.network_installed()
+    let installed = true
+//    let installed = await this.network_installed()
     if (installed) {
       try {
         await axios.get(`http://127.0.0.1:2019/config/`, { timeout: 1000 });
@@ -782,7 +783,9 @@ class Kernel {
       this.bin.init().then(() => {
         if (this.homedir) {
           this.shell.init().then(async () => {
-//            this.bin.check()
+            this.bin.check({
+              bin: this.bin.preset("ai"),
+            })
             if (this.envs) {
               this.template.update({
                 env: this.envs,
@@ -924,10 +927,13 @@ class Kernel {
   }
   async exec(params, ondata) {
 //    params.path = this.path()
-//    if (this.client) {
-//      params.cols = this.client.cols
-//      params.rows = this.client.rows
-//    }
+    if (this.client) {
+      params.cols = this.client.cols
+      params.rows = this.client.rows
+    } else if (this.bin.client) {
+      params.cols = this.bin.client.cols
+      params.rows = this.bin.client.rows
+    }
     let response = await this.shell.run(params, null, ondata)
     return response
   }

package/kernel/prototype.js

@@ -24,6 +24,9 @@ class Proto {
         }, (e) => {
           process.stdout.write(e.raw)
         })
+      }
+      let exists2 = await this.kernel.exists("prototype/PINOKIO.md")
+      if (!exists2) {
         await this.kernel.download({
           uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
           path: this.kernel.path("prototype"),
@@ -32,6 +35,16 @@ class Proto {
           process.stdout.write(e.raw)
         })
       }
+      let exists3 = await this.kernel.exists("prototype/CLI.md")
+      if (!exists3) {
+        await this.kernel.download({
+          uri: "https://raw.githubusercontent.com/pinokiocomputer/pterm/refs/heads/main/README.md",
+          path: this.kernel.path("prototype"),
+          filename: "CLI.md"
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      }
     }
   }
   async reset() {
@@ -59,6 +72,11 @@ class Proto {
       let readme_path = this.kernel.path("prototype/PINOKIO.md")
       await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
 
+      // copy cli.md
+      let cli_readme_path = this.kernel.path("prototype/CLI.md")
+      await fs.promises.cp(cli_readme_path, path.resolve(cwd, name, "CLI.md"))
+
+
       return { success: "/p/" + name }
     } catch (e) {
       console.log("ERROR", e)

package/kernel/shells.js

@@ -302,6 +302,7 @@ class Shells {
       }
     */
     let session = this.get(params.id)
+    console.log({ session })
     if (session) {
       session.resize(params.resize)
     }

package/kernel/util.js

@@ -32,10 +32,9 @@ if( __dirname.includes(".asar") ) {
 }
 const { getFolderSize, getFolderSizeBin, getFolderSizeWasm, } = g
 const du = async (folderpath) => {
-  console.time("disk size calc")
+//  console.time("disk size calc")
   let totalSize = await getFolderSizeBin(folderpath)
-  console.timeEnd("disk size calc")
-  console.log("totalSize", totalSize)
+//  console.timeEnd("disk size calc")
   return totalSize;
 }
 

package/package.json

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

package/server/index.js

@@ -366,10 +366,6 @@ class Server {
   }
 
   async chrome(req, res, type) {
-    let d = "Request " + Date.now()
-    console.time(d)
-
-    console.time("bin check " + d)
     let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
       bin: this.kernel.bin.preset("dev"),
     })
@@ -377,7 +373,6 @@ class Server {
       res.redirect(`/setup/dev?callback=${req.originalUrl}`)
       return
     }
-    console.timeEnd("bin check " + d)
 
     let name = req.params.name
     let config = await this.kernel.api.meta(name)
@@ -530,7 +525,6 @@ class Server {
 
     let c = this.kernel.path("api", name)
 
-    let repos = await this.kernel.git.repos(c)
     await this.kernel.plugin.init()
     let plugin = await this.getPlugin(name)
     let plugin_menu = null
@@ -543,7 +537,7 @@ class Server {
     let current_urls = await this.current_urls(req.originalUrl.slice(1))
 
     const result = {
-      repos,
+//      repos,
       current_urls,
       path: this.kernel.path("api", name),
       plugin_menu,
@@ -559,6 +553,7 @@ class Server {
       running:this.kernel.api.running,
       memory: this.kernel.memory,
       sidebar: "/pinokio/sidebar/" + name,
+      repos: "/pinokio/repos/" + name,
       dynamic: "/pinokio/dynamic/" + name,
 //      dynamic: "/pinokio/dynamic/" + name,
       dynamic_content: null,
@@ -579,7 +574,6 @@ class Server {
     if (!this.kernel.proto.config) {
       await this.kernel.proto.init()
     }
-    console.timeEnd(d)
     res.render("app", result)
   }
   getVariationUrls(req) {
@@ -2468,7 +2462,6 @@ class Server {
     }
   }
   async getPlugin(name) {
-    console.log("getPlugin", name)
     if (this.kernel.plugin.config) {
       try {
         let info = new Info(this.kernel)
@@ -2494,7 +2487,6 @@ class Server {
     }
   }
   async check_router_up() {
-    console.log("/check_router_up")
     // check if caddy is runnign properly
     //    try https://pinokio.localhost
     //    if it works, proceed
@@ -2509,9 +2501,9 @@ class Server {
         https_running = true
       }
     } catch (e) {
-      console.log(e)
+//      console.log(e)
     }
-    console.log({ https_running })
+//    console.log({ https_running })
     if (!https_running) {
       return { error: "pinokio.host not yet available" }
     }
@@ -4608,6 +4600,17 @@ class Server {
       }
       res.send(html)
     }))
+    this.app.get("/pinokio/repos/:name", ex(async (req, res) => {
+  //    await this.kernel.plugin.init()
+      let c = this.kernel.path("api", req.params.name)
+      let repos = await this.kernel.git.repos(c)
+      let html = await new Promise((resolve, reject) => {
+        ejs.renderFile(path.resolve(__dirname, "views/partials/repos.ejs"), { repos }, (err, html) => {
+          resolve(html)
+        })
+      })
+      res.send(html)
+    }))
     this.app.get("/pinokio/sidebar/:name", ex(async (req, res) => {
       let name = req.params.name
       let app_path = this.kernel.path("api", name, "pinokio.js")
@@ -4894,6 +4897,9 @@ class Server {
       await compressing.zip.compressDir(folder, zipPath)
       res.json({ success: true })
     }))
+    this.app.get("/pinokio/version", ex(async (req, res) => {
+      res.json(this.version)
+    }))
     this.app.get("/pinokio/info", ex(async (req, res) => {
       await this.kernel.getInfo(true)
       let info = Object.assign({}, this.kernel.i)
@@ -5221,7 +5227,6 @@ class Server {
       if (this.kernel.peer.active) {
         // if network is active, return success only if the router is up for all of its peers (including itself)
         console.log({ peer_info: this.kernel.peer.info })
-        console.time("check_peer")
         let ready = true
         if (this.kernel.peer.info && Object.keys(this.kernel.peer.info).length > 0) {
           for(let host in this.kernel.peer.info) {
@@ -5237,7 +5242,6 @@ class Server {
           ready = false;
         }
         console.log({ info: this.kernel.peer.info, ready })
-        console.timeEnd("check_peer")
         if (ready) {
           res.json({ success: true })
         } else {

package/server/socket.js

@@ -157,6 +157,7 @@ class Socket {
               paste: req.paste
             })
           } else if (req.resize && req.id) {
+            console.log("RESIZE", req)
             this.parent.kernel.shell.resize({
               id: req.id,
               resize: req.resize

package/server/views/app.ejs

@@ -873,12 +873,7 @@ body.dark .appcanvas {
           <div class='tab'><i class="fa-solid fa-cloud"></i> Git</div>
           <div class='loader'><i class="fa-solid fa-angle-down"></i><i class="fa-solid fa-angle-up hidden"></i></div>
         </div>
-        <div class='submenu'>
-          <% repos.forEach((git, index) => { %>
-            <a target="/git/<%=git.gitParentRelPath%>" href="/git/<%=git.gitParentRelPath%>" class='btn header-item frame-link' data-index="<%=index%>" data-mode="refresh">
-              <div class='tab'><i class="fa-regular fa-folder-open"></i> <%=git.gitRelPath%></div>
-            </a>
-          <% }) %>
+        <div class='submenu' id='git-repos'>
         </div>
       </div>
     <% } %>
@@ -1933,6 +1928,14 @@ body.dark .appcanvas {
       document.querySelector(".dynamic").innerHTML = dynamic
     }
 
+
+    const repos = await fetch("<%=repos%>").then((res) => {
+      return res.text()
+    })
+    if (document.querySelector("#git-repos")) {
+      document.querySelector("#git-repos").innerHTML = repos
+    }
+
     location.hash = ""
 
     // render the selected frame only if not silent
@@ -2042,6 +2045,14 @@ body.dark .appcanvas {
   });
   refresh_du()
   <% if (type !== 'run') { %>
+    debugger
+    fetch("<%=repos%>").then((res) => {
+      return res.text()
+    }).then((repos) => {
+      if (document.querySelector("#git-repos")) {
+        document.querySelector("#git-repos").innerHTML = repos
+      }
+    })
     if (document.querySelector(".dynamic .reveal")) {
       document.querySelector(".dynamic .reveal").click()
     }

package/server/views/git.ejs

@@ -115,11 +115,12 @@ main h3 {
 <nav>
   <% if (remote) { %>
     <a href="/run/scripts/git/push.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-brands fa-github"></i> Publish to GitHub</a>
+    <a href="/run/scripts/git/commit.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-solid fa-floppy-disk"></i> Commit (Save the current version)</a>
     <a href="<%=remote%>" target="_blank"><%=remote%></a>
   <% } else { %>
     <a href="/run/scripts/git/create.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-brands fa-github"></i> Create on GitHub</a>
+    <a href="/run/scripts/git/commit.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-solid fa-floppy-disk"></i> Commit (Save the current version)</a>
   <% } %>
-  <a href="/run/scripts/git/commit.json?cwd=<%=encodeURIComponent(dir)%>" class='btn'><i class="fa-solid fa-floppy-disk"></i> Commit (Save the current version)</a>
 </nav>
 <main>
 <h2>Changed Files</h2>

package/server/views/install.ejs

@@ -244,6 +244,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   });
   observer.observe(document.body)
   await new Promise((resolve, reject) => {
+    console.log({ cols: term.cols, rows: term.rows })
     socket.run({
       id: location.pathname,
       method: "kernel.bin.install",

package/server/views/partials/repos.ejs

@@ -0,0 +1,5 @@
+<% repos.forEach((git, index) => { %>
+  <a target="/git/<%=git.gitParentRelPath%>" href="/git/<%=git.gitParentRelPath%>" class='btn header-item frame-link' data-index="<%=index%>" data-mode="refresh">
+    <div class='tab'><i class="fa-regular fa-folder-open"></i> <%=git.gitRelPath%></div>
+  </a>
+<% }) %>