pinokiod 2.15.31 → 2.15.33

package/kernel/api/hf/index.js

@@ -21,15 +21,16 @@ class HF {
   */
   async download(req, ondata, kernel) {
     const shell = new Shell()
-    console.log("params before", req.params)
     let params = Object.assign({}, req.params)
     delete params.env
     delete params.path
     let chunks = unparse(params)
-    let message = `huggingface-cli download ${chunks.join(" ")}`
+    let message = [
+      `huggingface-cli download ${chunks.join(" ")}`,
+      (kernel.platform === "win32" ? "dir" : "ls")
+    ]
     console.log({ message, before: req.params.message })
     req.params.message = message
-    console.log("params after", req.params)
     let res = await shell.run(req, ondata, kernel)
     return res
   }

package/package.json

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

package/server/views/browser-experimental.ejs

@@ -523,7 +523,11 @@ body.dark .loader-container {
   aside:not(.active) {
     display: none;
   }
+  .container {
+    display: none;
+  }
   .container.active {
+    display: block;
     position: absolute;
     z-index: 10000000;
     width: 100%;
@@ -740,16 +744,9 @@ const nav = (type) => {
 //  }
 }
 const renderSelection = (e, force) => {
-  console.log("# 1")
   // if the menu has a default item, or if the url specifies a selection
-  let selection = null;
-  <% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
-    selection = document.querySelector("[data-default]")
-  <% } %>
+  let selection = document.querySelector("[data-default]")
   if (selection || location.hash && location.hash.length > 0) {
-    console.log("# 2")
-
-
     let target
     if (location.hash && location.hash.length > 0) {
   //    document.querySelector(".bar").classList.remove("hidden")
@@ -759,7 +756,8 @@ const renderSelection = (e, force) => {
 
       let selector
       if (id.startsWith("@")) {
-        selector = `aside [target='${id.slice(1)}']`
+        //selector = `aside [target='${id.slice(1)}']`
+        selector = `aside [target='${id}']`
       } else {
         let type = id[0]
         let index = id.slice(1)
@@ -809,11 +807,9 @@ const renderSelection = (e, force) => {
       // minimize aside
 
       document.querySelector(".container").classList.add("active")
-      document.querySelector(".container").classList.remove("hidden")
       document.querySelector("aside").classList.remove("active")
     } else {
       document.querySelector(".container").classList.remove("active")
-      document.querySelector(".container").classList.add("hidden")
       document.querySelector("aside").classList.add("active")
     }
 
@@ -843,17 +839,13 @@ const renderSelection = (e, force) => {
       // 2. if it's soft (".s")
       //    find using the name attribute
       let targetFrame;
-      console.log("> A")
       if (target.closest(".h")) {
-        console.log("> B")
         let hardFrames = document.querySelectorAll(".browserview iframe[name^='@']")
         let port = new URL(target.href).port || 80
         for(let frame of hardFrames) {
-          console.log("> C")
           console.log({ src: frame.src, href: target.href, target: target.target })
           // Types of links in the tab
           if (String(port) === "<%=port%>") {
-            console.log("> D")
             // 1. running from <%=port%> => find a frame whose base URL matches the tab's base URL
             // Pinokio links
             let targetPath = new URL(target.href).pathname
@@ -867,7 +859,6 @@ const renderSelection = (e, force) => {
             }
           } else {
             // 2. rest => find the frame whose src exactly matches the tab's url
-            console.log("> E")
             if (target.href === frame.src) {
               frame.name = target.target
               targetFrame = frame
@@ -881,8 +872,6 @@ const renderSelection = (e, force) => {
       } else if (target.closest(".n")) {
         targetFrame = document.querySelector(`iframe[name='${target.target}']`)
       }
-      console.log("targetFrame", targetFrame)
-
 
       /*
       // Load the link in the frame
@@ -908,7 +897,6 @@ const renderSelection = (e, force) => {
       */
 
       if (targetFrame) {
-        console.log("> F")
         targetFrame.classList.remove("hidden")
         let mode = target.getAttribute("data-mode")
         if (mode === "refresh") {
@@ -919,7 +907,6 @@ const renderSelection = (e, force) => {
               e.preventDefault()
               e.stopPropagation()
               let sub = subUrlOf(target.href, targetFrame.src)
-              console.log("issub", sub)
               if (!sub) {
                 targetFrame.src = target.href
               }
@@ -950,7 +937,6 @@ const renderSelection = (e, force) => {
             }
           } else {
             if (force) {
-              console.log("# 7")
               targetFrame.src = target.href
             }
           }
@@ -959,7 +945,6 @@ const renderSelection = (e, force) => {
           }, "*")
         }
       } else {
-        console.log("# 12")
         let frame = document.createElement("iframe")
         frame.name = target.target
         frame.src = target.href
@@ -1058,13 +1043,14 @@ const renderSelection = (e, force) => {
   } else {
     console.log("# 14")
     document.querySelector(".container").classList.remove("active")
-    document.querySelector(".container").classList.add("hidden")
     document.querySelector("aside").classList.add("active")
 
   }
 }
 console.log("loaded before", loaded)
+<% if (type === "run" && env.PINOKIO_SCRIPT_DEFAULT && env.PINOKIO_SCRIPT_DEFAULT.toString().toLowerCase() === "true") { %>
 renderSelection()
+<% } %>
 //renderCursor()
 console.log("loaded after", loaded)
 //Reporter()
@@ -1298,7 +1284,6 @@ document.querySelector("aside").addEventListener("click", async (e) => {
         uri: "~" + src
       }
     }, (packet) => {
-      console.log("packet", packet)
       if (packet.type === "result") {
         socket.close()
         n.Noty({
@@ -1331,7 +1316,6 @@ document.querySelector("aside").addEventListener("click", async (e) => {
     let confirmText = target.getAttribute("data-confirm")
     if (confirmText && confirmText.length > 0) {
       const confirmed = confirm(confirmText)
-      console.log('confirmed', confirmed)
       if (!confirmed) {
         e.preventDefault()
         e.stopPropagation()
@@ -1351,7 +1335,6 @@ document.querySelector("aside").addEventListener("click", async (e) => {
             uri: action.uri//"~" + location.pathname
           }
         }, (packet) => {
-          console.log("packet", packet)
           if (packet.type === "result") {
             socket.close()
 //              location.href = location.href
@@ -1401,12 +1384,29 @@ document.querySelector("aside").addEventListener("click", async (e) => {
 
 
 })
+const refresh_du = () => {
+  fetch("/du/<%=name%>").then((res) => {
+    return res.json()
+  }).then((res) => {
+    let val
+    let k = 1024
+    if (res.du > k * k * k) {
+      // GB
+      val = `${Math.floor(res.du/k/k/k * 100) / 100} GB`
+    } else if (res.du > k * k) {
+      // MB
+      val = `${Math.floor(res.du/k/k * 100) / 100} MB`
+    } else {
+      // KB
+      val = `${Math.floor(res.du/k * 100) / 100} KB`
+    }
+    //document.querySelector(".disk-usage").innerHTML = `<i class="fa-regular fa-hard-drive"></i> ${val}`
+    document.querySelector(".disk-usage").innerHTML = val
+  })
+}
 const refresh = async (silent, options) => {
-  console.log("REFRESH")
   if (options && options.nodelay) {
-    console.log("1")
   } else {
-    console.log("2")
     await new Promise((resolve, reject) => {
       setTimeout(() => {
         resolve()
@@ -1424,35 +1424,36 @@ const refresh = async (silent, options) => {
   } else {
     if (options && options.nodelay) {
     } else {
-      await new Promise((resolve, reject) => {
-        setTimeout(() => {
-          resolve()
-        }, 500)
-      })
+//      await new Promise((resolve, reject) => {
+//        setTimeout(() => {
+//          resolve()
+//        }, 500)
+//      })
     }
     renderSelection()
   }
+  refresh_du()
 }
-document.querySelector("#genlog").addEventListener("click", (e) => {
-  e.preventDefault()
-  e.stopPropagation()
-  e.target.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
-  fetch("/pinokio/log", {
-    method: "post",
-  }).then((res) => {
-    console.log("RES", res)
-    let btn = document.querySelector("#genlog")
-    let btn2 = document.querySelector("#downloadlogs")
-    btn2.classList.remove("hidden") 
-    btn.classList.add("hidden")
-    btn.innerHTML = '<i class="fa-solid fa-circle-check"></i> Generated!'
-    //btn.classList.add("hidden")
+if (document.querySelector("#genlog")) {
+  document.querySelector("#genlog").addEventListener("click", (e) => {
+    e.preventDefault()
+    e.stopPropagation()
+    e.target.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
+    fetch("/pinokio/log", {
+      method: "post",
+    }).then((res) => {
+      let btn = document.querySelector("#genlog")
+      let btn2 = document.querySelector("#downloadlogs")
+      btn2.classList.remove("hidden") 
+      btn.classList.add("hidden")
+      btn.innerHTML = '<i class="fa-solid fa-circle-check"></i> Generated!'
+      //btn.classList.add("hidden")
+    })
   })
-})
+}
 window.addEventListener('message', (event) => {
 
   // only process the event it's coming from pinokio
-  console.log("EVENT", event)
   let origin = event.origin
   if (origin) {
     let port = new URL(origin).port || 80
@@ -1494,24 +1495,7 @@ window.addEventListener('message', (event) => {
 
 
 });
-fetch("/du/<%=name%>").then((res) => {
-  return res.json()
-}).then((res) => {
-  let val
-  let k = 1024
-  if (res.du > k * k * k) {
-    // GB
-    val = `${Math.floor(res.du/k/k/k * 100) / 100} GB`
-  } else if (res.du > k * k) {
-    // MB
-    val = `${Math.floor(res.du/k/k * 100) / 100} MB`
-  } else {
-    // KB
-    val = `${Math.floor(res.du/k * 100) / 100} KB`
-  }
-  //document.querySelector(".disk-usage").innerHTML = `<i class="fa-regular fa-hard-drive"></i> ${val}`
-  document.querySelector(".disk-usage").innerHTML = val
-})
+refresh_du()
 /*
 document.addEventListener("keydown", (e) => {
   let size = document.querySelectorAll(".selectable").length

package/server/views/fullscreen_editor.ejs

@@ -192,7 +192,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             rows: this.term.rows,
           }
         }, async (packet) => {
-          console.log({ packet })
           if (packet.type === 'start') {
             refreshParent(packet)
             reloadMemory()
@@ -455,7 +454,6 @@ document.addEventListener("DOMContentLoaded", async () => {
             })
             */
             console.log("instance", instance)
-            console.log("EVENT", packet.event)
             instance.mark(packet.event)
             let element = document.querySelector("mark")
             element.scrollIntoView({ behavior: "smooth", block: "center" });

package/server/views/index.ejs

@@ -1060,22 +1060,24 @@ if (document.querySelector("#forward")) {
     history.forward()
   })
 }
-document.querySelector("#genlog").addEventListener("click", (e) => {
-  e.preventDefault()
-  e.stopPropagation()
-  e.target.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
-  fetch("/pinokio/log", {
-    method: "post",
-  }).then((res) => {
-    console.log("RES", res)
-    let btn = document.querySelector("#genlog")
-    let btn2 = document.querySelector("#downloadlogs")
-    btn2.classList.remove("hidden") 
-    btn.classList.add("hidden")
-    btn.innerHTML = '<i class="fa-solid fa-circle-check"></i> Generated!'
-    //btn.classList.add("hidden")
+if (document.querySelector("#genlog")) {
+  document.querySelector("#genlog").addEventListener("click", (e) => {
+    e.preventDefault()
+    e.stopPropagation()
+    e.target.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
+    fetch("/pinokio/log", {
+      method: "post",
+    }).then((res) => {
+      console.log("RES", res)
+      let btn = document.querySelector("#genlog")
+      let btn2 = document.querySelector("#downloadlogs")
+      btn2.classList.remove("hidden") 
+      btn.classList.add("hidden")
+      btn.innerHTML = '<i class="fa-solid fa-circle-check"></i> Generated!'
+      //btn.classList.add("hidden")
+    })
   })
-})
+}
 
 </script>
 </body>