Added support for DaddyLive and Vavoo streams

This commit is contained in:
2025-07-09 22:27:01 -05:00
parent 2aa0dd5be4
commit e0129f04a0
7 changed files with 497 additions and 195 deletions

View File

@@ -46,6 +46,16 @@ pip install -r src/requirements.txt
docker-compose up -d docker-compose up -d
``` ```
### Build image and push to registry
Use the following command to build the docker image locally and
push it to the package repository
```bash
docker build -t git.fiorinis.com/home/streamlink-server:latest .
docker push git.fiorinis.com/home/streamlink-server:latest
```
### Hugging Face Spaces Deployment ### Hugging Face Spaces Deployment
The project includes a specialized Dockerfile (`Dockerfile_HF`) optimized for deployment on Hugging Face Spaces. Once you have created the Space, you can create a Dockerfile and past the contents of `Dockerfile_HF` into it. The project includes a specialized Dockerfile (`Dockerfile_HF`) optimized for deployment on Hugging Face Spaces. Once you have created the Space, you can create a Dockerfile and past the contents of `Dockerfile_HF` into it.
@@ -125,4 +135,4 @@ When using the `/stream/url` endpoint:
- The server includes automatic stream recovery on failures - The server includes automatic stream recovery on failures
- Default server port is 6090 - Default server port is 6090
- All API endpoints require authentication - All API endpoints require authentication
- Docker setup includes optional VPN support via gluetun - Docker setup includes optional VPN support via gluetun

View File

