lastfm-nodejs-client 1.1.4 → 1.2.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.2.1
+
+- Tidy up, removes console logs
+
+## 1.2.0
+
+- Swops `node-fetch` for `cross-fetch` for server and browser fetching support in one.
+
+## 1.1.5
+
+- Fix incorrect type on request method
+
 ## 1.1.4
 
 - Fix incorrect type on request method

package/README.md

@@ -1,7 +1,14 @@
 # LastFm NodeJs client
 
+[![NPM Version](https://img.shields.io/npm/v/lastfm-nodejs-client.svg?branch=main)](https://www.npmjs.com/package/lastfm-nodejs-client)
+[![Downloads Per Week](https://img.shields.io/npm/dw/lastfm-nodejs-client.svg?color=blue)](https://www.npmjs.com/package/lastfm-nodejs-client)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/ba3b73c24e06433fabe0efed8b43d026)](https://www.codacy.com/gh/mannuelf/lastfm-nodejs-client/dashboard?utm_source=github.com&utm_medium=referral&utm_content=mannuelf/lastfm-nodejs-client&utm_campaign=Badge_Grade)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+
 A Node JS wrapper client for fetching public data from [LastFm API](https://www.last.fm/api).
 
+Fetch server side or client side, thanks to [cross-fetch](https://github.com/lquixada/cross-fetch)
+
 ## How to use the client
 
 Install the npm package in your project.

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 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: number) => Promise<AuthResponse>;
+    auth: (method: string, user: string, period: string, limit: string) => Promise<AuthResponse>;
     config: {
         api_key: string;
         app_name: string;
@@ -12,16 +12,16 @@ declare function LastFmApi(): {
         share_secret: string;
         username: string;
     };
-    getInfo: (method: string, user: string, period: string, limit: number) => Promise<UserResponse>;
-    getLovedTracks: (method: string, user: string, period: string, limit: number) => Promise<LovedTracksResponse>;
-    getRecentTracks: (method: string, user: string, period: string, limit: number) => Promise<RecentTracksResponse>;
-    getTopAlbums: (method: string, user: string, period: string, limit: number) => Promise<TopAlbumsResponse>;
-    getTopArtists: (method: string, user: string, period: string, limit: number) => Promise<TopArtistsResponse>;
-    getTopTracks: (method: string, user: string, period: string, limit: number) => Promise<TopTrackResponse>;
-    getWeeklyAlbumChart: (method: string, user: string, period: string, limit: number) => Promise<WeeklyAlbumChartResponse>;
-    getWeeklyArtistChart: (method: string, user: string, period: string, limit: number) => Promise<WeeklyArtistChartResponse>;
-    getWeeklyChartList: (method: string, user: string, period: string, limit: number) => Promise<WeeklyChartListResponse>;
-    getWeeklyTrackChart: (method: string, user: string, period: string, limit: number) => Promise<WeeklyTrackChartResponse>;
+    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: {

package/dist/request.d.ts

@@ -1,2 +1,2 @@
-declare const request: <Parameters_1, Response_1>(method: string, user: string, period?: string, limit?: string) => Promise<Response_1>;
+declare const request: <Response_1>(method: string, user: string, period?: string, limit?: string) => Promise<Response_1>;
 export default request;

package/dist/request.js

@@ -12,17 +12,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
 const config_1 = __importDefault(require("./config"));
 const request = (method, user, period, limit) => __awaiter(void 0, void 0, void 0, function* () {
     const url = `
       ${config_1.default.base_url}?method=${method}${user ? '&user=' : ''}${user}${user ? '&user=' : ''}${user}${period ? '&period=' : ''}${period}&${limit ? '&limit=' : ''}${limit}&api_key=${config_1.default.api_key}&format=${config_1.default.format.json}`;
-    return (yield fetch(url, {
+    return (yield (0, cross_fetch_1.default)(url, {
         headers: {
             'Content-Type': 'application/json',
         },
     })
-        .then((res) => res.json())
+        .then((res) => {
+        if (res.status >= 400) {
+            throw new Error('Bad response from server');
+        }
+        return res.json();
+    })
         .then((json) => json)
-        .catch((error) => console.log('🔥 Uh oh...', error)));
+        .catch((error) => {
+        throw new Error(error);
+    }));
 });
 exports.default = request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lastfm-nodejs-client",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "A NodeJS wrapper client for LastFm API. Fetching public data by username using the LastFm public API",
   "main": "./dist",
   "keywords": [
@@ -16,7 +16,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "node-fetch": "2.6.7",
+    "cross-fetch": "^3.1.5",
     "rimraf": "^3.0.2"
   },
   "devDependencies": {

package/src/request.ts

@@ -1,6 +1,7 @@
+import fetch from 'cross-fetch';
 import config from './config';
 
-const request = async <Parameters, Response>(
+const request = async <Response>(
   method: string,
   user: string,
   period?: string,
@@ -18,9 +19,16 @@ const request = async <Parameters, Response>(
       'Content-Type': 'application/json',
     },
   })
-    .then((res) => res.json())
+    .then((res) => {
+      if (res.status >= 400) {
+        throw new Error('Bad response from server');
+      }
+      return res.json();
+    })
     .then((json) => json)
-    .catch((error) => console.log('🔥 Uh oh...', error))) as Response;
+    .catch((error) => {
+      throw new Error(error);
+    })) as Response;
 };
 
 export default request;