@camstack/addon-provider-enpal 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.7] - 2026-11-01
+
+### Changed
+
+- An integration deleted while its provider was down now has its orphan devices removed after two concordant reads of the integration list
+
 ## [0.1.6] - 2026-11-01
 
 ### Changed

package/dist/addon.js

@@ -94602,6 +94602,88 @@ function ingestReading(input) {
 		value: converted
 	};
 }
+/**
+* Closes the gap D49 leaves: an integration deleted while its provider was down never emits an
+* event the provider sees. An integration id absent from an ANSWERED list is only a suspect; its
+* devices go (through the provider's own removeDevices) when a SECOND answered read, at least
+* `minIntervalMs` later, still lacks it. A read that threw changes nothing; reappearing clears.
+*/
+var OrphanIntegrationSweep = class {
+	#logger;
+	#minIntervalMs;
+	#now;
+	#suspects = /* @__PURE__ */ new Map();
+	constructor(options) {
+		this.#logger = options.logger;
+		this.#minIntervalMs = options.minIntervalMs ?? 6e4;
+		this.#now = options.now ?? Date.now;
+	}
+	get minIntervalMs() {
+		return this.#minIntervalMs;
+	}
+	async sweep(input) {
+		if (input.listedIds === null) return {
+			newSuspects: 0,
+			removed: []
+		};
+		const listed = new Set(input.listedIds);
+		const owners = new Set(input.ownerIds);
+		const now = this.#now();
+		let newSuspects = 0;
+		const removed = [];
+		for (const id of [...this.#suspects.keys()]) if (listed.has(id) || !owners.has(id)) {
+			this.#suspects.delete(id);
+			this.#logger.info("Orphan integration suspect cleared", { meta: {
+				integrationId: id,
+				reason: listed.has(id) ? "listed again" : "owns no devices"
+			} });
+		}
+		for (const id of owners) {
+			if (listed.has(id)) continue;
+			const since = this.#suspects.get(id);
+			if (since === void 0) {
+				this.#suspects.set(id, now);
+				newSuspects += 1;
+				this.#logger.info("Integration owns devices but is absent from the list — suspect", { meta: {
+					integrationId: id,
+					minIntervalMs: this.#minIntervalMs
+				} });
+				continue;
+			}
+			if (now - since < this.#minIntervalMs) continue;
+			try {
+				const count = await input.removeDevices(id);
+				this.#suspects.delete(id);
+				removed.push(id);
+				this.#logger.warn("Orphan integration devices removed — absent from two answered lists", { meta: {
+					integrationId: id,
+					removed: count,
+					firstMissingAt: since
+				} });
+			} catch (err) {
+				this.#logger.warn("Orphan integration device removal failed — kept as suspect", { meta: {
+					integrationId: id,
+					error: errMsg(err)
+				} });
+			}
+		}
+		return {
+			newSuspects,
+			removed
+		};
+	}
+};
+/** The integration ids that own top-level devices of one provider (a config that cannot be read is skipped). */
+async function collectOwnerIntegrationIds(input) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const d of input.reg.getAllForAddon(input.addonId)) {
+		if (d.parentDeviceId !== null) continue;
+		const cfg = await input.devices.loadConfig(d.id).catch(() => ({}));
+		const owner = input.ownerOf(cfg);
+		if (owner !== null) ids.add(owner);
+	}
+	return [...ids];
+}
 String.raw`(?<=^|["'(\s>,\[{])`;
 var MB = 1024 * 1024;
 1024 * MB, 3072 * MB;
@@ -96116,8 +96198,14 @@ var EnpalClientRegistry = class {
 */
 var EnpalReconciler = class {
 	#deps;
+	#sweep;
+	#rerun = null;
 	constructor(deps) {
 		this.#deps = deps;
+		this.#sweep = new OrphanIntegrationSweep({
+			logger: deps.logger,
+			...deps.sweepOptions
+		});
 	}
 	/** Upsert a client per usable enabled integration; drop the CLIENT (never devices) of one the list answered is gone. */
 	async reconcile() {
@@ -96140,6 +96228,37 @@ var EnpalReconciler = class {
 		}
 		const enabledIds = new Set(enabled.map((i) => i.id));
 		for (const id of clients.list()) if (!enabledIds.has(id)) await clients.remove(id);
+		await this.#sweepOrphans(all.map((i) => i.id));
+	}
+	/** Stop the scheduled second read (addon stop). */
+	dispose() {
+		if (this.#rerun !== null) clearTimeout(this.#rerun);
+		this.#rerun = null;
+	}
+	/**
+	* An integration deleted while this addon was down emits nothing it sees: its id owns devices
+	* yet is absent from the ANSWERED list. Removal needs a second answered read later, so one
+	* re-run is scheduled when a suspect appears (bounded: one timer, no retry loop).
+	*/
+	async #sweepOrphans(listedIds) {
+		const { ownerIntegrationIds, removeDevices, logger } = this.#deps;
+		if (ownerIntegrationIds === void 0) return;
+		try {
+			const ownerIds = await ownerIntegrationIds();
+			if ((await this.#sweep.sweep({
+				ownerIds,
+				listedIds,
+				removeDevices
+			})).newSuspects > 0 && this.#rerun === null) {
+				this.#rerun = setTimeout(() => {
+					this.#rerun = null;
+					this.reconcile();
+				}, this.#sweep.minIntervalMs + 1e3);
+				this.#rerun.unref();
+			}
+		} catch (err) {
+			logger.warn("Orphan integration sweep failed — devices left as they are", { meta: { error: errMsg(err) } });
+		}
 	}
 	/** An explicit lifecycle event: only `deleted` / `disabled` of a named integration remove devices. */
 	async onLifecycle(kind, integrationId) {
@@ -96310,6 +96429,7 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 			this.ctx.logger.warn("Enpal shutdown error", { meta: { error: errMsg(err) } });
 		}
 		this.clients = null;