@@ -3,421 +3,309 @@
{ {
"id": "1", "id": "1",
"name": "RAI 1", "name": "RAI 1",
"url": "https://cachehsi1a.netplus.ch/live/eds/rai1/browser-dash/rai1.mpd" "url": "https://raiplay.it/dirette/rai1",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "2", "id": "2",
"name": "RAI 2", "name": "RAI 2",
"url": "https://cachehsi1a.netplus.ch/live/eds/rai2/browser-dash/rai2.mpd" "url": "https://raiplay.it/dirette/rai2",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "3", "id": "3",
"name": "RAI 3", "name": "RAI 3",
"url": "https://cachehsi1a.netplus.ch/live/eds/rai3/browser-dash/rai3.mpd" "url": "https://raiplay.it/dirette/rai3",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "4", "id": "4",
"name": "Rete 4", "name": "Rete 4",
"url": "https://cachehsi1a.netplus.ch/live/eds/rete4/browser-dash/rete4.mpd" "url": "https://live02-seg.msf.cdn.mediaset.net/live/ch-r4/r4-clr.isml/index.m3u8",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "5", "id": "5",
"name": "Canale 5", "name": "Canale 5",
"url": "https://cachehsi1a.netplus.ch/live/eds/canale5/browser-dash/canale5.mpd" "url": "https://live02-seg.msf.cdn.mediaset.net/live/ch-c5/c5-clr.isml/index.m3u8",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "6", "id": "6",
"name": "Italia 1", "name": "Italia 1",
"url": "https://cachehsi1a.netplus.ch/live/eds/italia1/browser-dash/italia1.mpd" "url": "https://live02-seg.msf.cdn.mediaset.net/live/ch-i1/i1-clr.isml/index.m3u8",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "7", "id": "7",
"name": "Rai Storia", "name": "Rai Storia",
"url": "https://cachehsi1a.netplus.ch/live/eds/raistoria/browser-dash/raistoria.mpd" "url": "https://www.raiplay.it/dirette/raistoria",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "8", "id": "8",
"name": "Rai Scuola", "name": "Rai Scuola",
"url": "https://cachehsi1a.netplus.ch/live/eds/raiscuola/browser-dash/raiscuola.mpd" "url": "https://www.raiplay.it/dirette/raiscuola",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "9", "id": "9",
"name": "Rai News 24", "name": "Rai News 24",
"url": "https://cachehsi1a.netplus.ch/live/eds/rainews/browser-dash/rainews.mpd" "url": "https://www.raiplay.it/dirette/rainews24",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "10", "id": "10",
"name": "Rai Sport", "name": "Rai Sport",
"url": "https://cachehsi1a.netplus.ch/live/eds/raisport1/browser-dash/raisport1.mpd" "url": "https://www.raiplay.it/dirette/raisport",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "11", "id": "11",
"name": "Rai Gulp", "name": "Rai Gulp",
"url": "https://cachehsi1a.netplus.ch/live/eds/raigulp/browser-dash/raigulp.mpd" "url": "https://www.raiplay.it/dirette/raigulp",
"proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "12", "id": "12",
"name": "LA 7", "name": "LA 7",
"url": "https://cachehsi1a.netplus.ch/live/eds/la7/browser-dash/la7.mpd" "url": "https://vavoo.to/vavoo-iptv/play/2143522071cfa887e2feb3"
}, },
{ {
"id": "13", "id": "13",
"name": "Nove", "name": "Nove",
"url": "https://cachehsi1a.netplus.ch/live/eds/nove/browser-dash/nove.mpd" "url": "https://vavoo.to/vavoo-iptv/play/2651461317c35e3e83858e"
}, },
{ {
"id": "14", "id": "14",
"name": "Rai 4", "name": "Rai 4",
"url": "https://raiplay.it/dirette/rai4", "url": "https://raiplay.it/dirette/rai4",
"proxy": "http://14a97c06b98ae:aa1078a3b4@88.216.196.65:12323" "proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "15", "id": "15",
"name": "Rai 5", "name": "Rai 5",
"url": "https://raiplay.it/dirette/rai5", "url": "https://raiplay.it/dirette/rai5",
"proxy": "http://14a97c06b98ae:aa1078a3b4@88.216.196.65:12323" "proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "16", "id": "16",
"name": "Rai Premium", "name": "Rai Premium",
"url": "https://raiplay.it/dirette/raipremium", "url": "https://raiplay.it/dirette/raipremium",
"proxy": "http://14a97c06b98ae:aa1078a3b4@88.216.196.65:12323" "proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "17", "id": "17",
"name": "Rai Movie", "name": "Rai Movie",
"url": "https://raiplay.it/dirette/raimovie", "url": "https://raiplay.it/dirette/raimovie",
"proxy": "http://14a97c06b98ae:aa1078a3b4@88.216.196.65:12323" "proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
}, },
{ {
"id": "18", "id": "18",
"name": "20 Mediaset - IT", "name": "20 Mediaset - IT",
"url": "https://windnew.newkso.ru/wind/premium857/mono.m3u8", "url": "https://live02-seg.msf.cdn.mediaset.net/live/ch-lb/lb-clr.isml/index.m3u8",
"origin": "https://cookiewebplay.xyz", "proxy": "https://G6mnrdkzmBGy1xo5PsewoKQy:VCLFhoWnbrNrUkAu74mvt8yU@it132.nordvpn.com:89"
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "19", "id": "19",
"name": "Eurosport 1 - IT", "name": "Eurosport 1 - IT",
"url": "https://windnew.newkso.ru/wind/premium878/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/34813468571b25fb16646d"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "20", "id": "20",
"name": "Eurosport 2 - IT", "name": "Eurosport 2 - IT",
"url": "https://windnew.newkso.ru/wind/premium879/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/2283887097a4248311ff27"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "21", "id": "21",
"name": "Sky Sport 24 - IT", "name": "Sky Sport 24 - IT",
"url": "https://windnew.newkso.ru/wind/premium869/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/277580225585f503fbfc87"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "22", "id": "22",
"name": "Sky Sport Arena - IT", "name": "Sky Sport Arena - IT",
"url": "https://ddy6new.newkso.ru/ddy6/premium462/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/3007400791d5bc640207c3"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "23", "id": "23",
"name": "Sky Sport F1 - IT", "name": "Sky Sport F1 - IT",
"url": "https://nfsnew.newkso.ru/nfs/premium577/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/42467740561588897497f2"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "24", "id": "24",
"name": "Sky Sport Calcio - IT", "name": "Sky Sport Calcio - IT",
"url": "https://windnew.newkso.ru/wind/premium870/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/1665920101d5db640ce7e6"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "25", "id": "25",
"name": "Sky Sport Calcio 1 (251) - IT", "name": "Sky Sport Calcio 1 (251) - IT",
"url": "https://zekonew.newkso.ru/zeko/premium871/mono.m3u8", "url": "https://thedaddy.click/stream/stream-871.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "26", "id": "26",
"name": "Sky Sport Calcio 2 (252) - IT", "name": "Sky Sport Calcio 2 (252) - IT",
"url": "https://windnew.newkso.ru/wind/premium872/mono.m3u8", "url": "https://thedaddy.click/stream/stream-872.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "27", "id": "27",
"name": "Sky Sport Calcio 3 (253) - IT", "name": "Sky Sport Calcio 3 (253) - IT",
"url": "https://windnew.newkso.ru/wind/premium873/mono.m3u8", "url": "https://thedaddy.click/stream/stream-873.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "28", "id": "28",
"name": "Sky Sport Calcio 4 (254) - IT", "name": "Sky Sport Calcio 4 (254) - IT",
"url": "https://windnew.newkso.ru/wind/premium874/mono.m3u8", "url": "https://thedaddy.click/stream/stream-874.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "29", "id": "29",
"name": "Sky Sport Calcio 5 (255) - IT", "name": "Sky Sport Calcio 5 (255) - IT",
"url": "https://windnew.newkso.ru/wind/premium875/mono.m3u8", "url": "https://thedaddy.click/stream/stream-875.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "30", "id": "30",
"name": "Sky Sport Calcio 6 (256) - IT", "name": "Sky Sport Calcio 6 (256) - IT",
"url": "https://windnew.newkso.ru/wind/premium876/mono.m3u8", "url": "https://thedaddy.click/stream/stream-876.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "31", "id": "31",
"name": "Sky Sport Calcio 7 (257) - IT", "name": "Sky Sport Calcio 7 (257) - IT",
"url": "https://nfsnew.newkso.ru/nfs/premium877/mono.m3u8", "url": "https://thedaddy.click/stream/stream-877.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "32", "id": "32",
"name": "Sky Sport Max - IT", "name": "Sky Sport Max - IT",
"url": "https://dokko1new.newkso.ru/dokko1/premium460/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/206632691678b853b73adb"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "33", "id": "33",
"name": "Sky Sport Golf - IT", "name": "Sky Sport Golf - IT",
"url": "https://ddy6new.newkso.ru/ddy6/premium574/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/729945219d6146597896a"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "34", "id": "34",
"name": "Sky Sport MotoGP - IT", "name": "Sky Sport MotoGP - IT",
"url": "https://nfsnew.newkso.ru/nfs/premium575/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/30363168866e9eeb997936"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "35", "id": "35",
"name": "Sky Sport Tennis - IT", "name": "Sky Sport Tennis - IT",
"url": "https://ddy6new.newkso.ru/ddy6/premium576/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/210077178262e76f204fa6"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "36", "id": "36",
"name": "Sky Sport Uno - IT", "name": "Sky Sport Uno - IT",
"url": "https://ddy6new.newkso.ru/ddy6/premium461/mono.m3u8", "url": "https://vavoo.to/vavoo-iptv/play/3192996672d2c923be0346"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "100", "id": "100",
"name": "TNT 1 Sports - UK", "name": "TNT 1 Sports - UK",
"url": "https://nfsnew.newkso.ru/nfs/premium31/mono.m3u8", "url": "https://thedaddy.click/stream/stream-31.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "101", "id": "101",
"name": "TNT 2 Sports - UK", "name": "TNT 2 Sports - UK",
"url": "https://nfsnew.newkso.ru/nfs/premium32/mono.m3u8", "url": "https://thedaddy.click/stream/stream-32.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "102", "id": "102",
"name": "TNT 3 Sports - UK", "name": "TNT 3 Sports - UK",
"url": "https://nfsnew.newkso.ru/nfs/premium33/mono.m3u8", "url": "https://thedaddy.click/stream/stream-33.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "103", "id": "103",
"name": "TNT 4 Sports - UK", "name": "TNT 4 Sports - UK",
"url": "https://nfsnew.newkso.ru/nfs/premium34/mono.m3u8", "url": "https://thedaddy.click/stream/stream-34.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "104", "id": "104",
"name": "Sky Sports F1 - UK", "name": "Sky Sports F1 - UK",
"url": "https://windnew.newkso.ru/wind/premium60/mono.m3u8", "url": "https://thedaddy.click/stream/stream-60.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "200", "id": "200",
"name": "ESPN - US", "name": "ESPN - US",
"url": "https://zekonew.newkso.ru/zeko/premium44/mono.m3u8", "url": "https://thedaddy.click/stream/stream-60.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/"
}, },
{ {
"id": "300", "id": "300",
"name": "Super Sports Action - ZA", "name": "Super Sports Action - ZA",
"url": "https://windnew.newkso.ru/wind/premium420/mono.m3u8", "url": "https://thedaddy.click/stream/stream-60.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
},
{
"id": "301",
"name": "Super Sports Blitz - ZA",
"url": "https://nix1-dc4new.koskoros.ru/nix1-dc4/superblitz/mono.m3u8",
"origin": "https://topembed.pw",
"referer": "https://topembed.pw/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "302", "id": "302",
"name": "Super Sports Cricket - ZA", "name": "Super Sports Cricket - ZA",
"url": "https://dokko1new.newkso.ru/dokko1/premium368/mono.m3u8", "url": "https://thedaddy.click/stream/stream-368.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "303", "id": "303",
"name": "Super Sports Football - ZA", "name": "Super Sports Football - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium56/mono.m3u8", "url": "https://thedaddy.click/stream/stream-56.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "304", "id": "304",
"name": "Super Sports Golf - ZA", "name": "Super Sports Golf - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium422/mono.m3u8", "url": "https://thedaddy.click/stream/stream-422.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "305", "id": "305",
"name": "Super Sports Grandstand - ZA", "name": "Super Sports Grandstand - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium412/mono.m3u8", "url": "https://thedaddy.click/stream/stream-412.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "306", "id": "306",
"name": "Super Sports La Liga - ZA", "name": "Super Sports La Liga - ZA",
"url": "https://ddy6new.newkso.ru/ddy6/premium415/mono.m3u8", "url": "https://thedaddy.click/stream/stream-415.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "307", "id": "307",
"name": "Super Sports Maximo - ZA", "name": "Super Sports Maximo - ZA",
"url": "https://dokko1new.newkso.ru/dokko1/premium572/mono.m3u8", "url": "https://thedaddy.click/stream/stream-572.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "308", "id": "308",
"name": "Super Sports Motorsport - ZA", "name": "Super Sports Motorsport - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium424/mono.m3u8", "url": "https://thedaddy.click/stream/stream-424.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "309", "id": "309",
"name": "Super Sports PSL - ZA", "name": "Super Sports PSL - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium413/mono.m3u8", "url": "https://thedaddy.click/stream/stream-413.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "310", "id": "310",
"name": "Super Sports Premier League - ZA", "name": "Super Sports Premier League - ZA",
"url": "https://ddy6new.newkso.ru/ddy6/premium414/mono.m3u8", "url": "https://thedaddy.click/stream/stream-414.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "311", "id": "311",
"name": "Super Sports Rugby - ZA", "name": "Super Sports Rugby - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium421/mono.m3u8", "url": "https://thedaddy.click/stream/stream-421.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "312", "id": "312",
"name": "Super Sports Tennis - ZA", "name": "Super Sports Tennis - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium423/mono.m3u8", "url": "https://thedaddy.click/stream/stream-423.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "313", "id": "313",
"name": "Super Sports Variety 1 - ZA", "name": "Super Sports Variety 1 - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium416/mono.m3u8", "url": "https://thedaddy.click/stream/stream-416.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "314", "id": "314",
"name": "Super Sports Variety 2 - ZA", "name": "Super Sports Variety 2 - ZA",
"url": "https://windnew.newkso.ru/wind/premium417/mono.m3u8", "url": "https://thedaddy.click/stream/stream-417.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "315", "id": "315",
"name": "Super Sports Variety 3 - ZA", "name": "Super Sports Variety 3 - ZA",
"url": "https://ddy6new.newkso.ru/ddy6/premium418/mono.m3u8", "url": "https://thedaddy.click/stream/stream-418.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
}, },
{ {
"id": "316", "id": "316",
"name": "Super Sports Variety 4 - ZA", "name": "Super Sports Variety 4 - ZA",
"url": "https://zekonew.newkso.ru/zeko/premium419/mono.m3u8", "url": "https://thedaddy.click/stream/stream-419.php"
"origin": "https://cookiewebplay.xyz",
"referer": "https://cookiewebplay.xyz/",
"agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 17_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.0 Mobile/15E148 Safari/604.1"
} }
] ]
} }

