@camstack/system 1.2.458 → 1.2.460

package/dist/addon-runner.js

@@ -39,9 +39,9 @@ let node_vm = require("node:vm");
 node_vm = __toESM(node_vm);
 let node_fs_promises = require("node:fs/promises");
 let _trpc_client = require("@trpc/client");
+let _camstack_types_node = require("@camstack/types/node");
 let node_http = require("node:http");
 let node_events = require("node:events");
-let _camstack_types_node = require("@camstack/types/node");
 let node_module = require("node:module");
 let node_url = require("node:url");
 //#region src/kernel/addon-refused-error.ts
@@ -7885,13 +7885,13 @@ var CORAL_PCI_VENDOR = "0x1ac1";
 var CORAL_PCI_DEVICE = "0x089a";
 /** A unit the apex driver bound: `/sys/class/apex/apex_<N>` ↔ `/dev/apex_<N>`. */
 var APEX_ENTRY = /^apex_(\d+)$/;
-/**
-* Default install path of the libedgetpu delegate on the hub, provisioned
-* out-of-band by `/data/deps/edgetpu-install.sh` (it is a system shared
-* library, not a pip package). Overridable via `CAMSTACK_EDGETPU_LIB` — kept in
-* sync with the Python pool's own default in `inference_pool.py`.
-*/
-var DEFAULT_EDGETPU_LIB = "/data/deps/edgetpu/lib/libedgetpu.so.1";
+function currentDelegateHost() {
+	return {
+		platform: process.platform,
+		dataDir: (0, _camstack_types_node.nodeDataRootFromEnv)(process.env),
+		override: process.env[_camstack_types_node.EDGETPU_LIB_ENV]
+	};
+}
 function countUsbCorals(fsx) {
 	let count = 0;
 	for (const device of fsx.listUsbDevices()) {
@@ -7946,7 +7946,7 @@ function classifyPci(fsx) {
 * Returns `null` only when no Coral was found at all; a present-but-unusable
 * Coral is reported with its typed reason, never as absent (D393/D315).
 */
-function classifyCoralAccelerator(fsx) {
+function classifyCoralAccelerator(fsx, delegateHost = currentDelegateHost()) {
 	const usb = countUsbCorals(fsx);
 	const pci = classifyPci(fsx);
 	const units = [];
@@ -7977,8 +7977,10 @@ function classifyCoralAccelerator(fsx) {
 		type: "coral-edgetpu",
 		units
 	};
-	const libPath = process.env["CAMSTACK_EDGETPU_LIB"] ?? DEFAULT_EDGETPU_LIB;
-	if (fsx.exists(libPath)) return {
+	if ((0, _camstack_types_node.chooseEdgetpuDelegate)({
+		...delegateHost,
+		exists: (p) => fsx.exists(p)
+	}) !== null) return {
 		type: "coral-edgetpu",
 		units: [{
 			bus: "usb",
@@ -8987,6 +8989,19 @@ var AddonDepsManager = class {
 		const pythonPath = await this.ensurePython();
 		if (!pythonPath) throw new Error("Cannot install Python requirements: Python is not available");
 		await singleFlight(this.depsDir, "python-pip", () => (0, _camstack_types_node.installPythonRequirements)(pythonPath, requirementsFile, this.logger));
+		await this.stageNativeDepsDeclaredBy(requirementsFile);
+	}
+	/**
+	* The native library a requirements file says its packages need
+	* (`# camstack-native-dep: edgetpu-delegate`), staged under this node's
+	* deps dir. Runs on every call — not only the first pip install — so a
+	* node whose pip marker predates the line still gets the library. A
+	* platform without a build answers `unavailable` (logged, not thrown); a
+	* failed or tampered download throws, and provisioning reports it.
+	*/
+	async stageNativeDepsDeclaredBy(requirementsFile) {
+		if (!(0, _camstack_types_node.declaresEdgetpuDelegate)(node_fs.readFileSync(requirementsFile, "utf8"))) return;
+		await singleFlight(this.depsDir, "edgetpu-delegate", () => (0, _camstack_types_node.ensureEdgetpuDelegate)(this.nodeRoot, this.logger));
 	}
 	getDepsDir() {
 		return this.depsDir;

package/dist/addon-runner.mjs

@@ -16,9 +16,9 @@ import { monitorEventLoopDelay } from "node:perf_hooks";
 import * as vm from "node:vm";
 import { mkdir, rm, stat, unlink } from "node:fs/promises";
 import { TRPCClientError, createTRPCClient } from "@trpc/client";
+import { EDGETPU_LIB_ENV, chooseEdgetpuDelegate, declaresEdgetpuDelegate, ensureBinary, ensureEdgetpuDelegate, ensureFfmpeg, ensurePython, installPythonPackages, installPythonRequirements, nodeDataRootFromEnv } from "@camstack/types/node";
 import { createServer as createServer$1, request } from "node:http";
 import { once } from "node:events";
-import { ensureBinary, ensureFfmpeg, ensurePython, installPythonPackages, installPythonRequirements } from "@camstack/types/node";
 import { pathToFileURL } from "node:url";
 //#region src/kernel/addon-refused-error.ts
 /**
@@ -7861,13 +7861,13 @@ var CORAL_PCI_VENDOR = "0x1ac1";
 var CORAL_PCI_DEVICE = "0x089a";
 /** A unit the apex driver bound: `/sys/class/apex/apex_<N>` ↔ `/dev/apex_<N>`. */
 var APEX_ENTRY = /^apex_(\d+)$/;
-/**
-* Default install path of the libedgetpu delegate on the hub, provisioned
-* out-of-band by `/data/deps/edgetpu-install.sh` (it is a system shared
-* library, not a pip package). Overridable via `CAMSTACK_EDGETPU_LIB` — kept in
-* sync with the Python pool's own default in `inference_pool.py`.
-*/
-var DEFAULT_EDGETPU_LIB = "/data/deps/edgetpu/lib/libedgetpu.so.1";
+function currentDelegateHost() {
+	return {
+		platform: process.platform,
+		dataDir: nodeDataRootFromEnv(process.env),
+		override: process.env[EDGETPU_LIB_ENV]
+	};
+}
 function countUsbCorals(fsx) {
 	let count = 0;
 	for (const device of fsx.listUsbDevices()) {
@@ -7922,7 +7922,7 @@ function classifyPci(fsx) {
 * Returns `null` only when no Coral was found at all; a present-but-unusable
 * Coral is reported with its typed reason, never as absent (D393/D315).
 */
-function classifyCoralAccelerator(fsx) {
+function classifyCoralAccelerator(fsx, delegateHost = currentDelegateHost()) {
 	const usb = countUsbCorals(fsx);
 	const pci = classifyPci(fsx);
 	const units = [];
@@ -7953,8 +7953,10 @@ function classifyCoralAccelerator(fsx) {
 		type: "coral-edgetpu",
 		units
 	};
-	const libPath = process.env["CAMSTACK_EDGETPU_LIB"] ?? DEFAULT_EDGETPU_LIB;
-	if (fsx.exists(libPath)) return {
+	if (chooseEdgetpuDelegate({
+		...delegateHost,
+		exists: (p) => fsx.exists(p)
+	}) !== null) return {
 		type: "coral-edgetpu",
 		units: [{
 			bus: "usb",
@@ -8963,6 +8965,19 @@ var AddonDepsManager = class {
 		const pythonPath = await this.ensurePython();
 		if (!pythonPath) throw new Error("Cannot install Python requirements: Python is not available");
 		await singleFlight(this.depsDir, "python-pip", () => installPythonRequirements(pythonPath, requirementsFile, this.logger));
+		await this.stageNativeDepsDeclaredBy(requirementsFile);
+	}
+	/**
+	* The native library a requirements file says its packages need
+	* (`# camstack-native-dep: edgetpu-delegate`), staged under this node's
+	* deps dir. Runs on every call — not only the first pip install — so a
+	* node whose pip marker predates the line still gets the library. A
+	* platform without a build answers `unavailable` (logged, not thrown); a
+	* failed or tampered download throws, and provisioning reports it.
+	*/
+	async stageNativeDepsDeclaredBy(requirementsFile) {
+		if (!declaresEdgetpuDelegate(fs$1.readFileSync(requirementsFile, "utf8"))) return;
+		await singleFlight(this.depsDir, "edgetpu-delegate", () => ensureEdgetpuDelegate(this.nodeRoot, this.logger));
 	}
 	getDepsDir() {
 		return this.depsDir;

package/dist/addon-utils.mjs

@@ -1,3 +1,3 @@
-import { C as isModelDownloaded, S as isModelDownloadHttpError, _ as downloadFile, a as startEventLoopStallMonitor, f as ModelDownloadService, g as deleteModelFromDisk, h as collectModelFiles, i as attributeStall, l as parseRangeHeader, m as adoptModelRevisions, n as STALL_REPORT_MS, o as createFileDataPlaneHandler, p as ModelDownloadHttpError, r as STALL_TICK_MS, s as contentTypeFor, t as CustomActionRegistry, w as resolveFormatRevision, x as getModelFilePath, y as ensureModel } from "./custom-action-registry-stpC3Zy-.mjs";
+import { C as isModelDownloaded, S as isModelDownloadHttpError, _ as downloadFile, a as startEventLoopStallMonitor, f as ModelDownloadService, g as deleteModelFromDisk, h as collectModelFiles, i as attributeStall, l as parseRangeHeader, m as adoptModelRevisions, n as STALL_REPORT_MS, o as createFileDataPlaneHandler, p as ModelDownloadHttpError, r as STALL_TICK_MS, s as contentTypeFor, t as CustomActionRegistry, w as resolveFormatRevision, x as getModelFilePath, y as ensureModel } from "./custom-action-registry-DStvrQKI.mjs";
 import { i as renderCourtesyOverlayJpeg, n as courtesyCacheKey, r as renderCourtesyJpeg, t as COURTESY_DEFAULT_WIDTH } from "./snapshot-courtesy-CyFs1M3I.mjs";
 export { COURTESY_DEFAULT_WIDTH, CustomActionRegistry, ModelDownloadHttpError, ModelDownloadService, STALL_REPORT_MS, STALL_TICK_MS, adoptModelRevisions, attributeStall, collectModelFiles, contentTypeFor, courtesyCacheKey, createFileDataPlaneHandler, deleteModelFromDisk, downloadFile, ensureModel, getModelFilePath, isModelDownloadHttpError, isModelDownloaded, parseRangeHeader, renderCourtesyJpeg, renderCourtesyOverlayJpeg, resolveFormatRevision, startEventLoopStallMonitor };