Replace iconv with iconv-lite

danmactough · danmactough · commit bff485be1e03 · 2020-04-30T20:10:57.000-04:00
diff --git a/examples/compressed.js b/examples/compressed.js
@@ -1,6 +1,6 @@
 var request = require('request')
   , FeedParser = require(__dirname+'/..')
-  , Iconv = require('iconv').Iconv
+  , iconv = require('iconv-lite')
   , zlib = require('zlib');
 
 function fetch(feed) {
@@ -46,16 +46,16 @@ function maybeDecompress (res, encoding) {
 }
 
 function maybeTranslate (res, charset) {
-  var iconv;
-  // Use iconv if its not utf8 already.
-  if (!iconv && charset && !/utf-*8/i.test(charset)) {
+  var iconvStream;
+  // Decode using iconv-lite if its not utf8 already.
+  if (!iconvStream && charset && !/utf-*8/i.test(charset)) {
     try {
-      iconv = new Iconv(charset, 'utf-8');
+      iconvStream = iconv.decodeStream(charset);
       console.log('Converting from charset %s to utf-8', charset);
-      iconv.on('error', done);
-      // If we're using iconv, stream will be the output of iconv
+      iconvStream.on('error', done);
+      // If we're using iconvStream, stream will be the output of iconvStream
       // otherwise it will remain the output of request
-      res = res.pipe(iconv);
+      res = res.pipe(iconvStream);
     } catch(err) {
       res.emit('error', err);
     }
diff --git a/examples/iconv.js b/examples/iconv.js
@@ -7,7 +7,7 @@
 
 var request = require('request')
   , FeedParser = require(__dirname+'/..')
-  , Iconv = require('iconv').Iconv;
+  , iconv = require('iconv-lite');
 
 function fetch(feed) {
   // Define our streams
@@ -40,16 +40,16 @@ function fetch(feed) {
 }
 
 function maybeTranslate (res, charset) {
-  var iconv;
-  // Use iconv if its not utf8 already.
-  if (!iconv && charset && !/utf-*8/i.test(charset)) {
+  var iconvStream;
+  // Decode using iconv-lite if its not utf8 already.
+  if (!iconvStream && charset && !/utf-*8/i.test(charset)) {
     try {
-      iconv = new Iconv(charset, 'utf-8');
+      iconvStream = iconv.decodeStream(charset);
       console.log('Converting from charset %s to utf-8', charset);
-      iconv.on('error', done);
-      // If we're using iconv, stream will be the output of iconv
+      iconvStream.on('error', done);
+      // If we're using iconvStream, stream will be the output of iconvStream
       // otherwise it will remain the output of request
-      res = res.pipe(iconv);
+      res = res.pipe(iconvStream);
     } catch(err) {
       res.emit('error', err);
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "eslint": "^4.8.0",
-    "iconv": "^2.3.0",
+    "iconv-lite": "^0.5.1",
     "mocha": "^5.0.0",
     "request": "^2.83.0"
   },
