@uimaxbai/am-lyrics 1.0.9 → 1.1.0

package/dist/src/AmLyrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AmLyrics.d.ts","sourceRoot":"","sources":["../../src/AmLyrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AmLyrics.d.ts","sourceRoot":"","sources":["../../src/AmLyrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,UAAU,EAAE,MAAM,KAAK,CAAC;AA2F5C,qBAAa,QAAS,SAAQ,UAAU;IACtC,MAAM,CAAC,MAAM,0BA+mCX;IAGF,KAAK,CAAC,EAAE,MAAM,CAAC;IAGf,OAAO,CAAC,EAAE,MAAM,CAAC;IAGjB,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,OAAO,CAAC,cAAc,CAAmC;IAGzD,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,cAAc,CAAC,EAAE,MAAM,CAAC;IAGxB,cAAc,SAAa;IAG3B,oBAAoB,SAA+B;IAGnD,UAAU,CAAC,EAAE,MAAM,CAAC;IAGpB,UAAU,UAAQ;IAGlB,WAAW,UAAQ;IAGnB,OAAO,CAAC,gBAAgB,CAAS;IAGjC,OAAO,CAAC,eAAe,CAAS;YAElB,kBAAkB;YAKlB,iBAAiB;YAsBjB,iBAAiB;YAKjB,gBAAgB;IAyC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,YAAY,CAAK;IAEzB,IACI,WAAW,CAAC,KAAK,EAAE,MAAM,EAM5B;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAGD,OAAO,CAAC,SAAS,CAAS;IAG1B,OAAO,CAAC,MAAM,CAAC,CAAe;IAE9B,OAAO,CAAC,iBAAiB,CAAgB;IAEzC,OAAO,CAAC,qBAAqB,CAAkC;IAE/D,OAAO,CAAC,2BAA2B,CAAkC;IAErE,OAAO,CAAC,gBAAgB,CAAkC;IAE1D,OAAO,CAAC,sBAAsB,CAAkC;IAGhE,OAAO,CAAC,YAAY,CAAuB;IAE3C,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAElC,OAAO,CAAC,kBAAkB,CAGZ;IAEd,OAAO,CAAC,wBAAwB,CAGlB;IAGd,OAAO,CAAC,eAAe,CAAC,CAAc;IAEtC,OAAO,CAAC,qBAAqB,CAAuB;IAEpD,OAAO,CAAC,mBAAmB,CAAC,CAAS;IAGrC,OAAO,CAAC,eAAe,CAAS;IAEhC,OAAO,CAAC,oBAAoB,CAAS;IAErC,OAAO,CAAC,cAAc,CAAS;IAE/B,OAAO,CAAC,gBAAgB,CAAC,CAAgC;IAGzD,OAAO,CAAC,iBAAiB,CAAqB;IAG9C,OAAO,CAAC,aAAa,CAA0B;IAE/C,OAAO,CAAC,wBAAwB,CAA4B;IAE5D,OAAO,CAAC,qBAAqB,CAA4B;IAGzD,OAAO,CAAC,oBAAoB,CAGZ;IAEhB,OAAO,CAAC,mBAAmB,CAAK;IAEhC,OAAO,CAAC,cAAc,CAAqB;IAE3C,OAAO,CAAC,mBAAmB,CAAC,CAAgC;IAE5D,OAAO,CAAC,sBAAsB,CAAC,CAAgC;IAG/D,OAAO,CAAC,eAAe,CAAK;IAE5B,OAAO,CAAC,cAAc,CAA0B;IAEhD,iBAAiB;IAKjB,oBAAoB;YAUN,WAAW;YAiEX,cAAc;YAoBd,iBAAiB;YASjB,mBAAmB;IAiGjC,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBAkCZ,uBAAuB;mBA6CvB,wBAAwB;IA8H7C;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA4DhC;;;OAGG;mBACkB,oBAAoB;IA0FzC;;;OAGG;mBACkB,qBAAqB;IAyE1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;IA4JhC,OAAO,CAAC,MAAM,CAAC,cAAc;IAa7B,YAAY;IAkBZ;;;;;OAKG;IACH,OAAO,CAAC,cAAc;IAoLtB,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,OAAO,CAAC;IAuEjE;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAqC/B,OAAO,CAAC,gBAAgB,CAAgC;IAExD,OAAO,CAAC,aAAa,CAA8C;IAEnE,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,qBAAqB;IAsE7B,OAAO,CAAC,MAAM,CAAC,WAAW;IAI1B,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,qBAAqB;IA6B7B,OAAO,CAAC,qBAAqB;IAiC7B;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAgC/B,OAAO,CAAC,sBAAsB;IAgE9B,OAAO,CAAC,wBAAwB;IA0ChC,OAAO,CAAC,eAAe;IA4CvB,OAAO,CAAC,eAAe;IA4EvB,OAAO,CAAC,MAAM,CAAC,0BAA0B;IAkBzC,OAAO,CAAC,kBAAkB;IA2C1B,OAAO,CAAC,oBAAoB;IAyB5B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAa3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAoJ1B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IA+C7B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAiD/B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IA+JtC;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAwC5B;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,cAAc;IAS7B;;;OAGG;IACH,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAuErC,OAAO,CAAC,eAAe;IA4HvB,OAAO,CAAC,WAAW;IAyBnB,OAAO,CAAC,YAAY;IA2DpB,OAAO,CAAC,MAAM,CAAC,kBAAkB;IAUjC,OAAO,CAAC,MAAM,CAAC,mBAAmB;IAYlC,OAAO,CAAC,cAAc;IAuCtB,MAAM;CA4qBP"}

