From 00b217796f51ea4c80b5b4bb0a83e9e1642ed853 Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 29 Apr 2025 22:29:57 +0600
Subject: [PATCH 1/2] api/soundcloud: fix short link url & refactor

---
 api/src/processing/match.js               |  6 +-
 api/src/processing/services/soundcloud.js | 83 +++++++++++++----------
 api/src/util/tests/soundcloud.json        |  2 +-
 3 files changed, 48 insertions(+), 43 deletions(-)

diff --git a/api/src/processing/match.js b/api/src/processing/match.js
index ee4fdc1a..f6a0611e 100644
--- a/api/src/processing/match.js
+++ b/api/src/processing/match.js
@@ -157,12 +157,8 @@ export default async function({ host, patternMatch, params }) {
                 isAudioOnly = true;
                 isAudioMuted = false;
                 r = await soundcloud({
-                    url,
-                    author: patternMatch.author,
-                    song: patternMatch.song,
+                    ...patternMatch,
                     format: params.audioFormat,
-                    shortLink: patternMatch.shortLink || false,
-                    accessKey: patternMatch.accessKey || false
                 });
                 break;
 
diff --git a/api/src/processing/services/soundcloud.js b/api/src/processing/services/soundcloud.js
index ad535479..a5c30ff8 100644
--- a/api/src/processing/services/soundcloud.js
+++ b/api/src/processing/services/soundcloud.js
@@ -1,4 +1,5 @@
 import { env } from "../../config.js";
+import { resolveRedirectingURL } from "../url.js";
 
 const cachedID = {
     version: '',
@@ -7,22 +8,25 @@ const cachedID = {
 
 async function findClientID() {
     try {
-        let sc = await fetch('https://soundcloud.com/').then(r => r.text()).catch(() => {});
-        let scVersion = String(sc.match(/<script>window\.__sc_version="[0-9]{10}"<\/script>/)[0].match(/[0-9]{10}/));
+        const sc = await fetch('https://soundcloud.com/').then(r => r.text()).catch(() => {});
+        const scVersion = String(sc.match(/<script>window\.__sc_version="[0-9]{10}"<\/script>/)[0].match(/[0-9]{10}/));
 
-        if (cachedID.version === scVersion) return cachedID.id;
+        if (cachedID.version === scVersion) {
+            return cachedID.id;
+        }
+
+        const scripts = sc.matchAll(/<script.+src="(.+)">/g);
 
-        let scripts = sc.matchAll(/<script.+src="(.+)">/g);
         let clientid;
         for (let script of scripts) {
-            let url = script[1];
+            const url = script[1];
 
             if (!url?.startsWith('https://a-v2.sndcdn.com/')) {
                 return;
             }
 
-            let scrf = await fetch(url).then(r => r.text()).catch(() => {});
-            let 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];
@@ -37,46 +41,57 @@ async function findClientID() {
 }
 
 export default async function(obj) {
-    let clientId = await findClientID();
+    const clientId = await findClientID();
     if (!clientId) return { error: "fetch.fail" };
 
     let link;
-    if (obj.url.hostname === 'on.soundcloud.com' && obj.shortLink) {
-        link = await fetch(`https://on.soundcloud.com/${obj.shortLink}/`, { redirect: "manual" }).then(r => {
-            if (r.status === 302 && r.headers.get("location").startsWith("https://soundcloud.com/")) {
-                return r.headers.get("location").split('?', 1)[0]
-            }
-        }).catch(() => {});
+
+    if (obj.shortLink) {
+        obj = {
+            ...obj,
+            ...await resolveRedirectingURL(
+                `https://on.soundcloud.com/${obj.shortLink}`
+            )
+        }
     }
 
-    if (!link && obj.author && obj.song) {
-        link = `https://soundcloud.com/${obj.author}/${obj.song}${obj.accessKey ? `/s-${obj.accessKey}` : ''}`
+    if (obj.author && obj.song) {
+        link = `https://soundcloud.com/${obj.author}/${obj.song}`;
+        if (obj.accessKey) {
+            link += `/s-${obj.accessKey}`;
+        }
     }
 
     if (!link && obj.shortLink) return { error: "fetch.short_link" };
     if (!link) return { error: "link.unsupported" };
 
-    let json = await fetch(`https://api-v2.soundcloud.com/resolve?url=${link}&client_id=${clientId}`)
-                     .then(r => r.status === 200 ? r.json() : false)
-                     .catch(() => {});
+    const resolveURL = new URL("https://api-v2.soundcloud.com/resolve");
+    resolveURL.searchParams.set("url", link);
+    resolveURL.searchParams.set("client_id", clientId);
 
+    const json = await fetch(resolveURL).then(r => r.json()).catch(() => {});
     if (!json) return { error: "fetch.fail" };
 
-    if (json?.policy === "BLOCK") {
+    if (json.duration > env.durationLimit * 1000) {
+        return { error: "content.too_long" };
+    }
+
+    if (json.policy === "BLOCK") {
         return { error: "content.region" };
     }
 
-    if (json?.policy === "SNIP") {
+    if (json.policy === "SNIP") {
         return { error: "content.paid" };
     }
 
-    if (!json?.media?.transcodings || !json?.media?.transcodings.length === 0) {
+    if (!json.media?.transcodings || !json.media?.transcodings.length === 0) {
         return { error: "fetch.empty" };
     }
 
     let bestAudio = "opus",
-        selectedStream = json.media.transcodings.find(v => v.preset === "opus_0_0"),
-        mp3Media = json.media.transcodings.find(v => v.preset === "mp3_0_0");
+        selectedStream = json.media.transcodings.find(v => v.preset === "opus_0_0");
+
+    const mp3Media = json.media.transcodings.find(v => v.preset === "mp3_0_0");
 
     // use mp3 if present if user prefers it or if opus isn't available
     if (mp3Media && (obj.format === "mp3" || !selectedStream)) {
@@ -88,22 +103,17 @@ export default async function(obj) {
         return { error: "fetch.empty" };
     }
 
-    let fileUrlBase = selectedStream.url;
-    let fileUrl = `${fileUrlBase}${fileUrlBase.includes("?") ? "&" : "?"}client_id=${clientId}&track_authorization=${json.track_authorization}`;
+    const fileUrl = new URL(selectedStream.url);
+    fileUrl.searchParams.set("client_id", clientId);
+    fileUrl.searchParams.set("track_authorization", json.track_authorization);
 
-    if (!fileUrl.startsWith("https://api-v2.soundcloud.com/media/soundcloud:tracks:"))
-        return { error: "fetch.empty" };
-
-    if (json.duration > env.durationLimit * 1000) {
-        return { error: "content.too_long" };
-    }
-
-    let file = await fetch(fileUrl)
+    const file = await fetch(fileUrl)
                      .then(async r => (await r.json()).url)
                      .catch(() => {});
+
     if (!file) return { error: "fetch.empty" };
 
-    let fileMetadata = {
+    const fileMetadata = {
         title: json.title.trim(),
         artist: json.user.username.trim(),
     }
@@ -113,8 +123,7 @@ export default async function(obj) {
         filenameAttributes: {
             service: "soundcloud",
             id: json.id,
-            title: fileMetadata.title,
-            author: fileMetadata.artist
+            ...fileMetadata
         },
         bestAudio,
         fileMetadata
diff --git a/api/src/util/tests/soundcloud.json b/api/src/util/tests/soundcloud.json
index 04ed8632..725c8ebf 100644
--- a/api/src/util/tests/soundcloud.json
+++ b/api/src/util/tests/soundcloud.json
@@ -59,7 +59,7 @@
     },
     {
         "name": "on.soundcloud link",
-        "url": "https://on.soundcloud.com/wLZre",
+        "url": "https://on.soundcloud.com/XHLLKSXRQ5yyGDuD9",
         "params": {},
         "expected": {
             "code": 200,

From 4b9644ebdfbfe7bc6f7ec2d476692e3619cb59bd Mon Sep 17 00:00:00 2001
From: wukko <me@wukko.me>
Date: Tue, 29 Apr 2025 23:10:18 +0600
Subject: [PATCH 2/2] api/package: bump version to 10.9.4

---
 api/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/package.json b/api/package.json
index 0c71295a..c9955a83 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@imput/cobalt-api",
     "description": "save what you love",
-    "version": "10.9.3",
+    "version": "10.9.4",
     "author": "imput",
     "exports": "./src/cobalt.js",
     "type": "module",