Package cleanup (#63)

* Revert "feat(http): better handle ECONNRESET errors"

This reverts commit 3109494.

* chore(package): updated yarn version

* refactor(util): removed unused index file

* chore(errors): moved errors into separate package

* style(http): return types

* chore(http): renamed http manager filename

.yarnrc.yml

@@ -1 +1,3 @@
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.4.0.cjs

package.json

@@ -36,5 +36,5 @@
     "axios": "^1.7.2",
     "axios-better-stacktrace": "^2.1.6"
   },
-  "packageManager": "yarn@4.3.1"
+  "packageManager": "yarn@4.4.0"
 }

src/index.ts

@@ -1,15 +1,15 @@
 export * from './lib/SpotifyAPI';
 export * from './lib/Manager';
+export * from './lib/http/HttpClient';
 export * from './lib/album/AlbumManager';
 export * from './lib/artist/ArtistManager';
 export * from './lib/audio/AudioManager';
-export * from './lib/http/HttpManager';
 export * from './lib/me/MeManager';
 export * from './lib/search/SearchManager';
 export * from './lib/track/TrackManager';
 export * from './lib/user/UserManager';
+export * from './lib/errors';
 
 // Interfaces
 export * from './interfaces/Config';
-export * from './interfaces/Errors';
 export * from './interfaces/Spotify';

src/lib/Manager.ts

