Skip to content

Commit

Permalink
Revert "Add "extendWorker" extension point"
Browse files Browse the repository at this point in the history
This reverts commit bd47559.
  • Loading branch information
garrettjstevens committed Sep 15, 2023
1 parent bd47559 commit 7560b2c
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions packages/core/rpc/BaseRpcDriver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,11 @@ class LazyWorker {

constructor(public driver: BaseRpcDriver) {}

async getWorker(pluginManager?: PluginManager) {
async getWorker() {
if (!this.workerP) {
if (!pluginManager) {
throw new Error("Can't make new worker without plugin manager")
}
this.workerP = this.driver
.makeWorker()
.then(unextendedWorker => {
const worker = pluginManager.evaluateExtensionPoint(
'Core-extendWorker',
unextendedWorker,
) as typeof unextendedWorker
.then(worker => {
watchWorker(worker, this.driver.maxPingTime, this.driver.name).catch(
error => {
if (worker) {
Expand Down Expand Up @@ -184,10 +177,7 @@ export default abstract class BaseRpcDriver {
return this.workerPool
}

async getWorker(
sessionId: string,
pluginManager?: PluginManager,
): Promise<WorkerHandle> {
async getWorker(sessionId: string): Promise<WorkerHandle> {
const workers = this.getWorkerPool()
let workerNumber = this.workerAssignments.get(sessionId)
if (workerNumber === undefined) {
Expand All @@ -197,7 +187,7 @@ export default abstract class BaseRpcDriver {
workerNumber = workerAssignment
}

return workers[workerNumber].getWorker(pluginManager)
return workers[workerNumber].getWorker()
}

async call(
Expand All @@ -211,7 +201,7 @@ export default abstract class BaseRpcDriver {
throw new TypeError('sessionId is required')
}
let done = false
const worker = await this.getWorker(sessionId, pluginManager)
const worker = await this.getWorker(sessionId)
const rpcMethod = pluginManager.getRpcMethodType(functionName)
const serializedArgs = await rpcMethod.serializeArguments(args, this.name)
const filteredAndSerializedArgs = this.filterArgs(serializedArgs, sessionId)
Expand Down

0 comments on commit 7560b2c

Please sign in to comment.