@camstack/addon-provider-homeassistant 1.2.166 → 1.2.170

package/dist/addon.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("./dist-BKSNuxYV.js");
+const require_dist = require("./dist-B7c8ebLd.js");
 let node_crypto = require("node:crypto");
 let node_zlib = require("node:zlib");
 //#region src/ha-admin-link.ts
@@ -7363,14 +7363,20 @@ async function fetchEventsForEntities(manager, entityIds, startIso, endIso) {
 	}
 	return out;
 }
+/** Empty selection = import nothing (operator must pick calendars explicitly). */
+function isSelected(entityId, selected) {
+	return selected.size > 0 && selected.has(entityId);
+}
 function createHaCalendarSource(deps) {
 	return {
 		listCalendars: async () => {
+			const selected = deps.selectedCalendarIds();
 			const out = [];
 			for (const { manager } of deps.brokers.listManagers()) {
 				const states = manager.snapshotAllStates();
 				for (const [entityId, raw] of Object.entries(states)) {
 					if (!isCalendarEntity(entityId)) continue;
+					if (!isSelected(entityId, selected)) continue;
 					const state = asEntityState(raw);
 					if (state === null) continue;
 					out.push({
@@ -7386,11 +7392,16 @@ function createHaCalendarSource(deps) {
 		listEvents: async (input) => {
 			const startIso = new Date(input.startMs).toISOString();
 			const endIso = new Date(input.endMs).toISOString();
+			const selected = deps.selectedCalendarIds();
 			const wanted = input.calendarIds !== void 0 && input.calendarIds.length > 0 ? new Set(input.calendarIds) : null;
 			const out = [];
 			for (const { brokerId, manager } of deps.brokers.listManagers()) {
 				const states = manager.snapshotAllStates();
-				const entityIds = Object.keys(states).filter((id) => isCalendarEntity(id) && (wanted === null || wanted.has(id)));
+				const entityIds = Object.keys(states).filter((id) => {
+					if (!isCalendarEntity(id)) return false;
+					if (!isSelected(id, selected)) return false;
+					return wanted === null || wanted.has(id);
+				});
 				if (entityIds.length === 0) continue;
 				try {
 					const events = await fetchEventsForEntities(manager, entityIds, startIso, endIso);
@@ -7407,6 +7418,25 @@ function createHaCalendarSource(deps) {
 		}
 	};
 }
+/** Discover every HA calendar entity (ignores the import filter) — for settings catalog. */
+function listHaCalendarCatalog(brokers) {
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const { manager } of brokers.listManagers()) {
+		const states = manager.snapshotAllStates();
+		for (const [entityId, raw] of Object.entries(states)) {
+			if (!isCalendarEntity(entityId) || seen.has(entityId)) continue;
+			const state = asEntityState(raw);
+			if (state === null) continue;
+			seen.add(entityId);
+			out.push({
+				value: entityId,
+				label: calendarName(state)
+			});
+		}
+	}
+	return out.toSorted((a, b) => a.label.localeCompare(b.label));
+}
 //#endregion
 //#region src/ha-reconcile-broker.ts
 /**
@@ -7841,7 +7871,10 @@ function planStandaloneReconcile(devices, freshById, brokerId) {
 var ADOPTION_FILTER_DEVICES = "devices";
 var ADOPTION_FILTER_ENTITIES = "entities";
 var HA_KIND = "home-assistant";
-var DEFAULT_CONFIG = { brokers: [] };
+var DEFAULT_CONFIG = {
+	brokers: [],
+	calendarIds: []
+};
 /**
 * Home Assistant provider addon.
 *
@@ -7938,7 +7971,8 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 				capability: require_dist.calendarSourceCapability,
 				provider: createHaCalendarSource({
 					brokers: this.requireRegistry(),
-					logger: this.ctx.logger.child("calendar-source")
+					logger: this.ctx.logger.child("calendar-source"),
+					selectedCalendarIds: () => new Set(this.config.calendarIds ?? [])
 				})
 			}
 		];
@@ -8065,20 +8099,43 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 		eb.subscribe({ category: "integration.disabled" }, handler);
 		eb.subscribe({ category: "integration.deleted" }, handler);
 	}
-	globalSettingsSchema() {
+	globalSettingsSchema(cap) {
+		if (cap === "calendar-source") return this.schema({ sections: [{
+			id: "ha-calendars-import",
+			title: "Calendars to import",
+			description: "Pick which Home Assistant calendar entities feed System → Calendars. Nothing selected = no calendars imported.",
+			columns: 1,
+			fields: [{
+				type: "multiselect",
+				key: "calendarIds",
+				label: "Calendars",
+				options: [],
+				optionsFrom: "_calendarCatalog",
+				description: "Discovered from connected HA brokers. Select at least one to import; leave empty to import none."
+			}]
+		}] });
 		return this.schema({ sections: [{
 			id: "ha-broker",
 			title: "Home Assistant broker",
-			description: "Home Assistant brokers are managed in the External systems → Brokers tab.",
+			description: "Home Assistant brokers are managed in Connectivity → Brokers.",
 			columns: 1,
 			fields: [{
 				type: "info",
 				key: "brokerHelp",
 				label: "Brokers are managed separately",
-				content: "This integration links to a Home Assistant broker. Add, edit, or remove brokers from External systems → Brokers. The integration only stores a reference to its broker — no credentials are kept here."
+				content: "This integration links to a Home Assistant broker. Add, edit, or remove brokers from Connectivity → Brokers. The integration only stores a reference to its broker — no credentials are kept here."
 			}]
 		}] });
 	}
+	async getGlobalSettings(overlay, cap, nodeId) {
+		if (cap !== "calendar-source") return super.getGlobalSettings(overlay, cap, nodeId);
+		const catalog = this.registry ? listHaCalendarCatalog(this.registry) : [];
+		return super.getGlobalSettings({
+			...overlay,
+			calendarIds: this.config.calendarIds ?? [],
+			...catalog.length > 0 ? { _calendarCatalog: catalog } : {}
+		}, cap, nodeId);
+	}
 	async onShutdown() {
 		if (this.resyncTimer) {
 			clearInterval(this.resyncTimer);
@@ -8185,7 +8242,7 @@ var HaProviderAddon = class HaProviderAddon extends require_dist.BaseDeviceProvi
 			}],
 			add: async ({ kind, name, settings, id }) => {
 				if (kind !== HA_KIND) throw new Error(`provider-homeassistant: only kind '${HA_KIND}' is handled here (got '${kind}')`);
-				const entry = await this.requireRegistry().createEntry(name, settings, { ...id !== void 0 ? { id } : {} });
+				const entry = await this.requireRegistry().createEntry(name, settings, id !== void 0 ? { id } : {});
 				if (id !== void 0) this.ctx.logger.info("broker restored under an adopted id", { meta: {
 					brokerId: entry.id,
 					name

package/dist/addon.mjs

@@ -1,4 +1,4 @@
-import { A as connectivityCapability, At as record, B as floodCapability, C as buildAddonRouteProvider, Ct as _enum, D as carbonMonoxideCapability, Dt as literal, E as calendarSourceCapability, Et as discriminatedUnion, F as deviceAdoptionCapability, Ft as EventCategory, G as lawnMowerControlCapability, H as humidifierCapability, J as motionCapability, K as lockControlCapability, L as enumSensorCapability, M as controlCapability, Mt as union, N as coverCapability, Nt as unknown, O as climateControlCapability, Ot as number, P as deviceAdminLinkCapability, Pt as url, Q as numericSensorCapability, R as eventEmitterCapability, S as brokerCapability, T as buttonCapability, Tt as boolean, U as humiditySensorCapability, V as gasCapability, W as imageCapability, X as notificationOutputCapability, Y as normalizeUnit, Z as notifierCapability, _ as automationControlCapability, _t as DeviceRole, at as scriptRunnerCapability, b as binaryCapability, ct as tamperCapability, d as TargetSchema, dt as vacuumControlCapability, et as parseAdminBase, f as accessoriesCapability, ft as valveCapability, g as ambientLightSensorCapability, gt as DeviceFeature, h as alarmPanelCapability, ht as weatherCapability, it as pressureSensorCapability, j as contactCapability, jt as string, k as colorCapability, kt as object, lt as temperatureSensorCapability, m as airQualitySensorCapability, mt as waterHeaterCapability, n as BaseDevice, nt as prepareNotification, ot as smokeCapability, p as addonRoutesCapability, pt as vibrationCapability, q as mediaPlayerCapability, r as BaseDeviceProvider, rt as presenceCapability, s as EnumSensorDateTimeFormatSchema, st as switchCapability, tt as powerMeterCapability, ut as updateCapability, v as batteryCapability, vt as DeviceType, w as buildDeviceAdminUrl, wt as array, x as brightnessCapability, xt as createEvent, y as bestLocationMatch, yt as errMsg, z as fanControlCapability } from "./dist-CkOgR9ep.mjs";
+import { A as connectivityCapability, At as record, B as floodCapability, C as buildAddonRouteProvider, Ct as _enum, D as carbonMonoxideCapability, Dt as literal, E as calendarSourceCapability, Et as discriminatedUnion, F as deviceAdoptionCapability, Ft as EventCategory, G as lawnMowerControlCapability, H as humidifierCapability, J as motionCapability, K as lockControlCapability, L as enumSensorCapability, M as controlCapability, Mt as union, N as coverCapability, Nt as unknown, O as climateControlCapability, Ot as number, P as deviceAdminLinkCapability, Pt as url, Q as numericSensorCapability, R as eventEmitterCapability, S as brokerCapability, T as buttonCapability, Tt as boolean, U as humiditySensorCapability, V as gasCapability, W as imageCapability, X as notificationOutputCapability, Y as normalizeUnit, Z as notifierCapability, _ as automationControlCapability, _t as DeviceRole, at as scriptRunnerCapability, b as binaryCapability, ct as tamperCapability, d as TargetSchema, dt as vacuumControlCapability, et as parseAdminBase, f as accessoriesCapability, ft as valveCapability, g as ambientLightSensorCapability, gt as DeviceFeature, h as alarmPanelCapability, ht as weatherCapability, it as pressureSensorCapability, j as contactCapability, jt as string, k as colorCapability, kt as object, lt as temperatureSensorCapability, m as airQualitySensorCapability, mt as waterHeaterCapability, n as BaseDevice, nt as prepareNotification, ot as smokeCapability, p as addonRoutesCapability, pt as vibrationCapability, q as mediaPlayerCapability, r as BaseDeviceProvider, rt as presenceCapability, s as EnumSensorDateTimeFormatSchema, st as switchCapability, tt as powerMeterCapability, ut as updateCapability, v as batteryCapability, vt as DeviceType, w as buildDeviceAdminUrl, wt as array, x as brightnessCapability, xt as createEvent, y as bestLocationMatch, yt as errMsg, z as fanControlCapability } from "./dist-BaG2A4xn.mjs";
 import { randomUUID } from "node:crypto";
 import { brotliCompressSync, deflateSync, gzipSync } from "node:zlib";
 //#region src/ha-admin-link.ts
@@ -7362,14 +7362,20 @@ async function fetchEventsForEntities(manager, entityIds, startIso, endIso) {
 	}
 	return out;
 }
+/** Empty selection = import nothing (operator must pick calendars explicitly). */
+function isSelected(entityId, selected) {
+	return selected.size > 0 && selected.has(entityId);
+}
 function createHaCalendarSource(deps) {
 	return {
 		listCalendars: async () => {
+			const selected = deps.selectedCalendarIds();
 			const out = [];
 			for (const { manager } of deps.brokers.listManagers()) {
 				const states = manager.snapshotAllStates();
 				for (const [entityId, raw] of Object.entries(states)) {
 					if (!isCalendarEntity(entityId)) continue;
+					if (!isSelected(entityId, selected)) continue;
 					const state = asEntityState(raw);
 					if (state === null) continue;
 					out.push({
@@ -7385,11 +7391,16 @@ function createHaCalendarSource(deps) {
 		listEvents: async (input) => {
 			const startIso = new Date(input.startMs).toISOString();
 			const endIso = new Date(input.endMs).toISOString();
+			const selected = deps.selectedCalendarIds();
 			const wanted = input.calendarIds !== void 0 && input.calendarIds.length > 0 ? new Set(input.calendarIds) : null;
 			const out = [];
 			for (const { brokerId, manager } of deps.brokers.listManagers()) {
 				const states = manager.snapshotAllStates();
-				const entityIds = Object.keys(states).filter((id) => isCalendarEntity(id) && (wanted === null || wanted.has(id)));
+				const entityIds = Object.keys(states).filter((id) => {
+					if (!isCalendarEntity(id)) return false;
+					if (!isSelected(id, selected)) return false;
+					return wanted === null || wanted.has(id);
+				});
 				if (entityIds.length === 0) continue;
 				try {
 					const events = await fetchEventsForEntities(manager, entityIds, startIso, endIso);
@@ -7406,6 +7417,25 @@ function createHaCalendarSource(deps) {
 		}
 	};
 }
+/** Discover every HA calendar entity (ignores the import filter) — for settings catalog. */
+function listHaCalendarCatalog(brokers) {
+	const out = [];
+	const seen = /* @__PURE__ */ new Set();
+	for (const { manager } of brokers.listManagers()) {
+		const states = manager.snapshotAllStates();
+		for (const [entityId, raw] of Object.entries(states)) {
+			if (!isCalendarEntity(entityId) || seen.has(entityId)) continue;
+			const state = asEntityState(raw);
+			if (state === null) continue;
+			seen.add(entityId);
+			out.push({
+				value: entityId,
+				label: calendarName(state)
+			});
+		}
+	}
+	return out.toSorted((a, b) => a.label.localeCompare(b.label));
+}
 //#endregion
 //#region src/ha-reconcile-broker.ts
 /**
@@ -7840,7 +7870,10 @@ function planStandaloneReconcile(devices, freshById, brokerId) {
 var ADOPTION_FILTER_DEVICES = "devices";
 var ADOPTION_FILTER_ENTITIES = "entities";
 var HA_KIND = "home-assistant";
-var DEFAULT_CONFIG = { brokers: [] };
+var DEFAULT_CONFIG = {
+	brokers: [],
+	calendarIds: []
+};
 /**
 * Home Assistant provider addon.
 *
@@ -7937,7 +7970,8 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 				capability: calendarSourceCapability,
 				provider: createHaCalendarSource({
 					brokers: this.requireRegistry(),
-					logger: this.ctx.logger.child("calendar-source")
+					logger: this.ctx.logger.child("calendar-source"),
+					selectedCalendarIds: () => new Set(this.config.calendarIds ?? [])
 				})
 			}
 		];
@@ -8064,20 +8098,43 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 		eb.subscribe({ category: "integration.disabled" }, handler);
 		eb.subscribe({ category: "integration.deleted" }, handler);
 	}
-	globalSettingsSchema() {
+	globalSettingsSchema(cap) {
+		if (cap === "calendar-source") return this.schema({ sections: [{
+			id: "ha-calendars-import",
+			title: "Calendars to import",
+			description: "Pick which Home Assistant calendar entities feed System → Calendars. Nothing selected = no calendars imported.",
+			columns: 1,
+			fields: [{
+				type: "multiselect",
+				key: "calendarIds",
+				label: "Calendars",
+				options: [],
+				optionsFrom: "_calendarCatalog",
+				description: "Discovered from connected HA brokers. Select at least one to import; leave empty to import none."
+			}]
+		}] });
 		return this.schema({ sections: [{
 			id: "ha-broker",
 			title: "Home Assistant broker",
-			description: "Home Assistant brokers are managed in the External systems → Brokers tab.",
+			description: "Home Assistant brokers are managed in Connectivity → Brokers.",
 			columns: 1,
 			fields: [{
 				type: "info",
 				key: "brokerHelp",
 				label: "Brokers are managed separately",
-				content: "This integration links to a Home Assistant broker. Add, edit, or remove brokers from External systems → Brokers. The integration only stores a reference to its broker — no credentials are kept here."
+				content: "This integration links to a Home Assistant broker. Add, edit, or remove brokers from Connectivity → Brokers. The integration only stores a reference to its broker — no credentials are kept here."
 			}]
 		}] });
 	}
+	async getGlobalSettings(overlay, cap, nodeId) {
+		if (cap !== "calendar-source") return super.getGlobalSettings(overlay, cap, nodeId);
+		const catalog = this.registry ? listHaCalendarCatalog(this.registry) : [];
+		return super.getGlobalSettings({
+			...overlay,
+			calendarIds: this.config.calendarIds ?? [],
+			...catalog.length > 0 ? { _calendarCatalog: catalog } : {}
+		}, cap, nodeId);
+	}
 	async onShutdown() {
 		if (this.resyncTimer) {
 			clearInterval(this.resyncTimer);
@@ -8184,7 +8241,7 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 			}],
 			add: async ({ kind, name, settings, id }) => {
 				if (kind !== HA_KIND) throw new Error(`provider-homeassistant: only kind '${HA_KIND}' is handled here (got '${kind}')`);
-				const entry = await this.requireRegistry().createEntry(name, settings, { ...id !== void 0 ? { id } : {} });
+				const entry = await this.requireRegistry().createEntry(name, settings, id !== void 0 ? { id } : {});
 				if (id !== void 0) this.ctx.logger.info("broker restored under an adopted id", { meta: {
 					brokerId: entry.id,
 					name