@@ -1,4 +1,4 @@
-import { HttpClient } from './http/HttpManager';
+import { HttpClient } from './http/HttpClient';
 
 export abstract class Manager {
   // eslint-disable-next-line no-unused-vars

src/lib/SpotifyAPI.ts

@@ -2,7 +2,7 @@ import { PrivateConfig, SpotifyConfig } from '../interfaces/Config';
 import { AlbumManager } from './album/AlbumManager';
 import { ArtistManager } from './artist/ArtistManager';
 import { AudioManager } from './audio/AudioManager';
-import { HttpClient } from './http/HttpManager';
+import { HttpClient } from './http/HttpClient';
 import { MeManager } from './me/MeManager';
 import { PlaylistManager } from './playlist/PlaylistManager';
 import { RecommendationsManager } from './recommendations/RecommendationsManager';

src/lib/album/AlbumManager.ts

@@ -1,4 +1,4 @@
-import { chunk } from '../../util';
+import { chunk } from '../../util/chunk';
 import {
   Album,
   Markets,

src/lib/artist/ArtistManager.ts

@@ -1,4 +1,4 @@
-import { chunk } from '../../util';
+import { chunk } from '../../util/chunk';
 import {
   AlbumSimplified,
   Artist,

src/lib/http/AuthManager.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 import axios, { AxiosInstance } from 'axios';
-import { AuthError } from '../../interfaces/Errors';
+import { AuthError } from '../errors';
 import { PrivateConfig, SpotifyConfig } from '../../interfaces/Config';
 
 const accountsApiUrl = 'https://accounts.spotify.com/api';

src/lib/http/HttpManager.ts → src/lib/http/HttpClient.ts

@@ -5,8 +5,8 @@
 import axios, {
   AxiosError,
   AxiosInstance,
+  AxiosPromise,
   AxiosRequestConfig,
-  AxiosResponse,
   InternalAxiosRequestConfig
 } from 'axios';
 import { URL, URLSearchParams } from 'url';
@@ -20,7 +20,7 @@ import {
   RatelimitError,
   RequestRetriesExceededError,
   UnauthorizedError
-} from '../../interfaces/Errors';
+} from '../errors';
 import { PrivateConfig, SpotifyConfig } from '../../interfaces/Config';
 import { sleep } from '../../util/sleep';
 import { AuthManager } from './AuthManager';
@@ -109,7 +109,7 @@ export class HttpClient {
     return client;
   }
 
-  private async handleError(client: AxiosInstance, err: unknown): Promise<AxiosResponse> {
+  private async handleError(client: AxiosInstance, err: unknown): AxiosPromise {
     if (axios.isCancel(err) || axios.isAxiosError(err) === false || !this.shouldRetryRequest(err)) {
       return await Promise.reject(this.extractResponseError(err));
     }
@@ -119,7 +119,6 @@ export class HttpClient {
     requestConfig.retryAttempt ||= 0;
 
     const isRateLimited = err.response && err.response.status === 429;
-    const isConnectionReset = (err as AxiosError).code === 'ECONNRESET';
 
     if (isRateLimited) {
       if (this.config.logRetry) {
@@ -137,16 +136,6 @@ export class HttpClient {
       await sleep(retryAfter * 1_000);
 
       requestConfig.retryAttempt = 0;
-    } else if (isConnectionReset) {
-      await sleep(1_000 * (requestConfig.retryAttempt + 1));
-
-      requestConfig.retryAttempt += 1;
-
-      if (this.config.debug) {
-        console.log(
-          `(${requestConfig.retryAttempt}/${this.maxRetryAttempts}) retry ${requestConfig.url} - ${err}`
-        );
-      }
     } else {
       await sleep(1_000);
 
@@ -273,54 +262,54 @@ export class HttpClient {
   /**
    * @param {string} slug The slug to get.
    * @param {{query?: Record<string, string> & AxiosRequestConfig}} config Config.
-   * @returns {Promise<AxiosResponse>} Returns a promise with the response.
+   * @returns {AxiosPromise} Returns a promise with the response.
    */
   async get(
     slug: string,
     config?: { query?: Record<string, string> } & AxiosRequestConfig
-  ): Promise<AxiosResponse> {
+  ): AxiosPromise {
     return await this.client.get(this.getURL(slug, config?.query), config);
   }
 
   /**
    * @param {string} slug The slug to post.
    * @param {any} data Body data.
    * @param {{Record<string, string> & RequestInit}} config Config.
-   * @returns {Promise<Response>} Returns a promise with the response.
+   * @returns {AxiosPromise} Returns a promise with the response.
    */
   async post(
     slug: string,
     data: unknown,
     config?: { query?: Record<string, string> } & AxiosRequestConfig
-  ): Promise<AxiosResponse> {
+  ): AxiosPromise {
     return await this.client.post(this.getURL(slug, config?.query), data, config);
   }
 
   /**
    * @param {string} slug The slug to put.
    * @param {any} data Body data.
    * @param {{Record<string, string> & RequestInit}} config Config.
-   * @returns {Promise<Response>} Returns a promise with the response.
+   * @returns {AxiosPromise} Returns a promise with the response.
    */
   async put(
     slug: string,
     data: unknown,
     config?: { query?: Record<string, string> } & AxiosRequestConfig
-  ): Promise<AxiosResponse> {
+  ): AxiosPromise {
     return await this.client.put(this.getURL(slug, config?.query), data, config);
   }
 
   /**
    * @param {string} slug The slug to delete.
    * @param {unknown} data Body data.
    * @param {{Record<string, string> & RequestInit}} config Config.
-   * @returns {Promise<Response>} Returns a promise with the response.
+   * @returns {AxiosPromise} Returns a promise with the response.
    */
   async delete(
     slug: string,
     data: unknown,
     config?: { query?: Record<string, string> } & AxiosRequestConfig
-  ): Promise<AxiosResponse> {
+  ): AxiosPromise {
     return await this.client.delete(this.getURL(slug, config?.query), {
       ...config,
       data

src/lib/playlist/PlaylistManager.ts

@@ -1,4 +1,4 @@
-import { chunk } from '../../util';
+import { chunk } from '../../util/chunk';
 import {
   FeaturedPlaylist,
   Markets,

src/lib/track/TrackManager.ts

@@ -1,6 +1,6 @@
 import { Track } from '../../interfaces/Spotify';
 import { Manager } from '../Manager';
-import { chunk } from '../../util';
+import { chunk } from '../../util/chunk';
 
 export class TrackManager extends Manager {
   /**