plugins.wwenetwork: new api layout #5559

kitanoyoru · 2023-09-17T19:15:58Z

before changes:

[cli][debug] OS:         macOS 13.4
[cli][debug] Python:     3.11.5
[cli][debug] OpenSSL:    OpenSSL 3.1.2 1 Aug 2023
[cli][debug] Streamlink: 6.2.0
[cli][debug] Dependencies:
[cli][debug]  certifi: 2023.7.22
[cli][debug]  isodate: 0.6.1
[cli][debug]  lxml: 4.9.3
[cli][debug]  pycountry: 22.3.5
[cli][debug]  pycryptodome: 3.18.0
[cli][debug]  PySocks: 1.7.1
[cli][debug]  requests: 2.31.0
[cli][debug]  trio: 0.22.2
[cli][debug]  trio-websocket: 0.10.4
[cli][debug]  typing-extensions: 4.7.1
[cli][debug]  urllib3: 2.0.4
[cli][debug]  websocket-client: 1.6.3
[cli][debug] Arguments:
[cli][debug]  url=https://network.wwe.com/video/495654/money-in-the-bank-2023
[cli][debug]  stream=['best']
[cli][debug]  --loglevel=debug
[cli][debug]  --wwenetwork-email=****@outlook.at
[cli][debug]  --wwenetwork-password=********
error: No plugin can handle URL: https://network.wwe.com/video/495654/money-in-the-bank-2023

after

