@camstack/server 1.0.8 → 1.1.1

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

@@ -128,6 +128,7 @@ function buildCapabilityRouters(services) {
         audioAnalyzer: (0, generated_cap_routers_1.createCapRouter_audioAnalyzer)((_ctx) => (0, cap_mount_helpers_js_1.requireSingleton)(services.capabilityRegistry, 'audio-analyzer'), (capName, nodeId) => services.moleculer.createCapabilityProxy(capName, nodeId)),
         audioCodec: (0, generated_cap_routers_1.createCapRouter_audioCodec)((_ctx) => (0, cap_mount_helpers_js_1.requireSingleton)(services.capabilityRegistry, 'audio-codec'), (capName, nodeId) => services.moleculer.createCapabilityProxy(capName, nodeId)),
         decoder: (0, generated_cap_routers_1.createCapRouter_decoder)((_ctx) => (0, cap_mount_helpers_js_1.requireSingleton)(services.capabilityRegistry, 'decoder'), (capName, nodeId) => services.moleculer.createCapabilityProxy(capName, nodeId)),
+        modelConvert: (0, generated_cap_routers_1.createCapRouter_modelConvert)((_ctx) => (0, cap_mount_helpers_js_1.requireSingleton)(services.capabilityRegistry, 'model-convert'), (capName, nodeId) => services.moleculer.createCapabilityProxy(capName, nodeId)),
         platformProbe: (0, generated_cap_routers_1.createCapRouter_platformProbe)((_ctx) => (0, cap_mount_helpers_js_1.requireSingleton)(services.capabilityRegistry, 'platform-probe'), (capName, nodeId) => services.moleculer.createCapabilityProxy(capName, nodeId)),
         // ── Cap overrides: hub-only, no remote fallback ─────────────────
         // The cap is intentionally single-node; agents are not directly

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

@@ -793,11 +793,11 @@ class AddonPackageService {
             // hub/node_modules/@camstack/ — addons resolve everything from
             // their own inlined deps.
             const addonsDir = this.resolveAddonsDir();
-            const { installPackageFromNpmSync } = await Promise.resolve().then(() => __importStar(require('@camstack/system')));
+            const { installPackageFromNpm } = await Promise.resolve().then(() => __importStar(require('@camstack/system')));
             const dirName = name.replace(/^@camstack\//, '');
             const targetDir = path.join(addonsDir, dirName);
             const packageSpec = version ? `${name}@${version}` : name;
-            installPackageFromNpmSync(packageSpec, targetDir);
+            await installPackageFromNpm(packageSpec, targetDir);
             updatedVersion = this.getInstalledPackageVersion(name);
             // Invalidate cache after update
             this.cachedUpdates = null;
@@ -1794,7 +1794,9 @@ async function packTarball(pkg, version, destRoot, registry) {
         await execFileAsync('npm', args, { timeout: 60_000, killSignal: 'SIGKILL' });
         const tgz = fs.readdirSync(dir).find((f) => f.endsWith('.tgz'));
         if (tgz === undefined) {
-            throw new Error(`download failed for ${pkg}@${version}: ${(0, types_1.errMsg)(httpErr)}`);
+            throw new Error(`download failed for ${pkg}@${version}: ${(0, types_1.errMsg)(httpErr)}`, {
+                cause: httpErr,
+            });
         }
         return path.join(dir, tgz);
     }

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

@@ -119,14 +119,14 @@ function parseSerializableRouteDescriptors(raw) {
             throw new Error('addon-routes: route descriptor is not an object');
         }
         const method = Reflect.get(entry, 'method');
-        const path = Reflect.get(entry, 'path');
-        if (typeof method !== 'string' || typeof path !== 'string') {
+        const routePath = Reflect.get(entry, 'path');
+        if (typeof method !== 'string' || typeof routePath !== 'string') {
             throw new Error('addon-routes: route descriptor missing method/path');
         }
         const description = Reflect.get(entry, 'description');
         return {
             method: asRouteMethod(method),
-            path,
+            path: routePath,
             access: asRouteAccess(Reflect.get(entry, 'access')),
             ...(typeof description === 'string' ? { description } : {}),
         };
@@ -2431,6 +2431,10 @@ class AddonRegistryService {
             capabilityRegistry: this.capabilityRegistry,
             streamProbe: kernelStreamProbe,
         });
+        // Captured for use inside the `ctx` object-literal getters/methods below
+        // (e.g. `get api()`), where `this` rebinds to the literal — an arrow can't
+        // be used for an accessor, so an explicit alias is required.
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
         const registry = this;
         const rr = this.moleculer.readinessRegistry;
         const capHandleCache = new Map();

package/dist/core/addon/addon-settings-provider.js

@@ -58,12 +58,16 @@ function createAddonSettingsProvider(deps) {
                 const addon = getAddon(input.addonId);
                 if (!addon || typeof addon.getGlobalSettings !== 'function')
                     return null;
-                const result = await addon.getGlobalSettings(input.overlay, input.cap);
+                // Pass the REQUESTED nodeId so an addon serving a cluster-central,
+                // per-node config (the store is hub-resident) can scope to that node —
+                // the hub addon answers for every node, so it must not assume "self".
+                const result = await addon.getGlobalSettings(input.overlay, input.cap, input.nodeId);
                 return result ? reshapeForOutput(result) : null;
             }
             return forkedGet(input.addonId, 'getGlobalSettings', {
                 ...(input.overlay ? { overlay: input.overlay } : {}),
                 ...(input.cap ? { cap: input.cap } : {}),
+                ...(input.nodeId ? { nodeId: input.nodeId } : {}),
             }, input.nodeId);
         },
         async updateGlobalSettings(input) {
@@ -72,10 +76,10 @@ function createAddonSettingsProvider(deps) {
                 if (!addon || typeof addon.updateGlobalSettings !== 'function') {
                     throw new Error(`Addon "${input.addonId}" does not implement updateGlobalSettings`);
                 }
-                await addon.updateGlobalSettings(input.patch);
+                await addon.updateGlobalSettings(input.patch, input.nodeId);
                 return { success: true };
             }
-            return forkedUpdate(input.addonId, 'updateGlobalSettings', { patch: input.patch }, input.nodeId);
+            return forkedUpdate(input.addonId, 'updateGlobalSettings', { patch: input.patch, ...(input.nodeId ? { nodeId: input.nodeId } : {}) }, input.nodeId);
         },
         async getDeviceSettings(input) {
             if (gateway.isInProcess(input.addonId, input.nodeId)) {

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

@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentRegistryService = void 0;
 const node_crypto_1 = require("node:crypto");
 const os = __importStar(require("node:os"));
+const system_1 = require("@camstack/system");
 const types_1 = require("@camstack/types");
 /** Per-call timeout for `$agent.*` RPC during reconciliation. */
 const AGENT_RECONCILE_RPC_TIMEOUT_MS = 8_000;
@@ -241,7 +242,14 @@ class AgentRegistryService {
         }
         try {
             const broker = this.broker;
-            const statusRaw = await broker.call('$agent.status', {}, {
+            // The reconcile fires the moment `$hub.registerNode` acks, which can race
+            // ahead of Moleculer's service-discovery INFO packet for the agent — a
+            // bare call then fails with "Service '$agent.status' is not found". Wrap
+            // it so a discovery miss waits for the `$agent` service (the framework's
+            // waitForServices primitive) and retries once, instead of giving up and
+            // leaving the agent unreconciled until the next connect. (No timers/backoff
+            // — that's banned for node readiness; this is the sanctioned primitive.)
+            const statusRaw = await (0, system_1.callWithServiceDiscovery)(broker, '$agent', '$agent.status', {}, {
                 nodeID: agentId,
                 timeout: AGENT_RECONCILE_RPC_TIMEOUT_MS,
             });

package/dist/core/auth/auth.service.js

@@ -3,8 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const system_1 = require("@camstack/system");
 class AuthService extends system_1.AuthManager {
-    constructor(config) {
-        super(config);
-    }
 }
 exports.AuthService = AuthService;

package/dist/core/config/config.service.js

@@ -3,8 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfigService = void 0;
 const system_1 = require("@camstack/system");
 class ConfigService extends system_1.ConfigManager {
-    constructor(configPath) {
-        super(configPath);
-    }
 }
 exports.ConfigService = ConfigService;

package/dist/core/feature/feature.service.js

@@ -3,8 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeatureService = void 0;
 const system_1 = require("@camstack/system");
 class FeatureService extends system_1.FeatureManager {
-    constructor(configService) {
-        super(configService);
-    }
 }
 exports.FeatureService = FeatureService;

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

@@ -266,18 +266,18 @@ class MoleculerService {
             // double-apply is idempotent (same nodeId + same caps → no-op on the second call).
             registry.onChildRegistered((child) => {
                 const hubNodeId = this.brokerSafe.nodeID;
-                const nodeId = `${hubNodeId}/${child.childId}`;
-                const params = buildChildUdsManifest(nodeId, child.childId, child.caps);
+                const childNodeId = `${hubNodeId}/${child.childId}`;
+                const params = buildChildUdsManifest(childNodeId, child.childId, child.caps);
                 this.onRegisterNode(params);
-                logger.info('UDS child registered — manifest applied', { meta: { nodeId } });
+                logger.info('UDS child registered — manifest applied', { meta: { nodeId: childNodeId } });
             });
             // E1: cleanup on child disconnect — same effect as `$node.disconnected`
             // for hub-local children. The Moleculer path stays for AGENT nodes.
             registry.onChildGone((childId) => {
                 const hubNodeId = this.brokerSafe.nodeID;
-                const nodeId = `${hubNodeId}/${childId}`;
+                const childNodeId = `${hubNodeId}/${childId}`;
                 logger.info('UDS child gone — removing from registry', { meta: { childId } });
-                this.removeNodeFromRegistry(nodeId);
+                this.removeNodeFromRegistry(childNodeId);
             });
             // B2: ingest UDS child logs into the hub's LoggingService so they appear
             // in the LogManager / admin-UI log stream alongside broker-forwarded logs.

package/dist/main.js

@@ -62,6 +62,7 @@ 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");
 const moleculer_service_1 = require("./core/moleculer/moleculer.service");
+const model_distributor_js_1 = require("./api/model-distributor.js");
 const addon_registry_service_1 = require("./core/addon/addon-registry.service");
 const addon_package_service_1 = require("./core/addon/addon-package.service");
 const repl_engine_service_1 = require("./core/repl/repl-engine.service");
@@ -293,6 +294,13 @@ async function bootstrap() {
     // so Moleculer re-advertises the service list to the network)
     const moleculer = app.get(moleculer_service_1.MoleculerService);
     moleculer.registerLogReceiver();
+    // Hub-internal `model-distributor` provider — pushes a model format that is
+    // resident on the hub `/data/models` to an agent's `/data/models` (Model
+    // Studio P2). Registered in the CapabilityRegistry (not just the tRPC
+    // router) so forked addons (addon-model-studio) can reach it via `ctx.api`,
+    // not only external HTTP clients. Needs the broker + the deploy-stage
+    // registry, which an addon can't access.
+    capabilityRegistry.registerProvider('model-distributor', '$hub', (0, model_distributor_js_1.buildModelDistributorProvider)(moleculer, loggingService));
     // ── Health routes (hub self + agent forwarding) ──────────────────
     // Registered after app.init() so the AgentRegistryService is wired and
     // the Moleculer broker is ready to forward `$agent.health` calls.
@@ -358,10 +366,10 @@ async function bootstrap() {
             trpcOptions: {
                 router: appRouter,
                 createContext: ({ req }) => (0, trpc_context_1.createTrpcContext)(req, authService, addonRegistry),
-                onError: ({ path, error, }) => {
+                onError: ({ path: trpcPath, error, }) => {
                     const trpcLogger = app.get(logging_service_1.LoggingService).createLogger('tRPC');
                     trpcLogger.warn('tRPC error', {
-                        meta: { code: error.code, path: path ?? '?', message: error.message },
+                        meta: { code: error.code, path: trpcPath ?? '?', message: error.message },
                     });
                     if (error.cause)
                         trpcLogger.warn('tRPC error cause', {
@@ -715,11 +723,11 @@ async function bootstrap() {
                     }
                 }
                 const qIdx = request.url.indexOf('?');
-                const query = qIdx >= 0 ? request.url.slice(qIdx) : '';
+                const queryString = qIdx >= 0 ? request.url.slice(qIdx) : '';
                 // Forward the FULL sub-path INCLUDING the prefix — the addon's facility
                 // multiplexes by prefix, so it strips the prefix itself. (`dpMatch.rest`
                 // is only used to pick the endpoint, not to rewrite the path.)
-                const upstreamPath = `/${subPath}${query}`;
+                const upstreamPath = `/${subPath}${queryString}`;
                 // Take over the socket — `proxyToUpstream` drives the raw response.
                 reply.hijack();
                 (0, system_1.proxyToUpstream)({
@@ -838,10 +846,10 @@ async function bootstrap() {
             wss,
             router: appRouter,
             createContext: (opts) => (0, trpc_context_1.createWsTrpcContext)(opts, authService, addonRegistry),
-            onError: ({ path, error, }) => {
+            onError: ({ path: trpcPath, error, }) => {
                 const trpcLogger = app.get(logging_service_1.LoggingService).createLogger('tRPC:ws');
                 trpcLogger.warn('tRPC error', {
-                    meta: { code: error.code, path: path ?? '?', message: error.message },
+                    meta: { code: error.code, path: trpcPath ?? '?', message: error.message },
                 });
                 if (error.cause)
                     trpcLogger.warn('tRPC error cause', {
@@ -899,8 +907,8 @@ async function bootstrap() {
     // no static file serving' warn that left the SPA unserved until next
     // restart.
     try {
-        const addonRegistry = app.get(addon_registry_service_1.AddonRegistryService);
-        const capRegistry = addonRegistry.getCapabilityRegistry();
+        const bootAddonRegistry = app.get(addon_registry_service_1.AddonRegistryService);
+        const capRegistry = bootAddonRegistry.getCapabilityRegistry();
         let adminUI = capRegistry?.getSingleton('admin-ui');
         // CAMSTACK_SKIP_ADMIN_UI_WAIT — bypass the 60s poll. Used by the
         // e2e harness, which doesn't need the SPA served and spawns hubs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/server",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "private": false,
   "files": [
     "dist",