lastfm-nodejs-client 1.2.4 → 1.4.0

package/src/getWeeklyTrackChart.ts

@@ -0,0 +1,20 @@
+import { WeeklyTrackChartResponse } from '../@types';
+import { createOptions } from './createOptions';
+import request from './request';
+
+
+/**
+ * GET: Weekly track chart - LastFM
+ *
+ * https://www.last.fm/api/show/user.getWeeklyTrackChart
+ * @returns Weekly track chart
+ */
+export function getWeeklyTrackChart(
+  method: string,
+  user: string,
+  period: string,
+  limit: string,
+): Promise<WeeklyTrackChartResponse> {
+  const options = createOptions(method, user, period, limit);
+  return request<WeeklyTrackChartResponse>(options);
+}

package/src/index.ts

@@ -1,256 +1,18 @@
-import config from './config';
-import method from './method';
-import request from './request';
-import {
-  AuthResponse,
-  LovedTracksResponse,
-  RecentTracksResponse,
-  TopAlbumsResponse,
-  TopArtistsResponse,
-  TopTrackResponse,
-  UserResponse,
-  WeeklyAlbumChartResponse,
-  WeeklyArtistChartResponse,
-  WeeklyChartListResponse,
-  WeeklyTrackChartResponse,
-} from '../@types';
-
-function LastFmApi() {
-  /**
-   * POST: Auth - LastFM
-   *
-   * https://www.last.fm/api/show/auth.getToken
-   *
-   * Authentication tokens are API account specific.
-   * They are valid for 60 minutes from the moment they are granted.
-   * Can only used once (they are consumed when a session is created).
-   * @returns Auth token
-   */
-  function auth(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<AuthResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<AuthResponse>(options);
-  }
-
-  /**
-   * GET: User profile information - LastFM
-   *
-   * https://www.last.fm/api/show/user.getInfo
-   * @returns User profile data
-   */
-  function getInfo(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<UserResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<UserResponse>(options);
-  }
-
-  /**
-   * GET: Love Tracks - LastFM
-   *
-   * https://www.last.fm/api/show/user.getLovedTracks
-   * @returns Loved Tracks;
-   */
-  function getLovedTracks(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<LovedTracksResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<LovedTracksResponse>(options);
-  }
-
-  /**
-   * GET: Recent Tracks - LastFM
-   *
-   * https://www.last.fm/api/show/user.getRecentTracks
-   * @returns Recent Tracks
-   */
-  function getRecentTracks(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<RecentTracksResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<RecentTracksResponse>(options);
-  }
-
-  /**
-   * GET: Top Albums - LastFM
-   *
-   * https://www.last.fm/api/show/user.getTopAlbums
-   * @returns Top Albums
-   */
-  function getTopAlbums(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<TopAlbumsResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<TopAlbumsResponse>(options);
-  }
-
-  /**
-   * GET: Top Artist - LastFM
-   *
-   * https://www.last.fm/api/show/user.getTopArtists
-   * @returns Top Artists
-   */
-  function getTopArtists(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<TopArtistsResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<TopArtistsResponse>(options);
-  }
-
-  /**
-   * GET: Top Tracks - LastFM
-   *
-   * https://www.last.fm/api/show/user.getTopTracks
-   * @returns Top Tracks
-   */
-  function getTopTracks(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<TopTrackResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<TopTrackResponse>(options);
-  }
-
-  /**
-   * GET: Weekly album chart - LastFM
-   *
-   * https://www.last.fm/api/show/user.getWeeklyAlbumChart
-   * @returns Weekly album chart
-   */
-  function getWeeklyAlbumChart(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<WeeklyAlbumChartResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<WeeklyAlbumChartResponse>(options);
-  }
-
-  /**
-   * GET: Weekly artist chart - LastFM
-   *
-   * https://www.last.fm/api/show/user.getWeeklyArtistChart
-   * @returns Weekly artist chart
-   */
-  function getWeeklyArtistChart(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<WeeklyArtistChartResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<WeeklyArtistChartResponse>(options);
-  }
-
-  /**
-   * GET: Weekly chart list - LastFM
-   *
-   * https://www.last.fm/api/show/user.getWeeklyChartList
-   * @returns Weekly chart list
-   */
-  function getWeeklyChartList(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<WeeklyChartListResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<WeeklyChartListResponse>(options);
-  }
-
-  /**
-   * GET: Weekly track chart - LastFM
-   *
-   * https://www.last.fm/api/show/user.getWeeklyTrackChart
-   * @returns Weekly track chart
-   */
-  function getWeeklyTrackChart(
-    method: string,
-    user: string,
-    period: string,
-    limit: string,
-  ): Promise<WeeklyTrackChartResponse> {
-    const options = {
-      method,
-      user,
-      period,
-      limit,
-    }
-    return request<WeeklyTrackChartResponse>(options);
-  }
-
+import { auth } from './auth';
+import { config } from './config';
+import { getInfo } from './getInfo';
+import { getLovedTracks } from './getLovedTracks';
+import { getRecentTracks } from './getRecentTracks';
+import { getTopAlbums } from './getTopAlbums';
+import { getTopArtists } from './getTopArtists';
+import { getTopTracks } from './getTopTracks';
+import { getWeeklyAlbumChart } from './getWeeklyAlbumChart';
+import { getWeeklyArtistChart } from './getWeeklyArtistChart';
+import { getWeeklyChartList } from './getWeeklyChartList';
+import { getWeeklyTrackChart } from './getWeeklyTrackChart';
+import { method } from './method';
+
+export default function LastFmApi() {
   return {
     auth,
     config,
@@ -267,5 +29,3 @@ function LastFmApi() {
     method,
   };
 }
-
-export default LastFmApi;

package/src/method.ts

@@ -1,15 +1,33 @@
-export default {
+interface UserMethod {
+  getInfo: string;
+  getLovedTracks: string;
+  getRecentTracks: string;
+  getTopAlbums: string;
+  getTopArtists: string;
+  getTopTracks: string;
+  getWeeklyAlbumChart: string;
+  getWeeklyArtistChart: string;
+  getWeeklyChartList: string;
+  getWeeklyTrackChart: string;
+};
+
+export interface Method {
+  auth: string;
+  user: UserMethod;
+};
+
+export const method = {
   auth: 'auth.getToken',
   user: {
     getInfo: 'user.getInfo',
-    loved_tracks: 'user.getLovedTracks',
-    recent_tracks: 'user.getRecentTracks',
-    top_albums: 'user.getTopAlbums',
-    top_artists: 'user.getTopArtists',
-    top_tracks: 'user.getTopTracks',
-    weekly_album_chart: 'user.getWeeklyAlbumChart',
-    weekly_artist_chart: 'user.getWeeklyArtistChart',
-    weekly_chart_list: 'user.getWeeklyChartList',
-    weekly_track_chart: 'user.getWeeklyTrackChart',
+    getLovedTracks: 'user.getLovedTracks',
+    getRecentTracks: 'user.getRecentTracks',
+    getTopAlbums: 'user.getTopAlbums',
+    getTopArtists: 'user.getTopArtists',
+    getTopTracks: 'user.getTopTracks',
+    getWeeklyAlbumChart: 'user.getWeeklyAlbumChart',
+    getWeeklyArtistChart: 'user.getWeeklyArtistChart',
+    getWeeklyChartList: 'user.getWeeklyChartList',
+    getWeeklyTrackChart: 'user.getWeeklyTrackChart',
   },
-};
+} satisfies Method;

package/src/request.ts

@@ -1,5 +1,5 @@
 import fetch from 'cross-fetch';
-import config from './config';
+import { config } from './config';
 
 interface RequestOptions {
   method: string;
@@ -8,14 +8,35 @@ interface RequestOptions {
   limit?: string;
 }
 
+enum ErrorResponse {
+  InvalidService = 2,
+  InvalidMethod = 3,
+  AuthenticationFailed = 4,
+  InvalidFormat = 5,
+  InvalidParameters = 6,
+  InvalidResource = 7,
+  OperationFailed = 8,
+  InvalidSessionKey = 9,
+  InvalidAPIKey = 10,
+  ServiceOffline = 11,
+  InvalidMethodSignature = 13,
+  TemporaryError = 16,
+  SuspendedAPIKey = 26,
+  RateLimitExceeded = 29
+}
+
 const buildUrl = (options: RequestOptions): string => {
   const params = new URLSearchParams();
+
   params.append('method', options.method);
+
   if (options.user) params.append('user', options.user);
   if (options.period) params.append('period', options.period);
   if (options.limit) params.append('limit', options.limit);
+
   params.append('api_key', config.api_key);
   params.append('format', config.format.json);
+
   return `${config.base_url}?${params.toString()}`;
 }
 
@@ -28,14 +49,84 @@ const request = async <Response>(options: RequestOptions): Promise<Response> =>
     },
   })
     .then((res) => {
-      if (res.status >= 400) {
-        throw new Error('Bad response from server');
+      if(!res.ok) {
+        throw new Error(res.statusText);
       }
-      return res.json();
+
+      switch (res.status) {
+        case 200: {
+          return res.json();
+        }
+        case 400: {
+          throw new Error('Bad request');
+        }
+        case 401: {
+          throw new Error('Unauthorized');
+        }
+        case 403: {
+          throw new Error('Forbidden');
+        }
+        case 404: {
+          throw new Error('Not found');
+        }
+        case 500: {
+          throw new Error('Internal server error');
+        }
+        case 503: {
+          throw new Error('Service unavailable');
+        }
+        case ErrorResponse.InvalidAPIKey: {
+          throw new Error('Invalid API key');
+        }
+        case ErrorResponse.InvalidMethod: {
+          throw new Error('Invalid method');
+        }
+        case ErrorResponse.InvalidParameters: {
+          throw new Error('Invalid parameters');
+        }
+        case ErrorResponse.InvalidResource: {
+          throw new Error('Invalid resource');
+        }
+        case ErrorResponse.InvalidSessionKey: {
+          throw new Error('Invalid session key');
+        }
+        case ErrorResponse.InvalidService: {
+          throw new Error('Invalid service');
+        }
+        case ErrorResponse.OperationFailed: {
+          throw new Error('Operation failed');
+        }
+        case ErrorResponse.RateLimitExceeded: {
+          throw new Error('Rate limit exceeded');
+        }
+        case ErrorResponse.ServiceOffline: {
+          throw new Error('Service offline');
+        }
+        case ErrorResponse.SuspendedAPIKey: {
+          throw new Error('Suspended API key');
+        }
+        case ErrorResponse.TemporaryError: {
+          throw new Error('Temporary error');
+        }
+        case ErrorResponse.AuthenticationFailed: {
+          throw new Error('Authentication failed');
+        }
+        case ErrorResponse.InvalidFormat: {
+          throw new Error('Invalid format');
+        }
+        case ErrorResponse.InvalidMethodSignature: {
+          throw new Error('Invalid method signature');
+        }
+
+        default: {
+          throw new Error('Unknown error');
+        }
+      }
+
     })
     .then((json) => json)
     .catch((error) => {
-      console.log(error);
+      console.log('🚨 error:', error);
     })) as Response;
 };
 

