@camstack/addon-provider-bosch 0.1.55 → 0.1.56

package/dist/homecom/addon.mjs

@@ -1,5 +1,5 @@
-import { $ as union, B as entryBody, F as RecordIntegrationInstances, G as _null, J as literal, K as array, L as customAction, P as waterHeaterCapability, Q as string, R as defineCustomActions, U as rowsDepsOver, W as _enum, X as object, Y as number, Z as record, a as BaseDevice, b as heatPumpControlCapability, f as climateControlCapability, h as deviceAdoptionCapability, i as testBoschInstance, it as EventCategory, k as registerPowerSwitch, l as SessionHealthTracker, n as boschRowsPorts, nt as DeviceType, o as BaseDeviceProvider, q as boolean, r as keepBodyKeys, rt as errMsg, t as boschRowsMigration, tt as DeviceRole, w as integrationInstancesCapability, x as heatPumpStatusCapability, y as gatewayDeviceName, z as defineEntryKind } from "../bosch-instances-g54r3Dus.mjs";
-import { a as loginFailureForAttempt, i as createSignInAttemptStore, n as cascadeRemoveDevicesForIntegration, o as parseOAuthCallback, r as buildSignInGuideFields, s as HOMECOM_REDIRECT_URI, t as setIntegrationDevicesOnline } from "../account-integration-offline-xi6muNeM.mjs";
+import { $ as literal, A as registerPowerSwitch, B as defineCustomActions, F as waterHeaterCapability, H as entryBody, I as RecordIntegrationInstances, J as _enum, K as rowsDepsOver, L as SECRET_CLEAR, Q as custom, T as integrationPageHref, U as isSecretFieldView, V as defineEntryKind, X as array, Y as _null, Z as boolean, a as BaseDevice, b as heatPumpControlCapability, ct as errMsg, et as number, f as climateControlCapability, h as deviceAdoptionCapability, i as testBoschInstance, it as union, l as SessionHealthTracker, lt as EventCategory, n as boschRowsPorts, nt as record, o as BaseDeviceProvider, ot as DeviceRole, q as toSecretFieldView, r as keepBodyKeys, rt as string, st as DeviceType, t as boschRowsMigration, tt as object, w as integrationInstancesCapability, x as heatPumpStatusCapability, y as gatewayDeviceName, z as customAction } from "../bosch-instances-REcWLM14.mjs";
+import { a as loginFailureForAttempt, i as createSignInAttemptStore, n as cascadeRemoveDevicesForIntegration, o as parseOAuthCallback, r as buildSignInGuideFields, s as HOMECOM_REDIRECT_URI, t as setIntegrationDevicesOnline } from "../account-integration-offline-fB8V7XNu.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { spawn } from "node:child_process";
 import { existsSync } from "node:fs";
@@ -457,6 +457,17 @@ async function exploreHomeComResources(input) {
 }
 //#endregion
 //#region src/homecom/custom-actions.ts
