pinokiod 3.84.0 → 3.86.0

package/kernel/api/index.js

@@ -802,6 +802,13 @@ class Api {
       current: i,
       uri: request.uri,
       cwd,
+      exists: (...args) => {
+        return fs.existsSync(path.resolve(cwd, ...args))
+      },
+      running: (...args) => {
+        let fullpath = path.resolve(cwd, ...args)
+        return this.running[fullpath]
+      },
       name,
       self: script,
       port,

package/kernel/bin/caddy.js

@@ -32,10 +32,16 @@ class Caddy {
       await new Promise((resolve, reject) => {
         let interval = setInterval(() => {
           if (this.kernel.processes.caddy_pid) {
-            console.log("kill caddy", this.kernel.processes.caddy_pid)
-            kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
-            console.log("killed existing caddy")
-            resolve()
+            try {
+              console.log("kill caddy", this.kernel.processes.caddy_pid)
+              kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
+              console.log("killed existing caddy")
+              clearInterval(interval)
+              resolve()
+            } catch (error) {
+              clearInterval(interval)
+              reject(error)
+            }
           } else {
             console.log("try killing existing caddy again in 1 sec")
           }

package/kernel/peer.js

@@ -23,14 +23,11 @@ class PeerDiscovery {
     }
   }
   async check_peers () {
-    console.log(">>>>>>>>>>>> check peers")
     let peer_array = Array.from(this.peers)
     for(let host of peer_array) {
       if (this.host !== host) {
         let result = await this._refresh(host)
-        console.log("check peeers", { host, result })
         if (!result) {
-          console.log("delete host", host)
           this.peers.delete(host)
           delete this.info[host]
         }
@@ -367,15 +364,21 @@ class PeerDiscovery {
     let d = Date.now()
     let router_info = await this.router_info()
     let installed = await this.installed()
-    let peers = Object.values(this.info).filter((info) => {
-      return info.host !== this.host
-    }).map((info) => {
-      return {
-        name: info.name,
-        host: info.host
-      }
-    })
+    let peers
+    if (this.info) {
+      peers = Object.values(this.info).filter((info) => {
+        return info.host !== this.host
+      }).map((info) => {
+        return {
+          name: info.name,
+          host: info.host
+        }
+      })
+    } else {
+      peers = []
+    }
     return {
+      active: this.active,
       version: this.kernel.version,
       home: this.kernel.homedir,
       arch: this.kernel.arch,

package/kernel/prototype.js

@@ -75,6 +75,7 @@ class Proto {
     await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
   }
   async create(req, ondata) {
+    console.log("CREATE", req)
     try {
       if (req.client) {
         this.kernel.client = req.client

package/kernel/shell.js

@@ -18,6 +18,9 @@ const Util = require('./util')
 const Environment = require('./environment')
 const ShellParser = require('./shell_parser')
 const home = os.homedir()
+
+// xterm.js currently ignores DECSYNCTERM (CSI ? 2026 h/l) and renders it as text on Windows.
+// filterDecsync() removes these sequences so they do not pollute the terminal output.
 class Shell {
   /*
     params 
@@ -37,6 +40,7 @@ class Shell {
     this.platform = os.platform()
     this.logs = {}
     this.shell = this.platform === 'win32' ? 'cmd.exe' : 'bash';
+    this.decsyncBuffer = ''
 
     // Windows: /D => ignore AutoRun Registry Key
     // Others: --noprofile => ignore .bash_profile, --norc => ignore .bashrc
@@ -551,7 +555,7 @@ class Shell {
       term.onData((data) => {
         if (!this.prompt_done) {
           if (this.prompt_ready) {
-            queue.push(data)
+            queue.push(this.filterDecsync(data))
           } else {
             setTimeout(() => {
               if (!this.prompt_ready) {
@@ -1080,7 +1084,7 @@ class Shell {
                 data = data.replace(/\x1b\[6n/g, ''); // remove the code
               }
 
-              this.queue.push(data)
+              this.queue.push(this.filterDecsync(data))
             }
           });
         }
@@ -1182,6 +1186,43 @@ class Shell {
     let cleaned = this.stripAnsi(buf)
     this._log(buf, cleaned)
   }
+  filterDecsync(data) {
+    if (!data) return data
+
+    const prefix = '\u001b[?2026'
+    let chunk = this.decsyncBuffer ? this.decsyncBuffer + data : data
+    if (chunk.includes('\u2190')) {
+      chunk = chunk.replace(/\u2190/g, '\u001b')
+    }
+    this.decsyncBuffer = ''
+
+    let result = ''
+    let i = 0
+    while (i < chunk.length) {
+      if (chunk.charCodeAt(i) === 0x1b) { // ESC
+        const remaining = chunk.slice(i)
+        if (remaining.startsWith('\u001b[?2026h') || remaining.startsWith('\u001b[?2026l')) {
+          i += 8
+          continue
+        }
+
+        // Check if the remaining characters form a partial prefix of DECSYNCTERM
+        let matched = 0
+        const len = Math.min(prefix.length, remaining.length)
+        while (matched < len && remaining[matched] === prefix[matched]) {
+          matched++
+        }
+        if (matched === remaining.length && matched < prefix.length + 1) {
+          this.decsyncBuffer = remaining
+          return result
+        }
+      }
+      result += chunk[i]
+      i++
+    }
+
+    return result
+  }
   _log(buf, cleaned) {
 
 

package/kernel/util.js

@@ -146,6 +146,8 @@ let file_type = async (cwd, file) => {
         link: true
       }
     }
+  } else {
+    return { }
   }
 }
 

package/package.json

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

package/pipe/views/login.ejs

@@ -41,7 +41,7 @@ main input {
 }
 main button {
   color: white;
-  background: royalblue;
+  background: rgba(127, 91, 243, 0.9);
   padding: 10px;
   box-sizing: border-box;
   border: none;