View File

@@ -11,13 +11,13 @@ services:
ports: ports:
- "6090:6090" - "6090:6090"
environment: environment:
# NordVPN - Dallas # NordVPN - Houston, US
- VPN_SERVICE_PROVIDER=custom - VPN_SERVICE_PROVIDER=custom
- VPN_TYPE=wireguard - VPN_TYPE=wireguard
- WIREGUARD_ENDPOINT_IP=185.247.70.139 - WIREGUARD_ENDPOINT_IP=185.81.126.17
- WIREGUARD_ENDPOINT_PORT=51820 - WIREGUARD_ENDPOINT_PORT=51820
- WIREGUARD_PUBLIC_KEY=8pRFH/FfMBs3eBJCM2ABFoOs/13n78LYQvoovZVLdgI= - WIREGUARD_PUBLIC_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- WIREGUARD_PRIVATE_KEY=8Hzee8uJtfKwbJ+NhG8wdAeWtcfdU8bRO/hHLXmM2l0= - WIREGUARD_PRIVATE_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- WIREGUARD_ADDRESSES=10.5.0.2/32 - WIREGUARD_ADDRESSES=10.5.0.2/32
streamlink-server: streamlink-server:
build: build:

View File

@@ -3,4 +3,5 @@ uvicorn>=0.27.0
streamlink>=6.5.0 streamlink>=6.5.0
python-multipart>=0.0.9 python-multipart>=0.0.9
typing-extensions>=4.9.0 typing-extensions>=4.9.0
python-dotenv==1.0.0 python-dotenv==1.0.0
requests>=2.28.1

