Adjusting response formats

Author: GTFalcao

components/spotify/actions/get-artist-top-tracks/get-artist-top-tracks.mjs

@@ -32,7 +32,7 @@ export default {
       market,
     } = this;
 
-    const res = await this.spotify._makeRequest({
+    const { data } = await this.spotify._makeRequest({
       $,
       url: `/artists/${artistId.value ?? artistId}/top-tracks`,
       params: {
@@ -42,6 +42,6 @@ export default {
 
     $.export("$summary", `Successfully fetched top tracks for "${artistId.label ?? artistId}"`);
 
-    return res.tracks ?? [];
+    return data?.tracks ?? [];
   },
 };

components/spotify/actions/get-categorys-playlist/get-categorys-playlist.mjs

@@ -49,7 +49,7 @@ export default {
       offset,
     } = this;
 
-    const res = await this.spotify._makeRequest({
+    const { data } = await this.spotify._makeRequest({
       $,
       url: `/browse/categories/${categoryId.value ?? categoryId}/playlists`,
       params: {
@@ -61,6 +61,6 @@ export default {
 
     $.export("$summary", `Successfully fetched playlists for the "${categoryId.label ?? categoryId}" category`);
 
-    return res.playlists?.items ?? [];
+    return data?.playlists?.items ?? [];
   },
 };

components/spotify/actions/get-playlist-items/get-playlist-items.mjs

@@ -51,19 +51,17 @@ export default {
   async run({ $ }) {
     const {
       playlistId,
-      market,
       fields,
       limit,
       offset,
       additionalTypes,
     } = this;
 
-    const res = await this.spotify._makeRequest({
+    const { data } = await this.spotify._makeRequest({
       $,
       url: `/playlists/${playlistId.value ?? playlistId}/tracks`,
       params: {
         fields,
-        market,
         limit,
         offset,
         additional_types: additionalTypes && additionalTypes.join(",").toLowerCase(),
@@ -72,6 +70,6 @@ export default {
 
     $.export("$summary", `Successfully fetched details for "${playlistId.label ?? playlistId}"`);
 
-    return res.items ?? [];
+    return data?.items ?? [];
   },
 };

components/spotify/actions/get-recommendations/get-recommendations.mjs

@@ -60,7 +60,7 @@ export default {
 
     const numSeeds = seedArtists.length + seedGenres.length + seedTracks.length;
     if (numSeeds > 5 || numSeeds < 1) {
-      throw new ConfigurationError("Must provide between 1 and 5 seeds in in any combination of `seedArtists`, `seedTracks` and `seedGenres`.");
+      throw new ConfigurationError("Must provide between 1 and 5 seeds in any combination of `seedArtists`, `seedTracks` and `seedGenres`.");
     }
 
     const params = {
@@ -70,16 +70,16 @@ export default {
       limit,
     };
 
-    const response = await this.spotify.getRecommendations({
+    const { data } = await this.spotify.getRecommendations({
       $,
       ...params,
     });
 
-    if (response.tracks.length === 0) {
+    if (data?.tracks?.length === 0) {
       $.export("$summary", "No recommendations found");
       return;
     }
-    $.export("$summary", `Successfully retrieved ${response.tracks.length} recommendation(s).`);
-    return response;
+    $.export("$summary", `Successfully retrieved ${data?.tracks?.length} recommendation(s).`);
+    return data;
   },
 };

components/spotify/actions/get-track/get-track.mjs

@@ -33,16 +33,16 @@ export default {
       market,
     } = this;
 
-    const res = await this.spotify._makeRequest({
+    const { data } = await this.spotify._makeRequest({
       $,
       url: `/tracks/${trackId.value ?? trackId}`,
       params: {
         market,
       },
     });
 
-    $.export("$summary", `Successfully fetched info for the track, "${res.name}"`);
+    $.export("$summary", `Successfully fetched info for the track, "${data?.name}"`);
 
-    return res;
+    return data ?? {};
   },
 };

components/spotify/actions/remove-user-saved-tracks/remove-user-saved-tracks.mjs

@@ -25,7 +25,7 @@ export default {
 
     const ids = this.spotify.sanitizedArray(savedUserTracksId);
 
-    const resp = await this.spotify._makeRequest({
+    const { data } = await this.spotify._makeRequest({
       $,
       method: "DELETE",
       url: "/me/tracks",
@@ -37,6 +37,6 @@ export default {
     // eslint-disable-next-line multiline-ternary
     $.export("$summary", `Successfully removed ${ids.length} ${ids.length == 1 ? "item" : "items"} from "Liked Songs"`);
 
-    return resp;
+    return data;
   },
 };

components/spotify/spotify.app.mjs

@@ -269,23 +269,24 @@ export default {
       return await this.retry($, config);
     },
     // Retry axios request if not successful
-    async retry($, config, retries = 3) {
+    async retry($, config, retries = 0) {
       try {
         return await axios($, {
           ...config,
           returnFullResponse: true,
         });
       } catch (err) {
-        if (retries <= 1) {
-          throw new Error(err);
+        if (err?.status !== 429 || retries <= 3) {
+          $?.export?.("response", err);
+          throw new Error("Error response");
         }
         // if rate limit is exceeded, Retry-After will contain the # of seconds
         // to wait before retrying
-        const delay = (err && err.status == 429)
-          ? (err.headers["Retry-After"] * 1000)
-          : 500;
+        const delay = err?.headers?.["Retry-After"]
+          ? err.headers["Retry-After"] * 1000
+          : (retries * 3000);
         await pause(delay);
-        return this.retry($, config, retries - 1);
+        return this.retry($, config, retries + 1);
       }
     },
     async getItems(types, q, limit, offset) {
@@ -329,71 +330,53 @@ export default {
         return item.name;
       }
     },
-    async getPlaylist({
-      $, playlistId, ...args
-    }) {
-      const res = await this._makeRequest({
-        $,
+    async getPlaylist(playlistId, args) {
+      const { data } = await this._makeRequest({
         url: `/playlists/${playlistId}`,
         ...args,
       });
-      return res.data ?? {};
+      return data;
     },
-    async getPlaylists({
-      $, ...args
-    }) {
-      const res = await this._makeRequest({
-        $,
+    async getPlaylists(args) {
+      const { data } = await this._makeRequest({
         url: "/me/playlists",
         ...args,
       });
-      return res.data?.items ?? null;
+      return data?.items ?? [];
     },
-    async getCategories({
-      $, ...args
-    }) {
-      const res = await this._makeRequest({
-        $,
+    async getCategories(args) {
+      const { data } = await this._makeRequest({
         url: "/browse/categories",
         ...args,
       });
-      return res.data?.categories?.items ?? [];
+      return data?.categories?.items ?? [];
     },
-    async getUserTracks({
-      $, ...args
-    }) {
-      const res = await this._makeRequest({
-        $,
+    async getUserTracks(args) {
+      const { data } = await this._makeRequest({
         url: "/me/tracks",
         ...args,
       });
-      return res.data?.items ?? [];
+      return data?.items ?? [];
     },
     async getPlaylistItems({
       $, playlistId, ...args
     }) {
-      const res = await this._makeRequest({
+      const { data } = await this._makeRequest({
         $,
         url: `/playlists/${playlistId}/tracks`,
         ...args,
       });
-      return res.data?.items ?? [];
+      return data?.items ?? [];
     },
-    async getGenres({
-      $, ...args
-    } = {}) {
+    async getGenres(args) {
       const { data } = await this._makeRequest({
-        $,
         url: "/recommendations/available-genre-seeds",
         ...args,
       });
-      return data.genres;
+      return data?.genres;
     },
-    async getRecommendations({
-      $, ...args
-    }) {
+    async getRecommendations(args) {
       const { data } = await this._makeRequest({
-        $,
         url: "/recommendations",
         ...args,
       });