mr-magic-mcp-server 0.5.1 → 0.6.0

package/README.md

@@ -1184,17 +1184,19 @@ Global CLI options:
 
 ### Commands
 
-| Command                       | Purpose                                                 | Notable flags                                                                                              |
-| ----------------------------- | ------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
-| `mrmagic-cli search`          | List candidates across providers without downloading.   | `--artist`, `--title`, `--provider`, `--duration`, `--show-all`, `--pick`                                  |
-| `mrmagic-cli find`            | Resolve best lyric (prefers synced) and print / export. | `--providers`, `--synced-only`, `--export`, `--format`, `--output`, `--no-romanize`, `--choose`, `--index` |
-| `mrmagic-cli export`          | Resolve best lyric and write export files directly.     | `--providers`, `--synced-only`, `--format`, `--output`, `--no-romanize`                                    |
-| `mrmagic-cli select`          | Pick first match from a prioritized provider list.      | `--providers`, `--artist`, `--title`, `--require-synced`                                                   |
-| `mrmagic-cli server`          | Start the JSON automation API.                          | `--host`, `--port`, `--remote`                                                                             |
-| `mrmagic-cli server:mcp`      | Start the MCP stdio server.                             | —                                                                                                          |
-| `mrmagic-cli server:mcp:http` | Start the Streamable HTTP & SSE MCP server.             | `--host`, `--port`, `--remote`, `--sessionless`                                                            |
-| `mrmagic-cli search-provider` | Query a single provider only.                           | `--provider`, `--artist`, `--title`                                                                        |
-| `mrmagic-cli status`          | Print provider readiness.                               | —                                                                                                          |
+| Command                              | Purpose                                                           | Notable flags                                                                                              |
+| ------------------------------------ | ----------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- |
+| `mrmagic-cli search`                 | List candidates across providers without downloading.             | `--artist`, `--title`, `--provider`, `--duration`, `--show-all`, `--pick`                                  |
+| `mrmagic-cli find`                   | Resolve best lyric (prefers synced) and print / export.           | `--providers`, `--synced-only`, `--export`, `--format`, `--output`, `--no-romanize`, `--choose`, `--index` |
+| `mrmagic-cli export`                 | Resolve best lyric and write export files directly.               | `--providers`, `--synced-only`, `--format`, `--output`, `--no-romanize`                                    |
+| `mrmagic-cli select`                 | Pick first match from a prioritized provider list.                | `--providers`, `--artist`, `--title`, `--require-synced`                                                   |
+| `mrmagic-cli server`                 | Start the JSON automation API.                                    | `--host`, `--port`, `--remote`                                                                             |
+| `mrmagic-cli server:mcp`             | Start the MCP stdio server.                                       | —                                                                                                          |
+| `mrmagic-cli server:mcp:http`        | Start the Streamable HTTP & SSE MCP server.                       | `--host`, `--port`, `--remote`, `--sessionless`                                                            |
+| `mrmagic-cli search-provider`        | Query a single provider only.                                     | `--provider`, `--artist`, `--title`                                                                        |
+| `mrmagic-cli status`                 | Print provider readiness.                                         | —                                                                                                          |
+| `mrmagic-cli fetch:musixmatch-token` | Launch the browser workflow to fetch/cache a Musixmatch token.    | `--headless`, `--browser`, `--session-dir`                                                                 |
+| `mrmagic-cli push:musixmatch-token`  | Push an existing Musixmatch token to configured storage backends. | `--token`                                                                                                  |
 
 ### Examples
 
@@ -1227,6 +1229,12 @@ mrmagic-cli server --port 3333
 # Pick first synced match from a prioritized provider list
 npm run cli -- select --providers lrclib,genius --artist "Nayeon" --title "POP!" --require-synced
 
+# Fetch and cache a Musixmatch token through the CLI
+npm run cli -- fetch:musixmatch-token
+
+# Push an existing Musixmatch token through the CLI
+npm run cli -- push:musixmatch-token --token '{"message":...}'
+
 # Start JSON automation API on a custom port
 mrmagic-cli server --port 4000
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mr-magic-mcp-server",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Lyrics MCP server connecting LRCLIB, Genius, Musixmatch, and Melon",
   "type": "module",
   "main": "src/index.js",
