@camstack/addon-provider-bosch 0.1.20 → 0.1.21

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { C as customAction, D as _enum, E as isSecretMarkerLike, F as unknown, I as EventCategory, M as record, N as string, O as array, P as union, S as createEvent, T as isSecretMarker, a as binaryCapability, b as DeviceType, c as consumablesCapability, d as enumSensorCapability, f as eventEmitterCapability, h as powerMeterCapability, j as object, k as literal, l as deviceAdoptionCapability, m as numericSensorCapability, n as BaseDeviceProvider, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as dishwasherCapability, w as defineCustomActions, x as errMsg, y as DeviceRole } from "../dist-B75tWQLF.mjs";
-import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-DvuqXgc8.mjs";
+import { A as array, C as errMsg, D as isSecretMarker, E as defineCustomActions, F as string, I as union, L as unknown, N as object, O as isSecretMarkerLike, P as record, R as EventCategory, S as DeviceType, T as customAction, _ as runningStateCapability, a as binaryCapability, c as consumablesCapability, d as enumSensorCapability, f as eventEmitterCapability, g as runningFromDishwasherOperation, h as powerMeterCapability, j as literal, k as _enum, l as deviceAdoptionCapability, m as numericSensorCapability, n as BaseDeviceProvider, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as dishwasherCapability, w as createEvent, x as DeviceRole } from "../dist-D9i3id5N.mjs";
+import { a as parseOAuthCallback, i as loginFailureForAttempt, n as cascadeRemoveDevicesForIntegration, r as createSignInAttemptStore, t as setIntegrationDevicesOnline } from "../account-integration-offline-Ciq9CZa-.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -7,21 +7,20 @@ import { lookup } from "node:dns/promises";
 //#region src/home-connect/custom-actions.ts
 var homeConnectActions = defineCustomActions({
 	beginSignIn: customAction(object({}), object({
+		attemptId: string().min(1),
 		authorizeUrl: string().min(1),
-		verifier: string().min(1),
-		state: string().min(1),
 		summary: string()
 	}), {
 		kind: "mutation",
 		auth: "admin"
 	}),
 	finishSignIn: customAction(object({
-		verifier: string().min(1),
-		callback: string().min(1),
-		state: string().min(1)
+		attemptId: string().min(1),
+		callback: string().min(1)
 	}), object({
 		token: string().min(1).meta({ secret: true }),
 		refresh: string().optional().meta({ secret: true }),
+		accountLabel: string(),
 		/** JSON of the paired appliances — no credential on it. */
 		appliances: string().min(1),
 		/** JSON of `haId -> { psk, iv64? }`; stored in the keychain, never in `appliances`. */
@@ -30,6 +29,13 @@ var homeConnectActions = defineCustomActions({
 	}), {
 		kind: "mutation",
 		auth: "admin"
+	}),
+	signOut: customAction(object({}), object({
+		signedOut: literal(true),
+		summary: string()
+	}), {
+		kind: "mutation",
+		auth: "admin"
 	})
 });
 //#endregion
@@ -601,11 +607,15 @@ var HOME_CONNECT_IDDF_URL = (haId) => `https://eu.services.home-connect.com/api/
 //#endregion
 //#region src/home-connect/home-connect-login.ts
 /** Public OAuth client ids from the Home Connect app login (hcpy). */
-var APP_ID$1 = "9B75AC9EC512F36C84256AC47D813E2C1DD0D6520DF774B020E1E6E2EB29B1F3";
-var OAUTH_BASE = "https://api.home-connect.com/security/oauth/";
+var HOME_CONNECT_CLIENT_ID = "9B75AC9EC512F36C84256AC47D813E2C1DD0D6520DF774B020E1E6E2EB29B1F3";
+var HOME_CONNECT_OAUTH_BASE = "https://api.home-connect.com/security/oauth/";
 var ASSET_BASE = "https://eu.services.home-connect.com/";
-var REDIRECT_URI = "hcauth://auth/prod";
-var AUTHORIZE_SCOPE = "Control DeleteAppliance IdentifyAppliance Images Monitor ReadAccount ReadOrigApi Settings WriteAppliance WriteOrigApi";
+var HOME_CONNECT_REDIRECT_URI = "hcauth://auth/prod";
+var HOME_CONNECT_AUTHORIZE_SCOPE = "Control DeleteAppliance IdentifyAppliance Images Monitor ReadAccount ReadOrigApi Settings WriteAppliance WriteOrigApi";
+var APP_ID$1 = HOME_CONNECT_CLIENT_ID;
+var OAUTH_BASE = HOME_CONNECT_OAUTH_BASE;
+var REDIRECT_URI = HOME_CONNECT_REDIRECT_URI;
+var AUTHORIZE_SCOPE = HOME_CONNECT_AUTHORIZE_SCOPE;
 var CookieJar = class {
 	#cookies = /* @__PURE__ */ new Map();
 	absorb(headers) {
@@ -811,6 +821,7 @@ async function fetchHomeConnectAccount(creds, fetchImpl = homeConnectLoginFetch)
 			token,
 			refresh,
 			appliances,
+			accountId: homeConnectAccountLabel(token),
 			summary: accountSummary(appliances)
 		};
 	} catch (err) {
@@ -823,9 +834,18 @@ async function fetchHomeConnectAccount(creds, fetchImpl = homeConnectLoginFetch)
 		token: next.token,
 		refresh: next.refresh,
 		appliances,
+		accountId: homeConnectAccountLabel(next.token),
 		summary: accountSummary(appliances)
 	};
 }
+/** The JWT `sub`, or empty when the token has none. Never throws. */
+function homeConnectAccountLabel(token) {
+	try {
+		return accountIdFromAccessToken(token);
+	} catch {
+		return "";
+	}
+}
 /**
 * Exchange the refresh token for a new access token. Never throws; a failure says why and
 * carries no credential. A response without a new refresh token keeps the one that was used.
@@ -948,6 +968,24 @@ async function completeHomeConnectSignIn(input, fetchImpl = homeConnectLoginFetc
 	}
 	return fetchHomeConnectAccount(tokensFromBody(token.body), fetchImpl);
 }
+/** What the form is allowed to see. The verifier stays in `store`. */
+function publishHomeConnectSignIn(store, nowMs) {
+	const started = beginHomeConnectSignIn();
+	return {
+		attemptId: store.put(started.verifier, started.state, nowMs),
+		authorizeUrl: started.authorizeUrl
+	};
+}
+async function finishHomeConnectSignIn(input, store, fetchImpl = homeConnectLoginFetch) {
+	const taken = store.take(input.attemptId, input.nowMs);
+	if (!taken.ok) throw new HomeConnectLoginError(loginFailureForAttempt(taken.reason));
+	return completeHomeConnectSignIn({
+		verifier: taken.attempt.verifier,
+		callback: input.callback,
+		state: taken.attempt.state
+	}, fetchImpl);
+}
+var homeConnectSignInAttempts = createSignInAttemptStore();
 //#endregion
 //#region src/home-connect/home-connect-discovery.ts
 /** Dishwasher accessory label: `Dishwasher` plus the appliance name. */
@@ -1191,7 +1229,9 @@ var homeConnectStoredApplianceSchema = homeConnectApplianceRowSchema.extend({
 var homeConnectConfigSchema = object({
 	token: string().min(1).describe("Home Connect access token").meta({ secret: true }),
 	refresh: string().optional().describe("Home Connect refresh token").meta({ secret: true }),
-	appliances: array(homeConnectStoredApplianceSchema).optional()
+	appliances: array(homeConnectStoredApplianceSchema).optional(),
+	/** Shown on the sign-in field. The JWT subject, not a credential. */
+	accountLabel: string().optional()
 });
 function parseJsonValue(raw) {
 	if (typeof raw !== "string") return raw;
@@ -1392,103 +1432,49 @@ function sameHomeConnectConnection(a, b) {
 var HOME_CONNECT_PAIRED_ONLY = "__paired_only__";
 function buildHomeConnectFormSchema() {
 	const pairedOnly = {
-		field: "authorizeUrl",
+		field: "__hidden__",
 		equals: HOME_CONNECT_PAIRED_ONLY
 	};
 	return { sections: [{
 		id: "gateway",
 		title: "Home Connect",
 		titleKey: "provider-bosch:home-connect.s_gateway.title",
-		description: "Open the login link, sign in, then paste the address the browser stops on (hcauth://auth/prod?code=…). Chrome: DevTools > Network > last redirect > Location.",
+		description: "Sign in with your Home Connect account. Paste the address the browser stops on (hcauth://auth/prod?code=…).",
 		descriptionKey: "provider-bosch:home-connect.s_gateway.description",
 		columns: 1,
 		fields: [
 			{
-				type: "addon-action-button",
+				type: "account-sign-in",
 				addonId: "bosch-home-connect",
-				key: "__home-connect-begin",
+				key: "__home-connect-sign-in",
 				label: "Home Connect",
-				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-begin.label",
-				buttonLabel: "Create login link",
-				action: "beginSignIn",
-				variant: "primary",
-				assignResult: {
-					authorizeUrl: "authorizeUrl",
-					verifier: "verifier",
-					state: "state"
-				},
-				successMessage: "Open the link in Chrome and sign in."
-			},
-			{
-				type: "textarea",
-				key: "authorizeUrl",
-				label: "Login link",
-				labelKey: "provider-bosch:home-connect.s_gateway.authorizeUrl.label",
-				required: false,
-				omitFromSettings: true
-			},
-			{
-				type: "textarea",
-				key: "callback",
-				label: "Redirect address or code",
-				labelKey: "provider-bosch:home-connect.s_gateway.callback.label",
-				required: false,
-				placeholder: "hcauth://auth/prod?code=…&state=…",
-				omitFromSettings: true
-			},
-			{
-				type: "password",
-				key: "state",
-				label: "Login state",
-				labelKey: "provider-bosch:home-connect.s_gateway.state.label",
-				required: false,
-				omitFromSettings: true,
-				showWhen: pairedOnly
-			},
-			{
-				type: "password",
-				key: "verifier",
-				label: "Login verifier",
-				labelKey: "provider-bosch:home-connect.s_gateway.verifier.label",
-				required: false,
-				omitFromSettings: true,
-				showWhen: pairedOnly
-			},
-			{
-				type: "addon-action-button",
-				addonId: "bosch-home-connect",
-				key: "__home-connect-finish",
-				label: "Finish",
-				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-finish.label",
-				buttonLabel: "Complete sign-in",
-				action: "finishSignIn",
-				variant: "primary",
-				paramsFromForm: {
-					verifier: "verifier",
-					callback: "callback",
-					state: "state"
-				},
+				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-sign-in.label",
+				providerLabel: "Home Connect",
+				beginAction: "beginSignIn",
+				completeAction: "finishSignIn",
+				signOutAction: "signOut",
+				accountKey: "accountLabel",
+				countFromKey: "appliances",
+				countNoun: "appliance",
+				pastePlaceholder: "hcauth://auth/prod?code=…&state=…",
+				secretKeys: [
+					"token",
+					"refresh",
+					APPLIANCE_SECRETS_KEY
+				],
 				assignResult: {
 					token: "token",
 					refresh: "refresh",
+					accountLabel: "accountLabel",
 					appliances: "appliances",
 					[APPLIANCE_SECRETS_KEY]: APPLIANCE_SECRETS_KEY
-				},
-				successMessage: "{summary}"
-			},
-			{
-				type: "password",
-				key: "token",
-				label: "Access token",
-				labelKey: "provider-bosch:home-connect.s_gateway.token.label",
-				required: true,
-				showWhen: pairedOnly
+				}
 			},
 			{
-				type: "password",
-				key: "refresh",
-				label: "Refresh token",
-				labelKey: "provider-bosch:home-connect.s_gateway.refresh.label",
+				type: "text",
+				key: "accountLabel",
+				label: "Account",
+				labelKey: "provider-bosch:home-connect.s_gateway.accountLabel.label",
 				required: false,
 				showWhen: pairedOnly
 			},
@@ -1497,15 +1483,38 @@ function buildHomeConnectFormSchema() {
 				key: "appliances",
 				label: "Appliances",
 				labelKey: "provider-bosch:home-connect.s_gateway.appliances.label",
-				required: true,
+				required: false,
 				showWhen: pairedOnly
 			},
 			{
 				type: "password",
 				key: APPLIANCE_SECRETS_KEY,
 				label: "Appliance keys",
-				required: true,
+				required: false,
 				showWhen: pairedOnly
+			},
+			{
+				type: "group",
+				key: "__home-connect-advanced",
+				label: "Advanced",
+				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-advanced.label",
+				style: "accordion",
+				defaultCollapsed: true,
+				fields: [{
+					type: "password",
+					key: "token",
+					label: "Access token",
+					labelKey: "provider-bosch:home-connect.s_gateway.token.label",
+					required: false,
+					showToggle: false
+				}, {
+					type: "password",
+					key: "refresh",
+					label: "Refresh token",
+					labelKey: "provider-bosch:home-connect.s_gateway.refresh.label",
+					required: false,
+					showToggle: false
+				}]
 			}
 		]
 	}] };
@@ -4611,6 +4620,14 @@ var homeConnectDishwasherSchema = object({
 });
 var DISH_CAP = "dishwasher";
 var CONSUMABLES_CAP = "consumables";
+var RUNNING_CAP = "running-state";
+var RUNNING_COLD = {
+	running: null,
+	since: null,
+	source: "native",
+	phase: null,
+	lastFetchedAt: 0
+};
 var CONSUMABLES_EMPTY = {
 	items: [],
 	lastChangedAt: 0,
@@ -4646,7 +4663,12 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 		await super.onActivate();
 		this.registerDishwasherCap();
 		this.registerConsumablesCap();
+		this.registerRunningCap();
 		this.runtimeState.setCapState(DISH_CAP, COLD_DISHWASHER_STATUS);
+		this.runtimeState.setCapState(RUNNING_CAP, {
+			...RUNNING_COLD,
+			lastFetchedAt: Date.now()
+		});
 		this.markOnline(false);
 		this.#unwatch = homeConnectConnections.watch(this.#brokerId, this.#haId, (event) => this.recomputeSlice(event));
 		this.recomputeSlice({ kind: "client" });
@@ -4676,6 +4698,7 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 			lastValueAt
 		});
 		this.runtimeState.setCapState(DISH_CAP, slice);
+		this.publishRunningSlice(slice, lastValueAt);
 		this.writeConsumables(dishwasherConsumablesFromFeatures(view));
 		this.markOnline(slice.availability !== "offline");
 	}
@@ -4778,6 +4801,14 @@ var HomeConnectDishwasherDevice = class extends BaseDevice {
 			setOption: async ({ key, value }) => this.writeKey(this.requireClient(), key, value)
 		});
 	}
+	registerRunningCap() {
+		this.ctx.registerNativeCap(runningStateCapability, { getStatus: async () => this.runtimeState.getCapState(RUNNING_CAP) ?? RUNNING_COLD });
+	}
+	publishRunningSlice(slice, sinceMs) {
+		const previous = this.runtimeState.getCapState(RUNNING_CAP);
+		const next = runningFromDishwasherOperation(slice.operationState, slice.program, previous, sinceMs);
+		this.runtimeState.setCapState(RUNNING_CAP, next);
+	}
 };
 //#endregion
 //#region src/home-connect/devices/home-connect-event-device.ts
@@ -5241,21 +5272,16 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 			],
 			customActions: homeConnectActions,
 			actionHandlers: {
-				beginSignIn: async () => {
-					const started = beginHomeConnectSignIn();
-					return {
-						authorizeUrl: started.authorizeUrl,
-						verifier: started.verifier,
-						state: started.state,
-						summary: "Open the link in the browser and sign in."
-					};
-				},
+				beginSignIn: async () => ({
+					...publishHomeConnectSignIn(homeConnectSignInAttempts, Date.now()),
+					summary: "Open the link in the browser and sign in."
+				}),
 				finishSignIn: async (input) => {
-					const account = await completeHomeConnectSignIn({
-						verifier: input.verifier,
+					const account = await finishHomeConnectSignIn({
+						attemptId: input.attemptId,
 						callback: input.callback,
-						state: input.state
-					});
+						nowMs: Date.now()
+					}, homeConnectSignInAttempts);
 					const { rows, secrets } = splitApplianceSecrets(account.appliances.map((app) => ({
 						haId: app.haId,
 						name: app.name,
@@ -5269,11 +5295,16 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 					return {
 						token: account.token,
 						...account.refresh.length > 0 ? { refresh: account.refresh } : {},
+						accountLabel: account.accountId,
 						appliances: JSON.stringify(rows),
 						applianceSecrets: JSON.stringify(secrets),
 						summary: account.summary
 					};
-				}
+				},
+				signOut: async () => ({
+					signedOut: true,
+					summary: "Signed out."
+				})
 			}
 		};
 	}