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

server: internal refactoring

Browse Source
This commit is contained in:
Brian Warner 2015-11-13 18:12:47 -08:00
parent 101c800237
commit 0b9f858761
1 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/wormhole/servers/relay_server.py
View File

@ -57,29 +57,26 @@ class EventsProtocol:
# POST /deallocate {appid:,channelid:,side:} -> {status: waiting | deleted} # POST /deallocate {appid:,channelid:,side:} -> {status: waiting | deleted}
# all JSON responses include a "welcome:{..}" key # all JSON responses include a "welcome:{..}" key
class ChannelLister(resource.Resource): class RelayResource(resource.Resource):
def __init__(self, relay): def __init__(self, relay, welcome):
resource.Resource.__init__(self) resource.Resource.__init__(self)
self._relay = relay self._relay = relay
self._welcome = welcome
class ChannelLister(RelayResource):
def render_GET(self, request): def render_GET(self, request):
if b"appid" not in request.args: if b"appid" not in request.args:
e = NeedToUpgradeErrorResource(self._relay.welcome) e = NeedToUpgradeErrorResource(self._welcome)
return e.get_message() return e.get_message()
appid = request.args[b"appid"][0].decode("utf-8") appid = request.args[b"appid"][0].decode("utf-8")
#print("LIST", appid) #print("LIST", appid)
app = self._relay.get_app(appid) app = self._relay.get_app(appid)
allocated = app.get_allocated() allocated = app.get_allocated()
request.setHeader(b"content-type", b"application/json; charset=utf-8") request.setHeader(b"content-type", b"application/json; charset=utf-8")
data = {"welcome": self._relay.welcome, data = {"welcome": self._welcome, "channelids": sorted(allocated)}
"channelids": sorted(allocated)}
return (json.dumps(data)+"\n").encode("utf-8") return (json.dumps(data)+"\n").encode("utf-8")
class Allocator(resource.Resource): class Allocator(RelayResource):
def __init__(self, relay):
resource.Resource.__init__(self)
self._relay = relay
def render_POST(self, request): def render_POST(self, request):
content = request.content.read() content = request.content.read()
data = json.loads(content.decode("utf-8")) data = json.loads(content.decode("utf-8"))
@ -94,8 +91,7 @@ class Allocator(resource.Resource):
log.msg("allocated #%d, now have %d DB channels" % log.msg("allocated #%d, now have %d DB channels" %
(channelid, len(app.get_allocated()))) (channelid, len(app.get_allocated())))
request.setHeader(b"content-type", b"application/json; charset=utf-8") request.setHeader(b"content-type", b"application/json; charset=utf-8")
data = {"welcome": self._relay.welcome, data = {"welcome": self._welcome, "channelid": channelid}
"channelid": channelid}
return (json.dumps(data)+"\n").encode("utf-8") return (json.dumps(data)+"\n").encode("utf-8")
def getChild(self, path, req): def getChild(self, path, req):
@ -103,7 +99,7 @@ class Allocator(resource.Resource):
# wormhole-0.5.0 changed that to "POST /allocate". We catch the old # wormhole-0.5.0 changed that to "POST /allocate". We catch the old
# URL here to deliver a nicer error message (with upgrade # URL here to deliver a nicer error message (with upgrade
# instructions) than an ugly 404. # instructions) than an ugly 404.
return NeedToUpgradeErrorResource(self._relay.welcome) return NeedToUpgradeErrorResource(self._welcome)
class NeedToUpgradeErrorResource(resource.Resource): class NeedToUpgradeErrorResource(resource.Resource):
def __init__(self, welcome): def __init__(self, welcome):
@ -121,11 +117,7 @@ class NeedToUpgradeErrorResource(resource.Resource):
def getChild(self, path, req): def getChild(self, path, req):
return self return self
class Adder(resource.Resource): class Adder(RelayResource):
def __init__(self, relay):
resource.Resource.__init__(self)
self._relay = relay
def render_POST(self, request): def render_POST(self, request):
#content = json.load(request.content, encoding="utf-8") #content = json.load(request.content, encoding="utf-8")
content = request.content.read() content = request.content.read()
@ -142,12 +134,11 @@ class Adder(resource.Resource):
app = self._relay.get_app(appid) app = self._relay.get_app(appid)
channel = app.get_channel(channelid) channel = app.get_channel(channelid)
response = channel.add_message(side, phase, body) response = channel.add_message(side, phase, body)
# response is generated with get_messages(), so it includes both
# 'welcome' and 'messages'
return json_response(request, response) return json_response(request, response)
class Getter(resource.Resource): class Getter(RelayResource):
def __init__(self, relay):
self._relay = relay
def render_GET(self, request): def render_GET(self, request):
appid = request.args[b"appid"][0].decode("utf-8") appid = request.args[b"appid"][0].decode("utf-8")
channelid = int(request.args[b"channelid"][0]) channelid = int(request.args[b"channelid"][0])
@ -161,7 +152,7 @@ class Getter(resource.Resource):
request.setHeader(b"content-type", b"text/event-stream; charset=utf-8") request.setHeader(b"content-type", b"text/event-stream; charset=utf-8")
ep = EventsProtocol(request) ep = EventsProtocol(request)
ep.sendEvent(json.dumps(self._relay.welcome), name="welcome") ep.sendEvent(json.dumps(self._welcome), name="welcome")
old_events = channel.add_listener(ep.sendEvent) old_events = channel.add_listener(ep.sendEvent)
request.notifyFinish().addErrback(lambda f: request.notifyFinish().addErrback(lambda f:
channel.remove_listener(ep.sendEvent)) channel.remove_listener(ep.sendEvent))
@ -169,10 +160,7 @@ class Getter(resource.Resource):
ep.sendEvent(old_event) ep.sendEvent(old_event)
return server.NOT_DONE_YET return server.NOT_DONE_YET
class Deallocator(resource.Resource): class Deallocator(RelayResource):
def __init__(self, relay):
self._relay = relay
def render_POST(self, request): def render_POST(self, request):
content = request.content.read() content = request.content.read()
data = json.loads(content.decode("utf-8")) data = json.loads(content.decode("utf-8"))
@ -331,11 +319,11 @@ class Relay(resource.Resource, service.MultiService):
self._apps = {} self._apps = {}
t = internet.TimerService(EXPIRATION_CHECK_PERIOD, self.prune) t = internet.TimerService(EXPIRATION_CHECK_PERIOD, self.prune)
t.setServiceParent(self) t.setServiceParent(self)
self.putChild(b"list", ChannelLister(self)) self.putChild(b"list", ChannelLister(self, welcome))
self.putChild(b"allocate", Allocator(self)) self.putChild(b"allocate", Allocator(self, welcome))
self.putChild(b"add", Adder(self)) self.putChild(b"add", Adder(self, welcome))
self.putChild(b"get", Getter(self)) self.putChild(b"get", Getter(self, welcome))
self.putChild(b"deallocate", Deallocator(self)) self.putChild(b"deallocate", Deallocator(self, welcome))
def getChild(self, path, req): def getChild(self, path, req):
# 0.4.0 used "POST /CID/SIDE/post/MSGNUM" # 0.4.0 used "POST /CID/SIDE/post/MSGNUM"