Merge pull request #263 from iptv-org/increase-global-timeout

Increase the global timeout to 30 seconds
2021-11-18 18:01:43 +03:00 · 2021-11-18 18:01:43 +03:00 · 13cbd52020
parent 3eb07df9ce bfdda454f1
commit 13cbd52020
33 changed files with 7 additions and 84 deletions
--- a/.github/workflows/auto-update.yml
+++ b/.github/workflows/auto-update.yml
@ -71,7 +71,7 @@ jobs:
      - name: Install Dependencies
        run: npm install
      - name: Run Grabber
-        run: NODE_OPTIONS=--insecure-http-parser npx epg-grabber --config=sites/${{ matrix.guide.site }}/${{ matrix.guide.site }}.config.js --channels=sites/${{ matrix.guide.site }}/${{ matrix.guide.site }}_${{ matrix.guide.country }}.channels.xml --output=.gh-pages/guides/${{ matrix.guide.country }}/${{ matrix.guide.site }}.epg.xml --log=logs/${{ matrix.guide.site }}_${{ matrix.guide.country }}.log --days=2
+        run: NODE_OPTIONS=--insecure-http-parser npx epg-grabber --config=sites/${{ matrix.guide.site }}/${{ matrix.guide.site }}.config.js --channels=sites/${{ matrix.guide.site }}/${{ matrix.guide.site }}_${{ matrix.guide.country }}.channels.xml --output=.gh-pages/guides/${{ matrix.guide.country }}/${{ matrix.guide.site }}.epg.xml --log=logs/${{ matrix.guide.site }}_${{ matrix.guide.country }}.log --days=2 --timeout=30000
      - name: Upload Guide
        uses: actions/upload-artifact@v2
        with:
--- a/sites/allente.se/allente.se.config.js
+++ b/sites/allente.se/allente.se.config.js
@ -8,9 +8,6 @@ module.exports = {

    return `https://cs-vcb.allente.${country}/epg/events?date=${date.format('YYYY-MM-DD')}`
  },
-  request: {
-    timeout: 10000
-  },
  logo({ channel }) {
    return channel.logo
  },
