@camstack/addon-provider-homeassistant 1.2.638 → 1.2.640

package/dist/addon.mjs

@@ -1,4 +1,4 @@
-import { $ as lawnMowerControlCapability, $t as object, A as buttonCapability, At as valveCapability, B as coverCapability, Bt as baseUnitOf, C as batteryCapability, Ct as switchCapability, D as brokerCapability, Dt as tryConvertUnit, E as brightnessCapability, Et as tryConvertDelta, F as connectivityCapability, Ft as DeviceRole, G as eventEmitterCapability, H as deviceAdoptionCapability, Ht as defineEntryKind, It as DeviceType, J as gasCapability, Jt as array, K as fanControlCapability, Lt as errMsg, M as carbonMonoxideCapability, Mt as waterHeaterCapability, N as climateControlCapability, Nt as weatherCapability, O as buildAddonRouteProvider, Ot as updateCapability, P as colorCapability, Pt as DeviceFeature, Q as ingestReading, Qt as number, R as contactCapability, S as automationControlCapability, St as smokeCapability, T as binaryCapability, Tt as temperatureSensorCapability, Ut as defineRecordKinds, V as deviceAdminLinkCapability, Vt as createEvent, W as enumSensorCapability, Wt as entryBody, X as humiditySensorCapability, Xt as discriminatedUnion, Y as humidifierCapability, Yt as boolean, Z as imageCapability, Zt as literal, _ as accessoriesCapability, _t as runningFromMediaPlayer, an as EventCategory, at as notifierCapability, b as alarmPanelCapability, bt as scriptRunnerCapability, ct as parseAdminBase, dt as presenceCapability, en as record, et as lockControlCapability, ft as pressureSensorCapability, g as TargetSchema, gt as runningFromLawnMower, h as RUNNING_STATE_COLD, in as url, it as notificationOutputCapability, j as calendarSourceCapability, jt as vibrationCapability, k as buildDeviceAdminUrl, kt as vacuumControlCapability, lt as powerMeterCapability, mt as quantityFromUnit, n as BaseDevice, nn as union, nt as motionCapability, ot as numericSensorCapability, q as floodCapability, qt as _enum, r as BaseDeviceProvider, rn as unknown, rt as normalizeUnit, tn as string, tt as mediaPlayerCapability, u as EnumSensorDateTimeFormatSchema, ut as prepareNotification, v as addonRoutesCapability, vt as runningFromVacuumState, w as bestLocationMatch, wt as tamperCapability, x as ambientLightSensorCapability, y as airQualitySensorCapability, yt as runningStateCapability, z as controlCapability, zt as RecordSecretUnavailableError } from "./dist-Cvz76AD1.mjs";
+import { $ as humiditySensorCapability, $t as discriminatedUnion, A as brokerCapability, At as tryConvertUnit, Bt as errMsg, C as alarmPanelCapability, Ct as scriptRunnerCapability, D as bestLocationMatch, Dt as tamperCapability, E as batteryCapability, Et as switchCapability, F as carbonMonoxideCapability, Ft as waterHeaterCapability, G as deviceAdoptionCapability, Gt as defineEntryKind, H as controlCapability, Ht as RecordSecretUnavailableError, I as climateControlCapability, It as weatherCapability, J as eventEmitterCapability, Kt as defineRecordKinds, L as colorCapability, Lt as DeviceFeature, M as buildDeviceAdminUrl, Mt as vacuumControlCapability, N as buttonCapability, Nt as valveCapability, O as binaryCapability, Ot as temperatureSensorCapability, P as calendarSourceCapability, Pt as vibrationCapability, Q as humidifierCapability, Qt as boolean, R as connectivityCapability, Rt as DeviceRole, S as airQualitySensorCapability, St as runningStateCapability, T as automationControlCapability, Tt as smokeCapability, U as coverCapability, Ut as baseUnitOf, V as contactCapability, W as deviceAdminLinkCapability, Wt as createEvent, X as floodCapability, Xt as _enum, Y as fanControlCapability, Z as gasCapability, Zt as array, _t as quantityFromUnit, a as BaseDevice, an as union, at as motionCapability, b as accessoriesCapability, bt as runningFromMediaPlayer, cn as EventCategory, ct as notifierCapability, dt as parseAdminBase, en as literal, et as imageCapability, ft as powerMeterCapability, ht as pressureSensorCapability, in as string, it as mediaPlayerCapability, j as buildAddonRouteProvider, jt as updateCapability, k as brightnessCapability, kt as tryConvertDelta, lt as numericSensorCapability, mt as presenceCapability, nn as object, nt as lawnMowerControlCapability, o as BaseDeviceProvider, on as unknown, ot as normalizeUnit, p as EnumSensorDateTimeFormatSchema, pt as prepareNotification, q as enumSensorCapability, qt as entryBody, rn as record, rt as lockControlCapability, sn as url, st as notificationOutputCapability, t as HA_BROKER_KIND, tn as number, tt as ingestReading, v as RUNNING_STATE_COLD, w as ambientLightSensorCapability, x as addonRoutesCapability, xt as runningFromVacuumState, y as TargetSchema, yt as runningFromLawnMower, zt as DeviceType } from "./ha-broker-source-FHFpUlgq.mjs";
 import { randomUUID } from "node:crypto";
 import { brotliCompressSync, deflateSync, gzipSync } from "node:zlib";
 //#region src/ha-admin-link.ts
