Merge pull request #3 from AnswerDotAI/handle-multiport-sub-reverse-proxy

Modify add_sub_reverse_proxy to be multi-port

Author: jph00

fastcaddy/core.py

@@ -12,6 +12,7 @@
 import os, subprocess, httpx, json
 from fastcore.utils import *
 from httpx import HTTPStatusError, get as xget, post as xpost, patch as xpatch, put as xput, delete as xdelete, head as xhead
+from typing import Sequence
 
 # %% ../nbs/00_core.ipynb 5
 def get_id(path):
@@ -177,16 +178,23 @@ def add_wildcard_route(domain):
     add_route(route)
 
 # %% ../nbs/00_core.ipynb 48
-def add_sub_reverse_proxy(domain, subdomain, port, host='localhost'):
-    "Add a reverse proxy to a wildcard subdomain"
+def add_sub_reverse_proxy(
+        domain,
+        subdomain,
+        port:str|int|Sequence[str|int], # A single port or list of ports
+        host='localhost'
+    ):
+    "Add a reverse proxy to a wildcard subdomain supporting multiple ports"
     wildcard_id = f"wildcard-{domain}"
     route_id = f"{subdomain}.{domain}"
+    if isinstance(port, (int,str)): port = [port]
+    upstreams = [{"dial": f"{host}:{p}"} for p in port]
     new_route = {
         "@id": route_id,
         "match": [{"host": [route_id]}],
         "handle": [{
             "handler": "reverse_proxy",
-            "upstreams": [{"dial": f"{host}:{port}"}]
+            "upstreams": upstreams
         }]
     }
     pid([new_route], f"{wildcard_id}/handle/0/routes/...")

nbs/00_core.ipynb

@@ -34,7 +34,8 @@
     "#| export\n",
     "import os, subprocess, httpx, json\n",
     "from fastcore.utils import *\n",
-    "from httpx import HTTPStatusError, get as xget, post as xpost, patch as xpatch, put as xput, delete as xdelete, head as xhead"
+    "from httpx import HTTPStatusError, get as xget, post as xpost, patch as xpatch, put as xput, delete as xdelete, head as xhead\n",
+    "from typing import Sequence"
    ]
   },
   {
@@ -599,7 +600,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# add_wildcard_route('something.fast.ai')"
+    "add_wildcard_route('something.fast.ai')"
    ]
   },
   {
@@ -609,16 +610,23 @@
    "outputs": [],
    "source": [
     "#| export\n",
-    "def add_sub_reverse_proxy(domain, subdomain, port, host='localhost'):\n",
-    "    \"Add a reverse proxy to a wildcard subdomain\"\n",
+    "def add_sub_reverse_proxy(\n",
+    "        domain,\n",
+    "        subdomain,\n",
+    "        port:str|int|Sequence[str|int], # A single port or list of ports\n",
+    "        host='localhost'\n",
+    "    ):\n",
+    "    \"Add a reverse proxy to a wildcard subdomain supporting multiple ports\"\n",
     "    wildcard_id = f\"wildcard-{domain}\"\n",
     "    route_id = f\"{subdomain}.{domain}\"\n",
+    "    if isinstance(port, (int,str)): port = [port]\n",
+    "    upstreams = [{\"dial\": f\"{host}:{p}\"} for p in port]\n",
     "    new_route = {\n",
     "        \"@id\": route_id,\n",
     "        \"match\": [{\"host\": [route_id]}],\n",
     "        \"handle\": [{\n",
     "            \"handler\": \"reverse_proxy\",\n",
-    "            \"upstreams\": [{\"dial\": f\"{host}:{port}\"}]\n",
+    "            \"upstreams\": upstreams\n",
     "        }]\n",
     "    }\n",
     "    pid([new_route], f\"{wildcard_id}/handle/0/routes/...\")"
@@ -630,7 +638,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# add_sub_reverse_proxy('something.fast.ai', 'foo', 5001)"
+    "add_sub_reverse_proxy('something.fast.ai', 'foo', 5001)"
    ]
   },
   {
@@ -639,7 +647,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# del_id('foo.something.fast.ai')"
+    "del_id('foo.something.fast.ai')"
    ]
   },
   {