mr-magic-mcp-server 0.2.5 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mr-magic-mcp-server",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Lyrics MCP server connecting LRCLIB, Genius, Musixmatch, and Melon",
   "type": "module",
   "main": "src/index.js",

package/src/transport/http-server.js

@@ -84,12 +84,25 @@ export function startHttpServer(options = {}) {
 
       if (req.method === 'GET' && req.url.startsWith('/downloads/')) {
         const segments = req.url.split('/');
-        const [, , downloadId, ...rest] = segments;
-        // Strip trailing filename segment (e.g. "artist-song.srt") when present so the
-        // Redis key lookup uses only the extension portion of the path.
-        const hasFilename = rest.length > 1 && rest[rest.length - 1].includes('.');
-        const extensionParts = hasFilename ? rest.slice(0, -1) : rest;
-        const extension = extensionParts.join('/') || '';
+        const [, , idSegment, ...rest] = segments;
+
+        // Support two URL formats:
+        //   flat:     /downloads/export-xxx.srt         → id=export-xxx, extension=srt
+        //   compound: /downloads/export-xxx/romanized.srt → id=export-xxx, extension=romanized.srt
+        let downloadId, extension;
+        if (rest.length === 0 && idSegment && idSegment.includes('.')) {
+          // Flat format – extension is appended to the id with a dot.
+          const dotIdx = idSegment.lastIndexOf('.');
+          downloadId = idSegment.slice(0, dotIdx);
+          extension = idSegment.slice(dotIdx + 1);
+        } else {
+          // Compound / path-segment format.
+          downloadId = idSegment;
+          // Strip trailing human-readable filename (e.g. "artist-song.srt") when present.
+          const hasFilename = rest.length > 1 && rest[rest.length - 1].includes('.');
+          const extensionParts = hasFilename ? rest.slice(0, -1) : rest;
+          extension = extensionParts.join('/') || '';
+        }
         if (!downloadId || !extension) {
           logger.warn('Invalid download path', {
             context: 'http-download',

package/src/transport/mcp-http-server.js

@@ -134,8 +134,8 @@ export async function startMcpHttpServer(options = {}) {
   });
 
   // ── Export download endpoint ──────────────────────────────────────────────────
-  app.get('/downloads/:downloadId/:extension', async (req, res) => {
-    const { downloadId, extension } = req.params;
+  // Helper shared by both download route handlers.
+  async function serveDownload(downloadId, extension, res, url) {
     if (!downloadId || !extension) {
       res.status(400).json({ error: 'Invalid download path' });
       return;
@@ -163,9 +163,28 @@ export async function startMcpHttpServer(options = {}) {
         bytes: Buffer.byteLength(content)
       });
     } catch (error) {
-      logger.error('Download lookup failed', { error, url: req.originalUrl });
+      logger.error('Download lookup failed', { error, url });
       res.status(500).json({ error: 'Failed to fetch export' });
     }
+  }
+
+  // Flat format:     /downloads/export-xxx.srt      → id=export-xxx, extension=srt
+  app.get('/downloads/:idWithExt', async (req, res) => {
+    const { idWithExt } = req.params;
+    if (!idWithExt || !idWithExt.includes('.')) {
+      res.status(400).json({ error: 'Invalid download path' });
+      return;
+    }
+    const dotIdx = idWithExt.lastIndexOf('.');
+    const downloadId = idWithExt.slice(0, dotIdx);
+    const extension = idWithExt.slice(dotIdx + 1);
+    await serveDownload(downloadId, extension, res, req.originalUrl);
+  });
+
+  // Compound format: /downloads/export-xxx/romanized.srt → id=export-xxx, extension=romanized.srt
+  app.get('/downloads/:downloadId/:extension', async (req, res) => {
+    const { downloadId, extension } = req.params;
+    await serveDownload(downloadId, extension, res, req.originalUrl);
   });
 
   // ── Streamable HTTP transport (/mcp) ──────────────────────────────────────────

package/src/utils/export-storage/redis-storage.js

@@ -30,8 +30,11 @@ export default class RedisStorage {
 
     const expiresAt = new Date(Date.now() + this.ttl * 1000).toISOString();
     const base = this.downloadBaseUrl?.replace(/[\/]+$/, '') || '';
-    const bareExt = extension.includes('.') ? extension.split('.').pop() : extension;
-    const url = `${base}/downloads/${id}/${extension}/${baseName}.${bareExt}`;
+    // Compound extensions (e.g. "romanized.srt") become a path segment;
+    // simple extensions (e.g. "srt") are appended directly to the id.
+    const url = extension.includes('.')
+      ? `${base}/downloads/${id}/${extension}`
+      : `${base}/downloads/${id}.${extension}`;
     return new ExportStorageResult({ url, expiresAt, skipped: false });
   }
 }