@camstack/server 1.1.42 → 1.1.43

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

@@ -5006,14 +5006,14 @@ function createCapRouter_pipelineExecutor(getProvider, createRemoteProxy) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.setVideoPipelineSteps(methodInput);
         }),
-        resetToDefault: trpc_middleware_js_1.adminProcedure
-            .input(types_76.pipelineExecutorCapability.methods.resetToDefault.input.loose())
-            .output(types_76.pipelineExecutorCapability.methods.resetToDefault.output)
+        clearDeviceOverrides: trpc_middleware_js_1.adminProcedure
+            .input(types_76.pipelineExecutorCapability.methods.clearDeviceOverrides.input.loose())
+            .output(types_76.pipelineExecutorCapability.methods.clearDeviceOverrides.output)
             .mutation(async ({ input, ctx }) => {
             const { nodeId, ...methodInput } = input;
             const p = resolveProvider('pipeline-executor', nodeId, () => getProvider(ctx), createRemoteProxy);
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-            return p.resetToDefault(methodInput);
+            return p.clearDeviceOverrides(methodInput);
         }),
         getSchema: trpc_middleware_js_1.protectedProcedure
             .input(zod_1.z.object({ nodeId: zod_1.z.string().optional() }).optional())
@@ -5120,15 +5120,6 @@ function createCapRouter_pipelineExecutor(getProvider, createRemoteProxy) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.deleteModel(methodInput);
         }),
-        detect: trpc_middleware_js_1.protectedProcedure
-            .input(types_76.pipelineExecutorCapability.methods.detect.input.loose())
-            .output(types_76.pipelineExecutorCapability.methods.detect.output)
-            .query(async ({ input, ctx }) => {
-            const { nodeId, ...methodInput } = input;
-            const p = resolveProvider('pipeline-executor', nodeId, () => getProvider(ctx), createRemoteProxy);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-            return p.detect(methodInput);
-        }),
         runPipeline: trpc_middleware_js_1.protectedProcedure
             .input(types_76.pipelineExecutorCapability.methods.runPipeline.input.loose())
             .output(types_76.pipelineExecutorCapability.methods.runPipeline.output)
@@ -5377,30 +5368,6 @@ function createCapRouter_pipelineOrchestrator(getProvider, _createRemoteProxy) {
             const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
             return p.getIngestOwner();
         }),
-        assignDecoder: trpc_middleware_js_1.adminProcedure
-            .input(types_77.pipelineOrchestratorCapability.methods.assignDecoder.input.loose())
-            .output(types_77.pipelineOrchestratorCapability.methods.assignDecoder.output)
-            .mutation(async ({ input, ctx }) => {
-            const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-            return p.assignDecoder(input);
-        }),
-        unassignDecoder: trpc_middleware_js_1.adminProcedure
-            .input(types_77.pipelineOrchestratorCapability.methods.unassignDecoder.input.loose())
-            .output(types_77.pipelineOrchestratorCapability.methods.unassignDecoder.output)
-            .mutation(async ({ input, ctx }) => {
-            const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-            return p.unassignDecoder(input);
-        }),
-        getDecoderAssignments: trpc_middleware_js_1.protectedProcedure
-            .input(zod_1.z.object({ nodeId: zod_1.z.string().optional() }).optional())
-            .output(types_77.pipelineOrchestratorCapability.methods.getDecoderAssignments.output)
-            .query(async ({ input, ctx }) => {
-            void input;
-            const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
-            return p.getDecoderAssignments();
-        }),
         assignAudio: trpc_middleware_js_1.adminProcedure
             .input(types_77.pipelineOrchestratorCapability.methods.assignAudio.input.loose())
             .output(types_77.pipelineOrchestratorCapability.methods.assignAudio.output)
@@ -5441,14 +5408,6 @@ function createCapRouter_pipelineOrchestrator(getProvider, _createRemoteProxy) {
             const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
             return p.getAudioAssignments();
         }),
-        getDecoderAssignment: trpc_middleware_js_1.protectedProcedure
-            .input(types_77.pipelineOrchestratorCapability.methods.getDecoderAssignment.input.loose())
-            .output(types_77.pipelineOrchestratorCapability.methods.getDecoderAssignment.output)
-            .query(async ({ input, ctx }) => {
-            const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
-            return p.getDecoderAssignment(input);
-        }),
         getAgentSettings: trpc_middleware_js_1.protectedProcedure
             .input(types_77.pipelineOrchestratorCapability.methods.getAgentSettings.input.loose())
             .output(types_77.pipelineOrchestratorCapability.methods.getAgentSettings.output)
@@ -5513,6 +5472,14 @@ function createCapRouter_pipelineOrchestrator(getProvider, _createRemoteProxy) {
             // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
             return p.setAgentReachableHost(input);
         }),
+        resetNodePipelineDefaults: trpc_middleware_js_1.adminProcedure
+            .input(types_77.pipelineOrchestratorCapability.methods.resetNodePipelineDefaults.input.loose())
+            .output(types_77.pipelineOrchestratorCapability.methods.resetNodePipelineDefaults.output)
+            .mutation(async ({ input, ctx }) => {
+            const p = requireCapProvider('pipeline-orchestrator', () => getProvider(ctx));
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument
+            return p.resetNodePipelineDefaults(input);
+        }),
         getCameraSettings: trpc_middleware_js_1.protectedProcedure
             .input(types_77.pipelineOrchestratorCapability.methods.getCameraSettings.input.loose())
             .output(types_77.pipelineOrchestratorCapability.methods.getCameraSettings.output)

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

