c8y-nitro 0.4.0 → 0.4.2

package/dist/{bootstrap-CGOe2HxK.mjs → bootstrap-BqWPkH8q.mjs}

@@ -2,7 +2,7 @@ import { a as findMicroserviceByName, d as updateMicroservice, l as subscribeToA
 import { t as writeBootstrapCredentials } from "./env-file-B0BK-uZW.mjs";
 import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-Dqi-ttQi.mjs";
 import { defineCommand, runCommand } from "citty";
-import { consola as consola$1 } from "consola";
+import { consola } from "consola";
 //#region src/cli/commands/bootstrap.ts
 var bootstrap_default = defineCommand({
 	meta: {
@@ -11,50 +11,50 @@ var bootstrap_default = defineCommand({
 	},
 	args: {},
 	async run() {
-		consola$1.info("Loading configuration...");
+		consola.info("Loading configuration...");
 		const { env, c8yOptions, configDir } = await loadC8yConfig();
-		consola$1.info("Validating environment variables...");
+		consola.info("Validating environment variables...");
 		const envVars = validateBootstrapEnv(env);
-		consola$1.info("Building manifest...");
+		consola.info("Building manifest...");
 		const manifest = await createC8yManifest(configDir, c8yOptions?.manifest);
-		consola$1.success(`Manifest created for: ${manifest.name} v${manifest.version}`);
+		consola.success(`Manifest created for: ${manifest.name} v${manifest.version}`);
 		const authHeader = createBasicAuthHeader(envVars.C8Y_DEVELOPMENT_TENANT, envVars.C8Y_DEVELOPMENT_USER, envVars.C8Y_DEVELOPMENT_PASSWORD);
-		consola$1.info(`Checking if microservice "${manifest.name}" exists...`);
+		consola.info(`Checking if microservice "${manifest.name}" exists...`);
 		const existingApp = await findMicroserviceByName(envVars.C8Y_BASEURL, manifest.name, authHeader);
 		let appId;
 		if (existingApp) {
-			consola$1.warn(`Microservice "${manifest.name}" already exists on development tenant (ID: ${existingApp.id})`);
-			if (!await consola$1.prompt("Do you want to update the existing microservice?", {
+			consola.warn(`Microservice "${manifest.name}" already exists on development tenant (ID: ${existingApp.id})`);
+			if (!await consola.prompt("Do you want to update the existing microservice?", {
 				type: "confirm",
 				cancel: "reject"
 			})) {
-				consola$1.info("Bootstrap cancelled.");
+				consola.info("Bootstrap cancelled.");
 				return;
 			}
-			consola$1.info("Updating microservice...");
+			consola.info("Updating microservice...");
 			appId = (await updateMicroservice(envVars.C8Y_BASEURL, existingApp.id, manifest, authHeader)).id;
-			consola$1.success(`Microservice updated successfully (ID: ${appId})`);
+			consola.success(`Microservice updated successfully (ID: ${appId})`);
 		} else {
-			consola$1.info("Creating microservice...");
+			consola.info("Creating microservice...");
 			appId = (await createMicroservice(envVars.C8Y_BASEURL, manifest, authHeader)).id;
-			consola$1.success(`Microservice created successfully (ID: ${appId})`);
+			consola.success(`Microservice created successfully (ID: ${appId})`);
 		}
-		consola$1.info("Subscribing tenant to application...");
+		consola.info("Subscribing tenant to application...");
 		await subscribeToApplication(envVars.C8Y_BASEURL, envVars.C8Y_DEVELOPMENT_TENANT, appId, authHeader);
-		consola$1.success("Tenant subscribed to application");
-		consola$1.info("Fetching bootstrap credentials...");
+		consola.success("Tenant subscribed to application");
+		consola.info("Fetching bootstrap credentials...");
 		const credentials = await getBootstrapCredentials(envVars.C8Y_BASEURL, appId, authHeader);
-		consola$1.info("Writing bootstrap credentials...");
+		consola.info("Writing bootstrap credentials...");
 		const envFileName = await writeBootstrapCredentials(configDir, {
 			C8Y_BOOTSTRAP_TENANT: credentials.tenant,
 			C8Y_BOOTSTRAP_USER: credentials.name,
 			C8Y_BOOTSTRAP_PASSWORD: credentials.password
 		});
-		consola$1.success(`Bootstrap credentials written to ${envFileName}`);
+		consola.success(`Bootstrap credentials written to ${envFileName}`);
 		if (manifest.roles && manifest.roles.length > 0) {
-			if (await consola$1.prompt("Do you want to manage microservice roles for your development user?", { type: "confirm" })) await runCommand(await import("./roles-DrJsxUG-.mjs").then((r) => r.default), { rawArgs: [] });
+			if (await consola.prompt("Do you want to manage microservice roles for your development user?", { type: "confirm" })) await runCommand(await import("./roles-DJxp2d8p.mjs").then((r) => r.default), { rawArgs: [] });
 		}
-		consola$1.success("Bootstrap complete!");
+		consola.success("Bootstrap complete!");
 	}
 });
 //#endregion

package/dist/cli/index.mjs

@@ -1,4 +1,4 @@
-import { n as name, r as version, t as description } from "../package-BAjMvZYS.mjs";
+import { n as name, r as version, t as description } from "../package-C4HtuVu_.mjs";
 import { defineCommand, runMain } from "citty";
 //#region src/cli/index.ts
 runMain(defineCommand({
@@ -8,9 +8,9 @@ runMain(defineCommand({
 		description
 	},
 	subCommands: {
-		bootstrap: () => import("../bootstrap-CGOe2HxK.mjs").then((r) => r.default),
-		roles: () => import("../roles-DrJsxUG-.mjs").then((r) => r.default),
-		options: () => import("../options-CuGdGP4l.mjs").then((r) => r.default)
+		bootstrap: () => import("../bootstrap-BqWPkH8q.mjs").then((r) => r.default),
+		roles: () => import("../roles-DJxp2d8p.mjs").then((r) => r.default),
+		options: () => import("../options-BDDJWdph.mjs").then((r) => r.default)
 	}
 }));
 //#endregion

package/dist/{index-B6HtYHU0.d.mts → index-CzUqbp5C.d.mts}

@@ -405,4 +405,4 @@ interface C8yNitroModuleOptions {
   skipBootstrap?: boolean;
 }
 //#endregion
-export { C8yCacheOptions as a, C8YAPIClientOptions as c, C8YRoles$1 as i, C8YTenantOptionKey$1 as n, C8YZipOptions as o, C8YTenantOptionKeysCacheConfig$1 as r, C8YManifestOptions as s, C8yNitroModuleOptions as t };
+export { C8yCacheOptions as a, C8YManifestOptions as c, C8YRoles$1 as i, C8YAPIClientOptions as l, C8YTenantOptionKey$1 as n, C8YZipOptions as o, C8YTenantOptionKeysCacheConfig$1 as r, C8YManifest as s, C8yNitroModuleOptions as t };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { t as C8yNitroModuleOptions } from "./index-B6HtYHU0.mjs";
+import { t as C8yNitroModuleOptions } from "./index-CzUqbp5C.mjs";
 import { NitroModule } from "nitro/types";
 
 //#region src/index.d.ts

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { a as findMicroserviceByName, g as GENERATED_READINESS_ROUTE, h as GENERATED_LIVENESS_ROUTE, l as subscribeToApplication, m as createC8yManifestFromNitro, n as createBasicAuthHeader, o as getBootstrapCredentials, p as createC8yManifest, r as createMicroservice } from "./c8y-api-BBSKRwKs.mjs";
 import { t as writeBootstrapCredentials } from "./env-file-B0BK-uZW.mjs";
-import { n as name } from "./package-BAjMvZYS.mjs";
+import { n as name } from "./package-C4HtuVu_.mjs";
 import { basename, dirname, join, relative } from "node:path";
 import { mkdir, writeFile } from "node:fs/promises";
 import { x } from "tinyexec";
@@ -366,10 +366,10 @@ async function createC8yZip(nitro, options = {}) {
 }
 //#endregion
 //#region src/module/runtime.ts
-function setupRuntime(nitro, manifestOptions = {}) {
+function setupRuntime(nitro, manifest) {
 	nitro.logger.debug("Setting up C8Y nitro runtime");
-	const roles = manifestOptions.roles ?? [];
-	const settingKeys = (manifestOptions.settings ?? []).map((s) => s.key);
+	const roles = manifest.roles ?? [];
+	const settingKeys = (manifest.settings ?? []).map((s) => s.key);
 	const completeTypesDir = join$1(nitro.options.rootDir, nitro.options.typescript.generatedTypesDir ?? "node_modules/.nitro/types");
 	const typesFile = join$1(completeTypesDir, "c8y-nitro.d.ts");
 	const typesContent = `// generated by c8y-nitro
@@ -382,15 +382,18 @@ ${roles.map((role) => `    '${role}': '${role}';`).join("\n")}
 }
 
 declare module 'c8y-nitro/runtime' {
-  import type { C8YRoles } from 'c8y-nitro/types';
+  import type { C8YRoles, C8yManifest } from 'c8y-nitro/types';
   export const c8yRoles: C8YRoles;
   export const c8yTenantOptionKeys: readonly [${settingKeys.map((key) => `'${key}'`).join(", ")}];
+  export const c8yManifest: C8yManifest;
 }`;
 	nitro.options.virtual["c8y-nitro/runtime"] = `
 export const c8yRoles = {
 ${roles.map((role) => `  '${role}': '${role}',`).join("\n")}
 }
 
+export const c8yManifest = ${JSON.stringify(manifest, null, 2)}
+
 export const c8yTenantOptionKeys = [${settingKeys.map((key) => `'${key}'`).join(", ")}]
 `;
 	mkdirSync(completeTypesDir, { recursive: true });
@@ -414,7 +417,7 @@ async function setupRuntimeConfig(nitro, options) {
 	nitro.options.runtimeConfig.c8ySettingsCategory = options.manifest?.settingsCategory ?? manifest.contextPath ?? manifest.name;
 }
 //#endregion
-//#region src/module/register.ts
+//#region src/module/registerRuntime.ts
 /**
 * Links runtime middleware, handlers, and plugins to the nitro instance.
 * Works by having the handlers in a relative path to this file.
@@ -424,26 +427,25 @@ async function setupRuntimeConfig(nitro, options) {
 */
 function registerRuntime(nitro, options = {}) {
 	const thisFilePath = fileURLToPath(new URL(".", import.meta.url));
+	const allPlugins = Object.keys({
+		"./runtime/plugins/c8y-variables.ts": 0,
+		"./runtime/plugins/enrich-logs.ts": 0
+	}).map((p) => join$1(thisFilePath, p.replace(".ts", "")));
+	const allMiddlewares = Object.keys({ "./runtime/middlewares/dev-user.ts": 0 }).map((p) => join$1(thisFilePath, p.replace(".ts", "")));
 	/**
-	* Plugins
+	* Plugins (auto scanned)
 	*/
-	const plugins = [];
-	const c8yVariablesPluginPath = join$1(thisFilePath, "./runtime/plugins/c8y-variables");
-	plugins.push(c8yVariablesPluginPath);
-	nitro.options.plugins.push(...plugins);
+	nitro.options.plugins.push(...allPlugins);
 	/**
-	* Middlewares (global)
+	* Middlewares (auto scanned)
 	*/
-	const middlewares = [];
-	const devUserMiddlewarePath = join$1(thisFilePath, "./runtime/middlewares/dev-user");
-	middlewares.push(devUserMiddlewarePath);
-	nitro.options.handlers.push(...middlewares.map((handler) => ({
+	nitro.options.handlers.push(...allMiddlewares.map((handler) => ({
 		route: "/**",
 		handler,
 		middleware: true
 	})));
 	/**
-	* Handlers
+	* Handlers (can't be auto scanned as they need methods etc)
 	*/
 	const handlers = [];
 	const probeHandlerPath = join$1(thisFilePath, "./runtime/handlers/liveness-readiness");
@@ -560,13 +562,15 @@ function c8y() {
 				nitro.logger.error(`Unsupported preset "${nitro.options.preset}" for c8y-nitro module, only node presets are supported.`);
 				throw new Error("Unsupported preset for c8y-nitro module");
 			}
-			const { setup: setupEvlog } = evlog({ env: { service: (await createC8yManifestFromNitro(nitro)).name } });
+			let manifest = await createC8yManifestFromNitro(nitro);
+			const { setup: setupEvlog } = evlog({ env: { service: manifest.name } });
 			await setupEvlog(nitro);
 			if (!options.skipBootstrap) await autoBootstrap(nitro);
 			await setupRuntimeConfig(nitro, options);
-			setupRuntime(nitro, options.manifest);
+			setupRuntime(nitro, manifest);
 			nitro.hooks.hook("dev:reload", async () => {
-				setupRuntime(nitro, options.manifest);
+				manifest = await createC8yManifestFromNitro(nitro);
+				setupRuntime(nitro, manifest);
 				if (options.apiClient) {
 					nitro.logger.debug("Generating C8Y API client");
 					await writeAPIClient(nitro, options);

package/dist/{options-CuGdGP4l.mjs → options-BDDJWdph.mjs}

@@ -1,7 +1,7 @@
 import { c as getTenantOptionsByCategory, f as updateTenantOption, i as deleteTenantOption, n as createBasicAuthHeader, p as createC8yManifest, s as getTenantOption } from "./c8y-api-BBSKRwKs.mjs";
 import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-Dqi-ttQi.mjs";
 import { defineCommand } from "citty";
-import { consola as consola$1 } from "consola";
+import { consola } from "consola";
 //#region src/cli/commands/options.ts
 var options_default = defineCommand({
 	meta: {
@@ -10,21 +10,21 @@ var options_default = defineCommand({
 	},
 	args: {},
 	async run() {
-		consola$1.info("Loading configuration...");
+		consola.info("Loading configuration...");
 		const { env, c8yOptions, configDir } = await loadC8yConfig();
-		consola$1.info("Validating environment variables...");
+		consola.info("Validating environment variables...");
 		const envVars = validateBootstrapEnv(env);
-		consola$1.info("Loading manifest...");
+		consola.info("Loading manifest...");
 		const manifest = await createC8yManifest(configDir, c8yOptions?.manifest);
 		const category = manifest.settingsCategory || manifest.contextPath || manifest.name;
 		if (!manifest.settings || manifest.settings.length === 0) throw new Error("No settings defined in manifest. Add settings to your c8y.manifest configuration.");
-		consola$1.success(`Using category: ${category}`);
+		consola.success(`Using category: ${category}`);
 		const authHeader = createBasicAuthHeader(envVars.C8Y_DEVELOPMENT_TENANT, envVars.C8Y_DEVELOPMENT_USER, envVars.C8Y_DEVELOPMENT_PASSWORD);
-		consola$1.info("Fetching current tenant options...");
+		consola.info("Fetching current tenant options...");
 		const currentOptions = await getTenantOptionsByCategory(envVars.C8Y_BASEURL, category, authHeader);
 		const availableKeys = manifest.settings.map((s) => s.key);
-		consola$1.success(`Found ${Object.keys(currentOptions).length} options set on tenant`);
-		const action = await consola$1.prompt("What do you want to do?", {
+		consola.success(`Found ${Object.keys(currentOptions).length} options set on tenant`);
+		const action = await consola.prompt("What do you want to do?", {
 			type: "select",
 			options: [
 				{
@@ -59,10 +59,10 @@ async function handleRead(baseUrl, category, authHeader, availableKeys, currentO
 	const credentialsKeys = availableKeys.filter((k) => k.startsWith("credentials."));
 	const allKeys = [...setKeys, ...credentialsKeys];
 	if (allKeys.length === 0) {
-		consola$1.warn("No options are currently set");
+		consola.warn("No options are currently set");
 		return;
 	}
-	const key = await consola$1.prompt("Select option to read:", {
+	const key = await consola.prompt("Select option to read:", {
 		type: "select",
 		options: allKeys.map((k) => ({
 			label: k.startsWith("credentials.") ? `${k} (unknown)` : k,
@@ -70,10 +70,10 @@ async function handleRead(baseUrl, category, authHeader, availableKeys, currentO
 		})),
 		cancel: "reject"
 	});
-	consola$1.info(`Reading option: ${key}`);
+	consola.info(`Reading option: ${key}`);
 	const value = await getTenantOption(baseUrl, category, key.startsWith("credentials.") ? key.replace(/^credentials\./, "") : key, authHeader);
-	if (value === void 0) consola$1.warn(`Option '${key}' is not set`);
-	else consola$1.success(`Value: ${value}`);
+	if (value === void 0) consola.warn(`Option '${key}' is not set`);
+	else consola.success(`Value: ${value}`);
 }
 /**
 * Handle updating options (with loop for multiple updates)
@@ -86,7 +86,7 @@ async function handleRead(baseUrl, category, authHeader, availableKeys, currentO
 async function handleUpdate(baseUrl, category, authHeader, availableKeys, currentOptions) {
 	let continueUpdating = true;
 	while (continueUpdating) {
-		const key = await consola$1.prompt("Select option to update:", {
+		const key = await consola.prompt("Select option to update:", {
 			type: "select",
 			options: availableKeys.map((k) => ({
 				label: currentOptions[k] !== void 0 ? `${k} (current: ${currentOptions[k]})` : k.startsWith("credentials.") ? `${k} (current: unknown)` : `${k} (not set)`,
@@ -95,16 +95,16 @@ async function handleUpdate(baseUrl, category, authHeader, availableKeys, curren
 			cancel: "reject"
 		});
 		const currentValue = currentOptions[key];
-		const newValue = await consola$1.prompt("Enter new value:", {
+		const newValue = await consola.prompt("Enter new value:", {
 			type: "text",
 			default: currentValue,
 			cancel: "reject"
 		});
-		consola$1.info(`Updating option: ${key}`);
+		consola.info(`Updating option: ${key}`);
 		await updateTenantOption(baseUrl, category, key.replace(/^credentials\./, ""), newValue, authHeader);
 		currentOptions[key] = newValue;
-		consola$1.success(`Option '${key}' updated successfully`);
-		if (!await consola$1.prompt("Update another option?", {
+		consola.success(`Option '${key}' updated successfully`);
+		if (!await consola.prompt("Update another option?", {
 			type: "confirm",
 			initial: false,
 			cancel: "reject"
@@ -124,22 +124,22 @@ async function handleDelete(baseUrl, category, authHeader, availableKeys, curren
 	const credentialsKeys = availableKeys.filter((k) => k.startsWith("credentials."));
 	const allKeys = [...setKeys, ...credentialsKeys];
 	if (allKeys.length === 0) {
-		consola$1.warn("No options are currently set");
+		consola.warn("No options are currently set");
 		return;
 	}
-	const keysToDelete = await consola$1.prompt("Select option(s) to delete:", {
+	const keysToDelete = await consola.prompt("Select option(s) to delete:", {
 		type: "multiselect",
 		options: allKeys,
 		required: true,
 		cancel: "reject"
 	});
-	consola$1.info(`Deleting ${keysToDelete.length} option(s)...`);
+	consola.info(`Deleting ${keysToDelete.length} option(s)...`);
 	for (const key of keysToDelete) {
-		consola$1.info(`Deleting option: ${key}`);
+		consola.info(`Deleting option: ${key}`);
 		await deleteTenantOption(baseUrl, category, key.startsWith("credentials.") ? key.replace(/^credentials\./, "") : key, authHeader);
-		consola$1.success(`✓ Deleted: ${key}`);
+		consola.success(`✓ Deleted: ${key}`);
 	}
-	consola$1.success("Delete operation completed");
+	consola.success("Delete operation completed");
 }
 //#endregion
 export { options_default as default };

package/dist/{package-BAjMvZYS.mjs → package-C4HtuVu_.mjs}

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "c8y-nitro";
-var version = "0.4.0";
+var version = "0.4.2";
 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-DrJsxUG-.mjs → roles-DJxp2d8p.mjs}

@@ -1,7 +1,7 @@
 import { n as createBasicAuthHeader, p as createC8yManifest, t as assignUserRole, u as unassignUserRole } from "./c8y-api-BBSKRwKs.mjs";
 import { n as validateBootstrapEnv, t as loadC8yConfig } from "./config-Dqi-ttQi.mjs";
 import { defineCommand } from "citty";
-import { consola as consola$1 } from "consola";
+import { consola } from "consola";
 //#region src/cli/commands/roles.ts
 var roles_default = defineCommand({
 	meta: {
@@ -10,28 +10,28 @@ var roles_default = defineCommand({
 	},
 	args: {},
 	async run() {
-		consola$1.info("Loading configuration...");
+		consola.info("Loading configuration...");
 		const { env, c8yOptions, configDir } = await loadC8yConfig();
-		consola$1.info("Validating environment variables...");
+		consola.info("Validating environment variables...");
 		const envVars = validateBootstrapEnv(env);
-		consola$1.info("Building manifest...");
+		consola.info("Building manifest...");
 		const manifest = await createC8yManifest(configDir, c8yOptions?.manifest);
 		const authHeader = createBasicAuthHeader(envVars.C8Y_DEVELOPMENT_TENANT, envVars.C8Y_DEVELOPMENT_USER, envVars.C8Y_DEVELOPMENT_PASSWORD);
 		if (manifest.roles && manifest.roles.length > 0) {
-			const rolesToAssign = await consola$1.prompt("Select roles to assign to your user (unselected roles will be removed):", {
+			const rolesToAssign = await consola.prompt("Select roles to assign to your user (unselected roles will be removed):", {
 				type: "multiselect",
 				options: manifest.roles,
 				cancel: "reject",
 				required: false
 			});
-			consola$1.info("Managing user roles...");
+			consola.info("Managing user roles...");
 			const rolePromises = manifest.roles.map(async (role) => {
 				if (rolesToAssign.includes(role)) return await assignUserRole(envVars.C8Y_BASEURL, envVars.C8Y_DEVELOPMENT_TENANT, envVars.C8Y_DEVELOPMENT_USER, role, authHeader);
 				else return await unassignUserRole(envVars.C8Y_BASEURL, envVars.C8Y_DEVELOPMENT_TENANT, envVars.C8Y_DEVELOPMENT_USER, role, authHeader);
 			});
 			await Promise.all(rolePromises);
-			consola$1.success("Role management complete");
-		} else consola$1.warn("No roles defined in manifest. Nothing to manage.");
+			consola.success("Role management complete");
+		} else consola.warn("No roles defined in manifest. Nothing to manage.");
 	}
 });
 //#endregion

package/dist/runtime/middlewares/dev-user.mjs

@@ -1,6 +1,6 @@
-import { Buffer } from "node:buffer";
-import process from "node:process";
 import { defineHandler } from "nitro/h3";
+import process from "node:process";
+import { Buffer } from "node:buffer";
 import consola from "consola";
 //#region src/module/runtime/middlewares/dev-user.ts
 var dev_user_default = defineHandler((event) => {

package/dist/runtime/plugins/enrich-logs.mjs

@@ -0,0 +1,15 @@
+import { definePlugin } from "nitro";
+import { c8yManifest } from "c8y-nitro/runtime";
+//#region src/module/runtime/plugins/enrich-logs.ts
+var enrich_logs_default = definePlugin(async (nitroApp) => {
+	nitroApp.hooks.hook("evlog:enrich", (enrichContext) => {
+		enrichContext.event.microservice = {
+			name: c8yManifest.name,
+			version: c8yManifest.version,
+			provider: c8yManifest.provider,
+			contextPath: c8yManifest.contextPath
+		};
+	});
+});
+//#endregion
+export { enrich_logs_default as default };

package/dist/types.d.mts

@@ -1,2 +1,2 @@
-import { a as C8yCacheOptions, c as C8YAPIClientOptions, i as C8YRoles, n as C8YTenantOptionKey, o as C8YZipOptions, r as C8YTenantOptionKeysCacheConfig, s as C8YManifestOptions, t as C8yNitroModuleOptions } from "./index-B6HtYHU0.mjs";
-export { C8YAPIClientOptions, C8YManifestOptions, C8YRoles, C8YTenantOptionKey, C8YTenantOptionKeysCacheConfig, C8YZipOptions, C8yCacheOptions, C8yNitroModuleOptions };
+import { a as C8yCacheOptions, c as C8YManifestOptions, i as C8YRoles, l as C8YAPIClientOptions, n as C8YTenantOptionKey, o as C8YZipOptions, r as C8YTenantOptionKeysCacheConfig, s as C8YManifest, t as C8yNitroModuleOptions } from "./index-CzUqbp5C.mjs";
+export { C8YAPIClientOptions, C8YManifest, C8YManifestOptions, C8YRoles, C8YTenantOptionKey, C8YTenantOptionKeysCacheConfig, C8YZipOptions, C8yCacheOptions, C8yNitroModuleOptions };

package/dist/utils.mjs

@@ -1,7 +1,9 @@
+import { Buffer } from "node:buffer";
 import process from "node:process";
 import { useLogger } from "evlog/nitro/v3";
 import { BasicAuth, Client, MicroserviceClientRequestAuth } from "@c8y/client";
 import { defineCachedFunction } from "nitro/cache";
+import { createHash, randomBytes } from "node:crypto";
 import { HTTPError, defineHandler } from "nitro/h3";
 import { useStorage } from "nitro/storage";
 import { useRuntimeConfig } from "nitro/runtime-config";
@@ -30,6 +32,55 @@ function convertRequestHeadersToC8yFormat(request) {
 	return headers;
 }
 //#endregion
+//#region src/utils/internal/tenant.ts
+const USER_TENANT_CACHE_SALT = randomBytes(32).toString("hex");
+function getCookieValue(cookieHeader, name) {
+	try {
+		const value = cookieHeader?.match(`(^|;)\\s*${name}\\s*=\\s*([^;]+)`);
+		return value ? value.pop() : void 0;
+	} catch {
+		return;
+	}
+}
+function getCurrentUserTenantCacheKeyMaterial(requestOrEvent) {
+	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
+	const cookieAuth = getCookieValue(request.headers.get("cookie"), "authorization");
+	if (cookieAuth) return `cookie:${cookieAuth}`;
+	const authorization = request.headers.get("authorization");
+	if (authorization) return `header:${authorization}`;
+}
+function createCurrentUserTenantCacheKey(requestOrEvent) {
+	const material = getCurrentUserTenantCacheKeyMaterial(requestOrEvent);
+	if (!material) throw new Error("Cannot create current user tenant cache key without auth material");
+	return createHash("sha256").update(USER_TENANT_CACHE_SALT).update(":").update(material).digest("hex");
+}
+function tryGetTenantFromBasicAuth(requestOrEvent) {
+	const authorization = ("req" in requestOrEvent ? requestOrEvent.req : requestOrEvent).headers.get("authorization");
+	if (!authorization?.startsWith("Basic ")) return;
+	try {
+		const decoded = Buffer.from(authorization.slice(6), "base64").toString("utf8");
+		const separatorIndex = decoded.indexOf(":");
+		const userPart = separatorIndex === -1 ? decoded : decoded.slice(0, separatorIndex);
+		const slashIndex = userPart.indexOf("/");
+		if (slashIndex <= 0) return;
+		return userPart.slice(0, slashIndex);
+	} catch {
+		return;
+	}
+}
+const getCurrentUserTenantId = defineCachedFunction(async (requestOrEvent) => {
+	const basicTenant = tryGetTenantFromBasicAuth(requestOrEvent);
+	if (basicTenant) return basicTenant;
+	return (await useUserClient(requestOrEvent).tenant.current()).data.name;
+}, {
+	maxAge: 60,
+	name: "_c8y_nitro_get_current_user_tenant_id",
+	group: "c8y_nitro",
+	swr: false,
+	getKey: (requestOrEvent) => createCurrentUserTenantCacheKey(requestOrEvent),
+	shouldBypassCache: (requestOrEvent) => !getCurrentUserTenantCacheKeyMaterial(requestOrEvent)
+});
+//#endregion
 //#region src/utils/credentials.ts
 /**
 * Fetches credentials for all tenants subscribed to this microservice.\
@@ -128,7 +179,7 @@ const useDeployedTenantCredentials = Object.assign(async () => {
 async function useUserTenantCredentials(requestOrEvent) {
 	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
 	if (request.context?.["c8y_user_tenant_credentials"]) return request.context["c8y_user_tenant_credentials"];
-	const tenantId = useUserClient(requestOrEvent).core.tenant;
+	const tenantId = await getCurrentUserTenantId(requestOrEvent);
 	const userTenantCreds = (await useSubscribedTenantCredentials())[tenantId];
 	if (!userTenantCreds) throw new HTTPError({
 		message: `No subscribed tenant credentials found for user tenant '${tenantId}'`,
@@ -172,7 +223,7 @@ function useUserClient(requestOrEvent) {
 async function useUserTenantClient(requestOrEvent) {
 	const request = "req" in requestOrEvent ? requestOrEvent.req : requestOrEvent;
 	if (request.context?.["c8y_user_tenant_client"]) return request.context["c8y_user_tenant_client"];
-	const tenantId = useUserClient(requestOrEvent).core.tenant;
+	const tenantId = await getCurrentUserTenantId(requestOrEvent);
 	const creds = await useSubscribedTenantCredentials();
 	if (!creds[tenantId]) throw new HTTPError({
 		message: `No subscribed tenant credentials found for user tenant '${tenantId}'`,
@@ -281,7 +332,7 @@ function hasUserRequiredRole(roleOrRoles) {
 function isUserFromAllowedTenant(tenantIdOrIds) {
 	return defineHandler(async (event) => {
 		const allowedTenants = Array.isArray(tenantIdOrIds) ? tenantIdOrIds : [tenantIdOrIds];
-		const userTenantId = useUserClient(event).core.tenant;
+		const userTenantId = await getCurrentUserTenantId(event);
 		if (!allowedTenants.includes(userTenantId)) throw new HTTPError({
 			status: 403,
 			statusText: "Forbidden",
@@ -306,7 +357,7 @@ function isUserFromAllowedTenant(tenantIdOrIds) {
 */
 function isUserFromDeployedTenant() {
 	return defineHandler(async (event) => {
-		const userTenantId = useUserClient(event).core.tenant;
+		const userTenantId = await getCurrentUserTenantId(event);
 		const deployedTenantId = process.env.C8Y_BOOTSTRAP_TENANT;
 		if (!deployedTenantId) throw new HTTPError({
 			status: 500,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c8y-nitro",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "description": "Lightning fast Cumulocity IoT microservice development powered by Nitro",
   "keywords": [
@@ -48,10 +48,10 @@
     "dist"
   ],
   "dependencies": {
-    "c12": "^4.0.0-beta.3",
+    "c12": "^4.0.0-beta.4",
     "citty": "^0.2.1",
     "consola": "^3.4.2",
-    "evlog": "^2.6.0",
+    "evlog": "^2.9.0",
     "jszip": "^3.10.1",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.0",
@@ -61,10 +61,11 @@
   "devDependencies": {
     "@schplitt/eslint-config": "^1.3.1",
     "@types/spinnies": "^0.5.3",
-    "bumpp": "^10.4.1",
-    "eslint": "^10.0.3",
-    "memfs": "^4.56.11",
-    "tsdown": "^0.21.2",
+    "bumpp": "^11.0.1",
+    "changelogithub": "^14.0.0",
+    "eslint": "^10.1.0",
+    "memfs": "^4.57.1",
+    "tsdown": "^0.21.4",
     "typescript": "^5.9.3",
     "vitest": "^4.1.0"
   },

package/dist/runtime/handlers/liveness-readiness.d.mts

@@ -1,8 +0,0 @@
-import * as nitro_h30 from "nitro/h3";
-
-//#region src/module/runtime/handlers/liveness-readiness.d.ts
-declare const _default: nitro_h30.EventHandlerWithFetch<nitro_h30.EventHandlerRequest, Promise<{
-  status: string;
-}>>;
-//#endregion
-export { _default as default };

package/dist/runtime/middlewares/dev-user.d.mts

@@ -1,6 +0,0 @@
-import * as nitro_h30 from "nitro/h3";
-
-//#region src/module/runtime/middlewares/dev-user.d.ts
-declare const _default: nitro_h30.EventHandlerWithFetch<nitro_h30.EventHandlerRequest, void>;
-//#endregion
-export { _default as default };

package/dist/runtime/plugins/c8y-variables.d.mts

@@ -1,6 +0,0 @@
-import * as nitro_types0 from "nitro/types";
-
-//#region src/module/runtime/plugins/c8y-variables.d.ts
-declare const _default: nitro_types0.NitroAppPlugin;
-//#endregion
-export { _default as default };