@camstack/addon-provider-homeassistant 1.2.659 → 1.2.661

package/dist/addon.mjs

@@ -1,4 +1,4 @@
-import { $ as fanControlCapability, $t as createEvent, A as bestLocationMatch, At as runningFromMediaPlayer, B as climateControlCapability, Bt as tryConvertDelta, C as accessoriesCapability, Ct as pressureSensorCapability, D as ambientLightSensorCapability, Dt as resolveAttachmentUrls, E as alarmPanelCapability, Et as quantityFromUnit, F as buildAddonRouteProvider, Ft as smokeCapability, G as contactCapability, Gt as vibrationCapability, H as connectivityCapability, Ht as updateCapability, I as buildDeviceAdminUrl, J as deviceAdminLinkCapability, K as controlCapability, Kt as waterHeaterCapability, L as buttonCapability, Lt as switchCapability, M as boardKeySourceCapability, Mt as runningStateCapability, N as brightnessCapability, Nt as scriptRunnerCapability, O as automationControlCapability, P as brokerCapability, Q as eventEmitterCapability, Qt as baseUnitOf, R as calendarSourceCapability, Rt as tamperCapability, S as TargetSchema, Sn as EventCategory, St as presenceCapability, T as airQualitySensorCapability, Tt as publicEndpointReaderFrom, Ut as vacuumControlCapability, V as colorCapability, Vt as tryConvertUnit, Wt as valveCapability, Xt as RecordSecretUnavailableError, Y as deviceAdoptionCapability, Z as enumSensorCapability, _n as url, at as humiditySensorCapability, b as RUNNING_STATE_COLD, bn as DeviceType, bt as preconditionOf, cn as boolean, ct as integrationInstancesCapability, dn as number, dt as mediaPlayerCapability, en as defineAddonMigrations, et as flattenNestedRecords, fn as object, ft as motionCapability, gn as unknown, gt as numericSensorCapability, hn as union, ht as notifierCapability, it as humidifierCapability, j as binaryCapability, jt as runningFromVacuumState, k as batteryCapability, kt as runningFromLawnMower, ln as discriminatedUnion, lt as lawnMowerControlCapability, m as EnumSensorDateTimeFormatSchema, mn as string, mt as notificationOutputCapability, n as HA_BROKER_KIND, nn as defineRecordKinds, nt as floodCapability, o as BaseDevice, on as _enum, ot as imageCapability, pn as record, pt as normalizeUnit, q as coverCapability, qt as weatherCapability, rn as entryBody, rt as gasCapability, s as BaseDeviceProvider, sn as array, st as ingestReading, t as haInstanceSettingsPortsOver, tn as defineEntryKind, tt as flattenPortsOver, un as literal, ut as lockControlCapability, vn as DeviceFeature, vt as parseAdminBase, w as addonRoutesCapability, x as RecordIntegrationInstances, xn as errMsg, xt as prepareNotification, yn as DeviceRole, yt as powerMeterCapability, z as carbonMonoxideCapability, zt as temperatureSensorCapability } from "./ha-instance-settings-qhCNJbbn.mjs";
+import { $ as fanControlCapability, $t as createEvent, A as bestLocationMatch, At as runningFromMediaPlayer, B as climateControlCapability, Bt as tryConvertDelta, C as accessoriesCapability, Ct as pressureSensorCapability, D as ambientLightSensorCapability, Dt as resolveAttachmentUrls, E as alarmPanelCapability, Et as quantityFromUnit, F as buildAddonRouteProvider, Ft as smokeCapability, G as contactCapability, Gt as vibrationCapability, H as connectivityCapability, Ht as updateCapability, I as buildDeviceAdminUrl, J as deviceAdminLinkCapability, K as controlCapability, Kt as waterHeaterCapability, L as buttonCapability, Lt as switchCapability, M as boardKeySourceCapability, Mt as runningStateCapability, N as brightnessCapability, Nt as scriptRunnerCapability, O as automationControlCapability, P as brokerCapability, Q as eventEmitterCapability, Qt as baseUnitOf, R as calendarSourceCapability, Rt as tamperCapability, S as TargetSchema, Sn as EventCategory, St as presenceCapability, T as airQualitySensorCapability, Tt as publicEndpointReaderFrom, Ut as vacuumControlCapability, V as colorCapability, Vt as tryConvertUnit, Wt as valveCapability, Xt as RecordSecretUnavailableError, Y as deviceAdoptionCapability, Z as enumSensorCapability, _n as url, at as humiditySensorCapability, b as RUNNING_STATE_COLD, bn as DeviceType, bt as preconditionOf, cn as boolean, ct as integrationInstancesCapability, dn as number, dt as mediaPlayerCapability, en as defineAddonMigrations, et as flattenNestedRecords, fn as object, ft as motionCapability, gn as unknown, gt as numericSensorCapability, hn as union, ht as notifierCapability, it as humidifierCapability, j as binaryCapability, jt as runningFromVacuumState, k as batteryCapability, kt as runningFromLawnMower, ln as discriminatedUnion, lt as lawnMowerControlCapability, m as EnumSensorDateTimeFormatSchema, mn as string, mt as notificationOutputCapability, n as HA_BROKER_KIND, nn as defineRecordKinds, nt as floodCapability, o as BaseDevice, on as _enum, ot as imageCapability, pn as record, pt as normalizeUnit, q as coverCapability, qt as weatherCapability, rn as entryBody, rt as gasCapability, s as BaseDeviceProvider, sn as array, st as ingestReading, t as haInstanceSettingsPortsOver, tn as defineEntryKind, tt as flattenPortsOver, un as literal, ut as lockControlCapability, vn as DeviceFeature, vt as parseAdminBase, w as addonRoutesCapability, x as RecordIntegrationInstances, xn as errMsg, xt as prepareNotification, yn as DeviceRole, yt as powerMeterCapability, z as carbonMonoxideCapability, zt as temperatureSensorCapability } from "./legacy-integration-rows-Bhvthv-s.mjs";
 import { randomUUID } from "node:crypto";
 import { brotliCompressSync, deflateSync, gzipSync } from "node:zlib";
 //#region src/ha-admin-link.ts