@@ -5353,8 +5353,10 @@ function subscribeEntities(opts) {
 *     the same HA broker for overlapping entity sets. We keep ONE
 *     upstream `subscribe_entities` to HA with the UNION of every
 *     active subscription's entity ids, and fan inbound state changes
-*     out via `EventCategory.BrokerMessage` once per matching
-*     subscription.
+*     out via `EventCategory.BrokerMessage` ONCE per change when at
+*     least one subscription matches (the bus is shared and consumers
+*     filter by `key`). A new subscriber's cache replay is the one
+*     targeted emission: it carries that subscription's id.
 *   - When the active union changes (subscribe / unsubscribe call),
 *     we re-issue the upstream subscribe with the new set. HA accepts
 *     this efficiently (server-side filter).
@@ -5366,6 +5368,10 @@ function subscribeEntities(opts) {
 *     subscribe's initial `a` (add) frames.
 */
 var HA_KIND$1 = "home-assistant";
+/** `subscriptionId` of a `broker.message` that is not addressed to one
+*  subscription (a live state change fanned out once). The payload type
+*  requires the field; the empty string is the repo convention for "none". */
+var FANOUT_SUBSCRIPTION_ID = "";
 /**
 * Curated device-event allowlist for the per-broker bus-event aggregator
 * (Case 2). Home Assistant fires arbitrary events on its bus; subscribing
@@ -5644,7 +5650,10 @@ var HaIntegrationManager = class HaIntegrationManager {
 		for (const entityId of changed) {
 			const state = next[entityId] ?? null;
 			if (state === null) continue;
-			for (const sub of this.subscriptions.values()) if (this.subscriptionMatches(sub, entityId)) this.emitBrokerMessage(sub.id, entityId, state);
+			for (const sub of this.subscriptions.values()) if (this.subscriptionMatches(sub, entityId)) {
+				this.emitBrokerMessage(FANOUT_SUBSCRIPTION_ID, entityId, state);
+				break;
+			}
 		}
 	}
 	subscriptionMatches(sub, entityId) {
@@ -7221,21 +7230,27 @@ function haConfigSchema() {
 		title: "Home Assistant notify",
 		titleKey: "provider-homeassistant:haConfig.s_connection.title",
 		fields: [{
-			type: "text",
+			type: "broker-select",
+			key: "brokerId",
+			label: "Broker",
+			labelKey: "provider-homeassistant:haConfig.s_connection.brokerId.label",
+			description: "The Home Assistant connection the notification goes through.",
+			descriptionKey: "provider-homeassistant:haConfig.s_connection.brokerId.description",
+			brokerKind: HA_BROKER_KIND
+		}, {
+			type: "select",
 			key: "service",
 			label: "Notify service",
 			labelKey: "provider-homeassistant:haConfig.s_connection.service.label",
 			required: true,
+			options: [],
 			placeholder: "mobile_app_pixel_7",
-			description: "The part after `notify.` (e.g. `mobile_app_pixel_7`); use Discover to list them.",
-			descriptionKey: "provider-homeassistant:haConfig.s_connection.service.description"
-		}, {
-			type: "text",
-			key: "brokerId",
-			label: "Broker",
-			labelKey: "provider-homeassistant:haConfig.s_connection.brokerId.label",
-			description: "Optional; blank uses the only configured broker.",
-			descriptionKey: "provider-homeassistant:haConfig.s_connection.brokerId.description"
+			description: "Loaded from the broker once it is picked. If the list does not load, type the part after `notify.`.",
+			descriptionKey: "provider-homeassistant:haConfig.s_connection.service.description",
+			discoverOptions: {
+				kind: HA_NOTIFICATION_KIND,
+				dependsOn: ["brokerId"]
+			}
 		}]
 	}] };
 }
@@ -7376,24 +7391,70 @@ function buildNotifyServiceData(prepared) {
 * `get_services` returns `{ [domain]: { [service]: {...} } }`; we read the
 * `notify` domain. mobile_app_* services (rich push features) sort first.
 */
-function parseNotifyServices(result, brokerId) {
+function parseNotifyServices(result, brokerId, deviceNames) {
 	if (typeof result !== "object" || result === null) return [];
 	const notify = result["notify"];
 	if (typeof notify !== "object" || notify === null) return [];
-	return [...Object.keys(notify)].sort((a, b) => {
+	return [...Object.entries(notify)].sort(([a], [b]) => {
 		const am = a.startsWith("mobile_app_") ? 0 : 1;
 		const bm = b.startsWith("mobile_app_") ? 0 : 1;
 		if (am !== bm) return am - bm;
 		return a.localeCompare(b);
-	}).map((service) => ({
+	}).map(([service, definition]) => ({
 		kind: HA_NOTIFICATION_KIND,
-		suggestedName: `notify.${service}`,
+		suggestedName: friendlyServiceName(service, definition, deviceNames),
 		config: {
 			service,
 			...brokerId !== void 0 ? { brokerId } : {}
 		}
 	}));
 }
+function nonEmptyText(value) {
+	return typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
+}
+/** `alexa_media_echo` -> `Alexa Media Echo`. */
+function prettifyServiceId(service) {
+	return service.split("_").filter((word) => word.length > 0).map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+}
+/**
+* The name an operator recognises: the device name for a mobile app, else the
+* service's own `name`, else its `description`, else the prettified id.
+*/
+function friendlyServiceName(service, definition, deviceNames) {
+	const device = deviceNames?.get(service);
+	if (device !== void 0) return device;
+	if (typeof definition === "object" && definition !== null) {
+		const fields = { ...definition };
+		const name = nonEmptyText(fields["name"]);
+		if (name !== void 0) return name;
+		const description = nonEmptyText(fields["description"]);
+		if (description !== void 0) return description;
+	}
+	return prettifyServiceId(service);
+}
+/** HA's slug of a device name, as it appears in `mobile_app_<slug>`. */
+function slugifyDeviceName(name) {
+	return name.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+}
+/**
+* `mobile_app_<slug>` -> device name, read from a `config/device_registry/list`
+* reply. Only devices of the mobile_app integration count; the name the user
+* gave wins over the one the app reported.
+*/
+function mobileAppDeviceNames(registry) {
+	const names = /* @__PURE__ */ new Map();
+	if (!Array.isArray(registry)) return names;
+	for (const entry of registry) {
+		if (typeof entry !== "object" || entry === null) continue;
+		const device = { ...entry };
+		const identifiers = device["identifiers"];
+		if (!(Array.isArray(identifiers) && identifiers.some((pair) => Array.isArray(pair) && pair[0] === "mobile_app"))) continue;
+		const name = nonEmptyText(device["name_by_user"]) ?? nonEmptyText(device["name"]);
+		if (name === void 0) continue;
+		names.set(`mobile_app_${slugifyDeviceName(name)}`, name);
+	}
+	return names;
+}
 /**
 * CRUD over the `ha-notification-targets` record kind.
 *
@@ -7547,12 +7608,24 @@ function createHaNotificationOutputProvider(deps) {
 		},
 		discoverTargets: async ({ kind, config }) => {
 			if (kind !== "homeassistant") return [];
+			const deviceNamesOf = async (brokerId) => {
+				if (deps.listDevices === void 0) return /* @__PURE__ */ new Map();
+				try {
+					return mobileAppDeviceNames(await deps.listDevices(brokerId));
+				} catch (err) {
+					logger?.warn("ha device registry read failed; naming services from their ids", { meta: {
+						brokerId,
+						error: errMsg(err)
+					} });
+					return /* @__PURE__ */ new Map();
+				}
+			};
 			const explicit = config ? readBrokerId(config) : void 0;
 			const brokerIds = explicit ? [explicit] : [...deps.listBrokerIds()];
 			const out = [];
 			for (const brokerId of brokerIds) try {
 				const result = await deps.getServices(brokerId);
-				out.push(...parseNotifyServices(result, brokerId));
+				out.push(...parseNotifyServices(result, brokerId, await deviceNamesOf(brokerId)));
 			} catch (err) {
 				logger?.warn("ha get_services discovery failed", { meta: {
 					brokerId,
@@ -8421,6 +8494,11 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 				if (!manager) throw new Error(`ha-broker '${brokerId}' not found`);
 				return manager.sendMessage({ type: "get_services" });
 			},
+			listDevices: async (brokerId) => {
+				const manager = this.requireRegistry().getManager(brokerId);
+				if (!manager) throw new Error(`ha-broker '${brokerId}' not found`);
+				return manager.sendMessage({ type: "config/device_registry/list" });
+			},
 			listBrokerIds: () => this.activeBrokers.map((b) => b.id),
 			logger: this.ctx.logger.child("notification-output")
 		});