libmime 2.1.3 → 3.0.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.0.0 2016-12-08
+
+  * Updated encoded-word generation. Previously a minimal value was encoded, so it was possible to have multiple encoded words in a string separated by non encoded-words. This was an issue with some webmail clients that stripped out the non-encoded parts between encoded-words so the updated method uses wide match by encoding from the first word with unicode characters to the last word. "a =?b?= c =?d?= e" -> "a =?bcd?= e"
+
 ## v2.1.3 2016-12-08
 
   * Revert dot as a special symbol

package/lib/libmime.js

@@ -220,12 +220,27 @@ var libmime = module.exports = {
 
         maxLength = maxLength || 0;
 
-        var decodedValue = libcharset.decode(libcharset.convert((data || ''), fromCharset)),
-            encodedValue;
+        var decodedValue = libcharset.decode(libcharset.convert((data || ''), fromCharset));
+        var encodedValue;
 
-        encodedValue = decodedValue.replace(/([^\s\u0080-\uFFFF]*[\u0080-\uFFFF]+[^\s\u0080-\uFFFF]*(?:\s+[^\s\u0080-\uFFFF]*[\u0080-\uFFFF]+[^\s\u0080-\uFFFF]*\s*)?)+(?=\s|$)/g, function (match) {
-            return match.length ? libmime.encodeWord(match, mimeWordEncoding || 'Q', maxLength) : '';
-        });
+        var firstMatch = decodedValue.match(/(?:^|\s)([^\s]*[\u0080-\uFFFF])/);
+        if (!firstMatch) {
+            return decodedValue;
+        }
+        var lastMatch = decodedValue.match(/([\u0080-\uFFFF][^\s]*)[^\u0080-\uFFFF]*$/);
+        if (!lastMatch) {
+            // should not happen
+            return decodedValue;
+        }
+        var startIndex = firstMatch.index + (firstMatch[0].match(/[^\s]/) || {
+            index: 0
+        }).index;
+        var endIndex = lastMatch.index + (lastMatch[1] || '').length;
+
+        encodedValue =
+            (startIndex ? decodedValue.substr(0, startIndex) : '') +
+            libmime.encodeWord(decodedValue.substring(startIndex, endIndex), mimeWordEncoding || 'Q', maxLength) +
+            (endIndex < decodedValue.length ? decodedValue.substr(endIndex) : '');
 
         return encodedValue;
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "libmime",
   "description": "Encode and decode quoted printable and base64 strings",
-  "version": "2.1.3",
+  "version": "3.0.0",
   "main": "lib/libmime",
   "homepage": "https://github.com/andris9/libmime",
   "repository": {