c8y-nitro 0.10.3 → 0.10.4

package/dist/{autoBootstrap-DUjHuHe_.mjs → autoBootstrap-CElU3xv-.mjs}

@@ -1,5 +1,5 @@
 import { t as createC8yManifest } from "./manifest-DV3UW9Dl.mjs";
-import { a as findMicroserviceByName, d as updateMicroservice, l as subscribeToApplication, n as createBasicAuthHeader, o as getBootstrapCredentials, r as createMicroservice } from "./c8y-api-DSs1xIIh.mjs";
+import { h as updateMicroservice, l as findMicroserviceByName, o as createBasicAuthHeader, p as subscribeToApplication, s as createMicroservice, u as getBootstrapCredentials } from "./env-CM-t7BwA.mjs";
 import { t as writeBootstrapCredentials } from "./env-file-BrOTmVjA.mjs";
 import { join } from "node:path";
 import { mkdir, readFile, writeFile } from "node:fs/promises";

package/dist/{bootstrap-DrMjty-k.mjs → bootstrap-hV_pJO5R.mjs}

@@ -1,7 +1,7 @@
 import { t as createC8yManifest } from "./manifest-DV3UW9Dl.mjs";
-import { a as findMicroserviceByName, d as updateMicroservice, l as subscribeToApplication, n as createBasicAuthHeader, o as getBootstrapCredentials, r as createMicroservice } from "./c8y-api-DSs1xIIh.mjs";
+import { h as updateMicroservice, l as findMicroserviceByName, o as createBasicAuthHeader, p as subscribeToApplication, s as createMicroservice, u as getBootstrapCredentials } from "./env-CM-t7BwA.mjs";
 import { t as writeBootstrapCredentials } from "./env-file-BrOTmVjA.mjs";
-import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-BVQHqlgV.mjs";
+import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-4Ju9safS.mjs";
 import { defineCommand, runCommand } from "citty";
 import { consola } from "consola";
 //#region src/cli/commands/bootstrap.ts
