@camstack/server 1.2.683 → 1.2.685

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

@@ -341,6 +341,9 @@ class MoleculerService {
                 // owning runner, whose `getStatus` is the native slice. The SAME
                 // question the registry's resolvers ask, through the same method.
                 claimedStatus: (capName, deviceId) => this.resolveClaimedStatus(capName, deviceId),
+                // A covered device call the device's remote takes over (D963) — the
+                // same question the registry's wrappers and the other entries ask.
+                deviceCallRedirect: this.deviceCallRedirectHook(),
                 // `nodeIdMode: 'data'` signal: for these caps (`addon-settings`,
                 // `addons`, `nodes`, `pipeline-orchestrator`) an inline `args.nodeId`
                 // is provider DATA — the hub singleton dispatches internally — never a
@@ -446,6 +449,8 @@ class MoleculerService {
                 // sibling short-circuit can dispatch it to the owning child (D663, S3)
                 // — the same resolver the handler above and `callCapabilityOnNode` use.
                 claimedStatus: (capName, deviceId) => this.resolveClaimedStatus(capName, deviceId),
+                // The same device-call redirect, before the sibling short-circuit (D963).
+                deviceCallRedirect: this.deviceCallRedirectHook(),
                 // A collection ARRAY method must reach `onUnownedCall` (which fans it
                 // across every provider) instead of being short-circuited to ONE local
                 // sibling. Same predicate the aggregate itself uses, so the two agree
@@ -807,6 +812,21 @@ class MoleculerService {
             ? registry.resolveClaimedStatus(capName, deviceId)
             : Promise.resolve(system_1.UNCLAIMED);
     }
+    /**
+     * The device-call redirect (D963): `CapabilityRegistry.coversDeviceCall` /
+     * `redirectDeviceCall`, resolved at CALL time so a redirect installed after
+     * this entry was wired (core-blocks boots later) is honoured. Every entry
+     * that routes a device-scoped call by name asks it through
+     * `answerDeviceCallRedirect`.
+     */
+    deviceCallRedirectHook() {
+        return {
+            covers: (capName, method) => this.capabilityService.getRegistry()?.coversDeviceCall(capName, method) === true,
+            attempt: async (call) => (await this.capabilityService.getRegistry()?.redirectDeviceCall(call)) ?? {
+                kind: 'not-redirected',
+            },
+        };
+    }
     /**
      * Call a capability method on a specific node.
      *
@@ -833,6 +853,15 @@ class MoleculerService {
         const claimed = await (0, system_1.answerClaimedGetStatus)((capName, deviceId) => this.resolveClaimedStatus(capName, deviceId), { capName: capabilityName, method: methodName, args: params });
         if (claimed !== null)
             return claimed.slice;
+        // A covered device call the device's remote takes over (D963): the hub's
+        // own tRPC and every in-process `ctx.api` call arrive here with a pin.
+        const redirected = await (0, system_1.answerDeviceCallRedirect)(this.deviceCallRedirectHook(), {
+            capName: capabilityName,
+            method: methodName,
+            args: params,
+        });
+        if (redirected !== null)
+            return redirected.result;
         const resolver = this.resolver;
         if (resolver !== null) {
             // Extract deviceId from params so device-scoped native caps (ptz, motion-zones, …)

package/dist/main.js

@@ -71,6 +71,7 @@ const release_identity_1 = require("./core/release-identity");
 const runner_boot_check_1 = require("./core/runner-health/runner-boot-check");
 const hub_cluster_url_1 = require("./api/hub-cluster-url");
 const model_distributor_js_1 = require("./api/model-distributor.js");
+const form_body_js_1 = require("./api/data-plane/form-body.js");
 const oauth2_routes_js_1 = require("./api/oauth2/oauth2-routes.js");
 const embed_auth_route_js_1 = require("./auth/embed-auth-route.js");
 const live_user_js_1 = require("./auth/live-user.js");
@@ -1128,13 +1129,12 @@ async function bootstrap() {
                 }
                 if (shareHeaders !== null)
                     Object.assign(request.raw.headers, shareHeaders);
+                const replayBody = (0, form_body_js_1.dataPlaneReplayBody)(request.raw, request.body, addonGateLogger);
+                if (replayBody === null) {
+                    return reply.status(500).send({ error: 'Request body could not be forwarded' });
+                }
                 // Take over the socket — `proxyToUpstream` drives the raw response.
                 reply.hijack();
-                const replayBody = request.body === undefined
-                    ? undefined
-                    : Buffer.isBuffer(request.body)
-                        ? request.body
-                        : Buffer.from(typeof request.body === 'string' ? request.body : JSON.stringify(request.body));
                 (0, system_1.proxyToUpstream)({
                     baseUrl: dpMatch.endpoint.baseUrl,
                     secret: dpMatch.endpoint.secret,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.2.683",
+  "version": "1.2.685",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -49,10 +49,10 @@
     ]
   },
   "dependencies": {
-    "@camstack/addon-admin-ui": "1.2.511",
-    "@camstack/addon-agent-ui": "1.2.289",
+    "@camstack/addon-admin-ui": "1.2.513",
+    "@camstack/addon-agent-ui": "1.2.290",
     "@camstack/addon-auth": "1.2.170",
-    "@camstack/addon-benchmark": "1.2.288",
+    "@camstack/addon-benchmark": "1.2.289",
     "@camstack/addon-decoder-nodeav": "1.2.144",
     "@camstack/addon-notifiers": "1.2.623",
     "@camstack/addon-pipeline": "1.2.633",
@@ -60,9 +60,9 @@
     "@camstack/addon-post-analysis": "1.2.650",
     "@camstack/develop": "0.1.39",
     "@camstack/sdk": "1.2.154",
-    "@camstack/system": "1.2.514",
-    "@camstack/types": "1.2.440",
-    "@camstack/ui-library": "1.2.346",
+    "@camstack/system": "1.2.515",
+    "@camstack/types": "1.2.441",
+    "@camstack/ui-library": "1.2.348",
     "@fastify/compress": "^9.0.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/cors": "^11.2.0",