package/tsconfig.json

@@ -26,9 +26,9 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "CommonJS" /* Specify what module code is generated. */,
+    "module": "NodeNext" /* Specify what module code is generated. */,
     "rootDir": "./src" /* Specify the root folder within your source files. */,
-    "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
+    "moduleResolution": "NodeNext" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
@@ -45,17 +45,17 @@
     // "maxNodeModuleJsDepth": 1,                        /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
 
     /* Emit */
-    "declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
-    // "declarationMap": true,                           /* Create sourcemaps for d.ts files. */
+    "declaration": false /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
+    "declarationMap": false,                           /* Create sourcemaps for d.ts files. */
     // "emitDeclarationOnly": true,                      /* Only output d.ts files and not JavaScript files. */
     // "sourceMap": true,                                /* Create source map files for emitted JavaScript files. */
     // "outFile": "./",                                  /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
-    // "removeComments": true,                           /* Disable emitting comments. */
+    "removeComments": false,                           /* Disable emitting comments. */
     // "noEmit": true,                                   /* Disable emitting files from a compilation. */
     // "importHelpers": true,                            /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
     // "importsNotUsedAsValues": "remove",               /* Specify emit/checking behavior for imports that are only used for types. */
-    // "downlevelIteration": true,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
+    "downlevelIteration": false,                       /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
     // "sourceRoot": "",                                 /* Specify the root path for debuggers to find the reference source code. */
     // "mapRoot": "",                                    /* Specify the location where debugger should locate map files instead of generated locations. */
     // "inlineSourceMap": true,                          /* Include sourcemap files inside the emitted JavaScript. */
