pinokiod 3.271.0 → 3.273.0

package/kernel/shell.js

@@ -17,6 +17,7 @@ const unparse = require('yargs-unparser-custom-flag');
 const Util = require('./util')
 const Environment = require('./environment')
 const ShellParser = require('./shell_parser')
+const AnsiStreamTracker = require('./ansi_stream_tracker')
 const home = os.homedir()
 
 // xterm.js currently ignores DECSYNCTERM (CSI ? 2026 h/l) and renders it as text on Windows.
@@ -48,6 +49,19 @@ class Shell {
       }
     }
     this.decsyncBuffer = ''
+    this.nudgeRestoreTimer = null
+    this.nudging = false
+    this.nudgeReleaseTimer = null
+    this.lastInputAt = 0
+    this.canNudge = true
+    this.awaitingIdleNudge = false
+    this.idleNudgeTimer = null
+    this.idleNudgeDelay = 100
+    this.ignoreNudgeOutput = false
+    this.userActive = false
+    this.userActiveTimer = null
+    this.userActiveTimeout = 1000
+    this.ansiTracker = new AnsiStreamTracker()
 
     // Windows: /D => ignore AutoRun Registry Key
     // Others: --noprofile => ignore .bash_profile, --norc => ignore .bashrc
@@ -229,6 +243,25 @@ class Shell {
   }
   async start(params, ondata) {
     this.ondata = ondata
+    if (this.nudgeRestoreTimer) {
+      clearTimeout(this.nudgeRestoreTimer)
+      this.nudgeRestoreTimer = null
+    }
+    if (this.nudgeReleaseTimer) {
+      clearTimeout(this.nudgeReleaseTimer)
+      this.nudgeReleaseTimer = null
+    }
+    this.cancelIdleNudge()
+    this.nudging = false
+    this.lastInputAt = 0
+    this.canNudge = true
+    this.ignoreNudgeOutput = false
+    if (this.userActiveTimer) {
+      clearTimeout(this.userActiveTimer)
+      this.userActiveTimer = null
+    }
+    this.userActive = false
+    this.decsyncBuffer = ''
 
     /*
       params := {
@@ -383,6 +416,9 @@ class Shell {
 //    return this.id
   }
   resize({ cols, rows }) {
+//    console.log("RESIZE", { cols, rows })
+    this.cols = cols
+    this.rows = rows
     this.ptyProcess.resize(cols, rows)
     this.vt.resize(cols, rows)
   }
@@ -400,6 +436,8 @@ class Shell {
       chunk_size = 1024
     }
 //    console.log({ interactive: this.params.interactive, chunk_size })
+    this.canNudge = true
+    this.cancelIdleNudge()
     for(let i=0; i<message.length; i+=chunk_size) {
       let chunk = message.slice(i, i+chunk_size)
 //      console.log("write chunk", { i, chunk })
@@ -417,9 +455,15 @@ class Shell {
     if (this.input) {
       if (this.ptyProcess) {
         if (message.length > 1024) {
+          this.lastInputAt = Date.now()
+          this.canNudge = true
+          this.cancelIdleNudge()
           this.emit2(message)
         } else {
           this.ptyProcess.write(message)
+          this.lastInputAt = Date.now()
+          this.canNudge = true
+          this.cancelIdleNudge()
         }
       }
     }
@@ -433,15 +477,27 @@ class Shell {
           for(let m of message) {
             this.cmd = this.build({ message: m })
             this.ptyProcess.write(this.cmd)
+            this.lastInputAt = Date.now()
+            this.canNudge = true
+            this.cancelIdleNudge()
             if (newline) {
               this.ptyProcess.write(this.EOL)
+              this.lastInputAt = Date.now()
+              this.canNudge = true
+              this.cancelIdleNudge()
             }
           }
         } else {
           this.cmd = this.build({ message })
           this.ptyProcess.write(this.cmd)
+          this.lastInputAt = Date.now()
+          this.canNudge = true
+          this.cancelIdleNudge()
           if (newline) {
             this.ptyProcess.write(this.EOL)
+            this.lastInputAt = Date.now()
+            this.canNudge = true
+            this.cancelIdleNudge()
           }
         }
       })
@@ -457,11 +513,17 @@ class Shell {
             this.cmd = this.build({ message: m })
             this.ptyProcess.write(this.cmd)
             this.ptyProcess.write(this.EOL)
+            this.lastInputAt = Date.now()
+            this.canNudge = true
+            this.cancelIdleNudge()
           }
         } else {
           this.cmd = this.build({ message })
           this.ptyProcess.write(this.cmd)
           this.ptyProcess.write(this.EOL)
+          this.lastInputAt = Date.now()
+          this.canNudge = true
+          this.cancelIdleNudge()
         }
       })
     }
@@ -473,6 +535,9 @@ class Shell {
         this.resolve = resolve
         this.cmd = this.build({ message })
         this.ptyProcess.write(this.cmd)
+        this.lastInputAt = Date.now()
+        this.canNudge = true
+        this.cancelIdleNudge()
       })
     }
   }
@@ -1113,7 +1178,12 @@ class Shell {
                 data = data.replace(/\x1b\[6n/g, ''); // remove the code
               }
 
-              this.queue.push(this.filterDecsync(data))
+              const filtered = this.filterDecsync(data)
+              if (this.awaitingIdleNudge) {
+                this.scheduleIdleNudge()
+              }
+              this.maybeNudgeForSequences(filtered)
+              this.queue.push(filtered)
             }
           });
         }
@@ -1143,6 +1213,24 @@ class Shell {
 
     this.done = true
     this.ready = false
+    if (this.nudgeRestoreTimer) {
+      clearTimeout(this.nudgeRestoreTimer)
+      this.nudgeRestoreTimer = null
+    }
+    if (this.nudgeReleaseTimer) {
+      clearTimeout(this.nudgeReleaseTimer)
+      this.nudgeReleaseTimer = null
+    }
+    this.cancelIdleNudge()
+    this.nudging = false
+    this.lastInputAt = 0
+    this.canNudge = true
+    this.ignoreNudgeOutput = false
+    if (this.userActiveTimer) {
+      clearTimeout(this.userActiveTimer)
+      this.userActiveTimer = null
+    }
+    this.userActive = false
 
     let buf = this.vts.serialize()
     let cleaned = this.stripAnsi(buf)
@@ -1260,6 +1348,129 @@ class Shell {
 
     return result
   }
+  setUserActive(active, ttl) {
+    const clearTimer = () => {
+      if (this.userActiveTimer) {
+        clearTimeout(this.userActiveTimer)
+        this.userActiveTimer = null
+      }
+    }
+    if (active) {
+      this.userActive = true
+      this.lastInputAt = Date.now()
+      const parsedTtl = Number(ttl)
+      const timeout = Number.isFinite(parsedTtl) ? parsedTtl : this.userActiveTimeout
+      clearTimer()
+      if (timeout > 0) {
+        this.userActiveTimer = setTimeout(() => {
+          this.userActive = false
+          this.userActiveTimer = null
+        }, timeout)
+      }
+    this.cancelIdleNudge()
+    } else {
+      clearTimer()
+      this.userActive = false
+    }
+  }
+  maybeNudgeForSequences(chunk = '') {
+    if (!chunk || typeof chunk !== 'string') {
+      return
+    }
+    const detection = this.ansiTracker.push(chunk)
+    if (!detection) {
+      return
+    }
+    if (this.ignoreNudgeOutput || this.userActive) {
+      return
+    }
+    if (this.nudging || !this.canNudge) {
+//      console.log('[nudge] guard: nudging/canNudge', { nudging: this.nudging, canNudge: this.canNudge, reason: detection.reason })
+      return
+    }
+    const sinceInput = Date.now() - this.lastInputAt
+    if (sinceInput < 200) {
+//      console.log('[nudge] guard: recent input', { sinceInput, reason: detection.reason })
+      return
+    }
+//    console.log('[nudge] scheduling idle nudge', {
+//      reason: detection.reason,
+//      sinceInput,
+//      preview: chunk.slice(0, 160)
+//    })
+    this.requestIdleNudge()
+  }
+  cancelIdleNudge() {
+    if (this.idleNudgeTimer) {
+      clearTimeout(this.idleNudgeTimer)
+      this.idleNudgeTimer = null
+    }
+    this.awaitingIdleNudge = false
+  }
+  requestIdleNudge() {
+    if (this.awaitingIdleNudge || this.nudging || !this.canNudge) {
+      return
+    }
+    this.awaitingIdleNudge = true
+    this.scheduleIdleNudge()
+  }
+  scheduleIdleNudge() {
+    if (!this.awaitingIdleNudge) {
+      return
+    }
+    const delay = this.idleNudgeDelay || 500
+    if (this.idleNudgeTimer) {
+      clearTimeout(this.idleNudgeTimer)
+    }
+    this.idleNudgeTimer = setTimeout(() => {
+      if (this.nudging || !this.canNudge) {
+        this.cancelIdleNudge()
+        return
+      }
+      this.idleNudgeTimer = null
+      this.awaitingIdleNudge = false
+      this.canNudge = false
+//      console.log('[nudge] idle window elapsed')
+      this.forceTerminalNudge()
+    }, delay)
+  }
+  forceTerminalNudge() {
+    if (!this.ptyProcess || this.nudging) {
+//      console.log('[nudge] force skipped', { hasPty: !!this.ptyProcess, nudging: this.nudging })
+      return
+    }
+    this.cancelIdleNudge()
+    const baseCols = Number.isFinite(this.cols) ? this.cols : (this.vt && Number.isFinite(this.vt.cols) ? this.vt.cols : 80)
+    const baseRows = Number.isFinite(this.rows) ? this.rows : (this.vt && Number.isFinite(this.vt.rows) ? this.vt.rows : 24)
+    const cols = Math.max(2, Math.floor(baseCols))
+    const rows = Math.max(2, Math.floor(baseRows))
+    if (cols <= 2) {
+      return
+    }
+    this.ignoreNudgeOutput = true
+    this.nudging = true
+//    console.log('[nudge] shrink start', { cols: cols - 1, rows })
+    this.resize({ cols: cols - 1, rows })
+    if (this.nudgeRestoreTimer) {
+      clearTimeout(this.nudgeRestoreTimer)
+    }
+    this.nudgeRestoreTimer = setTimeout(() => {
+//      console.log('[nudge] restore', { cols, rows })
+//      console.log('[nudge] restore start', { cols, rows })
+      this.resize({ cols, rows })
+      if (this.nudgeReleaseTimer) {
+        clearTimeout(this.nudgeReleaseTimer)
+      }
+      this.nudgeReleaseTimer = setTimeout(() => {
+        this.nudging = false
+        this.canNudge = true
+        this.ignoreNudgeOutput = false
+//        console.log('[nudge] complete')
+        this.nudgeReleaseTimer = null
+      }, 100)
+      this.nudgeRestoreTimer = null
+    }, 100)
+  }
   _log(buf, cleaned) {
 
 

package/package.json

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