@camstack/addon-import-alexa 0.2.150 → 0.2.152

package/dist/_stub.js

@@ -10,7 +10,7 @@ import "./trash-2-DCHugLVt.mjs";
 import { t as Fe } from "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare___mf_0_trpc_mf_1_react_mf_2_query__loadShare__.js-B3qxfxBT.mjs";
 import "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare__react_mf_2_dom__loadShare__.js-CIPmAyPi.mjs";
 import "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare___mf_0_tanstack_mf_1_react_mf_2_query__loadShare__.js-Bct5qZia.mjs";
-import "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-DMdgQOgz.mjs";
+import "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-BHSk6VHO.mjs";
 import "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare__react_mf_2_dom_mf_1_client__loadShare__.js-tXm1x5EZ.mjs";
 import "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare___mf_0_trpc_mf_1_client__loadShare__.js-BHqOw8oh.mjs";
 import "./_virtual_mf___mfe_internal__addon_import_alexa_page__loadShare___mf_0_camstack_mf_1_sdk__loadShare__.js-BmoaT3cr.mjs";

package/dist/{_virtual_mf-localSharedImportMap___mfe_internal__addon_import_alexa_page-CcQjQJmj.mjs → _virtual_mf-localSharedImportMap___mfe_internal__addon_import_alexa_page-DZkNpxsX.mjs}

@@ -1,4 +1,4 @@
-import "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-DMdgQOgz.mjs";
+import "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-BHSk6VHO.mjs";
 //#region \0virtual:mf-localSharedImportMap:__mfe_internal__addon_import_alexa_page
 var e = {
 	"@camstack/sdk": {
@@ -18,7 +18,7 @@ var e = {
 	},
 	"@camstack/types": {
 		name: "@camstack/types",
-		version: "1.2.424",
+		version: "1.2.425",
 		scope: ["default"],
 		loaded: !1,
 		from: "addon_import_alexa_page",

package/dist/addon.js

@@ -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({ 
@@ -90090,37 +90105,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",
@@ -131611,20 +131667,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),
@@ -132728,7 +132789,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 }) => {
@@ -133515,6 +133577,11 @@ var alexaSpeakSessionsEntryKind = defineEntryKind("speak-sessions", {
 	schema: entryBody({ session: string().default("").meta({ secret: true }) }),
 	writeTrigger: "an Echo worker signs in as an Alexa account broker"
 });
+/** Every kind this addon declares, keyed by its name: `records.declare` refuses any other key. */
+var alexaRecordKinds = {
+	brokers: alexaBrokersEntryKind,
+	"speak-sessions": alexaSpeakSessionsEntryKind
+};
 //#endregion
 //#region src/alexa-broker-store.ts
 function rowToEntry(id, data) {
@@ -135242,10 +135309,7 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
 		const records = this.ctx.records;
 		if (records === void 0) throw new Error("import-alexa: ctx.records is required (hub-only addon)");
-		await records.declare({
-			brokers: alexaBrokersEntryKind,
-			speakSessions: alexaSpeakSessionsEntryKind
-		});
+		await records.declare(alexaRecordKinds);
 		this.brokerStore = AlexaBrokerStore.of(records);
 		this.activeBrokers = await this.loadPersistedBrokers();
 		this.registry = new AlexaBrokerRegistry(this.ctx.logger, {

package/dist/addon.mjs

@@ -17610,7 +17610,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({ 
@@ -90089,37 +90104,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",
@@ -131610,20 +131666,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),
@@ -132727,7 +132788,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 }) => {
@@ -133514,6 +133576,11 @@ var alexaSpeakSessionsEntryKind = defineEntryKind("speak-sessions", {
 	schema: entryBody({ session: string().default("").meta({ secret: true }) }),
 	writeTrigger: "an Echo worker signs in as an Alexa account broker"
 });
+/** Every kind this addon declares, keyed by its name: `records.declare` refuses any other key. */
+var alexaRecordKinds = {
+	brokers: alexaBrokersEntryKind,
+	"speak-sessions": alexaSpeakSessionsEntryKind
+};
 //#endregion
 //#region src/alexa-broker-store.ts
 function rowToEntry(id, data) {
@@ -135241,10 +135308,7 @@ var AlexaImportAddon = class extends BaseDeviceProvider {
 		const regs = this.providerRegistrationsFromSuper(await super.onInitialize());
 		const records = this.ctx.records;
 		if (records === void 0) throw new Error("import-alexa: ctx.records is required (hub-only addon)");
-		await records.declare({
-			brokers: alexaBrokersEntryKind,
-			speakSessions: alexaSpeakSessionsEntryKind
-		});
+		await records.declare(alexaRecordKinds);
 		this.brokerStore = AlexaBrokerStore.of(records);
 		this.activeBrokers = await this.loadPersistedBrokers();
 		this.registry = new AlexaBrokerRegistry(this.ctx.logger, {

package/dist/{hostInit-CRUwUtSm.mjs → hostInit-ChaqVJ-8.mjs}

@@ -36,7 +36,7 @@ async function r() {
 				}
 			},
 			"@camstack/types": {
-				version: "1.2.424",
+				version: "1.2.425",
 				scope: "default",
 				shareConfig: {
 					singleton: !0,

package/dist/remoteEntry.js

@@ -1,2 +1,2 @@
-import { n as e, t } from "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-DMdgQOgz.mjs";
+import { n as e, t } from "./virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-BHSk6VHO.mjs";
 export { t as get, e as init };

package/dist/{virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-DMdgQOgz.mjs → virtual_mf-REMOTE_ENTRY_ID___mfe_internal__addon_import_alexa_page__remoteEntry_js-BHSk6VHO.mjs}

@@ -2753,7 +2753,7 @@ async function rr(e) {
 	}
 }
 async function ir() {
-	return tr ||= rr(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_import_alexa_page-CcQjQJmj.mjs")).catch((e) => {
+	return tr ||= rr(() => import("./_virtual_mf-localSharedImportMap___mfe_internal__addon_import_alexa_page-DZkNpxsX.mjs")).catch((e) => {
 		throw tr = void 0, e;
 	}), tr;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-import-alexa",
-  "version": "0.2.150",
+  "version": "0.2.152",
   "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",