refactor: factor out worker info initialization

Signed-off-by: Jérôme Benoit <[email protected]>

Author: jerome-benoit

deno.json

@@ -3,9 +3,7 @@
   "version": "0.4.31",
   "exports": "./src/mod.ts",
   "compilerOptions": {
-    "lib": [
-      "deno.worker"
-    ],
+    "lib": ["deno.worker"],
     "strict": true
   },
   "tasks": {
@@ -26,9 +24,7 @@
     "documentation": "deno doc ./src/mod.ts"
   },
   "test": {
-    "include": [
-      "./tests/**/*.test.mjs"
-    ]
+    "include": ["./tests/**/*.test.mjs"]
   },
   "fmt": {
     "semiColons": false,
@@ -41,18 +37,8 @@
     "@std/testing": "jsr:@std/testing@^1.0.8"
   },
   "publish": {
-    "include": [
-      "LICENSE",
-      "README.md",
-      "deno.json",
-      "src/**/*.ts"
-    ]
+    "include": ["LICENSE", "README.md", "deno.json", "src/**/*.ts"]
   },
   "lock": false,
-  "exclude": [
-    "./coverage",
-    "./dist/browser",
-    "./dist/esm",
-    "./npm"
-  ]
+  "exclude": ["./coverage", "./dist/browser", "./dist/esm", "./npm"]
 }

src/pools/utils.ts

@@ -20,6 +20,7 @@ import {
   type IWorker,
   type IWorkerNode,
   type MeasurementStatistics,
+  type WorkerInfo,
   type WorkerNodeOptions,
   type WorkerType,
   WorkerTypes,
@@ -415,7 +416,7 @@ export const createWorker = <Worker extends IWorker>(
  * @returns The worker type of the given worker.
  * @internal
  */
-export const getWorkerType = (worker: IWorker): WorkerType | undefined => {
+const getWorkerType = (worker: IWorker): WorkerType | undefined => {
   if (worker instanceof Worker) {
     return WorkerTypes.web
   }
@@ -428,14 +429,28 @@ export const getWorkerType = (worker: IWorker): WorkerType | undefined => {
  * @returns The worker id of the given worker.
  * @internal
  */
-export const getWorkerId = (
+const getWorkerId = (
   worker: IWorker,
 ): `${string}-${string}-${string}-${string}-${string}` | undefined => {
   if (worker instanceof Worker) {
     return crypto.randomUUID()
   }
 }
 
+export const initWorkerInfo = (worker: IWorker): WorkerInfo => {
+  return {
+    backPressure: false,
+    backPressureStealing: false,
+    continuousStealing: false,
+    dynamic: false,
+    id: getWorkerId(worker),
+    ready: false,
+    stealing: false,
+    stolen: false,
+    type: getWorkerType(worker)!,
+  }
+}
+
 export const waitWorkerNodeEvents = async <
   Worker extends IWorker,
   Data = unknown,

src/pools/worker-node.ts

@@ -5,8 +5,7 @@ import { DEFAULT_TASK_NAME } from '../utils.ts'
 import {
   checkWorkerNodeArguments,
   createWorker,
-  getWorkerId,
-  getWorkerType,
+  initWorkerInfo,
 } from './utils.ts'
 import {
   type IWorker,
@@ -58,7 +57,7 @@ export class WorkerNode<Worker extends IWorker, Data = unknown>
     this.worker = createWorker<Worker>(type, fileURL, {
       workerOptions: opts.workerOptions,
     })
-    this.info = this.initWorkerInfo(this.worker)
+    this.info = initWorkerInfo(this.worker)
     this.usage = this.initWorkerUsage()
     this.messageChannel = new MessageChannel()
     this.messageChannel.port1.onmessage = (
@@ -197,20 +196,6 @@ export class WorkerNode<Worker extends IWorker, Data = unknown>
     }
   }
 
-  private initWorkerInfo(worker: Worker): WorkerInfo {
-    return {
-      id: getWorkerId(worker),
-      type: getWorkerType(worker)!,
-      dynamic: false,
-      ready: false,
-      stealing: false,
-      stolen: false,
-      continuousStealing: false,
-      backPressureStealing: false,
-      backPressure: false,
-    }
-  }
-
   private initWorkerUsage(): WorkerUsage {
     const getTasksQueueSize = (): number => {
       return this.tasksQueue.size

tests/pools/utils.test.mjs

@@ -7,8 +7,7 @@ import {
   DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
   exportedUpdateMeasurementStatistics,
   getDefaultTasksQueueOptions,
-  getWorkerId,
-  getWorkerType,
+  initWorkerInfo,
 } from '../../src/pools/utils.ts'
 import { MeasurementHistorySize } from '../../src/pools/worker.ts'
 
@@ -113,25 +112,25 @@ describe('Pool utils test suite', () => {
     worker.terminate()
   })
 
-  it('Verify getWorkerType() behavior', () => {
-    const worker = new Worker(
-      new URL('./../worker-files/thread/testWorker.mjs', import.meta.url),
-      {
-        type: 'module',
-      },
-    )
-    expect(getWorkerType(worker)).toBe(WorkerTypes.web)
-    worker.terminate()
-  })
-
-  it('Verify getWorkerId() behavior', () => {
-    const worker = new Worker(
+  it('Verify initWorkerInfo() behavior', () => {
+    const worker = createWorker(
+      WorkerTypes.web,
       new URL('./../worker-files/thread/testWorker.mjs', import.meta.url),
-      {
-        type: 'module',
-      },
+      {},
     )
-    expect(getWorkerId(worker)).toMatch(
+    const workerInfo = initWorkerInfo(worker)
+    expect(workerInfo).toStrictEqual({
+      backPressure: false,
+      backPressureStealing: false,
+      continuousStealing: false,
+      dynamic: false,
+      id: expect.any(String),
+      ready: false,
+      stealing: false,
+      stolen: false,
+      type: WorkerTypes.web,
+    })
+    expect(workerInfo.id).toMatch(
       /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/,
     )
     worker.terminate()