@@ -5773,7 +5773,9 @@ var HaBrokerEntrySchema = object({
 	/** Optional FK to the integration record that spawned this broker. */
 	integrationId: string().optional(),
 	/** The instance's own switch (D996); absent means on. */
-	enabled: boolean().optional()
+	enabled: boolean().optional(),
+	/** The `calendar.*` entity ids this instance imports (planning#416); absent means the addon default. */
+	calendarIds: array(string()).optional()
 });
 /**
 * Validates a `broker.add` `settings` payload for the HA kind. Accepts:
@@ -6229,6 +6231,27 @@ var haBrokerSettingsSchema = { sections: [{
 		}
 	]
 }] };
+/**
+* The calendars one instance imports (planning#416): a field of the instance record, offered from
+* that broker's own `calendar.*` entities, so it sits in the instance form beside the connection.
+*/
+function haCalendarsSection(options) {
+	return {
+		id: "ha-calendars-import",
+		title: "Calendars to import",
+		titleKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.title",
+		columns: 1,
+		fields: [{
+			type: "multiselect",
+			key: "calendarIds",
+			label: "Calendars",
+			labelKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.label",
+			options: [...options],
+			description: "Discovered from this Home Assistant instance. Select at least one to import; leave empty to import none.",
+			descriptionKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.description"
+		}]
+	};
+}
 //#endregion
 //#region src/ha-domain-mapping.ts
 function mapHaEntityToCamStack(input) {
@@ -7223,7 +7246,8 @@ var haBrokersEntryKind = defineEntryKind("brokers", {
 		accessToken: HaBrokerEntrySchema.shape.accessToken,
 		supervisorToken: HaBrokerEntrySchema.shape.supervisorToken,
 		integrationId: HaBrokerEntrySchema.shape.integrationId,
-		enabled: HaBrokerEntrySchema.shape.enabled
+		enabled: HaBrokerEntrySchema.shape.enabled,
+		calendarIds: HaBrokerEntrySchema.shape.calendarIds
 	}),
 	writeTrigger: "an operator adds, edits or removes a Home Assistant broker connection",
 	retiredSecretPaths: ["auth.accessToken", "auth.supervisorToken"]
@@ -7753,7 +7777,8 @@ function rowToEntry(id, data) {
 		accessToken: data.accessToken,
 		supervisorToken: data.supervisorToken,
 		integrationId: data.integrationId,
-		enabled: data.enabled
+		enabled: data.enabled,
+		calendarIds: data.calendarIds
 	});
 	return parsed.success ? parsed.data : null;
 }
@@ -7857,7 +7882,10 @@ function buildHaInstances(records, deps) {
 			}],
 			allowRestoreId: true
 		},
