pinokiod 3.19.33 → 3.19.35

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,38 +501,40 @@ class Shell {
       vt.loadAddon(vts)
 
       let queue = fastq((data, cb) => {
-        console.log("Vt.write", data)
-        vt.write(data, () => {
-          let buf = vts.serialize()
-          console.log({ buf })
-          let re = /(.+)echo pinokio[\r\n]+pinokio[\r\n]+(\1)/gs
-          const match = re.exec(buf)
-          console.log({ match })
-          if (match && match.length > 0) {
-            ready = false
-            let stripped = this.stripAnsi(match[1])
-            console.log({ stripped })
-            const p = stripped
-              .replaceAll(/[\r\n]/g, "")
-              .trim()
-              .replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            term.kill()
-            vt.dispose()
-            queue.killAndDrain()
-            resolve(p)
-          }
-        })
-        cb()
+        console.log("Vt.write", { data, prompt_ready: this.prompt_ready })
+        if (this.prompt_ready) {
+          vt.write(data, () => {
+            let buf = vts.serialize()
+            console.log({ buf })
+            let re = /(.+)echo pinokio[\r\n]+pinokio[\r\n]+(\1)/gs
+            const match = re.exec(buf)
+            console.log({ match })
+            if (match && match.length > 0) {
+              this.prompt_ready = false
+              let stripped = this.stripAnsi(match[1])
+              console.log({ stripped, prompt_ready: this.prompt_ready })
+              const p = stripped
+                .replaceAll(/[\r\n]/g, "")
+                .trim()
+                .replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&');
+              term.kill()
+              vt.dispose()
+              queue.killAndDrain()
+              resolve(p)
+            }
+          })
+          cb()
+        }
       }, 1)
       term.onData((data) => {
-        console.log("Prompt onData", { data, ready })
-        if (ready) {
+        console.log("Prompt onData", { data, prompt_ready: this.prompt_ready })
+        if (this.prompt_ready) {
           queue.push(data)
         } else {
           setTimeout(() => {
-            if (!ready) {
-              ready = true
-              console.log("P", { eol: this.EOL, shell: this.shell, args: this.args, ready })
+            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.33",
+  "version": "3.19.35",
   "description": "",
   "main": "index.js",
   "scripts": {