@camstack/addon-provider-bosch 0.1.35 → 0.1.36

package/dist/homecom/addon.mjs

@@ -1,5 +1,5 @@
-import { A as isSecretMarkerLike, D as customAction, F as number, H as DeviceType, I as object, M as array, N as boolean, O as defineCustomActions, P as literal, R as string, T as waterHeaterCapability, U as errMsg, W as EventCategory, f as deviceAdoptionCapability, j as _enum, k as isSecretMarker, l as climateControlCapability, n as BaseDeviceProvider, o as VendorLoginProxy, t as BaseDevice, u as connectionTestCapability } from "../dist-CkMPcvma.mjs";
-import { a as createSignInAttemptStore, i as openSignInProxy, n as cascadeRemoveDevicesForIntegration, o as loginFailureForAttempt, r as createSignInClaims, s as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-Bt3N9Zdk.mjs";
+import { $ as errMsg, F as defineAddonMigrations, G as number, H as array, I as defineCustomActions, J as string, K as object, L as defineEntryKind, M as waterHeaterCapability, P as customAction, Q as DeviceType, R as entryBody, U as boolean, V as _enum, W as literal, _ as defaultIntegrationApiOver, a as BaseDevice, d as VendorLoginProxy, et as EventCategory, h as connectionTestCapability, i as testBoschInstance, l as RecordIntegrationInstances, m as climateControlCapability, n as boschRowsPorts, o as BaseDeviceProvider, r as keepBodyKeys, t as boschRowsMigration, v as deviceAdoptionCapability, w as integrationInstancesCapability } from "../bosch-instances-BIvOtuzj.mjs";
+import { a as createSignInAttemptStore, i as openSignInProxy, n as cascadeRemoveDevicesForIntegration, o as loginFailureForAttempt, r as createSignInClaims, s as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-9ooJuNrN.mjs";
 import { createHash, randomBytes } from "node:crypto";
 //#region src/homecom/config.ts
 var HOMECOM_BRANDS = ["bosch", "buderus"];
@@ -41,11 +41,6 @@ var HOMECOM_GATEWAYS_PATH = "/pointt-api/api/v1/gateways/";
 function homeComApiBase(_region) {
 	return HOMECOM_POINTT_API_ORIGIN;
 }
-var HOMECOM_SECRET_KEYS = [
-	"username",
-	"token",
-	"refresh"
-];
 var HIDDEN_UNTIL_ADVANCED = {
 	field: "__hidden__",
 	equals: "yes"
@@ -1262,37 +1257,23 @@ function beginHomeComProxiedSignIn(deps) {
 }
 //#endregion
 //#region src/homecom/homecom-token-persist.ts
-function unreadable(value) {
-	return isSecretMarker(value) || isSecretMarkerLike(value);
-}
 /**
-* Merge `patch` into the integration's stored settings in ONE `setSettings` write, one at a
-* time per integration. Refuses (and says so, without values) when a secret the write
-* touches cannot be read back from the keychain: the hub refuses an overwrite of a secret the
-* addon could not read, so the write would only fail.
+* Patch the integration's record, one write at a time per integration. Refuses (and says so,
+* without values) when the record's secrets cannot be read right now: the write would replace a
+* secret the addon cannot see.
 */
 function buildSerialPatcher(deps) {
 	const tails = /* @__PURE__ */ new Map();
 	return (integrationId, patch) => {
 		const run = async () => {
 			try {
-				const stored = await deps.getSettings(integrationId);
-				const locked = HOMECOM_SECRET_KEYS.filter((key) => unreadable(stored[key]));
-				if (locked.length > 0) {
-					deps.logger.warn(`HomeCom not persisting ${deps.what} — stored secrets are locked`, {
-						tags: { integrationId },
-						meta: { locked }
-					});
+				const stored = await deps.read(integrationId);
+				if (stored === null) return;
+				if (stored.locked) {
+					deps.logger.warn(`HomeCom not persisting ${deps.what} — stored secrets are locked`, { tags: { integrationId } });
 					return;
 				}
-				await deps.setSettings({
-					id: integrationId,
-					settings: {
-						...stored,
-						...patch
-					},
-					secretKeys: [...HOMECOM_SECRET_KEYS]
-				});
+				await deps.patch(integrationId, patch);
 			} catch (err) {
 				deps.logger.warn(`HomeCom failed to persist ${deps.what}`, {
 					tags: { integrationId },
@@ -1876,6 +1857,134 @@ function buildHomeComConnectionTestProvider(deps) {
 	};
 }
 //#endregion
+//#region src/homecom/homecom-instances.ts
+/**
+* HomeCom integrations as `integration-instances` (planning#416, D985, D1007): one `connections`
+* record per account under the `integrations` registry id. The body IS the account (the account
+* email and the OAuth tokens in the keychain; brand, region, the chosen gateway and the
+* signed-in label in the open), so the form the instances page edits is the stored shape.
+*/
+var homeComConnectionsEntryKind = defineEntryKind("connections", {
+	title: "HomeCom accounts",
+	schema: entryBody({
+		username: string().optional().meta({ secret: true }),
+		token: string().optional().meta({ secret: true }),
+		refresh: string().optional().meta({ secret: true }),
+		brand: HomeComBrandSchema.optional(),
+		region: HomeComRegionSchema.optional(),
+		gatewayId: string().optional(),
+		accountLabel: string().optional(),
+		gatewayCount: number().optional()
+	}),
+	writeTrigger: "an operator signs in, edits or removes a HomeCom account, or a connection stores a rotated token or its gateway"
+});
+/** Every kind this addon declares, keyed by its name. */
+var homeComRecordKinds = { connections: homeComConnectionsEntryKind };
+var LEGACY_KEYS = [
+	"username",
+	"token",
+	"refresh",
+	"brand",
+	"region",
+	"gatewayId",
+	"accountLabel",
+	"gatewayCount"
+];
+var SECRET_KEYS = [
+	"username",
+	"token",
+	"refresh"
+];
+function text(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+/** The record body of one account, from its legacy rows (secrets resolved). */
+function homeComBodyFromRows(values, log, integration) {
+	const dropped = Object.keys(values).filter((key) => !LEGACY_KEYS.includes(key));
+	if (dropped.length > 0) log.warn(`integration '${integration.id}': legacy settings nothing reads any more are dropped: ${dropped.join(", ")}`);
+	const username = text(values["username"]);
+	const token = text(values["token"]);
+	const refresh = text(values["refresh"]);
+	const brand = HomeComBrandSchema.safeParse(values["brand"]);
+	const region = HomeComRegionSchema.safeParse(values["region"]);
+	const gatewayId = text(values["gatewayId"])?.trim();
+	const accountLabel = text(values["accountLabel"]);
+	const count = values["gatewayCount"];
+	return {
+		name: integration.name,
+		...username !== void 0 ? { username } : {},
+		...token !== void 0 ? { token } : {},
+		...refresh !== void 0 ? { refresh } : {},
+		...brand.success ? { brand: brand.data } : {},
+		...region.success ? { region: region.data } : {},
+		...gatewayId !== void 0 && gatewayId.length > 0 ? { gatewayId } : {},
+		...accountLabel !== void 0 ? { accountLabel } : {},
+		...typeof count === "number" && Number.isFinite(count) ? { gatewayCount: count } : {}
+	};
+}
+/** The whole `bosch-homecom` catalogue (D987): offered to the engine at `onInitialize`. */
+var HOMECOM_MIGRATIONS = [boschRowsMigration({
+	addonId: "bosch-homecom",
+	id: "bosch-homecom/2026-11-05-integration-rows-to-record",
+	description: "Move every HomeCom account into a typed instance record keyed by its registry id, then clear the legacy integration settings rows and their keychain values",
+	fixtureMark: "a legacy setting key the migration does not know",
+	kind: homeComConnectionsEntryKind,
+	bodyFrom: homeComBodyFromRows
+})];
+function homeComRowsPorts(deps) {
+	return boschRowsPorts({
+		...deps,
+		kind: homeComConnectionsEntryKind
+	});
+}
+async function homeComStoredOf(instances, id) {
+	const read = await instances.readResolved(id);
+	if (read === null) return null;
+	return {
+		settings: { ...read.body },
+		locked: read.secrets === "unavailable"
+	};
+}
+/**
+* The live account of one integration, read from its record. null while it is not signed in; a
+* locked keychain throws so the caller keeps the client it has instead of reconfiguring it
+* without its tokens (D49).
+*/
+async function homeComConnectionOf(instances, id) {
+	const stored = await homeComStoredOf(instances, id);
+	if (stored === null) return null;
+	if (stored.locked) throw new Error("the keychain is locked, the saved HomeCom tokens cannot be read");
+	return connectionFromSettings(stored.settings);
+}
+function buildHomeComInstances(records, deps) {
+	const handle = records.kind(homeComConnectionsEntryKind);
+	const instances = new RecordIntegrationInstances(records, homeComConnectionsEntryKind, {
+		description: {
+			role: "devices",
+			instanceMode: "multiple",
+			kind: "account",
+			canTest: true
+		},
+		formSchema: () => buildHomeComFormSchema(),
+		initialBody: (name) => ({ name }),
+		configured: (body) => connectionFromSettings(body) !== null,
+		onChanged: async (_id, change) => {
+			if (change !== "deleted") await deps.onChanged();
+		},
+		test: (input) => testBoschInstance({
+			...input,
+			tester: deps.tester,
+			handle,
+			secretKeys: SECRET_KEYS
+		})
+	});
+	return {
+		instances,
+		handle,
+		provider: keepBodyKeys(instances.toProvider(), new Set(Object.keys(homeComConnectionsEntryKind.schema.shape)))
+	};
+}
+//#endregion
 //#region src/homecom/devices/homecom-climate-device.ts
 var homeComClimateSchema = object({
 	nativeId: string().min(1),
@@ -2070,6 +2179,7 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 		[DeviceType.WaterHeater]: HomeComWaterHeaterDevice
 	};
 	clients = null;
+	instances = null;
 	loginProxy = null;
 	loginPlane = null;
 	constructor() {
@@ -2077,10 +2187,23 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 	}
 	async onInitialize() {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("bosch-homecom: ctx.records is required (hub-only addon)");
+		await records.declare(homeComRecordKinds);
+		await this.runMigrations(defineAddonMigrations(HOMECOM_MIGRATIONS, homeComRowsPorts({
+			api: defaultIntegrationApiOver(this.ctx.api),
+			records,
+			warn: (message) => this.ctx.logger.warn(message)
+		})));
+		const built = buildHomeComInstances(records, {
+			onChanged: () => this.reconcileIntegrations(),
+			tester: this.buildConnectionTestProvider()
+		});
+		this.instances = built;
 		await this.serveLoginProxy();
 		const persistDeps = {
-			getSettings: (id) => this.ctx.api.integrations.getSettings.query({ id }),
-			setSettings: (input) => this.ctx.api.integrations.setSettings.mutate(input),
+			read: (id) => homeComStoredOf(built.instances, id),
+			patch: (id, patch) => built.handle.patch(id, patch),
 			logger: this.ctx.logger
 		};
 		const persistTokens = buildHomeComTokenPersister(persistDeps);
@@ -2107,6 +2230,10 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 				{
 					capability: connectionTestCapability,
 					provider: this.buildConnectionTestProvider()
+				},
+				{
+					capability: integrationInstancesCapability,
+					provider: built.provider
 				}
 			],
 			customActions: homeComActions,
@@ -2164,6 +2291,7 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 			this.ctx.logger.warn("HomeCom shutdown error", { meta: { error: errMsg(err) } });
 		}
 		this.clients = null;
+		this.instances = null;
 		await super.onShutdown();
 	}
 	requireClients() {
@@ -2183,7 +2311,7 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id && i.enabled);
 			const surviving = /* @__PURE__ */ new Set();
 			for (const integration of mine) try {
-				const connection = connectionFromSettings(await this.ctx.api.integrations.getSettings.query({ id: integration.id }));
+				const connection = await homeComConnectionOf(this.requireInstances().instances, integration.id);
 				if (!connection) continue;
 				await reg.upsert(integration.id, integration.name, connection);
 				surviving.add(integration.id);
@@ -2272,9 +2400,6 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 			logger: this.ctx.logger
 		});
 	}
-	globalSettingsSchema() {
-		return buildHomeComFormSchema();
-	}
 	async supportsManualCreation() {
 		return false;
 	}
@@ -2284,6 +2409,10 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 	async onCreateDevice(_type, _config) {
 		throw new Error("HomeCom devices are adopted from the cloud");
 	}
+	requireInstances() {
+		if (!this.instances) throw new Error("HomeCom provider not initialised");
+		return this.instances;
+	}
 	setIntegrationDevicesOnline(integrationId, online) {
 		const reg = this.ctx.kernel.deviceRegistry;
 		if (!reg) return;