@camstack/addon-provider-bosch 0.1.31 → 0.1.33

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-DxO4cucS.mjs";
+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 { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";
@@ -6,7 +6,6 @@ import { execFileSync } from "node:child_process";
 import { mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { createSocket } from "node:dgram";
 import { connect } from "node:net";
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
@@ -333,78 +332,18 @@ async function registerShcClient(deps) {
 }
 //#endregion
 //#region src/shc/shc-controller-discovery.ts
-/** `prefilledConfig` flag: the scan opens the integration form instead of adopting a device. */
-var SHC_SETUP_INTEGRATION_KEY = "setupIntegration";
-/** Top bit of the question class: ask for a unicast reply (RFC 6762). */
-var MDNS_QU_CLASS = 32769;
-var SHC_MDNS_SERVICE = "_http._tcp.local";
+/** The controller announces itself as an `_http._tcp` service named `Bosch SHC`. */
+var SHC_MDNS_SERVICE = "_http._tcp";
 var SHC_CONTROLLER_NAME_PREFIX = "Bosch SHC";
-var SHC_DISCOVERY_TIMEOUT_MS = 1500;
-var MDNS_PORT = 5353;
-var MDNS_ADDRESS = "224.0.0.251";
-var PTR = 12;
-var A = 1;
-var SRV = 33;
+/** How the scan engine finds a controller: one mDNS browse, filtered on the instance name. */
+var SHC_DISCOVERY_MODES = [{
+	kind: "mdns",
+	serviceType: SHC_MDNS_SERVICE,
+	instancePattern: `^${SHC_CONTROLLER_NAME_PREFIX}`
+}];
 function isShcControllerName(name) {
 	return (name.split("._")[0] ?? name).toLowerCase().startsWith(SHC_CONTROLLER_NAME_PREFIX.toLowerCase());
 }
-function readName(buf, start) {
-	const labels = [];
-	let pos = start;
-	let end = start;
-	let jumped = false;
-	for (let hops = 0; hops < 16; hops++) {
-		if (pos < 0 || pos >= buf.length) return null;
-		const len = buf[pos] ?? 0;
-		if (len === 0) {
-			if (!jumped) end = pos + 1;
-			return {
-				name: labels.join("."),
-				end
-			};
-		}
-		if ((len & 192) === 192) {
-			if (pos + 1 >= buf.length) return null;
-			if (!jumped) end = pos + 2;
-			jumped = true;
-			pos = (len & 63) << 8 | (buf[pos + 1] ?? 0);
-			continue;
-		}
-		if ((len & 192) !== 0 || pos + 1 + len > buf.length) return null;
-		labels.push(buf.subarray(pos + 1, pos + 1 + len).toString("utf8"));
-		pos += 1 + len;
-		if (!jumped) end = pos;
-	}
-	return null;
-}
-function readRecords(buf, offset, count) {
-	const records = [];
-	let pos = offset;
-	for (let i = 0; i < count; i++) {
-		const name = readName(buf, pos);
-		if (name === null || name.end + 10 > buf.length) return null;
-		const type = buf.readUInt16BE(name.end);
-		const dataLength = buf.readUInt16BE(name.end + 8);
-		const dataOffset = name.end + 10;
-		if (dataOffset + dataLength > buf.length) return null;
-		records.push({
-			name: name.name,
-			type,
-			message: buf,
-			dataOffset,
-			dataLength
-		});
-		pos = dataOffset + dataLength;
-	}
-	return {
-		records,
-		next: pos
-	};
-}
-function ipv4(buf, offset, length) {
-	if (length !== 4 || offset + 4 > buf.length) return null;
-	return `${buf[offset] ?? 0}.${buf[offset + 1] ?? 0}.${buf[offset + 2] ?? 0}.${buf[offset + 3] ?? 0}`;
-}
 /** Identity used to recognise a controller already stored on an integration. */
 function shcControllerId(input) {
 	const service = input.serviceHost?.trim().toLowerCase() ?? "";
@@ -413,40 +352,24 @@ function shcControllerId(input) {
 	if (serial.length > 0) return serial;
 	return input.host;
 }
-function hostsFromRecords(records) {
-	const instances = [];
-	const srv = /* @__PURE__ */ new Map();
-	const addresses = /* @__PURE__ */ new Map();
-	for (const rec of records) {
-		const key = rec.name.toLowerCase();
-		if (rec.type === PTR) {
-			const target = readName(rec.message, rec.dataOffset);
-			if (target !== null && isShcControllerName(target.name)) instances.push(target.name);
-		} else if (rec.type === SRV && rec.dataLength >= 6) {
-			const target = readName(rec.message, rec.dataOffset + 6);
-			if (target !== null) srv.set(key, target.name);
-		} else if (rec.type === A) {
-			const ip = ipv4(rec.message, rec.dataOffset, rec.dataLength);
-			if (ip !== null) addresses.set(key, ip);
-		}
-	}
+/** Controllers among the engine's mDNS hits (a `Bosch SHC…` instance), one per host. */
+function shcHostsFromHits(hits) {
 	const out = [];
 	const seen = /* @__PURE__ */ new Set();
-	for (const instance of instances) {
-		const viaSrv = srv.get(instance.toLowerCase());
-		const host = (viaSrv !== void 0 ? addresses.get(viaSrv.toLowerCase()) : void 0) ?? addresses.get(instance.toLowerCase());
-		if (host === void 0 || seen.has(host)) continue;
-		seen.add(host);
-		const label = instance.split("._")[0] ?? instance;
-		const id = shcControllerId({
-			name: label,
-			host,
-			...viaSrv !== void 0 ? { serviceHost: viaSrv } : {}
-		});
+	for (const hit of hits) {
+		const mdns = hit.mdns;
+		if (mdns === void 0 || !isShcControllerName(mdns.instance)) continue;
+		if (hit.host.length === 0 || seen.has(hit.host)) continue;
+		seen.add(hit.host);
+		const name = mdns.instance.split("._")[0] ?? mdns.instance;
 		out.push({
-			host,
-			name: label,
-			id
+			host: hit.host,
+			name,
+			id: shcControllerId({
+				name,
+				host: hit.host,
+				serviceHost: mdns.host
+			})
 		});
 	}
 	return out;
@@ -466,11 +389,10 @@ function proposeShcControllers(found, existingHosts) {
 function shcDiscoveryCandidates(proposals) {
 	return proposals.map((found) => ({
 		stableId: `bosch-shc:${found.id}`,
+		type: DeviceType.Hub,
 		suggestedName: found.name,
-		prefilledConfig: {
-			host: found.host,
-			[SHC_SETUP_INTEGRATION_KEY]: true
-		}
+		prefilledConfig: { host: found.host },
+		setupIntegration: true
 	}));
 }
 function shcDiscoverySummary(foundCount, proposedCount) {
@@ -478,101 +400,6 @@ function shcDiscoverySummary(foundCount, proposedCount) {
 	if (proposedCount === 0) return "No controller found on the network.";
 	return `Found ${proposedCount} ${proposedCount === 1 ? "controller" : "controllers"}.`;
 }
-/** Hosts advertised as a Bosch Smart Home Controller on one mDNS message. */
-function shcHostsFromDnsMessage(buf) {
-	if (buf.length < 12) return [];
-	const questions = buf.readUInt16BE(4);
-	const answers = buf.readUInt16BE(6);
-	const authorities = buf.readUInt16BE(8);
-	const extra = buf.readUInt16BE(10);
-	let pos = 12;
-	for (let i = 0; i < questions; i++) {
-		const name = readName(buf, pos);
-		if (name === null) return [];
-		pos = name.end + 4;
-		if (pos > buf.length) return [];
-	}
-	const answerRecords = readRecords(buf, pos, answers);
-	if (answerRecords === null) return [];
-	const authorityRecords = readRecords(buf, answerRecords.next, authorities);
-	if (authorityRecords === null) return [];
-	const extraRecords = readRecords(buf, authorityRecords.next, extra);
-	if (extraRecords === null) return [];
-	return hostsFromRecords([
-		...answerRecords.records,
-		...authorityRecords.records,
-		...extraRecords.records
-	]);
-}
-function mdnsPtrQuery(service) {
-	const encoded = service.split(".").filter((part) => part.length > 0).map((label) => Buffer.concat([Buffer.from([label.length]), Buffer.from(label)]));
-	const header = Buffer.alloc(12);
-	header.writeUInt16BE(1, 4);
-	const tail = Buffer.alloc(4);
-	tail.writeUInt16BE(PTR, 0);
-	tail.writeUInt16BE(MDNS_QU_CLASS, 2);
-	return Buffer.concat([
-		header,
-		...encoded,
-		Buffer.from([0]),
-		tail
-	]);
-}
-function closeQuietly(socket) {
-	try {
-		socket.close();
-	} catch {}
-}
-function exchangeMdns(query, timeoutMs) {
-	return new Promise((resolve) => {
-		let socket;
-		try {
-			socket = createSocket({
-				type: "udp4",
-				reuseAddr: true
-			});
-		} catch {
-			resolve([]);
-			return;
-		}
-		const packets = [];
-		let settled = false;
-		const finish = () => {
-			if (settled) return;
-			settled = true;
-			closeQuietly(socket);
-			resolve(packets);
-		};
-		socket.on("error", () => finish());
-		socket.on("message", (msg) => {
-			packets.push(Buffer.from(msg));
-		});
-		socket.bind(0, () => {
-			try {
-				socket.send(query, MDNS_PORT, MDNS_ADDRESS);
-			} catch {
-				finish();
-			}
-		});
-		setTimeout(finish, timeoutMs);
-	});
-}
-async function browseShcControllers(exchange = exchangeMdns) {
-	let packets;
-	try {
-		packets = await exchange(mdnsPtrQuery(SHC_MDNS_SERVICE), SHC_DISCOVERY_TIMEOUT_MS);
-	} catch {
-		return [];
-	}
-	const hosts = [];
-	const seen = /* @__PURE__ */ new Set();
-	for (const packet of packets) for (const found of shcHostsFromDnsMessage(packet)) {
-		if (seen.has(found.host)) continue;
-		seen.add(found.host);
-		hosts.push(found);
-	}
-	return hosts;
-}
 /** Manual host wins. Otherwise the address discovery filled in. */
 function resolveShcPairingHost(input) {
 	const manual = input.hostManual?.trim() ?? "";
@@ -1097,11 +924,11 @@ var TEMP_CAP = "temperature-sensor";
 var BATTERY_CAP = "battery";
 var VALVE_CAP = "heating-valve";
 var TEMP_COLD = {
-	celsius: 0,
+	temperature: 0,
 	lastFetchedAt: 0
 };
 var BATTERY_COLD = {
-	percentage: null,
+	level: null,
 	charging: "unknown",
 	sleeping: false,
 	lastUpdated: 0
@@ -1138,12 +965,12 @@ var ShcTrvDevice = class extends ShcBaseDevice {
 			if (typeof temperature === "number" && Number.isFinite(temperature)) {
 				const prev = this.runtimeState.getCapState(TEMP_CAP);
 				this.runtimeState.setCapState(TEMP_CAP, {
-					celsius: temperature,
+					temperature,
 					lastFetchedAt: now
 				});
-				if (prev !== void 0 && prev.celsius !== temperature && prev.lastFetchedAt !== 0) this.deviceLog("info", "SHC temperature updated from controller", {
+				if (prev !== void 0 && prev.temperature !== temperature && prev.lastFetchedAt !== 0) this.deviceLog("info", "SHC temperature updated from controller", {
 					celsius: temperature,
-					previous: prev.celsius
+					previous: prev.temperature
 				});
 			}
 		} catch {}
@@ -1163,7 +990,7 @@ var ShcTrvDevice = class extends ShcBaseDevice {
 		try {
 			const batt = await client.getServiceState(this.shcDeviceId, "BatteryLevel");
 			this.runtimeState.setCapState(BATTERY_CAP, {
-				percentage: batt.batteryLevel ?? null,
+				level: batt.batteryLevel ?? null,
 				charging: "unknown",
 				sleeping: false,
 				lastUpdated: now
@@ -23865,14 +23692,15 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			customActions: boschShcActions,
 			actionHandlers: {
 				discoverController: async () => {
-					const { proposals, summary } = await this.discoverShcControllers();
+					const { candidates } = await this.ctx.api.deviceManager.discoverProvider.mutate({ addonId: this.ctx.id });
+					const hosts = candidates.map((candidate) => ({
+						host: String(candidate.prefilledConfig["host"] ?? ""),
+						name: candidate.suggestedName,
+						id: candidate.stableId.replace(/^bosch-shc:/, "")
+					}));
 					return {
-						hosts: proposals.map((found) => ({
-							host: found.host,
-							name: found.name,
-							id: found.id
-						})),
-						summary
+						hosts,
+						summary: shcDiscoverySummary(hosts.length, hosts.length)
 					};
 				},
 				registerClient: async (input) => {
@@ -23908,24 +23736,21 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 	async supportsManualCreation() {
 		return false;
 	}
-	/**
-	* LAN mDNS probe. This addon is hub-only, so the socket is the hub's.
-	* The operator's hub is on br0 (its own LAN address), the same path the
-	* hub already uses to announce itself — multicast UDP 5353 reaches the
-	* LAN. The probe asks for a unicast reply and does not bind 5353, which
-	* the hub's announcer holds. Agents do not run this addon.
-	*/
+	/** A controller is found by the scan engine's mDNS browse; this addon only classifies the hits. */
 	async supportsDiscovery() {
 		return true;
 	}
-	async discoverDevices() {
-		const { proposals } = await this.discoverShcControllers();
-		return shcDiscoveryCandidates(proposals).map((candidate) => ({
-			stableId: candidate.stableId,
-			type: DeviceType.Hub,
-			suggestedName: candidate.suggestedName,
-			prefilledConfig: { ...candidate.prefilledConfig }
-		}));
+	async getDiscoveryModes() {
+		return SHC_DISCOVERY_MODES;
+	}
+	async classifyDiscoveryHits(input) {
+		const found = shcHostsFromHits(input.hits);
+		const proposals = proposeShcControllers(found, await this.knownControllerHosts());
+		if (found.length > proposals.length) this.ctx.logger.info("SHC discovery skipped controllers already added", { meta: {
+			found: found.length,
+			proposed: proposals.length
+		} });
+		return shcDiscoveryCandidates(proposals);
 	}
 	async adoptDiscoveredDevice(_input) {
 		throw new Error("Bosch SHC controllers are paired from the integration form");
@@ -23943,24 +23768,6 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 		if (typeof shcDeviceId !== "string" || shcDeviceId.length === 0) throw new Error("bosch-shc generateStableId: shcDeviceId required");
 		return `bosch-shc:${integrationId}:${shcDeviceId}`;
 	}
-	async discoverShcControllers() {
-		let found = [];
-		try {
-			found = await browseShcControllers();
-		} catch (err) {
-			this.ctx.logger.warn("SHC controller discovery failed", { meta: { error: errMsg(err) } });
-		}
-		const known = await this.knownControllerHosts();
-		const proposals = proposeShcControllers(found, known);
-		if (found.length > proposals.length) this.ctx.logger.info("SHC discovery skipped controllers already added", { meta: {
-			found: found.length,
-			proposed: proposals.length
-		} });
-		return {
-			proposals,
-			summary: shcDiscoverySummary(found.length, proposals.length)
-		};
-	}
 	async knownControllerHosts() {
 		try {
 			const all = await this.ctx.api.integrations.list.query();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",