pinokiod 3.8.35 → 3.8.36

package/kernel/caddy.js

@@ -136,7 +136,7 @@ class Caddy {
               // create a proxy proxy
               // - get next available port and expose
               payload.apps.http.servers[":" + INTERNAL_PORT] = {
-                "listen": [":PORT_PLACEHOLDER_" + INTERNAL_PORT],
+                "listen": [":PORT_PLACEHOLDER_" + ip + ":" + INTERNAL_PORT],
                 "routes": [{
                   "handle": [
                     {
@@ -172,7 +172,7 @@ class Caddy {
                   "handle": [
                     {
                       "handler": "reverse_proxy",
-                      "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + INTERNAL_PORT }]
+                      "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + ip + ":" + INTERNAL_PORT }]
                     },
                     {
                       "handler": "headers",
@@ -200,7 +200,7 @@ class Caddy {
                 "handle": [
                   {
                     "handler": "reverse_proxy",
-                    "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + INTERNAL_PORT }]
+                    "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + ip + ":" + INTERNAL_PORT }]
                   },
                   {
                     "handler": "headers",
@@ -327,7 +327,7 @@ class Caddy {
         this.ip_mapping[INTERNAL_PORT] = ip
 
         payload.apps.http.servers[":" + INTERNAL_PORT] = {
-          "listen": [":PORT_PLACEHOLDER_" + INTERNAL_PORT],
+          "listen": [":PORT_PLACEHOLDER_" + ip + ":" + INTERNAL_PORT],
           "routes": [{
             "handle": [
               {
@@ -381,7 +381,7 @@ class Caddy {
             "handle": [
               {
                 "handler": "reverse_proxy",
-                "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + INTERNAL_PORT }]
+                "upstreams": [{ "dial": ip + ":PORT_PLACEHOLDER_" + ip + ":" + INTERNAL_PORT }]
               },
               {
                 "handler": "headers",
@@ -458,6 +458,7 @@ class Caddy {
     this._mapping = {}
     this.ip_mapping = {}
     this.port_mapping = {}   // 127.0.0.1 => 192.168,..
+    this.local_network_mapping = {}
 
     // localhost home
     let payload = this.home()
@@ -487,7 +488,20 @@ class Caddy {
       payload = response.result
       let replaced_map = response.replaced_map
       for(let key in replaced_map) {
-        let original_port = key.replace("PORT_PLACEHOLDER_", "")
+        // local_share_ip :- 192.168....
+        let local_share_key = key.replace("PORT_PLACEHOLDER_", "")
+        let chunks = local_share_key.split(":")
+        let local_share_ip = chunks[0]
+        let original_port = chunks[1]
+        let local_share_port = replaced_map[key]
+        console.log({ local_share_ip, local_share_port })
+        if (!this.local_network_mapping[local_share_ip]) {
+          this.local_network_mapping[local_share_ip] = {}
+        }
+        this.local_network_mapping[local_share_ip][original_port] = local_share_port
+
+
+        //let original_port = key.replace("PORT_PLACEHOLDER_", "")
         this.port_mapping[original_port] = replaced_map[key]
       }
     }

package/kernel/peer.js

@@ -9,6 +9,7 @@ class PeerDiscovery {
     this.socket = dgram.createSocket('udp4');
     this.peers = new Set();
     this.current_account = os.userInfo()
+    this.current_ip = this._getLocalIPAddress()
 //    this.start();
   }
   account(ip) {
@@ -18,7 +19,7 @@ class PeerDiscovery {
     return this.data[ip].homedir
   }
   caddy(ip) {
-    return this.data[ip].caddy
+    return this.data[ip].proxy
   }
   local(ip) {
     return this.data[ip].memory.local
@@ -33,12 +34,12 @@ class PeerDiscovery {
       const ip = rinfo.address;
       if (msg.toString() === this.message.toString() && this._isLocalLAN(ip)) {
         if (!this.peers.has(ip)) {
+          console.log(`Discovered peer: ${ip}`);
           this.peers.add(ip);
           let interval = setInterval(() => {
             axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
               this.data[ip] = res.data
-              if (res.data.caddy) {
-                console.log(`Discovered peer: ${ip}`);
+              if (res.data.proxy) {
 //                clearInterval(interval)
               }
             })
@@ -65,6 +66,17 @@ class PeerDiscovery {
   _isLocalLAN(ip) {
     return ip.startsWith('192.168.');
   }
+  _getLocalIPAddress() {
+    const interfaces = os.networkInterfaces();
+    for (const ifaceList of Object.values(interfaces)) {
+      for (const iface of ifaceList) {
+        if (iface.family === 'IPv4' && !iface.internal && iface.address.startsWith('192.168.')) {
+          return iface.address;
+        }
+      }
+    }
+    return null;
+  }
 }
 
 module.exports = PeerDiscovery;

package/package.json

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

package/server/index.js

@@ -2670,6 +2670,17 @@ class Server {
       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 live_proxies = this.kernel.api.proxies["/proxy"]
       if (!live_proxies) live_proxies = []
@@ -2742,10 +2753,12 @@ class Server {
 
       console.log({ port_mapping: this.kernel.caddy.port_mapping, ip_mapping: this.kernel.caddy.ip_mapping })
       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,
         agent: this.agent,
         theme: this.theme,
         items: proxies,
@@ -3278,7 +3291,10 @@ class Server {
       res.json({
         homedir: this.kernel.homedir,
         account: this.kernel.peer.current_account,
-        caddy: this.kernel.caddy.mapping, // mapping: { IP => https_domain }
+        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,
         memory: this.kernel.memory
       })
     }))

package/server/views/proxy.ejs

@@ -195,6 +195,9 @@ table a {
   text-decoration: none;
   color: royalblue;
 }
+td:first-child, th:first-child {
+  max-width: 100px;
+}
 .container-row th {
   text-align: left;
   font-size: 18px;
@@ -243,8 +246,8 @@ table a {
   <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="http://<%=item%>" class='line align-top'>
-        <h3 class='table-grid'><%=item%></h3>
+      <a target="_blank" href="<%=item.proxy_page%>" class='line align-top'>
+        <h3 class='table-grid'><%=item.account%></h3>
       </a>
     <% }) %>
   </div>
@@ -272,7 +275,7 @@ table a {
                 <a target="_blank" href="http://localhost:<%=item.port%>">http://localhost:<%=item.port%></a>
               </div>
               <div>
-                <a target="_blank" href="http://<%=ip_mapping[item.port]%>:<%=port_mapping[item.port]%>">http://<%=ip_mapping[item.port]%>:<%=port_mapping[item.port]%></a>
+                <a target="_blank" href="http://<%=ip%>:<%=lan[ip][item.port]%>">http://<%=ip%>:<%=lan[ip][item.port]%></a>
               </div>
             </td>
           </tr>