fix lag in ff on websocket connection, e.g., when switching terminals…

… and also to start collab and languageClient in editor
prona-p4-learning-platform · Jul 7, 2024 · 615b1d4 · 615b1d4
1 parent e6f64e4
commit 615b1d4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 16 deletions.
diff --git a/frontend/src/components/FileEditor.tsx b/frontend/src/components/FileEditor.tsx
@@ -359,14 +359,19 @@ export default class FileEditor extends Component<FileEditorProps> {
     }
 
     const collaborationId = fileName + "-group" + group;
-    console.log(
-      "Starting collaboration for user: " +
-        this.username +
-        " in group: " +
-        group +
-        " on: " +
-        collaborationId,
-    );
+
+    // Avoid console.log in production code while opening websockets, as Firefox otherwise    
+    // will will wait a long time before opening the connection, e.g., when switching terminals
+    // or files in the editor (y-websocket and/or monaco-languageclient)
+
+    // console.log(
+    //   "Starting collaboration for user: " +
+    //     this.username +
+    //     " in group: " +
+    //     group +
+    //     " on: " +
+    //     collaborationId,
+    // );
 
     const doc = new Y.Doc();
 
@@ -422,7 +427,7 @@ export default class FileEditor extends Component<FileEditorProps> {
           red.toString(16).padStart(2, "0") +
           green.toString(16).padStart(2, "0") +
           blue.toString(16).padStart(2, "0");
-        console.log("my color: " + hexColor);
+        //console.log("my color: " + hexColor);
 
         awareness.on(
           "update",
@@ -506,7 +511,7 @@ export default class FileEditor extends Component<FileEditorProps> {
             //});
           },
         );
-        console.log("my client id: " + awareness.clientID);
+        //console.log("my client id: " + awareness.clientID);
         awareness.setLocalStateField("user", {
           name: username,
           color: hexColor,
@@ -541,7 +546,7 @@ export default class FileEditor extends Component<FileEditorProps> {
       return;
     }
     this.binding?.destroy();
-    // WebRTC provider problem is room is taken, cannot be joined/created again
+    // WebRTC provider problem if room is taken, cannot be joined/created again
     //this.collaborationProvider?.room?.destroy();
     this.collaborationProvider?.disconnect();
   }
@@ -562,7 +567,11 @@ export default class FileEditor extends Component<FileEditorProps> {
     }
 
     if (lspLanguage !== "") {
-      console.log("Starting language client for language: " + lspLanguage);
+      // Avoid console.log in production code while opening websockets, as Firefox otherwise    
+      // will will wait a long time before opening the connection, e.g., when switching terminals
+      // or files in the editor (y-websocket and/or monaco-languageclient)
+
+      //console.log("Starting language client for language: " + lspLanguage);
 
       this.languageClientWebSocket = createWebSocket(
         "/environment/" +
@@ -589,7 +598,7 @@ export default class FileEditor extends Component<FileEditorProps> {
         this.languageClientWebSocket.onmessage = (e) => {
           if (e.data === "backend websocket ready") {
             // restore onmessage fn
-            console.log("backend websocket ready, starting language client");
+            //console.log("backend websocket ready, starting language client");
             //this.languageClientWebSocket.onmessage = (e) => {
             //console.log("received message from backend: " + e.data);
             //if (e.data === "pong") {
@@ -661,7 +670,7 @@ export default class FileEditor extends Component<FileEditorProps> {
     // if languageClient connection was closed, this.languageClient will be undefined
     void this.languageClient?.dispose();
     clearInterval(this.languageClientWSTimerId);
-    //this.languageClientWebSocket.close()
+    this.languageClientWebSocket.close()
   }
 
   findCommonPathPrefix(strings: string[]): string {

diff --git a/frontend/src/views/Environment.tsx b/frontend/src/views/Environment.tsx
@@ -153,8 +153,8 @@ class EnvironmentView extends Component<PropsType, StateType> {
       providerInstanceStatus: "",
       rootPath: "",
       workspaceFolders: [],
-      useCollaboration: true,
-      useLanguageClient: true,
+      useCollaboration: false,
+      useLanguageClient: false,
     };
     this.restartEnvironment = this.restartEnvironment.bind(this);
     this.storeTerminalState = this.storeTerminalState.bind(this);