@@ -61,20 +61,20 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@dotenvx/dotenvx": "^1.65.0",
+    "@dotenvx/dotenvx": "^1.75.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
-    "axios": "^1.16.0",
-    "commander": "^14.0.3",
-    "css-select": "^6.0.0",
-    "domutils": "^3.2.2",
-    "htmlparser2": "^10.1.0"
+    "axios": "^1.18.1",
+    "commander": "^15.0.0",
+    "css-select": "^7.0.0",
+    "domutils": "^4.0.2",
+    "htmlparser2": "^12.0.0"
   },
   "devDependencies": {
-    "eslint": "^10.3.0",
+    "eslint": "^10.5.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import-x": "^4.16.2",
-    "playwright": "^1.59.1",
-    "prettier": "^3.8.3"
+    "eslint-plugin-import-x": "^4.17.0",
+    "playwright": "^1.61.1",
+    "prettier": "^3.8.4"
   },
   "overrides": {
     "entities": "^7.0.1",

package/src/providers/lrclib.js

@@ -10,7 +10,7 @@ function normalizeLrclibRecord(record) {
 }
 
 const BASE_URL = 'https://lrclib.net/api';
-const HTTP_TIMEOUT_MS = Number(process.env.MR_MAGIC_HTTP_TIMEOUT_MS || 10000);
+const HTTP_TIMEOUT_MS = Number(process.env.MR_MAGIC_HTTP_TIMEOUT_MS || 15000);
 const MOZILLA_USER_AGENT =
   'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/145.0.0.0 Safari/537.36';
 

package/src/providers/melon.js

@@ -91,7 +91,7 @@ async function buildLyricHeaders(songId) {
 
 function extractSongId(value) {
   if (!value) return null;
-  const goSongMatch = value.match(/goSongDetail\([^0-9]*?(\d+)\)/);
+  const goSongMatch = value.match(/goSongDetail\([^)]*?(\d+)[^)]*\)/);
   if (goSongMatch) return goSongMatch[1];
   const searchLogMatch = value.match(/searchLog\('[^']+','[^']+','[^']+','[^']+','(\d+)'\)/);
   if (searchLogMatch) return searchLogMatch[1];
@@ -100,36 +100,50 @@ function extractSongId(value) {
   return null;
 }
 
-function parseSearchPage(html) {
+function selectFirst(selector, root) {
+  if (!root) return null;
+  return selectAll(selector, root)[0] || null;
+}
+
+function getAttributeValue(node, name) {
+  return node ? DomUtils.getAttributeValue(node, name) || '' : '';
+}
+
+function normalizedText(node) {
+  return node ? DomUtils.textContent(node).trim().replace(/\s+/g, ' ') : '';
+}
+
+export function parseSearchPage(html) {
   const document = parseDocument(html);
   const seenIds = new Set();
   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 titleCell = cells[2] || null;
+      const artistCell = cells[3] || null;
+      const albumCell = cells[4] || null;
+      const titleAnchor = selectFirst('a.fc_gray', titleCell) || selectFirst('a', titleCell);
+      const artistAnchor =
+        selectFirst('#artistName > a', artistCell) ||
+        selectFirst('#artistName', artistCell) ||
+        selectFirst('a', artistCell);
+      const albumAnchor = selectFirst('a', albumCell);
       const titleHref =
-        DomUtils.getAttributeValue(titleAnchor, 'href') ||
-        DomUtils.getAttributeValue(titleAnchor, 'onclick') ||
-        '';
+        getAttributeValue(titleAnchor, 'href') || getAttributeValue(titleAnchor, 'onclick');
       const artistHref =
-        DomUtils.getAttributeValue(artistAnchor, 'href') ||
-        DomUtils.getAttributeValue(artistAnchor, 'onclick') ||
-        '';
+        getAttributeValue(artistAnchor, 'href') || getAttributeValue(artistAnchor, 'onclick');
       let songId = extractSongId(titleHref) || extractSongId(artistHref);
       if (!songId) songId = extractSongId(DomUtils.getOuterHTML(row) || '');
       if (!songId || seenIds.has(songId)) {
         return null;
       }
-      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, ' ');
+      const title = normalizedText(titleAnchor || titleCell);
+      const artist = normalizedText(artistAnchor || artistCell);
+      const album = normalizedText(albumAnchor || albumCell);
       seenIds.add(songId);
       if (!title && !artist) return null;
       return { songId, title, artist, album };
     })
