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

package/dist/node/orchestration/actor/model/Actor.d.ts

@@ -1,6 +1,5 @@
 import type { TracerProvider } from '@opentelemetry/api';
 import { Base, type BaseParams } from '@xylabs/base';
-import type { Promisable } from '@xylabs/promise';
 import type { Config } from '@xyo-network/xl1-protocol-sdk';
 export interface IActor {
     start(): Promise<void>;
@@ -11,7 +10,8 @@ export type ActorParams = BaseParams<{
     traceProvider?: TracerProvider;
 }>;
 export declare class Actor<TParams extends ActorParams = ActorParams> extends Base<TParams> implements IActor {
-    protected readonly _timers: Map<string, ReturnType<typeof setTimeout>>;
+    protected readonly _intervals: Map<string, ReturnType<typeof setInterval>>;
+    protected readonly _timeouts: Map<string, ReturnType<typeof setTimeout>>;
     private _active;
     private readonly _displayName;
     private readonly _id;
@@ -23,7 +23,7 @@ export declare class Actor<TParams extends ActorParams = ActorParams> extends Ba
     /**
      * The timer runs until the actor is deactivated (or you manually stop it).
      */
-    registerTimer(timerName: string, callback: () => Promisable<void>, dueTimeMs: number, periodMs: number): void;
+    registerTimer(timerName: string, callback: () => Promise<void>, dueTimeMs: number, periodMs: number): void;
     span<T>(name: string, fn: () => T): T;
     spanAsync<T>(name: string, fn: () => Promise<T>): Promise<T>;
     /**

package/dist/node/orchestration/actor/model/Actor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../../../../src/orchestration/actor/model/Actor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAA;AAGpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,WAAW,MAAM;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,KAAK,CAAC,OAAO,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,IAAI,CAAC,OAAO,CAAE,YAAW,MAAM;IACnG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAY;IAClF,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEhB,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,YAAU,EAAE,MAAM,EAAE,OAAO;IAOtE,IAAI,WAAW,WAEd;IAED,IAAI,EAAE,WAEL;IAED,IAAI,IAAI,WAEP;IAED,SAAS,KAAK,SAAS,WAEtB;IAED;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAgCtG,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI/B,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIlE;;OAEG;IACG,KAAK;IAMX;;;OAGG;IACG,IAAI;CAUX"}
+{"version":3,"file":"Actor.d.ts","sourceRoot":"","sources":["../../../../../src/orchestration/actor/model/Actor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAA;AAGpD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAE3D,MAAM,WAAW,MAAM;IACrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CACtB;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC;IACnC,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,cAAc,CAAA;CAC/B,CAAC,CAAA;AAEF,qBAAa,KAAK,CAAC,OAAO,SAAS,WAAW,GAAG,WAAW,CAAE,SAAQ,IAAI,CAAC,OAAO,CAAE,YAAW,MAAM;IACnG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAY;IACtF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAY;IACpF,OAAO,CAAC,OAAO,CAAQ;IACvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAQ;IACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;gBAEhB,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,YAAU,EAAE,MAAM,EAAE,OAAO;IAOtE,IAAI,WAAW,WAEd;IAED,IAAI,EAAE,WAEL;IAED,IAAI,IAAI,WAEP;IAED,SAAS,KAAK,SAAS,WAEtB;IAED;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAmCnG,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAI/B,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAIlE;;OAEG;IACG,KAAK;IAMX;;;OAGG;IACG,IAAI;CAgBX"}

package/dist/node/orchestration/initServices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initServices.d.ts","sourceRoot":"","sources":["../../../src/orchestration/initServices.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAM5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAkCrF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,YAAY,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,wBAAwB,CA+LjG,CAAA"}
+{"version":3,"file":"initServices.d.ts","sourceRoot":"","sources":["../../../src/orchestration/initServices.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAA;AAM5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAuBrF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,eAAO,MAAM,YAAY,GAAU,SAAS,mBAAmB,KAAG,OAAO,CAAC,wBAAwB,CA0MjG,CAAA"}

package/dist/node/xl1.mjs

@@ -26,14 +26,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;
@@ -66,21 +66,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) {
@@ -105,10 +104,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.");
   }
 };
@@ -1221,16 +1224,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 isDefined9(value.start) && typeof value.start === "function";
 }, "isStartable");
@@ -1252,6 +1245,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))
@@ -1500,7 +1505,7 @@ var waitForHostPort = /* @__PURE__ */ __name((host, port) => {
 
 // src/runCLI.ts
 var config;
-var version = isDefined12("1.12.4") ? "1.12.4" : "unknown";
+var version = isDefined12("1.12.6") ? "1.12.6" : "unknown";
 var getContextFromConfig = /* @__PURE__ */ __name((config3) => {
   const logger = initLogger(config3);
   const orchestrator = new Orchestrator(logger);