View File

@@ -2,7 +2,7 @@ import json
import os import os
from typing import Optional from typing import Optional
from dotenv import load_dotenv from dotenv import load_dotenv
from fastapi import Depends, HTTPException from fastapi import HTTPException
# Load environment variables # Load environment variables
load_dotenv() load_dotenv()

397
src/utils/proxy_utils.py Normal file
View File

@@ -0,0 +1,397 @@
import requests
import re
import base64
import time
import logging
from urllib.parse import urlparse, unquote, quote_plus
# Setup logging
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
# --- Classe VavooResolver per gestire i link Vavoo ---
class VavooResolver:
def __init__(self):
self.session = requests.Session()
self.session.headers.update({
'User-Agent': 'MediaHubMX/2'
})
def getAuthSignature(self):
"""Funzione che replica esattamente quella dell'addon utils.py"""
headers = {
"user-agent": "okhttp/4.11.0",
"accept": "application/json",
"content-type": "application/json; charset=utf-8",
"content-length": "1106",
"accept-encoding": "gzip"
}
data = {
"token": "tosFwQCJMS8qrW_AjLoHPQ41646J5dRNha6ZWHnijoYQQQoADQoXYSo7ki7O5-CsgN4CH0uRk6EEoJ0728ar9scCRQW3ZkbfrPfeCXW2VgopSW2FWDqPOoVYIuVPAOnXCZ5g",
"reason": "app-blur",
"locale": "de",
"theme": "dark",
"metadata": {
"device": {
"type": "Handset",
"brand": "google",
"model": "Nexus",
"name": "21081111RG",
"uniqueId": "d10e5d99ab665233"
},
"os": {
"name": "android",
"version": "7.1.2",
"abis": ["arm64-v8a", "armeabi-v7a", "armeabi"],
"host": "android"
},
"app": {
"platform": "android",
"version": "3.1.20",
"buildId": "289515000",
"engine": "hbc85",
"signatures": ["6e8a975e3cbf07d5de823a760d4c2547f86c1403105020adee5de67ac510999e"],
"installer": "app.revanced.manager.flutter"
},
"version": {
"package": "tv.vavoo.app",
"binary": "3.1.20",
"js": "3.1.20"
}
},
"appFocusTime": 0,
"playerActive": False,
"playDuration": 0,
"devMode": False,
"hasAddon": True,
"castConnected": False,
"package": "tv.vavoo.app",
"version": "3.1.20",
"process": "app",
"firstAppStart": 1743962904623,
"lastAppStart": 1743962904623,
"ipLocation": "",
"adblockEnabled": True,
"proxy": {
"supported": ["ss", "openvpn"],
"engine": "ss",
"ssVersion": 1,
"enabled": True,
"autoServer": True,
"id": "pl-waw"
},
"iap": {
"supported": False
}
}
try:
resp = self.session.post("https://www.vavoo.tv/api/app/ping", json=data, headers=headers, timeout=20)
resp.raise_for_status()
result = resp.json()
addon_sig = result.get("addonSig")
if addon_sig:
return addon_sig
else:
return None
except Exception:
return None
def resolve_vavoo_link(self, link, verbose=False):
"""
Risolve un link Vavoo usando solo il metodo principale (streammode=1)
"""
if "vavoo.to" not in link:
return None
# Solo metodo principale per il proxy
signature = self.getAuthSignature()
if not signature:
return None
headers = {
"user-agent": "MediaHubMX/2",
"accept": "application/json",
"content-type": "application/json; charset=utf-8",
"content-length": "115",
"accept-encoding": "gzip",
"mediahubmx-signature": signature
}
data = {
"language": "de",
"region": "AT",
"url": link,
"clientVersion": "3.0.2"
}
try:
resp = self.session.post("https://vavoo.to/mediahubmx-resolve.json", json=data, headers=headers, timeout=20)
resp.raise_for_status()
result = resp.json()
if isinstance(result, list) and result and result[0].get("url"):
resolved_url = result[0]["url"]
return resolved_url
elif isinstance(result, dict) and result.get("url"):
return result["url"]
else:
return None
except Exception as e:
logger.error(f"Errore nella risoluzione Vavoo: {e}")
return None
# Istanza globale del resolver Vavoo
vavoo_resolver = VavooResolver()
DADDYLIVE_BASE_URL = None
LAST_FETCH_TIME = 0
FETCH_INTERVAL = 3600
def get_daddylive_base_url():
"""Fetches and caches the dynamic base URL for DaddyLive."""
global DADDYLIVE_BASE_URL, LAST_FETCH_TIME
current_time = time.time()
if DADDYLIVE_BASE_URL and (current_time - LAST_FETCH_TIME < FETCH_INTERVAL):
return DADDYLIVE_BASE_URL
try:
logger.info("Fetching dynamic DaddyLive base URL from GitHub...")
github_url = 'https://raw.githubusercontent.com/thecrewwh/dl_url/refs/heads/main/dl.xml'
response = requests.get(github_url, timeout=10)
response.raise_for_status()
content = response.text
match = re.search(r'src\s*=\s*"([^"]*)"', content)
if match:
base_url = match.group(1)
if not base_url.endswith('/'):
base_url += '/'
DADDYLIVE_BASE_URL = base_url
LAST_FETCH_TIME = current_time
logger.info(f"Dynamic DaddyLive base URL updated to: {DADDYLIVE_BASE_URL}")
return DADDYLIVE_BASE_URL
except requests.RequestException as e:
logger.error(f"Error fetching dynamic DaddyLive URL: {e}. Using fallback.")
DADDYLIVE_BASE_URL = "https://daddylive.sx/"
logger.info(f"Using fallback DaddyLive URL: {DADDYLIVE_BASE_URL}")
return DADDYLIVE_BASE_URL
def extract_channel_id(url):
"""Estrae l'ID del canale da vari formati URL"""
match_premium = re.search(r'/premium(\d+)/mono\.m3u8$', url)
if match_premium:
return match_premium.group(1)
match_player = re.search(r'/(?:watch|stream|cast|player)/stream-(\d+)\.php', url)
if match_player:
return match_player.group(1)
return None
def process_daddylive_url(url):
"""Converte URL vecchi in formati compatibili con DaddyLive 2025"""
daddy_base_url = get_daddylive_base_url()
daddy_domain = urlparse(daddy_base_url).netloc
match_premium = re.search(r'/premium(\d+)/mono\.m3u8$', url)
if match_premium:
channel_id = match_premium.group(1)
new_url = f"{daddy_base_url}watch/stream-{channel_id}.php"
logger.info(f"URL processato da {url} a {new_url}")
return new_url
if daddy_domain in url and any(p in url for p in ['/watch/', '/stream/', '/cast/', '/player/']):
return url
if url.isdigit():
return f"{daddy_base_url}watch/stream-{url}.php"
return url
def resolve_m3u8_link(url, headers=None):
if not url:
logger.error("Errore: URL non fornito.")
return {"resolved_url": None, "headers": {}}
current_headers = headers.copy() if headers else {}
clean_url = url
extracted_headers = {}
if '&h_' in url or '%26h_' in url:
logger.info("Rilevati parametri header nell'URL - Estrazione in corso...")
temp_url = url
if 'vavoo.to' in temp_url.lower() and '%26' in temp_url:
temp_url = temp_url.replace('%26', '&')
if '%26h_' in temp_url:
temp_url = unquote(unquote(temp_url))
url_parts = temp_url.split('&h_', 1)
clean_url = url_parts[0]
header_params = '&h_' + url_parts[1]
for param in header_params.split('&'):
if param.startswith('h_'):
try:
key_value = param[2:].split('=', 1)
if len(key_value) == 2:
key = unquote(key_value[0]).replace('_', '-')
value = unquote(key_value[1])
extracted_headers[key] = value
except Exception as e:
logger.error(f"Errore nell'estrazione dell'header {param}: {e}")
final_headers = {**current_headers, **extracted_headers}
is_daddylive_link = (
'newkso.ru' in clean_url.lower() or
'/stream-' in clean_url.lower() or
re.search(r'/premium(\d+)/mono\.m3u8$', clean_url) is not None
)
if not is_daddylive_link:
if 'vavoo.to' in clean_url.lower() and ('/vavoo-iptv/play/' in clean_url.lower() or '/play/' in clean_url.lower()):
try:
resolved_vavoo = vavoo_resolver.resolve_vavoo_link(clean_url, verbose=True)
if resolved_vavoo:
return {
"resolved_url": resolved_vavoo,
"headers": final_headers
}
else:
return {
"resolved_url": clean_url,
"headers": final_headers
}
except Exception:
return {
"resolved_url": clean_url,
"headers": final_headers
}
return {
"resolved_url": clean_url,
"headers": final_headers
}
daddy_base_url = get_daddylive_base_url()
daddy_origin = urlparse(daddy_base_url).scheme + "://" + urlparse(daddy_base_url).netloc
daddylive_headers = {
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36',
'Referer': daddy_base_url,
'Origin': daddy_origin
}
final_headers_for_resolving = {**final_headers, **daddylive_headers}
try:
github_url = 'https://raw.githubusercontent.com/thecrewwh/dl_url/refs/heads/main/dl.xml'
main_url_req = requests.get(github_url, timeout=10)
main_url_req.raise_for_status()
main_url = main_url_req.text
baseurl = re.findall('(?s)src = "([^"]*)', main_url)[0]
channel_id = extract_channel_id(clean_url)
if not channel_id:
logger.error(f"Impossibile estrarre ID canale da {clean_url}")
return {"resolved_url": clean_url, "headers": current_headers}
stream_url = f"{baseurl}stream/stream-{channel_id}.php"
final_headers_for_resolving['Referer'] = baseurl + '/'
final_headers_for_resolving['Origin'] = baseurl
max_retries = 2
for retry in range(max_retries):
try:
response = requests.get(stream_url, headers=final_headers_for_resolving, timeout=15)
response.raise_for_status()
break
except requests.exceptions.ProxyError as e:
if "429" in str(e) and retry < max_retries - 1:
logger.warning(f"Proxy rate limited (429), retry {retry + 1}/{max_retries}: {stream_url}")
time.sleep(1)
continue
else:
raise
except requests.RequestException:
if retry < max_retries - 1:
logger.warning(f"Request failed, retry {retry + 1}/{max_retries}: {stream_url}")
time.sleep(0.5)
continue
else:
raise
iframes = re.findall(r'<a[^>]*href="([^"]+)"[^>]*>\s*<button[^>]*>\s*Player\s*2\s*</button>', response.text)
if not iframes:
logger.error("Nessun link Player 2 trovato")
return {"resolved_url": clean_url, "headers": current_headers}
url2 = iframes[0]
url2 = baseurl + url2
url2 = url2.replace('//cast', '/cast')
final_headers_for_resolving['Referer'] = url2
final_headers_for_resolving['Origin'] = url2
response = requests.get(url2, headers=final_headers_for_resolving, timeout=15)
response.raise_for_status()
iframes = re.findall(r'iframe src="([^"]*)', response.text)
if not iframes:
logger.error("Nessun iframe trovato nella pagina Player 2")
return {"resolved_url": clean_url, "headers": current_headers}
iframe_url = iframes[0]
response = requests.get(iframe_url, headers=final_headers_for_resolving, timeout=15)
response.raise_for_status()
iframe_content = response.text
try:
channel_key = re.findall(r'(?s) channelKey = \"([^"]*)', iframe_content)[0]
auth_ts_b64 = re.findall(r'(?s)c = atob\("([^"]*)', iframe_content)[0]
auth_ts = base64.b64decode(auth_ts_b64).decode('utf-8')
auth_rnd_b64 = re.findall(r'(?s)d = atob\("([^"]*)', iframe_content)[0]
auth_rnd = base64.b64decode(auth_rnd_b64).decode('utf-8')
auth_sig_b64 = re.findall(r'(?s)e = atob\("([^"]*)', iframe_content)[0]
auth_sig = base64.b64decode(auth_sig_b64).decode('utf-8')
auth_sig = quote_plus(auth_sig)
auth_host_b64 = re.findall(r'(?s)a = atob\("([^"]*)', iframe_content)[0]
auth_host = base64.b64decode(auth_host_b64).decode('utf-8')
auth_php_b64 = re.findall(r'(?s)b = atob\("([^"]*)', iframe_content)[0]
auth_php = base64.b64decode(auth_php_b64).decode('utf-8')
except (IndexError, Exception) as e:
logger.error(f"Errore estrazione parametri: {e}")
return {"resolved_url": clean_url, "headers": current_headers}
auth_url = f'{auth_host}{auth_php}?channel_id={channel_key}&ts={auth_ts}&rnd={auth_rnd}&sig={auth_sig}'
auth_response = requests.get(auth_url, headers=final_headers_for_resolving, timeout=15)
auth_response.raise_for_status()
host = re.findall('(?s)m3u8 =.*?:.*?:.*?".*?".*?"([^"]*)', iframe_content)[0]
server_lookup = re.findall(r'n fetchWithRetry\(\s*\'([^\']*)', iframe_content)[0]
server_lookup_url = f"https://{urlparse(iframe_url).netloc}{server_lookup}{channel_key}"
lookup_response = requests.get(server_lookup_url, headers=final_headers_for_resolving, timeout=15)
lookup_response.raise_for_status()
server_data = lookup_response.json()
server_key = server_data['server_key']
referer_raw = f'https://{urlparse(iframe_url).netloc}'
clean_m3u8_url = f'https://{server_key}{host}{server_key}/{channel_key}/mono.m3u8'
final_headers_for_fetch = {
'User-Agent': final_headers_for_resolving.get('User-Agent'),
'Referer': referer_raw,
'Origin': referer_raw
}
return {
"resolved_url": clean_m3u8_url,
"headers": {**final_headers, **final_headers_for_fetch}
}
except Exception:
return {"resolved_url": clean_url, "headers": final_headers}

