refactor: move worker into worker file

src/core/execution/ExecutionManager.ts

@@ -20,8 +20,8 @@ import { DestroyerExecution } from "./DestroyerExecution";
 import { PortExecution } from "./PortExecution";
 import { MissileSiloExecution } from "./MissileSiloExecution";
 import { BattleshipExecution } from "./BattleshipExecution";
-import { AsyncPathFinderCreator } from "../pathfinding/AsyncPathFinding";
 import { PathFinder } from "../pathfinding/PathFinding";
+import { WorkerClient } from "../worker/WorkerClient";
 
 
 
@@ -32,7 +32,7 @@ export class Executor {
     // private random = new PseudoRandom(999)
     private random: PseudoRandom = null
 
-    constructor(private gs: Game, private difficulty: Difficulty, private gameID: GameID, private asyncPathFinder: AsyncPathFinderCreator) {
+    constructor(private gs: Game, private difficulty: Difficulty, private gameID: GameID, private workerClient: WorkerClient) {
         // Add one to avoid id collisions with bots.
         this.random = new PseudoRandom(simpleHash(gameID) + 1)
     }
@@ -94,7 +94,7 @@ export class Executor {
                     case UnitType.Battleship:
                         return new BattleshipExecution(intent.player, new Cell(intent.x, intent.y))
                     case UnitType.Port:
-                        return new PortExecution(intent.player, new Cell(intent.x, intent.y), this.asyncPathFinder)
+                        return new PortExecution(intent.player, new Cell(intent.x, intent.y), this.workerClient)
                     case UnitType.MissileSilo:
                         return new MissileSiloExecution(intent.player, new Cell(intent.x, intent.y))
                     default:
@@ -113,7 +113,7 @@ export class Executor {
         const execs = []
         for (const nation of this.gs.nations()) {
             execs.push(new FakeHumanExecution(
-                this.asyncPathFinder,
+                this.workerClient,
                 new PlayerInfo(
                     nation.name,
                     PlayerType.FakeHuman,

src/core/execution/FakeHumanExecution.ts

@@ -5,7 +5,7 @@ import { AttackExecution } from "./AttackExecution";
 import { TransportShipExecution } from "./TransportShipExecution";
 import { SpawnExecution } from "./SpawnExecution";
 import { PortExecution } from "./PortExecution";
-import { ParallelAStar, AsyncPathFinderCreator } from "../pathfinding/AsyncPathFinding";
+import { ParallelAStar, WorkerClient } from "../worker/WorkerClient";
 import { PathFinder } from "../pathfinding/PathFinding";
 
 export class FakeHumanExecution implements Execution {
@@ -23,7 +23,7 @@ export class FakeHumanExecution implements Execution {
 
     private relations = new Map<Player, number>()
 
-    constructor(private asyncPathFinder: AsyncPathFinderCreator, private playerInfo: PlayerInfo, private cell: Cell, private strength: number) {
+    constructor(private worker: WorkerClient, private playerInfo: PlayerInfo, private cell: Cell, private strength: number) {
         this.random = new PseudoRandom(simpleHash(playerInfo.id))
     }
 
@@ -153,7 +153,7 @@ export class FakeHumanExecution implements Execution {
             const oceanTiles = Array.from(this.player.borderTiles()).filter(t => t.isOceanShore())
             if (oceanTiles.length > 0) {
                 const buildTile = this.random.randElement(oceanTiles)
-                this.mg.addExecution(new PortExecution(this.player.id(), buildTile.cell(), this.asyncPathFinder))
+                this.mg.addExecution(new PortExecution(this.player.id(), buildTile.cell(), this.worker))
             }
         }
     }

src/core/execution/PortExecution.ts

@@ -5,7 +5,7 @@ import { SerialAStar } from "../pathfinding/SerialAStar";
 import { PseudoRandom } from "../PseudoRandom";
 import { bfs, dist, manhattanDist } from "../Util";
 import { TradeShipExecution } from "./TradeShipExecution";
-import { ParallelAStar, AsyncPathFinderCreator } from "../pathfinding/AsyncPathFinding";
+import { ParallelAStar, WorkerClient } from "../worker/WorkerClient";
 
 export class PortExecution implements Execution {
 
@@ -19,7 +19,7 @@ export class PortExecution implements Execution {
     constructor(
         private _owner: PlayerID,
         private cell: Cell,
-        private asyncPathFinderCreator: AsyncPathFinderCreator
+        private worker: WorkerClient
     ) { }
 
 
@@ -78,7 +78,7 @@ export class PortExecution implements Execution {
                 }
                 continue
             }
-            const asyncPF = this.asyncPathFinderCreator.createParallelAStar(this.port.tile(), port.tile(), 100)
+            const asyncPF = this.worker.createParallelAStar(this.port.tile(), port.tile(), 100)
             // console.log(`adding new port path from ${this.player().name()}:${this.port.tile().cell()} to ${port.owner().name()}:${port.tile().cell()}`)
             this.computingPaths.set(port, asyncPF)
         }
@@ -96,7 +96,7 @@ export class PortExecution implements Execution {
             const port = this.random.randElement(portConnections)
             const path = this.portPaths.get(port)
             if (path != null) {
-                const pf = PathFinder.Parallel(this.asyncPathFinderCreator, 30)
+                const pf = PathFinder.Parallel(this.worker, 30)
                 this.mg.addExecution(new TradeShipExecution(this.player().id(), this.port, port, pf, path))
             }
         }

src/core/execution/TradeShipExecution.ts

@@ -6,7 +6,6 @@ import { PathFindResultType } from "../pathfinding/AStar";
 import { SerialAStar } from "../pathfinding/SerialAStar";
 import { PseudoRandom } from "../PseudoRandom";
 import { bfs, dist, distSortUnit, manhattanDist } from "../Util";
-import { AsyncPathFinderCreator } from "../pathfinding/AsyncPathFinding";
 
 export class TradeShipExecution implements Execution {