@camstack/server 1.2.84 → 1.2.85

package/dist/api/trpc/cap-router-runtime.js

@@ -22,6 +22,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COLLECTION_ARRAY_METHODS = void 0;
 exports.aggregateCollectionCall = aggregateCollectionCall;
+exports.addonPinOf = addonPinOf;
 exports.pinnedCollectionCall = pinnedCollectionCall;
 exports.createCapRouterPrimitives = createCapRouterPrimitives;
 exports.createCapRouterServices = createCapRouterServices;
@@ -120,6 +121,35 @@ async function aggregateCollectionCall(reg, capName, method, args) {
     const out = await fn(args);
     return Array.isArray(out) ? out : null;
 }
+/**
+ * The `{ addonId }` a call PINS to, or `null` when the call is not an
+ * addon-pinned collection call and must route normally.
+ *
+ * ONE definition, because there are two places that must agree about it and
+ * they are in different packages. `LocalChildRegistry` decides whether to
+ * short-circuit a child's egress to a local sibling — and that decision happens
+ * BEFORE `onUnownedCall` runs, so a pin honoured only there is honoured never.
+ * That is precisely how the first attempt at this fix failed on the live hub:
+ * the handler was correct and unreachable, and the probe that proved it was a
+ * DELIBERATELY BOGUS addonId — refused if the selector routes, answered `null`
+ * if it is discarded. It came back `null`.
+ *
+ * Not an array method (that contract is the union) and not a non-collection cap
+ * (there `addonId` is provider DATA: `addons.getLogs({addonId})` names the addon
+ * whose logs you want, it does not name a provider).
+ */
+function addonPinOf(reg, capName, method, args) {
+    if (!reg)
+        return null;
+    if (reg.getDefinition(capName)?.mode !== 'collection')
+        return null;
+    if (exports.COLLECTION_ARRAY_METHODS.get(capName)?.includes(method) === true)
+        return null;
+    if (args === null || typeof args !== 'object' || Array.isArray(args))
+        return null;
+    const addonId = args['addonId'];
+    return typeof addonId === 'string' && addonId.length > 0 ? addonId : null;
+}
 /**
  * The `{ addonId }` PIN for a cap call arriving OUTSIDE the tRPC router — a
  * forked addon's `ctx.api.<cap>.<method>` reaching the parent's
@@ -160,20 +190,12 @@ async function aggregateCollectionCall(reg, capName, method, args) {
  * `null` legitimately, so a bare `null` could not be told from "not handled".
  */
 async function pinnedCollectionCall(reg, capName, method, args) {
-    if (!reg)
-        return null;
-    if (reg.getDefinition(capName)?.mode !== 'collection')
-        return null;
-    if (exports.COLLECTION_ARRAY_METHODS.get(capName)?.includes(method) === true)
-        return null;
-    if (args === null || typeof args !== 'object' || Array.isArray(args))
-        return null;
-    const addonId = args['addonId'];
-    if (typeof addonId !== 'string' || addonId.length === 0)
+    const addonId = addonPinOf(reg, capName, method, args);
+    if (addonId === null)
         return null;
-    const provider = reg.getProviderByAddonId(capName, addonId);
+    const provider = reg?.getProviderByAddonId(capName, addonId) ?? null;
     if (provider === null) {
-        const valid = reg.getProviderAddonIds(capName);
+        const valid = reg?.getProviderAddonIds(capName) ?? [];
         throw new Error(`Capability "${capName}" has no provider with addonId "${addonId}". ` +
             `Registered: ${valid.length > 0 ? valid.join(', ') : '(none)'}`);
     }

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

@@ -349,6 +349,14 @@ class MoleculerService {
                         return false;
                     return cap_router_runtime_js_1.COLLECTION_ARRAY_METHODS.get(capName)?.includes(method) === true;
                 },
+                // Same story for an explicit `{ addonId }` selector: the sibling
+                // short-circuit picks the FIRST-registered child, which is precisely
+                // what the selector exists to override. `onUnownedCall` then resolves
+                // the named provider via `callPinnedCollection`. Shares `addonPinOf`
+                // with it — the bypass and the routing must never disagree about what
+                // counts as a pin, or the call is bounced out of the sibling path and
+                // then routed by first-provider anyway.
+                isAddonPinnedCall: (capName, method, args) => (0, cap_router_runtime_js_1.addonPinOf)(this.capabilityService.getRegistry(), capName, method, args) !== null,
                 // Bound every UDS cap call by the cap's own declared timeout, falling
                 // back to the channel default. Same resolver the REMOTE plane uses
                 // below, so a method that survives 16 minutes across nodes survives it

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.84",
+  "version": "1.2.85",
   "private": false,
   "files": [
     "dist",
@@ -43,7 +43,7 @@
     "@camstack/addon-post-analysis": "1.2.56",
     "@camstack/sdk": "1.2.11",
     "@camstack/shm-ring": "1.1.9",
-    "@camstack/system": "1.2.71",
+    "@camstack/system": "1.2.72",
     "@camstack/types": "1.2.55",
     "@camstack/ui-library": "1.2.38",
     "@fastify/compress": "^9.0.0",