@camstack/server 1.2.600 → 1.2.602

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

@@ -345,6 +345,54 @@ function createCapRouterPrimitives() {
         iterableSubscription: trpc_middleware_js_1.iterableSubscription,
     };
 }
+/**
+ * `device-adoption` is collection-scoped: without an explicit `{ addonId }`
+ * pin the router must NOT fall through to the first registered provider.
+ * Resolve the owning addon from `integrationId` (most methods) or
+ * `camDeviceId` (`resync` only).
+ */
+async function inferDeviceAdoptionCollectionAddonPin(methodName, input, deps) {
+    const integrationId = typeof input.integrationId === 'string' && input.integrationId.length > 0
+        ? input.integrationId
+        : undefined;
+    const camDeviceId = typeof input.camDeviceId === 'number' && Number.isInteger(input.camDeviceId)
+        ? input.camDeviceId
+        : undefined;
+    if (methodName === 'resync' || (camDeviceId !== undefined && integrationId === undefined)) {
+        if (camDeviceId === undefined) {
+            throw new server_1.TRPCError({
+                code: 'BAD_REQUEST',
+                message: 'deviceAdoption.resync requires camDeviceId (owning addon is resolved from it) or an explicit addonId pin.',
+            });
+        }
+        const resolved = deps.resolveDeviceAddonId
+            ? await Promise.resolve(deps.resolveDeviceAddonId(camDeviceId))
+            : null;
+        if (resolved === null || resolved === '') {
+            throw new server_1.TRPCError({
+                code: 'BAD_REQUEST',
+                message: `deviceAdoption.${methodName}: device ${camDeviceId} not found — pass addonId explicitly.`,
+            });
+        }
+        return resolved;
+    }
+    if (integrationId !== undefined) {
+        const resolved = deps.resolveIntegrationAddonId
+            ? await Promise.resolve(deps.resolveIntegrationAddonId(integrationId))
+            : null;
+        if (resolved === null || resolved === '') {
+            throw new server_1.TRPCError({
+                code: 'BAD_REQUEST',
+                message: `deviceAdoption.${methodName}: unknown integrationId "${integrationId}" — pass addonId explicitly.`,
+            });
+        }
+        return resolved;
+    }
+    throw new server_1.TRPCError({
+        code: 'BAD_REQUEST',
+        message: `deviceAdoption.${methodName} requires addonId (top-level pin) or integrationId to resolve the owning provider.`,
+    });
+}
 /** Build the `services` half of `buildCapRouters(primitives, services)`. */
 function createCapRouterServices(deps) {
     const reg = deps.capabilityRegistry;
@@ -419,10 +467,16 @@ function createCapRouterServices(deps) {
                 `An unresolvable addonId is refused rather than answered by another provider.`,
         });
     };
