@xylabs/threads 4.7.0 → 4.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xylabs/threads",
-  "version": "4.7.0",
+  "version": "4.7.1",
   "description": "Web workers & worker threads as simple as a function call",
   "keywords": [
     "thread",
@@ -29,88 +29,85 @@
     "./register.*js",
     "./worker.*js"
   ],
-  "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/index.d.ts",
-      "import": "./dist/neutral/index.mjs",
-      "default": "./dist/neutral/index.mjs"
-    },
-    "./implementation": {
-      "browser": {
-        "types": "./dist/types/master/implementation.browser.d.ts",
-        "import": "./dist/browser/master/implementation.browser.mjs",
-        "default": "./dist/browser/master/implementation.browser.mjs"
-      },
-      "node": {
-        "types": "./dist/types/master/implementation.node.d.ts",
-        "import": "./dist/node/master/implementation.node.mjs",
-        "default": "./dist/node/master/implementation.node.mjs"
-      },
-      "types": "./dist/types/master/implementation.d.ts",
-      "import": "./dist/neutral/master/implementation.mjs",
-      "default": "./dist/neutral/master/implementation.mjs"
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js",
+      "import": "./dist/esm/index.js",
+      "default": "./dist/esm/index.js"
     },
     "./master": {
-      "types": "./dist/types/master/index.d.ts",
-      "import": "./dist/neutral/master/index.mjs",
-      "default": "./dist/neutral/master/index.mjs"
-    },
-    "./spawn": {
-      "types": "./dist/types/master/spawn.d.ts",
-      "import": "./dist/neutral/master/spawn.mjs",
-      "default": "./dist/neutral/master/spawn.mjs"
-    },
-    "./thread": {
-      "types": "./dist/types/master/thread.d.ts",
-      "import": "./dist/neutral/master/thread.mjs",
-      "default": "./dist/neutral/master/thread.mjs"
+      "types": "./dist/types/master.d.ts",
+      "require": "./dist/master.js",
+      "import": "./dist/esm/master.js",
+      "default": "./dist/esm/master.js"
     },
     "./messenger": {
-      "types": "./dist/types/types/messages.d.ts"
+      "types": "./dist/types/messenger.d.ts"
     },
     "./observable": {
-      "types": "./dist/types/observable.d.ts",
-      "import": "./dist/neutral/observable.mjs",
-      "default": "./dist/neutral/observable.mjs"
-    },
-    "./pool": {
-      "types": "./dist/types/master/pool.d.ts",
-      "import": "./dist/neutral/master/pool.mjs",
-      "default": "./dist/neutral/master/pool.mjs"
-    },
-    "./observable-promise": {
-      "types": "./dist/types/observable-promise.d.ts",
-      "import": "./dist/neutral/observable-promise.mjs",
-      "default": "./dist/neutral/observable-promise.mjs"
+      "types": "./dist/observable.d.ts",
+      "require": "./dist/observable.js",
+      "import": "./dist/esm/observable.js",
+      "default": "./dist/esm/observable.js"
     },
     "./register": {
-      "types": "./dist/types/master/register.d.ts",
-      "import": "./dist/neutral/master/register.mjs",
-      "default": "./dist/neutral/master/register.mjs"
+      "types": "./dist/master/register.d.ts",
+      "require": "./dist/master/register/index.js",
+      "import": "./dist/esm/master/register/index.js",
+      "default": "./dist/esm/master/register/index.js"
     },
     "./worker": {
-      "browser": {
-        "types": "./dist/types/worker/worker.browser.d.ts",
-        "import": "./dist/browser/worker/worker.browser.mjs",
-        "default": "./dist/browser/worker/worker.browser.mjs"
-      },
-      "node": {
-        "types": "./dist/types/worker/worker.node.d.ts",
-        "import": "./dist/node/worker/worker.node.mjs",
-        "default": "./dist/node/worker/worker.node.mjs"
-      }
+      "types": "./dist/types/worker.d.ts",
+      "require": "./dist/worker/index.js",
+      "import": "./dist/esm/worker/index.js",
+      "default": "./dist/esm/worker/index.js"
     }
   },
