@camstack/server 1.2.688 → 1.2.689

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

@@ -418,27 +418,17 @@ class AgentRegistryService {
      * nothing re-announces it, and the operator has no reason to wait for a
      * timer they cannot see.
      *
-     * An ONLINE node is REFUSED: dropping a live node from the routing catalog
-     * would break every cap call pinned to it, and it re-registers on the next
-     * heartbeat anyway — "forget" of a live node is not a slow success, it is
-     * not a thing.
+     * An ONLINE node is forgotten too (operator ruling 2026-10-29, D966). The old refusal said a
+     * live node re-registers at once; since D857 its leaf is on the CRL, so it cannot. The order
+     * matters: (1) revoke (the revoker also closes the node's mutual-TLS sockets, because the CRL is
+     * only read at a handshake), (2) `disconnected` in the catalog, which unregisters its services and
+     * rejects the cap calls still waiting on it with `RequestRejectedError` - a bare `nodes.delete`
+     * would leave both behind, (3) the delete and the rest of the cleanup. The agent finds out on
+     * its own: refused at the next handshake, it asks the hub (`agent-membership-watch`) and resets
+     * to unpaired after two CA-signed `revoked` answers. `stillListed` is read back at the end, so a
+     * node that came straight back (revocation failed) is reported as listed, never as forgotten.
      */
     async forgetClusterNode(nodeId) {
-        if (this.isNodeOnline(nodeId)) {
-            const message = `Refused: ${nodeId} is ONLINE. Take the node down first — a live node re-registers immediately.`;
-            this.logger?.warn('forget cluster node refused', {
-                tags: { nodeId },
-                meta: { reason: 'node-online' },
-            });
-            return {
-                forgotten: false,
-                historyRemoved: false,
-                registryRemoved: false,
-                stillListed: true,
-                certificates: { outcome: 'not-attempted' },
-                message,
-            };
-        }
         // First: a forgotten node whose leaf stays valid walks back in on its next boot (D857).
         const certificates = await this.revokeForgottenNodeCertificates(nodeId);
         const historyOutcome = this.historyStore
@@ -446,6 +436,8 @@ class AgentRegistryService {
             : 'store-unavailable';
         // The mirror still lists the forgotten node: the next directory re-reads.
         this.historyMirror?.invalidate();
+        if (this.isNodeOnline(nodeId))
+            this.disconnectFromNodeCatalog(nodeId);
         const registryRemoved = this.removeFromNodeCatalog(nodeId);
         // Its intended set is gone with the row, so the back-fill breaker's memory
         // of failed deliveries to it is meaningless — drop it too.
@@ -499,6 +491,20 @@ class AgentRegistryService {
             message,
         };
     }
+    /**
+     * Take a LIVE node out of routing the way Moleculer does when its transport drops: services
+     * unregistered, pending requests rejected (typed, not left to time out). Idempotent.
+     */
+    disconnectFromNodeCatalog(nodeId) {
+        const nodes = this.nodeCatalogRegistry()?.nodes;
+        if (nodes?.disconnected === undefined) {
+            this.logger?.warn('cluster node catalog does not expose disconnected - calls may hang', {
+                tags: { nodeId },
+            });
+            return;
+        }
+        nodes.disconnected(nodeId, false);
+    }
     /** Is the node currently AVAILABLE in Moleculer's catalog? */
     isNodeOnline(nodeId) {
         return this.catalogNodeIds({ onlyAvailable: true }).includes(nodeId);
@@ -1173,7 +1179,8 @@ class AgentRegistryService {
             status: {
                 activeCameras: 0,
                 cpuPercent: status.cpuPercent ?? 0,
-                memoryPercent: status.memoryPercent ?? 0,
+                memoryPercent: typeof status.memoryPercent === 'number' ? status.memoryPercent : null,
+                processRssBytes: typeof status.processRssBytes === 'number' ? status.processRssBytes : null,
                 fps: {},
                 errors: [],
             },
@@ -1237,7 +1244,7 @@ class AgentRegistryService {
             status: {
                 activeCameras: 0,
                 cpuPercent: 0,
-                memoryPercent: 0,
+                memoryPercent: null,
                 fps: {},
                 errors: [],
             },
@@ -1254,7 +1261,7 @@ class AgentRegistryService {
         // The cap contract only exposes async snapshots; the cached read is cheap
         // because the addon's background sampler keeps the snapshot warm.
         let cpuPercent = 0;
-        let memoryPercent = 0;
+        let memoryPercent = null;
         const registry = this.capabilityService.getRegistry();
         if (registry) {
             const metricsProvider = registry.getSingleton('metrics-provider');
@@ -1283,6 +1290,7 @@ class AgentRegistryService {
                 activeCameras: 0,
                 cpuPercent,
                 memoryPercent,
+                processRssBytes: process.memoryUsage().rss,
                 fps: {},
                 errors: [],
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.688",
+  "version": "1.2.689",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -49,10 +49,10 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.516",
-    "@camstack/addon-agent-ui": "1.2.291",
+    "@camstack/addon-admin-ui": "1.2.517",
+    "@camstack/addon-agent-ui": "1.2.292",
     "@camstack/addon-auth": "1.2.170",
-    "@camstack/addon-benchmark": "1.2.290",
+    "@camstack/addon-benchmark": "1.2.291",
     "@camstack/addon-decoder-nodeav": "1.2.144",
     "@camstack/addon-notifiers": "1.2.623",
     "@camstack/addon-pipeline": "1.2.634",
@@ -60,9 +60,9 @@
     "@camstack/addon-post-analysis": "1.2.651",
     "@camstack/develop": "0.1.39",
     "@camstack/sdk": "1.2.154",
-    "@camstack/system": "1.2.517",
-    "@camstack/types": "1.2.443",
-    "@camstack/ui-library": "1.2.349",
+    "@camstack/system": "1.2.518",
+    "@camstack/types": "1.2.444",
+    "@camstack/ui-library": "1.2.350",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",