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

package/dist/channels/aws-sns/channel.d.mts

@@ -1,6 +1,8 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { AwsSnsMessage } from "./message.mjs";
 import { AwsSnsConfig, AwsSnsTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/aws-sns/channel.d.ts
 declare function awsSnsChannel(config: AwsSnsConfig): AwsSnsChannel;
@@ -14,7 +16,7 @@ declare class AwsSnsChannel implements Channel<AwsSnsConfig, AwsSnsMessage, any,
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asAwsSnsMessage(): AwsSnsMessage;
+    asAwsSnsMessage(): Awaitable<AwsSnsMessage>;
   }
 }
 //#endregion

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

@@ -1,8 +1,10 @@
 import { Channel } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { WebhookOptions, WebhookTargets } from "../webhook/types.mjs";
 import { DiscordResponse } from "./types.mjs";
 import { DiscordMessage } from "./message.mjs";
 import { WebhookChannel } from "../webhook/provider.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/discord/channel.d.ts
 declare function discordWebhookChannel<Options extends WebhookOptions<any>>(options: Options): DiscordProvider<Options>;
@@ -11,7 +13,7 @@ declare class DiscordProvider<T extends WebhookOptions<any>> extends WebhookChan
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asDiscordMessage(): DiscordMessage;
+    asDiscordMessage(): Awaitable<DiscordMessage>;
   }
 }
 //#endregion

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

@@ -1,6 +1,8 @@
 import { BatchConfig, BatchSendResult, Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { ExpoMessage } from "./message.mjs";
 import { ExpoConfig, ExpoTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/expo/channel.d.ts
 declare function expoChannel(config?: ExpoConfig): ExpoChannel;
@@ -18,7 +20,7 @@ declare class ExpoChannel implements Channel<ExpoConfig, ExpoMessage, any, ExpoT
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asExpoMessage(): ExpoMessage;
+    asExpoMessage(): Awaitable<ExpoMessage>;
   }
 }
 //#endregion

package/dist/channels/expo/message.d.mts

@@ -1,7 +1,6 @@
 import { ExpoPushMessage } from "expo-server-sdk";
 
 //#region src/channels/expo/message.d.ts
-
 /**
  * Expo push notification message
  */

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

@@ -1,6 +1,8 @@
 import { BatchConfig, BatchSendResult, Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { FcmMessage } from "./message.mjs";
 import { FcmConfig, FcmTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/fcm/channel.d.ts
 declare function fcmChannel(config: FcmConfig): FcmChannel;
@@ -15,7 +17,7 @@ declare class FcmChannel implements Channel<FcmConfig, FcmMessage, any, FcmTarge
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asFcmMessage(): FcmMessage;
+    asFcmMessage(): Awaitable<FcmMessage>;
   }
 }
 //#endregion

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

@@ -1,7 +1,9 @@
 import { Channel } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { WebhookChannel } from "../webhook/provider.mjs";
 import { SlackMessage } from "./message.mjs";
 import { SlackOptions, SlackTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/slack/channel.d.ts
 declare function slackWebhookChannel<Options extends SlackOptions<any>>(options: Options): SlackWebhookChannel<Options>;
@@ -11,7 +13,7 @@ declare class SlackWebhookChannel<T extends SlackOptions<any>> extends WebhookCh
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asSlackMessage(): SlackMessage;
+    asSlackMessage(): Awaitable<SlackMessage>;
   }
 }
 //#endregion

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

@@ -1,6 +1,8 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { SocketIoMessage } from "./message.mjs";
 import { SocketIOConfig, SocketIOTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 import { Server } from "socket.io";
 
 //#region src/channels/socketio/channel.d.ts
@@ -16,7 +18,7 @@ declare class SocketIOChannel implements Channel<SocketIOConfig, SocketIoMessage
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asSocketIoMessage(): SocketIoMessage;
+    asSocketIoMessage(): Awaitable<SocketIoMessage>;
   }
 }
 //#endregion

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

