👀 好きコードに (worker.js)

worker.js

@@ -1,13 +1,18 @@
+// @ts-check
+
 // いじりやすいようにここに変数を集約させたい
 const BLOCKLIST = ["hacker@example.com", "spammer@example.com"];
 const FORWARD_TO = "mymail@example.com";
 const WEBHOOK_URL = "https://discord.com/api/webhooks/xxx/xxx";
 // trendcreate icon
-const WEBHOOK_ICON = "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/webhook_icon.jpg";
+const WEBHOOK_ICON =
+  "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/webhook_icon.jpg";
 // mail letter icon
-const AUTHOR_ICON = "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/email_icon.png";
+const AUTHOR_ICON =
+  "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/email_icon.png";
 // cloudflare icon
-const FOOTER_ICON = "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/cloudflare_icon.ico";
+const FOOTER_ICON =
+  "https://git.v-sli.me/HidemaruOwO/email-worker/raw/branch/main/assets/cloudflare_icon.ico";
 
 export default {
   async email(message, env, ctx) {
@@ -17,63 +22,67 @@ export default {
     }
 
     try {
-      const [text] = await Promise.all([
+      const [result] = await Promise.all([
-        getMailText(message),
+        notify(message),
-        message.forward(FORWARD_TO)
+        message.forward(FORWARD_TO),
       ]);
 
-      const result = await notify(message.headers.get("from"), message.headers.get('subject'), text, message.headers.get("date"));
-      
       if (!result.ok) {
-        console.log(await result.text())
+        console.log(await result.text());
-        console.log(await result.json())
+        console.log(await result.json());
         return;
       }
     } catch (err) {
       console.error("処理エラー:", err);
     }
-  }
+  },
 };
 
-async function notify(from, subject, text, date) {
+// async function notify(from, subject, text, date) {
+async function notify(message) {
+  const from = message.headers.get("from");
+  const subject = message.headers.get("subject");
+  const date = message.headers.get("date");
+  const text = await getMailText(message);
+
   const payload = {
     username: "contact@trendcreate.net",
     avatar_url: WEBHOOK_ICON,
     content: `**${from}**からお問い合わせメールが届いております。`,
-    embeds: [{
+    embeds: [
-      author: {name: from || "名前なし", icon_url: AUTHOR_ICON},
+      {
+        author: { name: from || "名前なし", icon_url: AUTHOR_ICON },
         title: `**${subject || "件名なし"}**`,
         description: text || "本文はありません。",
         timestamp: new Date(date).toISOString(),
         footer: {
-		    text: 'Powered by Cloudflare Worker and Email Routing',
+          text: "Powered by Cloudflare Worker and Email Routing",
-        icon_url: FOOTER_ICON
+          icon_url: FOOTER_ICON,
-	    }
+        },
-    }],
+      },
-    
+    ],
   };
 
   // console.log(JSON.stringify(payload))
 
-try {
+  try {
     const result = await fetch(WEBHOOK_URL, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-    body: JSON.stringify(payload)
+      body: JSON.stringify(payload),
     });
     return result;
-} catch (err) {
+  } catch (err) {
-  console.log(err)
+    console.log(err);
-  throw new Error(err)
+    throw new Error(err);
-}
+  }
-return;
 }
 
 async function getMailText(message) {
   try {
     const buf = await readStream(message.raw);
     if (buf === "NO_CONTENT") {
-      return ""
+      return "";
     }
     return parseEmail(buf);
   } catch (err) {
@@ -83,7 +92,7 @@ async function getMailText(message) {
 
 async function readStream(stream) {
   if (typeof stream === "undefined") {
-    return "NO_CONTENT"
+    return "NO_CONTENT";
   }
 
   const chunks = [];
@@ -109,9 +118,9 @@ async function readStream(stream) {
 
 function parseEmail(buffer) {
   const text = new TextDecoder().decode(buffer);
-  const headerEnd = text.indexOf('\r\n\r\n');
+  const headerEnd = text.indexOf("\r\n\r\n");
 
-  if (headerEnd === -1) return '';
+  if (headerEnd === -1) return "";
 
   const header = text.substring(0, headerEnd);
   const body = text.substring(headerEnd + 4);
@@ -124,15 +133,15 @@ function parseEmail(buffer) {
   const parts = body.split(boundary);
 
   for (const part of parts) {
-    if (part.includes('Content-Type: text/plain')) {
+    if (part.includes("Content-Type: text/plain")) {
-      const isBase64 = part.includes('Content-Transfer-Encoding: base64');
+      const isBase64 = part.includes("Content-Transfer-Encoding: base64");
-      const partBody = part.split('\r\n\r\n')[1]?.trim();
+      const partBody = part.split("\r\n\r\n")[1]?.trim();
 
       if (!partBody) continue;
 
       if (isBase64) {
         try {
-          const cleanBase64 = partBody.replace(/[\r\n\s]/g, '');
+          const cleanBase64 = partBody.replace(/[\r\n\s]/g, "");
           return decodeBase64(cleanBase64);
         } catch {
           continue;
@@ -143,7 +152,7 @@ function parseEmail(buffer) {
     }
   }
 
-  return '';
+  return "";
 }
 
 function decodeBase64(base64) {
@@ -156,3 +165,4 @@ function decodeBase64(base64) {
 
   return new TextDecoder().decode(bytes);
 }
+