@camstack/addon-provider-bosch 0.1.35 → 0.1.37

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as isSecretMarkerLike, B as unknown, D as customAction, E as createEvent, H as DeviceType, I as object, L as record, M as array, N as boolean, O as defineCustomActions, P as literal, R as string, S as runningStateCapability, U as errMsg, V as DeviceRole, W as EventCategory, _ as ingestReading, b as quantityFromUnit, c as binaryCapability, d as consumablesCapability, f as deviceAdoptionCapability, h as eventEmitterCapability, i as RUNNING_STATE_COLD, j as _enum, k as isSecretMarker, m as enumSensorCapability, n as BaseDeviceProvider, o as VendorLoginProxy, p as dishwasherCapability, r as DishwasherOperationStateSchema, t as BaseDevice, u as connectionTestCapability, v as numericSensorCapability, x as runningFromDishwasherOperation, y as powerMeterCapability, z as union } 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, B as isSecretMarkerLike, C as ingestReading, D as quantityFromUnit, E as powerMeterCapability, F as defineAddonMigrations, H as array, I as defineCustomActions, J as string, K as object, L as defineEntryKind, N as createEvent, O as runningFromDishwasherOperation, P as customAction, Q as DeviceType, R as entryBody, T as numericSensorCapability, U as boolean, V as _enum, W as literal, X as unknown, Y as union, Z as DeviceRole, _ as defaultIntegrationApiOver, a as BaseDevice, b as enumSensorCapability, c as RUNNING_STATE_COLD, d as VendorLoginProxy, et as EventCategory, g as consumablesCapability, h as connectionTestCapability, i as testBoschInstance, k as runningStateCapability, l as RecordIntegrationInstances, n as boschRowsPorts, o as BaseDeviceProvider, p as binaryCapability, q as record, r as keepBodyKeys, s as DishwasherOperationStateSchema, t as boschRowsMigration, v as deviceAdoptionCapability, w as integrationInstancesCapability, x as eventEmitterCapability, y as dishwasherCapability, z as isSecretMarker } from "../bosch-instances-BQiyzlPt.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-nChgZUlC.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -1017,15 +1017,6 @@ object({
 });
 /** Setting key of the keychain-stored credentials of every paired appliance. */
 var APPLIANCE_SECRETS_KEY = "applianceSecrets";
