update readme

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:21-alpine
+FROM node:22-alpine
 ARG GIT_REPO=https://github.com/iptv-org/epg.git
 ARG GIT_BRANCH=master
 ENV CRON_SCHEDULE="0 0,12 * * *"
@@ -22,7 +22,7 @@ RUN apk update \
     && npm install pm2 -g \
     && mkdir $(echo "${BIN_FOLDER}/${EPG_FOLDER}") -p \
     && git -C $(echo "${BIN_FOLDER}") clone --depth 1 -b $(echo "${GIT_BRANCH} ${GIT_REPO}") \
-    && cd $WORKDIR && npm install && npm update \
+    && cd $WORKDIR && npm install && npm update \ 
     && rm .eslintrc.json \
     && rm -rf .github \
     && rm -rf .git \

README.md

@@ -41,10 +41,10 @@ This the list of the provided custom fixes :
 | Provider         | Author(s)                                                        | Status                                                                                                                                                         |
 |------------------|------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | movistarplus.es  | [davidclaeysquinones](https://github.com/davidclaeysquinones)    | [PR](https://github.com/iptv-org/epg/pull/2440) pending approval                                                                                               |
-| orangetv.es      | [fraudiay79](https://github.com/fraudiay79) and [davidclaeysquinones](https://github.com/davidclaeysquinones)   | PR not submitted                                                                                                |
-| pickx.be         | [davidclaeysquinones](https://github.com/davidclaeysquinones) and [BellezaEmporium](https://github.com/BellezaEmporium)   | [PR](https://github.com/iptv-org/epg/pull/2480) merged since commit [296d616](https://github.com/iptv-org/epg/commit/296d6162ecbeb1b3c3e392845187d30624d50aa2)                                      |
+| orangetv.es      | [fraudiay79](https://github.com/fraudiay79) and [davidclaeysquinones](https://github.com/davidclaeysquinones)   | [PR](https://github.com/iptv-org/epg/pull/2485) in draft stage                                              |
+| pickx.be         | [davidclaeysquinones](https://github.com/davidclaeysquinones) and [BellezaEmporium](https://github.com/BellezaEmporium)   | [PR](https://github.com/iptv-org/epg/pull/2525) merged since commit [fd91a9c](https://github.com/iptv-org/epg/commit/fd91a9c532b476f6e192a564371d30e766b762ab)                                    |
 | telenet.tv       | [davidclaeysquinones](https://github.com/davidclaeysquinones)    | [PR](https://github.com/iptv-org/epg/pull/2429) merged since commit [fd382db](https://github.com/iptv-org/epg/commit/fd382db08da7a96150928b8dcfef115e29e661d3) |
-| web.magentatv.de | [klausellus-wallace](https://github.com/klausellus-wallace)      | [PR](https://github.com/iptv-org/epg/pull/2458) pending approval                                                                                               |
+| web.magentatv.de | [klausellus-wallace](https://github.com/klausellus-wallace)      | [PR](https://github.com/iptv-org/epg/pull/2458) merged since commit [61afe09](https://github.com/iptv-org/epg/commit/61afe090b6e7892cc5426457d960e9452222f885)                                                                                               |
 
 If for some reason you want to include your own provider fixes this is possible by creation a mapping in the `/fixes` folder.<br>
 The expected structure is */fixes/`provider_name`/`provider_name`.config.js*.<br>
@@ -137,4 +137,22 @@ Sometimes a new version of this image will be bound to the same source commit. T
 - 1.0.22
   [11-30-2024](https://github.com/iptv-org/epg/commit/1883338c0aee9909ac4567312b25701d10a765f2)
 - 1.0.23
-  [12-02-2024](https://github.com/iptv-org/epg/commit/296d6162ecbeb1b3c3e392845187d30624d50aa2)
+  [12-02-2024](https://github.com/iptv-org/epg/commit/296d6162ecbeb1b3c3e392845187d30624d50aa2)
+- 1.0.24
+  [12-02-2024](https://github.com/iptv-org/epg/commit/296d6162ecbeb1b3c3e392845187d30624d50aa2)<br>Fix for movistarplus.es channel grabber
+- 1.0.25
+  [12-04-2024](https://github.com/iptv-org/epg/commit/864e0ac2c4761d926b203a85a382a4bdc87fbc17)
+- 1.0.26
+  [12-05-2024](https://github.com/iptv-org/epg/commit/581441834af6f089c3930ad2d7ff1de2c701a6d9)
+- 1.0.27
+  [12-07-2024](https://github.com/iptv-org/epg/commit/ce4f3e69358385d1fb8e79df8129c63d6314a802)
+- 1.0.28
+  [12-08-2024](https://github.com/iptv-org/epg/commit/f9c8fc1b2dd63465564aba0c720096574980c58f)
+- 1.0.29
+  [12-11-2024](https://github.com/iptv-org/epg/commit/581f5e0ca94bd6d05c33f53951df078d702b2510)
+- 1.0.30
+  [12-16-2024](https://github.com/iptv-org/epg/commit/b9bbd32d354315eb292e3b82da09785e575a9781)
+- 1.0.31
+  [12-17-2024](https://github.com/iptv-org/epg/commit/7237a62d94c5691f7f467b334f846efce93b08ff)<br>Fix for Pickx.be + mayor program updates
+- 1.0.32
+  [12-20-2024](https://github.com/iptv-org/epg/commit/f00d53cb7be3cd7f6625897709cab005fe1b3dc4)

channels.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
     <!--This is a sample of a channel you can add look at https://github.com/iptv-org/epg/tree/master/sites for the complete list-->
-	<channel site="movistarplus.es" lang="es" xmltv_id="24Horas.es" site_id="24H">24 Horas</channel>
+    <channel site="pickx.be" lang="nl" xmltv_id="Een.be" site_id="UID50037">VRT 1</channel>
+	<!--<channel site="movistarplus.es" lang="es" xmltv_id="24Horas.es" site_id="24H">24 Horas</channel>-->
 </channels>

fixes/movistarplus.es/movistarplus.es.config.js

@@ -58,8 +58,37 @@ module.exports = {
 
     return programs
   },
+  async channels() {
+    const axios = require('axios')
+    //const dayjs = require('dayjs')
+    const data = await axios
+      .post(`${API_PROGRAM_ENDPOINT}/wp-admin/admin-ajax.php`,
+        {
+          action: 'getChannels',
+        },
+        {
+          headers: {
+            Origin: API_PROGRAM_ENDPOINT,
+            Referer: `${API_PROGRAM_ENDPOINT}/programacion/`,
+            "Content-Type" : 'application/x-www-form-urlencoded; charset=UTF-8',
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36 Edg/79.0.309.71'
+          }
+        }
+      )
+      .then(r => r.data)
+      .catch(console.log)
+
+    return Object.values(data).map(item => {
+      return {
+        lang: 'es',
+        site_id: item.cod_cadena_tv,
+        name: item.des_cadena_tv
+      }
+    })
+  }
 }
 
+
 function parseIcon(item, channel) {
   if(item.cod_elemento_emision)
   {

fixes/orangetv.es/orangetv.es.config.js

@@ -1,16 +1,17 @@
-// credit for this fix goes to fraudiay79 and to davidclaeysquinones for their work
+// credit for this fix goes to fraudiay79, BellezaEmporium and to davidclaeysquinones for their work
 // the PR is not submitted since the test suite for this provider needs to be developed
 // for now the source code can be found at https://github.com/davidclaeysquinones/epg/tree/orangetv.orange.es
 
 const dayjs = require('dayjs')
+const utc = require('dayjs/plugin/utc')
 const axios = require('axios')
 
+dayjs.extend(utc)
+
 const API_PROGRAM_ENDPOINT = 'https://epg.orangetv.orange.es/epg/Smartphone_Android/1_PRO'
 const API_CHANNEL_ENDPOINT = 'https://pc.orangetv.orange.es/pc/api/rtv/v1/GetChannelList?bouquet_id=1&model_external_id=PC&filter_unsupported_channels=false&client=json'
 const API_IMAGE_ENDPOINT = 'https://pc.orangetv.orange.es/pc/api/rtv/v1/images'
 
-
-
 module.exports = {
   site: 'orangetv.es',
   days: 2,
@@ -23,7 +24,9 @@ module.exports = {
     return `${API_PROGRAM_ENDPOINT}/${date.format('YYYYMMDD')}_8h_1.json`
   },
   async parser({ content, channel, date }) {
-    let items = []
+    let programs = []
+    let items = parseItems(content, channel)
+    if (!items.length) return programs
 
     const promises = [
       axios.get(
@@ -37,23 +40,23 @@ module.exports = {
       ),
     ]
 
-    await Promise.all(promises)
-    .then(results => {
-      results.forEach(r => {
-        const responseContent = r.data
-        items = items.concat(parseItems(responseContent, channel))
+    await Promise.allSettled(promises)
+      .then(results => {
+        results.forEach(r => {
+          if (r.status === 'fulfilled') {
+            const parsed = parseItems(r.value.data, channel)
+
+            items = items.filter((item, index) => items.findIndex(oi => oi.id === item.id) === index).concat(parsed)
+          }
+        })
       })
-    })
-    .catch(console.error)
+      .catch(console.error)
 
-    // remove duplicates
-    items = items.filter((item, index) => items.findIndex(oi => oi.id === item.id) === index);
-
-    let programs = []
     items.forEach(item => {
       programs.push({
         title: item.name,
         description: item.description,
+        category: parseGenres(item),
         season: item.seriesSeason || null,
         episode: item.episodeId || null,
         icon: parseIcon(item),
@@ -94,14 +97,21 @@ function parseIcon(item){
   return ''
 }
 
+function parseGenres(item){
+  return item.genres.map(i => i.name);
+}
+
 function parseItems(content, channel) {
-  const json = typeof content === 'string' ? JSON.parse(content) : typeof content === 'object' ? content : []
+  const json = typeof content === 'string' ? JSON.parse(content) : Array.isArray(content) ? content : []
+
+  if (!Array.isArray(json)) {
+    return [];
+  }
 
   const channelData = json.find(i => i.channelExternalId == channel.site_id);
 
   if(!channelData)
     return [];
 
-
   return channelData.programs;
 }

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

@@ -1,33 +1,26 @@
-// credit for this fix goes to davidclaeysquinones for his PR on https://github.com/iptv-org/epg/pull/2430 and to BellezaEmporium for his PR on https://github.com/iptv-org/epg/pull/2480
+// credit for this fix goes to davidclaeysquinones for his PR on https://github.com/iptv-org/epg/pull/2430, https://github.com/iptv-org/epg/pull/2520 and to BellezaEmporium for his PR on https://github.com/iptv-org/epg/pull/2480, https://github.com/iptv-org/epg/pull/2525
 
 const axios = require('axios')
 const dayjs = require('dayjs')
 const utc = require('dayjs/plugin/utc')
 
 let apiVersion
-let isApiVersionFetched = false
-
-;(async () => {
-  try {
-    await fetchApiVersion()
-    isApiVersionFetched = true
-  } catch (error) {
-    console.error('Error during script initialization:', error)
-  }
-})()
 
 dayjs.extend(utc)
 
 module.exports = {
   site: 'pickx.be',
   days: 2,
-  apiVersion: function () {
+  setApiVersion: function (version) {
+    apiVersion = version
+  },
+  getApiVersion: function () {
     return apiVersion
   },
-  fetchApiVersion: fetchApiVersion, // Export fetchApiVersion
+  fetchApiVersion: fetchApiVersion,
   url: async function ({ channel, date }) {
-    while (!isApiVersionFetched) {
-      await new Promise(resolve => setTimeout(resolve, 100)) // Wait for 100 milliseconds
+    if (!apiVersion) {
+      await fetchApiVersion()
     }
     return `https://px-epg.azureedge.net/airings/${apiVersion}/${date.format(
       'YYYY-MM-DD'
@@ -118,7 +111,7 @@ module.exports = {
         }`
     }
     const result = await axios
-      .post('https://api.proximusmwc.be/tiams/v2/graphql', query)
+      .post('https://api.proximusmwc.be/tiams/v3/graphql', query)
       .then(r => r.data)
       .catch(console.error)
 
@@ -141,53 +134,39 @@ module.exports = {
 function fetchApiVersion() {
   return new Promise(async (resolve, reject) => {
     try {
-      // load pickx bundle and get react version hash (regex).
+      // 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.
 
-      // find bundle version
-      const minBundleVer = "https://www.pickx.be/minimal-bundle-version"
-      const bundleVerData = await axios.get(minBundleVer, {
-          headers: {
-            Origin: 'https://www.pickx.be',
-            Referer: 'https://www.pickx.be/'
-          }
+      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 (bundleVerData.status !== 200) {
-        console.error(`Failed to fetch bundle version. Status: ${bundleVerData.status}`)
-        reject(`Failed to fetch bundle version. Status: ${bundleVerData.status}`)
+      if (response.status === 200) {
+        apiVersion = response.data.version
+        resolve()
       } else {
-        const bundleVer = bundleVerData.data.version
-        // get the minified JS app bundle
-        const bundleUrl = `https://components.pickx.be/pxReactPlayer/${bundleVer}/bundle.min.js`
-
-        // now, find the react hash inside the bundle URL
-        const bundle = await axios.get(bundleUrl).then(r => {
-          const re = /REACT_APP_VERSION_HASH:"([^"]+)"/
-          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-${bundle.replace('/REACT_APP_VERSION_HASH:"', '')}`
-
-        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()
-        } else {
-          console.error(`Failed to fetch API version. Status: ${response.status}`)
-          reject(`Failed to fetch API version. Status: ${response.status}`)
-        }
+        console.error(`Failed to fetch API version. Status: ${response.status}`)
+        reject(`Failed to fetch API version. Status: ${response.status}`)
       }
     } catch (error) {
       console.error('Error during fetchApiVersion:', error)

start.sh

@@ -27,7 +27,7 @@ fi
 sed -i -E "s/(https:\x2f\x2fiptv-org.github.io\x2fapi)/$api_url/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
+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
+npm run grab --- --channels=channels.xml --cron="$chron_schedule" --maxConnections=$max_connections --days=$days --gzip