@growth-labs/mailer 0.2.0 → 0.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +32 -4
- package/dist/options.d.ts +61 -0
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +23 -0
- package/dist/options.js.map +1 -1
- package/dist/queue/consumer.d.ts +1 -0
- package/dist/queue/consumer.d.ts.map +1 -1
- package/dist/queue/consumer.js +22 -0
- package/dist/queue/consumer.js.map +1 -1
- package/dist/routes/confirm.d.ts.map +1 -1
- package/dist/routes/confirm.js +15 -4
- package/dist/routes/confirm.js.map +1 -1
- package/dist/routes/subscribe.d.ts.map +1 -1
- package/dist/routes/subscribe.js +20 -4
- package/dist/routes/subscribe.js.map +1 -1
- package/dist/routes/track-click.d.ts.map +1 -1
- package/dist/routes/track-click.js +13 -4
- package/dist/routes/track-click.js.map +1 -1
- package/dist/routes/track-open.d.ts.map +1 -1
- package/dist/routes/track-open.js +13 -4
- package/dist/routes/track-open.js.map +1 -1
- package/dist/routes/unsubscribe.d.ts.map +1 -1
- package/dist/routes/unsubscribe.js +21 -8
- package/dist/routes/unsubscribe.js.map +1 -1
- package/dist/routes/webhook.d.ts.map +1 -1
- package/dist/routes/webhook.js +52 -6
- package/dist/routes/webhook.js.map +1 -1
- package/dist/utils/analytics.d.ts +24 -0
- package/dist/utils/analytics.d.ts.map +1 -0
- package/dist/utils/analytics.js +75 -0
- package/dist/utils/analytics.js.map +1 -0
- package/dist/utils/bindings.d.ts +4 -10
- package/dist/utils/bindings.d.ts.map +1 -1
- package/dist/utils/bindings.js +7 -7
- package/dist/utils/bindings.js.map +1 -1
- package/dist/utils/index.d.ts +3 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +3 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/providers.js +1 -1
- package/dist/utils/providers.js.map +1 -1
- package/dist/utils/webhook-signature.d.ts +6 -0
- package/dist/utils/webhook-signature.d.ts.map +1 -0
- package/dist/utils/webhook-signature.js +59 -0
- package/dist/utils/webhook-signature.js.map +1 -0
- package/package.json +7 -1
- package/src/cloudflare-workers.d.ts +3 -0
- package/src/options.ts +23 -0
- package/src/queue/consumer.ts +27 -1
- package/src/routes/confirm.ts +16 -5
- package/src/routes/preferences.astro +5 -9
- package/src/routes/subscribe.ts +21 -5
- package/src/routes/track-click.ts +14 -8
- package/src/routes/track-open.ts +14 -8
- package/src/routes/unsubscribe.ts +26 -9
- package/src/routes/webhook.ts +55 -11
- package/src/utils/analytics.ts +120 -0
- package/src/utils/bindings.ts +9 -11
- package/src/utils/index.ts +7 -5
- package/src/utils/providers.ts +1 -1
- package/src/utils/webhook-signature.ts +91 -0
- package/src/virtual.d.ts +15 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/routes/webhook.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/routes/webhook.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAcrC,eAAO,MAAM,IAAI,EAAE,QAgElB,CAAA"}
|
package/dist/routes/webhook.js
CHANGED
|
@@ -1,17 +1,43 @@
|
|
|
1
|
+
import { env as cloudflareEnv } from 'cloudflare:workers';
|
|
1
2
|
import { config } from 'virtual:growth-labs/mailer/config';
|
|
2
3
|
import { drizzle } from 'drizzle-orm/d1';
|
|
4
|
+
import { emitMailerAnalyticsEvent } from '../utils/analytics.js';
|
|
3
5
|
import { handleBounce, handleComplaint, handleDelivery } from '../utils/bounce.js';
|
|
4
|
-
|
|
5
|
-
|
|
6
|
+
import { verifyWebhookSignature } from '../utils/webhook-signature.js';
|
|
7
|
+
export const POST = async (context) => {
|
|
8
|
+
const { request } = context;
|
|
9
|
+
const rawBody = await request.text();
|
|
10
|
+
const signatureValid = await verifyWebhookSignature(config.webhookSignature, request, rawBody);
|
|
11
|
+
if (!signatureValid) {
|
|
12
|
+
return Response.json({ error: 'Invalid webhook signature' }, { status: 401 });
|
|
13
|
+
}
|
|
14
|
+
let body;
|
|
15
|
+
try {
|
|
16
|
+
body = JSON.parse(rawBody);
|
|
17
|
+
}
|
|
18
|
+
catch {
|
|
19
|
+
return Response.json({ error: 'Invalid payload' }, { status: 400 });
|
|
20
|
+
}
|
|
6
21
|
if (!body.type || !body.email) {
|
|
7
22
|
return Response.json({ error: 'Invalid payload' }, { status: 400 });
|
|
8
23
|
}
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
24
|
+
const bindingsEnv = cloudflareEnv;
|
|
25
|
+
const d1 = bindingsEnv[config.d1Binding];
|
|
26
|
+
if (!d1) {
|
|
27
|
+
return Response.json({ error: 'D1 binding not available' }, { status: 500 });
|
|
12
28
|
}
|
|
13
|
-
const d1 = runtimeEnv[config.d1Binding];
|
|
14
29
|
const db = drizzle(d1);
|
|
30
|
+
emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_webhook_received', {
|
|
31
|
+
request,
|
|
32
|
+
context,
|
|
33
|
+
contentSlug: body.trackingId ?? body.email,
|
|
34
|
+
label: {
|
|
35
|
+
type: body.type,
|
|
36
|
+
email: body.email,
|
|
37
|
+
trackingId: body.trackingId,
|
|
38
|
+
bounceType: body.bounceType,
|
|
39
|
+
},
|
|
40
|
+
});
|
|
15
41
|
switch (body.type) {
|
|
16
42
|
case 'delivery':
|
|
17
43
|
if (body.trackingId) {
|
|
@@ -25,6 +51,26 @@ export const POST = async ({ request, locals }) => {
|
|
|
25
51
|
await handleComplaint(db, body.email);
|
|
26
52
|
break;
|
|
27
53
|
}
|
|
54
|
+
emitMailerAnalyticsEvent(config, bindingsEnv, eventForWebhookType(body.type), {
|
|
55
|
+
request,
|
|
56
|
+
context,
|
|
57
|
+
contentSlug: body.trackingId ?? body.email,
|
|
58
|
+
label: {
|
|
59
|
+
email: body.email,
|
|
60
|
+
trackingId: body.trackingId,
|
|
61
|
+
bounceType: body.bounceType,
|
|
62
|
+
},
|
|
63
|
+
});
|
|
28
64
|
return Response.json({ ok: true });
|
|
29
65
|
};
|
|
66
|
+
function eventForWebhookType(type) {
|
|
67
|
+
switch (type) {
|
|
68
|
+
case 'delivery':
|
|
69
|
+
return 'newsletter_delivered';
|
|
70
|
+
case 'bounce':
|
|
71
|
+
return 'newsletter_bounced';
|
|
72
|
+
case 'complaint':
|
|
73
|
+
return 'newsletter_complained';
|
|
74
|
+
}
|
|
75
|
+
}
|
|
30
76
|
//# sourceMappingURL=webhook.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/routes/webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/routes/webhook.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { ResolvedMailerOptions } from '../options.js';
|
|
2
|
+
export type MailerAnalyticsEvent = 'newsletter_subscribed' | 'newsletter_confirmed' | 'newsletter_unsubscribed' | 'newsletter_opened' | 'newsletter_clicked' | 'newsletter_webhook_received' | 'newsletter_delivered' | 'newsletter_bounced' | 'newsletter_complained' | 'newsletter_sent' | 'newsletter_send_failed';
|
|
3
|
+
interface AnalyticsContext {
|
|
4
|
+
locals?: {
|
|
5
|
+
cfContext?: {
|
|
6
|
+
waitUntil(promise: Promise<unknown>): void;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
9
|
+
}
|
|
10
|
+
interface EmitMailerAnalyticsOptions {
|
|
11
|
+
request?: Request;
|
|
12
|
+
context?: AnalyticsContext;
|
|
13
|
+
label?: Record<string, unknown>;
|
|
14
|
+
contentSlug?: string;
|
|
15
|
+
eventValue?: number;
|
|
16
|
+
}
|
|
17
|
+
export declare function emitMailerAnalyticsEvent(options: ResolvedMailerOptions, bindingsEnv: Record<string, unknown>, eventName: MailerAnalyticsEvent, emitOptions?: EmitMailerAnalyticsOptions): boolean;
|
|
18
|
+
export declare function buildMailerAnalyticsDataPoint(options: ResolvedMailerOptions, eventName: MailerAnalyticsEvent, emitOptions?: EmitMailerAnalyticsOptions): {
|
|
19
|
+
blobs: string[];
|
|
20
|
+
doubles: number[];
|
|
21
|
+
indexes: string[];
|
|
22
|
+
};
|
|
23
|
+
export {};
|
|
24
|
+
//# sourceMappingURL=analytics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
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,6BAA6B,GAC7B,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"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
export function emitMailerAnalyticsEvent(options, bindingsEnv, eventName, emitOptions = {}) {
|
|
2
|
+
if (!options.analyticsEnabled)
|
|
3
|
+
return false;
|
|
4
|
+
const analyticsBinding = bindingsEnv[options.analyticsBinding];
|
|
5
|
+
if (!analyticsBinding?.writeDataPoint)
|
|
6
|
+
return false;
|
|
7
|
+
const dataPoint = buildMailerAnalyticsDataPoint(options, eventName, emitOptions);
|
|
8
|
+
const write = analyticsBinding.writeDataPoint(dataPoint);
|
|
9
|
+
const waitUntil = emitOptions.context?.locals?.cfContext?.waitUntil;
|
|
10
|
+
if (waitUntil) {
|
|
11
|
+
waitUntil(write.catch(() => undefined));
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
void write.catch(() => undefined);
|
|
15
|
+
}
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
export function buildMailerAnalyticsDataPoint(options, eventName, emitOptions = {}) {
|
|
19
|
+
const url = emitOptions.request ? new URL(emitOptions.request.url) : new URL(options.siteUrl);
|
|
20
|
+
const siteId = siteIdFromUrl(options.siteUrl);
|
|
21
|
+
const label = emitOptions.label ? JSON.stringify(emitOptions.label) : '';
|
|
22
|
+
return {
|
|
23
|
+
blobs: [
|
|
24
|
+
eventName,
|
|
25
|
+
siteId,
|
|
26
|
+
'',
|
|
27
|
+
'',
|
|
28
|
+
url.toString(),
|
|
29
|
+
url.pathname,
|
|
30
|
+
emitOptions.request?.headers.get('referer') ?? '',
|
|
31
|
+
'',
|
|
32
|
+
'',
|
|
33
|
+
'',
|
|
34
|
+
'',
|
|
35
|
+
emitOptions.request?.headers.get('cf-ipcountry') ?? '',
|
|
36
|
+
'',
|
|
37
|
+
'',
|
|
38
|
+
'',
|
|
39
|
+
emitOptions.contentSlug ?? '',
|
|
40
|
+
'newsletter',
|
|
41
|
+
categoryForMailerEvent(eventName),
|
|
42
|
+
label,
|
|
43
|
+
'false',
|
|
44
|
+
],
|
|
45
|
+
doubles: [Date.now(), emitOptions.eventValue ?? 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
|
|
46
|
+
indexes: [eventName],
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
function siteIdFromUrl(siteUrl) {
|
|
50
|
+
try {
|
|
51
|
+
return new URL(siteUrl).hostname.replace(/^www\./, '');
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
return siteUrl;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function categoryForMailerEvent(eventName) {
|
|
58
|
+
switch (eventName) {
|
|
59
|
+
case 'newsletter_subscribed':
|
|
60
|
+
case 'newsletter_confirmed':
|
|
61
|
+
return 'conversion';
|
|
62
|
+
case 'newsletter_opened':
|
|
63
|
+
case 'newsletter_clicked':
|
|
64
|
+
return 'interaction';
|
|
65
|
+
case 'newsletter_webhook_received':
|
|
66
|
+
case 'newsletter_delivered':
|
|
67
|
+
case 'newsletter_bounced':
|
|
68
|
+
case 'newsletter_complained':
|
|
69
|
+
case 'newsletter_sent':
|
|
70
|
+
case 'newsletter_send_failed':
|
|
71
|
+
case 'newsletter_unsubscribed':
|
|
72
|
+
return 'newsletter';
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=analytics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"analytics.js","sourceRoot":"","sources":["../../src/utils/analytics.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/bindings.d.ts
CHANGED
|
@@ -1,18 +1,12 @@
|
|
|
1
1
|
import { drizzle } from 'drizzle-orm/d1';
|
|
2
2
|
type DrizzleDB = ReturnType<typeof drizzle>;
|
|
3
|
-
export interface RuntimeLocals {
|
|
4
|
-
runtime?: {
|
|
5
|
-
env: Record<string, unknown>;
|
|
6
|
-
};
|
|
7
|
-
}
|
|
8
3
|
/**
|
|
9
|
-
* Resolve Cloudflare bindings from the
|
|
4
|
+
* Resolve Cloudflare bindings from the Astro 6 Cloudflare Workers env object.
|
|
10
5
|
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* the virtual config so they stay in sync with the consumer's `astro.config`.
|
|
6
|
+
* Binding names come from the virtual config so they stay in sync with the
|
|
7
|
+
* consumer's `astro.config`.
|
|
14
8
|
*/
|
|
15
|
-
export declare function resolveBindings(
|
|
9
|
+
export declare function resolveBindings(bindingsEnv?: Record<string, unknown>): {
|
|
16
10
|
db: DrizzleDB;
|
|
17
11
|
queue: Queue;
|
|
18
12
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/utils/bindings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
|
+
import { env as cloudflareEnv } from 'cloudflare:workers';
|
|
1
2
|
import { config } from 'virtual:growth-labs/mailer/config';
|
|
2
3
|
import { drizzle } from 'drizzle-orm/d1';
|
|
3
4
|
/**
|
|
4
|
-
* Resolve Cloudflare bindings from the
|
|
5
|
+
* Resolve Cloudflare bindings from the Astro 6 Cloudflare Workers env object.
|
|
5
6
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* the virtual config so they stay in sync with the consumer's `astro.config`.
|
|
7
|
+
* Binding names come from the virtual config so they stay in sync with the
|
|
8
|
+
* consumer's `astro.config`.
|
|
9
9
|
*/
|
|
10
|
-
export function resolveBindings(
|
|
11
|
-
const d1 =
|
|
12
|
-
const queue =
|
|
10
|
+
export function resolveBindings(bindingsEnv = cloudflareEnv) {
|
|
11
|
+
const d1 = bindingsEnv[config.d1Binding];
|
|
12
|
+
const queue = bindingsEnv[config.queueBinding];
|
|
13
13
|
if (!d1)
|
|
14
14
|
throw new Error(`[mailer] D1 binding "${config.d1Binding}" not found`);
|
|
15
15
|
if (!queue)
|
|
@@ -1 +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;
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
export { buildMailerAnalyticsDataPoint, emitMailerAnalyticsEvent, type MailerAnalyticsEvent, } from './analytics.js';
|
|
1
2
|
export { handleBounce, handleComplaint, handleDelivery, updateSendStatus, } from './bounce.js';
|
|
2
3
|
export type { CloudflareEmailSender } from './providers.js';
|
|
3
|
-
export { CloudflareEmailProvider, getProvider, sleep
|
|
4
|
+
export { CloudflareEmailProvider, getProvider, sleep } from './providers.js';
|
|
4
5
|
export type { CampaignSchedule, DigestSchedule } from './scheduling.js';
|
|
5
6
|
export { executeCampaignSchedule, executeDigestSchedule, prepareCampaign, prepareDigest, sendBatchCampaigns, } from './scheduling.js';
|
|
6
7
|
export type { MailerEnv } from './send.js';
|
|
@@ -9,4 +10,5 @@ export { confirmSubscriber, countSubscribers, createSubscriber, getSubscriberBat
|
|
|
9
10
|
export { inlineStyles, interpolate, processConditionals, renderDigestItems, renderEmail, } from './templates.js';
|
|
10
11
|
export { generateToken, verifyToken } from './tokens.js';
|
|
11
12
|
export { injectTrackingPixel, rewriteLinksForTracking, TRANSPARENT_GIF, } from './tracking.js';
|
|
13
|
+
export { signWebhookPayload, verifyWebhookSignature } from './webhook-signature.js';
|
|
12
14
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +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,
|
|
1
|
+
{"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;AACtB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA"}
|
package/dist/utils/index.js
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
export { buildMailerAnalyticsDataPoint, emitMailerAnalyticsEvent, } from './analytics.js';
|
|
1
2
|
export { handleBounce, handleComplaint, handleDelivery, updateSendStatus, } from './bounce.js';
|
|
2
|
-
export { CloudflareEmailProvider, getProvider, sleep
|
|
3
|
+
export { CloudflareEmailProvider, getProvider, sleep } from './providers.js';
|
|
3
4
|
export { executeCampaignSchedule, executeDigestSchedule, prepareCampaign, prepareDigest, sendBatchCampaigns, } from './scheduling.js';
|
|
4
5
|
export { sendCampaign, sendDigest, sendTransactional } from './send.js';
|
|
5
6
|
export { confirmSubscriber, countSubscribers, createSubscriber, getSubscriberBatch, getSubscriberByEmail, getSubscriberById, unsubscribeSubscriber, updatePreferences, } from './subscribers.js';
|
|
6
7
|
export { inlineStyles, interpolate, processConditionals, renderDigestItems, renderEmail, } from './templates.js';
|
|
7
8
|
export { generateToken, verifyToken } from './tokens.js';
|
|
8
9
|
export { injectTrackingPixel, rewriteLinksForTracking, TRANSPARENT_GIF, } from './tracking.js';
|
|
10
|
+
export { signWebhookPayload, verifyWebhookSignature } from './webhook-signature.js';
|
|
9
11
|
//# sourceMappingURL=index.js.map
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +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,
|
|
1
|
+
{"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;AACtB,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA"}
|
package/dist/utils/providers.js
CHANGED
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { ResolvedMailerOptions } from '../options.js';
|
|
2
|
+
type WebhookSignatureOptions = ResolvedMailerOptions['webhookSignature'];
|
|
3
|
+
export declare function verifyWebhookSignature(options: WebhookSignatureOptions, request: Request, body: string, nowMs?: number): Promise<boolean>;
|
|
4
|
+
export declare function signWebhookPayload(secret: string, timestamp: string, body: string): Promise<string>;
|
|
5
|
+
export {};
|
|
6
|
+
//# sourceMappingURL=webhook-signature.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webhook-signature.d.ts","sourceRoot":"","sources":["../../src/utils/webhook-signature.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAA;AAE1D,KAAK,uBAAuB,GAAG,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;AAExE,wBAAsB,sBAAsB,CAC3C,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,GAAE,MAAmB,GACxB,OAAO,CAAC,OAAO,CAAC,CAoBlB;AAED,wBAAsB,kBAAkB,CACvC,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACV,OAAO,CAAC,MAAM,CAAC,CAQjB"}
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
export async function verifyWebhookSignature(options, request, body, nowMs = Date.now()) {
|
|
2
|
+
if (!options.enabled)
|
|
3
|
+
return true;
|
|
4
|
+
const timestamp = request.headers.get(options.timestampHeader);
|
|
5
|
+
const signatureHeader = request.headers.get(options.header);
|
|
6
|
+
if (!timestamp || !signatureHeader)
|
|
7
|
+
return false;
|
|
8
|
+
if (!timestampWithinTolerance(timestamp, options.toleranceSeconds, nowMs))
|
|
9
|
+
return false;
|
|
10
|
+
const signature = signatureFromHeader(signatureHeader);
|
|
11
|
+
if (!signature)
|
|
12
|
+
return false;
|
|
13
|
+
const key = await importWebhookKey(options.secret);
|
|
14
|
+
const signedBody = `${timestamp}.${body}`;
|
|
15
|
+
return crypto.subtle.verify('HMAC', key, fromBase64Url(signature), new TextEncoder().encode(signedBody));
|
|
16
|
+
}
|
|
17
|
+
export async function signWebhookPayload(secret, timestamp, body) {
|
|
18
|
+
const key = await importWebhookKey(secret);
|
|
19
|
+
const signature = await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(`${timestamp}.${body}`));
|
|
20
|
+
return toBase64Url(signature);
|
|
21
|
+
}
|
|
22
|
+
function timestampWithinTolerance(timestamp, toleranceSeconds, nowMs) {
|
|
23
|
+
if (toleranceSeconds === 0)
|
|
24
|
+
return true;
|
|
25
|
+
const parsed = Number(timestamp);
|
|
26
|
+
if (!Number.isFinite(parsed))
|
|
27
|
+
return false;
|
|
28
|
+
const timestampMs = parsed > 1_000_000_000_000 ? parsed : parsed * 1000;
|
|
29
|
+
return Math.abs(nowMs - timestampMs) <= toleranceSeconds * 1000;
|
|
30
|
+
}
|
|
31
|
+
function signatureFromHeader(header) {
|
|
32
|
+
const parts = header.split(',').map((part) => part.trim());
|
|
33
|
+
for (const part of parts) {
|
|
34
|
+
if (part.startsWith('v1='))
|
|
35
|
+
return part.slice(3);
|
|
36
|
+
}
|
|
37
|
+
return parts[0] || null;
|
|
38
|
+
}
|
|
39
|
+
async function importWebhookKey(secret) {
|
|
40
|
+
return crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign', 'verify']);
|
|
41
|
+
}
|
|
42
|
+
function fromBase64Url(value) {
|
|
43
|
+
const padded = value
|
|
44
|
+
.replace(/-/g, '+')
|
|
45
|
+
.replace(/_/g, '/')
|
|
46
|
+
.padEnd(Math.ceil(value.length / 4) * 4, '=');
|
|
47
|
+
const binary = atob(padded);
|
|
48
|
+
const bytes = new Uint8Array(new ArrayBuffer(binary.length));
|
|
49
|
+
for (let i = 0; i < binary.length; i++)
|
|
50
|
+
bytes[i] = binary.charCodeAt(i);
|
|
51
|
+
return bytes;
|
|
52
|
+
}
|
|
53
|
+
function toBase64Url(bytes) {
|
|
54
|
+
let binary = '';
|
|
55
|
+
for (const byte of new Uint8Array(bytes))
|
|
56
|
+
binary += String.fromCharCode(byte);
|
|
57
|
+
return btoa(binary).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=webhook-signature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"webhook-signature.js","sourceRoot":"","sources":["../../src/utils/webhook-signature.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@growth-labs/mailer",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"type": "module",
|
|
5
|
+
"types": "./dist/index.d.ts",
|
|
5
6
|
"exports": {
|
|
6
7
|
".": {
|
|
7
8
|
"types": "./dist/index.d.ts",
|
|
@@ -52,6 +53,10 @@
|
|
|
52
53
|
"src",
|
|
53
54
|
"README.md"
|
|
54
55
|
],
|
|
56
|
+
"publishConfig": {
|
|
57
|
+
"access": "public",
|
|
58
|
+
"registry": "https://registry.npmjs.org/"
|
|
59
|
+
},
|
|
55
60
|
"peerDependencies": {
|
|
56
61
|
"astro": "^6.0.0"
|
|
57
62
|
},
|
|
@@ -75,6 +80,7 @@
|
|
|
75
80
|
},
|
|
76
81
|
"scripts": {
|
|
77
82
|
"build": "tsc",
|
|
83
|
+
"check": "biome check src/",
|
|
78
84
|
"test": "vitest run",
|
|
79
85
|
"test:watch": "vitest"
|
|
80
86
|
}
|
package/src/options.ts
CHANGED
|
@@ -29,6 +29,28 @@ export const mailerOptionsSchema = z.object({
|
|
|
29
29
|
unsubscribePath: z.string().default('/api/newsletter/unsubscribe'),
|
|
30
30
|
preferencesPath: z.string().default('/email/preferences'),
|
|
31
31
|
webhookPath: z.string().default('/api/email/webhook'),
|
|
32
|
+
webhookSignature: z
|
|
33
|
+
.discriminatedUnion('enabled', [
|
|
34
|
+
z.object({
|
|
35
|
+
enabled: z.literal(false),
|
|
36
|
+
header: z.string().default('x-gl-mailer-signature'),
|
|
37
|
+
timestampHeader: z.string().default('x-gl-mailer-timestamp'),
|
|
38
|
+
toleranceSeconds: z.number().min(0).default(300),
|
|
39
|
+
}),
|
|
40
|
+
z.object({
|
|
41
|
+
enabled: z.literal(true),
|
|
42
|
+
secret: z.string().min(32),
|
|
43
|
+
header: z.string().default('x-gl-mailer-signature'),
|
|
44
|
+
timestampHeader: z.string().default('x-gl-mailer-timestamp'),
|
|
45
|
+
toleranceSeconds: z.number().min(0).default(300),
|
|
46
|
+
}),
|
|
47
|
+
])
|
|
48
|
+
.default({
|
|
49
|
+
enabled: false,
|
|
50
|
+
header: 'x-gl-mailer-signature',
|
|
51
|
+
timestampHeader: 'x-gl-mailer-timestamp',
|
|
52
|
+
toleranceSeconds: 300,
|
|
53
|
+
}),
|
|
32
54
|
|
|
33
55
|
// ─── Tracking ───
|
|
34
56
|
trackOpenPath: z.string().default('/api/email/open'),
|
|
@@ -50,6 +72,7 @@ export const mailerOptionsSchema = z.object({
|
|
|
50
72
|
|
|
51
73
|
// ─── Optional peer: analytics ───
|
|
52
74
|
analyticsEnabled: z.boolean().default(false),
|
|
75
|
+
analyticsBinding: z.string().default('ANALYTICS'),
|
|
53
76
|
})
|
|
54
77
|
|
|
55
78
|
export type MailerOptions = z.input<typeof mailerOptionsSchema>
|
package/src/queue/consumer.ts
CHANGED
|
@@ -1,13 +1,18 @@
|
|
|
1
1
|
import { drizzle } from 'drizzle-orm/d1'
|
|
2
2
|
import type { ResolvedMailerOptions } from '../options.js'
|
|
3
3
|
import type { EmailProvider, EmailQueueMessage } from '../types.js'
|
|
4
|
+
import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
|
|
4
5
|
import { updateSendStatus } from '../utils/bounce.js'
|
|
5
6
|
import type { CloudflareEmailSender } from '../utils/providers.js'
|
|
6
7
|
import { CloudflareEmailProvider, sleep } from '../utils/providers.js'
|
|
7
8
|
|
|
8
9
|
export async function handleEmailQueue(
|
|
9
10
|
batch: MessageBatch<EmailQueueMessage>,
|
|
10
|
-
env: {
|
|
11
|
+
env: {
|
|
12
|
+
DB: D1Database
|
|
13
|
+
EMAIL_SENDER?: CloudflareEmailSender
|
|
14
|
+
[key: string]: unknown
|
|
15
|
+
},
|
|
11
16
|
options: ResolvedMailerOptions,
|
|
12
17
|
): Promise<void> {
|
|
13
18
|
const db = drizzle(env.DB)
|
|
@@ -68,11 +73,32 @@ export async function handleEmailQueue(
|
|
|
68
73
|
await updateSendStatus(db, recipient.trackingId, 'sent', {
|
|
69
74
|
sentAt: new Date().toISOString(),
|
|
70
75
|
})
|
|
76
|
+
emitMailerAnalyticsEvent(options, env, 'newsletter_sent', {
|
|
77
|
+
contentSlug: recipient.trackingId,
|
|
78
|
+
label: {
|
|
79
|
+
trackingId: recipient.trackingId,
|
|
80
|
+
subscriberId: recipient.subscriberId,
|
|
81
|
+
email: recipient.email,
|
|
82
|
+
campaignId: message.body.campaignId,
|
|
83
|
+
type,
|
|
84
|
+
},
|
|
85
|
+
})
|
|
71
86
|
} else {
|
|
72
87
|
await updateSendStatus(db, recipient.trackingId, 'bounced', {
|
|
73
88
|
bouncedAt: new Date().toISOString(),
|
|
74
89
|
bounceType: 'hard',
|
|
75
90
|
})
|
|
91
|
+
emitMailerAnalyticsEvent(options, env, 'newsletter_send_failed', {
|
|
92
|
+
contentSlug: recipient.trackingId,
|
|
93
|
+
label: {
|
|
94
|
+
trackingId: recipient.trackingId,
|
|
95
|
+
subscriberId: recipient.subscriberId,
|
|
96
|
+
email: recipient.email,
|
|
97
|
+
campaignId: message.body.campaignId,
|
|
98
|
+
type,
|
|
99
|
+
error: result.error,
|
|
100
|
+
},
|
|
101
|
+
})
|
|
76
102
|
console.error(`[mailer] Send failed for ${recipient.email}: ${result.error}`)
|
|
77
103
|
}
|
|
78
104
|
}
|
package/src/routes/confirm.ts
CHANGED
|
@@ -1,13 +1,15 @@
|
|
|
1
|
+
import { env as cloudflareEnv } from 'cloudflare:workers'
|
|
1
2
|
import { config } from 'virtual:growth-labs/mailer/config'
|
|
2
3
|
import type { APIRoute } from 'astro'
|
|
3
4
|
import { drizzle } from 'drizzle-orm/d1'
|
|
4
|
-
import
|
|
5
|
+
import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
|
|
5
6
|
import type { MailerEnv } from '../utils/send.js'
|
|
6
7
|
import { sendTransactional } from '../utils/send.js'
|
|
7
8
|
import { confirmSubscriber, getSubscriberById } from '../utils/subscribers.js'
|
|
8
9
|
import { verifyToken } from '../utils/tokens.js'
|
|
9
10
|
|
|
10
|
-
export const GET: APIRoute = async (
|
|
11
|
+
export const GET: APIRoute = async (context) => {
|
|
12
|
+
const { url } = context
|
|
11
13
|
const token = url.searchParams.get('token')
|
|
12
14
|
if (!token) {
|
|
13
15
|
return Response.json({ error: 'Missing token' }, { status: 400 })
|
|
@@ -20,9 +22,9 @@ export const GET: APIRoute = async ({ url, locals }) => {
|
|
|
20
22
|
}
|
|
21
23
|
|
|
22
24
|
// Resolve bindings
|
|
23
|
-
const
|
|
24
|
-
const d1 =
|
|
25
|
-
const queue =
|
|
25
|
+
const bindingsEnv = cloudflareEnv as Record<string, unknown>
|
|
26
|
+
const d1 = bindingsEnv[config.d1Binding] as D1Database
|
|
27
|
+
const queue = bindingsEnv[config.queueBinding] as Queue
|
|
26
28
|
const db = drizzle(d1)
|
|
27
29
|
const env: MailerEnv = { DB: d1, QUEUE: queue }
|
|
28
30
|
|
|
@@ -58,6 +60,15 @@ export const GET: APIRoute = async ({ url, locals }) => {
|
|
|
58
60
|
data: { name: subscriber.name },
|
|
59
61
|
})
|
|
60
62
|
|
|
63
|
+
emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_confirmed', {
|
|
64
|
+
context,
|
|
65
|
+
contentSlug: subscriber.id,
|
|
66
|
+
label: {
|
|
67
|
+
subscriberId: subscriber.id,
|
|
68
|
+
email: subscriber.email,
|
|
69
|
+
},
|
|
70
|
+
})
|
|
71
|
+
|
|
61
72
|
// Redirect to site with confirmed flag
|
|
62
73
|
return new Response(null, {
|
|
63
74
|
status: 302,
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
---
|
|
2
2
|
import { config } from "virtual:growth-labs/mailer/config";
|
|
3
|
+
import { env as cloudflareEnv } from "cloudflare:workers";
|
|
3
4
|
import { drizzle } from "drizzle-orm/d1";
|
|
4
5
|
import PreferenceCenter from "../components/PreferenceCenter.astro";
|
|
5
6
|
import {
|
|
@@ -50,16 +51,11 @@ if (Astro.request.method === "POST" && payload.action !== "preferences") {
|
|
|
50
51
|
return new Response("Invalid or expired token", { status: 400 });
|
|
51
52
|
}
|
|
52
53
|
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
).runtime?.env;
|
|
58
|
-
if (!runtimeEnv) {
|
|
59
|
-
return new Response("Runtime not available", { status: 500 });
|
|
54
|
+
const bindingsEnv = cloudflareEnv as Record<string, unknown>;
|
|
55
|
+
const d1 = bindingsEnv[config.d1Binding] as D1Database;
|
|
56
|
+
if (!d1) {
|
|
57
|
+
return new Response("D1 binding not available", { status: 500 });
|
|
60
58
|
}
|
|
61
|
-
|
|
62
|
-
const d1 = runtimeEnv[config.d1Binding] as D1Database;
|
|
63
59
|
const db = drizzle(d1);
|
|
64
60
|
|
|
65
61
|
// Handle POST (form submission)
|