-/**
-* The integration-settings keys that hold a credential — what a write from this addon names
-* as `secretKeys` so the hub moves them into the keychain.
-*/
-var HOME_CONNECT_SECRET_KEYS = [
-	"token",
-	"refresh",
-	APPLIANCE_SECRETS_KEY
-];
 /** One appliance as persisted in the integration's `appliances` setting: no credential on it. */
 var homeConnectApplianceRowSchema = object({
 	haId: string().min(1),
@@ -1127,7 +1118,7 @@ function splitApplianceSecrets(appliances) {
 	};
 }
 /**
-* Before `integrations.setSettings`: keep objects as-is (serializes as `json`), parse
+* Before the record write: keep objects as-is (serializes as `json`), parse
 * textarea JSON strings into objects so they are not re-serialized as `string` and
 * corrupted on read by `deserializeSetting(String(object))` — and move any credential
 * still sitting on an appliance row into `applianceSecrets`, so a row is never written
@@ -1184,29 +1175,6 @@ function moveInlineSecrets(settings) {
 		...Object.keys(merged).length > 0 ? { [APPLIANCE_SECRETS_KEY]: JSON.stringify(merged) } : {}
 	};
 }
-/**
-* One-time adopt: the settings that must be written so a pairing key found on an appliance
-* row moves into the keychain. `null` when nothing needs moving. The caller writes it with
-* {@link HOME_CONNECT_SECRET_KEYS} as `secretKeys`.
-*/
-function legacyApplianceSecretPatch(settings) {
-	const moved = moveInlineSecrets({
-		...settings,
-		appliances: parseJsonValue(settings["appliances"])
-	});
-	const rows = moved["appliances"];
-	const secrets = moved[APPLIANCE_SECRETS_KEY];
-	if (!Array.isArray(rows) || typeof secrets !== "string") return null;
-	const parsedRows = [];
-	for (const row of rows) {
-		const parsed = homeConnectApplianceRowSchema.safeParse(row);
-		if (parsed.success) parsedRows.push(parsed.data);
-	}
-	return {
-		appliances: parsedRows,
-		applianceSecrets: secrets
-	};
-}
 function connectionFromSettings(settings) {
 	const normalized = homeConnectSettingsForPersist(settings);
 	const rows = legacyRowsOf(normalized["appliances"]);
@@ -3690,33 +3658,23 @@ function buildHomeConnectConnectionTestProvider(deps) {
 }
 //#endregion
 //#region src/home-connect/home-connect-connection-persist.ts
-function locked(value) {
-	return isSecretMarker(value) || isSecretMarkerLike(value);
-}
 /**
 * Persist what a connection learned at runtime — enriched IDDF entity maps and a rotated
-* access / refresh token — in ONE `setSettings` write. The tokens are named in `secretKeys`
-* so they land in the keychain, never on the plain blob. Writes nothing when a stored secret
-* cannot be read right now: the write would drop a key it cannot see or be refused. Never
-* throws and never logs a value.
+* access / refresh token — in ONE patch of the record. Writes nothing when the stored secrets
+* cannot be read right now: the patch would replace a key it cannot see. Never throws and
+* never logs a value.
 */
 function buildHomeConnectConnectionPersister(deps) {
 	return async (integrationId, connection) => {
 		if (!connection.appliances || connection.appliances.length === 0) return;
 		try {
-			const settings = await deps.getSettings(integrationId);
-			const stored = readApplianceSecrets(settings[APPLIANCE_SECRETS_KEY]);
-			const lockedTokens = ["token", "refresh"].filter((key) => locked(settings[key]));
-			if (stored.kind === "unresolved" || stored.kind === "invalid" || lockedTokens.length > 0) {
-				deps.logger.warn("Home Connect not persisting the connection — stored secrets are locked or unreadable", {
-					tags: { integrationId },
-					meta: {
-						applianceSecrets: stored.kind,
-						lockedTokens
-					}
-				});
+			const stored = await deps.read(integrationId);
+			if (stored === null) return;
+			if (stored.locked) {
+				deps.logger.warn("Home Connect not persisting the connection — stored secrets are locked or unreadable", { tags: { integrationId } });
 				return;
 			}
+			const settings = stored.settings;
 			const refresh = connection.refresh ?? "";
 			const merged = homeConnectSettingsForPersist({
 				...settings,
@@ -3724,10 +3682,11 @@ function buildHomeConnectConnectionPersister(deps) {
 				...refresh.length > 0 ? { refresh } : {},
 				appliances: mergeAppliancesForPersist(settings["appliances"], connection.appliances)
 			});
-			await deps.setSettings({
-				id: integrationId,
-				settings: merged,
-				secretKeys: [...HOME_CONNECT_SECRET_KEYS]
+			await deps.patch(integrationId, {
+				token: merged["token"],
+				...merged["refresh"] !== void 0 ? { refresh: merged["refresh"] } : {},
+				appliances: merged["appliances"],
+				...merged["applianceSecrets"] !== void 0 ? { [APPLIANCE_SECRETS_KEY]: merged[APPLIANCE_SECRETS_KEY] } : {}
 			});
 		} catch (err) {
 			deps.logger.warn("Home Connect failed to persist the connection", {
@@ -5265,43 +5224,136 @@ var HomeConnectApplianceDevice = class extends BaseDevice {
 		return out;
 	}
 };
-//#endregion
-//#region src/home-connect/home-connect-secret-adopt.ts
+var homeConnectConnectionsEntryKind = defineEntryKind("connections", {
+	title: "Home Connect accounts",
+	schema: entryBody({
+		token: string().optional().meta({ secret: true }),
+		refresh: string().optional().meta({ secret: true }),
+		/** JSON of `haId -> { psk, iv64? }`: one string in the keychain. */
+		applianceSecrets: string().optional().meta({ secret: true }),
+		appliances: array(homeConnectApplianceRowSchema).optional(),
+		accountLabel: string().optional()
+	}),
+	writeTrigger: "an operator signs in, edits or removes a Home Connect account, or a connection stores what it learned",
+	maxDataBytes: 1024 * 1024
+});
+/** Every kind this addon declares, keyed by its name. */
+var homeConnectRecordKinds = { connections: homeConnectConnectionsEntryKind };
+var LEGACY_KEYS = [
+	"token",
+	"refresh",
+	APPLIANCE_SECRETS_KEY,
+	"appliances",
+	"accountLabel",
+	"accountEmail",
+	"accountPassword",
+	"authorizeUrl",
+	"verifier",
+	"callback",
+	"state"
+];
+var SECRET_KEYS = [
+	"token",
+	"refresh",
+	APPLIANCE_SECRETS_KEY
+];
+/** The `appliances` row value as an array: a JSON string is parsed, anything else is as stored. */
+function parseStoredRows(raw) {
+	if (typeof raw !== "string") return raw;
+	try {
+		return JSON.parse(raw);
+	} catch {
+		return;
+	}
+}
+function text(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 /**
-* One-time adopt: an integration saved before the keychain move carries each appliance's
-* pairing key (`psk`, `iv64`) on its row, in clear text. Plan the move into `applianceSecrets`
-* (keychain), with the rows stripped.
-*
-* `null` when there is nothing to move — settings already migrated, or the stored keys are
-* locked (the move could not see what it would replace). Idempotent.
+* The record body of one account, from its legacy rows (secrets resolved). A pairing key still
+* sitting on an appliance row (the shape before the keychain move) is carried into
+* `applianceSecrets` here, once, and never again.
 */
-function planLegacyApplianceSecretAdopt(deps, integrationId, settings) {
-	const patch = legacyApplianceSecretPatch(settings);
-	if (patch === null) return null;
-	const next = {
-		...settings,
-		...patch
+function homeConnectBodyFromRows(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 normalized = homeConnectSettingsForPersist({ ...values });
+	const storedRows = parseStoredRows(values["appliances"]);
+	if (Array.isArray(storedRows)) for (const row of storedRows) {
+		const parsed = homeConnectApplianceRowSchema.safeParse(row);
+		if (parsed.success) continue;
+		const haId = typeof row === "object" && row !== null && typeof Reflect.get(row, "haId") === "string" ? String(Reflect.get(row, "haId")) : "(no haId)";
+		const paths = parsed.error.issues.map((issue) => issue.path.join(".") || "(row)").join(", ");
+		log.warn(`integration '${integration.id}': appliance row '${haId}' could not be read and is dropped (invalid: ${paths})`);
+	}
+	const appliances = [];
+	const keptRows = normalized["appliances"];
+	if (Array.isArray(keptRows)) for (const row of keptRows) {
+		const parsed = homeConnectApplianceRowSchema.safeParse(row);
+		if (parsed.success) appliances.push(parsed.data);
+	}
+	const token = text(normalized["token"]);
+	const refresh = text(normalized["refresh"]);
+	const applianceSecrets = text(normalized[APPLIANCE_SECRETS_KEY]);
+	const accountLabel = text(normalized["accountLabel"]);
+	return {
+		name: integration.name,
+		...token !== void 0 ? { token } : {},
+		...refresh !== void 0 ? { refresh } : {},
+		...applianceSecrets !== void 0 ? { applianceSecrets } : {},
+		...appliances.length > 0 ? { appliances } : {},
+		...accountLabel !== void 0 ? { accountLabel } : {}
 	};
+}
+/** The whole `bosch-home-connect` catalogue (D987): offered to the engine at `onInitialize`. */
+var HOME_CONNECT_MIGRATIONS = [boschRowsMigration({
+	addonId: "bosch-home-connect",
+	id: "bosch-home-connect/2026-11-05-integration-rows-to-record",
+	description: "Move every Home Connect account into a typed instance record keyed by its registry id (pairing keys still on an appliance row go to the appliance secrets), then clear the legacy integration settings rows and their keychain values",
+	fixtureMark: "a legacy setting key the migration does not know",
+	kind: homeConnectConnectionsEntryKind,
+	bodyFrom: homeConnectBodyFromRows
+})];
+function homeConnectRowsPorts(deps) {
+	return boschRowsPorts({
+		...deps,
+		kind: homeConnectConnectionsEntryKind
+	});
+}
+async function homeConnectStoredOf(instances, id) {
+	const read = await instances.readResolved(id);
+	if (read === null) return null;
 	return {
-		settings: next,
-		persist: async () => {
-			try {
-				await deps.setSettings({
-					id: integrationId,
-					settings: next,
-					secretKeys: [...HOME_CONNECT_SECRET_KEYS]
-				});
-				deps.logger.info("Home Connect moved the appliance pairing keys into the keychain", {
-					tags: { integrationId },
-					meta: { appliances: patch.appliances.length }
-				});
-			} catch (err) {
-				deps.logger.warn("Home Connect could not move the appliance pairing keys into the keychain", {
-					tags: { integrationId },
-					meta: { error: errMsg(err) }
-				});
-			}
-		}
+		settings: { ...read.body },
+		locked: read.secrets === "unavailable"
+	};
+}
+function buildHomeConnectInstances(records, deps) {
+	const handle = records.kind(homeConnectConnectionsEntryKind);
+	const instances = new RecordIntegrationInstances(records, homeConnectConnectionsEntryKind, {
+		description: {
+			role: "devices",
+			instanceMode: "multiple",
+			kind: "account",
+			canTest: true
+		},
+		formSchema: () => buildHomeConnectFormSchema(),
+		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(homeConnectConnectionsEntryKind.schema.shape)))
 	};
 }
 //#endregion
@@ -5316,6 +5368,7 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 		[DeviceType.EventEmitter]: HomeConnectEventDevice
 	};
 	clients = null;
+	instances = null;
 	reconciler = null;
 	loginProxy = null;
 	loginPlane = null;
@@ -5324,6 +5377,20 @@ var BoschHomeConnectProviderAddon = 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-home-connect: ctx.records is required (hub-only addon)");
+		await records.declare(homeConnectRecordKinds);
+		await this.runMigrations(defineAddonMigrations(HOME_CONNECT_MIGRATIONS, homeConnectRowsPorts({
+			api: defaultIntegrationApiOver(this.ctx.api),
+			secrets: this.ctx.secrets ?? null,
+			records,
+			warn: (message) => this.ctx.logger.warn(message)
+		})));
+		const built = buildHomeConnectInstances(records, {
+			onChanged: () => this.reconcileIntegrations(),
+			tester: this.buildConnectionTestProvider()
+		});
+		this.instances = built;
 		await this.serveLoginProxy();
 		this.clients = new HomeConnectClientRegistry(this.ctx.logger, { onConnectionUpdated: (integrationId, connection) => {
 			this.persistIntegrationAppliances(integrationId, connection);
@@ -5349,6 +5416,10 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 				{
 					capability: connectionTestCapability,
 					provider: this.buildConnectionTestProvider()
+				},
+				{
+					capability: integrationInstancesCapability,
+					provider: built.provider
 				}
 			],
 			customActions: homeConnectActions,
@@ -5408,6 +5479,7 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 			this.ctx.logger.warn("Home Connect shutdown error", { meta: { error: errMsg(err) } });
 		}
 		this.clients = null;
+		this.instances = null;
 		await super.onShutdown();
 	}
 	requireClients() {
@@ -5425,8 +5497,8 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 	/** Enriched IDDF maps and a rotated token pair, in one keychain-aware write. */
 	persistIntegrationAppliances(integrationId, connection) {
 		return buildHomeConnectConnectionPersister({
-			getSettings: (id) => this.ctx.api.integrations.getSettings.query({ id }),
-			setSettings: (input) => this.ctx.api.integrations.setSettings.mutate(input),
+			read: (id) => homeConnectStoredOf(this.requireInstances().instances, id),
+			patch: (id, patch) => this.requireInstances().handle.patch(id, patch),
 			logger: this.ctx.logger
 		})(integrationId, connection);
 	}
@@ -5435,15 +5507,14 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 		try {
 			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id && i.enabled);
 			const surviving = /* @__PURE__ */ new Set();
-			const secretMoves = [];
 			for (const integration of mine) try {
-				const stored = await this.ctx.api.integrations.getSettings.query({ id: integration.id });
-				const adopt = planLegacyApplianceSecretAdopt({
-					setSettings: (input) => this.ctx.api.integrations.setSettings.mutate(input),
-					logger: this.ctx.logger
-				}, integration.id, stored);
-				if (adopt !== null) secretMoves.push(adopt);
-				const settings = adopt?.settings ?? stored;
+				const stored = await homeConnectStoredOf(this.requireInstances().instances, integration.id);
+				if (stored === null) continue;
+				if (stored.locked) {
+					this.ctx.logger.warn("Home Connect reconcile skipped: the keychain is locked", { meta: { integrationId: integration.id } });
+					continue;
+				}
+				const settings = stored.settings;
 				const connection = connectionFromSettings(settings);
 				if (!connection) {
 					logHomeConnectSettingsGap(this.ctx.logger, integration.id, settings);
@@ -5467,7 +5538,6 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 					error: errMsg(err)
 				} });
 			}
-			for (const move of secretMoves) move.persist();
 			const vanished = reg.list().filter((id) => !surviving.has(id));
 			await reg.retain(surviving);
 			const deviceReg = this.ctx.kernel.deviceRegistry;
@@ -5595,9 +5665,6 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 			logger: this.ctx.logger
 		}, trigger);
 	}
-	globalSettingsSchema() {
-		return buildHomeConnectFormSchema();
-	}
 	async supportsManualCreation() {
 		return false;
 	}
@@ -5607,6 +5674,10 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 	async onCreateDevice(_type, _config) {
 		throw new Error("Home Connect devices are adopted from the gateway");
 	}
+	requireInstances() {
+		if (!this.instances) throw new Error("Home Connect provider not initialised");
+		return this.instances;
+	}
 	setIntegrationDevicesOnline(integrationId, online) {
 		const reg = this.ctx.kernel.deviceRegistry;
 		if (!reg) return;