@camstack/addon-provider-bosch 0.1.46 → 0.1.48

package/dist/home-connect/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bosch_instances = require("../bosch-instances-BD-Valeo.js");
-const require_account_integration_offline = require("../account-integration-offline-BfsMnlJo.js");
+const require_bosch_instances = require("../bosch-instances-CRvxRbDk.js");
+const require_account_integration_offline = require("../account-integration-offline-CQ7UB6U_.js");
 let node_crypto = require("node:crypto");
 let node_tls = require("node:tls");
 let node_zlib = require("node:zlib");

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as RecordIntegrationInstances, B as array, C as powerMeterCapability, E as runningStateCapability, F as entryBody, G as string, I as isSecretMarker, J as DeviceRole, K as union, L as isSecretMarkerLike, M as customAction, N as defineCustomActions, P as defineEntryKind, R as rowsDepsOver, S as numericSensorCapability, T as runningFromDishwasherOperation, U as object, V as literal, W as record, X as errMsg, Y as DeviceType, Z as EventCategory, a as BaseDevice, b as ingestReading, c as RUNNING_STATE_COLD, f as consumablesCapability, g as eventEmitterCapability, h as enumSensorCapability, i as testBoschInstance, j as createEvent, m as dishwasherCapability, n as boschRowsPorts, o as BaseDeviceProvider, p as deviceAdoptionCapability, q as unknown, r as keepBodyKeys, s as DishwasherOperationStateSchema, t as boschRowsMigration, u as binaryCapability, w as quantityFromUnit, x as integrationInstancesCapability, z as _enum } from "../bosch-instances-DkUo6BfT.mjs";
-import { a as loginFailureForAttempt, c as HOME_CONNECT_REDIRECT_URI, i as createSignInAttemptStore, n as cascadeRemoveDevicesForIntegration, o as parseOAuthCallback, r as buildSignInGuideFields, t as setIntegrationDevicesOnline } from "../account-integration-offline-BGH1q3tj.mjs";
+import { A as RecordIntegrationInstances, B as array, C as powerMeterCapability, E as runningStateCapability, F as entryBody, G as string, I as isSecretMarker, J as DeviceRole, K as union, L as isSecretMarkerLike, M as customAction, N as defineCustomActions, P as defineEntryKind, R as rowsDepsOver, S as numericSensorCapability, T as runningFromDishwasherOperation, U as object, V as literal, W as record, X as errMsg, Y as DeviceType, Z as EventCategory, a as BaseDevice, b as ingestReading, c as RUNNING_STATE_COLD, f as consumablesCapability, g as eventEmitterCapability, h as enumSensorCapability, i as testBoschInstance, j as createEvent, m as dishwasherCapability, n as boschRowsPorts, o as BaseDeviceProvider, p as deviceAdoptionCapability, q as unknown, r as keepBodyKeys, s as DishwasherOperationStateSchema, t as boschRowsMigration, u as binaryCapability, w as quantityFromUnit, x as integrationInstancesCapability, z as _enum } from "../bosch-instances-t9x1fGVW.mjs";
+import { a as loginFailureForAttempt, c as HOME_CONNECT_REDIRECT_URI, i as createSignInAttemptStore, n as cascadeRemoveDevicesForIntegration, o as parseOAuthCallback, r as buildSignInGuideFields, t as setIntegrationDevicesOnline } from "../account-integration-offline-DLCUxCxS.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";

package/dist/homecom/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bosch_instances = require("../bosch-instances-BD-Valeo.js");
-const require_account_integration_offline = require("../account-integration-offline-BfsMnlJo.js");
+const require_bosch_instances = require("../bosch-instances-CRvxRbDk.js");
+const require_account_integration_offline = require("../account-integration-offline-CQ7UB6U_.js");
 let node_crypto = require("node:crypto");
 //#region src/homecom/config.ts
 var HOMECOM_BRANDS = ["bosch", "buderus"];
@@ -1807,6 +1807,129 @@ function buildHomeComGatewayPersister(deps) {
 	return (integrationId, gatewayId) => patch(integrationId, { gatewayId });
 }
 //#endregion
