wisp-python 0.8.1__tar.gz → 0.8.3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {wisp_python-0.8.1/src/wisp_python.egg-info → wisp_python-0.8.3}/PKG-INFO +2 -2
- {wisp_python-0.8.1 → wisp_python-0.8.3}/README.md +1 -1
- {wisp_python-0.8.1 → wisp_python-0.8.3}/pyproject.toml +1 -1
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/connection.py +2 -2
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/net.py +2 -1
- {wisp_python-0.8.1 → wisp_python-0.8.3/src/wisp_python.egg-info}/PKG-INFO +2 -2
- {wisp_python-0.8.1 → wisp_python-0.8.3}/LICENSE +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/LICENSE_third_party.md +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/setup.cfg +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/__init__.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/__init__.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/__main__.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/cli.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/http.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/server/ratelimit.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp/util.py +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp_python.egg-info/SOURCES.txt +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp_python.egg-info/dependency_links.txt +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp_python.egg-info/requires.txt +0 -0
- {wisp_python-0.8.1 → wisp_python-0.8.3}/src/wisp_python.egg-info/top_level.txt +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: wisp-python
|
|
3
|
-
Version: 0.8.
|
|
3
|
+
Version: 0.8.3
|
|
4
4
|
Summary: An implementation of a Wisp proxy server in Python
|
|
5
5
|
Author: ading2210
|
|
6
6
|
Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
|
|
@@ -45,7 +45,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
|
|
|
45
45
|
usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL]
|
|
46
46
|
[--threads THREADS] [--proxy PROXY] [--block-udp] [--block-tcp]
|
|
47
47
|
|
|
48
|
-
A Wisp server implementation, written in Python (v0.8.
|
|
48
|
+
A Wisp server implementation, written in Python (v0.8.3)
|
|
49
49
|
|
|
50
50
|
options:
|
|
51
51
|
-h, --help show this help message and exit
|
|
@@ -25,7 +25,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
|
|
|
25
25
|
usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL]
|
|
26
26
|
[--threads THREADS] [--proxy PROXY] [--block-udp] [--block-tcp]
|
|
27
27
|
|
|
28
|
-
A Wisp server implementation, written in Python (v0.8.
|
|
28
|
+
A Wisp server implementation, written in Python (v0.8.3)
|
|
29
29
|
|
|
30
30
|
options:
|
|
31
31
|
-h, --help show this help message and exit
|
|
@@ -118,8 +118,8 @@ class WispConnection:
|
|
|
118
118
|
|
|
119
119
|
async def stream_ws_to_tcp(self, stream_id):
|
|
120
120
|
#this infinite loop should get killed by the task.cancel call later on
|
|
121
|
+
stream = self.active_streams[stream_id]
|
|
121
122
|
while True:
|
|
122
|
-
stream = self.active_streams[stream_id]
|
|
123
123
|
data = await stream["queue"].get()
|
|
124
124
|
try:
|
|
125
125
|
await stream["conn"].send(data)
|
|
@@ -135,8 +135,8 @@ class WispConnection:
|
|
|
135
135
|
await self.ws.send(continue_packet)
|
|
136
136
|
|
|
137
137
|
async def stream_tcp_to_ws(self, stream_id):
|
|
138
|
+
stream = self.active_streams[stream_id]
|
|
138
139
|
while True:
|
|
139
|
-
stream = self.active_streams[stream_id]
|
|
140
140
|
try:
|
|
141
141
|
data = await stream["conn"].recv()
|
|
142
142
|
except Exception as e:
|
|
@@ -47,7 +47,8 @@ def validate_ip(addr_str):
|
|
|
47
47
|
|
|
48
48
|
async def validate_hostname(host, port, stream_type):
|
|
49
49
|
if is_ip(host):
|
|
50
|
-
|
|
50
|
+
validate_ip(host)
|
|
51
|
+
return host
|
|
51
52
|
#don't do a dns lookup when we're on a proxy and using remote dns
|
|
52
53
|
elif proxy_url and proxy_dns:
|
|
53
54
|
return None
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: wisp-python
|
|
3
|
-
Version: 0.8.
|
|
3
|
+
Version: 0.8.3
|
|
4
4
|
Summary: An implementation of a Wisp proxy server in Python
|
|
5
5
|
Author: ading2210
|
|
6
6
|
Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
|
|
@@ -45,7 +45,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
|
|
|
45
45
|
usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL]
|
|
46
46
|
[--threads THREADS] [--proxy PROXY] [--block-udp] [--block-tcp]
|
|
47
47
|
|
|
48
|
-
A Wisp server implementation, written in Python (v0.8.
|
|
48
|
+
A Wisp server implementation, written in Python (v0.8.3)
|
|
49
49
|
|
|
50
50
|
options:
|
|
51
51
|
-h, --help show this help message and exit
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|