@camstack/addon-provider-bosch 0.1.33 → 0.1.35

package/dist/shc/addon.mjs

@@ -1,4 +1,4 @@
-import { A as customAction, C as switchCapability, D as DeviceType, F as array, L as literal, O as errMsg, P as _enum, R as number, V as string, W as EventCategory, f as deviceAdoptionCapability, g as heatingValveCapability, j as defineCustomActions, l as climateControlCapability, n as BaseDeviceProvider, s as batteryCapability, t as BaseDevice, u as connectionTestCapability, w as temperatureSensorCapability, z as object } from "../dist-hH1ghdQ4.mjs";
+import { C as switchCapability, D as customAction, F as number, H as DeviceType, I as object, M as array, O as defineCustomActions, P as literal, R as string, U as errMsg, W as EventCategory, f as deviceAdoptionCapability, g as heatingValveCapability, j as _enum, l as climateControlCapability, n as BaseDeviceProvider, s as batteryCapability, t as BaseDevice, u as connectionTestCapability, w as temperatureSensorCapability } from "../dist-CkMPcvma.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";
@@ -389,7 +389,7 @@ function proposeShcControllers(found, existingHosts) {
 function shcDiscoveryCandidates(proposals) {
 	return proposals.map((found) => ({
 		stableId: `bosch-shc:${found.id}`,
-		type: DeviceType.Hub,
+		type: DeviceType.Gateway,
 		suggestedName: found.name,
 		prefilledConfig: { host: found.host },
 		setupIntegration: true
@@ -409,6 +409,137 @@ function resolveShcPairingHost(input) {
 	throw new Error("Enter the controller host or IP address.");
 }
 //#endregion
+//#region src/shc/shc-gateway.ts
+/** In-process resolver: integrationId → live SHC connection surface. */
+var ShcConnectionResolver = 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);
+	}
+	devices(integrationId) {
+		return this.#surfaces.get(integrationId)?.devices ?? [];
+	}
+	getClient(integrationId) {
+		return this.#surfaces.get(integrationId)?.client ?? null;
+	}
+	list() {
+		return Array.from(this.#surfaces.keys()).map((id) => ({ id }));
+	}
+	clear() {
+		for (const surface of this.#surfaces.values()) surface.client.close();
+		this.#surfaces.clear();
+	}
+};
+var shcConnections = new ShcConnectionResolver();
+//#endregion
+//#region src/shc/devices/shc-device-base.ts
+var shcDeviceSchema = object({
+	shcDeviceId: string().min(1).describe("Bosch SHC device id"),
+	brokerId: string().min(1).describe("Integration id"),
+	deviceModel: string().optional(),
+	system: literal("bosch-shc").optional(),
+	integrationId: string().optional(),
+	tempStep: number().positive().optional()
+});
+var ShcBaseDevice = class extends BaseDevice {
+	features = [];
+	shcDeviceId;
+	brokerId;
+	deviceModel;
+	stateUnsub = null;
+	constructor(ctx) {
+		const persisted = shcDeviceSchema.parse(ctx.persistedConfig ?? {});
+		super(ctx, shcDeviceSchema, { type: ctx.deviceMeta.type });
+		this.shcDeviceId = persisted.shcDeviceId;
+		this.brokerId = persisted.brokerId;
+		this.deviceModel = persisted.deviceModel;
+		this.online = shcConnections.has(this.brokerId);
+		this.updateSourceInfo({
+			id: this.shcDeviceId,
+			system: "bosch-shc"
+		});
+	}
+	resolveClient() {
+		return shcConnections.getClient(this.brokerId);
+	}
+	requireClient() {
+		const client = this.resolveClient();
+		if (client === null) throw new Error(`SHC client unavailable (device=${this.shcDeviceId})`);
+		return client;
+	}
+	async onActivate() {
+		await super.onActivate();
+		this.registerCaps();
+		this.attachStateListener();
+		await this.refreshFromController();
+	}
+	async removeDevice() {
+		if (this.stateUnsub) {
+			try {
+				this.stateUnsub();
+			} catch {}
+			this.stateUnsub = null;
+		}
+	}
+	attachStateListener() {
+		const client = this.resolveClient();
+		if (client === null) return;
+		const onEvent = (event) => {
+			if (event.deviceId !== this.shcDeviceId) return;
+			this.refreshFromController().catch((err) => {
+				this.deviceLog("warn", "SHC refresh after controller event failed", {
+					shcDeviceId: this.shcDeviceId,
+					error: errMsg(err)
+				});
+			});
+		};
+		this.stateUnsub = client.onStateChange(onEvent);
+	}
+	deviceLog(level, message, meta) {
+		const extras = {
+			tags: { deviceId: this.ctx.id },
+			...meta === void 0 ? {} : { meta }
+		};
+		if (level === "warn") this.ctx.logger.warn(message, extras);
+		else this.ctx.logger.info(message, extras);
+	}
+	unsupported(surface) {
+		throw new Error(`bosch-shc ${this.shcDeviceId}: ${surface} not supported`);
+	}
+};
+//#endregion
+//#region src/shc/devices/shc-gateway-device.ts
+/**
+* The Smart Home Controller box, as a {@link DeviceType.Gateway}. Its connection
+* lives on the INTEGRATION; this device is the box's presence in the device list
+* and follows the session's online state (the integration's connect and
+* disconnect callbacks flip it).
+*
+* It registers no action: the controller's local API offers no reboot or update
+* and the box serves no web page, so there is nothing real to expose. Rooms and
+* devices are NOT children of it; they are adopted as their own top-level
+* devices of the same integration.
+*/
+var ShcGatewayDevice = class extends BaseDevice {
+	features = [];
+	constructor(ctx) {
+		const cfg = shcDeviceSchema.parse(ctx.persistedConfig ?? {});
+		super(ctx, shcDeviceSchema, { type: DeviceType.Gateway });
+		this.online = shcConnections.has(cfg.brokerId);
+		this.updateSourceInfo({
+			id: cfg.shcDeviceId,
+			system: "bosch-shc"
+		});
+	}
+};
+//#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. */
@@ -531,6 +662,11 @@ function buildRoomClimatePutBody(input) {
 }
 //#endregion
 //#region src/shc/shc-discovery.ts
+var GATEWAY_SUFFIX = ":controller";
+/** The `childNativeId` (and `shcDeviceId`) of the controller box itself, one per integration. */
+function shcGatewayNativeId(integrationId) {
+	return `${integrationId}${GATEWAY_SUFFIX}`;
+}
 function shouldSkipShcDevice(device) {
 	if (classifyShcDevice(device) === "unsupported") return true;
 	if (device.deviceModel.startsWith("HOMECONNECT_")) return true;
@@ -625,7 +761,21 @@ function leafCandidate(device, kind, adoptedId) {
 /** Map live SHC discovery rows to adoption candidates. Pure — no I/O. */
 function buildShcCandidates(input) {
 	const linkedTrvs = collectTrvsLinkedToRoomClimate(input.devices);
-	const out = [];
+	const gatewayId = shcGatewayNativeId(input.integrationId);
+	const gatewayAdopted = input.adopted.get(gatewayId) ?? null;
+	const out = [{
+		childNativeId: gatewayId,
+		name: input.integrationName,
+		type: DeviceType.Gateway,
+		status: "online",
+		metadata: {
+			manufacturer: "Bosch",
+			model: "Smart Home Controller"
+		},
+		alreadyAdopted: gatewayAdopted !== null,
+		adoptedDeviceId: gatewayAdopted,
+		capabilities: []
+	}];
 	for (const device of input.devices) {
 		if (shouldSkipShcDevice(device)) continue;
 		const kind = classifyShcDevice(device);
@@ -655,112 +805,6 @@ function shcStableIdSuffixFromDeviceId(shcDeviceId) {
 	return shcDeviceId.replace(/[^a-zA-Z0-9._-]+/g, "_");
 }
 //#endregion
-//#region src/shc/shc-gateway.ts
-/** In-process resolver: integrationId → live SHC connection surface. */
-var ShcConnectionResolver = 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);
-	}
-	devices(integrationId) {
-		return this.#surfaces.get(integrationId)?.devices ?? [];
-	}
-	getClient(integrationId) {
-		return this.#surfaces.get(integrationId)?.client ?? null;
-	}
-	list() {
-		return Array.from(this.#surfaces.keys()).map((id) => ({ id }));
-	}
-	clear() {
-		for (const surface of this.#surfaces.values()) surface.client.close();
-		this.#surfaces.clear();
-	}
-};
-var shcConnections = new ShcConnectionResolver();
-//#endregion
-//#region src/shc/devices/shc-device-base.ts
-var shcDeviceSchema = object({
-	shcDeviceId: string().min(1).describe("Bosch SHC device id"),
-	brokerId: string().min(1).describe("Integration id"),
-	deviceModel: string().optional(),
-	system: literal("bosch-shc").optional(),
-	integrationId: string().optional(),
-	tempStep: number().positive().optional()
-});
-var ShcBaseDevice = class extends BaseDevice {
-	features = [];
-	shcDeviceId;
-	brokerId;
-	deviceModel;
-	stateUnsub = null;
-	constructor(ctx) {
-		const persisted = shcDeviceSchema.parse(ctx.persistedConfig ?? {});
-		super(ctx, shcDeviceSchema, { type: ctx.deviceMeta.type });
-		this.shcDeviceId = persisted.shcDeviceId;
-		this.brokerId = persisted.brokerId;
-		this.deviceModel = persisted.deviceModel;
-		this.online = shcConnections.has(this.brokerId);
-		this.updateSourceInfo({
-			id: this.shcDeviceId,
-			system: "bosch-shc"
-		});
-	}
-	resolveClient() {
-		return shcConnections.getClient(this.brokerId);
-	}
-	requireClient() {
-		const client = this.resolveClient();
-		if (client === null) throw new Error(`SHC client unavailable (device=${this.shcDeviceId})`);
-		return client;
-	}
-	async onActivate() {
-		await super.onActivate();
-		this.registerCaps();
-		this.attachStateListener();
-		await this.refreshFromController();
-	}
-	async removeDevice() {
-		if (this.stateUnsub) {
-			try {
-				this.stateUnsub();
-			} catch {}
-			this.stateUnsub = null;
-		}
-	}
-	attachStateListener() {
-		const client = this.resolveClient();
-		if (client === null) return;
-		const onEvent = (event) => {
-			if (event.deviceId !== this.shcDeviceId) return;
-			this.refreshFromController().catch((err) => {
-				this.deviceLog("warn", "SHC refresh after controller event failed", {
-					shcDeviceId: this.shcDeviceId,
-					error: errMsg(err)
-				});
-			});
-		};
-		this.stateUnsub = client.onStateChange(onEvent);
-	}
-	deviceLog(level, message, meta) {
-		const extras = {
-			tags: { deviceId: this.ctx.id },
-			...meta === void 0 ? {} : { meta }
-		};
-		if (level === "warn") this.ctx.logger.warn(message, extras);
-		else this.ctx.logger.info(message, extras);
-	}
-	unsupported(surface) {
-		throw new Error(`bosch-shc ${this.shcDeviceId}: ${surface} not supported`);
-	}
-};
-//#endregion
 //#region src/shc/shc-climate-schedules.ts
 /** Heating profiles from `GET /climate/schedule/{id}/HEATING`. */
 function heatingProfilesFromSchedule(body) {
@@ -1128,11 +1172,15 @@ async function adoptedMapForIntegration(integrationId, listAdoptedShc) {
 	return map;
 }
 function buildShcAdoptionProvider(deps) {
-	const { registry, hasIntegration, listIntegrations, listAdoptedShc, adoptDevice, removeDevice, findDeviceConfig, logger } = deps;
+	const { registry, hasIntegration, listIntegrations, integrationName, listAdoptedShc, adoptDevice, removeDevice, findDeviceConfig, logger } = deps;
 	async function allCandidatesForIntegration(integrationId) {
+		const devices = registry.devices(integrationId);
+		const adopted = await adoptedMapForIntegration(integrationId, listAdoptedShc);
 		return buildShcCandidates({
-			devices: registry.devices(integrationId),
-			adopted: await adoptedMapForIntegration(integrationId, listAdoptedShc)
+			integrationId,
+			integrationName: integrationName(integrationId) ?? "Bosch SHC",
+			devices,
+			adopted
 		});
 	}
 	return {
@@ -1193,6 +1241,22 @@ function buildShcAdoptionProvider(deps) {
 			const adopted = [];
 			let failures = 0;
 			for (const shcDeviceId of childNativeIds) try {
+				if (shcDeviceId === shcGatewayNativeId(integrationId)) {
+					const name = perCandidate?.[shcDeviceId]?.name ?? integrationName(integrationId) ?? "Bosch SHC";
+					const { deviceId } = await adoptDevice({
+						shcDeviceId,
+						integrationId,
+						type: DeviceType.Gateway,
+						name,
+						deviceModel: "Smart Home Controller"
+					});
+					adopted.push({
+						childNativeId: shcDeviceId,
+						parentDeviceId: deviceId,
+						accessoryDeviceIds: []
+					});
+					continue;
+				}
 				const dev = devices.find((d) => d.id === shcDeviceId);
 				if (dev === void 0) {
 					failures++;
@@ -1237,7 +1301,7 @@ function buildShcAdoptionProvider(deps) {
 			const integrationId = String(cfg["brokerId"]);
 			const shcDeviceId = String(cfg["shcDeviceId"]);
 			if (!hasIntegration(integrationId)) throw new Error(`bosch-shc resync: integration ${integrationId} not connected`);
-			if (!registry.devices(integrationId).some((d) => d.id === shcDeviceId)) throw new Error(`bosch-shc resync: device ${shcDeviceId} no longer on integration`);
+			if (!(shcDeviceId === shcGatewayNativeId(integrationId) || registry.devices(integrationId).some((d) => d.id === shcDeviceId))) throw new Error(`bosch-shc resync: device ${shcDeviceId} no longer on integration`);
 			return {
 				changed: false,
 				rebuiltChildren: 0
@@ -23462,6 +23526,10 @@ var ShcClientRegistry = class {
 			makeClient: opts.makeClient ?? this.#makeClient
 		}));
 	}
+	/** The integration's display name, or null when it is not registered. */
+	nameOf(integrationId) {
+		return this.#entries.get(integrationId)?.manager.getInfo().name ?? null;
+	}
 	setOnConnected(cb) {
 		this.#onConnected = cb;
 	}
@@ -23657,6 +23725,7 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 	addonId = "bosch-shc";
 	providerName = "Bosch SHC";
 	deviceClasses = {
+		[DeviceType.Gateway]: ShcGatewayDevice,
 		[DeviceType.Container]: ShcClimateRoomDevice,
 		[DeviceType.Climate]: ShcRoomClimateDevice,
 		[DeviceType.Thermostat]: ShcTrvDevice,
@@ -23848,6 +23917,7 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			logger: this.ctx.logger,
 			hasIntegration: (integrationId) => this.requireClients().has(integrationId),
 			listIntegrations: () => this.requireClients().list(),
+			integrationName: (integrationId) => this.requireClients().nameOf(integrationId),
 			listAdoptedShc: async () => {
 				const reg = this.ctx.kernel.deviceRegistry;
 				const devices = this.ctx.kernel.devices;
@@ -23867,8 +23937,25 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 				const devices = this.ctx.kernel.devices;
 				if (!devices) throw new Error("bosch-shc adopt: kernel.devices unavailable");
 				const summary = shcConnections.devices(integrationId).find((d) => d.id === shcDeviceId);
-				const kind = summary ? classifyShcDevice(summary) : "unsupported";
+				const kind = type === DeviceType.Gateway ? "gateway" : summary ? classifyShcDevice(summary) : "unsupported";
 				if (kind === "unsupported") throw new Error(`bosch-shc adopt: unsupported device ${shcDeviceId}`);
+				if (type === DeviceType.Gateway) {
+					const config = {
+						shcDeviceId,
+						brokerId: integrationId,
+						deviceModel,
+						system: "bosch-shc",
+						integrationId,
+						name
+					};
+					const stableId = this.generateStableId(DeviceType.Gateway, config);
+					const meta = {
+						type: DeviceType.Gateway,
+						name,
+						integrationId
+					};
+					return { deviceId: (await devices.create(stableId, ShcGatewayDevice, config, null, meta)).id };
+				}
 				const baseConfig = {
 					shcDeviceId,
 					brokerId: integrationId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -127,7 +127,10 @@
           }
         ]
       }
-    ]
+    ],
+    "requires": {
+      "server": ">=1.2.719"
+    }
   },
   "files": [
     "dist",