pinokiod 3.8.42 → 3.8.43

package/kernel/caddy.js

@@ -174,6 +174,7 @@ class Caddy {
               // proxy proxy => proxy
               if (key === "url") {
                 let namespaced_url = `${name}.${account}.localhost`.toLowerCase()
+                console.log("Adding namespaced_url 1", { name, account, namespaced_url })
                 //if (!this._mapping[internal_ip]) {
                 //  this._mapping[internal_ip] = new Set()
                 //}
@@ -211,6 +212,7 @@ class Caddy {
                 })
               }
               let namespaced_url = `${key}.${name}.${account}.localhost`.toLowerCase()
+              console.log("Adding namespaced_url 2", { name, account, namespaced_url })
               //if (!this._mapping[internal_ip]) {
               //  this._mapping[internal_ip] = new Set()
               //}
@@ -285,6 +287,7 @@ class Caddy {
 
 
               let namespaced_url = `${name}.localhost`.toLowerCase()
+              console.log("Adding namespaced_url 3", { name, namespaced_url })
               let current_lan_ip = this.kernel.peer.current_ip
               let current_lan_username = this.kernel.peer.account(current_lan_ip)
               if (!this._mapping[current_lan_ip]) {
@@ -319,6 +322,7 @@ class Caddy {
               })
             }
             let namespaced_url = `${key}.${name}.localhost`.toLowerCase()
+            console.log("Adding namespaced_url 4", { key, name, namespaced_url })
 
             let current_lan_ip = this.kernel.peer.current_ip
             let current_lan_username = this.kernel.peer.account(current_lan_ip)
@@ -431,12 +435,21 @@ class Caddy {
           // insert the $account value right before the last part (1234.localhost => 1234.x.localhost)
           let chunks = https_domain.split(".")
           let namespaced_url
-          if (chunks.length === 3) {
+
+          if (https_domain.endsWith(`${account}.localhost`)) {
+            // already accountified
             namespaced_url = https_domain
-          } else if (chunks.length === 2) {
+          } else {
             chunks.splice(chunks.length - 1, 0, account)
             namespaced_url = chunks.join(".")
           }
+
+//          if (chunks.length === 3) {
+//            namespaced_url = https_domain
+//          } else if (chunks.length === 2) {
+//            chunks.splice(chunks.length - 1, 0, account)
+//            namespaced_url = chunks.join(".")
+//          }
           console.log("##x", { chunks, namespaced_url, https_domain })
 
 

package/package.json

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

package/server/views/proxy.ejs

@@ -205,6 +205,7 @@ td:first-child, th:first-child {
   text-transform: uppercase;
 }
 .container-row td.title {
+  overflow-wrap: break-word;
 }
 .container-row td {
   font-size: 14px;