@growth-labs/mailer 0.3.0 → 0.4.0

package/src/utils/send.ts

@@ -2,7 +2,7 @@ import { eq } from 'drizzle-orm'
 import { drizzle } from 'drizzle-orm/d1'
 import { ulid } from 'ulidx'
 import type { ResolvedMailerOptions } from '../options.js'
-import { emailSends } from '../schema.js'
+import { emailSends } from '../schema/sends.js'
 import type {
 	DigestItem,
 	EmailQueueMessage,
@@ -21,9 +21,38 @@ type DrizzleDB = ReturnType<typeof drizzle>
 
 // ─── MailerEnv ───
 
-export interface MailerEnv {
-	DB: D1Database
-	QUEUE: Queue
+/**
+ * Producer-side env. The actual binding *names* come from
+ * `options.d1Binding` / `options.queueBinding` (default `SITE_DB` /
+ * `EMAIL_QUEUE`); MailerEnv is a generic record so consumers can pass
+ * their full Worker env without renaming bindings.
+ */
+export type MailerEnv = Record<string, unknown>
+
+interface ResolvedProducerBindings {
+	db: DrizzleDB
+	queue: Queue
+}
+
+function resolveProducerBindings(
+	env: MailerEnv,
+	options: ResolvedMailerOptions,
+): ResolvedProducerBindings {
+	const d1 = env[options.d1Binding] as D1Database | undefined
+	if (!d1) {
+		throw new Error(
+			`[mailer] env.${options.d1Binding} is undefined; ` +
+				'pass d1Binding option to the mailer integration or bind that name in wrangler.toml.',
+		)
+	}
+	const queue = env[options.queueBinding] as Queue | undefined
+	if (!queue) {
+		throw new Error(
+			`[mailer] env.${options.queueBinding} is undefined; ` +
+				'pass queueBinding option to the mailer integration or bind that name in wrangler.toml.',
+		)
+	}
+	return { db: drizzle(d1), queue }
 }
 
 // ─── sendTransactional ───
@@ -40,7 +69,7 @@ export async function sendTransactional(
 		data?: Record<string, unknown>
 	},
 ): Promise<{ trackingId: string }> {
-	const db = drizzle(env.DB)
+	const { db, queue } = resolveProducerBindings(env, options)
 	const trackingId = ulid()
 	const subscriberId = params.subscriberId ?? ulid()
 
@@ -76,6 +105,7 @@ export async function sendTransactional(
 
 	// Build and enqueue the message
 	const message: EmailQueueMessage = {
+		siteId: options.siteId,
 		type: 'transactional',
 		recipients: [
 			{
@@ -92,7 +122,7 @@ export async function sendTransactional(
 		replyTo: options.replyTo,
 	}
 
-	await env.QUEUE.send(message)
+	await queue.send(message)
 
 	return { trackingId }
 }
@@ -100,7 +130,7 @@ export async function sendTransactional(
 // ─── Fan-out helper (shared by campaign + digest) ───
 
 async function fanOutToSubscribers(
-	env: MailerEnv,
+	queue: Queue,
 	db: DrizzleDB,
 	options: ResolvedMailerOptions,
 	params: {
@@ -154,6 +184,7 @@ async function fanOutToSubscribers(
 		}
 
 		const message: EmailQueueMessage = {
+			siteId: options.siteId,
 			type: params.type,
 			recipients,
 			subject: params.subject,
@@ -162,7 +193,7 @@ async function fanOutToSubscribers(
 			replyTo: options.replyTo,
 			campaignId: params.campaignId,
 		}
-		await env.QUEUE.send(message)
+		await queue.send(message)
 
 		recipientCount += batch.length
 		cursor = batch[batch.length - 1].id
@@ -186,7 +217,7 @@ export async function sendCampaign(
 	},
 ): Promise<{ campaignId: string; recipientCount: number }> {
 	const campaignId = params.campaignId ?? ulid()
-	const db = drizzle(env.DB)
+	const { db, queue } = resolveProducerBindings(env, options)
 
 	// Render HTML
 	let html: string
@@ -211,7 +242,7 @@ export async function sendCampaign(
 	html = injectTrackingPixel(html, trackOpenUrl)
 	html = rewriteLinksForTracking(html, trackClickUrl)
 
-	const recipientCount = await fanOutToSubscribers(env, db, options, {
+	const recipientCount = await fanOutToSubscribers(queue, db, options, {
 		subject: params.subject,
 		html,
 		campaignId,
@@ -236,7 +267,7 @@ export async function sendDigest(
 	},
 ): Promise<{ campaignId: string; recipientCount: number }> {
 	const campaignId = params.campaignId ?? ulid()
-	const db = drizzle(env.DB)
+	const { db, queue } = resolveProducerBindings(env, options)
 
 	// Render digest items then full template
 	const itemsHtml = renderDigestItems(params.items)
@@ -256,7 +287,7 @@ export async function sendDigest(
 	html = injectTrackingPixel(html, trackOpenUrl)
 	html = rewriteLinksForTracking(html, trackClickUrl)
 
-	const recipientCount = await fanOutToSubscribers(env, db, options, {
+	const recipientCount = await fanOutToSubscribers(queue, db, options, {
 		subject: params.subject,
 		html,
 		campaignId,

package/src/utils/subscribers.ts

@@ -1,7 +1,7 @@
 import { and, eq, gt, inArray, like, lt, or, sql } from 'drizzle-orm'
 import type { drizzle } from 'drizzle-orm/d1'
 import { ulid } from 'ulidx'
-import { subscribers } from '../schema.js'
+import { subscribers } from '../schema/subscribers.js'
 import type { Subscriber, SubscriberAttribution, SubscriberFilter } from '../types.js'
 
 type DrizzleDB = ReturnType<typeof drizzle>

package/src/virtual.d.ts

@@ -1,10 +1,14 @@
 declare module 'virtual:growth-labs/mailer/config' {
+	import type { SiteConfigLookup } from './types.js'
 	export const config: {
+		siteId: string
 		senderName: string
 		fromAddress: string
 		replyTo?: string
 		d1Binding: string
 		queueBinding: string
+		senderBinding: string
+		siteConfigLookup?: SiteConfigLookup
 		turnstileSiteKey: string
 		turnstileSecretKey: string
 		doubleOptIn: boolean

package/src/schema.ts

@@ -1,56 +0,0 @@
-import { index, integer, sqliteTable, text } from 'drizzle-orm/sqlite-core'
-
-export const subscribers = sqliteTable(
-	'gl_subscribers',
-	{
-		id: text('id').primaryKey(),
-		email: text('email').notNull().unique(),
-		name: text('name'),
-		status: text('status').notNull().default('pending'),
-		preferences: text('preferences').notNull().default('[]'),
-		source: text('source').notNull(),
-		attribution: text('attribution'),
-		softBounceCount: integer('soft_bounce_count').notNull().default(0),
-		subscribedAt: text('subscribed_at').notNull(),
-		confirmedAt: text('confirmed_at'),
-		unsubscribedAt: text('unsubscribed_at'),
-		createdAt: text('created_at').notNull(),
-		updatedAt: text('updated_at').notNull(),
-	},
-	(table) => [
-		index('idx_subscribers_status').on(table.status),
-		index('idx_subscribers_email').on(table.email),
-		index('idx_subscribers_subscribed_at').on(table.subscribedAt),
-	],
-)
-
-export const emailSends = sqliteTable(
-	'gl_email_sends',
-	{
-		id: text('id').primaryKey(),
-		subscriberId: text('subscriber_id')
-			.notNull()
-			.references(() => subscribers.id),
-		campaignId: text('campaign_id'),
-		email: text('email').notNull(),
-		subject: text('subject').notNull(),
-		type: text('type').notNull(),
-		status: text('status').notNull().default('queued'),
-		sentAt: text('sent_at'),
-		deliveredAt: text('delivered_at'),
-		openedAt: text('opened_at'),
-		clickedAt: text('clicked_at'),
-		bouncedAt: text('bounced_at'),
-		bounceType: text('bounce_type'),
-		complainedAt: text('complained_at'),
-		trackingId: text('tracking_id').notNull().unique(),
-		createdAt: text('created_at').notNull(),
-	},
-	(table) => [
-		index('idx_sends_subscriber').on(table.subscriberId),
-		index('idx_sends_campaign').on(table.campaignId),
-		index('idx_sends_tracking').on(table.trackingId),
-		index('idx_sends_status').on(table.status),
-		index('idx_sends_type_created').on(table.type, table.createdAt),
-	],
-)