+/** A stored secret as the form sees it (`SecretFieldView`): set or not, never the value. */
+var secretView = custom(isSecretFieldView, "a stored secret view");
+/**
+* A sign-in secret in the result: in clear only for a form that has no record yet (the wizard
+* stores it on create); for an existing instance it is already stored and comes back as a view.
+*/
+var signInSecret = union([
+	string().min(1),
+	secretView,
+	_null()
+]).meta({ secret: true });
 var gatewayChoice = object({
 	value: string(),
 	label: string(),
@@ -495,11 +506,17 @@ var homeComActions = defineCustomActions({
 	}),
 	finishSignIn: customAction(object({
 		attemptId: string().min(1),
-		callback: string().min(1)
+		callback: string().min(1),
+		/** An existing instance: the new sign-in is stored on it and applied at once. */
+		integrationId: string().min(1).optional()
 	}), object({
-		token: string().min(1).meta({ secret: true }),
-		refresh: string().min(1).meta({ secret: true }),
-		username: string().meta({ secret: true }),
+		token: signInSecret,
+		refresh: signInSecret,
+		username: union([
+			string(),
+			secretView,
+			_null()
+		]).meta({ secret: true }),
 		accountLabel: string(),
 		gatewayCount: number(),
 		summary: string(),
@@ -511,13 +528,18 @@ var homeComActions = defineCustomActions({
 		kind: "mutation",
 		auth: "admin"
 	}),
-	signOut: customAction(object({}), object({
-		signedOut: literal(true),
-		summary: string()
-	}), {
-		kind: "mutation",
-		auth: "admin"
-	}),
+	signOut: customAction(
+		/** An existing instance: its stored sign-in is cleared and its connection stopped. */
+		object({ integrationId: string().min(1).optional() }),
+		object({
+			signedOut: literal(true),
+			summary: string()
+		}),
+		{
+			kind: "mutation",
+			auth: "admin"
+		}
+	),
 	/** Read-only walk of the gateway's resource tree, for diagnosing what it serves. */
 	exploreResources: customAction(exploreResourcesInput, exploreResourcesOutput, {
 		kind: "query",
@@ -525,6 +547,104 @@ var homeComActions = defineCustomActions({
 	})
 });
 //#endregion
+//#region src/homecom/homecom-account.ts
+/**
+* Sign in / sign out of an EXISTING HomeCom instance, written through the instance record — the
+* owner of the tokens (keychain-backed secret fields). The record's change hook reconciles the
+* integration: new tokens are applied to the running manager, cleared ones stop it.
+*/
+/** Forget the account: the three secrets are cleared in the keychain, the account labels reset. */
+async function signOutHomeComInstance(integrationId, instances) {
+	await instances.updateInstance({
+		id: integrationId,
+		values: {
+			token: SECRET_CLEAR,
+			refresh: SECRET_CLEAR,
+			username: SECRET_CLEAR,
+			accountLabel: "",
+			gatewayCount: 0
+		}
+	});
+}
+/**
+* Store a finished sign-in on the instance. The gateway (and its brand / region) is written only
+* when the sign-in settled on one: a choice still open keeps the stored gateway.
+*/
+async function storeHomeComSignIn(integrationId, finished, instances) {
+	await instances.updateInstance({
+		id: integrationId,
+		values: {
+			token: finished.token,
+			refresh: finished.refresh,
+			username: finished.username,
+			accountLabel: finished.accountLabel,
+			gatewayCount: finished.gatewayCount,
+			...finished.gatewayId !== void 0 ? { gatewayId: finished.gatewayId } : {},
+			...finished.brand !== void 0 ? { brand: finished.brand } : {},
+			...finished.region !== void 0 ? { region: finished.region } : {}
+		}
+	});
+}
+/**
+* The answer to a sign-in on an existing instance: the tokens are on the record now, so the form
+* gets the record's "set" views (as `hydrateSchema` hands them out) in their place — a Save that
+* follows keeps them, and the values never travel to the browser.
+*/
+async function storedSignInResult(integrationId, finished, handle) {
+	const data = (await handle.get(integrationId))?.data ?? {};
+	const { token: _token, refresh: _refresh, username: _username, ...open } = finished;
+	return {
+		...open,
+		token: toSecretFieldView(data["token"]),
+		refresh: toSecretFieldView(data["refresh"]),
+		username: toSecretFieldView(data["username"])
+	};
+}
+//#endregion
+//#region src/homecom/homecom-reconcile.ts
+/**
+* Bring the running HomeCom managers in line with the enabled integrations:
+*
+* - signed in       -> upsert (a changed connection is applied to the running manager);
+* - signed out      -> the manager stops and the devices go offline; the integration still
+*                      exists, so its devices and its session alert are KEPT;
+* - unreadable      -> left as it is (a locked keychain is not a sign out, nor a deletion);
+* - gone / disabled -> the manager stops and the caller drops what belonged to it.
+*
+* "Gone" is judged over EVERY id the addon still holds something for — a running manager, an
+* instance record, a device — not only the running managers: an integration that was signed out
+* or unreadable has no manager, and its devices and alert must still go when it is deleted.
+*/
+async function reconcileHomeComIntegrations(deps) {
+	const enabled = await deps.listEnabled();
+	const present = new Set(enabled.map((integration) => integration.id));
+	for (const integration of enabled) await reconcileOne(deps, integration);
+	const vanished = [...new Set([...deps.registry.list(), ...await deps.knownIds()])].filter((id) => !present.has(id));
+	await deps.registry.retain(present);
+	for (const integrationId of vanished) await deps.onVanished(integrationId);
+}
+async function reconcileOne(deps, integration) {
+	const tags = { integrationId: integration.id };
+	try {
+		const connection = await deps.connectionOf(integration.id);
+		deps.onNamed(integration.id, integration.name);
+		if (connection === null) {
+			if (deps.registry.has(integration.id)) {
+				await deps.registry.remove(integration.id);
+				deps.logger.info("HomeCom integration has no sign-in — stopped, devices offline", { tags });
+			}
+			deps.onSignedOut(integration.id);
+			return;
+		}
+		await deps.registry.upsert(integration.id, integration.name, connection);
+	} catch (err) {
+		deps.logger.warn("HomeCom reconcile failed for integration", {
+			tags,
+			meta: { error: errMsg(err) }
+		});
+	}
+}
+//#endregion
 //#region src/homecom/homecom-session-alert.ts
 /** The standard session-lost alert for HomeCom; "Sign in again" opens the integration page. */
 function createHomeComSessionAlert(deps) {
@@ -533,7 +653,9 @@ function createHomeComSessionAlert(deps) {
 		providerName: "Bosch HomeCom",
 		logger: deps.logger,
 		getAlerts: deps.getAlerts,
-		debounceMs: deps.debounceMs ?? 0
+		debounceMs: deps.debounceMs ?? 0,
+		addonId: deps.addonId,
+		severity: "critical"
 	});
 	return {
 		authFailed: (integrationId) => tracker.lost(integrationId, {
@@ -541,7 +663,7 @@ function createHomeComSessionAlert(deps) {
 			reason: "token-expired",
 			action: {
 				label: "Sign in again",
-				href: `/integrations/${encodeURIComponent(integrationId)}`,
+				href: integrationPageHref(deps.addonId, integrationId),
 				navigation: "app"
 			}
 		}),
@@ -3737,7 +3859,8 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 		const sessionAlert = createHomeComSessionAlert({
 			logger: this.ctx.logger,
 			getAlerts: () => this.ctx.api.alerts,
-			nameOf: (id) => this.integrationNames.get(id) ?? id
+			nameOf: (id) => this.integrationNames.get(id) ?? id,
+			addonId: this.addonId
 		});
 		this.sessionAlert = sessionAlert;
 		this.clients = new HomeComClientRegistry(this.ctx.logger, {
@@ -3778,15 +3901,30 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 					...publishHomeComSignIn(homeComSignInAttempts, Date.now()),
 					summary: "Open the sign-in page, sign in, then paste the address the browser stops on."
 				}),
-				finishSignIn: async (input) => finishHomeComSignIn({
-					attemptId: input.attemptId,
-					callback: input.callback,
-					nowMs: Date.now()
-				}, homeComSignInAttempts),
-				signOut: async () => ({
-					signedOut: true,
-					summary: "Signed out."
-				}),
+				finishSignIn: async (input) => {
+					const finished = await finishHomeComSignIn({
+						attemptId: input.attemptId,
+						callback: input.callback,
+						nowMs: Date.now()
+					}, homeComSignInAttempts);
+					const integrationId = input.integrationId;
+					if (integrationId === void 0) return finished;
+					await this.storeSignIn(integrationId, () => storeHomeComSignIn(integrationId, finished, built.instances));
+					return storedSignInResult(integrationId, finished, built.handle);
+				},
+				signOut: async (input) => {
+					const integrationId = input.integrationId;
+					if (integrationId === void 0) return {
+						signedOut: true,
+						summary: "Signed out."
+					};
+					await this.storeSignIn(integrationId, () => signOutHomeComInstance(integrationId, built.instances));
+					this.ctx.logger.info("HomeCom signed out — stored sign-in cleared", { tags: { integrationId } });
+					return {
+						signedOut: true,
+						summary: "Signed out. The devices stay offline until you sign in again."
+					};
+				},
 				exploreResources: explore
 			}
 		};
@@ -3831,43 +3969,60 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 		if (typeof nativeId !== "string" || nativeId.length === 0) throw new Error("homecom generateStableId: nativeId required");
 		return homeComStableId(integrationId, nativeId);
 	}
+	/** Write a sign-in change on an instance that exists; a missing one is refused by name. */
+	async storeSignIn(integrationId, write) {
+		if (await homeComStoredOf(this.requireInstances().instances, integrationId) === null) throw new Error(`HomeCom integration ${integrationId} does not exist`);
+		await write();
+	}
 	async reconcileIntegrations() {
 		const reg = this.requireClients();
 		try {
-			const mine = (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id && i.enabled);
-			const surviving = /* @__PURE__ */ new Set();
-			for (const integration of mine) try {
-				const connection = await homeComConnectionOf(this.requireInstances().instances, integration.id);
-				if (!connection) continue;
-				this.integrationNames.set(integration.id, integration.name);
-				await reg.upsert(integration.id, integration.name, connection);
-				surviving.add(integration.id);
-			} catch (err) {
-				this.ctx.logger.warn("HomeCom reconcile failed for integration", { meta: {
-					integrationId: integration.id,
-					error: errMsg(err)
-				} });
-			}
-			const vanished = reg.list().filter((id) => !surviving.has(id));
-			await reg.retain(surviving);
-			for (const integrationId of vanished) {
-				this.integrationNames.delete(integrationId);
-				this.sessionAlert?.removed(integrationId);
-			}
-			const deviceReg = this.ctx.kernel.deviceRegistry;
-			const deviceApi = this.ctx.kernel.devices;
-			if (deviceReg && deviceApi) for (const integrationId of vanished) await cascadeRemoveDevicesForIntegration({
-				reg: deviceReg,
-				devices: deviceApi,
-				addonId: this.addonId,
-				system: "homecom",
-				integrationId,
+			await reconcileHomeComIntegrations({
+				listEnabled: async () => {
+					return (await this.ctx.api.integrations.list.query()).filter((i) => i.addonId === this.ctx.id && i.enabled);
+				},
+				knownIds: () => this.knownIntegrationIds(),
+				connectionOf: (id) => homeComConnectionOf(this.requireInstances().instances, id),
+				registry: reg,
+				onNamed: (id, name) => this.integrationNames.set(id, name),
+				onSignedOut: (id) => this.setIntegrationDevicesOnline(id, false),
+				onVanished: (id) => this.dropIntegration(id),
 				logger: this.ctx.logger
 			});
 		} catch (err) {
 			this.ctx.logger.warn("HomeCom integration reconcile failed", { meta: { error: errMsg(err) } });
 		}
 	}
+	/** Every integration this addon holds a record or a top-level device for. */
+	async knownIntegrationIds() {
+		const ids = new Set(this.integrationNames.keys());
+		for (const row of await this.requireInstances().instances.listResolved()) ids.add(row.id);
+		const reg = this.ctx.kernel.deviceRegistry;
+		const devices = this.ctx.kernel.devices;
+		if (reg && devices) for (const d of reg.getAllForAddon(this.addonId)) {
+			if (d.parentDeviceId !== null) continue;
+			const cfg = await devices.loadConfig(d.id).catch(() => ({}));
+			const brokerId = cfg["brokerId"];
+			if (cfg["system"] === "homecom" && typeof brokerId === "string") ids.add(brokerId);
+		}
+		return [...ids];
+	}
+	/** The integration is gone: its alert and its devices go with it. */
+	async dropIntegration(integrationId) {
+		this.integrationNames.delete(integrationId);
+		this.sessionAlert?.removed(integrationId);
+		const deviceReg = this.ctx.kernel.deviceRegistry;
+		const deviceApi = this.ctx.kernel.devices;
+		if (!deviceReg || !deviceApi) return;
+		await cascadeRemoveDevicesForIntegration({
+			reg: deviceReg,
+			devices: deviceApi,
+			addonId: this.addonId,
+			system: "homecom",
+			integrationId,
+			logger: this.ctx.logger
+		});
+	}
 	subscribeIntegrationLifecycle() {
 		const handler = (event) => {
 			const addonId = event.data["addonId"];

package/dist/shc/addon.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
-const require_bosch_instances = require("../bosch-instances-DaWS-s0M.js");
+const require_bosch_instances = require("../bosch-instances-BnuV5On6.js");
 let node_crypto = require("node:crypto");
 let node_https = require("node:https");
 let node_child_process = require("node:child_process");

package/dist/shc/addon.mjs

@@ -1,4 +1,4 @@
-import { B as entryBody, F as RecordIntegrationInstances, J as literal, K as array, L as customAction, M as switchCapability, N as temperatureSensorCapability, Q as string, R as defineCustomActions, S as heatingValveCapability, U as rowsDepsOver, W as _enum, X as object, Y as number, a as BaseDevice, f as climateControlCapability, h as deviceAdoptionCapability, i as testBoschInstance, it as EventCategory, k as registerPowerSwitch, m as defaultIntegrationName, n as boschRowsPorts, nt as DeviceType, o as BaseDeviceProvider, r as keepBodyKeys, rt as errMsg, t as boschRowsMigration, tt as DeviceRole, u as batteryCapability, w as integrationInstancesCapability, y as gatewayDeviceName, z as defineEntryKind } from "../bosch-instances-g54r3Dus.mjs";
+import { $ as literal, A as registerPowerSwitch, B as defineCustomActions, H as entryBody, I as RecordIntegrationInstances, J as _enum, K as rowsDepsOver, N as switchCapability, P as temperatureSensorCapability, S as heatingValveCapability, V as defineEntryKind, X as array, a as BaseDevice, ct as errMsg, et as number, f as climateControlCapability, h as deviceAdoptionCapability, i as testBoschInstance, lt as EventCategory, m as defaultIntegrationName, n as boschRowsPorts, o as BaseDeviceProvider, ot as DeviceRole, r as keepBodyKeys, rt as string, st as DeviceType, t as boschRowsMigration, tt as object, u as batteryCapability, w as integrationInstancesCapability, y as gatewayDeviceName, z as customAction } from "../bosch-instances-REcWLM14.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",
@@ -142,7 +142,7 @@
       }
     ],
     "requires": {
-      "server": ">=1.2.879"
+      "server": ">=1.2.882"
     }
   },
   "files": [