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

relay.py: minor refactoring in anticipation of multi-pass rendezvous

Browse Source
This commit is contained in:
Brian Warner 2015-03-12 19:22:34 -07:00
parent fcf3b080f9
commit cda5634b1d
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,13 @@ CHANNEL_EXPIRATION_TIME = 1*HOUR
class Channel(resource.Resource): class Channel(resource.Resource):
isLeaf = True isLeaf = True
# POST /CHANNEL-ID/SIDE/pake/post {message: STR} -> {messages: [STR..]} valid_which = ["pake", "data"]
# POST /CHANNEL-ID/SIDE/pake/poll -> {messages: [STR..]} # WHICH=(pake,data)
# POST /CHANNEL-ID/SIDE/data/post {message: STR} -> {messages: [STR..]}
# POST /CHANNEL-ID/SIDE/data/poll -> {messages: [STR..]} # these return all messages for CHANNEL-ID= and WHICH= but SIDE!=
# POST /CHANNEL-ID/SIDE/WHICH/post {message: STR} -> {messages: [STR..]}
# POST /CHANNEL-ID/SIDE/WHICH/poll -> {messages: [STR..]}
#
# POST /CHANNEL-ID/SIDE/deallocate -> waiting | deleted # POST /CHANNEL-ID/SIDE/deallocate -> waiting | deleted
def __init__(self, channel_id, relay): def __init__(self, channel_id, relay):
@ -28,11 +31,12 @@ class Channel(resource.Resource):
self.relay = relay self.relay = relay
self.expire_at = time.time() + CHANNEL_EXPIRATION_TIME self.expire_at = time.time() + CHANNEL_EXPIRATION_TIME
self.sides = set() self.sides = set()
self.messages = {"pake": defaultdict(list), # side -> [strings] self.messages = {}
"data": defaultdict(list), # side -> [strings] for which in self.valid_which:
} self.messages[which] = defaultdict(list) # side -> [strings]
def render_POST(self, request): def render_POST(self, request):
# rest of URL is: SIDE/WHICH/(post|poll)
side = request.postpath[0] side = request.postpath[0]
self.sides.add(side) self.sides.add(side)
which = request.postpath[1] which = request.postpath[1]
@ -43,7 +47,7 @@ class Channel(resource.Resource):
return "waiting\n" return "waiting\n"
self.relay.free_child(self.channel_id) self.relay.free_child(self.channel_id)
return "deleted\n" return "deleted\n"
elif which in ("pake", "data"): elif which in self.valid_which:
all_messages = self.messages[which] all_messages = self.messages[which]
messages = all_messages[side] messages = all_messages[side]
other_messages = [] other_messages = []