@camstack/addon-import-alexa 0.2.157 → 0.2.158

package/CHANGELOG.md

@@ -7,11 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.158] - 2026-10-27
+
+### Fixed
+
+- Alexa sign-in follows Amazon's current login pages
+
 ## [0.2.157] - 2026-10-27
 
 ### Fixed
 
 - Amazon sign-in for the Alexa broker can be retried after a cancelled attempt, and the sign-in link now uses the hub's LAN address from the Network page instead of the first network interface
+- Alexa sign-in follows Amazon's current login pages (library update)
 
 ## [0.2.156] - 2026-10-27
 

package/dist/addon.js

@@ -128426,7 +128426,7 @@ var require_fix_request_body = /* @__PURE__ */ __commonJSMin(((exports) => {
 	* Fix proxied body if bodyParser is involved.
 	*/
 	function fixRequestBody(proxyReq, req) {
-		if (req.readableLength !== 0) return;
+		if (!req.readableEnded) return;
 		const requestBody = req.body;
 		if (!requestBody) return;
 		const contentType = proxyReq.getHeader("Content-Type");
@@ -128521,6 +128521,12 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var path$2 = require("path");
 	var crypto$1 = require("crypto");
 	var FORMERDATA_STORE_VERSION = 4;
+	var ALEXA_APP_VERSION = "2.2.651540.0";
+	var EXTRA_AMAZON_PROXY_HOSTS = [
+		"amazon.com",
+		"www.amazon.com",
+		"alexa.amazon.com"
+	];
 	function addCookies(Cookie, headers) {
 		if (!headers || !headers["set-cookie"]) return Cookie;
 		const cookies = cookieTools.parse(Cookie);
@@ -128536,6 +128542,15 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		Cookie = Cookie.replace(/[; ]*$/, "");
 		return Cookie;
 	}
+	function isAmazonCookieName(name) {
+		return /^(session-id|session-id-time|session-token|ubid-.+|lc-.+|x-.+|at-.+|sess-at-.+|frc|map-md|csrf|sid|csm-hit|i18n-prefs|sp-cdn|skin)$/.test(name);
+	}
+	function sanitizeAmazonCookie(cookie) {
+		const cookies = cookieTools.parse(cookie || "");
+		let sanitizedCookie = "";
+		for (const name of Object.keys(cookies)) if (isAmazonCookieName(name)) sanitizedCookie += `${name}=${cookies[name]}; `;
+		return sanitizedCookie.replace(/[; ]*$/, "");
+	}
 	function customStringify(v, func, intent) {
 		const cache = /* @__PURE__ */ new Map();
 		return JSON.stringify(v, function(key, value) {
@@ -128549,6 +128564,29 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	}
 	function initAmazonProxy(_options, callbackCookie, callbackListening) {
 		const initialCookies = {};
+		const proxyBase = () => `http://${_options.proxyOwnIp}:${_options.proxyPort}/`;
+		const defaultAmazonHost = `www.${_options.baseAmazonPage}`;
+		const amazonProxyHosts = [];
+		function escapeRegex(data) {
+			return data.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		}
+		function addAmazonProxyHost(host) {
+			if (host && !amazonProxyHosts.includes(host)) amazonProxyHosts.push(host);
+		}
+		addAmazonProxyHost(defaultAmazonHost);
+		addAmazonProxyHost(`alexa.${_options.baseAmazonPage}`);
+		addAmazonProxyHost(_options.baseAmazonPage);
+		EXTRA_AMAZON_PROXY_HOSTS.forEach(addAmazonProxyHost);
+		function amazonHostFromProxyPath(url) {
+			const match = (url || "").match(/^\/([^/?#]+)(?:[/?#]|$)/);
+			if (match && amazonProxyHosts.includes(match[1])) return match[1];
+			return null;
+		}
+		function amazonHostFromProxyUrl(url) {
+			if (!url) return null;
+			for (const host of amazonProxyHosts) if (url === `${proxyBase()}${host}` || url.startsWith(`${proxyBase()}${host}/`)) return host;
+			return null;
+		}
 		const formerDataStorePath = _options.formerDataStorePath || path$2.join(__dirname, "formerDataStore.json");
 		let formerDataStoreValid = false;
 		if (!_options.formerRegistrationData) try {
@@ -128572,7 +128610,7 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			_options.logger && _options.logger("Proxy Init: reuse frc from former data");
 			initialCookies.frc = _options.formerRegistrationData.frc;
 		}
-		if (!_options.formerRegistrationData || !_options.formerRegistrationData["map-md"]) initialCookies["map-md"] = Buffer.from("{\"device_user_dictionary\":[],\"device_registration_data\":{\"software_version\":\"1\"},\"app_identifier\":{\"app_version\":\"2.2.485407\",\"bundle_id\":\"com.amazon.echo\"}}").toString("base64");
+		if (!_options.formerRegistrationData || !_options.formerRegistrationData["map-md"]) initialCookies["map-md"] = Buffer.from(`{"device_user_dictionary":[],"device_registration_data":{"software_version":"1"},"app_identifier":{"app_version":"${ALEXA_APP_VERSION}","bundle_id":"com.amazon.echo"}}`).toString("base64");
 		else {
 			_options.logger && _options.logger("Proxy Init: reuse map-md from former data");
 			initialCookies["map-md"] = _options.formerRegistrationData["map-md"];
@@ -128605,11 +128643,49 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const code_verifier = base64URLEncode(crypto$1.randomBytes(32));
 		const code_challenge = base64URLEncode(sha256(code_verifier));
 		let proxyCookies = "";
+		let returnedInitUrl;
+		function buildInitialUrl() {
+			return `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
+		}
+		function fixEmbeddedProxyUrls(pathAndQuery) {
+			const qIndex = pathAndQuery.indexOf("?");
+			if (qIndex === -1) return pathAndQuery;
+			const p = pathAndQuery.slice(0, qIndex);
+			const qs = pathAndQuery.slice(qIndex + 1);
+			let params;
+			try {
+				params = new URLSearchParams(qs);
+			} catch (_e) {
+				return pathAndQuery;
+			}
+			let changed = false;
+			for (const key of params.keys()) {
+				const value = params.get(key);
+				const fixed = replaceHostsBack(value);
+				if (fixed !== value) {
+					params.set(key, fixed);
+					changed = true;
+				}
+			}
+			if (changed) _options.logger && _options.logger(`Alexa-Cookie: Fixed embedded proxy URL(s) in outgoing request query`);
+			return changed ? `${p}?${params.toString()}` : pathAndQuery;
+		}
+		function rewriteProxyPath(url, req) {
+			let result;
+			const urlHost = amazonHostFromProxyPath(url);
+			if (urlHost) result = url.replace(new RegExp(`^/${escapeRegex(urlHost)}`), "") || "/";
+			else if (req && req.headers && req.headers.host === `${_options.proxyOwnIp}:${_options.proxyPort}` && url === "/") {
+				const initialUrl = returnedInitUrl || buildInitialUrl();
+				const parsed = new URL(initialUrl);
+				result = `${parsed.pathname}${parsed.search}`;
+			} else result = url;
+			return fixEmbeddedProxyUrls(result);
+		}
 		const optionsAlexa = {
 			target: `https://alexa.${_options.baseAmazonPage}`,
 			changeOrigin: true,
 			ws: false,
-			pathRewrite: {},
+			pathRewrite: rewriteProxyPath,
 			router,
 			hostRewrite: true,
 			followRedirects: false,
@@ -128617,17 +128693,10 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			onError,
 			onProxyRes,
 			onProxyReq,
-			headers: {
-				"user-agent": "AppleWebKit PitanguiBridge/2.2.485407.0-[HARDWARE=iPhone10_4][SOFTWARE=15.5][DEVICE=iPhone]",
-				"accept-language": _options.acceptLanguage,
-				"authority": `www.${_options.baseAmazonPage}`
-			},
-			cookieDomainRewrite: { "*": "" }
+			headers: { "accept-language": _options.acceptLanguage },
+			cookieDomainRewrite: { "*": "" },
+			cookiePathRewrite: { "*": "/" }
 		};
-		optionsAlexa.pathRewrite[`^/www.${_options.baseAmazonPage}`] = "";
-		optionsAlexa.pathRewrite[`^/alexa.${_options.baseAmazonPage}`] = "";
-		optionsAlexa.cookieDomainRewrite[`.${_options.baseAmazonPage}`] = _options.proxyOwnIp;
-		optionsAlexa.cookieDomainRewrite[_options.baseAmazonPage] = _options.proxyOwnIp;
 		if (_options.logger) optionsAlexa.logProvider = function logProvider() {
 			return {
 				log: _options.logger.log || _options.logger,
@@ -128637,22 +128706,20 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				error: _options.logger.error || _options.logger
 			};
 		};
-		let returnedInitUrl;
 		function router(req) {
 			const url = req.originalUrl || req.url;
 			_options.logger && _options.logger(`Router: ${url} / ${req.method} / ${JSON.stringify(req.headers)}`);
 			if (req.headers.host === `${_options.proxyOwnIp}:${_options.proxyPort}`) {
-				if (url.startsWith(`/www.${_options.baseAmazonPage}/`)) return `https://www.${_options.baseAmazonPage}`;
-				else if (url.startsWith(`/alexa.${_options.baseAmazonPage}/`)) return `https://alexa.${_options.baseAmazonPage}`;
-				else if (req.headers.referer) {
-					if (req.headers.referer.startsWith(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`)) return `https://www.${_options.baseAmazonPage}`;
-					else if (req.headers.referer.startsWith(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`)) return `https://alexa.${_options.baseAmazonPage}`;
-				}
+				const urlHost = amazonHostFromProxyPath(url);
+				if (urlHost) return `https://${urlHost}`;
+				const refererHost = amazonHostFromProxyUrl(req.headers.referer);
+				if (refererHost) return `https://${refererHost}`;
 				if (url === "/") {
-					returnedInitUrl = `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
+					returnedInitUrl = buildInitialUrl();
 					_options.logger && _options.logger(`Alexa-Cookie: Initial Page Request: ${returnedInitUrl}`);
-					return returnedInitUrl;
-				} else return `https://www.${_options.baseAmazonPage}`;
+					const parsedInitUrl = new URL(returnedInitUrl);
+					return `${parsedInitUrl.protocol}//${parsedInitUrl.host}`;
+				} else return `https://${defaultAmazonHost}`;
 			}
 			return `https://alexa.${_options.baseAmazonPage}`;
 		}
@@ -128664,21 +128731,34 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			} catch (err) {}
 		}
 		function replaceHosts(data) {
-			const amazonRegex = new RegExp(`https?://www.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), "g");
-			const alexaRegex = new RegExp(`https?://alexa.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), "g");
 			data = data.replace(///g, "/");
-			data = data.replace(amazonRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`);
-			data = data.replace(alexaRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`);
+			for (const host of amazonProxyHosts) {
+				const hostRegex = new RegExp(`https?://${escapeRegex(host)}:?[0-9]*/`, "g");
+				data = data.replace(hostRegex, `${proxyBase()}${host}/`);
+			}
 			return data;
 		}
 		function replaceHostsBack(data) {
-			const amazonRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), "g");
-			const alexaRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), "g");
-			data = data.replace(amazonRegex, `https://www.${_options.baseAmazonPage}/`);
-			data = data.replace(alexaRegex, `https://alexa.${_options.baseAmazonPage}/`);
-			if (data === `http://${_options.proxyOwnIp}:${_options.proxyPort}/`) data = returnedInitUrl;
+			const base = proxyBase();
+			for (const host of amazonProxyHosts) {
+				const hostRegex = new RegExp(`${escapeRegex(base)}${escapeRegex(host)}/`, "g");
+				data = data.replace(hostRegex, `https://${host}/`);
+			}
+			if (data === base) data = returnedInitUrl;
+			else if (data.startsWith(base)) data = `https://${defaultAmazonHost}/${data.slice(base.length)}`;
 			return data;
 		}
+		function parseQueryParams(data) {
+			const paramStart = data && data.indexOf("?");
+			if (paramStart === -1 || paramStart === void 0) return {};
+			return querystring$2.parse(data.substr(paramStart + 1));
+		}
+		function isProxySuccessUrl(data) {
+			if (!data) return false;
+			if (data.includes("/spa/index.html")) return true;
+			if (!data.includes("/ap/maplanding?")) return false;
+			return !!parseQueryParams(data)["openid.oa2.authorization_code"];
+		}
 		function onProxyReq(proxyReq, req) {
 			const url = req.originalUrl || req.url;
 			if (url.endsWith(".ico") || url.endsWith(".js") || url.endsWith(".ttf") || url.endsWith(".svg") || url.endsWith(".png") || url.endsWith(".appcache")) return;
@@ -128705,14 +128785,26 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					}
 				}
 				if (typeof proxyReq.getHeader === "function" && proxyReq.getHeader("origin") !== `https://${proxyReq.getHeader("host")}`) {
-					proxyReq.setHeader("origin", `https://www.${_options.baseAmazonPage}`);
-					_options.logger && _options.logger("Alexa-Cookie: Modify headers: Delete Origin");
+					proxyReq.setHeader("origin", `https://${proxyReq.getHeader("host") || defaultAmazonHost}`);
+					_options.logger && _options.logger("Alexa-Cookie: Modify headers: Changed Origin");
 					modified = true;
 				}
-				let postBody = "";
-				req.on("data", (chunk) => {
-					postBody += chunk.toString();
-				});
+				if (req.body && typeof req.body === "object") {
+					let bodyChanged = false;
+					for (const key of Object.keys(req.body)) {
+						const value = req.body[key];
+						if (typeof value !== "string") continue;
+						const fixed = replaceHostsBack(value);
+						if (fixed !== value) {
+							req.body[key] = fixed;
+							bodyChanged = true;
+						}
+					}
+					if (bodyChanged) _options.logger && _options.logger("Alexa-Cookie: Fixed embedded proxy URL(s) in outgoing POST body");
+					const bodyData = querystring$2.stringify(req.body);
+					proxyReq.setHeader("Content-Length", Buffer.byteLength(bodyData));
+					proxyReq.write(bodyData);
+				}
 			}
 			_options.proxyLogLevel === "debug" && _options.logger && _options.logger(`Alexa-Cookie: Proxy-Request: (modified:${modified})${customStringify(proxyReq, null, 2)}`);
 		}
@@ -128730,17 +128822,22 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				proxyCookies = addCookies(proxyCookies, proxyRes.headers);
 			}
 			_options.logger && _options.logger(`Alexa-Cookie: Cookies handled: ${JSON.stringify(proxyCookies)}`);
-			if (proxyRes.socket && proxyRes.socket._host === `www.${_options.baseAmazonPage}` && proxyRes.socket.parser.outgoing && proxyRes.socket.parser.outgoing.method === "GET" && proxyRes.socket.parser.outgoing.path.startsWith("/ap/maplanding") || proxyRes.socket && proxyRes.socket.parser.outgoing && proxyRes.socket.parser.outgoing.getHeader("location") && proxyRes.socket.parser.outgoing.getHeader("location").includes("/ap/maplanding?") || proxyRes.headers.location && (proxyRes.headers.location.includes("/ap/maplanding?") || proxyRes.headers.location.includes("/spa/index.html"))) {
+			const outgoing = proxyRes.socket && proxyRes.socket.parser && proxyRes.socket.parser.outgoing;
+			const successUrl = [
+				proxyRes.headers.location,
+				outgoing && outgoing.method === "GET" && outgoing.path,
+				outgoing && outgoing.getHeader && outgoing.getHeader("location")
+			].find(isProxySuccessUrl);
+			if (successUrl) {
 				_options.logger && _options.logger("Alexa-Cookie: Proxy detected SUCCESS!!");
-				const paramStart = proxyRes.headers.location.indexOf("?");
-				const queryParams = querystring$2.parse(proxyRes.headers.location.substr(paramStart + 1));
+				const queryParams = parseQueryParams(successUrl);
 				proxyRes.statusCode = 302;
 				proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/cookie-success`;
 				delete proxyRes.headers.referer;
 				_options.logger && _options.logger(`Alexa-Cookie: Proxy catched cookie: ${proxyCookies}`);
 				_options.logger && _options.logger(`Alexa-Cookie: Proxy catched parameters: ${JSON.stringify(queryParams)}`);
 				callbackCookie && callbackCookie(null, {
-					"loginCookie": proxyCookies,
+					"loginCookie": sanitizeAmazonCookie(proxyCookies),
 					"authorization_code": queryParams["openid.oa2.authorization_code"],
 					"frc": initialCookies.frc,
 					"map-md": initialCookies["map-md"],
@@ -128752,7 +128849,7 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (proxyRes.headers.location) {
 				_options.logger && _options.logger(`Redirect: Original Location ----> ${proxyRes.headers.location}`);
 				proxyRes.headers.location = replaceHosts(proxyRes.headers.location);
-				if (reqestHost && proxyRes.headers.location.startsWith("/")) proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/${reqestHost}${proxyRes.headers.location}`;
+				if (reqestHost && amazonProxyHosts.includes(reqestHost) && proxyRes.headers.location.startsWith("/")) proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/${reqestHost}${proxyRes.headers.location}`;
 				_options.logger && _options.logger(`Redirect: Final Location ----> ${proxyRes.headers.location}`);
 				return;
 			}
@@ -128770,8 +128867,21 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				return body;
 			});
 		}
+		function bufferUrlencodedBody(req, res, next) {
+			const contentType = req.headers["content-type"] || "";
+			if (req.method !== "POST" || contentType.indexOf("application/x-www-form-urlencoded") === -1) return next();
+			let raw = "";
+			req.on("data", (chunk) => {
+				raw += chunk;
+			});
+			req.on("end", () => {
+				req.body = querystring$2.parse(raw);
+				next();
+			});
+		}
 		const myProxy = proxy("!/cookie-success", optionsAlexa);
 		const app = express();
+		app.use(bufferUrlencodedBody);
 		app.use(myProxy);
 		app.get("/cookie-success", function(req, res) {
 			res.send(_options.proxyCloseWindowHTML);
@@ -128781,7 +128891,8 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			_options.proxyPort = void 0;
 		}
 		const server = app.listen(_options.proxyPort, _options.proxyListenBind, function() {
-			_options.logger && _options.logger(`Alexa-Cookie: Proxy-Server listening on port ${server.address().port}`);
+			_options.proxyPort = this.address().port;
+			_options.logger && _options.logger(`Alexa-Cookie: Proxy-Server listening on port ${_options.proxyPort}`);
 			callbackListening && callbackListening(server);
 			callbackListening = null;
 		}).on("error", (err) => {
@@ -128827,6 +128938,13 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		let proxyServer;
 		let _options;
 		let Cookie = "";
+		const isAmazonCookieName = (name) => /^(session-id|session-id-time|session-token|ubid-.+|lc-.+|x-.+|at-.+|sess-at-.+|frc|map-md|csrf|sid|csm-hit|i18n-prefs|sp-cdn|skin)$/.test(name);
+		const sanitizeAmazonCookie = (cookie) => {
+			const cookies = cookieTools.parse(cookie || "");
+			let sanitizedCookie = "";
+			for (const name of Object.keys(cookies)) if (isAmazonCookieName(name)) sanitizedCookie += `${name}=${cookies[name]}; `;
+			return sanitizedCookie.replace(/[; ]*$/, "");
+		};
 		const addCookies = (Cookie, headers) => {
 			if (!headers || !headers["set-cookie"]) return Cookie;
 			const cookies = cookieTools.parse(Cookie || "");
@@ -128914,7 +129032,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (!_options.baseAmazonPageHandle && _options.baseAmazonPageHandle !== "") {
 				const amazonDomain = _options.baseAmazonPage.substr(_options.baseAmazonPage.lastIndexOf(".") + 1);
 				if (amazonDomain === "jp") _options.baseAmazonPageHandle = `_${amazonDomain}`;
-				else if (amazonDomain !== "com") _options.baseAmazonPageHandle = "";
+				else if (amazonDomain !== "com") _options.baseAmazonPageHandle = `_${amazonDomain}`;
 				else _options.baseAmazonPageHandle = "";
 			}
 			if (!_options.userAgent) if (os$1.platform() === "win32") _options.userAgent = defaultUserAgent;
@@ -128941,7 +129059,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (_options.formerRegistrationData) _options.proxyOnly = true;
 		};
 		const getCSRFFromCookies = (cookie, _options, callback) => {
-			const csrfUrls = csrfOptions;
+			const csrfUrls = [...csrfOptions];
 			function csrfTry() {
 				const path = csrfUrls.shift();
 				const options = {
@@ -129104,6 +129222,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const handleTokenRegistration = (_options, loginData, callback) => {
 			_options.logger && _options.logger(`Handle token registration Start: ${JSON.stringify(loginData)}`);
 			loginData.deviceAppName = _options.deviceAppName;
+			loginData.loginCookie = sanitizeAmazonCookie(loginData.loginCookie);
 			let deviceSerial;
 			if (!_options.formerRegistrationData || !_options.formerRegistrationData.deviceSerial) {
 				const deviceSerialBuffer = Buffer.alloc(16);
@@ -129191,6 +129310,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				Cookie = addCookies(Cookie, response.headers);
 				loginData.refreshToken = body.response.success.tokens.bearer.refresh_token;
 				const accessToken = body.response.success.tokens.bearer.access_token;
+				loginData.accessToken = accessToken;
 				loginData.tokenDate = Date.now();
 				loginData.macDms = body.response.success.tokens.mac_dms;
 				if (body.response.success.tokens.website_cookies && Array.isArray(body.response.success.tokens.website_cookies)) {
@@ -129217,29 +129337,43 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					_options.logger && _options.logger("Alexa-Cookie: Get User data");
 					_options.logger && _options.logger(JSON.stringify(options));
 					request(options, (error, response, body) => {
-						if (!error) {
+						if (!error) if (!response || response.statusCode < 200 || response.statusCode >= 300 || !body) {
+							_options.logger && _options.logger(`Get User data Response: status=${response && response.statusCode}, body=${JSON.stringify(body)}`);
+							if (!_options.amazonPage) {
+								callback && callback(/* @__PURE__ */ new Error(`Could not get user data from Amazon: HTTP ${response && response.statusCode}`), null);
+								return;
+							}
+							loginData.amazonPage = _options.amazonPage;
+						} else {
 							try {
 								if (typeof body !== "object") body = JSON.parse(body);
 							} catch (err) {
 								_options.logger && _options.logger(`Get User data Response: ${JSON.stringify(body)}`);
-								callback && callback(err, null);
-								return;
+								if (!_options.amazonPage) {
+									callback && callback(err, null);
+									return;
+								}
+								loginData.amazonPage = _options.amazonPage;
 							}
 							_options.logger && _options.logger(`Get User data Response: ${JSON.stringify(body)}`);
 							Cookie = addCookies(Cookie, response.headers);
-							if (body.marketPlaceDomainName) {
+							if (body && body.marketPlaceDomainName) {
 								const pos = body.marketPlaceDomainName.indexOf(".");
 								if (pos !== -1) _options.amazonPage = body.marketPlaceDomainName.substr(pos + 1);
 							}
 							loginData.amazonPage = _options.amazonPage;
-						} else if (error && (!_options || !_options.amazonPage)) {
+						}
+						else if (error && (!_options || !_options.amazonPage)) {
 							callback && callback(error, null);
 							return;
 						} else if (error && (!_options.formerRegistrationData || !_options.formerRegistrationData.amazonPage) && _options.amazonPage) _options.logger && _options.logger(`Continue with externally set amazonPage: ${_options.amazonPage}`);
 						else if (error) _options.logger && _options.logger("Ignore error while getting user data and amazonPage because previously set amazonPage is available");
 						loginData.loginCookie = Cookie;
 						getLocalCookies(loginData.amazonPage, loginData.refreshToken, (err, localCookie) => {
-							if (err) callback && callback(err, null);
+							if (err) {
+								callback && callback(err, null);
+								return;
+							}
 							loginData.localCookie = localCookie;
 							getCSRFFromCookies(loginData.localCookie, _options, (err, resData) => {
 								if (err) {
@@ -129248,7 +129382,6 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 								}
 								loginData.localCookie = resData.cookie;
 								loginData.csrf = resData.csrf;
-								delete loginData.accessToken;
 								delete loginData.authorization_code;
 								delete loginData.verifier;
 								loginData.dataVersion = 2;
@@ -129351,6 +129484,39 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				callback && callback(null, localCookie);
 			});
 		};
+		const finishCookieRefresh = (loginData, callback) => {
+			_options.logger && _options.logger("Alexa-Cookie: Skip App registration during refresh and update local cookies");
+			const updateLocalCookies = () => {
+				const amazonPage = loginData.amazonPage || _options.amazonPage;
+				getLocalCookies(amazonPage, loginData.refreshToken, (err, localCookie) => {
+					if (err) {
+						callback && callback(err, null);
+						return;
+					}
+					loginData.localCookie = localCookie;
+					getCSRFFromCookies(loginData.localCookie, _options, (err, resData) => {
+						if (err) {
+							callback && callback(/* @__PURE__ */ new Error(`Error getting csrf for ${amazonPage}`), null);
+							return;
+						}
+						loginData.localCookie = resData.cookie;
+						loginData.csrf = resData.csrf;
+						loginData.amazonPage = amazonPage;
+						loginData.tokenDate = Date.now();
+						delete loginData.authorization_code;
+						delete loginData.verifier;
+						loginData.dataVersion = 2;
+						_options.logger && _options.logger("Alexa-Cookie: Refresh finished with updated cookies and csrf");
+						callback && callback(null, loginData);
+					});
+				});
+			};
+			if (loginData.accessToken) {
+				registerTokenCapabilities(loginData.accessToken, updateLocalCookies);
+				return;
+			}
+			updateLocalCookies();
+		};
 		this.refreshAlexaCookie = (__options, callback) => {
 			if (!__options || !__options.formerRegistrationData || !__options.formerRegistrationData.loginCookie || !__options.formerRegistrationData.refreshToken) {
 				callback && callback(/* @__PURE__ */ new Error("No former registration data provided for Cookie Refresh"), null);
@@ -129417,13 +129583,16 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				_options.formerRegistrationData.loginCookie = addCookies(Cookie, response.headers);
 				_options.formerRegistrationData.accessToken = body.access_token;
 				getLocalCookies(_options.baseAmazonPage, _options.formerRegistrationData.refreshToken, (err, comCookie) => {
-					if (err) callback && callback(err, null);
+					if (err) {
+						callback && callback(err, null);
+						return;
+					}
 					const initCookies = cookieTools.parse(_options.formerRegistrationData.loginCookie);
 					let newCookie = `frc=${initCookies.frc}; `;
 					newCookie += `map-md=${initCookies["map-md"]}; `;
 					newCookie += comCookie;
-					_options.formerRegistrationData.loginCookie = newCookie;
-					handleTokenRegistration(_options, _options.formerRegistrationData, callback);
+					_options.formerRegistrationData.loginCookie = sanitizeAmazonCookie(newCookie);
+					finishCookieRefresh(_options.formerRegistrationData, callback);
 				});
 			});
 		};
@@ -130018,10 +130187,20 @@ var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin
 							listItemId: payload.listItemId
 						});
 						return;
+					case "NotifyNowPlayingUpdated":
+						const nowPlaying = payload?.update?.update?.nowPlayingData ?? null;
+						this.emit("ws-now-playing-updated", {
+							customerId: payload?.customerId ?? null,
+							taskSessionId: payload?.update?.taskSessionId ?? null,
+							cause: payload?.update?.update?.cause ?? null,
+							mediaId: nowPlaying?.mediaId ?? null,
+							playerState: nowPlaying?.playerState ?? null,
+							nowPlayingData: nowPlaying
+						});
+						return;
 					case "PUSH_MICROPHONE_STATE":
 					case "PUSH_DELETE_DOPPLER_ACTIVITIES":
 					case "PUSH_DEVICE_SETUP_STATE_CHANGE":
-					case "NotifyNowPlayingUpdated":
 					case "NotifyMediaSessionsUpdated": return;
 				}
 				this.emit("ws-unknown-command", command, payload);
@@ -132068,7 +132247,7 @@ var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin
 */
 var ALEXA_API_USER_AGENT_POSTFIX = `AlexaRemote/${{
 	name: "alexa-remote2",
-	version: "8.0.4",
+	version: "8.1.1",
 	description: "Remote Control for amazon echo devices",
 	author: {
 		"name": "Apollon77",
@@ -132097,16 +132276,16 @@ var ALEXA_API_USER_AGENT_POSTFIX = `AlexaRemote/${{
 		"layla.amazon.de"
 	],
 	dependencies: {
-		"alexa-cookie2": "^5.0.3",
+		"alexa-cookie2": "^5.0.6",
 		"https": "^1.0.0",
 		"querystring": "^0.2.1",
-		"ws": "^8.18.3",
+		"ws": "^8.21.0",
 		"extend": "^3.0.2",
-		"uuid": "^11.1.0"
+		"uuid": "^11.1.1"
 	},
 	devDependencies: {
-		"@alcalzone/release-script": "^5.0.0",
-		"@alcalzone/release-script-plugin-license": "^4.0.0",
+		"@alcalzone/release-script": "^5.2.1",
+		"@alcalzone/release-script-plugin-license": "^5.2.0",
 		"eslint": "^8.57.1"
 	},
 	scripts: {

package/dist/addon.mjs

@@ -128425,7 +128425,7 @@ var require_fix_request_body = /* @__PURE__ */ __commonJSMin(((exports) => {
 	* Fix proxied body if bodyParser is involved.
 	*/
 	function fixRequestBody(proxyReq, req) {
-		if (req.readableLength !== 0) return;
+		if (!req.readableEnded) return;
 		const requestBody = req.body;
 		if (!requestBody) return;
 		const contentType = proxyReq.getHeader("Content-Type");
@@ -128520,6 +128520,12 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var path$2 = __require("path");
 	var crypto$1 = __require("crypto");
 	var FORMERDATA_STORE_VERSION = 4;
+	var ALEXA_APP_VERSION = "2.2.651540.0";
+	var EXTRA_AMAZON_PROXY_HOSTS = [
+		"amazon.com",
+		"www.amazon.com",
+		"alexa.amazon.com"
+	];
 	function addCookies(Cookie, headers) {
 		if (!headers || !headers["set-cookie"]) return Cookie;
 		const cookies = cookieTools.parse(Cookie);
@@ -128535,6 +128541,15 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		Cookie = Cookie.replace(/[; ]*$/, "");
 		return Cookie;
 	}
+	function isAmazonCookieName(name) {
+		return /^(session-id|session-id-time|session-token|ubid-.+|lc-.+|x-.+|at-.+|sess-at-.+|frc|map-md|csrf|sid|csm-hit|i18n-prefs|sp-cdn|skin)$/.test(name);
+	}
+	function sanitizeAmazonCookie(cookie) {
+		const cookies = cookieTools.parse(cookie || "");
+		let sanitizedCookie = "";
+		for (const name of Object.keys(cookies)) if (isAmazonCookieName(name)) sanitizedCookie += `${name}=${cookies[name]}; `;
+		return sanitizedCookie.replace(/[; ]*$/, "");
+	}
 	function customStringify(v, func, intent) {
 		const cache = /* @__PURE__ */ new Map();
 		return JSON.stringify(v, function(key, value) {
@@ -128548,6 +128563,29 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	}
 	function initAmazonProxy(_options, callbackCookie, callbackListening) {
 		const initialCookies = {};
+		const proxyBase = () => `http://${_options.proxyOwnIp}:${_options.proxyPort}/`;
+		const defaultAmazonHost = `www.${_options.baseAmazonPage}`;
+		const amazonProxyHosts = [];
+		function escapeRegex(data) {
+			return data.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+		}
+		function addAmazonProxyHost(host) {
+			if (host && !amazonProxyHosts.includes(host)) amazonProxyHosts.push(host);
+		}
+		addAmazonProxyHost(defaultAmazonHost);
+		addAmazonProxyHost(`alexa.${_options.baseAmazonPage}`);
+		addAmazonProxyHost(_options.baseAmazonPage);
+		EXTRA_AMAZON_PROXY_HOSTS.forEach(addAmazonProxyHost);
+		function amazonHostFromProxyPath(url) {
+			const match = (url || "").match(/^\/([^/?#]+)(?:[/?#]|$)/);
+			if (match && amazonProxyHosts.includes(match[1])) return match[1];
+			return null;
+		}
+		function amazonHostFromProxyUrl(url) {
+			if (!url) return null;
+			for (const host of amazonProxyHosts) if (url === `${proxyBase()}${host}` || url.startsWith(`${proxyBase()}${host}/`)) return host;
+			return null;
+		}
 		const formerDataStorePath = _options.formerDataStorePath || path$2.join(__dirname, "formerDataStore.json");
 		let formerDataStoreValid = false;
 		if (!_options.formerRegistrationData) try {
@@ -128571,7 +128609,7 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			_options.logger && _options.logger("Proxy Init: reuse frc from former data");
 			initialCookies.frc = _options.formerRegistrationData.frc;
 		}
-		if (!_options.formerRegistrationData || !_options.formerRegistrationData["map-md"]) initialCookies["map-md"] = Buffer.from("{\"device_user_dictionary\":[],\"device_registration_data\":{\"software_version\":\"1\"},\"app_identifier\":{\"app_version\":\"2.2.485407\",\"bundle_id\":\"com.amazon.echo\"}}").toString("base64");
+		if (!_options.formerRegistrationData || !_options.formerRegistrationData["map-md"]) initialCookies["map-md"] = Buffer.from(`{"device_user_dictionary":[],"device_registration_data":{"software_version":"1"},"app_identifier":{"app_version":"${ALEXA_APP_VERSION}","bundle_id":"com.amazon.echo"}}`).toString("base64");
 		else {
 			_options.logger && _options.logger("Proxy Init: reuse map-md from former data");
 			initialCookies["map-md"] = _options.formerRegistrationData["map-md"];
@@ -128604,11 +128642,49 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const code_verifier = base64URLEncode(crypto$1.randomBytes(32));
 		const code_challenge = base64URLEncode(sha256(code_verifier));
 		let proxyCookies = "";
+		let returnedInitUrl;
+		function buildInitialUrl() {
+			return `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
+		}
+		function fixEmbeddedProxyUrls(pathAndQuery) {
+			const qIndex = pathAndQuery.indexOf("?");
+			if (qIndex === -1) return pathAndQuery;
+			const p = pathAndQuery.slice(0, qIndex);
+			const qs = pathAndQuery.slice(qIndex + 1);
+			let params;
+			try {
+				params = new URLSearchParams(qs);
+			} catch (_e) {
+				return pathAndQuery;
+			}
+			let changed = false;
+			for (const key of params.keys()) {
+				const value = params.get(key);
+				const fixed = replaceHostsBack(value);
+				if (fixed !== value) {
+					params.set(key, fixed);
+					changed = true;
+				}
+			}
+			if (changed) _options.logger && _options.logger(`Alexa-Cookie: Fixed embedded proxy URL(s) in outgoing request query`);
+			return changed ? `${p}?${params.toString()}` : pathAndQuery;
+		}
+		function rewriteProxyPath(url, req) {
+			let result;
+			const urlHost = amazonHostFromProxyPath(url);
+			if (urlHost) result = url.replace(new RegExp(`^/${escapeRegex(urlHost)}`), "") || "/";
+			else if (req && req.headers && req.headers.host === `${_options.proxyOwnIp}:${_options.proxyPort}` && url === "/") {
+				const initialUrl = returnedInitUrl || buildInitialUrl();
+				const parsed = new URL(initialUrl);
+				result = `${parsed.pathname}${parsed.search}`;
+			} else result = url;
+			return fixEmbeddedProxyUrls(result);
+		}
 		const optionsAlexa = {
 			target: `https://alexa.${_options.baseAmazonPage}`,
 			changeOrigin: true,
 			ws: false,
-			pathRewrite: {},
+			pathRewrite: rewriteProxyPath,
 			router,
 			hostRewrite: true,
 			followRedirects: false,
@@ -128616,17 +128692,10 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			onError,
 			onProxyRes,
 			onProxyReq,
-			headers: {
-				"user-agent": "AppleWebKit PitanguiBridge/2.2.485407.0-[HARDWARE=iPhone10_4][SOFTWARE=15.5][DEVICE=iPhone]",
-				"accept-language": _options.acceptLanguage,
-				"authority": `www.${_options.baseAmazonPage}`
-			},
-			cookieDomainRewrite: { "*": "" }
+			headers: { "accept-language": _options.acceptLanguage },
+			cookieDomainRewrite: { "*": "" },
+			cookiePathRewrite: { "*": "/" }
 		};
-		optionsAlexa.pathRewrite[`^/www.${_options.baseAmazonPage}`] = "";
-		optionsAlexa.pathRewrite[`^/alexa.${_options.baseAmazonPage}`] = "";
-		optionsAlexa.cookieDomainRewrite[`.${_options.baseAmazonPage}`] = _options.proxyOwnIp;
-		optionsAlexa.cookieDomainRewrite[_options.baseAmazonPage] = _options.proxyOwnIp;
 		if (_options.logger) optionsAlexa.logProvider = function logProvider() {
 			return {
 				log: _options.logger.log || _options.logger,
@@ -128636,22 +128705,20 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				error: _options.logger.error || _options.logger
 			};
 		};
-		let returnedInitUrl;
 		function router(req) {
 			const url = req.originalUrl || req.url;
 			_options.logger && _options.logger(`Router: ${url} / ${req.method} / ${JSON.stringify(req.headers)}`);
 			if (req.headers.host === `${_options.proxyOwnIp}:${_options.proxyPort}`) {
-				if (url.startsWith(`/www.${_options.baseAmazonPage}/`)) return `https://www.${_options.baseAmazonPage}`;
-				else if (url.startsWith(`/alexa.${_options.baseAmazonPage}/`)) return `https://alexa.${_options.baseAmazonPage}`;
-				else if (req.headers.referer) {
-					if (req.headers.referer.startsWith(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`)) return `https://www.${_options.baseAmazonPage}`;
-					else if (req.headers.referer.startsWith(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`)) return `https://alexa.${_options.baseAmazonPage}`;
-				}
+				const urlHost = amazonHostFromProxyPath(url);
+				if (urlHost) return `https://${urlHost}`;
+				const refererHost = amazonHostFromProxyUrl(req.headers.referer);
+				if (refererHost) return `https://${refererHost}`;
 				if (url === "/") {
-					returnedInitUrl = `https://www.${_options.baseAmazonPage}/ap/signin?openid.return_to=https%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fmaplanding&openid.assoc_handle=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&pageId=amzn_dp_project_dee_ios${_options.baseAmazonPageHandle}&accountStatusPolicy=P1&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns.oa2=http%3A%2F%2Fwww.${_options.baseAmazonPage}%2Fap%2Fext%2Foauth%2F2&openid.oa2.client_id=device%3A${deviceId}&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.oa2.response_type=code&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.pape.max_auth_age=0&openid.oa2.scope=device_auth_access&openid.oa2.code_challenge_method=S256&openid.oa2.code_challenge=${code_challenge}&language=${_options.amazonPageProxyLanguage}`;
+					returnedInitUrl = buildInitialUrl();
 					_options.logger && _options.logger(`Alexa-Cookie: Initial Page Request: ${returnedInitUrl}`);
-					return returnedInitUrl;
-				} else return `https://www.${_options.baseAmazonPage}`;
+					const parsedInitUrl = new URL(returnedInitUrl);
+					return `${parsedInitUrl.protocol}//${parsedInitUrl.host}`;
+				} else return `https://${defaultAmazonHost}`;
 			}
 			return `https://alexa.${_options.baseAmazonPage}`;
 		}
@@ -128663,21 +128730,34 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			} catch (err) {}
 		}
 		function replaceHosts(data) {
-			const amazonRegex = new RegExp(`https?://www.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), "g");
-			const alexaRegex = new RegExp(`https?://alexa.${_options.baseAmazonPage}:?[0-9]*/`.replace(/\./g, "\\."), "g");
 			data = data.replace(///g, "/");
-			data = data.replace(amazonRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`);
-			data = data.replace(alexaRegex, `http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`);
+			for (const host of amazonProxyHosts) {
+				const hostRegex = new RegExp(`https?://${escapeRegex(host)}:?[0-9]*/`, "g");
+				data = data.replace(hostRegex, `${proxyBase()}${host}/`);
+			}
 			return data;
 		}
 		function replaceHostsBack(data) {
-			const amazonRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/www.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), "g");
-			const alexaRegex = new RegExp(`http://${_options.proxyOwnIp}:${_options.proxyPort}/alexa.${_options.baseAmazonPage}/`.replace(/\./g, "\\."), "g");
-			data = data.replace(amazonRegex, `https://www.${_options.baseAmazonPage}/`);
-			data = data.replace(alexaRegex, `https://alexa.${_options.baseAmazonPage}/`);
-			if (data === `http://${_options.proxyOwnIp}:${_options.proxyPort}/`) data = returnedInitUrl;
+			const base = proxyBase();
+			for (const host of amazonProxyHosts) {
+				const hostRegex = new RegExp(`${escapeRegex(base)}${escapeRegex(host)}/`, "g");
+				data = data.replace(hostRegex, `https://${host}/`);
+			}
+			if (data === base) data = returnedInitUrl;
+			else if (data.startsWith(base)) data = `https://${defaultAmazonHost}/${data.slice(base.length)}`;
 			return data;
 		}
+		function parseQueryParams(data) {
+			const paramStart = data && data.indexOf("?");
+			if (paramStart === -1 || paramStart === void 0) return {};
+			return querystring$2.parse(data.substr(paramStart + 1));
+		}
+		function isProxySuccessUrl(data) {
+			if (!data) return false;
+			if (data.includes("/spa/index.html")) return true;
+			if (!data.includes("/ap/maplanding?")) return false;
+			return !!parseQueryParams(data)["openid.oa2.authorization_code"];
+		}
 		function onProxyReq(proxyReq, req) {
 			const url = req.originalUrl || req.url;
 			if (url.endsWith(".ico") || url.endsWith(".js") || url.endsWith(".ttf") || url.endsWith(".svg") || url.endsWith(".png") || url.endsWith(".appcache")) return;
@@ -128704,14 +128784,26 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					}
 				}
 				if (typeof proxyReq.getHeader === "function" && proxyReq.getHeader("origin") !== `https://${proxyReq.getHeader("host")}`) {
-					proxyReq.setHeader("origin", `https://www.${_options.baseAmazonPage}`);
-					_options.logger && _options.logger("Alexa-Cookie: Modify headers: Delete Origin");
+					proxyReq.setHeader("origin", `https://${proxyReq.getHeader("host") || defaultAmazonHost}`);
+					_options.logger && _options.logger("Alexa-Cookie: Modify headers: Changed Origin");
 					modified = true;
 				}
-				let postBody = "";
-				req.on("data", (chunk) => {
-					postBody += chunk.toString();
-				});
+				if (req.body && typeof req.body === "object") {
+					let bodyChanged = false;
+					for (const key of Object.keys(req.body)) {
+						const value = req.body[key];
+						if (typeof value !== "string") continue;
+						const fixed = replaceHostsBack(value);
+						if (fixed !== value) {
+							req.body[key] = fixed;
+							bodyChanged = true;
+						}
+					}
+					if (bodyChanged) _options.logger && _options.logger("Alexa-Cookie: Fixed embedded proxy URL(s) in outgoing POST body");
+					const bodyData = querystring$2.stringify(req.body);
+					proxyReq.setHeader("Content-Length", Buffer.byteLength(bodyData));
+					proxyReq.write(bodyData);
+				}
 			}
 			_options.proxyLogLevel === "debug" && _options.logger && _options.logger(`Alexa-Cookie: Proxy-Request: (modified:${modified})${customStringify(proxyReq, null, 2)}`);
 		}
@@ -128729,17 +128821,22 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				proxyCookies = addCookies(proxyCookies, proxyRes.headers);
 			}
 			_options.logger && _options.logger(`Alexa-Cookie: Cookies handled: ${JSON.stringify(proxyCookies)}`);
-			if (proxyRes.socket && proxyRes.socket._host === `www.${_options.baseAmazonPage}` && proxyRes.socket.parser.outgoing && proxyRes.socket.parser.outgoing.method === "GET" && proxyRes.socket.parser.outgoing.path.startsWith("/ap/maplanding") || proxyRes.socket && proxyRes.socket.parser.outgoing && proxyRes.socket.parser.outgoing.getHeader("location") && proxyRes.socket.parser.outgoing.getHeader("location").includes("/ap/maplanding?") || proxyRes.headers.location && (proxyRes.headers.location.includes("/ap/maplanding?") || proxyRes.headers.location.includes("/spa/index.html"))) {
+			const outgoing = proxyRes.socket && proxyRes.socket.parser && proxyRes.socket.parser.outgoing;
+			const successUrl = [
+				proxyRes.headers.location,
+				outgoing && outgoing.method === "GET" && outgoing.path,
+				outgoing && outgoing.getHeader && outgoing.getHeader("location")
+			].find(isProxySuccessUrl);
+			if (successUrl) {
 				_options.logger && _options.logger("Alexa-Cookie: Proxy detected SUCCESS!!");
-				const paramStart = proxyRes.headers.location.indexOf("?");
-				const queryParams = querystring$2.parse(proxyRes.headers.location.substr(paramStart + 1));
+				const queryParams = parseQueryParams(successUrl);
 				proxyRes.statusCode = 302;
 				proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/cookie-success`;
 				delete proxyRes.headers.referer;
 				_options.logger && _options.logger(`Alexa-Cookie: Proxy catched cookie: ${proxyCookies}`);
 				_options.logger && _options.logger(`Alexa-Cookie: Proxy catched parameters: ${JSON.stringify(queryParams)}`);
 				callbackCookie && callbackCookie(null, {
-					"loginCookie": proxyCookies,
+					"loginCookie": sanitizeAmazonCookie(proxyCookies),
 					"authorization_code": queryParams["openid.oa2.authorization_code"],
 					"frc": initialCookies.frc,
 					"map-md": initialCookies["map-md"],
@@ -128751,7 +128848,7 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (proxyRes.headers.location) {
 				_options.logger && _options.logger(`Redirect: Original Location ----> ${proxyRes.headers.location}`);
 				proxyRes.headers.location = replaceHosts(proxyRes.headers.location);
-				if (reqestHost && proxyRes.headers.location.startsWith("/")) proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/${reqestHost}${proxyRes.headers.location}`;
+				if (reqestHost && amazonProxyHosts.includes(reqestHost) && proxyRes.headers.location.startsWith("/")) proxyRes.headers.location = `http://${_options.proxyOwnIp}:${_options.proxyPort}/${reqestHost}${proxyRes.headers.location}`;
 				_options.logger && _options.logger(`Redirect: Final Location ----> ${proxyRes.headers.location}`);
 				return;
 			}
@@ -128769,8 +128866,21 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				return body;
 			});
 		}
+		function bufferUrlencodedBody(req, res, next) {
+			const contentType = req.headers["content-type"] || "";
+			if (req.method !== "POST" || contentType.indexOf("application/x-www-form-urlencoded") === -1) return next();
+			let raw = "";
+			req.on("data", (chunk) => {
+				raw += chunk;
+			});
+			req.on("end", () => {
+				req.body = querystring$2.parse(raw);
+				next();
+			});
+		}
 		const myProxy = proxy("!/cookie-success", optionsAlexa);
 		const app = express();
+		app.use(bufferUrlencodedBody);
 		app.use(myProxy);
 		app.get("/cookie-success", function(req, res) {
 			res.send(_options.proxyCloseWindowHTML);
@@ -128780,7 +128890,8 @@ var require_proxy = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			_options.proxyPort = void 0;
 		}
 		const server = app.listen(_options.proxyPort, _options.proxyListenBind, function() {
-			_options.logger && _options.logger(`Alexa-Cookie: Proxy-Server listening on port ${server.address().port}`);
+			_options.proxyPort = this.address().port;
+			_options.logger && _options.logger(`Alexa-Cookie: Proxy-Server listening on port ${_options.proxyPort}`);
 			callbackListening && callbackListening(server);
 			callbackListening = null;
 		}).on("error", (err) => {
@@ -128826,6 +128937,13 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		let proxyServer;
 		let _options;
 		let Cookie = "";
+		const isAmazonCookieName = (name) => /^(session-id|session-id-time|session-token|ubid-.+|lc-.+|x-.+|at-.+|sess-at-.+|frc|map-md|csrf|sid|csm-hit|i18n-prefs|sp-cdn|skin)$/.test(name);
+		const sanitizeAmazonCookie = (cookie) => {
+			const cookies = cookieTools.parse(cookie || "");
+			let sanitizedCookie = "";
+			for (const name of Object.keys(cookies)) if (isAmazonCookieName(name)) sanitizedCookie += `${name}=${cookies[name]}; `;
+			return sanitizedCookie.replace(/[; ]*$/, "");
+		};
 		const addCookies = (Cookie, headers) => {
 			if (!headers || !headers["set-cookie"]) return Cookie;
 			const cookies = cookieTools.parse(Cookie || "");
@@ -128913,7 +129031,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (!_options.baseAmazonPageHandle && _options.baseAmazonPageHandle !== "") {
 				const amazonDomain = _options.baseAmazonPage.substr(_options.baseAmazonPage.lastIndexOf(".") + 1);
 				if (amazonDomain === "jp") _options.baseAmazonPageHandle = `_${amazonDomain}`;
-				else if (amazonDomain !== "com") _options.baseAmazonPageHandle = "";
+				else if (amazonDomain !== "com") _options.baseAmazonPageHandle = `_${amazonDomain}`;
 				else _options.baseAmazonPageHandle = "";
 			}
 			if (!_options.userAgent) if (os$2.platform() === "win32") _options.userAgent = defaultUserAgent;
@@ -128940,7 +129058,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (_options.formerRegistrationData) _options.proxyOnly = true;
 		};
 		const getCSRFFromCookies = (cookie, _options, callback) => {
-			const csrfUrls = csrfOptions;
+			const csrfUrls = [...csrfOptions];
 			function csrfTry() {
 				const path = csrfUrls.shift();
 				const options = {
@@ -129103,6 +129221,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const handleTokenRegistration = (_options, loginData, callback) => {
 			_options.logger && _options.logger(`Handle token registration Start: ${JSON.stringify(loginData)}`);
 			loginData.deviceAppName = _options.deviceAppName;
+			loginData.loginCookie = sanitizeAmazonCookie(loginData.loginCookie);
 			let deviceSerial;
 			if (!_options.formerRegistrationData || !_options.formerRegistrationData.deviceSerial) {
 				const deviceSerialBuffer = Buffer.alloc(16);
@@ -129190,6 +129309,7 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				Cookie = addCookies(Cookie, response.headers);
 				loginData.refreshToken = body.response.success.tokens.bearer.refresh_token;
 				const accessToken = body.response.success.tokens.bearer.access_token;
+				loginData.accessToken = accessToken;
 				loginData.tokenDate = Date.now();
 				loginData.macDms = body.response.success.tokens.mac_dms;
 				if (body.response.success.tokens.website_cookies && Array.isArray(body.response.success.tokens.website_cookies)) {
@@ -129216,29 +129336,43 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					_options.logger && _options.logger("Alexa-Cookie: Get User data");
 					_options.logger && _options.logger(JSON.stringify(options));
 					request(options, (error, response, body) => {
-						if (!error) {
+						if (!error) if (!response || response.statusCode < 200 || response.statusCode >= 300 || !body) {
+							_options.logger && _options.logger(`Get User data Response: status=${response && response.statusCode}, body=${JSON.stringify(body)}`);
+							if (!_options.amazonPage) {
+								callback && callback(/* @__PURE__ */ new Error(`Could not get user data from Amazon: HTTP ${response && response.statusCode}`), null);
+								return;
+							}
+							loginData.amazonPage = _options.amazonPage;
+						} else {
 							try {
 								if (typeof body !== "object") body = JSON.parse(body);
 							} catch (err) {
 								_options.logger && _options.logger(`Get User data Response: ${JSON.stringify(body)}`);
-								callback && callback(err, null);
-								return;
+								if (!_options.amazonPage) {
+									callback && callback(err, null);
+									return;
+								}
+								loginData.amazonPage = _options.amazonPage;
 							}
 							_options.logger && _options.logger(`Get User data Response: ${JSON.stringify(body)}`);
 							Cookie = addCookies(Cookie, response.headers);
-							if (body.marketPlaceDomainName) {
+							if (body && body.marketPlaceDomainName) {
 								const pos = body.marketPlaceDomainName.indexOf(".");
 								if (pos !== -1) _options.amazonPage = body.marketPlaceDomainName.substr(pos + 1);
 							}
 							loginData.amazonPage = _options.amazonPage;
-						} else if (error && (!_options || !_options.amazonPage)) {
+						}
+						else if (error && (!_options || !_options.amazonPage)) {
 							callback && callback(error, null);
 							return;
 						} else if (error && (!_options.formerRegistrationData || !_options.formerRegistrationData.amazonPage) && _options.amazonPage) _options.logger && _options.logger(`Continue with externally set amazonPage: ${_options.amazonPage}`);
 						else if (error) _options.logger && _options.logger("Ignore error while getting user data and amazonPage because previously set amazonPage is available");
 						loginData.loginCookie = Cookie;
 						getLocalCookies(loginData.amazonPage, loginData.refreshToken, (err, localCookie) => {
-							if (err) callback && callback(err, null);
+							if (err) {
+								callback && callback(err, null);
+								return;
+							}
 							loginData.localCookie = localCookie;
 							getCSRFFromCookies(loginData.localCookie, _options, (err, resData) => {
 								if (err) {
@@ -129247,7 +129381,6 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 								}
 								loginData.localCookie = resData.cookie;
 								loginData.csrf = resData.csrf;
-								delete loginData.accessToken;
 								delete loginData.authorization_code;
 								delete loginData.verifier;
 								loginData.dataVersion = 2;
@@ -129350,6 +129483,39 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				callback && callback(null, localCookie);
 			});
 		};
+		const finishCookieRefresh = (loginData, callback) => {
+			_options.logger && _options.logger("Alexa-Cookie: Skip App registration during refresh and update local cookies");
+			const updateLocalCookies = () => {
+				const amazonPage = loginData.amazonPage || _options.amazonPage;
+				getLocalCookies(amazonPage, loginData.refreshToken, (err, localCookie) => {
+					if (err) {
+						callback && callback(err, null);
+						return;
+					}
+					loginData.localCookie = localCookie;
+					getCSRFFromCookies(loginData.localCookie, _options, (err, resData) => {
+						if (err) {
+							callback && callback(/* @__PURE__ */ new Error(`Error getting csrf for ${amazonPage}`), null);
+							return;
+						}
+						loginData.localCookie = resData.cookie;
+						loginData.csrf = resData.csrf;
+						loginData.amazonPage = amazonPage;
+						loginData.tokenDate = Date.now();
+						delete loginData.authorization_code;
+						delete loginData.verifier;
+						loginData.dataVersion = 2;
+						_options.logger && _options.logger("Alexa-Cookie: Refresh finished with updated cookies and csrf");
+						callback && callback(null, loginData);
+					});
+				});
+			};
+			if (loginData.accessToken) {
+				registerTokenCapabilities(loginData.accessToken, updateLocalCookies);
+				return;
+			}
+			updateLocalCookies();
+		};
 		this.refreshAlexaCookie = (__options, callback) => {
 			if (!__options || !__options.formerRegistrationData || !__options.formerRegistrationData.loginCookie || !__options.formerRegistrationData.refreshToken) {
 				callback && callback(/* @__PURE__ */ new Error("No former registration data provided for Cookie Refresh"), null);
@@ -129416,13 +129582,16 @@ var require_alexa_cookie = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				_options.formerRegistrationData.loginCookie = addCookies(Cookie, response.headers);
 				_options.formerRegistrationData.accessToken = body.access_token;
 				getLocalCookies(_options.baseAmazonPage, _options.formerRegistrationData.refreshToken, (err, comCookie) => {
-					if (err) callback && callback(err, null);
+					if (err) {
+						callback && callback(err, null);
+						return;
+					}
 					const initCookies = cookieTools.parse(_options.formerRegistrationData.loginCookie);
 					let newCookie = `frc=${initCookies.frc}; `;
 					newCookie += `map-md=${initCookies["map-md"]}; `;
 					newCookie += comCookie;
-					_options.formerRegistrationData.loginCookie = newCookie;
-					handleTokenRegistration(_options, _options.formerRegistrationData, callback);
+					_options.formerRegistrationData.loginCookie = sanitizeAmazonCookie(newCookie);
+					finishCookieRefresh(_options.formerRegistrationData, callback);
 				});
 			});
 		};
@@ -130017,10 +130186,20 @@ var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin
 							listItemId: payload.listItemId
 						});
 						return;
+					case "NotifyNowPlayingUpdated":
+						const nowPlaying = payload?.update?.update?.nowPlayingData ?? null;
+						this.emit("ws-now-playing-updated", {
+							customerId: payload?.customerId ?? null,
+							taskSessionId: payload?.update?.taskSessionId ?? null,
+							cause: payload?.update?.update?.cause ?? null,
+							mediaId: nowPlaying?.mediaId ?? null,
+							playerState: nowPlaying?.playerState ?? null,
+							nowPlayingData: nowPlaying
+						});
+						return;
 					case "PUSH_MICROPHONE_STATE":
 					case "PUSH_DELETE_DOPPLER_ACTIVITIES":
 					case "PUSH_DEVICE_SETUP_STATE_CHANGE":
-					case "NotifyNowPlayingUpdated":
 					case "NotifyMediaSessionsUpdated": return;
 				}
 				this.emit("ws-unknown-command", command, payload);
@@ -132067,7 +132246,7 @@ var import_alexa_remote = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin
 */
 var ALEXA_API_USER_AGENT_POSTFIX = `AlexaRemote/${{
 	name: "alexa-remote2",
-	version: "8.0.4",
+	version: "8.1.1",
 	description: "Remote Control for amazon echo devices",
 	author: {
 		"name": "Apollon77",
@@ -132096,16 +132275,16 @@ var ALEXA_API_USER_AGENT_POSTFIX = `AlexaRemote/${{
 		"layla.amazon.de"
 	],
 	dependencies: {
-		"alexa-cookie2": "^5.0.3",
+		"alexa-cookie2": "^5.0.6",
 		"https": "^1.0.0",
 		"querystring": "^0.2.1",
-		"ws": "^8.18.3",
+		"ws": "^8.21.0",
 		"extend": "^3.0.2",
-		"uuid": "^11.1.0"
+		"uuid": "^11.1.1"
 	},
 	devDependencies: {
-		"@alcalzone/release-script": "^5.0.0",
-		"@alcalzone/release-script-plugin-license": "^4.0.0",
+		"@alcalzone/release-script": "^5.2.1",
+		"@alcalzone/release-script-plugin-license": "^5.2.0",
 		"eslint": "^8.57.1"
 	},
 	scripts: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.157",
+  "version": "0.2.158",
   "description": "Alexa device-import provider for CamStack — imports the smart-home devices in a user's Alexa account via the unofficial alexa-remote2 cookie/token client (the inverse of the Alexa exporter)",
   "keywords": [
     "camstack",
@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@camstack/types": "*",
-    "alexa-remote2": "^8.0.4",
+    "alexa-remote2": "^8.1.1",
     "typescript": "~6.0.3",
     "vite": "^8.0.11",
     "vitest": "^2.0.0",