@facteurjs/core 2.0.0-beta.1 → 2.0.0-beta.2

package/dist/api/handlers/preferences.mjs

@@ -41,12 +41,18 @@ const updatePreferencesRoute = defineRoute(({ facteur, authorize }) => ({
 		const notifiableId = request.params.notifiableId;
 		const tenantId = request.body.tenantId;
 		const preferences = request.body.preferences;
+		const notificationName = request.body.notificationName;
+		const category = request.body.category;
 		if (!await checkAuthorization({
 			authorize,
 			request,
 			notifiableId,
 			tenantId
 		})) return UNAUTHORIZED_RESPONSE;
+		if (notificationName && category) return {
+			status: 400,
+			body: { error: "Cannot specify both \"notificationName\" and \"category\"" }
+		};
 		if (!preferences) return {
 			status: 400,
 			body: { error: "Preferences are required" }
@@ -56,10 +62,33 @@ const updatePreferencesRoute = defineRoute(({ facteur, authorize }) => ({
 			status: 400,
 			body: { error: validation.error }
 		};
+		/**
+		* Per-category scope: resolve notifications in category and update each one
+		*/
+		if (category) {
+			const matching = (await facteur.discoverer.getNotificationIdentities()).filter((n) => n.category === category);
+			if (matching.length === 0) return {
+				status: 400,
+				body: { error: `No notifications found for category "${category}"` }
+			};
+			for (const identity of matching) await facteur.db.updatePreferences({
+				notifiableId,
+				tenantId,
+				notificationName: identity.identifier,
+				channelPreferences: preferences
+			});
+			return {
+				status: 204,
+				body: {}
+			};
+		}
+		/**
+		* Global scope (no notificationName) or per-notification scope
+		*/
 		await facteur.db.updatePreferences({
 			notifiableId,
 			tenantId,
-			notificationName: request.body.notificationName,
+			notificationName,
 			channelPreferences: preferences
 		});
 		return {

package/dist/channels/fcm/channel.d.mts

@@ -2,6 +2,7 @@ import { BatchConfig, BatchSendResult, Channel, ChannelSendParams, kTargetSymbol
 import "../../types.mjs";
 import { FcmMessage } from "./message.mjs";
 import { FcmConfig, FcmTargets } from "./types.mjs";
+import { Messaging } from "firebase-admin/messaging";
 import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/fcm/channel.d.ts
@@ -11,7 +12,7 @@ declare class FcmChannel implements Channel<FcmConfig, FcmMessage, any, FcmTarge
   name: "fcm";
   [kTargetSymbol]: FcmTargets;
   batchConfig: BatchConfig;
-  constructor(config: FcmConfig);
+  constructor(config: FcmConfig, messaging?: Messaging);
   send(options: ChannelSendParams<FcmMessage, FcmTargets>): Promise<string>;
   sendBatch(messages: ChannelSendParams<FcmMessage, FcmTargets>[]): Promise<BatchSendResult>;
 }

package/dist/channels/fcm/channel.mjs

@@ -1,6 +1,6 @@
 import { errors } from "../../errors/index.mjs";
 import { kTargetSymbol } from "../../types/channel.mjs";
-import { getMessaging } from "firebase-admin/messaging";
+import { Messaging, getMessaging } from "firebase-admin/messaging";
 import { cert, initializeApp } from "firebase-admin/app";
 
 //#region src/channels/fcm/channel.ts
@@ -16,9 +16,10 @@ var FcmChannel = class {
 	};
 	#messaging;
 	#config;
-	constructor(config) {
+	constructor(config, messaging) {
 		this.#config = config;
-		this.#messaging = getMessaging(initializeApp({
+		if (messaging) this.#messaging = messaging;
+		else this.#messaging = getMessaging(initializeApp({
 			...config,
 			...config.serviceAccountKeyPath ? { credential: cert(config.serviceAccountKeyPath) } : {}
 		}));
@@ -35,8 +36,11 @@ var FcmChannel = class {
 	#buildMessage(options) {
 		const message = options.message.serialize();
 		const targets = this.#resolveTargets(options);
-		if (this.#config.debugToken) message.token = this.#config.debugToken;
-		if (targets.token) message.token = this.#config.debugToken || targets.token;
+		if (this.#config.debugToken) {
+			message.token = this.#config.debugToken;
+			return message;
+		}
+		if (targets.token) message.token = targets.token;
 		else if (targets.topic) message.topic = targets.topic;
 		else if (targets.condition) message.condition = targets.condition;
 		return message;

package/dist/database/adapters/knex.mjs

@@ -97,7 +97,10 @@ var KnexAdapter = class {
 	}
 	async updatePreferences(options) {
 		await this.#getConnection().transaction(async (trx) => {
-			const existing = await trx.table(this.#preferencesTableName).where("user_id", options.notifiableId).andWhere("notification_name", options.notificationName).andWhere((builder) => {
+			const existing = await trx.table(this.#preferencesTableName).where("user_id", options.notifiableId).andWhere((builder) => {
+				if (options.notificationName) builder.where("notification_name", options.notificationName);
+				else builder.whereNull("notification_name");
+			}).andWhere((builder) => {
 				if (options.tenantId) builder.where("tenant_id", options.tenantId);
 				else builder.whereNull("tenant_id");
 			}).first();
@@ -108,7 +111,7 @@ var KnexAdapter = class {
 			else await trx.table(this.#preferencesTableName).insert({
 				user_id: options.notifiableId,
 				tenant_id: options.tenantId || null,
-				notification_name: options.notificationName,
+				notification_name: options.notificationName || null,
 				channels: JSON.stringify(options.channelPreferences),
 				created_at: /* @__PURE__ */ new Date(),
 				updated_at: /* @__PURE__ */ new Date()

package/dist/database/adapters/kysely.mjs

@@ -78,7 +78,7 @@ var KyselyAdapter = class {
 	}
 	async updatePreferences(options) {
 		await this.#connection.transaction().execute(async (trx) => {
-			const existing = await trx.selectFrom(this.#preferencesTableName).selectAll().where("user_id", "=", options.notifiableId).where("notification_name", "=", options.notificationName).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!options.tenantId, (qb) => qb.where("tenant_id", "is", null)).executeTakeFirst();
+			const existing = await trx.selectFrom(this.#preferencesTableName).selectAll().where("user_id", "=", options.notifiableId).$if(!!options.notificationName, (qb) => qb.where("notification_name", "=", options.notificationName)).$if(!options.notificationName, (qb) => qb.where("notification_name", "is", null)).$if(!!options.tenantId, (qb) => qb.where("tenant_id", "=", options.tenantId)).$if(!options.tenantId, (qb) => qb.where("tenant_id", "is", null)).executeTakeFirst();
 			if (existing) await trx.updateTable(this.#preferencesTableName).set({
 				channels: JSON.stringify(options.channelPreferences),
 				updated_at: /* @__PURE__ */ new Date()
@@ -86,7 +86,7 @@ var KyselyAdapter = class {
 			else await trx.insertInto(this.#preferencesTableName).values({
 				user_id: options.notifiableId,
 				tenant_id: options.tenantId || null,
-				notification_name: options.notificationName,
+				notification_name: options.notificationName || null,
 				channels: JSON.stringify(options.channelPreferences),
 				created_at: /* @__PURE__ */ new Date(),
 				updated_at: /* @__PURE__ */ new Date()

package/dist/database/types.d.mts

@@ -131,7 +131,7 @@ interface SavePreferencesParams {
 interface UpdatePreferencesParams {
   notifiableId: Identifier;
   tenantId?: Identifier;
-  notificationName: string;
+  notificationName?: string;
   channelPreferences: Record<ChannelName, boolean>;
 }
 /**

package/dist/facteur.d.mts

@@ -22,6 +22,12 @@ declare class Facteur<KnownChannels extends Record<string, Channel>, DBAdapter e
   get discoverer(): {
     discoverNotifications: () => Promise<(new (...args: any[]) => Notification)[]>;
     getNotifications: () => Promise<(new (...args: any[]) => Notification)[]>;
+    getNotificationIdentities: () => Promise<{
+      name: string;
+      identifier: string;
+      tags?: string[];
+      category?: string;
+    }[]>;
     getNotificationTags: () => Promise<string[]>;
     clearCache: () => void;
   };

package/dist/facteur.mjs

@@ -138,6 +138,7 @@ var Facteur = class {
 		return {
 			discoverNotifications: () => this.#discoverer.discoverNotifications(),
 			getNotifications: () => this.#discoverer.getNotifications(),
+			getNotificationIdentities: () => this.#discoverer.getNotificationIdentities(),
 			getNotificationTags: () => this.#discoverer.getAllNotificationTags(),
 			clearCache: () => this.#discoverer.clearCache()
 		};
@@ -146,7 +147,7 @@ var Facteur = class {
 	* Enable fake mode for testing - captures sent notifications instead of sending
 	*/
 	fake() {
-		this.#fake = new FacteurFake();
+		this.#fake = new FacteurFake(() => this.restore());
 		return this.#fake;
 	}
 	/**

package/dist/fake.d.mts

@@ -11,6 +11,8 @@ interface SentNotification<N extends Notification = Notification> {
 }
 declare class FacteurFake {
   #private;
+  constructor(restoreFn: () => void);
+  [Symbol.dispose](): void;
   /**
    * Record a notification as sent during fake mode
    */

package/dist/fake.mjs

@@ -3,6 +3,13 @@ import { AssertionError } from "node:assert";
 //#region src/fake.ts
 var FacteurFake = class {
 	#sentNotifications = [];
+	#restoreFn;
+	constructor(restoreFn) {
+		this.#restoreFn = restoreFn;
+	}
+	[Symbol.dispose]() {
+		this.#restoreFn();
+	}
 	/**
 	* Record a notification as sent during fake mode
 	*/

package/dist/notifications/notification_discoverer.mjs

@@ -90,7 +90,7 @@ var NotificationDiscoverer = class {
 			const options = NotificationClass.options || {};
 			return {
 				name: options.name,
-				identifier: NotificationClass.name || options.identifier,
+				identifier: options.identifier || NotificationClass.name,
 				tags: options.tags || [],
 				category: options.category
 			};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@facteurjs/core",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Framework-agnostic notification system for Node.js with support for multiple channels (email, SMS, push, webhooks, etc.)",
   "keywords": [
     "discord",