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

package/dist/node/index.mjs

@@ -8,14 +8,14 @@ import { Mutex } from "async-mutex";
 
 // src/orchestration/actor/model/Actor.ts
 import { Base } from "@xylabs/base";
-import { forget } from "@xylabs/forget";
 import { IdLogger } from "@xylabs/logger";
 import { span, spanAsync } from "@xylabs/telemetry";
 var Actor = class extends Base {
   static {
     __name(this, "Actor");
   }
-  _timers = /* @__PURE__ */ new Map();
+  _intervals = /* @__PURE__ */ new Map();
+  _timeouts = /* @__PURE__ */ new Map();
   _active = false;
   _displayName;
   _id;
@@ -48,21 +48,20 @@ var Actor = class extends Base {
       this.logger?.warn(`Cannot register timer '${timerName}' because actor is not active.`);
       return;
     }
-    const schedulePeriodicRun = /* @__PURE__ */ __name(async () => {
-      if (!this._active || !this._timers.has(timerName)) return;
-      try {
-        await callback();
-      } catch (error) {
-        this.logger?.error(`Error in timer '${this.name}:${timerName}': ${error}`);
-      } finally {
-        this._timers.set(timerName, setTimeout(() => forget(schedulePeriodicRun(), {
-          name: `schedulePeriodicRun:${this.name}:${timerName}`
-        }), periodMs));
-      }
-    }, "schedulePeriodicRun");
-    this._timers.set(timerName, setTimeout(() => forget(schedulePeriodicRun(), {
-      name: `schedulePeriodicRun(initial):${this.name}:${timerName}`
-    }), dueTimeMs));
+    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);
+      this._intervals.set(timerName, intervalId);
+    }, dueTimeMs);
+    this._timeouts.set(timerName, timeoutId);
     this.logger?.log(`Timer '${this.name}:${timerName}' registered: first call after ${dueTimeMs}ms, recurring every ${periodMs}ms.`);
   }
   span(name, fn) {
@@ -87,10 +86,14 @@ var Actor = class extends Base {
     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._timeouts.clear();
+    for (const [, intervalRef] of this._intervals.entries()) {
+      clearInterval(intervalRef);
     }
-    this._timers.clear();
+    this._intervals.clear();
     this.logger?.log("Stopped.");
   }
 };
@@ -1286,16 +1289,6 @@ var RuntimeStatusMonitor = class extends LoggerStatusReporter {
 };
 
 // src/orchestration/initServices.ts
-var telemetryConfig = {
-  attributes: {
-    serviceName: "xl1-producer",
-    serviceVersion: "1.0.0"
-  },
-  metricsConfig: {
-    endpoint: "/metrics",
-    port: 9464
-  }
-};
 var isStartable = /* @__PURE__ */ __name((value) => {
   return isDefined10(value.start) && typeof value.start === "function";
 }, "isStartable");
@@ -1317,6 +1310,18 @@ var initServices = /* @__PURE__ */ __name(async (context) => {
     ...context,
     statusReporter
   }));
+  const { otlpEndpoint } = config3.telemetry?.otel ?? {};
+  const telemetryConfig = {
+    attributes: {
+      serviceName: "xl1-producer",
+      serviceVersion: "1.0.0"
+    },
+    otlpEndpoint,
+    metricsConfig: {
+      endpoint: "/metrics",
+      port: 9464
+    }
+  };
   const [{ traceProvider, meterProvider }, account] = await Promise.all([
     startupSpanAsync7("initTelemetry", () => initTelemetry(telemetryConfig)),
     startupSpanAsync7("initAccount", () => initAccount(context))
@@ -1580,7 +1585,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var config;
-var version = isDefined13("1.12.5") ? "1.12.5" : "unknown";
+var version = isDefined13("1.12.6") ? "1.12.6" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name((config3) => {
   const logger = initLogger(config3);
   const orchestrator = new Orchestrator(logger);