pinokiod 3.19.34 → 3.19.36

package/kernel/shell.js

@@ -494,7 +494,6 @@ class Shell {
       console.log("Prompt spawn", this.shell)
       console.log("Prompt config", config)
       let term = pty.spawn(this.shell, this.args, config)
-      let ready
       let vt = new Terminal({
         allowProposedApi: true
       })
@@ -502,8 +501,8 @@ class Shell {
       vt.loadAddon(vts)
 
       let queue = fastq((data, cb) => {
-        console.log("Vt.write", { data, ready })
-        if (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()
             console.log({ buf })
@@ -511,9 +510,10 @@ class Shell {
             const match = re.exec(buf)
             console.log({ match })
             if (match && match.length > 0) {
-              ready = false
+              this.prompt_ready = false
+              this.prompt_done = true
               let stripped = this.stripAnsi(match[1])
-              console.log({ stripped })
+              console.log({ stripped, prompt_ready: this.prompt_ready, prompt_done: this.prompt_done })
               const p = stripped
                 .replaceAll(/[\r\n]/g, "")
                 .trim()
@@ -528,17 +528,19 @@ class Shell {
         }
       }, 1)
       term.onData((data) => {
-        console.log("Prompt onData", { data, ready })
-        if (ready) {
-          queue.push(data)
-        } else {
-          setTimeout(() => {
-            if (!ready) {
-              ready = true
-              console.log("P", { eol: this.EOL, shell: this.shell, args: this.args, 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)
+          }
         }
       });
     })

package/package.json

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