@@ -1,6 +1,8 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { TransmitMessage } from "./message.mjs";
 import { TransmitConfig, TransmitTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/transmit/channel.d.ts
 declare function transmitChannel(config: TransmitConfig): TransmitChannel;
@@ -14,7 +16,7 @@ declare class TransmitChannel implements Channel<TransmitConfig, TransmitMessage
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asTransmitMessage(): TransmitMessage;
+    asTransmitMessage(): Awaitable<TransmitMessage>;
   }
 }
 //#endregion

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

@@ -1,6 +1,8 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { TwilioMessage } from "./message.mjs";
 import { TwilioConfig, TwilioTargets } from "./types.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/twilio/channel.d.ts
 declare function twilioChannel(config: TwilioConfig): TwilioChannel;
@@ -14,7 +16,7 @@ declare class TwilioChannel implements Channel<TwilioConfig, TwilioMessage, any,
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asTwilioMessage(): TwilioMessage;
+    asTwilioMessage(): Awaitable<TwilioMessage>;
   }
 }
 //#endregion

package/dist/channels/webhook/exceptions.d.mts

@@ -1,7 +1,6 @@
 import { HTTPErrorInfo } from "../../errors/http_error.mjs";
 
 //#region src/channels/webhook/exceptions.d.ts
-
 /**
  * Exception thrown when a webhook request fails
  */

package/dist/channels/webhook/provider.d.mts

@@ -1,4 +1,5 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { WebhookOptions, WebhookTargets } from "./types.mjs";
 import { WebhookMessage } from "./message.mjs";
 

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

@@ -1,7 +1,9 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../../types/channel.mjs";
+import "../../types.mjs";
 import { WebpushMessage } from "./message.mjs";
 import { WebpushConfig, WebpushTargets } from "./types.mjs";
 import webpush from "web-push";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/channels/webpush/channel.d.ts
 declare function webpushChannel(config: WebpushConfig): WebpushChannel;
@@ -19,7 +21,7 @@ declare class WebpushChannel implements Channel<WebpushConfig, WebpushMessage, a
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asWebpushMessage(): WebpushMessage;
+    asWebpushMessage(): Awaitable<WebpushMessage>;
   }
 }
 //#endregion

package/dist/database/channel.d.mts

@@ -1,6 +1,8 @@
 import { Channel, ChannelSendParams, kTargetSymbol } from "../types/channel.mjs";
+import "../types.mjs";
 import { DatabaseConfig, Identifier } from "./types.mjs";
 import { DatabaseMessage } from "./message.mjs";
+import { Awaitable } from "@julr/utils/types";
 
 //#region src/database/channel.d.ts
 declare function databaseChannel(options: DatabaseConfig): DatabaseChannel;
@@ -17,7 +19,7 @@ declare class DatabaseChannel implements Channel<DatabaseConfig, DatabaseMessage
 }
 declare module '@facteurjs/core/types' {
   interface Notification {
-    asDatabaseMessage(): DatabaseMessage;
+    asDatabaseMessage(): Awaitable<DatabaseMessage>;
   }
 }
 //#endregion

package/dist/database/types.d.mts

@@ -1,4 +1,5 @@
 import { ChannelName } from "../types/extend.mjs";
+import "../types.mjs";
 import { Kysely } from "kysely";
 import { Knex } from "knex";
 

package/dist/errors/http_error.d.mts

@@ -1,5 +1,4 @@
 //#region src/errors/http_error.d.ts
-
 /**
  * Represents an HTTP error with decoded response body
  */

package/dist/errors/index.d.mts

@@ -2,7 +2,6 @@ import { E_DUPLICATE_NOTIFICATION } from "./duplicate_notification_exception.mjs
 import * as _poppinss_exception0 from "@poppinss/exception";
 
 //#region src/errors/index.d.ts
