@camstack/server 1.2.368 → 1.2.370

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

@@ -22,6 +22,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COLLECTION_ARRAY_METHODS = void 0;
 exports.aggregateCollectionCall = aggregateCollectionCall;
+exports.devicePinOf = devicePinOf;
+exports.pinnedDeviceCollectionCall = pinnedDeviceCollectionCall;
 exports.addonPinOf = addonPinOf;
 exports.pinnedCollectionCall = pinnedCollectionCall;
 exports.createCapRouterPrimitives = createCapRouterPrimitives;
@@ -142,6 +144,84 @@ async function aggregateCollectionCall(reg, capName, method, args) {
     const out = await fn(args);
     return Array.isArray(out) ? out : null;
 }
+/**
+ * A DEVICE collection cap — several providers PER DEVICE, mounted per device.
+ *
+ * `videoclips` is the one: `resolveCapMount` checks `scope: 'device' + kind:
+ * 'wrapper'` BEFORE `mode: 'collection'` and answers `device-scoped`, so
+ * {@link isGlobalCollection} is false for it and the `{ addonId }` pin above
+ * does not apply. Its pin is `provider`, read by
+ * `device-collection-dispatch.ts` on the tRPC path.
+ */
+function isDeviceCollection(reg, capName) {
+    const def = reg.getDefinition(capName);
+    if (def === undefined)
+        return false;
+    return def.mode === 'collection' && (0, types_1.resolveCapMount)(def).kind === 'device-scoped';
+}
+/**
+ * The `{ provider }` a DEVICE-collection call pins to, or `null`.
+ *
+ * The device twin of {@link addonPinOf}, and it exists because the same defect
+ * was found a THIRD time. `videoclips` has three providers on the operator's
+ * hub; the clip byte read named `provider-reolink` every time and was answered
+ * by the recorder, then — after a redeploy in a different order — by
+ * export-hap ("was not minted by the HomeKit source"), which is what a
+ * first-wins resolution looks like from outside.
+ *
+ * Two earlier fixes were each correct and each missed this path:
+ *   - D592 fixed the tRPC MOUNT, which a forked addon never reaches.
+ *   - D593 fixed the Moleculer transport link — but a hub-local runner is a
+ *     broker-less UDS child whose link chain is `[localProviderLink,
+ *     ipcParentLink]` with no `brokerTransportLink` at all
+ *     (`addon-context-factory.ts`), so it never ran there either.
+ *
+ * The call lands on the parent's `onUnownedCall`, where routing discards the
+ * selector by construction — `resolveCapRoute` takes only `nodeId`/`deviceId`
+ * — and `cap-child-index.ts` answers "first child wins".
+ *
+ * Unlike the global pin this DOES apply to array methods: naming the provider
+ * is required on `listClips` too (D554), and the narrowing happens inside
+ * `requireDeviceCollection`, which then decides fan-out vs scalar itself.
+ */
+function devicePinOf(reg, capName, args) {
+    if (!reg)
+        return null;
+    if (!isDeviceCollection(reg, capName))
+        return null;
+    if (args === null || typeof args !== 'object' || Array.isArray(args))
+        return null;
+    const rec = args;
+    if (typeof rec['deviceId'] !== 'number')
+        return null;
+    const pin = rec[types_1.PROVIDER_PIN_FIELD];
+    return typeof pin === 'string' && pin.length > 0 ? pin : null;
+}
+/**
+ * Run a pinned DEVICE-collection call through the SAME dispatcher the tRPC
+ * mount uses, so the two paths cannot answer differently.
+ *
+ * Nothing is re-implemented here on purpose: `requireDeviceCollection` already
+ * narrows to the pinned provider, refuses a pin the device is not bound to BY
+ * NAME (D552's rule), and picks fan-out or scalar afterwards. Re-deriving any
+ * of that here would be the fourth authority on one question.
+ *
+ * Boxed like {@link pinnedCollectionCall}: a device-collection method may
+ * legitimately answer `null`, which a bare return could not tell from "not
+ * handled".
+ */
+async function pinnedDeviceCollectionCall(reg, capName, method, args) {
+    if (devicePinOf(reg, capName, args) === null)
+        return null;
+    const dispatcher = (0, device_collection_dispatch_js_1.requireDeviceCollection)(reg, capName);
+    if (dispatcher === null)
+        return null;
+    const fn = dispatcher[method];
+    if (typeof fn !== 'function')
+        return null;
+    const call = fn;
+    return { value: await call(args) };
+}
 /**
  * The `{ addonId }` a call PINS to, or `null` when the call is not an
  * addon-pinned collection call and must route normally.

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

@@ -354,7 +354,14 @@ class MoleculerService {
                 // registered provider answers for a resource it does not own: HA's
                 // export read Homematic's `null` for `ha_001` and never opened a link
                 // (2026-08-09).
-                callPinnedCollection: (capName, method, args) => (0, cap_router_runtime_js_1.pinnedCollectionCall)(this.capabilityService.getRegistry(), capName, method, args),
+                //
+                // The DEVICE twin runs first: `videoclips` mounts `device-scoped`
+                // (scope+wrapper is checked before `mode`), so the global pin above
+                // does not see it, and its pin is `provider`. Without this a forked
+                // addon's clip byte read named `provider-reolink` and was answered by
+                // whichever child registered first — the recorder, then export-hap
+                // after a redeploy in a different order (2026-09-22, D594).
+                callPinnedCollection: async (capName, method, args) => (await (0, cap_router_runtime_js_1.pinnedDeviceCollectionCall)(this.capabilityService.getRegistry(), capName, method, args)) ?? (0, cap_router_runtime_js_1.pinnedCollectionCall)(this.capabilityService.getRegistry(), capName, method, args),
                 // Hub-core `$`-service discriminant for the general
                 // provider-not-yet-registered recovery. A resolver miss on a NON-core
                 // cap (any addon-provided system/singleton cap, e.g.
@@ -409,7 +416,15 @@ class MoleculerService {
                 // 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,
+                //
+                // BOTH pins, because this predicate and `callPinnedCollection` must
+                // agree about what counts as one. A pin the bypass does not recognise
+                // is short-circuited to the first sibling and never reaches the
+                // routing that would honour it — "honoured only there is honoured
+                // never", which is how the first attempt at the `addonId` fix failed
+                // live, and how the `provider` pin failed twice more (D592, D593).
+                isAddonPinnedCall: (capName, method, args) => (0, cap_router_runtime_js_1.addonPinOf)(this.capabilityService.getRegistry(), capName, method, args) !== null ||
+                    (0, cap_router_runtime_js_1.devicePinOf)(this.capabilityService.getRegistry(), capName, 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.368",
+  "version": "1.2.370",
   "private": false,
   "files": [
     "dist",
@@ -35,7 +35,7 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.251",
+    "@camstack/addon-admin-ui": "1.2.252",
     "@camstack/addon-agent-ui": "1.2.137",
     "@camstack/addon-auth": "1.2.123",
     "@camstack/addon-decoder-nodeav": "1.2.115",
@@ -44,8 +44,8 @@
     "@camstack/addon-pipeline-orchestrator": "1.2.240",
     "@camstack/addon-post-analysis": "1.2.273",
     "@camstack/sdk": "1.2.118",
-    "@camstack/system": "1.2.283",
-    "@camstack/types": "1.2.240",
+    "@camstack/system": "1.2.285",
+    "@camstack/types": "1.2.241",
     "@camstack/ui-library": "1.2.195",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",