epg-grabber 0.20.0 → 0.23.0

package/README.md

@@ -81,6 +81,7 @@ Arguments:
 - `--delay`: delay between requests (default: 3000)
 - `--timeout`: set a timeout for each request (default: 5000)
 - `--debug`: enable debug mode (default: false)
+- `--curl`: display current request as CURL (default: false)
 - `--log`: path to log file (optional)
 - `--log-level`: set the log level (default: 'info')
 
@@ -181,6 +182,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

@@ -23,6 +23,7 @@ program
   .option('--delay <delay>', 'Delay between requests (in mileseconds)', parseInteger)
   .option('--timeout <timeout>', 'Set a timeout for each request (in mileseconds)', parseInteger)
   .option('--debug', 'Enable debug mode', false)
+  .option('--curl', 'Display request as CURL', false)
   .option('--log <log>', 'Path to log file')
   .option('--log-level <level>', 'Set log level', 'info')
   .parse(process.argv)
@@ -64,6 +65,7 @@ async function main() {
   config = merge(config, {
     days: options.days,
     debug: options.debug,
+    curl: options.curl,
     lang: options.lang,
     delay: options.delay,
     request: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.20.0",
+  "version": "0.23.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,
@@ -32,6 +32,7 @@
     "axios-cookiejar-support": "^1.0.1",
     "axios-mock-adapter": "^1.20.0",
     "commander": "^7.1.0",
+    "curl-generator": "^0.2.0",
     "dayjs": "^1.10.4",
     "glob": "^7.1.6",
     "lodash": "^4.17.21",

package/src/index.js

@@ -18,9 +18,12 @@ module.exports = {
         cb(item, null)
         programs = programs.concat(results)
       })
-      .catch(err => {
+      .catch(error => {
         item.programs = []
-        cb(item, err)
+        if (config.debug) {
+          console.log('Error:', JSON.stringify(error, null, 2))
+        }
+        cb(item, error)
       })
 
     await utils.sleep(config.delay)

package/src/utils.js

@@ -8,6 +8,7 @@ const convert = require('xml-js')
 const { merge } = require('lodash')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
+const { CurlGenerator } = require('curl-generator')
 dayjs.extend(utc)
 axiosCookieJarSupport(axios)
 
@@ -208,6 +209,16 @@ utils.buildRequest = async function (item, config) {
     console.log('Request:', JSON.stringify(request, null, 2))
   }
 
+  if (config.curl) {
+    const curl = CurlGenerator({
+      url: request.url,
+      method: request.method,
+      headers: request.headers,
+      body: request.data
+    })
+    console.log(curl)
+  }
+
   return request
 }
 
@@ -266,9 +277,24 @@ utils.getUTCDate = function (d = null) {
 }
 
 utils.parseResponse = async (item, response, config) => {
+  if (config.debug) {
+    console.log(
+      'Response:',
+      JSON.stringify(
+        {
+          headers: response.headers,
+          data: response.data.toString()
+        },
+        null,
+        2
+      )
+    )
+  }
+
   const data = merge(item, config, {
     content: response.data.toString(),
-    buffer: response.data
+    buffer: response.data,
+    headers: response.headers
   })
 
   if (!item.channel.logo && config.logo) {