@camstack/addon-provider-homeassistant 1.2.12 → 1.2.13

package/dist/addon.js

@@ -18843,6 +18843,20 @@ var GetInputSchema = object({ id: string() });
 var AddInputSchema = object({
 	kind: string().min(1),
 	name: string().min(1),
+	/**
+	* ADOPT an existing id instead of minting a new one.
+	*
+	* Written the day this cost an outage. A broker's id is not a detail: HA
+	* devices carry it inside their `stableId` (`ha:ha_004:dev:…`), so a broker
+	* lost from config and re-added as `ha_001` leaves every one of its devices
+	* bound to a broker that no longer exists. Re-entering the password under the
+	* ORIGINAL id turns a multi-step device migration back into re-entering a
+	* password.
+	*
+	* A provider MUST refuse an id that is already in use — adopting a live
+	* broker's id would silently take it over.
+	*/
+	id: string().min(1).optional(),
 	/** Kind-specific settings (e.g. MQTT `{url,username,password}` or HA
 	*  `{baseUrl,accessToken}`). Validated by the kind-specific provider
 	*  branch on receipt — invalid shape rejects the add. */
@@ -36117,6 +36131,27 @@ var HaBrokerRegistry = class {
 		this.nextIdCounter += 1;
 		return id;
 	}
+	/**
+	* Take a caller-supplied id, or refuse.
+	*
+	* Two refusals, and both matter more than they look:
+	*
+	*  - **An id already in use** would SILENTLY take over a live broker: the new
+	*    entry replaces it in config while its devices keep pointing at the id,
+	*    now serving someone else's Home Assistant. Recovery is re-creating a
+	*    broker that is GONE, never overwriting one that is here.
+	*  - **The progressive counter is advanced past an adopted id.** Adopting
+	*    `ha_004` while the counter sits at 2 would let the next automatic
+	*    allocation mint `ha_004` a second time — two brokers, one id, and every
+	*    device bound to whichever won. The counter is only seeded from stored
+	*    entries at load, so it cannot discover this on its own.
+	*/
+	adoptId(id) {
+		if (this.managers.has(id)) throw new Error(`broker id "${id}" is already in use — adopt an id only to restore a broker that is gone`);
+		const match = id.match(/^ha_(\d+)$/);
+		if (match) this.nextIdCounter = Math.max(this.nextIdCounter, Number.parseInt(match[1], 10) + 1);
+		return id;
+	}
 	seedCounterFromEntries(entries) {
 		let maxSeen = 0;
 		for (const e of entries) {
@@ -36136,7 +36171,7 @@ var HaBrokerRegistry = class {
 	async createEntry(name, settings, options = {}) {
 		const auth = settingsToAuth(settings);
 		const entry = {
-			id: this.allocateId(),
+			id: options.id !== void 0 ? this.adoptId(options.id) : this.allocateId(),
 			name,
 			auth,
 			...options.integrationId !== void 0 ? { integrationId: options.integrationId } : {}
@@ -38500,9 +38535,13 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 					label: "Home Assistant"
 				}]
 			}],
-			add: async ({ kind, name, settings }) => {
+			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);
+				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
+				} });
 				await this.updateGlobalSettings({ brokers: [...this.config.brokers, entry] });
 				return { id: entry.id };
 			},

package/dist/addon.mjs

@@ -18842,6 +18842,20 @@ var GetInputSchema = object({ id: string() });
 var AddInputSchema = object({
 	kind: string().min(1),
 	name: string().min(1),
+	/**
+	* ADOPT an existing id instead of minting a new one.
+	*
+	* Written the day this cost an outage. A broker's id is not a detail: HA
+	* devices carry it inside their `stableId` (`ha:ha_004:dev:…`), so a broker
+	* lost from config and re-added as `ha_001` leaves every one of its devices
+	* bound to a broker that no longer exists. Re-entering the password under the
+	* ORIGINAL id turns a multi-step device migration back into re-entering a
+	* password.
+	*
+	* A provider MUST refuse an id that is already in use — adopting a live
+	* broker's id would silently take it over.
+	*/
+	id: string().min(1).optional(),
 	/** Kind-specific settings (e.g. MQTT `{url,username,password}` or HA
 	*  `{baseUrl,accessToken}`). Validated by the kind-specific provider
 	*  branch on receipt — invalid shape rejects the add. */
@@ -36116,6 +36130,27 @@ var HaBrokerRegistry = class {
 		this.nextIdCounter += 1;
 		return id;
 	}
+	/**
+	* Take a caller-supplied id, or refuse.
+	*
+	* Two refusals, and both matter more than they look:
+	*
+	*  - **An id already in use** would SILENTLY take over a live broker: the new
+	*    entry replaces it in config while its devices keep pointing at the id,
+	*    now serving someone else's Home Assistant. Recovery is re-creating a
+	*    broker that is GONE, never overwriting one that is here.
+	*  - **The progressive counter is advanced past an adopted id.** Adopting
+	*    `ha_004` while the counter sits at 2 would let the next automatic
+	*    allocation mint `ha_004` a second time — two brokers, one id, and every
+	*    device bound to whichever won. The counter is only seeded from stored
+	*    entries at load, so it cannot discover this on its own.
+	*/
+	adoptId(id) {
+		if (this.managers.has(id)) throw new Error(`broker id "${id}" is already in use — adopt an id only to restore a broker that is gone`);
+		const match = id.match(/^ha_(\d+)$/);
+		if (match) this.nextIdCounter = Math.max(this.nextIdCounter, Number.parseInt(match[1], 10) + 1);
+		return id;
+	}
 	seedCounterFromEntries(entries) {
 		let maxSeen = 0;
 		for (const e of entries) {
@@ -36135,7 +36170,7 @@ var HaBrokerRegistry = class {
 	async createEntry(name, settings, options = {}) {
 		const auth = settingsToAuth(settings);
 		const entry = {
-			id: this.allocateId(),
+			id: options.id !== void 0 ? this.adoptId(options.id) : this.allocateId(),
 			name,
 			auth,
 			...options.integrationId !== void 0 ? { integrationId: options.integrationId } : {}
@@ -38499,9 +38534,13 @@ var HaProviderAddon = class HaProviderAddon extends BaseDeviceProvider {
 					label: "Home Assistant"
 				}]
 			}],
-			add: async ({ kind, name, settings }) => {
+			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);
+				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
+				} });
 				await this.updateGlobalSettings({ brokers: [...this.config.brokers, entry] });
 				return { id: entry.id };
 			},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-homeassistant",
-  "version": "1.2.12",
+  "version": "1.2.13",
   "description": "Home Assistant device provider addon for CamStack",
   "keywords": [
     "camstack",