v0.2.2: support 8-bit mime transport

Author: weaver

Makefile

@@ -0,0 +1,2 @@
+tests:
+	expresso test/*

README.md

@@ -37,15 +37,19 @@ Use the mailer to send messages:
 
 ## Mail(options) ##
 
-Create a new mailer that can be used to send messages.  Possible
-settings include:
+Create a new mailer that can be used to send messages.  Common options
+include:
 
   + `port`: server listens on this port (default: 587 or 25)
   + `host`: server hostname
-  + `domain`: the domain of the sender (default: `os.hostname()`)
-  + `secure`: `true`, `false`, or crypto credentials (default: false)
   + `username`: user for server authentication
-  + `password`: password for server authentication
+  + `password`: password for server authentication,
+
+Other options:
+
+  + `secure`: `true`, `false`, or crypto credentials (default: `true`)
+  + `domain`: the domain of the sender (default: `os.hostname()`)
+  + `mimeTransport`: `7BIT` or `8BITMIME` (default: `8BITMIME`)
 
 ### Mail.message(headers) ###
 
@@ -77,8 +81,9 @@ version `v0.4.3`.  A working subset of these RFCs are supported:
 
   + [Internet Message Format](http://tools.ietf.org/html/rfc5322)
   + [Simple Mail Transfer Protocol](http://tools.ietf.org/html/rfc5321)
-  + [Authentication Extension](http://www.faqs.org/rfcs/rfc2554.html)
+  + [Authentication Extension](http://tools.ietf.org/html/rfc2554)
   + [SMTP Transport Layer Security](http://tools.ietf.org/html/rfc3207)
+  + [8-bit MIME Transport](http://tools.ietf.org/html/rfc6152)
 
 There is not currently support for MIME.
 

lib/smtp.js

@@ -92,7 +92,7 @@ Client.prototype.reset = function(wait) {
   var self = this,
       replies = [];
 
-  this.session = {};
+  this.session = { use8BITMIME: undefined };
 
   U.eachLine(this.sock, function(line) {
     var probe;
@@ -283,6 +283,30 @@ Client.prototype.authLOGIN = function(username, password, next) {
   return this;
 };
 
+// ### 8BITMIME Extension ###
+
+// Default to sending 8BITMIME even if the server doesn't advertise
+// support for it. If the server does advertise support, add BODY to
+// the `MAIL FROM` command.
+//
+// To require a 7BIT body, use the `mimeTransport: '7BIT` option.
+//
+// See: <http://cr.yp.to/smtp/8bitmime.html>, <http://tools.ietf.org/html/rfc6152>
+
+Client.prototype.smtp8BITMIME = function(next) {
+  this.session.use8BITMIME = true;
+  next();
+};
+
+Client.prototype.mimeTransport = function() {
+  return this.session.use8BITMIME && (this.options.mimeTransport || '8BITMIME');
+};
+
+// Only require 7bit encoding if it's explicitly requested.
+Client.prototype.require7Bit = function() {
+  return this.options.mimeTransport == '7BIT';
+};
+
 
 // ## Reply ##
 
@@ -328,7 +352,10 @@ function ClientTransaction(client, from, to) {
   client.once('ready', sendFrom);
 
   function sendFrom() {
-    client.command('mail from:', '<' + from + '>', function() {
+    var transport = client.mimeTransport(),
+        args = '<' + from + '>' + (transport ? ' BODY=' + transport : '');
+
+    client.command('mail from:', args, function() {
       U.aEach(to, sendTo, data);
     });
   }
@@ -357,7 +384,7 @@ ClientTransaction.prototype.write = function(data) {
     this.client.emit('error', new Error('The transaction has ended.'));
     return this;
   }
-  else if ((this.session.bits != 8) && !U.is7Bit(data)) {
+  else if (this.client.require7Bit() && !U.is7Bit(data)) {
     this.client.emit('error', new Error('Data must be 7-bit ASCII.'));
     return this;
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mail",
   "description": "This SMTP client library for Node.JS helps you send email safely and easily.",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "Ben Weaver <[email protected]>",
   "contributors": [],
   "dependencies": {