[cli][debug] OS:         macOS 13.4
[cli][debug] Python:     3.11.5
[cli][debug] OpenSSL:    OpenSSL 3.1.2 1 Aug 2023
[cli][debug] Streamlink: 6.2.0+2.g1603dbc7.dirty
[cli][debug] Dependencies:
[cli][debug]  certifi: 2023.7.22
[cli][debug]  isodate: 0.6.1
[cli][debug]  lxml: 4.9.3
[cli][debug]  pycountry: 22.3.5
[cli][debug]  pycryptodome: 3.19.0
[cli][debug]  PySocks: 1.7.1
[cli][debug]  requests: 2.31.0
[cli][debug]  trio: 0.22.2
[cli][debug]  trio-websocket: 0.10.4
[cli][debug]  typing-extensions: 4.7.1
[cli][debug]  urllib3: 2.0.4
[cli][debug]  websocket-client: 1.6.3
[cli][debug] Arguments:
[cli][debug]  url=https://network.wwe.com/video/495654/money-in-the-bank-2023
[cli][debug]  stream=['best']
[cli][debug]  --loglevel=debug
[cli][debug]  --wwenetwork-email=****@outlook.at
[cli][debug]  --wwenetwork-password=********
[cli][info] Found matching plugin wwenetwork for URL https://network.wwe.com/video/495654/money-in-the-bank-2023
[plugins.wwenetwork][debug] Attempting login as flash@outlook.at
[plugins.wwenetwork][debug] API request: POST https://dce-frontoffice.imggaming.com/api/v2/login
[plugins.wwenetwork][debug] Found content ID: vod/495654
[plugins.wwenetwork][debug] API request: GET https://dce-frontoffice.imggaming.com/api/v2/stream/vod/495654
[plugins.wwenetwork][debug] API request: GET https://dve-api.imggaming.com/v/495654?customerId=16&auth=2073c0a66a3080c6210cf5943b046879&timestamp=1694978040547&sId=549b8163-7c60-4859-9b06-34c43cd4a14b
[utils.l10n][debug] Language code: en_US
[stream.ffmpegmux][debug] ffmpeg version 6.0 Copyright (c) 2000-2023 the FFmpeg developers
[stream.ffmpegmux][debug]  built with Apple clang version 14.0.3 (clang-1403.0.22.14.1)
[stream.ffmpegmux][debug]  configuration: --prefix=/usr/local/Cellar/ffmpeg/6.0_1 --enable-shared --enable-pthreads --enable-version3 --cc=clang --host-cflags= --host-ldflags= --enable-ffplay --enable-gnutls --enable-gpl --enable-libaom --enable-libaribb24 --enable-libbluray --enable-libdav1d --enable-libmp3lame --enable-libopus --enable-librav1e --enable-librist --enable-librubberband --enable-libsnappy --enable-libsrt --enable-libsvtav1 --enable-libtesseract --enable-libtheora --enable-libvidstab --enable-libvmaf --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 --enable-libxml2 --enable-libxvid --enable-lzma --enable-libfontconfig --enable-libfreetype --enable-frei0r --enable-libass --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopenjpeg --enable-libspeex --enable-libsoxr --enable-libzmq --enable-libzimg --disable-libjack --disable-indev=jack --enable-videotoolbox --enable-audiotoolbox
[stream.ffmpegmux][debug]  libavutil      58.  2.100 / 58.  2.100
[stream.ffmpegmux][debug]  libavcodec     60.  3.100 / 60.  3.100
[stream.ffmpegmux][debug]  libavformat    60.  3.100 / 60.  3.100
[stream.ffmpegmux][debug]  libavdevice    60.  1.100 / 60.  1.100
[stream.ffmpegmux][debug]  libavfilter     9.  3.100 /  9.  3.100
[stream.ffmpegmux][debug]  libswscale      7.  1.100 /  7.  1.100
[stream.ffmpegmux][debug]  libswresample   4. 10.100 /  4. 10.100
[stream.ffmpegmux][debug]  libpostproc    57.  1.100 / 57.  1.100
[stream.hls][debug] Using external audio tracks for stream 720p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 1080p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 1080p_alt (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 720p_alt (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 504p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 360p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 288p (language=eng, name=English)
[cli][info] Available streams: 288p (worst), 360p, 504p, 720p_alt, 720p, 1080p_alt, 1080p (best)
[cli][info] Opening stream: 1080p (hls-multi)
[cli][info] Starting player: /Applications/VLC.app/Contents/MacOS/VLC
[stream.ffmpegmux][debug] Opening hls substream
[stream.hls][debug] Reloading playlist
[stream.ffmpegmux][debug] Opening hls substream
[stream.hls][debug] Reloading playlist
[utils.named_pipe][info] Creating pipe streamlinkpipe-80659-1-787
[utils.named_pipe][info] Creating pipe streamlinkpipe-80659-2-6708
[stream.ffmpegmux][debug] ffmpeg command: /usr/local/bin/ffmpeg -nostats -y -i /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-80659-1-787 -i /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-80659-2-6708 -c:v copy -c:a copy -map 0:v? -map 0:a? -map 1:a -f mpegts pipe:1
[stream.ffmpegmux][debug] Starting copy to pipe: /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-80659-1-787
[stream.ffmpegmux][debug] Starting copy to pipe: /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-80659-2-6708
[cli][debug] Pre-buffering 8192 bytes
[stream.hls][debug] First Sequence: 0; Last Sequence: 2161
[stream.hls][debug] Start offset: 0; Duration: None; Start Sequence: 0; End Sequence: 2161
[stream.hls][debug] Adding segment 0 to queue
[stream.hls][debug] Adding segment 1 to queue
[stream.hls][debug] Adding segment 2 to queue
[stream.hls][debug] Adding segment 3 to queue
[stream.hls][debug] Adding segment 4 to queue
[stream.hls][debug] Adding segment 5 to queue

bastimeyer

Thanks for the PR.
Since this site requires having an account, I can't verify these changes.

Please don't forget to update the plugin matcher tests. As you can see, the tests have failed.

src/streamlink/plugins/wwenetwork.py

MaxosHadj · 2023-09-29T09:15:57Z

There is no audio in the output file.

kitanoyoru · 2023-09-29T11:41:51Z

@MaxosI As you can see from my logs I have streamlink finding audio tracks, and hence the final output with audio

[stream.hls][debug] Using external audio tracks for stream 720p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 1080p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 1080p_alt (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 720p_alt (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 504p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 360p (language=eng, name=English)
[stream.hls][debug] Using external audio tracks for stream 288p (language=eng, name=English)
[cli][info] Available streams: 288p (worst), 360p, 504p, 720p_alt, 720p, 1080p_alt, 1080p (best)
[cli][info] Opening stream: 1080p (hls-multi)
[cli][info] Starting player: /Applications/VLC.app/Contents/MacOS/VLC

bastimeyer · 2023-09-29T11:50:49Z

There is no audio in the output file.
hls-multi

Muxing external audio tracks requires FFmpeg. FFmpeg is looked up automatically in the dirs of the user's PATH env var, or via the --ffmpeg-ffmpeg CLI argument and respective session option.
https://streamlink.github.io/cli.html#ffmpeg-options

Lint / Code style (pull_request) Failing after 28s

Please fix the linting error and provide a full debug log of both live streams and VODs, so I can see that the changes actually fix the plugin.

Alternatively, one of you can send me auth data, so I can see for myself. As commented, the plugin is in a rough shape due to not being updated in a long time, so if I had auth data, I can have a look at rewriting and cleaning up the plugin.

kitanoyoru · 2023-09-29T14:08:53Z

@bastimeyer
Debug logs for VOD:

[cli][debug] OS:         macOS 13.4
[cli][debug] Python:     3.11.5
[cli][debug] OpenSSL:    OpenSSL 3.1.2 1 Aug 2023
[cli][debug] Streamlink: 0.0.0+unknown
[cli][debug] Dependencies:
[cli][debug]  certifi: 2023.7.22
[cli][debug]  isodate: 0.6.1
[cli][debug]  lxml: 4.9.3
[cli][debug]  pycountry: 22.3.5
[cli][debug]  pycryptodome: 3.19.0
[cli][debug]  PySocks: 1.7.1
[cli][debug]  requests: 2.31.0
[cli][debug]  trio: 0.22.2
[cli][debug]  trio-websocket: 0.11.1
[cli][debug]  typing-extensions: 4.8.0
[cli][debug]  urllib3: 2.0.5
[cli][debug]  websocket-client: 1.6.3
[cli][debug] Arguments:
[cli][debug]  url=https://network.wwe.com/video/522956
[cli][debug]  stream=['best']
[cli][debug]  --loglevel=debug
[cli][debug]  --wwenetwork-email=flash@outlook.at
[cli][debug]  --wwenetwork-password=********
[cli][info] Found matching plugin wwenetwork for URL https://network.wwe.com/video/522956
[plugins.wwenetwork][debug] Attempting login as flash@outlook.at
[plugins.wwenetwork][debug] API request: POST https://dce-frontoffice.imggaming.com/api/v2/login
[plugins.wwenetwork][debug] Loading live event
[plugins.wwenetwork][debug] API request: GET https://dce-frontoffice.imggaming.com/api/v2/event/live
[plugins.wwenetwork][debug] Found content ID: vod/522956
[plugins.wwenetwork][debug] API request: GET https://dce-frontoffice.imggaming.com/api/v2/stream/vod/522956
[plugins.wwenetwork][debug] API request: GET https://dve-api.imggaming.com/v/522956?customerId=16&auth=042ca4c9f3541ea72dabb062c267c3d0&timestamp=1695995947799&sId=2ce2a5b7-24e3-431c-b368-67cc80c2c53f
[utils.l10n][debug] Language code: en_US
[stream.ffmpegmux][debug] ffmpeg version 6.0 Copyright (c) 2000-2023 the FFmpeg developers
[stream.ffmpegmux][debug]  built with Apple clang version 14.0.3 (clang-1403.0.22.14.1)
[stream.ffmpegmux][debug]  configuration: --prefix=/usr/local/Cellar/ffmpeg/6.0_1 --enable-shared --enable-pthreads --enable-version3 --cc=clang --host-cflags= --host-ldflags= --enable-ffplay --enable-gnutls --enable-gpl --enable-libaom --enable-libaribb24 --enable-libbluray --enable-libdav1d --enable-libmp3lame --enable-libopus --enable-librav1e --enable-librist --enable-librubberband --enable-libsnappy --enable-libsrt --enable-libsvtav1 --enable-libtesseract --enable-libtheora --enable-libvidstab --enable-libvmaf --enable-libvorbis --enable-libvpx --enable-libwebp --enable-libx264 --enable-libx265 --enable-libxml2 --enable-libxvid --enable-lzma --enable-libfontconfig --enable-libfreetype --enable-frei0r --enable-libass --enable-libopencore-amrnb --enable-libopencore-amrwb --enable-libopenjpeg --enable-libspeex --enable-libsoxr --enable-libzmq --enable-libzimg --disable-libjack --disable-indev=jack --enable-videotoolbox --enable-audiotoolbox
[stream.ffmpegmux][debug]  libavutil      58.  2.100 / 58.  2.100
[stream.ffmpegmux][debug]  libavcodec     60.  3.100 / 60.  3.100
[stream.ffmpegmux][debug]  libavformat    60.  3.100 / 60.  3.100
[stream.ffmpegmux][debug]  libavdevice    60.  1.100 / 60.  1.100
[stream.ffmpegmux][debug]  libavfilter     9.  3.100 /  9.  3.100
[stream.ffmpegmux][debug]  libswscale      7.  1.100 /  7.  1.100
[stream.ffmpegmux][debug]  libswresample   4. 10.100 /  4. 10.100
[stream.ffmpegmux][debug]  libpostproc    57.  1.100 / 57.  1.100
[stream.hls][debug] Using external audio tracks for stream 720p (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 1080p (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 1080p_alt (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 720p_alt (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 504p (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 360p (language=eng, name=English (United States))
[stream.hls][debug] Using external audio tracks for stream 288p (language=eng, name=English (United States))
[cli][info] Available streams: 288p (worst), 360p, 504p, 720p_alt, 720p, 1080p_alt, 1080p (best)
[cli][info] Opening stream: 1080p (hls-multi)
[cli][info] Starting player: /Applications/VLC.app/Contents/MacOS/VLC
[stream.ffmpegmux][debug] Opening hls substream
[stream.hls][debug] Reloading playlist
[stream.ffmpegmux][debug] Opening hls substream
[stream.hls][debug] Reloading playlist
[utils.named_pipe][info] Creating pipe streamlinkpipe-46812-1-8912
[utils.named_pipe][info] Creating pipe streamlinkpipe-46812-2-1727
[stream.ffmpegmux][debug] ffmpeg command: /usr/local/bin/ffmpeg -nostats -y -i /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-46812-1-8912 -i /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-46812-2-1727 -c:v copy -c:a copy -map 0:v? -map 0:a? -map 1:a -f mpegts pipe:1
[stream.ffmpegmux][debug] Starting copy to pipe: /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-46812-1-8912
[stream.ffmpegmux][debug] Starting copy to pipe: /var/folders/nl/hrx_nbb90fxcym4mk22wtw0w0000gn/T/streamlinkpipe-46812-2-1727
[cli][debug] Pre-buffering 8192 bytes
[stream.hls][debug] First Sequence: 0; Last Sequence: 870
[stream.hls][debug] Start offset: 0; Duration: None; Start Sequence: 0; End Sequence: 870
[stream.hls][debug] Adding segment 0 to queue
[stream.hls][debug] Adding segment 1 to queue
[stream.hls][debug] Adding segment 2 to queue
[stream.hls][debug] Adding segment 3 to queue
[stream.hls][debug] Adding segment 4 to queue
[stream.hls][debug] Adding segment 5 to queue
[stream.hls][debug] Adding segment 6 to queue
[stream.hls][debug] Adding segment 7 to queue
[stream.hls][debug] Adding segment 8 to queue
[stream.hls][debug] Adding segment 9 to queue
[stream.hls][debug] Adding segment 10 to queue

And for live stream:

[cli][debug] OS:         macOS 13.4
[cli][debug] Python:     3.11.5
[cli][debug] OpenSSL:    OpenSSL 3.1.2 1 Aug 2023
[cli][debug] Streamlink: 0.0.0+unknown
[cli][debug] Dependencies:
[cli][debug]  certifi: 2023.7.22
[cli][debug]  isodate: 0.6.1
[cli][debug]  lxml: 4.9.3
[cli][debug]  pycountry: 22.3.5
[cli][debug]  pycryptodome: 3.19.0
[cli][debug]  PySocks: 1.7.1
[cli][debug]  requests: 2.31.0
[cli][debug]  trio: 0.22.2
[cli][debug]  trio-websocket: 0.11.1
[cli][debug]  typing-extensions: 4.8.0
[cli][debug]  urllib3: 2.0.5
[cli][debug]  websocket-client: 1.6.3
[cli][debug] Arguments:
[cli][debug]  url=https://network.wwe.com/live/111449
[cli][debug]  stream=['best']
[cli][debug]  --loglevel=debug
[cli][debug]  --wwenetwork-email=flash@outlook.at
[cli][debug]  --wwenetwork-password=********
[cli][info] Found matching plugin wwenetwork for URL https://network.wwe.com/live/111449
[plugins.wwenetwork][debug] Attempting login as flash@outlook.at
[plugins.wwenetwork][debug] API request: POST https://dce-frontoffice.imggaming.com/api/v2/login
[plugins.wwenetwork][debug] Loading live event
[plugins.wwenetwork][debug] API request: GET https://dce-frontoffice.imggaming.com/api/v2/event/live
[plugins.wwenetwork][debug] Found content ID: event/1/1/1/111449
[plugins.wwenetwork][debug] API request: GET https://dce-frontoffice.imggaming.com/api/v2/stream/event/1/1/1/111449
[plugins.wwenetwork][debug] API request: GET https://dge-streaming.imggaming.com/api/v3/streaming/events/111449/stream?hlsv2=true&operatorId=158&auth=5153036dea6f74bac01909a00fee49ebcdeb209ce1870a1011becb20be9eb92c&timestamp=1695996490642&uu=false&nondrm=true&uid=sKcN4M%7Cd78b3690-96b0-4172-88e4-a508fd559775&dty=BROWSER&realm=dce.wwe&sId=fe8f7c2a-91ef-49bf-9242-6166ec6ae40f&ssai=OFF
[utils.l10n][debug] Language code: en_US
[cli][info] Available streams: 288p_alt (worst), 288p, 360p_alt, 360p, 504p_alt2, 504p_alt, 504p, 720p_alt2, 720p_alt, 720p (best)
[cli][info] Opening stream: 720p (hls)
[cli][info] Starting player: /Applications/VLC.app/Contents/MacOS/VLC
[stream.hls][debug] Reloading playlist
[cli][debug] Pre-buffering 8192 bytes
[stream.hls][debug] First Sequence: 19693270; Last Sequence: 19693279
[stream.hls][debug] Start offset: 0; Duration: None; Start Sequence: 19693277; End Sequence: None
[stream.hls][debug] Adding segment 19693277 to queue
[stream.hls][debug] Adding segment 19693278 to queue
[stream.hls][debug] Adding segment 19693279 to queue
[stream.hls][debug] Writing segment 19693277 to output
[stream.hls][debug] Segment 19693277 complete
[cli.output][debug] Opening subprocess: ['/Applications/VLC.app/Contents/MacOS/VLC', '--input-title-format', 'https://network.wwe.com/live/111449', '-']
[cli][debug] Writing stream to output
[stream.hls][debug] Writing segment 19693278 to output
[stream.hls][debug] Segment 19693278 complete
[stream.hls][debug] Writing segment 19693279 to output
[stream.hls][debug] Segment 19693279 complete
[stream.hls][debug] Reloading playlist
[stream.hls][debug] Adding segment 19693280 to queue
[stream.hls][debug] Writing segment 19693280 to output
[stream.hls][debug] Segment 19693280 complete
[stream.hls][debug] Reloading playlist
[stream.hls][debug] Adding segment 19693281 to queue
[stream.hls][debug] Writing segment 19693281 to output
[stream.hls][debug] Segment 19693281 complete

bastimeyer

Thanks, @kitanoyoru

plugins.wwenetwork: new api layout (streamlink#5503)

1603dbc

bastimeyer changed the title ~~plugins.wwenetwork: new api layout (#5503)~~ plugins.wwenetwork: new api layout Sep 17, 2023

bastimeyer added plugin issue A Plugin does not work correctly restriction: account needed labels Sep 17, 2023

bastimeyer requested changes Sep 17, 2023

View reviewed changes

src/streamlink/plugins/wwenetwork.py Outdated Show resolved Hide resolved

src/streamlink/plugins/wwenetwork.py Outdated Show resolved Hide resolved

src/streamlink/plugins/wwenetwork.py Outdated Show resolved Hide resolved

kitanoyoru added 3 commits September 18, 2023 07:11

plugins.wwenetwork: fix live stream (streamlink#5503)

0ec4abb

plugins.wwenetwork: fix tests (streamlink#5503)

730904f

plugins.wwenetwork: new live url format (streamlink#5503)

057a920

bastimeyer reviewed Sep 18, 2023

View reviewed changes

src/streamlink/plugins/wwenetwork.py Outdated Show resolved Hide resolved

plugins.wwenetwork: refactor regexp matcher (streamlink#5503)

4871c0c

plugins.wwenetwork: fix lint

5fcf049

bastimeyer added the PR: squash commits Commits need to be squashed as a single commit - eg. multiple commits for a single component label Sep 29, 2023

bastimeyer approved these changes Sep 29, 2023

View reviewed changes

bastimeyer merged commit 0e6a17f into streamlink:master Sep 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

plugins.wwenetwork: new api layout #5559

plugins.wwenetwork: new api layout #5559

Uh oh!

kitanoyoru commented Sep 17, 2023

Uh oh!

bastimeyer left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MaxosHadj commented Sep 29, 2023

Uh oh!

kitanoyoru commented Sep 29, 2023

Uh oh!

bastimeyer commented Sep 29, 2023

Uh oh!

kitanoyoru commented Sep 29, 2023

Uh oh!

bastimeyer left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

plugins.wwenetwork: new api layout #5559

plugins.wwenetwork: new api layout #5559

Uh oh!

Conversation

kitanoyoru commented Sep 17, 2023

Uh oh!

bastimeyer left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MaxosHadj commented Sep 29, 2023

Uh oh!

kitanoyoru commented Sep 29, 2023

Uh oh!

bastimeyer commented Sep 29, 2023

Uh oh!

kitanoyoru commented Sep 29, 2023

Uh oh!

bastimeyer left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants