Fix liveshare guest hang issue (#7764) (#7772)

* initial changes

* update notebooks on server session change and add test

* await correctly

Author: IanMatthewHuff

news/2 Fixes/7638.md

@@ -0,0 +1 @@
+Fix a hang in the Interactive window when connecting guest to host after the host has already started the interactive window.

src/client/datascience/jupyter/jupyterServer.ts

@@ -169,6 +169,10 @@ export class JupyterServerBase implements INotebookServer {
         return this.notebooks.get(resource.toString());
     }
 
+    protected getNotebooks(): INotebook[] {
+        return [...this.notebooks.values()];
+    }
+
     protected setNotebook(resource: Uri, notebook: INotebook) {
         const oldDispose = notebook.dispose;
         notebook.dispose = () => {

src/client/datascience/jupyter/liveshare/guestJupyterServer.ts

@@ -73,6 +73,17 @@ export class GuestJupyterServer
         return result;
     }
 
+    public async onSessionChange(api: vsls.LiveShare | null): Promise<void> {
+        await super.onSessionChange(api);
+
+        this.notebooks.forEach(async notebook => {
+            const guestNotebook = notebook as GuestJupyterNotebook;
+            if (guestNotebook) {
+                await guestNotebook.onSessionChange(api);
+            }
+        });
+    }
+
     public async getNotebook(resource: Uri): Promise<INotebook | undefined> {
         return this.notebooks.get(resource.toString());
     }

src/client/datascience/jupyter/liveshare/hostJupyterServer.ts

@@ -96,6 +96,17 @@ export class HostJupyterServer
         }
     }
 
+    public async onSessionChange(api: vsls.LiveShare | null): Promise<void> {
+        await super.onSessionChange(api);
+
+        this.getNotebooks().forEach(async notebook => {
+            const hostNotebook = notebook as HostJupyterNotebook;
+            if (hostNotebook) {
+                await hostNotebook.onSessionChange(api);
+            }
+        });
+    }
+
     public async onDetach(api: vsls.LiveShare | null): Promise<void> {
         await super.onDetach(api);
 

src/test/datascience/liveshare.functional.test.tsx

@@ -202,6 +202,23 @@ suite('DataScience LiveShare tests', () => {
         verifyHtmlOnCell(guestContainer.wrapper!, 'InteractiveCell', '<span>1</span>', CellPosition.Last);
     });
 
+    test('Host starts LiveShare after starting Jupyter', async() => {
+       addMockData(hostContainer!, 'a=1\na', 1);
+       addMockData(hostContainer!, 'b=2\nb', 2);
+       await getOrCreateInteractiveWindow(vsls.Role.Host);
+       let wrapper = await addCodeToRole(vsls.Role.Host, 'a=1\na');
+       verifyHtmlOnCell(wrapper, 'InteractiveCell', '<span>1</span>', CellPosition.Last);
+
+       await startSession(vsls.Role.Host);
+       await getOrCreateInteractiveWindow(vsls.Role.Guest);
+       await startSession(vsls.Role.Guest);
+
+       wrapper = await addCodeToRole(vsls.Role.Host, 'b=2\nb');
+
+       assert.ok(guestContainer.wrapper, 'Guest wrapper not created');
+       verifyHtmlOnCell(guestContainer.wrapper!, 'InteractiveCell', '<span>2</span>', CellPosition.Last);
+    });
+
     test('Host Shutdown and Run', async () => {
         // Should only need mock data in host
         addMockData(hostContainer!, 'a=1\na', 1);