-		formSchema: () => haBrokerSettingsSchema,
+		formSchema: (id) => {
+			const options = id === null ? [] : deps.calendarOptions(id);
+			return options.length === 0 ? haBrokerSettingsSchema : { sections: [...haBrokerSettingsSchema.sections, haCalendarsSection(options)] };
+		},
 		initialBody: (name) => ({
 			name,
 			authKind: "long-lived"
@@ -8080,6 +8108,28 @@ function createHaBoardKeyProvider(source) {
 	};
 }
 //#endregion
+//#region src/ha-instance-settings.ts
+function valuesOf(body) {
+	return {
+		...body.integrationId !== void 0 ? { integrationId: body.integrationId } : {},
+		...body.calendarIds !== void 0 ? { calendarIds: body.calendarIds } : {}
+	};
+}
+function haInstanceRecordPortsOver(kind) {
+	return {
+		readInstance: async (brokerId) => {
+			const row = await kind.get(brokerId);
+			return row === null ? null : valuesOf(row.data);
+		},
+		patchInstance: async (brokerId, patch) => {
+			const row = await kind.get(brokerId);
+			if (row === null) return false;
+			await kind.patch(brokerId, patch, { ifRev: row.rev });
+			return true;
+		}
+	};
+}
+//#endregion
 //#region src/migrations/flatten-broker-records.ts
 /**
 * The Home Assistant broker records keep their connection flat (planning#408 P3): the nested
@@ -8112,6 +8162,98 @@ async function flattenBrokerRecords(ports) {
 	});
 }
 //#endregion
+//#region src/migrations/instance-settings-to-record.ts
+var INSTANCE_SETTINGS_TO_RECORD_ID = "provider-homeassistant/2026-11-05-instance-settings-to-record";
+var CLEAR_INSTANCE_SETTINGS_ROWS_ID = "provider-homeassistant/2026-11-05-clear-instance-settings-rows";
+/** The legacy row key the clearing migration removes once the record carries it. */
+var MOVED_ROW_KEYS = ["calendarIds"];
+var asIds$1 = (value) => Array.isArray(value) && value.every((item) => typeof item === "string") ? value : null;
+var sameSet$1 = (a, b) => {
+	const left = new Set(a);
+	const right = new Set(b);
+	return left.size === right.size && [...left].every((id) => right.has(id));
+};
+/** What the rows of one integration say about its record. */
+function wanted(row) {
+	const calendarIds = asIds$1(row.settings["calendarIds"]);
+	return {
+		integrationId: row.integrationId,
+		...calendarIds !== null ? { calendarIds } : {}
+	};
+}
+function assertNoAmbiguity(rows) {
+	const seen = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		if (row.brokerId === null) continue;
+		const other = seen.get(row.brokerId);
+		if (other === void 0) {
+			seen.set(row.brokerId, row);
+			continue;
+		}
+		throw new Error(`provider-homeassistant: integrations ${other.integrationId} and ${row.integrationId} both link broker ${row.brokerId} — nothing moved`);
+	}
+}
+async function moveInstanceSettingsToRecords(ports) {
+	const rows = await ports.listInstances();
+	assertNoAmbiguity(rows);
+	let moved = 0;
+	let kept = 0;
+	let gone = 0;
+	for (const row of rows) {
+		if (row.brokerId === null) continue;
+		const record = await ports.readInstance(row.brokerId);
+		if (record === null) {
+			gone += 1;
+			continue;
+		}
+		const want = wanted(row);
+		const patch = {
+			...record.integrationId === void 0 && want.integrationId !== void 0 ? { integrationId: want.integrationId } : {},
+			...record.calendarIds === void 0 && want.calendarIds !== void 0 ? { calendarIds: want.calendarIds } : {}
+		};
+		if (Object.keys(patch).length === 0) {
+			kept += 1;
+			continue;
+		}
+		if (!await ports.patchInstance(row.brokerId, patch)) {
+			gone += 1;
+			continue;
+		}
+		const back = await ports.readInstance(row.brokerId);
+		if (back === null || patch.integrationId !== void 0 && back.integrationId !== patch.integrationId || patch.calendarIds !== void 0 && !(back.calendarIds !== void 0 && sameSet$1(back.calendarIds, patch.calendarIds))) throw new Error(`provider-homeassistant: record ${row.brokerId} does not show the values of integration ${row.integrationId} after the write — rows kept`);
+		moved += 1;
+	}
+	return {
+		outcome: moved === 0 ? "already-done" : "done",
+		summary: {
+			moved,
+			kept,
+			gone
+		}
+	};
+}
+async function clearInstanceSettingsRows(ports) {
+	let cleared = 0;
+	let parked = 0;
+	for (const row of await ports.listInstances()) {
+		if (!MOVED_ROW_KEYS.some((key) => key in row.settings)) continue;
+		const own = asIds$1(row.settings["calendarIds"]);
+		const onRecord = (row.brokerId === null ? null : await ports.readInstance(row.brokerId))?.calendarIds;
+		if (own === null || onRecord === void 0 || !sameSet$1(own, onRecord)) {
+			parked += 1;
+			continue;
+		}
+		if (await ports.clearInstanceSettingsKeys(row.integrationId, MOVED_ROW_KEYS)) cleared += 1;
+	}
+	return {
+		outcome: cleared === 0 ? "already-done" : "done",
+		summary: {
+			cleared,
+			parked
+		}
+	};
+}
+//#endregion
 //#region src/migrations/calendar-ids-to-integration.ts
 /**
 * The HA calendars an instance imports are a fact of THAT instance (D985): each Home Assistant
@@ -8249,6 +8391,38 @@ var ADDON_MIGRATIONS = [
 			fixtureMark: "a non-secret field stored beside the auth of a broker record"
 		},
 		procedure: flattenBrokerRecords
+	},
+	{
+		meta: {
+			id: INSTANCE_SETTINGS_TO_RECORD_ID,
+			owner: "provider-homeassistant",
+			level: "addon-state",
+			seq: 4,
+			dependsOn: ["provider-homeassistant/2026-11-03-drop-shared-calendar-ids", FLATTEN_BROKER_RECORDS_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Merge the calendars and the integration link of every Home Assistant integration into the instance record its broker link names; a field the record holds wins; read back",
+			fixtureMark: "a calendar id stored in the integration settings of an instance"
+		},
+		procedure: moveInstanceSettingsToRecords
+	},
+	{
+		meta: {
+			id: CLEAR_INSTANCE_SETTINGS_ROWS_ID,
+			owner: "provider-homeassistant",
+			level: "addon-state",
+			seq: 5,
+			dependsOn: [INSTANCE_SETTINGS_TO_RECORD_ID],
+			store: "settings",
+			scope: "cluster",
+			onFailure: "block-owner",
+			bodyKind: "procedure",
+			description: "Clear the calendars from the integration settings of every Home Assistant instance whose record reads back the same set",
+			fixtureMark: "a calendar set the instance record holds differently"
+		},
+		procedure: clearInstanceSettingsRows
 	}
 ];
 //#endregion
@@ -8471,24 +8645,6 @@ async function reconcileBroker(brokerId, deps) {
 function computeBrokerCleanup(brokers, survivingIntegrationIds) {
 	return brokers.filter((b) => b.integrationId !== void 0 && !survivingIntegrationIds.has(b.integrationId)).map((b) => b.id);
 }
-/**
-* Stamp the integrationId FK onto each broker that an integration references
-* via its settings.brokerId, so cleanup-on-delete can later collect orphans.
-* Pure: returns a NEW array; does not mutate. Only the entries that change are
-* replaced (immutably) — unchanged entries keep their original object reference.
-*/
-function linkBrokersToIntegrations(brokers, integrations) {
-	const brokerToIntegration = /* @__PURE__ */ new Map();
-	for (const integration of integrations) if (integration.brokerId !== void 0) brokerToIntegration.set(integration.brokerId, integration.id);
-	return brokers.map((b) => {
-		const integrationId = brokerToIntegration.get(b.id);
-		if (integrationId !== void 0 && b.integrationId !== integrationId) return {
-			...b,
-			integrationId
-		};
-		return b;
-	});
-}
 //#endregion
 //#region src/ha-standalone-entity.ts
 /**
@@ -8930,7 +9086,13 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 		if (this.ctx.secrets === void 0) throw new Error("provider-homeassistant: ctx.secrets is required");
 		return {
 			readStored: (key) => this.readStoredGlobalKey(key),
-			...haInstanceSettingsPortsOver(this.ctx.api.integrations),
+			...haInstanceSettingsPortsOver({
+				list: this.ctx.api.integrations.list,
+				readLegacyIntegrationRows: this.ctx.api.migrations.readLegacyIntegrationRows,
+				patchLegacyIntegrationRows: this.ctx.api.migrations.patchLegacyIntegrationRows,
+				deleteLegacyIntegrationRowKeys: this.ctx.api.migrations.deleteLegacyIntegrationRowKeys
+			}, this.ctx.secrets ?? null),
+			...haInstanceRecordPortsOver(records.kind(haBrokersEntryKind)),
 			...flattenPortsOver(records.kind(haBrokersEntryKind))
 		};
 	}
@@ -8942,6 +9104,7 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 		this.instances = buildHaInstances(records, {
 			mintId: () => this.requireRegistry().allocateId(),
 			infoOf: (id) => this.registry?.get(id) ?? null,
+			calendarOptions: (id) => this.registry ? listHaCalendarCatalog(this.registry, id) : [],
 			onChanged: (id) => this.syncBrokerRuntime(id),
 			probe: (settings) => this.requireRegistry().testSettings(settings)
 		});
@@ -9099,41 +9262,25 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 	* selection yet (the move has not run) uses the legacy shared set, so a boot mid-move never
 	* changes what is imported.
 	*/
