Attempt to improve unsent mail

2026-03-03 14:37:13 +01:00 · 2022-06-23 17:39:30 +02:00
parent a462cd1c14
commit 942066bc7a
4 changed files with 119 additions and 97 deletions
--- a/helpers/mail.ts
+++ b/helpers/mail.ts
@@ -2,12 +2,11 @@ import { Booking } from '../db/booking'
 import { getBaseURL } from '../helpers/url'
 import { daysFormatFrontend } from './date'
 import { generateCalendarEntry } from './ical'
-import { retryWithDelay } from './retryWithDelay'
+import sgMail from '@sendgrid/mail'

 const SENDGRID_API_KEY = process.env.SENDGRID_API_KEY
 const ADMIN_EMAIL = process.env.ADMIN_EMAIL
 const FROM_EMAIL = process.env.FROM_EMAIL
-const SENDGRID_URL = 'https://api.sendgrid.com/v3/mail/send'

 if (!SENDGRID_API_KEY) {
  throw new Error('NO SENDGRID_API_KEY set!')
@@ -21,6 +20,8 @@ if (!FROM_EMAIL) {
  throw new Error('No FROM_EMAIL set!')
 }

+sgMail.setApiKey(SENDGRID_API_KEY)
+
 const footer = `

 Viele Grüße
@@ -29,6 +30,7 @@ Thomas Ruoff
 Pfadi Bussle Wart

 Tel. 0151/212 253 62
+${getBaseURL()}
 `

 function getReceivedBookingBookerText(booking: Booking): string {
@@ -210,36 +212,22 @@ async function sendMail({
  }[]
 }): Promise<void> {
  const data = {
-    personalizations: [
-      {
-        to,
-      },
-    ],
+    to,
    from,
    subject,
-    content: [{ type: 'text/plain', value: textPlainContent }],
+    text: textPlainContent,
    attachments,
  }

-  const fetchOptions = {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${SENDGRID_API_KEY}`,
-    },
-    body: JSON.stringify(data),
+  try {
+    await sgMail.send(data)
+  } catch (error) {
+    console.error(error)
+
+    if (error.response) {
+      console.error(error.response.body)
+    }
+
+    // TODO: stuff into DB if failed and retry later
  }
-
-  return retryWithDelay({
-    run: async () => {
-      const resp = await fetch(SENDGRID_URL, fetchOptions)
-      const bodyText = await resp.text()
-
-      if (!resp.ok) {
-        throw new Error(
-          `Failed to send mail with status ${resp.status}: ${bodyText}`
-        )
-      }
-    },
-  })
 }
--- a/helpers/retryWithDelay.ts
+++ b/helpers/retryWithDelay.ts
@@ -1,20 +0,0 @@
-import pRetry from 'p-retry'
-
-export function retryWithDelay<T>({
-  run,
-  delay = 1000,
-}: {
-  run: () => Promise<T>
-  delay?: number
-}) {
-  return pRetry(run, {
-    retries: 2,
-    onFailedAttempt: (error) => {
-      console.info(
-        `Attempt ${error.attemptNumber}: ${error.message}. ${error.retriesLeft} retries left`
-      )
-
-      return new Promise((resolve) => setTimeout(resolve, delay))
-    },
-  })
-}
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
      "version": "0.1.0",
      "dependencies": {
        "@next-auth/mongodb-adapter": "1.0.3",
+        "@sendgrid/mail": "^7.7.0",
        "autoprefixer": "10.4.7",
        "classnames": "2.3.1",
        "date-fns": "2.28.0",
@@ -20,7 +21,6 @@
        "next-auth": "4.6.1",
        "next-mdx-remote": "4.0.3",
        "nodemailer": "6.7.5",
-        "p-retry": "5.1.1",
        "react": "18.2.0",
        "react-calendar": "3.7.0",
        "react-dom": "18.2.0",
@@ -1546,6 +1546,41 @@
      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
      "dev": true
    },
+    "node_modules/@sendgrid/client": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.7.0.tgz",
+      "integrity": "sha512-SxH+y8jeAQSnDavrTD0uGDXYIIkFylCo+eDofVmZLQ0f862nnqbC3Vd1ej6b7Le7lboyzQF6F7Fodv02rYspuA==",
+      "dependencies": {
+        "@sendgrid/helpers": "^7.7.0",
+        "axios": "^0.26.0"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >=10.*"
+      }
+    },
+    "node_modules/@sendgrid/helpers": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.7.0.tgz",
+      "integrity": "sha512-3AsAxfN3GDBcXoZ/y1mzAAbKzTtUZ5+ZrHOmWQ279AuaFXUNCh9bPnRpN504bgveTqoW+11IzPg3I0WVgDINpw==",
+      "dependencies": {
+        "deepmerge": "^4.2.2"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/@sendgrid/mail": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.7.0.tgz",
+      "integrity": "sha512-5+nApPE9wINBvHSUxwOxkkQqM/IAAaBYoP9hw7WwgDNQPxraruVqHizeTitVtKGiqWCKm2mnjh4XGN3fvFLqaw==",
+      "dependencies": {
+        "@sendgrid/client": "^7.7.0",
+        "@sendgrid/helpers": "^7.7.0"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >=10.*"
+      }
+    },
    "node_modules/@sinclair/typebox": {
      "version": "0.23.5",
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
@@ -1753,11 +1788,6 @@
        "@types/react": "*"
      }
    },
-    "node_modules/@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
-    },
    "node_modules/@types/scheduler": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
@@ -2192,6 +2222,14 @@
        "node": ">=4"
      }
    },
+    "node_modules/axios": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "dependencies": {
+        "follow-redirects": "^1.14.8"
+      }
+    },
    "node_modules/axobject-query": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -3928,6 +3966,25 @@
      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
      "dev": true
    },
+    "node_modules/follow-redirects": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/fraction.js": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -7044,21 +7101,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/p-retry": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-5.1.1.tgz",
-      "integrity": "sha512-i69WkEU5ZAL8mrmdmVviWwU+DN+IUF8f4sSJThoJ3z5A7Nn5iuO5ROX3Boye0u+uYQLOSfgFl7SuFZCjlAVbQA==",
-      "dependencies": {
-        "@types/retry": "0.12.1",
-        "retry": "^0.13.1"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
    "node_modules/p-try": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -8203,14 +8245,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
    "node_modules/reusify": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -10368,6 +10402,32 @@
      "integrity": "sha512-WiBSI6JBIhC6LRIsB2Kwh8DsGTlbBU+mLRxJmAe3LjHTdkDpwIbEOZgoXBbZilk/vlfjK8i6nKRAvIRn1XaIMw==",
      "dev": true
    },
+    "@sendgrid/client": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/client/-/client-7.7.0.tgz",
+      "integrity": "sha512-SxH+y8jeAQSnDavrTD0uGDXYIIkFylCo+eDofVmZLQ0f862nnqbC3Vd1ej6b7Le7lboyzQF6F7Fodv02rYspuA==",
+      "requires": {
+        "@sendgrid/helpers": "^7.7.0",
+        "axios": "^0.26.0"
+      }
+    },
+    "@sendgrid/helpers": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/helpers/-/helpers-7.7.0.tgz",
+      "integrity": "sha512-3AsAxfN3GDBcXoZ/y1mzAAbKzTtUZ5+ZrHOmWQ279AuaFXUNCh9bPnRpN504bgveTqoW+11IzPg3I0WVgDINpw==",
+      "requires": {
+        "deepmerge": "^4.2.2"
+      }
+    },
+    "@sendgrid/mail": {
+      "version": "7.7.0",
+      "resolved": "https://registry.npmjs.org/@sendgrid/mail/-/mail-7.7.0.tgz",
+      "integrity": "sha512-5+nApPE9wINBvHSUxwOxkkQqM/IAAaBYoP9hw7WwgDNQPxraruVqHizeTitVtKGiqWCKm2mnjh4XGN3fvFLqaw==",
+      "requires": {
+        "@sendgrid/client": "^7.7.0",
+        "@sendgrid/helpers": "^7.7.0"
+      }
+    },
    "@sinclair/typebox": {
      "version": "0.23.5",
      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz",
@@ -10575,11 +10635,6 @@
        "@types/react": "*"
      }
    },
-    "@types/retry": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.1.tgz",
-      "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g=="
-    },
    "@types/scheduler": {
      "version": "0.16.2",
      "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
@@ -10872,6 +10927,14 @@
      "integrity": "sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==",
      "dev": true
    },
+    "axios": {
+      "version": "0.26.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz",
+      "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==",
+      "requires": {
+        "follow-redirects": "^1.14.8"
+      }
+    },
    "axobject-query": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -12122,6 +12185,11 @@
      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
      "dev": true
    },
+    "follow-redirects": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
+      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+    },
    "fraction.js": {
      "version": "4.2.0",
      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
@@ -14272,15 +14340,6 @@
        "p-limit": "^2.2.0"
      }
    },
-    "p-retry": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-5.1.1.tgz",
-      "integrity": "sha512-i69WkEU5ZAL8mrmdmVviWwU+DN+IUF8f4sSJThoJ3z5A7Nn5iuO5ROX3Boye0u+uYQLOSfgFl7SuFZCjlAVbQA==",
-      "requires": {
-        "@types/retry": "0.12.1",
-        "retry": "^0.13.1"
-      }
-    },
    "p-try": {
      "version": "2.2.0",
      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -14998,11 +15057,6 @@
      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz",
      "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ=="
    },
-    "retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
-    },
    "reusify": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
  },
  "dependencies": {
    "@next-auth/mongodb-adapter": "1.0.3",
+    "@sendgrid/mail": "^7.7.0",
    "autoprefixer": "10.4.7",
    "classnames": "2.3.1",
    "date-fns": "2.28.0",
@@ -22,7 +23,6 @@
    "next-auth": "4.6.1",
    "next-mdx-remote": "4.0.3",
    "nodemailer": "6.7.5",
-    "p-retry": "5.1.1",
    "react": "18.2.0",
    "react-calendar": "3.7.0",
    "react-dom": "18.2.0",