fixing up vscodemessenger

3 files changed, 11 insertions, 7 deletions

diff --git a/extension/react-app/src/hooks/useContinueNotebookProtocol.ts b/extension/react-app/src/hooks/useContinueNotebookProtocol.ts
index d5ffbf09..b785cc84 100644
--- a/extension/react-app/src/hooks/useContinueNotebookProtocol.ts
+++ b/extension/react-app/src/hooks/useContinueNotebookProtocol.ts
@@ -10,7 +10,7 @@ class ContinueNotebookClientProtocol extends AbstractContinueNotebookClientProto
 
   constructor(
     serverUrlWithSessionId: string,
-    useVscodeMessagePassing: boolean = false
+    useVscodeMessagePassing: boolean
   ) {
     super();
     this.serverUrlWithSessionId = serverUrlWithSessionId;
diff --git a/extension/react-app/src/hooks/useWebsocket.ts b/extension/react-app/src/hooks/useWebsocket.ts
index b98be577..016fa17d 100644
--- a/extension/react-app/src/hooks/useWebsocket.ts
+++ b/extension/react-app/src/hooks/useWebsocket.ts
@@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
 import ContinueNotebookClientProtocol from "./useContinueNotebookProtocol";
 import { postVscMessage } from "../vscode";
 
-function useContinueNotebookProtocol(useVscodeMessagePassing: boolean = false) {
+function useContinueNotebookProtocol(useVscodeMessagePassing: boolean = true) {
   const sessionId = useSelector((state: RootStore) => state.config.sessionId);
   const serverHttpUrl = useSelector((state: RootStore) => state.config.apiUrl);
   const [client, setClient] = useState<
diff --git a/extension/react-app/src/hooks/vscodeMessenger.ts b/extension/react-app/src/hooks/vscodeMessenger.ts
index 746c4302..e330db57 100644
--- a/extension/react-app/src/hooks/vscodeMessenger.ts
+++ b/extension/react-app/src/hooks/vscodeMessenger.ts
@@ -21,8 +21,10 @@ export class VscodeMessenger extends Messenger {
   onMessageType(messageType: string, callback: (data: object) => void): void {
     window.addEventListener("message", (event: any) => {
       if (event.data.type === "websocketForwardingMessage") {
-        if (event.data.message.messageType === messageType) {
-          callback(event.data.message.data);
+        console.log("VS CODE SENT DATA: ", event.data);
+        const data = JSON.parse(event.data.data);
+        if (data.messageType === messageType) {
+          callback(data.data);
         }
       }
     });
@@ -31,7 +33,8 @@ export class VscodeMessenger extends Messenger {
   onMessage(callback: (messageType: string, data: any) => void): void {
     window.addEventListener("message", (event: any) => {
       if (event.data.type === "websocketForwardingMessage") {
-        callback(event.data.message.messageType, event.data.message.data);
+        const data = JSON.parse(event.data.data);
+        callback(data.messageType, data.data);
       }
     });
   }
@@ -40,9 +43,10 @@ export class VscodeMessenger extends Messenger {
     return new Promise((resolve) => {
       const handler = (event: any) => {
         if (event.data.type === "websocketForwardingMessage") {
-          if (event.data.message.messageType === messageType) {
+          const data = JSON.parse(event.data.data);
+          if (data.messageType === messageType) {
             window.removeEventListener("message", handler);
-            resolve(event.data.message.data);
+            resolve(data.data);
           }
         }
       };