@camstack/addon-provider-bosch 0.1.26 → 0.1.28

package/dist/shc/addon.js

@@ -16,7 +16,8 @@ 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()
+			name: require_dist.string(),
+			id: require_dist.string()
 		})),
 		summary: require_dist.string()
 	}), {
@@ -331,6 +332,10 @@ 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";
 var SHC_CONTROLLER_NAME_PREFIX = "Bosch SHC";
 var SHC_DISCOVERY_TIMEOUT_MS = 1500;
@@ -399,6 +404,14 @@ 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() ?? "";
+	if (service.length > 0) return service.endsWith(".local") ? service.slice(0, -6) : service;
+	const serial = /\[([^\]]+)\]/.exec(input.name)?.[1]?.trim().toLowerCase() ?? "";
+	if (serial.length > 0) return serial;
+	return input.host;
+}
 function hostsFromRecords(records) {
 	const instances = [];
 	const srv = /* @__PURE__ */ new Map();
@@ -424,13 +437,46 @@ function hostsFromRecords(records) {
 		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 } : {}
+		});
 		out.push({
 			host,
-			name: label
+			name: label,
+			id
 		});
 	}
 	return out;
 }
+function identityKeys(found) {
+	const host = found.host.trim().toLowerCase();
+	const id = found.id.trim().toLowerCase();
+	const keys = [host, id];
+	if (id.length > 0 && !id.endsWith(".local")) keys.push(`${id}.local`);
+	return keys;
+}
+/** Controllers whose host or id is already stored on an integration are not proposed again. */
+function proposeShcControllers(found, existingHosts) {
+	const known = new Set(existingHosts.map((host) => host.trim().toLowerCase()).filter((host) => host.length > 0));
+	return found.filter((item) => !identityKeys(item).some((key) => known.has(key)));
+}
+function shcDiscoveryCandidates(proposals) {
+	return proposals.map((found) => ({
+		stableId: `bosch-shc:${found.id}`,
+		suggestedName: found.name,
+		prefilledConfig: {
+			host: found.host,
+			[SHC_SETUP_INTEGRATION_KEY]: true
+		}
+	}));
+}
+function shcDiscoverySummary(foundCount, proposedCount) {
+	if (proposedCount === 0 && foundCount > 0) return "Controller already added.";
+	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 [];
@@ -463,7 +509,7 @@ function mdnsPtrQuery(service) {
 	header.writeUInt16BE(1, 4);
 	const tail = Buffer.alloc(4);
 	tail.writeUInt16BE(PTR, 0);
-	tail.writeUInt16BE(1, 2);
+	tail.writeUInt16BE(MDNS_QU_CLASS, 2);
 	return Buffer.concat([
 		header,
 		...encoded,
@@ -23818,22 +23864,15 @@ var BoschShcProviderAddon = class extends require_dist.BaseDeviceProvider {
 			customActions: boschShcActions,
 			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."
-						};
-					}
+					const { proposals, summary } = await this.discoverShcControllers();
+					return {
+						hosts: proposals.map((found) => ({
+							host: found.host,
+							name: found.name,
+							id: found.id
+						})),
+						summary
+					};
 				},
 				registerClient: async (input) => {
 					const { sslCertificate, sslKey, token } = await registerShcClient({
@@ -23868,6 +23907,28 @@ var BoschShcProviderAddon = class extends require_dist.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.
+	*/
+	async supportsDiscovery() {
+		return true;
+	}
+	async discoverDevices() {
+		const { proposals } = await this.discoverShcControllers();
+		return shcDiscoveryCandidates(proposals).map((candidate) => ({
+			stableId: candidate.stableId,
+			type: require_dist.DeviceType.Hub,
+			suggestedName: candidate.suggestedName,
+			prefilledConfig: { ...candidate.prefilledConfig }
+		}));
+	}
+	async adoptDiscoveredDevice(_input) {
+		throw new Error("Bosch SHC controllers are paired from the integration form");
+	}
 	async onGetCreationSchema(_type) {
 		return null;
 	}
@@ -23881,6 +23942,46 @@ var BoschShcProviderAddon = class extends require_dist.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: require_dist.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();
+			const hosts = [];
+			for (const integration of all) {
+				if (integration.addonId !== this.ctx.id) continue;
+				try {
+					const connection = connectionFromSettings(await this.ctx.api.integrations.getSettings.query({ id: integration.id }));
+					if (connection) hosts.push(connection.host);
+				} catch (err) {
+					this.ctx.logger.warn("SHC discovery: settings read failed", { meta: {
+						integrationId: integration.id,
+						error: require_dist.errMsg(err)
+					} });
+				}
+			}
+			return hosts;
+		} catch (err) {
+			this.ctx.logger.warn("SHC discovery: integration list failed", { meta: { error: require_dist.errMsg(err) } });
+			return [];
+		}
+	}
 	requireClients() {
 		if (!this.clients) throw new Error("Bosch SHC provider not initialised");
 		return this.clients;

package/dist/shc/addon.mjs

@@ -17,7 +17,8 @@ var boschShcActions = defineCustomActions({
 	discoverController: customAction(object({}), object({
 		hosts: array(object({
 			host: string(),
-			name: string()
+			name: string(),
+			id: string()
 		})),
 		summary: string()
 	}), {
@@ -332,6 +333,10 @@ 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";
 var SHC_CONTROLLER_NAME_PREFIX = "Bosch SHC";
 var SHC_DISCOVERY_TIMEOUT_MS = 1500;
@@ -400,6 +405,14 @@ 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() ?? "";
+	if (service.length > 0) return service.endsWith(".local") ? service.slice(0, -6) : service;
+	const serial = /\[([^\]]+)\]/.exec(input.name)?.[1]?.trim().toLowerCase() ?? "";
+	if (serial.length > 0) return serial;
+	return input.host;
+}
 function hostsFromRecords(records) {
 	const instances = [];
 	const srv = /* @__PURE__ */ new Map();
@@ -425,13 +438,46 @@ function hostsFromRecords(records) {
 		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 } : {}
+		});
 		out.push({
 			host,
-			name: label
+			name: label,
+			id
 		});
 	}
 	return out;
 }
+function identityKeys(found) {
+	const host = found.host.trim().toLowerCase();
+	const id = found.id.trim().toLowerCase();
+	const keys = [host, id];
+	if (id.length > 0 && !id.endsWith(".local")) keys.push(`${id}.local`);
+	return keys;
+}
+/** Controllers whose host or id is already stored on an integration are not proposed again. */
+function proposeShcControllers(found, existingHosts) {
+	const known = new Set(existingHosts.map((host) => host.trim().toLowerCase()).filter((host) => host.length > 0));
+	return found.filter((item) => !identityKeys(item).some((key) => known.has(key)));
+}
+function shcDiscoveryCandidates(proposals) {
+	return proposals.map((found) => ({
+		stableId: `bosch-shc:${found.id}`,
+		suggestedName: found.name,
+		prefilledConfig: {
+			host: found.host,
+			[SHC_SETUP_INTEGRATION_KEY]: true
+		}
+	}));
+}
+function shcDiscoverySummary(foundCount, proposedCount) {
+	if (proposedCount === 0 && foundCount > 0) return "Controller already added.";
+	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 [];
@@ -464,7 +510,7 @@ function mdnsPtrQuery(service) {
 	header.writeUInt16BE(1, 4);
 	const tail = Buffer.alloc(4);
 	tail.writeUInt16BE(PTR, 0);
-	tail.writeUInt16BE(1, 2);
+	tail.writeUInt16BE(MDNS_QU_CLASS, 2);
 	return Buffer.concat([
 		header,
 		...encoded,
@@ -23819,22 +23865,15 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			customActions: boschShcActions,
 			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: errMsg(err) } });
-						return {
-							hosts: [],
-							summary: "No controller found on the network."
-						};
-					}
+					const { proposals, summary } = await this.discoverShcControllers();
+					return {
+						hosts: proposals.map((found) => ({
+							host: found.host,
+							name: found.name,
+							id: found.id
+						})),
+						summary
+					};
 				},
 				registerClient: async (input) => {
 					const { sslCertificate, sslKey, token } = await registerShcClient({
@@ -23869,6 +23908,28 @@ 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.
+	*/
+	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 adoptDiscoveredDevice(_input) {
+		throw new Error("Bosch SHC controllers are paired from the integration form");
+	}
 	async onGetCreationSchema(_type) {
 		return null;
 	}
@@ -23882,6 +23943,46 @@ 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();
+			const hosts = [];
+			for (const integration of all) {
+				if (integration.addonId !== this.ctx.id) continue;
+				try {
+					const connection = connectionFromSettings(await this.ctx.api.integrations.getSettings.query({ id: integration.id }));
+					if (connection) hosts.push(connection.host);
+				} catch (err) {
+					this.ctx.logger.warn("SHC discovery: settings read failed", { meta: {
+						integrationId: integration.id,
+						error: errMsg(err)
+					} });
+				}
+			}
+			return hosts;
+		} catch (err) {
+			this.ctx.logger.warn("SHC discovery: integration list failed", { meta: { error: errMsg(err) } });
+			return [];
+		}
+	}
 	requireClients() {
 		if (!this.clients) throw new Error("Bosch SHC provider not initialised");
 		return this.clients;

package/i18n/en.json

@@ -3,7 +3,7 @@
   "bosch-home-connect.name": "Bosch Home Connect",
   "bosch-homecom.name": "Bosch HomeCom",
   "homecom.s_account.title": "HomeCom account",
-  "homecom.s_account.description": "Sign in with your SingleKey ID. Bosch opens its app address; paste that address here.",
+  "homecom.s_account.description": "Sign in with your SingleKey ID. Copy the code as described below, then paste it here.",
   "homecom.s_account.__homecom-sign-in.label": "HomeCom",
   "homecom.s_account.accountLabel.label": "Account",
   "homecom.s_account.gatewayCount.label": "Gateways",
@@ -31,5 +31,7 @@
   "shc.s_connection.__shc-advanced.label": "Advanced",
   "shc.s_connection.token.label": "Controller token",
   "shc.s_connection.sslCertificate.label": "Client certificate (PEM)",
-  "shc.s_connection.sslKey.label": "Client private key (PEM)"
+  "shc.s_connection.sslKey.label": "Client private key (PEM)",
+  "homecom.s_account.__homecom-code-help.label": "Before you sign in, open the browser's developer tools, choose the Network tab, and turn on Preserve log.\n\nSign in with SingleKey. The page will say it has network problems. Ignore that: the browser tried to open the Bosch app and could not.\n\nIn the Network list, filter by code= and open the request whose address starts with com.bosch.tt.dashtt.pointt://app/login?code=\n\nCopy that whole address, or only the code, and paste it in the box under the sign-in button.\n\nOn a phone the same redirect fails unless the Bosch app is installed. Use a desktop browser to copy the code.",
+  "homecom.s_account.gatewayId.description": "Filled from the account. Type one only when you need to override the choice."
 }

package/i18n/it.json

@@ -3,7 +3,7 @@
   "bosch-home-connect.name": "Bosch Home Connect",
   "bosch-homecom.name": "Bosch HomeCom",
   "homecom.s_account.title": "Account HomeCom",
-  "homecom.s_account.description": "Accedi con il tuo SingleKey ID. Bosch apre l'indirizzo dell'app; incolla qui quell'indirizzo.",
+  "homecom.s_account.description": "Accedi con il tuo SingleKey ID. Copia il codice come descritto sotto, poi incollalo qui.",
   "homecom.s_account.__homecom-sign-in.label": "HomeCom",
   "homecom.s_account.accountLabel.label": "Account",
   "homecom.s_account.gatewayCount.label": "Gateway",
@@ -31,5 +31,7 @@
   "shc.s_connection.__shc-advanced.label": "Avanzate",
   "shc.s_connection.token.label": "Token del controller",
   "shc.s_connection.sslCertificate.label": "Certificato client (PEM)",
-  "shc.s_connection.sslKey.label": "Chiave privata client (PEM)"
+  "shc.s_connection.sslKey.label": "Chiave privata client (PEM)",
+  "homecom.s_account.__homecom-code-help.label": "Prima di accedere, apri gli strumenti per sviluppatori del browser, scegli la scheda Rete (Network) e attiva \"Conserva registro\" (Preserve log).\n\nAccedi con SingleKey. La pagina dirà che ci sono problemi di rete. Ignoralo: il browser ha provato ad aprire l'app Bosch e non c'è riuscito.\n\nNell'elenco Rete filtra per code= e apri la richiesta il cui indirizzo inizia con com.bosch.tt.dashtt.pointt://app/login?code=\n\nCopia l'indirizzo intero, oppure solo il codice, e incollalo nella casella sotto il pulsante di accesso.\n\nSu un telefono lo stesso reindirizzamento fallisce se l'app Bosch non è installata. Per copiare il codice usa un browser da computer.",
+  "homecom.s_account.gatewayId.description": "Compilato dall'account. Scrivilo solo se devi sostituire la scelta."
 }

package/package.json

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