@camstack/addon-provider-bosch 0.1.34 → 0.1.36

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-BV6iLwfA.mjs";
+import { $ as errMsg, A as switchCapability, F as defineAddonMigrations, G as number, H as array, I as defineCustomActions, J as string, K as object, L as defineEntryKind, P as customAction, Q as DeviceType, R as entryBody, S as heatingValveCapability, V as _enum, W as literal, _ as defaultIntegrationApiOver, a as BaseDevice, et as EventCategory, f as batteryCapability, h as connectionTestCapability, i as testBoschInstance, j as temperatureSensorCapability, l as RecordIntegrationInstances, m as climateControlCapability, n as boschRowsPorts, o as BaseDeviceProvider, r as keepBodyKeys, t as boschRowsMigration, v as deviceAdoptionCapability, w as integrationInstancesCapability } from "../bosch-instances-BIvOtuzj.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";
@@ -198,6 +198,109 @@ function buildConnectionFormSchema() {
 	}] };
 }
 //#endregion
+//#region src/shc/shc-instances.ts
+/**
+* Bosch Smart Home Controller integrations as `integration-instances` (planning#416, D985,
+* D1007): one `connections` record per controller under the `integrations` registry id. The body
+* IS the connection (host, the client certificate and key and the optional token, all three in
+* the keychain), so the form the instances page edits is the stored shape.
+*/
+var shcConnectionsEntryKind = defineEntryKind("connections", {
+	title: "Smart Home Controllers",
+	schema: entryBody({
+		host: string().optional(),
+		sslCertificate: string().optional().meta({ secret: true }),
+		sslKey: string().optional().meta({ secret: true }),
+		token: string().optional().meta({ secret: true })
+	}),
+	writeTrigger: "an operator pairs, edits or removes a Smart Home Controller"
+});
+/** Every kind this addon declares, keyed by its name. */
+var shcRecordKinds = { connections: shcConnectionsEntryKind };
+var LEGACY_KEYS = [
+	"host",
+	"sslCertificate",
+	"sslKey",
+	"token"
+];
+var SECRET_KEYS = [
+	"sslCertificate",
+	"sslKey",
+	"token"
+];
+function text(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+/** The record body of one controller, from its legacy rows (secrets resolved). */
+function shcBodyFromRows(values, log, integration) {
+	const dropped = Object.keys(values).filter((key) => !LEGACY_KEYS.includes(key));
+	if (dropped.length > 0) log.warn(`integration '${integration.id}': legacy settings nothing reads any more are dropped: ${dropped.join(", ")}`);
+	const host = text(values["host"]);
+	const sslCertificate = text(values["sslCertificate"]);
+	const sslKey = text(values["sslKey"]);
+	const token = text(values["token"]);
+	return {
+		name: integration.name,
+		...host !== void 0 ? { host } : {},
+		...sslCertificate !== void 0 ? { sslCertificate } : {},
+		...sslKey !== void 0 ? { sslKey } : {},
+		...token !== void 0 ? { token } : {}
+	};
+}
+/** The whole `bosch-shc` catalogue (D987): offered to the engine at `onInitialize`. */
+var SHC_MIGRATIONS = [boschRowsMigration({
+	addonId: "bosch-shc",
+	id: "bosch-shc/2026-11-05-integration-rows-to-record",
+	description: "Move every Smart Home Controller connection into a typed instance record keyed by its registry id, then clear the legacy integration settings rows and their keychain values",
+	fixtureMark: "a legacy setting key the migration does not know",
+	kind: shcConnectionsEntryKind,
+	bodyFrom: shcBodyFromRows
+})];
+function shcRowsPorts(deps) {
+	return boschRowsPorts({
+		...deps,
+		kind: shcConnectionsEntryKind
+	});
+}
+/**
+* The live connection of one controller, read from its record. null while the connection is
+* incomplete; a locked keychain throws so the caller keeps the client it has instead of
+* reconfiguring it without its certificate (D49).
+*/
+async function shcConnectionOf(instances, id) {
+	const read = await instances.readResolved(id);
+	if (read === null) return null;
+	if (read.secrets === "unavailable") throw new Error("the keychain is locked, the saved controller credentials cannot be read");
+	return connectionFromSettings(read.body);
+}
+function buildShcInstances(records, deps) {
+	const handle = records.kind(shcConnectionsEntryKind);
+	const instances = new RecordIntegrationInstances(records, shcConnectionsEntryKind, {
+		description: {
+			role: "devices",
+			instanceMode: "multiple",
+			kind: "controller",
+			canTest: true
+		},
+		formSchema: () => buildConnectionFormSchema(),
+		initialBody: (name) => ({ name }),
+		configured: (body) => connectionFromSettings(body) !== null,
+		onChanged: async (_id, change) => {
+			if (change !== "deleted") await deps.onChanged();
+		},
+		test: (input) => testBoschInstance({
+			...input,
+			tester: deps.tester,
+			handle,
+			secretKeys: SECRET_KEYS
+		})
+	});
+	return {
+		instances,
+		provider: keepBodyKeys(instances.toProvider(), new Set(Object.keys(shcConnectionsEntryKind.schema.shape)))
+	};
+}
+//#endregion
 //#region src/shc/shc-self-signed.ts
 /**
 * RSA-2048 self-signed certificate. The controller stores this certificate;
@@ -23732,11 +23835,25 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 		[DeviceType.Switch]: ShcSwitchDevice
 	};
 	clients = null;
+	instances = null;
 	constructor() {
 		super({});
 	}
 	async onInitialize() {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("bosch-shc: ctx.records is required (hub-only addon)");
+		await records.declare(shcRecordKinds);
+		await this.runMigrations(defineAddonMigrations(SHC_MIGRATIONS, shcRowsPorts({
+			api: defaultIntegrationApiOver(this.ctx.api),
+			records,
+			warn: (message) => this.ctx.logger.warn(message)
+		})));
+		const built = buildShcInstances(records, {
+			onChanged: () => this.reconcileIntegrations(),
+			tester: this.buildConnectionTestProvider()
+		});
+		this.instances = built.instances;
 		this.clients = new ShcClientRegistry(this.ctx.logger);
 		this.clients.setOnConnected((integrationId) => {
 			this.setIntegrationDevicesOnline(integrationId, true);
@@ -23756,6 +23873,10 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 				{
 					capability: connectionTestCapability,
 					provider: this.buildConnectionTestProvider()
+				},
+				{
+					capability: integrationInstancesCapability,
+					provider: built.provider
 				}
 			],
 			customActions: boschShcActions,
@@ -23797,11 +23918,9 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			this.ctx.logger.warn("Bosch SHC: shutdown error", { meta: { error: errMsg(err) } });
 		}
 		this.clients = null;
+		this.instances = null;
 		await super.onShutdown();
 	}
-	globalSettingsSchema() {
-		return buildConnectionFormSchema();
-	}
 	async supportsManualCreation() {
 		return false;
 	}
@@ -23844,7 +23963,7 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			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 }));
+					const connection = await shcConnectionOf(this.requireInstances(), integration.id);
 					if (connection) hosts.push(connection.host);
 				} catch (err) {
 					this.ctx.logger.warn("SHC discovery: settings read failed", { meta: {
@@ -23859,6 +23978,10 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			return [];
 		}
 	}
+	requireInstances() {
+		if (!this.instances) throw new Error("Bosch SHC provider not initialised");
+		return this.instances;
+	}
 	requireClients() {
 		if (!this.clients) throw new Error("Bosch SHC provider not initialised");
 		return this.clients;
@@ -23869,7 +23992,7 @@ var BoschShcProviderAddon = class extends BaseDeviceProvider {
 			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id && i.enabled);
 			const surviving = /* @__PURE__ */ new Set();
 			for (const integration of mine) try {
-				const connection = connectionFromSettings(await this.ctx.api.integrations.getSettings.query({ id: integration.id }));
+				const connection = await shcConnectionOf(this.requireInstances(), integration.id);
 				if (!connection) continue;
 				await reg.upsert(integration.id, integration.name, connection);
 				surviving.add(integration.id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -36,6 +36,7 @@
     "addons": [
       {
         "id": "bosch-shc",
+        "integrationRole": "devices",
         "category": "providers",
         "name": "Bosch Smart Home",
         "version": "0.1.0",
@@ -57,11 +58,15 @@
           },
           {
             "name": "connection-test"
+          },
+          {
+            "name": "integration-instances"
           }
         ]
       },
       {
         "id": "bosch-home-connect",
+        "integrationRole": "devices",
         "category": "providers",
         "name": "Bosch Home Connect",
         "version": "0.1.0",
@@ -84,6 +89,9 @@
           {
             "name": "connection-test"
           },
+          {
+            "name": "integration-instances"
+          },
           {
             "name": "dishwasher"
           },
@@ -97,6 +105,7 @@
       },
       {
         "id": "bosch-homecom",
+        "integrationRole": "devices",
         "category": "providers",
         "name": "Bosch HomeCom",
         "version": "0.1.0",
@@ -119,6 +128,9 @@
           {
             "name": "connection-test"
           },
+          {
+            "name": "integration-instances"
+          },
           {
             "name": "climate-control"
           },
@@ -127,7 +139,10 @@
           }
         ]
       }
-    ]
+    ],
+    "requires": {
+      "server": ">=1.2.765"
+    }
   },
   "files": [
     "dist",