@xyo-network/xl1-cli-lib 1.12.6 → 1.12.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/xl1-cli-lib",
-  "version": "1.12.6",
+  "version": "1.12.7",
   "description": "XYO Layer One CLI Library",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -46,7 +46,6 @@
     "@xylabs/base": "~5.0.10",
     "@xylabs/creatable": "~5.0.10",
     "@xylabs/delay": "~5.0.10",
-    "@xylabs/forget": "~5.0.10",
     "@xylabs/hex": "~5.0.10",
     "@xylabs/logger": "~5.0.10",
     "@xylabs/object": "~5.0.10",
@@ -56,14 +55,14 @@
     "@xyo-network/archivist-lmdb": "~5.0.7",
     "@xyo-network/archivist-memory": "~5.0.7",
     "@xyo-network/archivist-model": "~5.0.7",
-    "@xyo-network/chain-api": "~1.12.6",
-    "@xyo-network/chain-sdk": "~1.12.6",
+    "@xyo-network/chain-api": "~1.12.7",
+    "@xyo-network/chain-sdk": "~1.12.7",
     "@xyo-network/payload-builder": "~5.0.7",
     "@xyo-network/payload-model": "~5.0.7",
     "@xyo-network/wallet": "~5.0.7",
     "@xyo-network/wallet-model": "~5.0.7",
     "@xyo-network/xl1-protocol": "~1.10.15",
-    "@xyo-network/xl1-protocol-sdk": "~1.12.6",
+    "@xyo-network/xl1-protocol-sdk": "~1.12.7",
     "async-mutex": "~0.5.0",
     "cosmiconfig": "~9.0.0",
     "dotenv": "~17.2.1",
@@ -73,9 +72,10 @@
     "zod": "~4.0.17"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "~7.1.3",
-    "@xylabs/tsconfig": "~7.1.3",
+    "@xylabs/ts-scripts-yarn3": "~7.1.7",
+    "@xylabs/tsconfig": "~7.1.7",
     "@xylabs/vitest-extended": "~5.0.10",
+    "eslint": "^9.33.0",
     "nodemon": "~3.1.10",
     "rimraf": "~6.0.1",
     "tslib": "~2.8.1",

package/src/orchestration/actor/model/Actor.ts

@@ -1,8 +1,6 @@
 import type { TracerProvider } from '@opentelemetry/api'
 import { Base, type BaseParams } from '@xylabs/base'
-import { forget } from '@xylabs/forget'
 import { IdLogger } from '@xylabs/logger'
-import type { Promisable } from '@xylabs/promise'
 import { span, spanAsync } from '@xylabs/telemetry'
 import type { Config } from '@xyo-network/xl1-protocol-sdk'
 
@@ -17,7 +15,8 @@ export type ActorParams = BaseParams<{
 }>
 
 export class Actor<TParams extends ActorParams = ActorParams> extends Base<TParams> implements IActor {
-  protected readonly _timers: Map<string, ReturnType<typeof setTimeout>> = new Map()
+  protected readonly _intervals: Map<string, ReturnType<typeof setInterval>> = new Map()
+  protected readonly _timeouts: Map<string, ReturnType<typeof setTimeout>> = new Map()
   private _active = false
   private readonly _displayName: string
   private readonly _id: string
@@ -48,7 +47,7 @@ export class Actor<TParams extends ActorParams = ActorParams> extends Base<TPara
   /**
    * The timer runs until the actor is deactivated (or you manually stop it).
    */
-  registerTimer(timerName: string, callback: () => Promisable<void>, dueTimeMs: number, periodMs: number) {
+  registerTimer(timerName: string, callback: () => Promise<void>, dueTimeMs: number, periodMs: number) {
     if (!this._active) {
       this.logger?.warn(
         `Cannot register timer '${timerName}' because actor is not active.`,
@@ -56,24 +55,27 @@ export class Actor<TParams extends ActorParams = ActorParams> extends Base<TPara
       return
     }
 
-    // Function to handle recursive scheduling
-    const schedulePeriodicRun = async () => {
-      // Stop if actor is deactivated or timer is removed
-      if (!this._active || !this._timers.has(timerName)) return
-      try {
-        // Run the callback
-        await callback()
-      } catch (error) {
-        // Catch and log any errors
-        this.logger?.error(`Error in timer '${this.name}:${timerName}': ${error}`)
-      } finally {
-        // Always schedule subsequent executions based on the desired period
-        this._timers.set(timerName, setTimeout(() => forget(schedulePeriodicRun(), { name: `schedulePeriodicRun:${this.name}:${timerName}` }), periodMs))
-      }
-    }
+    let running = false
+
+    const timeoutId = setTimeout(() => {
+      const intervalId = setInterval(() => {
+        if (!this._active || !this._intervals.has(timerName) || running) return
+        running = true
+        callback()
+          .catch((error) => {
+            this.logger?.error(`Error in timer '${this.name}:${timerName}': ${error}`)
+          })
+          .finally(() => {
+            running = false
+          })
+      }, periodMs)
+
+      // store interval so we can clear it on stop()
+      this._intervals.set(timerName, intervalId)
+    }, dueTimeMs)
 
-    // Schedule the 1st execution after the desired initial delay
-    this._timers.set(timerName, setTimeout(() => forget(schedulePeriodicRun(), { name: `schedulePeriodicRun(initial):${this.name}:${timerName}` }), dueTimeMs))
+    // store timeout so we can clear it on stop() if interval hasn't started yet
+    this._timeouts.set(timerName, timeoutId)
 
     this.logger?.log(
       `Timer '${this.name}:${timerName}' registered: first call after ${dueTimeMs}ms, recurring every ${periodMs}ms.`,
@@ -105,10 +107,16 @@ export class Actor<TParams extends ActorParams = ActorParams> extends Base<TPara
     await Promise.resolve()
     this._active = false
     this.logger?.log('Stopping all timers...')
-    for (const [, timerRef] of this._timers.entries()) {
-      clearTimeout(timerRef)
+    for (const [, timeoutRef] of this._timeouts.entries()) {
+      clearTimeout(timeoutRef)
     }
-    this._timers.clear()
+    this._timeouts.clear()
+
+    for (const [, intervalRef] of this._intervals.entries()) {
+      clearInterval(intervalRef)
+    }
+    this._intervals.clear()
+
     this.logger?.log('Stopped.')
   }
 }

package/src/orchestration/initServices.ts

@@ -22,17 +22,6 @@ import {
 } from './services/index.ts'
 import { RuntimeStatusMonitor } from './status/index.ts'
 
-const telemetryConfig = {
-  attributes: {
-    serviceName: 'xl1-producer',
-    serviceVersion: '1.0.0',
-  },
-  metricsConfig: {
-    endpoint: '/metrics',
-    port: 9464,
-  },
-}
-
 interface Startable {
   start: () => Promise<void>
 }
@@ -59,7 +48,18 @@ export const initServices = async (context: InitServicesContext): Promise<ChainS
   })
 
   await startupSpanAsync('initHealthEndpoints', () => initHealthEndpoints({ ...context, statusReporter }))
-
+  const { otlpEndpoint } = config.telemetry?.otel ?? {}
+  const telemetryConfig = {
+    attributes: {
+      serviceName: 'xl1-producer',
+      serviceVersion: '1.0.0',
+    },
+    otlpEndpoint,
+    metricsConfig: {
+      endpoint: '/metrics',
+      port: 9464,
+    },
+  }
   const [
     { traceProvider, meterProvider },
     account,