temp data push hack to get around race condition

Author: tgriesser

packages/data-context/src/DataContext.ts

@@ -34,7 +34,7 @@ import type { Server } from 'http'
 import type { AddressInfo } from 'net'
 import type { App as ElectronApp } from 'electron'
 import { VersionsDataSource } from './sources/VersionsDataSource'
-import type { SocketIOServer } from '@packages/socket'
+import type { Socket, SocketIOServer } from '@packages/socket'
 import { globalPubSub } from '.'
 import { InjectedConfigApi, ProjectLifecycleManager } from './data/ProjectLifecycleManager'
 
@@ -237,6 +237,11 @@ export class DataContext {
 
   setAppSocketServer (socketServer: SocketIOServer | undefined) {
     this.update((d) => {
+      if (d.servers.appSocketServer !== socketServer) {
+        d.servers.appSocketServer?.off('connection', this.initialPush)
+        socketServer?.on('connection', this.initialPush)
+      }
+
       d.servers.appSocketServer = socketServer
     })
   }
@@ -250,13 +255,21 @@ export class DataContext {
 
   setGqlSocketServer (socketServer: SocketIOServer | undefined) {
     this.update((d) => {
+      if (d.servers.gqlSocketServer !== socketServer) {
+        d.servers.gqlSocketServer?.off('connection', this.initialPush)
+        socketServer?.on('connection', this.initialPush)
+      }
+
       d.servers.gqlSocketServer = socketServer
     })
+  }
 
-    // TODO: refine the whole socket communication layer
-    socketServer?.once('connect', (socket) => {
+  initialPush = (socket: Socket) => {
+    // TODO: This is a hack that will go away when we refine the whole socket communication
+    // layer w/ GraphQL subscriptions, we shouldn't be pushing so much
+    setTimeout(() => {
       socket.emit('data-context-push')
-    })
+    }, 100)
   }
 
   /**

packages/data-context/src/data/ProjectLifecycleManager.ts

@@ -1089,13 +1089,13 @@ export class ProjectLifecycleManager {
     const finalConfig = this._cachedFullConfig = this.ctx._apis.configApi.updateWithPluginValues(fullConfig, result.setupConfig ?? {})
 
     if (this.ctx.coreData.cliBrowser) {
-      await this.setActiveBrowser(finalConfig, this.ctx.coreData.cliBrowser)
+      await this.setActiveBrowser(this.ctx.coreData.cliBrowser)
     }
 
     this._pendingInitialize?.resolve(finalConfig)
   }
 
-  private async setActiveBrowser (config: FullConfig, cliBrowser: string) {
+  private async setActiveBrowser (cliBrowser: string) {
     // When we're starting up, if we've chosen a browser to run with, check if it exists
     this.ctx.coreData.cliBrowser = null
 

packages/frontend-shared/src/graphql/urqlExchangePubsub.ts

@@ -7,12 +7,8 @@ export const pubSubExchange = (io: Socket): Exchange => {
     const watchedOperations = new Map<number, Operation>()
     const observedOperations = new Map<number, number>()
 
-    // const x = Math.random().toString()
-
     io.on('data-context-push', (...args) => {
       watchedOperations.forEach((op) => {
-        // console.log(x)
-
         client.reexecuteOperation(
           client.createRequestOperation('query', op, {
             requestPolicy: 'cache-and-network',

packages/launchpad/src/setup/OpenBrowser.vue

@@ -1,15 +1,12 @@
 <template>
   <WizardLayout
+    v-if="query.data.value?.currentProject"
     no-container
     :can-navigate-forward="false"
     :show-next="false"
     #="{backFn}"
   >
-    <div v-if="!query.data.value?.currentProject">
-      Loading browsers...
-    </div>
     <OpenBrowserList
-      v-else
       variant=""
       :gql="query.data.value.currentProject"
       @navigated-back="backFn"