@camstack/addon-provider-homeassistant 1.2.654 → 1.2.655

package/dist/ha-export/ha-export.addon.js

@@ -24,7 +24,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_ha_instance_settings = require("../ha-instance-settings-Bn_Trz6p.js");
+const require_ha_instance_settings = require("../ha-instance-settings-5Ms7yRju.js");
 let node_crypto = require("node:crypto");
 require("node:zlib");
 let node_fs = require("node:fs");
@@ -7672,31 +7672,46 @@ var HaExportAddon = class extends require_ha_instance_settings.BaseAddon {
 			{
 				capability: require_ha_instance_settings.deviceExportCapability,
 				provider: {
-					getStatus: async () => this.buildStatus(),
-					listSupportedDeviceKinds: async () => [...SUPPORTED_DEVICE_KINDS],
-					listExposedDevices: async () => exposedDeviceIds(this.config.membership, this.enabledBrokerIds()).map((deviceId) => ({
-						deviceId,
-						exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+					getStatus: async (input) => this.buildStatus(this.brokerScope(require_ha_instance_settings.statusInstanceOf(input))),
+					listInstances: async () => this.config.knownBrokers.map((broker) => ({
+						instanceId: broker.id,
+						name: broker.name,
+						enabled: this.enabledBrokerIds().includes(broker.id),
+						kind: "home-assistant"
 					})),
-					exposeDevice: async ({ deviceId }) => this.setMembershipEverywhere(deviceId, true),
-					unexposeDevice: async ({ deviceId }) => this.setMembershipEverywhere(deviceId, false),
+					listSupportedDeviceKinds: async ({ instanceId }) => {
+						this.brokerScope(instanceId);
+						return [...SUPPORTED_DEVICE_KINDS];
+					},
+					listExposedDevices: async ({ instanceId }) => this.exposedDeviceRows(this.brokerScope(instanceId)),
+					exposeDevice: async ({ instanceId, deviceId }) => this.setBrokerMembership(instanceId, deviceId, true),
+					unexposeDevice: async ({ instanceId, deviceId }) => this.setBrokerMembership(instanceId, deviceId, false),
 					listSupportedEntityKinds: async () => [
 						"device",
 						"action",
 						"notifier"
 					],
-					listExposedEntities: async () => {
+					listExposedEntities: async ({ instanceId }) => {
+						const scope = this.brokerScope(instanceId);
 						await exportedEntities.pruneDeleted();
-						return [...exposedDeviceIds(this.config.membership, this.enabledBrokerIds()).map((deviceId) => ({
+						return [...this.exposedDeviceRows(scope).map((row) => ({
 							entity: {
 								kind: "device",
-								deviceId
+								deviceId: row.deviceId
 							},
-							exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+							exposedAs: row.exposedAs
 						})), ...exportedEntities.list()];
 					},
-					exposeEntity: async ({ entity }) => entity.kind === "device" ? this.setMembershipEverywhere(entity.deviceId, true) : exportedEntities.expose(entity),
-					unexposeEntity: async ({ entity }) => entity.kind === "device" ? this.setMembershipEverywhere(entity.deviceId, false) : exportedEntities.unexpose(entity),
+					exposeEntity: async ({ instanceId, entity }) => {
+						if (entity.kind === "device") return this.setBrokerMembership(instanceId, entity.deviceId, true);
+						this.brokerScope(instanceId);
+						return exportedEntities.expose(entity);
+					},
+					unexposeEntity: async ({ instanceId, entity }) => {
+						if (entity.kind === "device") return this.setBrokerMembership(instanceId, entity.deviceId, false);
+						this.brokerScope(instanceId);
+						return exportedEntities.unexpose(entity);
+					},
 					getDeviceSettingsContribution: async ({ deviceId }) => this.buildContribution(deviceId),
 					getDeviceLiveContribution: async () => null,
 					applyDeviceSettingsPatch: async ({ deviceId, patch }) => this.applyDeviceSettingsPatch(deviceId, patch)
@@ -9820,20 +9835,44 @@ var HaExportAddon = class extends require_ha_instance_settings.BaseAddon {
 		return bases;
 	}
 	/**
-	* The cap-level expose/unexpose applies to EVERY enabled broker.
-	*
-	* The `device-export` cap is the COMMON surface across export targets
-	* and has no notion of a broker; per-broker granularity lives in the
-	* derived Export panel, over the same store. There is exactly one
-	* authority either way.
+	* Every broker this addon knows, enabled or not: a membership write may
+	* target a broker that is switched off (its devices resume when it is turned
+	* back on). A cold `knownBrokers` still counts the enabled ids.
 	*/
-	async setMembershipEverywhere(deviceId, exposed) {
-		let next = this.config.membership;
-		for (const brokerId of this.enabledBrokerIds()) next = setExposed(next, brokerId, deviceId, exposed);
+	knownBrokerIds() {
+		return new Set([...this.config.knownBrokers.map((b) => b.id), ...this.enabledBrokerIds()]);
+	}
+	/**
+	* The brokers a `device-export` read answers over: the named instance, or
+	* (absent) every enabled broker. A broker this addon does not know is
+	* refused, never answered empty.
+	*/
+	brokerScope(instanceId) {
+		if (instanceId === void 0) return this.enabledBrokerIds();
+		if (!this.knownBrokerIds().has(instanceId)) throw new require_ha_instance_settings.ExportInstanceUnknownError("provider-homeassistant", instanceId);
+		return [instanceId];
+	}
+	exposedDeviceRows(scope) {
+		return exposedDeviceIds(this.config.membership, scope).map((deviceId) => ({
+			deviceId,
+			exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+		}));
+	}
+	/**
+	* A cap-level expose/unexpose changes ONE broker's membership — the named
+	* instance. There is no write without a target and no "everywhere": the
+	* other brokers' membership is not touched.
+	*/
+	async setBrokerMembership(instanceId, deviceId, exposed) {
+		this.brokerScope(instanceId);
+		const next = setExposed(this.config.membership, instanceId, deviceId, exposed);
 		if (next === this.config.membership) {
 			this.ctx.logger.debug("ha-export: membership already in that state, nothing to do", {
 				tags: { deviceId: Number(deviceId) },
-				meta: { exposed }
+				meta: {
+					exposed,
+					brokerId: instanceId
+				}
 			});
 			return;
 		}
@@ -9842,7 +9881,7 @@ var HaExportAddon = class extends require_ha_instance_settings.BaseAddon {
 			tags: { deviceId: Number(deviceId) },
 			meta: {
 				exposed,
-				brokers: this.enabledBrokerIds()
+				brokerId: instanceId
 			}
 		});
 		await this.reconcile(exposed ? "expose" : "unexpose");
@@ -9996,19 +10035,20 @@ var HaExportAddon = class extends require_ha_instance_settings.BaseAddon {
 		await this.reconcile("device-panel");
 		return { success: true };
 	}
-	buildStatus() {
-		const enabled = this.enabledBrokerIds();
-		const healthy = [...this.links.values()].filter((link) => link.client.healthy).length;
-		const linkFailure = [...this.links.values()].map((link) => link.client.failure).filter((failure) => failure !== null)[0]?.text;
+	buildStatus(scope) {
+		const enabled = scope;
+		const links = [...this.links.entries()].filter(([brokerId]) => scope.includes(brokerId)).map(([, link]) => link);
+		const healthy = links.filter((link) => link.client.healthy).length;
+		const linkFailure = links.map((link) => link.client.failure).filter((failure) => failure !== null)[0]?.text;
 		return {
-			linkState: enabled.length === 0 ? "unlinked" : healthy === this.links.size ? "linked" : "error",
+			linkState: enabled.length === 0 ? "unlinked" : healthy === links.length ? "linked" : "error",
 			exposedDeviceCount: exposedDeviceIds(this.config.membership, enabled).length,
 			...linkFailure !== void 0 ? { error: linkFailure } : this.lastError !== void 0 ? { error: this.lastError } : {},
 			setup: {
 				fields: [
 					{
 						label: "Home Assistant instances",
-						value: `${healthy} / ${this.links.size} reachable`
+						value: `${healthy} / ${links.length} reachable`
 					},
 					{
 						label: "Last push failure",

package/dist/ha-export/ha-export.addon.mjs

@@ -1,4 +1,4 @@
-import { $t as nodePin, F as buildAddonRouteProvider, Jt as defineAddonMigrations, Kt as baseUnitOf, Qt as isReadingQuantity, Tt as runExportedAction, U as consumableFormOf, W as consumableKindOf, Wt as BaseAddon, X as deviceExportCapability, _ as FanDirectionSchema, _t as preconditionOf, b as PLUG_APPLIANCE_TYPES, cn as string, d as COCO_TO_MACRO, f as CameraSwitchIdSchema, gn as EventCategory, h as ConsumableStatusSchema, jt as sendToExportedTarget, m as ConsumableItemSchema, mt as oauthIntegrationCapability, n as listInstancesOrNothing, o as listHomeAssistantBrokers, on as object, p as ConsumableFormSchema, r as settingsByBroker, s as AlarmArmModeSchema, t as haInstanceSettingsPortsOver, tn as array, u as CAMERA_SWITCH_ORDER, un as unknown, v as HvacModeSchema, w as addonRoutesCapability, xt as pruneDeletedEntities, y as MediaPlayerRepeatSchema } from "../ha-instance-settings-g5pwb3Fi.mjs";
+import { $t as baseUnitOf, At as runExportedAction, Cn as EventCategory, E as addonRoutesCapability, Et as pruneDeletedEntities, G as consumableFormOf, It as sendToExportedTarget, K as consumableKindOf, L as buildAddonRouteProvider, Q as deviceExportCapability, Rt as statusInstanceOf, St as preconditionOf, Xt as BaseAddon, _ as ExportInstanceUnknownError, _n as unknown, an as isReadingQuantity, b as MediaPlayerRepeatSchema, cn as array, d as COCO_TO_MACRO, f as CameraSwitchIdSchema, h as ConsumableStatusSchema, hn as string, m as ConsumableItemSchema, n as listInstancesOrNothing, o as listHomeAssistantBrokers, on as nodePin, p as ConsumableFormSchema, pn as object, r as settingsByBroker, s as AlarmArmModeSchema, t as haInstanceSettingsPortsOver, tn as defineAddonMigrations, u as CAMERA_SWITCH_ORDER, v as FanDirectionSchema, x as PLUG_APPLIANCE_TYPES, y as HvacModeSchema, yt as oauthIntegrationCapability } from "../ha-instance-settings-DLDNOmgL.mjs";
 import { createHmac, timingSafeEqual } from "node:crypto";
 import "node:zlib";
 import "node:fs";
@@ -7637,31 +7637,46 @@ var HaExportAddon = class extends BaseAddon {
 			{
 				capability: deviceExportCapability,
 				provider: {
-					getStatus: async () => this.buildStatus(),
-					listSupportedDeviceKinds: async () => [...SUPPORTED_DEVICE_KINDS],
-					listExposedDevices: async () => exposedDeviceIds(this.config.membership, this.enabledBrokerIds()).map((deviceId) => ({
-						deviceId,
-						exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+					getStatus: async (input) => this.buildStatus(this.brokerScope(statusInstanceOf(input))),
+					listInstances: async () => this.config.knownBrokers.map((broker) => ({
+						instanceId: broker.id,
+						name: broker.name,
+						enabled: this.enabledBrokerIds().includes(broker.id),
+						kind: "home-assistant"
 					})),
-					exposeDevice: async ({ deviceId }) => this.setMembershipEverywhere(deviceId, true),
-					unexposeDevice: async ({ deviceId }) => this.setMembershipEverywhere(deviceId, false),
+					listSupportedDeviceKinds: async ({ instanceId }) => {
+						this.brokerScope(instanceId);
+						return [...SUPPORTED_DEVICE_KINDS];
+					},
+					listExposedDevices: async ({ instanceId }) => this.exposedDeviceRows(this.brokerScope(instanceId)),
+					exposeDevice: async ({ instanceId, deviceId }) => this.setBrokerMembership(instanceId, deviceId, true),
+					unexposeDevice: async ({ instanceId, deviceId }) => this.setBrokerMembership(instanceId, deviceId, false),
 					listSupportedEntityKinds: async () => [
 						"device",
 						"action",
 						"notifier"
 					],
-					listExposedEntities: async () => {
+					listExposedEntities: async ({ instanceId }) => {
+						const scope = this.brokerScope(instanceId);
 						await exportedEntities.pruneDeleted();
-						return [...exposedDeviceIds(this.config.membership, this.enabledBrokerIds()).map((deviceId) => ({
+						return [...this.exposedDeviceRows(scope).map((row) => ({
 							entity: {
 								kind: "device",
-								deviceId
+								deviceId: row.deviceId
 							},
-							exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+							exposedAs: row.exposedAs
 						})), ...exportedEntities.list()];
 					},
-					exposeEntity: async ({ entity }) => entity.kind === "device" ? this.setMembershipEverywhere(entity.deviceId, true) : exportedEntities.expose(entity),
-					unexposeEntity: async ({ entity }) => entity.kind === "device" ? this.setMembershipEverywhere(entity.deviceId, false) : exportedEntities.unexpose(entity),
+					exposeEntity: async ({ instanceId, entity }) => {
+						if (entity.kind === "device") return this.setBrokerMembership(instanceId, entity.deviceId, true);
+						this.brokerScope(instanceId);
+						return exportedEntities.expose(entity);
+					},
+					unexposeEntity: async ({ instanceId, entity }) => {
+						if (entity.kind === "device") return this.setBrokerMembership(instanceId, entity.deviceId, false);
+						this.brokerScope(instanceId);
+						return exportedEntities.unexpose(entity);
+					},
 					getDeviceSettingsContribution: async ({ deviceId }) => this.buildContribution(deviceId),
 					getDeviceLiveContribution: async () => null,
 					applyDeviceSettingsPatch: async ({ deviceId, patch }) => this.applyDeviceSettingsPatch(deviceId, patch)
@@ -9785,20 +9800,44 @@ var HaExportAddon = class extends BaseAddon {
 		return bases;
 	}
 	/**
-	* The cap-level expose/unexpose applies to EVERY enabled broker.
-	*
-	* The `device-export` cap is the COMMON surface across export targets
-	* and has no notion of a broker; per-broker granularity lives in the
-	* derived Export panel, over the same store. There is exactly one
-	* authority either way.
+	* Every broker this addon knows, enabled or not: a membership write may
+	* target a broker that is switched off (its devices resume when it is turned
+	* back on). A cold `knownBrokers` still counts the enabled ids.
 	*/
-	async setMembershipEverywhere(deviceId, exposed) {
-		let next = this.config.membership;
-		for (const brokerId of this.enabledBrokerIds()) next = setExposed(next, brokerId, deviceId, exposed);
+	knownBrokerIds() {
+		return new Set([...this.config.knownBrokers.map((b) => b.id), ...this.enabledBrokerIds()]);
+	}
+	/**
+	* The brokers a `device-export` read answers over: the named instance, or
+	* (absent) every enabled broker. A broker this addon does not know is
+	* refused, never answered empty.
+	*/
+	brokerScope(instanceId) {
+		if (instanceId === void 0) return this.enabledBrokerIds();
+		if (!this.knownBrokerIds().has(instanceId)) throw new ExportInstanceUnknownError("provider-homeassistant", instanceId);
+		return [instanceId];
+	}
+	exposedDeviceRows(scope) {
+		return exposedDeviceIds(this.config.membership, scope).map((deviceId) => ({
+			deviceId,
+			exposedAs: brokersExposing(this.config.membership, deviceId).map((brokerId) => this.brokerName(brokerId)).join(", ")
+		}));
+	}
+	/**
+	* A cap-level expose/unexpose changes ONE broker's membership — the named
+	* instance. There is no write without a target and no "everywhere": the
+	* other brokers' membership is not touched.
+	*/
+	async setBrokerMembership(instanceId, deviceId, exposed) {
+		this.brokerScope(instanceId);
+		const next = setExposed(this.config.membership, instanceId, deviceId, exposed);
 		if (next === this.config.membership) {
 			this.ctx.logger.debug("ha-export: membership already in that state, nothing to do", {
 				tags: { deviceId: Number(deviceId) },
-				meta: { exposed }
+				meta: {
+					exposed,
+					brokerId: instanceId
+				}
 			});
 			return;
 		}
@@ -9807,7 +9846,7 @@ var HaExportAddon = class extends BaseAddon {
 			tags: { deviceId: Number(deviceId) },
 			meta: {
 				exposed,
-				brokers: this.enabledBrokerIds()
+				brokerId: instanceId
 			}
 		});
 		await this.reconcile(exposed ? "expose" : "unexpose");
@@ -9961,19 +10000,20 @@ var HaExportAddon = class extends BaseAddon {
 		await this.reconcile("device-panel");
 		return { success: true };
 	}
-	buildStatus() {
-		const enabled = this.enabledBrokerIds();
-		const healthy = [...this.links.values()].filter((link) => link.client.healthy).length;
-		const linkFailure = [...this.links.values()].map((link) => link.client.failure).filter((failure) => failure !== null)[0]?.text;
+	buildStatus(scope) {
+		const enabled = scope;
+		const links = [...this.links.entries()].filter(([brokerId]) => scope.includes(brokerId)).map(([, link]) => link);
+		const healthy = links.filter((link) => link.client.healthy).length;
+		const linkFailure = links.map((link) => link.client.failure).filter((failure) => failure !== null)[0]?.text;
 		return {
-			linkState: enabled.length === 0 ? "unlinked" : healthy === this.links.size ? "linked" : "error",
+			linkState: enabled.length === 0 ? "unlinked" : healthy === links.length ? "linked" : "error",
 			exposedDeviceCount: exposedDeviceIds(this.config.membership, enabled).length,
 			...linkFailure !== void 0 ? { error: linkFailure } : this.lastError !== void 0 ? { error: this.lastError } : {},
 			setup: {
 				fields: [
 					{
 						label: "Home Assistant instances",
-						value: `${healthy} / ${this.links.size} reachable`
+						value: `${healthy} / ${links.length} reachable`
 					},
 					{
 						label: "Last push failure",