@camstack/addon-provider-bosch 0.1.3 → 0.1.5

package/dist/home-connect/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-B-Un7bqT.js");
-const require_account_integration_offline = require("../account-integration-offline-BBqEtCgz.js");
+const require_dist = require("../dist-CIIror0W.js");
+const require_account_integration_offline = require("../account-integration-offline-BhjIPfv5.js");
 let node_crypto = require("node:crypto");
 let node_tls = require("node:tls");
 let node_zlib = require("node:zlib");
@@ -589,6 +589,14 @@ function tokensFromBody(body) {
 		refresh: typeof refresh === "string" ? refresh : ""
 	};
 }
+function isInvalidGrant(body) {
+	try {
+		const parsed = JSON.parse(body);
+		return isRecord$1(parsed) && parsed["error"] === "invalid_grant";
+	} catch {
+		return false;
+	}
+}
 function accountSummary(appliances) {
 	if (appliances.length === 0) return "Signed in. No appliances on this account yet.";
 	const names = appliances.map((app) => app.name).join(", ");
@@ -752,27 +760,34 @@ function beginHomeConnectSignIn() {
 		state
 	};
 }
-function callbackParams(callback) {
-	let url;
-	try {
-		url = new URL(callback.trim());
-	} catch {
-		throw new Error("Paste the full redirect address from the browser");
+var LOGIN_MESSAGES = {
+	empty: "Nothing was pasted. Paste the address the browser tried to open after you signed in.",
+	"no-code": "No sign-in code was found in what you pasted. Copy the whole address that starts with hcauth://, or just the code.",
+	"state-missing": "The pasted address has no state. Copy the complete address, or create the login link again.",
+	"state-mismatch": "State mismatch: this address belongs to a different sign-in attempt. Create the login link again and use the address that follows it.",
+	denied: "Home Connect refused the sign-in. Create the login link again and approve the access.",
+	"code-rejected": "The code was already used or has expired. Create the login link again; a code works once and only for a few minutes."
+};
+/** A failure the operator can act on; `reason` is stable, the message is for the form. */
+var HomeConnectLoginError = class extends Error {
+	name = "HomeConnectLoginError";
+	reason;
+	constructor(reason) {
+		super(LOGIN_MESSAGES[reason]);
+		this.reason = reason;
 	}
-	const code = url.searchParams.get("code") ?? url.hash.replace(/^#/, "").match(/(?:^|&)code=([^&]+)/)?.[1];
-	const state = url.searchParams.get("state") ?? "";
-	if (!code) throw new Error("Paste the full redirect address from the browser");
+};
+function callbackParams(callback, expectedState) {
+	const parsed = require_account_integration_offline.parseOAuthCallback(callback, expectedState);
+	if (!parsed.ok) throw new HomeConnectLoginError(parsed.reason);
 	return {
-		code,
-		grantType: url.searchParams.get("grant_type") ?? "authorization_code",
-		state
+		code: parsed.code,
+		grantType: parsed.params.get("grant_type") ?? "authorization_code"
 	};
 }
 /** Exchange the pasted redirect for the account token and each appliance profile. */
 async function completeHomeConnectSignIn(input, fetchImpl = homeConnectLoginFetch) {
-	const parsed = callbackParams(input.callback);
-	if (parsed.state !== input.state) throw new Error("State mismatch. Create the login link again.");
-	const { code, grantType } = parsed;
+	const { code, grantType } = callbackParams(input.callback, input.state);
 	const token = await exchange(fetchImpl, new CookieJar(), `${OAUTH_BASE}token`, "POST", { "content-type": "application/x-www-form-urlencoded" }, new URLSearchParams({
 		grant_type: grantType,
 		client_id: APP_ID$1,
@@ -780,7 +795,10 @@ async function completeHomeConnectSignIn(input, fetchImpl = homeConnectLoginFetc
 		code_verifier: input.verifier,
 		redirect_uri: REDIRECT_URI
 	}).toString());
-	if (token.status >= 400) throw new Error("Home Connect sign-in was rejected");
+	if (token.status >= 400) {
+		if (isInvalidGrant(token.body)) throw new HomeConnectLoginError("code-rejected");
+		throw new Error("Home Connect sign-in was rejected");
+	}
 	return fetchHomeConnectAccount(tokensFromBody(token.body), fetchImpl);
 }
 //#endregion
@@ -1233,7 +1251,9 @@ function buildHomeConnectFormSchema() {
 	return { sections: [{
 		id: "gateway",
 		title: "Home Connect",
-		description: "Create the login link and open it in the browser. After signing in, paste the full address the browser tried to open (it starts with hcauth://). The appliances are downloaded and then spoken to on the local network.",
+		titleKey: "provider-bosch:home-connect.s_gateway.title",
+		description: "Create the login link and open it in a browser, then sign in. The browser cannot open the app and stops on an address starting with hcauth://auth/prod?code=. Paste that whole address below (or only the code) and press Complete sign-in. The address is shown in Chrome and Edge under DevTools (F12) > Network, with Preserve log ticked before you sign in: select the last redirect and copy its Location header. In Firefox use Network > Headers > Location; in Safari use Develop > Show Web Inspector > Network. A code works once and expires within minutes. The appliances are then downloaded and spoken to on the local network.",
+		descriptionKey: "provider-bosch:home-connect.s_gateway.description",
 		columns: 1,
 		fields: [
 			{
@@ -1241,6 +1261,7 @@ function buildHomeConnectFormSchema() {
 				addonId: "bosch-home-connect",
 				key: "__home-connect-begin",
 				label: "Home Connect",
+				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-begin.label",
 				buttonLabel: "Create login link",
 				action: "beginSignIn",
 				variant: "primary",
@@ -1255,13 +1276,15 @@ function buildHomeConnectFormSchema() {
 				type: "textarea",
 				key: "authorizeUrl",
 				label: "Login link",
+				labelKey: "provider-bosch:home-connect.s_gateway.authorizeUrl.label",
 				required: false,
 				omitFromSettings: true
 			},
 			{
-				type: "text",
+				type: "textarea",
 				key: "callback",
-				label: "Redirect address",
+				label: "Redirect address or code",
+				labelKey: "provider-bosch:home-connect.s_gateway.callback.label",
 				required: false,
 				placeholder: "hcauth://auth/prod?code=…&state=…",
 				omitFromSettings: true
@@ -1270,6 +1293,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "state",
 				label: "Login state",
+				labelKey: "provider-bosch:home-connect.s_gateway.state.label",
 				required: false,
 				omitFromSettings: true,
 				showWhen: pairedOnly
@@ -1278,6 +1302,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "verifier",
 				label: "Login verifier",
+				labelKey: "provider-bosch:home-connect.s_gateway.verifier.label",
 				required: false,
 				omitFromSettings: true,
 				showWhen: pairedOnly
@@ -1287,6 +1312,7 @@ function buildHomeConnectFormSchema() {
 				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",
@@ -1307,6 +1333,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "token",
 				label: "Access token",
+				labelKey: "provider-bosch:home-connect.s_gateway.token.label",
 				required: true,
 				showWhen: pairedOnly
 			},
@@ -1314,6 +1341,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "refresh",
 				label: "Refresh token",
+				labelKey: "provider-bosch:home-connect.s_gateway.refresh.label",
 				required: false,
 				showWhen: pairedOnly
 			},
@@ -1321,6 +1349,7 @@ function buildHomeConnectFormSchema() {
 				type: "textarea",
 				key: "appliances",
 				label: "Appliances",
+				labelKey: "provider-bosch:home-connect.s_gateway.appliances.label",
 				required: true,
 				showWhen: pairedOnly
 			},

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, N as union, O as literal, P as unknown, S as customAction, T as isSecretMarkerLike, a as binaryCapability, b as errMsg, c as deviceAdoptionCapability, d as eventEmitterCapability, j as record, l as dishwasherCapability, m as powerMeterCapability, n as BaseDeviceProvider, p as numericSensorCapability, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as enumSensorCapability, v as DeviceRole, w as isSecretMarker, x as createEvent, y as DeviceType } from "../dist-BiZi19Lw.mjs";
-import { n as cascadeRemoveDevicesForIntegration, t as setIntegrationDevicesOnline } from "../account-integration-offline-BfoLYzxz.mjs";
+import { A as object, C as defineCustomActions, D as array, E as _enum, F as EventCategory, M as string, N as union, O as literal, P as unknown, S as customAction, T as isSecretMarkerLike, a as binaryCapability, b as errMsg, c as deviceAdoptionCapability, d as eventEmitterCapability, j as record, l as dishwasherCapability, m as powerMeterCapability, n as BaseDeviceProvider, p as numericSensorCapability, r as DishwasherOperationStateSchema, s as connectionTestCapability, t as BaseDevice, u as enumSensorCapability, v as DeviceRole, w as isSecretMarker, x as createEvent, y as DeviceType } from "../dist-DNznrlG_.mjs";
+import { n as cascadeRemoveDevicesForIntegration, r as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-DW2D0vf8.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -588,6 +588,14 @@ function tokensFromBody(body) {
 		refresh: typeof refresh === "string" ? refresh : ""
 	};
 }
+function isInvalidGrant(body) {
+	try {
+		const parsed = JSON.parse(body);
+		return isRecord$1(parsed) && parsed["error"] === "invalid_grant";
+	} catch {
+		return false;
+	}
+}
 function accountSummary(appliances) {
 	if (appliances.length === 0) return "Signed in. No appliances on this account yet.";
 	const names = appliances.map((app) => app.name).join(", ");
@@ -751,27 +759,34 @@ function beginHomeConnectSignIn() {
 		state
 	};
 }
-function callbackParams(callback) {
-	let url;
-	try {
-		url = new URL(callback.trim());
-	} catch {
-		throw new Error("Paste the full redirect address from the browser");
+var LOGIN_MESSAGES = {
+	empty: "Nothing was pasted. Paste the address the browser tried to open after you signed in.",
+	"no-code": "No sign-in code was found in what you pasted. Copy the whole address that starts with hcauth://, or just the code.",
+	"state-missing": "The pasted address has no state. Copy the complete address, or create the login link again.",
+	"state-mismatch": "State mismatch: this address belongs to a different sign-in attempt. Create the login link again and use the address that follows it.",
+	denied: "Home Connect refused the sign-in. Create the login link again and approve the access.",
+	"code-rejected": "The code was already used or has expired. Create the login link again; a code works once and only for a few minutes."
+};
+/** A failure the operator can act on; `reason` is stable, the message is for the form. */
+var HomeConnectLoginError = class extends Error {
+	name = "HomeConnectLoginError";
+	reason;
+	constructor(reason) {
+		super(LOGIN_MESSAGES[reason]);
+		this.reason = reason;
 	}
-	const code = url.searchParams.get("code") ?? url.hash.replace(/^#/, "").match(/(?:^|&)code=([^&]+)/)?.[1];
-	const state = url.searchParams.get("state") ?? "";
-	if (!code) throw new Error("Paste the full redirect address from the browser");
+};
+function callbackParams(callback, expectedState) {
+	const parsed = parseOAuthCallback(callback, expectedState);
+	if (!parsed.ok) throw new HomeConnectLoginError(parsed.reason);
 	return {
-		code,
-		grantType: url.searchParams.get("grant_type") ?? "authorization_code",
-		state
+		code: parsed.code,
+		grantType: parsed.params.get("grant_type") ?? "authorization_code"
 	};
 }
 /** Exchange the pasted redirect for the account token and each appliance profile. */
 async function completeHomeConnectSignIn(input, fetchImpl = homeConnectLoginFetch) {
-	const parsed = callbackParams(input.callback);
-	if (parsed.state !== input.state) throw new Error("State mismatch. Create the login link again.");
-	const { code, grantType } = parsed;
+	const { code, grantType } = callbackParams(input.callback, input.state);
 	const token = await exchange(fetchImpl, new CookieJar(), `${OAUTH_BASE}token`, "POST", { "content-type": "application/x-www-form-urlencoded" }, new URLSearchParams({
 		grant_type: grantType,
 		client_id: APP_ID$1,
@@ -779,7 +794,10 @@ async function completeHomeConnectSignIn(input, fetchImpl = homeConnectLoginFetc
 		code_verifier: input.verifier,
 		redirect_uri: REDIRECT_URI
 	}).toString());
-	if (token.status >= 400) throw new Error("Home Connect sign-in was rejected");
+	if (token.status >= 400) {
+		if (isInvalidGrant(token.body)) throw new HomeConnectLoginError("code-rejected");
+		throw new Error("Home Connect sign-in was rejected");
+	}
 	return fetchHomeConnectAccount(tokensFromBody(token.body), fetchImpl);
 }
 //#endregion
@@ -1232,7 +1250,9 @@ function buildHomeConnectFormSchema() {
 	return { sections: [{
 		id: "gateway",
 		title: "Home Connect",
-		description: "Create the login link and open it in the browser. After signing in, paste the full address the browser tried to open (it starts with hcauth://). The appliances are downloaded and then spoken to on the local network.",
+		titleKey: "provider-bosch:home-connect.s_gateway.title",
+		description: "Create the login link and open it in a browser, then sign in. The browser cannot open the app and stops on an address starting with hcauth://auth/prod?code=. Paste that whole address below (or only the code) and press Complete sign-in. The address is shown in Chrome and Edge under DevTools (F12) > Network, with Preserve log ticked before you sign in: select the last redirect and copy its Location header. In Firefox use Network > Headers > Location; in Safari use Develop > Show Web Inspector > Network. A code works once and expires within minutes. The appliances are then downloaded and spoken to on the local network.",
+		descriptionKey: "provider-bosch:home-connect.s_gateway.description",
 		columns: 1,
 		fields: [
 			{
@@ -1240,6 +1260,7 @@ function buildHomeConnectFormSchema() {
 				addonId: "bosch-home-connect",
 				key: "__home-connect-begin",
 				label: "Home Connect",
+				labelKey: "provider-bosch:home-connect.s_gateway.__home-connect-begin.label",
 				buttonLabel: "Create login link",
 				action: "beginSignIn",
 				variant: "primary",
@@ -1254,13 +1275,15 @@ function buildHomeConnectFormSchema() {
 				type: "textarea",
 				key: "authorizeUrl",
 				label: "Login link",
+				labelKey: "provider-bosch:home-connect.s_gateway.authorizeUrl.label",
 				required: false,
 				omitFromSettings: true
 			},
 			{
-				type: "text",
+				type: "textarea",
 				key: "callback",
-				label: "Redirect address",
+				label: "Redirect address or code",
+				labelKey: "provider-bosch:home-connect.s_gateway.callback.label",
 				required: false,
 				placeholder: "hcauth://auth/prod?code=…&state=…",
 				omitFromSettings: true
@@ -1269,6 +1292,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "state",
 				label: "Login state",
+				labelKey: "provider-bosch:home-connect.s_gateway.state.label",
 				required: false,
 				omitFromSettings: true,
 				showWhen: pairedOnly
@@ -1277,6 +1301,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "verifier",
 				label: "Login verifier",
+				labelKey: "provider-bosch:home-connect.s_gateway.verifier.label",
 				required: false,
 				omitFromSettings: true,
 				showWhen: pairedOnly
@@ -1286,6 +1311,7 @@ function buildHomeConnectFormSchema() {
 				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",
@@ -1306,6 +1332,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "token",
 				label: "Access token",
+				labelKey: "provider-bosch:home-connect.s_gateway.token.label",
 				required: true,
 				showWhen: pairedOnly
 			},
@@ -1313,6 +1340,7 @@ function buildHomeConnectFormSchema() {
 				type: "password",
 				key: "refresh",
 				label: "Refresh token",
+				labelKey: "provider-bosch:home-connect.s_gateway.refresh.label",
 				required: false,
 				showWhen: pairedOnly
 			},
@@ -1320,6 +1348,7 @@ function buildHomeConnectFormSchema() {
 				type: "textarea",
 				key: "appliances",
 				label: "Appliances",
+				labelKey: "provider-bosch:home-connect.s_gateway.appliances.label",
 				required: true,
 				showWhen: pairedOnly
 			},