fix(browser): implement terminateWorker correctly

Author: targos

src/Ework.ts

@@ -5,6 +5,7 @@ import {
   makeWorkerCode,
   spawnWorker,
   addWorkerListener,
+  terminateWorker,
 } from './worker';
 
 export type Eworker<Input, Output> = (value: Input) => Output | Promise<Output>;
@@ -29,7 +30,7 @@ export interface IEworkOptions {
 type WorkerResolveFn<Output> = (result: Output) => void;
 type WorkerRejectFn = (reason: unknown) => void;
 
-interface IWorker<Input, Output> {
+export interface IWorker<Input, Output> {
   worker: Worker;
   isWorking: boolean;
   job: IWorkerJob<Input, Output> | null;
@@ -135,17 +136,7 @@ export class Ework<Input, Output> {
   }
 
   public async terminate(): Promise<void> {
-    await Promise.all(
-      this.workers.map(
-        (w) =>
-          new Promise((resolve) => {
-            w.worker.terminate(() => resolve());
-            if (w.job !== null) {
-              w.job.reject(new Error('worker terminated'));
-            }
-          }),
-      ),
-    );
+    await Promise.all(this.workers.map(terminateWorker));
     this.freeWorkers = 0;
     this.queue = [];
     this.workers = [];

src/index.ts

@@ -1 +1 @@
-export * from './Ework';
+export { Ework, Eworker, IEworkOptions } from './Ework';

src/worker.browser.ts

@@ -1,3 +1,5 @@
+import { IWorker } from './Ework';
+
 /* eslint-env browser */
 
 export const numCpus = navigator.hardwareConcurrency || 1;
@@ -8,6 +10,15 @@ export function spawnWorker(workerCode: string): Worker {
   return new Worker(url);
 }
 
+export function terminateWorker<Input, Output>(
+  worker: IWorker<Input, Output>,
+): void {
+  worker.worker.terminate();
+  if (worker.job !== null) {
+    worker.job.reject(new Error('worker terminated'));
+  }
+}
+
 export function addWorkerListener(
   worker: Worker,
   type: string,

src/worker.ts

@@ -2,6 +2,8 @@ import { cpus } from 'os';
 
 import { Worker } from 'worker_threads';
 
+import { IWorker } from './Ework';
+
 const cpuList = cpus();
 
 export const numCpus = cpuList ? cpuList.length : 1;
@@ -10,6 +12,17 @@ export function spawnWorker(workerCode: string): Worker {
   return new Worker(workerCode, { eval: true });
 }
 
+export function terminateWorker<Input, Output>(
+  worker: IWorker<Input, Output>,
+): Promise<void> {
+  return new Promise((resolve) => {
+    worker.worker.terminate(() => resolve());
+    if (worker.job !== null) {
+      worker.job.reject(new Error('worker terminated'));
+    }
+  });
+}
+
 export function addWorkerListener(
   worker: Worker,
   type: string,