@camstack/addon-import-alexa 0.2.151 → 0.2.153

package/dist/addon.js

@@ -1819,7 +1819,7 @@ var Doc = class {
 };
 //#endregion
 //#region ../../node_modules/zod/v4/core/versions.js
-var version = {
+var version$1 = {
 	major: 4,
 	minor: 4,
 	patch: 3
@@ -1831,7 +1831,7 @@ var $ZodType = /*@__PURE__*/ $constructor("$ZodType", (inst, def) => {
 	inst ?? (inst = {});
 	inst._zod.def = def;
 	inst._zod.bag = inst._zod.bag || {};
-	inst._zod.version = version;
+	inst._zod.version = version$1;
 	const checks = [...inst._zod.def.checks ?? []];
 	if (inst._zod.traits.has("$ZodCheck")) checks.unshift(inst);
 	for (const ch of checks) for (const fn of ch._zod.onattach) fn(inst);
@@ -17611,7 +17611,22 @@ var BrokerProviderInfoSchema = object({
 		*/
 		interactiveConnectPath: string().min(1).optional(),
 		/** Relative hub path to disconnect the linked account (same popup pattern). */
-		interactiveDisconnectPath: string().min(1).optional()
+		interactiveDisconnectPath: string().min(1).optional(),
+		/**
+		* The kind signs in through a server-held interactive session instead of
+		* (or before) typed credentials. `basePath` is a hub-relative route set
+		* served by the owning addon (`/addon/<id>/...`) speaking the sign-in
+		* contract: `POST {basePath}/start` (body: the form's settings) answers
+		* `{ sessionId, loginUrl }`; `GET {basePath}/status?sessionId=` answers
+		* `{ phase: 'starting' | 'awaiting-login' | 'captured' | 'error' |
+		* 'cancelled', loginUrl, error }`; `POST {basePath}/commit`
+		* (`{ sessionId, name, brokerId? }`) stores the credentials on a new or
+		* existing broker and answers `{ brokerId }`; `POST {basePath}/cancel`
+		* (`{ sessionId }`) drops the session. The dialog that edits a broker
+		* offers it as the default path; the fields the session fills are
+		* marked `filledBySignIn` in the kind's settings schema.
+		*/
+		signIn: object({ basePath: string().min(1) }).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -58051,7 +58066,8 @@ var BATTERY_DEVICE_TYPES = [
 	DeviceType.Switch,
 	DeviceType.PetFeeder,
 	DeviceType.Container,
-	DeviceType.Thermostat
+	DeviceType.Thermostat,
+	DeviceType.EventEmitter
 ];
 /** Generic Customize target for the percentage reading (D936). */
 var batteryCustomize = {
@@ -64902,9 +64918,9 @@ var PowerMeterStatusSchema = object({
 	/** Cumulative energy in kilowatt-hours since the meter was reset. */
 	kwhTotal: number().optional().meta(readingMeta("energy", { label: "Energy" })),
 	/** Voltage in volts. */
-	volts: number().optional().meta(readingMeta("voltage")),
+	volts: number().optional().meta(readingMeta("voltage", { label: "Voltage" })),
 	/** Current in amperes. */
-	amps: number().optional().meta(readingMeta("current")),
+	amps: number().optional().meta(readingMeta("current", { label: "Current" })),
 	/** Apparent power in volt-amperes. */
 	va: number().optional().meta(readingMeta("apparent-power")),
 	/** Power factor (0..1) if reported. */
@@ -64912,17 +64928,74 @@ var PowerMeterStatusSchema = object({
 	/** Ms epoch when the slice was last updated. */
 	lastFetchedAt: number()
 });
+/**
+* Loads that draw metered mains power (D951). The reading is a feature of the
+* device itself — a plug, a lamp, a fan, an air conditioner, a boiler, a
+* vacuum dock — not a separate sensor beside it. A `Sensor` stays: a clamp
+* meter or a standalone energy monitor IS the device. Cover, lock, valve,
+* camera and the like are left out: their draw is not what anyone meters.
+*/
+var POWER_METER_DEVICE_TYPES = [
+	DeviceType.Sensor,
+	DeviceType.Switch,
+	DeviceType.Light,
+	DeviceType.Fan,
+	DeviceType.Climate,
+	DeviceType.Thermostat,
+	DeviceType.Humidifier,
+	DeviceType.WaterHeater,
+	DeviceType.MediaPlayer,
+	DeviceType.Washer,
+	DeviceType.Dryer,
+	DeviceType.Dishwasher,
+	DeviceType.Vacuum,
+	DeviceType.LawnMower,
+	DeviceType.PetFeeder
+];
+/** Everything but a bare `Sensor`: a sensor that takes its reading from another sensor adds nothing. */
+var POWER_METER_CUSTOMIZE_DEVICE_TYPES = POWER_METER_DEVICE_TYPES.filter((type) => type !== DeviceType.Sensor);
+/** One scalar target per reading; each is sourced from a device of its own (D951). */
+function powerTarget(id, unit) {
+	return {
+		id,
+		cardinality: "scalar",
+		vocabulary: {
+			cap: "power-meter",
+			stateField: id
+		},
+		deviceTypes: POWER_METER_CUSTOMIZE_DEVICE_TYPES,
+		apply: "add",
+		path: id,
+		sources: [{
+			kind: "numeric",
+			requiredUnit: unit,
+			transforms: [{ kind: "identity" }]
+		}],
+		companions: [{
+			kind: "clock",
+			path: "lastFetchedAt",
+			when: "always"
+		}],
+		sourceReport: { status: "assignment-status" },
+		advancedExpression: true
+	};
+}
+/** "Power and energy" extension: watts, energy, voltage and current from other devices (D951). */
+var powerMeterCustomize = {
+	version: 1,
+	targets: [
+		powerTarget("watts", "W"),
+		powerTarget("kwhTotal", "kWh"),
+		powerTarget("volts", "V"),
+		powerTarget("amps", "A")
+	]
+};
 var powerMeterCapability = {
 	name: "power-meter",
 	scope: "device",
 	deviceNative: true,
 	mode: "singleton",
-	deviceTypes: [
-		DeviceType.Sensor,
-		DeviceType.Washer,
-		DeviceType.Dryer,
-		DeviceType.Dishwasher
-	],
+	deviceTypes: POWER_METER_DEVICE_TYPES,
 	methods: {},
 	status: {
 		schema: PowerMeterStatusSchema,
@@ -64979,7 +65052,8 @@ var powerMeterCapability = {
 	} },
 	/** Clock fields: written, but excluded from the compare that decides
 	*  whether persisting is worth a SQLite commit. */
-	volatileStateFields: ["lastFetchedAt"]
+	volatileStateFields: ["lastFetchedAt"],
+	customize: powerMeterCustomize
 };
 /**
 * Presence cap. Models HA `person.*` and `device_tracker.*` entities
@@ -70367,7 +70441,7 @@ method(object({}), array(TrainingBaseModelSchema).readonly(), { auth: "admin" })
 });
 DeviceFeature.FanSpeed, DeviceFeature.FanPreset, DeviceFeature.FanDirection, DeviceFeature.FanOscillating, DeviceFeature.CoverPositionable, DeviceFeature.CoverTilt, DeviceFeature.ValvePositionable, DeviceFeature.MediaPlayerVolume, DeviceFeature.ClimateFanMode;
 SOURCE_CAPS.filter((cap) => cap !== "switch" && cap !== "motion");
-DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
+DeviceType.Camera, DeviceType.Sensor, DeviceType.Button, DeviceType.Switch, DeviceType.PetFeeder, DeviceType.Container, DeviceType.Thermostat, DeviceType.EventEmitter, DeviceType.Camera, DeviceType.Hub, DeviceType.Light, DeviceType.Siren, DeviceType.Switch, DeviceType.Sensor, DeviceType.Thermostat, DeviceType.Climate, DeviceType.Button, DeviceType.EventEmitter, DeviceType.Update, DeviceType.Generic, DeviceType.Notifier, DeviceType.Script, DeviceType.Automation, DeviceType.Lock, DeviceType.Cover, DeviceType.Valve, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.Fan, DeviceType.MediaPlayer, DeviceType.AlarmPanel, DeviceType.Control, DeviceType.Presence, DeviceType.Weather, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.Container, DeviceType.Image, DeviceType.PetFeeder, DeviceType.Dishwasher, DeviceType.Washer, DeviceType.Dryer, DeviceType.Camera, DeviceType.Camera, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Switch, DeviceType.Light, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.Humidifier, DeviceType.WaterHeater, DeviceType.MediaPlayer, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.PetFeeder, DeviceType.Washer, DeviceType.Dryer, DeviceType.Dishwasher, DeviceType.Vacuum, DeviceType.LawnMower, DeviceType.MediaPlayer, DeviceType.WaterHeater, DeviceType.Humidifier, DeviceType.Fan, DeviceType.Climate, DeviceType.Thermostat, DeviceType.PetFeeder;
 String.raw`rose\(active(\d+), changed(\d+), (\d+(?:\.\d+)?)\)`;
 DeviceRole.BinarySensor, DeviceRole.MotionSensor;
 new Set(CAP_NAMES);
@@ -90090,37 +90164,78 @@ function toRecord(value) {
 function settingsToAlexaConnection(settings) {
 	return alexaConnectionSchema.parse(toRecord(settings));
 }
+/**
+* Allowlist of real Amazon regional domains that alexa-remote2 is known to
+* support. An enum (not a free-form string) keeps the value from ever naming an
+* arbitrary host: alexa-remote2 uses it as a raw domain suffix.
+*/
+var AMAZON_DOMAINS = [
+	"amazon.com",
+	"amazon.it",
+	"amazon.de",
+	"amazon.co.uk",
+	"amazon.fr",
+	"amazon.es",
+	"amazon.ca",
+	"amazon.com.au",
+	"amazon.co.jp",
+	"amazon.in",
+	"amazon.com.br",
+	"amazon.com.mx"
+];
+/** The country each domain serves; the first match for a country prefills the form. */
+var AMAZON_DOMAIN_BY_COUNTRY = {
+	US: "amazon.com",
+	IT: "amazon.it",
+	DE: "amazon.de",
+	AT: "amazon.de",
+	GB: "amazon.co.uk",
+	FR: "amazon.fr",
+	ES: "amazon.es",
+	CA: "amazon.ca",
+	AU: "amazon.com.au",
+	JP: "amazon.co.jp",
+	IN: "amazon.in",
+	BR: "amazon.com.br",
+	MX: "amazon.com.mx"
+};
 /** Hand-written connection form for the broker/integration creation UI. */
 function buildConnectionFormSchema() {
 	return { sections: [{
 		id: "alexa-account",
 		title: "Amazon Alexa account",
 		titleKey: "import-alexa:connection.s_alexa-account.title",
-		description: "Link an Amazon account via the unofficial Alexa client. Supply a captured cookie OR a refresh token. NOTE: this is an unofficial integration — Amazon can change or break it without notice, and it may violate Amazon ToS. State is polled, not pushed.",
+		description: "Sign in with your Amazon account to link it. This is an unofficial integration: Amazon can change or break it without notice, and it may violate Amazon ToS. State is polled, not pushed.",
 		descriptionKey: "import-alexa:connection.s_alexa-account.description",
 		columns: 1,
 		fields: [
 			{
-				type: "text",
+				type: "select",
 				key: "amazonDomain",
 				label: "Amazon domain (region)",
 				labelKey: "import-alexa:connection.s_alexa-account.amazonDomain.label",
-				placeholder: "amazon.com",
-				default: "amazon.com"
+				options: AMAZON_DOMAINS.map((value) => ({
+					value,
+					label: value
+				})),
+				default: "amazon.com",
+				defaultByCountry: AMAZON_DOMAIN_BY_COUNTRY
 			},
 			{
 				type: "password",
 				key: "cookie",
-				label: "Cookie blob (from proxy login)",
+				label: "Cookie blob (filled by the sign-in)",
 				labelKey: "import-alexa:connection.s_alexa-account.cookie.label",
-				showToggle: true
+				showToggle: true,
+				filledBySignIn: true
 			},
 			{
 				type: "password",
 				key: "refreshToken",
-				label: "Refresh token (alternative to cookie)",
+				label: "Refresh token (alternative to the sign-in)",
 				labelKey: "import-alexa:connection.s_alexa-account.refreshToken.label",
-				showToggle: true
+				showToggle: true,
+				filledBySignIn: true
 			},
 			{
 				type: "number",
@@ -128719,7 +128834,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = AlexaCookie();
 }));
 //#endregion
-//#region src/alexa-proxy-login.ts
+//#region ../../node_modules/alexa-remote2/package.json
 var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var https = require("https");
 	var querystring = require("querystring");
@@ -131337,6 +131452,76 @@ var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin
 	};
 	module.exports = AlexaRemote;
 })))());
+//#endregion
+//#region src/alexa-api-user-agent.ts
+/**
+* The `apiUserAgentPostfix` handed to every `alexa-remote2` `init`.
+*
+* Left unset, the library computes it with
+* `require(path.join(__dirname, 'package.json'))`. Bundled into `dist/addon.js`
+* that resolves to the addon's own `dist/`, where no `package.json` exists, and
+* `init` throws "Cannot find module …/dist/package.json". Setting it here keeps
+* the library's own value (`AlexaRemote/<version>`), read at build time.
+*/
+var ALEXA_API_USER_AGENT_POSTFIX = `AlexaRemote/${{
+	name: "alexa-remote2",
+	version: "8.0.4",
+	description: "Remote Control for amazon echo devices",
+	author: {
+		"name": "Apollon77",
+		"email": "iobroker@fischer-ka.de"
+	},
+	contributors: [
+		{
+			"name": "soef",
+			"email": "soef@gmx.net"
+		},
+		{
+			"name": "Apollon77",
+			"email": "iobroker@fischer-ka.de"
+		},
+		{
+			"name": "bbindreiter",
+			"email": "bernd.bindreiter@gmail.com"
+		}
+	],
+	homepage: "https://github.com/Apollon77/alexa-remote",
+	license: "MIT",
+	keywords: [
+		"alexa",
+		"echo",
+		"alexa remote",
+		"layla.amazon.de"
+	],
+	dependencies: {
+		"alexa-cookie2": "^5.0.3",
+		"https": "^1.0.0",
+		"querystring": "^0.2.1",
+		"ws": "^8.18.3",
+		"extend": "^3.0.2",
+		"uuid": "^11.1.0"
+	},
+	devDependencies: {
+		"@alcalzone/release-script": "^5.0.0",
+		"@alcalzone/release-script-plugin-license": "^4.0.0",
+		"eslint": "^8.57.1"
+	},
+	scripts: {
+		"test": "node node_modules/mocha/bin/mocha",
+		"release": "release-script"
+	},
+	repository: {
+		"type": "git",
+		"url": "git+https://github.com/Apollon77/alexa-remote.git"
+	},
+	bugs: { "url": "https://github.com/Apollon77/alexa-remote/issues" },
+	engines: { "node": ">=16.0.0" },
+	types: "alexa-remote.d.ts",
+	main: "alexa-remote.js",
+	readmeFilename: "readme.md"
+}.version}`;
+//#endregion
+//#region src/alexa-proxy-login.ts
 /**
 * A single interactive proxy-login attempt. One instance = one Amazon login.
 * Construct → {@link start} → poll {@link getStatus} → on `captured` the
@@ -131393,6 +131578,7 @@ var AlexaProxyLoginSession = class {
 			proxyPort: this.#opts.proxyPort,
 			proxyLogLevel: "warn",
 			amazonPage,
+			apiUserAgentPostfix: ALEXA_API_USER_AGENT_POSTFIX,
 			logger: (...args) => {
 				const line = args.map(String).join(" ");
 				if (SECRET_LINE_RE.test(line)) return;
@@ -131611,20 +131797,25 @@ function capturedToCookieString(captured) {
 }
 //#endregion
 //#region src/alexa-login-routes.ts
-var StartBodySchema = object({ amazonDomain: _enum([
-	"amazon.com",
-	"amazon.it",
-	"amazon.de",
-	"amazon.co.uk",
-	"amazon.fr",
-	"amazon.es",
-	"amazon.ca",
-	"amazon.com.au",
-	"amazon.co.jp",
-	"amazon.in",
-	"amazon.com.br",
-	"amazon.com.mx"
-]).default("amazon.com") });
+/**
+* `addon-routes` control plane that drives the INTERACTIVE Amazon login from the
+* broker dialog (the kind's `signIn` contract). All routes are `admin` — they start a proxy server and
+* mutate broker credentials, so they require an admin session/scoped token (the
+* hub enforces this BEFORE the handler runs; see `main.ts` `/addon/:addonId/*`).
+*
+* Public URLs (hub reachable as `https://<hub>`):
+*   POST /addon/import-alexa/login/start    { amazonDomain }            → { sessionId, loginUrl }
+*   GET  /addon/import-alexa/login/status?sessionId=…                   → AlexaProxyLoginStatus (no secrets)
+*   POST /addon/import-alexa/login/commit    { sessionId, name, brokerId? } → { brokerId }
+*   POST /addon/import-alexa/login/cancel    { sessionId }              → { ok: true }
+*
+* The wizard flow: POST /login/start → render a "Login to Amazon" button linking
+* to `loginUrl` (opened in a new tab) → poll /login/status until
+* `phase === 'captured'` → POST /login/commit to persist the cookie onto a new
+* or existing broker → proceed to device discovery/adoption.
+*/
+/** The broker dialog posts the whole form; only the region matters here (other keys are ignored). */
+var StartBodySchema = object({ amazonDomain: _enum(AMAZON_DOMAINS).default("amazon.com") });
 var StatusQuerySchema = object({ sessionId: string().min(1) });
 var CommitBodySchema = object({
 	sessionId: string().min(1),
@@ -132107,12 +132298,14 @@ var AlexaRemoteClient = class {
 		if (persisted !== null) return {
 			cookie: persisted.cookieData,
 			proxyOnly: false,
-			amazonPage
+			amazonPage,
+			apiUserAgentPostfix: ALEXA_API_USER_AGENT_POSTFIX
 		};
 		if (creds.cookie !== void 0 && creds.cookie.length > 0) return {
 			cookie: parseCookieMaterial(creds.cookie),
 			proxyOnly: false,
-			amazonPage
+			amazonPage,
+			apiUserAgentPostfix: ALEXA_API_USER_AGENT_POSTFIX
 		};
 		if (creds.refreshToken !== void 0 && creds.refreshToken.length > 0) throw new AlexaAuthError("a bare refresh token is not sufficient — supply the full cookie / cookieData blob captured by the alexa-remote2 proxy login (it embeds the refresh token)");
 		throw new AlexaAuthError("no cookie or cookieData blob configured for this account");
@@ -132728,7 +132921,8 @@ function buildAlexaBrokerProvider(deps) {
 			addonId: ownerAddonId,
 			kinds: [{
 				kind: ALEXA_KIND,
-				label: "Alexa Import"
+				label: "Alexa Import",
+				signIn: { basePath: "/addon/import-alexa/login" }
 			}]
 		}],
 		add: async ({ kind, name, settings }) => {