pinokiod 3.8.44 → 3.8.45

package/server/index.js

@@ -90,7 +90,6 @@ class Server {
     return new Promise(r=>fs.access(s, fs.constants.F_OK, e => r(!e)))
   }
   async updateMeta(formData, app_path) {
-    console.log("icon_dirty?", formData.icon_dirty)
     if (formData.icon_dirty) {
       // write icon file
       let icon_path = this.kernel.path("api", formData.new_path, formData.icon_path)
@@ -117,7 +116,6 @@ class Server {
   }
   async createMeta(formData) {
     let icon_path = this.kernel.path("api", formData.path, "icon.png")
-    console.log({ icon_path })
     await fs.promises.writeFile(icon_path, formData.avatar)
 
     // write title/description to pinokio_meta.json
@@ -377,7 +375,6 @@ class Server {
 
     // profile + feed
     const repositoryPath = path.resolve(this.kernel.api.userdir, name)
-    console.log({ repositoryPath })
 
     try {
       await git.resolveRef({ fs, dir: repositoryPath, ref: 'HEAD' });
@@ -558,7 +555,6 @@ class Server {
       })
     } else if (pathComponents.length === 0 && req.query.mode === "download") {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check_bin()
-      console.log({ requirements, install_required, requirements_pending })
 
       res.render("download", {
         error,
@@ -618,7 +614,6 @@ class Server {
           drive: path.resolve(this.kernel.homedir, "drive"),
         }
       }
-      console.log({ configArray })
       res.render("settings", {
         platform,
         version: this.version,
@@ -923,7 +918,6 @@ class Server {
         let install_required = true
         if (!requirements_pending) {
           install_required = false
-          console.time(">>>>>>>>>> 1")
           for(let i=0; i<requirements.length; i++) {
             let r = requirements[i]
 
@@ -937,7 +931,6 @@ class Server {
               }
             }
           }
-          console.timeEnd(">>>>>>>>>> 1")
         }
 
         let error = null
@@ -1006,7 +999,6 @@ class Server {
           if (platform === "win32") {
             p = p.replace(/\\/g, '\\\\')
           }
-          console.log({ pre_items })
           res.render("required_env_editor", {
             agent: this.agent,
             theme: this.theme,
@@ -1016,7 +1008,6 @@ class Server {
           })
         } else {
           let logpath = encodeURIComponent(Util.log_path(filepath, this.kernel))
-          console.log({ logpath })
           const result = {
             prev,
             error,
@@ -1108,7 +1099,6 @@ class Server {
         // look for README.md
 
         let config
-        console.log("f.files", f.files)
         for(let file of f.files) {
           if (file.name.toLowerCase() === "readme.md") {
             let p = path.resolve(filepath, file.name)
@@ -1300,13 +1290,11 @@ class Server {
 
           // check if there is a running process with this folder name
           let runningApps = new Set()
-          console.log("running", this.kernel.api.running)
           for(let key in this.kernel.api.running) {
             let p = this.kernel.path("api", items[i].name) + path.sep
             //let re = new RegExp(items[i].name)
             //if (re.test(key)) {
             //if (p === key) {
-            console.log({ key, p})
             if (key.includes(p)) {
               items[i].running = true
               items[i].index = index
@@ -1438,7 +1426,6 @@ class Server {
             }
             if (config.xterm) {
               this.xterm = config.xterm
-              console.log("this.xterm", this.xterm)
             }
           }
         }
@@ -1888,7 +1875,6 @@ class Server {
     }
   }
   async sudo_exec(message, homedir) {
-    console.log("sudo_exec", { message, homedir })
     // sudo-prompt uses TEMP
 //    let TEMP = path.resolve(homedir, "cache", "TEMP")
 //    await fs.promises.mkdir(TEMP, { recursive: true }).catch((e) => { })
@@ -2121,7 +2107,6 @@ class Server {
         NO_PROXY: config.NO_PROXY,
       }
       let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
-      console.log({ updated })
       await Util.update_env(fullpath, updated)
     }
 
@@ -2130,17 +2115,13 @@ class Server {
     this.kernel.store.set("NO_PROXY", config.NO_PROXY)
   }
   async startLogging(homedir) {
-    console.log(">>>>>>> startLogging", homedir)
     if (!this.debug) {
       if (this.logInterval) {
         clearInterval(this.logInterval)
       }
       if (homedir) {
-        console.log({ homedir })
         let logsdir = path.resolve(homedir, "logs")
-        console.log({ logsdir })
         await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { console.log(e) })
-        console.log("this.log", this.log)
         if (!this.log) {
           this.log = fs.createWriteStream(path.resolve(homedir, "logs/stdout.txt"))
           process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
@@ -2174,13 +2155,11 @@ class Server {
     }
   }
   async start(options) {
-    console.time("SERVER START")
     this.debug = false
     if (options) {
       this.debug = options.debug
       this.browser = options.browser
     }
-    console.time(">>>> 1")
 
     if (this.listening) {
       // stop proxies
@@ -2207,24 +2186,18 @@ class Server {
 //      } catch (e) {
 //      }
     }
-    console.timeEnd(">>>> 1")
 
     // configure from kernel.store
-    console.time(">>>> 2")
     await this.syncConfig()
-    console.timeEnd(">>>> 2")
 
-    console.time(">>>> 3")
     try {
       let _home = this.kernel.store.get("home")
-      console.log({ _home })
       if (_home) {
         await this.startLogging(_home)
       }
     } catch (e) {
       console.log("start logging attempt", e)
     }
-    console.timeEnd(">>>> 3")
 
     // determine port if port is not passed in
 
@@ -2253,11 +2226,8 @@ class Server {
 //      }
     }
 
-    console.log("available port", this.port)
-
     let version = this.kernel.store.get("version")
     let home = this.kernel.store.get("home")
-    console.log({ home, version })
 
     let needInitHome = false
     if (home) {
@@ -2286,17 +2256,12 @@ class Server {
       }
     }
     // initialize kernel
-    console.time(">>>> 4 kernel.init")
     await this.kernel.init({ port: this.port})
-    console.timeEnd(">>>> 4 kernel.init")
 
 
-    console.time(">>>> 5 kernel.initHome")
-    console.log({ needInitHome })
     if (needInitHome) {
       await this.kernel.initHome()
     }
-    console.timeEnd(">>>> 5 kernel.initHome")
 
     if (this.kernel.homedir) {
       let ex = await this.kernel.exists(this.kernel.homedir, "ENVIRONMENT")
@@ -2422,7 +2387,6 @@ class Server {
     //let home = this.kernel.homedir
     //let home = this.kernel.store.get("home")
     this.app.get("/", ex(async (req, res) => {
-      console.log("Shells", this.kernel.shell.shells.length)
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")
         return
@@ -2549,7 +2513,6 @@ class Server {
 //          if (pinokio2.icon) meta[folder].icon = pinokio2.icon
 //        }
       }
-      console.log("META", { meta })
       await this.render(req, res, [], meta)
 //      if (this.kernel.bin.all_installed) {
 //        this.started = true
@@ -2659,31 +2622,40 @@ class Server {
       })
     }))
     this.app.get("/proxy", ex(async (req, res) => {
-      await this.kernel.caddy.update()
+      await this.kernel.router.refresh()
       let list = await this.kernel.processes.refresh()
-      let current_lan_ip = this.kernel.peer.current_ip
-      console.log("this.kernel.caddy.mapping", this.kernel.caddy.mapping())
       list = list.map((item) => {
         return {
           //proxy: this.kernel.caddy.mapping[item.ip] || [],
-          proxy: this.kernel.caddy.mapping()[current_lan_ip][item.ip] || [],
+          router: this.kernel.router.info()[this.kernel.peer.host][item.ip] || [],
           ...item
         }
       })
-      console.log("list", list)
 
-      let peers = this.kernel.peer.get()
-      peers = peers.map((x) => {
-        let account = this.kernel.peer.account(x)
-        let domain = `https://pinokio.${account}.localhost`
-        let proxy_page = `https://pinokio.${account}.localhost/proxy`
-        return {
-          ip: x,
-          account,
-          domain,
-          proxy_page
-        }
-      })
+      let peers_info = await this.kernel.peer.refresh()
+      let peers = []
+      for(let host in peers_info) {
+        let peer_info = peers_info[host]
+        peers.push({
+          host,
+          name: peer_info.name,
+          domain: `https://pinokio.${peer_info.name}.localhost`,
+          router: `https://pinokio.${peer_info.name}.localhost/proxy`
+        })
+      }
+
+//      let peers = this.kernel.peer.get()
+//      peers = peers.map((x) => {
+//        let account = this.kernel.peer.account(x)
+//        let domain = `https://pinokio.${account}.localhost`
+//        let proxy_page = `https://pinokio.${account}.localhost/proxy`
+//        return {
+//          ip: x,
+//          account,
+//          domain,
+//          proxy_page
+//        }
+//      })
 
       let live_proxies = this.kernel.api.proxies["/proxy"]
       if (!live_proxies) live_proxies = []
@@ -2745,23 +2717,20 @@ class Server {
         let pinokio2 = (await this.kernel.loader.load(p2)).resolved
         if (pinokio) {
           let cc = Object.assign({} , pinokio , pinokio2);
-          console.log({ pinokio, pinokio2, cc })
           cc.link = `/pinokio/browser/${folder}/browse#n1`,
           cc.icon = cc.icon ? `/api/${folder}/${cc.icon}?raw=true` : null
           cc.name = cc.title
-          console.log("after", { pinokio, pinokio2, cc })
           apps.push(cc)
         }
       }
 
-      console.log({ port_mapping: this.kernel.caddy.port_mapping, ip_mapping: this.kernel.caddy.ip_mapping, lan: this.kernel.caddy.local_network_mapping, ip: this.kernel.peer.current_ip })
       res.render("proxy", {
         ip: this.kernel.peer.current_ip,
         peers,
         list,
-        port_mapping: this.kernel.caddy.port_mapping,
-        ip_mapping: this.kernel.caddy.ip_mapping,
-        lan: this.kernel.caddy.local_network_mapping,
+//        port_mapping: this.kernel.caddy.port_mapping,
+//        ip_mapping: this.kernel.caddy.ip_mapping,
+        lan: this.kernel.router.local_network_mapping,
         agent: this.agent,
         theme: this.theme,
         items: proxies,
@@ -2793,7 +2762,6 @@ class Server {
     this.app.post("/copy", ex(async (req, res) => {
       let src_path = path.resolve(this.kernel.api.userdir, req.body.src)
       let dest_path = path.resolve(this.kernel.api.userdir, req.body.dest)
-      console.log({ src_path, dest_path })
       try {
         await fs.promises.cp(src_path, dest_path, { recursive: true })
         res.json({
@@ -3130,7 +3098,6 @@ class Server {
           }
         }
       }
-      console.log({ cloudflare_links, local_links })
       res.render("share_editor", {
         cloudflare_links,
         local_links,
@@ -3290,14 +3257,12 @@ class Server {
       */
 
     }))
-    this.app.get("/pinokio/mem", ex((req, res) => {
+    this.app.get("/pinokio/peer", ex((req, res) => {
       res.json({
-        homedir: this.kernel.homedir,
-        account: this.kernel.peer.current_account,
-        proxy: this.kernel.caddy.mapping(), // mapping: { IP => https_domain }
-        ports: this.kernel.caddy.port_mapping,
-        lan: this.kernel.caddy.local_network_mapping,
-        ips: this.kernel.caddy.ip_mapping,
+        home: this.kernel.homedir,
+        name: this.kernel.peer.name,
+        host: this.kernel.peer.host,
+        router: this.kernel.router.info(),
         memory: this.kernel.memory
       })
     }))
@@ -3921,7 +3886,6 @@ class Server {
       });
     })
     this.kernel.peer.start()
-    console.timeEnd("SERVER START")
 
 
   }

package/server/views/install.ejs

@@ -254,7 +254,6 @@ document.addEventListener("DOMContentLoaded", async () => {
         }
       } else if (packet.type === "input") {
         let params = packet.data
-        console.log(">> input", { params })
         /*
           params := {
             title,

package/server/views/proxy.ejs

@@ -247,8 +247,8 @@ td:first-child, th:first-child {
   <div class='header-container'>
     <div class='header-label-sub'><i class="fa-solid fa-podcast"></i> Local Network</div>
     <% peers.forEach((item) => { %>
-      <a target="_blank" href="<%=item.proxy_page%>" class='line align-top'>
-        <h3 class='table-grid'><%=item.account%></h3>
+      <a target="_blank" href="<%=item.router%>" class='line align-top'>
+        <h3 class='table-grid'><%=item.name%></h3>
       </a>
     <% }) %>
   </div>
@@ -265,9 +265,9 @@ td:first-child, th:first-child {
           <tr> 
             <td class='title'><%=item.name%></td>
             <td>
-              <% item.proxy.forEach((ip) => { %>
+              <% item.router.forEach((domain) => { %>
                 <div>
-                  <a target="_blank" href="https://<%=ip%>">https://<%=ip%></a>
+                  <a target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
                 </div>
               <% }) %>
             </td>