eleith
/
emailjs
mirror of https://github.com/eleith/emailjs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove deprecated securePair call

This commit is contained in:
eleith 2016-09-04 22:55:38 -07:00
parent 8f89298641
commit 80cfe78795
3 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Readme.md
View File

@ -101,6 +101,36 @@ var message = {
server.send(message, function(err, message) { console.log(err || message); });
```
## EXAMPLE USAGE - attaching and embedding an image
```javascript
var email = require("./path/to/emailjs/email");
var server = email.server.connect({
user: "username",
password:"password",
host: "smtp-mail.outlook.com",
tls: {ciphers: "SSLv3"}
});
var message = {
text: "i hope this works",
from: "you <username@outlook.com>",
to: "someone <someone@your-email.com>, another <another@your-email.com>",
cc: "else <else@your-email.com>",
subject: "testing emailjs",
attachment:
[
{data: "<html>i <i>hope</i> this works! here is an image: <img src='cid:my-image' width='100' height ='50'> </html>"},
{path:"path/to/file.zip", type:"application/zip", name:"renamed.zip"},
{path:"path/to/image.jpg", type:"image/jpg", headers:{"Content-ID":"<my-image>"}}
]
};
// send the message and get a callback with an error or details of the message that was sent
server.send(message, function(err, message) { console.log(err || message); });
```
# API
## email.server.connect(options)

7
package.json
View File

@ -1,7 +1,7 @@
{
"name": "emailjs",
"description": "send text/html emails and attachments (files, streams and strings) from node.js to any smtp server",
"version": "1.0.5",
"version": "1.0.6",
"author": "eleith",
"contributors": [
"izuzak",
@ -16,8 +16,7 @@
"dependencies": {
"addressparser": "^0.3.2",
"mimelib": "0.2.14",
"moment": "= 2.11.2",
"starttls": "1.0.1"
"moment": "= 2.11.2"
},
"optionalDependencies": {
"bufferjs": "=1.1.0"
@ -30,7 +29,7 @@
"iconv": "2.1.6"
},
"engine": [
"node >= 0.10"
"node >= 4"
],
"main": "email.js",
"scripts": {

37
smtp/smtp.js
View File

@ -7,7 +7,6 @@ var os = require('os');
var tls = require('tls');
var util = require('util');
var events = require('events');
var starttls = require('starttls');
var SMTPResponse = require('./response');
var SMTPError = require('./error');
@ -242,36 +241,22 @@ SMTP.prototype = {
err.message += " while establishing a starttls session";
caller(callback, err);
} else {
var secured_socket = null;
var secured = function() {
self._secure = true;
self.sock = secured_socket;
var error = function(err) {
self.close(true);
caller(callback, err);
};
SMTPResponse.monitor(self.sock, self.timeout, function() {
self.close(true);
});
caller(callback, msg.data);
};
//secured_socket = starttls.secure(self.sock, self.tls, secured);
secured_socket = starttls({
socket: self.sock,
host: self.host,
port: self.port,
pair: tls.createSecurePair(
tls.createSecureContext ? tls.createSecureContext(self.tls) : crypto.createCredentials(self.tls),
false)
}, secured).cleartext;
var secured_socket = new tls.TLSSocket(self.sock, {
secureContext: tls.createSecureContext ? tls.createSecureContext(self.tls) : crypto.createCredentials(self.tls)
});
secured_socket.on('error', function(err) {
self.close(true);
caller(callback, err);
});
self._secure = true;
self.sock = secured_socket;
SMTPResponse.monitor(self.sock, self.timeout, function() {
self.close(true);
});
caller(callback, msg.data);
}
};