using brotli 1.2 from pypi, fixed tests to py 3.14, removed from experimental pyproxy
This commit is contained in:
@@ -1,9 +1,46 @@
|
||||
import queue
|
||||
from multiprocessing import Process, Queue
|
||||
import socket
|
||||
import traceback
|
||||
|
||||
|
||||
def _start_tcp_server(port, server_queue: Queue, ipv6, verbose):
|
||||
sock = socket.socket(
|
||||
socket.AF_INET6 if ipv6 else socket.AF_INET, socket.SOCK_STREAM
|
||||
)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
sock.bind(("::1" if ipv6 else "127.0.0.1", port))
|
||||
sock.listen(8)
|
||||
while True:
|
||||
connection, address = sock.accept()
|
||||
while True:
|
||||
try:
|
||||
buf = connection.recv(4096)
|
||||
if buf == b"":
|
||||
break
|
||||
|
||||
reply = buf # Default to echo
|
||||
try:
|
||||
# See if there is a custom reply, but don't block
|
||||
custom_reply = server_queue.get(block=False)
|
||||
reply = custom_reply
|
||||
except queue.Empty:
|
||||
pass # No custom reply, just echo
|
||||
|
||||
if verbose:
|
||||
print("SERVER: ", reply)
|
||||
connection.sendall(reply)
|
||||
except (ConnectionResetError, BrokenPipeError):
|
||||
break # Client closed connection
|
||||
except Exception:
|
||||
if verbose:
|
||||
traceback.print_exc()
|
||||
break # Exit on other errors
|
||||
connection.close()
|
||||
|
||||
|
||||
class TcpServer:
|
||||
def __init__(self,port,ipv6,proxy_port=None, verbose=False):
|
||||
def __init__(self, port, ipv6, proxy_port=None, verbose=False):
|
||||
self.proxy_port = proxy_port
|
||||
self.ipv6 = ipv6
|
||||
self.port = port
|
||||
@@ -12,43 +49,30 @@ class TcpServer:
|
||||
self._regen_process()
|
||||
|
||||
def _regen_process(self):
|
||||
def _startServer(port, server_queue:Queue):
|
||||
sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
sock.bind(('::1' if self.ipv6 else '127.0.0.1', port))
|
||||
sock.listen(8)
|
||||
while True:
|
||||
connection,address = sock.accept()
|
||||
while True:
|
||||
try:
|
||||
buf = connection.recv(4096)
|
||||
if buf == b'':
|
||||
break
|
||||
try:
|
||||
buf = server_queue.get(block=False)
|
||||
except Exception:
|
||||
pass
|
||||
if self.verbose:
|
||||
print("SERVER: ", buf)
|
||||
connection.sendall(buf)
|
||||
except Exception:
|
||||
if self.verbose:
|
||||
traceback.print_exc()
|
||||
connection.close()
|
||||
self.server = Process(target=_startServer,args=[self.port, self._server_data_queue])
|
||||
self.server = Process(
|
||||
target=_start_tcp_server,
|
||||
args=[self.port, self._server_data_queue, self.ipv6, self.verbose],
|
||||
)
|
||||
|
||||
def start(self):
|
||||
self.server.start()
|
||||
|
||||
|
||||
def stop(self):
|
||||
self.server.terminate()
|
||||
self.server.join()
|
||||
self._regen_process()
|
||||
|
||||
def connect_client(self):
|
||||
self.client_sock = socket.socket(socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.client_sock = socket.socket(
|
||||
socket.AF_INET6 if self.ipv6 else socket.AF_INET, socket.SOCK_STREAM
|
||||
)
|
||||
self.client_sock.settimeout(1)
|
||||
self.client_sock.connect(('::1' if self.ipv6 else '127.0.0.1', self.proxy_port if self.proxy_port else self.port))
|
||||
self.client_sock.connect(
|
||||
(
|
||||
"::1" if self.ipv6 else "127.0.0.1",
|
||||
self.proxy_port if self.proxy_port else self.port,
|
||||
)
|
||||
)
|
||||
|
||||
def close_client(self):
|
||||
if self.client_sock:
|
||||
@@ -60,7 +84,7 @@ class TcpServer:
|
||||
if server_reply:
|
||||
self._server_data_queue.put(server_reply)
|
||||
self.client_sock.sendall(packet)
|
||||
|
||||
|
||||
def recv_packet(self):
|
||||
try:
|
||||
return self.client_sock.recv(4096)
|
||||
@@ -68,7 +92,7 @@ class TcpServer:
|
||||
if self.verbose:
|
||||
traceback.print_exc()
|
||||
return False
|
||||
|
||||
|
||||
def sendCheckData(self, data, get_data=False):
|
||||
self.connect_client()
|
||||
self.send_packet(data)
|
||||
|
||||
Reference in New Issue
Block a user