fix: improve aborted handling (#416)

Author: Uzlopak

package.json

@@ -26,8 +26,8 @@
     "lint:fix": "eslint --cache --fix src test examples eslint.config.js tsdown.config.ts vitest.config.ts vitest.pretest.config.ts",
     "release": "bumpp package.json --commit --push --tag",
     "ci:pretest": "vitest --config vitest.pretest.config.ts run",
-    "test": "vitest --retry=5 run",
-    "test:coverage": "vitest --retry=5 --coverage run"
+    "test": "vitest run",
+    "test:coverage": "vitest --coverage run"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",

src/bench.ts

@@ -171,8 +171,8 @@ export class Bench extends EventTarget {
   remove (name: string): this {
     const task = this.getTask(name)
     if (task) {
-      this.dispatchEvent(new BenchEvent('remove', task))
       this.#tasks.delete(name)
+      this.dispatchEvent(new BenchEvent('remove', task))
     }
     return this
   }
@@ -181,10 +181,10 @@ export class Bench extends EventTarget {
    * reset tasks and remove their result
    */
   reset (): void {
-    this.dispatchEvent(new BenchEvent('reset'))
     for (const task of this.#tasks.values()) {
       task.reset()
     }
+    this.dispatchEvent(new BenchEvent('reset'))
   }
 
   /**

src/task.ts

@@ -50,11 +50,6 @@ export class Task extends EventTarget {
     options?: RemoveEventListenerOptionsArgument
   ) => void
 
-  /**
-   * The number of times the task function has been executed
-   */
-  runs = 0
-
   get name (): string {
     return this.#name
   }
@@ -67,6 +62,16 @@ export class Task extends EventTarget {
     }
   }
 
+  get runs (): number {
+    return this.#runs
+  }
+
+  /**
+   * Check if either our signal or the bench-level signal is aborted
+   * `true` if either signal is aborted
+   */
+  #aborted = false
+
   /**
    * The task asynchronous status
    */
@@ -98,17 +103,14 @@ export class Task extends EventTarget {
   #result: TaskResult = notStartedTaskResult
 
   /**
-   * The task-level abort signal
+   * The number of times the task function has been executed
    */
-  readonly #signal: AbortSignal | undefined
+  #runs = 0
 
   /**
-   * Check if either our signal or the bench-level signal is aborted
-   * @returns `true` if either signal is aborted
+   * The task-level abort signal
    */
-  get #aborted (): boolean {
-    return this.#signal?.aborted === true || this.#bench.opts.signal?.aborted === true
-  }
+  readonly #signal: AbortSignal | undefined
 
   constructor (bench: Bench, name: string, fn: Fn, fnOpts: FnOptions = {}) {
     super()
@@ -128,23 +130,31 @@ export class Task extends EventTarget {
       }
     }
 
+    this.reset(false)
+
     if (this.#signal) {
-      this.#signal.addEventListener(
-        'abort',
-        this.#onAbort.bind(this),
-        { once: true }
-      )
+      if (this.#signal.aborted) {
+        this.#onAbort()
+      } else {
+        this.#signal.addEventListener(
+          'abort',
+          this.#onAbort.bind(this),
+          { once: true }
+        )
+      }
     }
 
     if (this.#bench.opts.signal) {
-      this.#bench.opts.signal.addEventListener(
-        'abort',
-        this.#onAbort.bind(this),
-        { once: true }
-      )
+      if (this.#bench.opts.signal.aborted) {
+        this.#onAbort()
+      } else {
+        this.#bench.opts.signal.addEventListener(
+          'abort',
+          this.#onAbort.bind(this),
+          { once: true }
+        )
+      }
     }
-
-    this.reset(false)
   }
 
   /**
@@ -153,10 +163,10 @@ export class Task extends EventTarget {
    * @internal
    */
   reset (emit = true): void {
-    if (emit) this.dispatchEvent(new BenchEvent('reset', this))
-    this.runs = 0
-
+    this.#runs = 0
     this.#result = this.#aborted ? abortedTaskResult : notStartedTaskResult
+
+    if (emit) this.dispatchEvent(new BenchEvent('reset', this))
   }
 
   /**
@@ -469,6 +479,7 @@ export class Task extends EventTarget {
   }
 
   #onAbort (): void {
+    this.#aborted = true
     if (
       abortableStates.includes(this.#result.state as typeof abortableStates[number])
     ) {
@@ -501,7 +512,7 @@ export class Task extends EventTarget {
     latencySamples?: number[]
   }): void {
     if (isValidSamples(latencySamples)) {
-      this.runs = latencySamples.length
+      this.#runs = latencySamples.length
 
       sortSamples(latencySamples)
 

test/basic-async.test.ts

@@ -3,7 +3,7 @@ import { expect, test } from 'vitest'
 import { Bench, hrtimeNow, now, type Task } from '../src'
 
 // If running in CI, allow a bit more leeway for the mean value
-const maxMeanValue = process.env.CI ? 1025 : 1002
+const maxMeanValue = process.env.CI ? 1100 : 1002
 
 test.each([['now()'], ['hrtimeNow()']])('%s basic (async)', async mode => {
   const bench = new Bench({

test/basic-sync.test.ts

@@ -4,7 +4,7 @@ import { Bench, hrtimeNow, now, type Task } from '../src'
 import { sleep } from './utils'
 
 // If running in CI, allow a bit more leeway for the mean value
-const maxMeanValue = process.env.CI ? 1025 : 1002
+const maxMeanValue = process.env.CI ? 1100 : 1002
 
 test.each([['now()'], ['hrtimeNow()']])('%s basic (sync)', mode => {
   const bench = new Bench({