@camstack/server 1.1.66 → 1.1.68

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

@@ -1419,6 +1419,16 @@ class AddonRegistryService {
             // roster from the freshly-swapped on-disk bundle. Updating ONE member of a
             // group therefore respawns the ENTIRE group — they share a process.
             if (this.isForkedAddonEntry(entry)) {
+                // Snapshot which declared caps are ACTUALLY registered right now —
+                // the post-restart wait below must only gate on these. Device-scoped
+                // caps (vacuum-control, valve, humidifier, …) register only when a
+                // device using them exists: waiting for a cap that was NOT registered
+                // before the restart burns the full 120s timeout for nothing (live:
+                // integrations.create held its mutation — and the creation modal —
+                // for 2 minutes on the HA addon's 8 deviceless caps).
+                const preRegistered = new Set(entry.declaredCapabilities
+                    .map((cap) => cap.name)
+                    .filter((name) => this.capabilityRegistry.getProviderByAddon(name, addonId) != null));
                 await this.ensureForkedRunner(addonId, { restart: true });
                 // The respawn resolves as soon as the child is up, not when its
                 // capabilities are re-registered. Callers (integrations.create, UI forms) may
@@ -1450,9 +1460,21 @@ class AddonRegistryService {
                     // *misleading error* on timeout — a warning avoids that while still
                     // letting the update finalize).
                     const REGISTER_WAIT_MS = 120_000;
-                    const waits = declared.map((cap) => this.capabilityRegistry.waitForProvider(cap.name, addonId, REGISTER_WAIT_MS));
+                    // Gate ONLY on the caps that were registered BEFORE the restart —
+                    // those are the ones a caller could have been routing to. Caps that
+                    // were absent (device-scoped, no device yet) re-register
+                    // asynchronously whenever their devices appear; waiting for them
+                    // here held integrations.create (and its modal) for the full
+                    // timeout on every deviceless declared cap.
+                    const gated = declared.filter((cap) => preRegistered.has(cap.name));
+                    const skipped = declared.filter((cap) => !preRegistered.has(cap.name));
+                    if (skipped.length > 0) {
+                        this.logger.debug(`Addon "${addonId}" restart: not gating on ${skipped.length} cap(s) that were ` +
+                            `unregistered pre-restart (device-scoped, awaiting devices): ${skipped.map((c) => c.name).join(', ')}`, { tags: { addonId } });
+                    }
+                    const waits = gated.map((cap) => this.capabilityRegistry.waitForProvider(cap.name, addonId, REGISTER_WAIT_MS));
                     const settled = await Promise.all(waits);
-                    const missing = declared
+                    const missing = gated
                         .map((cap, i) => (settled[i] == null ? cap.name : null))
                         .filter((name) => name !== null);
                     if (missing.length > 0) {

package/dist/core/moleculer/agent-readiness-pull.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterAgentAuthoritativeRecords = filterAgentAuthoritativeRecords;
+const VALID_STATES = new Set(['starting', 'ready', 'down']);
+const VALID_SCOPE_TYPES = new Set(['global', 'node', 'device']);
+/** Structural validation for a record received from a remote node. */
+function isWellFormedRecord(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const record = value;
+    if (typeof record.capName !== 'string' || record.capName.length === 0)
+        return false;
+    if (typeof record.state !== 'string' || !VALID_STATES.has(record.state))
+        return false;
+    if (typeof record.generation !== 'string')
+        return false;
+    if (typeof record.sourceNodeId !== 'string')
+        return false;
+    const scope = record.scope;
+    if (typeof scope !== 'object' || scope === null)
+        return false;
+    if (!VALID_SCOPE_TYPES.has(scope.type))
+        return false;
+    return true;
+}
+/**
+ * Keep only the records `agentNodeId` is authoritative for, dropping
+ * malformed entries. See module doc for why this filter must exist.
+ */
+function filterAgentAuthoritativeRecords(records, agentNodeId) {
+    if (!Array.isArray(records))
+        return [];
+    return records.filter((record) => {
+        if (!isWellFormedRecord(record))
+            return false;
+        if (record.scope.type === 'node')
+            return record.scope.nodeId === agentNodeId;
+        return record.sourceNodeId === agentNodeId;
+    });
+}

package/dist/core/moleculer/moleculer.service.js

@@ -5,6 +5,7 @@ exports.buildChildUdsManifest = buildChildUdsManifest;
 const node_crypto_1 = require("node:crypto");
 const system_1 = require("@camstack/system");
 const types_1 = require("@camstack/types");
+const agent_readiness_pull_js_1 = require("./agent-readiness-pull.js");
 const cap_router_runtime_js_1 = require("../../api/trpc/cap-router-runtime.js");
 const core_cap_bridge_js_1 = require("../../api/trpc/core-cap-bridge.js");
 const cap_call_fn_js_1 = require("./cap-call-fn.js");
@@ -26,6 +27,14 @@ class MoleculerService {
      * `$hub.registerNode`. Populated by `onRegisterNode` in `hubDeps`.
      */
     nodeRegistry = new system_1.HubNodeRegistry();
+    /**
+     * Fixed-period agent-readiness snapshot sweep (D8 reconcile) — repairs
+     * agent-origin readiness deltas lost while the agent stayed connected.
+     * Not a retry backoff: a steady-state reconcile against each agent's
+     * authoritative snapshot.
+     */
+    static AGENT_READINESS_PULL_INTERVAL_MS = 60_000;
+    agentReadinessPullTimer = null;
     nodeCallFns = new Map();
     /**
      * D3: callback invoked whenever a bare-ID agent node completes the
@@ -390,6 +399,30 @@ class MoleculerService {
         bridgeBus.localBus.on('$node.disconnected', ({ node }) => {
             this.removeNodeFromRegistry(node.id);
         });
+        // D8 reverse-leg snapshot-reconcile: on every agent (re)connect, pull
+        // the agent's own readiness snapshot (`$agent-readiness.getSnapshot`)
+        // and hydrate the hub-authoritative registry with the records the
+        // agent is authoritative for. Cross-node `system.ready-state` deltas
+        // are telemetry (lossy) — a lost post-restart `ready` used to leave
+        // this registry stuck on the synthesized `down` forever (2026-07-17:
+        // pipeline-executor@little-unraid, 3.5h dispatch outage). The
+        // periodic sweep below repairs deltas lost while CONNECTED.
+        bridgeBus.localBus.on('$node.connected', ({ node }) => {
+            const nodeId = node.id;
+            if (nodeId === this.brokerSafe.nodeID || nodeId.includes('/'))
+                return;
+            void this.pullAgentReadinessSnapshot(nodeId);
+        });
+        this.agentReadinessPullTimer = setInterval(() => {
+            for (const nodeId of this.nodeRegistry.listNodeIds()) {
+                if (nodeId === this.brokerSafe.nodeID || nodeId.includes('/'))
+                    continue;
+                void this.pullAgentReadinessSnapshot(nodeId);
+            }
+        }, MoleculerService.AGENT_READINESS_PULL_INTERVAL_MS);
+        if (typeof this.agentReadinessPullTimer.unref === 'function') {
+            this.agentReadinessPullTimer.unref();
+        }
         // Register the $event-bus service BEFORE broker.start(). Moleculer
         // announces service subscriptions to remote nodes only during discovery
         // handshake, not dynamically after post-start `createService()`.
@@ -955,7 +988,39 @@ class MoleculerService {
             return false;
         return registry.setChildLogLevel(childId, level);
     }
+    /**
+     * Pull one agent's own readiness snapshot and hydrate the
+     * hub-authoritative registry with the records that agent is
+     * authoritative for (see `agent-readiness-pull.ts` for the filter
+     * rationale). Best-effort: agents predating `$agent-readiness` (or a
+     * service list still propagating right after connect) fail with
+     * "not found" — silent; the periodic sweep retries.
+     */
+    async pullAgentReadinessSnapshot(nodeId) {
+        try {
+            const snapshot = await this.brokerSafe.call(`${system_1.AGENT_READINESS_SERVICE_NAME}.getSnapshot`, {}, { nodeID: nodeId });
+            if (!Array.isArray(snapshot) || snapshot.length === 0)
+                return;
+            const records = (0, agent_readiness_pull_js_1.filterAgentAuthoritativeRecords)(snapshot, nodeId);
+            if (records.length === 0)
+                return;
+            this.readinessRegistry.hydrate(records);
+        }
+        catch (err) {
+            const msg = err instanceof Error ? err.message : String(err);
+            if (!msg.includes('not found') && !msg.includes('NOT_FOUND')) {
+                this.logger.debug('agent readiness snapshot pull failed', {
+                    tags: { nodeId },
+                    meta: { err: msg },
+                });
+            }
+        }
+    }
     async onModuleDestroy() {
+        if (this.agentReadinessPullTimer !== null) {
+            clearInterval(this.agentReadinessPullTimer);
+            this.agentReadinessPullTimer = null;
+        }
         this.udsEventBridgeDispose?.();
         this.udsEventBridgeDispose = null;
         await this.brokerSafe.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.66",
+  "version": "1.1.68",
   "private": false,
   "files": [
     "dist",
@@ -23,19 +23,19 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.1.54",
-    "@camstack/addon-advanced-notifier": "1.1.26",
-    "@camstack/addon-auth": "1.1.11",
-    "@camstack/addon-decoder-nodeav": "1.1.14",
-    "@camstack/addon-notifiers": "1.1.26",
-    "@camstack/addon-pipeline": "1.1.59",
-    "@camstack/addon-pipeline-orchestrator": "1.1.49",
-    "@camstack/addon-post-analysis": "1.1.31",
-    "@camstack/sdk": "1.1.26",
-    "@camstack/shm-ring": "1.0.25",
-    "@camstack/system": "1.1.52",
-    "@camstack/types": "1.1.47",
-    "@camstack/ui-library": "1.1.38",
+    "@camstack/addon-admin-ui": "1.1.56",
+    "@camstack/addon-advanced-notifier": "1.1.28",
+    "@camstack/addon-auth": "1.1.13",
+    "@camstack/addon-decoder-nodeav": "1.1.16",
+    "@camstack/addon-notifiers": "1.1.28",
+    "@camstack/addon-pipeline": "1.1.61",
+    "@camstack/addon-pipeline-orchestrator": "1.1.51",
+    "@camstack/addon-post-analysis": "1.1.33",
+    "@camstack/sdk": "1.1.28",
+    "@camstack/shm-ring": "1.0.27",
+    "@camstack/system": "1.1.54",
+    "@camstack/types": "1.1.49",
+    "@camstack/ui-library": "1.1.40",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/multipart": "^10.0.0",