pinokiod 3.8.31 → 3.8.32

package/kernel/caddy.js

@@ -281,52 +281,27 @@ class Caddy {
 
         // insert the $account value right before the last part (1234.localhost => 1234.x.localhost)
         let chunks = https_domain.split(".")
-        if (chunks.length === 2) {
+        let namespaced_url
+        if (chunks.length === 3) {
+          namespaced_url = https_domain
+        } else if (chunks.length === 2) {
           chunks.splice(chunks.length - 1, 0, account)
+          namespaced_url = chunks.join(".")
+        }
+        this.mapping[internal_ip] = namespaced_url
+        console.log({ namespaced_url, https_domain, exposed_url, internal_ip })
 
 
-          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],
-            }],
+        // 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": ip + ":PORT_PLACEHOLDER_" + INTERNAL_PORT }]
+                "upstreams": [{ "dial": internal_ip }]
               },
               {
                 "handler": "headers",
@@ -340,8 +315,32 @@ class Caddy {
                 }
               }
             ]
-          })
+          }]
         }
+
+        // 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

package/package.json

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