+    const inferCollectionAddonPin = (capName, methodName, methodInput) => {
+        if (capName !== 'device-adoption')
+            return undefined;
+        return inferDeviceAdoptionCollectionAddonPin(methodName, methodInput, deps);
+    };
     return {
         getLocalProvider,
         remoteProxy,
         rejectUnresolvedAddonPin,
+        inferCollectionAddonPin,
         noProvider: (capName, nodeId) => {
             if (nodeId !== undefined && nodeId !== 'hub') {
                 throw new server_1.TRPCError({

package/dist/api/trpc/generated-cap-mounts.js

@@ -186,8 +186,15 @@ function mountAllCaps(services) {
         decoder: (0, generated_cap_routers_js_1.createCapRouter_decoder)((_ctx) => reg?.getSingleton('decoder') ?? null, remoteCapProxy),
         detectionPipeline: (0, generated_cap_routers_js_1.createCapRouter_detectionPipeline)((_ctx) => (0, cap_mount_helpers_js_1.requireDeviceScoped)(reg, 'detection-pipeline'), remoteCapProxy),
         deviceAdminLink: (0, generated_cap_routers_js_1.createCapRouter_deviceAdminLink)((_ctx) => (0, cap_mount_helpers_js_1.requireDeviceScoped)(reg, 'device-admin-link'), remoteCapProxy),
-        deviceAdoption: (0, generated_cap_routers_js_1.createCapRouter_deviceAdoption)((_ctx) => reg?.getSingleton('device-adoption') ??
-            null, remoteCapProxy),
+        deviceAdoption: (0, generated_cap_routers_js_1.createCapRouter_deviceAdoption)((_ctx, addonId) => {
+            if (!reg)
+                return null;
+            if (addonId !== undefined) {
+                return reg.getProviderByAddonId('device-adoption', addonId);
+            }
+            const entries = reg.getCollectionEntries('device-adoption');
+            return entries[0]?.[1] ?? null;
+        }, remoteCapProxy),
         deviceCredentials: (0, generated_cap_routers_js_1.createCapRouter_deviceCredentials)((_ctx) => reg?.getSingleton('device-credentials') ?? null, remoteCapProxy),
         deviceDiscovery: (0, generated_cap_routers_js_1.createCapRouter_deviceDiscovery)((_ctx) => (0, cap_mount_helpers_js_1.requireDeviceScoped)(reg, 'device-discovery'), remoteCapProxy),
         deviceExport: (0, generated_cap_routers_js_1.createCapRouter_deviceExport)((_ctx, addonId) => {

package/dist/api/trpc/generated-cap-routers.js

@@ -2612,8 +2612,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_2.DEVICE_STATUS_METHOD.getStatus.input.loose())
             .output(types_2.DEVICE_STATUS_METHOD.getStatus.output)
             .query(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.getStatus(methodInput);
         }),
@@ -2621,8 +2621,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.listCandidateFilters.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.listCandidateFilters.output)
             .query(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.listCandidateFilters(methodInput);
         }),
@@ -2630,8 +2630,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.listCandidates.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.listCandidates.output)
             .query(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.listCandidates(methodInput);
         }),
@@ -2639,8 +2639,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.getCandidate.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.getCandidate.output)
             .query(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.getCandidate(methodInput);
         }),
@@ -2648,8 +2648,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.refresh.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.refresh.output)
             .mutation(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.refresh(methodInput);
         }),
@@ -2657,8 +2657,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.adopt.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.adopt.output)
             .mutation(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.adopt(methodInput);
         }),
@@ -2666,8 +2666,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.release.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.release.output)
             .mutation(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.release(methodInput);
         }),
@@ -2675,8 +2675,8 @@ function createCapRouter_deviceAdoption(getProvider, createRemoteProxy) {
             .input(types_45.deviceAdoptionCapability.methods.resync.input.loose())
             .output(types_45.deviceAdoptionCapability.methods.resync.output)
             .mutation(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx), createRemoteProxy);
+            const { nodeId, addonId, ...methodInput } = input;
+            const p = resolveProvider('device-adoption', nodeId, () => getProvider(ctx, addonId), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.resync(methodInput);
         }),
@@ -4314,6 +4314,42 @@ function createCapRouter_dishwasher(getProvider, createRemoteProxy) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.setHygienePlus(methodInput);
         }),
+        setExtraDry: trpc_middleware_js_1.protectedProcedure
+            .input(types_56.dishwasherCapability.methods.setExtraDry.input.loose())
+            .output(types_56.dishwasherCapability.methods.setExtraDry.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, ...methodInput } = input;
+            const p = resolveProvider('dishwasher', nodeId, () => getProvider(ctx), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.setExtraDry(methodInput);
+        }),
+        setIntensiveZone: trpc_middleware_js_1.protectedProcedure
+            .input(types_56.dishwasherCapability.methods.setIntensiveZone.input.loose())
+            .output(types_56.dishwasherCapability.methods.setIntensiveZone.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, ...methodInput } = input;
+            const p = resolveProvider('dishwasher', nodeId, () => getProvider(ctx), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.setIntensiveZone(methodInput);
+        }),
+        setVarioSpeedPlus: trpc_middleware_js_1.protectedProcedure
+            .input(types_56.dishwasherCapability.methods.setVarioSpeedPlus.input.loose())
+            .output(types_56.dishwasherCapability.methods.setVarioSpeedPlus.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, ...methodInput } = input;
+            const p = resolveProvider('dishwasher', nodeId, () => getProvider(ctx), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.setVarioSpeedPlus(methodInput);
+        }),
+        setChildLock: trpc_middleware_js_1.protectedProcedure
+            .input(types_56.dishwasherCapability.methods.setChildLock.input.loose())
+            .output(types_56.dishwasherCapability.methods.setChildLock.output)
+            .mutation(async ({ input, ctx }) => {
+            const { nodeId, ...methodInput } = input;
+            const p = resolveProvider('dishwasher', nodeId, () => getProvider(ctx), createRemoteProxy);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.setChildLock(methodInput);
+        }),
         setOption: trpc_middleware_js_1.protectedProcedure
             .input(types_56.dishwasherCapability.methods.setOption.input.loose())
             .output(types_56.dishwasherCapability.methods.setOption.output)

