pinokiod 3.12.2 → 3.13.0

package/kernel/plugin.js

@@ -4,9 +4,7 @@ class Plugin {
     this.kernel = kernel
   }
   async init() {
-    console.log("Plugin.init")
     if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
-      console.log("INSTALLED")
       // if ~/pinokio/prototype doesn't exist, clone
       let exists = await this.kernel.exists("plugin")
       if (!exists) {
@@ -18,13 +16,9 @@ class Plugin {
           process.stdout.write(e.raw)
         })
       }
-      console.log("#################")
-
       let plugin_dir = path.resolve(this.kernel.homedir, "plugin")
       let pinokiojs = path.resolve(plugin_dir, "pinokio.js")
-      console.log("pinokiojs", pinokiojs)
       this.config = await this.kernel.require(pinokiojs)
-      console.log("this.config", this.config)
     }
   }
   async update() {

package/kernel/prototype.js

@@ -27,7 +27,6 @@ class Proto {
 
       let pinokiojs_path = this.kernel.path("prototype/system/pinokio.js")
       let config = await this.kernel.require(pinokiojs_path)
-      console.log("--config", config)
       this.config = config
 
       if (this.config && this.config.menu) {

package/kernel/shell.js

@@ -55,7 +55,6 @@ class Shell {
     }
     this.queue = fastq((data, cb) => {
       this.stream(data, cb)
-//      cb()
     }, 1)
 
   }
@@ -201,6 +200,8 @@ class Shell {
     }
   }
   async start(params, ondata) {
+    this.written = 0;
+    this.pendingCallbacks = 0;
     this.ondata = ondata
 
     /*
@@ -323,28 +324,38 @@ class Shell {
     this.ptyProcess.resize(cols, rows)
     this.vt.resize(cols, rows)
   }
-  emit2(message) {
-    console.log("emit2", message)
-    let i = 0;
-    const interval = setInterval(() => {
-      if (i >= message.length) {
-        clearInterval(interval);
-        return;
-      }
-      let chunk = message.slice(i, i+1024)
-      console.log("chunk", i, chunk)
+  async emit2(message) {
+    /*
+    // buffer size
+    1. default:256
+    2. "interactive": true => 1024
+    3. "buffer": n => n
+    */
+    let chunk_size = 256  // default buffer: 256
+    if (this.params && this.params.buffer) {
+      chunk_size = this.params.buffer 
+    } else if (this.params.interactive) {
+      chunk_size = 1024
+    }
+    console.log({ interactive: this.params.interactive, chunk_size })
+    for(let i=0; i<message.length; i+=chunk_size) {
+      let chunk = message.slice(i, i+chunk_size)
       this.ptyProcess.write(chunk)
-      i += 1024;
-    }, 10);
+      this.ondata({ i, total: message.length, type: "emit2" })
+      await new Promise(r => setTimeout(r, 10));
+//      if (interactive) {
+//        await new Promise(queueMicrotask); // zero-delay yield to avoid blocking
+//      } else {
+//        await new Promise(r => setTimeout(r, 1));
+//      }
+    }
   }
   emit(message) {
-    if (message.length > 1024) {
-      this.emit2(message)
-    } else {
+    if (this.input) {
       if (this.ptyProcess) {
-        if (this.input) {
-          console.log("emit", { message })
-          console.log(Buffer.from(message))
+        if (message.length > 1024) {
+          this.emit2(message)
+        } else {
           this.ptyProcess.write(message)
         }
       }
@@ -909,6 +920,7 @@ class Shell {
     return params
   }
   async exec(params) {
+    this.watermark = 0
     params = await this.activate(params)
     this.cmd = this.build(params)
     let res = await new Promise((resolve, reject) => {
@@ -928,20 +940,21 @@ class Shell {
 
         config.env = this.env
 
+
+
+
         if (!this.ptyProcess) {
           // ptyProcess doesn't exist => create
           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)
             }
           });
-//          this.ptyProcess.onExit((result) => {
-//            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
-//          })
+          this.ptyProcess.onExit((result) => {
+            console.log(">>>>>>>>>>>>>>>>>>> exec onExit", result)
+          })
         }
       } catch (e) {
         console.log("** Error", e)
@@ -967,6 +980,8 @@ class Shell {
   }
   kill(message, force, cb) {
 
+    console.log("KILL", { message })
+
     this.done = true
     this.ready = false
 
@@ -1110,6 +1125,7 @@ ${cleaned}
       callback()
       return
     }
+
     this.vt.write(msg, () => {
       let buf = this.vts.serialize()
       let cleaned = this.stripAnsi(buf)
@@ -1121,7 +1137,9 @@ ${cleaned}
         shell_id: this.id
       }
       this.state = cleaned
-      if (this.cb) this.cb(response)
+      if (this.cb) {
+        this.cb(response)
+      }
 
       // Decide whether to kill or continue
       if (this.ready) {

package/kernel/shells.js

@@ -281,7 +281,12 @@ class Shells {
     */
     let session = this.get(params.id)
     if (session) {
-      session.emit(params.emit)
+      if (params.paste) {
+        //session.emit("\x1b[?2004h\x1b[200~" + params.emit+ "\x1b[201~")
+        session.emit(params.emit)
+      } else {
+        session.emit(params.emit)
+      }
     }
   }
   async send(params, ondata, enter) {

package/kernel/util.js

@@ -92,8 +92,8 @@ const parse_env = async (filename) => {
   }
 }
 const run = (cmd, cwd, kernel) => {
-  child_process.exec(cmd, { cwd })
-  /*
+//  console.log("Util.run", { cmd, cwd })
+//  child_process.exec(cmd, { cwd })
   if (kernel) {
     kernel.exec({
       message: cmd,
@@ -106,8 +106,6 @@ const run = (cmd, cwd, kernel) => {
   } else {
     child_process.exec(command)
   }
-  */
-
 }
 const openURL = (url) => {
   const platform = os.platform()

package/package.json

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

package/server/index.js

@@ -146,7 +146,6 @@ class Server {
           } else {
             newIndexPath = "" + i
           }
-          console.log({ item, i, indexPath, newIndexPath })
           traverse(item, newIndexPath);
         }
       } else if (obj !== null && typeof obj === 'object') {
@@ -175,9 +174,7 @@ class Server {
               }
             }
           } else if (key === "shell") {
-            console.log("shell", key, obj[key], indexPath)
             let shell_id = this.get_shell_id(name, indexPath, obj[key])
-            console.log("shell_id", shell_id, this.kernel.api.running[shell_id], this.kernel.api.running)
             if (this.kernel.api.running[shell_id]) {
               obj.display = "indent"
               running_dynamic.push(obj)
@@ -3702,13 +3699,9 @@ class Server {
         res.redirect(href)
       } else {
         let run_path = "/run/prototype/system/" + config.href + "?cwd=" + req.query.path
-        console.log({ config, run_path, query: req.query })
         let readme_path = this.kernel.path("prototype/system", config.readme)
-        console.log("config.readme.split", config.readme.split("/").slice(0, -1))
         let md = await fs.promises.readFile(readme_path, "utf8")
-        console.log({ readme_path, md })
         let baseUrl = "/asset/prototype/system/" + (config.readme.split("/").slice(0, -1).join("/")) + "/"
-        console.log("baseUrl", baseUrl)
         let readme = marked.parse(md, {
           baseUrl
         })
@@ -3747,7 +3740,6 @@ class Server {
         href: "/prototype/show",
         path: "/asset/prototype/system"
       })
-      console.log("FINAL CONFIG", JSON.stringify(config, null, 2))
 
 //    {
 //      "icon": "fa-solid fa-power-off",

package/server/socket.js

@@ -25,7 +25,6 @@ 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);
@@ -152,7 +151,8 @@ class Socket {
           } else if (req.key && req.id) {
             this.parent.kernel.shell.emit({
               id: req.id,
-              emit: req.key
+              emit: req.key,
+              paste: req.paste
             })
           } else if (req.resize && req.id) {
             this.parent.kernel.shell.resize({

package/server/views/shell.ejs

@@ -134,6 +134,39 @@ body.frozen {
 .terminal-container {
   padding: 0;
 }
+#status-window {
+  /*
+  flex-grow: 1;
+  text-align: right;
+  */
+  padding: 0 10px;
+}
+#status-window strong {
+  color: royalblue;
+}
+#status-window b {
+  color: black;
+  font-weight: normal;
+}
+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: royalblue;
+  transition: width 0.2s;
+}
 </style>
 <link href="/terminal.css" rel="stylesheet"/>
 <script>
@@ -296,6 +329,18 @@ 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("#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(".play-btn").classList.add("hidden")
             document.querySelector(".starting-btn").classList.add("hidden")
             document.querySelector(".stop-btn").classList.remove("hidden")
@@ -663,11 +708,18 @@ 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: text,
+              //  id: shell_id
+              //})
               this.socket.run({
                 //key: "\x1b[200~" + text + "\x1b[201~",
                 key: text,
-                id: shell_id
+                id: shell_id,
+                paste: true
               })
+
             })
             return false
           }
@@ -809,6 +861,8 @@ document.addEventListener("DOMContentLoaded", async () => {
       <div class='hidden btn stopped-btn'>
         <span class='stopped'><i class="fa-solid fa-hand"></i> Stopped</span>
       </div>
+      <div id='status-window'></div>
+      <div id='progress-window' class='hidden'><div id='progress-bar'></div></div>
     </h1>
   </header>
   <div class='terminal-container'>

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: royalblue;
+}
 #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: royalblue;
+  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")
@@ -689,12 +722,20 @@ 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: text,
-                id: shell_id
+                id: shell_id,
+                paste: true
               })
+
+
+//              this.socket.run({
+//                //key: "\x1b[200~" + text + "\x1b[201~",
+//                key: text,
+//                id: shell_id
+//              })
             })
             return false
           }
@@ -708,7 +749,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         //term.resize(cols, rows);
 
         term.onKey(({ key }) => {
-        console.log({ key })
+        console.log({ key, shell_id })
           if (this.socket) {
             if (shell_id) {
               this.socket.run({
@@ -934,6 +975,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>
   <% } %>