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

relay_server: internal rearrangement

Browse Source 
Construct the response in the render_* method, rather than
add_messages(), to prepare for adding server timestamps. Use
json_response() everywhere.
This commit is contained in:
Brian Warner 2016-03-03 16:53:15 -08:00
parent 9d7b9dd8d2
commit e342236b7d
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,8 @@ class ChannelLister(RelayResource):
#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")
data = {"welcome": self._welcome, "channelids": sorted(allocated)} data = {"welcome": self._welcome, "channelids": sorted(allocated)}
return (json.dumps(data)+"\n").encode("utf-8") return json_response(request, data)
class Allocator(RelayResource): class Allocator(RelayResource):
def render_POST(self, request): def render_POST(self, request):
@ -97,9 +96,8 @@ class Allocator(RelayResource):
if self._log_requests: if self._log_requests:
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") response = {"welcome": self._welcome, "channelid": channelid}
data = {"welcome": self._welcome, "channelid": channelid} return json_response(request, response)
return (json.dumps(data)+"\n").encode("utf-8")
def getChild(self, path, req): def getChild(self, path, req):
# wormhole-0.4.0 "send" started with "POST /allocate/SIDE". # wormhole-0.4.0 "send" started with "POST /allocate/SIDE".
@ -140,9 +138,8 @@ class Adder(RelayResource):
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) messages = channel.add_message(side, phase, body)
# response is generated with get_messages(), so it includes both response = {"welcome": self._welcome, "messages": messages}
# 'welcome' and 'messages'
return json_response(request, response) return json_response(request, response)
class GetterOrWatcher(RelayResource): class GetterOrWatcher(RelayResource):
@ -154,7 +151,8 @@ class GetterOrWatcher(RelayResource):
channel = app.get_channel(channelid) channel = app.get_channel(channelid)
if b"text/event-stream" not in (request.getHeader(b"accept") or b""): if b"text/event-stream" not in (request.getHeader(b"accept") or b""):
response = channel.get_messages() messages = channel.get_messages()
response = {"welcome": self._welcome, "messages": messages}
return json_response(request, response) return json_response(request, response)
request.setHeader(b"content-type", b"text/event-stream; charset=utf-8") request.setHeader(b"content-type", b"text/event-stream; charset=utf-8")
@ -213,7 +211,6 @@ class Channel:
appid, channelid): appid, channelid):
self._app = app self._app = app
self._db = db self._db = db
self._welcome = welcome
self._blur_usage = blur_usage self._blur_usage = blur_usage
self._log_requests = log_requests self._log_requests = log_requests
self._appid = appid self._appid = appid
@ -231,8 +228,7 @@ class Channel:
if row["phase"] in (u"_allocate", u"_deallocate"): if row["phase"] in (u"_allocate", u"_deallocate"):
continue continue
messages.append({"phase": row["phase"], "body": row["body"]}) messages.append({"phase": row["phase"], "body": row["body"]})
data = {"welcome": self._welcome, "messages": messages} return messages
return data
def add_listener(self, ep): def add_listener(self, ep):
self._listeners.add(ep) self._listeners.add(ep)