Merge branch 'iptv-org:master' into orangetv.orange.es

sites/i24news.tv/i24news.tv.channels.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <channels>
-  <channel site="i24news.tv" lang="ar" xmltv_id="i24NEWSArabic.il" site_id="ar#world">I24NEWS عربى</channel>
+  <channel site="i24news.tv" lang="ar" xmltv_id="i24NEWSArabic.il" site_id="ar">I24NEWS عربى</channel>
-  <channel site="i24news.tv" lang="en" xmltv_id="i24NEWSEnglishUSA.il" site_id="en#usa">I24NEWS English (USA)</channel>
+  <channel site="i24news.tv" lang="en" xmltv_id="i24NEWSEnglishUSA.il" site_id="en">I24NEWS English (USA)</channel>
-  <channel site="i24news.tv" lang="en" xmltv_id="i24NEWSEnglishWorld.il" site_id="en#world">I24NEWS English (World)</channel>
+  <channel site="i24news.tv" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="fr">I24NEWS Français</channel>
-  <channel site="i24news.tv" lang="fr" xmltv_id="i24NEWSFrench.il" site_id="fr#world">I24NEWS Français</channel>
+  <channel site="i24news.tv" lang="he" xmltv_id="i24NEWSHebrew.il" site_id="he">I24NEWS עברית</channel>
 </channels>

sites/i24news.tv/i24news.tv.config.js

@@ -11,9 +11,7 @@ module.exports = {
   site: 'i24news.tv',
   days: 2,
   url: function ({ channel }) {
-    const [lang, region] = channel.site_id.split('#')
+    return `https://api.i24news.tv/v2/${channel.site_id}/schedules`
-
-    return `https://api.i24news.tv/v2/${lang}/schedules/${region}`
   },
   parser: function ({ content, date }) {
     let programs = []

sites/i24news.tv/i24news.tv.test.js

@@ -7,12 +7,12 @@ dayjs.extend(utc)
 
 const date = dayjs.utc('2022-03-06', 'YYYY-MM-DD').startOf('d')
 const channel = {
-  site_id: 'ar#',
+  site_id: 'ar',
   xmltv_id: 'I24NewsArabic.il'
 }
 
 it('can generate valid url', () => {
-  expect(url({ channel })).toBe('https://api.i24news.tv/v2/ar/schedules/world')
+  expect(url({ channel })).toBe('https://api.i24news.tv/v2/ar/schedules')
 })
 
 it('can parse response', () => {

sites/iltalehti.fi/iltalehti.fi.test.js

@@ -9,7 +9,7 @@ dayjs.extend(utc)
 
 const date = dayjs.utc('2022-10-29', 'YYYY-MM-DD').startOf('d')
 const channel = {
-  site_id: 'default_builtin_channelgroup1#yle-tv1',
+  site_id: '1#yle-tv1',
   xmltv_id: 'YleTV1.fi'
 }
 

sites/pickx.be/pickx.be.config.js

@@ -3,29 +3,22 @@ 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) {
+    if (!apiVersion) {
-      await new Promise(resolve => setTimeout(resolve, 100)) // Wait for 100 milliseconds
+      await fetchApiVersion()
     }
     return `https://px-epg.azureedge.net/airings/${apiVersion}/${date.format(
       'YYYY-MM-DD'
@@ -116,7 +109,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)
 
@@ -140,53 +133,38 @@ function fetchApiVersion() {
   return new Promise(async (resolve, reject) => {
     try {
       // you'll never find what happened here :)
-      // load pickx bundle and get react version hash (regex).
+      // 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 hashUrl = 'https://www.pickx.be/nl/televisie/tv-gids';
-      const minBundleVer = "https://www.pickx.be/minimal-bundle-version"
+
-      const bundleVerData = await axios.get(minBundleVer, {
+      const hashData = await axios.get(hashUrl)
-          headers: {
+      .then(r => {
-            Origin: 'https://www.pickx.be',
+        const re = /"hashes":\["(.*)"\]/
-            Referer: 'https://www.pickx.be/'
+        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) {
+      if (response.status === 200) {
-        console.error(`Failed to fetch bundle version. Status: ${bundleVerData.status}`)
+        apiVersion = response.data.version
-        reject(`Failed to fetch bundle version. Status: ${bundleVerData.status}`)
+        resolve()
       } else {
-        const bundleVer = bundleVerData.data.version
+        console.error(`Failed to fetch API version. Status: ${response.status}`)
-        // get the minified JS app bundle
+        reject(`Failed to fetch API version. Status: ${response.status}`)
-        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}`)
-        }
       }
     } catch (error) {
       console.error('Error during fetchApiVersion:', error)

sites/pickx.be/pickx.be.test.js

@@ -1,4 +1,20 @@
-const { parser, url, request, fetchApiVersion, apiVersion } = require('./pickx.be.config.js')
+jest.mock('./pickx.be.config.js', () => {
+  const originalModule = jest.requireActual('./pickx.be.config.js')
+  return {
+    ...originalModule,
+    fetchApiVersion: jest.fn(() => Promise.resolve())
+  }
+})
+
+const {
+  parser,
+  url,
+  request,
+  fetchApiVersion,
+  setApiVersion,
+  getApiVersion
+} = require('./pickx.be.config.js')
+
 const fs = require('fs')
 const path = require('path')
 const dayjs = require('dayjs')
@@ -13,12 +29,14 @@ const channel = {
   xmltv_id: 'Vedia.be'
 }
 
+beforeEach(() => {
+  setApiVersion('mockedApiVersion')
+})
+
 it('can generate valid url', async () => {
-  await fetchApiVersion()
   const generatedUrl = await url({ channel, date })
-  const resolvedApiVersion = apiVersion()
   expect(generatedUrl).toBe(
-    `https://px-epg.azureedge.net/airings/${resolvedApiVersion}/2023-12-13/channel/UID0118?timezone=Europe%2FBrussels`
+    `https://px-epg.azureedge.net/airings/mockedApiVersion/2023-12-13/channel/UID0118?timezone=Europe%2FBrussels`
   )
 })