@camstack/system 1.0.4 → 1.0.6

package/dist/addon-runner.js

@@ -1,10 +1,12 @@
 const require_chunk = require("./chunk-Cek0wNdY.js");
-const require_manifest_python_deps = require("./manifest-python-deps-D1DbAQEv.js");
+const require_manifest_python_deps = require("./manifest-python-deps-B4BmMoGT.js");
 let node_fs = require("node:fs");
 node_fs = require_chunk.__toESM(node_fs);
 let node_path = require("node:path");
 node_path = require_chunk.__toESM(node_path);
 let _camstack_types = require("@camstack/types");
+let node_url = require("node:url");
+let node_module = require("node:module");
 //#region src/kernel/moleculer/worker-device-restore.ts
 /**
 * Worker-side device restore helper.
@@ -88,6 +90,22 @@ async function runWorkerDeviceRestoreWithRetry(addon, context, addonId, sourceNo
 	}
 }
 //#endregion
+//#region src/kernel/moleculer/register-framework-resolver.ts
+/**
+* Register the ESM resolver hook so this runner's addon imports of the
+* host-provided packages (@camstack/system, @camstack/shm-ring, …) resolve from
+* `frameworkDir/node_modules` instead of failing to walk up from the addon's
+* isolated `/data/addons/<addon>` folder. No-op in dev (frameworkDir unset),
+* where workspace symlinks already resolve the framework.
+*/
+function registerFrameworkResolver(frameworkDir) {
+	if (!frameworkDir) return;
+	(0, node_module.register)((0, node_url.pathToFileURL)(node_path.join(__dirname, "framework-resolver-hook.mjs")), {
+		parentURL: (0, node_url.pathToFileURL)(`${__dirname}/`).href,
+		data: { frameworkDir }
+	});
+}
+//#endregion
 //#region src/kernel/moleculer/child-cap-dispatch.ts
 /** Type guard narrowing a dynamically-read provider member to a callable method. */
 function isCapMethod(value) {
@@ -365,6 +383,7 @@ async function main() {
 		process.exit(1);
 	}
 	console.log(`[addon-runner] Starting "${nodeId}" (UDS-only) with ${specs.length} addon(s): ${specs.map((s) => s.addonId).join(", ")}`);
+	registerFrameworkResolver(process.env["CAMSTACK_FRAMEWORK_DIR"]);
 	const loadedModules = [];
 	for (const spec of specs) try {
 		const { declaration, AddonClass } = await loadAddonModule(spec.addonId, spec.addonDir);
@@ -500,6 +519,13 @@ async function main() {
 				addonDataPlanes.set(addonId, endpoints);
 			} }
 		});
+		try {
+			const pkgRaw = JSON.parse(node_fs.readFileSync(node_path.join(spec.addonDir, "package.json"), "utf-8"));
+			await require_manifest_python_deps.installManifestNativeDeps(spec.addonDir, pkgRaw, context.logger);
+		} catch (nativeErr) {
+			console.error(`[addon-runner] native deps install failed for "${spec.addonId}": ${(0, _camstack_types.errMsg)(nativeErr)}`);
+			process.exit(1);
+		}
 		await require_manifest_python_deps.installManifestPythonDeps(declaration, spec.addonDir, context.deps, context.logger);
 		const registeredProviders = /* @__PURE__ */ new Map();
 		const initResult = (0, _camstack_types.normalizeAddonInitResult)(await addon.initialize(context));

package/dist/addon-runner.mjs

@@ -1,7 +1,9 @@
-import { $ as setWorkerNativeCapsChangeListener, A as createUdsLoggerWithControl, L as LocalChildClient, X as getWorkerNativeCapProvider, Z as getWorkerNativeCapSnapshot, dt as CustomActionRegistry, i as createUdsAddonContext, mt as resolveAddonClass, t as installManifestPythonDeps, tt as validateProviderRegistrations } from "./manifest-python-deps-DZsKTbs1.mjs";
+import { $ as setWorkerNativeCapsChangeListener, A as createUdsLoggerWithControl, L as LocalChildClient, X as getWorkerNativeCapProvider, Z as getWorkerNativeCapSnapshot, dt as CustomActionRegistry, ht as resolveAddonClass, i as createUdsAddonContext, mt as installManifestNativeDeps, t as installManifestPythonDeps, tt as validateProviderRegistrations } from "./manifest-python-deps-CXbKrOdk.mjs";
+import { register } from "node:module";
 import * as fs from "node:fs";
 import * as path$1 from "node:path";
 import { ReadinessRegistry, ReadinessTimeoutError, errMsg, normalizeAddonInitResult } from "@camstack/types";
+import { pathToFileURL } from "node:url";
 //#region src/kernel/moleculer/worker-device-restore.ts
 /**
 * Worker-side device restore helper.
@@ -85,6 +87,22 @@ async function runWorkerDeviceRestoreWithRetry(addon, context, addonId, sourceNo
 	}
 }
 //#endregion
+//#region src/kernel/moleculer/register-framework-resolver.ts
+/**
+* Register the ESM resolver hook so this runner's addon imports of the
+* host-provided packages (@camstack/system, @camstack/shm-ring, …) resolve from
+* `frameworkDir/node_modules` instead of failing to walk up from the addon's
+* isolated `/data/addons/<addon>` folder. No-op in dev (frameworkDir unset),
+* where workspace symlinks already resolve the framework.
+*/
+function registerFrameworkResolver(frameworkDir) {
+	if (!frameworkDir) return;
+	register(pathToFileURL(path$1.join(__dirname, "framework-resolver-hook.mjs")), {
+		parentURL: pathToFileURL(`${__dirname}/`).href,
+		data: { frameworkDir }
+	});
+}
+//#endregion
 //#region src/kernel/moleculer/child-cap-dispatch.ts
 /** Type guard narrowing a dynamically-read provider member to a callable method. */
 function isCapMethod(value) {
@@ -362,6 +380,7 @@ async function main() {
 		process.exit(1);
 	}
 	console.log(`[addon-runner] Starting "${nodeId}" (UDS-only) with ${specs.length} addon(s): ${specs.map((s) => s.addonId).join(", ")}`);
+	registerFrameworkResolver(process.env["CAMSTACK_FRAMEWORK_DIR"]);
 	const loadedModules = [];
 	for (const spec of specs) try {
 		const { declaration, AddonClass } = await loadAddonModule(spec.addonId, spec.addonDir);
@@ -497,6 +516,13 @@ async function main() {
 				addonDataPlanes.set(addonId, endpoints);
 			} }
 		});
+		try {
+			const pkgRaw = JSON.parse(fs.readFileSync(path$1.join(spec.addonDir, "package.json"), "utf-8"));
+			await installManifestNativeDeps(spec.addonDir, pkgRaw, context.logger);
+		} catch (nativeErr) {
+			console.error(`[addon-runner] native deps install failed for "${spec.addonId}": ${errMsg(nativeErr)}`);
+			process.exit(1);
+		}
 		await installManifestPythonDeps(declaration, spec.addonDir, context.deps, context.logger);
 		const registeredProviders = /* @__PURE__ */ new Map();
 		const initResult = normalizeAddonInitResult(await addon.initialize(context));