From 3d470a530c4a48b2e4f4a9e7d4f223e14f32cea4 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Jun 2021 16:52:22 +0200 Subject: Faster ci using compiled ts files --- shared/extra-utils/miscs/email.ts | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) (limited to 'shared/extra-utils/miscs/email.ts') diff --git a/shared/extra-utils/miscs/email.ts b/shared/extra-utils/miscs/email.ts index 758b15b58..9fc9a5ad0 100644 --- a/shared/extra-utils/miscs/email.ts +++ b/shared/extra-utils/miscs/email.ts @@ -1,8 +1,9 @@ -import { ChildProcess, fork } from 'child_process' -import { join } from 'path' +import { ChildProcess } from 'child_process' import { randomInt } from '../../core-utils/miscs/miscs' import { parallelTests } from '../server/servers' +const MailDev = require('maildev') + class MockSmtpServer { private static instance: MockSmtpServer @@ -10,38 +11,32 @@ class MockSmtpServer { private emailChildProcess: ChildProcess private emails: object[] - private constructor () { - this.emailChildProcess = fork(join(__dirname, 'email-child-process'), []) - - this.emailChildProcess.on('message', (msg: any) => { - if (msg.email) { - return this.emails.push(msg.email) - } - }) - - process.on('exit', () => this.kill()) - } + private constructor () { } collectEmails (emailsCollection: object[]) { return new Promise((res, rej) => { const port = parallelTests() ? randomInt(1000, 2000) : 1025 + this.emails = emailsCollection if (this.started) { - this.emails = emailsCollection return res(undefined) } - // ensure maildev isn't started until - // unexpected exit can be reported to test runner - this.emailChildProcess.send({ start: true, port }) - this.emailChildProcess.on('exit', () => { - return rej(new Error('maildev exited unexpectedly, confirm port not in use')) + const maildev = new MailDev({ + ip: '127.0.0.1', + smtp: port, + disableWeb: true, + silent: true + }) + + maildev.on('new', email => { + this.emails.push(email) }) - this.emailChildProcess.on('message', (msg: any) => { - if (msg.err) return rej(new Error(msg.err)) + + maildev.listen(err => { + if (err) return rej(err) this.started = true - this.emails = emailsCollection return res(port) }) -- cgit v1.2.3