@camstack/addon-provider-homeassistant 1.2.650 → 1.2.652

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_broker_source = require("../ha-broker-source-DUj9pUWr.js");
+const require_ha_broker_source = require("../ha-broker-source-D3ScsO0T.js");
 let node_crypto = require("node:crypto");
 require("node:zlib");
 let node_fs = require("node:fs");
@@ -3522,7 +3522,11 @@ var CAPS_NOT_EXPORTED = [
 	},
 	{
 		cap: "pet-fountain",
-		reason: "A fountain is BUILT here from the loose entities Home Assistant already holds (a pump switch, two number boxes, a button), so exporting it back would publish a second copy of entities that already exist there. A dedicated mapping can follow when an ecosystem asks for the built device."
+		reason: "A fountain is BUILT here from the loose entities Home Assistant already holds (a pump switch, a button, sensors), so exporting it back would publish a second copy of entities that already exist there. A dedicated mapping can follow when an ecosystem asks for the built device."
+	},
+	{
+		cap: "pump-cycle",
+		reason: "The pump duty cycle of a fountain BUILT here from a cycle switch and two number boxes Home Assistant already holds, so exporting it back would publish a second copy of entities that already exist there."
 	},
 	{
 		cap: "ir-transmitter",
@@ -5491,6 +5495,10 @@ var PushClient = class {
 	disposed = false;
 	lastFailure = null;
 	suspendedUntil = 0;
+	/** When the current unbroken streak of 404s began; 0 when there is none. */
+	first404At = 0;
+	/** A suspension was entered and not yet logged as left. */
+	suspensionLogged = false;
 	constructor(options) {
 		this.transport = options.transport;
 		this.logger = options.logger;
@@ -5509,9 +5517,20 @@ var PushClient = class {
 	get suspended() {
 		return this.suspendedUntil > Date.now();
 	}
+	/** Epoch ms of the next probe while suspended; 0 otherwise. */
+	get recheckAt() {
+		return this.suspended ? this.suspendedUntil : 0;
+	}
 	/** Probe again at once — the operator changed something. */
 	resetBackoff() {
 		this.suspendedUntil = 0;
+		this.first404At = 0;
+		this.logSuspensionEnded("reset by a settings change");
+	}
+	logSuspensionEnded(why) {
+		if (!this.suspensionLogged) return;
+		this.suspensionLogged = false;
+		this.logger.info(`ha-export: push link no longer suspended (${why}), probing again`, { meta: { brokerId: this.brokerId } });
 	}
 	/** Messages discarded because HA did not answer. Never silent. */
 	get droppedCount() {
@@ -5592,8 +5611,13 @@ var PushClient = class {
 			this.dropped += message.type === "batch" ? message.items.length : 1;
 			return false;
 		}
+		if (this.suspendedUntil !== 0 && !this.suspended) {
+			this.suspendedUntil = 0;
+			this.logSuspensionEnded("recheck time reached");
+		}
 		try {
 			await this.transport(message);
+			this.first404At = 0;
 			this.onReachable();
 			return true;
 		} catch (err) {
@@ -5620,6 +5644,7 @@ var PushClient = class {
 		this.available = true;
 		this.lastFailure = null;
 		this.suspendedUntil = 0;
+		this.logSuspensionEnded("Home Assistant answered");
 		/**
 		* The link came back. Drop the dedup cache so the reconcile that
 		* follows re-pushes every value: HA may have restarted and lost its
@@ -5657,11 +5682,29 @@ var PushClient = class {
 	*/
 	onUnreachable(message, err) {
 		this.available = false;
-		const failure = describePushFailure(err);
+		const now = Date.now();
+		const described = describePushFailure(err);
+		let failure = described;
+		if (described.kind === "component-missing") {
+			if (this.first404At === 0) this.first404At = now;
+			if (now - this.first404At < 6e4) failure = {
+				kind: "other",
+				permanent: false,
+				text: "HTTP 404 — Home Assistant has not registered the CamStack endpoint (yet); retrying"
+			};
+		} else this.first404At = 0;
 		this.lastFailure = failure;
-		if (failure.permanent) this.suspendedUntil = Date.now() + COMPONENT_RECHECK_MS;
 		this.dropped += message.type === "batch" ? message.items.length : 1;
-		const now = Date.now();
+		if (failure.permanent) {
+			this.suspendedUntil = now + COMPONENT_RECHECK_MS;
+			this.suspensionLogged = true;
+			this.logger.warn(`ha-export: push link SUSPENDED (${failure.text}); next probe at ${new Date(this.suspendedUntil).toISOString()}`, { meta: {
+				brokerId: this.brokerId,
+				failureKind: failure.kind,
+				recheckAt: this.suspendedUntil,
+				recheckInMs: COMPONENT_RECHECK_MS
+			} });
+		}
 		if (now - this.droppedLoggedAt < DROP_LOG_INTERVAL_MS) return;
 		this.droppedLoggedAt = now;
 		this.logger.warn(`ha-export: push to Home Assistant failed (${failure.text}), messages dropped`, { meta: {
@@ -5673,6 +5716,19 @@ var PushClient = class {
 		} });
 	}
 };
+//#endregion
+//#region src/ha-export/link-gaps.ts
+/** A parked link is reported, never silently excluded. */
+function summariseLinkGaps(links) {
+	return {
+		failing: links.filter((l) => !l.healthy && !l.suspended).map((l) => l.brokerId),
+		suspended: links.filter((l) => l.suspended).map((l) => ({
+			brokerId: l.brokerId,
+			recheckAt: l.recheckAt
+		})),
+		anyLive: links.some((l) => !l.suspended)
+	};
+}
 var ReachabilityReconciler = class {
 	options;
 	minIntervalMs;
@@ -8144,13 +8200,21 @@ var HaExportAddon = class extends require_ha_broker_source.BaseAddon {
 			const delivered = await this.announce(exported, fullResync);
 			await this.pushFullState(exported, snapshots);
 			if (synthetic !== null) await this.pushSynthetic(projectSynthetic(synthetic, Date.now()), [...enabled]);
-			const failing = [...this.links.values()].filter((link) => !link.client.healthy && !link.client.suspended);
-			const anyLive = [...this.links.values()].some((link) => !link.client.suspended);
-			if (failing.length > 0 || !delivered && anyLive) {
+			const gaps = summariseLinkGaps([...this.links.entries()].map(([brokerId, link]) => ({
+				brokerId,
+				healthy: link.client.healthy,
+				suspended: link.client.suspended,
+				recheckAt: link.client.recheckAt
+			})));
+			if (gaps.failing.length > 0 || !delivered && gaps.anyLive) {
 				this.resync.markGap("push-not-delivered");
 				this.lastStructureFingerprint = void 0;
 				this.ctx.logger.warn("ha-export: a push was not delivered, the next pass is a full resync");
 			}
+			if (gaps.suspended.length > 0) this.ctx.logger.warn("ha-export: push links suspended, Home Assistant receives nothing", { meta: { suspended: gaps.suspended.map((s) => ({
+				brokerId: s.brokerId,
+				recheckAt: new Date(s.recheckAt).toISOString()
+			})) } });
 			this.ctx.logger.info("ha-export: reconciled", { meta: {
 				reason,
 				fullResync,
@@ -8158,6 +8222,7 @@ var HaExportAddon = class extends require_ha_broker_source.BaseAddon {
 				devices: exported.size,
 				entities: entityCount,
 				unclassifiedCaps: this.unclassified.length,
+				suspendedLinks: gaps.suspended.length,
 				durationMs: Date.now() - startedAt
 			} });
 			if (this.unclassified.length > 0) this.ctx.logger.warn("ha-export: capabilities in neither the map nor the exclusion list", { meta: { caps: this.unclassified } });

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

@@ -1,4 +1,4 @@
-import { B as consumableKindOf, Bt as BaseAddon, Dt as sendToExportedTarget, Ht as baseUnitOf, Jt as isReadingQuantity, K as deviceExportCapability, Wt as defineAddonMigrations, Yt as nodePin, Zt as array, _ as PLUG_APPLIANCE_TYPES, _t as pruneDeletedEntities, c as COCO_TO_MACRO, d as ConsumableItemSchema, f as ConsumableStatusSchema, fn as EventCategory, g as MediaPlayerRepeatSchema, h as HvacModeSchema, i as AlarmArmModeSchema, in as string, j as buildAddonRouteProvider, l as CameraSwitchIdSchema, m as FanDirectionSchema, nn as object, on as unknown, pt as preconditionOf, r as listHomeAssistantBrokers, s as CAMERA_SWITCH_ORDER, u as ConsumableFormSchema, ut as oauthIntegrationCapability, x as addonRoutesCapability, xt as runExportedAction, z as consumableFormOf } from "../ha-broker-source-B2v2dnPe.mjs";
+import { B as consumableFormOf, Gt as defineAddonMigrations, M as buildAddonRouteProvider, Ot as sendToExportedTarget, Qt as array, St as runExportedAction, Ut as baseUnitOf, V as consumableKindOf, Vt as BaseAddon, Xt as nodePin, Yt as isReadingQuantity, _ as PLUG_APPLIANCE_TYPES, an as string, c as COCO_TO_MACRO, d as ConsumableItemSchema, dt as oauthIntegrationCapability, f as ConsumableStatusSchema, g as MediaPlayerRepeatSchema, h as HvacModeSchema, i as AlarmArmModeSchema, l as CameraSwitchIdSchema, m as FanDirectionSchema, mt as preconditionOf, pn as EventCategory, q as deviceExportCapability, r as listHomeAssistantBrokers, rn as object, s as CAMERA_SWITCH_ORDER, sn as unknown, u as ConsumableFormSchema, vt as pruneDeletedEntities, x as addonRoutesCapability } from "../ha-broker-source-CBWl6Wat.mjs";
 import { createHmac, timingSafeEqual } from "node:crypto";
 import "node:zlib";
 import "node:fs";
@@ -3487,7 +3487,11 @@ var CAPS_NOT_EXPORTED = [
 	},
 	{
 		cap: "pet-fountain",
-		reason: "A fountain is BUILT here from the loose entities Home Assistant already holds (a pump switch, two number boxes, a button), so exporting it back would publish a second copy of entities that already exist there. A dedicated mapping can follow when an ecosystem asks for the built device."
+		reason: "A fountain is BUILT here from the loose entities Home Assistant already holds (a pump switch, a button, sensors), so exporting it back would publish a second copy of entities that already exist there. A dedicated mapping can follow when an ecosystem asks for the built device."
+	},
+	{
+		cap: "pump-cycle",
+		reason: "The pump duty cycle of a fountain BUILT here from a cycle switch and two number boxes Home Assistant already holds, so exporting it back would publish a second copy of entities that already exist there."
 	},
 	{
 		cap: "ir-transmitter",
@@ -5456,6 +5460,10 @@ var PushClient = class {
 	disposed = false;
 	lastFailure = null;
 	suspendedUntil = 0;
+	/** When the current unbroken streak of 404s began; 0 when there is none. */
+	first404At = 0;
+	/** A suspension was entered and not yet logged as left. */
+	suspensionLogged = false;
 	constructor(options) {
 		this.transport = options.transport;
 		this.logger = options.logger;
@@ -5474,9 +5482,20 @@ var PushClient = class {
 	get suspended() {
 		return this.suspendedUntil > Date.now();
 	}
+	/** Epoch ms of the next probe while suspended; 0 otherwise. */
+	get recheckAt() {
+		return this.suspended ? this.suspendedUntil : 0;
+	}
 	/** Probe again at once — the operator changed something. */
 	resetBackoff() {
 		this.suspendedUntil = 0;
+		this.first404At = 0;
+		this.logSuspensionEnded("reset by a settings change");
+	}
+	logSuspensionEnded(why) {
+		if (!this.suspensionLogged) return;
+		this.suspensionLogged = false;
+		this.logger.info(`ha-export: push link no longer suspended (${why}), probing again`, { meta: { brokerId: this.brokerId } });
 	}
 	/** Messages discarded because HA did not answer. Never silent. */
 	get droppedCount() {
@@ -5557,8 +5576,13 @@ var PushClient = class {
 			this.dropped += message.type === "batch" ? message.items.length : 1;
 			return false;
 		}
+		if (this.suspendedUntil !== 0 && !this.suspended) {
+			this.suspendedUntil = 0;
+			this.logSuspensionEnded("recheck time reached");
+		}
 		try {
 			await this.transport(message);
+			this.first404At = 0;
 			this.onReachable();
 			return true;
 		} catch (err) {
@@ -5585,6 +5609,7 @@ var PushClient = class {
 		this.available = true;
 		this.lastFailure = null;
 		this.suspendedUntil = 0;
+		this.logSuspensionEnded("Home Assistant answered");
 		/**
 		* The link came back. Drop the dedup cache so the reconcile that
 		* follows re-pushes every value: HA may have restarted and lost its
@@ -5622,11 +5647,29 @@ var PushClient = class {
 	*/
 	onUnreachable(message, err) {
 		this.available = false;
-		const failure = describePushFailure(err);
+		const now = Date.now();
+		const described = describePushFailure(err);
+		let failure = described;
+		if (described.kind === "component-missing") {
+			if (this.first404At === 0) this.first404At = now;
+			if (now - this.first404At < 6e4) failure = {
+				kind: "other",
+				permanent: false,
+				text: "HTTP 404 — Home Assistant has not registered the CamStack endpoint (yet); retrying"
+			};
+		} else this.first404At = 0;
 		this.lastFailure = failure;
-		if (failure.permanent) this.suspendedUntil = Date.now() + COMPONENT_RECHECK_MS;
 		this.dropped += message.type === "batch" ? message.items.length : 1;
-		const now = Date.now();
+		if (failure.permanent) {
+			this.suspendedUntil = now + COMPONENT_RECHECK_MS;
+			this.suspensionLogged = true;
+			this.logger.warn(`ha-export: push link SUSPENDED (${failure.text}); next probe at ${new Date(this.suspendedUntil).toISOString()}`, { meta: {
+				brokerId: this.brokerId,
+				failureKind: failure.kind,
+				recheckAt: this.suspendedUntil,
+				recheckInMs: COMPONENT_RECHECK_MS
+			} });
+		}
 		if (now - this.droppedLoggedAt < DROP_LOG_INTERVAL_MS) return;
 		this.droppedLoggedAt = now;
 		this.logger.warn(`ha-export: push to Home Assistant failed (${failure.text}), messages dropped`, { meta: {
@@ -5638,6 +5681,19 @@ var PushClient = class {
 		} });
 	}
 };
+//#endregion
+//#region src/ha-export/link-gaps.ts
+/** A parked link is reported, never silently excluded. */
+function summariseLinkGaps(links) {
+	return {
+		failing: links.filter((l) => !l.healthy && !l.suspended).map((l) => l.brokerId),
+		suspended: links.filter((l) => l.suspended).map((l) => ({
+			brokerId: l.brokerId,
+			recheckAt: l.recheckAt
+		})),
+		anyLive: links.some((l) => !l.suspended)
+	};
+}
 var ReachabilityReconciler = class {
 	options;
 	minIntervalMs;
@@ -8109,13 +8165,21 @@ var HaExportAddon = class extends BaseAddon {
 			const delivered = await this.announce(exported, fullResync);
 			await this.pushFullState(exported, snapshots);
 			if (synthetic !== null) await this.pushSynthetic(projectSynthetic(synthetic, Date.now()), [...enabled]);
-			const failing = [...this.links.values()].filter((link) => !link.client.healthy && !link.client.suspended);
-			const anyLive = [...this.links.values()].some((link) => !link.client.suspended);
-			if (failing.length > 0 || !delivered && anyLive) {
+			const gaps = summariseLinkGaps([...this.links.entries()].map(([brokerId, link]) => ({
+				brokerId,
+				healthy: link.client.healthy,
+				suspended: link.client.suspended,
+				recheckAt: link.client.recheckAt
+			})));
+			if (gaps.failing.length > 0 || !delivered && gaps.anyLive) {
 				this.resync.markGap("push-not-delivered");
 				this.lastStructureFingerprint = void 0;
 				this.ctx.logger.warn("ha-export: a push was not delivered, the next pass is a full resync");
 			}
+			if (gaps.suspended.length > 0) this.ctx.logger.warn("ha-export: push links suspended, Home Assistant receives nothing", { meta: { suspended: gaps.suspended.map((s) => ({
+				brokerId: s.brokerId,
+				recheckAt: new Date(s.recheckAt).toISOString()
+			})) } });
 			this.ctx.logger.info("ha-export: reconciled", { meta: {
 				reason,
 				fullResync,
@@ -8123,6 +8187,7 @@ var HaExportAddon = class extends BaseAddon {
 				devices: exported.size,
 				entities: entityCount,
 				unclassifiedCaps: this.unclassified.length,
+				suspendedLinks: gaps.suspended.length,
 				durationMs: Date.now() - startedAt
 			} });
 			if (this.unclassified.length > 0) this.ctx.logger.warn("ha-export: capabilities in neither the map nor the exclusion list", { meta: { caps: this.unclassified } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.2.650",
+  "version": "1.2.652",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",
@@ -55,6 +55,9 @@
           {
             "name": "broker"
           },
+          {
+            "name": "board-key-source"
+          },
           {
             "name": "device-adoption"
           },
@@ -127,7 +130,7 @@
       "description": "Device provider (import) + native entity export (push). Two addons, one bundle, separate processes."
     },
     "requires": {
-      "server": ">=1.2.740"
+      "server": ">=1.2.742"
     }
   },
   "files": [