add delay option

.gitea/workflows/action.yml

@@ -38,6 +38,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
+            labels: |
+                org.opencontainers.image.title=epg-info
+                org.opencontainers.image.description=Docker image of https://github.com/iptv-org/epg
+                org.opencontainers.image.authors=Davidquinonescl
+                org.opencontainers.image.documentation=https://git.claeyscloud.com/david/epg-info-docker/src/branch/main/README.md
             images: |
                 davidquinonescl/epg-info
                 git.claeyscloud.com/david/epg-info

.github/workflows/action.yml

@@ -24,6 +24,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
+          labels: |
+             org.opencontainers.image.title=epg-info
+             org.opencontainers.image.description=Docker image of https://github.com/iptv-org/epg
+             org.opencontainers.image.authors=Davidquinonescl
+             org.opencontainers.image.documentation=https://github.com/davidclaeysquinones/epg-info-docker/blob/main/README.md
           images: ghcr.io/davidclaeysquinones/epg-info
           tags: |
              type=semver,pattern={{raw}}

Dockerfile

@@ -4,6 +4,7 @@ ARG GIT_BRANCH=master
 ENV CRON_SCHEDULE="0 0,12 * * *"
 ENV API_URL="https://iptv-org.github.io/api"
 ENV DAYS=14
+ENV DELAY=0
 ENV MAX_CONNECTIONS=10
 ENV ENABLE_FIXES=false
 ARG BIN_FOLDER=/bin
@@ -52,9 +53,10 @@ RUN apk update \
     && mkdir /public
 COPY start.sh $WORKDIR
 COPY serve.json $WORKDIR
