epg-grabber 0.40.4 → 0.41.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epg-grabber",
-  "version": "0.40.4",
+  "version": "0.41.0",
   "description": "Node.js CLI tool for grabbing EPG from different sites",
   "main": "src/index.js",
   "preferGlobal": true,
@@ -30,30 +30,30 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "axios-cache-interceptor": "^0.10.3",
-    "commander": "^7.1.0",
-    "curl-generator": "^0.2.0",
+    "axios-cache-interceptor": "^1.8.0",
+    "commander": "^14.0.0",
+    "curl-generator": "^0.4.2",
     "cwait": "^1.1.2",
-    "dayjs": "^1.10.4",
-    "epg-parser": "^0.1.6",
-    "fs-extra": "^11.1.1",
-    "glob": "^7.1.6",
+    "dayjs": "^1.11.13",
+    "epg-parser": "^0.3.1",
+    "fs-extra": "^11.3.0",
+    "glob": "^11.0.3",
     "lodash": "^4.17.21",
     "node-gzip": "^1.1.2",
     "socks-proxy-agent": "^8.0.5",
-    "winston": "^3.3.3",
+    "winston": "^3.17.0",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
     "@babel/core": "^7.13.14",
-    "@babel/preset-env": "^7.13.12",
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.18.0",
-    "babel-jest": "^29.7.0",
-    "eslint": "^9.17.0",
-    "globals": "^15.14.0",
-    "jest": "^29.7.0",
-    "jest-mock-axios": "^4.4.1"
+    "@babel/preset-env": "^7.28.0",
+    "@eslint/eslintrc": "^3.3.1",
+    "@eslint/js": "^9.31.0",
+    "babel-jest": "^30.0.4",
+    "eslint": "^9.31.0",
+    "globals": "^16.3.0",
+    "jest": "^30.0.4",
+    "jest-mock-axios": "^4.5.0"
   },
   "jest": {
     "testEnvironment": "node"

package/src/client.js

@@ -7,8 +7,6 @@ module.exports.create = create
 module.exports.buildRequest = buildRequest
 module.exports.parseResponse = parseResponse
 
-let timeout
-
 function create(config) {
   const client = axios.defaults.cache
     ? axios
@@ -51,11 +49,13 @@ function create(config) {
         )
       }
 
-      clearTimeout(timeout)
       return response
     },
     function (error) {
-      clearTimeout(timeout)
+      if (error.name === 'CanceledError') {
+        error.message = 'Connection timeout'
+        return Promise.reject(error)
+      }
       return Promise.reject(error)
     }
   )
@@ -64,16 +64,11 @@ function create(config) {
 }
 
 async function buildRequest({ channel, date, config }) {
-  const CancelToken = axios.CancelToken
-  const source = CancelToken.source()
   const request = { ...config.request }
-  timeout = setTimeout(() => {
-    source.cancel('Connection timeout')
-  }, request.timeout)
   request.headers = await getRequestHeaders({ channel, date, config })
   request.url = await getRequestUrl({ channel, date, config })
   request.data = await getRequestData({ channel, date, config })
-  request.cancelToken = source.token
+  request.signal = AbortSignal.timeout(request.timeout)
 
   if (config.curl) {
     const curl = CurlGenerator({

package/src/file.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const glob = require('glob')
+const { glob } = require('glob')
 
 module.exports.list = list
 module.exports.read = read
@@ -12,11 +12,7 @@ module.exports.templateVariables = templateVariables
 module.exports.templateFormat = templateFormat
 
 function list(pattern) {
-  return new Promise(resolve => {
-    glob(pattern, function (err, files) {
-      resolve(files)
-    })
-  })
+  return glob(pattern)
 }
 
 function read(filepath) {

package/src/utils.js

@@ -19,15 +19,19 @@ module.exports.parseProxy = parseProxy
 function parseProxy(_url) {
   const parsed = new URL(_url)
 
-  return {
+  const result = {
     protocol: parsed.protocol.replace(':', '') || null,
-    auth: {
-      username: parsed.username || null,
-      password: parsed.password || null
-    },
     host: parsed.hostname,
     port: parsed.port ? parseInt(parsed.port) : null
   }
+
+  if (parsed.username || parsed.password) {
+    result.auth = {}
+    if (parsed.username) result.auth.username = parsed.username
+    if (parsed.password) result.auth.password = parsed.password
+  }
+
+  return result
 }
 
 function sleep(ms) {

package/tests/index.test.js

@@ -7,35 +7,6 @@ import axios from 'axios'
 
 jest.mock('axios')
 
-it('return "Connection timeout" error if server does not response', done => {
-  const config = {
-    site: 'example.com',
-    request: {
-      timeout: 1000
-    },
-    url({ date, channel }) {
-      return `https://www.cosmote.gr/cosmotetv/residential/program/epg/programchannel?p_p_id=channelprogram_WAR_OTETVportlet&p_p_lifecycle=0&_channelprogram_WAR_OTETVportlet_platform=IPTV&_channelprogram_WAR_OTETVportlet_date=${date.format(
-        'DD-MM-YYYY'
-      )}&_channelprogram_WAR_OTETVportlet_articleTitleUrl=${channel.site_id}`
-    },
-    parser: () => []
-  }
-  const channel = new Channel({
-    site: 'example.com',
-    site_id: 'cnn',
-    xmltv_id: 'CNN.us',
-    lang: 'en',
-    name: 'CNN'
-  })
-  const grabber = new EPGGrabber(config)
-  grabber
-    .grab(channel, '2022-01-01', (data, err) => {
-      expect(err.message).toBe('Connection timeout')
-      done()
-    })
-    .catch(done)
-})
-
 it('can grab single channel programs', done => {
   const data = {
     data: {