🏗️ Cloudflare MailChannel → Resend

Author: wappon28dev

.github/workflows/build.yml

@@ -65,15 +65,15 @@ jobs:
           environment: ${{ env.MODE }}
           secrets: |
             MODE
-            API_MAIL_DKIM_PRIVATE_KEY
+            API_RESEND_API_KEY
             API_DISCORD_WEBHOOK_URL_CONTACT
             API_DISCORD_WEBHOOK_MENTION_ID
             API_CONTACT_MANIFEST
             API_ASSETS_ENDPOINT
             API_ASSETS_ACCESS_KEY
         env:
           MODE: ${{ env.MODE }}
-          API_MAIL_DKIM_PRIVATE_KEY: ${{ secrets.API_MAIL_DKIM_PRIVATE_KEY }}
+          API_RESEND_API_KEY: ${{ secrets.API_RESEND_API_KEY }}
           API_DISCORD_WEBHOOK_URL_CONTACT: ${{ secrets.API_DISCORD_WEBHOOK_URL_CONTACT }}
           API_DISCORD_WEBHOOK_MENTION_ID: ${{ secrets.API_DISCORD_WEBHOOK_MENTION_ID }}
           API_CONTACT_MANIFEST: ${{ secrets.API_CONTACT_MANIFEST }}

api/.dev.vars.example

@@ -1,5 +1,5 @@
 MODE = "xxxxxxxxxxxxxxxxx"
-API_MAIL_DKIM_PRIVATE_KEY = "xxxxxxxxxxxxxxxxx"
+API_RESEND_API_KEY = "xxxxxxxxxxxxxxxxx"
 API_DISCORD_WEBHOOK_URL_CONTACT = "xxxxxxxxxxxxxxxxx"
 API_DISCORD_WEBHOOK_MENTION_ID = "xxxxxxxxxxxxxxxxx"
 API_CONTACT_MANIFEST = `

api/package.json

@@ -6,9 +6,11 @@
     "deploy": "wrangler deploy --minify src/index.ts"
   },
   "dependencies": {
-    "@cloudflare/pages-plugin-mailchannels": "^0.1.2",
     "@hono/zod-validator": "^0.2.0",
     "hono": "^4.0.9",
+    "neverthrow": "^7.0.0",
+    "resend": "^3.5.0",
+    "ts-pattern": "^5.2.0",
     "zod": "^3.22.4"
   },
   "devDependencies": {

api/src/api/v1/contact/index.ts

@@ -1,131 +1,97 @@
 /* eslint-disable no-console */
 import { getModeName, type ENV, type HonoType } from "@api/lib/consts";
 import { authGuard, configureCors } from "@api/lib/middlewares/contact";
-import { type EmailAddress, getPersonalizationInfo } from "@api/lib/sender";
+import { sendEmail } from "@api/lib/sender";
 import { INFO } from "@client/lib/config";
 import { formatDate, getEntries } from "@client/lib/consts";
 import {
   type ContactFormData,
   formSchema,
   zContactFormData,
 } from "@client/lib/services/contact";
-import { sendEmail } from "@cloudflare/pages-plugin-mailchannels/api";
 import { zValidator } from "@hono/zod-validator";
 import { Hono } from "hono";
 import { cors } from "hono/cors";
 import { HTTPException } from "hono/http-exception";
+import { err, ok, ResultAsync } from "neverthrow";
 
-async function sendAdminMail(
+function formatContactData(data: ContactFormData) {
+  return getEntries(formSchema)
+    .filter(([k]) => data[k] !== "")
+    .map(([key, { description }]) =>
+      `
+  ${description}:
+    ${data[key]}
+  `.trim(),
+    )
+    .join("\n");
+}
+
+function sendAdminMail(
   data: ContactFormData,
   env: ENV,
-  acceptDate: Date,
+  acceptedDate: Date,
 ): ReturnType<typeof sendEmail> {
-  const to: EmailAddress = {
-    email: INFO.addr.email.contact,
-    name: INFO.name.full,
-  };
-  const from: EmailAddress = {
-    email: INFO.addr.email.noreply,
-    name: INFO.name.full,
-  };
   const subject = `【お問い合わせ】${data.name} 様からのお問い合わせ - ${INFO.id}`;
 
-  const _data = getEntries(formSchema)
-    .map(([key, { description }]) =>
-      `
-${description}:
-  ${data[key]}
-`.trim(),
-    )
-    .join("\n");
   const content = `
 ${getModeName(env.MODE)}
 ポートフォリオのお問い合わせフォームから以下の内容が送信されました。
 お問い合わせ内容を確認し、返信をお願いします。
 
 --- お問い合わせ内容 ---