View File

@@ -2,6 +2,7 @@
import asyncio import asyncio
from asyncio import create_subprocess_exec, subprocess from asyncio import create_subprocess_exec, subprocess
from asyncio.subprocess import Process from asyncio.subprocess import Process
from utils.proxy_utils import resolve_m3u8_link
async def stream_generator(process: Process, url: str, headers=None, proxy=None): async def stream_generator(process: Process, url: str, headers=None, proxy=None):
"""Generate streaming content asynchronously""" """Generate streaming content asynchronously"""
@@ -24,13 +25,13 @@ async def stream_generator(process: Process, url: str, headers=None, proxy=None)
print(f"Error reading stream: {e}") print(f"Error reading stream: {e}")
try: try:
process.terminate() process.terminate()
except: except ProcessLookupError:
pass pass
process = await generate_streamlink_process(url, headers, proxy) process = await generate_streamlink_process(url, headers, proxy)
finally: finally:
try: try:
process.terminate() process.terminate()
except: except ProcessLookupError:
pass pass
async def generate_streamlink_process(url, headers=None, proxy=None) -> Process: async def generate_streamlink_process(url, headers=None, proxy=None) -> Process:
@@ -40,6 +41,11 @@ async def generate_streamlink_process(url, headers=None, proxy=None) -> Process:
url: Stream URL url: Stream URL
headers: Optional dict of HTTP headers headers: Optional dict of HTTP headers
""" """
# Resolve the URL using the proxy logic
resolved_data = resolve_m3u8_link(url, headers)
resolved_url = resolved_data.get("resolved_url", url)
resolved_headers = resolved_data.get("headers", headers)
cmd = [ cmd = [
'streamlink', 'streamlink',
'--ffmpeg-fout', 'mpegts', '--ffmpeg-fout', 'mpegts',
@@ -56,11 +62,11 @@ async def generate_streamlink_process(url, headers=None, proxy=None) -> Process:
cmd.extend(['--http-proxy', proxy]) cmd.extend(['--http-proxy', proxy])
# Add headers if specified # Add headers if specified
if headers: if resolved_headers:
for key, value in headers.items(): for key, value in resolved_headers.items():
cmd.extend(['--http-header', f'{key}={value}']) cmd.extend(['--http-header', f'{key}={value}'])
cmd.extend(['--stdout', url, 'best']) cmd.extend(['--stdout', resolved_url, 'best'])
process = await create_subprocess_exec( process = await create_subprocess_exec(
*cmd, *cmd,