pinokiod 3.8.147 → 3.8.148

package/kernel/index.js

@@ -204,7 +204,6 @@ class Kernel {
     if (this.router.port_mapping && Object.keys(this.router.port_mapping).length > 0) {
       let max_caddy_port = Math.max(...Object.values(this.router.port_mapping))
       let start_port = Math.max(42003, max_caddy_port + 1)
-      console.log({ start_port })
       return start_port
     } else {
       return 42003
@@ -267,35 +266,35 @@ class Kernel {
     if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
       active = true
     }
-    console.log("kernel.refresh", { active, notify_peers })
+//    console.log("kernel.refresh", { active, notify_peers })
     if (active) {
 
       // 1. get the process list
-      console.log("Step 1: Get process list")
+//      console.log("Step 1: Get process list")
       await this.processes.refresh()
-      console.log("Process info", this.processes.info)
+//      console.log("Process info", this.processes.info)
 
       // 2. refresh peer info to reflect the proc info
       await this.peer.refresh()
 
       // 3. set current local host router info
-      console.log("Step 3: Set current local host router")
+//      console.log("Step 3: Set current local host router")
       await this.router.local()
-      console.log("router mapping after step 3", this.router.info)
+//      console.log("router mapping after step 3", this.router.info)
 
       // 4. refresh peer info to reflect the updated router info
       await this.peer.refresh()
 
       // 4. tell peers to refresh
       if (notify_peers) {
-        console.log("Step 4: notify peers to refresh")
+//        console.log("Step 4: notify peers to refresh")
         await this.peer.notify_peers()
       }
 
       // 4. update remote router
-      console.log("Step 5: Set remote routers")
+//      console.log("Step 5: Set remote routers")
       await this.router.remote()
-      console.log("router mapping after step 5", this.router.info)
+//      console.log("router mapping after step 5", this.router.info)
 
       await this.router.update()
 

package/kernel/loader.js

@@ -40,7 +40,7 @@ class Loader {
           resolved = null
         }
       } catch (e) {
-        console.log(`[load error] ${_path}`)
+        console.log(`[did not load] ${_path}`)
         resolved = null
       }
     }
@@ -49,21 +49,21 @@ class Loader {
   async requireJSON(filepath) {
     let config
     try { config = require(filepath) } catch (e) {
-      console.log(`[load error] ${filepath}`)
+      console.log(`[did not load] ${filepath}`)
     }
     return config
   }
   async requireJS(filepath) {
     let config
     try { config = require(filepath) } catch (e) {
-      console.log(`[load error] ${filepath}`)
+      console.log(`[did not load] ${filepath}`)
     }
     try {
       // if the required module is a class, return the instantiated object
       return new config();
     } catch (e) {
       // otherwise return normally
-      console.log(`[load error] ${filepath}`)
+      console.log(`[did not load] ${filepath}`)
       return config
     }
   }

package/kernel/peer.js

@@ -86,7 +86,7 @@ class PeerDiscovery {
     }
   }
   async _broadcast(host) {
-    console.log("peer _broadcast", host)
+//    console.log("peer _broadcast", host)
     try {
       let res = await axios.post(`http://${host}:${this.default_port}/pinokio/peer/refresh`, {
         timeout: 2000
@@ -108,6 +108,7 @@ class PeerDiscovery {
   // refresh peer info
   async refresh(peers) {
     if (this.active) {
+      this.refreshing = true
       let refresh_peers
       if (peers) {
         refresh_peers = peers
@@ -118,7 +119,7 @@ class PeerDiscovery {
       let peer_info = await Promise.all(refresh_peers.map((host) => {
         return this._refresh(host)
       }))
-      console.log({ peer_info })
+//      console.log({ peer_info })
       for(let i=0; i<peer_info.length; i++) {
         let peer = peer_info[i]
         if (peer) {
@@ -128,7 +129,8 @@ class PeerDiscovery {
           }
         }
       }
-      console.log("REFRESH", this.info)
+//      console.log("REFRESH", this.info)
+      this.refreshing = false
       return this.info
     }
   }

package/kernel/procs.js

@@ -107,7 +107,7 @@ class Procs {
 //          list = list.filter((item) => {
 //            return !["caddy", "caddy.exe"].includes(item.name.toLowerCase()) 
 //          })
-          console.log("#LIST", { list, size: list.length })
+//          console.log("#LIST", { list, size: list.length })
           resolve(list)
         });
       });      

package/kernel/router/connector.js

@@ -3,11 +3,12 @@ class Connector {
     this.router = router
   }
   handle ({ match, connector, dial, }) {
-    console.log("connector.handle", { match, connector, dial })
+//    console.log("connector.handle", { match, connector, dial })
     let connector_name = connector.host + ":" + connector.port
     let listener = "0.0.0.0:PORT_PLACEHOLDER_" + connector_name
     let listener_pointer = connector.host + ":PORT_PLACEHOLDER_" + connector_name
-    console.log("CONNECTING", { listener, dial, listener_pointer, match })
+    let port_placeholder = "PORT_PLACEHOLDER_" + connector_name
+//    console.log("CONNECTING", { listener, dial, listener_pointer, match })
     if(!this.router.config.apps.http.servers[connector_name]) {
       this.router.config.apps.http.servers[connector_name] = {
         "listen": [listener],
@@ -103,8 +104,9 @@ class Connector {
 //        }
       ]
     })
-    console.log("Router.add", { host: connector.host, dial: listener_pointer, match })
     this.router.add({ host: connector.host, dial: listener_pointer, match })
+//    this.router._tree[connector_name] = dial
+//    this.router._tree[connector_name] = dial
   }
 }
 module.exports = Connector

package/kernel/router/index.js

@@ -50,7 +50,6 @@ class Router {
       }
     }
 
-    console.log("BEFORE REPLACING", mapping)
 
     let host_mapping = mapping[this.kernel.peer.host]
     if (host_mapping) {
@@ -60,7 +59,7 @@ class Router {
             let transformed = key.replace(":" + cache_key, '')
             let port = this.port_cache[cache_key]
             host_mapping[transformed + ":" + port] = host_mapping[key]
-            console.log("replacing", transformed + ":" + port, "with", host_mapping[key])
+//            console.log("replacing", transformed + ":" + port, "with", host_mapping[key])
             delete host_mapping[key]
           }
         }
@@ -75,9 +74,10 @@ class Router {
 //      let m = JSON.parse(json)
 //
 //      mapping[this.kernel.peer.host] = m
-      console.log("AFTER REPLACING", mapping)
+//      console.log("AFTER REPLACING", mapping)
     }
 
+
     return mapping
 
 //    let json = JSON.stringify(mapping)
@@ -105,17 +105,17 @@ class Router {
   */
   published() {
     let pub = {}
-    console.log("published info", this.info)
+//    console.log("published info", this.info)
     if (this.info) {
       let routes = this.info[this.kernel.peer.host]
       for(let dial in routes) {
         let matches = routes[dial]
         // current host => the single source of truth
-        if (dial.startsWith(this.kernel.peer.host)) {
+//        if (dial.startsWith(this.kernel.peer.host)) {
           pub[dial] = matches
-        }
+//        }
       }
-      console.log({ pub })
+//      console.log({ pub })
     }
     return pub
   }
@@ -143,14 +143,10 @@ class Router {
     }
     */
 
-
-    console.log("^^^^^^^^", { count , matches })
-
     let new_config
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
-      console.log("Filling with port cache", JSON.stringify({ port_cache: this.port_cache, config: this.config }, null, 2))
       let response = Util.fill_object(this.config, /PORT_PLACEHOLDER_.+/, ports, this.port_cache)
       this.config = response.result
       let replaced_map = response.replaced_map
@@ -170,7 +166,7 @@ class Router {
 
         //let original_port = key.replace("PORT_PLACEHOLDER_", "")
         this.port_mapping[original_port] = replaced_map[key]
-        console.log("set port_mapping", { original_port, key, replaced_map })
+//        console.log("set port_mapping", { original_port, key, replaced_map })
       }
       this.port_cache = replaced_map
     }
@@ -181,59 +177,49 @@ class Router {
   // set local config
   async local() {
     this._mapping = {}
-    console.log("Processing local")
+//    this._tree = {}
     this.localhost_home_router.handle()
-    console.log("after 1", this._mapping)
     this.localhost_variable_router.handle(this.kernel.memory.local)
-    console.log("after 2", this._mapping)
     for(let proc of this.kernel.processes.info) {
       this.localhost_port_router.handle(proc)
     }
-    console.log("after 3", this._mapping)
     //this.mapping = this._mapping
 
 
     for(let host in this.kernel.peer.info) {
       let peer = this.kernel.peer.info[host]
       if (peer.host === this.kernel.peer.host) {
-        console.log("peer.host === kernel.peer.host", peer.host)
         this.peer_home_router.handle(peer)
-        console.log("after 4", this._mapping)
         this.peer_variable_router.handle(peer)
-        console.log("after 5", this._mapping)
         this.peer_port_router.handle(peer)
-        console.log("after 6", this._mapping)
       }
     }
-    console.log("after 7", this._mapping)
     await this.fill()
-    console.log("after 8", this._mapping)
     this.mapping = this._mapping
+//    this.tree = this._tree
   }
 
   // set remote config
   async remote() {
-    console.log("Before remote", this.kernel.peer.info)
     for(let host in this.kernel.peer.info) {
       let peer = this.kernel.peer.info[host]
       if (peer.host !== this.kernel.peer.host) {
         this.peer_peer_router.handle(peer)
       }
     }
-    console.log("After remote", this.kernel.peer.info)
     //await this.fill()
     this.mapping = this._mapping
+//    this.tree = this._tree
     this.info = this._info()
+//    console.log("TREE", JSON.stringify(this.tree, null, 2))
   }
 
   // update caddy config
   async update() {
-//    console.log("this.config", JSON.stringify(this.config))
-//    console.log("this.old_config", JSON.stringify(this.old_config))
     if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
-      console.log("config hasn't updated")
+//      console.log("config hasn't updated")
     } else {
-      console.log("config has updated")
+      console.log("caddy config has updated")
       let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
         headers: { 'Content-Type': 'application/json' }
       }).catch((e) => {
@@ -244,59 +230,59 @@ class Router {
     }
   }
 
-  async refresh() {
-//    console.log("router.refresh")
-//    console.time("router.refresh")
-//    console.log("> procs", this.kernel.processes.info)
-//    console.log("> peers", this.kernel.peer.info)
-    this._mapping = {}
-//    this.port_mapping = {}   // 127.0.0.1 => 192.168,..
-//    this.local_network_mapping = {}
-
-    let old_config = this.config
-
-    // 1. Localhost handling
-    this.localhost_home_router.handle()
-    this.localhost_variable_router.handle(this.kernel.memory.local)
-    for(let proc of this.kernel.processes.info) {
-      this.localhost_port_router.handle(proc)
-    }
-    this.mapping = this._mapping
-
-    // 2. Peers handling
-    for(let host in this.kernel.peer.info) {
-      let peer = this.kernel.peer.info[host]
-      if (peer.host === this.kernel.peer.host) {
-        this.peer_home_router.handle(peer)
-        this.peer_variable_router.handle(peer)
-        this.peer_port_router.handle(peer)
-      } else {
-        this.peer_peer_router.handle(peer)
-      }
-    }
-    // replace :PORT_PLACEHOLDER with available ports
-
-
-    await this.fill()
-    this.mapping = this._mapping
-    console.timeEnd("router.refresh")
-
-
-    // compare old config with new config
-    // if it hasn't changed, don't do anything
-    // if it has changed, refresh
-
-    if (JSON.stringify(this.config) === JSON.stringify(old_config)) {
-      console.log("config hasn't updated")
-    } else {
-      console.log("config has updated")
-      let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
-        headers: { 'Content-Type': 'application/json' }
-      }).catch((e) => {
-        console.log("EEEEEEEEEEEEE", e.message)
-      })
-      console.log("Caddy Response", { response })
-    }
-  }
+//  async refresh() {
+////    console.log("router.refresh")
+////    console.time("router.refresh")
+////    console.log("> procs", this.kernel.processes.info)
+////    console.log("> peers", this.kernel.peer.info)
+//    this._mapping = {}
+////    this.port_mapping = {}   // 127.0.0.1 => 192.168,..
+////    this.local_network_mapping = {}
+//
+//    let old_config = this.config
+//
+//    // 1. Localhost handling
+//    this.localhost_home_router.handle()
+//    this.localhost_variable_router.handle(this.kernel.memory.local)
+//    for(let proc of this.kernel.processes.info) {
+//      this.localhost_port_router.handle(proc)
+//    }
+//    this.mapping = this._mapping
+//
+//    // 2. Peers handling
+//    for(let host in this.kernel.peer.info) {
+//      let peer = this.kernel.peer.info[host]
+//      if (peer.host === this.kernel.peer.host) {
+//        this.peer_home_router.handle(peer)
+//        this.peer_variable_router.handle(peer)
+//        this.peer_port_router.handle(peer)
+//      } else {
+//        this.peer_peer_router.handle(peer)
+//      }
+//    }
+//    // replace :PORT_PLACEHOLDER with available ports
+//
+//
+//    await this.fill()
+//    this.mapping = this._mapping
+//    console.timeEnd("router.refresh")
+//
+//
+//    // compare old config with new config
+//    // if it hasn't changed, don't do anything
+//    // if it has changed, refresh
+//
+//    if (JSON.stringify(this.config) === JSON.stringify(old_config)) {
+//      console.log("config hasn't updated")
+//    } else {
+//      console.log("config has updated")
+//      let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
+//        headers: { 'Content-Type': 'application/json' }
+//      }).catch((e) => {
+//        console.log("EEEEEEEEEEEEE", e.message)
+//      })
+//      console.log("Caddy Response", { response })
+//    }
+//  }
 }
 module.exports = Router

package/kernel/router/localhost_home_router.js

@@ -3,6 +3,7 @@ class LocalhostHomeRouter {
     this.router = router
   }
   handle () {
+    this.router.add({ host: this.router.kernel.peer.host, dial: this.router.default_host + ":" + this.router.default_port, match: this.router.default_match })
     this.router.config = {
       "apps": {
         "http": {

package/kernel/router/localhost_port_router.js

@@ -5,7 +5,6 @@ class LocalhostPortRouter {
     this.common = new Common(router)
   }
   handle (proc) {
-    console.log("LocalhostPortRouter", proc)
     this.common.handle({
       match: `${proc.port}.localhost`,
       dial: proc.ip,

package/kernel/router/localhost_variable_router.js

@@ -8,7 +8,6 @@ class LocalhostVariableRouter extends Processor {
     this.common = new Common(router)
   }
   handle (local) {
-    console.log("LocalhostVariableRouter", local)
     for(let script_path in local) {
       let local_variables_for_script = local[script_path]
       for(let key in local_variables_for_script) {

package/kernel/router/peer_home_router.js

@@ -5,7 +5,6 @@ class PeerHomeRouter {
     this.common = new Common(router)
   }
   handle(peer) {
-    console.log("PeerHomeRouter", peer)
     this.common.handle({
       match: `${this.router.default_prefix}.${peer.name}.${this.router.default_suffix}`,
       dial: `${peer.host}:${this.router.default_port}`,

package/kernel/router/peer_peer_router.js

@@ -5,7 +5,6 @@ class PeerPeerRouter {
     this.common = new Common(router)
   }
   handle(peer) {
-    console.log("PeerPeerRouter", peer)
     for(let dial in peer.router) {
       let matches = peer.router[dial]
       let exposed_matches = matches.filter((m) => {
@@ -15,7 +14,6 @@ class PeerPeerRouter {
       let port = chunks[chunks.length-1]
       let exposed_dial = `${peer.host}:${port}` // exposed_dial :- 192.168...
       for(let match of exposed_matches) {
-        console.log("common.handle", { match, exposed_dial, host: peer.host })
         this.common.handle({
           match,
           dial: exposed_dial,

package/kernel/router/peer_port_router.js

@@ -8,13 +8,9 @@ class PeerPortRouter extends Processor {
     this.connector = new Connector(router)
   }
   handle(peer) {
-    console.log("PeerPortRouter", peer)
     let https_domains_mapping = this.router.info[peer.host]
-    console.log({ https_domains_mapping })
     for(let dial in https_domains_mapping) {
-      console.log({ dial })
       let parsed_dial = this.parse_ip(dial)
-      console.log("Parsed dial", parsed_dial)
 
       if (parsed_dial.host !== peer.host) {
         // ONLY connect for 127.0.0.1 or localhost

package/kernel/router/peer_variable_router.js

@@ -8,19 +8,15 @@ class PeerVariableRouter extends Processor {
     this.connector = new Connector(router)
   }
   handle(peer) {
-    console.log("PeerVariableRouter", JSON.stringify(peer, null, 2))
     for(let script_path in peer.memory.local) {
       let local_variables = peer.memory.local[script_path]
       for(let key in local_variables) {
         let val = local_variables[key]
-        console.log({ key, val })
         if (val.startsWith("http")) {
           let dial = val.replace(/https?:\/\//, '')
           let name = this.api_name(peer.platform, peer.home, script_path)
-          console.log({ dial, name, has_port: this.has_port(dial), parsed_dial: this.parse_ip(dial) })
           if (this.has_port(dial)) {
             let parsed_dial = this.parse_ip(dial)
-            console.log("PeerVariable", { parsed_dial })
             if (key === "url") {
               this.connector.handle({
                 match: `${name}.${peer.name}.localhost`.toLowerCase(),

package/kernel/util.js

@@ -317,12 +317,12 @@ function fill_object(obj, pattern, list, cache) {
         if (!(match in map)) {
           if (replaced_map[match]) {
             map[match] = replaced_map[match]
-            console.log("filling with cache", { match, replaced: replaced_map[match] })
+//            console.log("filling with cache", { match, replaced: replaced_map[match] })
           } else {
             if (index >= list.length) throw new Error("Not enough items provided");
             map[match] = list[index++];
             replaced_map[match] = map[match]
-            console.log("filling with new", { match, replaced: replaced_map[match] })
+//            console.log("filling with new", { match, replaced: replaced_map[match] })
           }
         }
         return map[match];

package/package.json

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

package/server/index.js

@@ -1933,6 +1933,85 @@ class Server {
     }
     console.log("FINISHED MV")
   }
+  getPeerInfo() {
+    let list = []
+    let peers_info = {}
+    if (this.kernel.peer.info) {
+      peers_info = this.kernel.peer.info
+      let remote_peers = Object.keys(this.kernel.peer.info).filter(x => x !== this.kernel.peer.host)
+      let nodes = [this.kernel.peer.host].concat(remote_peers)
+      for(let host of nodes) {
+        let processes = []
+        try {
+          let procs = this.kernel.peer.info[host].proc
+          let router = this.kernel.peer.info[host].router
+          let port_mapping = this.kernel.peer.info[host].port_mapping
+          for(let proc of procs) {
+            let chunks = proc.ip.split(":")
+            let internal_port = chunks[chunks.length-1]
+            let internal_host = chunks.slice(0, chunks.length-1).join(":")
+            let external_port = port_mapping[internal_port]
+
+            let merged
+            let external_ip
+            if (external_port) {
+              external_ip = `${host}:${external_port}`
+//              merged = Array.from(new Set(router[external_ip].concat(router[proc.ip])))
+            } else {
+//              merged = router[proc.ip]
+            }
+            processes.push({
+              external_router: router[external_ip] || [],
+              internal_router: router[proc.ip] || [],
+              //router: merged || [],
+              external_ip,
+              external_port: parseInt(external_port),
+              internal_port: parseInt(internal_port),
+              ...proc
+            })
+            //if (external_port) {
+            //  let external_ip = `${host}:${external_port}`
+            //  // merge router
+            //  let merged = Array.from(new Set(router[external_ip].concat(router[proc.ip))
+            //  processes.push({
+            //    //proxy: this.kernel.caddy.mapping[item.ip] || [],
+            //    //router: router[external_ip] || [],
+            //    router: merged || [],
+            //    external_ip,
+            //    external_port: parseInt(external_port),
+            //    internal_port: parseInt(internal_port),
+            //    ...proc
+            //  })
+            //} else {
+            //  processes.push({
+            //    router: [],
+            //    external_port: parseInt(external_port),
+            //    internal_port: parseInt(internal_port),
+            //    ...proc
+            //  })
+            //}
+          }
+          // merge processes
+          // 1. 
+          processes.sort((a, b) => {
+            return b.external_port-a.external_port
+          })
+          list.push({
+            host,
+            name: this.kernel.peer.info[host].name,
+            platform: this.kernel.peer.info[host].platform,
+            processes
+          })
+        } catch (e) {
+          console.log(">>e", e)
+          console.log({ host, info: this.kernel.peer.info })
+        }
+      }
+//      console.log("Loaded yet?", nodes.length, Object.keys(peers_info).length, nodes.length === Object.keys(peers_info).length)
+    }
+    return list
+  }
+
 
   async syncConfig() {
 
@@ -2625,67 +2704,26 @@ class Server {
         id: req.params.id
       })
     }))
-    this.app.get("/network", ex(async (req, res) => {
-      let list = []
-
-//      let peers_info = await this.kernel.peer.refresh()
-      let peers_info = {}
-      if (this.kernel.peer.info) {
-        peers_info = this.kernel.peer.info
-//        let info = this.kernel.router.info()
-//        console.log("33 info", info)
-        let remote_peers = Object.keys(this.kernel.peer.info).filter(x => x !== this.kernel.peer.host)
-        let nodes = [this.kernel.peer.host].concat(remote_peers)
-        for(let host of nodes) {
-          let processes = []
-          try {
-            let procs = this.kernel.peer.info[host].proc
-            let router = this.kernel.peer.info[host].router
-            console.log({ router })
-            let port_mapping = this.kernel.peer.info[host].port_mapping
-            for(let proc of procs) {
-              let internal_port = proc.ip.split(":")[1]
-              let external_port = port_mapping[internal_port]
-              if (external_port) {
-                let external_ip = `${host}:${external_port}`
-                console.log({ internal_port, external_port, external_ip })
-                processes.push({
-                  //proxy: this.kernel.caddy.mapping[item.ip] || [],
-                  router: router[external_ip] || [],
-                  external_ip,
-                  external_port: parseInt(external_port),
-                  internal_port: parseInt(internal_port),
-                  ...proc
-                })
-              } else {
-                processes.push({
-                  router: [],
-                  external_port: parseInt(external_port),
-                  internal_port: parseInt(internal_port),
-                  ...proc
-                })
-              }
-            }
-            processes.sort((a, b) => {
-              return b.external_port-a.external_port
-            })
-            list.push({
-              host,
-              name: this.kernel.peer.info[host].name,
-              platform: this.kernel.peer.info[host].platform,
-              processes
-            })
-          } catch (e) {
-            console.log(">>e", e)
-            console.log({ host, info: this.kernel.peer.info })
-          }
+    this.app.get("/peer_check", ex(async (req, res) => {
+      if (this.kernel.peer.refreshing) {
+        res.json({ updated: false })
+      } else {
+        let list = this.getPeerInfo()
+        if (JSON.stringify(this.last_list) !== JSON.stringify(list)) {
+          this.last_list = list
+          res.json({ updated: true })
+        } else {
+          res.json({ updated: false })
         }
       }
-      console.log({ peers_info })
+    }))
+    this.app.get("/network", ex(async (req, res) => {
+      let list = this.getPeerInfo()
+
 
       let peers = []
-      for(let host in peers_info) {
-        let peer_info = peers_info[host]
+      for(let host in this.kernel.peer.info) {
+        let peer_info = this.kernel.peer.info[host]
         peers.push({
           host,
           name: peer_info.name,
@@ -3308,7 +3346,6 @@ class Server {
       res.json({ success: true })
     }))
     this.app.get("/pinokio/peer", ex(async (req, res) => {
-      console.log("/pinokio/peer", { proc: this.kernel.processes.info })
 //      await this.kernel.refresh()
       res.json({
         home: this.kernel.homedir,

package/server/views/network.ejs

@@ -136,6 +136,12 @@ body.dark .browser-options-row {
   color: royalblue;
   text-decoration: none;
 }
+a.ln[href^=https] {
+  color: #56ad00;
+}
+a.ln:hover {
+  color: red !important;
+}
 .line.align-top h3 {
 /*
   align-items: flex-start;
@@ -167,9 +173,8 @@ body.dark .browser-options-row {
   font-weight: bold;
 }
 .header-label-sub {
-  text-align: center;
-  font-size: 14px;
-  padding: 10px;
+  font-size: 16px;
+  padding: 10px 0;
   border-bottom: 1px solid rgba(0,0,0,0.1);
 }
 .header-label-sub .s {
@@ -207,7 +212,6 @@ body.dark .browser-options-row {
 }
 .container-row table {
   width: 100%;
-  margin-top: 20px;
 }
 table a {
   text-decoration: none;
@@ -216,19 +220,26 @@ table a {
 td:first-child, th:first-child {
   max-width: 100px;
 }
-.container-row th {
-  text-align: left;
+.container-row th h2 {
   font-size: 18px;
-  padding: 2px;
+  margin: 0;
   text-transform: uppercase;
 }
+.container-row th {
+  border-bottom: 1px solid rgba(0,0,0,0.05);
+  text-align: left;
+  padding: 20px 0;
+  font-weight: normal;
+  font-size: 12px;
+  margin-bottom: 10px;
+}
 .container-row td.title {
   overflow-wrap: break-word;
 }
 .container-row td {
   vertical-align: top;
   font-size: 14px;
-  padding: 2px;
+  padding: 5px 2px;
 }
 
 .config {
@@ -404,41 +415,46 @@ input:checked + .slider:before {
         -->
         <% if (current_host === host) { %>
           <div class='header-label-sub'>
-            <h1><i class="fa-solid fa-podcast"></i> <%=name%></h1>
-            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%> (this machine)</div>
+            <h1><i class="fa-solid fa-podcast"></i> <%=name%> (localhost)</h1>
+            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%></div>
           </div>
         <% } else { %>
           <div class='header-label-sub'>
             <h1><i class="fa-solid fa-wifi"></i> <%=name%></h1>
-            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%> (remote)</div>
+            <div class='s'><i class="fa-brands fa-<%=brands[platform]%>"></i> <%=platform%> <%=host%></div>
           </div>
         <% } %>
         <table>
           <tr>
-            <th>Server</th>
-            <th>https</th>
-            <th>http</th>
+            <th><h2>Server</h2><div>Running apps</div></th>
+            <th><h2>Shared</h2><div>Use on any machine on the network</div></th>
+            <th><h2>Local</h2><div>Use on this machine</div></th>
           </tr>
           <% processes.forEach((item) => { %>
             <tr> 
               <td class='title'><%=item.name%></td>
               <td>
-                <% item.router.forEach((domain) => { %>
+                <% item.external_router.forEach((domain) => { %>
                   <div>
-                    <a target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
+                    <a class='ln' target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
                   </div>
                 <% }) %>
-              </td>
-              <td>
-                <div>
-                  <a target="_blank" href="http://localhost:<%=item.port%>">http://localhost:<%=item.port%></a>
-                </div>
                 <% if (item.external_ip) { %>
                   <div>
-                    <a target="_blank" href="http://<%=item.external_ip%>">http://<%=item.external_ip%></a>
+                    <a class='ln' target="_blank" href="http://<%=item.external_ip%>">http://<%=item.external_ip%></a>
                   </div>
                 <% } %>
               </td>
+              <td>
+                <% item.internal_router.forEach((domain) => { %>
+                  <div>
+                    <a class='ln' target="_blank" href="https://<%=domain%>">https://<%=domain%></a>
+                  </div>
+                <% }) %>
+                <div>
+                  <a class='ln' target="_blank" href="http://localhost:<%=item.port%>">http://localhost:<%=item.port%></a>
+                </div>
+              </td>
             </tr>
           <% }) %>
         </table>
@@ -696,6 +712,15 @@ if (document.querySelector("#wifi")) {
   })
 }
 <% } %>
+setInterval(() => {
+  fetch("/peer_check").then((res) => {
+    return res.json()
+  }).then((res) => {
+    if (res.updated) {
+      location.href = location.href
+    }
+  })
+}, 2000)
 </script>
 </body>
 </html>