@camstack/addon-provider-homeassistant 1.2.173 → 1.2.602

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("./dist-DTt9hwTQ.js");
+const require_dist = require("./dist-xuu2eG_W.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -6783,6 +6783,54 @@ function createHaIconRouteProvider() {
 	}]);
 }
 //#endregion
+//#region src/broker-record-kinds.ts
+/**
+* Broker entry kind (B2): credentials live in records; integrations keep brokerId.
+*/
+var HA_BROKERS_KIND = "brokers";
+var HA_BROKERS_OWNER = "provider-homeassistant";
+var HaBrokerBodySchema = require_dist.entryBody({
+	auth: HaBrokerEntrySchema.shape.auth,
+	integrationId: require_dist.string().optional()
+});
+var haBrokersEntryKind = require_dist.defineEntryKind(HA_BROKERS_KIND, {
+	title: "Home Assistant brokers",
+	schema: HaBrokerBodySchema,
+	writeTrigger: "an operator adds, edits or removes a Home Assistant broker connection",
+	adoptsFrom: require_dist.settingsBrokersAdoptsFrom(HA_BROKERS_OWNER)
+});
+//#endregion
+//#region src/record-kinds.ts
+/**
+* Body of one stored HA notification target. The record id IS the target id
+* and is not repeated in the body.
+* No `.meta({ secret: true })` fields: HA notify targets carry no standalone
+* credential — delivery reuses the broker WebSocket connection (the token
+* lives in the broker config, not in the target).
+*/
+var HaTargetBodySchema = require_dist.TargetSchema.omit({ id: true });
+var haRecordKinds = require_dist.defineRecordKinds({ 
+/**
+* One row per configured Home Assistant push target. Operator-managed via the
+* notification-output cap CRUD; no TTL.
+* The legacy collection name is `provider-homeassistant:ha-notification-targets`.
+*/
+"ha-notification-targets": {
+	schema: HaTargetBodySchema,
+	class: "config",
+	writeTrigger: "an operator creates, updates, enables/disables or deletes a HA notification target",
+	device: "none",
+	at: "none",
+	retention: { none: "a row is removed only on an explicit operator delete; bounded by the number of HA notify targets the operator configures" },
+	adoptsFrom: "provider-homeassistant:ha-notification-targets",
+	entry: { title: "Home Assistant notification targets" }
+} });
+/** All record kinds this addon declares (targets + B2 broker entries). */
+var haAllRecordKinds = {
+	...haRecordKinds,
+	[haBrokersEntryKind.name]: haBrokersEntryKind
+};
+//#endregion
 //#region src/ha-notification-output.ts
 /**
 * `homeassistant` notification-output kind — hosted BY the HA provider addon.
@@ -6816,8 +6864,6 @@ function createHaIconRouteProvider() {
 */
 /** The single kind this provider contributes to the shared catalog. */
 var HA_NOTIFICATION_KIND = "homeassistant";
-/** addonId-namespaced settings-store collection holding HA notify targets. */
-var HA_TARGETS_COLLECTION = "provider-homeassistant:ha-notification-targets";
 function haConfigSchema() {
 	return { sections: [{
 		id: "connection",
@@ -6997,71 +7043,59 @@ function parseNotifyServices(result, brokerId) {
 		}
 	}));
 }
