@camstack/addon-provider-bosch 0.1.50 → 0.1.52

package/dist/shc/addon.mjs

@@ -1,4 +1,4 @@
-import { $ as EventCategory, A as RecordIntegrationInstances, D as switchCapability, F as entryBody, G as object, M as customAction, N as defineCustomActions, O as temperatureSensorCapability, P as defineEntryKind, Q as errMsg, R as rowsDepsOver, U as literal, V as array, W as number, Z as DeviceType, a as BaseDevice, d as climateControlCapability, i as testBoschInstance, l as batteryCapability, n as boschRowsPorts, o as BaseDeviceProvider, p as deviceAdoptionCapability, q as string, r as keepBodyKeys, t as boschRowsMigration, x as integrationInstancesCapability, y as heatingValveCapability, z as _enum } from "../bosch-instances-CdvcBYye.mjs";
+import { $ as errMsg, B as _enum, F as defineEntryKind, G as number, H as array, I as entryBody, J as string, K as object, N as customAction, O as switchCapability, P as defineCustomActions, Q as DeviceType, T as registerPowerSwitch, W as literal, Z as DeviceRole, a as BaseDevice, d as climateControlCapability, et as EventCategory, i as testBoschInstance, j as RecordIntegrationInstances, k as temperatureSensorCapability, l as batteryCapability, n as boschRowsPorts, o as BaseDeviceProvider, p as deviceAdoptionCapability, r as keepBodyKeys, t as boschRowsMigration, x as integrationInstancesCapability, y as heatingValveCapability, z as rowsDepsOver } from "../bosch-instances-DSE6IXdU.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";
@@ -39,6 +39,146 @@ var boschShcActions = defineCustomActions({
 	})
 });
 //#endregion
