epg-grabber 0.25.4 → 0.26.0

package/README.md

@@ -80,7 +80,7 @@ Arguments:
 - `--days`: number of days for which to grab the program (default: 1)
 - `--delay`: delay between requests (default: 3000)
 - `--timeout`: set a timeout for each request (default: 5000)
-- `--cache-max-age`: maximum time for storing each request in milliseconds (default: 0)
+- `--cache-ttl`: maximum time for storing each request in milliseconds (default: 0)
 - `--gzip`: compress the output (default: false)
 - `--debug`: enable debug mode (default: false)
 - `--curl`: display current request as CURL (default: false)
@@ -102,12 +102,8 @@ module.exports = {
 
     method: 'GET',
     timeout: 5000,
-    cache: { // cache options (details: https://github.com/RasCarlito/axios-cache-adapter#options)
-      maxAge: 0,
-      readHeaders: false,
-      exclude: {
-        query: false
-      }
+    cache: { // cache options (details: https://axios-cache-interceptor.js.org/#/pages/per-request-configuration)
+      ttl: 60 * 1000 // 60s
     },
 
     /**
@@ -192,6 +188,8 @@ From each function in `config.js` you can access a `context` object containing t
 - `content`: The response data as a String
 - `buffer`: The response data as an ArrayBuffer
 - `headers`: The response headers
+- `request`: The request config
+- `cached`: A boolean to check whether this request was cached or not
 
 ## Channels List
 

package/bin/epg-grabber.js

@@ -24,7 +24,7 @@ program
   .option('--delay <delay>', 'Delay between requests (in mileseconds)', parseInteger)
   .option('--timeout <timeout>', 'Set a timeout for each request (in mileseconds)', parseInteger)
   .option(
-    '--cache-max-age <cacheMaxAge>',
+    '--cache-ttl <cacheTtl>',
     'Maximum time for storing each request (in milliseconds)',
     parseInteger
   )
@@ -76,14 +76,11 @@ async function main() {
     curl: options.curl,
     lang: options.lang,
     delay: options.delay,
-    request: {
-      timeout: options.timeout,
-      cache: {
-        maxAge: options.cacheMaxAge
-      }
-    }
+    request: {}
   })
 
+  if (options.timeout) config.request.timeout = options.timeout
+  if (options.cacheTtl) config.request.cache.ttl = options.cacheTtl
   if (options.channels) config.channels = options.channels
   else if (config.channels)
     config.channels = path.join(path.dirname(options.config), config.channels)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.25.4",
+  "version": "0.26.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "axios-cache-adapter": "^2.7.3",
+    "axios-cache-interceptor": "^0.10.3",
     "axios-cookiejar-support": "^1.0.1",
     "axios-mock-adapter": "^1.20.0",
     "commander": "^7.1.0",

package/src/utils.js

@@ -3,7 +3,7 @@ const { padStart } = require('lodash')
 const path = require('path')
 const axios = require('axios').default
 const axiosCookieJarSupport = require('axios-cookiejar-support').default
-const axiosCacheAdapter = require('axios-cache-adapter')
+const { setupCache } = require('axios-cache-interceptor')
 const tough = require('tough-cookie')
 const convert = require('xml-js')
 const { merge } = require('lodash')
@@ -41,13 +41,7 @@ utils.loadConfig = function (config) {
       withCredentials: true,
       jar: new tough.CookieJar(),
       responseType: 'arraybuffer',
-      cache: {
-        readHeaders: false,
-        exclude: {
-          query: false
-        },
-        maxAge: 0
-      }
+      cache: false
     }
   }
 
@@ -55,7 +49,7 @@ utils.loadConfig = function (config) {
 }
 
 utils.createClient = function (config) {
-  const client = axiosCacheAdapter.setup()
+  const client = setupCache(axios.create())
   client.interceptors.request.use(
     function (request) {
       if (config.debug) {
@@ -80,7 +74,7 @@ utils.createClient = function (config) {
             {
               headers: response.headers,
               data,
-              fromCache: response.request.fromCache === true
+              cached: response.cached
             },
             null,
             2
@@ -318,20 +312,12 @@ utils.getUTCDate = function (d = null) {
 }
 
 utils.parseResponse = async (item, response, config) => {
-  let buffer
-  let content
-  if (utils.isObject(response.data) || Array.isArray(response.data)) {
-    content = JSON.stringify(response.data)
-    buffer = Buffer.from(content, 'utf8')
-  } else {
-    content = response.data.toString()
-    buffer = response.data
-  }
   const data = merge(item, config, {
-    content,
-    buffer,
+    content: response.data.toString(),
+    buffer: response.data,
     headers: response.headers,
-    request: response.request
+    request: response.request,
+    cached: response.cached
   })
 
   if (!item.channel.logo && config.logo) {