feat: follow redirects with miniget

fixes #30

Author: fent

lib/feedsub.js

@@ -1,9 +1,7 @@
 const EventEmitter = require('events').EventEmitter;
 const FeedMe       = require('feedme');
 const NewsEmitter  = require('newsemitter');
-const http         = require('http');
-const https        = require('https');
-const url          = require('url');
+const miniget      = require('miniget');
 const zlib         = require('zlib');
 
 
@@ -21,6 +19,7 @@ module.exports = class FeedReader extends EventEmitter {
   constructor(feed, options) {
     options = options || {};
     super();
+    this.feed = feed;
     this.options = {
       interval      : 10,
       forceInterval : false,
@@ -53,7 +52,6 @@ module.exports = class FeedReader extends EventEmitter {
 
     this.news.addHistory('item', this.options.history);
 
-
     this.newitems = [];
     this.first = this.news.history.item.length === 0;
 
@@ -64,9 +62,7 @@ module.exports = class FeedReader extends EventEmitter {
       }
     });
 
-    this.getOpts = url.parse(feed);
-    this.getOpts.headers = {};
-    Object.assign(this.getOpts, this.options.requestOpts);
+    this.getOpts = Object.assign({ headers: {} }, this.options.requestOpts);
     if (this.options.autoStart) {
       this.start();
     }
@@ -144,24 +140,14 @@ module.exports = class FeedReader extends EventEmitter {
       }
     };
 
-    const httpLib = {
-      'http:': http,
-      'https:': https,
-    }[this.getOpts.protocol];
-    const req = httpLib.get(this.getOpts, (res) => {
-      // Check the response is successful.
-      if (res.statusCode !== 200) {
-
-        // Check if not modified code is sent back
-        // in this case, the body will be empty.
-        if (res.statusCode === 304) {
-          return success([]);
-        }
-
-        return error(true, new Error('Status Code: ' + res.statusCode));
+    const req = miniget(this.feed, this.getOpts);
+    req.on('response', (res) => {
+      // Check if not modified code is sent back
+      // in this case, the body will be empty.
+      if (res.statusCode === 304) {
+        return success([]);
       }
 
-
       // Check headers for conditional get.
       if (res.headers['last-modified']) {
         this.getOpts.headers['If-Modified-Since'] = res.headers['last-modified'];
@@ -274,20 +260,18 @@ module.exports = class FeedReader extends EventEmitter {
       switch(res.headers['content-encoding']) {
         case 'gzip':
           output = zlib.createGunzip();
-          res.pipe(output);
+          req.pipe(output);
           break;
         case 'deflate':
           output = zlib.createInflate();
-          res.pipe(output);
+          req.pipe(output);
           break;
         default:
-          output = res;
+          output = req;
       }
 
       // Pipe data from gunzipper/inflater to parser.
-      output.on('data', (chunk) => {
-        parser.write(chunk);
-      });
+      output.pipe(parser);
 
       output.on('end', () => {
         if (parser.close) { parser.close(); }

package-lock.json

@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "feedme": "^1.0.0",
+    "miniget": "^1.3.0",
     "newsemitter": "^0.3.0"
   },
   "devDependencies": {