pinokiod 3.12.0 → 3.12.2

package/kernel/bin/setup.js

@@ -155,6 +155,7 @@ module.exports = {
     }
     requirements = requirements.concat([
       { name: "git", },
+      { name: "uv", },
       { name: "caddy", },
       { name: "py", },
     ])
@@ -166,6 +167,7 @@ module.exports = {
       requirements,
       conda_requirements: [
         zip_cmd,
+        "uv",
         "git",
         "caddy"
       ]
@@ -181,6 +183,7 @@ module.exports = {
     }
     requirements = requirements.concat([
       { name: "git", },
+      { name: "uv", },
       { name: "caddy", },
       { name: "py", },
     ])
@@ -192,6 +195,7 @@ module.exports = {
       requirements,
       conda_requirements: [
         zip_cmd,
+        "uv",
         "git",
         "caddy"
       ]

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({
@@ -324,6 +324,7 @@ class Shell {
     this.vt.resize(cols, rows)
   }
   emit2(message) {
+    console.log("emit2", message)
     let i = 0;
     const interval = setInterval(() => {
       if (i >= message.length) {
@@ -331,6 +332,7 @@ class Shell {
         return;
       }
       let chunk = message.slice(i, i+1024)
+      console.log("chunk", i, chunk)
       this.ptyProcess.write(chunk)
       i += 1024;
     }, 10);
@@ -341,6 +343,8 @@ class Shell {
     } else {
       if (this.ptyProcess) {
         if (this.input) {
+          console.log("emit", { message })
+          console.log(Buffer.from(message))
           this.ptyProcess.write(message)
         }
       }
@@ -929,6 +933,8 @@ 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)
             }
@@ -1160,6 +1166,9 @@ ${cleaned}
             this.ready = true
             if (this.ptyProcess) {
               this.ptyProcess.write(`${this.cmd}${os.EOL}`)
+//              setTimeout(() => {
+//                this.ptyProcess.write('\x1B[?2004h');
+//              }, 500)
             }
           }
         }

package/package.json

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

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

@@ -662,8 +662,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

@@ -688,8 +688,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 +708,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         //term.resize(cols, rows);
 
         term.onKey(({ key }) => {
+        console.log({ key })
           if (this.socket) {
             if (shell_id) {
               this.socket.run({