pinokiod 3.12.1 → 3.12.3

package/kernel/shell.js

@@ -37,7 +37,7 @@ class Shell {
 
     // Windows: /D => ignore AutoRun Registry Key
     // Others: --noprofile => ignore .bash_profile, --norc => ignore .bashrc
-    this.args = this.platform === 'win32' ? ["/D"] : ["--noprofile", "--norc"]
+    this.args = this.platform === 'win32' ? ["/D"] : ["--noprofile", "--norc",]
 
     //this.vt = new Terminal({ allowProposedApi: true, scrollback: 5, })
     // this.vt = new Terminal({
@@ -325,6 +325,7 @@ class Shell {
   }
   emit2(message) {
     let i = 0;
+    let total = message.length
     const interval = setInterval(() => {
       if (i >= message.length) {
         clearInterval(interval);
@@ -333,6 +334,7 @@ class Shell {
       let chunk = message.slice(i, i+1024)
       this.ptyProcess.write(chunk)
       i += 1024;
+      this.ondata({ i, total, type: "emit2" })
     }, 10);
   }
   emit(message) {
@@ -341,6 +343,7 @@ class Shell {
     } else {
       if (this.ptyProcess) {
         if (this.input) {
+          console.log(Buffer.from(message))
           this.ptyProcess.write(message)
         }
       }
@@ -1160,6 +1163,9 @@ ${cleaned}
             this.ready = true
             if (this.ptyProcess) {
               this.ptyProcess.write(`${this.cmd}${os.EOL}`)
+//              setTimeout(() => {
+//                this.ptyProcess.write('\x1B[?2004h');
+//              }, 500)
             }
           }
         }

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.1",
+  "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/socket.js

@@ -25,6 +25,7 @@ class Socket {
       });
       ws.on('message', async (message, isBinary) => {
         let req
+        console.log({ message, isBinary })
         if (isBinary) {
           const buffer = Buffer.from(message);
           const sepIndex = buffer.indexOf(0);

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")
@@ -662,8 +666,10 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
             navigator.clipboard.readText().then((text) => {
+              console.log({ text })
               this.socket.run({
-                key: "\x1b[200~" + text + "\x1b[201~",
+                //key: "\x1b[200~" + text + "\x1b[201~",
+                key: text,
                 id: shell_id
               })
             })

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")
@@ -688,8 +721,11 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
             navigator.clipboard.readText().then((text) => {
+              console.log({ text })
+              debugger
               this.socket.run({
-                key: "\x1b[200~" + text + "\x1b[201~",
+                //key: "\x1b[200~" + text + "\x1b[201~",
+                key: text,
                 id: shell_id
               })
             })
@@ -705,6 +741,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         //term.resize(cols, rows);
 
         term.onKey(({ key }) => {
+        console.log({ key })
           if (this.socket) {
             if (shell_id) {
               this.socket.run({
@@ -930,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>
   <% } %>