soundcloud-api-ts 1.2.0 → 1.3.0

package/dist/index.mjs

@@ -1,6 +1,35 @@
+import { SoundCloudError } from './chunk-GKNBLKPB.mjs';
+export { SoundCloudError } from './chunk-GKNBLKPB.mjs';
+
 // src/client/http.ts
 var BASE_URL = "https://api.soundcloud.com";
+var DEFAULT_RETRY = { maxRetries: 3, retryBaseDelay: 1e3 };
+function delay(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryable(status) {
+  return status === 429 || status >= 500 && status <= 599;
+}
+function getRetryDelay(response, attempt, config) {
+  if (response.status === 429) {
+    const retryAfter = response.headers.get("retry-after");
+    if (retryAfter) {
+      const seconds = Number(retryAfter);
+      if (!Number.isNaN(seconds)) return seconds * 1e3;
+    }
+  }
+  const base = config.retryBaseDelay * Math.pow(2, attempt);
+  return base + Math.random() * base * 0.1;
+}
+async function parseErrorBody(response) {
+  try {
+    return await response.json();
+  } catch {
+    return void 0;
+  }
+}
 async function scFetch(options, refreshCtx) {
+  const retryConfig = refreshCtx?.retry ?? DEFAULT_RETRY;
   const execute = async (tokenOverride) => {
     const url = `${BASE_URL}${options.path}`;
     const headers = {
@@ -24,32 +53,44 @@ async function scFetch(options, refreshCtx) {
     } else if (options.contentType) {
       headers["Content-Type"] = options.contentType;
     }
-    const response = await fetch(url, {
-      method: options.method,
-      headers,
-      body: fetchBody,
-      redirect: "manual"
-    });
-    if (response.status === 302) {
-      const location = response.headers.get("location");
-      if (location) {
-        return location;
+    let lastResponse;
+    for (let attempt = 0; attempt <= retryConfig.maxRetries; attempt++) {
+      const response = await fetch(url, {
+        method: options.method,
+        headers,
+        body: fetchBody,
+        redirect: "manual"
+      });
+      if (response.status === 302) {
+        const location = response.headers.get("location");
+        if (location) return location;
+      }
+      if (response.status === 204 || response.headers.get("content-length") === "0") {
+        return void 0;
+      }
+      if (response.ok) {
+        return response.json();
+      }
+      if (!isRetryable(response.status)) {
+        const body2 = await parseErrorBody(response);
+        throw new SoundCloudError(response.status, response.statusText, body2);
+      }
+      lastResponse = response;
+      if (attempt < retryConfig.maxRetries) {
+        const delayMs = getRetryDelay(response, attempt, retryConfig);
+        retryConfig.onDebug?.(
+          `Retry ${attempt + 1}/${retryConfig.maxRetries} after ${Math.round(delayMs)}ms (status ${response.status})`
+        );
+        await delay(delayMs);
       }
     }
-    if (response.status === 204 || response.headers.get("content-length") === "0") {
-      return void 0;
-    }
-    if (!response.ok) {
-      throw new Error(
-        `SoundCloud API error: ${response.status} ${response.statusText}`
-      );
-    }
-    return response.json();
+    const body = await parseErrorBody(lastResponse);
+    throw new SoundCloudError(lastResponse.status, lastResponse.statusText, body);
   };
   try {
     return await execute();
   } catch (err) {
-    if (refreshCtx?.onTokenRefresh && err instanceof Error && err.message.includes("401")) {
+    if (refreshCtx?.onTokenRefresh && err instanceof SoundCloudError && err.status === 401) {
       const newToken = await refreshCtx.onTokenRefresh();
       refreshCtx.setToken(newToken.access_token, newToken.refresh_token);
       return execute(newToken.access_token);
@@ -57,21 +98,38 @@ async function scFetch(options, refreshCtx) {
     throw err;
   }
 }
-async function scFetchUrl(url, token) {
+async function scFetchUrl(url, token, retryConfig) {
+  const config = retryConfig ?? DEFAULT_RETRY;
   const headers = { Accept: "application/json" };
   if (token) headers["Authorization"] = `OAuth ${token}`;
-  const response = await fetch(url, { method: "GET", headers, redirect: "manual" });
-  if (response.status === 302) {
-    const location = response.headers.get("location");
-    if (location) return location;
-  }
-  if (response.status === 204 || response.headers.get("content-length") === "0") {
-    return void 0;
-  }
-  if (!response.ok) {
-    throw new Error(`SoundCloud API error: ${response.status} ${response.statusText}`);
+  let lastResponse;
+  for (let attempt = 0; attempt <= config.maxRetries; attempt++) {
+    const response = await fetch(url, { method: "GET", headers, redirect: "manual" });
+    if (response.status === 302) {
+      const location = response.headers.get("location");
+      if (location) return location;
+    }
+    if (response.status === 204 || response.headers.get("content-length") === "0") {
+      return void 0;
+    }
+    if (response.ok) {
+      return response.json();
+    }
+    if (!isRetryable(response.status)) {
+      const body2 = await parseErrorBody(response);
+      throw new SoundCloudError(response.status, response.statusText, body2);
+    }
+    lastResponse = response;
+    if (attempt < config.maxRetries) {
+      const delayMs = getRetryDelay(response, attempt, config);
+      config.onDebug?.(
+        `Retry ${attempt + 1}/${config.maxRetries} after ${Math.round(delayMs)}ms (status ${response.status})`
+      );
+      await delay(delayMs);
+    }
   }
-  return response.json();
+  const body = await parseErrorBody(lastResponse);
+  throw new SoundCloudError(lastResponse.status, lastResponse.statusText, body);
 }
 
 // src/client/paginate.ts
@@ -124,14 +182,24 @@ var SoundCloudClient = class _SoundCloudClient {
   constructor(config) {
     this.config = config;
     const getToken = () => this._accessToken;
+    const retryConfig = {
+      maxRetries: config.maxRetries ?? 3,
+      retryBaseDelay: config.retryBaseDelay ?? 1e3,
+      onDebug: config.onDebug
+    };
     const refreshCtx = config.onTokenRefresh ? {
       getToken,
       onTokenRefresh: async () => {
         const result = await config.onTokenRefresh(this);
         return result;
       },
-      setToken: (a, r) => this.setToken(a, r)
-    } : void 0;
+      setToken: (a, r) => this.setToken(a, r),
+      retry: retryConfig
+    } : {
+      getToken,
+      setToken: (a, r) => this.setToken(a, r),
+      retry: retryConfig
+    };
     this.auth = new _SoundCloudClient.Auth(this.config);
     this.me = new _SoundCloudClient.Me(getToken, refreshCtx);
     this.users = new _SoundCloudClient.Users(getToken, refreshCtx);