diff --git a/app/multiplayer/websocket.js b/app/multiplayer/websocket.js index 9803c23148..8663fe733d 100644 --- a/app/multiplayer/websocket.js +++ b/app/multiplayer/websocket.js @@ -98,9 +98,11 @@ const setupWebsocket = (provider) => { }; provider.socket.on("document.sync", (event) => { - const encoder = readMessage(provider, new Uint8Array(event.data), true); - if (encoding.length(encoder) > 1) { - provider.ws.send(encoding.toUint8Array(encoder)); + if (event.documentId === provider.documentId) { + const encoder = readMessage(provider, new Uint8Array(event.data), true); + if (encoding.length(encoder) > 1) { + provider.ws.send(encoding.toUint8Array(encoder)); + } } }); diff --git a/server/multiplayer/utils.js b/server/multiplayer/utils.js index 424ee0744b..8be690551e 100644 --- a/server/multiplayer/utils.js +++ b/server/multiplayer/utils.js @@ -81,9 +81,11 @@ export const setupConnection = (conn: Socket, documentId: string) => { doc.conns.set(conn, new Set()); // listen and reply to events - conn.on("sync", (event) => - messageListener(conn, doc, new Uint8Array(event.data)) - ); + conn.on("sync", (event) => { + if (event.documentId === documentId) { + messageListener(conn, doc, new Uint8Array(event.data)); + } + }); conn.on("disconnecting", () => cleanup(doc, conn)); conn.on("leave", (event) => {