pinokiod 3.12.2 → 3.12.3

package/kernel/shell.js

@@ -324,17 +324,17 @@ class Shell {
     this.vt.resize(cols, rows)
   }
   emit2(message) {
-    console.log("emit2", message)
     let i = 0;
+    let total = message.length
     const interval = setInterval(() => {
       if (i >= message.length) {
         clearInterval(interval);
         return;
       }
       let chunk = message.slice(i, i+1024)
-      console.log("chunk", i, chunk)
       this.ptyProcess.write(chunk)
       i += 1024;
+      this.ondata({ i, total, type: "emit2" })
     }, 10);
   }
   emit(message) {
@@ -343,7 +343,6 @@ class Shell {
     } else {
       if (this.ptyProcess) {
         if (this.input) {
-          console.log("emit", { message })
           console.log(Buffer.from(message))
           this.ptyProcess.write(message)
         }
@@ -933,8 +932,6 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
-            console.log("onData", { data })
-            console.log([...data].map(c => c.charCodeAt(0)));
             if (!this.done) {
               this.queue.push(data)
             }

package/kernel/util.js

@@ -92,6 +92,7 @@ const parse_env = async (filename) => {
   }
 }
 const run = (cmd, cwd, kernel) => {
+  console.log("Util.run", { cmd, cwd })
   child_process.exec(cmd, { cwd })
   /*
   if (kernel) {

package/package.json

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

package/server/public/opener.js

@@ -29,6 +29,7 @@ const open_url = (href, target, features) => {
   }
 }
 document.addEventListener("click", async (e) => {
+  debugger
   // [data-filepath] should open in file explorer
   let el = e.target.closest("[data-filepath]")
   if (!el) {

package/server/views/shell.ejs

@@ -296,6 +296,10 @@ document.addEventListener("DOMContentLoaded", async () => {
             if (packet.data.type === "shell.kill") {
               this.socket.close()
             }
+            if (packet.data.type === "emit2") {
+              // long text => still posting to the shell => show progress
+              console.log("emit2", { packet.data })
+            }
             document.querySelector(".play-btn").classList.add("hidden")
             document.querySelector(".starting-btn").classList.add("hidden")
             document.querySelector(".stop-btn").classList.remove("hidden")

package/server/views/terminal.ejs

@@ -105,10 +105,15 @@ header {
 }
 */
 #status-window {
+  /*
   flex-grow: 1;
   text-align: right;
+  */
   padding: 0 10px;
 }
+#status-window strong {
+  color: yellowgreen;
+}
 #status-window b {
   color: black;
   font-weight: normal;
@@ -116,6 +121,22 @@ header {
 body.dark #status-window b {
   color: white;
 }
+#progress-window {
+  flex-shrink: 0;
+  width: 100px;
+  background: #eee;
+  height: 15px;
+  /*
+  border-radius: 5px;
+  */
+  overflow: hidden;
+}
+#progress-bar {
+  width: 0%;
+  height: 100%;
+  background: yellowgreen;
+  transition: width 0.2s;
+}
 #del-bin {
   color: royalblue;
   cursor: pointer;
@@ -297,6 +318,18 @@ document.addEventListener("DOMContentLoaded", async () => {
               this.write(JSON.stringify(packet.data.json2, null, 2).replace(/\n/g, "\r\n"))
               this.write("\r\n")
             }
+            if (packet.data.type === "emit2") {
+              // long text => still posting to the shell => show progress
+              console.log("emit2", packet.data)
+              document.querySelector("#status-window").innerHTML = `<strong>Pasting... (${Math.floor(100 * packet.data.i/packet.data.total)}%)</strong>`
+              let percent = Math.floor(100 * packet.data.i/packet.data.total)
+              document.querySelector("#progress-window").classList.remove("hidden")
+              document.querySelector("#progress-bar").style.width = "" + percent + "%";
+            } else {
+              document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
+              document.querySelector("#progress-window").classList.add("hidden")
+              document.querySelector("#progress-bar").style.width = "0%"
+            }
             document.querySelector(".run .play").classList.add("hidden")
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
@@ -934,6 +967,9 @@ const reloadMemory = async () => {
           <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
         <% } %>
         <div id='status-window'></div>
+        <div id='progress-window' class='hidden'><div id='progress-bar'></div></div>
+    </div>
+
       </div>
     </header>
   <% } %>