+		this.integrationReconciler?.dispose();
 		this.integrationReconciler = null;
 		enpalConnections.clear();
 		await super.onShutdown();
@@ -96344,7 +96464,8 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 				await reg.upsert(integration.id, integration.name, read.connection, read.tokenLocked);
 				return true;
 			},
-			removeDevices: (integrationId) => this.cascadeRemoveDevicesForIntegration(integrationId)
+			removeDevices: (integrationId) => this.cascadeRemoveDevicesForIntegration(integrationId),
+			ownerIntegrationIds: () => this.ownerIntegrationIds()
 		});
 		return this.integrationReconciler;
 	}
@@ -96363,6 +96484,21 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 		this.ctx.eventBus.subscribe({ category: EventCategory.IntegrationDisabled }, on("disabled"));
 		this.ctx.eventBus.subscribe({ category: EventCategory.IntegrationDeleted }, on("deleted"));
 	}
+	/** The integrations that own devices here, for the orphan sweep. */
+	async ownerIntegrationIds() {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return [];
+		return await collectOwnerIntegrationIds({
+			reg,
+			devices,
+			addonId: this.addonId,
+			ownerOf: (cfg) => {
+				const owner = cfg["integrationId"];
+				return cfg["system"] === "enpal" && typeof owner === "string" ? owner : null;
+			}
+		});
+	}
 	async cascadeRemoveDevicesForIntegration(integrationId) {
 		const reg = this.ctx.kernel.deviceRegistry;
 		const devices = this.ctx.kernel.devices;

package/dist/addon.mjs

@@ -94601,6 +94601,88 @@ function ingestReading(input) {
 		value: converted
 	};
 }
+/**
+* Closes the gap D49 leaves: an integration deleted while its provider was down never emits an
+* event the provider sees. An integration id absent from an ANSWERED list is only a suspect; its
+* devices go (through the provider's own removeDevices) when a SECOND answered read, at least
+* `minIntervalMs` later, still lacks it. A read that threw changes nothing; reappearing clears.
+*/
+var OrphanIntegrationSweep = class {
+	#logger;
+	#minIntervalMs;
+	#now;
+	#suspects = /* @__PURE__ */ new Map();
+	constructor(options) {
+		this.#logger = options.logger;
+		this.#minIntervalMs = options.minIntervalMs ?? 6e4;
+		this.#now = options.now ?? Date.now;
+	}
+	get minIntervalMs() {
+		return this.#minIntervalMs;
+	}
+	async sweep(input) {
+		if (input.listedIds === null) return {
+			newSuspects: 0,
+			removed: []
+		};
+		const listed = new Set(input.listedIds);
+		const owners = new Set(input.ownerIds);
+		const now = this.#now();
+		let newSuspects = 0;
+		const removed = [];
+		for (const id of [...this.#suspects.keys()]) if (listed.has(id) || !owners.has(id)) {
+			this.#suspects.delete(id);
+			this.#logger.info("Orphan integration suspect cleared", { meta: {
+				integrationId: id,
+				reason: listed.has(id) ? "listed again" : "owns no devices"
+			} });
+		}
+		for (const id of owners) {
+			if (listed.has(id)) continue;
+			const since = this.#suspects.get(id);
+			if (since === void 0) {
+				this.#suspects.set(id, now);
+				newSuspects += 1;
+				this.#logger.info("Integration owns devices but is absent from the list — suspect", { meta: {
+					integrationId: id,
+					minIntervalMs: this.#minIntervalMs
+				} });
+				continue;
+			}
+			if (now - since < this.#minIntervalMs) continue;
+			try {
+				const count = await input.removeDevices(id);
+				this.#suspects.delete(id);
+				removed.push(id);
+				this.#logger.warn("Orphan integration devices removed — absent from two answered lists", { meta: {
+					integrationId: id,
+					removed: count,
+					firstMissingAt: since
+				} });
+			} catch (err) {
+				this.#logger.warn("Orphan integration device removal failed — kept as suspect", { meta: {
+					integrationId: id,
+					error: errMsg(err)
+				} });
+			}
+		}
+		return {
+			newSuspects,
+			removed
+		};
+	}
+};
+/** The integration ids that own top-level devices of one provider (a config that cannot be read is skipped). */
+async function collectOwnerIntegrationIds(input) {
+	const ids = /* @__PURE__ */ new Set();
+	for (const d of input.reg.getAllForAddon(input.addonId)) {
+		if (d.parentDeviceId !== null) continue;
+		const cfg = await input.devices.loadConfig(d.id).catch(() => ({}));
+		const owner = input.ownerOf(cfg);
+		if (owner !== null) ids.add(owner);
+	}
+	return [...ids];
+}
 String.raw`(?<=^|["'(\s>,\[{])`;
 var MB = 1024 * 1024;
 1024 * MB, 3072 * MB;