-${_data}
+${formatContactData(data)}
 ---
-受付日時: ${formatDate(acceptDate, "YYYY-MM-DD HH:mm:ss")}
+受付日時: ${formatDate(acceptedDate, "YYYY-MM-DD HH:mm:ss")}
     `.trim();
 
-  return await sendEmail({
-    personalizations: [
-      getPersonalizationInfo({
-        env,
-        info: { to: [to], from },
-      }),
-    ],
-    content: [
-      {
-        type: "text/plain",
-        value: content,
-      },
-    ],
+  return sendEmail(env, {
+    to: INFO.addr.email.admin,
     subject,
-    from,
+    text: content,
   });
 }
 
-async function sendThanksMail(
+function sendThanksMail(
   data: ContactFormData,
   env: ENV,
   acceptDate: Date,
 ): ReturnType<typeof sendEmail> {
-  const to: EmailAddress = {
-    email: data.email,
-    name: `${data.name} 様`,
-  };
-  const from: EmailAddress = {
-    email: INFO.addr.email.noreply,
-    name: INFO.name.full,
-  };
   const subject = `【自動返信】お問い合わせありがとうございます - ${INFO.name.full}`;
 
-  const _data = getEntries(formSchema)
-    .map(([key, { description }]) =>
-      `
-  ${description}:
-    ${data[key]}
-  `.trim(),
-    )
-    .join("\n");
+  const deadlineDate = new Date(acceptDate);
+  deadlineDate.setDate(acceptDate.getDate() + 3);
+  const deadlineDateStr = formatDate(deadlineDate, "YYYY年M月d日");
 
   const content = `
 ${getModeName(env.MODE)}
-テストテストテストテストテストテスト
-テストテストテストテストテストテスト
+この度は、お問い合わせいただき誠にありがとうございます。
+以下の内容でお問い合わせを受け付けいたしました。
 
 --- お問い合わせ内容 ---
-${_data}
+${formatContactData(data)}
 ---
 
-テストテストテストテストテストテスト
+もしも${deadlineDateStr}までに返信がない場合、お手数ですが${INFO.addr.email.contact}まで再度ご連絡いただきますようお願いいたします。
+
+※このメールは自動返信により送信しています。ご返信をいただいても対応できかねますことをご了承ください。
   `.trim();
 
-  return await sendEmail({
-    personalizations: [
-      getPersonalizationInfo({
-        env,
-        info: { to: [to], from },
-      }),
-    ],
-    content: [
-      {
-        type: "text/plain",
-        value: content,
-      },
-    ],
+  return sendEmail(env, {
+    to: data.email,
     subject,
-    from,
+    text: content,
   });
 }
 
-async function sendDiscordWebhook(
+function sendDiscordWebhook(
   data: ContactFormData,
   env: ENV,
   acceptDate: Date,
-): Promise<Response> {
+): ResultAsync<
+  undefined,
+  { code: "NETWORK_ERROR" | "API_ERROR"; details: string }
+> {
   const unixTime = Math.floor(acceptDate.getTime() / 1000);
   const content = `
 <:9u3rcusdark:1204434658792837160> <@${env.API_DISCORD_WEBHOOK_MENTION_ID}>
@@ -156,12 +122,25 @@ async function sendDiscordWebhook(
     attachments: [],
   };
 
-  return await fetch(env.API_DISCORD_WEBHOOK_URL_CONTACT, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(body),
+  return ResultAsync.fromPromise(
+    fetch(env.API_DISCORD_WEBHOOK_URL_CONTACT, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(body),
+    }),
+    (e) => ({ code: "NETWORK_ERROR", details: String(e) }) as const,
+  ).andThen((res) => {
+    if (!res.ok) {
+      console.error("Failed to send discord webhook", res);
+      return err({
+        code: "API_ERROR",
+        details: `API returned status: ${res.statusText}`,
+      } as const);
+    }
+
+    return ok(undefined);
   });
 }
 
@@ -170,33 +149,34 @@ export const contact = new Hono<HonoType>()
   .use("*", authGuard, configureCors)
   .post("/", zValidator("json", zContactFormData), async (ctx) => {
     const data = ctx.req.valid("json");
-    const acceptDate = new Date();
+    const acceptedDate = new Date();
 
-    if (ctx.env.MODE !== "local") {
-      const adminMailResult = await sendAdminMail(data, ctx.env, acceptDate);
-      if (!adminMailResult.success) {
-        console.warn("Failed to send admin mail", adminMailResult.errors);
+    await sendAdminMail(data, ctx.env, acceptedDate).match(
+      () => {},
+      () => {
         throw new HTTPException(500, {
           message: "Failed to send admin mail",
         });
-      }
+      },
+    );
 
-      const autoReplyResult = await sendThanksMail(data, ctx.env, acceptDate);
-      if (!autoReplyResult.success) {
-        console.warn("Failed to send auto thanks mail", autoReplyResult.errors);
+    await sendThanksMail(data, ctx.env, acceptedDate).match(
+      () => {},
+      () => {
         throw new HTTPException(500, {
           message: "Failed to send thanks mail",
         });
-      }
-    }
+      },
+    );
 
-    const res = await sendDiscordWebhook(data, ctx.env, acceptDate);
-    if (!res.ok) {
-      console.warn("Failed to send discord webhook", res);
-      throw new HTTPException(500, {
-        message: "Failed to send discord webhook",
-      });
-    }
+    await sendDiscordWebhook(data, ctx.env, acceptedDate).match(
+      () => {},
+      () => {
+        throw new HTTPException(500, {
+          message: "Failed to send discord webhook",
+        });
+      },
+    );
 
-    return ctx.json({ acceptDate }, 201);
+    return ctx.json({ acceptedDate }, 201);
   });

api/src/lib/consts.ts

@@ -2,7 +2,7 @@ import { type ContactManifest, zContactManifest } from "./types/contact";
 
 export type ENV = {
   MODE: "local" | "preview" | "production";
-  API_MAIL_DKIM_PRIVATE_KEY: string;
+  API_RESEND_API_KEY: string;
   API_DISCORD_WEBHOOK_URL_CONTACT: string;
   API_DISCORD_WEBHOOK_MENTION_ID: string;
   API_CONTACT_MANIFEST: string;

api/src/lib/sender.ts

@@ -1,27 +1,50 @@
-import { type Personalization } from "@cloudflare/pages-plugin-mailchannels/api";
+/* eslint-disable no-console */
+import { INFO } from "@client/lib/config";
+import { err, ok, ResultAsync } from "neverthrow";
+import {
+  type CreateEmailOptions,
+  type CreateEmailResponseSuccess,
+  Resend,
+} from "resend";
 import { type ENV } from "./consts";
+import { type Override } from "./types/utils";
 
-export type EmailAddress = {
-  email: string;
-  name?: string;
-};
-
-export function getPersonalizationInfo({
-  env,
-  info,
-}: {
-  env: ENV;
-  info: Personalization;
-}): Personalization {
-  const { API_MAIL_DKIM_PRIVATE_KEY } = env;
-  if (API_MAIL_DKIM_PRIVATE_KEY == null) {
-    throw new Error("MAIL_DKIM_PRIVATE_KEY is not set");
+export function sendEmail(
+  env: ENV,
+  body: Override<
+    CreateEmailOptions,
+    {
+      from?: never;
+      text: string;
+    }
+  >,
+): ResultAsync<
+  CreateEmailResponseSuccess,
+  {
+    code: "API_ERROR";
+    err: Error;
+  }
+> {
+  if (env.API_RESEND_API_KEY == null) {
+    throw new Error("API_RESEND_API_KEY is not set!");
   }
 
-  return {
-    ...info,
-    dkim_domain: "9u3rc.us",
-    dkim_selector: "mailchannels",
-    dkim_private_key: API_MAIL_DKIM_PRIVATE_KEY,
-  };
+  const resend = new Resend(env.API_RESEND_API_KEY);
+
+  return ResultAsync.fromSafePromise(
+    resend.emails.send({
+      ...body,
+      from: `${INFO.name.full} <${INFO.addr.email.noreply}>`,
+    }),
+  ).andThen((res) => {
+    if (res.data == null) {
+      console.warn("Failed to send email", res.error?.name, res.error?.message);
+      return err({
+        code: "API_ERROR",
+        err: new Error(res.error?.message),
+      } as const);
+    }
+
+    return ok(res.data);
+  });
 }

api/src/lib/types/utils.ts

@@ -0,0 +1,16 @@
+export type Override<T, U extends { [Key in keyof T]?: unknown }> = Omit<
+  T,
+  keyof U
+> &
+  U;
+
+export type Entries<T> = Array<
+  keyof T extends infer U ? (U extends keyof T ? [U, T[U]] : never) : never
+>;
+
+export type ArrayElem<ArrayType extends readonly unknown[]> =
+  ArrayType extends ReadonlyArray<infer ElementType> ? ElementType : never;
+
+export type OmitStrict<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+
+export type Nullable<T> = T | null | undefined;