+//#region src/shc/shc-domain-mapping.ts
+var ROOM_CLIMATE_MODEL = "ROOM_CLIMATE_CONTROL";
+/** Classify a normalised device summary into an adoption / driver kind. */
+function classifyShcDevice(device) {
+	const fromModel = shcKindForModel(device.deviceModel);
+	if (fromModel !== "unsupported") return fromModel;
+	if (device.services.includes("RoomClimateControl")) return "room-climate";
+	if (device.services.includes("PowerSwitch")) return "switch";
+	if (device.services.includes("TemperatureLevel") || device.services.includes("ValveTappet")) return "trv";
+	return "unsupported";
+}
+function shcKindForModel(deviceModel) {
+	if (deviceModel === ROOM_CLIMATE_MODEL) return "room-climate";
+	if (deviceModel === "TWR_SWITCH" || deviceModel === "DIMMER_LIGHT" || deviceModel === "PLUG_COMPACT" || deviceModel === "PLUG_COMPACT_DUAL") return "switch";
+	if (deviceModel === "HEATING_THERMOSTAT" || deviceModel === "RADIATOR_THERMOSTAT" || deviceModel === "TRV_GEN2_DUAL" || deviceModel === "TRV") return "trv";
+	return "unsupported";
+}
+function deviceTypeForShcKind(kind) {
+	switch (kind) {
+		case "room-climate": return DeviceType.Container;
+		case "trv": return DeviceType.Climate;
+		case "switch": return DeviceType.Switch;
+	}
+}
+/** D1033 — which climate device an SHC kind is: a valve is a radiator, a room a thermostat. */
+function shcClimateRole(kind) {
+	return kind === "trv" ? DeviceRole.ClimateRadiator : DeviceRole.ClimateThermostat;
+}
+/** The room-climate accessory's stable-id suffix (`ShcClimateRoomDevice`). */
+var SHC_ROOM_CLIMATE_SUFFIX = "climate";
+/**
+* D1033 — a valve and a room climate share the `climate` type, so a persisted
+* row is told apart by its model when the config carries one, else by the
+* room-climate accessory's stable-id suffix.
+*/
+function shcClimateRowKind(row) {
+	const model = row.config?.["deviceModel"];
+	if (typeof model === "string") {
+		const kind = shcKindForModel(model);
+		if (kind === "trv" || kind === "room-climate") return kind;
+	}
+	return row.stableId.endsWith(`-climate`) ? "room-climate" : "trv";
+}
+function capsForShcKind(kind) {
+	switch (kind) {
+		case "room-climate": return ["climate-control"];
+		case "switch": return ["switch"];
+		case "trv": return [
+			"temperature-sensor",
+			"battery",
+			"heating-valve"
+		];
+	}
+}
+function mapShcModeToHvac(state) {
+	if ((state.roomControlMode ?? "").toUpperCase() === "OFF") return "off";
+	const upper = (state.operationMode ?? state.mode ?? "").toUpperCase();
+	if (upper === "OFF") return "off";
+	if (upper === "AUTOMATIC" || upper === "AUTO") return "auto";
+	if (upper.includes("COOL")) return "cool";
+	if (upper.includes("HEAT")) return "heat";
+	return "heat";
+}
+var CLIMATE_MODES = [
+	"off",
+	"heat",
+	"auto"
+];
+/**
+* Setpoint ends the Smart Home Controller app enforces. RoomClimateControl
+* state does not carry them; a value present on the payload still wins.
+*/
+var SHC_SETPOINT_MIN = 5;
+var SHC_SETPOINT_MAX = 30;
+/** Map Bosch RoomClimateControl state JSON → CamStack climate-control slice. */
+function mapRoomClimateStateToSlice(state) {
+	const now = Date.now();
+	return {
+		mode: mapShcModeToHvac(state),
+		availableModes: [...CLIMATE_MODES],
+		fanMode: "",
+		availableFanModes: [],
+		preset: "",
+		availablePresets: [],
+		target: state.setpointTemperature ?? null,
+		targetHigh: null,
+		targetLow: null,
+		targetHumidity: null,
+		currentTemp: state.temperature ?? null,
+		currentHumidity: null,
+		swingVertical: null,
+		swingHorizontal: null,
+		minTemp: state.minTemperature ?? SHC_SETPOINT_MIN,
+		maxTemp: state.maxTemperature ?? SHC_SETPOINT_MAX,
+		tempStep: .5,
+		lastFetchedAt: now
+	};
+}
+/**
+* PUT bodies for a mode change, in order.
+* Off is `roomControlMode` alone — `operationMode: OFF` is rejected.
+* Heat and auto must turn heating on first; combining both fields while
+* the room is off returns WRONG_THERMOSTAT_GROUP_MODE.
+*/
+function buildRoomClimateModeBodies(mode) {
+	if (mode === "off") return [{
+		"@type": "climateControlState",
+		roomControlMode: "OFF"
+	}];
+	return [{
+		"@type": "climateControlState",
+		roomControlMode: "HEATING"
+	}, {
+		"@type": "climateControlState",
+		operationMode: mode === "auto" ? "AUTOMATIC" : "MANUAL"
+	}];
+}
+/** PowerSwitch on the controller is the string `ON` / `OFF`, not a boolean. */
+function readShcSwitchOn(state) {
+	if (isShcSwitchOn(state.switchState)) return true;
+	return isShcSwitchOn(state.switchStates?.[0]?.switchState);
+}
+function isShcSwitchOn(value) {
+	if (value === true) return true;
+	return typeof value === "string" && value.toUpperCase() === "ON";
+}
+function buildPowerSwitchPutBody(on) {
+	return {
+		"@type": "powerSwitchState",
+		switchState: on ? "ON" : "OFF"
+	};
+}
+/** Body for PUT RoomClimateControl/state when changing the setpoint. */
+function buildRoomClimatePutBody(input) {
+	return {
+		"@type": "climateControlState",
+		setpointTemperature: input.target
+	};
+}
+//#endregion
 //#region src/shc/config.ts
 /** Operator settings for one SHC integration (local mTLS + optional token). */
 var shcConfigSchema = object({
@@ -563,9 +703,12 @@ var ShcBaseDevice = class extends BaseDevice {
 	brokerId;
 	deviceModel;
 	stateUnsub = null;
-	constructor(ctx) {
+	constructor(ctx, role) {
 		const persisted = shcDeviceSchema.parse(ctx.persistedConfig ?? {});
-		super(ctx, shcDeviceSchema, { type: ctx.deviceMeta.type });
+		super(ctx, shcDeviceSchema, {
+			type: ctx.deviceMeta.type,
+			...role !== void 0 ? { role } : {}
+		});
 		this.shcDeviceId = persisted.shcDeviceId;
 		this.brokerId = persisted.brokerId;
 		this.deviceModel = persisted.deviceModel;
@@ -649,127 +792,6 @@ var ShcGatewayDevice = class extends BaseDevice {
 	}
 };
 //#endregion
-//#region src/shc/shc-domain-mapping.ts
-var ROOM_CLIMATE_MODEL = "ROOM_CLIMATE_CONTROL";
-/** Classify a normalised device summary into an adoption / driver kind. */
-function classifyShcDevice(device) {
-	const fromModel = shcKindForModel(device.deviceModel);
-	if (fromModel !== "unsupported") return fromModel;
-	if (device.services.includes("RoomClimateControl")) return "room-climate";
-	if (device.services.includes("PowerSwitch")) return "switch";
-	if (device.services.includes("TemperatureLevel") || device.services.includes("ValveTappet")) return "trv";
-	return "unsupported";
-}
-function shcKindForModel(deviceModel) {
-	if (deviceModel === ROOM_CLIMATE_MODEL) return "room-climate";
-	if (deviceModel === "TWR_SWITCH" || deviceModel === "DIMMER_LIGHT" || deviceModel === "PLUG_COMPACT" || deviceModel === "PLUG_COMPACT_DUAL") return "switch";
-	if (deviceModel === "HEATING_THERMOSTAT" || deviceModel === "RADIATOR_THERMOSTAT" || deviceModel === "TRV_GEN2_DUAL" || deviceModel === "TRV") return "trv";
-	return "unsupported";
-}
-function deviceTypeForShcKind(kind) {
-	switch (kind) {
-		case "room-climate": return DeviceType.Container;
-		case "trv": return DeviceType.Thermostat;
-		case "switch": return DeviceType.Switch;
-	}
-}
-function capsForShcKind(kind) {
-	switch (kind) {
-		case "room-climate": return ["climate-control"];
-		case "switch": return ["switch"];
-		case "trv": return [
-			"temperature-sensor",
-			"battery",
-			"heating-valve"
-		];
-	}
-}
-function mapShcModeToHvac(state) {
-	if ((state.roomControlMode ?? "").toUpperCase() === "OFF") return "off";
-	const upper = (state.operationMode ?? state.mode ?? "").toUpperCase();
-	if (upper === "OFF") return "off";
-	if (upper === "AUTOMATIC" || upper === "AUTO") return "auto";
-	if (upper.includes("COOL")) return "cool";
-	if (upper.includes("HEAT")) return "heat";
-	return "heat";
-}
-var CLIMATE_MODES = [
-	"off",
-	"heat",
-	"auto"
-];
-/**
-* Setpoint ends the Smart Home Controller app enforces. RoomClimateControl
-* state does not carry them; a value present on the payload still wins.
-*/
-var SHC_SETPOINT_MIN = 5;
-var SHC_SETPOINT_MAX = 30;
-/** Map Bosch RoomClimateControl state JSON → CamStack climate-control slice. */
-function mapRoomClimateStateToSlice(state) {
-	const now = Date.now();
-	return {
-		mode: mapShcModeToHvac(state),
-		availableModes: [...CLIMATE_MODES],
-		fanMode: "",
-		availableFanModes: [],
-		preset: "",
-		availablePresets: [],
-		target: state.setpointTemperature ?? null,
-		targetHigh: null,
-		targetLow: null,
-		targetHumidity: null,
-		currentTemp: state.temperature ?? null,
-		currentHumidity: null,
-		swingVertical: null,
-		swingHorizontal: null,
-		minTemp: state.minTemperature ?? SHC_SETPOINT_MIN,
-		maxTemp: state.maxTemperature ?? SHC_SETPOINT_MAX,
-		tempStep: .5,
-		lastFetchedAt: now
-	};
-}
-/**
-* PUT bodies for a mode change, in order.
-* Off is `roomControlMode` alone — `operationMode: OFF` is rejected.
-* Heat and auto must turn heating on first; combining both fields while
-* the room is off returns WRONG_THERMOSTAT_GROUP_MODE.
-*/
-function buildRoomClimateModeBodies(mode) {
-	if (mode === "off") return [{
-		"@type": "climateControlState",
-		roomControlMode: "OFF"
-	}];
-	return [{
-		"@type": "climateControlState",
-		roomControlMode: "HEATING"
-	}, {
-		"@type": "climateControlState",
-		operationMode: mode === "auto" ? "AUTOMATIC" : "MANUAL"
-	}];
-}
-/** PowerSwitch on the controller is the string `ON` / `OFF`, not a boolean. */
-function readShcSwitchOn(state) {
-	if (isShcSwitchOn(state.switchState)) return true;
-	return isShcSwitchOn(state.switchStates?.[0]?.switchState);
-}
-function isShcSwitchOn(value) {
-	if (value === true) return true;
-	return typeof value === "string" && value.toUpperCase() === "ON";
-}
-function buildPowerSwitchPutBody(on) {
-	return {
-		"@type": "powerSwitchState",
-		switchState: on ? "ON" : "OFF"
-	};
-}
-/** Body for PUT RoomClimateControl/state when changing the setpoint. */
-function buildRoomClimatePutBody(input) {
-	return {
-		"@type": "climateControlState",
-		setpointTemperature: input.target
-	};
-}
-//#endregion
 //#region src/shc/shc-discovery.ts
 var GATEWAY_SUFFIX = ":controller";
 /** The `childNativeId` (and `shcDeviceId`) of the controller box itself, one per integration. */
@@ -800,7 +822,7 @@ function trvCandidate(device) {
 	return {
 		childNativeId: device.id,
 		name: device.name.length > 0 ? device.name : device.id,
-		type: DeviceType.Thermostat,
+		type: DeviceType.Climate,
 		status: "online",
 		metadata: {
 			serialNumber: device.id,
@@ -993,10 +1015,10 @@ var COLD_START = {
 };
 var ShcRoomClimateDevice = class extends ShcBaseDevice {
 	constructor(ctx) {
-		super(ctx);
+		super(ctx, shcClimateRole("room-climate"));
 	}
 	registerCaps() {
-		this.ctx.registerNativeCap(climateControlCapability, {
+		const provider = {
 			getStatus: async () => this.runtimeState.getCapState(CLIMATE_CAP) ?? COLD_START,
 			setMode: async ({ mode }) => {
 				const client = this.requireClient();
@@ -1035,7 +1057,9 @@ var ShcRoomClimateDevice = class extends ShcBaseDevice {
 			setTargetHumidity: async () => this.unsupported("climate humidity"),
 			setSwingVertical: async () => this.unsupported("climate swing"),
 			setSwingHorizontal: async () => this.unsupported("climate swing")
-		});
+		};
+		this.ctx.registerNativeCap(climateControlCapability, provider);
+		registerPowerSwitch(this, climateControlCapability, provider);
 		this.runtimeState.setCapState(CLIMATE_CAP, COLD_START);
 	}
 	async refreshFromController() {
@@ -1093,7 +1117,7 @@ var VALVE_COLD = {
 /** Radiator TRV — local temperature, valve position, battery (no room setpoint). */
 var ShcTrvDevice = class extends ShcBaseDevice {
 	constructor(ctx) {
-		super(ctx);
+		super(ctx, shcClimateRole("trv"));
 	}
 	registerCaps() {
 		this.ctx.registerNativeCap(temperatureSensorCapability, { getStatus: async () => this.runtimeState.getCapState(TEMP_CAP) ?? TEMP_COLD });
@@ -1190,9 +1214,10 @@ var ShcClimateRoomDevice = class extends BaseDevice {
 					...this.integrationId !== void 0 ? { integrationId: this.integrationId } : {}
 				};
 				return {
-					stableIdSuffix: "climate",
+					stableIdSuffix: SHC_ROOM_CLIMATE_SUFFIX,
 					meta: {
 						type: DeviceType.Climate,
+						role: shcClimateRole("room-climate"),
 						name: shcClimateEntityName(containerName),
 						linkDeviceId: this.id,
 						...this.integrationId !== void 0 ? { integrationId: this.integrationId } : {}
@@ -1211,7 +1236,8 @@ var ShcClimateRoomDevice = class extends BaseDevice {
 			return {
 				stableIdSuffix: `trv-${shcStableIdSuffixFromDeviceId(child.shcDeviceId)}`,
 				meta: {
-					type: DeviceType.Thermostat,
+					type: DeviceType.Climate,
+					role: shcClimateRole("trv"),
 					name: child.name,
 					linkDeviceId: this.id,
 					...this.integrationId !== void 0 ? { integrationId: this.integrationId } : {}
@@ -13554,7 +13580,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 //#region ../../node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var { writeFile, readFile, mkdir } = __require("node:fs/promises");
-	var { dirname, resolve } = __require("node:path");
+	var { dirname: dirname$1, resolve } = __require("node:path");
 	var { setTimeout: setTimeout$1, clearTimeout: clearTimeout$1 } = __require("node:timers");
 	var { InvalidArgumentError, UndiciError } = require_errors();
 	var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -13840,7 +13866,7 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin(((exports, module)
 			const path = filePath || this.#snapshotPath;
 			if (!path) throw new InvalidArgumentError("Snapshot path is required");
 			const resolvedPath = resolve(path);
-			await mkdir(dirname(resolvedPath), { recursive: true });
+			await mkdir(dirname$1(resolvedPath), { recursive: true });
 			const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
 				hash,
 				snapshot
@@ -23832,10 +23858,14 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 	deviceClasses = {
 		[DeviceType.Gateway]: ShcGatewayDevice,
 		[DeviceType.Container]: ShcClimateRoomDevice,
-		[DeviceType.Climate]: ShcRoomClimateDevice,
-		[DeviceType.Thermostat]: ShcTrvDevice,
+		[DeviceType.Climate]: ShcTrvDevice,
 		[DeviceType.Switch]: ShcSwitchDevice
 	};
+	/** D1033 — a valve and a room climate are both `climate`: rebuild each with its class. */
+	deviceClassForRow(row) {
+		if (row.type !== DeviceType.Climate) return super.deviceClassForRow(row);
+		return shcClimateRowKind(row) === "room-climate" ? ShcRoomClimateDevice : ShcTrvDevice;
+	}
 	clients = null;
 	instances = null;
 	constructor() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -112,6 +112,9 @@
         "execution": {
           "placement": "hub-only"
         },
+        "python": {
+          "requirements": "./python/requirements.txt"
+        },
         "capabilities": [
           {
             "name": "device-provider"
@@ -138,11 +141,12 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.834"
+      "server": ">=1.2.841"
     }
   },
   "files": [
     "dist",
+    "python",
     "i18n",
     "assets",
     "README.md",