timer: normalize timeout for any ETimer type

Signed-off-by: 🕷️ <[email protected]>

Author: zendive

src/api-monitor-cs-main.ts

@@ -15,7 +15,7 @@ import diff from './api/diff.ts';
 let originalMetrics: TTelemetry | null;
 let currentMetrics: TTelemetry | null;
 const eachSecond = new Timer(
-  { type: ETimer.TIMEOUT, delay: 1e3 },
+  { type: ETimer.TIMEOUT, timeout: 1e3 },
   function apiMonitorEachSecond() {
     onEachSecond();
     eachSecond.start();
@@ -24,7 +24,7 @@ const eachSecond = new Timer(
 const tick = new Timer({
   type: ETimer.TASK,
   priority: 'background',
-  delay: TELEMETRY_FREQUENCY_1PS,
+  timeout: TELEMETRY_FREQUENCY_1PS,
 }, function apiMonitorTelemetryTick() {
   const now = Date.now();
   currentMetrics = structuredClone(collectMetrics());
@@ -54,7 +54,7 @@ const tick = new Timer({
 
 windowListen((o) => {
   if (EMsg.TELEMETRY_ACKNOWLEDGED === o.msg) {
-    tick.delay = adjustTelemetryDelay(o.timeOfCollection);
+    tick.timeout = adjustTelemetryDelay(o.timeOfCollection);
     originalMetrics = currentMetrics;
     const shouldRun = eachSecond.isPending() && !tick.isPending();
     shouldRun && tick.start();

src/api/time.ts

@@ -101,7 +101,7 @@ type TTimerMeasurable = {
 };
 type TTimerTimeout = TTimerMeasurable & {
   type: ETimer.TIMEOUT;
-  delay: number;
+  timeout: number;
 };
 type TTimerAnimation = TTimerMeasurable & {
   type: ETimer.ANIMATION;
@@ -112,7 +112,7 @@ type TTimerIdle = TTimerMeasurable & {
 };
 type TTimerTask = TTimerMeasurable & {
   type: ETimer.TASK;
-  delay: number;
+  timeout: number;
   priority?: TTaskPriority;
 };
 type TTimerOptions =
@@ -159,7 +159,6 @@ const timerApi = __mirror__
  * in javascript event-loop
  */
 export class Timer {
-  delay: number = 0;
   timeout: number = 0;
   /** callback's self-time in milliseconds */
   callbackSelfTime: number = -1;
@@ -175,10 +174,9 @@ export class Timer {
 
     if (
       this.#options.type === ETimer.TIMEOUT ||
+      this.#options.type === ETimer.IDLE ||
       this.#options.type === ETimer.TASK
     ) {
-      this.delay = this.#options.delay;
-    } else if (this.#options.type === ETimer.IDLE) {
       this.timeout = this.#options.timeout;
     }
 
@@ -198,7 +196,7 @@ export class Timer {
       this.#handler = timerApi.setTimeout(() => {
         this.#handler = 0;
         this.trigger(...args);
-      }, this.delay);
+      }, this.timeout);
     } else if (
       this.#options.type === ETimer.ANIMATION
     ) {
@@ -218,7 +216,7 @@ export class Timer {
         // nullifying AFTER the trigger to allow use-case when aborting from the callback
         this.#abortController = null;
       }, {
-        delay: this.delay,
+        delay: this.timeout,
         signal: this.#abortController.signal,
         priority: this.#options.priority,
       }).catch(NOOP);
@@ -282,7 +280,7 @@ export class Fps {
   #eachSecond: Timer;
 
   constructor(callback?: (value: number) => void) {
-    this.#eachSecond = new Timer({ type: ETimer.TIMEOUT, delay: 1e3 }, () => {
+    this.#eachSecond = new Timer({ type: ETimer.TIMEOUT, timeout: 1e3 }, () => {
       this.value = this.#ticks;
       this.#ticks = 0;
       callback?.(this.value);

src/view/ConnectionAlert.svelte

@@ -13,11 +13,11 @@
   let tabReloadAlertEl: Alert | null = null;
   let devtoolsReloadAlertEl: Alert | null = null;
   const delayedAlert = new Timer(
-    { type: ETimer.TIMEOUT, delay: INJECTION_ALERT_TIMEOUT },
+    { type: ETimer.TIMEOUT, timeout: INJECTION_ALERT_TIMEOUT },
     () => void tabReloadAlertEl?.show(),
   );
   const extensionUpdateSensor = new Timer(
-    { type: ETimer.TIMEOUT, delay: UPDATE_SENSOR_INTERVAL },
+    { type: ETimer.TIMEOUT, timeout: UPDATE_SENSOR_INTERVAL },
     () => {
       whenUpdateDetected(() => {
         devtoolsReloadAlertEl?.show();

src/view/menu/SummaryBarItem.svelte

@@ -22,7 +22,7 @@
   } = $props();
   let enabled: boolean = $derived.by(() => panel.visible && count > 0);
   const stopAnimate = new Timer(
-    { type: ETimer.TIMEOUT, delay: 512 },
+    { type: ETimer.TIMEOUT, timeout: 512 },
     (el: HTMLElement | unknown) =>
       void requestAnimationFrame(() => {
         if (el instanceof HTMLElement) {

src/view/panels/shared/CellSelfTimeStats.svelte

@@ -16,18 +16,21 @@
     mean: time,
     max: time,
   });
-  const eachSecond = new Timer({ type: ETimer.TIMEOUT, delay: 1e3 }, () => {
-    if (!mean.samples) {
-      return;
-    }
+  const eachSecond = new Timer(
+    { type: ETimer.TIMEOUT, timeout: 1e3 },
+    () => {
+      if (!mean.samples) {
+        return;
+      }
 
-    vs.stdDev = mean.sampleStdDev().toFixed(1);
-    vs.mean = mean.mean;
-    vs.max = mean.max;
+      vs.stdDev = mean.sampleStdDev().toFixed(1);
+      vs.mean = mean.mean;
+      vs.max = mean.max;
 
-    mean.reset();
-    eachSecond.start();
-  });
+      mean.reset();
+      eachSecond.start();
+    },
+  );
 
   $effect(() => void mean.add(time));
 

src/view/shared/Variable.svelte

@@ -9,7 +9,7 @@
   );
   let lastUpdated: number = Date.now();
   const stopAnimate = new Timer(
-    { type: ETimer.TIMEOUT, delay: 100 },
+    { type: ETimer.TIMEOUT, timeout: 100 },
     () => (isAnimated = false),
   );
 

tests/time_test.ts

@@ -60,7 +60,7 @@ describe('Stopper', () => {
 describe('Timer - default options', () => {
   test('start', async () => {
     let counter = 0;
-    const timeout = new Timer({ type: ETimer.TIMEOUT, delay: DELAY }, () => {
+    const timeout = new Timer({ type: ETimer.TIMEOUT, timeout: DELAY }, () => {
       counter++;
     });
 
@@ -75,7 +75,7 @@ describe('Timer - default options', () => {
   test('stop before expected', async () => {
     let counter = 0;
     const timeout = new Timer(
-      { type: ETimer.TIMEOUT, delay: 2 * DELAY },
+      { type: ETimer.TIMEOUT, timeout: 2 * DELAY },
       () => {
         counter++;
       },
@@ -94,7 +94,7 @@ describe('Timer - default options', () => {
 describe('Timer - repeatable', () => {
   test('start/stop', async () => {
     let counter = 0;
-    const interval = new Timer({ type: ETimer.TIMEOUT, delay: DELAY }, () => {
+    const interval = new Timer({ type: ETimer.TIMEOUT, timeout: DELAY }, () => {
       counter++;
       interval.start();
     });
@@ -169,7 +169,7 @@ describe('Timer - idle', () => {
 describe('Timer - task', () => {
   test('start/stop', async () => {
     let counter = 0;
-    const task = new Timer({ type: ETimer.TASK, delay: DELAY }, () => {
+    const task = new Timer({ type: ETimer.TASK, timeout: DELAY }, () => {
       counter++;
     });