Merge pull request #113 from timlrx/v2

Add support for newsletter route handler

.changeset/pre.json

@@ -15,6 +15,7 @@
     "neat-tables-occur",
     "pretty-worms-help",
     "proud-brooms-laugh",
-    "unlucky-keys-join"
+    "unlucky-keys-join",
+    "weak-swans-heal"
   ]
 }

.changeset/weak-swans-heal.md

@@ -0,0 +1,5 @@
+---
+'pliny': patch
+---
+
+Add support for newsletter route handler

packages/pliny/CHANGELOG.md

@@ -1,5 +1,11 @@
 # pliny
 
+## 0.1.0-beta.5
+
+### Patch Changes
+
+- 3e31a82: Add support for newsletter route handler
+
 ## 0.1.0-beta.4
 
 ### Patch Changes

packages/pliny/package.json

@@ -2,7 +2,7 @@
   "name": "pliny",
   "description": "Main entry point for pliny components",
   "homepage": "https://github.com/timlrx/pliny",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.5",
   "type": "module",
   "exports": {
     "./*": "./*",

packages/pliny/src/newsletter/buttondown.ts

@@ -1,6 +1,7 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 
-export const buttondownHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const buttondownHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
   const API_KEY = process.env.BUTTONDOWN_API_KEY
   const API_URL = 'https://api.buttondown.email/v1/'

packages/pliny/src/newsletter/convertkit.ts

@@ -1,6 +1,7 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 
-export const convertkitHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const convertkitHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
   const FORM_ID = process.env.CONVERTKIT_FORM_ID
   const API_KEY = process.env.CONVERTKIT_API_KEY

packages/pliny/src/newsletter/emailOctopus.ts

@@ -1,6 +1,7 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 
-export const emailOctopusHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const emailOctopusHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
   const API_KEY = process.env.EMAILOCTOPUS_API_KEY
   const LIST_ID = process.env.EMAILOCTOPUS_LIST_ID

packages/pliny/src/newsletter/index.ts

@@ -1,4 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next'
+import { NextResponse } from 'next/server'
+import type { NextRequest } from 'next/server'
 import { buttondownHandler } from './buttondown'
 import { convertkitHandler } from './convertkit'
 import { mailchimpHandler } from './mailchimp'
@@ -16,7 +18,7 @@ export interface NewsletterRequest extends NextApiRequest {
 
 export type NewsletterResponse<T = any> = NextApiResponse<T>
 
-async function NewsletterHandler(
+async function NewsletterAPIHandler(
   req: NextApiRequest,
   res: NextApiResponse,
   options: NewsletterConfig
@@ -29,22 +31,22 @@ async function NewsletterHandler(
     let response: Response
     switch (options.provider) {
       case 'buttondown':
-        response = await buttondownHandler(req, res)
+        response = await buttondownHandler(req)
         break
       case 'convertkit':
-        response = await convertkitHandler(req, res)
+        response = await convertkitHandler(req)
         break
       case 'mailchimp':
-        response = await mailchimpHandler(req, res)
+        response = await mailchimpHandler(req)
         break
       case 'klaviyo':
-        response = await klaviyoHandler(req, res)
+        response = await klaviyoHandler(req)
         break
       case 'revue':
-        response = await revueHandler(req, res)
+        response = await revueHandler(req)
         break
       case 'emailoctopus':
-        response = await emailOctopusHandler(req, res)
+        response = await emailOctopusHandler(req)
         break
       default:
         res.status(500).json({ error: `${options.provider} not supported` })
@@ -58,20 +60,79 @@ async function NewsletterHandler(
   }
 }
 
+async function NewsletterRouteHandler(req: NextRequest, options: NewsletterConfig) {
+  const res = await req.json()
+  if (!res.email) {
+    return NextResponse.json({ error: 'Email is required' }, { status: 400 })
+  }
+  try {
+    let response: Response
+    switch (options.provider) {
+      case 'buttondown':
+        response = await buttondownHandler(req)
+        break
+      case 'convertkit':
+        response = await convertkitHandler(req)
+        break
+      case 'mailchimp':
+        response = await mailchimpHandler(req)
+        break
+      case 'klaviyo':
+        response = await klaviyoHandler(req)
+        break
+      case 'revue':
+        response = await revueHandler(req)
+        break
+      case 'emailoctopus':
+        response = await emailOctopusHandler(req)
+        break
+      default:
+        return NextResponse.json({ error: `${options.provider} not supported` }, { status: 500 })
+    }
+    if (response.status == 200) {
+      return NextResponse.json(
+        { message: 'Successfully subscribed to the newsletter' },
+        { status: response.status }
+      )
+    } else if (response.status >= 400) {
+      return NextResponse.json(
+        { error: `There was an error subscribing to the list` },
+        { status: response.status }
+      )
+    }
+    return NextResponse.json({ error: '' }, { status: 201 })
+  } catch (error) {
+    return NextResponse.json({ error: error.message || error.toString() }, { status: 500 })
+  }
+}
+
 export function NewsletterAPI(options: NewsletterConfig): any
+export function NewsletterAPI(req: NextRequest, options: NewsletterConfig): any
 export function NewsletterAPI(
   req: NextApiRequest,
   res: NextApiResponse,
   options: NewsletterConfig
 ): any
 
 export function NewsletterAPI(
-  ...args: [NewsletterConfig] | [NextApiRequest, NextApiResponse, NewsletterConfig]
+  ...args:
+    | [NewsletterConfig]
+    | [NextRequest, NewsletterConfig]
+    | [NextApiRequest, NextApiResponse, NewsletterConfig]
 ) {
   if (args.length === 1) {
-    return async (req: NewsletterRequest, res: NewsletterResponse) =>
-      await NewsletterHandler(req, res, args[0])
+    return async (req: NewsletterRequest | NextRequest, res: NewsletterResponse) => {
+      // For route handlers, 2nd argument contains the 'params' property instead of a response object
+      if ('params' in res) {
+        return await NewsletterRouteHandler(req as NextRequest, args[0])
+      }
+      return await NewsletterAPIHandler(req as NewsletterRequest, res, args[0])
+    }
+  }
+
+  if (args.length === 2) {
+    return NewsletterRouteHandler(...args)
   }
 
-  return NewsletterHandler(args[0], args[1], args[2])
+  return NewsletterAPIHandler(...args)
 }

packages/pliny/src/newsletter/klaviyo.ts

@@ -1,6 +1,7 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 
-export const klaviyoHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const klaviyoHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
   const API_KEY = process.env.KLAVIYO_API_KEY
   const LIST_ID = process.env.KLAVIYO_LIST_ID

packages/pliny/src/newsletter/mailchimp.ts

@@ -1,12 +1,13 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 import mailchimp from '@mailchimp/mailchimp_marketing'
 
 mailchimp.setConfig({
   apiKey: process.env.MAILCHIMP_API_KEY,
   server: process.env.MAILCHIMP_API_SERVER, // E.g. us1
 })
 
-export const mailchimpHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const mailchimpHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
 
   const response = await mailchimp.lists.addListMember(process.env.MAILCHIMP_AUDIENCE_ID, {

packages/pliny/src/newsletter/revue.ts

@@ -1,6 +1,7 @@
-import { NextApiRequest, NextApiResponse } from 'next'
+import { NextApiRequest } from 'next'
+import { NextRequest } from 'next/server'
 
-export const revueHandler = async (req: NextApiRequest, res: NextApiResponse) => {
+export const revueHandler = async (req: NextApiRequest | NextRequest) => {
   const { email } = req.body
 
   const API_KEY = process.env.REVUE_API_KEY