@camstack/addon-notifiers 1.2.130 → 1.2.131

package/dist/addon.js

@@ -13714,7 +13714,14 @@ var BrokerProviderInfoSchema = object({
 	/** Broker kinds this provider can create, with a display label. */
 	kinds: array(object({
 		kind: string(),
-		label: string()
+		label: string(),
+		/**
+		* Relative hub path to start an interactive account link (OAuth popup).
+		* May include `{{brokerId}}`; admin-ui substitutes and appends `?popup=1`.
+		*/
+		interactiveConnectPath: string().min(1).optional(),
+		/** Relative hub path to disconnect the linked account (same popup pattern). */
+		interactiveDisconnectPath: string().min(1).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -51976,18 +51983,18 @@ var HTML_ESCAPES = [
 	[/"/g, """],
 	[/'/g, "'"]
 ];
-function escapeHtml$1(text) {
+function escapeHtml$2(text) {
 	let out = text;
 	for (const [re, rep] of HTML_ESCAPES) out = out.replace(re, rep);
 	return out;
 }
 /** Plain text → HTML-lite (escape + newlines to <br>). */
 function textToHtml(text) {
-	return escapeHtml$1(text).replace(/\n/g, "<br>");
+	return escapeHtml$2(text).replace(/\n/g, "<br>");
 }
 /** Markdown → HTML-lite (bold/italic/code/links; used e.g. for Pushover). */
 function markdownToHtmlLite(md) {
-	return escapeHtml$1(md).replace(/(\*\*|__)(.*?)\1/g, "<b>$2</b>").replace(/(\*|_)(.*?)\1/g, "<i>$2</i>").replace(/`([^`]*)`/g, "<code>$1</code>").replace(/\[([^\]]*)\]\(([^)]*)\)/g, "<a href=\"$2\">$1</a>").replace(/\n/g, "<br>");
+	return escapeHtml$2(md).replace(/(\*\*|__)(.*?)\1/g, "<b>$2</b>").replace(/(\*|_)(.*?)\1/g, "<i>$2</i>").replace(/`([^`]*)`/g, "<code>$1</code>").replace(/\[([^\]]*)\]\(([^)]*)\)/g, "<a href=\"$2\">$1</a>").replace(/\n/g, "<br>");
 }
 /**
 * Preference order when the source format is NOT supported — first supported
@@ -53345,6 +53352,116 @@ var discordAdapter = {
 		};
 	}
 };
+var descriptor$2 = {
+	kind: "email",
+	label: "Email",
+	icon: "mail",
+	addonId: "notifiers",
+	supportsDiscovery: false,
+	configSchema: { sections: [{
+		id: "email",
+		title: "Email",
+		description: "Send via a Connectivity → Email provider (Google Services or SMTP). Install and Verify a provider first.",
+		fields: [
+			{
+				type: "text",
+				key: "to",
+				label: "To",
+				description: "Recipient address, or comma-separated list.",
+				required: true
+			},
+			{
+				type: "text",
+				key: "smtpAddonId",
+				label: "Email provider addon id (optional)",
+				description: "Leave blank to use the first ready smtp-provider. Examples: google-services, smtp-nodemailer."
+			},
+			{
+				type: "text",
+				key: "from",
+				label: "From (optional)",
+				description: "Override From when the relay allows it."
+			}
+		]
+	}] },
+	caps: {
+		attachments: {
+			mediaTypes: ["image"],
+			mode: "url",
+			max: 0
+		},
+		actions: 0,
+		levels: [{
+			id: "normal",
+			label: "Normal",
+			ordinal: 3
+		}, {
+			id: "high",
+			label: "High",
+			ordinal: 4
+		}],
+		format: [
+			"text",
+			"html",
+			"markdown"
+		],
+		clickUrl: true,
+		sound: false,
+		ttl: false,
+		bodyMaxLen: 1e5
+	}
+};
+function requireTo(config) {
+	const raw = config["to"];
+	if (typeof raw !== "string" || raw.trim() === "") throw new Error("email: missing required config 'to'");
+	const list = raw.split(/[,;\s]+/).map((s) => s.trim()).filter((s) => s.length > 0);
+	if (list.length === 0) throw new Error("email: missing required config 'to'");
+	return list;
+}
+function renderBodies(prepared) {
+	const body = prepared.bodyParts[0] ?? prepared.body;
+	const title = prepared.title?.trim() ?? "";
+	const click = prepared.clickUrl !== null && prepared.clickUrl !== void 0 ? `\n\n${prepared.clickUrl}` : "";
+	const text = title !== "" ? `${title}\n\n${body}${click}` : `${body}${click}`;
+	if (prepared.format === "html") return {
+		text,
+		html: `${title !== "" ? `<h2>${escapeHtml$1(title)}</h2>` : ""}<div>${body}</div>${prepared.clickUrl !== null && prepared.clickUrl !== void 0 ? `<p><a href="${escapeHtml$1(prepared.clickUrl)}">${escapeHtml$1(prepared.clickUrl)}</a></p>` : ""}`
+	};
+	return { text };
+}
+function escapeHtml$1(value) {
+	return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+/** Build the email adapter bound to a live smtp-provider client. */
+function createEmailAdapter(smtp) {
+	return {
+		descriptor: descriptor$2,
+		destinationKeys: ["to"],
+		async sendDirect(config, prepared) {
+			try {
+				const to = requireTo(config);
+				const bodies = renderBodies(prepared);
+				const addonId = (typeof config["smtpAddonId"] === "string" && config["smtpAddonId"].trim() !== "" ? config["smtpAddonId"].trim() : void 0) ?? await smtp.resolveDefaultAddonId?.();
+				const subject = prepared.title?.trim() && prepared.title.trim().length > 0 ? prepared.title.trim() : "CamStack notification";
+				const from = typeof config["from"] === "string" && config["from"].trim() !== "" ? config["from"].trim() : void 0;
+				await smtp.sendEmail({
+					to,
+					subject,
+					text: bodies.text,
+					...bodies.html !== void 0 ? { html: bodies.html } : {},
+					...addonId !== void 0 ? { addonId } : {},
+					...from !== void 0 ? { from } : {}
+				});
+				return { success: true };
+			} catch (err) {
+				return {
+					success: false,
+					error: err instanceof Error ? err.message : String(err)
+				};
+			}
+		}
+	};
+}
 //#endregion
 //#region src/http.ts
 /** Default per-request timeout for notification dispatch. */
@@ -55280,7 +55397,8 @@ function zentikConfigSchema() {
 }
 //#endregion
 //#region src/adapters/registry.ts
-var NOTIFIER_ADAPTERS = [
+/** HTTP adapters that need no runtime deps. */
+var HTTP_NOTIFIER_ADAPTERS = [
 	ntfyAdapter,
 	pushoverAdapter,
 	gotifyAdapter,
@@ -55432,6 +55550,17 @@ var NOTIFIER_ADAPTERS = [
 	},
 	whatsappAdapter
 ];
+/**
+* Full catalog. When `smtp` is omitted the Email kind is still listed but
+* `sendDirect` fails until the addon wires a client (tests use this).
+*/
+function buildNotifierAdapters(smtp) {
+	const emailSmtp = smtp ?? { async sendEmail() {
+		throw new Error("email: no smtp-provider client — install Google Services or SMTP Email under Connectivity → Email and Verify it");
+	} };
+	return [...HTTP_NOTIFIER_ADAPTERS, createEmailAdapter(emailSmtp)];
+}
+buildNotifierAdapters();
 var NOTIFIER_ICONS = {
 	telegram: {
 		contentType: "image/svg+xml",
@@ -56273,6 +56402,32 @@ function createNotificationOutputProvider(deps) {
 			...prepared,
 			attachments
 		};
+		if (adapter.sendDirect) try {
+			const result = await adapter.sendDirect(target.config, readyPrepared);
+			return result.error === void 0 ? {
+				...result,
+				renderedAs: prepared.renderedAs
+			} : {
+				...result,
+				error: stripUrls(result.error),
+				renderedAs: prepared.renderedAs
+			};
+		} catch (err) {
+			logger?.warn("sendDirect failed", { meta: {
+				kind: target.kind,
+				error: errMsg(err)
+			} });
+			return {
+				success: false,
+				error: `sendDirect failed: ${errMsg(err)}`,
+				renderedAs: prepared.renderedAs
+			};
+		}
+		if (!adapter.buildRequest) return {
+			success: false,
+			error: `No adapter send path for kind '${target.kind}'`,
+			renderedAs: prepared.renderedAs
+		};
 		let plan;
 		try {
 			plan = adapter.buildRequest(target.config, readyPrepared);
@@ -56640,11 +56795,12 @@ var TargetStore = class {
 * Notifiers addon — a system `notification-output` collection provider.
 *
 * It hosts per-kind `NotifierAdapter`s (ntfy, pushover, gotify, telegram,
-* discord, webhook, zentik, whatsapp) behind one uniform cap surface. Targets
-* persist via the `settings-store` cap; the canonical notification is degraded
-* per each target's declared capabilities by the pure `prepareNotification`
-* engine in `@camstack/types`. The catalog is `NOTIFIER_ADAPTERS`
-* (`adapters/registry.ts`).
+* discord, webhook, zentik, whatsapp, email) behind one uniform cap surface.
+* Targets persist via the `settings-store` cap; the canonical notification is
+* degraded per each target's declared capabilities by the pure
+* `prepareNotification` engine in `@camstack/types`. The catalog is
+* `buildNotifierAdapters` (`adapters/registry.ts`); email uses `sendDirect` →
+* `smtp-provider`.
 */
 var NotifiersAddon = class extends BaseAddon {
 	constructor() {
@@ -56656,9 +56812,19 @@ var NotifiersAddon = class extends BaseAddon {
 		if (!api) this.ctx.logger.warn("notifiers: no ctx.api — targets persist in-memory only");
 		const store = new TargetStore(port);
 		await store.init();
+		const adapters = buildNotifierAdapters(api !== void 0 ? { sendEmail: async (input) => {
+			return { messageId: (await api.smtpProvider.sendEmail({
+				to: input.to,
+				subject: input.subject,
+				text: input.text,
+				...input.html !== void 0 ? { html: input.html } : {},
+				...input.from !== void 0 ? { from: input.from } : {},
+				...input.addonId !== void 0 ? { addonId: input.addonId } : {}
+			})).messageId };
+		} } : void 0);
 		const provider = createNotificationOutputProvider({
 			store,
-			adapters: NOTIFIER_ADAPTERS,
+			adapters,
 			logger: this.ctx.logger.child("notification-output"),
 			iconUrlFor,
 			iconMediaTypeFor
@@ -56668,7 +56834,7 @@ var NotifiersAddon = class extends BaseAddon {
 			provider,
 			logger: this.ctx.logger.child("nc-target-actions")
 		});
-		this.ctx.logger.info("NotifiersAddon initialized", { meta: { adapterCount: NOTIFIER_ADAPTERS.length } });
+		this.ctx.logger.info("NotifiersAddon initialized", { meta: { adapterCount: adapters.length } });
 		return {
 			providers: [{
 				capability: notificationOutputCapability,

package/dist/addon.mjs

@@ -13687,7 +13687,14 @@ var BrokerProviderInfoSchema = object({
 	/** Broker kinds this provider can create, with a display label. */
 	kinds: array(object({
 		kind: string(),
-		label: string()
+		label: string(),
+		/**
+		* Relative hub path to start an interactive account link (OAuth popup).
+		* May include `{{brokerId}}`; admin-ui substitutes and appends `?popup=1`.
+		*/
+		interactiveConnectPath: string().min(1).optional(),
+		/** Relative hub path to disconnect the linked account (same popup pattern). */
+		interactiveDisconnectPath: string().min(1).optional()
 	}))
 });
 var ListInputSchema = object({ 
@@ -51949,18 +51956,18 @@ var HTML_ESCAPES = [
 	[/"/g, """],
 	[/'/g, "'"]
 ];
-function escapeHtml$1(text) {
+function escapeHtml$2(text) {
 	let out = text;
 	for (const [re, rep] of HTML_ESCAPES) out = out.replace(re, rep);
 	return out;
 }
 /** Plain text → HTML-lite (escape + newlines to <br>). */
 function textToHtml(text) {
-	return escapeHtml$1(text).replace(/\n/g, "<br>");
+	return escapeHtml$2(text).replace(/\n/g, "<br>");
 }
 /** Markdown → HTML-lite (bold/italic/code/links; used e.g. for Pushover). */
 function markdownToHtmlLite(md) {
-	return escapeHtml$1(md).replace(/(\*\*|__)(.*?)\1/g, "<b>$2</b>").replace(/(\*|_)(.*?)\1/g, "<i>$2</i>").replace(/`([^`]*)`/g, "<code>$1</code>").replace(/\[([^\]]*)\]\(([^)]*)\)/g, "<a href=\"$2\">$1</a>").replace(/\n/g, "<br>");
+	return escapeHtml$2(md).replace(/(\*\*|__)(.*?)\1/g, "<b>$2</b>").replace(/(\*|_)(.*?)\1/g, "<i>$2</i>").replace(/`([^`]*)`/g, "<code>$1</code>").replace(/\[([^\]]*)\]\(([^)]*)\)/g, "<a href=\"$2\">$1</a>").replace(/\n/g, "<br>");
 }
 /**
 * Preference order when the source format is NOT supported — first supported
@@ -53318,6 +53325,116 @@ var discordAdapter = {
 		};
 	}
 };
+var descriptor$2 = {
+	kind: "email",
+	label: "Email",
+	icon: "mail",
+	addonId: "notifiers",
+	supportsDiscovery: false,
+	configSchema: { sections: [{
+		id: "email",
+		title: "Email",
+		description: "Send via a Connectivity → Email provider (Google Services or SMTP). Install and Verify a provider first.",
+		fields: [
+			{
+				type: "text",
+				key: "to",
+				label: "To",
+				description: "Recipient address, or comma-separated list.",
+				required: true
+			},
+			{
+				type: "text",
+				key: "smtpAddonId",
+				label: "Email provider addon id (optional)",
+				description: "Leave blank to use the first ready smtp-provider. Examples: google-services, smtp-nodemailer."
+			},
+			{
+				type: "text",
+				key: "from",
+				label: "From (optional)",
+				description: "Override From when the relay allows it."
+			}
+		]
+	}] },
+	caps: {
+		attachments: {
+			mediaTypes: ["image"],
+			mode: "url",
+			max: 0
+		},
+		actions: 0,
+		levels: [{
+			id: "normal",
+			label: "Normal",
+			ordinal: 3
+		}, {
+			id: "high",
+			label: "High",
+			ordinal: 4
+		}],
+		format: [
+			"text",
+			"html",
+			"markdown"
+		],
+		clickUrl: true,
+		sound: false,
+		ttl: false,
+		bodyMaxLen: 1e5
+	}
+};
+function requireTo(config) {
+	const raw = config["to"];
+	if (typeof raw !== "string" || raw.trim() === "") throw new Error("email: missing required config 'to'");
+	const list = raw.split(/[,;\s]+/).map((s) => s.trim()).filter((s) => s.length > 0);
+	if (list.length === 0) throw new Error("email: missing required config 'to'");
+	return list;
+}
+function renderBodies(prepared) {
+	const body = prepared.bodyParts[0] ?? prepared.body;
+	const title = prepared.title?.trim() ?? "";
+	const click = prepared.clickUrl !== null && prepared.clickUrl !== void 0 ? `\n\n${prepared.clickUrl}` : "";
+	const text = title !== "" ? `${title}\n\n${body}${click}` : `${body}${click}`;
+	if (prepared.format === "html") return {
+		text,
+		html: `${title !== "" ? `<h2>${escapeHtml$1(title)}</h2>` : ""}<div>${body}</div>${prepared.clickUrl !== null && prepared.clickUrl !== void 0 ? `<p><a href="${escapeHtml$1(prepared.clickUrl)}">${escapeHtml$1(prepared.clickUrl)}</a></p>` : ""}`
+	};
+	return { text };
+}
+function escapeHtml$1(value) {
+	return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+/** Build the email adapter bound to a live smtp-provider client. */
+function createEmailAdapter(smtp) {
+	return {
+		descriptor: descriptor$2,
+		destinationKeys: ["to"],
+		async sendDirect(config, prepared) {
+			try {
+				const to = requireTo(config);
+				const bodies = renderBodies(prepared);
+				const addonId = (typeof config["smtpAddonId"] === "string" && config["smtpAddonId"].trim() !== "" ? config["smtpAddonId"].trim() : void 0) ?? await smtp.resolveDefaultAddonId?.();
+				const subject = prepared.title?.trim() && prepared.title.trim().length > 0 ? prepared.title.trim() : "CamStack notification";
+				const from = typeof config["from"] === "string" && config["from"].trim() !== "" ? config["from"].trim() : void 0;
+				await smtp.sendEmail({
+					to,
+					subject,
+					text: bodies.text,
+					...bodies.html !== void 0 ? { html: bodies.html } : {},
+					...addonId !== void 0 ? { addonId } : {},
+					...from !== void 0 ? { from } : {}
+				});
+				return { success: true };
+			} catch (err) {
+				return {
+					success: false,
+					error: err instanceof Error ? err.message : String(err)
+				};
+			}
+		}
+	};
+}
 //#endregion
 //#region src/http.ts
 /** Default per-request timeout for notification dispatch. */
@@ -55253,7 +55370,8 @@ function zentikConfigSchema() {
 }
 //#endregion
 //#region src/adapters/registry.ts
-var NOTIFIER_ADAPTERS = [
+/** HTTP adapters that need no runtime deps. */
+var HTTP_NOTIFIER_ADAPTERS = [
 	ntfyAdapter,
 	pushoverAdapter,
 	gotifyAdapter,
@@ -55405,6 +55523,17 @@ var NOTIFIER_ADAPTERS = [
 	},
 	whatsappAdapter
 ];
+/**
+* Full catalog. When `smtp` is omitted the Email kind is still listed but
+* `sendDirect` fails until the addon wires a client (tests use this).
+*/
+function buildNotifierAdapters(smtp) {
+	const emailSmtp = smtp ?? { async sendEmail() {
+		throw new Error("email: no smtp-provider client — install Google Services or SMTP Email under Connectivity → Email and Verify it");
+	} };
+	return [...HTTP_NOTIFIER_ADAPTERS, createEmailAdapter(emailSmtp)];
+}
+buildNotifierAdapters();
 var NOTIFIER_ICONS = {
 	telegram: {
 		contentType: "image/svg+xml",
@@ -56246,6 +56375,32 @@ function createNotificationOutputProvider(deps) {
 			...prepared,
 			attachments
 		};
+		if (adapter.sendDirect) try {
+			const result = await adapter.sendDirect(target.config, readyPrepared);
+			return result.error === void 0 ? {
+				...result,
+				renderedAs: prepared.renderedAs
+			} : {
+				...result,
+				error: stripUrls(result.error),
+				renderedAs: prepared.renderedAs
+			};
+		} catch (err) {
+			logger?.warn("sendDirect failed", { meta: {
+				kind: target.kind,
+				error: errMsg(err)
+			} });
+			return {
+				success: false,
+				error: `sendDirect failed: ${errMsg(err)}`,
+				renderedAs: prepared.renderedAs
+			};
+		}
+		if (!adapter.buildRequest) return {
+			success: false,
+			error: `No adapter send path for kind '${target.kind}'`,
+			renderedAs: prepared.renderedAs
+		};
 		let plan;
 		try {
 			plan = adapter.buildRequest(target.config, readyPrepared);
@@ -56613,11 +56768,12 @@ var TargetStore = class {
 * Notifiers addon — a system `notification-output` collection provider.
 *
 * It hosts per-kind `NotifierAdapter`s (ntfy, pushover, gotify, telegram,
-* discord, webhook, zentik, whatsapp) behind one uniform cap surface. Targets
-* persist via the `settings-store` cap; the canonical notification is degraded
-* per each target's declared capabilities by the pure `prepareNotification`
-* engine in `@camstack/types`. The catalog is `NOTIFIER_ADAPTERS`
-* (`adapters/registry.ts`).
+* discord, webhook, zentik, whatsapp, email) behind one uniform cap surface.
+* Targets persist via the `settings-store` cap; the canonical notification is
+* degraded per each target's declared capabilities by the pure
+* `prepareNotification` engine in `@camstack/types`. The catalog is
+* `buildNotifierAdapters` (`adapters/registry.ts`); email uses `sendDirect` →
+* `smtp-provider`.
 */
 var NotifiersAddon = class extends BaseAddon {
 	constructor() {
@@ -56629,9 +56785,19 @@ var NotifiersAddon = class extends BaseAddon {
 		if (!api) this.ctx.logger.warn("notifiers: no ctx.api — targets persist in-memory only");
 		const store = new TargetStore(port);
 		await store.init();
+		const adapters = buildNotifierAdapters(api !== void 0 ? { sendEmail: async (input) => {
+			return { messageId: (await api.smtpProvider.sendEmail({
+				to: input.to,
+				subject: input.subject,
+				text: input.text,
+				...input.html !== void 0 ? { html: input.html } : {},
+				...input.from !== void 0 ? { from: input.from } : {},
+				...input.addonId !== void 0 ? { addonId: input.addonId } : {}
+			})).messageId };
+		} } : void 0);
 		const provider = createNotificationOutputProvider({
 			store,
-			adapters: NOTIFIER_ADAPTERS,
+			adapters,
 			logger: this.ctx.logger.child("notification-output"),
 			iconUrlFor,
 			iconMediaTypeFor
@@ -56641,7 +56807,7 @@ var NotifiersAddon = class extends BaseAddon {
 			provider,
 			logger: this.ctx.logger.child("nc-target-actions")
 		});
-		this.ctx.logger.info("NotifiersAddon initialized", { meta: { adapterCount: NOTIFIER_ADAPTERS.length } });
+		this.ctx.logger.info("NotifiersAddon initialized", { meta: { adapterCount: adapters.length } });
 		return {
 			providers: [{
 				capability: notificationOutputCapability,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camstack/addon-notifiers",
-  "version": "1.2.130",
+  "version": "1.2.131",
   "description": "System notifiers addon for CamStack — a `notification-output` collection provider hosting per-kind notifier adapters (ntfy, pushover, gotify, telegram, discord, webhook, zentik).",
   "keywords": [
     "camstack",