Skip to content

feat: wrap mailer on global #894

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

Merged
Klakurka merged 1 commit into from
Dec 4, 2024
Merged

feat: wrap mailer on global #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 27 additions & 15 deletions constants/mail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,38 @@ import { Prisma } from '@prisma/client'
import config from 'config/index'
import { XEC_TX_EXPLORER_URL, BCH_TX_EXPLORER_URL } from 'constants/index'
import nodemailer from 'nodemailer'
import SMTPTransport from 'nodemailer/lib/smtp-transport'
import { getAddressPrefix } from 'utils'
import { OpReturnData } from 'utils/validators'

export const MAIL_TRANSPORTER = nodemailer.createTransport({
host: config.smtpHost,
secure: config.smtpPort === 465,
logger: true,
auth: {
user: process.env.SMTP_USER,
pass: process.env.SMTP_PASSWORD
}
})
export interface MailerGlobal extends NodeJS.Global {
mailerTransporter?: nodemailer.Transporter<SMTPTransport.SentMessageInfo, SMTPTransport.Options>
}

MAIL_TRANSPORTER.verify((error, _success) => {
if (error != null) {
console.error('ERROR SETTING UP MAILER:', error)
} else {
console.log('Mailer ready to send messages')
declare const global: MailerGlobal

export const getMailerTransporter = (): nodemailer.Transporter<SMTPTransport.SentMessageInfo, SMTPTransport.Options> => {
if (global.mailerTransporter === undefined) {
global.mailerTransporter = nodemailer.createTransport({
host: config.smtpHost,
secure: config.smtpPort === 465,
logger: true,
auth: {
user: process.env.SMTP_USER,
pass: process.env.SMTP_PASSWORD
}
})
global.mailerTransporter.verify((error, _success) => {
if (error != null) {
console.error('ERROR SETTING UP MAILER:', error)
global.mailerTransporter = undefined
} else {
console.log('Mailer ready to send messages')
}
})
}
})
return global.mailerTransporter
}

export const MAIL_FROM = 'no-reply@paybutton.org'
export const MAIL_SUBJECT = 'New Payment Received'
Expand Down
4 changes: 2 additions & 2 deletions services/triggerService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { EMPTY_OP_RETURN, OpReturnData, parseTriggerPostData } from 'utils/valid
import { BroadcastTxData } from 'ws-service/types'
import { fetchPaybuttonById, fetchPaybuttonWithTriggers } from './paybuttonService'
import config from 'config'
import { MAIL_FROM, MAIL_HTML_REPLACER, MAIL_SUBJECT, MAIL_TRANSPORTER, SendEmailParameters } from 'constants/mail'
import { MAIL_FROM, MAIL_HTML_REPLACER, MAIL_SUBJECT, getMailerTransporter, SendEmailParameters } from 'constants/mail'

const triggerWithPaybutton = Prisma.validator<Prisma.PaybuttonTriggerArgs>()({
include: { paybutton: true }
Expand Down Expand Up @@ -339,7 +339,7 @@ async function sendEmailForTrigger (trigger: TriggerWithPaybutton, sendEmailPara
try {
const user = await fetchUserFromTriggerId(trigger.id)
if (user.emailCredits > 0) {
const response = await MAIL_TRANSPORTER.sendMail(mailOptions)
const response = await getMailerTransporter().sendMail(mailOptions)
logData = {
email: trigger.emails,
responseData: response.response
Expand Down
Loading