Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ecau): provider fixes for Soundcloud, Amazon Music #653

Merged
merged 3 commits into from
Apr 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mb_enhanced_cover_art_uploads/providers/amazon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const VARIANT_TYPE_MAPPING: Record<string, ArtworkTypeIDs | undefined> = {
// CSS queries to figure out which type of page we're on
const AUDIBLE_PAGE_QUERY = '#audibleProductTitle'; // Product title with Audible logo on standard product pages
const DIGITAL_PAGE_QUERY = '.DigitalMusicDetailPage'; // TODO: Does this still exist?
const MUSIC_DIGITAL_PAGE_QUERY = '#nav-global-location-data-modal-action[data-a-modal*="DmusicRetailMp3Player"]'; // Dynamically loaded Amazon Music digital pages.
const MUSIC_DIGITAL_PAGE_QUERY = '#nav-global-location-data-modal-action[data-a-modal*="dmusicRetailMp3Player"]'; // Dynamically loaded Amazon Music digital pages.
const PHYSICAL_AUDIOBOOK_PAGE_QUERY = '#booksImageBlock_feature_div';

// CSS queries to extract a front cover from a page
Expand Down
4 changes: 3 additions & 1 deletion src/mb_enhanced_cover_art_uploads/providers/soundcloud.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ interface LoadedAPITrack {

type SCHydrationTrack = LazyAPITrack | LoadedAPITrack;

const SC_CLIENT_ID = 'DwmXmuOkvCh3VuIiUo9NZIgArRpEXjU0'; // TODO: Might change?
// NOTE: Already changed in the past, if it changes again we should write logic
// to extract it automatically.
const SC_CLIENT_ID = 'JYcDe4vHGjmQkIdR2BB58tFXMBO8M888';

export class SoundcloudProvider extends ProviderWithTrackImages {
public readonly supportedDomains = ['soundcloud.com'];
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
WARC/1.1
WARC-Filename: soundcloud provider/extracting images/throws on non-existent set
WARC-Date: 2022-10-09T08:06:44.387Z
WARC-Date: 2023-04-22T16:29:11.660Z
WARC-Type: warcinfo
WARC-Record-ID: <urn:uuid:1193e7eb-196b-42b6-8e22-cbd82ead1821>
WARC-Record-ID: <urn:uuid:7c6dd857-e8d4-482e-bc62-8d439ee8e7e8>
Content-Type: application/warc-fields
Content-Length: 119

Expand All @@ -12,11 +12,11 @@ harCreator: {"name":"Polly.JS","version":"6.0.5","comment":"persister:fs-warc"}


WARC/1.1
WARC-Concurrent-To: <urn:uuid:c0f8f040-1c8c-499f-8a17-fe6a59efaa05>
WARC-Concurrent-To: <urn:uuid:835a71fe-3068-4098-9028-a04acda52cdb>
WARC-Target-URI: https://soundcloud.com/officialpandaeyes/sets/isolationep404
WARC-Date: 2022-10-09T08:06:44.387Z
WARC-Date: 2023-04-22T16:29:11.660Z
WARC-Type: request
WARC-Record-ID: <urn:uuid:fc6d3320-e089-439b-8605-c6f2219d82f0>
WARC-Record-ID: <urn:uuid:bd57aa8b-e429-4f51-886d-9d3963a8841f>
Content-Type: application/http; msgtype=request
WARC-Payload-Digest: sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
WARC-Block-Digest: sha256:1d64cc5959ac68a62990b5a28da3ba268330520fa560c043cd9c9246ff8aa7aa
Expand All @@ -27,53 +27,53 @@ GET /officialpandaeyes/sets/isolationep404 HTTP/1.1


WARC/1.1
WARC-Concurrent-To: <urn:uuid:c0f8f040-1c8c-499f-8a17-fe6a59efaa05>
WARC-Concurrent-To: <urn:uuid:835a71fe-3068-4098-9028-a04acda52cdb>
WARC-Target-URI: https://soundcloud.com/officialpandaeyes/sets/isolationep404
WARC-Date: 2022-10-09T08:06:44.387Z
WARC-Date: 2023-04-22T16:29:11.660Z
WARC-Type: metadata
WARC-Record-ID: <urn:uuid:341da990-77c9-4c72-884c-3f59b7c48a7b>
WARC-Record-ID: <urn:uuid:2a20ad79-c1dc-4e2a-88fc-753dbde3ead9>
Content-Type: application/warc-fields
WARC-Payload-Digest: sha256:cfaf4155c7a5deb469f357e30c80def7e89c30f933874bca6c6694b7ee6f441c
WARC-Block-Digest: sha256:cfaf4155c7a5deb469f357e30c80def7e89c30f933874bca6c6694b7ee6f441c
WARC-Payload-Digest: sha256:f31cdcbc82c9c3fdeb1a88d01ab10e23353fd4b29a016059c7fc45d4814a407b
WARC-Block-Digest: sha256:f31cdcbc82c9c3fdeb1a88d01ab10e23353fd4b29a016059c7fc45d4814a407b
Content-Length: 348

harEntryId: 6dceb880d4e276164e734d0857885e3c
harEntryOrder: 0
cache: {}
startedDateTime: 2022-10-09T08:06:44.211Z
time: 175
timings: {"blocked":-1,"dns":-1,"connect":-1,"send":0,"wait":175,"receive":0,"ssl":-1}
startedDateTime: 2023-04-22T16:29:11.538Z
time: 121
timings: {"blocked":-1,"dns":-1,"connect":-1,"send":0,"wait":121,"receive":0,"ssl":-1}
warcRequestHeadersSize: 79
warcRequestCookies: []
warcResponseHeadersSize: 900
warcResponseHeadersSize: 899
warcResponseCookies: []
responseDecoded: false


WARC/1.1
WARC-Target-URI: https://soundcloud.com/officialpandaeyes/sets/isolationep404
WARC-Date: 2022-10-09T08:06:44.387Z
WARC-Date: 2023-04-22T16:29:11.660Z
WARC-Type: response
WARC-Record-ID: <urn:uuid:c0f8f040-1c8c-499f-8a17-fe6a59efaa05>
WARC-Record-ID: <urn:uuid:835a71fe-3068-4098-9028-a04acda52cdb>
Content-Type: application/http; msgtype=response
WARC-Payload-Digest: sha256:a347b0550ec9a320d0a4b5118ddc2f00ff52f44f65df960e184b841d1216d06b
WARC-Block-Digest: sha256:c34e22045e6a4db9197ff8bda115e7ea1fb219e2f047b5a90766a14d82f5a468
Content-Length: 17870
WARC-Payload-Digest: sha256:9b2f60f33daa8e84bb57ae7885b7b8cccaf2993396becce3739fd1f00d86a5d2
WARC-Block-Digest: sha256:30bc53695cdf40bf2c835de67b2769b3370b2e8a397468d2a8eaa51732301b69
Content-Length: 18144

HTTP/1.1 200 OK
cache-control: private, max-age=0, no-cache, no-store
connection: close
content-encoding: gzip
content-type: text/html
date: Sun, 09 Oct 2022 08:06:44 GMT
date: Sat, 22 Apr 2023 16:29:11 GMT
server: am/2
server-timing: enabledFeatures; dur=11.789713; desc="api-v2/enabledFeatures", experiments; dur=8.642526; desc="api-v2/experiments", geoip; dur=1.200189; desc="geoip/geoip", privacySettings; dur=7.034197; desc="api-v2/privacySettings"
server-timing: enabledFeatures; dur=5.405053; desc="api-v2/enabledFeatures", experiments; dur=7.572737; desc="api-v2/experiments", geoip; dur=1.003109; desc="geoip/geoip", privacySettings; dur=5.548816; desc="api-v2/privacySettings"
strict-transport-security: max-age=63072000; includeSubdomains; preload
transfer-encoding: chunked
vary: Accept-Encoding
via: 1.1 31a1ed822e5cb0d9c8c86a015f42b7be.cloudfront.net (CloudFront)
x-amz-cf-id: iXDI-JEpB4S8UrPb28da5rjR1bKswGxyI5GF9QLON15ngyprBX-v7Q==
x-amz-cf-pop: CDG50-P2
via: 1.1 dd9044f778a0203632be1c1b84d73ba8.cloudfront.net (CloudFront)
x-amz-cf-id: iAwsAzorJcEhZCkZpNbJFyxHkHQ_lwopU3Ynd5FdEOTviO1iK3XUyQ==
x-amz-cf-pop: LHR62-C2
x-cache: Miss from cloudfront
x-frame-options: SAMEORIGIN
x-pants: distant-towel
Expand Down Expand Up @@ -126,10 +126,10 @@ x-pollyjs-finalurl: https://soundcloud.com/officialpandaeyes/sets/isolationep404
<link href="https://a-v2.sndcdn.com/assets/images/sc-icons/favicon-2cadd14bdb.ico" rel="icon">
<link href="https://a-v2.sndcdn.com/assets/images/sc-icons/ios-a62dfc8fe7.png" rel="apple-touch-icon">
<link href="https://a-v2.sndcdn.com/assets/images/sc-icons/fluid-b4e7a64b8b.png" rel="fluid-icon">
<script>!function(){var o,a,r;function e(a){return a.test(o)}o=window.navigator.userAgent.toLowerCase();var i,t,n,s=void 0!==window.opera&&"[object Opera]"===window.opera.toString(),p=o.match(/\sopr\/([0-9]+)\./),d=e(/chrome/),c=e(/webkit/),m=!d&&e(/safari/),w=!s&&e(/msie|trident/),f=!c&&e(/gecko/);i=p?parseInt(p[1],10):(n=o.match(/(opera|chrome|safari|firefox|msie|rv:)\/?\s*(\.?\d+(\.\d+)*)/i))&&(t=o.match(/version\/([.\d]+)/i))?parseInt(t[1],10):n?parseInt(n[2],10):null;var h=e(/mobile|android|iphone|ipod|symbianos|nokia|s60|playbook|playstation/);f&&(r=(a=o.match(/(firefox)\/?\s*(\.?\d+(\.\d+)*)/i))&&a.length>1&&parseInt(a[2],10)>=41),i&&!h&&(d&&!p&&i<49||f&&!p&&!1===r||m&&i<8||w||s&&i<13||p&&i<27)&&(window.__sc_abortApp=!0)}()</script>
<script>!function(){var o,a,r;function e(a){return a.test(o)}o=window.navigator.userAgent.toLowerCase();var i,t,n,s=void 0!==window.opera&&"[object Opera]"===window.opera.toString(),p=o.match(/\sopr\/([0-9]+)\./),d=e(/chrome/),c=e(/webkit/),m=!d&&e(/safari/),w=!s&&e(/msie|trident/),f=!c&&e(/gecko/);i=p?parseInt(p[1],10):(n=o.match(/(opera|chrome|safari|firefox|msie|rv:)\/?\s*(\.?\d+(\.\d+)*)/i))&&(t=o.match(/version\/([.\d]+)/i))?parseInt(t[1],10):n?parseInt(n[2],10):null;var h=e(/mobile|android|iphone|ipod|symbianos|nokia|s60|playbook|playstation/);f&&(r=(a=o.match(/(firefox)\/?\s*(\.?\d+(\.\d+)*)/i))&&a.length>1&&parseInt(a[2],10)>=47),i&&!h&&(d&&!p&&i<49||f&&!p&&!1===r||m&&i<9||w||s&&i<13||p&&i<27)&&(window.__sc_abortApp=!0)}()</script>
<link rel="stylesheet" href="https://style.sndcdn.com/css/interstate-a86f07cf94ae5a496b24.css">

<link rel="stylesheet" href="https://a-v2.sndcdn.com/assets/css/app-da587f24b5ac4d7010fa.css">
<link rel="stylesheet" href="https://a-v2.sndcdn.com/assets/css/app-440803ce3e9b9c59a645.css">
</head>
<body class="ot-hide-banner sc-classic">

Expand Down Expand Up @@ -193,7 +193,7 @@ Please download one of our supported browsers.
</p>
</div>
<script crossorigin src="https://a-v2.sndcdn.com/assets/53-aed4402d.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/51-db625a70.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/51-024727b7.js"></script>
<script
async
src="https://cdn.cookielaw.org/consent/7e62c772-c97a-4d95-8d0a-f99bbeadcf61/otSDKStub.js"
Expand Down Expand Up @@ -241,18 +241,18 @@ Please download one of our supported browsers.
}(window));
</script>

<script>window.__sc_version="1665133451"</script>
<script>window.__sc_hydration = [{"hydratable":"anonymousId","data":"474329-78749-92161-854283"},{"hydratable":"features","data":{"features":["mobi_use_onetrust_gb","v2_enable_onetrust_user_id","v2_peace_ukraine_logo_takeover","v2_use_onetrust_tcfv2_eu1","v2_ie11_support_end","v2_use_updated_alert_banner_quota_upsell","checkout_use_new_plan_picker","v2_use_onetrust_eu2","mobi_enable_onetrust_tcfv2","mobi_tracking_send_session_id","mobi_use_onetrust_eu1","v2_use_onetrust_user_id_eu2","v2_enable_sourcepoint_tcfv2","mobi_peace_ukraine_logo_takeover","mobi_use_onetrust_tcfv2_eu2","v2_test_feature_toggle","checkout_send_segment_events_to_event_gateway","mobi_use_onetrust_user_id_eu1","mobi_enable_onetrust_user_id","mobi_use_onetrust_user_id_ex_us","mobi_use_onetrust_tcfv2_eu1","v2_post_with_caption","mobi_use_onetrust_eu4","featured_artists_banner","v2_repost_redirect_page","v2_use_onetrust_gb","mobi_use_onetrust_user_id_global","use_onetrust_async","v2_signals_collection","v2_track_level_distro_to_plan_picker","v2_direct_support_link","v2_hq_file_storage_release","mobi_use_onetrust_user_id_eu2","v2_use_onetrust_eu4","v2_stories_onboarding","v2_enable_onetrust","v2_import_playlist_experiment","v2_disable_sidebar_comments_count","v2_use_onetrust_us","checkout_use_recurly_with_paypal","v2_use_onetrust_tcfv2_ex_us","mobi_use_onetrust_eu3","mobi_use_onetrust_elsewhere","v2_use_onetrust_eu3","mobi_use_onetrust_us","v2_oscp_german_tax_fields_support","v2_use_onetrust_user_id_ex_us","v2_use_new_connect","v2_use_onetrust_tcfv2_eu2","v2_send_segment_events_to_event_gateway","v2_use_onetrust_eu1","v2_enable_sourcepoint","v2_repost_with_caption_graphql","mobi_use_onetrust_tcfv2_ex_us","v2_tags_recent_tracks","mobi_use_onetrust_eu2","v2_enable_new_web_errors","v2_use_onetrust_elsewhere","v2_webauth_use_local_tracking","mobi_sign_in_experiment","mobi_enable_onetrust","v2_can_see_insights","mobi_trinity","v2_google_one_tap","v2_enable_pwa","mobi_use_hls_hack","v2_stories","v2_use_onetrust_user_id_eu1","v2_use_onetrust_user_id_global","use_recurly_checkout","v2_show_side_by_side_upsell_experience","v2_enable_onetrust_tcfv2","v2_enable_tcfv2_consent_string_cache","mobi_send_segment_events_to_event_gateway","use_on_soundcloud_short_links"]}},{"hydratable":"experiments","data":{}},{"hydratable":"geoip","data":{"country_code":"FR","country_name":"France","latitude":48.8582,"longitude":2.3387}},{"hydratable":"privacySettings","data":{"allows_messages_from_unfollowed_users":false,"analytics_opt_in":true,"communications_opt_in":true,"targeted_advertising_opt_in":false,"legislation":[]}},{"hydratable":"trackingBrowserTabId","data":"0fa4ab"}];</script>
<script>window.__sc_version="1682083390"</script>
<script>window.__sc_hydration = [{"hydratable":"anonymousId","data":"43937-228935-576167-611097"},{"hydratable":"features","data":{"features":["mobi_use_onetrust_gb","v2_enable_onetrust_user_id","v2_use_onetrust_tcfv2_eu1","cd_repost_to_artists","v2_use_updated_alert_banner_quota_upsell","checkout_use_new_plan_picker","v2_use_onetrust_eu2","mobi_enable_onetrust_tcfv2","mobi_tracking_send_session_id","mobi_use_onetrust_eu1","v2_use_onetrust_user_id_eu2","v2_enable_sourcepoint_tcfv2","mobi_peace_ukraine_logo_takeover","mobi_use_auth_internal_analytics","v2_peace_ukraine_logo_takeover","mobi_use_onetrust_tcfv2_eu2","v2_test_feature_toggle","checkout_send_segment_events_to_event_gateway","mobi_use_onetrust_user_id_eu1","mobi_enable_onetrust_user_id","mobi_use_onetrust_user_id_ex_us","mobi_use_onetrust_tcfv2_eu1","v2_post_with_caption","mobi_use_onetrust_eu4","featured_artists_banner","v2_repost_redirect_page","v2_use_onetrust_gb","mobi_use_onetrust_user_id_global","use_onetrust_async","v2_signals_collection","v2_track_level_distro_to_plan_picker","v2_direct_support_link","v2_api_auth_sign_out","v2_ie11_support_end","v2_hq_file_storage_release","mobi_use_onetrust_user_id_eu2","creator_plan_names_repositioning","v2_use_onetrust_eu4","v2_stories_onboarding","v2_enable_onetrust","v2_import_playlist_experiment","v2_disable_sidebar_comments_count","fpi_messaging_drawer","v2_use_onetrust_us","v2_comment_sorting","checkout_use_recurly_with_paypal","v2_use_onetrust_tcfv2_ex_us","mobi_use_onetrust_eu3","mobi_use_onetrust_elsewhere","v2_use_onetrust_eu3","mobi_use_onetrust_us","v2_oscp_german_tax_fields_support","v2_fallback_queue_for_search","v2_use_onetrust_user_id_ex_us","v2_use_new_connect","v2_use_onetrust_tcfv2_eu2","v2_send_segment_events_to_event_gateway","v2_use_onetrust_eu1","v2_enable_sourcepoint","v2_repost_with_caption_graphql","mobi_use_onetrust_tcfv2_ex_us","v2_tags_recent_tracks","mobi_use_onetrust_eu2","v2_enable_new_web_errors","v2_use_onetrust_elsewhere","v2_webauth_use_local_tracking","mobi_sign_in_experiment","mobi_enable_onetrust","v2_can_see_insights","mobi_trinity","v2_webauth_oauth_mode","v2_google_one_tap","v2_enable_pwa","mobi_use_hls_hack","v2_stories","v2_use_onetrust_user_id_eu1","v2_use_onetrust_user_id_global","use_recurly_checkout","v2_show_side_by_side_upsell_experience","v2_enable_onetrust_tcfv2","v2_enable_tcfv2_consent_string_cache","mobi_send_segment_events_to_event_gateway","use_on_soundcloud_short_links"]}},{"hydratable":"experiments","data":{}},{"hydratable":"geoip","data":{"country_code":"NL","country_name":"Netherlands","region":"NH","city":"Amsterdam","postal_code":"1012","latitude":52.3759,"longitude":4.8975}},{"hydratable":"privacySettings","data":{"allows_messages_from_unfollowed_users":false,"analytics_opt_in":true,"communications_opt_in":true,"targeted_advertising_opt_in":false,"legislation":[]}},{"hydratable":"trackingBrowserTabId","data":"9e6318"}];</script>




<script crossorigin src="https://a-v2.sndcdn.com/assets/52-d44ff3af.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/1-aa0bd65e.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/3-2eacfa6b.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/2-62c87f09.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/0-e69720d7.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/50-2a1a5631.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/52-ef527942.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/1-2eceab34.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/3-f1f89bd3.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/2-066a444a.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/0-4bbeaecd.js"></script>
<script crossorigin src="https://a-v2.sndcdn.com/assets/50-20e3a806.js"></script>
</body>
</html>

Expand Down
Loading