pinokiod 3.8.30 → 3.8.31

package/kernel/caddy.js

@@ -1,5 +1,6 @@
 const axios = require('axios')
 const path = require('path')
+const Util = require('./util')
 class Caddy {
   constructor(kernel) {
     this.kernel = kernel
@@ -86,7 +87,7 @@ class Caddy {
       }
     }
   }
-  peers_locals(payload) {
+  async peers_locals(payload) {
     let peers = this.kernel.peer.get()
     for(let ip of peers) {
       let account = this.kernel.peer.account(ip)
@@ -101,12 +102,42 @@ class Caddy {
           if (val.startsWith("http")) {
             val = val.replace(/https?:\/\//, '')
 
+
             // replace 127,0.0.1 or localhost with the 192.168 address
             val = val.replace(/localhost|127\.0\.0\.1/g, ip)
             let api_path = path.resolve(this.kernel.peer.homedir(ip), "api")
             let rel_path = path.relative(api_path, script_path)
             let name = rel_path.split(path.sep)[0]
             console.log({ api_path, rel_path, name, val })
+
+
+            // create a proxy proxy
+            // - get next available port and expose
+            payload.apps.http.servers.main.routes.push({
+              "match": [{
+                "host": [":PORT_PLACEHOLDER_" + val],
+              }],
+              "handle": [
+                {
+                  "handler": "reverse_proxy",
+                  "upstreams": [{ "dial": val }]
+                },
+                {
+                  "handler": "headers",
+                  "response": {
+                    "set": {
+                      "Access-Control-Allow-Origin": ["*"],
+                      "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                      "Access-Control-Allow-Headers": ["*"],
+                      "Vary": ["Origin"]
+                    }
+                  }
+                }
+              ]
+            })
+
+
+            // proxy proxy => proxy
             if (key === "url") {
               let url = `${name}.${account}.localhost`.toLowerCase()
               this.mapping[val] = url
@@ -117,7 +148,7 @@ class Caddy {
                 "handle": [
                   {
                     "handler": "reverse_proxy",
-                    "upstreams": [{ "dial": val }]
+                    "upstreams": [{ "dial": ":PORT_PLACEHOLDER_" + val }]
                   },
                   {
                     "handler": "headers",
@@ -140,7 +171,7 @@ class Caddy {
               "handle": [
                 {
                   "handler": "reverse_proxy",
-                  "upstreams": [{ "dial": val }]
+                  "upstreams": [{ "dial": ":PORT_PLACEHOLDER_" + val }]
                 },
                 {
                   "handler": "headers",
@@ -232,40 +263,85 @@ class Caddy {
   async peers_procs (payload) {
     console.log("####### procs", payload)
     let list = this.kernel.peer.get()
+    console.log(">> peers list", list)
     for(let ip of list) {
       let account = this.kernel.peer.account(ip)
+      console.log({ account })
 
       // caddy_mapping := { IP => HTTPS_DOMAIN }
       let caddy_mapping = this.kernel.peer.caddy(ip)
-      for(let app_ip in caddy_mapping) {
-        let https_domain = caddy_mapping[app_ip]
-        let remote_app_ip = app_ip.replace(/localhost|127\.0\.0\.1/g, ip)
+      console.log({ caddy_mapping })
+      for(let internal_ip in caddy_mapping) {
+        let INTERNAL_PORT = internal_ip.split(":")[1]
+        let https_domain = caddy_mapping[internal_ip]
+//        let remote_app_ip = app_ip.replace(/localhost|127\.0\.0\.1/g, ip)
+//        console.log({ https_domain, app_ip, ip })
         // https_domain <port>.localhost
-        let re = new RegExp(ip)
-        let url  = https_domain.replace(re, '.') + `${account}.localhost`
-        this.mapping[remote_app_ip] = url
-        payload.apps.http.servers.main.routes.push({
-          "match": [{
-            "host": [url],
-          }],
-          "handle": [
-            {
-              "handler": "reverse_proxy",
-              "upstreams": [{ "dial": remote_app_ip }]
-            },
-            {
-              "handler": "headers",
-              "response": {
-                "set": {
-                  "Access-Control-Allow-Origin": ["*"],
-                  "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
-                  "Access-Control-Allow-Headers": ["*"],
-                  "Vary": ["Origin"]
+//        let re = new RegExp(ip)
+
+        // insert the $account value right before the last part (1234.localhost => 1234.x.localhost)
+        let chunks = https_domain.split(".")
+        if (chunks.length === 2) {
+          chunks.splice(chunks.length - 1, 0, account)
+
+
+          let namespaced_url = chunks.join(".")
+
+          const exposed_url = ip + ":" + INTERNAL_PORT
+          console.log({ namespaced_url, https_domain, exposed_url, internal_ip })
+          this.mapping[internal_ip] = namespaced_url
+
+
+          // create a proxy proxy
+          // 1. create an exposed port listening on 0.0.0.0
+          // 2. the exposed port points to the internal ip
+          payload.apps.http.servers[":" + INTERNAL_PORT] = {
+            "listen": [":PORT_PLACEHOLDER_" + INTERNAL_PORT],
+            "routes": [{
+              "handle": [
+                {
+                  "handler": "reverse_proxy",
+                  "upstreams": [{ "dial": internal_ip }]
+                },
+                {
+                  "handler": "headers",
+                  "response": {
+                    "set": {
+                      "Access-Control-Allow-Origin": ["*"],
+                      "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                      "Access-Control-Allow-Headers": ["*"],
+                      "Vary": ["Origin"]
+                    }
+                  }
+                }
+              ]
+            }]
+          }
+
+          // 1. point proxy URL to the 127.0.0.1:EXPOSED_PORT
+          payload.apps.http.servers.main.routes.push({
+            "match": [{
+              "host": [namespaced_url],
+            }],
+            "handle": [
+              {
+                "handler": "reverse_proxy",
+                "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + INTERNAL_PORT }]
+              },
+              {
+                "handler": "headers",
+                "response": {
+                  "set": {
+                    "Access-Control-Allow-Origin": ["*"],
+                    "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                    "Access-Control-Allow-Headers": ["*"],
+                    "Vary": ["Origin"]
+                  }
                 }
               }
-            }
-          ]
-        })
+            ]
+          })
+        }
       }
     }
     return payload
@@ -332,10 +408,23 @@ class Caddy {
     // localhost local variables
     payload = this.locals(payload)
     // peers local variables
-    payload = this.peers_locals(payload)
+    payload = await this.peers_locals(payload)
 
     payload = await this.procs(payload)
-    payload = this.peers_procs(payload)
+    payload = await this.peers_procs(payload)
+
+
+    // replace :PORT_PLACEHOLDER with available ports
+
+    const jsonString = JSON.stringify(payload)
+    const matches = jsonString.match(/:PORT_PLACEHOLDER/g);
+    const count = matches ? matches.length : 0;
+ 
+    if (count > 0) {
+      let ports = await this.kernel.ports(count)
+      console.log({ count, ports })
+      payload = Util.fill_object(payload, /PORT_PLACEHOLDER_.+/, ports)
+    }
 
     return payload
   }

package/kernel/index.js

@@ -212,6 +212,18 @@ class Kernel {
       return portfinder.getPortPromise({ port: 42003 })
     }
   }
+  ports(count) {
+    // get "count" number of available ports
+    return new Promise((resolve, reject) => {
+      portfinder.getPorts(count, { port: 42003 }, (err, ports) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(ports)
+        }
+      })
+    })
+  }
   path(...args) {
     return path.resolve(this.homedir, ...args)
   }

package/kernel/peer.js

@@ -34,10 +34,16 @@ class PeerDiscovery {
       if (msg.toString() === this.message.toString() && this._isLocalLAN(ip)) {
         if (!this.peers.has(ip)) {
           this.peers.add(ip);
-          axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
-            this.data[ip] = res.data
-          })
-          console.log(`Discovered peer: ${ip}`);
+          let interval = setInterval(() => {
+            axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
+              console.log("axios", res.data)
+              this.data[ip] = res.data
+              if (res.data.caddy) {
+                console.log(`Discovered peer: ${ip}`);
+//                clearInterval(interval)
+              }
+            })
+          }, 1000)
         }
       }
     });

package/kernel/util.js

@@ -307,6 +307,34 @@ const update_env = async (filepath, changes) => {
   }, normalizeEOL(env));
   await fs.promises.writeFile(filepath, newval)
 };
+function fill_object(obj, pattern, list) {
+  const map = {};
+  let index = 0;
+
+  function recurse(value) {
+    if (typeof value === 'string') {
+      return value.replace(pattern, (match) => {
+        if (!(match in map)) {
+          if (index >= list.length) throw new Error("Not enough items provided");
+          map[match] = list[index++];
+        }
+        return map[match];
+      });
+    } else if (Array.isArray(value)) {
+      return value.map(recurse);
+    } else if (value && typeof value === 'object') {
+      const newObj = {};
+      for (const [k, v] of Object.entries(value)) {
+        newObj[k] = recurse(v);
+      }
+      return newObj;
+    }
+    return value;
+  }
+
+  return recurse(obj);
+}
+
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object
 }

package/package.json

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