@camstack/addon-provider-bosch 0.1.20 → 0.1.21

package/dist/shc/addon.js

@@ -2,27 +2,41 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
-const require_dist = require("../dist-CYBUFKeW.js");
+const require_dist = require("../dist-CFPbdUpa.js");
 let node_crypto = require("node:crypto");
 let node_https = require("node:https");
 let node_child_process = require("node:child_process");
 let node_fs = require("node:fs");
 let node_os = require("node:os");
 let node_path = require("node:path");
+let node_dgram = require("node:dgram");
 let node_net = require("node:net");
 //#region src/shc/custom-actions.ts
-var boschShcActions = require_dist.defineCustomActions({ registerClient: require_dist.customAction(require_dist.object({
-	host: require_dist.string().min(1),
-	systemPassword: require_dist.string().min(1)
-}), require_dist.object({
-	sslCertificate: require_dist.string().min(1),
-	sslKey: require_dist.string().min(1),
-	token: require_dist.string().min(1),
-	summary: require_dist.string()
-}), {
-	kind: "mutation",
-	auth: "admin"
-}) });
+var boschShcActions = require_dist.defineCustomActions({
+	discoverController: require_dist.customAction(require_dist.object({}), require_dist.object({
+		hosts: require_dist.array(require_dist.object({
+			host: require_dist.string(),
+			name: require_dist.string()
+		})),
+		summary: require_dist.string()
+	}), {
+		kind: "mutation",
+		auth: "admin"
+	}),
+	registerClient: require_dist.customAction(require_dist.object({
+		host: require_dist.string().optional(),
+		hostManual: require_dist.string().optional(),
+		systemPassword: require_dist.string().min(1)
+	}), require_dist.object({
+		sslCertificate: require_dist.string().min(1).meta({ secret: true }),
+		sslKey: require_dist.string().min(1).meta({ secret: true }),
+		token: require_dist.string().min(1).meta({ secret: true }),
+		summary: require_dist.string()
+	}), {
+		kind: "mutation",
+		auth: "admin"
+	})
+});
 //#endregion
 //#region src/shc/config.ts
 /** Operator settings for one SHC integration (local mTLS + optional token). */
