feat: add Accept-Encoding header to requests

Author: fent

lib/feedsub.js

@@ -5,7 +5,7 @@ const miniget      = require('miniget');
 const zlib         = require('zlib');
 
 
-// These will be used for the skipdays tag.
+// Used for the skipdays tag.
 const DAYS = ['sunday', 'monday', 'tuesday', 'wednesday',
   'thursday', 'friday', 'saturday'];
 
@@ -17,10 +17,9 @@ module.exports = class FeedReader extends EventEmitter {
    * @param {!Object} options
    */
   constructor(feed, options) {
-    options = options || {};
     super();
     this.feed = feed;
-    this.options = {
+    this.options = Object.assign({
       interval      : 10,
       forceInterval : false,
       autoStart     : false,
@@ -32,8 +31,7 @@ module.exports = class FeedReader extends EventEmitter {
       skipHours     : false,
       skipDays      : false,
       readEveryItem : false
-    };
-    Object.assign(this.options, options);
+    }, options);
 
     // Create news emitter.
     this.news = new NewsEmitter({
@@ -62,37 +60,40 @@ module.exports = class FeedReader extends EventEmitter {
       }
     });
 
-    this.getOpts = Object.assign({ headers: {} }, this.options.requestOpts);
+    this.getOpts = Object.assign({ }, this.options.requestOpts);
+    this.getOpts.headers = Object.assign({
+      'Accept-Encoding': 'gzip, deflate'
+    }, this.getOpts.headers);
     if (this.options.autoStart) {
-      this.start();
+      this.start(true);
     }
   }
 
 
   /**
    * Start calling the read function on interval.
    *
-   * @param {!Boolean} begin
+   * @param {Boolean} readOnStart
    */
-  start(begin) {
-    if (begin == null) begin = true;
-    this.intervalid = this.readInterval(this.options.interval, null, begin);
+  start(readOnStart) {
+    this.stop();
+    let ms = this.options.interval * 60000;
+    this._intervalid = setInterval(this.read.bind(this), ms);
+    if (readOnStart) {
+      this.read();
+    }
   }
 
 
   /**
    * Stop interval if any
    */
   stop() {
-    if (this.intervalid) {
-      clearInterval(this.intervalid);
-      delete this.intervalid;
-    }
+    clearInterval(this._intervalid);
   }
 
 
   /**
-   *
    * Reads feed and determines if there are any new items
    * emits new items through event `item`
    * if there are new items, emits `items` event at end with all items
@@ -110,17 +111,17 @@ module.exports = class FeedReader extends EventEmitter {
       ended = true;
       this.newitems = [];
       this.first = false;
-      if (abort && !aborted) {
-        aborted = true;
-        req.abort();
-      }
       if (!aborted) {
         if (typeof callback === 'function') {
           callback(err);
         } else {
           this.emit('error', err);
         }
       }
+      if (abort && !aborted) {
+        aborted = true;
+        req.abort();
+      }
     };
 
     const success = (results, abort) => {
@@ -180,37 +181,31 @@ module.exports = class FeedReader extends EventEmitter {
           // Only update if ttl is longer than requested interval.
           if (minutes > this.options.interval) {
             this.options.interval = minutes;
-            if (this.intervalid) {
+            if (this.options.autoStart) {
               this.start(false);
             }
           }
         });
       }
 
       // Listen for skipHours if enabled.
-      if (this.options.skipHours) {
+      if (this.options.skipHours && !this.options.hoursToSkip) {
         parser.once('skiphours', (data) => {
-          if (this.options.hoursToSkip) { return; }
-          let hours = data.hour;
-
-          this.options.hoursToSkip = Array.isArray(hours) ?
-            data.hour.map(h => parseInt(h, 10)) : [parseInt(hours, 10)];
+          this.options.hoursToSkip =
+            [].concat(data.hour).map(h => parseInt(h, 10));
         });
       }
 
       // Listen for skipDays if enabled.
-      if (this.options.skipDays !== false) {
+      if (this.options.skipDays !== false && !this.options.daysToSkip) {
         parser.once('skipdays', (data) => {
-          if (this.options.daysToSkip) { return; }
-          let days = data.day;
-          this.options.daysToSkip = Array.isArray(days) ? days : [days];
+          this.options.daysToSkip = [].concat(data.day);
         });
       }
 
 
       // Compare date when first item is encountered.
       const firstitem = (item) => {
-
         // If date is the same as last, abort.
         if (date && this.options.lastDate === date) {
           return success([], true);
@@ -274,7 +269,6 @@ module.exports = class FeedReader extends EventEmitter {
       output.pipe(parser);
 
       output.on('end', () => {
-        if (parser.close) { parser.close(); }
         if (!ended) {
           if (this.first && this.options.emitOnStart) {
             this.news.addHistory('item', this.newitems.map((item) => {
@@ -289,28 +283,4 @@ module.exports = class FeedReader extends EventEmitter {
 
     req.on('error', error.bind(null, false));
   }
-
-
-  /**
-   * Starts calling the read fuction in an interval.
-   * Passes callback to read
-   * if begin is true, call read immediately.
-   *
-   * @param {!Function(!Error, Array.<Object>)} callback
-   * @param {Number} interval
-   * @param {Boolean} begin
-   */
-  readInterval(callback, interval, begin) {
-    this.stop();
-
-    // Allow callback argument to be optional.
-    if (typeof callback === 'number') { interval = callback; }
-    interval = parseInt(interval, 10);
-
-    if (interval > 0) {
-      if (begin) { this.read(callback); }
-
-      return setInterval(() => this.read(callback), interval * 60000);
-    }
-  }
 };