Revert "[v2.4.3] Support for dynamic reverse proxy routes (#1188)"

This reverts commit f4e480b.

Author: abhinavsingh

.github/FUNDING.yml

@@ -1,4 +1,3 @@
 ---
-# These are supported funding model platforms
-
-github: abhinavsingh
+open_collective: proxypy
+...

.github/workflows/test-library.yml

@@ -72,7 +72,7 @@ jobs:
       container-platforms: ${{ steps.container.outputs.platforms }}
     steps:
     - name: Switch to using Python 3.9 by default
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: 3.9
     - name: >-
@@ -135,7 +135,7 @@ jobs:
     - name: Set up pip cache
       if: >-
         steps.request-check.outputs.release-requested != 'true'
-      uses: actions/[email protected].4
+      uses: actions/[email protected].2
       with:
         path: ${{ steps.pip-cache-dir.outputs.dir }}
         key: >-
@@ -225,7 +225,7 @@ jobs:
 
     steps:
     - name: Switch to using Python v3.10
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: '3.10'
     - name: >-
@@ -244,7 +244,7 @@ jobs:
       run: >-
         echo "::set-output name=dir::$(pip cache dir)"
     - name: Set up pip cache
-      uses: actions/[email protected].4
+      uses: actions/[email protected].2
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
         key: >-
@@ -284,7 +284,7 @@ jobs:
       if: >-
         fromJSON(needs.pre-setup.outputs.is-untagged-devel)
         || fromJSON(needs.pre-setup.outputs.release-requested)
-      uses: fregante/setup-git-user@v1.1.0
+      uses: fregante/setup-git-user@v1.0.1
     - name: >-
         Tag the release in the local Git repo
         as ${{ needs.pre-setup.outputs.git-tag }}
@@ -350,7 +350,7 @@ jobs:
 
     steps:
     - name: Switch to using Python v3.10
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: '3.10'
     - name: >-
@@ -369,7 +369,7 @@ jobs:
       run: >-
         echo "::set-output name=dir::$(pip cache dir)"
     - name: Set up pip cache
-      uses: actions/[email protected].4
+      uses: actions/[email protected].2
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
         key: >-
@@ -467,7 +467,7 @@ jobs:
 
     steps:
     - name: Switch to using Python v${{ matrix.python }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: >-
@@ -486,7 +486,7 @@ jobs:
       run: >-
         echo "::set-output name=dir::$(pip cache dir)"
     - name: Set up pip cache
-      uses: actions/[email protected].4
+      uses: actions/[email protected].2
       with:
         path: ${{ steps.pip-cache.outputs.dir }}
         key: >-
@@ -670,7 +670,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Brew
@@ -724,7 +724,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Setup Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python }}
     - name: Install Pip Dependencies
@@ -1057,7 +1057,7 @@ jobs:
         fetch-depth: 1
         ref: ${{ github.event.inputs.release-commitish }}
     - name: Setup git user as [bot]
-      uses: fregante/setup-git-user@v1.1.0
+      uses: fregante/setup-git-user@v1.0.1
 
     - name: >-
         Tag the release in the local Git repo

README.md

@@ -2315,9 +2315,9 @@ usage: -m [-h] [--tunnel-hostname TUNNEL_HOSTNAME] [--tunnel-port TUNNEL_PORT]
           [--filtered-client-ips FILTERED_CLIENT_IPS]
           [--filtered-url-regex-config FILTERED_URL_REGEX_CONFIG]
 
-proxy.py v2.4.3.dev14+gc6b2de6.d20220605
+proxy.py v2.4.2.dev11+g0beb02d.d20220420
 
-optional arguments:
+options:
   -h, --help            show this help message and exit
   --tunnel-hostname TUNNEL_HOSTNAME
                         Default: None. Remote hostname or IP address to which
@@ -2334,11 +2334,11 @@ optional arguments:
   --tunnel-remote-port TUNNEL_REMOTE_PORT
                         Default: 8899. Remote port which will be forwarded
                         locally for proxy.
-  --threadless          Default: False. Enabled by default on Python 3.8+
-                        (mac, linux). When disabled a new thread is spawned to
+  --threadless          Default: True. Enabled by default on Python 3.8+ (mac,
+                        linux). When disabled a new thread is spawned to
                         handle each client connection.
-  --threaded            Default: True. Disabled by default on Python < 3.8 and
-                        windows. When enabled a new thread is spawned to
+  --threaded            Default: False. Disabled by default on Python < 3.8
+                        and windows. When enabled a new thread is spawned to
                         handle each client connection.
   --num-workers NUM_WORKERS
                         Defaults to number of CPU cores.
@@ -2434,8 +2434,8 @@ optional arguments:
                         Default: None. Signing certificate to use for signing
                         dynamically generated HTTPS certificates. If used,
                         must also pass --ca-key-file and --ca-signing-key-file
-  --ca-file CA_FILE     Default: /Users/abhinavsingh/Dev/proxy.py/venv373/lib/
-                        python3.7/site-packages/certifi/cacert.pem. Provide
+  --ca-file CA_FILE     Default: /Users/abhinavsingh/Dev/proxy.py/venv310/lib/
+                        python3.10/site-packages/certifi/cacert.pem. Provide
                         path to custom CA bundle for peer certificate
                         verification
   --ca-signing-key-file CA_SIGNING_KEY_FILE

benchmark/requirements.txt

@@ -1,5 +1,5 @@
 aiohttp==3.8.1
-blacksheep==1.2.7
-starlette==0.19.1
+blacksheep==1.2.2
+starlette==0.17.1
 tornado==6.1
 uvicorn==0.16.0

dashboard/package-lock.json

@@ -48,8 +48,8 @@
     "rollup-plugin-copy": "^3.4.0",
     "rollup-plugin-javascript-obfuscator": "^1.0.4",
     "rollup-plugin-typescript": "^1.0.1",
-    "ts-node": "^10.8.0",
+    "ts-node": "^10.7.0",
     "typescript": "^4.5.4",
-    "ws": "^8.6.0"
+    "ws": "^8.5.0"
   }
 }

dashboard/package.json

@@ -320,7 +320,6 @@
     (_py_class_role, 'T'),
     (_py_class_role, 'HostPort'),
     (_py_class_role, 'TcpOrTlsSocket'),
-    (_py_class_role, 're.Pattern'),
     (_py_obj_role, 'proxy.core.work.threadless.T'),
     (_py_obj_role, 'proxy.core.work.work.T'),
     (_py_obj_role, 'proxy.core.base.tcp_server.T'),

docs/conf.py

@@ -8,9 +8,7 @@
     :copyright: (c) 2013-present by Abhinav Singh and contributors.
     :license: BSD, see LICENSE for more details.
 """
-import re
 import ssl
-import sys
 import queue
 import socket
 import ipaddress
@@ -32,10 +30,3 @@
 IpAddress = Union[ipaddress.IPv4Address, ipaddress.IPv6Address]
 TcpOrTlsSocket = Union[ssl.SSLSocket, socket.socket]
 HostPort = Tuple[str, int]
-
-if sys.version_info.minor == 6:
-    RePattern = Any
-elif sys.version_info.minor in (7, 8):
-    RePattern = re.Pattern  # type: ignore
-else:
-    RePattern = re.Pattern[Any]  # type: ignore