+//#region src/homecom/homecom-gateway.ts
+/** Stable id of one HomeCom device. Adoption matches an existing row on this. */
+function homeComStableId(integrationId, nativeId) {
+	return `homecom:${integrationId}:${nativeId}`;
+}
+/** The hot-water child of a heat pump. A boiler's own row keeps its longer name. */
+var HOMECOM_HOT_WATER_CHILD_NAME = "Hot water";
+var HomeComConnectionResolver = class {
+	#surfaces = /* @__PURE__ */ new Map();
+	set(integrationId, surface) {
+		if (surface === null) {
+			this.#surfaces.delete(integrationId);
+			return;
+		}
+		this.#surfaces.set(integrationId, surface);
+	}
+	has(integrationId) {
+		return this.#surfaces.has(integrationId);
+	}
+	list() {
+		return Array.from(this.#surfaces.keys()).map((id) => ({ id }));
+	}
+	discoverables(integrationId) {
+		return this.#surfaces.get(integrationId)?.discoverables ?? [];
+	}
+	getClient(integrationId) {
+		return this.#surfaces.get(integrationId)?.client ?? null;
+	}
+	getSnapshot(integrationId) {
+		return this.#surfaces.get(integrationId)?.snapshot ?? null;
+	}
+	updateSnapshot(integrationId, snapshot) {
+		const existing = this.#surfaces.get(integrationId);
+		if (!existing) return;
+		this.#surfaces.set(integrationId, {
+			...existing,
+			snapshot,
+			discoverables: buildDiscoverables(snapshot)
+		});
+	}
+	clear() {
+		this.#surfaces.clear();
+	}
+};
+var BOILER_DHW_NAME = "Domestic hot water";
+function circuitDiscoverable(circuit) {
+	return {
+		nativeId: `hc:${circuit.id}`,
+		name: circuit.name,
+		kind: "heating-circuit",
+		circuitId: circuit.id
+	};
+}
+function dhwDiscoverable(name) {
+	return {
+		nativeId: "dhw:0",
+		name,
+		kind: "dhw"
+	};
+}
+/**
+* A gateway with a heat pump is one pick. A boiler still offers each circuit
+* and the hot-water row on its own.
+*/
+function buildDiscoverables(snapshot) {
+	const circuits = snapshot.circuits.map(circuitDiscoverable);
+	if (snapshot.heatPump !== void 0) return [{
+		nativeId: "hp:0",
+		name: "Heat pump",
+		kind: "heat-pump",
+		children: [...circuits, ...snapshot.dhw === null ? [] : [dhwDiscoverable(HOMECOM_HOT_WATER_CHILD_NAME)]]
+	}];
+	return [...circuits, ...snapshot.dhw === null ? [] : [dhwDiscoverable(BOILER_DHW_NAME)]];
+}
+var homeComConnections = new HomeComConnectionResolver();
+//#endregion
+//#region src/homecom/homecom-adoption-plan.ts
+function createOf(device, parentNativeId) {
+	return {
+		nativeId: device.nativeId,
+		name: device.name,
+		kind: device.kind,
+		circuitId: device.circuitId,
+		parentNativeId
+	};
+}
+/**
+* The devices one pick creates. A heat pump also creates its children, except
+* a circuit or hot-water row that already exists: a top-level one is reported
+* so the caller can log why it stayed there, and any existing row is not
+* created again.
+*/
+function planHomeComAdoption(device, integrationId, adopted) {
+	const root = createOf(device, null);
+	if (device.kind !== "heat-pump") return {
+		create: [root],
+		stayedTopLevel: [],
+		alreadyPresent: []
+	};
+	const byStableId = new Map(adopted.map((row) => [row.stableId, row]));
+	const create = [root];
+	const stayedTopLevel = [];
+	const alreadyPresent = [];
+	for (const child of device.children ?? []) {
+		const existing = byStableId.get(homeComStableId(integrationId, child.nativeId));
+		if (existing === void 0) {
+			create.push(createOf(child, device.nativeId));
+			continue;
+		}
+		const skip = {
+			nativeId: child.nativeId,
+			deviceId: existing.id
+		};
+		if (existing.parentDeviceId === null) stayedTopLevel.push(skip);
+		else alreadyPresent.push(skip);
+	}
+	return {
+		create,
+		stayedTopLevel,
+		alreadyPresent
+	};
+}
+//#endregion
 //#region src/homecom/homecom-discovery.ts
 function buildHomeComCandidates(input) {
 	const out = [];
@@ -1826,6 +1949,9 @@ function buildHomeComCandidates(input) {
 	}
 	return out;
 }