-	calendarIdsByBroker = /* @__PURE__ */ new Map();
-	noteInstanceCalendars(brokerId, raw) {
-		if (Array.isArray(raw) && raw.every((id) => typeof id === "string")) this.calendarIdsByBroker.set(brokerId, new Set(raw));
-		else this.calendarIdsByBroker.delete(brokerId);
-	}
+	/** The calendars one instance imports: its record's set, else the addon default. */
 	calendarIdsOf(brokerId) {
-		return this.calendarIdsByBroker.get(brokerId) ?? new Set(this.config.calendarIds ?? []);
+		const own = this.activeBrokers.find((b) => b.id === brokerId)?.calendarIds;
+		return new Set(own ?? this.config.calendarIds ?? []);
 	}
 	async reconcileIntegrationsToBrokers() {
-		const api = this.ctx.api;
-		if (!api.integrations?.list?.query || !api.integrations.getSettings?.query) return;
+		const api = this.ctx.api.integrations;
+		if (!api?.list?.query) return;
 		try {
-			const haIntegrations = (await api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id);
+			const haIntegrations = (await api.list.query()).filter((i) => i.addonId === this.ctx.id);
 			const survivingIntegrationIds = new Set(haIntegrations.map((i) => i.id));
-			const integrationsWithBrokerId = [];
 			for (const integration of haIntegrations) {
-				const settings = await api.integrations.getSettings.query({ id: integration.id });
-				const brokerId = typeof settings["brokerId"] === "string" ? settings["brokerId"] : null;
-				if (!brokerId) continue;
-				this.noteInstanceCalendars(brokerId, settings["calendarIds"]);
-				if (!this.activeBrokers.find((b) => b.id === brokerId)) {
-					this.ctx.logger.warn("integration→broker: linked broker not found", { meta: {
-						integrationId: integration.id,
-						brokerId
-					} });
+				const matching = this.activeBrokers.find((b) => b.integrationId === integration.id);
+				if (!matching) {
+					this.ctx.logger.warn("integration→broker: no instance record names this integration", { meta: { integrationId: integration.id } });
 					continue;
 				}
-				this.requireRegistry().linkIntegration(integration.id, brokerId);
-				integrationsWithBrokerId.push({
-					id: integration.id,
-					brokerId
-				});
+				this.requireRegistry().linkIntegration(integration.id, matching.id);
 			}
-			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.activeBrokers.length,
@@ -9173,40 +9320,6 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 			}]
 		}] });
 	}
