pinokiod 3.80.0 → 3.82.0

package/kernel/bin/caddy.js

@@ -28,9 +28,19 @@ class Caddy {
     console.log("Caddy running?", running)
 //    if (this.kernel.processes.caddy_pid) {
     if (running) {
-      console.log("kill existing caddy")
-      kill(this.kernel.processes.caddy_pid, "SIGKILL", true)
-      console.log("killed existing caddy")
+      console.log("kill existing caddy before restarting")
+      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()
+          } else {
+            console.log("try killing existing caddy again in 1 sec")
+          }
+        }, 1000)
+      })
     }
 //    let running = await this.running()
 //    console.log("Running", running)

package/kernel/index.js

@@ -418,6 +418,10 @@ class Kernel {
           return
         }
 
+        if (!this.peer.info) {
+          return
+        }
+
   //      // 1. get the process list
   //      await this.processes.refresh()
   //

package/kernel/kv.js

@@ -22,12 +22,10 @@ class KV {
   async get(host, index) {
     if (this.kernel.homedir) {
       let filePath = this.kernel.path("key.json")
-      console.log({ host, index, filePath })
       let json = await this.kernel.load(filePath)
       if (!json) {
         return null
       }
-      console.log({ json })
       if (json[host]) {
         return json[host][index]
       }

package/kernel/peer.js

@@ -23,10 +23,14 @@ class PeerDiscovery {
     }
   }
   async check_peers () {
-    for(let host of Array.from(this.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]
         }
@@ -136,7 +140,7 @@ class PeerDiscovery {
         return res.data
       }
     } catch (e) {
-      console.log("_refresh error", { host , e })
+//      console.log("_refresh error", { host , e })
       return null
     }
   }
@@ -144,16 +148,18 @@ class PeerDiscovery {
     // notify all peers of the current host info
     if (this.info) {
       let info = this.info[this.host]
-      for(let host of Array.from(this.peers)) {
+      let peer_array = Array.from(this.peers)
+      for(let host of peer_array) {
         if (this.host !== host) {
           try {
             let endpoint = `http://${host}:${this.default_port}/pinokio/peer/refresh`
             let res = await axios.post(endpoint, info, {
               timeout: 2000
             })
-            return res.data
+//            return res.data
           } catch (e) {
-            return null
+//            console.log("ERROR", e)
+//            return null
           }
         }
       }
@@ -172,7 +178,8 @@ class PeerDiscovery {
   // notify peers to refresh my info
   async notify_peers() {
     if (this.active) {
-      let res = await Promise.all(Array.from(this.peers).map((host) => {
+      let peer_array = Array.from(this.peers)
+      let res = await Promise.all(peer_array.map((host) => {
         return this._broadcast(host)
       }))
       return res

package/kernel/router/index.js

@@ -254,7 +254,7 @@ class Router {
   }
 
   fallback() {
-    let host_peer = this.kernel.peer.info[this.kernel.peer.host]
+//    let host_peer = this.kernel.peer.info[this.kernel.peer.host]
     this.config.apps.http.servers.main.routes.push({
       "handle": [
         {

package/kernel/router/peer_static_router.js

@@ -30,7 +30,7 @@ class PeerStaticRouter extends Processor {
         rewrite: /asset/api/test
         match: test.x.localhost
     */ 
-    console.log("PEER STATIC ROUTER", rewrite_mapping)
+//    console.log("PEER STATIC ROUTER", rewrite_mapping)
     let url = new URL("http://" + rewrite_mapping.external_ip)
     let dial = url.host
     let rewrite = url.pathname

package/kernel/util.js

@@ -838,19 +838,14 @@ const rewrite_localhost= (kernel, obj, source) => {
         console.log({ port, hostname, host })
         if (protocol === "https") {
           let proxyDomain
-          console.log("current_host", kernel.peer.host)
-          console.log("router_info", kernel.peer.info[kernel.peer.host].router_info)
           for(let item of kernel.peer.info[kernel.peer.host].router_info) {
-            console.log({ internal_port: item.internal_port, port })
             if (String(item.internal_port) === String(port)) {
               if (item.external_router && item.external_router.length > 0) {
-                console.log("Found", { item, port })
                 proxyDomain = item.external_router[0]
               }
               break;
             }
           }
-          console.log({ proxyDomain })
           if (proxyDomain) {
             u.host = proxyDomain
             u.port = ""
@@ -860,9 +855,7 @@ const rewrite_localhost= (kernel, obj, source) => {
           let proxyPort = kernel.peer.info[kernel.peer.host].port_mapping["" + port]
           u.hostname = sourceIp;
           u.port = proxyPort;
-          console.log({ url, port, proxyPort, sourceIp, proxyPort })
         }
-        console.log("Fixed", u.toString())
         return u.toString();
       }
     } catch (e) {

package/package.json

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

package/server/index.js

@@ -2282,8 +2282,6 @@ class Server {
             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)
@@ -4201,8 +4199,6 @@ class Server {
         }
       } catch (e) {
       }
-      console.log("PEER INFO", JSON.stringify(this.kernel.peer.info[host], null, 2))
-
       let installed = this.kernel.peer.info[host].installed
       let serverless_mapping = this.kernel.peer.info[host].rewrite_mapping
       let serverless = Object.keys(serverless_mapping).map((name) => {
@@ -6252,7 +6248,6 @@ class Server {
     this.app.get("/check_peer", ex((req, res) => {
       if (this.kernel.peer.active) {
         // if network is active, return success only if the router is up for all of its peers (including itself)
-        console.log({ peer_info: this.kernel.peer.info })
         let ready = true
         if (this.kernel.peer.info && Object.keys(this.kernel.peer.info).length > 0) {
           for(let host in this.kernel.peer.info) {
@@ -6267,7 +6262,6 @@ class Server {
         } else {
           ready = false;
         }
-        console.log({ info: this.kernel.peer.info, ready })
         if (ready) {
           res.json({ success: true })
         } else {

package/server/public/urldropdown.js

@@ -69,7 +69,7 @@ function initUrlDropdown(config = {}) {
         let u = new URL(val)
         if (String(u.port) === "42000") {
           // pinokio app => open the url itself
-          window.open(val, "_blank")
+          window.open(val, "_blank", 'self')
         } else {
           // other servers => open in pinokio redirect frame
           let redirect_uri = "/container?url=" + val
@@ -347,7 +347,7 @@ function initUrlDropdown(config = {}) {
       button.addEventListener('click', function(e) {
         e.stopPropagation();
         const networkUrl = this.getAttribute('data-network-url');
-        window.open(networkUrl, '_blank');
+        window.open(networkUrl, '_blank', 'self');
       });
     });
   }
@@ -570,7 +570,7 @@ function initUrlDropdown(config = {}) {
       button.addEventListener('click', function(e) {
         e.stopPropagation();
         const networkUrl = this.getAttribute('data-network-url');
-        window.open(networkUrl, '_blank');
+        window.open(networkUrl, '_blank', 'self');
       });
     });
   }