@growth-labs/mailer 0.2.0 → 0.2.1

package/dist/utils/analytics.d.ts

@@ -0,0 +1,24 @@
+import type { ResolvedMailerOptions } from '../options.js';
+export type MailerAnalyticsEvent = 'newsletter_subscribed' | 'newsletter_confirmed' | 'newsletter_unsubscribed' | 'newsletter_opened' | 'newsletter_clicked' | 'newsletter_delivered' | 'newsletter_bounced' | 'newsletter_complained' | 'newsletter_sent' | 'newsletter_send_failed';
+interface AnalyticsContext {
+    locals?: {
+        cfContext?: {
+            waitUntil(promise: Promise<unknown>): void;
+        };
+    };
+}
+interface EmitMailerAnalyticsOptions {
+    request?: Request;
+    context?: AnalyticsContext;
+    label?: Record<string, unknown>;
+    contentSlug?: string;
+    eventValue?: number;
+}
+export declare function emitMailerAnalyticsEvent(options: ResolvedMailerOptions, bindingsEnv: Record<string, unknown>, eventName: MailerAnalyticsEvent, emitOptions?: EmitMailerAnalyticsOptions): boolean;
+export declare function buildMailerAnalyticsDataPoint(options: ResolvedMailerOptions, eventName: MailerAnalyticsEvent, emitOptions?: EmitMailerAnalyticsOptions): {
+    blobs: string[];
+    doubles: number[];
+    indexes: string[];
+};
+export {};
+//# sourceMappingURL=analytics.d.ts.map

package/dist/utils/analytics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"analytics.d.ts","sourceRoot":"","sources":["../../src/utils/analytics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAE1D,MAAM,MAAM,oBAAoB,GAC7B,uBAAuB,GACvB,sBAAsB,GACtB,yBAAyB,GACzB,mBAAmB,GACnB,oBAAoB,GACpB,sBAAsB,GACtB,oBAAoB,GACpB,uBAAuB,GACvB,iBAAiB,GACjB,wBAAwB,CAAA;AAM3B,UAAU,gBAAgB;IACzB,MAAM,CAAC,EAAE;QACR,SAAS,CAAC,EAAE;YACX,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;SAC1C,CAAA;KACD,CAAA;CACD;AAED,UAAU,0BAA0B;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,gBAAgB,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,wBAAgB,wBAAwB,CACvC,OAAO,EAAE,qBAAqB,EAC9B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,SAAS,EAAE,oBAAoB,EAC/B,WAAW,GAAE,0BAA+B,GAC1C,OAAO,CAeT;AAED,wBAAgB,6BAA6B,CAC5C,OAAO,EAAE,qBAAqB,EAC9B,SAAS,EAAE,oBAAoB,EAC/B,WAAW,GAAE,0BAA+B,GAC1C;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CA+B3D"}

package/dist/utils/analytics.js

