@growth-labs/mailer 0.5.0 → 0.6.0

package/src/utils/send.ts

@@ -93,6 +93,7 @@ export async function sendTransactional(
 	const signingSecret = params.subscriberId ? await requireSigningSecret(env, options) : undefined
 	const { sendsDb, queue } = resolveProducerBindings(env, options)
 	const trackingId = ulid()
+	const deliveryToken = ulid()
 	const subscriberId = params.subscriberId ?? ulid()
 
 	// Render HTML
@@ -123,6 +124,7 @@ export async function sendTransactional(
 		type: 'transactional',
 		status: 'queued',
 		trackingId,
+		deliveryToken,
 		createdAt: new Date().toISOString(),
 	})
 
@@ -137,6 +139,7 @@ export async function sendTransactional(
 				trackingId,
 				unsubscribeToken: '',
 				preferencesToken: '',
+				deliveryToken,
 			},
 		],
 		subject: params.subject,
@@ -178,6 +181,7 @@ async function fanOutToSubscribers(
 		const recipients: QueueRecipient[] = []
 		for (const sub of batch) {
 			const trackingId = ulid()
+			const deliveryToken = ulid()
 			const unsubscribeToken = await generateToken(signingSecret, {
 				subscriberId: sub.id,
 				action: 'unsubscribe',
@@ -199,6 +203,7 @@ async function fanOutToSubscribers(
 				type: params.type,
 				status: 'queued',
 				trackingId,
+				deliveryToken,
 				createdAt: new Date().toISOString(),
 			})
 
@@ -208,6 +213,7 @@ async function fanOutToSubscribers(
 				trackingId,
 				unsubscribeToken,
 				preferencesToken,
+				deliveryToken,
 			})
 		}
 

package/src/vite-plugin.ts

@@ -1,22 +1,21 @@
 import type { Plugin } from 'vite'
-import type { ResolvedMailerOptions } from './options.js'
+import type { ResolvedMailerComponentsOptions, ResolvedMailerOptions } from './options.js'
+
+type MailerConfig = ResolvedMailerOptions | ResolvedMailerComponentsOptions
 
 const VIRTUAL_MODULE_ID = 'virtual:growth-labs/mailer/config'
 const RESOLVED_VIRTUAL_MODULE_ID = `\0${VIRTUAL_MODULE_ID}`
 
-export function renderMailerConfigModule(
-	config: ResolvedMailerOptions,
-	command: 'build' | 'serve',
-): string {
+export function renderMailerConfigModule(config: MailerConfig, command: 'build' | 'serve'): string {
 	const serializableConfig = { ...config }
 	if (command !== 'serve') {
-		delete serializableConfig.turnstileSecretKey
-		delete serializableConfig.signingSecret
+		if ('turnstileSecretKey' in serializableConfig) delete serializableConfig.turnstileSecretKey
+		if ('signingSecret' in serializableConfig) delete serializableConfig.signingSecret
 	}
 	return `export const config = ${JSON.stringify(serializableConfig)};`
 }
 
-export function growthLabsMailerPlugin(config: ResolvedMailerOptions): Plugin {
+export function growthLabsMailerPlugin(config: MailerConfig): Plugin {
 	let command: 'build' | 'serve' = 'build'
 
 	return {