-/** KV JSON-blob shape — a single `data` column routes the row through the
-*  settings backend's canonical key/value path (id TEXT PK, data TEXT). */
-var KV_BLOB_COLUMNS = [{
-	name: "data",
-	type: "TEXT",
-	notNull: true
-}];
-function rowToTarget(row) {
-	const parsed = require_dist.TargetSchema.safeParse({
-		id: row.id,
-		...row.data
-	});
-	return parsed.success ? parsed.data : null;
-}
-function targetToData(target) {
-	return {
-		name: target.name,
-		kind: target.kind,
-		addonId: target.addonId,
-		enabled: target.enabled,
-		config: target.config
-	};
-}
-/** CRUD over one settings-store collection of `homeassistant` notify targets. */
-var HaTargetStore = class {
-	store;
-	collection;
-	constructor(store, collection = HA_TARGETS_COLLECTION) {
-		this.store = store;
-		this.collection = collection;
+/**
+* CRUD over the `ha-notification-targets` record kind.
+*
+* `HaTargetStore.of(records)` is the production factory; the test helper
+* (`makeFakeHaRecords`) supplies a fake transport so nothing hits SQLite.
+* No `init()` method: kinds are declared at addon boot via
+* `ctx.records.declare(haRecordKinds)`.
+*/
+var HaTargetStore = class HaTargetStore {
+	kind;
+	constructor(kind) {
+		this.kind = kind;
 	}
-	/** Declare the backing collection before any read/write. The SQLite settings
-	*  backend rejects undeclared collections (fail-fast), so this MUST run before
-	*  `list`/`getById`/`upsert`/`delete` — mirrors addon-ai's ProfileStore.init. */
-	async init() {
-		await this.store.declareCollection(this.collection, KV_BLOB_COLUMNS);
+	/** Factory: build from a declared `RecordsAccess` (after `ctx.records.declare`). */
+	static of(records) {
+		return new HaTargetStore(records.kind(haRecordKinds["ha-notification-targets"]));
 	}
 	async list() {
-		const rows = await this.store.query(this.collection);
+		const page = await this.kind.query({ limit: 1e3 });
 		const out = [];
-		for (const row of rows) {
-			const target = rowToTarget(row);
-			if (target) out.push(target);
+		for (const record of page.records) {
+			const parsed = require_dist.TargetSchema.safeParse({
+				id: record.id,
+				...record.data
+			});
+			if (parsed.success) out.push(parsed.data);
 		}
 		return out;
 	}
 	async getById(id) {
-		const row = (await this.store.query(this.collection)).find((r) => r.id === id);
-		return row ? rowToTarget(row) : null;
+		const row = await this.kind.get(id);
+		if (row === null) return null;
+		const parsed = require_dist.TargetSchema.safeParse({
+			id: row.id,
+			...row.data
+		});
+		return parsed.success ? parsed.data : null;
 	}
 	async upsert(target) {
-		const exists = (await this.store.query(this.collection)).some((r) => r.id === target.id);
-		const data = targetToData(target);
-		if (exists) await this.store.update(this.collection, target.id, data);
-		else await this.store.insert(this.collection, {
-			id: target.id,
-			data
+		const { id, ...rest } = target;
+		const parsed = haRecordKinds["ha-notification-targets"].schema.safeParse(rest);
+		if (!parsed.success) throw new Error(`invalid HA target '${id}': ${parsed.error.message}`);
+		await this.kind.put({
+			id,
+			data: parsed.data
 		});
 	}
 	async delete(id) {
-		await this.store.remove(this.collection, id);
+		await this.kind.delete(id);
 	}
 	async setEnabled(id, enabled) {
 		const target = await this.getById(id);
-		if (!target) return null;
+		if (target === null) return null;
 		const next = {
 			...target,
 			enabled
@@ -7070,78 +7104,6 @@ var HaTargetStore = class {
 		return next;
 	}
 };
-/** Adapt the tRPC-shaped `settings-store` cap client to the narrow port. */
-function createApiHaSettingsStorePort(api) {
-	return {
-		query: async (collection) => {
-			return (await api.settingsStore.query.query({ collection })).map((r) => ({
-				id: r.id,
-				data: r.data
-			}));
-		},
-		insert: async (collection, record) => {
-			await api.settingsStore.insert.mutate({
-				collection,
-				record: {
-					id: record.id,
-					data: { ...record.data }
-				}
-			});
-		},
-		update: async (collection, id, data) => {
-			await api.settingsStore.update.mutate({
-				collection,
-				id,
-				data
-			});
-		},
-		remove: async (collection, id) => {
-			await api.settingsStore.delete.mutate({
-				collection,
-				key: id
-			});
-		},
-		declareCollection: async (collection, columns) => {
-			await api.settingsStore.declareCollection.mutate({
-				collection,
-				columns: columns.map((c) => ({ ...c }))
-			});
-		}
-	};
-}
-/** In-memory port — a resilient fallback when no `api` is wired. */
-function createMemoryHaSettingsStorePort() {
-	const collections = /* @__PURE__ */ new Map();
-	const bucket = (collection) => {
-		let map = collections.get(collection);
-		if (!map) {
-			map = /* @__PURE__ */ new Map();
-			collections.set(collection, map);
-		}
-		return map;
-	};
-	return {
-		query: async (collection) => [...bucket(collection).values()],
-		insert: async (collection, record) => {
-			bucket(collection).set(record.id, {
-				id: record.id,
-				data: { ...record.data }
-			});
-		},
-		update: async (collection, id, data) => {
-			bucket(collection).set(id, {
-				id,
-				data: { ...data }
-			});
-		},
-		remove: async (collection, id) => {
-			bucket(collection).delete(id);
-		},
-		declareCollection: async (collection) => {
-			bucket(collection);
-		}
-	};
-}
 /** The canned notification `testTarget` sends when the caller omits a sample. */
 function cannedNotification() {
 	return {
@@ -7291,6 +7253,78 @@ function createHaNotificationOutputProvider(deps) {
 	};
 }
 //#endregion
+//#region src/ha-broker-store.ts
+/**
+* CRUD for HA brokers over the `brokers` entry record kind (B2).
+*/
+function rowToEntry(id, data) {
+	const parsed = HaBrokerEntrySchema.safeParse({
+		id,
+		name: data.name,
+		auth: data.auth,
+		integrationId: data.integrationId
+	});
+	return parsed.success ? parsed.data : null;
+}
+var HaBrokerStore = class HaBrokerStore {
+	kind;
+	constructor(kind) {
+		this.kind = kind;
+	}
+	static of(records) {
+		return new HaBrokerStore(records.kind(haBrokersEntryKind));
+	}
+	async listResolved() {
+		const page = await this.kind.query({ limit: 1e3 });
+		const out = [];
+		for (const record of page.records) {
+			let data = record.data;
+			try {
+				const resolved = await this.kind.getResolved(record.id);
+				if (resolved !== null) data = resolved.data;
+			} catch (err) {
+				if (!(err instanceof require_dist.RecordSecretUnavailableError)) throw err;
+			}
+			const entry = rowToEntry(record.id, data);
+			if (entry !== null) out.push(entry);
+		}
+		return out;
+	}
+	async getById(id) {
+		try {
+			const row = await this.kind.getResolved(id);
+			if (row === null) return null;
+			return rowToEntry(row.id, row.data);
+		} catch (err) {
+			if (err instanceof require_dist.RecordSecretUnavailableError) return null;
+			throw err;
+		}
+	}
+	async upsert(entry) {
+		const { id, name, auth, integrationId } = entry;
+		const body = {
+			name,
+			auth,
+			...integrationId === void 0 ? {} : { integrationId }
+		};
+		const parsed = haBrokersEntryKind.schema.safeParse(body);
+		if (!parsed.success) throw new Error(`invalid HA broker '${id}': ${parsed.error.message}`);
+		await this.kind.put({
+			id,
+			data: parsed.data
+		});
+	}
+	async delete(id) {
+		await this.kind.delete(id);
+	}
+	async replaceAll(entries) {
+		const page = await this.kind.query({ limit: 1e3 });
+		const nextIds = new Set(entries.map((e) => e.id));
+		for (const row of page.records) if (!nextIds.has(row.id)) await this.kind.delete(row.id);
+		for (const entry of entries) await this.upsert(entry);
+	}
+};
+//#endregion
 //#region src/ha-calendar-source.ts
 function isCalendarEntity(entityId) {
 	return entityId.startsWith("calendar.");
@@ -7951,6 +7985,9 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 		return `ha:${String(config?.["brokerId"] ?? "unknown")}:dev:${String(config?.["haDeviceId"] ?? Date.now())}`;
 	}
 	registry = null;
+	brokerStore = null;
+	/** Runtime broker rows (records when B2 is live, else settings). */
+	activeBrokers = [];
 	/** Periodic re-sync sweep handle (cleared on shutdown). */
 	resyncTimer = null;
 	/** `brokerId → aggregator deviceId` cache for the per-broker generic
@@ -7964,6 +8001,11 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 		super({ ...DEFAULT_CONFIG });
 	}
 	async onInitialize() {
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("provider-homeassistant: ctx.records is required (hub-only addon)");
+		await records.declare(haAllRecordKinds);
+		this.brokerStore = HaBrokerStore.of(records);
+		this.activeBrokers = await this.loadPersistedBrokers();
 		this.registry = new HaBrokerRegistry(this.ctx.logger, this.ctx.eventBus);
 		this.registry.setOnBrokerConnected((brokerId) => {
 			this.reconcileBroker(brokerId);
@@ -7974,11 +8016,11 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 		this.registry.setOnBusEvent((brokerId, ev) => {
 			this.routeBusEvent(brokerId, ev);
 		});
-		await this.registry.restore(this.config.brokers);
+		await this.registry.restore(this.activeBrokers);
 		this.resyncTimer = setInterval(() => {
 			this.reconcileAllConnectedBrokers();
 		}, HaProviderAddon.RESYNC_INTERVAL_MS);
-		this.ctx.logger.info("ha provider initialised", { meta: { brokerCount: this.config.brokers.length } });
+		this.ctx.logger.info("ha provider initialised", { meta: { brokerCount: this.activeBrokers.length } });
 		await this.reconcileIntegrationsToBrokers();
 		this.subscribeIntegrationLifecycle();
 		return [
@@ -8009,11 +8051,9 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 		];
 	}
 	async buildNotificationOutputProvider() {
-		const api = this.ctx.api;
-		const port = api ? createApiHaSettingsStorePort(api) : createMemoryHaSettingsStorePort();
-		if (!api) this.ctx.logger.warn("ha notification-output: no ctx.api — targets persist in-memory only");
-		const store = new HaTargetStore(port);
-		await store.init();
+		const records = this.ctx.records;
+		if (records === void 0) throw new Error("ha notification-output: ctx.records is required (hub-only addon)");
+		const store = HaTargetStore.of(records);
 		return createHaNotificationOutputProvider({
 			addonId: this.ctx.id,
 			iconUrl: HA_NOTIFICATION_ICON_URL,
@@ -8030,7 +8070,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				if (!manager) throw new Error(`ha-broker '${brokerId}' not found`);
 				return manager.sendMessage({ type: "get_services" });
 			},
-			listBrokerIds: () => this.config.brokers.map((b) => b.id),
+			listBrokerIds: () => this.activeBrokers.map((b) => b.id),
 			logger: this.ctx.logger.child("notification-output")
 		});
 	}
@@ -8091,7 +8131,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				const settings = await api.integrations.getSettings.query({ id: integration.id });
 				const brokerId = typeof settings["brokerId"] === "string" ? settings["brokerId"] : null;
 				if (!brokerId) continue;
-				if (!this.config.brokers.find((b) => b.id === brokerId)) {
+				if (!this.activeBrokers.find((b) => b.id === brokerId)) {
 					this.ctx.logger.warn("integration→broker: linked broker not found", { meta: {
 						integrationId: integration.id,
 						brokerId
@@ -8104,11 +8144,11 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 					brokerId
 				});
 			}
-			const linkedBrokers = linkBrokersToIntegrations(this.config.brokers, integrationsWithBrokerId);
-			if (linkedBrokers.some((b, i) => b !== this.config.brokers[i])) await this.updateGlobalSettings({ brokers: linkedBrokers });
-			const orphans = computeBrokerCleanup(this.config.brokers, survivingIntegrationIds);
+			const linkedBrokers = linkBrokersToIntegrations(this.activeBrokers, integrationsWithBrokerId);
+			if (linkedBrokers.some((b, i) => b !== this.activeBrokers[i])) await this.persistBrokerEntries(linkedBrokers);
+			const orphans = computeBrokerCleanup(this.activeBrokers, survivingIntegrationIds);
 			this.ctx.logger.info("integration→broker reconcile", { meta: {
-				brokerCount: this.config.brokers.length,
+				brokerCount: this.activeBrokers.length,
 				integrationCount: haIntegrations.length,
 				orphans: orphans.length
 			} });
@@ -8205,7 +8245,8 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 	async onConfigChanged() {
 		const reg = this.registry;
 		if (!reg) return;
-		const persisted = this.config.brokers;
+		this.activeBrokers = await this.loadPersistedBrokers();
+		const persisted = this.activeBrokers;
 		const liveIds = new Set(reg.list().map((b) => b.id));
 		const persistedIds = new Set(persisted.map((e) => e.id));
 		for (const liveId of liveIds) if (!persistedIds.has(liveId)) try {
@@ -8243,7 +8284,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 						...b,
 						id: created.id
 					} : b);
-					await this.updateGlobalSettings({ brokers: next });
+					await this.persistBrokerEntries(next);
 				}
 			} catch (err) {
 				this.ctx.logger.warn("ha onConfigChanged: failed to start new broker", { meta: {
@@ -8253,9 +8294,26 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 			}
 		}
 	}
+	async loadPersistedBrokers() {
+		const store = this.brokerStore;
+		if (store !== null) {
+			const fromRecords = await store.listResolved();
+			if (fromRecords.length > 0) return fromRecords;
+		}
+		return this.config.brokers;
+	}
+	async persistBrokerEntries(entries) {
+		this.activeBrokers = [...entries];
+		const store = this.brokerStore;
+		if (store !== null) {
+			await store.replaceAll(entries);
+			return;
+		}
+		await this.updateGlobalSettings({ brokers: entries });
+	}
 	buildBrokerProvider() {
 		const ownerAddonId = this.ctx.id;
-		const owns = (id) => this.config.brokers.some((b) => b.id === id);
+		const owns = (id) => this.activeBrokers.some((b) => b.id === id);
 		return {
 			list: async ({ kind }) => {
 				if (kind && kind !== HA_KIND) return [];
@@ -8285,7 +8343,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 					brokerId: entry.id,
 					name
 				} });
-				await this.updateGlobalSettings({ brokers: [...this.config.brokers, entry] });
+				await this.persistBrokerEntries([...this.activeBrokers, entry]);
 				return { id: entry.id };
 			},
 			remove: async ({ id }) => {
@@ -8300,8 +8358,8 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 					brokerId: id,
 					logger: this.ctx.logger
 				});
-				const nextBrokers = this.config.brokers.filter((b) => b.id !== id);
-				await this.updateGlobalSettings({ brokers: nextBrokers });
+				const nextBrokers = this.activeBrokers.filter((b) => b.id !== id);
+				await this.persistBrokerEntries(nextBrokers);
 			},
 			testConnection: async ({ id }) => {
 				if (!owns(id)) return {
@@ -8323,18 +8381,18 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				};
 			},
 			getSettings: async ({ id }) => {
-				const entry = this.config.brokers.find((b) => b.id === id);
+				const entry = this.activeBrokers.find((b) => b.id === id);
 				if (!entry) return null;
 				return authToSettings(entry.auth);
 			},
 			setSettings: async ({ id, settings }) => {
 				if (!owns(id)) return;
 				const entry = await this.requireRegistry().updateEntry(id, settings);
-				const next = this.config.brokers.map((b) => b.id === id ? entry : b);
-				await this.updateGlobalSettings({ brokers: next });
+				const next = this.activeBrokers.map((b) => b.id === id ? entry : b);
+				await this.persistBrokerEntries(next);
 			},
 			getBrokerConfig: async ({ id }) => {
-				const entry = this.config.brokers.find((b) => b.id === id);
+				const entry = this.activeBrokers.find((b) => b.id === id);
 				if (!entry) return null;
 				return authToSettings(entry.auth);
 			},