@camstack/addon-provider-bosch 0.1.43 → 0.1.45

package/dist/home-connect/addon.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_bosch_instances = require("../bosch-instances-CppS1lTA.js");
-const require_account_integration_offline = require("../account-integration-offline-Ctzpu6DI.js");
+const require_bosch_instances = require("../bosch-instances-DdklwoKS.js");
+const require_account_integration_offline = require("../account-integration-offline-BiXbzZsg.js");
 let node_crypto = require("node:crypto");
 let node_tls = require("node:tls");
 let node_zlib = require("node:zlib");
@@ -31,23 +31,6 @@ var homeConnectActions = require_bosch_instances.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_bosch_instances.customAction(require_bosch_instances.object({ attemptId: require_bosch_instances.string().min(1) }), require_bosch_instances.object({
-		pending: require_bosch_instances.boolean(),
-		token: require_bosch_instances.string().optional().meta({ secret: true }),
-		refresh: require_bosch_instances.string().optional().meta({ secret: true }),
-		accountLabel: require_bosch_instances.string().optional(),
-		appliances: require_bosch_instances.string().optional(),
-		applianceSecrets: require_bosch_instances.string().optional().meta({ secret: true }),
-		summary: require_bosch_instances.string().optional()
-	}), {
-		kind: "mutation",
-		auth: "admin"
-	}),
 	signOut: require_bosch_instances.customAction(require_bosch_instances.object({}), require_bosch_instances.object({
 		signedOut: require_bosch_instances.literal(true),
 		summary: require_bosch_instances.string()
@@ -628,11 +611,10 @@ var HOME_CONNECT_IDDF_URL = (haId) => `https://eu.services.home-connect.com/api/
 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 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 REDIRECT_URI = require_account_integration_offline.HOME_CONNECT_REDIRECT_URI;
 var AUTHORIZE_SCOPE = HOME_CONNECT_AUTHORIZE_SCOPE;
 var CookieJar = class {
 	#cookies = /* @__PURE__ */ new Map();
@@ -1230,6 +1212,12 @@ function sameHomeConnectConnection(a, b) {
 }
 /** Sentinel so the gateway fields stay filled by sign-in and stay off the form. */
 var HOME_CONNECT_PAIRED_ONLY = "__paired_only__";
+var HOME_CONNECT_SIGN_IN_GUIDE = {
+	i18nPrefix: "home-connect.s_gateway",
+	keyPrefix: "__home-connect",
+	providerName: "Home Connect",
+	redirectStart: `${require_account_integration_offline.HOME_CONNECT_REDIRECT_URI}?code=`
+};
 function buildHomeConnectFormSchema() {
 	const pairedOnly = {
 		field: "__hidden__",
@@ -1239,10 +1227,11 @@ function buildHomeConnectFormSchema() {
 		id: "gateway",
 		title: "Home Connect",
 		titleKey: "provider-bosch:home-connect.s_gateway.title",
-		description: "Sign in with your Home Connect account. A new tab opens the sign-in page through this hub and finishes on its own.",
+		description: "Sign in with your Home Connect account in your own browser, then paste the address the browser stops on.",
 		descriptionKey: "provider-bosch:home-connect.s_gateway.description",
 		columns: 1,
 		fields: [
+			...require_account_integration_offline.buildSignInGuideFields(HOME_CONNECT_SIGN_IN_GUIDE),
 			{
 				type: "account-sign-in",
 				addonId: "bosch-home-connect",
@@ -1252,7 +1241,6 @@ function buildHomeConnectFormSchema() {
 				providerLabel: "Home Connect",
 				beginAction: "beginSignIn",
 				completeAction: "finishSignIn",
-				claimAction: "claimSignIn",
 				signOutAction: "signOut",
 				accountKey: "accountLabel",
 				countFromKey: "appliances",
@@ -1404,46 +1392,6 @@ function homeConnectFinishResult(account) {
 	};
 }
 //#endregion
-//#region src/home-connect/home-connect-sign-in-proxy.ts
-/**
-* Home Connect signs in through its own identity pages, which end on `hcauth://auth/prod?...`
-* — an address no browser can open. These are the hosts those pages are served from; the
-* proxy reaches nothing else. The authorize call redirects to SingleKey ID, whose page loads its
-* scripts from `cdn.singlekey-id.com` (see `HOMECOM_LOGIN_HOSTS`).
-*/
-var HOME_CONNECT_LOGIN_HOSTS = [
-	"api.home-connect.com",
-	"singlekey-id.com",
-	"cdn.singlekey-id.com"
-];
-var HOME_CONNECT_APP_SCHEME = HOME_CONNECT_REDIRECT_URI.slice(0, HOME_CONNECT_REDIRECT_URI.indexOf("://") + 3);
-var homeConnectSignInClaims = require_account_integration_offline.createSignInClaims();
-/** Start an attempt whose `authorizeUrl` is the hub-relative proxied login page. */
-function beginHomeConnectProxiedSignIn(deps) {
-	const nowMs = deps.nowMs ?? (() => Date.now());
-	const published = publishHomeConnectSignIn(homeConnectSignInAttempts, nowMs());
-	if (deps.proxy === null) return published;
-	const entry = require_account_integration_offline.openSignInProxy({
-		proxy: deps.proxy,
-		claims: homeConnectSignInClaims,
-		addonId: deps.addonId,
-		attemptId: published.attemptId,
-		authorizeUrl: published.authorizeUrl,
-		hosts: HOME_CONNECT_LOGIN_HOSTS,
-		appScheme: HOME_CONNECT_APP_SCHEME,
-		finish: async (callback) => homeConnectFinishResult(await finishHomeConnectSignIn({
-			attemptId: published.attemptId,
-			callback,
-			nowMs: nowMs()
-		}, homeConnectSignInAttempts, deps.fetchImpl)),
-		nowMs
-	});
-	return {
-		attemptId: published.attemptId,
-		authorizeUrl: entry
-	};
-}
-//#endregion
 //#region src/home-connect/home-connect-discovery.ts
 /** Dishwasher accessory label: `Dishwasher` plus the appliance name. */
 function homeConnectDishwasherEntityName(containerName) {
@@ -5378,8 +5326,6 @@ var BoschHomeConnectProviderAddon = class extends require_bosch_instances.BaseDe
 	clients = null;
 	instances = null;
 	reconciler = null;
-	loginProxy = null;
-	loginPlane = null;
 	constructor() {
 		super({});
 	}
@@ -5398,7 +5344,6 @@ var BoschHomeConnectProviderAddon = class extends require_bosch_instances.BaseDe
 			tester: this.buildConnectionTestProvider()
 		});
 		this.instances = built;
-		await this.serveLoginProxy();
 		this.clients = new HomeConnectClientRegistry(this.ctx.logger, { onConnectionUpdated: (integrationId, connection) => {
 			this.persistIntegrationAppliances(integrationId, connection);
 		} });
@@ -5428,24 +5373,14 @@ var BoschHomeConnectProviderAddon = class extends require_bosch_instances.BaseDe
 			customActions: homeConnectActions,
 			actionHandlers: {
 				beginSignIn: async () => ({
-					...beginHomeConnectProxiedSignIn({
-						proxy: this.loginProxy,
-						addonId: this.ctx.id
-					}),
-					summary: "Open the sign-in page and sign in."
+					...publishHomeConnectSignIn(homeConnectSignInAttempts, Date.now()),
+					summary: "Open the sign-in page, sign in, then paste the address the browser stops on."
 				}),
 				finishSignIn: async (input) => homeConnectFinishResult(await finishHomeConnectSignIn({
 					attemptId: input.attemptId,
 					callback: input.callback,
 					nowMs: Date.now()
 				}, homeConnectSignInAttempts)),
-				claimSignIn: async (input) => {
-					const claim = homeConnectSignInClaims.claim(input.attemptId, Date.now());
-					return claim.state === "pending" ? { pending: true } : {
-						pending: false,
-						...claim.result
-					};
-				},
 				signOut: async () => ({
 					signedOut: true,
 					summary: "Signed out."
@@ -5453,27 +5388,7 @@ var BoschHomeConnectProviderAddon = class extends require_bosch_instances.BaseDe
 			}
 		};
 	}
-	/** The hub's HTTPS face for the vendor's login pages (D955): admin session only. */
-	async serveLoginProxy() {
-		const proxy = new require_bosch_instances.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("Home Connect login proxy failed to serve — sign-in falls back to paste", { meta: { error: require_bosch_instances.errMsg(err) } });
-		}
-	}
 	async onShutdown() {
-		await this.loginPlane?.dispose().catch(() => void 0);
-		this.loginPlane = null;
-		this.loginProxy = null;
 		this.reconciler?.stop();
 		this.reconciler = null;
 		try {

package/dist/home-connect/addon.mjs

@@ -1,5 +1,5 @@
-import { A as RecordIntegrationInstances, B as array, C as powerMeterCapability, E as runningStateCapability, F as entryBody, G as record, H as literal, I as isSecretMarker, J as unknown, K as string, L as isSecretMarkerLike, M as customAction, N as defineCustomActions, P as defineEntryKind, Q as EventCategory, R as rowsDepsOver, S as numericSensorCapability, T as runningFromDishwasherOperation, V as boolean, W as object, X as DeviceType, Y as DeviceRole, Z as errMsg, _ as enumSensorCapability, a as BaseDevice, b as ingestReading, c as RUNNING_STATE_COLD, f as binaryCapability, g as dishwasherCapability, h as deviceAdoptionCapability, i as testBoschInstance, j as createEvent, m as consumablesCapability, n as boschRowsPorts, o as BaseDeviceProvider, q as union, r as keepBodyKeys, s as DishwasherOperationStateSchema, t as boschRowsMigration, u as VendorLoginProxy, v as eventEmitterCapability, w as quantityFromUnit, x as integrationInstancesCapability, z as _enum } from "../bosch-instances-BtKXLOoG.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-BrrnCsrl.mjs";
+import { A as RecordIntegrationInstances, B as array, C as powerMeterCapability, E as runningStateCapability, F as entryBody, G as string, I as isSecretMarker, J as DeviceRole, K as union, L as isSecretMarkerLike, M as customAction, N as defineCustomActions, P as defineEntryKind, R as rowsDepsOver, S as numericSensorCapability, T as runningFromDishwasherOperation, U as object, V as literal, W as record, X as errMsg, Y as DeviceType, Z as EventCategory, a as BaseDevice, b as ingestReading, c as RUNNING_STATE_COLD, f as consumablesCapability, g as eventEmitterCapability, h as enumSensorCapability, i as testBoschInstance, j as createEvent, m as dishwasherCapability, n as boschRowsPorts, o as BaseDeviceProvider, p as deviceAdoptionCapability, q as unknown, r as keepBodyKeys, s as DishwasherOperationStateSchema, t as boschRowsMigration, u as binaryCapability, w as quantityFromUnit, x as integrationInstancesCapability, z as _enum } from "../bosch-instances-DXID-jMD.mjs";
+import { a as loginFailureForAttempt, c as HOME_CONNECT_REDIRECT_URI, i as createSignInAttemptStore, n as cascadeRemoveDevicesForIntegration, o as parseOAuthCallback, r as buildSignInGuideFields, t as setIntegrationDevicesOnline } from "../account-integration-offline-DAEciV_Q.mjs";
 import { createHash, randomBytes } from "node:crypto";
 import { connect } from "node:tls";
 import { inflateRawSync } from "node:zlib";
@@ -30,23 +30,6 @@ var homeConnectActions = 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 }),
-		accountLabel: string().optional(),
-		appliances: string().optional(),
-		applianceSecrets: string().optional().meta({ secret: true }),
-		summary: string().optional()
-	}), {
-		kind: "mutation",
-		auth: "admin"
-	}),
 	signOut: customAction(object({}), object({
 		signedOut: literal(true),
 		summary: string()
@@ -627,7 +610,6 @@ var HOME_CONNECT_IDDF_URL = (haId) => `https://eu.services.home-connect.com/api/
 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 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;
@@ -1229,6 +1211,12 @@ function sameHomeConnectConnection(a, b) {
 }
 /** Sentinel so the gateway fields stay filled by sign-in and stay off the form. */
 var HOME_CONNECT_PAIRED_ONLY = "__paired_only__";
+var HOME_CONNECT_SIGN_IN_GUIDE = {
+	i18nPrefix: "home-connect.s_gateway",
+	keyPrefix: "__home-connect",
+	providerName: "Home Connect",
+	redirectStart: `${HOME_CONNECT_REDIRECT_URI}?code=`
+};
 function buildHomeConnectFormSchema() {
 	const pairedOnly = {
 		field: "__hidden__",
@@ -1238,10 +1226,11 @@ function buildHomeConnectFormSchema() {
 		id: "gateway",
 		title: "Home Connect",
 		titleKey: "provider-bosch:home-connect.s_gateway.title",
-		description: "Sign in with your Home Connect account. A new tab opens the sign-in page through this hub and finishes on its own.",
+		description: "Sign in with your Home Connect account in your own browser, then paste the address the browser stops on.",
 		descriptionKey: "provider-bosch:home-connect.s_gateway.description",
 		columns: 1,
 		fields: [
+			...buildSignInGuideFields(HOME_CONNECT_SIGN_IN_GUIDE),
 			{
 				type: "account-sign-in",
 				addonId: "bosch-home-connect",
@@ -1251,7 +1240,6 @@ function buildHomeConnectFormSchema() {
 				providerLabel: "Home Connect",
 				beginAction: "beginSignIn",
 				completeAction: "finishSignIn",
-				claimAction: "claimSignIn",
 				signOutAction: "signOut",
 				accountKey: "accountLabel",
 				countFromKey: "appliances",
@@ -1403,46 +1391,6 @@ function homeConnectFinishResult(account) {
 	};
 }
 //#endregion
-//#region src/home-connect/home-connect-sign-in-proxy.ts
-/**
-* Home Connect signs in through its own identity pages, which end on `hcauth://auth/prod?...`
-* — an address no browser can open. These are the hosts those pages are served from; the
-* proxy reaches nothing else. The authorize call redirects to SingleKey ID, whose page loads its
-* scripts from `cdn.singlekey-id.com` (see `HOMECOM_LOGIN_HOSTS`).
-*/
-var HOME_CONNECT_LOGIN_HOSTS = [
-	"api.home-connect.com",
-	"singlekey-id.com",
-	"cdn.singlekey-id.com"
-];
-var HOME_CONNECT_APP_SCHEME = HOME_CONNECT_REDIRECT_URI.slice(0, HOME_CONNECT_REDIRECT_URI.indexOf("://") + 3);
-var homeConnectSignInClaims = createSignInClaims();
-/** Start an attempt whose `authorizeUrl` is the hub-relative proxied login page. */
-function beginHomeConnectProxiedSignIn(deps) {
-	const nowMs = deps.nowMs ?? (() => Date.now());
-	const published = publishHomeConnectSignIn(homeConnectSignInAttempts, nowMs());
-	if (deps.proxy === null) return published;
-	const entry = openSignInProxy({
-		proxy: deps.proxy,
-		claims: homeConnectSignInClaims,
-		addonId: deps.addonId,
-		attemptId: published.attemptId,
-		authorizeUrl: published.authorizeUrl,
-		hosts: HOME_CONNECT_LOGIN_HOSTS,
-		appScheme: HOME_CONNECT_APP_SCHEME,
-		finish: async (callback) => homeConnectFinishResult(await finishHomeConnectSignIn({
-			attemptId: published.attemptId,
-			callback,
-			nowMs: nowMs()
-		}, homeConnectSignInAttempts, deps.fetchImpl)),
-		nowMs
-	});
-	return {
-		attemptId: published.attemptId,
-		authorizeUrl: entry
-	};
-}
-//#endregion
 //#region src/home-connect/home-connect-discovery.ts
 /** Dishwasher accessory label: `Dishwasher` plus the appliance name. */
 function homeConnectDishwasherEntityName(containerName) {
@@ -5377,8 +5325,6 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 	clients = null;
 	instances = null;
 	reconciler = null;
-	loginProxy = null;
-	loginPlane = null;
 	constructor() {
 		super({});
 	}
@@ -5397,7 +5343,6 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 			tester: this.buildConnectionTestProvider()
 		});
 		this.instances = built;
-		await this.serveLoginProxy();
 		this.clients = new HomeConnectClientRegistry(this.ctx.logger, { onConnectionUpdated: (integrationId, connection) => {
 			this.persistIntegrationAppliances(integrationId, connection);
 		} });
@@ -5427,24 +5372,14 @@ var BoschHomeConnectProviderAddon = class extends BaseDeviceProvider {
 			customActions: homeConnectActions,
 			actionHandlers: {
 				beginSignIn: async () => ({
-					...beginHomeConnectProxiedSignIn({
-						proxy: this.loginProxy,
-						addonId: this.ctx.id
-					}),
-					summary: "Open the sign-in page and sign in."
+					...publishHomeConnectSignIn(homeConnectSignInAttempts, Date.now()),
+					summary: "Open the sign-in page, sign in, then paste the address the browser stops on."
 				}),
 				finishSignIn: async (input) => homeConnectFinishResult(await finishHomeConnectSignIn({
 					attemptId: input.attemptId,
 					callback: input.callback,
 					nowMs: Date.now()
 				}, homeConnectSignInAttempts)),
-				claimSignIn: async (input) => {
-					const claim = homeConnectSignInClaims.claim(input.attemptId, Date.now());
-					return claim.state === "pending" ? { pending: true } : {
-						pending: false,
-						...claim.result
-					};
-				},
 				signOut: async () => ({
 					signedOut: true,
 					summary: "Signed out."
@@ -5452,27 +5387,7 @@ var BoschHomeConnectProviderAddon = 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("Home Connect 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;
 		this.reconciler?.stop();
 		this.reconciler = null;
 		try {