Merge branch 'master' of github.com:poolifier/poolifier-web-worker

jerome-benoit · jerome-benoit · commit 2cca7b7d9f15 · 2025-08-21T22:11:49.000+02:00
diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "0.5.10"
+  ".": "0.5.11"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.5.11](https://github.com/poolifier/poolifier-web-worker/compare/v0.5.10...v0.5.11) (2025-08-21)
+
+### 🐞 Bug Fixes
+
+- properly account strategy retries on a per strategy basis
+  ([98b3742](https://github.com/poolifier/poolifier-web-worker/commit/98b37420072677775c275538daa06e702a10ae89))
+
+### ⚡ Performance
+
+- reduce pool info property internal usage
+  ([3c7ad6e](https://github.com/poolifier/poolifier-web-worker/commit/3c7ad6eea40e41eaacb9981b73b62453730d3f38))
+
 ## [0.5.10](https://github.com/poolifier/poolifier-web-worker/compare/v0.5.9...v0.5.10) (2025-08-20)
 
 ### 🐞 Bug Fixes
diff --git a/README.md b/README.md
@@ -149,7 +149,7 @@ for more details**:
 <!-- deno-fmt-ignore -->
 
 ```js
-<script type="module">import { ThreadWorker } from 'https://cdn.jsdelivr.net/npm/poolifier-web-worker@0.5.10/browser/mod.js'</script>
+<script type="module">import { ThreadWorker } from 'https://cdn.jsdelivr.net/npm/poolifier-web-worker@0.5.11/browser/mod.js'</script>
 ```
 
 ```js
@@ -159,7 +159,7 @@ import {
   DynamicThreadPool,
   FixedThreadPool,
   PoolEvents,
-} from 'https://cdn.jsdelivr.net/npm/poolifier-web-worker@0.5.10/browser/mod.js'
+} from 'https://cdn.jsdelivr.net/npm/poolifier-web-worker@0.5.11/browser/mod.js'
 </script>
 ```
 
diff --git a/deno.json b/deno.json
@@ -1,6 +1,6 @@
 {
   "name": "@poolifier/poolifier-web-worker",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "exports": "./src/mod.ts",
   "compilerOptions": {
     "lib": [
diff --git a/dist/package.json b/dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poolifier-web-worker",
-  "version": "0.5.10",
+  "version": "0.5.11",
   "description": "poolifier-web-worker",
   "repository": {
     "type": "git",
diff --git a/examples/deno/javascript/dynamicExample.js b/examples/deno/javascript/dynamicExample.js
@@ -2,7 +2,7 @@ import {
   availableParallelism,
   DynamicThreadPool,
   PoolEvents,
-} from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+} from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 const pool = new DynamicThreadPool(
   Math.floor(availableParallelism() / 2),
diff --git a/examples/deno/javascript/fixedExample.js b/examples/deno/javascript/fixedExample.js
@@ -2,7 +2,7 @@ import {
   availableParallelism,
   FixedThreadPool,
   PoolEvents,
-} from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+} from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 const pool = new FixedThreadPool(
   availableParallelism(),
diff --git a/examples/deno/javascript/multiFunctionExample.js b/examples/deno/javascript/multiFunctionExample.js
@@ -1,7 +1,7 @@
 import {
   availableParallelism,
   FixedThreadPool,
-} from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+} from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 const pool = new FixedThreadPool(
   availableParallelism(),
diff --git a/examples/deno/javascript/multiFunctionWorker.js b/examples/deno/javascript/multiFunctionWorker.js
@@ -1,4 +1,4 @@
-import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 function fn0(data) {
   console.info('Executing fn0')
diff --git a/examples/deno/javascript/yourWorker.js b/examples/deno/javascript/yourWorker.js
@@ -1,4 +1,4 @@
-import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 function yourFunction() {
   for (let i = 0; i <= 1000; i++) {
diff --git a/examples/deno/typescript/pool.ts b/examples/deno/typescript/pool.ts
@@ -2,7 +2,7 @@ import {
   availableParallelism,
   DynamicThreadPool,
   FixedThreadPool,
-} from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+} from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 import type { MyData, MyResponse } from './worker.ts'
 
 const workerFileURL = new URL('./worker.ts', import.meta.url)
diff --git a/examples/deno/typescript/worker.ts b/examples/deno/typescript/worker.ts
@@ -1,4 +1,4 @@
-import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version
+import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version
 
 export interface MyData {
   ok: 0 | 1
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -3,7 +3,7 @@ sonar.organization=poolifier
 sonar.typescript.lcov.reportPaths=coverage/lcov.info
 sonar.projectName=poolifier-web-worker
 # x-release-please-start-version
-sonar.projectVersion=0.5.10
+sonar.projectVersion=0.5.11
 # x-release-please-end
 sonar.host.url=https://sonarcloud.io
 sonar.sources=src
diff --git a/src/pools/abstract-pool.ts b/src/pools/abstract-pool.ts
@@ -309,7 +309,8 @@ export abstract class AbstractPool<
       started: this.started,
       ready: this.ready,
       defaultStrategy: this.opts.workerChoiceStrategy!,
-      strategyRetries: this.workerChoiceStrategiesContext?.retriesCount ?? 0,
+      strategyRetries:
+        this.workerChoiceStrategiesContext?.getStrategyRetries() ?? 0,
       minSize: this.minimumNumberOfWorkers,
       maxSize: this.maximumNumberOfWorkers ?? this.minimumNumberOfWorkers,
       ...(taskStatisticsRequirements?.runTime.aggregate === true &&
@@ -358,18 +359,8 @@ export abstract class AbstractPool<
               : accumulator,
           0,
         ),
-        stealingWorkerNodes: this.workerNodes.reduce(
-          (accumulator, _, workerNodeKey) =>
-            this.isWorkerNodeStealing(workerNodeKey)
-              ? accumulator + 1
-              : accumulator,
-          0,
-        ),
-        queuedTasks: this.workerNodes.reduce(
-          (accumulator, workerNode) =>
-            accumulator + workerNode.usage.tasks.queued,
-          0,
-        ),
+        stealingWorkerNodes: this.getStealingWorkerNodes(),
+        queuedTasks: this.getQueuedTasks(),
         maxQueuedTasks: this.workerNodes.reduce(
           (accumulator, workerNode) =>
             accumulator + (workerNode.usage.tasks.maxQueued ?? 0),
@@ -852,6 +843,9 @@ export abstract class AbstractPool<
     message: MessageValue<Data>,
   ): Promise<boolean> {
     const targetWorkerNodeKeys = [...this.workerNodes.keys()]
+    if (targetWorkerNodeKeys.length === 0) {
+      return true
+    }
     const responsesReceived: MessageValue<Response>[] = []
     const taskFunctionOperationsListener = (
       message: MessageValue<Response>,
@@ -1002,6 +996,22 @@ export abstract class AbstractPool<
       : new Error(`Task '${taskName}' id '${taskId}' aborted`)
   }
 
+  private getQueuedTasks(): number {
+    return this.workerNodes.reduce((accumulator, workerNode) => {
+      return accumulator + workerNode.usage.tasks.queued
+    }, 0)
+  }
+
+  private getStealingWorkerNodes(): number {
+    return this.workerNodes.reduce(
+      (accumulator, _, workerNodeKey) =>
+        this.isWorkerNodeStealing(workerNodeKey)
+          ? accumulator + 1
+          : accumulator,
+      0,
+    )
+  }
+
   /**
    * Gets task function worker choice strategy, if any.
    *
@@ -1827,7 +1837,7 @@ export abstract class AbstractPool<
       !this.started ||
       this.destroying ||
       this.workerNodes.length <= 1 ||
-      this.info.queuedTasks === 0
+      this.getQueuedTasks() === 0
     )
   }
 
@@ -1976,7 +1986,7 @@ export abstract class AbstractPool<
   private readonly isStealingRatioReached = (): boolean => {
     return (
       this.opts.tasksQueueOptions?.tasksStealingRatio === 0 ||
-      (this.info.stealingWorkerNodes ?? 0) >
+      this.getStealingWorkerNodes() >
         Math.ceil(
           this.workerNodes.length *
             this.opts.tasksQueueOptions!.tasksStealingRatio!,
diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts
@@ -28,15 +28,18 @@ export abstract class AbstractWorkerChoiceStrategy<
   /** @inheritDoc */
   public abstract readonly name: WorkerChoiceStrategy
 
+  /** @inheritDoc */
+  public retriesCount: number
+
   /**
    * The next worker node key.
    */
-  protected nextWorkerNodeKey: number | undefined = 0
+  protected nextWorkerNodeKey: number | undefined
 
   /**
    * The previous worker node key.
    */
-  protected previousWorkerNodeKey = 0
+  protected previousWorkerNodeKey: number
 
   /** @inheritDoc */
   public readonly strategyPolicy: StrategyPolicy = Object.freeze({
@@ -62,6 +65,9 @@ export abstract class AbstractWorkerChoiceStrategy<
     protected readonly pool: IPool<Worker, Data, Response>,
     protected opts?: WorkerChoiceStrategyOptions,
   ) {
+    this.retriesCount = 0
+    this.nextWorkerNodeKey = 0
+    this.previousWorkerNodeKey = 0
     this.choose = this.choose.bind(this)
     this.setOptions(this.opts)
   }
diff --git a/src/pools/selection-strategies/selection-strategies-types.ts b/src/pools/selection-strategies/selection-strategies-types.ts
@@ -194,6 +194,10 @@ export interface IWorkerChoiceStrategy {
    * @returns `true` if the reset is successful, `false` otherwise.
    */
   readonly reset: () => boolean
+  /**
+   * The worker choice strategy execution retries count.
+   */
+  retriesCount: number
   /**
    * Updates the worker node key strategy internals.
    * This is called after a task has been executed on a worker node.
diff --git a/src/pools/selection-strategies/worker-choice-strategies-context.ts b/src/pools/selection-strategies/worker-choice-strategies-context.ts
@@ -28,11 +28,6 @@ export class WorkerChoiceStrategiesContext<
   Data = unknown,
   Response = unknown,
 > {
-  /**
-   * The number of worker choice strategies execution retries.
-   */
-  public retriesCount: number
-
   /**
    * The default worker choice strategy in the context.
    */
@@ -92,7 +87,6 @@ export class WorkerChoiceStrategiesContext<
       buildWorkerChoiceStrategiesTaskStatisticsRequirements(
         this.workerChoiceStrategies,
       )
-    this.retriesCount = 0
     this.retries = getWorkerChoiceStrategiesRetries<Worker, Data, Response>(
       this.pool,
       opts,
@@ -108,6 +102,17 @@ export class WorkerChoiceStrategiesContext<
     return this.workerChoiceStrategiesPolicy
   }
 
+  /**
+   * Gets the number of worker choice strategies execution retries.
+   * @returns The number of retries.
+   */
+  public getStrategyRetries(): number {
+    return Array.from(
+      this.workerChoiceStrategies,
+      ([_, workerChoiceStrategy]) => workerChoiceStrategy.retriesCount,
+    ).reduce((accumulator, retries) => accumulator + retries, 0)
+  }
+
   /**
    * Gets the active worker choice strategies in the context task statistics requirements.
    *
@@ -173,13 +178,13 @@ export class WorkerChoiceStrategiesContext<
     let workerNodeKey: number | undefined = workerChoiceStrategy.choose()
     let retriesCount = 0
     while (workerNodeKey == null && retriesCount < this.retries) {
-      workerNodeKey = workerChoiceStrategy.choose()
       retriesCount++
-      this.retriesCount++
+      workerNodeKey = workerChoiceStrategy.choose()
     }
+    workerChoiceStrategy.retriesCount = retriesCount
     if (workerNodeKey == null) {
       throw new Error(
-        `Worker node key chosen by ${workerChoiceStrategy.name} is null or undefined after ${retriesCount.toString()} retries (max: ${this.retries.toString()})`,
+        `Worker node key chosen by ${workerChoiceStrategy.name} is null or undefined after ${workerChoiceStrategy.retriesCount.toString()} retries (max: ${this.retries.toString()})`,
       )
     }
     return workerNodeKey
diff --git a/src/pools/version.ts b/src/pools/version.ts
@@ -1,3 +1,3 @@
 // x-release-please-start-version
-export const version = '0.5.10'
+export const version = '0.5.11'
 // x-release-please-end
diff --git a/src/worker/abstract-worker.ts b/src/worker/abstract-worker.ts
@@ -287,14 +287,10 @@ export abstract class AbstractWorker<
         DEFAULT_TASK_NAME,
         this.taskFunctions.get(DEFAULT_TASK_NAME),
       ),
-      ...(defaultTaskFunctionName !== DEFAULT_TASK_NAME
-        ? [
-          buildTaskFunctionProperties(
-            defaultTaskFunctionName,
-            this.taskFunctions.get(defaultTaskFunctionName),
-          ),
-        ]
-        : []),
+      buildTaskFunctionProperties(
+        defaultTaskFunctionName,
+        this.taskFunctions.get(defaultTaskFunctionName),
+      ),
       ...taskFunctionsProperties,
     ]
   }
diff --git a/tests/pools/selection-strategies/selection-strategies.test.mjs b/tests/pools/selection-strategies/selection-strategies.test.mjs
@@ -97,6 +97,11 @@ describe('Selection strategies test suite', () => {
           workerChoiceStrategy,
         ).name,
       ).toBe(workerChoiceStrategy)
+      expect(
+        pool.workerChoiceStrategiesContext.workerChoiceStrategies.get(
+          workerChoiceStrategy,
+        ).retriesCount,
+      ).toBe(0)
       expect(
         pool.workerChoiceStrategiesContext.workerChoiceStrategies.get(
           workerChoiceStrategy,
diff --git a/tests/pools/selection-strategies/worker-choice-strategies-context.test.mjs b/tests/pools/selection-strategies/worker-choice-strategies-context.test.mjs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- ".": "0.5.10"`
	`2`	`+ ".": "0.5.11"`
`3`	`3`	`}`
-Original file line number
+Diff line change
 <!-- deno-fmt-ignore -->
 ```js
 -<script type="module">import { ThreadWorker } from 'https://cdn.jsdelivr.net/npm/[email protected].10/browser/mod.js'</script>
 +<script type="module">import { ThreadWorker } from 'https://cdn.jsdelivr.net/npm/[email protected].11/browser/mod.js'</script>
 ```
 ```js
   DynamicThreadPool,
   FixedThreadPool,
   PoolEvents,
 -} from 'https://cdn.jsdelivr.net/npm/[email protected].10/browser/mod.js'
 +} from 'https://cdn.jsdelivr.net/npm/[email protected].11/browser/mod.js'
 </script>
 ```
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@poolifier/poolifier-web-worker",`
`3`		`- "version": "0.5.10",`
	`3`	`+ "version": "0.5.11",`
`4`	`4`	`"exports": "./src/mod.ts",`
`5`	`5`	`"compilerOptions": {`
`6`	`6`	`"lib": [`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "poolifier-web-worker",`
`3`		`- "version": "0.5.10",`
	`3`	`+ "version": "0.5.11",`
`4`	`4`	`"description": "poolifier-web-worker",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.10' // x-release-please-version`
	`1`	`+import { ThreadWorker } from 'jsr:@poolifier/poolifier-web-worker@^0.5.11' // x-release-please-version`
`2`	`2`
`3`	`3`	`function fn0(data) {`
`4`	`4`	`console.info('Executing fn0')`