package/dist/src/am-lyrics.js

@@ -228,19 +228,18 @@ class GoogleService {
                 line.romanizedText // Skip if already romanized
             )
                 return line;
-            // Extract text from syllables
-            const syllableTexts = line.text.map((s) => s.text);
-            const romanizedTexts = await this.romanizeTexts(syllableTexts);
-            const newSyllabus = line.text.map((s, index) => ({
+            // Get the entire line text to romanize together for context-aware pronunciation
+            const fullText = line.text.map((s) => s.text).join('');
+            // romanizeTexts expects an array of strings, so we pass an array of one
+            const [romanizedFullLine] = await this.romanizeTexts([fullText]);
+            const newSyllabus = line.text.map((s) => ({
                 ...s,
-                romanizedText: romanizedTexts[index]
-                    ? `${romanizedTexts[index]}`
-                    : s.text,
+                romanizedText: s.romanizedText, // Keep any existing syllabus romanization if provided by API natively
             }));
             return {
                 ...line,
                 text: newSyllabus,
-                romanizedText: romanizedTexts.join(' '),
+                romanizedText: romanizedFullLine || '',
             };
         }));
     }
@@ -310,7 +309,7 @@ class GoogleService {
     }
 }
 
-const VERSION = '1.0.9';
+const VERSION = '1.1.0';
 const INSTRUMENTAL_THRESHOLD_MS = 7000; // Show dots for gaps >= 7s
 const KPOE_SERVERS = [
     'https://lyricsplus.binimum.org',
@@ -471,7 +470,9 @@ class AmLyrics extends i {
                 !this.songArtist &&
                 !this.query;
             if (resolvedMetadata?.metadata && !isMusicIdOnlyRequest) {
-                const youLyResult = await AmLyrics.fetchLyricsFromYouLyPlus(resolvedMetadata.metadata);
+                const title = resolvedMetadata.metadata.title?.trim() || '';
+                const artist = resolvedMetadata.metadata.artist?.trim() || '';
+                const youLyResult = await AmLyrics.fetchLyricsFromYouLyPlus(title, artist, resolvedMetadata.metadata);
                 if (youLyResult && youLyResult.lines.length > 0) {
                     this.lyrics = youLyResult.lines;
                     this.lyricsSource = youLyResult.source ?? 'LyricsPlus (KPoe)';
@@ -672,12 +673,9 @@ class AmLyrics extends i {
         }
         return null;
     }
-    static async fetchLyricsFromYouLyPlus(metadata) {
-        const title = metadata.title?.trim();
-        const artist = metadata.artist?.trim();
-        if (!title || !artist) {
+    static async fetchLyricsFromYouLyPlus(title, artist, metadata = {}) {
+        if (!title || !artist)
             return null;
-        }
         const params = new URLSearchParams({ title, artist });
         if (metadata.album) {
             params.append('album', metadata.album);
@@ -686,9 +684,31 @@ class AmLyrics extends i {
             params.append('duration', Math.round(metadata.durationMs / 1000).toString());
         }
         params.append('source', DEFAULT_KPOE_SOURCE_ORDER);
-        let fallbackResult = null;
+        const getRank = (sourceLabel, parsedLines) => {
+            const lower = sourceLabel.toLowerCase();
+            const hasWordSync = parsedLines.some((line) => line.text && Array.isArray(line.text) && line.text.length > 1);
+            const isQQ = lower.includes('qq') || lower.includes('lyricsplus');
+            if (lower.includes('apple') && hasWordSync)
+                return 1;
+            if (isQQ && hasWordSync)
+                return 2;
+            if (lower.includes('musixmatch') && hasWordSync)
+                return 3;
+            if (lower.includes('apple') && !hasWordSync)
+                return 4;
+            if (isQQ && !hasWordSync)
+                return 5;
+            if (lower.includes('musixmatch') && !hasWordSync)
+                return 6;
+            return 10;
+        };
+        let bestFallbackResult = null;
+        let bestFallbackRank = 100;
         // Shuffle servers so we pick a random one first, with all others as fallback
-        const shuffledServers = [...KPOE_SERVERS].sort(() => Math.random() - 0.5);
+        // Limit to 2 servers to prevent unnecessary API spam when Apple lyrics are missing
+        const shuffledServers = [...KPOE_SERVERS]
+            .sort(() => Math.random() - 0.5)
+            .slice(0, 2);
         for (const base of shuffledServers) {
             const normalizedBase = base.endsWith('/') ? base.slice(0, -1) : base;
             const url = `${normalizedBase}/v2/lyrics/get?${params.toString()}`;
@@ -710,19 +730,50 @@ class AmLyrics extends i {
                     const sourceLabel = payload?.metadata?.source ||
                         payload?.metadata?.provider ||
                         'LyricsPlus (KPoe)';
+                    const rank = getRank(sourceLabel, lines);
                     const result = { lines, source: sourceLabel };
                     // If source is Apple, return immediately (best quality)
-                    if (sourceLabel.toLowerCase() === 'apple') {
+                    if (rank === 1) {
                         return result;
                     }
                     // Otherwise, store as fallback if we don't have one yet
-                    if (!fallbackResult) {
-                        fallbackResult = result;
+                    if (rank < bestFallbackRank) {
+                        bestFallbackResult = result;
+                        bestFallbackRank = rank;
                     }
+                    // Proxies are identical mirrors; if we got a valid response (even a fallback),
+                    // there's no reason to query the next proxy because it will return the exact same fallback.
+                    break;
                 }
             }
         }
-        return fallbackResult;
+        // If we finished the 2-server check and STILL don't have Apple (1) or QQ (2),
+        // force an explicit query against lyricsplus.binimum.org looking for QQ
+        if (bestFallbackRank > 2) {
+            try {
+                const qqParams = new URLSearchParams(params);
+                qqParams.set('source', 'qq');
+                const url = `https://lyricsplus.binimum.org/v2/lyrics/get?${qqParams.toString()}`;
+                const response = await fetch(url);
+                if (response.ok) {
+                    const payload = await response.json();
+                    if (payload) {
+                        const lines = AmLyrics.convertKPoeLyrics(payload);
+                        const sourceLabel = payload?.metadata?.source ||
+                            payload?.metadata?.provider ||
+                            'LyricsPlus (KPoe)';
+                        const rank = getRank(sourceLabel, lines || []);
+                        if (lines && lines.length > 0 && rank < bestFallbackRank) {
+                            return { lines, source: sourceLabel };
+                        }
+                    }
+                }
+            }
+            catch (error) {
+                // Explicit QQ fallback failed, ignore and proceed to return whatever we had
+            }
+        }
+        return bestFallbackResult;
     }
     /**
      * Parse LRC subtitle format into LyricsLine[].
@@ -949,16 +1000,17 @@ class AmLyrics extends i {
                 personIndexMap.set(agentKey, personIndex);
             });
             agentEntries.forEach(([agentKey, agentData]) => {
+                const mappedKey = agentData.alias || agentKey;
                 if (agentData.type === 'group') {
-                    singerAlignmentMap[agentKey] = 'start';
+                    singerAlignmentMap[mappedKey] = 'start';
                 }
                 else if (agentData.type === 'other') {
-                    singerAlignmentMap[agentKey] = 'end';
+                    singerAlignmentMap[mappedKey] = 'end';
                 }
                 else if (agentData.type === 'person') {
                     const personIndex = personIndexMap.get(agentKey);
                     if (personIndex !== undefined) {
-                        singerAlignmentMap[agentKey] =
+                        singerAlignmentMap[mappedKey] =
                             personIndex % 2 === 0 ? 'start' : 'end';
                     }
                 }
@@ -1408,7 +1460,22 @@ class AmLyrics extends i {
             return [];
         const activeLines = [];
         for (let i = 0; i < this.lyrics.length; i += 1) {
-            if (time >= this.lyrics[i].timestamp && time <= this.lyrics[i].endtime) {
+            const line = this.lyrics[i];
+            let effectiveEndTime = line.endtime;
+            // Extend the "active" highlight window to abut the next line,
+            // leaving a 500ms gap for breathing/scrolling
+            if (i < this.lyrics.length - 1) {
+                const nextLineStart = this.lyrics[i + 1].timestamp;
+                const gapDuration = nextLineStart - line.endtime;
+                // If the gap is large enough to trigger the breathing dots,
+                // DO NOT extend the highlight. The text should dim when the dots appear.
+                if (gapDuration < INSTRUMENTAL_THRESHOLD_MS) {
+                    if (effectiveEndTime < nextLineStart) {
+                        effectiveEndTime = Math.max(effectiveEndTime, nextLineStart - 500);
+                    }
+                }
+            }
+            if (time >= line.timestamp && time <= effectiveEndTime) {
                 activeLines.push(i);
             }
         }