-    .get()
     .filter(Boolean);
 }
 

package/src/tests/run-tests.js

@@ -19,6 +19,7 @@ import {
   catalogCacheKey,
   catalogCache
 } from '../services/lyrics-service.js';
+import { parseSearchPage } from '../providers/melon.js';
 import { mcpToolDefinitions, handleMcpTool } from '../transport/mcp-tools.js';
 import { romanizePlainLyrics } from '../utils/lyrics-format.js';
 
@@ -453,6 +454,41 @@ function testCliExportCommandHelp() {
   console.log('CLI export command help is available: ok');
 }
 
+function testCliMusixmatchTokenCommandHelp() {
+  const fetchOutput = execFileSync(
+    process.execPath,
+    ['src/bin/cli.js', 'fetch:musixmatch-token', '--help'],
+    {
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        LOG_LEVEL: 'error',
+        MR_MAGIC_QUIET_STDIO: '1'
+      }
+    }
+  );
+  const pushOutput = execFileSync(
+    process.execPath,
+    ['src/bin/cli.js', 'push:musixmatch-token', '--help'],
+    {
+      encoding: 'utf8',
+      env: {
+        ...process.env,
+        LOG_LEVEL: 'error',
+        MR_MAGIC_QUIET_STDIO: '1'
+      }
+    }
+  );
+
+  assert.ok(fetchOutput.includes('Launch the browser workflow'));
+  assert.ok(fetchOutput.includes('--browser <name>'));
+  assert.ok(pushOutput.includes('Push an existing Musixmatch token'));
+  assert.ok(pushOutput.includes('--token <json_or_string>'));
+
+  divider();
+  console.log('CLI Musixmatch token command help is available: ok');
+}
+
 function testCliEnvPathLoadsCustomEnvFile() {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'mrmagic-cli-env-'));
   const envPath = path.join(tempDir, '.env.custom');
@@ -504,6 +540,81 @@ function testCliEnvPathLoadsCustomEnvFile() {
   console.log('CLI --env-path loads and persists custom env files: ok');
 }
 
