@camstack/server 1.2.458 → 1.2.459

package/dist/agent/agent-update-service.js

@@ -33,7 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgentUpdateService = exports.AGENT_RESTART_GRACE_MS = exports.AGENT_RUNTIME_ADDON_ID = void 0;
+exports.AgentUpdateService = exports.AgentRestartAnnouncer = exports.AGENT_RESTART_GRACE_MS = exports.AGENT_RUNTIME_ADDON_ID = void 0;
 exports.isRunningInContainer = isRunningInContainer;
 exports.resolveAgentPackageJsonPath = resolveAgentPackageJsonPath;
 exports.scheduleAgentRestart = scheduleAgentRestart;
@@ -149,7 +149,61 @@ function scheduleAgentRestart(logger, requestedBy, dataDir) {
     }, exports.AGENT_RESTART_GRACE_MS);
     grace.unref();
 }
+/**
+ * The agent's restart ANNOUNCEMENT (D723): `system.restarting`, emitted before
+ * the self-SIGTERM, through the agent's event bus — which broadcasts it to the
+ * hub, where the notification centre turns it into `node-restarting` or
+ * `node-updating`. Until D723 the agent emitted nothing before exiting, so an
+ * agent's restart was announced only after the fact (`system.restart-completed`).
+ *
+ * Its own small object because the restart seam is a closure handed to the base
+ * class BEFORE `this` exists, while the bus is bound later (`bindAvailability`,
+ * once the mesh is up). A restart before that has nobody to tell — said, never
+ * silent.
+ */
+class AgentRestartAnnouncer {
+    logger;
+    eventBus;
+    nodeId;
+    constructor(logger, eventBus, nodeId) {
+        this.logger = logger;
+        this.eventBus = eventBus;
+        this.nodeId = nodeId;
+    }
+    bind(eventBus, nodeId) {
+        this.eventBus = eventBus;
+        this.nodeId = nodeId;
+    }
+    announce(marker) {
+        const bus = this.eventBus;
+        if (bus === null) {
+            this.logger.warn('agent restart NOT announced — the event bus is not bound yet', {
+                meta: { nodeId: this.nodeId, kind: marker.kind },
+            });
+            return;
+        }
+        const payload = { ...marker, nodeId: this.nodeId };
+        try {
+            bus.emit({
+                id: (0, node_crypto_1.randomUUID)(),
+                timestamp: new Date(),
+                source: { type: 'core', id: 'agent-update-service' },
+                category: types_1.EventCategory.SystemRestarting,
+                data: payload,
+            });
+        }
+        catch (err) {
+            // Telemetry (D8): an announcement that could not go out must never block
+            // the restart it announces.
+            this.logger.warn('agent restart announcement failed', {
+                meta: { nodeId: this.nodeId, error: err instanceof Error ? err.message : String(err) },
+            });
+        }
+    }
+}
+exports.AgentRestartAnnouncer = AgentRestartAnnouncer;
 class AgentUpdateService extends index_js_1.RootUpdateService {
+    restartAnnouncer;
     updateAvailability;
     eventBus;
     nodeId;
@@ -164,6 +218,7 @@ class AgentUpdateService extends index_js_1.RootUpdateService {
         // handshake settles the id; the log tag keeps the boot-time value, which is
         // the same string in every deployment that sets `CAMSTACK_NODE_ID`.
         const nodeId = options.nodeId ?? process.env['CAMSTACK_NODE_ID'] ?? 'agent';
+        const restartAnnouncer = new AgentRestartAnnouncer(options.logger, options.eventBus ?? null, nodeId);
         super({
             spec: index_js_1.HUB_ROOT_SPEC,
             nodeId,
@@ -177,7 +232,8 @@ class AgentUpdateService extends index_js_1.RootUpdateService {
             },
             logger: options.logger,
             restartServer: (requestedBy, update) => {
-                writeAgentRestartMarker(options.dataDir, requestedBy, update);
+                const marker = writeAgentRestartMarker(options.dataDir, requestedBy, update);
+                restartAnnouncer.announce(marker);
                 restartAgent(requestedBy);
             },
             dataDir: options.dataDir,
@@ -204,6 +260,7 @@ class AgentUpdateService extends index_js_1.RootUpdateService {
             now: options.now,
         });
         this.nodeId = nodeId;
+        this.restartAnnouncer = restartAnnouncer;
         this.agentDataDir = options.dataDir;
         this.agentLogger = options.logger;
         this.eventBus = options.eventBus ?? null;
@@ -220,6 +277,7 @@ class AgentUpdateService extends index_js_1.RootUpdateService {
     bindAvailability(eventBus, nodeId) {
         this.eventBus = eventBus;
         this.nodeId = nodeId;
+        this.restartAnnouncer.bind(eventBus, nodeId);
         this.updateAvailability = new update_availability_emitter_js_1.UpdateAvailabilityEmitter(eventBus, { type: 'core', id: 'agent-update-service' }, new update_availability_store_js_1.FileUpdateAvailabilityStore(this.agentDataDir, 'agent-update', this.agentLogger));
     }
     async checkServerUpdate() {
@@ -266,19 +324,22 @@ class AgentUpdateService extends index_js_1.RootUpdateService {
     }
 }
 exports.AgentUpdateService = AgentUpdateService;
+/** Write the marker and return it — the same payload is the announcement (D723). */
 function writeAgentRestartMarker(dataDir, requestedBy, update) {
+    // Same builder as the hub: an agent's "Server aggiornato" notification must
+    // name both versions too — see `core/updates/restart-marker.ts`.
+    const marker = (0, restart_marker_js_1.buildRestartMarker)({
+        requestedAt: Date.now(),
+        requestedBy,
+        ...(update !== undefined ? { update } : {}),
+    });
     try {
-        // Same builder as the hub: an agent's "Server aggiornato" notification must
-        // name both versions too — see `core/updates/restart-marker.ts`.
-        (0, system_1.writePendingRestart)(dataDir, (0, restart_marker_js_1.buildRestartMarker)({
-            requestedAt: Date.now(),
-            requestedBy,
-            ...(update !== undefined ? { update } : {}),
-        }));
+        (0, system_1.writePendingRestart)(dataDir, marker);
     }
     catch {
         // Marker write must never block the restart.
     }
+    return marker;
 }
 /**
  * The manifest entry for the agent runtime's own providers. Appended to

package/dist/core/addon/addon-package.service.js

@@ -1146,7 +1146,11 @@ class AddonPackageService {
             timestamp: new Date(),
             source: { type: 'core', id: 'addon-package-service' },
             category: types_1.EventCategory.SystemRestarting,
-            data: payload,
+            // The node, as `system.restart-completed` names it after the boot
+            // (`post-boot.service.ts`): the announcement and the landing of one
+            // restart must name the same node, or a stale `node-updating` could not
+            // be matched to the `server-updated` that supersedes it (D723).
+            data: { ...payload, nodeId: process.env['CAMSTACK_NODE_ID'] ?? 'hub' },
         });
         // 10s grace gives in-flight requests time to drain.
         (0, system_1.scheduleSelfRestart)({ delayMs: 10_000 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.458",
+  "version": "1.2.459",
   "license": "MIT",
   "private": false,
   "files": [
@@ -37,17 +37,17 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.332",
+    "@camstack/addon-admin-ui": "1.2.333",
     "@camstack/addon-agent-ui": "1.2.175",
     "@camstack/addon-auth": "1.2.127",
     "@camstack/addon-decoder-nodeav": "1.2.119",
     "@camstack/addon-notifiers": "1.2.128",
     "@camstack/addon-pipeline": "1.2.328",
     "@camstack/addon-pipeline-orchestrator": "1.2.283",
-    "@camstack/addon-post-analysis": "1.2.334",
+    "@camstack/addon-post-analysis": "1.2.335",
     "@camstack/sdk": "1.2.122",
-    "@camstack/system": "1.2.355",
-    "@camstack/types": "1.2.306",
+    "@camstack/system": "1.2.356",
+    "@camstack/types": "1.2.307",
     "@camstack/ui-library": "1.2.233",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",