open.source/magic-wormhole-transit-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add CLI options for WebSockets support

Browse Source
This commit is contained in:
meejah 2021-04-14 16:46:46 -06:00
parent 7b92c3701e
commit e7466a3595
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wormhole_transit_relay/server_tap.py
View File

@ -26,6 +26,8 @@ class Options(usage.Options):
optParameters = [ optParameters = [
("port", "p", "tcp:4001:interface=\:\:", "endpoint to listen on"), ("port", "p", "tcp:4001:interface=\:\:", "endpoint to listen on"),
("websocket", "w", None, "endpoint to listen for WebSocket connections"),
("websocket-url", "u", None, "WebSocket URL (derived from endpoint if not provided)"),
("blur-usage", None, None, "blur timestamps and data sizes in logs"), ("blur-usage", None, None, "blur timestamps and data sizes in logs"),
("log-fd", None, None, "write JSON usage logs to this file descriptor"), ("log-fd", None, None, "write JSON usage logs to this file descriptor"),
("usage-db", None, None, "record usage data (SQLite)"), ("usage-db", None, None, "record usage data (SQLite)"),
@ -38,8 +40,11 @@ class Options(usage.Options):
def makeService(config, reactor=reactor): def makeService(config, reactor=reactor):
increase_rlimits() increase_rlimits()
tcp_ep = endpoints.serverFromString(reactor, config["port"]) # to listen tcp_ep = endpoints.serverFromString(reactor, config["port"]) # to listen
# XXX FIXME proper websocket option ws_ep = (
ws_ep = endpoints.serverFromString(reactor, "tcp:4002") # to listen endpoints.serverFromString(reactor, config["websocket"])
if config["websocket"] is not None
else None
)
log_file = ( log_file = (
os.fdopen(int(config["log-fd"]), "w") os.fdopen(int(config["log-fd"]), "w")
if config["log-fd"] is not None if config["log-fd"] is not None
@ -55,13 +60,22 @@ def makeService(config, reactor=reactor):
tcp_factory = protocol.ServerFactory() tcp_factory = protocol.ServerFactory()
tcp_factory.protocol = transit_server.TransitConnection tcp_factory.protocol = transit_server.TransitConnection
ws_factory = WebSocketServerFactory("ws://localhost:4002") # FIXME: url if ws_ep is not None:
ws_factory.protocol = transit_server.WebSocketTransitConnection ws_url = config["websocket-url"]
if ws_url is None:
# we're using a "private" attribute here but I don't see
# any useful alternative unless we also want to parse
# Twisted endpoint-strings.
ws_url = "ws://localhost:{}/".format(ws_ep._port)
print("Using WebSocket URL '{}'".format(ws_url))
ws_factory = WebSocketServerFactory(ws_url)
ws_factory.protocol = transit_server.WebSocketTransitConnection
tcp_factory.transit = transit tcp_factory.transit = transit
ws_factory.transit = transit ws_factory.transit = transit
parent = MultiService() parent = MultiService()
StreamServerEndpointService(tcp_ep, tcp_factory).setServiceParent(parent) StreamServerEndpointService(tcp_ep, tcp_factory).setServiceParent(parent)
StreamServerEndpointService(ws_ep, ws_factory).setServiceParent(parent) if ws_ep is not None:
StreamServerEndpointService(ws_ep, ws_factory).setServiceParent(parent)
TimerService(5*60.0, transit.update_stats).setServiceParent(parent) TimerService(5*60.0, transit.update_stats).setServiceParent(parent)
return parent return parent