@@ -101,4 +101,4 @@
     "skipDefaultLibCheck": true /* Skip type checking .d.ts files that are included with TypeScript. */,
     "skipLibCheck": true /* Skip type checking all .d.ts files. */
   }
-}
+}

package/dist/config.d.ts

@@ -1,12 +0,0 @@
-declare const _default: {
-    api_key: string;
-    app_name: string;
-    base_url: string;
-    format: {
-        json: string;
-        xml: string;
-    };
-    share_secret: string;
-    username: string;
-};
-export default _default;

package/dist/index.d.ts

@@ -1,41 +0,0 @@
-import { AuthResponse, LovedTracksResponse, RecentTracksResponse, TopAlbumsResponse, TopArtistsResponse, TopTrackResponse, UserResponse, WeeklyAlbumChartResponse, WeeklyArtistChartResponse, WeeklyChartListResponse, WeeklyTrackChartResponse } from '../@types';
-declare function LastFmApi(): {
-    auth: (method: string, user: string, period: string, limit: string) => Promise<AuthResponse>;
-    config: {
-        api_key: string;
-        app_name: string;
-        base_url: string;
-        format: {
-            json: string;
-            xml: string;
-        };
-        share_secret: string;
-        username: string;
-    };
-    getInfo: (method: string, user: string, period: string, limit: string) => Promise<UserResponse>;
-    getLovedTracks: (method: string, user: string, period: string, limit: string) => Promise<LovedTracksResponse>;
-    getRecentTracks: (method: string, user: string, period: string, limit: string) => Promise<RecentTracksResponse>;
-    getTopAlbums: (method: string, user: string, period: string, limit: string) => Promise<TopAlbumsResponse>;
-    getTopArtists: (method: string, user: string, period: string, limit: string) => Promise<TopArtistsResponse>;
-    getTopTracks: (method: string, user: string, period: string, limit: string) => Promise<TopTrackResponse>;
-    getWeeklyAlbumChart: (method: string, user: string, period: string, limit: string) => Promise<WeeklyAlbumChartResponse>;
-    getWeeklyArtistChart: (method: string, user: string, period: string, limit: string) => Promise<WeeklyArtistChartResponse>;
-    getWeeklyChartList: (method: string, user: string, period: string, limit: string) => Promise<WeeklyChartListResponse>;
-    getWeeklyTrackChart: (method: string, user: string, period: string, limit: string) => Promise<WeeklyTrackChartResponse>;
-    method: {
-        auth: string;
-        user: {
-            getInfo: string;
-            loved_tracks: string;
-            recent_tracks: string;
-            top_albums: string;
-            top_artists: string;
-            top_tracks: string;
-            weekly_album_chart: string;
-            weekly_artist_chart: string;
-            weekly_chart_list: string;
-            weekly_track_chart: string;
-        };
-    };
-};
-export default LastFmApi;

package/dist/method.d.ts

@@ -1,16 +0,0 @@
-declare const _default: {
-    auth: string;
-    user: {
-        getInfo: string;
-        loved_tracks: string;
-        recent_tracks: string;
-        top_albums: string;
-        top_artists: string;
-        top_tracks: string;
-        weekly_album_chart: string;
-        weekly_artist_chart: string;
-        weekly_chart_list: string;
-        weekly_track_chart: string;
-    };
-};
-export default _default;

package/dist/request.d.ts

@@ -1,8 +0,0 @@
-interface RequestOptions {
-    method: string;
-    user?: string;
-    period?: string;
-    limit?: string;
-}
-declare const request: <Response_1>(options: RequestOptions) => Promise<Response_1>;
-export default request;