pinokiod 3.270.0 → 3.272.0

package/kernel/peer.js

@@ -1,6 +1,7 @@
 const dgram = require('dgram');
 const axios = require('axios');
 const os = require('os')
+const systeminformation = require('systeminformation')
 const Environment = require("./environment")
 class PeerDiscovery {
   constructor(kernel, port = 41234, message = 'ping', interval = 1000) {
@@ -12,9 +13,8 @@ class PeerDiscovery {
     this.peers = new Set();
     this.interface_addresses = []
     this.host_candidates = []
-    this.host = this._getLocalIPAddress()
+    this.host = null
     this.default_port = 42000
-    this.peers.add(this.host)
     this.router_info_cache = {}
 //    this.start();
   }
@@ -85,6 +85,13 @@ class PeerDiscovery {
       this.active = false
     }
   }
+  // Prepare host/peer state before the rest of the kernel bootstraps
+  async initialize(kernel) {
+    await this.refreshLocalAddress()
+    if (kernel) {
+      await this.check(kernel)
+    }
+  }
   async start(kernel) {
     let env = await Environment.get(kernel.homedir, kernel)
 
@@ -576,23 +583,70 @@ class PeerDiscovery {
   _isLocalLAN(ip) {
     return this.isRFC1918(ip)
   }
-  _getLocalIPAddress() {
-    this.interface_addresses = this._collectInterfaceAddresses()
-    const shareable = this.interface_addresses.filter((entry) => entry.shareable)
-    this.host_candidates = shareable
-    const lanCandidate = shareable.find((entry) => entry.scope === 'lan')
-    if (lanCandidate) {
-      return lanCandidate.address
+  // Refresh LAN/IP selection; keeps peers set in sync with the active address
+  async refreshLocalAddress() {
+    try {
+      const { host, host_candidates, interface_addresses } = await this._getLocalIPAddress()
+      this.interface_addresses = interface_addresses
+      this.host_candidates = host_candidates
+      if (host && this.host !== host) {
+        if (this.host) {
+          this.peers.delete(this.host)
+        }
+        this.host = host
+      } else if (!this.host) {
+        this.host = host
+      }
+      if (this.host) {
+        this.peers.add(this.host)
+      }
+      return this.host
+    } catch (err) {
+      console.error('peer refreshLocalAddress error', err)
+      if (!this.host) {
+        this.host = null
+      }
+      return this.host
+    }
+  }
+  async _getLocalIPAddress() {
+    const interface_addresses = await this._collectInterfaceAddresses()
+    const shareable = interface_addresses.filter((entry) => entry.shareable)
+    const host_candidates = shareable.map((entry) => ({
+      address: entry.address,
+      netmask: entry.netmask,
+      interface: entry.interface,
+      scope: entry.scope,
+      shareable: entry.shareable,
+      type: entry.type || null,
+      operstate: entry.operstate || null,
+      virtual: entry.virtual || false,
+      default: entry.default || false,
+      prefixLength: entry.prefixLength,
+      mac: entry.mac || null,
+      score: this._scoreCandidate(entry)
+    }))
+    let selectedHost = null
+    let bestScore = -Infinity
+    host_candidates.forEach((candidate, index) => {
+      const score = typeof candidate.score === 'number' ? candidate.score : -Infinity
+      if (score > bestScore) {
+        bestScore = score
+        selectedHost = candidate.address
+      } else if (score === bestScore && selectedHost === null) {
+        selectedHost = candidate.address
+      }
+    })
+    if (!selectedHost && shareable.length > 0) {
+      selectedHost = shareable[0].address
     }
-    const cgnatCandidate = shareable.find((entry) => entry.scope === 'cgnat')
-    if (cgnatCandidate) {
-      return cgnatCandidate.address
+    if (!selectedHost && interface_addresses.length > 0) {
+      selectedHost = interface_addresses[0].address
     }
-    const publicCandidate = shareable.find((entry) => entry.scope === 'public')
-    if (publicCandidate) {
-      return publicCandidate.address
+    if (!selectedHost) {
+      selectedHost = '127.0.0.1'
     }
-    return shareable.length > 0 ? shareable[0].address : null
+    return { host: selectedHost, host_candidates, interface_addresses }
   }
   isPrivateOrCGNAT(ip) {
     return this.isRFC1918(ip) || this.isCGNAT(ip)
@@ -626,7 +680,7 @@ class PeerDiscovery {
     }
     return secondOctet >= 16 && secondOctet <= 31
   }
-  _collectInterfaceAddresses() {
+  _collectInterfaceAddressesSync() {
     const interfaces = os.networkInterfaces()
     const results = []
     const seen = new Set()
@@ -653,12 +707,51 @@ class PeerDiscovery {
           interface: ifaceName,
           internal: Boolean(iface.internal),
           scope: classification.scope,
-          shareable: classification.shareable
+          shareable: classification.shareable,
+          mac: typeof iface.mac === 'string' ? iface.mac : null
         })
       }
     }
     return results
   }
+  async _collectInterfaceAddresses() {
+    const baseEntries = this._collectInterfaceAddressesSync()
+    let metadata = []
+    try {
+      metadata = await systeminformation.networkInterfaces()
+    } catch (err) {
+      metadata = []
+    }
+    const metadataMap = new Map()
+    if (Array.isArray(metadata)) {
+      metadata.forEach((entry) => {
+        if (entry && typeof entry.iface === 'string') {
+          metadataMap.set(this._normalizeInterfaceName(entry.iface), entry)
+        }
+      })
+    }
+    return baseEntries.map((entry) => {
+      const key = this._normalizeInterfaceName(entry.interface)
+      const meta = key ? metadataMap.get(key) : null
+      const prefixLength = this._prefixLengthFromNetmask(entry.netmask)
+      return {
+        ...entry,
+        prefixLength,
+        type: meta && meta.type ? meta.type : null,
+        operstate: meta && meta.operstate ? meta.operstate : null,
+        speed: typeof meta?.speed === 'number' ? meta.speed : null,
+        virtual: Boolean(meta && meta.virtual),
+        default: Boolean(meta && meta.default),
+        mac: entry.mac || (meta && meta.mac) || null
+      }
+    })
+  }
+  _normalizeInterfaceName(name) {
+    if (!name || typeof name !== 'string') {
+      return ''
+    }
+    return name.trim().toLowerCase()
+  }
   classifyAddress(address, isInternal = false) {
     if (!address || typeof address !== 'string') {
       return { scope: 'unknown', shareable: false }
@@ -684,6 +777,80 @@ class PeerDiscovery {
     }
     return { scope: 'public', shareable: true }
   }
+  _prefixLengthFromNetmask(netmask) {
+    if (!netmask || typeof netmask !== 'string') {
+      return null
+    }
+    const octets = this._parseIPv4(netmask)
+    if (!octets) {
+      return null
+    }
+    let bits = 0
+    for (const octet of octets) {
+      bits += this._countBits(octet)
+    }
+    return bits
+  }
+  _countBits(value) {
+    let count = 0
+    let v = value & 255
+    while (v) {
+      count += v & 1
+      v >>= 1
+    }
+    return count
+  }
+  // Heuristically rank interface candidates so physical LAN adapters win over VPN/tunnels
+  _scoreCandidate(entry) {
+    if (!entry || !entry.shareable) {
+      return -Infinity
+    }
+    let score = 0
+    switch (entry.scope) {
+      case 'lan':
+        score += 100
+        break
+      case 'cgnat':
+        score += 60
+        break
+      case 'public':
+        score += 40
+        break
+      default:
+        score -= 50
+        break
+    }
+    if (entry.default) {
+      score += 20
+    }
+    const type = entry.type ? entry.type.toLowerCase() : ''
+    if (type === 'wired') {
+      score += 25
+    } else if (type === 'wireless') {
+      score += 18
+    } else if (type === 'vpn') {
+      score -= 40
+    } else if (type === 'cellular') {
+      score += 5
+    }
+    if (entry.virtual) {
+      score -= 25
+    }
+    if (entry.operstate && entry.operstate.toLowerCase() === 'up') {
+      score += 5
+    } else if (entry.operstate) {
+      score -= 10
+    }
+    if (typeof entry.prefixLength === 'number') {
+      if (entry.prefixLength <= 24) {
+        score += 5
+      }
+      if (entry.prefixLength >= 30) {
+        score -= 20
+      }
+    }
+    return score
+  }
   _buildExternalHostEntries(externalPort) {
     if (!externalPort && externalPort !== 0) {
       return []
@@ -741,7 +908,7 @@ class PeerDiscovery {
     return entries
   }
   _broadcastTargets() {
-    const addresses = this._collectInterfaceAddresses()
+    const addresses = this._collectInterfaceAddressesSync()
     this.interface_addresses = addresses
     const targets = new Set()
     for (const entry of addresses) {

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.270.0",
+  "version": "3.272.0",
   "description": "",
   "main": "index.js",
   "scripts": {