diff options
author | Josh Morel <morel.josh@hotmail.com> | 2018-12-15 08:51:51 -0500 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-12-17 10:59:07 +0100 |
commit | af37210c0bd7bf343fe366ddd2b253e2214f5547 (patch) | |
tree | efb08450a3c1d91429e4fc5a9bc6b2a9e7cae0ba /shared | |
parent | 8fc58cb580994efe8f5167739568afadfe9850d7 (diff) | |
download | PeerTube-af37210c0bd7bf343fe366ddd2b253e2214f5547.tar.gz PeerTube-af37210c0bd7bf343fe366ddd2b253e2214f5547.tar.zst PeerTube-af37210c0bd7bf343fe366ddd2b253e2214f5547.zip |
throw error if MailDev doesn't run
also allow calling in multiple file
Diffstat (limited to 'shared')
-rw-r--r-- | shared/utils/miscs/email-child-process.js | 27 | ||||
-rw-r--r-- | shared/utils/miscs/email.ts | 66 |
2 files changed, 75 insertions, 18 deletions
diff --git a/shared/utils/miscs/email-child-process.js b/shared/utils/miscs/email-child-process.js new file mode 100644 index 000000000..40ae37d70 --- /dev/null +++ b/shared/utils/miscs/email-child-process.js | |||
@@ -0,0 +1,27 @@ | |||
1 | const MailDev = require('maildev') | ||
2 | |||
3 | // must run maildev as forked ChildProcess | ||
4 | // failed instantiation stops main process with exit code 0 | ||
5 | process.on('message', (msg) => { | ||
6 | if (msg.start) { | ||
7 | const maildev = new MailDev({ | ||
8 | ip: '127.0.0.1', | ||
9 | smtp: 1025, | ||
10 | disableWeb: true, | ||
11 | silent: true | ||
12 | }) | ||
13 | |||
14 | maildev.on('new', email => { | ||
15 | process.send({ email }) | ||
16 | }) | ||
17 | |||
18 | maildev.listen(err => { | ||
19 | if (err) { | ||
20 | // cannot send as Error object | ||
21 | return process.send({ err: err.message }) | ||
22 | } | ||
23 | |||
24 | return process.send({ err: null }) | ||
25 | }) | ||
26 | } | ||
27 | }) | ||
diff --git a/shared/utils/miscs/email.ts b/shared/utils/miscs/email.ts index 21accd09d..108f7d3d9 100644 --- a/shared/utils/miscs/email.ts +++ b/shared/utils/miscs/email.ts | |||
@@ -1,25 +1,55 @@ | |||
1 | import * as MailDev from 'maildev' | 1 | import * as child from 'child_process' |
2 | 2 | ||
3 | function mockSmtpServer (emailsCollection: object[]) { | 3 | class MockSmtpServer { |
4 | const maildev = new MailDev({ | 4 | |
5 | ip: '127.0.0.1', | 5 | private static instance: MockSmtpServer |
6 | smtp: 1025, | 6 | private started = false |
7 | disableWeb: true, | 7 | private emailChildProcess: child.ChildProcess |
8 | silent: true | 8 | private emails: object[] |
9 | }) | 9 | |
10 | maildev.on('new', email => emailsCollection.push(email)) | 10 | private constructor () { |
11 | 11 | this.emailChildProcess = child.fork(`${__dirname}/email-child-process`, [], { silent: true }) | |
12 | return new Promise((res, rej) => { | 12 | this.emailChildProcess.on('message', (msg) => { |
13 | maildev.listen(err => { | 13 | if (msg.email) { |
14 | if (err) return rej(err) | 14 | return this.emails.push(msg.email) |
15 | 15 | } | |
16 | return res() | 16 | }) |
17 | process.on('exit', () => { | ||
18 | this.emailChildProcess.kill() | ||
17 | }) | 19 | }) |
18 | }) | 20 | } |
21 | |||
22 | collectEmails (emailsCollection: object[]) { | ||
23 | return new Promise((res, rej) => { | ||
24 | if (this.started) { | ||
25 | this.emails = emailsCollection | ||
26 | return res() | ||
27 | } | ||
28 | |||
29 | // ensure maildev isn't started until | ||
30 | // unexpected exit can be reported to test runner | ||
31 | this.emailChildProcess.send({ start: true }) | ||
32 | this.emailChildProcess.on('exit', () => { | ||
33 | return rej(new Error('maildev exited unexpectedly, confirm port not in use')) | ||
34 | }) | ||
35 | this.emailChildProcess.on('message', (msg) => { | ||
36 | if (msg.err) { | ||
37 | return rej(new Error(msg.err)) | ||
38 | } | ||
39 | this.started = true | ||
40 | this.emails = emailsCollection | ||
41 | return res() | ||
42 | }) | ||
43 | }) | ||
44 | } | ||
45 | |||
46 | static get Instance () { | ||
47 | return this.instance || (this.instance = new this()) | ||
48 | } | ||
19 | } | 49 | } |
20 | 50 | ||
21 | // --------------------------------------------------------------------------- | 51 | // --------------------------------------------------------------------------- |
22 | 52 | ||
23 | export { | 53 | export { |
24 | mockSmtpServer | 54 | MockSmtpServer |
25 | } | 55 | } |