-
 /**
  * Thrown when the notification targets for a channel cannot be determined
  * before sending the notification.

package/dist/errors/index.mjs

@@ -22,8 +22,8 @@ const E_MISSING_MESSAGE_METHOD = createError(`Notification is missing "as%sMessa
 var E_SEND_NOTIFICATION_FAILED = class extends AggregateError {
 	code = "E_SEND_NOTIFICATION_FAILED";
 	status = 500;
-	constructor(errors$1) {
-		super(errors$1, "Failed to send notification due to errors in one or more channels.");
+	constructor(errors) {
+		super(errors, "Failed to send notification due to errors in one or more channels.");
 	}
 };
 const errors = {

package/dist/events/events.d.mts

@@ -1,5 +1,6 @@
 import { ChannelName } from "../types/extend.mjs";
 import { Notification } from "../types/notifications.mjs";
+import "../types.mjs";
 
 //#region src/events/events.d.ts
 interface MessageEventOptions {

package/dist/facteur.d.mts

@@ -4,6 +4,7 @@ import { FacteurFake } from "./fake.mjs";
 import { FacteurDatabase } from "./database/database.mjs";
 import { FacteurConfiguration } from "./types/options.mjs";
 import { Notification, NotificationClass } from "./types/notifications.mjs";
+import "./types.mjs";
 import { DatabaseAdapter } from "./database/types.mjs";
 
 //#region src/facteur.d.ts

package/dist/fake.d.mts

@@ -1,5 +1,6 @@
 import { InternalSendOptions } from "./types/builder.mjs";
 import { Notification, NotificationSendResult } from "./types/notifications.mjs";
+import "./types.mjs";
 
 //#region src/fake.d.ts
 interface SentNotification<N extends Notification = Notification> {

package/dist/index.d.mts

@@ -3,7 +3,6 @@ import { Facteur, createFacteur } from "./facteur.mjs";
 import { E_MISSING_MESSAGE_METHOD, E_QUEUE_NOT_SET, E_SEND_NOTIFICATION_FAILED, E_UNAVAILABLE_TARGETS, errors } from "./errors/index.mjs";
 
 //#region src/index.d.ts
-
 /**
  * Define a new provider
  */

package/dist/notifications/batching_sender.mjs

@@ -56,7 +56,7 @@ var BatchingSender = class {
 			continueOnError: options.continueOnError,
 			...options.timeout && { timeout: options.timeout }
 		});
-		const messagesByChannel = this.#groupByChannel(preparedRecipients);
+		const messagesByChannel = await this.#groupByChannel(preparedRecipients);
 		return this.#sendBatches({
 			messagesByChannel,
 			builderOptions: options.builderOptions,