@@ -30,6 +30,7 @@ function buildCapCallFn(deps) {
                     method,
                     args: params,
                     ...(deviceId !== undefined ? { deviceId } : {}),
+                    ...(deps.addonId !== undefined ? { addonId: deps.addonId } : {}),
                 };
                 return registry.callCapOnChild(deps.udsChildId, input);
             }

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

@@ -704,6 +704,7 @@ class MoleculerService {
             //   - resolver not yet built (pre-init) → legacy Moleculer call.
             const callFn = (0, cap_call_fn_js_1.buildCapCallFn)({
                 capName,
+                addonId,
                 nodeId,
                 udsChildId,
                 getLocalChildRegistry: () => this.localChildRegistry,
@@ -954,39 +955,44 @@ exports.MoleculerService = MoleculerService;
 // Module-level helpers
 // ---------------------------------------------------------------------------
 /**
- * E1: Adapt a child's UDS `ChildCapDescriptor[]` (which has no `addonId`) into
- * a `RegisterNodeParams` that `onRegisterNode` / `applyNodeManifest` can consume.
+ * E1: Adapt a child's UDS `ChildCapDescriptor[]` into a `RegisterNodeParams`
+ * that `onRegisterNode` / `applyNodeManifest` can consume.
  *
- * Strategy: use `childId` as the synthetic `addonId`. For currently-shipped addons
- * `childId = runnerId = addonId` (one-addon-one-process, no shared group), so the
- * `registryKey = childId` produced here matches what the Moleculer `$hub.registerNode`
- * path uses — making double-apply via both paths fully idempotent.
+ * Multi-addon manifest support (co-location): descriptors are grouped by the
+ * `addonId` each one carries, producing ONE `RegisteredAddonManifest` entry
+ * per hosted addon. A GROUPED runner (`execution.group`, e.g. `net-access`
+ * hosting cloudflare-tunnel + cloudflare-turn + tailscale-*) therefore
+ * registers each addon's caps under its REAL addon id — real provider
+ * registryKeys, per-addon settings/logs/restart, correct admin-UI display
+ * names. Before this, all of a group's caps collapsed under one synthetic
+ * `addonId = childId` (the group name) — the "@camstack/addon-net-access"
+ * admin-UI bug. A legacy child that omits `addonId` falls back to `childId`,
+ * which is identical to the historical single-addon behaviour
+ * (childId = runnerId = addonId when no group is declared).
  *
  * Singleton vs. device-scoped caps: `ChildCapDescriptor.deviceId` is present only
  * for device-scoped native caps. The `addons` array carries system (singleton/collection)
  * cap names; device-scoped native caps are handled separately via `nativeCaps` in the
- * full `RegisterNodeParams`. For the parallel-window phase (E1), we populate only
- * the `addons` portion — the Moleculer path carries `nativeCaps` on the re-handshake.
- *
- * TODO(co-location): This function synthesises ONE manifest entry with `addonId = childId`
- * (the runner id). This is correct under the current one-addon-one-process invariant
- * where `childId = runnerId = addonId`. If `execution.group` co-location is ever
- * activated (multiple addons sharing one runner), a single runner would host multiple
- * addonIds but this function would register all their caps under one synthetic addonId —
- * collapsing distinct provider registryKeys into one and breaking per-addon routing.
- * Multi-addon manifest support (splitting the `ChildCapDescriptor[]` by addonId once the
- * protocol carries addonId) would be needed here before enabling co-location post-Phase-F.
+ * full `RegisterNodeParams`.
  */
 function buildChildUdsManifest(nodeId, childId, caps) {
-    // Collect unique system (non-device-scoped) cap names.
-    const systemCapNames = new Set();
+    // Group unique system (non-device-scoped) cap names per hosted addon.
+    // Insertion order preserves the child's registration order.
+    const capsByAddon = new Map();
     for (const cap of caps) {
-        if (cap.deviceId === undefined) {
-            systemCapNames.add(cap.capName);
-        }
+        if (cap.deviceId !== undefined)
+            continue;
+        const addonId = cap.addonId ?? childId;
+        const set = capsByAddon.get(addonId) ?? new Set();
+        set.add(cap.capName);
+        capsByAddon.set(addonId, set);
+    }
+    // A child with no system caps still registers an (empty) entry under its
+    // childId so node bookkeeping (previous-manifest diffing, disconnect
+    // cleanup) keeps a record for the node.
+    if (capsByAddon.size === 0) {
+        capsByAddon.set(childId, new Set());
     }
-    const addons = [
-        { addonId: childId, capabilities: [...systemCapNames] },
-    ];
+    const addons = [...capsByAddon.entries()].map(([addonId, capNames]) => ({ addonId, capabilities: [...capNames] }));
     return { nodeId, addons };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "private": false,
   "files": [
     "dist",
@@ -24,6 +24,7 @@
   "dependencies": {
     "@camstack/addon-admin-ui": "*",
     "@camstack/addon-advanced-notifier": "*",
+    "@camstack/addon-auth": "*",
     "@camstack/addon-decoder-nodeav": "*",
     "@camstack/addon-notifiers": "*",
     "@camstack/addon-pipeline": "*",