@camstack/addon-provider-bosch 0.1.29 → 0.1.31

package/dist/homecom/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_dist = require("../dist-CyLs51d2.js");
-const require_account_integration_offline = require("../account-integration-offline-DMtMWixt.js");
+const require_dist = require("../dist-NdDwxHvT.js");
+const require_account_integration_offline = require("../account-integration-offline-IvvrXQDg.js");
 let node_crypto = require("node:crypto");
 //#region src/homecom/config.ts
 var HOMECOM_BRANDS = ["bosch", "buderus"];
@@ -51,19 +51,13 @@ var HIDDEN_UNTIL_ADVANCED = {
 	field: "__hidden__",
 	equals: "yes"
 };
-var HOMECOM_CODE_HELP = [
-	"Before you sign in, open the browser's developer tools, choose the Network tab, and turn on Preserve log.",
-	"Sign in with SingleKey. The page will say it has network problems. Ignore that: the browser tried to open the Bosch app and could not.",
-	"In the Network list, filter by code= and open the request whose address starts with com.bosch.tt.dashtt.pointt://app/login?code=",
-	"Copy that whole address, or only the code, and paste it in the box under the sign-in button.",
-	"On a phone the same redirect fails unless the Bosch app is installed. Use a desktop browser to copy the code."
-].join("\n\n");
+var HOMECOM_CODE_HELP = "If the page does not finish, copy the address it stops on (it starts with com.bosch.tt.dashtt.pointt://app/login?code=) or only the code, and paste it in the box under the sign-in button.";
 function buildHomeComFormSchema() {
 	return { sections: [{
 		id: "account",
 		title: "HomeCom account",
 		titleKey: "provider-bosch:homecom.s_account.title",
-		description: "Sign in with your SingleKey ID. Copy the code as described below, then paste it here.",
+		description: "Sign in with your SingleKey ID. A new tab opens the sign-in page through this hub and finishes on its own.",
 		descriptionKey: "provider-bosch:homecom.s_account.description",
 		columns: 1,
 		fields: [
@@ -83,6 +77,7 @@ function buildHomeComFormSchema() {
 				providerLabel: "SingleKey ID",
 				beginAction: "beginSignIn",
 				completeAction: "finishSignIn",
+				claimAction: "claimSignIn",
 				signOutAction: "signOut",
 				accountKey: "accountLabel",
 				countKey: "gatewayCount",
@@ -225,6 +220,27 @@ var homeComActions = require_dist.defineCustomActions({
 		kind: "mutation",
 		auth: "admin"
 	}),
+	/**
+	* The form asks while the proxied login page is open: `pending` until the hub captured the
+	* app-scheme redirect and finished the exchange, then the same fields `finishSignIn` returns.
+	* Claimed once. A failed exchange answers with its operator-facing message as an error.
+	*/
+	claimSignIn: require_dist.customAction(require_dist.object({ attemptId: require_dist.string().min(1) }), require_dist.object({
+		pending: require_dist.boolean(),
+		token: require_dist.string().optional().meta({ secret: true }),
+		refresh: require_dist.string().optional().meta({ secret: true }),
+		username: require_dist.string().optional().meta({ secret: true }),
+		accountLabel: require_dist.string().optional(),
+		gatewayCount: require_dist.number().optional(),
+		summary: require_dist.string().optional(),
+		gatewayId: require_dist.string().optional(),
+		brand: HomeComBrandSchema.optional(),
+		region: HomeComRegionSchema.optional(),
+		choices: require_dist.array(gatewayChoice).optional()
+	}), {
+		kind: "mutation",
+		auth: "admin"
+	}),
 	signOut: require_dist.customAction(require_dist.object({}), require_dist.object({
 		signedOut: require_dist.literal(true),
 		summary: require_dist.string()
@@ -1215,6 +1231,37 @@ function finishedFromGateways(tokens, resolved, listFailure) {
 }
 var homeComSignInAttempts = require_account_integration_offline.createSignInAttemptStore();
 //#endregion
+//#region src/homecom/homecom-sign-in-proxy.ts
+/** SingleKey ID serves the whole HomeCom login. (Not verified against the live pages: no vendor credentials.) */
+var HOMECOM_LOGIN_HOSTS = ["singlekey-id.com"];
+var HOMECOM_APP_SCHEME = HOMECOM_REDIRECT_URI.slice(0, HOMECOM_REDIRECT_URI.indexOf("://") + 3);
+var homeComSignInClaims = require_account_integration_offline.createSignInClaims();
+/** Start an attempt whose `authorizeUrl` is the hub-relative proxied login page. */
+function beginHomeComProxiedSignIn(deps) {
+	const nowMs = deps.nowMs ?? (() => Date.now());
+	const published = publishHomeComSignIn(homeComSignInAttempts, nowMs());
+	if (deps.proxy === null) return published;
+	const entry = require_account_integration_offline.openSignInProxy({
+		proxy: deps.proxy,
+		claims: homeComSignInClaims,
+		addonId: deps.addonId,
+		attemptId: published.attemptId,
+		authorizeUrl: published.authorizeUrl,
+		hosts: HOMECOM_LOGIN_HOSTS,
+		appScheme: HOMECOM_APP_SCHEME,
+		finish: (callback) => finishHomeComSignIn({
+			attemptId: published.attemptId,
+			callback,
+			nowMs: nowMs()
+		}, homeComSignInAttempts, deps.fetchFn !== void 0 ? { fetchFn: deps.fetchFn } : {}),
+		nowMs
+	});
+	return {
+		attemptId: published.attemptId,
+		authorizeUrl: entry
+	};
+}
+//#endregion
 //#region src/homecom/homecom-token-persist.ts
 function unreadable(value) {
 	return require_dist.isSecretMarker(value) || require_dist.isSecretMarkerLike(value);
@@ -2024,11 +2071,14 @@ var BoschHomeComProviderAddon = class extends require_dist.BaseDeviceProvider {
 		[require_dist.DeviceType.WaterHeater]: HomeComWaterHeaterDevice
 	};
 	clients = null;
+	loginProxy = null;
+	loginPlane = null;
 	constructor() {
 		super({});
 	}
 	async onInitialize() {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
+		await this.serveLoginProxy();
 		const persistDeps = {
 			getSettings: (id) => this.ctx.api.integrations.getSettings.query({ id }),
 			setSettings: (input) => this.ctx.api.integrations.setSettings.mutate(input),
@@ -2063,9 +2113,19 @@ var BoschHomeComProviderAddon = class extends require_dist.BaseDeviceProvider {
 			customActions: homeComActions,
 			actionHandlers: {
 				beginSignIn: async () => ({
-					...publishHomeComSignIn(homeComSignInAttempts, Date.now()),
-					summary: "Open the link in a browser and sign in."
+					...beginHomeComProxiedSignIn({
+						proxy: this.loginProxy,
+						addonId: this.ctx.id
+					}),
+					summary: "Open the sign-in page and sign in."
 				}),
+				claimSignIn: async (input) => {
+					const claim = homeComSignInClaims.claim(input.attemptId, Date.now());
+					return claim.state === "pending" ? { pending: true } : {
+						pending: false,
+						...claim.result
+					};
+				},
 				finishSignIn: async (input) => finishHomeComSignIn({
 					attemptId: input.attemptId,
 					callback: input.callback,
@@ -2078,7 +2138,27 @@ var BoschHomeComProviderAddon = class extends require_dist.BaseDeviceProvider {
 			}
 		};
 	}
+	/** The hub's HTTPS face for the vendor's login pages (D955): admin session only. */
+	async serveLoginProxy() {
+		const proxy = new require_dist.VendorLoginProxy({
+			addonId: this.ctx.id,
+			logger: this.ctx.logger
+		});
+		try {
+			this.loginPlane = await this.ctx.dataPlane?.serve({
+				prefix: "vendor-login",
+				access: "admin",
+				handler: proxy.handler
+			}) ?? null;
+			if (this.loginPlane !== null) this.loginProxy = proxy;
+		} catch (err) {
+			this.ctx.logger.warn("HomeCom login proxy failed to serve — sign-in falls back to paste", { meta: { error: require_dist.errMsg(err) } });
+		}
+	}
 	async onShutdown() {
+		await this.loginPlane?.dispose().catch(() => void 0);
+		this.loginPlane = null;
+		this.loginProxy = null;
 		try {
 			await this.clients?.shutdown();
 		} catch (err) {

package/dist/homecom/addon.mjs

@@ -1,5 +1,5 @@
-import { A as isSecretMarker, C as waterHeaterCapability, E as errMsg, F as number, I as object, M as _enum, N as array, O as customAction, P as literal, R as string, T as DeviceType, V as EventCategory, c as connectionTestCapability, j as isSecretMarkerLike, k as defineCustomActions, n as BaseDeviceProvider, s as climateControlCapability, t as BaseDevice, u as deviceAdoptionCapability } from "../dist-DzSesBKb.mjs";
-import { a as parseOAuthCallback, i as loginFailureForAttempt, n as cascadeRemoveDevicesForIntegration, r as createSignInAttemptStore, t as setIntegrationDevicesOnline } from "../account-integration-offline-C-XbrgLs.mjs";
+import { A as customAction, D as DeviceType, F as array, I as boolean, L as literal, M as isSecretMarker, N as isSecretMarkerLike, O as errMsg, P as _enum, R as number, T as waterHeaterCapability, V as string, W as EventCategory, f as deviceAdoptionCapability, j as defineCustomActions, l as climateControlCapability, n as BaseDeviceProvider, o as VendorLoginProxy, t as BaseDevice, u as connectionTestCapability, z as object } from "../dist-DxO4cucS.mjs";
+import { a as createSignInAttemptStore, i as openSignInProxy, n as cascadeRemoveDevicesForIntegration, o as loginFailureForAttempt, r as createSignInClaims, s as parseOAuthCallback, t as setIntegrationDevicesOnline } from "../account-integration-offline-Cfcp8s5x.mjs";
 import { createHash, randomBytes } from "node:crypto";
 //#region src/homecom/config.ts
 var HOMECOM_BRANDS = ["bosch", "buderus"];
@@ -50,19 +50,13 @@ var HIDDEN_UNTIL_ADVANCED = {
 	field: "__hidden__",
 	equals: "yes"
 };
-var HOMECOM_CODE_HELP = [
-	"Before you sign in, open the browser's developer tools, choose the Network tab, and turn on Preserve log.",
-	"Sign in with SingleKey. The page will say it has network problems. Ignore that: the browser tried to open the Bosch app and could not.",
-	"In the Network list, filter by code= and open the request whose address starts with com.bosch.tt.dashtt.pointt://app/login?code=",
-	"Copy that whole address, or only the code, and paste it in the box under the sign-in button.",
-	"On a phone the same redirect fails unless the Bosch app is installed. Use a desktop browser to copy the code."
-].join("\n\n");
+var HOMECOM_CODE_HELP = "If the page does not finish, copy the address it stops on (it starts with com.bosch.tt.dashtt.pointt://app/login?code=) or only the code, and paste it in the box under the sign-in button.";
 function buildHomeComFormSchema() {
 	return { sections: [{
 		id: "account",
 		title: "HomeCom account",
 		titleKey: "provider-bosch:homecom.s_account.title",
-		description: "Sign in with your SingleKey ID. Copy the code as described below, then paste it here.",
+		description: "Sign in with your SingleKey ID. A new tab opens the sign-in page through this hub and finishes on its own.",
 		descriptionKey: "provider-bosch:homecom.s_account.description",
 		columns: 1,
 		fields: [
@@ -82,6 +76,7 @@ function buildHomeComFormSchema() {
 				providerLabel: "SingleKey ID",
 				beginAction: "beginSignIn",
 				completeAction: "finishSignIn",
+				claimAction: "claimSignIn",
 				signOutAction: "signOut",
 				accountKey: "accountLabel",
 				countKey: "gatewayCount",
@@ -224,6 +219,27 @@ var homeComActions = defineCustomActions({
 		kind: "mutation",
 		auth: "admin"
 	}),
+	/**
+	* The form asks while the proxied login page is open: `pending` until the hub captured the
+	* app-scheme redirect and finished the exchange, then the same fields `finishSignIn` returns.
+	* Claimed once. A failed exchange answers with its operator-facing message as an error.
+	*/
+	claimSignIn: customAction(object({ attemptId: string().min(1) }), object({
+		pending: boolean(),
+		token: string().optional().meta({ secret: true }),
+		refresh: string().optional().meta({ secret: true }),
+		username: string().optional().meta({ secret: true }),
+		accountLabel: string().optional(),
+		gatewayCount: number().optional(),
+		summary: string().optional(),
+		gatewayId: string().optional(),
+		brand: HomeComBrandSchema.optional(),
+		region: HomeComRegionSchema.optional(),
+		choices: array(gatewayChoice).optional()
+	}), {
+		kind: "mutation",
+		auth: "admin"
+	}),
 	signOut: customAction(object({}), object({
 		signedOut: literal(true),
 		summary: string()
@@ -1214,6 +1230,37 @@ function finishedFromGateways(tokens, resolved, listFailure) {
 }
 var homeComSignInAttempts = createSignInAttemptStore();
 //#endregion
+//#region src/homecom/homecom-sign-in-proxy.ts
+/** SingleKey ID serves the whole HomeCom login. (Not verified against the live pages: no vendor credentials.) */
+var HOMECOM_LOGIN_HOSTS = ["singlekey-id.com"];
+var HOMECOM_APP_SCHEME = HOMECOM_REDIRECT_URI.slice(0, HOMECOM_REDIRECT_URI.indexOf("://") + 3);
+var homeComSignInClaims = createSignInClaims();
+/** Start an attempt whose `authorizeUrl` is the hub-relative proxied login page. */
+function beginHomeComProxiedSignIn(deps) {
+	const nowMs = deps.nowMs ?? (() => Date.now());
+	const published = publishHomeComSignIn(homeComSignInAttempts, nowMs());
+	if (deps.proxy === null) return published;
+	const entry = openSignInProxy({
+		proxy: deps.proxy,
+		claims: homeComSignInClaims,
+		addonId: deps.addonId,
+		attemptId: published.attemptId,
+		authorizeUrl: published.authorizeUrl,
+		hosts: HOMECOM_LOGIN_HOSTS,
+		appScheme: HOMECOM_APP_SCHEME,
+		finish: (callback) => finishHomeComSignIn({
+			attemptId: published.attemptId,
+			callback,
+			nowMs: nowMs()
+		}, homeComSignInAttempts, deps.fetchFn !== void 0 ? { fetchFn: deps.fetchFn } : {}),
+		nowMs
+	});
+	return {
+		attemptId: published.attemptId,
+		authorizeUrl: entry
+	};
+}
+//#endregion
 //#region src/homecom/homecom-token-persist.ts
 function unreadable(value) {
 	return isSecretMarker(value) || isSecretMarkerLike(value);
@@ -2023,11 +2070,14 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 		[DeviceType.WaterHeater]: HomeComWaterHeaterDevice
 	};
 	clients = null;
+	loginProxy = null;
+	loginPlane = null;
 	constructor() {
 		super({});
 	}
 	async onInitialize() {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
+		await this.serveLoginProxy();
 		const persistDeps = {
 			getSettings: (id) => this.ctx.api.integrations.getSettings.query({ id }),
 			setSettings: (input) => this.ctx.api.integrations.setSettings.mutate(input),
@@ -2062,9 +2112,19 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 			customActions: homeComActions,
 			actionHandlers: {
 				beginSignIn: async () => ({
-					...publishHomeComSignIn(homeComSignInAttempts, Date.now()),
-					summary: "Open the link in a browser and sign in."
+					...beginHomeComProxiedSignIn({
+						proxy: this.loginProxy,
+						addonId: this.ctx.id
+					}),
+					summary: "Open the sign-in page and sign in."
 				}),
+				claimSignIn: async (input) => {
+					const claim = homeComSignInClaims.claim(input.attemptId, Date.now());
+					return claim.state === "pending" ? { pending: true } : {
+						pending: false,
+						...claim.result
+					};
+				},
 				finishSignIn: async (input) => finishHomeComSignIn({
 					attemptId: input.attemptId,
 					callback: input.callback,
@@ -2077,7 +2137,27 @@ var BoschHomeComProviderAddon = class extends BaseDeviceProvider {
 			}
 		};
 	}
+	/** The hub's HTTPS face for the vendor's login pages (D955): admin session only. */
+	async serveLoginProxy() {
+		const proxy = new VendorLoginProxy({
+			addonId: this.ctx.id,
+			logger: this.ctx.logger
+		});
+		try {
+			this.loginPlane = await this.ctx.dataPlane?.serve({
+				prefix: "vendor-login",
+				access: "admin",
+				handler: proxy.handler
+			}) ?? null;
+			if (this.loginPlane !== null) this.loginProxy = proxy;
+		} catch (err) {
+			this.ctx.logger.warn("HomeCom login proxy failed to serve — sign-in falls back to paste", { meta: { error: errMsg(err) } });
+		}
+	}
 	async onShutdown() {
+		await this.loginPlane?.dispose().catch(() => void 0);
+		this.loginPlane = null;
+		this.loginProxy = null;
 		try {
 			await this.clients?.shutdown();
 		} catch (err) {

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_dist = require("../dist-CyLs51d2.js");
+const require_dist = require("../dist-NdDwxHvT.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 { E as errMsg, F as number, I as object, M as _enum, N as array, O as customAction, P as literal, R as string, S as temperatureSensorCapability, T as DeviceType, V as EventCategory, a as batteryCapability, c as connectionTestCapability, k as defineCustomActions, m as heatingValveCapability, n as BaseDeviceProvider, s as climateControlCapability, t as BaseDevice, u as deviceAdoptionCapability, x as switchCapability } from "../dist-DzSesBKb.mjs";
+import { A as customAction, C as switchCapability, D as DeviceType, F as array, L as literal, O as errMsg, P as _enum, R as number, V as string, W as EventCategory, f as deviceAdoptionCapability, g as heatingValveCapability, j as defineCustomActions, l as climateControlCapability, n as BaseDeviceProvider, s as batteryCapability, t as BaseDevice, u as connectionTestCapability, w as temperatureSensorCapability, z as object } from "../dist-DxO4cucS.mjs";
 import { createRequire } from "node:module";
 import { randomUUID } from "node:crypto";
 import { request } from "node:https";

package/i18n/en.json

@@ -33,5 +33,18 @@
   "shc.s_connection.sslCertificate.label": "Client certificate (PEM)",
   "shc.s_connection.sslKey.label": "Client private key (PEM)",
   "homecom.s_account.__homecom-code-help.label": "Before you sign in, open the browser's developer tools, choose the Network tab, and turn on Preserve log.\n\nSign in with SingleKey. The page will say it has network problems. Ignore that: the browser tried to open the Bosch app and could not.\n\nIn the Network list, filter by code= and open the request whose address starts with com.bosch.tt.dashtt.pointt://app/login?code=\n\nCopy that whole address, or only the code, and paste it in the box under the sign-in button.\n\nOn a phone the same redirect fails unless the Bosch app is installed. Use a desktop browser to copy the code.",
-  "homecom.s_account.gatewayId.description": "Filled from the account. Type one only when you need to override the choice."
+  "homecom.s_account.gatewayId.description": "Filled from the account. Type one only when you need to override the choice.",
+  "homecom": {
+    "s_account": {
+      "description": "Sign in with your SingleKey ID. A new tab opens the sign-in page through this hub and finishes on its own.",
+      "__homecom-code-help": {
+        "label": "If the page does not finish, copy the address it stops on (it starts with com.bosch.tt.dashtt.pointt://app/login?code=) or only the code, and paste it in the box under the sign-in button."
+      }
+    }
+  },
+  "home-connect": {
+    "s_gateway": {
+      "description": "Sign in with your Home Connect account. A new tab opens the sign-in page through this hub and finishes on its own."
+    }
+  }
 }

package/i18n/it.json

@@ -33,5 +33,18 @@
   "shc.s_connection.sslCertificate.label": "Certificato client (PEM)",
   "shc.s_connection.sslKey.label": "Chiave privata client (PEM)",
   "homecom.s_account.__homecom-code-help.label": "Prima di accedere, apri gli strumenti per sviluppatori del browser, scegli la scheda Rete (Network) e attiva \"Conserva registro\" (Preserve log).\n\nAccedi con SingleKey. La pagina dirà che ci sono problemi di rete. Ignoralo: il browser ha provato ad aprire l'app Bosch e non c'è riuscito.\n\nNell'elenco Rete filtra per code= e apri la richiesta il cui indirizzo inizia con com.bosch.tt.dashtt.pointt://app/login?code=\n\nCopia l'indirizzo intero, oppure solo il codice, e incollalo nella casella sotto il pulsante di accesso.\n\nSu un telefono lo stesso reindirizzamento fallisce se l'app Bosch non è installata. Per copiare il codice usa un browser da computer.",
-  "homecom.s_account.gatewayId.description": "Compilato dall'account. Scrivilo solo se devi sostituire la scelta."
+  "homecom.s_account.gatewayId.description": "Compilato dall'account. Scrivilo solo se devi sostituire la scelta.",
+  "homecom": {
+    "s_account": {
+      "description": "Accedi con il tuo SingleKey ID. Si apre una nuova scheda con la pagina di accesso tramite questo hub e si conclude da sola.",
+      "__homecom-code-help": {
+        "label": "Se la pagina non si conclude, copia l indirizzo su cui si ferma (inizia con com.bosch.tt.dashtt.pointt://app/login?code=) oppure solo il codice, e incollalo nel riquadro sotto il pulsante di accesso."
+      }
+    }
+  },
+  "home-connect": {
+    "s_gateway": {
+      "description": "Accedi con il tuo account Home Connect. Si apre una nuova scheda con la pagina di accesso tramite questo hub e si conclude da sola."
+    }
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-provider-bosch",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "Bosch smart-home device-provider addons for CamStack — SHC, Home Connect, and HomeCom cloud integrations (scaffold)",
   "keywords": [
     "camstack",