@@ -98,11 +98,11 @@ var BatchingSender = class {
 	/**
 	* Groups prepared messages by channel name for batch sending
 	*/
-	#groupByChannel(preparedRecipients) {
+	async #groupByChannel(preparedRecipients) {
 		const messagesByChannel = /* @__PURE__ */ new Map();
 		for (const prepared of preparedRecipients) for (const [channelName, channelConfig] of Object.entries(prepared.resolvedChannels)) {
 			if (!channelConfig.shouldSend || !channelConfig.target) continue;
-			const message = this.#sender.prepareMessage({
+			const message = await this.#sender.prepareMessage({
 				notification: prepared.notification,
 				channelName,
 				sendOptions: prepared.options,

package/dist/notifications/channel_resolver.mjs

@@ -74,8 +74,8 @@ var ChannelResolver = class {
 		const currentTenant = preferences?.tenants?.[tenantId || -1];
 		const tenantPreferences = currentTenant?.global;
 		const globalPreferences = preferences?.global.global;
-		const notificationTenantPreference = currentTenant?.notifications?.find(({ notification: notification$1 }) => notification$1.identifier === notificationIdentifier);
-		const notificationGlobalPreference = preferences?.global.notifications.find(({ notification: notification$1 }) => notification$1.identifier === notificationIdentifier);
+		const notificationTenantPreference = currentTenant?.notifications?.find(({ notification }) => notification.identifier === notificationIdentifier);
+		const notificationGlobalPreference = preferences?.global.notifications.find(({ notification }) => notification.identifier === notificationIdentifier);
 		return mapEntries(fromDeliverBy, (channelName, { shouldSend, target }) => {
 			if (shouldSend === false) return [channelName, {
 				shouldSend: false,

package/dist/notifications/notification_discoverer.d.mts

@@ -1,4 +1,5 @@
 import { Notification } from "../types/notifications.mjs";
+import "../types.mjs";
 
 //#region src/notifications/notification_discoverer.d.ts
 interface NotificationDiscovererConfig {

package/dist/notifications/notification_discoverer.mjs

@@ -57,9 +57,9 @@ var NotificationDiscoverer = class {
 	*/
 	#validateUniqueNotificationNames(notifications) {
 		const notificationsByName = Object.groupBy(notifications, (i) => i.notification.name);
-		const duplicates = Object.entries(notificationsByName).filter(([_, notifications$1]) => (notifications$1?.length || 0) > 1).map(([notificationName, notifications$1]) => ({
+		const duplicates = Object.entries(notificationsByName).filter(([_, notifications]) => (notifications?.length || 0) > 1).map(([notificationName, notifications]) => ({
 			notificationName,
-			notifications: notifications$1
+			notifications
 		}));
 		if (duplicates.length > 0) throw new errors.E_DUPLICATE_NOTIFICATION(this.#config.searchDirectory, duplicates);
 	}

package/dist/notifications/notification_sender.mjs

@@ -20,12 +20,12 @@ var NotificationSender = class {
 	/**
 	* Build the message content by calling the notification's `as<ChannelName>Message` method
 	*/
-	#buildMessageContent(options) {
+	async #buildMessageContent(options) {
 		const { notification, channelName, sendOptions } = options;
 		const capitalizedChannelName = capitalizeFirstLetter(channelName);
 		const messageBuilder = notification[`as${capitalizedChannelName}Message`];
 		if (typeof messageBuilder !== "function") throw new errors.E_MISSING_MESSAGE_METHOD([capitalizedChannelName]);
-		const content = messageBuilder.call(notification, {
+		const content = await messageBuilder.call(notification, {
 			to: sendOptions.to,
 			params: sendOptions.params,
 			tenantId: sendOptions.tenantId
@@ -75,10 +75,10 @@ var NotificationSender = class {
 	/**
 	* Emit notification failed event
 	*/
-	#emitNotificationFailed(notification, errors$1) {
+	#emitNotificationFailed(notification, errors) {
 		const event = facteurEvents.notificationFailed({
 			notification,
-			errors: errors$1
+			errors
 		});
 		this.emitter.emit(event.name, event.data);
 	}
@@ -144,7 +144,7 @@ var NotificationSender = class {
 	async #sendMessage(options) {
 		const { notification, channelName, options: sendOptions, channelConfig } = options;
 		const channel = this.#getChannel(channelName);
-		const messageResult = this.#buildMessageContent({
+		const messageResult = await this.#buildMessageContent({
 			notification,
 			channelName,
 			sendOptions
@@ -304,10 +304,10 @@ var NotificationSender = class {
 	* Prepare a message for a specific channel without sending it.
 	* Returns null if the message should not be sent.
 	*/
-	prepareMessage(options) {
+	async prepareMessage(options) {
 		const { notification, channelName, sendOptions, channelConfig } = options;
 		this.#getChannel(channelName);
-		const messageResult = this.#buildMessageContent({
+		const messageResult = await this.#buildMessageContent({
 			notification,
 			channelName,
 			sendOptions

package/dist/options.d.mts

@@ -3,6 +3,7 @@ import { QueueAdapter } from "./types/queue.mjs";
 import { ResolvedDefaultPreferences } from "./types/preferences.mjs";
 import { Emitter } from "./types/events.mjs";
 import { FacteurConfiguration, NotificationResolver, RetryConfig } from "./types/options.mjs";
+import "./types.mjs";
 import { DatabaseAdapter } from "./database/types.mjs";
 import { Logger } from "@julr/utils/logger";
 

package/dist/types/builder.d.mts

@@ -5,7 +5,6 @@ import { Identifier } from "../database/types.mjs";
 import { Duration } from "@julr/tenace/types";
 
 //#region src/types/builder.d.ts
-
 /**
  * Helper type to check if params are required for a notification
  */

package/dist/types/events.d.mts

@@ -1,7 +1,6 @@
 import { facteurEvents } from "../events/events.mjs";
 
 //#region src/types/events.d.ts
-
 /**
  * Shape of the emitter accepted by facteur
  * Should be compatible with node's EventEmitter and Emittery

package/dist/types/extend.d.mts

@@ -2,7 +2,6 @@ import { Facteur } from "../facteur.mjs";
 import { FacteurConfiguration } from "./options.mjs";
 
 //#region src/types/extend.d.ts
-
 /**
  * List of available channels
  */

package/dist/types/notifications.d.mts

@@ -1,10 +1,10 @@
 import { ChannelName, NotificationChannels } from "./extend.mjs";
 import { ExtractChannelTargets, MessageCtx, NotificationOptions } from "./options.mjs";
+import "../types.mjs";
 import { Identifier } from "../database/types.mjs";
 import { Awaitable } from "@julr/utils/types";
 
 //#region src/types/notifications.d.ts
-
 /**
  * Constructor type for notification classes
  */

package/dist/types/options.d.mts

@@ -4,13 +4,13 @@ import { DefaultPreferences } from "./preferences.mjs";
 import { ChannelName, NotificationChannels } from "./extend.mjs";
 import { Emitter } from "./events.mjs";
 import { Notifiable, Notification, NotificationClass } from "./notifications.mjs";
+import "../types.mjs";
 import { DatabaseAdapter, Identifier } from "../database/types.mjs";
 import { Logger } from "@julr/utils/logger";
 import { Awaitable } from "@julr/utils/types";
 import { Duration } from "@julr/tenace/types";
 
 //#region src/types/options.d.ts
-
 /**
  * Type for values that can be a single item or an array of items
  */
@@ -162,7 +162,7 @@ type SendOptions<TNotificationClass extends NotificationClass<any, any>> = IsAno
 };
 type ChannelSpecificConfig<N extends Notifiable> = { [K in ChannelName]?: boolean | ProviderTarget<N, K> };
 type ExtractChannelTargets<T> = T extends Channel<any, any, any, infer U> ? U : never;
-type ProviderTarget<_N extends Notifiable, K$1 extends ChannelName> = ExtractChannelTargets<NotificationChannels[K$1]>;
+type ProviderTarget<_N extends Notifiable, K extends ChannelName> = ExtractChannelTargets<NotificationChannels[K]>;
 /**
  * Retry options for channel sends
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@facteurjs/core",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "description": "Framework-agnostic notification system for Node.js with support for multiple channels (email, SMS, push, webhooks, etc.)",
   "keywords": [
     "discord",
@@ -65,18 +65,18 @@
     "@julr/tenace": "1.0.0-next.0",
     "@julr/utils": "1.9.0",
     "@poppinss/exception": "^1.2.3",
-    "ky": "^1.14.2"
+    "ky": "^1.14.3"
   },
   "devDependencies": {
-    "@aws-sdk/client-sns": "^3.958.0",
-    "@boringnode/transmit": "^0.3.0",
+    "@aws-sdk/client-sns": "^3.987.0",
+    "@boringnode/transmit": "^0.4.0",
     "@types/web-push": "^3.6.4",
     "expo-server-sdk": "^4.0.0",
-    "firebase-admin": "^13.6.0",
+    "firebase-admin": "^13.6.1",
     "knex": "^3.1.0",
-    "kysely": "^0.28.9",
+    "kysely": "^0.28.11",
     "socket.io": "^4.8.3",
-    "twilio": "^5.11.1",
+    "twilio": "^5.12.1",
     "web-push": "^3.6.7"
   },
   "peerDependencies": {