pinokiod 2.15.47 → 2.15.50

package/kernel/api/hf/index.js

@@ -26,8 +26,7 @@ class HF {
     delete params.path
     let chunks = unparse(params)
     let message = [
-      `huggingface-cli download ${chunks.join(" ")}`,
-      (kernel.platform === "win32" ? "dir" : "ls")
+      `huggingface-cli download ${chunks.join(" ")}` + (kernel.platform === "win32" ? " && dir" : " ; ls")
     ]
     console.log({ message, before: req.params.message })
     req.params.message = message

package/kernel/bin/playwright.js

@@ -2,10 +2,16 @@ const fs = require('fs')
 const { rimraf } = require('rimraf')
 class Playwright {
   async install(req, ondata) {
+    let c
+    if (this.kernel.platform === "win32") {
+      c = `npm config set prefix ${this.kernel.bin.path("miniconda")}`
+    } else {
+      c = `npm config set prefix ${this.kernel.bin.path("miniconda/lib")}`
+    }
     await this.kernel.exec({
       message: [
 //        "npm init -y",
-        `npm config set prefix ${this.kernel.bin.path("miniconda")}`,
+        c
       ],
       path: this.kernel.bin.path("playwright"),
       env: {

package/kernel/shells.js

@@ -150,8 +150,6 @@ class Shells {
       ondata(stream)
     })
 
-    console.log(">>>>>> RESPONSE", response)
-
     /*
       {
         method: "shell.run",
@@ -181,7 +179,6 @@ class Shells {
 
         // 2. first find the `break: false` handlers and replace the patterns with blank => so they won't be matched in the next step
         //let line = response.replaceAll(/[\r\n]/g, "")
-        console.log("checking breakpoints", breakPoints)
         for(let handler of breakPoints) {
           if (handler.event) {
             let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(handler.event)

package/kernel/util.js

@@ -140,6 +140,16 @@ const parse_env_detail = async (filename) => {
   */
   return items
 }
+const log_path = (fullpath, kernel) => {
+  let api_path = `${kernel.homedir}${path.sep}api`
+  let rel_path = path.relative(api_path, fullpath)
+  console.log({ rel_path })
+  let log_root = `${kernel.homedir}${path.sep}logs`
+  console.log({ log_root })
+  let current_log_path = path.resolve(log_root, "shell/cleaned/api", rel_path)
+  console.log({ current_log_path })
+  return current_log_path
+}
 const api_path = (fullpath, kernel) => {
   let api_path = `${kernel.homedir}${path.sep}api`
   let rel_path = path.relative(api_path, fullpath)
@@ -196,5 +206,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 module.exports = {
-  parse_env, api_path, update_env, parse_env_detail, openfs, port_running, du
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du
 }

package/package.json

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

package/server/index.js

@@ -931,6 +931,8 @@ class Server {
             items: pre_items
           })
         } else {
+          let logpath = encodeURIComponent(Util.log_path(filepath, this.kernel))
+          console.log({ logpath })
           const result = {
             prev,
             error,
@@ -949,6 +951,7 @@ class Server {
             gitRemote,
             filename,
             filepath,
+            logpath,
             encodedFilePath: encodeURIComponent(filepath),
             schemaPath,
             uri,
@@ -2363,6 +2366,11 @@ class Server {
         apps
       })
     }))
+    this.app.get("/getlog", ex(async (req, res) => {
+      console.log("query", req.query)
+      let str = await fs.promises.readFile(req.query.logpath, "utf8")
+      res.send(str)
+    }))
     this.app.post("/proxy", ex(async (req, res) => {
       /*
         req.body := {

package/server/views/editor.ejs

@@ -89,6 +89,13 @@ td.key {
 header .runner {
   padding: 10px 0 0;
 }
+#del-bin {
+  color: royalblue;
+  cursor: pointer;
+  font-weight: bold;
+  padding: 0 5px;
+  text-decoration: underline;
+}
 </style>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
@@ -742,6 +749,40 @@ document.addEventListener("DOMContentLoaded", async () => {
   document.querySelector("#close-error-screen").addEventListener('click', (e) => {
     document.querySelector("#error-screen").classList.add("hidden")
   })
+  if (document.querySelector("#del-bin")) {
+    document.querySelector("#del-bin").addEventListener("click", async (e) => {
+      console.log("del-bin")
+      let proceed = confirm("Are you sure you wish to delete the bin folder?")
+      if (proceed) {
+        document.querySelector(".reset-bin-loading").classList.remove("hidden")
+        document.querySelector("#del-bin").classList.add("hidden")
+        let res = await fetch("/pinokio/delete", {
+          method: "post",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ type: "bin" })
+        }).then((res) => {
+          return res.json()
+        })
+        console.log(res)
+        document.querySelector(".reset-bin-loading").classList.add("hidden")
+        if (res.error) {
+          alert(res.error)
+        } else {
+          location.href = location.href
+        }
+      }
+    })
+  }
+  /*
+  document.querySelector("#open-log").addEventListener("click", async (e) => {
+    let logs = await fetch("/getlog?logpath=<%=logpath%>").then((res) => {
+      return res.text()
+    })
+    console.log(logs)
+  })
+  */
 })
 const reloadMemory = async () => {
 //  let url = "/pinokio/memory?filepath=" + encodeURI("<%-filepath%>")
@@ -795,6 +836,9 @@ const reloadMemory = async () => {
       </div>
       <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
       <!--
+      <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
+      -->
+      <!--
       <button class='btn' id='source' data-editor-url="<%=editorUrl%>">Navigate</button>
       -->
       <div id='save' class='btn disabled'>
@@ -836,6 +880,12 @@ const reloadMemory = async () => {
             <input type='hidden' name='callback' value="<%=current%>">
             <button class='btn'>Install</button>
           </form>
+          <div class='item'>
+            <div class='d'>Not working? <a id='del-bin'>Try a fresh install</a></div>
+            <div class='reset-bin-loading hidden'>
+              <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+            </div>
+          </div>
         </div>
       </div>
     <% } else { %>

package/server/views/fullscreen_editor.ejs

@@ -98,6 +98,13 @@ header {
 .btn {
   background: royalblue;
 }
+#del-bin {
+  color: royalblue;
+  cursor: pointer;
+  font-weight: bold;
+  padding: 0 5px;
+  text-decoration: underline;
+}
 </style>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
@@ -711,6 +718,38 @@ document.addEventListener("DOMContentLoaded", async () => {
   document.querySelector("#close-error-screen").addEventListener('click', (e) => {
     document.querySelector("#error-screen").classList.add("hidden")
   })
+  if (document.querySelector("#del-bin")) {
+    document.querySelector("#del-bin").addEventListener("click", async (e) => {
+      console.log("del-bin")
+      let proceed = confirm("Are you sure you wish to delete the bin folder?")
+      if (proceed) {
+        document.querySelector(".reset-bin-loading").classList.remove("hidden")
+        document.querySelector("#del-bin").classList.add("hidden")
+        let res = await fetch("/pinokio/delete", {
+          method: "post",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ type: "bin" })
+        }).then((res) => {
+          return res.json()
+        })
+        console.log(res)
+        document.querySelector(".reset-bin-loading").classList.add("hidden")
+        if (res.error) {
+          alert(res.error)
+        } else {
+          location.href = location.href
+        }
+      }
+    })
+  }
+//  document.querySelector("#open-log").addEventListener("click", async (e) => {
+//    let logs = await fetch("/getlog?logpath=<%=logpath%>").then((res) => {
+//      return res.text()
+//    })
+//    console.log(logs)
+//  })
 })
 const reloadMemory = async () => {
 //  let url = "/pinokio/memory?filepath=<%=encodedFilePath%>"
@@ -754,6 +793,9 @@ const reloadMemory = async () => {
         <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>
       <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
+      <!--
+      <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
+      -->
     </div>
   <% } %>
   </header>
@@ -790,6 +832,12 @@ const reloadMemory = async () => {
             <input type='hidden' name='callback' value="<%=current%>">
             <button class='btn'>Install</button>
           </form>
+          <div class='item'>
+            <div class='d'>Not working? <a id='del-bin'>Try a fresh install</a></div>
+            <div class='reset-bin-loading hidden'>
+              <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+            </div>
+          </div>
         </div>
       </div>
     <% } else { %>