pinokiod 3.10.1 → 3.10.3

package/kernel/index.js

@@ -263,6 +263,7 @@ class Kernel {
     this.log_queue.push({ data, group, info })
   }
   async refresh(notify_peers) {
+    console.log("kernel.refresh", { notify_peers })
     let env = await Environment.get(this.homedir)
     let peer_active = false
     // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
@@ -273,10 +274,13 @@ class Kernel {
     if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
       https_active = true
     }
+    console.log({ https_active, peer_active })
 //    console.log("kernel.refresh", { active, notify_peers })
 
     let caddy_installed = await this.bin.check_installed({ name: "caddy" })
 
+    console.log({ caddy_installed, https_active })
+
     // 1. https
     // 2. https + local share
 //    console.log("caddy installed?", caddy_installed)

package/kernel/procs.js

@@ -83,13 +83,16 @@ class Procs {
     let map = {}
     let list = await new Promise((resolve, reject) => {
       this.getPortPidList((err, portPidList) => {
+        console.log({ portPidList })
         if (err) {
+          console.log("getPortPidList Error", err)
           reject(err)
           return
         }
 
         this.getPidToNameMap((err, pidToName) => {
           if (err) {
+            console.log("getPidToNameMap Error", err)
             reject(err)
             return
           }
@@ -105,6 +108,7 @@ class Procs {
               return { port, pid , name, fullname, ip }
             }
           }).filter((x) => { return x })
+          console.log({ list })
           resolve(list)
         });
       });      

package/package.json

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

package/server/index.js

@@ -3055,6 +3055,7 @@ class Server {
 //      params.set("kill", "/Logged in/i")
       params.set("kill_message", "Click to return home")
       params.set("callback", encodeURIComponent("/github"))
+      params.set("target", "_top")
       params.set("id", id)
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
@@ -3069,6 +3070,7 @@ class Server {
       params.set("kill_message", "Click to return home")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
+      params.set("target", "_top")
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
     }))
@@ -3092,6 +3094,7 @@ class Server {
       params.set("kill_message", "Your Github account is now connected.")
       params.set("callback", encodeURIComponent("/github"))
       params.set("id", id)
+      params.set("target", "_top")
       let url = `/shell/${id}?${params.toString()}`
       res.redirect(url)
     }))
@@ -3113,6 +3116,7 @@ class Server {
 
       // create a new term from cwd
       let id = decodeURIComponent(req.params.id)
+      let target = req.query.target ? req.query.target : null
       let cwd = this.kernel.path(this.kernel.api.filePath(decodeURIComponent(req.query.path)))
       let message = req.query.message ? decodeURIComponent(req.query.message) : null
       //let message = req.query.message ? req.query.message : null
@@ -3152,6 +3156,7 @@ class Server {
 
       let shell = this.kernel.shell.get(id)
       res.render("shell", {
+        target,
         filepath: cwd,
         theme: this.theme,
         agent: this.agent,

package/server/public/commander.js

@@ -25,6 +25,9 @@ const Commander = async (config) => {
       if (config.venv) {
         search_params.set("venv", config.venv)
       }
+      if (config.target) {
+        search_params.set("target", config.target)
+      }
 
       // env
       if (config.env) {

package/server/views/network.ejs

@@ -668,6 +668,7 @@ document.querySelector("#advanced-label").addEventListener("click", (e) => {
     title: "Custom Router",
     placeholder: "enter a custom router git url",
     description: `<div>you can write your own custom routers to handle custom request handling for any port <a target="_blank" href="<%=docs%>">Learn more</a></div>`,
+    target: "_top",
     message: (url) => {
       let name = new URL(url).pathname.split("/").slice(-2).join("_")
       return encodeURIComponent(`git clone ${url} ${name}`)

package/server/views/shell.ejs

@@ -198,8 +198,6 @@ document.addEventListener("DOMContentLoaded", async () => {
         await this.socket.close()
 
         let query = Object.fromEntries(new URLSearchParams(location.search))
-        console.log(">>>>>>>> 1")
-
         let firstPacketReceived = false
         this.socket.run({
           //method: "kernel.bin.shell_start",
@@ -208,7 +206,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             message: "<%-message%>",
           <% } %>
           <% if (venv) { %>
-            venv: "<%=venv%>",
+            venv: "<%-JSON.stringify(venv).slice(1, -1)%>",
           <% } %>
           <% if (kill) { %>
             on: [{
@@ -760,9 +758,15 @@ document.addEventListener("DOMContentLoaded", async () => {
 </script>
 </head>
 <body class='<%=theme%>'>
-  <header class='navheader grabbable'>
+  <% if (target === "_top") { %>
+    <header class='navheader grabbable'>
+  <% } else { %>
+    <header class='navheader3'>
+  <% } %>
     <h1>
+      <% if (target === "_top") { %>
       <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
+      <% } %>
       <div class='hidden btn run play-btn'>
         <span class='play'><i class="fa-solid fa-play"></i> Start</span>
       </div>