pinokiod 3.17.2 → 3.17.3

package/kernel/bin/caddy.js

@@ -88,27 +88,46 @@ class Caddy {
         ondata(e)
       })
     } else {
-      ondata({
-        title: "Password",
-        description: "Enter your system password to add the HTTPS certificate",
-        form: [{
-          type: "password",
-          autofocus: true,
-          key: "password",
-          placeholder: "System password",
-        }]
-      }, "input")
-      let response = await this.kernel.api.wait(id)
+//      ondata({
+//        title: "Password",
+//        description: "Enter your system password to add the HTTPS certificate",
+//        form: [{
+//          type: "password",
+//          autofocus: true,
+//          key: "password",
+//          placeholder: "System password",
+//        }]
+//      }, "input")
+//      let response = await this.kernel.api.wait(id)
+//      await this.kernel.exec({
+//        message: `echo ${response.password} | sudo -S caddy trust`,
+//        path: this.kernel.homedir
+//      }, (e) => {
+//  //        ondata(e)
+//  //      console.log(e)
+//  //        if (/Caddy Local Authority/i.test(e.cleaned)) {
+//  //          trusted = true
+//  //        }
+//      })
+
+      //let response = await this.kernel.api.wait(id)
+      console.log("ondata", ondata.toString())
+      setTimeout(() => {
+        ondata({ html: `<b><i class="fa-solid fa-keyboard"></i> Enter the system password to generate a certificate</b>` }, "notify3")
+      }, 2000)
       await this.kernel.exec({
-        message: `echo ${response.password} | sudo -S caddy trust`,
+        input: true,
+        //message: "sudo -s && caddy trust",
+        //message: "sudo -s",
+        message: "caddy trust",
+        onprompt: (shell) => {
+          shell.kill("Done")
+        },
         path: this.kernel.homedir
       }, (e) => {
-  //        ondata(e)
-  //      console.log(e)
-  //        if (/Caddy Local Authority/i.test(e.cleaned)) {
-  //          trusted = true
-  //        }
+        ondata(e)
       })
+      ondata({ html: `<b><i class="fa-solid fa-check"></i> HTTPS certificate create step finished</b>` }, "notify3")
     }
   }
   async installed() {

package/kernel/peer.js

@@ -9,6 +9,7 @@ class PeerDiscovery {
     this.interval = interval;
     this.peers = new Set();
     this.host = this._getLocalIPAddress()
+    console.log("THIS>HOST", this.host)
     this.default_port = 42000
     this.peers.add(this.host)
 //    this.start();
@@ -160,27 +161,50 @@ class PeerDiscovery {
   _isLocalLAN(ip) {
     return ip.startsWith('192.168.') || ip.startsWith('10.') || (ip.startsWith('172.') && is172Private(ip));
   }
+  //_getLocalIPAddress() {
+  //  const interfaces = os.networkInterfaces();
+  //  for (const ifaceList of Object.values(interfaces)) {
+  //    for (const iface of ifaceList) {
+  //      console.log({ iface })
+  //      if (iface.family === 'IPv4' && !iface.internal) {
+  //        const ip = iface.address;
+  //        if (
+  //          ip.startsWith('10.') ||
+  //          ip.startsWith('192.168.') ||
+  //          (ip.startsWith('172.') && is172Private(ip))
+  //        ) {
+  //          return ip;
+  //        }
+  //      }
+  //    }
+  //  }
+  //  return null;
+  //  function is172Private(ip) {
+  //    const secondOctet = parseInt(ip.split('.')[1], 10);
+  //    return secondOctet >= 16 && secondOctet <= 31;
+  //  }
+  //}
   _getLocalIPAddress() {
     const interfaces = os.networkInterfaces();
     for (const ifaceList of Object.values(interfaces)) {
       for (const iface of ifaceList) {
         if (iface.family === 'IPv4' && !iface.internal) {
           const ip = iface.address;
-          if (
-            ip.startsWith('10.') ||
-            ip.startsWith('192.168.') ||
-            (ip.startsWith('172.') && is172Private(ip))
-          ) {
+          if (this.isPrivateOrCGNAT(ip)) {
             return ip;
           }
         }
       }
     }
     return null;
-    function is172Private(ip) {
-      const secondOctet = parseInt(ip.split('.')[1], 10);
-      return secondOctet >= 16 && secondOctet <= 31;
-    }
+  }
+  isPrivateOrCGNAT(ip) {
+    const octets = ip.split('.').map(Number);
+    if (octets[0] === 10) return true;
+    if (octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31) return true;
+    if (octets[0] === 192 && octets[1] === 168) return true;
+    if (octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127) return true; // CGNAT
+    return false;
   }
 }
 

package/kernel/shell.js

@@ -1143,7 +1143,7 @@ ${cleaned}
           setTimeout(() => {
             if (cache === cleaned) {
               if (this.params.onprompt) {
-                this.params.onprompt()
+                this.params.onprompt(this)
               }
               if (this.input || this.persistent) {
 //                if (this.cb) this.cb({

package/package.json

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

package/server/socket.js

@@ -59,6 +59,8 @@ class Socket {
           await this.parent.kernel.api.init()
           // look for repos that match
 
+          console.log({ req })
+
           if (req.uri) {
             if (req.mode === "open") {
               // get the default script and respond
@@ -149,6 +151,7 @@ class Socket {
           } else if (req.emit) {
             this.parent.kernel.shell.emit(req)
           } else if (req.key && req.id) {
+            console.log({ req })
             this.parent.kernel.shell.emit({
               id: req.id,
               emit: req.key,

package/server/views/install.ejs

@@ -98,16 +98,20 @@ body {
   box-sizing: border-box;
   width: 100%;
   margin: 0;
+  /*
   margin-bottom: 10px;
+  */
   overflow: auto;
-  border-left: 5px solid royalblue;
+  background: royalblue;
+  color: white;
   /*
+  border-left: 5px solid royalblue;
   color: rgb(27, 28, 29);
   */
 }
 #status-screen b {
+  color: white;
   font-weight: normal;
-  color: royalblue;
   font-size: 16px;
 }
 </style>
@@ -133,10 +137,10 @@ body {
 </head>
 <body class='<%=theme%>' data-agent="<%=agent%>">
 <header class='grabbable'></header>
-<div id='status-screen'><b><i class="fas fa-circle-notch fa-spin"></i> Setting up...</b><br>Setting up core modules including conda, uv, git, etc.</div>
 <div class='terminal-container'>
   <div id='terminal'></div>
 </div>
+<div id='status-screen'><b><i class="fas fa-circle-notch fa-spin"></i> Setting up...</b><br>Setting up core modules including conda, uv, git, etc.</div>
 <input id='requirements' type='hidden' value="<%=requirements%>">
 <input id='callback' type='hidden' value="<%=callback%>">
 <script>
@@ -206,10 +210,17 @@ document.addEventListener("DOMContentLoaded", async () => {
     }
   }
   term.onKey((e) => {
-    socket.emit({
-      id: location.pathname,
-      emit: e.key
-    })
+    if (shell_id) {
+      socket.emit({
+        id: shell_id,
+        key: e.key
+      })
+    }
+    //console.log({ e })
+    //socket.emit({
+    //  id: location.pathname,
+    //  emit: e.key
+    //})
   })
   let observer = new ResizeObserver(() => {
     fitAddon.fit()
@@ -255,6 +266,20 @@ document.addEventListener("DOMContentLoaded", async () => {
           type: "moddal",
           description: packet.data
         })
+      } else if (packet.type === "notify3") {
+        console.log("HTML", packet.data)
+        if (packet.data) {
+          let payload = {}
+          if (packet.data.html) {
+            payload.text = packet.data.html
+          }
+          if (packet.data.type) {
+            payload.type = packet.data.type
+          }
+          document.querySelector("#status-screen").innerHTML = packet.data.html
+          let audio = new Audio("/pop.mp3")
+          audio.play()
+        }
       } else if (packet.type === "notify2") {
         console.log("HTML", packet.data)
         if (packet.data) {

package/server/views/setup.ejs

@@ -85,7 +85,6 @@ body {
   display: flex;
   align-items: flex-start;
   margin: 10px;
-  background: rgba(0,0,0,0.04);
 }
 .item img {
   width: 100px;

package/server/views/terminal.ejs

@@ -749,7 +749,6 @@ document.addEventListener("DOMContentLoaded", async () => {
         //term.resize(cols, rows);
 
         term.onKey(({ key }) => {
-        console.log({ key, shell_id })
           if (this.socket) {
             if (shell_id) {
               this.socket.run({