@camstack/server 1.2.592 → 1.2.594

package/dist/core/moleculer/agent-registration-request.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * The hub asks a (re)connected agent for its capability set.
  *
@@ -18,10 +17,7 @@
  * be asked: that is said, with whether the hub holds its registration, so an
  * online-but-capless node is never silent.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AGENT_REQUEST_REGISTRATION_ACTION = void 0;
-exports.requestAgentRegistration = requestAgentRegistration;
-exports.AGENT_REQUEST_REGISTRATION_ACTION = '$agent.requestRegistration';
+export const AGENT_REQUEST_REGISTRATION_ACTION = '$agent.requestRegistration';
 function errorType(err) {
     if (typeof err !== 'object' || err === null)
         return null;
@@ -32,9 +28,9 @@ function errorText(err) {
     return err instanceof Error ? err.message : String(err);
 }
 /** Ask `nodeId` to re-send its complete capability manifest. Never throws. */
-async function requestAgentRegistration(deps, nodeId) {
+export async function requestAgentRegistration(deps, nodeId) {
     try {
-        await deps.call(exports.AGENT_REQUEST_REGISTRATION_ACTION, {}, { nodeID: nodeId });
+        await deps.call(AGENT_REQUEST_REGISTRATION_ACTION, {}, { nodeID: nodeId });
         return 'requested';
     }
     catch (err) {

package/dist/core/moleculer/cap-call-fn.js

@@ -1,6 +1,20 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCapCallFn = buildCapCallFn;
+/**
+ * cap-call-fn — the per-(cap, node) dispatcher behind every CapabilityRegistry
+ * provider proxy the hub builds in `applyNodeManifest`.
+ *
+ * Extracted from `MoleculerService` so its routing branches are unit-testable
+ * in isolation (the closure that lived inline could only be exercised by
+ * standing up a full broker). It closes a UDS-migration gap: the inline
+ * version hand-rolled a `broker.call` for any non-hub-local provider, so an
+ * AGENT-hosted addon cap (a UDS child of the agent, NOT a Moleculer service)
+ * resolved to a Moleculer node that does not exist → `waitForServices` waited
+ * its full 30s discovery timeout → "Services waiting is timed out". The fix
+ * routes everything that isn't a hub-local child through the unified
+ * `CapRouteResolver`, which classifies an agent node as `agent-child-forward`
+ * (hub → agent over Moleculer → agent's UDS child) and a direct remote as
+ * `remote-moleculer`.
+ */
+import { CALLER_STAMPED_CAPABILITIES } from '@camstack/types';
 /** Extract a numeric `deviceId` routing hint out of arbitrary method args. */
 function extractDeviceId(params) {
     if (params === null || typeof params !== 'object')
@@ -8,11 +22,24 @@ function extractDeviceId(params) {
     const raw = Reflect.get(params, 'deviceId');
     return typeof raw === 'number' ? raw : undefined;
 }
+/**
+ * Hub in-process builtins state `callerAddonId` in args (see
+ * `AddonRegistryService.inProcessRecordsTransport`). A registry proxy routes
+ * over UDS; without lifting this to {@link CapCallInput.callerAddonId} the
+ * child strips the claim (`stampCallerAddonId` with no wire stamp) and records
+ * refuses `no-caller`.
+ */
+function extractStatedCallerAddonId(params) {
+    if (params === null || typeof params !== 'object' || Array.isArray(params))
+        return undefined;
+    const raw = Reflect.get(params, 'callerAddonId');
+    return typeof raw === 'string' && raw.length > 0 ? raw : undefined;
+}
 /**
  * Build the `CallFn` (`(method, params, targetNodeId?) => Promise`) for one
  * registered provider. See module docs for the routing rationale.
  */
-function buildCapCallFn(deps) {
+export function buildCapCallFn(deps) {
     return async (method, params, targetNodeId) => {
         const deviceId = extractDeviceId(params);
         // ── Hub-local child: route per-child over UDS (collection-safe — keyed by
@@ -25,12 +52,16 @@ function buildCapCallFn(deps) {
             const registry = deps.getLocalChildRegistry();
             if (registry !== null && registry.childProvides(deps.udsChildId, deps.capName, deviceId)) {
                 deps.onUdsRoute?.(deps.capName);
+                const statedCaller = CALLER_STAMPED_CAPABILITIES.includes(deps.capName)
+                    ? extractStatedCallerAddonId(params)
+                    : undefined;
                 const input = {
                     capName: deps.capName,
                     method,
                     args: params,
                     ...(deviceId !== undefined ? { deviceId } : {}),
                     ...(deps.addonId !== undefined ? { addonId: deps.addonId } : {}),
+                    ...(statedCaller !== undefined ? { callerAddonId: statedCaller } : {}),
                 };
                 return registry.callCapOnChild(deps.udsChildId, input);
             }
@@ -45,11 +76,14 @@ function buildCapCallFn(deps) {
         // there is a harmless no-op.
         const resolver = deps.getResolver();
         if (resolver !== null) {
+            const statedCaller = CALLER_STAMPED_CAPABILITIES.includes(deps.capName)
+                ? extractStatedCallerAddonId(params)
+                : undefined;
             const route = resolver.resolveCapRoute(deps.capName, {
                 nodeId: targetNodeId ?? deps.nodeId,
                 ...(deviceId !== undefined ? { deviceId } : {}),
             });
-            return resolver.dispatch(route, method, params, deps.addonId);
+            return resolver.dispatch(route, method, params, deps.addonId, statedCaller);
         }
         // ── Pre-init window (resolver not yet constructed): legacy Moleculer call.
         return deps.legacyBrokerCall(method, params, targetNodeId ?? deps.nodeId);

package/dist/core/moleculer/cap-route-authority.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * Adapter factories that bridge the server-side registry/service state into the
  * narrow interfaces that CapRouteResolver (in @camstack/system) requires.
@@ -13,10 +12,6 @@
  *   hub child   → 'hub/<runnerId>' → not an agent
  *   agent       → bare id with no '/' → agent
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodeCapAuthority = createNodeCapAuthority;
-exports.createInProcessProviderLookup = createInProcessProviderLookup;
-exports.createHubResidentProviderLookup = createHubResidentProviderLookup;
 /**
  * Build a NodeCapAuthority backed by a HubNodeRegistry.
  *
@@ -32,7 +27,7 @@ exports.createHubResidentProviderLookup = createHubResidentProviderLookup;
  * child under an agent provides a cap (the agent flattens its subtree into
  * one merged manifest). The agent resolves its own child locally (Task 6).
  */
-function createNodeCapAuthority(nodeRegistry, resolver) {
+export function createNodeCapAuthority(nodeRegistry, resolver) {
     return {
         nodeKnowsCap(nodeId, capName) {
             // Check system (manifest) caps first
@@ -102,7 +97,7 @@ function createNodeCapAuthority(nodeRegistry, resolver) {
  * Function (implicit `any` return); calling via `fn.call(provider, args)` is
  * then safe and the result is captured as `unknown`. No `as` casts anywhere.
  */
-function createInProcessProviderLookup(capabilityService) {
+export function createInProcessProviderLookup(capabilityService) {
     return (capName) => {
         const provider = capabilityService.getSingletonForNode?.(capName, 'hub') ??
             capabilityService.getSingleton(capName);
@@ -126,7 +121,7 @@ function createInProcessProviderLookup(capabilityService) {
  * the hub landed on a remote agent whenever the hub's decoder runner was
  * circuit-broken). Wired into `CapRouteResolver.hubResidentProviders`.
  */
-function createHubResidentProviderLookup(capabilityService) {
+export function createHubResidentProviderLookup(capabilityService) {
     return (capName) => {
         const provider = capabilityService.getSingletonForNode?.(capName, 'hub');
         if (provider === null || provider === undefined)

package/dist/core/moleculer/hub-mesh-guard.js

@@ -1,6 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HubMeshGuard = void 0;
 /**
  * The hub's mesh guard (D802, D857) — the one object that decides whether
  * another node may talk to the hub.
@@ -14,20 +11,20 @@ exports.HubMeshGuard = void 0;
  *
  * Kept out of `moleculer.service.ts` so that file only wires it.
  */
-const system_1 = require("@camstack/system");
+import { createMeshAccessMiddleware, isProcessVerifiedMeshPeer, MeshIdentityGate, } from '@camstack/system';
 /** At most one "refused" line per node per this long. */
 const REFUSED_LOG_INTERVAL_MS = 60_000;
-class HubMeshGuard {
+export class HubMeshGuard {
     ownNodeId;
     logger;
     now;
     gate;
     lastLoggedAt = new Map();
-    constructor(ownNodeId, logger, now = Date.now, isVerifiedPeer = system_1.isProcessVerifiedMeshPeer) {
+    constructor(ownNodeId, logger, now = Date.now, isVerifiedPeer = isProcessVerifiedMeshPeer) {
         this.ownNodeId = ownNodeId;
         this.logger = logger;
         this.now = now;
-        this.gate = new system_1.MeshIdentityGate({
+        this.gate = new MeshIdentityGate({
             ownNodeId,
             isVerifiedPeer,
             onRefused: (nodeId, what) => this.noteRefused(nodeId, what),
@@ -35,7 +32,7 @@ class HubMeshGuard {
     }
     /** The middleware the hub broker must be constructed with. */
     middleware() {
-        return (0, system_1.createMeshAccessMiddleware)({
+        return createMeshAccessMiddleware({
             ownNodeId: this.ownNodeId,
             gate: this.gate,
             logger: {
@@ -59,4 +56,3 @@ class HubMeshGuard {
             'System → Cluster → Agents', { tags: { nodeId }, meta: { firstCall: what } });
     }
 }
-exports.HubMeshGuard = HubMeshGuard;