Skip to content

feat(email): add Resend as transactional email provider #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
otscup wants to merge 2 commits into from
Closed

feat(email): add Resend as transactional email provider #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7b31d
feat: 自托管部署适配(auth.otscup.com)
otscup Oct 16, 2026
a564f17
feat(email): add Resend as transactional email provider
otscup Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ id_ed25519*
__pycache__/
*.pyc
.phpunit.result.cache
.xid-secrets
2 changes: 1 addition & 1 deletion apps/console/worker/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export type ConsoleEnv = {
}
}

const CANONICAL_HOST = 'xid.dev'
const CANONICAL_HOST = 'auth.otscup.com'
const LOCAL_DEV_HOSTS = new Set(['127.0.0.1', 'localhost'])
const CONSOLE_ROOT = '/console'
const CONSOLE_SHELL = '/console/'
Expand Down
9 changes: 2 additions & 7 deletions apps/console/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
{
"$schema": "node_modules/wrangler/config-schema.json",
"name": "xid-console",
"account_id": "86e4d320a5d69fb54f9721fb219a4902",
"account_id": "f475b3dcf291c33ae82ab0b595f81958",
"main": "worker/index.ts",
"preview_urls": false,
"routes": [
{ "pattern": "xid.dev/console", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/console/*", "zone_name": "xid.dev" },
{ "pattern": "*.xid.dev/console", "zone_name": "xid.dev" },
{ "pattern": "*.xid.dev/console/*", "zone_name": "xid.dev" },
],
"routes": [],
"compatibility_date": "2026-07-27",
"compatibility_flags": ["nodejs_compat"],
"assets": {
Expand Down
2 changes: 1 addition & 1 deletion apps/server/worker/auth/password.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { PASSWORD_RESET_TTL_MS } from '../lib/ttl'

// --- 参数常量 ---
const ARGON2_MEMORY_KB = 65536 // 64 MiB(password-auth rule)
const ARGON2_ITERATIONS = 3
const ARGON2_ITERATIONS = 2 // Workers Free CPU 10ms 上限:改密需两次 Argon2(验旧+算新),3 迭代会超限
const ARGON2_HASH_LEN = 32
const ARGON2_PARALLELISM = 1
const MIN_LENGTH = 12
Expand Down
2 changes: 2 additions & 0 deletions apps/server/worker/env.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ type WorkerBindings = {
PEPPER: string
// BOOTSTRAP_TOKEN:可选,seed/bootstrap 接口门控(配置则强制 X-Bootstrap-Token 匹配,防公网滥用)
BOOTSTRAP_TOKEN?: string
// RESEND_API_KEY:可选,EMAIL_PROVIDER=resend 时经 Resend API 发事务邮件。
RESEND_API_KEY?: string
// Turnstile 必须成对配置:site key 是公开 runtime var,secret 是 Workers Secret。
// 两者都未配置时 dev/test 跳过;只配置任一项时认证配置与校验均 fail closed。
TURNSTILE_SITE_KEY?: string
Expand Down
38 changes: 38 additions & 0 deletions apps/server/worker/queues/email.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,39 @@ export class CloudflareEmailProvider implements EmailProvider {
}
}

// Resend Provider:经 HTTPS API 发信,适用于无 Cloudflare Email Service 配额的自托管部署。
// API Key 走 Workers Secret RESEND_API_KEY,不进代码与 D1。
export class ResendEmailProvider implements EmailProvider {
readonly name = 'resend'
private readonly apiKey: string

constructor(apiKey: string) {
this.apiKey = apiKey
}

async send(input: EmailSendInput): Promise<void> {
const resp = await fetch('https://api.resend.com/emails', {
method: 'POST',
headers: {
Authorization: `Bearer ${this.apiKey}`,
'Content-Type': 'application/json',
},
body: JSON.stringify({
from: `${input.from.name} <${input.from.email}>`,
to: [input.to],
subject: input.subject,
html: input.html,
text: input.text,
}),
signal: AbortSignal.timeout(15000),
})
if (!resp.ok) {
const body = await resp.text().catch(() => '')
throw new Error(`resend_send_failed: ${resp.status} ${body.slice(0, 200)}`)
}
}
}

// 事务邮件模板(Mustache 子集)。按 type + locale 选模板。
// 真实部署模板由 R2 语言包提供(见 07 章 4);此处内置 en/zh-Hans 兜底,保证无外部依赖可渲染。
type EmailTemplate = {
Expand Down Expand Up @@ -564,6 +597,11 @@ export function resolveEmailProvider(env: Env): EmailProvider {
if (!isDevOrTestEnvironment(env)) throw new Error('email_provider_not_configured')
return new TestEmailProvider(env)
}
if (env.EMAIL_PROVIDER === 'resend') {
const apiKey = (env as unknown as { RESEND_API_KEY?: string }).RESEND_API_KEY
if (!apiKey) throw new Error('email_provider_not_configured')
return new ResendEmailProvider(apiKey)
}
return new CloudflareEmailProvider(env.EMAIL)
}

Expand Down
22 changes: 4 additions & 18 deletions apps/server/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
{
"$schema": "node_modules/wrangler/config-schema.json",
"name": "xid",
"account_id": "86e4d320a5d69fb54f9721fb219a4902",
"account_id": "f475b3dcf291c33ae82ab0b595f81958",
"main": "worker/index.ts",
"preview_urls": false,
"keep_vars": true,
"routes": [
// Core 保留 apex Custom Domain、tenant fallback，以及 Cloudflare for SaaS custom hostname
// 所需的 zone-wide fallback。Site 与 Console 的更具体 routes 优先。
// Site 与 Console 的具体 routes 由各自 wrangler.jsonc 唯一声明。
{ "pattern": "xid.dev", "custom_domain": true },
{ "pattern": "*.xid.dev/*", "zone_name": "xid.dev" },
{ "pattern": "*/*", "zone_name": "xid.dev" },
{ "pattern": "auth.otscup.com", "custom_domain": true },
],
"compatibility_date": "2025-04-08",
"compatibility_flags": ["nodejs_compat"],
Expand Down Expand Up @@ -45,14 +40,14 @@
{
"binding": "DB",
"database_name": "xid-db",
"database_id": "149e5997-e684-41d0-b483-afa6948479c3",
"database_id": "776b350f-6d9a-476b-b808-4ddbcc67752d",
"migrations_dir": "../../packages/db/drizzle",
},
],
"kv_namespaces": [
{
"binding": "CACHE",
"id": "a827c644c20344aaa6c7760d76875122",
"id": "fa82fc300d44485c8536ee9b4cd8c8b3",
},
],
"r2_buckets": [
Expand All @@ -62,12 +57,6 @@
},
],
"send_email": [{ "name": "EMAIL" }],
"analytics_engine_datasets": [
{
"binding": "ANALYTICS",
"dataset": "xid_analytics",
},
],
"queues": {
"producers": [
{ "binding": "EMAIL_QUEUE", "queue": "xid-email" },
Expand Down Expand Up @@ -274,9 +263,6 @@
"new_sqlite_classes": ["SessionHandoffDO"],
},
],
"triggers": {
"crons": ["0 * * * *", "0 2 * * *"],
},
"vars": {
"ENVIRONMENT": "production",
},
Expand Down
96 changes: 2 additions & 94 deletions apps/site/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,102 +1,10 @@
{
"$schema": "node_modules/wrangler/config-schema.json",
"name": "xid-site",
"account_id": "86e4d320a5d69fb54f9721fb219a4902",
"account_id": "f475b3dcf291c33ae82ab0b595f81958",
"main": "worker/index.ts",
"preview_urls": false,
"routes": [
{ "pattern": "xid.dev/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/index.md", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/index.mdx", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/docs", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/docs/index.md", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/docs/index.mdx", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/docs/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/status", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/status/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/status/index.md", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/status/index.mdx", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pricing", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pricing/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pricing/index.md", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pricing/index.mdx", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/getting-started", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/getting-started/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/hosted-auth", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/hosted-auth/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/organizations", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/organizations/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/oidc-oauth", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/oidc-oauth/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/enterprise-sso", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/enterprise-sso/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/social-login", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/social-login/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/management-api", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/management-api/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/webhooks", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/webhooks/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/branding", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/branding/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/scim", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/scim/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/scim/index.md", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/scim/index.mdx", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/saml", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/saml/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/sdks", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/sdks/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/self-hosting", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/self-hosting/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/zh-hans", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/zh-hans/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/zh-hans/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ja", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ja/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ja/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ko", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ko/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/ko/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/fr", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/fr/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/fr/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/de", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/de/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/de/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/es", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/es/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/es/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pt-br", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pt-br/", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pt-br/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/_astro/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/_nimbus/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/pagefind/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/og.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/og/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/robots.txt", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/sitemap-index.xml", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/sitemap-*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/sitemap.xml", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/llms.txt", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/llms-full.txt", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/en/llms.txt", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/en/llms-full.txt", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/favicon.ico", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/favicon-16.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/favicon-32.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/favicon-48.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/apple-touch-icon.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/icon-192.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/icon-512.png", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/site.webmanifest", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/brand/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/icons/*", "zone_name": "xid.dev" },
{ "pattern": "xid.dev/fonts/*", "zone_name": "xid.dev" },
{ "pattern": "www.xid.dev/*", "zone_name": "xid.dev" },
{ "pattern": "www.xid.dev/console", "zone_name": "xid.dev" },
{ "pattern": "www.xid.dev/console/*", "zone_name": "xid.dev" },
],
"routes": [],
"compatibility_date": "2026-07-27",
"assets": {
"directory": "./dist",
Expand Down
2 changes: 1 addition & 1 deletion packages/types/src/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export type EmailQueueMessage = {
payload: Record<string, unknown>
}

export type EmailProviderName = 'cloudflare' | 'test'
export type EmailProviderName = 'cloudflare' | 'resend' | 'test'
export type SmsProviderName = 'twilio' | 'vonage' | 'infobip' | 'messagebird' | 'test'
export type WhatsappProviderName = 'twilio' | 'meta' | 'test'

Expand Down