+COPY pm2.config.js $WORKDIR
 RUN chmod +x "$START_SCRIPT" \
   && apk del git curl \
   && rm -rf /var/cache/apk/*
 SHELL ["/bin/bash", "-c"]
-ENTRYPOINT bash $START_SCRIPT chron-schedule="$CRON_SCHEDULE" work-dir="$WORKDIR" days="$DAYS" max_connections="$MAX_CONNECTIONS" enable_fixes="$ENABLE_FIXES" api_url="$API_URL"
+ENTRYPOINT bash $START_SCRIPT chron-schedule="$CRON_SCHEDULE" work-dir="$WORKDIR" days="$DAYS" delay=$DELAY max_connections="$MAX_CONNECTIONS" enable_fixes="$ENABLE_FIXES" api_url="$API_URL"
 EXPOSE 3000

README.md

@@ -56,6 +56,7 @@ It is recommended that you take existing provider code as a base for your custom
 |-------------------------------|----------------------------------------------------------------------------|----------------------------------|
 | CRON_SCHEDULE                 | CRON expression describing the recurrence for epg retrieval.               | `0 0,12 * * *`                   |            
 | DAYS                          | Describes the desired amount of days in the future for for epg retrieval.  | 14                               |
+| DELAY                         | Delay between requests in milliseconds                                     | 0                                |
 | MAX_CONNECTIONS               | The maximum amount of parallel connections that can be established         | 10                               |
 | ENABLE_FIXES                  | Some fixes to providers take a long time to be merged into the main branch.<br>When this option is enabled some of these fixes will also be included.<br>The source code for these fixes can be seen under the `fixes` folder.<br> Recreate the container when changing this variable in order for it to take effect  | false            |
 | API_URL                       | The endpoint where channel information will be grabbed                     | `https://iptv-org.github.io/api` |
@@ -165,24 +166,52 @@ Sometimes a new version of this image will be bound to the same source commit. T
 - 1.0.36
   [12-31-2024 17:32](https://github.com/iptv-org/epg/commit/5ffe285c1e5882e905c5aaee672849f6f89e5cf3)
 - 1.0.37
-  [09-01-2025](https://github.com/iptv-org/epg/commit/8e39af2a4d7c15f442a3e686144278e97151d46e)
+  [01-09-2025](https://github.com/iptv-org/epg/commit/8e39af2a4d7c15f442a3e686144278e97151d46e)
 - 1.0.38
-  [13-01-2025](https://github.com/iptv-org/epg/commit/9a565f16f4016e49d17b762477e0f6d29bb0f970)
+  [01-13-2025](https://github.com/iptv-org/epg/commit/9a565f16f4016e49d17b762477e0f6d29bb0f970)
 - 1.0.39
-  [14-01-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)
+  [01-14-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)
 - 1.0.40
-  [14-01-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)<br> Fixes issue with api url
+  [01-14-2025](https://github.com/iptv-org/epg/commit/76df1541d8b0b90533ea74dcbb7815c27425b608)<br> Fixes issue with api url
 - 1.0.41
-  [15-01-2025](https://github.com/iptv-org/epg/commit/65331dff1c6728c3012e314e51d40da85d2d7f3c)
+  [01-15-2025](https://github.com/iptv-org/epg/commit/65331dff1c6728c3012e314e51d40da85d2d7f3c)
 - 1.0.42
-  [15-01-2025](https://github.com/iptv-org/epg/commit/5958c77c65a652285da64ad8a77d137306ca46d7)
+  [01-15-2025](https://github.com/iptv-org/epg/commit/5958c77c65a652285da64ad8a77d137306ca46d7)
 - 1.0.43
-  [20-01-2025](https://github.com/iptv-org/epg/commit/7b2cfba7f5d4df8c01ff74a7c26d7695cb750244)
+  [01-20-2025](https://github.com/iptv-org/epg/commit/7b2cfba7f5d4df8c01ff74a7c26d7695cb750244)
 - 1.0.44
-  [21-01-2025](https://github.com/iptv-org/epg/commit/b69d61af5e46cea4f7dcb15a00d897397c23defa)
+  [01-21-2025](https://github.com/iptv-org/epg/commit/b69d61af5e46cea4f7dcb15a00d897397c23defa)
 - 1.0.45
-  [23-01-2025](https://github.com/iptv-org/epg/commit/bc4b7fcfd51325cc597ccce13821f355dd0fbc72)
+  [01-23-2025](https://github.com/iptv-org/epg/commit/bc4b7fcfd51325cc597ccce13821f355dd0fbc72)
 - 1.0.46
-  [27-01-2025](https://github.com/iptv-org/epg/commit/a45a346ec83cae3863b8d0e1cbe7abd99d6fef36)
+  [01-27-2025](https://github.com/iptv-org/epg/commit/a45a346ec83cae3863b8d0e1cbe7abd99d6fef36)
 - 1.0.47
-  [29-01-2025](https://github.com/iptv-org/epg/commit/106ae083d243df825958dcf4fea1d48d2765cf72)
+  [01-29-2025](https://github.com/iptv-org/epg/commit/106ae083d243df825958dcf4fea1d48d2765cf72)
+- 1.0.48
+  [01-30-2025](https://github.com/iptv-org/epg/commit/e57dfaff41f498ffbfe79ecadd37f7f254dad0cc)
+- 1.0.49
+  [02-02-2025](https://github.com/iptv-org/epg/commit/6b45cd9bd60058fdb7b974ad610c2d6565317f3b)
+- 1.0.50
+  [02-05-2025](https://github.com/iptv-org/epg/commit/7f6849869f7182ddfa1a01b08a160ff8d2129441)
+- 1.0.51
+  [02-11-2025](https://github.com/iptv-org/epg/commit/6cbe64f2dde47a3eb042cac35932989a7eefb2db)
+- 1.0.52
+  [02-18-2025](https://github.com/iptv-org/epg/commit/39c4c5143e7cf7591ac49227e73e564be70c7615)
+- 1.0.53
+  [02-23-2025](https://github.com/iptv-org/epg/commit/2721fe1ba06761fd06799a233dda27af6184fd17)
+- 1.0.54
+  [03-07-2025](https://github.com/iptv-org/epg/commit/40c9af82d6f7f4e562cd239237fdf46a396d5728)
+- 1.0.55
+  [03-11-2025](https://github.com/iptv-org/epg/commit/40c9af82d6f7f4e562cd239237fdf46a396d5728)
+- 1.0.56
+  [03-16-2025](https://github.com/iptv-org/epg/commit/cf82b4089ef00c1fc94b7751652bfa598f8ab06a)
+- 1.0.57
+  [03-25-2025](https://github.com/iptv-org/epg/commit/138842009bb3f9135430cdc667502ffa51d4a295)
+- 1.0.58
+  [04-04-2025](https://github.com/iptv-org/epg/commit/4df25c92bcad1e4892640f532eae71cf9f5e7b95)
+- 1.0.59
+  [04-04-2025](https://github.com/iptv-org/epg/commit/4df25c92bcad1e4892640f532eae71cf9f5e7b95)<br>Includes fixes for new configuration changes
+- 1.0.60
+  [04-07-2025](https://github.com/iptv-org/epg/commit/7e1fbcbe154f4efd5c81341351cceb06f71b79a0)
+- 1.0.61
+  [04-07-2025](https://github.com/iptv-org/epg/commit/7e1fbcbe154f4efd5c81341351cceb06f71b79a0)<br>Add delay option

fixes/pickx.be/pickx.be.config.js

@@ -2,26 +2,17 @@
 
 const axios = require('axios')
 const dayjs = require('dayjs')
-const utc = require('dayjs/plugin/utc')
 
 let apiVersion
 
-dayjs.extend(utc)
-
 module.exports = {
   site: 'pickx.be',
   days: 2,
-  setApiVersion: function (version) {
+  async url({ channel, date }) {
-    apiVersion = version
-  },
-  getApiVersion: function () {
-    return apiVersion
-  },
-  fetchApiVersion: fetchApiVersion,
-  url: async function ({ channel, date }) {
     if (!apiVersion) {
       await fetchApiVersion()
     }
+
     return `https://px-epg.azureedge.net/airings/${apiVersion}/${date.format(
       'YYYY-MM-DD'
     )}/channel/${channel.site_id}?timezone=Europe%2FBrussels`
@@ -51,19 +42,21 @@ module.exports = {
           episode: item.program.episodeNumber,
           actors: item.program.actors,
           director: item.program.director ? [item.program.director] : null,
-          start: dayjs.utc(item.programScheduleStart),
+          start: dayjs(item.programScheduleStart),
-          stop: dayjs.utc(item.programScheduleEnd)
+          stop: dayjs(item.programScheduleEnd)
         })
       })
     }
 
     return programs
   },
-  async channels({ lang = '' }) {
+  async channels() {
+    let channels = []
+
     const query = {
       operationName: 'getChannels',
       variables: {
-        language: lang,
+        language: 'fr',
         queryParams: {},
         id: '0',
         params: {
@@ -71,96 +64,60 @@ module.exports = {
         }
       },
       query: `query getChannels($language: String!, $queryParams: ChannelQueryParams, $id: String, $params: ChannelParams) {
-          channels(language: $language, queryParams: $queryParams, id: $id, params: $params) {
+        channels(language: $language, queryParams: $queryParams, id: $id, params: $params) {
-            id
+          id
-            channelReferenceNumber
+          name
-            name
+          language
-            callLetter
+          radio
-            number
+        }
-            logo {
+      }`
-              key
-              url
-              __typename
-            }
-            language
-            hd
-            radio
-            replayable
-            ottReplayable
-            playable
-            ottPlayable
-            recordable
-            subscribed
-            cloudRecordable
-            catchUpWindowInHours
-            isOttNPVREnabled
-            ottNPVRStart
-            subscription {
-              channelRef
-              subscribed
-              upselling {
-                upsellable
-                packages
-                __typename
-              }
-              __typename
-            }
-            packages
-            __typename
-          }
-        }`
     }
-    const result = await axios
+
+    const data = await axios
       .post('https://api.proximusmwc.be/tiams/v3/graphql', query)
       .then(r => r.data)
       .catch(console.error)
 
-    return (
+    data.data.channels.forEach(channel => {
-      result?.data?.channels
+      let lang = channel.language || 'fr'
-        .filter(
+      if (channel.language === 'ger') lang = 'de'
-          channel =>
+
-            !channel.radio && (!lang || channel.language === (lang === 'de' ? 'ger' : lang))
+      channels.push({
-        )
+        lang,
-        .map(channel => {
+        site_id: channel.id,
-          return {
+        name: channel.name
-            lang: channel.language === 'ger' ? 'de' : channel.language,
+      })
-            site_id: channel.id,
+    })
-            name: channel.name
+
-          }
+    return channels
-        }) || []
-    )
   }
 }
-function fetchApiVersion() {
+
-  return new Promise(async (resolve, reject) => {
+async function fetchApiVersion() {
+  const hashUrl = 'https://www.pickx.be/nl/televisie/tv-gids'
+  const hashData = await axios
+    .get(hashUrl)
+    .then(r => {
+      const re = /"hashes":\["(.*)"\]/
+      const match = r.data.match(re)
+      if (match && match[1]) {
+        return match[1]
+      } else {
+        throw new Error('React app version hash not found')
+      }
+    })
+    .catch(console.error)
+
+  const versionUrl = `https://www.pickx.be/api/s-${hashData}`
+  const response = await axios.get(versionUrl, {
+    headers: {
+      Origin: 'https://www.pickx.be',
+      Referer: 'https://www.pickx.be/'
+    }
+  })
+
+  return new Promise((resolve, reject) => {
     try {
-      // you'll never find what happened here :)
-      // load the pickx page and get the hash from the MWC configuration.
-      // it's not the best way to get the version but it's the only way to get it.
-
-      const hashUrl = 'https://www.pickx.be/nl/televisie/tv-gids';
-
-      const hashData = await axios.get(hashUrl)
-      .then(r => {
-        const re = /"hashes":\["(.*)"\]/
-        const match = r.data.match(re)
-        if (match && match[1]) {
-          return match[1]
-        } else {
-          throw new Error('React app version hash not found')
-        }
-      })
-      .catch(console.error);
-
-      const versionUrl = `https://www.pickx.be/api/s-${hashData}`
-   
-      const response = await axios.get(versionUrl, {
-        headers: {
-          Origin: 'https://www.pickx.be',
-          Referer: 'https://www.pickx.be/'
-        }
-      })
-
       if (response.status === 200) {
         apiVersion = response.data.version
         resolve()

pm2.config.js

@@ -0,0 +1,23 @@
+module.exports = {
+    apps: [
+      {
+        name: 'serve',
+        script: 'npx serve -- public',
+        instances: 1,
+        watch: false,
+        autorestart: true
+      },
+      {
+        name: 'grab',
+        script: process.env.SITE
+          ? `npm run grab -- --site=${process.env.SITE} ${
+              process.env.CLANG ? `--lang=${process.env.CLANG}` : ''
+            } --output=public/guide.xml`
+          : `npm run grab -- --gzip --channels=channels.xml --output=public/guide.xml`,
+        cron_restart: process.env.CRON || null,
+        instances: 1,
+        watch: false,
+        autorestart: false
+      }
+    ]
+  }

start.sh

@@ -6,9 +6,10 @@ for arg in "$@"; do
       chron-schedule=*) chron_schedule="${arg#*=}" ;;
       work-dir=*) work_dir="${arg#*=}" ;;
       days=*) days="${arg#*=}" ;;
+      delay=*) delay="${arg#*=}" ;;
       max_connections=*) max_connections="${arg#*=}" ;;
       enable_fixes=*) enable_fixes="${arg#*=}" ;;
-	  api_url=*) api_url="${arg#*=}" ;;
+	   api_url=*) api_url="${arg#*=}" ;;
    esac
 done
 
@@ -16,6 +17,7 @@ echo "chron_schedule : ${chron_schedule}"
 cd $work_dir
 echo "working dir : " $(pwd)
 echo "days : ${days}"
+echo "delay : ${delay}"
 echo "max_connections : ${max_connections}"
 echo "enable_fixes : ${enable_fixes}"
 echo "api url : ${api_url}"
@@ -25,9 +27,6 @@ if [ "$enable_fixes" = true ] ; then
 fi
 
 sed -i -E "s/(https:\x2f\x2fiptv-org.github.io\x2fapi$\123filename\125)/$api_url$\123filename\125/g" $work_dir/scripts/core/apiClient.ts
-
-pm2 --name epg start npm -- run serve
-npm run grab --- --channels=channels.xml --maxConnections=$max_connections --days=$days --gzip
 ln -s $work_dir/guide.xml /public/guide.xml
 ln -s $work_dir/guide.xml.gz /public/guide.xml.gz
-npm run grab --- --channels=channels.xml --cron="$chron_schedule" --maxConnections=$max_connections --days=$days --gzip
+pm2-runtime pm2.config.js --name epg --node-args="--no-autorestart --cron-restart="$chron_schedule" --maxConnections=$max_connections --days=$days --delay=$delay"