@@ -96115,8 +96197,14 @@ var EnpalClientRegistry = class {
 */
 var EnpalReconciler = class {
 	#deps;
+	#sweep;
+	#rerun = null;
 	constructor(deps) {
 		this.#deps = deps;
+		this.#sweep = new OrphanIntegrationSweep({
+			logger: deps.logger,
+			...deps.sweepOptions
+		});
 	}
 	/** Upsert a client per usable enabled integration; drop the CLIENT (never devices) of one the list answered is gone. */
 	async reconcile() {
@@ -96139,6 +96227,37 @@ var EnpalReconciler = class {
 		}
 		const enabledIds = new Set(enabled.map((i) => i.id));
 		for (const id of clients.list()) if (!enabledIds.has(id)) await clients.remove(id);
+		await this.#sweepOrphans(all.map((i) => i.id));
+	}
+	/** Stop the scheduled second read (addon stop). */
+	dispose() {
+		if (this.#rerun !== null) clearTimeout(this.#rerun);
+		this.#rerun = null;
+	}
+	/**
+	* An integration deleted while this addon was down emits nothing it sees: its id owns devices
+	* yet is absent from the ANSWERED list. Removal needs a second answered read later, so one
+	* re-run is scheduled when a suspect appears (bounded: one timer, no retry loop).
+	*/
+	async #sweepOrphans(listedIds) {
+		const { ownerIntegrationIds, removeDevices, logger } = this.#deps;
+		if (ownerIntegrationIds === void 0) return;
+		try {
+			const ownerIds = await ownerIntegrationIds();
+			if ((await this.#sweep.sweep({
+				ownerIds,
+				listedIds,
+				removeDevices
+			})).newSuspects > 0 && this.#rerun === null) {
+				this.#rerun = setTimeout(() => {
+					this.#rerun = null;
+					this.reconcile();
+				}, this.#sweep.minIntervalMs + 1e3);
+				this.#rerun.unref();
+			}
+		} catch (err) {
+			logger.warn("Orphan integration sweep failed — devices left as they are", { meta: { error: errMsg(err) } });
+		}
 	}
 	/** An explicit lifecycle event: only `deleted` / `disabled` of a named integration remove devices. */
 	async onLifecycle(kind, integrationId) {
@@ -96309,6 +96428,7 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 			this.ctx.logger.warn("Enpal shutdown error", { meta: { error: errMsg(err) } });
 		}
 		this.clients = null;
+		this.integrationReconciler?.dispose();
 		this.integrationReconciler = null;
 		enpalConnections.clear();
 		await super.onShutdown();
@@ -96343,7 +96463,8 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 				await reg.upsert(integration.id, integration.name, read.connection, read.tokenLocked);
 				return true;
 			},
-			removeDevices: (integrationId) => this.cascadeRemoveDevicesForIntegration(integrationId)
+			removeDevices: (integrationId) => this.cascadeRemoveDevicesForIntegration(integrationId),
+			ownerIntegrationIds: () => this.ownerIntegrationIds()
 		});
 		return this.integrationReconciler;
 	}
@@ -96362,6 +96483,21 @@ var EnpalProviderAddon = class extends BaseDeviceProvider {
 		this.ctx.eventBus.subscribe({ category: EventCategory.IntegrationDisabled }, on("disabled"));
 		this.ctx.eventBus.subscribe({ category: EventCategory.IntegrationDeleted }, on("deleted"));
 	}
+	/** The integrations that own devices here, for the orphan sweep. */
+	async ownerIntegrationIds() {
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (!reg || !devices) return [];
+		return await collectOwnerIntegrationIds({
+			reg,
+			devices,
+			addonId: this.addonId,
+			ownerOf: (cfg) => {
+				const owner = cfg["integrationId"];
+				return cfg["system"] === "enpal" && typeof owner === "string" ? owner : null;
+			}
+		});
+	}
 	async cascadeRemoveDevicesForIntegration(integrationId) {
 		const reg = this.ctx.kernel.deviceRegistry;
 		const devices = this.ctx.kernel.devices;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-enpal",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Enpal solar-box device-provider addon for CamStack — PV, battery, grid, house and heat-pump readings from the box's local InfluxDB (device page as fallback)",
   "keywords": [
     "camstack",
@@ -59,7 +59,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.719"
+      "server": ">=1.2.722"
     }
   },
   "files": [