+function homeComDeviceType(kind) {
+	return shapeOf(kind).type;
+}
 function shapeOf(kind) {
 	switch (kind) {
 		case "heating-circuit": return {
@@ -1849,6 +1975,62 @@ var DEVICES_FILTER = {
 	label: "Devices",
 	isDefault: true
 };
+var STAYED_TOP_LEVEL = "HomeCom device stayed top-level: it was already adopted, so it was not created again under the heat pump";
+var ALREADY_PRESENT = "HomeCom device was not created again: a device with this stable id already exists";
+async function adoptOne(input) {
+	const { dev, integrationId, name, known, adoptDevice, logger, logOnce } = input;
+	const plan = planHomeComAdoption(dev, integrationId, known);
+	for (const skip of plan.stayedTopLevel) logOnce(skip.deviceId, STAYED_TOP_LEVEL);
+	for (const skip of plan.alreadyPresent) logOnce(skip.deviceId, ALREADY_PRESENT);
+	const root = plan.create[0];
+	if (root === void 0) return { ok: false };
+	let parentDeviceId;
+	try {
+		parentDeviceId = (await adoptDevice({
+			nativeId: root.nativeId,
+			integrationId,
+			type: homeComDeviceType(root.kind),
+			name,
+			kind: root.kind,
+			...root.circuitId === void 0 ? {} : { circuitId: root.circuitId },
+			parentDeviceId: null
+		})).deviceId;
+	} catch (err) {
+		logger.warn("homecom adopt failed", { meta: {
+			nativeId: root.nativeId,
+			integrationId,
+			error: require_bosch_instances.errMsg(err)
+		} });
+		return { ok: false };
+	}
+	const accessoryDeviceIds = [];
+	for (const child of plan.create.slice(1)) try {
+		const created = await adoptDevice({
+			nativeId: child.nativeId,
+			integrationId,
+			type: homeComDeviceType(child.kind),
+			name: child.name,
+			kind: child.kind,
+			...child.circuitId === void 0 ? {} : { circuitId: child.circuitId },
+			parentDeviceId
+		});
+		accessoryDeviceIds.push(created.deviceId);
+	} catch (err) {
+		logger.warn("homecom adopt child failed", {
+			tags: { deviceId: parentDeviceId },
+			meta: {
+				nativeId: child.nativeId,
+				integrationId,
+				error: require_bosch_instances.errMsg(err)
+			}
+		});
+	}
+	return {
+		ok: true,
+		parentDeviceId,
+		accessoryDeviceIds
+	};
+}
 async function adoptedMapForIntegration(integrationId, listAdopted) {
 	const all = await listAdopted();
 	const map = /* @__PURE__ */ new Map();
@@ -1860,6 +2042,12 @@ async function adoptedMapForIntegration(integrationId, listAdopted) {
 }
 function buildHomeComAdoptionProvider(deps) {
 	const { registry, hasIntegration, listIntegrations, listAdopted, adoptDevice, removeDevice, findDeviceConfig, logger } = deps;
+	const logged = /* @__PURE__ */ new Set();
+	const logOnce = (deviceId, message) => {
+		if (logged.has(deviceId)) return;
+		logged.add(deviceId);
+		logger.info(message, { tags: { deviceId } });
+	};
 	async function allCandidatesForIntegration(integrationId) {
 		return buildHomeComCandidates({
 			devices: registry.discoverables(integrationId),
@@ -1914,48 +2102,36 @@ function buildHomeComAdoptionProvider(deps) {
 		adopt: async ({ integrationId, childNativeIds, perCandidate }) => {
 			if (!registry.has(integrationId)) throw new Error(`homecom adopt: integration ${integrationId} not connected`);
 			const devices = registry.discoverables(integrationId);
+			const known = await listAdopted();
 			const adopted = [];
 			let failures = 0;
-			for (const nativeId of childNativeIds) try {
+			for (const nativeId of childNativeIds) {
 				const dev = devices.find((d) => d.nativeId === nativeId);
 				if (!dev) {
 					failures++;
 					continue;
 				}
-				const candidate = buildHomeComCandidates({
-					devices: [dev],
-					adopted: /* @__PURE__ */ new Map()
-				})[0];
-				if (!candidate) {
+				const outcome = await adoptOne({
+					dev,
+					integrationId,
+					name: perCandidate?.[nativeId]?.name ?? dev.name,
+					known,
+					adoptDevice,
+					logger,
+					logOnce
+				});
+				if (!outcome.ok) {
 					failures++;
 					continue;
 				}
-				const name = perCandidate?.[nativeId]?.name ?? dev.name;
-				const { deviceId } = await adoptDevice({
-					nativeId,
-					integrationId,
-					type: candidate.type,
-					name,
-					kind: dev.kind,
-					circuitId: dev.circuitId
-				});
 				adopted.push({
 					childNativeId: nativeId,
-					parentDeviceId: deviceId
+					parentDeviceId: outcome.parentDeviceId,
+					accessoryDeviceIds: outcome.accessoryDeviceIds
 				});
-			} catch (err) {
-				logger.warn("homecom adopt failed", { meta: {
-					nativeId,
-					integrationId,
-					error: require_bosch_instances.errMsg(err)
-				} });
-				failures++;
 			}
 			if (adopted.length === 0 && failures > 0) throw new Error(`homecom adopt: all ${failures} adopt(s) failed`);
-			return { adopted: adopted.map((a) => ({
-				...a,
-				accessoryDeviceIds: []
-			})) };
+			return { adopted };
 		},
 		release: async ({ camDeviceId }) => {
 			await removeDevice(camDeviceId);
@@ -1975,66 +2151,6 @@ function buildHomeComAdoptionProvider(deps) {
 	};
 }
 //#endregion
-//#region src/homecom/homecom-gateway.ts
-var HomeComConnectionResolver = class {
-	#surfaces = /* @__PURE__ */ new Map();
-	set(integrationId, surface) {
-		if (surface === null) {
-			this.#surfaces.delete(integrationId);
-			return;
-		}
-		this.#surfaces.set(integrationId, surface);
-	}
-	has(integrationId) {
-		return this.#surfaces.has(integrationId);
-	}
-	list() {
-		return Array.from(this.#surfaces.keys()).map((id) => ({ id }));
-	}
-	discoverables(integrationId) {
-		return this.#surfaces.get(integrationId)?.discoverables ?? [];
-	}
-	getClient(integrationId) {
-		return this.#surfaces.get(integrationId)?.client ?? null;
-	}
-	getSnapshot(integrationId) {
-		return this.#surfaces.get(integrationId)?.snapshot ?? null;
-	}
-	updateSnapshot(integrationId, snapshot) {
-		const existing = this.#surfaces.get(integrationId);
-		if (!existing) return;
-		this.#surfaces.set(integrationId, {
-			...existing,
-			snapshot,
-			discoverables: buildDiscoverables(snapshot)
-		});
-	}
-	clear() {
-		this.#surfaces.clear();
-	}
-};
-function buildDiscoverables(snapshot) {
-	const out = [];
-	for (const circuit of snapshot.circuits) out.push({
-		nativeId: `hc:${circuit.id}`,
-		name: circuit.name,
-		kind: "heating-circuit",
-		circuitId: circuit.id
-	});
-	if (snapshot.dhw) out.push({
-		nativeId: "dhw:0",
-		name: "Domestic hot water",
-		kind: "dhw"
-	});
-	if (snapshot.heatPump !== void 0) out.push({
-		nativeId: "hp:0",
-		name: "Heat pump",
-		kind: "heat-pump"
-	});
-	return out;
-}
-var homeComConnections = new HomeComConnectionResolver();
-//#endregion
 //#region src/homecom/homecom-integration-manager.ts
 var HomeComIntegrationManager = class {
 	#id;
@@ -2933,7 +3049,7 @@ var BoschHomeComProviderAddon = class extends require_bosch_instances.BaseDevice
 		if (typeof integrationId !== "string" || integrationId.length === 0) throw new Error("homecom generateStableId: brokerId required");
 		const nativeId = config?.["nativeId"];
 		if (typeof nativeId !== "string" || nativeId.length === 0) throw new Error("homecom generateStableId: nativeId required");
-		return `homecom:${integrationId}:${nativeId}`;
+		return homeComStableId(integrationId, nativeId);
 	}
 	async reconcileIntegrations() {
 		const reg = this.requireClients();
@@ -2995,12 +3111,14 @@ var BoschHomeComProviderAddon = class extends require_bosch_instances.BaseDevice
 					const config = await devices.loadConfig(d.id).catch(() => ({}));
 					out.push({
 						id: d.id,
+						stableId: d.stableId,
+						parentDeviceId: d.parentDeviceId,
 						config
 					});
 				}
 				return out;
 			},
-			adoptDevice: async ({ nativeId, integrationId, type, name, kind, circuitId }) => {
+			adoptDevice: async ({ nativeId, integrationId, type, name, kind, circuitId, parentDeviceId }) => {
 				const devices = this.ctx.kernel.devices;
 				if (!devices) throw new Error("homecom adopt: devices unavailable");
 				const config = {
@@ -3014,7 +3132,7 @@ var BoschHomeComProviderAddon = class extends require_bosch_instances.BaseDevice
 				const stableId = this.generateStableId(type, config);
 				const DeviceClass = this.deviceClasses[type];
 				if (!DeviceClass) throw new Error(`homecom adopt: unsupported type ${type}`);
-				return { deviceId: (await devices.create(stableId, DeviceClass, config, null, {
+				return { deviceId: (await devices.create(stableId, DeviceClass, config, parentDeviceId, {
 					type,
 					name,
 					integrationId