pinokiod 3.19.35 → 3.19.37

package/kernel/shell.js

@@ -501,7 +501,7 @@ class Shell {
       vt.loadAddon(vts)
 
       let queue = fastq((data, cb) => {
-        console.log("Vt.write", { data, prompt_ready: this.prompt_ready })
+        console.log("Vt.write", { data, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
         if (this.prompt_ready) {
           vt.write(data, () => {
             let buf = vts.serialize()
@@ -511,8 +511,9 @@ class Shell {
             console.log({ match })
             if (match && match.length > 0) {
               this.prompt_ready = false
+              this.prompt_done = true
               let stripped = this.stripAnsi(match[1])
-              console.log({ stripped, prompt_ready: this.prompt_ready })
+              console.log({ stripped, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
               const p = stripped
                 .replaceAll(/[\r\n]/g, "")
                 .trim()
@@ -527,17 +528,19 @@ class Shell {
         }
       }, 1)
       term.onData((data) => {
-        console.log("Prompt onData", { data, prompt_ready: this.prompt_ready })
-        if (this.prompt_ready) {
-          queue.push(data)
-        } else {
-          setTimeout(() => {
-            if (!this.prompt_ready) {
-              this.prompt_ready = true
-              console.log("P", { eol: this.EOL, shell: this.shell, args: this.args, prompt_ready: this.prompt_ready })
-              term.write(`echo pinokio${this.EOL}echo pinokio${this.EOL}`)
-            }
-          }, 500)
+        console.log("Prompt onData", { data, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
+        if (!this.prompt_done) {
+          if (this.prompt_ready) {
+            queue.push(data)
+          } else {
+            setTimeout(() => {
+              if (!this.prompt_ready) {
+                this.prompt_ready = true
+                console.log("P", { eol: this.EOL, shell: this.shell, args: this.args, prompt_ready: this.prompt_ready })
+                term.write(`echo pinokio${this.EOL}echo pinokio${this.EOL}`)
+              }
+            }, 500)
+          }
         }
       });
     })
@@ -972,7 +975,9 @@ class Shell {
   }
   async exec(params) {
     params = await this.activate(params)
+    console.log("#Exec 1", { params })
     this.cmd = this.build(params)
+    console.log("#Exec 2", { cmd: this.cmd })
     let res = await new Promise((resolve, reject) => {
       this.resolve = resolve
       this.reject = reject
@@ -1249,6 +1254,7 @@ ${cleaned}
               this.params.onready()
             }
             if (this.ptyProcess) {
+              console.log("ptyProcess.write", { cmd: this.cmd, eol: this.EOL })
               this.ptyProcess.write(`${this.cmd}${this.EOL}`)
 //              setTimeout(() => {
 //                this.ptyProcess.write('\x1B[?2004h');

package/package.json

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