Fixes sending long messages

jupyterlab · Jul 19, 2023 · 3a4b86e · 3a4b86e
1 parent 1d1a61c
commit 3a4b86e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/jupyter_collaboration/handlers.py b/jupyter_collaboration/handlers.py
@@ -257,7 +257,13 @@ async def on_message(self, message):
 
         if message_type == MessageType.CHAT:
             user = self.current_user
-            msg = message[2:].decode("utf-8")
+
+            # The fist bytes are the length of the message
+            pos = 1
+            while message[pos] >= 128:
+                pos += 1
+            pos += 1
+            msg = message[pos:].decode("utf-8")
 
             data = json.loads(msg)
             data["sender"] = user.username

diff --git a/packages/collaboration-extension/src/collaboration.ts b/packages/collaboration-extension/src/collaboration.ts
@@ -14,7 +14,10 @@ import {
   EditorExtensionRegistry,
   IEditorExtensionRegistry
 } from '@jupyterlab/codemirror';
-import { IAwarenessProvider, WebSocketAwarenessProvider } from '@jupyter/docprovider';
+import {
+  IAwarenessProvider,
+  WebSocketAwarenessProvider
+} from '@jupyter/docprovider';
 import { SidePanel, usersIcon } from '@jupyterlab/ui-components';
 import { URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection } from '@jupyterlab/services';

diff --git a/packages/docprovider/src/awareness.ts b/packages/docprovider/src/awareness.ts
@@ -122,11 +122,11 @@ export class WebSocketAwarenessProvider
         body: msg
       }
     };
-
     const encoder = encoding.createEncoder();
     encoding.writeVarUint(encoder, MessageType.CHAT);
     encoding.writeVarString(encoder, JSON.stringify(message));
-    this.ws!.send(encoding.toUint8Array(encoder));
+    const data = encoding.toUint8Array(encoder);
+    this.ws!.send(data);
 
     return { ...message, sender: this._user };
   }