--- a/sites/astro.com.my/astro.com.my.config.js
+++ b/sites/astro.com.my/astro.com.my.config.js
@ -5,9 +5,6 @@ dayjs.extend(utc)

 module.exports = {
  site: 'astro.com.my',
-  request: {
-    timeout: 15000
-  },
  url: function ({ date, channel }) {
    return `http://ams-api.astro.com.my/ams/v3/getEvents?periodStart=${date.format(
      'YYYY-MM-DD'
--- a/sites/beinsports.com/beinsports.com.config.js
+++ b/sites/beinsports.com/beinsports.com.config.js
@ -8,9 +8,6 @@ dayjs.extend(customParseFormat)

 module.exports = {
  ignore: true, // INFO: guide on the site is empty
-  request: {
-    timeout: 30000
-  },
  site: 'beinsports.com',
  url: function ({ date }) {
    return `https://epg.beinsports.com/utctime.php?mins=00&serviceidentity=beinsports.com&cdate=${date.format(
--- a/sites/comteco.com.bo/comteco.com.bo.config.js
+++ b/sites/comteco.com.bo/comteco.com.bo.config.js
@ -23,8 +23,7 @@ module.exports = {
    },
    headers: {
      'Content-Type': 'application/x-www-form-urlencoded'
-    },
-    timeout: 15000
+    }
  },
  url: function ({ channel }) {
    return `https://comteco.com.bo/pages/canales-y-programacion-tv/paquete-oro/${channel.site_id}`
--- a/sites/cosmote.gr/cosmote.gr.config.js
+++ b/sites/cosmote.gr/cosmote.gr.config.js
@ -8,9 +8,6 @@ dayjs.extend(utc)
 dayjs.extend(customParseFormat)

 module.exports = {
-  request: {
-    timeout: 30000
-  },
  site: 'cosmote.gr',
  url: function ({ 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(
--- a/sites/directv.com/directv.com.config.js
+++ b/sites/directv.com/directv.com.config.js
@ -4,9 +4,6 @@ const utc = require('dayjs/plugin/utc')
 dayjs.extend(utc)

 module.exports = {
-  request: {
-    timeout: 15000
-  },
  site: 'directv.com',
  url({ channel, date }) {
    return `https://www.directv.com/json/channelschedule?channels=${
--- a/sites/dishtv.in/dishtv.in.config.js
+++ b/sites/dishtv.in/dishtv.in.config.js
@ -12,7 +12,6 @@ module.exports = {
  site: 'dishtv.in',
  url: `https://www.dishtv.in/WhatsonIndiaWebService.asmx/LoadPagginResultDataForProgram`,
  request: {
-    timeout: 15000,
    method: 'POST',
    data({ channel, date }) {
      return {
--- a/sites/dsmart.com.tr/dsmart.com.tr.config.js
+++ b/sites/dsmart.com.tr/dsmart.com.tr.config.js
@ -4,9 +4,6 @@ const utc = require('dayjs/plugin/utc')
 dayjs.extend(utc)

 module.exports = {
-  request: {
-    timeout: 15000
-  },
  site: 'dsmart.com.tr',
  url({ date, channel }) {
    const [page] = channel.site_id.split('#')
--- a/sites/dstv.com/dstv.com.config.js
+++ b/sites/dstv.com/dstv.com.config.js
@ -8,9 +8,6 @@ dayjs.extend(customParseFormat)

 module.exports = {
  site: 'dstv.com',
-  request: {
-    timeout: 30000
-  },
  url({ channel, date }) {
    const [bouquetId] = channel.site_id.split('#')

--- a/sites/elcinema.com/elcinema.com.config.js
+++ b/sites/elcinema.com/elcinema.com.config.js
@ -10,9 +10,6 @@ dayjs.extend(timezone)
 dayjs.extend(utc)

 module.exports = {
-  request: {
-    timeout: 10000
-  },
  site: 'elcinema.com',
  url({ channel }) {
    const lang = channel.lang === 'en' ? 'en/' : '/'
--- a/sites/guidatv.sky.it/guidatv.sky.it.config.js
+++ b/sites/guidatv.sky.it/guidatv.sky.it.config.js
@ -1,8 +1,5 @@
 module.exports = {
  site: 'guidatv.sky.it',
-  request: {
-    timeout: 10000
-  },
  url: function ({ date, channel }) {
    const [env, id] = channel.site_id.split('#')
    return `https://apid.sky.it/gtv/v1/events?from=${date.format('YYYY-MM-DD')}T00:00:00Z&to=${date
--- a/sites/hd-plus.de/hd-plus.de.config.js
+++ b/sites/hd-plus.de/hd-plus.de.config.js
@ -18,9 +18,6 @@ module.exports = {

    return `https://www.hd-plus.de/epg/channel/${channel.site_id}?d=${day}`
  },
-  request: {
-    timeout: 10000
-  },
  logo({ content }) {
    const dom = new JSDOM(content)
    const img = dom.window.document.querySelector('header > img')
--- a/sites/m.tv.sms.cz/m.tv.sms.cz.config.js
+++ b/sites/m.tv.sms.cz/m.tv.sms.cz.config.js
@ -11,9 +11,6 @@ dayjs.extend(timezone)
 dayjs.extend(customParseFormat)

 module.exports = {
-  request: {
-    timeout: 15000
-  },
  site: 'm.tv.sms.cz',
  url: function ({ date, channel }) {
    return `https://m.tv.sms.cz/index.php?stanice=${channel.site_id}&cas=0&den=${date.format(
--- a/sites/meo.pt/meo.pt.config.js
+++ b/sites/meo.pt/meo.pt.config.js
@ -19,8 +19,7 @@ module.exports = {
        dateEnd: date.add(1, 'd').format('YYYY-MM-DDT00:00:00-00:00'),
        accountID: ''
      }
-    },
-    timeout: 15000
+    }
  },
  logo({ content }) {
    const data = parseContent(content)
--- a/sites/mncvision.id/mncvision.id.config.js
+++ b/sites/mncvision.id/mncvision.id.config.js
@ -14,7 +14,6 @@ module.exports = {
  site: 'mncvision.id',
  url: `https://mncvision.id/schedule/table`,
  request: {
-    timeout: 10000,
    method: 'POST',
    data: function ({ channel, date }) {
      const formData = new FormData()
--- a/sites/mtel.ba/mtel.ba.config.js
+++ b/sites/mtel.ba/mtel.ba.config.js
@ -11,7 +11,6 @@ module.exports = {
    return `https://mtel.ba/oec/epg/program?date=${date.format('YYYY-MM-DD')}&position=${position}`
  },
  request: {
-    timeout: 15000,
    headers: {
      'X-Requested-With': 'XMLHttpRequest'
    }
--- a/sites/mts.rs/mts.rs.config.js
+++ b/sites/mts.rs/mts.rs.config.js
@ -13,7 +13,6 @@ module.exports = {
    return `https://mts.rs/oec/epg/program?date=${date.format('YYYY-MM-DD')}&position=${position}`
  },
  request: {
-    timeout: 10000,
    headers: {
      'X-Requested-With': 'XMLHttpRequest'
    }
--- a/sites/novacyprus.com/novacyprus.com.config.js
+++ b/sites/novacyprus.com/novacyprus.com.config.js
@ -15,9 +15,6 @@ module.exports = {
      .add(1, 'd')
      .format('YYYYMMDD')}`
  },
-  request: {
-    timeout: 10000
-  },
  logo({ channel }) {
    return channel.logo
  },
--- a/sites/ontvtonight.com/ontvtonight.com.config.js
+++ b/sites/ontvtonight.com/ontvtonight.com.config.js
@ -17,9 +17,6 @@ const tz = {

 module.exports = {
  site: 'ontvtonight.com',
-  request: {
-    timeout: 10000
-  },
  url: function ({ date, channel }) {
    const [region, id] = channel.site_id.split('#')
    let url = `https://www.ontvtonight.com`
--- a/sites/osn.com/osn.com.config.js
+++ b/sites/osn.com/osn.com.config.js
@ -19,7 +19,6 @@ module.exports = {
        hoursForMobile: 0
      }
    },
-    timeout: 10000,
    jar: null
  },
  url: function () {
--- a/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.config.js
+++ b/sites/programacion-tv.elpais.com/programacion-tv.elpais.com.config.js
@ -6,9 +6,6 @@ dayjs.extend(utc)
 dayjs.extend(timezone)

 module.exports = {
-  request: {
-    timeout: 10000
-  },
  site: 'programacion-tv.elpais.com',
  url: function ({ date }) {
    return `https://programacion-tv.elpais.com/data/parrilla_${date.format('DDMMYYYY')}.json`
--- a/sites/programetv.ro/programetv.ro.config.js
+++ b/sites/programetv.ro/programetv.ro.config.js
@ -1,9 +1,6 @@
 const dayjs = require('dayjs')

 module.exports = {
-  request: {
-    timeout: 30000
-  },
  site: 'programetv.ro',
  url: function ({ date, channel }) {
    const daysOfWeek = {
--- a/sites/programme-tv.net/programme-tv.net.config.js
+++ b/sites/programme-tv.net/programme-tv.net.config.js
@ -13,9 +13,6 @@ dayjs.extend(customParseFormat)
 module.exports = {
  site: 'programme-tv.net',
  delay: 5000,
-  request: {
-    timeout: 30000
-  },
  url: function ({ date, channel }) {
    return `https://www.programme-tv.net/programme/chaine/${date.format('YYYY-MM-DD')}/programme-${
      channel.site_id
--- a/sites/programtv.onet.pl/programtv.onet.pl.config.js
+++ b/sites/programtv.onet.pl/programtv.onet.pl.config.js
@ -11,9 +11,6 @@ dayjs.extend(customParseFormat)

 module.exports = {
  site: 'programtv.onet.pl',
-  request: {
-    timeout: 10000
-  },
  url: function ({ date, channel }) {
    const today = dayjs().utc().startOf('d')
    const day = date.diff(today, 'd')
--- a/sites/telkussa.fi/telkussa.fi.config.js
+++ b/sites/telkussa.fi/telkussa.fi.config.js
@ -2,9 +2,6 @@ const dayjs = require('dayjs')

 module.exports = {
  site: 'telkussa.fi',
-  request: {
-    timeout: 10000
-  },
  url: function ({ date, channel }) {
    return `https://telkussa.fi/API/Channel/${channel.site_id}/${date.format('YYYYMMDD')}`
  },
--- a/sites/tv.cctv.com/tv.cctv.com.config.js
+++ b/sites/tv.cctv.com/tv.cctv.com.config.js
@ -2,9 +2,6 @@ const dayjs = require('dayjs')

 module.exports = {
  site: 'tv.cctv.com',
-  request: {
-    timeout: 30000
-  },
  url({ channel, date }) {
    return `https://api.cntv.cn/epg/getEpgInfoByChannelNew?serviceId=tvcctv&c=${
      channel.site_id
--- a/sites/tv.lv/tv.lv.config.js
+++ b/sites/tv.lv/tv.lv.config.js
@ -7,9 +7,6 @@ module.exports = {
      'DD-MM-YYYY'
    )}?filter=channel&subslug=${channel.site_id}`
  },
-  request: {
-    timeout: 10000
-  },
  logo: function ({ content }) {
    const data = JSON.parse(content)
    const logo =
--- a/sites/tv.trueid.net/tv.trueid.net.config.js
+++ b/sites/tv.trueid.net/tv.trueid.net.config.js
@ -5,15 +5,13 @@ const utc = require('dayjs/plugin/utc')
 dayjs.extend(utc)

 module.exports = {
-  request: {
-    timeout: 300000,
-    jar: null
-  },
  site: 'tv.trueid.net',
-  channels: 'tv.trueid.net.channels.xml',
  url: function ({ channel, date }) {
    return `https://tv.trueid.net/tvguide/all/${channel.site_id}/${date.format('YYYY-MM-DD')}`
  },
+  request: {
+    jar: null
+  },
  logo: function ({ content, channel }) {
    const data = parseContent(content, channel)

--- a/sites/tv.yandex.ru/tv.yandex.ru.config.js
+++ b/sites/tv.yandex.ru/tv.yandex.ru.config.js
@ -7,8 +7,7 @@ module.exports = {
    headers: {
      Cookie:
        'yandexuid=8747786251615498142; Expires=Tue, 11 Mar 2031 21:29:02 GMT; Domain=yandex.ru; Path=/'
-    },
-    timeout: 10000
+    }
  },
  url: function ({ date, channel }) {
    const [region, id] = channel.site_id.split('#')
--- a/sites/tvtv.us/tvtv.us.config.js
+++ b/sites/tvtv.us/tvtv.us.config.js
@ -4,9 +4,6 @@ const utc = require('dayjs/plugin/utc')
 dayjs.extend(utc)

 module.exports = {
-  request: {
-    timeout: 30000
-  },
  site: 'tvtv.us',
  url: function ({ date, channel }) {
    return `https://tvtv.us/tvm/t/tv/v4/stations/${
--- a/sites/vtm.be/vtm.be.config.js
+++ b/sites/vtm.be/vtm.be.config.js
@ -9,7 +9,6 @@ module.exports = {
    return `https://vtm.be/tv-gids/${channel.site_id}`
  },
  request: {
-    timeout: 15000,
    headers: {
      Cookie:
        'ak_bmsc=8103DDA2C2C37ECD922124463C746A4C~000000000000000000000000000000~YAAQNwVJF7ndI+p8AQAAYDkcCg0mQAkQ2jDHjSfnXl9VIGnzditECZ1FDj1Yi72a8rv/Q454lDDY0Dm3TPqxJUuNLzxJGmgkLmei4IIIwzKJWbB6wC/FMQApoI1NbGz+tUErryic1HWdbZ2dz1IX+AkOHJ9RVupYG5GmkSEQdFG1+/dSZoBMWEeb/5VOCLmNXRDP7k8LnSXaIuKqp5c2MQB+uQ9DdHUd6bIje3dzuxbka9+nJZ+eX/pNbgWI41X2tiXLvPZKh91Tk9k98zrK0pwBnGpTJqDVxmafYH/CjkXoLgEUW3loZfgL9SqddG706a4LnRPhyLzW6W6SH7Q0QOFE4g54NKADVttS2gbXgVrICvo0bb0FAESaFjc5uDyOd+fV2XBGzw==; authId=54da9bc2-d387-4923-8773-3d33ec68710e; gtm_session=1; _sp_ses.417f=*; _ga=GA1.2.525677035.1636552212; _gid=GA1.2.386833723.1636552212; tcf20_purposes=functional|analytics|targeted_advertising|non-personalised_ads|personalisation|marketing|social_media|advertising_1|advertising_2|advertising_3|advertising_4|advertising_7|advertising_9|advertising_10; _gcl_au=1.1.112810754.1636552212; _gat_UA-538372-57=1; sp=4a32f074-5526-4654-9389-2516d799ec68; _gat_UA-6602938-21=1; _sp_id.417f=0c81a857-09dc-47c2-8e51-4fed976211c4.1636552212.1.1636552214.1636552212.55934f90-4bad-47ff-8c5e-cf904126dcfb; bm_sv=1A45EF31D80D05B688C17EAD85964E29~hFpINNxpFphfJ2LLPoLQTauvUpyAf3kaTeGZAMfI/UTMlTRFjoAGBQJPEUPvSw3rXw/swqqAICc74l56pEBVSw6aJYqaoRaiRAZXyWZzQ6jAoeP5SMsZwtvNzYQ3aJXVWM8W8a98J0trlnSjIIsRPQ=='
--- a/sites/zap.co.ao/zap.co.ao.config.js
+++ b/sites/zap.co.ao/zap.co.ao.config.js
@ -8,9 +8,6 @@ dayjs.extend(timezone)
 dayjs.extend(customParseFormat)

 module.exports = {
-  request: {
-    timeout: 10000
-  },
  site: 'zap.co.ao',
  url: function ({ date, channel }) {
    return `https://www.zap.co.ao/_api/channels/${date.format('YYYY-M-D')}/epg.json`