@wopr-network/platform-core 1.30.0 → 1.31.0

package/dist/fleet/fleet-event-emitter.d.ts

@@ -7,6 +7,8 @@ export interface BotFleetEvent {
     botId: string;
     tenantId: string;
     timestamp: string;
+    /** Image tag or version string, when available (e.g. from update events). */
+    version?: string;
 }
 export interface NodeFleetEvent {
     type: NodeEventType;

package/dist/fleet/fleet-notification-listener.d.ts

@@ -10,4 +10,4 @@ export interface FleetNotificationListenerDeps {
     /** Debounce window in ms before sending summary email. Default 60_000. */
     debounceMs?: number;
 }
-export declare function initFleetNotificationListener(deps: FleetNotificationListenerDeps): () => void;
+export declare function initFleetNotificationListener(deps: FleetNotificationListenerDeps): () => Promise<void>;

package/dist/fleet/fleet-notification-listener.js

@@ -17,9 +17,7 @@ export function initFleetNotificationListener(deps) {
                 logger.warn("Fleet notification skipped: no email for tenant", { tenantId });
                 return;
             }
-            // TODO: Surface actual target version from RolloutOrchestrator context.
-            // BotFleetEvent doesn't carry version info; "latest" is a placeholder.
-            notificationService.notifyFleetUpdateComplete(tenantId, email, "latest", rollout.succeeded, rollout.failed);
+            notificationService.notifyFleetUpdateComplete(tenantId, email, rollout.version, rollout.succeeded, rollout.failed);
         }
         catch (err) {
             logger.error("Fleet notification flush error", { err, tenantId });
@@ -35,6 +33,7 @@ export function initFleetNotificationListener(deps) {
         if (!rollout) {
             rollout = {
                 tenantId: botEvent.tenantId,
+                version: botEvent.version ?? "latest",
                 succeeded: 0,
                 failed: 0,
                 timer: setTimeout(() => flush(botEvent.tenantId), debounceMs),
@@ -45,6 +44,8 @@ export function initFleetNotificationListener(deps) {
             // Reset timer on each new event (sliding window)
             clearTimeout(rollout.timer);
             rollout.timer = setTimeout(() => flush(botEvent.tenantId), debounceMs);
+            if (botEvent.version)
+                rollout.version = botEvent.version;
         }
         if (botEvent.type === "bot.updated") {
             rollout.succeeded++;
@@ -53,13 +54,14 @@ export function initFleetNotificationListener(deps) {
             rollout.failed++;
         }
     });
-    return () => {
+    return async () => {
         unsubscribe();
-        // Flush all pending on shutdown
+        const flushes = [];
         for (const [tenantId, rollout] of pending) {
             clearTimeout(rollout.timer);
-            void flush(tenantId);
+            flushes.push(flush(tenantId));
         }
         pending.clear();
+        await Promise.allSettled(flushes);
     };
 }

package/dist/fleet/init-fleet-updater.d.ts

@@ -12,7 +12,7 @@
  */
 import type Docker from "dockerode";
 import type { IBotProfileRepository } from "./bot-profile-repository.js";
-import type { FleetEventEmitter } from "./fleet-event-emitter.js";
+import { FleetEventEmitter } from "./fleet-event-emitter.js";
 import type { FleetManager } from "./fleet-manager.js";
 import { ImagePoller } from "./image-poller.js";
 import type { IProfileStore } from "./profile-store.js";
@@ -46,6 +46,8 @@ export interface FleetUpdaterHandle {
     updater: ContainerUpdater;
     orchestrator: RolloutOrchestrator;
     snapshotManager: VolumeSnapshotManager;
+    /** Fleet event emitter for subscribing to bot/node lifecycle events */
+    eventEmitter: FleetEventEmitter;
     /** Stop the poller and wait for any active rollout to finish */
     stop: () => Promise<void>;
 }

package/dist/fleet/init-fleet-updater.js

@@ -11,6 +11,7 @@
  * all bots need updating.
  */
 import { logger } from "../config/logger.js";
+import { FleetEventEmitter } from "./fleet-event-emitter.js";
 import { ImagePoller } from "./image-poller.js";
 import { RolloutOrchestrator } from "./rollout-orchestrator.js";
 import { createRolloutStrategy } from "./rollout-strategy.js";
@@ -29,7 +30,8 @@ import { VolumeSnapshotManager } from "./volume-snapshot-manager.js";
  * @param config - Optional pipeline configuration
  */
 export function initFleetUpdater(docker, fleet, profileStore, profileRepo, config = {}) {
-    const { strategy: strategyType = "rolling-wave", strategyOptions, snapshotDir = "/data/fleet/snapshots", onBotUpdated, onRolloutComplete, configRepo, eventEmitter, } = config;
+    const { strategy: strategyType = "rolling-wave", strategyOptions, snapshotDir = "/data/fleet/snapshots", onBotUpdated, onRolloutComplete, configRepo, eventEmitter: configEventEmitter, } = config;
+    const emitter = configEventEmitter ?? new FleetEventEmitter();
     const poller = new ImagePoller(docker, profileStore);
     const updater = new ContainerUpdater(docker, profileStore, fleet, poller);
     const snapshotManager = new VolumeSnapshotManager(docker, snapshotDir);
@@ -54,16 +56,28 @@ export function initFleetUpdater(docker, fleet, profileStore, profileRepo, confi
             return results.filter((p) => p !== null);
         },
         onBotUpdated: (result) => {
-            // Emit fleet events if emitter is provided
-            if (eventEmitter) {
-                eventEmitter.emit({
+            // Fire-and-forget: resolve tenantId + emit event asynchronously
+            // The orchestrator callback is sync (void return) — async work must not block rollout progress
+            void (async () => {
+                let tenantId = "";
+                try {
+                    const profile = await profileRepo.get(result.botId);
+                    if (profile)
+                        tenantId = profile.tenantId;
+                }
+                catch {
+                    // Best-effort — event still fires with empty tenantId
+                }
+                // Extract version tag from image name (e.g. "ghcr.io/org/image:v1.2.3" → "v1.2.3")
+                const version = result.newImage.includes(":") ? (result.newImage.split(":").pop() ?? "latest") : "latest";
+                emitter.emit({
                     type: result.success ? "bot.updated" : "bot.update_failed",
                     botId: result.botId,
-                    tenantId: "",
+                    tenantId,
                     timestamp: new Date().toISOString(),
+                    version,
                 });
-            }
-            // Chain user-provided callback
+            })();
             onBotUpdated?.(result);
         },
         onRolloutComplete: (result) => {
@@ -96,6 +110,7 @@ export function initFleetUpdater(docker, fleet, profileStore, profileRepo, confi
         updater,
         orchestrator,
         snapshotManager,
+        eventEmitter: emitter,
         stop: async () => {
             poller.stop();
             // Wait for any in-flight rollout to complete before returning

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.30.0",
+  "version": "1.31.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/fleet/fleet-event-emitter.ts

@@ -26,6 +26,8 @@ export interface BotFleetEvent {
   botId: string;
   tenantId: string;
   timestamp: string;
+  /** Image tag or version string, when available (e.g. from update events). */
+  version?: string;
 }
 
 export interface NodeFleetEvent {

package/src/fleet/fleet-notification-listener.ts

@@ -15,12 +15,13 @@ export interface FleetNotificationListenerDeps {
 
 interface PendingRollout {
   tenantId: string;
+  version: string;
   succeeded: number;
   failed: number;
   timer: ReturnType<typeof setTimeout>;
 }
 
-export function initFleetNotificationListener(deps: FleetNotificationListenerDeps): () => void {
+export function initFleetNotificationListener(deps: FleetNotificationListenerDeps): () => Promise<void> {
   const { eventEmitter, notificationService, preferences, resolveEmail } = deps;
   const debounceMs = deps.debounceMs ?? 60_000;
   const pending = new Map<string, PendingRollout>();
@@ -40,9 +41,13 @@ export function initFleetNotificationListener(deps: FleetNotificationListenerDep
         return;
       }
 
-      // TODO: Surface actual target version from RolloutOrchestrator context.
-      // BotFleetEvent doesn't carry version info; "latest" is a placeholder.
-      notificationService.notifyFleetUpdateComplete(tenantId, email, "latest", rollout.succeeded, rollout.failed);
+      notificationService.notifyFleetUpdateComplete(
+        tenantId,
+        email,
+        rollout.version,
+        rollout.succeeded,
+        rollout.failed,
+      );
     } catch (err) {
       logger.error("Fleet notification flush error", { err, tenantId });
     }
@@ -57,6 +62,7 @@ export function initFleetNotificationListener(deps: FleetNotificationListenerDep
     if (!rollout) {
       rollout = {
         tenantId: botEvent.tenantId,
+        version: botEvent.version ?? "latest",
         succeeded: 0,
         failed: 0,
         timer: setTimeout(() => flush(botEvent.tenantId), debounceMs),
@@ -66,6 +72,7 @@ export function initFleetNotificationListener(deps: FleetNotificationListenerDep
       // Reset timer on each new event (sliding window)
       clearTimeout(rollout.timer);
       rollout.timer = setTimeout(() => flush(botEvent.tenantId), debounceMs);
+      if (botEvent.version) rollout.version = botEvent.version;
     }
 
     if (botEvent.type === "bot.updated") {
@@ -75,13 +82,14 @@ export function initFleetNotificationListener(deps: FleetNotificationListenerDep
     }
   });
 
-  return () => {
+  return async () => {
     unsubscribe();
-    // Flush all pending on shutdown
+    const flushes: Promise<void>[] = [];
     for (const [tenantId, rollout] of pending) {
       clearTimeout(rollout.timer);
-      void flush(tenantId);
+      flushes.push(flush(tenantId));
     }
     pending.clear();
+    await Promise.allSettled(flushes);
   };
 }

package/src/fleet/init-fleet-updater.ts

@@ -14,7 +14,7 @@
 import type Docker from "dockerode";
 import { logger } from "../config/logger.js";
 import type { IBotProfileRepository } from "./bot-profile-repository.js";
-import type { FleetEventEmitter } from "./fleet-event-emitter.js";
+import { FleetEventEmitter } from "./fleet-event-emitter.js";
 import type { FleetManager } from "./fleet-manager.js";
 import { ImagePoller } from "./image-poller.js";
 import type { IProfileStore } from "./profile-store.js";
@@ -46,6 +46,8 @@ export interface FleetUpdaterHandle {
   updater: ContainerUpdater;
   orchestrator: RolloutOrchestrator;
   snapshotManager: VolumeSnapshotManager;
+  /** Fleet event emitter for subscribing to bot/node lifecycle events */
+  eventEmitter: FleetEventEmitter;
   /** Stop the poller and wait for any active rollout to finish */
   stop: () => Promise<void>;
 }
@@ -76,9 +78,11 @@ export function initFleetUpdater(
     onBotUpdated,
     onRolloutComplete,
     configRepo,
-    eventEmitter,
+    eventEmitter: configEventEmitter,
   } = config;
 
+  const emitter = configEventEmitter ?? new FleetEventEmitter();
+
   const poller = new ImagePoller(docker, profileStore);
   const updater = new ContainerUpdater(docker, profileStore, fleet, poller);
   const snapshotManager = new VolumeSnapshotManager(docker, snapshotDir);
@@ -106,16 +110,28 @@ export function initFleetUpdater(
       return results.filter((p) => p !== null);
     },
     onBotUpdated: (result) => {
-      // Emit fleet events if emitter is provided
-      if (eventEmitter) {
-        eventEmitter.emit({
+      // Fire-and-forget: resolve tenantId + emit event asynchronously
+      // The orchestrator callback is sync (void return) — async work must not block rollout progress
+      void (async () => {
+        let tenantId = "";
+        try {
+          const profile = await profileRepo.get(result.botId);
+          if (profile) tenantId = profile.tenantId;
+        } catch {
+          // Best-effort — event still fires with empty tenantId
+        }
+
+        // Extract version tag from image name (e.g. "ghcr.io/org/image:v1.2.3" → "v1.2.3")
+        const version = result.newImage.includes(":") ? (result.newImage.split(":").pop() ?? "latest") : "latest";
+
+        emitter.emit({
           type: result.success ? "bot.updated" : "bot.update_failed",
           botId: result.botId,
-          tenantId: "",
+          tenantId,
           timestamp: new Date().toISOString(),
+          version,
         });
-      }
-      // Chain user-provided callback
+      })();
       onBotUpdated?.(result);
     },
     onRolloutComplete: (result) => {
@@ -152,6 +168,7 @@ export function initFleetUpdater(
     updater,
     orchestrator,
     snapshotManager,
+    eventEmitter: emitter,
     stop: async () => {
       poller.stop();
       // Wait for any in-flight rollout to complete before returning