package/dist/api/trpc/trpc.router.js

@@ -296,11 +296,20 @@ function buildCapabilityRouters(services) {
     // (`import type`) — its value is never called; the codegen
     // `generated-cap-mounts.ts` / `generated-cap-routers.ts` remain the TYPE
     // source of record.
+    const integrationRegistry = services.addonRegistry.getIntegrationRegistry();
+    const deviceRegistry = services.addonRegistry.getDeviceRegistry();
     const dynamicCaps = (0, cap_router_runtime_js_1.buildRuntimeCapRouters)({
         capabilityRegistry: services.capabilityRegistry,
         moleculer: services.moleculer,
         serverProviders: buildServerProviders(services),
         logger: services.loggingService.createLogger('cap-router'),
+        resolveIntegrationAddonId: integrationRegistry
+            ? async (integrationId) => {
+                const row = await integrationRegistry.getIntegration(integrationId);
+                return row?.addonId ?? null;
+            }
+            : undefined,
+        resolveDeviceAddonId: (camDeviceId) => deviceRegistry.getAddonId(camDeviceId),
     });
     return {
         // ── Runtime-built cap routers: EVERY cap whose mount is

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

@@ -47,6 +47,7 @@ const path = __importStar(require("node:path"));
 const system_1 = require("@camstack/system");
 const types_1 = require("@camstack/types");
 const client_1 = require("@trpc/client");
+const hub_addon_api_js_1 = require("./hub-addon-api.js");
 const addon_call_gateway_js_1 = require("./addon-call-gateway.js");
 const addon_row_manifest_1 = require("./addon-row-manifest");
 const addon_settings_provider_js_1 = require("./addon-settings-provider.js");
@@ -336,29 +337,49 @@ class AddonRegistryService {
      */
     getBrokerApi() {
         if (!this.brokerApi) {
-            const reg = this.capabilityRegistry;
-            const resolver = {
-                getByName: (capName) => reg.getSingleton(capName) ?? reg.getAllProviders(capName)[0] ?? null,
-            };
-            const client = (0, client_1.createTRPCClient)({
-                links: [
-                    (0, system_1.localProviderLink)(resolver),
-                    // Device-scoped caps go through the hub's CapRouteResolver, which is
-                    // the only authority that can route `(cap, deviceId)` into a FORKED
-                    // child — and forked children are broker-less, so the Moleculer
-                    // lookup below cannot see them at all. Without this an in-process
-                    // addon asking `ptz.getOptions({deviceId})` got
-                    // `Service 'ptz.ptz.getOptions' is not found`, which is how the
-                    // autotrack builtin came up switched on and unable to move a camera
-                    // (2026-09-18).
-                    (0, system_1.deviceCapResolverLink)((capName, method, input) => this.moleculer.callCapabilityOnNode(this.moleculer.broker.nodeID, capName, method, input), isDeviceScopedCapName),
-                    (0, system_1.brokerTransportLink)(this.moleculer.broker),
-                ],
-            });
-            this.brokerApi = client;
+            this.brokerApi = this.buildBrokerApi(undefined);
         }
         return this.brokerApi;
     }
+    /**
+     * The `ctx.api` of one in-process addon. Same chain as {@link getBrokerApi},
+     * but its `localProviderLink` knows WHO is calling, so a caller-stamped cap
+     * (`device-history`, keychain, records) can identify the addon. A shared
+     * client cannot: `metrics-native` was refused `declareSeries` ("the caller
+     * addon could not be identified") on every sample.
+     */
+    getAddonApi(addonId) {
+        const cached = this.addonApis.get(addonId);
+        if (cached)
+            return cached;
+        const api = this.buildBrokerApi(addonId);
+        this.addonApis.set(addonId, api);
+        return api;
+    }
+    addonApis = new Map();
+    buildBrokerApi(callerAddonId) {
+        const reg = this.capabilityRegistry;
+        const resolver = {
+            getByName: (capName) => reg.getSingleton(capName) ?? reg.getAllProviders(capName)[0] ?? null,
+        };
+        // Device-scoped caps go through the hub's CapRouteResolver, which is
+        // the only authority that can route `(cap, deviceId)` into a FORKED
+        // child — and forked children are broker-less, so the Moleculer
+        // lookup below cannot see them at all. Without this an in-process
+        // addon asking `ptz.getOptions({deviceId})` got
+        // `Service 'ptz.ptz.getOptions' is not found`, which is how the
+        // autotrack builtin came up switched on and unable to move a camera
+        // (2026-09-18).
+        const links = [
+            (0, system_1.deviceCapResolverLink)((capName, method, input) => this.moleculer.callCapabilityOnNode(this.moleculer.broker.nodeID, capName, method, input), isDeviceScopedCapName),
+            (0, system_1.brokerTransportLink)(this.moleculer.broker),
+        ];
+        if (callerAddonId !== undefined) {
+            return (0, hub_addon_api_js_1.createHubAddonApi)({ resolver, callerAddonId, links });
+        }
+        const client = (0, client_1.createTRPCClient)({ links: [(0, system_1.localProviderLink)(resolver), ...links] });
+        return client;
+    }
     // Common settings resolver (3-level: defaults → global → per-device).
     // Lazily constructed on first call to `getSettingsResolver()` so tests
     // that don't exercise the settings API can instantiate the service
@@ -3013,7 +3034,7 @@ class AddonRegistryService {
             dataPlane: dataPlaneFacility.dataPlane,
             peerBytes: peerBytesFacility.peerBytes,
             get api() {
-                return registry.getBrokerApi();
+                return registry.getAddonApi(addonId);
             },
             integrationRegistry: this.integrationRegistry ?? undefined,
             // Live capability-collection accessor used by addons like stream-broker

package/dist/core/addon/hub-addon-api.js

@@ -0,0 +1,27 @@
+"use strict";
+/**
+ * The `ctx.api` of an in-process hub addon.
+ *
+ * Identity is the whole point: a caller-stamped capability (`device-history`,
+ * keychain, records) learns WHO is calling only from the `callerAddonId` its
+ * `localProviderLink` stamps, so each addon needs its own client — a shared one
+ * cannot say whose call it is.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHubAddonApi = createHubAddonApi;
+const client_1 = require("@trpc/client");
+const system_1 = require("@camstack/system");
+function createHubAddonApi(options) {
+    // The observer options carry the stamp only. Cap usage stays recorded on the
+    // callee side (`LocalChildRegistry`), so in-process calls are not counted
+    // here and the hub's usage graph keeps its meaning.
+    const observerOpts = {
+        callerAddonId: options.callerAddonId,
+        providerAddonIdForCap: () => null,
+        observer: () => undefined,
+    };
+    const client = (0, client_1.createTRPCClient)({
+        links: [(0, system_1.localProviderLink)(options.resolver, observerOpts), ...options.links],
+    });
+    return client;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.600",
+  "version": "1.2.602",
   "license": "MIT",
   "private": false,
   "files": [
@@ -38,19 +38,19 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.438",
-    "@camstack/addon-agent-ui": "1.2.244",
-    "@camstack/addon-auth": "1.2.149",
-    "@camstack/addon-decoder-nodeav": "1.2.123",
-    "@camstack/addon-notifiers": "1.2.601",
-    "@camstack/addon-pipeline": "1.2.601",
-    "@camstack/addon-pipeline-orchestrator": "1.2.602",
-    "@camstack/addon-post-analysis": "1.2.603",
-    "@camstack/develop": "0.1.13",
-    "@camstack/sdk": "1.2.133",
-    "@camstack/system": "1.2.451",
-    "@camstack/types": "1.2.383",
-    "@camstack/ui-library": "1.2.300",
+    "@camstack/addon-admin-ui": "1.2.439",
+    "@camstack/addon-agent-ui": "1.2.245",
+    "@camstack/addon-auth": "1.2.150",
+    "@camstack/addon-decoder-nodeav": "1.2.124",
+    "@camstack/addon-notifiers": "1.2.602",
+    "@camstack/addon-pipeline": "1.2.602",
+    "@camstack/addon-pipeline-orchestrator": "1.2.603",
+    "@camstack/addon-post-analysis": "1.2.607",
+    "@camstack/develop": "0.1.14",
+    "@camstack/sdk": "1.2.134",
+    "@camstack/system": "1.2.453",
+    "@camstack/types": "1.2.384",
+    "@camstack/ui-library": "1.2.301",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",