-  "main": "dist/neutral/index.mjs",
-  "module": "dist/neutral/index.mjs",
-  "types": "dist/types/index.d.ts",
+  "main": "dist/index.js",
+  "module": "dist/esm/index.js",
+  "browser": {
+    "./dist/esm/master/implementation.js": "./dist/esm/master/implementation.browser.js",
+    "./dist/esm/master/implementation.node.js": false,
+    "./dist/esm/worker/implementation.js": "./dist/esm/worker/implementation.browser.js",
+    "./dist/esm/worker/implementation.tiny-worker.js": false,
+    "./dist/esm/worker/implementation.worker_threads.js": false,
+    "./dist/master/implementation.js": "./dist/master/implementation.browser.js",
+    "./dist/master/implementation.node.js": false,
+    "./dist/worker/implementation.js": "./dist/worker/implementation.browser.js",
+    "./dist/worker/implementation.tiny-worker.js": false,
+    "./dist/worker/implementation.worker_threads.js": false,
+    "callsites": false,
+    "tiny-worker": false,
+    "ts-node": false,
+    "ts-node/register": false,
+    "worker_threads": false
+  },
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**",
     "*.js",
     "*.mjs",
     "*.ts"
   ],
+  "scripts": {
+    "build-threads": "yarn clean && yarn build:cjs && yarn build:es",
+    "build:cjs": "tsc -p tsconfig.json",
+    "build:es": "tsc -p tsconfig-esm.json",
+    "bundle": "rollup -c -f umd --file=bundle/worker.js --name=threads --silent -- dist/esm/worker/bundle-entry.js",
+    "clean": "rimraf ./dist ./dist-esm",
+    "dev": "yarn clean && tsc -p tsconfig.json --watch",
+    "package-build": "echo BUILD && yarn build-threads && echo BUILD_DONE",
+    "package-compile": "echo COMPILE && yarn build-threads && echo COMPILE_DONE",
+    "package-publint": "echo Skipping Publint - @xylabs/threads",
+    "postbuild": "yarn bundle",
+    "prepare": "yarn build-threads",
+    "test": "yarn test:library && yarn test:tooling && yarn test:puppeteer:basic && yarn test:puppeteer:webpack",
+    "test:library": "cross-env TS_NODE_FILES=true vitest ./test/**/*.test.ts",
+    "test:puppeteer:basic": "puppet-run --plugin=mocha --bundle=./test/workers/:workers/ --serve=./bundle/worker.js:/worker.js ./test/*.chromium*.ts",
+    "test:puppeteer:webpack": "puppet-run --serve ./test-tooling/webpack/dist/app.web/0.worker.js --serve ./test-tooling/webpack/dist/app.web/1.worker.js --plugin=mocha ./test-tooling/webpack/webpack.chromium.mocha.ts",
+    "test:tooling": "cross-env TS_NODE_FILES=true vitest ./test-tooling/**/*.test.ts"
+  },
   "ava": {
     "extensions": [
       "ts"
@@ -125,16 +122,30 @@
     "serial": true
   },
   "dependencies": {
+    "callsites-3-1-0": "npm:callsites@3.1.0",
     "debug": "^4.4.0",
     "is-observable-2-1-0": "npm:is-observable@2.1.0",
     "observable-fns": "^0.6.1"
   },
   "devDependencies": {
+    "@babel/types": "^7.26.10",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-node-resolve": "^16.0.1",
     "@types/debug": "^4.1.12",
     "@types/node": "^22.13.10",
-    "@xylabs/eslint-config-flat": "^6.1.4",
-    "@xylabs/ts-scripts-yarn3": "^6.1.4",
-    "typescript": "^5.8.2"
+    "@xylabs/eslint-config-flat": "^6.1.3",
+    "@xylabs/ts-scripts-yarn3": "^6.1.3",
+    "cross-env": "^7.0.3",
+    "puppet-run": "^0.11.4",
+    "raw-loader": "^4.0.2",
+    "rimraf": "^6.0.1",
+    "rollup": "^4.36.0",
+    "threads-plugin": "^1.4.0",
+    "tiny-worker": "^2.3.0",
+    "tslib": "^2.8.1",
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.9",
+    "webpack": "^5.98.0"
   },
   "optionalDependencies": {
     "tiny-worker": "^2.3.0"

package/register.d.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line import-x/no-internal-modules
+export * from './dist/master/register'

package/register.js

@@ -0,0 +1,2 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
+require('./dist/master/register')

package/register.mjs

@@ -0,0 +1 @@
+import './dist/master/register.js'

package/rollup.config.js

@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
+const commonjs = require('@rollup/plugin-commonjs')
+/* eslint-disable @typescript-eslint/no-require-imports */
+const { nodeResolve } = require('@rollup/plugin-node-resolve')
+
+module.exports = {
+  plugins: [
+    nodeResolve({
+      browser: true,
+      mainFields: ['module', 'main'],
+      preferBuiltins: true,
+    }),
+
+    commonjs(),
+  ],
+}

package/src/common.ts

@@ -1,23 +1,19 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type {
   JsonSerializable, Serializer, SerializerImplementation,
-} from './serializers.ts'
-import { DefaultSerializer, extendSerializer } from './serializers.ts'
+} from './serializers'
+import { DefaultSerializer, extendSerializer } from './serializers'
 
-declare global {
-  var registeredSerializer: Serializer<JsonSerializable>
-}
-
-globalThis.registeredSerializer = globalThis.registeredSerializer ?? DefaultSerializer
+let registeredSerializer: Serializer<JsonSerializable> = DefaultSerializer
 
 export function registerSerializer(serializer: SerializerImplementation<JsonSerializable>) {
-  globalThis.registeredSerializer = extendSerializer(globalThis.registeredSerializer, serializer)
+  registeredSerializer = extendSerializer(registeredSerializer, serializer)
 }
 
 export function deserialize(message: JsonSerializable): any {
-  return globalThis.registeredSerializer.deserialize(message)
+  return registeredSerializer.deserialize(message)
 }
 
 export function serialize(input: any): JsonSerializable {
-  return globalThis.registeredSerializer.serialize(input)
+  return registeredSerializer.serialize(input)
 }

package/src/index.ts

@@ -1,11 +1,10 @@
 /* eslint-disable import-x/no-internal-modules */
-export { registerSerializer } from './common.ts'
-export * from './master/index.ts'
-export type { QueuedTask } from './master/pool.ts'
-export type { ExposedToThreadType as ExposedAs } from './master/spawn.ts'
-export type {
-  JsonSerializable, Serializer, SerializerImplementation,
-} from './serializers.ts'
-export { DefaultSerializer } from './serializers.ts'
-export type { TransferDescriptor } from './transferable.ts'
-export { Transfer } from './transferable.ts'
+export { registerSerializer } from './common'
+export * from './master/index'
+export { QueuedTask } from './master/pool'
+export { ExposedToThreadType as ExposedAs } from './master/spawn'
+export {
+  DefaultSerializer, JsonSerializable, Serializer, SerializerImplementation,
+} from './serializers'
+export { Transfer, TransferDescriptor } from './transferable'
+export { expose } from './worker/index'

package/src/master/get-bundle-url.browser.ts

@@ -14,8 +14,7 @@ function getBundleURL(): string {
   // Attempt to find the URL of the current script and use that as the base URL
   try {
     throw new Error('getBundleURL failed')
-  } catch (ex) {
-    const err = ex as Error
+  } catch (err) {
     const matches = ('' + err.stack).match(/(https?|file|ftp|chrome-extension|moz-extension):\/\/[^\n)]+/g)
     if (matches) {
       return getBaseURL(matches[0])

package/src/master/implementation.browser.ts

@@ -2,8 +2,8 @@
 /* eslint-disable import-x/no-internal-modules */
 // tslint:disable max-classes-per-file
 
-import type { ImplementationExport, ThreadsWorkerOptions } from '../types/master.ts'
-import { getBundleURL } from './get-bundle-url.browser.ts'
+import type { ImplementationExport, ThreadsWorkerOptions } from '../types/master'
+import { getBundleURL } from './get-bundle-url.browser'
 
 export const defaultPoolSize = typeof navigator !== 'undefined' && navigator.hardwareConcurrency ? navigator.hardwareConcurrency : 4
 

package/src/master/implementation.node.ts

@@ -1,50 +1,123 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
+/* eslint-disable import-x/no-internal-modules */
+/* eslint-disable unicorn/no-process-exit */
+/* eslint-disable unicorn/prefer-logical-operator-over-ternary */
+/* eslint-disable unicorn/prefer-regexp-test */
 
 /* eslint-disable unicorn/prefer-add-event-listener */
 /* eslint-disable unicorn/prefer-event-target */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable unicorn/text-encoding-identifier-case */
+/// <reference lib="dom" />
 
 import { EventEmitter } from 'node:events'
 import { cpus } from 'node:os'
 import path from 'node:path'
-import { cwd } from 'node:process'
-import { Worker as NativeWorker } from 'node:worker_threads'
+import { fileURLToPath } from 'node:url'
+
+import type { CallSite } from 'callsites-3-1-0'
+import getCallsites from 'callsites-3-1-0'
 
 import type {
   ImplementationExport, ThreadsWorkerOptions, WorkerImplementation,
-// eslint-disable-next-line import-x/no-internal-modules
-} from '../types/master.ts'
+} from '../types/master'
+
+interface WorkerGlobalScope {
+  addEventListener(eventName: string, listener: (event: Event) => void): void
+  postMessage(message: any, transferables?: any[]): void
+  removeEventListener(eventName: string, listener: (event: Event) => void): void
+}
 
 declare const __non_webpack_require__: typeof require
+declare const self: WorkerGlobalScope
 
 type WorkerEventName = 'error' | 'message'
 
+let tsNodeAvailable: boolean | undefined
+
 export const defaultPoolSize = cpus().length
 
+function detectTsNode() {
+  if (typeof __non_webpack_require__ === 'function') {
+    // Webpack build: => No ts-node required or possible
+    return false
+  }
+  if (tsNodeAvailable) {
+    return tsNodeAvailable
+  }
+
+  try {
+    eval('require').resolve('ts-node')
+    tsNodeAvailable = true
+  } catch (error) {
+    if (error && error.code === 'MODULE_NOT_FOUND') {
+      tsNodeAvailable = false
+    } else {
+      // Re-throw
+      throw error
+    }
+  }
+  return tsNodeAvailable
+}
+
+function createTsNodeModule(scriptPath: string) {
+  return `
+    require("ts-node/register/transpile-only");
+    require(${JSON.stringify(scriptPath)});
+  `
+}
+
+function rebaseScriptPath(scriptPath: string, ignoreRegex: RegExp) {
+  const parentCallSite = getCallsites().find((callsite: CallSite) => {
+    const filename = callsite.getFileName()
+    return Boolean(
+      filename && !filename.match(ignoreRegex) && !/[/\\]master[/\\]implementation/.test(filename) && !/^internal\/process/.test(filename),
+    )
+  })
+
+  const rawCallerPath = parentCallSite ? parentCallSite.getFileName() : null
+  let callerPath = rawCallerPath ? rawCallerPath : null
+  if (callerPath && callerPath.startsWith('file:')) {
+    callerPath = fileURLToPath(callerPath)
+  }
+  return callerPath ? path.join(path.dirname(callerPath), scriptPath) : scriptPath
+}
+
 function resolveScriptPath(scriptPath: string, baseURL?: string | undefined) {
-  const makeAbsolute = (filePath: string) => {
-    return path.isAbsolute(filePath) ? filePath : path.join(baseURL ?? cwd(), filePath)
+  const makeRelative = (filePath: string) => {
+    // eval() hack is also webpack-related
+    return path.isAbsolute(filePath) ? filePath : path.join(baseURL || eval('__dirname'), filePath)
   }
 
-  const absolutePath = makeAbsolute(scriptPath)
-  return absolutePath
+  return typeof __non_webpack_require__ === 'function'
+    ? __non_webpack_require__.resolve(makeRelative(scriptPath))
+    : eval('require').resolve(makeRelative(rebaseScriptPath(scriptPath, /[/\\]worker_threads[/\\]/)))
 }
 
 function initWorkerThreadsWorker(): ImplementationExport {
-  let allWorkers: Array<NativeWorker> = []
+  // Webpack hack
+  const NativeWorker
+    = typeof __non_webpack_require__ === 'function' ? __non_webpack_require__('worker_threads').Worker : eval('require')('worker_threads').Worker
+
+  let allWorkers: Array<typeof NativeWorker> = []
 
   class Worker extends NativeWorker {
     private mappedEventListeners: WeakMap<EventListener, EventListener>
 
     constructor(scriptPath: string, options?: ThreadsWorkerOptions & { fromSource: boolean }) {
-      const resolvedScriptPath = options && options.fromSource ? null : resolveScriptPath(scriptPath, (options ?? {})._baseURL)
-      if (resolvedScriptPath) {
-        super(resolvedScriptPath, options)
-      } else {
+      const resolvedScriptPath = options && options.fromSource ? null : resolveScriptPath(scriptPath, (options || {})._baseURL)
+
+      if (!resolvedScriptPath) {
         // `options.fromSource` is true
         const sourceCode = scriptPath
         super(sourceCode, { ...options, eval: true })
+      } else if (/\.tsx?$/i.test(resolvedScriptPath) && detectTsNode()) {
+        super(createTsNodeModule(resolvedScriptPath), { ...options, eval: true })
+      } else if (/\.asar[/\\]/.test(resolvedScriptPath)) {
+        // See <https://github.com/andywer/threads-plugin/issues/17>
+        super(resolvedScriptPath.replace(/\.asar([/\\])/, '.asar.unpacked$1'), options)
+      } else {
+        super(resolvedScriptPath, options)
       }
 
       this.mappedEventListeners = new WeakMap()
@@ -112,12 +185,17 @@ function initTinyWorker(): ImplementationExport {
             ? `file:///${resolveScriptPath(scriptPath).replaceAll('\\', '/')}`
             : resolveScriptPath(scriptPath)
 
-      if (resolvedScriptPath) {
-        super(resolvedScriptPath, [], { esm: true })
-      } else {
+      if (!resolvedScriptPath) {
         // `options.fromSource` is true
         const sourceCode = scriptPath
         super(new Function(sourceCode), [], { esm: true })
+      } else if (/\.tsx?$/i.test(resolvedScriptPath) && detectTsNode()) {
+        super(new Function(createTsNodeModule(resolveScriptPath(scriptPath))), [], { esm: true })
+      } else if (/\.asar[/\\]/.test(resolvedScriptPath)) {
+        // See <https://github.com/andywer/threads-plugin/issues/17>
+        super(resolvedScriptPath.replace(/\.asar([/\\])/, '.asar.unpacked$1'), [], { esm: true })
+      } else {
+        super(resolvedScriptPath, [], { esm: true })
       }
 
       allWorkers.push(this)
@@ -178,8 +256,7 @@ function selectWorkerImplementation(): ImplementationExport {
   try {
     isTinyWorker = false
     return initWorkerThreadsWorker()
-  } catch (ex) {
-    console.error(ex)
+  } catch {
     // tslint:disable-next-line no-console
     console.debug('Node worker_threads not available. Trying to fall back to tiny-worker polyfill...')
     isTinyWorker = true
@@ -196,7 +273,7 @@ export function getWorkerImplementation(): ImplementationExport {
 
 export function isWorkerRuntime() {
   if (isTinyWorker) {
-    return globalThis !== undefined && self['postMessage'] ? true : false
+    return self !== undefined && self['postMessage'] ? true : false
   } else {
     // Webpack hack
     const isMainThread

package/src/master/implementation.ts

@@ -6,8 +6,8 @@
 // browsers already in the package.json, so if get here, it's safe to pass-through the
 // node implementation
 
-import * as BrowserImplementation from './implementation.browser.ts'
-import * as NodeImplementation from './implementation.node.ts'
+import * as BrowserImplementation from './implementation.browser'
+import * as NodeImplementation from './implementation.node'
 
 const runningInNode = typeof process !== 'undefined' && (process.arch as string) !== 'browser' && 'pid' in process
 const implementation = runningInNode ? NodeImplementation : BrowserImplementation

package/src/master/index.ts

@@ -1,11 +1,11 @@
 /* eslint-disable import-x/no-internal-modules */
-import type { BlobWorker as BlobWorkerClass, Worker as WorkerType } from '../types/master.ts'
-import { getWorkerImplementation } from './implementation.ts'
+import type { BlobWorker as BlobWorkerClass, Worker as WorkerType } from '../types/master'
+import { getWorkerImplementation } from './implementation'
 
-export type { FunctionThread, ModuleThread } from '../types/master.ts'
-export { Pool } from './pool.ts'
-export { spawn } from './spawn.ts'
-export { Thread } from './thread.ts'
+export { FunctionThread, ModuleThread } from '../types/master'
+export { Pool } from './pool'
+export { spawn } from './spawn'
+export { Thread } from './thread'
 
 export type BlobWorker = typeof BlobWorkerClass
 export type Worker = WorkerType
@@ -16,4 +16,4 @@ export const BlobWorker = getWorkerImplementation().blob
 /** Worker implementation. Either web worker or a node.js Worker class. */
 export const Worker = getWorkerImplementation().default
 
-export { isWorkerRuntime } from './implementation.ts'
+export { isWorkerRuntime } from './implementation'

package/src/master/invocation-proxy.ts

@@ -10,23 +10,23 @@
 import DebugLogger from 'debug'
 import { multicast, Observable } from 'observable-fns'
 
-import { deserialize, serialize } from '../common.ts'
-import { ObservablePromise } from '../observable-promise.ts'
-import { isTransferDescriptor } from '../transferable.ts'
+import { deserialize, serialize } from '../common'
+import { ObservablePromise } from '../observable-promise'
+import { isTransferDescriptor } from '../transferable'
 import type {
   ModuleMethods, ModuleProxy, ProxyableFunction, Worker as WorkerType,
-} from '../types/master.ts'
+} from '../types/master'
 import type {
   MasterJobCancelMessage,
   MasterJobRunMessage,
   WorkerJobErrorMessage,
   WorkerJobResultMessage,
   WorkerJobStartMessage,
-} from '../types/messages.ts'
+} from '../types/messages'
 import {
   MasterMessageType,
   WorkerMessageType,
-} from '../types/messages.ts'
+} from '../types/messages'
 
 const debugMessages = DebugLogger('threads:master:messages')
 

package/src/master/pool-types.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/member-ordering */
-import type { Thread } from './thread.ts'
+import type { Thread } from './thread'
 
 /** Pool event type. Specifies the type of each `PoolEvent`. */
 export enum PoolEventType {

package/src/master/pool.ts

@@ -1,25 +1,24 @@
 /* eslint-disable import-x/export */
 /* eslint-disable unicorn/no-thenable */
 
+/* eslint-disable require-await */
 /* eslint-disable @typescript-eslint/member-ordering */
 /* eslint-disable unicorn/no-array-reduce */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-namespace */
-
-/// <reference lib="esnext" />
-
+/* eslint-disable @typescript-eslint/no-floating-promises */
 import DebugLogger from 'debug'
 import {
   multicast, Observable, Subject,
 } from 'observable-fns'
 
-import { allSettled } from '../ponyfills.ts'
-import { defaultPoolSize } from './implementation.ts'
+import { allSettled } from '../ponyfills'
+import { defaultPoolSize } from './implementation'
 import type {
   PoolEvent, QueuedTask, TaskRunFunction, WorkerDescriptor,
-} from './pool-types.ts'
-import { PoolEventType } from './pool-types.ts'
-import { Thread } from './thread.ts'
+} from './pool-types'
+import { PoolEventType } from './pool-types'
+import { Thread } from './thread'
 
 export declare namespace Pool {
   type Event<ThreadType extends Thread = any> = PoolEvent<ThreadType>
@@ -178,8 +177,7 @@ class WorkerPool<ThreadType extends Thread> implements Pool<ThreadType> {
         type: PoolEventType.taskCompleted,
         workerID,
       })
-    } catch (ex) {
-      const error = ex as Error
+    } catch (error) {
       this.debug(`Task #${task.id} failed`)
       this.eventSubject.next({
         error,
@@ -190,7 +188,7 @@ class WorkerPool<ThreadType extends Thread> implements Pool<ThreadType> {
     }
   }
 
-  private run(worker: WorkerDescriptor<ThreadType>, task: QueuedTask<ThreadType, any>) {
+  private async run(worker: WorkerDescriptor<ThreadType>, task: QueuedTask<ThreadType, any>) {
     const runPromise = (async () => {
       const removeTaskFromWorkersRunningTasks = () => {
         worker.runningTasks = worker.runningTasks.filter(someRunPromise => someRunPromise !== runPromise)
@@ -395,6 +393,7 @@ function PoolConstructor<ThreadType extends Thread>(spawnWorker: () => Promise<T
  */
 export const Pool = PoolConstructor as typeof PoolConstructor & { EventType: typeof PoolEventType }
 
-export type { PoolEvent, QueuedTask } from './pool-types.ts'
-export { PoolEventType } from './pool-types.ts'
-export { Thread } from './thread.ts'
+export {
+  PoolEvent, PoolEventType, QueuedTask,
+} from './pool-types'
+export { Thread } from './thread'

package/src/master/register.ts

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-// eslint-disable-next-line no-restricted-imports
-import { Worker as WorkerImplementation } from './index.ts'
+import { Worker as WorkerImplementation } from './index'
 
 declare const window: any