@@ -54,7 +54,7 @@ var bootstrap_default = defineCommand({
 		consola.success(`Bootstrap credentials written to ${envFileName}`);
 		if (manifest.roles && manifest.roles.length > 0) {
 			if (await consola.prompt("Do you want to manage microservice roles for your development user?", { type: "confirm" })) {
-				const rolesCommand = await import("./roles-CNCObfa3.mjs").then((r) => r.default);
+				const rolesCommand = await import("./roles-D08LKKLI.mjs").then((r) => r.default);
 				await runCommand(rolesCommand, { rawArgs: [] });
 			}
 		}

package/dist/cli/index.mjs

@@ -1,4 +1,4 @@
-import { n as name, r as version, t as description } from "../package-Dqlz6AoZ.mjs";
+import { n as name, r as version, t as description } from "../package-WtwC9ClY.mjs";
 import { defineCommand, runMain } from "citty";
 //#region src/cli/index.ts
 const main = defineCommand({
@@ -8,9 +8,9 @@ const main = defineCommand({
 		description
 	},
 	subCommands: {
-		bootstrap: () => import("../bootstrap-DrMjty-k.mjs").then((r) => r.default),
-		roles: () => import("../roles-CNCObfa3.mjs").then((r) => r.default),
-		options: () => import("../options-54uJmuUV.mjs").then((r) => r.default),
+		bootstrap: () => import("../bootstrap-hV_pJO5R.mjs").then((r) => r.default),
+		roles: () => import("../roles-D08LKKLI.mjs").then((r) => r.default),
+		options: () => import("../options-Bif4gAIp.mjs").then((r) => r.default),
 		typegen: () => import("../typegen-BO_AkyNc.mjs").then((r) => r.default)
 	}
 });

package/dist/{client-BmSKIcuq.mjs → client-D8DbCxT6.mjs}

@@ -266,7 +266,7 @@ function useUserClient(requestOrEvent) {
 	const auth = new MicroserviceClientRequestAuth(headers);
 	const client = new Client(auth, process.env.C8Y_BASEURL);
 	const forwardedHost = request.headers.get("x-forwarded-host")?.split(",")[0]?.trim();
-	client.core.defaultHeaders["X-Forwarded-Host"] = forwardedHost || process.env.C8Y_BASEURL;
+	if (forwardedHost) client.core.defaultHeaders["X-Forwarded-Host"] = forwardedHost;
 	request.context ??= {};
 	request.context["c8y_user_client"] = client;
 	return client;

package/dist/{config-BVQHqlgV.mjs → config-4Ju9safS.mjs}

@@ -1,3 +1,4 @@
+import { i as toPrefixedEnvVar, n as resolveEnvFileNames, t as applyC8yNitroEnvVars } from "./env-CM-t7BwA.mjs";
 import { dirname } from "pathe";
 import { loadConfig, loadDotenv } from "c12";
 import process from "process";
@@ -11,20 +12,23 @@ function normalizeBaseUrl(baseUrl) {
 */
 async function loadC8yConfig() {
 	const cwd = process.cwd();
-	const env = await loadDotenv({
-		cwd,
-		fileName: [".env", ".env.local"]
-	});
 	const { config, _configFile } = await loadConfig({
 		configFile: "nitro.config",
 		cwd
 	});
 	if (!_configFile) throw new Error("No nitro.config file found. Please ensure you have a valid nitro.config file.");
 	const configDir = dirname(_configFile);
+	const c8yOptions = config.c8y;
+	const env = await loadDotenv({
+		cwd: configDir,
+		fileName: resolveEnvFileNames(configDir, c8yOptions?.envFile),
+		interpolate: true
+	});
+	applyC8yNitroEnvVars(env);
 	return {
 		env,
 		nitroConfig: config,
-		c8yOptions: config.c8y,
+		c8yOptions,
 		configDir,
 		configFile: _configFile
 	};
@@ -46,7 +50,7 @@ const REQUIRED_BOOTSTRAP_ENV_VARS = [
 */
 function validateBootstrapEnv(env) {
 	const missing = REQUIRED_BOOTSTRAP_ENV_VARS.filter((key) => !env[key]);
-	if (missing.length > 0) throw new Error(`Missing required environment variables:\n${missing.map((k) => `  - ${k}`).join("\n")}\n\nPlease set these in your .env or .env.local file.`);
+	if (missing.length > 0) throw new Error(`Missing required environment variables:\n${missing.map((k) => `  - ${k} (or ${toPrefixedEnvVar(k)})`).join("\n")}\n\nPlease set these in your .env or .env.local file (or a file configured via \`c8y.envFile\`).`);
 	return {
 		C8Y_BASEURL: normalizeBaseUrl(env.C8Y_BASEURL),
 		C8Y_DEVELOPMENT_TENANT: env.C8Y_DEVELOPMENT_TENANT,

package/dist/{c8y-api-DSs1xIIh.mjs → env-CM-t7BwA.mjs}

@@ -1,4 +1,8 @@
+import { resolve } from "pathe";
 import { Buffer } from "node:buffer";
+import { statSync } from "node:fs";
+import process from "node:process";
+import { setupDotenv } from "c12";
 //#region src/cli/utils/c8y-api.ts
 /**
 * Creates a Basic Auth header for Cumulocity API requests.
@@ -308,4 +312,75 @@ async function deleteTenantOption(baseUrl, category, key, authHeader) {
 	}
 }
 //#endregion
-export { findMicroserviceByName as a, getTenantOptionsByCategory as c, updateMicroservice as d, upsertTenantOption as f, deleteTenantOption as i, subscribeToApplication as l, createBasicAuthHeader as n, getBootstrapCredentials as o, createMicroservice as r, getCurrentApplicationSettings as s, assignUserRole as t, unassignUserRole as u };
+//#region src/cli/utils/env.ts
+/**
+* The project's own env files. Always loaded last so they override any
+* additional (e.g. monorepo-root) env files configured via `c8y.envFile`.
+*/
+const LOCAL_ENV_FILES = [".env", ".env.local"];
+/**
+* Env vars that also accept a `C8Y_NITRO_`-prefixed variant
+* (e.g. `C8Y_NITRO_DEVELOPMENT_USER`). The prefixed variant takes precedence,
+* so shared env files can carry c8y-nitro credentials without clashing with
+* other tools that read the generic `C8Y_*` names.
+*/
+const PREFIXABLE_ENV_VARS = [
+	"C8Y_BASEURL",
+	"C8Y_DEVELOPMENT_TENANT",
+	"C8Y_DEVELOPMENT_USER",
+	"C8Y_DEVELOPMENT_PASSWORD"
+];
+/**
+* Maps a `C8Y_*` variable name to its `C8Y_NITRO_*` variant.
+* @param name - Unprefixed variable name (e.g. `C8Y_DEVELOPMENT_USER`)
+*/
+function toPrefixedEnvVar(name) {
+	return name.replace(/^C8Y_/, "C8Y_NITRO_");
+}
+/**
+* Builds the ordered list of env files to load. Later entries override earlier
+* ones, so configured extra files (monorepo root) come first and the project's
+* own `.env`/`.env.local` last.
+*
+* Extra entries may point at a file (`../../.env`) or a directory (`../..`,
+* expanded to its `.env` and `.env.local`).
+*
+* @param cwd - Directory that relative entries are resolved against
+* @param envFile - Extra env file(s) or directory(ies) from `c8y.envFile`
+*/
+function resolveEnvFileNames(cwd, envFile) {
+	return [...(typeof envFile === "string" ? [envFile] : envFile ?? []).flatMap((entry) => {
+		const resolved = resolve(cwd, entry);
+		if (statSync(resolved, { throwIfNoEntry: false })?.isDirectory()) return LOCAL_ENV_FILES.map((fileName) => resolve(resolved, fileName));
+		return [resolved];
+	}), ...LOCAL_ENV_FILES];
+}
+/**
+* Applies `C8Y_NITRO_*` variants onto their unprefixed `C8Y_*` counterparts
+* (see {@link PREFIXABLE_ENV_VARS}). Mutates `env` in place; a set prefixed
+* variant always wins over the unprefixed value.
+* @param env - Environment variables object (e.g. `process.env` or a loaded `.env`)
+*/
+function applyC8yNitroEnvVars(env) {
+	for (const name of PREFIXABLE_ENV_VARS) {
+		const prefixed = env[toPrefixedEnvVar(name)];
+		if (prefixed) env[name] = prefixed;
+	}
+}
+/**
+* Loads the configured env files into `process.env` (existing real environment
+* variables are never overridden) and resolves `C8Y_NITRO_*` variants.
+* Used during Nitro dev mode, where only the project's own env files would be
+* picked up otherwise.
+* @param rootDir - Project root directory
+* @param envFile - Extra env file(s)/directory(ies) from `c8y.envFile`
+*/
+async function setupC8yDevEnv(rootDir, envFile) {
+	await setupDotenv({
+		cwd: rootDir,
+		fileName: resolveEnvFileNames(rootDir, envFile)
+	});
+	applyC8yNitroEnvVars(process.env);
+}
+//#endregion
+export { assignUserRole as a, deleteTenantOption as c, getCurrentApplicationSettings as d, getTenantOptionsByCategory as f, upsertTenantOption as g, updateMicroservice as h, toPrefixedEnvVar as i, findMicroserviceByName as l, unassignUserRole as m, resolveEnvFileNames as n, createBasicAuthHeader as o, subscribeToApplication as p, setupC8yDevEnv as r, createMicroservice as s, applyC8yNitroEnvVars as t, getBootstrapCredentials as u };

package/dist/{index-BEFoDy-y.d.mts → index-BOaWGoaf.d.mts}

@@ -605,6 +605,24 @@ interface C8yNitroModuleOptions {
    * @default false
    */
   enableTenantOptionsInvalidationRoute?: boolean;
+  /**
+   * Additional `.env` file(s) to load during development and for CLI commands,
+   * for example a shared monorepo-root env file.
+   *
+   * Entries are resolved relative to the project root (absolute paths work too)
+   * and may point at a file (`'../../.env'`) or a directory (`'../..'`, which
+   * loads its `.env` and `.env.local`).
+   *
+   * Precedence (highest first): real environment variables, the project's own
+   * `.env.local` and `.env`, then the entries here (later entries override
+   * earlier ones). Bootstrap credentials are still written to the project's
+   * own env file, keeping them per-microservice in a monorepo.
+   *
+   * Only used in dev mode and by the CLI - deployed microservices get their
+   * environment from the platform.
+   * @default []
+   */
+  envFile?: string | string[];
   /**
    * Disable auto-bootstrap during development.
    * When true, the module will not automatically register the microservice

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { n as C8yNitroModuleOptions } from "./index-BEFoDy-y.mjs";
+import { n as C8yNitroModuleOptions } from "./index-BOaWGoaf.mjs";
 import { t as TenantCredentials } from "./credentials-eKnJ7m9Y.mjs";
 import { NitroModule } from "nitro/types";
 //#region src/index.d.ts

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { a as GENERATED_INVALIDATE_TENANT_OPTIONS_ROUTE, i as C8Y_NITRO_TYPES_FILE, n as createC8yManifestFromNitro, o as GENERATED_LIVENESS_ROUTE, r as C8Y_NITRO_TYPES_DIR, s as GENERATED_READINESS_ROUTE, t as createC8yManifest } from "./manifest-DV3UW9Dl.mjs";
 import { t as writeAPIClient } from "./apiClient-kxv5KHYJ.mjs";
-import { t as autoBootstrap } from "./autoBootstrap-DUjHuHe_.mjs";
-import { n as name } from "./package-Dqlz6AoZ.mjs";
+import { r as setupC8yDevEnv } from "./env-CM-t7BwA.mjs";
+import { t as autoBootstrap } from "./autoBootstrap-CElU3xv-.mjs";
+import { n as name } from "./package-WtwC9ClY.mjs";
 import { basename, join, resolve } from "node:path";
 import { copyFile, mkdir, writeFile } from "node:fs/promises";
 import { x } from "tinyexec";
@@ -424,10 +425,14 @@ function c8y() {
 				exclude: [manifest.livenessProbe?.httpGet?.path, manifest.readinessProbe?.httpGet?.path].filter(Boolean)
 			});
 			await setupEvlog(nitro);
-			if (nitro.options.preset === "nitro-dev" && !options.skipBootstrap) await autoBootstrap(nitro);
+			if (nitro.options.preset === "nitro-dev") {
+				await setupC8yDevEnv(nitro.options.rootDir, options.envFile);
+				if (!options.skipBootstrap) await autoBootstrap(nitro);
+			}
 			await setupRuntimeConfig(nitro, options);
 			setupRuntime(nitro, manifest);
 			nitro.hooks.hook("dev:reload", async () => {
+				await setupC8yDevEnv(nitro.options.rootDir, options.envFile);
 				manifest = await createC8yManifestFromNitro(nitro);
 				setupRuntime(nitro, manifest);
 				if (!options.skipBootstrap) await autoBootstrap(nitro);

package/dist/{options-54uJmuUV.mjs → options-Bif4gAIp.mjs}

@@ -1,7 +1,7 @@
 import { t as createC8yManifest } from "./manifest-DV3UW9Dl.mjs";
-import { c as getTenantOptionsByCategory, f as upsertTenantOption, i as deleteTenantOption, n as createBasicAuthHeader, s as getCurrentApplicationSettings } from "./c8y-api-DSs1xIIh.mjs";
-import { n as readBootstrapCredentialsFromEnv, r as syncBootstrappedMicroservice } from "./autoBootstrap-DUjHuHe_.mjs";
-import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-BVQHqlgV.mjs";
+import { c as deleteTenantOption, d as getCurrentApplicationSettings, f as getTenantOptionsByCategory, g as upsertTenantOption, o as createBasicAuthHeader } from "./env-CM-t7BwA.mjs";
+import { n as readBootstrapCredentialsFromEnv, r as syncBootstrappedMicroservice } from "./autoBootstrap-CElU3xv-.mjs";
+import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-4Ju9safS.mjs";
 import process from "node:process";
 import { defineCommand } from "citty";
 import { consola } from "consola";

package/dist/{package-Dqlz6AoZ.mjs → package-WtwC9ClY.mjs}

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "c8y-nitro";
-var version = "0.10.3";
+var version = "0.10.4";
 var description = "Lightning fast Cumulocity IoT microservice development powered by Nitro";
 //#endregion
 export { name as n, version as r, description as t };

package/dist/{roles-CNCObfa3.mjs → roles-D08LKKLI.mjs}

@@ -1,6 +1,6 @@
 import { t as createC8yManifest } from "./manifest-DV3UW9Dl.mjs";
-import { n as createBasicAuthHeader, t as assignUserRole, u as unassignUserRole } from "./c8y-api-DSs1xIIh.mjs";
-import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-BVQHqlgV.mjs";
+import { a as assignUserRole, m as unassignUserRole, o as createBasicAuthHeader } from "./env-CM-t7BwA.mjs";
+import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-4Ju9safS.mjs";
 import { defineCommand } from "citty";
 import { consola } from "consola";
 //#region src/cli/commands/roles.ts

package/dist/runtime/handlers/invalidateTenantOptions.mjs

@@ -1,5 +1,5 @@
 import { t as createError } from "../../logging-BUYT8Z2V.mjs";
-import { t as useDeployedTenantClient } from "../../client-BmSKIcuq.mjs";
+import { t as useDeployedTenantClient } from "../../client-D8DbCxT6.mjs";
 import { c8yTenantOptionKeys } from "c8y-nitro/runtime";
 import { defineCachedFunction } from "nitro/cache";
 import { useRuntimeConfig } from "nitro/runtime-config";

package/dist/runtime/handlers/openapi.mjs

@@ -1,4 +1,4 @@
-import { r as tryGetUserTenantDomainFast } from "../../client-BmSKIcuq.mjs";
+import { r as tryGetUserTenantDomainFast } from "../../client-D8DbCxT6.mjs";
 import { c8yManifest } from "c8y-nitro/runtime";
 import { useRuntimeConfig } from "nitro/runtime-config";
 import { getRequestURL } from "nitro/h3";

package/dist/runtime/handlers/rewriteRequestUrl.mjs

@@ -1,4 +1,4 @@
-import { n as buildPublicRequestUrl, r as tryGetUserTenantDomainFast } from "../../client-BmSKIcuq.mjs";
+import { n as buildPublicRequestUrl, r as tryGetUserTenantDomainFast } from "../../client-D8DbCxT6.mjs";
 import { c8yManifest } from "c8y-nitro/runtime";
 import { defineMiddleware } from "nitro";
 //#region src/module/runtime/handlers/rewriteRequestUrl.ts

package/dist/types.d.mts

@@ -1,3 +1,3 @@
-import { a as C8YTenantOptionKey, c as C8yDockerOptions, d as C8YManifest, f as C8YManifestOptions, g as C8YAPIClientOptions, h as C8YKnownRole, i as C8YSettingsCategory, l as C8yCacheOptions, m as C8YRoles, n as C8yNitroModuleOptions, o as C8YTenantOptionKeysCacheConfig, p as C8YRole, r as C8yOpenAPIOptions, s as C8yRealtimeOptions, t as C8yDevOptions, u as C8YZipOptions } from "./index-BEFoDy-y.mjs";
+import { a as C8YTenantOptionKey, c as C8yDockerOptions, d as C8YManifest, f as C8YManifestOptions, g as C8YAPIClientOptions, h as C8YKnownRole, i as C8YSettingsCategory, l as C8yCacheOptions, m as C8YRoles, n as C8yNitroModuleOptions, o as C8YTenantOptionKeysCacheConfig, p as C8YRole, r as C8yOpenAPIOptions, s as C8yRealtimeOptions, t as C8yDevOptions, u as C8YZipOptions } from "./index-BOaWGoaf.mjs";
 import { t as TenantCredentials } from "./credentials-eKnJ7m9Y.mjs";
 export { C8YAPIClientOptions, type C8YKnownRole, type C8YManifest, type C8YManifestOptions, C8YRole, C8YRoles, C8YSettingsCategory, C8YTenantOptionKey, C8YTenantOptionKeysCacheConfig, type C8YZipOptions, type C8yCacheOptions, C8yDevOptions, type C8yDockerOptions, C8yNitroModuleOptions, C8yOpenAPIOptions, type C8yRealtimeOptions, type TenantCredentials };

package/dist/utils.mjs

@@ -329,7 +329,7 @@ function useUserClient(requestOrEvent) {
 	const auth = new MicroserviceClientRequestAuth(headers);
 	const client = new Client(auth, process.env.C8Y_BASEURL);
 	const forwardedHost = request.headers.get("x-forwarded-host")?.split(",")[0]?.trim();
-	client.core.defaultHeaders["X-Forwarded-Host"] = forwardedHost || process.env.C8Y_BASEURL;
+	if (forwardedHost) client.core.defaultHeaders["X-Forwarded-Host"] = forwardedHost;
 	request.context ??= {};
 	request.context["c8y_user_client"] = client;
 	return client;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c8y-nitro",
-  "version": "0.10.3",
+  "version": "0.10.4",
   "type": "module",
   "description": "Lightning fast Cumulocity IoT microservice development powered by Nitro",
   "keywords": [