From b7c27324078a1b4e4ac05da18cf8e18a5506b941 Mon Sep 17 00:00:00 2001 From: Yohan Boniface Date: Fri, 27 Dec 2024 12:18:41 +0100 Subject: [PATCH] fixup(sync): code cleaning --- umap/static/umap/js/modules/sync/engine.js | 4 +--- umap/sync/consumers.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/umap/static/umap/js/modules/sync/engine.js b/umap/static/umap/js/modules/sync/engine.js index 3ac14f54..7a877e2b 100644 --- a/umap/static/umap/js/modules/sync/engine.js +++ b/umap/static/umap/js/modules/sync/engine.js @@ -150,7 +150,6 @@ export class SyncEngine { * and dispatches the different "on*" methods. */ receive({ kind, ...payload }) { - console.log(kind, payload) if (kind === 'OperationMessage') { this.onOperationMessage(payload) } else if (kind === 'JoinResponse') { @@ -286,7 +285,6 @@ export class SyncEngine { */ sendToPeer(recipient, verb, payload) { payload.verb = verb - console.log('Sending peermessage to', recipient) this.transport.send('PeerMessage', { sender: this.uuid, recipient: recipient, @@ -486,7 +484,7 @@ export class Operations { return ( Utils.deepEqual(local.subject, remote.subject) && Utils.deepEqual(local.metadata, remote.metadata) && - (!shouldCheckKey || (shouldCheckKey && local.key == remote.key)) + (!shouldCheckKey || (shouldCheckKey && local.key === remote.key)) ) } } diff --git a/umap/sync/consumers.py b/umap/sync/consumers.py index 48912820..dc722279 100644 --- a/umap/sync/consumers.py +++ b/umap/sync/consumers.py @@ -25,8 +25,8 @@ class SyncConsumer(AsyncWebsocketConsumer): # Join room group await self.channel_layer.group_add(self.map_id, self.channel_name) - await self.accept() self.is_authenticated = False + await self.accept() async def disconnect(self, close_code): await self.channel_layer.group_discard(self.map_id, self.channel_name) @@ -37,7 +37,7 @@ class SyncConsumer(AsyncWebsocketConsumer): await self.broadcast(message.model_dump_json()) async def broadcast(self, message): - # Send to one all channels + # Send to all channels (including sender!) await self.channel_layer.group_send( self.map_id, {"message": message, "type": "on_message"} )