mr-magic-mcp-server 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mr-magic-mcp-server",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Lyrics MCP server connecting LRCLIB, Genius, Musixmatch, and Melon",
   "type": "module",
   "main": "src/index.js",
@@ -64,8 +64,10 @@
     "@dotenvx/dotenvx": "^1.65.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "axios": "^1.16.0",
-    "cheerio": "^1.2.0",
-    "commander": "^14.0.3"
+    "commander": "^14.0.3",
+    "css-select": "^6.0.0",
+    "domutils": "^3.2.2",
+    "htmlparser2": "^10.1.0"
   },
   "devDependencies": {
     "eslint": "^10.3.0",
@@ -85,8 +87,7 @@
     "hasown": "npm:@socketregistry/hasown@^1",
     "object-assign": "npm:@socketregistry/object-assign@^1",
     "safer-buffer": "npm:@socketregistry/safer-buffer@^1",
-    "side-channel": "npm:@socketregistry/side-channel@^1",
-    "encoding-sniffer": "^1.0.2"
+    "side-channel": "npm:@socketregistry/side-channel@^1"
   },
   "resolutions": {
     "entities": "^7.0.1",
@@ -99,7 +100,6 @@
     "hasown": "npm:@socketregistry/hasown@^1",
     "object-assign": "npm:@socketregistry/object-assign@^1",
     "safer-buffer": "npm:@socketregistry/safer-buffer@^1",
-    "side-channel": "npm:@socketregistry/side-channel@^1",
-    "encoding-sniffer": "^1.0.2"
+    "side-channel": "npm:@socketregistry/side-channel@^1"
   }
 }

package/src/providers/genius.js

@@ -1,5 +1,7 @@
 import axios from 'axios';
-import * as cheerio from 'cheerio';
+import { selectAll } from 'css-select';
+import * as DomUtils from 'domutils';
+import { parseDocument } from 'htmlparser2';
 
 import { normalizeLyricRecord } from '../provider-result-schema.js';
 import { assertEnv, getEnvValue } from '../utils/config.js';
@@ -119,7 +121,7 @@ export async function fetchFromGenius(track) {
   return primary;
 }
 
-function normalizeNodeText($node) {
+function normalizeNodeText(node) {
   const lines = [];
   const traverse = (node) => {
     if (!node) return;
@@ -145,7 +147,7 @@ function normalizeNodeText($node) {
     }
   };
 
-  traverse($node[0]);
+  traverse(node);
 
   return lines
     .join(' ')
@@ -155,18 +157,19 @@ function normalizeNodeText($node) {
     .trim();
 }
 
-function extractFromNodes(nodes, $) {
+function removeUnwantedNodes(node) {
+  const unwanted = selectAll(
+    'script,noscript,img,style,aside,.song_media_dropdown,.header_with_cover_art-primary_info',
+    node
+  );
+  unwanted.forEach((element) => DomUtils.removeElement(element));
+}
+
+function extractFromNodes(nodes) {
   const blocks = [];
   nodes.forEach((element) => {
-    const cleaned = $(element)
-      .clone()
-      .find(
-        'script,noscript,img,style,aside,.song_media_dropdown,.header_with_cover_art-primary_info'
-      )
-      .remove()
-      .end();
-
-    const text = normalizeNodeText(cleaned);
+    removeUnwantedNodes(element);
+    const text = normalizeNodeText(element);
     const stripped = stripSummaryText(text);
 
     if (stripped) {
@@ -224,15 +227,18 @@ export async function fetchLyricsForGeniusSong(url) {
       }
     });
 
-    const $ = cheerio.load(response.data);
-    let blocks = extractFromNodes($('div[data-lyrics-container="true"]').toArray(), $);
+    const document = parseDocument(response.data);
+    let blocks = extractFromNodes(selectAll('div[data-lyrics-container="true"]', document));
 
     if (!blocks.length) {
-      blocks = extractFromNodes($('div[class^="Lyrics__Container"]').toArray(), $);
+      blocks = extractFromNodes(selectAll('div[class^="Lyrics__Container"]', document));
     }
 
     if (!blocks.length) {
-      const fallback = $('.lyrics').text().trim();
+      const fallback = selectAll('.lyrics', document)
+        .map((node) => DomUtils.textContent(node))
+        .join('\n')
+        .trim();
       if (fallback) {
         blocks.push(fallback);
       }

package/src/providers/melon.js

@@ -1,5 +1,7 @@
 import axios from 'axios';
-import * as cheerio from 'cheerio';
+import { selectAll } from 'css-select';
+import * as DomUtils from 'domutils';
+import { parseDocument } from 'htmlparser2';
 
 import { normalizeLyricRecord, recomputeSyncFlags } from '../provider-result-schema.js';
 import { MELON_COOKIE, warnMissingEnv } from '../utils/config.js';
@@ -99,25 +101,30 @@ function extractSongId(value) {
 }
 
 function parseSearchPage(html) {
-  const $ = cheerio.load(html);
+  const document = parseDocument(html);
   const seenIds = new Set();
-  return $('#frm_defaultList > div > table > tbody > tr')
-    .map((_, row) => {
-      const $row = $(row);
-      const cells = $row.find('td');
-      const titleAnchor = cells.eq(2).find('a.fc_gray').first();
-      const artistAnchor = cells.eq(3).find('#artistName > a').first();
-      const albumAnchor = cells.eq(4).find('a').first();
-      const titleHref = titleAnchor.attr('href') || titleAnchor.attr('onclick') || '';
-      const artistHref = artistAnchor.attr('href') || artistAnchor.attr('onclick') || '';
+  return selectAll('#frm_defaultList > div > table > tbody > tr', document)
+    .map((row) => {
+      const cells = selectAll('td', row);
+      const titleAnchor = selectAll('a.fc_gray', cells[2] || [])[0];
+      const artistAnchor = selectAll('#artistName > a', cells[3] || [])[0];
+      const albumAnchor = selectAll('a', cells[4] || [])[0];
+      const titleHref =
+        DomUtils.getAttributeValue(titleAnchor, 'href') ||
+        DomUtils.getAttributeValue(titleAnchor, 'onclick') ||
+        '';
+      const artistHref =
+        DomUtils.getAttributeValue(artistAnchor, 'href') ||
+        DomUtils.getAttributeValue(artistAnchor, 'onclick') ||
+        '';
       let songId = extractSongId(titleHref) || extractSongId(artistHref);
-      if (!songId) songId = extractSongId($row.html() || '');
+      if (!songId) songId = extractSongId(DomUtils.getOuterHTML(row) || '');
       if (!songId || seenIds.has(songId)) {
         return null;
       }
-      const title = titleAnchor.text().trim().replace(/\s+/g, ' ');
-      const artist = artistAnchor.text().trim().replace(/\s+/g, ' ');
-      const album = albumAnchor.text().trim().replace(/\s+/g, ' ');
+      const title = DomUtils.textContent(titleAnchor).trim().replace(/\s+/g, ' ');
+      const artist = DomUtils.textContent(artistAnchor).trim().replace(/\s+/g, ' ');
+      const album = DomUtils.textContent(albumAnchor).trim().replace(/\s+/g, ' ');
       seenIds.add(songId);
       if (!title && !artist) return null;
       return { songId, title, artist, album };