perelman/fear_tracker
1
0
Fork 0
Code Issues Pull Requests 1 Activity

Compare commits

base: perelman:59045a199d065a499568b7ca0395f666e9226f9e
Branches Tags
perelman:main
perelman:deploy/awi
perelman:feature/long-poll-status
perelman:history/short-polling-only
perelman:feature/js
..
compare: perelman:0b4beea4913391bff7c86585ed5f98b7833d66b4
Branches Tags
perelman:main
perelman:deploy/awi
perelman:feature/long-poll-status
perelman:history/short-polling-only
perelman:feature/js

No commits in common. "59045a199d065a499568b7ca0395f666e9226f9e" and "0b4beea4913391bff7c86585ed5f98b7833d66b4" have entirely different histories.
59045a199d ... 0b4beea491

2 changed files with 13 additions and 24 deletions
Show Stats Expand all files Collapse all files

7
fear_tracker/templates/game.html
View File

@ -392,10 +392,9 @@
statusObj = data; statusObj = data;
} }
}) })
.then(checkStatus) .catch(() => {})
.catch(() => { .then(() => {
// If something went wrong, wait a few seconds before retrying. checkStatus();
setTimeout(checkStatus, 5000);
}); });
} }
checkStatus(); checkStatus();

30
fear_tracker/views.py
View File

@ -159,6 +159,12 @@ def game_status_object(game, current_phase=None, players_with_fear=None):
status_hash = h.hexdigest() status_hash = h.hexdigest()
status_obj['hash'] = status_hash status_obj['hash'] = status_hash
async_to_sync(get_channel_layer().group_send)(
"%s_status" % game.access_code, {
"type": "fear_tracker.hashcode_seen",
"hashcode": status_hash,
})
return status_obj return status_obj
@ -284,6 +290,10 @@ def handle_game_request(request, game, update):
for player in players.values(): for player in players.values():
player.ready = True player.ready = True
async_to_sync(get_channel_layer().group_send)(
"%s_status" % game.access_code,
{"type": "fear_tracker.invalidate_status"})
if update: if update:
if errors: if errors:
res = { res = {
@ -294,22 +304,12 @@ def handle_game_request(request, game, update):
res['value'] = current_value res['value'] = current_value
else: else:
res = {'success': True} res = {'success': True}
async_to_sync(get_channel_layer().group_send)(
"%s_status" % game.access_code,
{"type": "fear_tracker.invalidate_status"})
return HttpResponse(json.dumps(res)) return HttpResponse(json.dumps(res))
players = get_players_with_fear(game, current_phase, players) players = get_players_with_fear(game, current_phase, players)
status_obj = game_status_object(game, current_phase, players) status_obj = game_status_object(game, current_phase, players)
status_string = json.dumps(status_obj) status_string = json.dumps(status_obj)
async_to_sync(get_channel_layer().group_send)(
"%s_status" % game.access_code, {
"type": "fear_tracker.hashcode_seen",
"hashcode": status_obj['hash'],
"status_string": status_string,
})
for player in players.values(): for player in players.values():
info = player.fear info = player.fear
if not info: if not info:
@ -340,12 +340,6 @@ def status(request, game, hashcode=None):
return HttpResponse(status=HTTPStatus.NOT_MODIFIED) return HttpResponse(status=HTTPStatus.NOT_MODIFIED)
else: else:
status_string = json.dumps(status_obj) status_string = json.dumps(status_obj)
async_to_sync(get_channel_layer().group_send)(
"%s_status" % game.access_code, {
"type": "fear_tracker.hashcode_seen",
"hashcode": status_obj['hash'],
"status_string": status_string,
})
return HttpResponse(status_string) return HttpResponse(status_string)
@ -378,10 +372,6 @@ class StatusLongPollConsumer(AsyncHttpConsumer):
async def fear_tracker_hashcode_seen(self, event): async def fear_tracker_hashcode_seen(self, event):
if self.hashcode != event["hashcode"]: if self.hashcode != event["hashcode"]:
if event["status_string"]:
body = event["status_string"].encode('utf-8')
await self.send_response(200, body)
await self.disconnect()
await self.channel_layer.group_send( await self.channel_layer.group_send(
"%s_status" % self.access_code, { "%s_status" % self.access_code, {
"type": "fear_tracker.invalidate_status", "type": "fear_tracker.invalidate_status",