soundcloud-api-ts 1.10.1 → 1.11.0

package/dist/{chunk-YKKLNC4A.js → chunk-7IRQD552.js}

@@ -30,16 +30,32 @@ async function parseErrorBody(response) {
     return void 0;
   }
 }
-async function scFetch(options, refreshCtx) {
+async function scFetch(options, refreshCtx, onRequest) {
   const retryConfig = refreshCtx?.retry ?? DEFAULT_RETRY;
+  const telemetryCallback = onRequest ?? refreshCtx?.onRequest;
+  const startTime = Date.now();
+  let retryCount = 0;
+  let finalStatus = 0;
+  const emitTelemetry = (error) => {
+    if (!telemetryCallback) return;
+    telemetryCallback({
+      method: options.method,
+      path: options.path,
+      durationMs: Date.now() - startTime,
+      status: finalStatus,
+      retryCount,
+      ...error ? { error } : {}
+    });
+  };
   const execute = async (tokenOverride) => {
     const isAuthPath = options.path.startsWith("/oauth");
     const url = `${isAuthPath ? AUTH_BASE_URL : BASE_URL}${options.path}`;
     const headers = {
-      Accept: "application/json"
+      Accept: "application/json",
+      ...options.headers
     };
     const token = tokenOverride ?? options.token;
-    if (token) {
+    if (token && !headers["Authorization"]) {
       headers["Authorization"] = `OAuth ${token}`;
     }
     let fetchBody;
@@ -64,22 +80,32 @@ async function scFetch(options, refreshCtx) {
         body: fetchBody,
         redirect: "manual"
       });
+      finalStatus = response.status;
       if (response.status === 302) {
         const location = response.headers.get("location");
-        if (location) return location;
+        if (location) {
+          emitTelemetry();
+          return location;
+        }
       }
       if (response.status === 204 || response.headers.get("content-length") === "0") {
+        emitTelemetry();
         return void 0;
       }
       if (response.ok) {
-        return response.json();
+        const result = response.json();
+        emitTelemetry();
+        return result;
       }
       if (!isRetryable(response.status)) {
         const body2 = await parseErrorBody(response);
-        throw new chunkMLVA534Z_js.SoundCloudError(response.status, response.statusText, body2);
+        const err2 = new chunkMLVA534Z_js.SoundCloudError(response.status, response.statusText, body2);
+        emitTelemetry(err2.message);
+        throw err2;
       }
       lastResponse = response;
       if (attempt < retryConfig.maxRetries) {
+        retryCount = attempt + 1;
         const delayMs = getRetryDelay(response, attempt, retryConfig);
         retryConfig.onDebug?.(
           `Retry ${attempt + 1}/${retryConfig.maxRetries} after ${Math.round(delayMs)}ms (status ${response.status})`
@@ -88,7 +114,9 @@ async function scFetch(options, refreshCtx) {
       }
     }
     const body = await parseErrorBody(lastResponse);
-    throw new chunkMLVA534Z_js.SoundCloudError(lastResponse.status, lastResponse.statusText, body);
+    const err = new chunkMLVA534Z_js.SoundCloudError(lastResponse.status, lastResponse.statusText, body);
+    emitTelemetry(err.message);
+    throw err;
   };
   try {
     return await execute();
@@ -101,29 +129,53 @@ async function scFetch(options, refreshCtx) {
     throw err;
   }
 }
-async function scFetchUrl(url, token, retryConfig) {
+async function scFetchUrl(url, token, retryConfig, onRequest) {
   const config = retryConfig ?? DEFAULT_RETRY;
   const headers = { Accept: "application/json" };
   if (token) headers["Authorization"] = `OAuth ${token}`;
+  const startTime = Date.now();
+  let retryCount = 0;
+  let finalStatus = 0;
+  const emitTelemetry = (error) => {
+    if (!onRequest) return;
+    onRequest({
+      method: "GET",
+      path: url,
+      durationMs: Date.now() - startTime,
+      status: finalStatus,
+      retryCount,
+      ...error ? { error } : {}
+    });
+  };
   let lastResponse;
   for (let attempt = 0; attempt <= config.maxRetries; attempt++) {
     const response = await fetch(url, { method: "GET", headers, redirect: "manual" });
+    finalStatus = response.status;
     if (response.status === 302) {
       const location = response.headers.get("location");
-      if (location) return location;
+      if (location) {
+        emitTelemetry();
+        return location;
+      }
     }
     if (response.status === 204 || response.headers.get("content-length") === "0") {
+      emitTelemetry();
       return void 0;
     }
     if (response.ok) {
-      return response.json();
+      const result = response.json();
+      emitTelemetry();
+      return result;
     }
     if (!isRetryable(response.status)) {
       const body2 = await parseErrorBody(response);
-      throw new chunkMLVA534Z_js.SoundCloudError(response.status, response.statusText, body2);
+      const err2 = new chunkMLVA534Z_js.SoundCloudError(response.status, response.statusText, body2);
+      emitTelemetry(err2.message);
+      throw err2;
     }
     lastResponse = response;
     if (attempt < config.maxRetries) {
+      retryCount = attempt + 1;
       const delayMs = getRetryDelay(response, attempt, config);
       config.onDebug?.(
         `Retry ${attempt + 1}/${config.maxRetries} after ${Math.round(delayMs)}ms (status ${response.status})`
@@ -132,7 +184,9 @@ async function scFetchUrl(url, token, retryConfig) {
     }
   }
   const body = await parseErrorBody(lastResponse);
-  throw new chunkMLVA534Z_js.SoundCloudError(lastResponse.status, lastResponse.statusText, body);
+  const err = new chunkMLVA534Z_js.SoundCloudError(lastResponse.status, lastResponse.statusText, body);
+  emitTelemetry(err.message);
+  throw err;
 }
 
 // src/client/paginate.ts
@@ -211,14 +265,16 @@ exports.SoundCloudClient = class _SoundCloudClient {
         return result;
       },
       setToken: (a, r) => this.setToken(a, r),
-      retry: retryConfig
+      retry: retryConfig,
+      onRequest: config.onRequest
     } : {
       getToken,
       setToken: (
         /* v8 ignore next */
         (a, r) => this.setToken(a, r)
       ),
-      retry: retryConfig
+      retry: retryConfig,
+      onRequest: config.onRequest
     };
     this.auth = new _SoundCloudClient.Auth(this.config);
     this.me = new _SoundCloudClient.Me(getToken, refreshCtx);
@@ -268,7 +324,8 @@ exports.SoundCloudClient = class _SoundCloudClient {
    */
   paginate(firstPage) {
     const token = this._accessToken;
-    return paginate(firstPage, (url) => scFetchUrl(url, token));
+    const onReq = this.config.onRequest;
+    return paginate(firstPage, (url) => scFetchUrl(url, token, void 0, onReq));
   }
   /**
    * Async generator that yields individual items across all pages.
@@ -285,7 +342,8 @@ exports.SoundCloudClient = class _SoundCloudClient {
    */
   paginateItems(firstPage) {
     const token = this._accessToken;
-    return paginateItems(firstPage, (url) => scFetchUrl(url, token));
+    const onReq = this.config.onRequest;
+    return paginateItems(firstPage, (url) => scFetchUrl(url, token, void 0, onReq));
   }
   /**
    * Collects all pages into a single flat array.
@@ -303,7 +361,8 @@ exports.SoundCloudClient = class _SoundCloudClient {
    */
   fetchAll(firstPage, options) {
     const token = this._accessToken;
-    return fetchAll(firstPage, (url) => scFetchUrl(url, token), options);
+    const onReq = this.config.onRequest;
+    return fetchAll(firstPage, (url) => scFetchUrl(url, token, void 0, onReq), options);
   }
 };
 ((SoundCloudClient2) => {
@@ -1394,13 +1453,15 @@ exports.SoundCloudClient = class _SoundCloudClient {
 
 // src/auth/getClientToken.ts
 var getClientToken = (clientId, clientSecret) => {
+  const basicAuth = Buffer.from(`${clientId}:${clientSecret}`).toString("base64");
   return scFetch({
     path: "/oauth/token",
     method: "POST",
+    headers: {
+      Authorization: `Basic ${basicAuth}`
+    },
     body: new URLSearchParams({
-      grant_type: "client_credentials",
-      client_id: clientId,
-      client_secret: clientSecret
+      grant_type: "client_credentials"
     })
   });
 };
@@ -1743,5 +1804,5 @@ exports.unrepostPlaylist = unrepostPlaylist;
 exports.unrepostTrack = unrepostTrack;
 exports.updatePlaylist = updatePlaylist;
 exports.updateTrack = updateTrack;
-//# sourceMappingURL=chunk-YKKLNC4A.js.map
-//# sourceMappingURL=chunk-YKKLNC4A.js.map
+//# sourceMappingURL=chunk-7IRQD552.js.map
+//# sourceMappingURL=chunk-7IRQD552.js.map