Fix broken feature layout due to async race condition on getRpcDriver (…

…#2551)
GMOD · Nov 25, 2021 · b90f78b · b90f78b
1 parent abedfa8
commit b90f78b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 deletions.
diff --git a/packages/core/rpc/RpcManager.ts b/packages/core/rpc/RpcManager.ts
@@ -5,7 +5,6 @@ import rpcConfigSchema from './configSchema'
 import WebWorkerRpcDriver from './WebWorkerRpcDriver'
 import MainThreadRpcDriver from './MainThreadRpcDriver'
 import { AnyConfigurationModel } from '../configuration/configurationSchema'
-import { isElectron } from '../util'
 
 type DriverClass = WebWorkerRpcDriver | MainThreadRpcDriver
 type BackendConfigurations = {
@@ -48,9 +47,7 @@ export default class RpcManager {
     this.driverObjects = new Map()
   }
 
-  async getDriver(
-    backendName: keyof typeof DriverClasses,
-  ): Promise<DriverClass> {
+  getDriver(backendName: keyof typeof DriverClasses) {
     const driver = this.driverObjects.get(backendName)
     if (driver) {
       return driver
@@ -61,19 +58,15 @@ export default class RpcManager {
 
     if (!DriverClassImpl) {
       throw new Error(`requested RPC driver "${backendName}" is not installed`)
-    } else if (!backendConfiguration) {
-      throw new Error(`requested RPC driver "${backendName}" is missing config`)
     }
-    let userDataDirectory: string | undefined = undefined
-    if (isElectron) {
-      // eslint-disable-next-line import/no-extraneous-dependencies
-      const { ipcRenderer }: typeof import('electron') = require('electron')
-      userDataDirectory = await ipcRenderer.invoke('userData')
+
+    if (!backendConfiguration) {
+      throw new Error(`requested RPC driver "${backendName}" is missing config`)
     }
+
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const newDriver = new DriverClassImpl(backendConfiguration as any, {
       plugins: this.pluginManager.runtimePluginDefinitions,
-      userData: userDataDirectory,
     })
     this.driverObjects.set(backendName, newDriver)
     return newDriver

diff --git a/packages/core/rpc/WebWorkerRpcDriver.ts b/packages/core/rpc/WebWorkerRpcDriver.ts
@@ -48,11 +48,11 @@ export default class WebWorkerRpcDriver extends BaseRpcDriver {
 
   WorkerClass: WebpackWorker
 
-  workerBootConfiguration: { plugins: PluginDefinition[]; userData?: string }
+  workerBootConfiguration: { plugins: PluginDefinition[] }
 
   constructor(
     args: WebWorkerRpcDriverConstructorArgs,
-    workerBootConfiguration: { plugins: PluginDefinition[]; userData?: string },
+    workerBootConfiguration: { plugins: PluginDefinition[] },
   ) {
     super(args)
     this.WorkerClass = args.WorkerClass