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

rdv_ws: get server_rx at a better place

Browse Source
This commit is contained in:
Brian Warner 2016-05-05 18:43:43 -07:00
parent d9ba55621b
commit 959ab4baca
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/wormhole/server/rendezvous_websocket.py
View File

@ -66,6 +66,7 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
self.send("welcome", welcome=rv.get_welcome()) self.send("welcome", welcome=rv.get_welcome())
def onMessage(self, payload, isBinary): def onMessage(self, payload, isBinary):
server_rx = time.time()
msg = json.loads(payload.decode("utf-8")) msg = json.loads(payload.decode("utf-8"))
try: try:
if "type" not in msg: if "type" not in msg:
@ -90,7 +91,7 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
if mtype == "watch": if mtype == "watch":
return self.handle_watch(self._channel, msg) return self.handle_watch(self._channel, msg)
if mtype == "add": if mtype == "add":
return self.handle_add(self._channel, msg) return self.handle_add(self._channel, msg, server_rx)
if mtype == "deallocate": if mtype == "deallocate":
return self.handle_deallocate(self._channel, msg) return self.handle_deallocate(self._channel, msg)
@ -147,12 +148,12 @@ class WebSocketRendezvous(websocket.WebSocketServerProtocol):
for old_message in channel.add_listener(self): for old_message in channel.add_listener(self):
self.send_rendezvous_event(old_message) self.send_rendezvous_event(old_message)
def handle_add(self, channel, msg): def handle_add(self, channel, msg, server_rx):
if "phase" not in msg: if "phase" not in msg:
raise Error("missing 'phase'") raise Error("missing 'phase'")
if "body" not in msg: if "body" not in msg:
raise Error("missing 'body'") raise Error("missing 'body'")
channel.add_message(self._side, msg["phase"], msg["body"], time.time()) channel.add_message(self._side, msg["phase"], msg["body"], server_rx)
def handle_deallocate(self, channel, msg): def handle_deallocate(self, channel, msg):
deleted = channel.deallocate(self._side, msg.get("mood")) deleted = channel.deallocate(self._side, msg.get("mood"))