epg-grabber 0.18.0 → 0.21.0

package/README.md

@@ -181,6 +181,7 @@ From each function in `config.js` you can access a `context` object containing t
 - `date`: The 'dayjs' instance with the requested date
 - `content`: The response data as a String
 - `buffer`: The response data as an ArrayBuffer
+- `headers`: The response headers
 
 ## Channels List
 

package/bin/epg-grabber.js

@@ -79,28 +79,32 @@ async function main() {
   if (!config.channels) return logger.error('Path to [site].channels.xml is missing')
   logger.info(`Loading '${config.channels}'...`)
   const channelsXML = fs.readFileSync(path.resolve(config.channels), { encoding: 'utf-8' })
-  const channels = utils.parseChannels(channelsXML)
+  const { channels } = utils.parseChannels(channelsXML)
 
   let programs = []
   let i = 1
   let days = options.days || 1
   const total = channels.length * days
+  const utcDate = utils.getUTCDate()
+  const dates = Array.from({ length: config.days }, (_, i) => utcDate.add(i, 'd'))
   for (let channel of channels) {
-    await grabber
-      .grab(channel, config, (data, err) => {
-        logger.info(
-          `[${i}/${total}] ${config.site} - ${data.channel.xmltv_id} - ${data.date.format(
-            'MMM D, YYYY'
-          )} (${data.programs.length} programs)`
-        )
-
-        if (err) logger.error(err.message)
-
-        if (i < total) i++
-      })
-      .then(results => {
-        programs = programs.concat(results)
-      })
+    for (let date of dates) {
+      await grabber
+        .grab(channel, date, config, (data, err) => {
+          logger.info(
+            `[${i}/${total}] ${config.site} - ${data.channel.xmltv_id} - ${data.date.format(
+              'MMM D, YYYY'
+            )} (${data.programs.length} programs)`
+          )
+
+          if (err) logger.error(err.message)
+
+          if (i < total) i++
+        })
+        .then(results => {
+          programs = programs.concat(results)
+        })
+    }
   }
 
   const xml = utils.convertToXMLTV({ config, channels, programs })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.18.0",
+  "version": "0.21.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,

package/src/index.js

@@ -1,35 +1,29 @@
 const utils = require('./utils')
 
 module.exports = {
-  grab: async function (channel, config, cb) {
+  grab: async function (channel, date, config, cb) {
+    date = typeof date === 'string' ? utils.getUTCDate(date) : date
     config = utils.loadConfig(config)
     channel.lang = channel.lang || config.lang || null
 
-    const utcDate = utils.getUTCDate()
-    const dates = Array.from({ length: config.days }, (_, i) => utcDate.add(i, 'd'))
-    const queue = []
-    dates.forEach(date => {
-      queue.push({ date, channel })
-    })
-
     let programs = []
-    for (let item of queue) {
-      await utils
-        .buildRequest(item, config)
-        .then(request => utils.fetchData(request))
-        .then(response => utils.parseResponse(item, response, config))
-        .then(results => {
-          item.programs = results
-          cb(item, null)
-          programs = programs.concat(results)
-        })
-        .catch(err => {
-          item.programs = []
-          cb(item, err)
-        })
 
-      await utils.sleep(config.delay)
-    }
+    const item = { date, channel }
+    await utils
+      .buildRequest(item, config)
+      .then(request => utils.fetchData(request))
+      .then(response => utils.parseResponse(item, response, config))
+      .then(results => {
+        item.programs = results
+        cb(item, null)
+        programs = programs.concat(results)
+      })
+      .catch(err => {
+        item.programs = []
+        cb(item, err)
+      })
+
+    await utils.sleep(config.delay)
 
     return programs
   },

package/src/utils.js

@@ -65,7 +65,7 @@ utils.parseChannels = function (xml) {
       return channel
     })
 
-  return channels
+  return { site, channels }
 }
 
 utils.sleep = function (ms) {
@@ -259,14 +259,17 @@ utils.getRequestUrl = async function (item, config) {
   return config.url
 }
 
-utils.getUTCDate = function () {
+utils.getUTCDate = function (d = null) {
+  if (typeof d === 'string') return dayjs.utc(d).startOf('d')
+
   return dayjs.utc().startOf('d')
 }
 
 utils.parseResponse = async (item, response, config) => {
   const data = merge(item, config, {
     content: response.data.toString(),
-    buffer: response.data
+    buffer: response.data,
+    headers: response.headers
   })
 
   if (!item.channel.logo && config.logo) {

package/tests/index.test.js

@@ -27,7 +27,7 @@ it('return "Connection timeout" error if server does not response', done => {
     lang: 'en',
     name: 'CNN'
   }
-  grabber.grab(channel, config, (data, err) => {
+  grabber.grab(channel, '2022-01-01', config, (data, err) => {
     expect(err.message).toBe('Connection timeout')
     done()
   })
@@ -54,7 +54,7 @@ it('can grab single channel programs', done => {
     name: '1TV'
   }
   grabber
-    .grab(channel, config, (data, err) => {
+    .grab(channel, '2022-01-01', config, (data, err) => {
       if (err) {
         console.log(`    Error: ${err.message}`)
         done()

package/tests/utils.test.js

@@ -28,7 +28,7 @@ it('can load valid config.js', () => {
 
 it('can parse valid channels.xml', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const channels = utils.parseChannels(file)
+  const { channels } = utils.parseChannels(file)
   expect(channels).toEqual([
     {
       name: '1 TV',
@@ -51,7 +51,7 @@ it('can parse valid channels.xml', () => {
 
 it('can convert object to xmltv string', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const channels = utils.parseChannels(file)
+  const { channels } = utils.parseChannels(file)
   const programs = [
     {
       title: 'Program 1',
@@ -101,7 +101,7 @@ it('can convert object to xmltv string without categories', () => {
 
 it('can convert object to xmltv string with multiple categories', () => {
   const file = fs.readFileSync('./tests/input/example.com.channels.xml', { encoding: 'utf-8' })
-  const channels = utils.parseChannels(file)
+  const { channels } = utils.parseChannels(file)
   const programs = [
     {
       title: 'Program 1',