+function testMelonSearchParserWithoutCheerioCollection() {
+  const html = `
+    <div id="frm_defaultList">
+      <div>
+        <table>
+          <tbody>
+            <tr>
+              <td></td>
+              <td></td>
+              <td><a class="fc_gray" href="javascript:goSongDetail('38914304')">Summer Nights</a></td>
+              <td><div id="artistName"><a href="#artist">St. Lucia</a></div></td>
+              <td><a href="#album">When The Night</a></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>`;
+
+  const results = parseSearchPage(html);
+  assert.equal(results.length, 1, 'Melon parser should return plain arrays, not Cheerio chains');
+  assert.deepEqual(results[0], {
+    songId: '38914304',
+    title: 'Summer Nights',
+    artist: 'St. Lucia',
+    album: 'When The Night'
+  });
+
+  divider();
+  console.log('Melon parser works without Cheerio collection helpers: ok');
+}
+
+function testMelonSearchParserHandlesMissingAnchors() {
+  const html = `
+    <div id="frm_defaultList">
+      <div>
+        <table>
+          <tbody>
+            <tr>
+              <td></td>
+              <td></td>
+              <td><a class="fc_gray" href="javascript:goSongDetail('12345678')">This Feeling</a></td>
+              <td><div id="artistName">The Chainsmokers</div></td>
+              <td><a href="#album">Sick Boy</a></td>
+            </tr>
+            <tr>
+              <td></td>
+              <td></td>
+              <td><a href="javascript:goSongDetail('87654321')">Fallback Title Link</a></td>
+              <td><a href="#artist">Fallback Artist</a></td>
+              <td>Fallback Album</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>`;
+
+  const results = parseSearchPage(html);
+  assert.equal(results.length, 2, 'Melon parser should skip missing anchors without crashing');
+  assert.deepEqual(results[0], {
+    songId: '12345678',
+    title: 'This Feeling',
+    artist: 'The Chainsmokers',
+    album: 'Sick Boy'
+  });
+  assert.deepEqual(results[1], {
+    songId: '87654321',
+    title: 'Fallback Title Link',
+    artist: 'Fallback Artist',
+    album: 'Fallback Album'
+  });
+
+  divider();
+  console.log('Melon parser handles missing class/id anchors: ok');
+}
+
 async function run() {
   testAutoPickPrefersSynced();
   testAutoPickFallbackWhenNoSynced();
@@ -521,7 +632,10 @@ async function run() {
   await testBuildPayloadFromResultReturnsCacheKey();
   await testBuildPayloadFromResultNoCacheKeyWhenNoLyrics();
   testCliExportCommandHelp();
+  testCliMusixmatchTokenCommandHelp();
   testCliEnvPathLoadsCustomEnvFile();
+  testMelonSearchParserWithoutCheerioCollection();
+  testMelonSearchParserHandlesMissingAnchors();
   const toolNames = mcpToolDefinitions.map((tool) => tool.name);
   console.log('MCP tooling available:', toolNames.join(', '));
   console.log('All sanity checks passed');

package/src/tools/cli.js

@@ -1,6 +1,9 @@
 #!/usr/bin/env node
 import '../utils/config.js';
+import { spawn } from 'node:child_process';
+import path from 'node:path';
 import process from 'node:process';
+import { fileURLToPath } from 'node:url';
 
 import { Command } from 'commander';
 
@@ -77,6 +80,38 @@ function hasOption(argv, names) {
   return argv.some((token) => names.some((name) => token === name || token.startsWith(`${name}=`)));
 }
 
+function runScript(scriptFile, { args = [], env = process.env } = {}) {
+  const scriptPath = path.resolve(
+    path.dirname(fileURLToPath(import.meta.url)),
+    '..',
+    'scripts',
+    scriptFile
+  );
+
+  return new Promise((resolve) => {
+    const child = spawn(process.execPath, [scriptPath, ...args], {
+      stdio: 'inherit',
+      env
+    });
+
+    child.on('error', (error) => {
+      console.error(`Failed to start ${scriptFile}: ${error.message}`);
+      process.exitCode = 1;
+      resolve();
+    });
+
+    child.on('close', (code, signal) => {
+      if (signal) {
+        console.error(`${scriptFile} terminated by signal ${signal}`);
+        process.exitCode = 1;
+      } else if (code && code !== 0) {
+        process.exitCode = code;
+      }
+      resolve();
+    });
+  });
+}
+
 function normalizeLegacyNpmInvocation(argv) {
   const base = Array.isArray(argv) ? [...argv] : [];
   if (base.length < 3) return base;
@@ -175,6 +210,32 @@ program
     console.table(await getProviderStatus());
   });
 
+program
+  .command('fetch:musixmatch-token')
+  .description('Launch the browser workflow to fetch and cache a Musixmatch token')
+  .option('--headless', 'Run the Playwright browser workflow headlessly', false)
+  .option(
+    '--browser <name>',
+    'Prefer a browser candidate (chrome, brave, msedge, comet, firefox, safari)'
+  )
+  .option('--session-dir <dir>', 'Override the persistent Playwright session directory')
+  .action(async (options) => {
+    const env = { ...process.env };
+    if (options.headless) env.HEADLESS = '1';
+    if (options.browser) env.BROWSER = options.browser;
+    if (options.sessionDir) env.PLAYWRIGHT_SESSION_DIR = options.sessionDir;
+    await runScript('fetch_musixmatch_token.mjs', { env });
+  });
+
+program
+  .command('push:musixmatch-token')
+  .description('Push an existing Musixmatch token to configured storage backends')
+  .option('-t, --token <json_or_string>', 'Token JSON payload or raw token string')
+  .action(async (options) => {
+    const args = options.token ? ['--token', options.token] : [];
+    await runScript('push_musixmatch_token.mjs', { args });
+  });
+
 const DEFAULT_FORMATS = ['plain', 'srt'];
 
 const COLORS = {