From 20b901356644a4fbfea42a9cd59bc15ef11c2eb8 Mon Sep 17 00:00:00 2001
From: A7aneekxd <138504924+A7aneekxd@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:20:01 +0300
Subject: [PATCH 1/2] fix-sc

---
 packages/soundcloud/src/index.ts | 54 +++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/packages/soundcloud/src/index.ts b/packages/soundcloud/src/index.ts
index cd0dbd0..b96d03c 100644
--- a/packages/soundcloud/src/index.ts
+++ b/packages/soundcloud/src/index.ts
@@ -121,24 +121,48 @@ export class SoundCloudPlugin extends ExtractorPlugin {
     return related.filter(t => t.title).map(t => new SoundCloudSong(this, t));
   }
 
-  async getStreamURL<T>(song: SoundCloudSong<T>) {
-    if (!song.url) {
-      throw new DisTubeError("SOUNDCLOUD_PLUGIN_INVALID_SONG", "Cannot get stream url from invalid song.");
-    }
-    const stream = await this.soundcloud.util.streamLink(song.url);
-    if (!stream) {
-      throw new DisTubeError(
-        "SOUNDCLOUD_PLUGIN_RATE_LIMITED",
-        "Reached SoundCloud rate limits\nSee more: https://developers.soundcloud.com/docs/api/rate-limits#play-requests",
-      );
-    }
-    return stream;
+async getStreamURL(song) {
+  if (!song.url) {
+    throw new import_distube.DisTubeError("SOUNDCLOUD_PLUGIN_INVALID_SONG", "Cannot get stream url from invalid song.");
   }
+  
+  let stream = await this.soundcloud.util.streamLink(song.url).catch(() => null);
 
-  async searchSong<T>(query: string, options: ResolveOptions<T>) {
-    const songs = await this.search(query, SearchType.Track, 1, options);
-    return songs[0];
+  if (stream) return stream;
+
+  const track = await this.soundcloud.resolve.get(song.url, true).catch(() => null);
+
+  if (!track || !track.media || !track.media.transcodings?.length) {
+    throw new import_distube.DisTubeError("SOUNDCLOUD_PLUGIN_STREAM_ERROR", "Invalid or restricted SoundCloud track.");
   }
+
+
+  const progressive = track.media.transcodings.find(t => t.format.protocol === "progressive");
+  const transcoding = progressive || track.media.transcodings[0];
+
+  if (!transcoding?.url) {
+    throw new import_distube.DisTubeError("SOUNDCLOUD_PLUGIN_STREAM_ERROR", "No valid stream URL found.");
+  }
+
+  const clientId = await this.soundcloud.api.getClientId().catch(() => null);
+  if (!clientId) {
+    throw new import_distube.DisTubeError("SOUNDCLOUD_PLUGIN_NO_CLIENT_ID", "Missing client ID");
+  }
+
+  const res = await fetch(`${transcoding.url}?client_id=${clientId}`);
+  if (!res.ok) {
+    throw new import_distube.DisTubeError(
+      "SOUNDCLOUD_PLUGIN_RATE_LIMITED",
+      `Failed to fetch stream URL. HTTP ${res.status}`
+    );
+  }
+
+  const json = await res.json();
+  if (!json?.url) {
+    throw new import_distube.DisTubeError("SOUNDCLOUD_PLUGIN_STREAM_ERROR", "Stream URL missing in response.");
+  }
+
+  return json.url; 
 }
 
 class SoundCloudSong<T> extends Song<T> {

From 200e6d0dcbabc94eb8ed471a4762d1d22242d79f Mon Sep 17 00:00:00 2001
From: A7aneekxd <138504924+A7aneekxd@users.noreply.github.com>
Date: Thu, 3 Jul 2025 09:25:48 +0300
Subject: [PATCH 2/2] fix-soundcloud

---
 packages/soundcloud/src/index.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/soundcloud/src/index.ts b/packages/soundcloud/src/index.ts
index b96d03c..392d99d 100644
--- a/packages/soundcloud/src/index.ts
+++ b/packages/soundcloud/src/index.ts
@@ -165,6 +165,12 @@ async getStreamURL(song) {
   return json.url; 
 }
 
+  async searchSong<T>(query: string, options: ResolveOptions<T>) {
+    const songs = await this.search(query, SearchType.Track, 1, options);
+    return songs[0];
+  }
+}
+
 class SoundCloudSong<T> extends Song<T> {
   constructor(plugin: SoundCloudPlugin, info: SoundcloudTrack, options: ResolveOptions<T> = {}) {
     super(