@camstack/server 1.1.41 → 1.1.43

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

@@ -25,7 +25,6 @@ exports.createCapRouterPrimitives = createCapRouterPrimitives;
 exports.createCapRouterServices = createCapRouterServices;
 exports.buildRuntimeCapRouters = buildRuntimeCapRouters;
 const system_1 = require("@camstack/system");
-const types_1 = require("@camstack/types");
 const server_1 = require("@trpc/server");
 const cap_mount_helpers_js_1 = require("./cap-mount-helpers.js");
 const trpc_middleware_js_1 = require("./trpc.middleware.js");
@@ -38,7 +37,7 @@ const trpc_middleware_js_1 = require("./trpc.middleware.js");
 exports.COLLECTION_ARRAY_METHODS = computeArrayMethods();
 function computeArrayMethods() {
     const out = new Map();
-    for (const def of types_1.ALL_CAPABILITY_DEFINITIONS) {
+    for (const def of system_1.ALL_CAPABILITY_DEFINITIONS) {
         if (def.mode !== 'collection')
             continue;
         const names = [];
@@ -46,7 +45,7 @@ function computeArrayMethods() {
             const m = schema;
             if (m.kind === 'subscription')
                 continue;
-            if ((0, types_1.isArrayOutputSchema)(m.output))
+            if ((0, system_1.isArrayOutputSchema)(m.output))
                 names.push(name);
         }
         if (names.length > 0)

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/api/trpc/scope-access.js

@@ -24,7 +24,7 @@ exports.checkScopeAccess = checkScopeAccess;
  *      method's required `access` flavour.
  *   4. No matching scope → FORBIDDEN with a human-readable reason.
  */
-const types_1 = require("@camstack/types");
+const system_1 = require("@camstack/system");
 /**
  * Pull `deviceId` off a tRPC request input. Device-scope cap methods
  * uniformly take `{deviceId: number, ...}` per the DeviceProxy contract,
@@ -51,7 +51,7 @@ function effectiveDeviceIds(deviceId, getAncestors) {
     return [...out];
 }
 function checkScopeAccess(scopes, path, input, getDeviceAncestors) {
-    const meta = types_1.METHOD_ACCESS_MAP[path];
+    const meta = system_1.METHOD_ACCESS_MAP[path];
     if (!meta) {
         return { ok: false, reason: `Unknown method '${path}' — codegen drift` };
     }

package/dist/api/trpc/trpc.middleware.js

@@ -8,7 +8,7 @@ exports.iterableSubscription = iterableSubscription;
 exports.iterableInterval = iterableInterval;
 const server_1 = require("@trpc/server");
 const superjson_1 = __importDefault(require("superjson"));
-const types_1 = require("@camstack/types");
+const system_1 = require("@camstack/system");
 const scope_access_js_1 = require("./scope-access.js");
 const cap_route_error_formatter_js_1 = require("./cap-route-error-formatter.js");
 const t = server_1.initTRPC.context().create({
@@ -102,7 +102,7 @@ exports.protectedProcedure = t.procedure.use(async ({ ctx, next, path, getRawInp
     // Hand-written core route — no cap entry. Authentication has already
     // passed; defer further gating to any explicit `adminProcedure`
     // chained on top of this one.
-    if (!(path in types_1.METHOD_ACCESS_MAP)) {
+    if (!(path in system_1.METHOD_ACCESS_MAP)) {
         return next({ ctx: { ...ctx, user: ctx.user } });
     }
     // Device-scope caps may be gated by a `device:N` scope. Resolve the

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

@@ -50,8 +50,8 @@ const fs = __importStar(require("node:fs"));
 const node_url_1 = require("node:url");
 const addon_settings_provider_js_1 = require("./addon-settings-provider.js");
 const addon_call_gateway_js_1 = require("./addon-call-gateway.js");
+const system_5 = require("@camstack/system");
 const types_2 = require("@camstack/types");
-const types_3 = require("@camstack/types");
 /**
  * Type predicate: true when an `ISettingsBackend` also satisfies the
  * sync `ISettingsStore` contract (system/addon/device key-value ops)
@@ -355,7 +355,7 @@ class AddonRegistryService {
         // Register the addon-settings singleton provider — replaces the
         // former `$addonHost` Moleculer service. The provider resolves
         // addonId → local addon instance (hub) or remote Moleculer call.
-        this.capabilityRegistry.declareCapability(types_2.addonSettingsCapability);
+        this.capabilityRegistry.declareCapability(system_5.addonSettingsCapability);
         // The SINGLE router for addon-level calls (routes / custom / settings).
         // It classifies in-process | hub-local-child (UDS) | remote-agent
         // (Moleculer) in ONE place — `resolveNode` reports only the BASE node
@@ -2592,7 +2592,7 @@ class AddonRegistryService {
         let chain = this.disposerChains.get(addonId);
         if (chain == null) {
             const log = this.loggingService.createLogger().withTags({ addonId });
-            chain = new types_3.DisposerChain({
+            chain = new types_2.DisposerChain({
                 onError: (err, index) => {
                     log.error(`Disposer #${index} threw during teardown`, {
                         meta: { error: (0, types_1.errMsg)(err) },

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,
@@ -717,7 +718,7 @@ class MoleculerService {
                 },
             });
             const proxy = { id: addonId, nodeId };
-            for (const methodName of Object.keys((0, types_1.expandCapMethods)(capDef))) {
+            for (const methodName of Object.keys((0, system_1.expandCapMethods)(capDef))) {
                 proxy[methodName] = (methodParams) => callFn(methodName, methodParams);
             }
             registry.registerProvider(capName, registryKey, proxy);
@@ -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/dist/main.js

@@ -57,7 +57,10 @@ const auth_service_1 = require("./core/auth/auth.service");
 // `npx tsx scripts/generate-capability-router-types.ts`. The previous
 // hand-curated list silently dropped caps (zones, zone-rules,
 // zone-analytics, audio-metrics — see git for the regression).
-const types_1 = require("@camstack/types");
+// Sourced from `@camstack/system` (not `@camstack/types`) so the hub's
+// capability surface refreshes on `camstack deploy packages/system` with no new
+// server image. `@camstack/types` is never deployed to the hub.
+const system_1 = require("@camstack/system");
 const stream_probe_service_1 = require("./core/streaming/stream-probe.service");
 const feature_service_1 = require("./core/feature/feature.service");
 const agent_registry_service_1 = require("./core/agent/agent-registry.service");
@@ -79,7 +82,7 @@ const auth_whoami_1 = require("./api/auth-whoami");
 const session_cookie_js_1 = require("./auth/session-cookie.js");
 const health_routes_1 = require("./api/health/health.routes");
 const oauth2_routes_js_1 = require("./api/oauth2/oauth2-routes.js");
-const system_1 = require("@camstack/system");
+const system_2 = require("@camstack/system");
 const boot_config_1 = require("./boot/boot-config");
 const manual_boot_1 = require("./manual-boot");
 const post_boot_service_1 = require("./boot/post-boot.service");
@@ -238,8 +241,8 @@ async function bootstrap() {
     // If registration fails, start in degraded mode: serve a health warning endpoint.
     // Instantiate new core services
     const loggingService = app.get(logging_service_1.LoggingService);
-    const addonRouteRegistry = new system_1.AddonRouteRegistry();
-    const dataPlaneRegistry = new system_1.DataPlaneRegistry();
+    const addonRouteRegistry = new system_2.AddonRouteRegistry();
+    const dataPlaneRegistry = new system_2.DataPlaneRegistry();
     // Use Fastify-managed notification/toast wrappers (globally provided by NotificationModule)
     const { NotificationServiceWrapper } = await Promise.resolve().then(() => __importStar(require('./core/notification/notification-wrapper.service')));
     const { ToastServiceWrapper } = await Promise.resolve().then(() => __importStar(require('./core/notification/toast-wrapper.service')));
@@ -260,7 +263,7 @@ async function bootstrap() {
     // from forked workers / agents) find their definition during
     // onModuleInit. The list comes from the codegen — see the import
     // comment above for the rationale.
-    for (const capDef of types_1.ALL_CAPABILITY_DEFINITIONS) {
+    for (const capDef of system_1.ALL_CAPABILITY_DEFINITIONS) {
         capabilityRegistry.declareCapability(capDef);
     }
     // Hub-internal `sso-bridge` provider — gives auth-provider addons
@@ -730,7 +733,7 @@ async function bootstrap() {
                 const upstreamPath = `/${subPath}${queryString}`;
                 // Take over the socket — `proxyToUpstream` drives the raw response.
                 reply.hijack();
-                (0, system_1.proxyToUpstream)({
+                (0, system_2.proxyToUpstream)({
                     baseUrl: dpMatch.endpoint.baseUrl,
                     secret: dpMatch.endpoint.secret,
                     upstreamPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.1.41",
+  "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": "*",