-	/**
-	* The calendars of ONE Home Assistant instance (D985): picked on its integration, offered from
-	* that broker's own `calendar.*` entities.
-	*/
-	async integrationSettingsSchema(instance) {
-		if (instance.integrationId === null || !this.registry) return null;
-		let brokerId;
-		try {
-			brokerId = (await this.ctx.api.integrations.getSettings.query({ id: instance.integrationId }))["brokerId"];
-		} catch (err) {
-			this.ctx.logger.warn("HA integration form: instance lookup failed — broker form shown", { meta: {
-				integrationId: instance.integrationId,
-				error: errMsg(err)
-			} });
-			return null;
-		}
-		if (typeof brokerId !== "string") return null;
-		const options = listHaCalendarCatalog(this.registry, brokerId);
-		return this.schema({ sections: [{
-			id: "ha-calendars-import",
-			title: "Calendars to import",
-			titleKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.title",
-			columns: 1,
-			fields: [{
-				type: "multiselect",
-				key: "calendarIds",
-				label: "Calendars",
-				labelKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.label",
-				options,
-				description: "Discovered from this Home Assistant instance. Select at least one to import; leave empty to import none.",
-				descriptionKey: "provider-homeassistant:globalSettings.s_ha-calendars-import.calendarIds.description"
-			}]
-		}] });
-	}
 	async onShutdown() {
 		if (this.resyncTimer) {
 			clearInterval(this.resyncTimer);