chore: browserserver

src/backend.ts

@@ -96,6 +96,7 @@ export class BackendClient extends EventEmitter {
         pair.fulfill(message.result);
       }
     };
+    this._transport.onclose = () => this._onCloseEvent.fire();
     await this.initialize();
   }
 

src/reusedBrowser.ts

@@ -82,28 +82,32 @@ export class ReusedBrowser implements vscodeTypes.Disposable {
       return {};
     }
 
-    const args = [
-      config.cli,
-      'run-server',
-      `--path=/${createGuid()}`
-    ];
-    const cwd = config.workspaceFolder;
-    const envProvider = () => ({
-      ...this._envProvider(),
-      PW_CODEGEN_NO_INSPECTOR: '1',
-      PW_EXTENSION_MODE: '1',
-    });
+    let backend = await this._connectToBrowserServer();
+    if (!backend) {
+      const args = [
+        config.cli,
+        'run-server',
+        `--path=/${createGuid()}`
+      ];
+      const cwd = config.workspaceFolder;
+      const envProvider = () => ({
+        ...this._envProvider(),
+        PW_CODEGEN_NO_INSPECTOR: '1',
+        PW_EXTENSION_MODE: '1',
+      });
+
+      const errors: string[] = [];
+      const backendServer = new BackendServer(this._vscode, () => new Backend(this._vscode), {
+        args,
+        cwd,
+        envProvider,
+        errors,
+      });
+      backend = await backendServer.startAndConnect();
+      if (!backend)
+        return { errors };
+    }
 
-    const errors: string[] = [];
-    const backendServer = new BackendServer(this._vscode, () => new Backend(this._vscode), {
-      args,
-      cwd,
-      envProvider,
-      errors,
-    });
-    const backend = await backendServer.startAndConnect();
-    if (!backend)
-      return { errors };
     backend.onClose(() => {
       if (backend === this._backend) {
         this._backend = undefined;
@@ -191,6 +195,24 @@ export class ReusedBrowser implements vscodeTypes.Disposable {
     return {};
   }
 
+  private async _connectToBrowserServer(): Promise<Backend | null> {
+    try {
+      const baseURL = new URL('http://localhost:14518');
+      const response = await fetch(new URL('/json', baseURL));
+      if (!response.ok)
+        return null;
+      const json = await response.json();
+      if (typeof json.wsEndpointPath !== 'string')
+        return null;
+      const client = new Backend(this._vscode);
+      await client._connect(baseURL.toString());
+      return client;
+    } catch (e) {
+      console.error('Failed to connect to browser server:', e);
+      return null;
+    }
+  }
+
   private _scheduleEdit(callback: () => Promise<void>) {
     this._editOperations = this._editOperations.then(callback).catch(e => console.log(e));
   }