mailing: added queue

src/lib/dwatch.ts

@@ -8,11 +8,13 @@ import {webDiffWatcher} from "./watchers/webdiff/webdiff-watcher";
 import {Watcher} from "./types/state";
 import {headWatcher} from "./watchers/bma/head-watcher";
 import {jsonWatcher} from "./watchers/wotwizard/json-watcher";
+import {initConfMail} from './mail'
 
 export async function dwatch(confFile: string) {
 
   const yml = fs.readFileSync(confFile, 'utf8')
   const conf = yaml.load(yml) as Conf
+  initConfMail(conf.mail)
   const watchers: Watcher[] = [];
   (await Promise.all((conf.ws2pServers || []).map(ws2pWatcher(conf)))).forEach(w => watchers.push(w));
   (await Promise.all((conf.bmaServers || []).map(bmaWatcher(conf)))).forEach(w => watchers.push(w));

src/lib/mail.ts

@@ -4,47 +4,85 @@ import {ConfMail} from './types/conf'
 import * as nodemailer from 'nodemailer'
 import * as os from 'os'
 
-export async function sendMail(conf: ConfMail, subject: string, html: string, cc?: string) {
+// TODO: in confMail
+
+const QUEUE_PERIOD = 5000
+const queue: EmailContent[] = []
+let conf: ConfMail|undefined
+
+export function initConfMail(confMail: ConfMail) {
+  conf = confMail
+
+  ;(async () => {
+    while (true) {
+      await consumeQueue()
+      await new Promise((res) => setTimeout(res, QUEUE_PERIOD))
+    }
+  })()
+}
+
+export async function queueEmail(subject: string, html: string, cc?: string) {
+  queue.push({ subject, body: html, cc })
+}
+
+async function consumeQueue() {
+  while (queue.length) {
+    const mail = queue.shift()
+    if (mail) {
+      await sendEmail(mail.subject, mail.body, mail.cc)
+    }
+  }
+}
+
+async function sendEmail(subject: string, html: string, cc?: string) {
+
+  if (!conf) {
+    console.error(`Mail is not properly configured.`)
+    return
+  }
 
   console.log(`[mail] Subject: ${subject}`)
   console.log(`[mail] Body: ${html}`)
-  if (conf.enabled) {
-    let transporter = nodemailer.createTransport({
-      host: conf.host,
-      port: conf.port,
-      secure: false, // true for 465, false for other ports
-      auth: {
-        user: conf.username, // generated ethereal user
-        pass: conf.apikey // generated ethereal password
-      },
-      authMethod: conf.auth,
-      requireTLS: true,
-    });
-
-// send mail with defined transport object
-    let info = await transporter.sendMail({
-      from: conf.from,
-      to: conf.to,
-      cc: (conf.cc ? [conf.cc] : []).concat(cc ? [cc] : []).join(','),
-      subject,
-      html
-    })
+  if (!conf.enabled) {
+    console.warn(`Mail is disabled.`)
+    return
   }
+
+  let transporter = nodemailer.createTransport({
+    host: conf.host,
+    port: conf.port,
+    secure: false, // true for 465, false for other ports
+    auth: {
+      user: conf.username, // generated ethereal user
+      pass: conf.apikey // generated ethereal password
+    },
+    authMethod: conf.auth,
+    requireTLS: true,
+  });
+
+  // send mail with defined transport object
+  let info = await transporter.sendMail({
+    from: conf.from,
+    to: conf.to,
+    cc: (conf.cc ? [conf.cc] : []).concat(cc ? [cc] : []).join(','),
+    subject,
+    html
+  })
 }
 
 export const mail = {
 
-  onEstablished: (conf: Conf, target: string, message = `Connection established for ${target}`, getHtml: () => string = () => `
+  onEstablished: (target: string, message = `Connection established for ${target}`, getHtml: () => string = () => `
       <p>
         Connection from [${os.hostname}] to ${target} established on ${moment().format('DD-MM-YYYY HH:mm:ss')}.
       </p>
     `) => {
     return async (cc?: string) => {
-      await sendMail(conf.mail, `[dw] [${os.hostname}] ${message}`, getHtml(), cc)
+      await queueEmail(`[dw] [${os.hostname}] ${message}`, getHtml(), cc)
     }
   },
 
-  onDisconnect: (conf: Conf, target: string, message = `Connection closed for ${target}`, getErrorMessage: () => string = () => '', getHtml: (waitingDelay: number, recallDelay: number) => string = (waitingDelay: number, recallDelay: number) => `
+  onDisconnect: (target: string, message = `Connection closed for ${target}`, getErrorMessage: () => string = () => '', getHtml: (waitingDelay: number, recallDelay: number) => string = (waitingDelay: number, recallDelay: number) => `
       <p>
         Connection from [${os.hostname}] to ${target} was lost on ${moment().format('dd-MM-YYYY HH:mm:ss')}.
       </p>
@@ -55,18 +93,24 @@ export const mail = {
   `) => {
     return async (waitingDelay: number, recallDelay: number, cc?: string) => {
       console.log('Waiting %s seconds...', (waitingDelay / 1000).toFixed(0))
-      await sendMail(conf.mail, `[dw] [${os.hostname}] ${message}`, getHtml(waitingDelay, recallDelay), cc)
+      await queueEmail(`[dw] [${os.hostname}] ${message}`, getHtml(waitingDelay, recallDelay), cc)
     }
   },
 
-  onRestartSuccess: (conf: Conf, target: string, message = `Connection recovered for ${target}`, getHtml: () => string = () => `
+  onRestartSuccess: (target: string, message = `Connection recovered for ${target}`, getHtml: () => string = () => `
       <p>
         Connection from [${os.hostname}] to ${target} was recovered on ${moment().format('dd-MM-YYYY HH:mm:ss')}.
       </p>
     `) => {
     return async (cc?: string) => {
       console.log(`${message}`)
-      await sendMail(conf.mail, `[dw] [${os.hostname}] ${message}`, getHtml(), cc)
+      await queueEmail(`[dw] [${os.hostname}] ${message}`, getHtml(), cc)
     }
   },
 }
+
+interface EmailContent {
+  subject: string
+  body: string
+  cc?: string
+}

src/lib/watchers/abstract/url-watcher.ts

@@ -47,7 +47,7 @@ export function urlWatcher(conf: Conf, checkValidity: (data: any) => Promise<Url
       conf.waitingDelay,
       conf.recallDelay,
 
-      mail.onEstablished(conf, urlConf.address, getOkTitle()),
+      mail.onEstablished(urlConf.address, getOkTitle()),
 
       // When a disconnection is detected
         (waitingDelay: number, recallDelay, error?: any) => {
@@ -57,14 +57,14 @@ export function urlWatcher(conf: Conf, checkValidity: (data: any) => Promise<Url
           koTitle = getKoTitle()
           koMessage = () => `<p>${error.errorMessage}</p>`
         }
-        return mail.onDisconnect(conf, urlConf.address, koTitle, koMessage)(waitingDelay, recallDelay)
+        return mail.onDisconnect(urlConf.address, koTitle, koMessage)(waitingDelay, recallDelay)
       },
 
       async () => {
         console.log('Trying to connect to %s', urlConf.address)
       },
 
-      mail.onRestartSuccess(conf, urlConf.address, getRecoveredTitle()),
+      mail.onRestartSuccess(urlConf.address, getRecoveredTitle()),
     )
 
   }

src/lib/watchers/webdiff/webdiff-watcher.ts

@@ -64,10 +64,10 @@ export function webDiffWatcher(conf: Conf) {
       conf.waitingDelay,
       conf.recallDelay,
 
-      () => mail.onEstablished(conf, target, 'webdiff successfully started')(webDiffConf.cc),
+      () => mail.onEstablished(target, 'webdiff successfully started')(webDiffConf.cc),
 
       // When a disconnection is detected
-      (waitingDelay: number, recallDelay: number) => mail.onDisconnect(conf, target, 'Diff detected', undefined, (waitingDelay: number) => `
+      (waitingDelay: number, recallDelay: number) => mail.onDisconnect(target, 'Diff detected', undefined, (waitingDelay: number) => `
         ${htmlDiff}
         <p>
           Waiting ${(waitingDelay / 1000).toFixed(0)} seconds before trying to reconnect.
@@ -78,7 +78,7 @@ export function webDiffWatcher(conf: Conf) {
         console.log('Trying to connect to %s', target)
       },
 
-      () => mail.onRestartSuccess(conf, target)(webDiffConf.cc),
+      () => mail.onRestartSuccess(target)(webDiffConf.cc),
     )
 
   }

src/lib/watchers/ws2p/ws2p-watcher.ts

@@ -44,16 +44,16 @@ export function ws2pWatcher(conf: Conf) {
       conf.waitingDelay,
       conf.recallDelay,
 
-      mail.onEstablished(conf, target, `State OK WS2P on ${wserver.address}`),
+      mail.onEstablished(target, `State OK WS2P on ${wserver.address}`),
 
       // When a disconnection is detected
-      mail.onDisconnect(conf, target, `State FAILURE WS2P on ${wserver.address}`),
+      mail.onDisconnect(target, `State FAILURE WS2P on ${wserver.address}`),
 
       async () => {
         console.log('Trying to connect to %s', target)
       },
 
-      mail.onRestartSuccess(conf, target, `State RECOVERED WS2P on ${wserver.address}`),
+      mail.onRestartSuccess(target, `State RECOVERED WS2P on ${wserver.address}`),
     )
 
   }