Skip to content

best way to save what you love

api/soundcloud: fix extraction of client_id (#1497)

patrick07bb16dfe757
diff --git a/api/src/processing/services/soundcloud.js b/api/src/processing/services/soundcloud.js
index a73e6474..9692a519 100644
--- a/api/src/processing/services/soundcloud.js
+++ b/api/src/processing/services/soundcloud.js
@@ -15,24 +15,27 @@ async function findClientID() {
return cachedID.id;
}
- const scripts = sc.matchAll(/<script.+src="(.+)">/g);
+ let clientid = sc.match(/"hydratable"\s*:\s*"apiClient"\s*,\s*"data"\s*:\s*\{\s*"id"\s*:\s*"([^"]+)"/)?.[1];
+ if (!clientid) {
+ const scripts = sc.matchAll(/<script.+src="(.+)">/g);
- let clientid;
- for (let script of scripts) {
- const url = script[1];
+ for (let script of scripts) {
+ const url = script[1];
- if (!url?.startsWith('https://a-v2.sndcdn.com/')) {
- return;
- }
+ if (!url?.startsWith('https://a-v2.sndcdn.com/')) {
+ return;
+ }
- const scrf = await fetch(url).then(r => r.text()).catch(() => {});
- const id = scrf.match(/\("client_id=[A-Za-z0-9]{32}"\)/);
+ const scrf = await fetch(url).then(r => r.text()).catch(() => {});
+ const id = scrf.match(/,client_id:"([A-Za-z0-9]{32})",/);
- if (id && typeof id[0] === 'string') {
- clientid = id[0].match(/[A-Za-z0-9]{32}/)[0];
- break;
+ if (id && id.length >= 2) {
+ clientid = id[1];
+ break;
+ }
}
}
+
cachedID.version = scVersion;
cachedID.id = clientid;