@@ -46,30 +60,48 @@ function buildConnectionFormSchema() {
 	return { sections: [{
 		id: "connection",
 		title: "Smart Home Controller",
-		titleKey: "bosch-shc:connection.s_connection.title",
+		titleKey: "provider-bosch:shc.s_connection.title",
 		description: "Local REST access to your Bosch Smart Home Controller.",
-		descriptionKey: "bosch-shc:connection.s_connection.description",
+		descriptionKey: "provider-bosch:shc.s_connection.description",
 		columns: 1,
 		fields: [
+			{
+				type: "addon-action-select",
+				addonId: "bosch-shc",
+				key: "__shc-discovered",
+				writesKey: "host",
+				omitFromSettings: true,
+				label: "Controller",
+				labelKey: "provider-bosch:shc.s_connection.__shc-discovered.label",
+				action: "discoverController",
+				mapOption: {
+					value: "host",
+					label: "name"
+				},
+				hideWhenFewerThan: 2,
+				emptyResultsMessage: "No controller found on the network."
+			},
 			{
 				type: "text",
 				key: "host",
 				label: "Host",
-				labelKey: "bosch-shc:connection.s_connection.host.label",
-				required: true,
+				labelKey: "provider-bosch:shc.s_connection.host.label",
+				description: "Filled when one controller is found. Type the address if it is not.",
+				descriptionKey: "provider-bosch:shc.s_connection.host.description",
+				required: false,
 				placeholder: "192.168.1.50"
 			},
 			{
 				type: "info",
 				key: "__shc-pairing-hint",
 				label: "Pair with the controller",
-				content: "Enter the password you created in the Bosch Smart Home app (not the code printed on the controller). Then hold the pairing button until the LED blinks, and press Register on controller."
+				content: "Press the button on the controller until the LED blinks. Enter the password you created in the Bosch Smart Home app, not the code printed on the controller, then register."
 			},
 			{
 				type: "password",
 				key: "systemPassword",
 				label: "System password",
-				labelKey: "bosch-shc:connection.s_connection.systemPassword.label",
+				labelKey: "provider-bosch:shc.s_connection.systemPassword.label",
 				required: true,
 				showToggle: true
 			},
@@ -92,13 +124,46 @@ function buildConnectionFormSchema() {
 				},
 				successMessage: "{summary}"
 			},
+			{
+				type: "group",
+				key: "__shc-advanced",
+				label: "Advanced",
+				labelKey: "provider-bosch:shc.s_connection.__shc-advanced.label",
+				style: "accordion",
+				defaultCollapsed: true,
+				fields: [{
+					type: "secret-presence",
+					key: "__shc-registered",
+					label: "Client registration",
+					sourceKey: "sslCertificate",
+					yesLabel: "Client registered: yes",
+					noLabel: "Client registered: no"
+				}, {
+					type: "addon-action-button",
+					addonId: "bosch-shc",
+					key: "__shc-reregister",
+					label: "Register again",
+					buttonLabel: "Register again",
+					action: "registerClient",
+					paramsFromForm: {
+						host: "host",
+						systemPassword: "systemPassword"
+					},
+					assignResult: {
+						sslCertificate: "sslCertificate",
+						sslKey: "sslKey",
+						token: "token"
+					},
+					successMessage: "{summary}"
+				}]
+			},
 			{
 				type: "password",
 				key: "token",
 				label: "Controller token",
-				labelKey: "bosch-shc:connection.s_connection.token.label",
-				required: true,
-				showToggle: true,
+				labelKey: "provider-bosch:shc.s_connection.token.label",
+				required: false,
+				showToggle: false,
 				showWhen: {
 					field: "host",
 					equals: SHC_PAIRING_ONLY_SHOW_WHEN
@@ -108,8 +173,8 @@ function buildConnectionFormSchema() {
 				type: "password",
 				key: "sslCertificate",
 				label: "Client certificate (PEM)",
-				labelKey: "bosch-shc:connection.s_connection.sslCertificate.label",
-				required: true,
+				labelKey: "provider-bosch:shc.s_connection.sslCertificate.label",
+				required: false,
 				showToggle: true,
 				showWhen: {
 					field: "host",
@@ -120,8 +185,8 @@ function buildConnectionFormSchema() {
 				type: "password",
 				key: "sslKey",
 				label: "Client private key (PEM)",
-				labelKey: "bosch-shc:connection.s_connection.sslKey.label",
-				required: true,
+				labelKey: "provider-bosch:shc.s_connection.sslKey.label",
+				required: false,
 				showToggle: true,
 				showWhen: {
 					field: "host",
@@ -265,6 +330,211 @@ async function registerShcClient(deps) {
 	};
 }
 //#endregion
+//#region src/shc/shc-controller-discovery.ts
+var SHC_MDNS_SERVICE = "_http._tcp.local";
+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;
+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}`;
+}
+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);
+		}
+	}
+	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;
+		out.push({
+			host,
+			name: label
+		});
+	}
+	return out;
+}
+/** 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(1, 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 = (0, node_dgram.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() ?? "";
+	if (manual.length > 0) return manual;
+	const host = input.host?.trim() ?? "";
+	if (host.length > 0) return host;
+	throw new Error("Enter the controller host or IP address.");
+}
+//#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. */
@@ -23546,18 +23816,41 @@ var BoschShcProviderAddon = class extends require_dist.BaseDeviceProvider {
 				}
 			],
 			customActions: boschShcActions,
-			actionHandlers: { registerClient: async (input) => {
-				const { sslCertificate, sslKey, token } = await registerShcClient({
-					host: input.host,
-					systemPassword: input.systemPassword
-				});
-				return {
-					sslCertificate,
-					sslKey,
-					token,
-					summary: "CamStack is registered with your Smart Home Controller."
-				};
-			} }
+			actionHandlers: {
+				discoverController: async () => {
+					try {
+						const hosts = await browseShcControllers();
+						return {
+							hosts: hosts.map((found) => ({
+								host: found.host,
+								name: found.name
+							})),
+							summary: hosts.length === 0 ? "No controller found on the network." : `Found ${hosts.length} controller${hosts.length === 1 ? "" : "s"}.`
+						};
+					} catch (err) {
+						this.ctx.logger.warn("SHC controller discovery failed", { meta: { error: require_dist.errMsg(err) } });
+						return {
+							hosts: [],
+							summary: "No controller found on the network."
+						};
+					}
+				},
+				registerClient: async (input) => {
+					const { sslCertificate, sslKey, token } = await registerShcClient({
+						host: resolveShcPairingHost({
+							host: input.host,
+							hostManual: input.hostManual
+						}),
+						systemPassword: input.systemPassword
+					});
+					return {
+						sslCertificate,
+						sslKey,
+						token,
+						summary: "CamStack is registered with your Smart Home Controller."
+					};
+				}
+			}
 		};
 	}
 	async onShutdown() {