wisp-python 0.5.2__py3-none-any.whl → 0.6.1__py3-none-any.whl
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/server/__main__.py +13 -32
- wisp/server/common.py +30 -0
- wisp/server/connection.py +2 -2
- wisp/server/http.py +1 -1
- wisp/server/ratelimit.py +12 -0
- wisp/server/threading/__init__.py +2 -0
- wisp/server/threading/__main__.py +6 -0
- wisp/server/threading/connection.py +219 -0
- wisp/server/threading/http.py +104 -0
- wisp/server/threading/netsync.py +58 -0
- {wisp_python-0.5.2.dist-info → wisp_python-0.6.1.dist-info}/METADATA +12 -4
- wisp_python-0.6.1.dist-info/RECORD +19 -0
- {wisp_python-0.5.2.dist-info → wisp_python-0.6.1.dist-info}/WHEEL +1 -1
- wisp_python-0.5.2.dist-info/RECORD +0 -13
- {wisp_python-0.5.2.dist-info → wisp_python-0.6.1.dist-info/licenses}/LICENSE +0 -0
- {wisp_python-0.5.2.dist-info → wisp_python-0.6.1.dist-info}/top_level.txt +0 -0
wisp/server/__main__.py
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import argparse
|
|
2
2
|
import asyncio
|
|
3
|
-
import logging
|
|
4
3
|
import sys
|
|
5
4
|
|
|
6
5
|
try:
|
|
@@ -9,37 +8,19 @@ try:
|
|
|
9
8
|
except ImportError:
|
|
10
9
|
use_uvloop = False
|
|
11
10
|
|
|
12
|
-
import
|
|
13
|
-
|
|
11
|
+
from wisp.server import http
|
|
12
|
+
from wisp.server import common
|
|
14
13
|
|
|
15
14
|
if __name__ == "__main__":
|
|
16
|
-
|
|
17
|
-
prog="wisp-server-python",
|
|
18
|
-
description=f"A Wisp server implementation, written in Python (v{wisp.version})"
|
|
19
|
-
)
|
|
15
|
+
args = common.setup_main()
|
|
20
16
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
args = parser.parse_args()
|
|
32
|
-
|
|
33
|
-
logging.basicConfig(
|
|
34
|
-
format="[%(asctime)s] %(levelname)-8s %(message)s",
|
|
35
|
-
level=getattr(logging, args.log_level.upper()),
|
|
36
|
-
datefmt="%Y/%m/%d - %H:%M:%S"
|
|
37
|
-
)
|
|
38
|
-
|
|
39
|
-
if use_uvloop:
|
|
40
|
-
uvloop.run(wisp.server.http.main(args))
|
|
41
|
-
else:
|
|
42
|
-
#uvloop doesn't support windows at all so we don't need to print the error
|
|
43
|
-
if not sys.platform in ("win32", "cygwin"):
|
|
44
|
-
logging.error("Importing uvloop failed. Falling back to asyncio, which is slower.")
|
|
45
|
-
asyncio.run(wisp.server.http.main(args))
|
|
17
|
+
try:
|
|
18
|
+
if use_uvloop:
|
|
19
|
+
uvloop.run(http.main(args))
|
|
20
|
+
else:
|
|
21
|
+
#uvloop doesn't support windows at all so we don't need to print the error
|
|
22
|
+
if not sys.platform in ("win32", "cygwin"):
|
|
23
|
+
logging.error("Importing uvloop failed. Falling back to asyncio, which is slower.")
|
|
24
|
+
asyncio.run(http.main(args))
|
|
25
|
+
except KeyboardInterrupt:
|
|
26
|
+
pass
|
wisp/server/common.py
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import argparse
|
|
2
|
+
import logging
|
|
3
|
+
|
|
4
|
+
import wisp
|
|
5
|
+
|
|
6
|
+
def setup_main():
|
|
7
|
+
parser = argparse.ArgumentParser(
|
|
8
|
+
prog="wisp-server-python",
|
|
9
|
+
description=f"A Wisp server implementation, written in Python (v{wisp.version})"
|
|
10
|
+
)
|
|
11
|
+
|
|
12
|
+
parser.add_argument("--host", default="127.0.0.1", help="The hostname the server will listen on.")
|
|
13
|
+
parser.add_argument("--port", default=6001, help="The TCP port the server will listen on.")
|
|
14
|
+
parser.add_argument("--static", help="Where static files are served from.")
|
|
15
|
+
parser.add_argument("--limits", action="store_true", help="Enable rate limits.")
|
|
16
|
+
parser.add_argument("--bandwidth", default=1000, help="Bandwidth limit per IP, in kilobytes per second.")
|
|
17
|
+
parser.add_argument("--connections", default=30, help="New connections limit per IP.")
|
|
18
|
+
parser.add_argument("--window", default=60, help="Fixed window length for rate limits, in seconds.")
|
|
19
|
+
parser.add_argument("--allow-loopback", action="store_true",help="Allow connections to loopback IP addresses.")
|
|
20
|
+
parser.add_argument("--allow-private", action="store_true", help="Allow connections to private IP addresses.")
|
|
21
|
+
parser.add_argument("--log-level", default="info", help="The log level (either debug, info, warning, error, or critical).")
|
|
22
|
+
args = parser.parse_args()
|
|
23
|
+
|
|
24
|
+
logging.basicConfig(
|
|
25
|
+
format="[%(asctime)s] %(levelname)-8s %(message)s",
|
|
26
|
+
level=getattr(logging, args.log_level.upper()),
|
|
27
|
+
datefmt="%Y/%m/%d - %H:%M:%S"
|
|
28
|
+
)
|
|
29
|
+
|
|
30
|
+
return args
|
wisp/server/connection.py
CHANGED
|
@@ -46,7 +46,7 @@ class WSProxyConnection:
|
|
|
46
46
|
await ratelimit.limit_client_bandwidth(self.client_ip, len(data), "ws")
|
|
47
47
|
await self.conn.send(data)
|
|
48
48
|
|
|
49
|
-
self.
|
|
49
|
+
self.conn.close()
|
|
50
50
|
|
|
51
51
|
async def handle_tcp(self):
|
|
52
52
|
while True:
|
|
@@ -128,7 +128,7 @@ class WispConnection:
|
|
|
128
128
|
|
|
129
129
|
#send a CONTINUE packet periodically
|
|
130
130
|
stream["packets_sent"] += 1
|
|
131
|
-
if stream["packets_sent"] % queue_size
|
|
131
|
+
if stream["packets_sent"] % (queue_size // 4) == 0:
|
|
132
132
|
buffer_remaining = stream["queue"].maxsize - stream["queue"].qsize()
|
|
133
133
|
continue_payload = struct.pack(continue_format, buffer_remaining)
|
|
134
134
|
continue_packet = struct.pack(packet_format, 0x03, stream_id) + continue_payload
|
wisp/server/http.py
CHANGED
|
@@ -61,7 +61,7 @@ async def static_handler(path, request_headers):
|
|
|
61
61
|
|
|
62
62
|
async def main(args):
|
|
63
63
|
global static_path
|
|
64
|
-
logging.info(f"running wisp-server-python v{wisp.version}")
|
|
64
|
+
logging.info(f"running wisp-server-python v{wisp.version} (async)")
|
|
65
65
|
|
|
66
66
|
if args.static:
|
|
67
67
|
static_path = pathlib.Path(args.static).resolve()
|
wisp/server/ratelimit.py
CHANGED
|
@@ -52,3 +52,15 @@ async def reset_limits_timer():
|
|
|
52
52
|
while True:
|
|
53
53
|
active_clients = {}
|
|
54
54
|
await asyncio.sleep(window_size)
|
|
55
|
+
|
|
56
|
+
def limit_client_bandwidth_sync(client_ip, length, attr):
|
|
57
|
+
if not enabled: return
|
|
58
|
+
inc_client_attr(client_ip, attr, length)
|
|
59
|
+
while calculate_client_bandwidth(client_ip, attr) > bandwidth_limit:
|
|
60
|
+
time.sleep(0.01)
|
|
61
|
+
|
|
62
|
+
def reset_limits_timer_sync():
|
|
63
|
+
global active_clients
|
|
64
|
+
while True:
|
|
65
|
+
active_clients = {}
|
|
66
|
+
time.sleep(window_size)
|
|
@@ -0,0 +1,219 @@
|
|
|
1
|
+
import struct
|
|
2
|
+
import os
|
|
3
|
+
import logging
|
|
4
|
+
import queue
|
|
5
|
+
import threading
|
|
6
|
+
|
|
7
|
+
from websockets.exceptions import ConnectionClosed, ConnectionClosedError
|
|
8
|
+
|
|
9
|
+
from wisp.server import ratelimit
|
|
10
|
+
from wisp.server.threading import netsync
|
|
11
|
+
|
|
12
|
+
queue_size = 128
|
|
13
|
+
static_path = None
|
|
14
|
+
|
|
15
|
+
#wisp packet format definitions
|
|
16
|
+
#see https://docs.python.org/3/library/struct.html for what these characters mean
|
|
17
|
+
packet_format = "<BI"
|
|
18
|
+
connect_format = "<BH"
|
|
19
|
+
continue_format = "<I"
|
|
20
|
+
close_format = "<B"
|
|
21
|
+
|
|
22
|
+
class WSProxyConnection:
|
|
23
|
+
def __init__(self, ws, path, client_ip):
|
|
24
|
+
self.ws = ws
|
|
25
|
+
self.path = path
|
|
26
|
+
self.client_ip = client_ip
|
|
27
|
+
|
|
28
|
+
def setup_connection(self):
|
|
29
|
+
addr_str = self.path.split("/")[-1]
|
|
30
|
+
self.tcp_host, self.tcp_port = addr_str.split(":")
|
|
31
|
+
self.tcp_port = int(self.tcp_port)
|
|
32
|
+
|
|
33
|
+
try:
|
|
34
|
+
self.conn = netsync.TCPConnection(self.tcp_host, self.tcp_port)
|
|
35
|
+
self.conn.connect()
|
|
36
|
+
except Exception as e:
|
|
37
|
+
logging.info(f"Creating a WSProxy stream to {self.tcp_host}:{self.tcp_port} failed: {e}")
|
|
38
|
+
self.ws.close()
|
|
39
|
+
|
|
40
|
+
def handle_ws(self):
|
|
41
|
+
while True:
|
|
42
|
+
try:
|
|
43
|
+
data = self.ws.recv()
|
|
44
|
+
except (ConnectionClosed, ConnectionClosedError) as e:
|
|
45
|
+
break
|
|
46
|
+
|
|
47
|
+
ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data), "ws")
|
|
48
|
+
self.conn.send(data)
|
|
49
|
+
|
|
50
|
+
self.conn.close()
|
|
51
|
+
|
|
52
|
+
def handle_tcp(self):
|
|
53
|
+
while True:
|
|
54
|
+
data = self.conn.recv()
|
|
55
|
+
if len(data) == 0:
|
|
56
|
+
break #socket closed
|
|
57
|
+
|
|
58
|
+
ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data), "tcp")
|
|
59
|
+
self.ws.send(data)
|
|
60
|
+
|
|
61
|
+
self.ws.close()
|
|
62
|
+
|
|
63
|
+
class WispConnection:
|
|
64
|
+
def __init__(self, ws, path, client_ip, id=None):
|
|
65
|
+
self.ws = ws
|
|
66
|
+
self.path = path
|
|
67
|
+
self.active_streams = {}
|
|
68
|
+
self.client_ip = client_ip
|
|
69
|
+
self.id = id
|
|
70
|
+
|
|
71
|
+
#send the initial CONTINUE packet
|
|
72
|
+
def setup(self):
|
|
73
|
+
continue_payload = struct.pack(continue_format, queue_size)
|
|
74
|
+
continue_packet = struct.pack(packet_format, 0x03, 0) + continue_payload
|
|
75
|
+
self.ws.send(continue_packet)
|
|
76
|
+
|
|
77
|
+
def close(self):
|
|
78
|
+
#close all active streams when the websocket disconnects
|
|
79
|
+
for stream_id in list(self.active_streams.keys()):
|
|
80
|
+
self.close_stream(stream_id)
|
|
81
|
+
self.ws.close()
|
|
82
|
+
|
|
83
|
+
def new_stream(self, stream_id, payload):
|
|
84
|
+
stream_type, destination_port = struct.unpack(connect_format, payload[:3])
|
|
85
|
+
hostname = bytes(payload[3:]).decode()
|
|
86
|
+
logging.debug(f"({self.id}) Creating a new stream to {hostname}:{destination_port}")
|
|
87
|
+
|
|
88
|
+
#rate limited
|
|
89
|
+
stream_count = ratelimit.get_client_attr(self.client_ip, "streams")
|
|
90
|
+
if ratelimit.enabled and stream_count > ratelimit.connections_limit:
|
|
91
|
+
self.send_close_packet(stream_id, 0x49)
|
|
92
|
+
self.close_stream(stream_id)
|
|
93
|
+
return
|
|
94
|
+
|
|
95
|
+
#info looks valid - try to open the connection now
|
|
96
|
+
try:
|
|
97
|
+
if stream_type == 0x01:
|
|
98
|
+
connection = netsync.TCPConnection(hostname, destination_port)
|
|
99
|
+
elif stream_type == 0x02:
|
|
100
|
+
connection = netsync.UDPConnection(hostname, destination_port)
|
|
101
|
+
else:
|
|
102
|
+
raise Exception("Invalid stream type.")
|
|
103
|
+
self.active_streams[stream_id]["conn"] = connection
|
|
104
|
+
connection.connect()
|
|
105
|
+
|
|
106
|
+
except Exception as e:
|
|
107
|
+
logging.warn(f"({self.id}) Creating a new stream to {hostname}:{destination_port} failed: {e}")
|
|
108
|
+
self.send_close_packet(stream_id, 0x42)
|
|
109
|
+
self.close_stream(stream_id)
|
|
110
|
+
return
|
|
111
|
+
|
|
112
|
+
self.active_streams[stream_id]["type"] = stream_type
|
|
113
|
+
threading.Thread(target=self.stream_ws_to_tcp, args=(stream_id,), daemon=True).start()
|
|
114
|
+
threading.Thread(target=self.stream_tcp_to_ws, args=(stream_id,), daemon=True).start()
|
|
115
|
+
ratelimit.inc_client_attr(self.client_ip, "streams")
|
|
116
|
+
|
|
117
|
+
def stream_ws_to_tcp(self, stream_id):
|
|
118
|
+
while True:
|
|
119
|
+
stream = self.active_streams[stream_id]
|
|
120
|
+
data = stream["queue"].get()
|
|
121
|
+
if data is None:
|
|
122
|
+
break
|
|
123
|
+
try:
|
|
124
|
+
stream["conn"].send(data)
|
|
125
|
+
except:
|
|
126
|
+
break
|
|
127
|
+
|
|
128
|
+
#send a CONTINUE packet periodically
|
|
129
|
+
stream["packets_sent"] += 1
|
|
130
|
+
if stream["packets_sent"] % (queue_size // 4) == 0:
|
|
131
|
+
buffer_remaining = stream["queue"].maxsize - stream["queue"].qsize()
|
|
132
|
+
continue_payload = struct.pack(continue_format, buffer_remaining)
|
|
133
|
+
continue_packet = struct.pack(packet_format, 0x03, stream_id) + continue_payload
|
|
134
|
+
self.ws.send(continue_packet)
|
|
135
|
+
|
|
136
|
+
def stream_tcp_to_ws(self, stream_id):
|
|
137
|
+
while True:
|
|
138
|
+
stream = self.active_streams[stream_id]
|
|
139
|
+
try:
|
|
140
|
+
data = stream["conn"].recv()
|
|
141
|
+
except Exception as e:
|
|
142
|
+
logging.warn(f"({self.id}) Receiving data from stream failed: {e}")
|
|
143
|
+
self.send_close_packet(stream_id, 0x03)
|
|
144
|
+
self.close_stream(stream_id)
|
|
145
|
+
return
|
|
146
|
+
|
|
147
|
+
if len(data) == 0: #connection closed
|
|
148
|
+
break
|
|
149
|
+
data_header = struct.pack(packet_format, 0x02, stream_id)
|
|
150
|
+
|
|
151
|
+
ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data_header)+len(data), "tcp")
|
|
152
|
+
try:
|
|
153
|
+
self.ws.send(data_header + data)
|
|
154
|
+
except (ConnectionClosed, ConnectionClosedError) as e:
|
|
155
|
+
return
|
|
156
|
+
|
|
157
|
+
self.send_close_packet(stream_id, 0x02)
|
|
158
|
+
self.close_stream(stream_id)
|
|
159
|
+
|
|
160
|
+
def send_close_packet(self, stream_id, reason):
|
|
161
|
+
if not stream_id in self.active_streams:
|
|
162
|
+
return
|
|
163
|
+
close_payload = struct.pack(close_format, reason)
|
|
164
|
+
close_packet = struct.pack(packet_format, 0x04, stream_id) + close_payload
|
|
165
|
+
self.ws.send(close_packet)
|
|
166
|
+
|
|
167
|
+
def close_stream(self, stream_id):
|
|
168
|
+
if not stream_id in self.active_streams:
|
|
169
|
+
return #stream already closed
|
|
170
|
+
stream = self.active_streams[stream_id]
|
|
171
|
+
if stream["conn"]:
|
|
172
|
+
stream["conn"].close()
|
|
173
|
+
|
|
174
|
+
#empty the queue and kill it
|
|
175
|
+
while not stream["queue"].empty():
|
|
176
|
+
stream["queue"].get()
|
|
177
|
+
stream["queue"].put(None)
|
|
178
|
+
del self.active_streams[stream_id]
|
|
179
|
+
|
|
180
|
+
def handle_ws(self):
|
|
181
|
+
while True:
|
|
182
|
+
try:
|
|
183
|
+
data = self.ws.recv()
|
|
184
|
+
except (ConnectionClosed, ConnectionClosedError):
|
|
185
|
+
break
|
|
186
|
+
except Exception as e:
|
|
187
|
+
logging.warn(f"({self.id}) Receiving data from websocket failed: {e}")
|
|
188
|
+
break
|
|
189
|
+
|
|
190
|
+
if not isinstance(data, bytes):
|
|
191
|
+
continue #ignore non binary frames
|
|
192
|
+
|
|
193
|
+
#implement bandwidth limits
|
|
194
|
+
ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data), "ws")
|
|
195
|
+
|
|
196
|
+
#get basic packet info
|
|
197
|
+
payload = memoryview(data)[5:]
|
|
198
|
+
packet_type, stream_id = struct.unpack(packet_format, data[:5])
|
|
199
|
+
|
|
200
|
+
if packet_type == 0x01: #CONNECT packet
|
|
201
|
+
self.active_streams[stream_id] = {
|
|
202
|
+
"conn": None,
|
|
203
|
+
"type": None,
|
|
204
|
+
"queue": queue.Queue(queue_size),
|
|
205
|
+
"packets_sent": 0
|
|
206
|
+
}
|
|
207
|
+
threading.Thread(target=self.new_stream, args=(stream_id, payload), daemon=True).start()
|
|
208
|
+
|
|
209
|
+
elif packet_type == 0x02: #DATA packet
|
|
210
|
+
stream = self.active_streams.get(stream_id)
|
|
211
|
+
if not stream:
|
|
212
|
+
continue
|
|
213
|
+
stream["queue"].put(payload)
|
|
214
|
+
|
|
215
|
+
elif packet_type == 0x04: #CLOSE packet
|
|
216
|
+
reason = struct.unpack(close_format, payload)[0]
|
|
217
|
+
self.close_stream(stream_id)
|
|
218
|
+
|
|
219
|
+
self.close()
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import threading
|
|
2
|
+
import multiprocessing
|
|
3
|
+
import pathlib
|
|
4
|
+
import mimetypes
|
|
5
|
+
import logging
|
|
6
|
+
import random
|
|
7
|
+
import sys
|
|
8
|
+
|
|
9
|
+
from websockets.sync.server import serve
|
|
10
|
+
from websockets.http11 import Response, Headers
|
|
11
|
+
|
|
12
|
+
import wisp
|
|
13
|
+
from wisp.server import ratelimit
|
|
14
|
+
from wisp.server import net
|
|
15
|
+
from wisp.server.threading import connection
|
|
16
|
+
|
|
17
|
+
static_path = None
|
|
18
|
+
connections = {}
|
|
19
|
+
|
|
20
|
+
def connection_handler(websocket):
|
|
21
|
+
path = websocket.request.path
|
|
22
|
+
client_ip = websocket.remote_address[0]
|
|
23
|
+
if client_ip == "127.0.0.1" and "X-Real-IP" in websocket.request.headers:
|
|
24
|
+
client_ip = websocket.request.headers["X-Real-IP"]
|
|
25
|
+
origin = websocket.request.headers.get("Origin")
|
|
26
|
+
|
|
27
|
+
conn_id = "".join(random.choices("1234567890abcdef", k=8))
|
|
28
|
+
logging.info(f"({conn_id}) incoming connection on {path} from {client_ip} (origin: {origin})")
|
|
29
|
+
ratelimit.inc_client_attr(client_ip, "streams")
|
|
30
|
+
|
|
31
|
+
if path.endswith("/"):
|
|
32
|
+
wisp_conn = connection.WispConnection(websocket, path, client_ip, conn_id)
|
|
33
|
+
connections[websocket] = wisp_conn
|
|
34
|
+
wisp_conn.setup()
|
|
35
|
+
wisp_conn.handle_ws()
|
|
36
|
+
del connections[websocket]
|
|
37
|
+
|
|
38
|
+
else:
|
|
39
|
+
stream_count = ratelimit.get_client_attr(client_ip, "streams")
|
|
40
|
+
if ratelimit.enabled and stream_count > ratelimit.connections_limit:
|
|
41
|
+
return
|
|
42
|
+
wsproxy_conn = connection.WSProxyConnection(websocket, path, client_ip)
|
|
43
|
+
wsproxy_conn.setup_connection()
|
|
44
|
+
t1 = threading.Thread(target=wsproxy_conn.handle_ws, daemon=True)
|
|
45
|
+
t2 = threading.Thread(target=wsproxy_conn.handle_tcp, daemon=True)
|
|
46
|
+
t1.start(); t2.start()
|
|
47
|
+
t1.join(); t2.join()
|
|
48
|
+
|
|
49
|
+
def static_handler(connection, request):
|
|
50
|
+
if "Upgrade" in request.headers:
|
|
51
|
+
return
|
|
52
|
+
|
|
53
|
+
response_headers = Headers()
|
|
54
|
+
response_headers["Server"] = f"wisp-server-python v{wisp.version}"
|
|
55
|
+
if static_path is None:
|
|
56
|
+
return Response(204, None, response_headers, body=b"")
|
|
57
|
+
|
|
58
|
+
target_path = static_path / request.path[1:]
|
|
59
|
+
|
|
60
|
+
if target_path.is_dir():
|
|
61
|
+
target_path = target_path / "index.html"
|
|
62
|
+
if not target_path.is_relative_to(static_path):
|
|
63
|
+
return Response(403, None, response_headers, body="403 forbidden".encode())
|
|
64
|
+
if not target_path.exists():
|
|
65
|
+
return Response(404, None, response_headers, body="404 not found".encode())
|
|
66
|
+
|
|
67
|
+
mimetype = mimetypes.guess_type(target_path.name)[0]
|
|
68
|
+
response_headers["Content-Type"] = mimetype
|
|
69
|
+
|
|
70
|
+
static_data = target_path.read_bytes()
|
|
71
|
+
return Response(200, None, response_headers, body=static_data)
|
|
72
|
+
|
|
73
|
+
def main(args):
|
|
74
|
+
global static_path
|
|
75
|
+
logging.info(f"running wisp-server-python v{wisp.version} (threading)")
|
|
76
|
+
|
|
77
|
+
if args.static:
|
|
78
|
+
static_path = pathlib.Path(args.static).resolve()
|
|
79
|
+
mimetypes.init()
|
|
80
|
+
logging.info(f"serving static files from {static_path}")
|
|
81
|
+
|
|
82
|
+
if args.limits:
|
|
83
|
+
logging.info("enabled rate limits")
|
|
84
|
+
ratelimit.enabled = True
|
|
85
|
+
ratelimit.connections_limit = int(args.connections)
|
|
86
|
+
ratelimit.bandwidth_limit = float(args.bandwidth)
|
|
87
|
+
ratelimit.window_size = float(args.window)
|
|
88
|
+
|
|
89
|
+
net.block_loopback = not args.allow_loopback
|
|
90
|
+
net.block_private = not args.allow_private
|
|
91
|
+
|
|
92
|
+
threading.Thread(target=ratelimit.reset_limits_timer_sync, daemon=True).start()
|
|
93
|
+
logging.info(f"listening on {args.host}:{args.port}")
|
|
94
|
+
|
|
95
|
+
ws_logger = logging.getLogger("websockets")
|
|
96
|
+
ws_logger.setLevel(logging.WARN)
|
|
97
|
+
|
|
98
|
+
with serve(connection_handler, args.host, int(args.port), process_request=static_handler, compression=None) as server:
|
|
99
|
+
try:
|
|
100
|
+
server.serve_forever()
|
|
101
|
+
except KeyboardInterrupt:
|
|
102
|
+
for connection in connections.values():
|
|
103
|
+
connection.close()
|
|
104
|
+
server.shutdown()
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import socket
|
|
2
|
+
import ipaddress
|
|
3
|
+
|
|
4
|
+
#various network utilities and wrappers - synchronous version
|
|
5
|
+
|
|
6
|
+
from wisp.server import net
|
|
7
|
+
|
|
8
|
+
def validate_hostname(host, port, stream_type):
|
|
9
|
+
addr_str = net.get_ip(host, port, stream_type)
|
|
10
|
+
net.validate_ip(addr_str)
|
|
11
|
+
return addr_str
|
|
12
|
+
|
|
13
|
+
class TCPConnection:
|
|
14
|
+
def __init__(self, hostname, port):
|
|
15
|
+
self.hostname = hostname
|
|
16
|
+
self.port = port
|
|
17
|
+
self.socket = None
|
|
18
|
+
|
|
19
|
+
def connect(self):
|
|
20
|
+
addr_str = validate_hostname(self.hostname, self.port, 0x01)
|
|
21
|
+
self.socket = socket.socket()
|
|
22
|
+
self.socket.connect((self.hostname, self.port))
|
|
23
|
+
|
|
24
|
+
def recv(self):
|
|
25
|
+
return self.socket.recv(net.tcp_size)
|
|
26
|
+
|
|
27
|
+
def send(self, data):
|
|
28
|
+
self.socket.send(data)
|
|
29
|
+
|
|
30
|
+
def close(self):
|
|
31
|
+
if self.socket is None:
|
|
32
|
+
return
|
|
33
|
+
self.socket.shutdown(socket.SHUT_RDWR)
|
|
34
|
+
self.socket.close()
|
|
35
|
+
|
|
36
|
+
class UDPConnection:
|
|
37
|
+
def __init__(self, hostname, port):
|
|
38
|
+
self.hostname = hostname
|
|
39
|
+
self.port = port
|
|
40
|
+
self.socket = None
|
|
41
|
+
|
|
42
|
+
def connect(self):
|
|
43
|
+
addr_str = validate_hostname(self.hostname, self.port, 0x02)
|
|
44
|
+
self.socket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
|
45
|
+
self.socket.bind((self.hostname, self.port))
|
|
46
|
+
|
|
47
|
+
def recv(self):
|
|
48
|
+
data, addr = self.socket.recvfrom(net.tcp_size)
|
|
49
|
+
return data
|
|
50
|
+
|
|
51
|
+
def send(self, data):
|
|
52
|
+
self.socket.sendto(data, (self.hostname, self.port))
|
|
53
|
+
|
|
54
|
+
def close(self):
|
|
55
|
+
if self.socket is None:
|
|
56
|
+
return
|
|
57
|
+
self.socket.shutdown(socket.SHUT_RDWR)
|
|
58
|
+
self.socket.close()
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
2
|
Name: wisp-python
|
|
3
|
-
Version: 0.
|
|
3
|
+
Version: 0.6.1
|
|
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
|
|
@@ -13,7 +13,8 @@ Description-Content-Type: text/markdown
|
|
|
13
13
|
License-File: LICENSE
|
|
14
14
|
Requires-Dist: websockets
|
|
15
15
|
Requires-Dist: asyncudp
|
|
16
|
-
Requires-Dist: uvloop
|
|
16
|
+
Requires-Dist: uvloop; sys_platform != "win32" and sys_platform != "cygwin"
|
|
17
|
+
Dynamic: license-file
|
|
17
18
|
|
|
18
19
|
# Python Wisp Server
|
|
19
20
|
|
|
@@ -35,7 +36,13 @@ pip3 install wisp-python
|
|
|
35
36
|
```
|
|
36
37
|
|
|
37
38
|
## Running the Server:
|
|
38
|
-
|
|
39
|
+
There are two different versions of the server:
|
|
40
|
+
- Async (`wisp.server`) - The default, based on asyncio. It is more stable, but slower.
|
|
41
|
+
- Threading (`wisp.server.threading`) - An faster alternative based on threading. It is about 40-80% faster, but possibly unstable. If you use Python's experimental [free threading](https://docs.python.org/3/howto/free-threading-python.html) builds, performance will scale linearly with your available CPU cores.
|
|
42
|
+
|
|
43
|
+
For the best performance use [CPython](https://github.com/python/cpython) 3.11 or newer. [PyPy](https://github.com/pypy/pypy) is not recommended as it is a lot slower than CPython here.
|
|
44
|
+
|
|
45
|
+
To start the server, run `python3 -m wisp.server` (or `python3 -m wisp.server.threading`). The program accepts the following arguments:
|
|
39
46
|
```
|
|
40
47
|
usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private]
|
|
41
48
|
[--log-level LOG_LEVEL]
|
|
@@ -64,6 +71,7 @@ options:
|
|
|
64
71
|
- JSON based config files
|
|
65
72
|
- ~~UDP support~~
|
|
66
73
|
- ~~Ability to block local addresses~~
|
|
74
|
+
- Wisp v2 support
|
|
67
75
|
|
|
68
76
|
## Copyright:
|
|
69
77
|
This repository is licensed under the GNU AGPL v3.
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
|
|
2
|
+
wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
|
|
3
|
+
wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
|
|
4
|
+
wisp/server/__main__.py,sha256=oEDuHOpC7DaHTFIX-9HViwOmWJqdIyktA8whRTmGesk,610
|
|
5
|
+
wisp/server/common.py,sha256=0NheE8nJeUmAMPt-DomesnkqCvB8gITi-dsT7VBRJCw,1442
|
|
6
|
+
wisp/server/connection.py,sha256=V_Skmmsvn30lQKY5w9x2rJQFR_FsA3lngNDpaYOfX6U,7669
|
|
7
|
+
wisp/server/http.py,sha256=YL-N3ajptgcAq5P50V6b8KlSJlVo6fRPnz65El9ZUQY,3145
|
|
8
|
+
wisp/server/net.py,sha256=3EL5FzM9BAF2VW6ysTFX1vyJG4xMvrcu_YMlxTYqhI8,2265
|
|
9
|
+
wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
|
|
10
|
+
wisp/server/threading/__init__.py,sha256=_34ZRPKommA9uazP9UBw59EByf6m9-VGNqc7hAjaJkc,122
|
|
11
|
+
wisp/server/threading/__main__.py,sha256=xM65KttaBDFg3FS5H5msEkx3p-mPfP7grpGslqKG4uY,146
|
|
12
|
+
wisp/server/threading/connection.py,sha256=2bMEPBxMl28OAVehNS3sk4C33dECZCHKBZSHTkEzZoM,7044
|
|
13
|
+
wisp/server/threading/http.py,sha256=0pzsHVrJoP4QZ9yNPPZYGStah9g3pJZvNMGbzVBRk5w,3521
|
|
14
|
+
wisp/server/threading/netsync.py,sha256=7RBlLhEtrF1fsWUIt6aGeoD_lUui2Q83FJdEhi5gnTY,1462
|
|
15
|
+
wisp_python-0.6.1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
|
|
16
|
+
wisp_python-0.6.1.dist-info/METADATA,sha256=YE9Ent8HbMHBW95GSgF8irmLlOxRWEDpMcyCCS7r3Fg,4083
|
|
17
|
+
wisp_python-0.6.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
|
|
18
|
+
wisp_python-0.6.1.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
|
|
19
|
+
wisp_python-0.6.1.dist-info/RECORD,,
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
|
|
2
|
-
wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
|
|
3
|
-
wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
|
|
4
|
-
wisp/server/__main__.py,sha256=-3NhgpGpWkeJh-vnbk2pKzoxv-1AguHxHkCc8VwewJg,1901
|
|
5
|
-
wisp/server/connection.py,sha256=Eon78eD1FDki_jQX46EK9CVtXKzOWJJEWvfykbRCAb4,7672
|
|
6
|
-
wisp/server/http.py,sha256=6i2r97H9DGc2ijLLsCUxXkByaGON6fdqqXCElU_eJNQ,3137
|
|
7
|
-
wisp/server/net.py,sha256=3EL5FzM9BAF2VW6ysTFX1vyJG4xMvrcu_YMlxTYqhI8,2265
|
|
8
|
-
wisp/server/ratelimit.py,sha256=zT_ya_3_ZocSxU0IOVWJ68L4-JSwKsBfqdwp_IvUWhQ,1585
|
|
9
|
-
wisp_python-0.5.2.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
|
|
10
|
-
wisp_python-0.5.2.dist-info/METADATA,sha256=b_l9xpLCmt-AyII7z1UDOOk3SAEdglK4vdD49jSQRS4,3366
|
|
11
|
-
wisp_python-0.5.2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
|
|
12
|
-
wisp_python-0.5.2.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
|
|
13
|
-
wisp_python-0.5.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|