soundcloud-api-ts 1.13.3 → 1.14.0

package/dist/{chunk-ZOHFLO4B.js → chunk-YBNVXQ2E.js}

@@ -5,6 +5,7 @@ var chunkMLVA534Z_js = require('./chunk-MLVA534Z.js');
 // src/client/http.ts
 var BASE_URL = "https://api.soundcloud.com";
 var AUTH_BASE_URL = "https://secure.soundcloud.com";
+var DEFAULT_CACHE_TTL_MS = 6e4;
 var DEFAULT_RETRY = { maxRetries: 3, retryBaseDelay: 1e3 };
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -31,6 +32,26 @@ async function parseErrorBody(response) {
   }
 }
 async function scFetch(options, refreshCtx, onRequest) {
+  const deduper = refreshCtx?.deduper;
+  const cache = refreshCtx?.cache;
+  if (options.method !== "GET" || !deduper && !cache) {
+    return scFetchCore(options, refreshCtx, onRequest);
+  }
+  const key = `GET ${options.path} ${options.token ?? ""}`;
+  const run = async () => {
+    if (cache) {
+      const hit = await cache.get(key);
+      if (hit !== void 0) return hit;
+    }
+    const result = await scFetchCore(options, refreshCtx, onRequest);
+    if (cache && result !== void 0) {
+      await cache.set(key, result, { ttlMs: refreshCtx?.cacheTtlMs ?? DEFAULT_CACHE_TTL_MS });
+    }
+    return result;
+  };
+  return deduper ? deduper.add(key, run) : run();
+}
+async function scFetchCore(options, refreshCtx, onRequest) {
   const retryConfig = refreshCtx?.retry ?? DEFAULT_RETRY;
   const telemetryCallback = onRequest ?? refreshCtx?.onRequest;
   const startTime = Date.now();
@@ -73,8 +94,9 @@ async function scFetch(options, refreshCtx, onRequest) {
       headers["Content-Type"] = options.contentType;
     }
     let lastResponse;
+    const fetchFn = refreshCtx?.fetchImpl ?? fetch;
     for (let attempt = 0; attempt <= retryConfig.maxRetries; attempt++) {
-      const response = await fetch(url, {
+      const response = await fetchFn(url, {
         method: options.method,
         headers,
         body: fetchBody,
@@ -153,7 +175,7 @@ async function scFetch(options, refreshCtx, onRequest) {
     throw err;
   }
 }
-async function scFetchUrl(url, token, retryConfig, onRequest) {
+async function scFetchUrl(url, token, retryConfig, onRequest, fetchImpl) {
   const config = retryConfig ?? DEFAULT_RETRY;
   const headers = { Accept: "application/json" };
   if (token) headers["Authorization"] = `OAuth ${token}`;
@@ -172,8 +194,9 @@ async function scFetchUrl(url, token, retryConfig, onRequest) {
     });
   };
   let lastResponse;
+  const fetchFn = fetchImpl ?? fetch;
   for (let attempt = 0; attempt <= config.maxRetries; attempt++) {
-    const response = await fetch(url, { method: "GET", headers, redirect: "manual" });
+    const response = await fetchFn(url, { method: "GET", headers, redirect: "manual" });
     finalStatus = response.status;
     if (response.status === 302) {
       const location = response.headers.get("location");
@@ -237,6 +260,14 @@ async function scFetchUrl(url, token, retryConfig, onRequest) {
   throw err;
 }
 
+// src/utils/base64.ts
+var toBase64 = (value) => {
+  if (typeof Buffer !== "undefined") {
+    return Buffer.from(value).toString("base64");
+  }
+  return btoa(value);
+};
+
 // src/client/paginate.ts
 async function* paginate(firstPage, fetchNext) {
   let page = await firstPage();
@@ -355,6 +386,28 @@ var RawClient = class {
   }
 };
 
+// src/client/dedupe.ts
+var InFlightDeduper = class {
+  inFlight = /* @__PURE__ */ new Map();
+  /**
+   * Return an existing in-flight promise for `key`, or start a new one via `factory`.
+   * The entry is removed from the map once the promise settles (resolve or reject).
+   */
+  add(key, factory) {
+    const existing = this.inFlight.get(key);
+    if (existing) return existing;
+    const promise = factory().finally(() => {
+      this.inFlight.delete(key);
+    });
+    this.inFlight.set(key, promise);
+    return promise;
+  }
+  /** Number of currently in-flight requests */
+  get size() {
+    return this.inFlight.size;
+  }
+};
+
 // src/client/SoundCloudClient.ts
 function resolveToken(tokenGetter, explicit) {
   const t = explicit ?? tokenGetter();
@@ -399,6 +452,14 @@ exports.SoundCloudClient = class _SoundCloudClient {
       onDebug: config.onDebug,
       onRetry: config.onRetry
     };
+    const sharedCtx = {
+      retry: retryConfig,
+      onRequest: config.onRequest,
+      fetchImpl: config.fetch,
+      deduper: config.dedupe ?? true ? new InFlightDeduper() : void 0,
+      cache: config.cache,
+      cacheTtlMs: config.cacheTtlMs
+    };
     const refreshCtx = config.onTokenRefresh ? {
       getToken,
       onTokenRefresh: async () => {
@@ -406,16 +467,14 @@ exports.SoundCloudClient = class _SoundCloudClient {
         return result;
       },
       setToken: (a, r) => this.setToken(a, r),
-      retry: retryConfig,
-      onRequest: config.onRequest
+      ...sharedCtx
     } : {
       getToken,
       setToken: (
         /* v8 ignore next */
         (a, r) => this.setToken(a, r)
       ),
-      retry: retryConfig,
-      onRequest: config.onRequest
+      ...sharedCtx
     };
     this.auth = new _SoundCloudClient.Auth(this.config);
     this.me = new _SoundCloudClient.Me(getToken, refreshCtx);
@@ -467,7 +526,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
   paginate(firstPage) {
     const token = this._accessToken;
     const onReq = this.config.onRequest;
-    return paginate(firstPage, (url) => scFetchUrl(url, token, void 0, onReq));
+    return paginate(firstPage, (url) => scFetchUrl(url, token, void 0, onReq, this.config.fetch));
   }
   /**
    * Async generator that yields individual items across all pages.
@@ -485,7 +544,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
   paginateItems(firstPage) {
     const token = this._accessToken;
     const onReq = this.config.onRequest;
-    return paginateItems(firstPage, (url) => scFetchUrl(url, token, void 0, onReq));
+    return paginateItems(firstPage, (url) => scFetchUrl(url, token, void 0, onReq, this.config.fetch));
   }
   /**
    * Collects all pages into a single flat array.
@@ -504,7 +563,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
   fetchAll(firstPage, options) {
     const token = this._accessToken;
     const onReq = this.config.onRequest;
-    return fetchAll(firstPage, (url) => scFetchUrl(url, token, void 0, onReq), options);
+    return fetchAll(firstPage, (url) => scFetchUrl(url, token, void 0, onReq, this.config.fetch), options);
   }
 };
 ((SoundCloudClient2) => {
@@ -513,7 +572,25 @@ exports.SoundCloudClient = class _SoundCloudClient {
       this.config = config;
     }
     fetch(opts) {
-      return scFetch(opts, void 0, this.config.onRequest);
+      const ctx = {
+        getToken: (
+          /* v8 ignore next */
+          () => void 0
+        ),
+        setToken: (
+          /* v8 ignore next */
+          () => {
+          }
+        ),
+        retry: {
+          maxRetries: this.config.maxRetries ?? 3,
+          retryBaseDelay: this.config.retryBaseDelay ?? 1e3,
+          onDebug: this.config.onDebug,
+          onRetry: this.config.onRetry
+        },
+        fetchImpl: this.config.fetch
+      };
+      return scFetch(opts, ctx, this.config.onRequest);
     }
     /**
      * Build the authorization URL to redirect users to SoundCloud's OAuth login page.
@@ -561,7 +638,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
      * @see https://developers.soundcloud.com/docs/api/explorer/open-api#/oauth2/post_oauth2_token
      */
     async getClientToken() {
-      const credentials = Buffer.from(`${this.config.clientId}:${this.config.clientSecret}`).toString("base64");
+      const credentials = toBase64(`${this.config.clientId}:${this.config.clientSecret}`);
       return this.fetch({
         path: "/oauth/token",
         method: "POST",
@@ -588,6 +665,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
      * @see https://developers.soundcloud.com/docs/api/explorer/open-api#/oauth2/post_oauth2_token
      */
     async getUserToken(code, codeVerifier) {
+      if (!this.config.redirectUri) throw new Error("redirectUri is required for getUserToken");
       const params = {
         grant_type: "authorization_code",
         client_id: this.config.clientId,
@@ -618,6 +696,7 @@ exports.SoundCloudClient = class _SoundCloudClient {
      * @see https://developers.soundcloud.com/docs/api/explorer/open-api#/oauth2/post_oauth2_token
      */
     async refreshUserToken(refreshToken) {
+      if (!this.config.redirectUri) throw new Error("redirectUri is required for refreshUserToken");
       return this.fetch({
         path: "/oauth/token",
         method: "POST",
@@ -646,7 +725,8 @@ exports.SoundCloudClient = class _SoundCloudClient {
      * ```
      */
     async signOut(accessToken) {
-      const res = await fetch("https://secure.soundcloud.com/sign-out", {
+      const fetchFn = this.config.fetch ?? fetch;
+      const res = await fetchFn("https://secure.soundcloud.com/sign-out", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ access_token: accessToken })
@@ -1645,28 +1725,6 @@ exports.SoundCloudClient = class _SoundCloudClient {
   SoundCloudClient2.Reposts = Reposts;
 })(exports.SoundCloudClient || (exports.SoundCloudClient = {}));
 
-// src/client/dedupe.ts
-var InFlightDeduper = class {
-  inFlight = /* @__PURE__ */ new Map();
-  /**
-   * Return an existing in-flight promise for `key`, or start a new one via `factory`.
-   * The entry is removed from the map once the promise settles (resolve or reject).
-   */
-  add(key, factory) {
-    const existing = this.inFlight.get(key);
-    if (existing) return existing;
-    const promise = factory().finally(() => {
-      this.inFlight.delete(key);
-    });
-    this.inFlight.set(key, promise);
-    return promise;
-  }
-  /** Number of currently in-flight requests */
-  get size() {
-    return this.inFlight.size;
-  }
-};
-
 // src/client/registry.ts
 var IMPLEMENTED_OPERATIONS = [
   // Auth
@@ -1731,13 +1789,13 @@ var IMPLEMENTED_OPERATIONS = [
 
 // src/auth/getClientToken.ts
 var getClientToken = (clientId, clientSecret) => {
+  const credentials = toBase64(`${clientId}:${clientSecret}`);
   return scFetch({
     path: "/oauth/token",
     method: "POST",
+    headers: { Authorization: `Basic ${credentials}` },
     body: new URLSearchParams({
-      grant_type: "client_credentials",
-      client_id: clientId,
-      client_secret: clientSecret
+      grant_type: "client_credentials"
     })
   });
 };
@@ -2100,5 +2158,5 @@ exports.unrepostPlaylist = unrepostPlaylist;
 exports.unrepostTrack = unrepostTrack;
 exports.updatePlaylist = updatePlaylist;
 exports.updateTrack = updateTrack;
-//# sourceMappingURL=chunk-ZOHFLO4B.js.map
-//# sourceMappingURL=chunk-ZOHFLO4B.js.map
+//# sourceMappingURL=chunk-YBNVXQ2E.js.map
+//# sourceMappingURL=chunk-YBNVXQ2E.js.map