@@ -0,0 +1,74 @@
+export function emitMailerAnalyticsEvent(options, bindingsEnv, eventName, emitOptions = {}) {
+    if (!options.analyticsEnabled)
+        return false;
+    const analyticsBinding = bindingsEnv[options.analyticsBinding];
+    if (!analyticsBinding?.writeDataPoint)
+        return false;
+    const dataPoint = buildMailerAnalyticsDataPoint(options, eventName, emitOptions);
+    const write = analyticsBinding.writeDataPoint(dataPoint);
+    const waitUntil = emitOptions.context?.locals?.cfContext?.waitUntil;
+    if (waitUntil) {
+        waitUntil(write.catch(() => undefined));
+    }
+    else {
+        void write.catch(() => undefined);
+    }
+    return true;
+}
+export function buildMailerAnalyticsDataPoint(options, eventName, emitOptions = {}) {
+    const url = emitOptions.request ? new URL(emitOptions.request.url) : new URL(options.siteUrl);
+    const siteId = siteIdFromUrl(options.siteUrl);
+    const label = emitOptions.label ? JSON.stringify(emitOptions.label) : '';
+    return {
+        blobs: [
+            eventName,
+            siteId,
+            '',
+            '',
+            url.toString(),
+            url.pathname,
+            emitOptions.request?.headers.get('referer') ?? '',
+            '',
+            '',
+            '',
+            '',
+            emitOptions.request?.headers.get('cf-ipcountry') ?? '',
+            '',
+            '',
+            '',
+            emitOptions.contentSlug ?? '',
+            'newsletter',
+            categoryForMailerEvent(eventName),
+            label,
+            'false',
+        ],
+        doubles: [Date.now(), emitOptions.eventValue ?? 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+        indexes: [eventName],
+    };
+}
+function siteIdFromUrl(siteUrl) {
+    try {
+        return new URL(siteUrl).hostname.replace(/^www\./, '');
+    }
+    catch {
+        return siteUrl;
+    }
+}
+function categoryForMailerEvent(eventName) {
+    switch (eventName) {
+        case 'newsletter_subscribed':
+        case 'newsletter_confirmed':
+            return 'conversion';
+        case 'newsletter_opened':
+        case 'newsletter_clicked':
+            return 'interaction';
+        case 'newsletter_delivered':
+        case 'newsletter_bounced':
+        case 'newsletter_complained':
+        case 'newsletter_sent':
+        case 'newsletter_send_failed':
+        case 'newsletter_unsubscribed':
+            return 'newsletter';
+    }
+}
+//# sourceMappingURL=analytics.js.map

package/dist/utils/analytics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/utils/analytics.ts"],"names":[],"mappings":"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"}

package/dist/utils/bindings.d.ts

@@ -1,18 +1,12 @@
 import { drizzle } from 'drizzle-orm/d1';
 type DrizzleDB = ReturnType<typeof drizzle>;
-export interface RuntimeLocals {
-    runtime?: {
-        env: Record<string, unknown>;
-    };
-}
 /**
- * Resolve Cloudflare bindings from the runtime environment object.
+ * Resolve Cloudflare bindings from the Astro 6 Cloudflare Workers env object.
  *
- * Route handlers call this with `context.locals.runtime.env` (the standard
- * Astro 6 + @astrojs/cloudflare adapter pattern). Binding names come from
- * the virtual config so they stay in sync with the consumer's `astro.config`.
+ * Binding names come from the virtual config so they stay in sync with the
+ * consumer's `astro.config`.
  */
-export declare function resolveBindings(runtimeEnv: Record<string, unknown>): {
+export declare function resolveBindings(bindingsEnv?: Record<string, unknown>): {
     db: DrizzleDB;
     queue: Queue;
 };

package/dist/utils/bindings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/utils/bindings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC,KAAK,SAAS,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAA;AAE3C,MAAM,WAAW,aAAa;IAC7B,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAC1C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IACrE,EAAE,EAAE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;CACZ,CAQA"}
+{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/utils/bindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAExC,KAAK,SAAS,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAA;AAE3C;;;;;GAKG;AACH,wBAAgB,eAAe,CAC9B,WAAW,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAA4C,GAC7E;IACF,EAAE,EAAE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;CACZ,CAQA"}

package/dist/utils/bindings.js

@@ -1,15 +1,15 @@
+import { env as cloudflareEnv } from 'cloudflare:workers';
 import { config } from 'virtual:growth-labs/mailer/config';
 import { drizzle } from 'drizzle-orm/d1';
 /**
- * Resolve Cloudflare bindings from the runtime environment object.
+ * Resolve Cloudflare bindings from the Astro 6 Cloudflare Workers env object.
  *
- * Route handlers call this with `context.locals.runtime.env` (the standard
- * Astro 6 + @astrojs/cloudflare adapter pattern). Binding names come from
- * the virtual config so they stay in sync with the consumer's `astro.config`.
+ * Binding names come from the virtual config so they stay in sync with the
+ * consumer's `astro.config`.
  */
-export function resolveBindings(runtimeEnv) {
-    const d1 = runtimeEnv[config.d1Binding];
-    const queue = runtimeEnv[config.queueBinding];
+export function resolveBindings(bindingsEnv = cloudflareEnv) {
+    const d1 = bindingsEnv[config.d1Binding];
+    const queue = bindingsEnv[config.queueBinding];
     if (!d1)
         throw new Error(`[mailer] D1 binding "${config.d1Binding}" not found`);
     if (!queue)

package/dist/utils/bindings.js.map

@@ -1 +1 @@
-{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/utils/bindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAQxC;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,UAAmC;IAIlE,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,CAAe,CAAA;IACrD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAU,CAAA;IAEtD,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,SAAS,aAAa,CAAC,CAAA;IAC/E,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,YAAY,aAAa,CAAC,CAAA;IAExF,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAA;AAClC,CAAC"}
+{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/utils/bindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAIxC;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC9B,cAAuC,aAAwC;IAK/E,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAe,CAAA;IACtD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,YAAY,CAAU,CAAA;IAEvD,IAAI,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,CAAC,SAAS,aAAa,CAAC,CAAA;IAC/E,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,MAAM,CAAC,YAAY,aAAa,CAAC,CAAA;IAExF,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAA;AAClC,CAAC"}

package/dist/utils/index.d.ts

@@ -1,6 +1,7 @@
+export { buildMailerAnalyticsDataPoint, emitMailerAnalyticsEvent, type MailerAnalyticsEvent, } from './analytics.js';
 export { handleBounce, handleComplaint, handleDelivery, updateSendStatus, } from './bounce.js';
 export type { CloudflareEmailSender } from './providers.js';
-export { CloudflareEmailProvider, getProvider, sleep, } from './providers.js';
+export { CloudflareEmailProvider, getProvider, sleep } from './providers.js';
 export type { CampaignSchedule, DigestSchedule } from './scheduling.js';
 export { executeCampaignSchedule, executeDigestSchedule, prepareCampaign, prepareDigest, sendBatchCampaigns, } from './scheduling.js';
 export type { MailerEnv } from './send.js';

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,gBAAgB,GAChB,MAAM,aAAa,CAAA;AACpB,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAC3D,OAAO,EACN,uBAAuB,EACvB,WAAW,EACX,KAAK,GACL,MAAM,gBAAgB,CAAA;AACvB,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACvE,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,kBAAkB,GAClB,MAAM,iBAAiB,CAAA;AACxB,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACvE,OAAO,EACN,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACN,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EACN,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,GACf,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,6BAA6B,EAC7B,wBAAwB,EACxB,KAAK,oBAAoB,GACzB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,gBAAgB,GAChB,MAAM,aAAa,CAAA;AACpB,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAA;AAC3D,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAC5E,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AACvE,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,kBAAkB,GAClB,MAAM,iBAAiB,CAAA;AACxB,YAAY,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACvE,OAAO,EACN,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACN,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EACN,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,GACf,MAAM,eAAe,CAAA"}

package/dist/utils/index.js

@@ -1,5 +1,6 @@
+export { buildMailerAnalyticsDataPoint, emitMailerAnalyticsEvent, } from './analytics.js';
 export { handleBounce, handleComplaint, handleDelivery, updateSendStatus, } from './bounce.js';
-export { CloudflareEmailProvider, getProvider, sleep, } from './providers.js';
+export { CloudflareEmailProvider, getProvider, sleep } from './providers.js';
 export { executeCampaignSchedule, executeDigestSchedule, prepareCampaign, prepareDigest, sendBatchCampaigns, } from './scheduling.js';
 export { sendCampaign, sendDigest, sendTransactional } from './send.js';
 export { confirmSubscriber, countSubscribers, createSubscriber, getSubscriberBatch, getSubscriberByEmail, getSubscriberById, unsubscribeSubscriber, updatePreferences, } from './subscribers.js';

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAEpB,OAAO,EACN,uBAAuB,EACvB,WAAW,EACX,KAAK,GACL,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,kBAAkB,GAClB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACvE,OAAO,EACN,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACN,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EACN,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,GACf,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,6BAA6B,EAC7B,wBAAwB,GAExB,MAAM,gBAAgB,CAAA;AACvB,OAAO,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,gBAAgB,GAChB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAA;AAE5E,OAAO,EACN,uBAAuB,EACvB,qBAAqB,EACrB,eAAe,EACf,aAAa,EACb,kBAAkB,GAClB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AACvE,OAAO,EACN,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,iBAAiB,GACjB,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACN,YAAY,EACZ,WAAW,EACX,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,GACX,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACxD,OAAO,EACN,mBAAmB,EACnB,uBAAuB,EACvB,eAAe,GACf,MAAM,eAAe,CAAA"}

package/dist/utils/providers.js

@@ -26,7 +26,7 @@ export class CloudflareEmailProvider {
         }
     }
 }
-// ─── Factory functions ───
+// ─── Factory function ───
 export function getProvider(emailSender) {
     return new CloudflareEmailProvider(emailSender);
 }

package/dist/utils/providers.js.map

@@ -1 +1 @@
-{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/utils/providers.ts"],"names":[],"mappings":"AAaA,kCAAkC;AAElC,MAAM,OAAO,uBAAuB;IAC1B,IAAI,GAAG,YAAY,CAAA;IACX,MAAM,CAAuB;IAE9C,YAAY,WAAkC;QAC7C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAoB;QAC9B,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;aACnD,CAAC,CAAA;YAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAChE,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;YAEnD,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,OAAO;gBACd,SAAS,EAAE,WAAW;aACtB,CAAA;QACF,CAAC;IACF,CAAC;CACD;AAED,4BAA4B;AAE5B,MAAM,UAAU,WAAW,CAAC,WAAkC;IAC7D,OAAO,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAA;AAChD,CAAC;AAED,kBAAkB;AAElB,MAAM,UAAU,KAAK,CAAC,EAAU;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AACzD,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC9C,MAAM,QAAQ,GAAG;QAChB,SAAS;QACT,SAAS;QACT,cAAc;QACd,YAAY;QACZ,WAAW;QACX,QAAQ;QACR,GAAG;QACH,cAAc;QACd,qBAAqB;QACrB,iBAAiB;KACjB,CAAA;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;AAC/C,CAAC"}
+{"version":3,"file":"providers.js","sourceRoot":"","sources":["../../src/utils/providers.ts"],"names":[],"mappings":"AAaA,kCAAkC;AAElC,MAAM,OAAO,uBAAuB;IAC1B,IAAI,GAAG,YAAY,CAAA;IACX,MAAM,CAAuB;IAE9C,YAAY,WAAkC;QAC7C,IAAI,CAAC,MAAM,GAAG,WAAW,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAoB;QAC9B,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACtB,EAAE,EAAE,KAAK,CAAC,EAAE;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;aACnD,CAAC,CAAA;YAEF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAChE,MAAM,WAAW,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAA;YAEnD,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,OAAO;gBACd,SAAS,EAAE,WAAW;aACtB,CAAA;QACF,CAAC;IACF,CAAC;CACD;AAED,2BAA2B;AAE3B,MAAM,UAAU,WAAW,CAAC,WAAkC;IAC7D,OAAO,IAAI,uBAAuB,CAAC,WAAW,CAAC,CAAA;AAChD,CAAC;AAED,kBAAkB;AAElB,MAAM,UAAU,KAAK,CAAC,EAAU;IAC/B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AACzD,CAAC;AAED,SAAS,sBAAsB,CAAC,OAAe;IAC9C,MAAM,QAAQ,GAAG;QAChB,SAAS;QACT,SAAS;QACT,cAAc;QACd,YAAY;QACZ,WAAW;QACX,QAAQ;QACR,GAAG;QACH,cAAc;QACd,qBAAqB;QACrB,iBAAiB;KACjB,CAAA;IACD,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;AAC/C,CAAC"}

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "@growth-labs/mailer",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -52,6 +53,10 @@
     "src",
     "README.md"
   ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "peerDependencies": {
     "astro": "^6.0.0"
   },
@@ -75,6 +80,7 @@
   },
   "scripts": {
     "build": "tsc",
+    "check": "biome check src/",
     "test": "vitest run",
     "test:watch": "vitest"
   }

package/src/cloudflare-workers.d.ts

@@ -0,0 +1,3 @@
+declare module 'cloudflare:workers' {
+	export const env: Record<string, unknown>
+}

package/src/options.ts

@@ -50,6 +50,7 @@ export const mailerOptionsSchema = z.object({
 
 	// ─── Optional peer: analytics ───
 	analyticsEnabled: z.boolean().default(false),
+	analyticsBinding: z.string().default('ANALYTICS'),
 })
 
 export type MailerOptions = z.input<typeof mailerOptionsSchema>

package/src/queue/consumer.ts

@@ -1,13 +1,18 @@
 import { drizzle } from 'drizzle-orm/d1'
 import type { ResolvedMailerOptions } from '../options.js'
 import type { EmailProvider, EmailQueueMessage } from '../types.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import { updateSendStatus } from '../utils/bounce.js'
 import type { CloudflareEmailSender } from '../utils/providers.js'
 import { CloudflareEmailProvider, sleep } from '../utils/providers.js'
 
 export async function handleEmailQueue(
 	batch: MessageBatch<EmailQueueMessage>,
-	env: { DB: D1Database; EMAIL_SENDER?: CloudflareEmailSender },
+	env: {
+		DB: D1Database
+		EMAIL_SENDER?: CloudflareEmailSender
+		[key: string]: unknown
+	},
 	options: ResolvedMailerOptions,
 ): Promise<void> {
 	const db = drizzle(env.DB)
@@ -68,11 +73,32 @@ export async function handleEmailQueue(
 				await updateSendStatus(db, recipient.trackingId, 'sent', {
 					sentAt: new Date().toISOString(),
 				})
+				emitMailerAnalyticsEvent(options, env, 'newsletter_sent', {
+					contentSlug: recipient.trackingId,
+					label: {
+						trackingId: recipient.trackingId,
+						subscriberId: recipient.subscriberId,
+						email: recipient.email,
+						campaignId: message.body.campaignId,
+						type,
+					},
+				})
 			} else {
 				await updateSendStatus(db, recipient.trackingId, 'bounced', {
 					bouncedAt: new Date().toISOString(),
 					bounceType: 'hard',
 				})
+				emitMailerAnalyticsEvent(options, env, 'newsletter_send_failed', {
+					contentSlug: recipient.trackingId,
+					label: {
+						trackingId: recipient.trackingId,
+						subscriberId: recipient.subscriberId,
+						email: recipient.email,
+						campaignId: message.body.campaignId,
+						type,
+						error: result.error,
+					},
+				})
 				console.error(`[mailer] Send failed for ${recipient.email}: ${result.error}`)
 			}
 		}

package/src/routes/confirm.ts

@@ -1,13 +1,15 @@
+import { env as cloudflareEnv } from 'cloudflare:workers'
 import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { drizzle } from 'drizzle-orm/d1'
-import type { RuntimeLocals } from '../utils/bindings.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import type { MailerEnv } from '../utils/send.js'
 import { sendTransactional } from '../utils/send.js'
 import { confirmSubscriber, getSubscriberById } from '../utils/subscribers.js'
 import { verifyToken } from '../utils/tokens.js'
 
-export const GET: APIRoute = async ({ url, locals }) => {
+export const GET: APIRoute = async (context) => {
+	const { url } = context
 	const token = url.searchParams.get('token')
 	if (!token) {
 		return Response.json({ error: 'Missing token' }, { status: 400 })
@@ -20,9 +22,9 @@ export const GET: APIRoute = async ({ url, locals }) => {
 	}
 
 	// Resolve bindings
-	const runtimeEnv = (locals as RuntimeLocals).runtime?.env as Record<string, unknown>
-	const d1 = runtimeEnv[config.d1Binding] as D1Database
-	const queue = runtimeEnv[config.queueBinding] as Queue
+	const bindingsEnv = cloudflareEnv as Record<string, unknown>
+	const d1 = bindingsEnv[config.d1Binding] as D1Database
+	const queue = bindingsEnv[config.queueBinding] as Queue
 	const db = drizzle(d1)
 	const env: MailerEnv = { DB: d1, QUEUE: queue }
 
@@ -58,6 +60,15 @@ export const GET: APIRoute = async ({ url, locals }) => {
 		data: { name: subscriber.name },
 	})
 
+	emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_confirmed', {
+		context,
+		contentSlug: subscriber.id,
+		label: {
+			subscriberId: subscriber.id,
+			email: subscriber.email,
+		},
+	})
+
 	// Redirect to site with confirmed flag
 	return new Response(null, {
 		status: 302,

package/src/routes/preferences.astro

@@ -1,5 +1,6 @@
 ---
 import { config } from "virtual:growth-labs/mailer/config";
+import { env as cloudflareEnv } from "cloudflare:workers";
 import { drizzle } from "drizzle-orm/d1";
 import PreferenceCenter from "../components/PreferenceCenter.astro";
 import {
@@ -50,16 +51,11 @@ if (Astro.request.method === "POST" && payload.action !== "preferences") {
 	return new Response("Invalid or expired token", { status: 400 });
 }
 
-const runtimeEnv = (
-	Astro.locals as Record<string, unknown> & {
-		runtime?: { env: Record<string, unknown> };
-	}
-).runtime?.env;
-if (!runtimeEnv) {
-	return new Response("Runtime not available", { status: 500 });
+const bindingsEnv = cloudflareEnv as Record<string, unknown>;
+const d1 = bindingsEnv[config.d1Binding] as D1Database;
+if (!d1) {
+	return new Response("D1 binding not available", { status: 500 });
 }
-
-const d1 = runtimeEnv[config.d1Binding] as D1Database;
 const db = drizzle(d1);
 
 // Handle POST (form submission)

package/src/routes/subscribe.ts

@@ -1,13 +1,15 @@
+import { env as cloudflareEnv } from 'cloudflare:workers'
 import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { drizzle } from 'drizzle-orm/d1'
-import type { RuntimeLocals } from '../utils/bindings.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import type { MailerEnv } from '../utils/send.js'
 import { sendTransactional } from '../utils/send.js'
 import { createSubscriber } from '../utils/subscribers.js'
 import { generateToken } from '../utils/tokens.js'
 
-export const POST: APIRoute = async ({ request, locals }) => {
+export const POST: APIRoute = async (context) => {
+	const { request } = context
 	// 1. Parse request body
 	const body = (await request.json()) as {
 		email?: string
@@ -48,9 +50,9 @@ export const POST: APIRoute = async ({ request, locals }) => {
 	}
 
 	// 5. Resolve bindings
-	const runtimeEnv = (locals as RuntimeLocals).runtime?.env as Record<string, unknown>
-	const d1 = runtimeEnv[config.d1Binding] as D1Database
-	const queue = runtimeEnv[config.queueBinding] as Queue
+	const bindingsEnv = cloudflareEnv as Record<string, unknown>
+	const d1 = bindingsEnv[config.d1Binding] as D1Database
+	const queue = bindingsEnv[config.queueBinding] as Queue
 	const db = drizzle(d1)
 	const env: MailerEnv = { DB: d1, QUEUE: queue }
 
@@ -92,6 +94,20 @@ export const POST: APIRoute = async ({ request, locals }) => {
 			})
 		}
 
+		emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_subscribed', {
+			request,
+			context,
+			contentSlug: subscriber.id,
+			label: {
+				subscriberId: subscriber.id,
+				email: subscriber.email,
+				source: body.source ?? 'form',
+				preferences: body.preferences ?? [],
+				requiresConfirmation: config.doubleOptIn,
+				isNew,
+			},
+		})
+
 		// Return success (always 200 to avoid email enumeration)
 		return Response.json({
 			success: true,

package/src/routes/track-click.ts

@@ -1,10 +1,13 @@
+import { env as cloudflareEnv } from 'cloudflare:workers'
 import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { and, eq, inArray } from 'drizzle-orm'
 import { drizzle } from 'drizzle-orm/d1'
 import { emailSends } from '../schema.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 
-export const GET: APIRoute = async ({ params, url, locals }) => {
+export const GET: APIRoute = async (context) => {
+	const { params, request, url } = context
 	const trackingId = params.trackingId
 	const destination = url.searchParams.get('url')
 
@@ -24,13 +27,9 @@ export const GET: APIRoute = async ({ params, url, locals }) => {
 
 	// Update status to 'clicked' only when it hasn't already reached 'clicked'
 	try {
-		const runtimeEnv = (
-			locals as Record<string, unknown> & {
-				runtime?: { env: Record<string, unknown> }
-			}
-		).runtime?.env
-		if (runtimeEnv) {
-			const d1 = runtimeEnv[config.d1Binding] as D1Database
+		const bindingsEnv = cloudflareEnv as Record<string, unknown>
+		if (bindingsEnv) {
+			const d1 = bindingsEnv[config.d1Binding] as D1Database
 			const db = drizzle(d1)
 			await db
 				.update(emailSends)
@@ -49,6 +48,13 @@ export const GET: APIRoute = async ({ params, url, locals }) => {
 		// Never fail the redirect on DB errors
 	}
 
+	emitMailerAnalyticsEvent(config, cloudflareEnv as Record<string, unknown>, 'newsletter_clicked', {
+		request,
+		context,
+		contentSlug: trackingId,
+		label: { trackingId, destination },
+	})
+
 	// 302 redirect to original destination
 	return new Response(null, {
 		status: 302,

package/src/routes/track-open.ts

@@ -1,11 +1,14 @@
+import { env as cloudflareEnv } from 'cloudflare:workers'
 import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { and, eq, inArray } from 'drizzle-orm'
 import { drizzle } from 'drizzle-orm/d1'
 import { emailSends } from '../schema.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import { TRANSPARENT_GIF } from '../utils/tracking.js'
 
-export const GET: APIRoute = async ({ params, locals }) => {
+export const GET: APIRoute = async (context) => {
+	const { params, request } = context
 	const trackingId = params.trackingId
 	if (!trackingId) {
 		return new Response(null, { status: 400 })
@@ -14,13 +17,9 @@ export const GET: APIRoute = async ({ params, locals }) => {
 	// Update status to 'opened' only when currently 'sent' or 'delivered'
 	// to avoid downgrading from 'clicked'.
 	try {
-		const runtimeEnv = (
-			locals as Record<string, unknown> & {
-				runtime?: { env: Record<string, unknown> }
-			}
-		).runtime?.env
-		if (runtimeEnv) {
-			const d1 = runtimeEnv[config.d1Binding] as D1Database
+		const bindingsEnv = cloudflareEnv as Record<string, unknown>
+		if (bindingsEnv) {
+			const d1 = bindingsEnv[config.d1Binding] as D1Database
 			const db = drizzle(d1)
 			await db
 				.update(emailSends)
@@ -39,6 +38,13 @@ export const GET: APIRoute = async ({ params, locals }) => {
 		// Never fail the pixel response on DB errors
 	}
 
+	emitMailerAnalyticsEvent(config, cloudflareEnv as Record<string, unknown>, 'newsletter_opened', {
+		request,
+		context,
+		contentSlug: trackingId,
+		label: { trackingId },
+	})
+
 	// 1x1 transparent GIF
 	return new Response(TRANSPARENT_GIF, {
 		status: 200,

package/src/routes/unsubscribe.ts

@@ -1,14 +1,19 @@
+import { env as cloudflareEnv } from 'cloudflare:workers'
 import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { drizzle } from 'drizzle-orm/d1'
-import type { RuntimeLocals } from '../utils/bindings.js'
+import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import type { MailerEnv } from '../utils/send.js'
 import { sendTransactional } from '../utils/send.js'
 import { getSubscriberById, unsubscribeSubscriber } from '../utils/subscribers.js'
 import { generateToken, verifyToken } from '../utils/tokens.js'
 import { buildSiteUrl } from '../utils/urls.js'
 
-async function processUnsubscribe(locals: RuntimeLocals, token: string) {
+async function processUnsubscribe(
+	token: string,
+	context?: Parameters<APIRoute>[0],
+	request?: Request,
+) {
 	// Verify token
 	const payload = await verifyToken(config.signingSecret, token)
 	if (!payload || payload.action !== 'unsubscribe') {
@@ -16,9 +21,9 @@ async function processUnsubscribe(locals: RuntimeLocals, token: string) {
 	}
 
 	// Resolve bindings
-	const runtimeEnv = locals.runtime?.env as Record<string, unknown>
-	const d1 = runtimeEnv[config.d1Binding] as D1Database
-	const queue = runtimeEnv[config.queueBinding] as Queue
+	const bindingsEnv = cloudflareEnv as Record<string, unknown>
+	const d1 = bindingsEnv[config.d1Binding] as D1Database
+	const queue = bindingsEnv[config.queueBinding] as Queue
 	const db = drizzle(d1)
 	const env: MailerEnv = { DB: d1, QUEUE: queue }
 
@@ -43,6 +48,16 @@ async function processUnsubscribe(locals: RuntimeLocals, token: string) {
 		},
 	})
 
+	emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_unsubscribed', {
+		request,
+		context,
+		contentSlug: subscriber.id,
+		label: {
+			subscriberId: subscriber.id,
+			email: subscriber.email,
+		},
+	})
+
 	return {
 		success: true,
 		subscriberId: payload.subscriberId,
@@ -50,13 +65,14 @@ async function processUnsubscribe(locals: RuntimeLocals, token: string) {
 }
 
 // GET: Link from email footer
-export const GET: APIRoute = async ({ url, locals }) => {
+export const GET: APIRoute = async (context) => {
+	const { url, request } = context
 	const token = url.searchParams.get('token')
 	if (!token) {
 		return Response.json({ error: 'Missing token' }, { status: 400 })
 	}
 
-	const result = await processUnsubscribe(locals as RuntimeLocals, token)
+	const result = await processUnsubscribe(token, context, request)
 	if ('error' in result) {
 		return Response.json({ error: result.error }, { status: result.status })
 	}
@@ -78,7 +94,8 @@ export const GET: APIRoute = async ({ url, locals }) => {
 }
 
 // POST: RFC 8058 List-Unsubscribe-Post
-export const POST: APIRoute = async ({ request, locals }) => {
+export const POST: APIRoute = async (context) => {
+	const { request } = context
 	// RFC 8058: body is "List-Unsubscribe=One-Click"
 	// Token comes from List-Unsubscribe header URL
 	const url = new URL(request.url)
@@ -87,7 +104,7 @@ export const POST: APIRoute = async ({ request, locals }) => {
 		return new Response('Missing token', { status: 400 })
 	}
 
-	const result = await processUnsubscribe(locals as RuntimeLocals, token)
+	const result = await processUnsubscribe(token, context, request)
 	if ('error' in result) {
 		return new Response(result.error, { status: result.status })
 	}