@uimaxbai/am-lyrics 1.1.2 → 1.1.5

package/dist/src/AmLyrics.d.ts

@@ -85,6 +85,8 @@ export declare class AmLyrics extends LitElement {
      */
     private static fetchLyricsFromLrclib;
     private static fetchLyricsFromGenius;
+    private static calculateLineAlignments;
+    private static parseTTML;
     private static convertKPoeLyrics;
     private static toMilliseconds;
     firstUpdated(): void;

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":"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"}

package/dist/src/am-lyrics.js

@@ -309,7 +309,7 @@ class GoogleService {
     }
 }
 
-const VERSION = '1.1.2';
+const VERSION = '1.1.5';
 const INSTRUMENTAL_THRESHOLD_MS = 7000; // Show dots for gaps >= 7s
 const KPOE_SERVERS = [
     'https://lyricsplus.binimum.org',
@@ -851,6 +851,82 @@ class AmLyrics extends i {
             return 10;
         };
         const allResults = [];
+        // Try cache API first
+        try {
+            const cacheParams = new URLSearchParams({
+                track: title,
+                artist,
+            });
+            if (metadata.album) {
+                cacheParams.append('album', metadata.album);
+            }
+            if (metadata.durationMs && metadata.durationMs > 0) {
+                cacheParams.append('duration', Math.round(metadata.durationMs / 1000).toString());
+            }
+            const cacheUrl = `https://lyrics-api.binimum.org/?${cacheParams.toString()}`;
+            const cacheRes = await fetch(cacheUrl);
+            if (cacheRes.ok) {
+                const cacheData = await cacheRes.json();
+                if (cacheData.results && cacheData.results.length > 0) {
+                    const result = cacheData.results[0];
+                    if (result.timing_type === 'word' && result.lyricsUrl) {
+                        const ttmlRes = await fetch(result.lyricsUrl);
+                        if (ttmlRes.ok) {
+                            const ttmlText = await ttmlRes.text();
+                            const lines = AmLyrics.parseTTML(ttmlText);
+                            if (lines && lines.length > 0) {
+                                allResults.push({ lines, source: 'BiniLyrics' });
+                                return allResults;
+                            }
+                        }
+                    }
+                    else {
+                        // Not word type, try fetching any word synced lyrics from lyricsplus
+                        const fallbackParams = new URLSearchParams(params);
+                        const fallbackUrl = `https://lyricsplus.binimum.org/v2/lyrics/get?${fallbackParams.toString()}`;
+                        try {
+                            const fallbackRes = await fetch(fallbackUrl);
+                            if (fallbackRes.ok) {
+                                const payload = await fallbackRes.json();
+                                const lines = AmLyrics.convertKPoeLyrics(payload);
+                                const hasWordSync = lines?.some((line) => line.text &&
+                                    Array.isArray(line.text) &&
+                                    line.text.length > 1);
+                                if (lines && lines.length > 0 && hasWordSync) {
+                                    const sourceLabel = payload?.metadata?.source ||
+                                        payload?.metadata?.provider ||
+                                        'LyricsPlus (KPoe)';
+                                    allResults.push({ lines, source: sourceLabel });
+                                    return allResults;
+                                }
+                            }
+                        }
+                        catch (fallbackError) {
+                            // Ignore fallback fetch error
+                        }
+                        // If fallback fails or has no word sync, fall back to bini lyrics
+                        if (result.lyricsUrl) {
+                            const ttmlRes = await fetch(result.lyricsUrl);
+                            if (ttmlRes.ok) {
+                                const ttmlText = await ttmlRes.text();
+                                const lines = AmLyrics.parseTTML(ttmlText);
+                                if (lines && lines.length > 0) {
+                                    allResults.push({
+                                        lines,
+                                        source: 'BiniLyrics',
+                                    });
+                                    return allResults;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('Cache API failed', e);
+        }
         // Shuffle servers so we pick a random one first, with all others as fallback
         // Limit to 2 servers to prevent unnecessary API spam when Apple lyrics are missing
         const shuffledServers = [...KPOE_SERVERS]
@@ -887,14 +963,13 @@ class AmLyrics extends i {
                 }
             }
         }
-        // If we haven't found a completely synced Apple/QQ result (rank 1 or 2) among the servers,
-        // force an explicit query against lyricsplus.binimum.org looking for QQ
+        // If we haven't found a completely synced result (rank 1 or 2) among the servers,
+        // force an explicit query against lyricsplus.binimum.org looking for word lyrics
         const hasHighRankResult = allResults.some(r => getRank(r.source, r.lines) <= 2);
         if (!hasHighRankResult) {
             try {
-                const qqParams = new URLSearchParams(params);
-                qqParams.set('source', 'qq');
-                const url = `https://lyricsplus.binimum.org/v2/lyrics/get?${qqParams.toString()}`;
+                const fallbackParams = new URLSearchParams(params);
+                const url = `https://lyricsplus.binimum.org/v2/lyrics/get?${fallbackParams.toString()}`;
                 const response = await fetch(url);
                 if (response.ok) {
                     const payload = await response.json();
@@ -903,14 +978,15 @@ class AmLyrics extends i {
                         const sourceLabel = payload?.metadata?.source ||
                             payload?.metadata?.provider ||
                             'LyricsPlus (KPoe)';
-                        if (lines && lines.length > 0) {
+                        const hasWordSync = lines?.some((line) => line.text && Array.isArray(line.text) && line.text.length > 1);
+                        if (lines && lines.length > 0 && hasWordSync) {
                             allResults.push({ lines, source: sourceLabel });
                         }
                     }
                 }
             }
             catch (error) {
-                // Explicit QQ fallback failed, ignore
+                // Explicit fallback failed, ignore
             }
         }
         return allResults;
@@ -930,6 +1006,7 @@ class AmLyrics extends i {
             if (!match) {
                 // Skip non-timestamped lines (headers like [ti:], [ar:], etc.)
                 // eslint-disable-next-line no-continue
+                // eslint-disable-next-line no-continue
                 continue;
             }
             const minutes = parseInt(match[1], 10);
@@ -949,6 +1026,7 @@ class AmLyrics extends i {
             const endtime = i + 1 < parsed.length ? parsed[i + 1].timestamp : timestamp + 5000;
             // Skip empty lines (instrumental gaps)
             if (!text.trim()) {
+                // eslint-disable-next-line no-continue
                 // eslint-disable-next-line no-continue
                 continue;
             }
@@ -992,6 +1070,7 @@ class AmLyrics extends i {
                 // eslint-disable-next-line no-await-in-loop
                 const searchResponse = await fetch(`${normalizedBase}/search/?${searchParams.toString()}`);
                 if (!searchResponse.ok) {
+                    // eslint-disable-next-line no-continue
                     // eslint-disable-next-line no-continue
                     continue;
                 }
@@ -999,6 +1078,7 @@ class AmLyrics extends i {
                 const searchData = await searchResponse.json();
                 const items = searchData?.data?.items;
                 if (!Array.isArray(items) || items.length === 0) {
+                    // eslint-disable-next-line no-continue
                     // eslint-disable-next-line no-continue
                     continue;
                 }
@@ -1012,6 +1092,7 @@ class AmLyrics extends i {
                 }
                 const trackId = bestTrack?.id;
                 if (!trackId) {
+                    // eslint-disable-next-line no-continue
                     // eslint-disable-next-line no-continue
                     continue;
                 }
@@ -1019,6 +1100,7 @@ class AmLyrics extends i {
                 // eslint-disable-next-line no-await-in-loop
                 const lyricsResponse = await fetch(`${normalizedBase}/lyrics/?id=${trackId}`);
                 if (!lyricsResponse.ok) {
+                    // eslint-disable-next-line no-continue
                     // eslint-disable-next-line no-continue
                     continue;
                 }
@@ -1143,10 +1225,230 @@ class AmLyrics extends i {
             }
         }
         catch {
+            // eslint-disable-next-line no-console
             console.error('No Genius lyrics found');
         }
         return null;
     }
+    static calculateLineAlignments(lineSingers, agentTypes) {
+        const lineSideAssignments = new Array(lineSingers.length).fill(undefined);
+        let currentSideIsLeft = true;
+        let lastPersonSingerId = null;
+        let rightCount = 0;
+        let totalCount = 0;
+        lineSingers.forEach((singerId, index) => {
+            let sideClass;
+            if (singerId) {
+                let type = agentTypes[singerId];
+                if (!type) {
+                    if (singerId === 'v1000') {
+                        type = 'group';
+                    }
+                    else if (singerId === 'v2000') {
+                        type = 'other';
+                    }
+                    else {
+                        type = 'person';
+                    }
+                }
+                if (type === 'group') {
+                    sideClass = 'start';
+                }
+                else {
+                    if (lastPersonSingerId === null) {
+                        if (type === 'other') {
+                            currentSideIsLeft = false;
+                        }
+                        else {
+                            currentSideIsLeft = true;
+                        }
+                    }
+                    else if (singerId !== lastPersonSingerId) {
+                        currentSideIsLeft = !currentSideIsLeft;
+                    }
+                    sideClass = currentSideIsLeft ? 'start' : 'end';
+                    lastPersonSingerId = singerId;
+                }
+            }
+            if (sideClass) {
+                totalCount += 1;
+                if (sideClass === 'end')
+                    rightCount += 1;
+            }
+            lineSideAssignments[index] = sideClass;
+        });
+        if (totalCount > 0 && Math.round((rightCount / totalCount) * 100) >= 85) {
+            const flip = (s) => {
+                if (s === 'start')
+                    return 'end';
+                if (s === 'end')
+                    return 'start';
+                return s;
+            };
+            for (let i = 0; i < lineSideAssignments.length; i += 1) {
+                lineSideAssignments[i] = flip(lineSideAssignments[i]);
+            }
+        }
+        return lineSideAssignments;
+    }
+    static parseTTML(ttmlString) {
+        try {
+            const parser = new DOMParser();
+            const doc = parser.parseFromString(ttmlString, 'text/xml');
+            const translations = {};
+            const transliterations = {};
+            const agentMap = {};
+            const agents = doc.getElementsByTagName('ttm:agent');
+            for (let i = 0; i < agents.length; i += 1) {
+                const agent = agents[i];
+                const id = agent.getAttribute('xml:id');
+                const type = agent.getAttribute('type');
+                if (id && type) {
+                    agentMap[id] = type;
+                }
+            }
+            const translationNodes = doc.getElementsByTagName('translation');
+            for (let i = 0; i < translationNodes.length; i += 1) {
+                const texts = translationNodes[i].getElementsByTagName('text');
+                for (let j = 0; j < texts.length; j += 1) {
+                    const textNode = texts[j];
+                    const key = textNode.getAttribute('for');
+                    if (key && textNode.textContent) {
+                        translations[key] = textNode.textContent;
+                    }
+                }
+            }
+            const transliterationNodes = doc.getElementsByTagName('transliteration');
+            for (let i = 0; i < transliterationNodes.length; i += 1) {
+                const texts = transliterationNodes[i].getElementsByTagName('text');
+                for (let j = 0; j < texts.length; j += 1) {
+                    const textNode = texts[j];
+                    const key = textNode.getAttribute('for');
+                    if (key && textNode.textContent) {
+                        transliterations[key] = textNode.textContent
+                            .trim()
+                            .replace(/\s+/g, ' ');
+                    }
+                }
+            }
+            const timeToMs = (timeStr) => {
+                if (!timeStr)
+                    return 0;
+                const parts = timeStr.split(':');
+                let seconds = 0;
+                if (parts.length === 2) {
+                    seconds = parseInt(parts[0], 10) * 60 + parseFloat(parts[1]);
+                }
+                else if (parts.length === 3) {
+                    seconds =
+                        parseInt(parts[0], 10) * 3600 +
+                            parseInt(parts[1], 10) * 60 +
+                            parseFloat(parts[2]);
+                }
+                else {
+                    seconds = parseFloat(parts[0]);
+                }
+                return Math.round(seconds * 1000);
+            };
+            const lines = [];
+            const pNodes = doc.getElementsByTagName('p');
+            const lineSingers = [];
+            for (let i = 0; i < pNodes.length; i += 1) {
+                lineSingers.push(pNodes[i].getAttribute('ttm:agent') || undefined);
+            }
+            const alignments = AmLyrics.calculateLineAlignments(lineSingers, agentMap);
+            for (let i = 0; i < pNodes.length; i += 1) {
+                const p = pNodes[i];
+                const key = p.getAttribute('itunes:key');
+                const beginMs = timeToMs(p.getAttribute('begin'));
+                const endMs = timeToMs(p.getAttribute('end'));
+                let songPart;
+                if (p.parentNode && p.parentNode.tagName === 'div') {
+                    songPart =
+                        p.parentNode.getAttribute('itunes:songPart') ||
+                            undefined;
+                }
+                const mainSyllables = [];
+                const bgSyllables = [];
+                const spans = p.getElementsByTagName('span');
+                if (spans.length > 0) {
+                    for (let j = 0; j < spans.length; j += 1) {
+                        const span = spans[j];
+                        if (span.getAttribute('ttm:role') === 'x-bg') {
+                            const bgInnerSpans = span.getElementsByTagName('span');
+                            for (let k = 0; k < bgInnerSpans.length; k += 1) {
+                                const bgSpan = bgInnerSpans[k];
+                                let bgText = bgSpan.textContent || '';
+                                const nextNode = bgSpan.nextSibling;
+                                if (nextNode &&
+                                    nextNode.nodeType === 3 &&
+                                    /^\s/.test(nextNode.textContent || '') &&
+                                    !bgText.endsWith(' ')) {
+                                    bgText += ' ';
+                                }
+                                bgSyllables.push({
+                                    text: bgText,
+                                    timestamp: timeToMs(bgSpan.getAttribute('begin')),
+                                    endtime: timeToMs(bgSpan.getAttribute('end')),
+                                    part: false,
+                                });
+                            }
+                            // eslint-disable-next-line no-continue
+                            continue;
+                        }
+                        if (span.parentNode &&
+                            span.parentNode.getAttribute?.('ttm:role') === 'x-bg') {
+                            // eslint-disable-next-line no-continue
+                            continue;
+                        }
+                        let text = span.textContent || '';
+                        const nextNode = span.nextSibling;
+                        if (nextNode &&
+                            nextNode.nodeType === 3 &&
+                            /^\s/.test(nextNode.textContent || '') &&
+                            !text.endsWith(' ')) {
+                            text += ' ';
+                        }
+                        mainSyllables.push({
+                            text,
+                            timestamp: timeToMs(span.getAttribute('begin')),
+                            endtime: timeToMs(span.getAttribute('end')),
+                            part: false,
+                        });
+                    }
+                }
+                else {
+                    mainSyllables.push({
+                        text: p.textContent?.trim() || '',
+                        timestamp: beginMs,
+                        endtime: endMs,
+                        part: false,
+                        lineSynced: true,
+                    });
+                }
+                const alignment = alignments[i];
+                lines.push({
+                    text: mainSyllables,
+                    background: bgSyllables.length > 0,
+                    backgroundText: bgSyllables,
+                    timestamp: beginMs,
+                    endtime: endMs,
+                    isWordSynced: spans.length > 0,
+                    alignment,
+                    songPart,
+                    translation: key ? translations[key] : undefined,
+                    romanizedText: key ? transliterations[key] : undefined,
+                    oppositeTurn: alignment === 'end',
+                });
+            }
+            return lines;
+        }
+        catch (e) {
+            // eslint-disable-next-line no-console
+            console.error('Failed to parse TTML', e);
+            return null;
+        }
+    }
     static convertKPoeLyrics(payload) {
         if (!payload) {
             return null;
@@ -1168,45 +1470,21 @@ class AmLyrics extends i {
         const lines = [];
         // If type is 'Line', we revert to line-by-line highlighting by skipping syllabus parsing
         const isLineType = payload.type === 'Line' || payload.type === 'line';
-        // Convert metadata.agents to alignment map
-        const agents = payload.metadata?.agents ?? {};
-        const agentEntries = Object.entries(agents);
-        const singerAlignmentMap = {};
-        if (agentEntries.length > 0) {
-            agentEntries.sort((a, b) => a[0].localeCompare(b[0]));
-            const personAgents = agentEntries.filter(
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            ([_, agentData]) => agentData.type === 'person');
-            const personIndexMap = new Map();
-            personAgents.forEach(([agentKey], personIndex) => {
-                personIndexMap.set(agentKey, personIndex);
-            });
-            agentEntries.forEach(([agentKey, agentData]) => {
-                const mappedKey = agentData.alias || agentKey;
-                if (agentData.type === 'group') {
-                    singerAlignmentMap[mappedKey] = 'start';
-                }
-                else if (agentData.type === 'other') {
-                    singerAlignmentMap[mappedKey] = 'end';
-                }
-                else if (agentData.type === 'person') {
-                    const personIndex = personIndexMap.get(agentKey);
-                    if (personIndex !== undefined) {
-                        singerAlignmentMap[mappedKey] =
-                            personIndex % 2 === 0 ? 'start' : 'end';
-                    }
-                }
+        // Convert metadata.agents to type map
+        const agentTypes = {};
+        if (payload.metadata?.agents) {
+            Object.entries(payload.metadata.agents).forEach(([key, agent]) => {
+                const mappedKey = agent.alias || key;
+                agentTypes[mappedKey] = agent.type;
             });
         }
-        for (const entry of sanitizedEntries) {
+        const lineSingers = sanitizedEntries.map((entry) => entry.element?.singer);
+        const alignments = AmLyrics.calculateLineAlignments(lineSingers, agentTypes);
+        for (let i = 0; i < sanitizedEntries.length; i += 1) {
+            const entry = sanitizedEntries[i];
             const start = AmLyrics.toMilliseconds(entry.time);
             const duration = AmLyrics.toMilliseconds(entry.duration);
-            // Determine alignment
-            let alignment;
-            const singerId = entry.element?.singer;
-            if (singerId && singerAlignmentMap[singerId]) {
-                alignment = singerAlignmentMap[singerId];
-            }
+            const alignment = alignments[i];
             const lineText = typeof entry.text === 'string' ? entry.text : '';
             const lineStart = AmLyrics.toMilliseconds(entry.time);
             const lineDuration = AmLyrics.toMilliseconds(entry.duration);
@@ -1257,10 +1535,8 @@ class AmLyrics extends i {
                 // If syllabus data matches, map it to main syllables
                 if (Array.isArray(transliteration.syllabus) &&
                     transliteration.syllabus.length === mainSyllables.length) {
-                    transliteration.syllabus.forEach((s, i) => {
-                        if (mainSyllables[i]) {
-                            mainSyllables[i].romanizedText = s.text;
-                        }
+                    transliteration.syllabus.forEach((s, idx) => {
+                        mainSyllables[idx].romanizedText = s.text;
                     });
                 }
             }
@@ -1270,10 +1546,11 @@ class AmLyrics extends i {
                 text: mainSyllables,
                 background: backgroundSyllables.length > 0,
                 backgroundText: backgroundSyllables,
-                oppositeTurn: Array.isArray(entry.element)
-                    ? entry.element.includes('opposite') ||
-                        entry.element.includes('right')
-                    : false,
+                oppositeTurn: alignment === 'end' ||
+                    (Array.isArray(entry.element)
+                        ? entry.element.includes('opposite') ||
+                            entry.element.includes('right')
+                        : false),
                 timestamp: lineStart,
                 endtime: start + duration,
                 isWordSynced: isLineType ? false : hasWordSync,
@@ -1386,15 +1663,32 @@ class AmLyrics extends i {
                     // Entering gap: remove any leftover exit state, add active
                     gap.classList.remove('gap-exiting');
                     gap.classList.add('active');
-                    // Mark any dots whose time has already passed as finished
-                    // (prevents skipping the first dot when lyrics load mid-gap)
+                    // Mark dots whose time has already passed as finished, and
+                    // trigger highlight on the dot currently in its time window
+                    // so the first dot always lights up even on late load.
                     const dotSyllables = gap.querySelectorAll('.lyrics-syllable');
                     dotSyllables.forEach(dot => {
+                        const dotStart = parseFloat(dot.getAttribute('data-start-time') || '0');
                         const dotEnd = parseFloat(dot.getAttribute('data-end-time') || '0');
                         if (newTime > dotEnd) {
                             dot.classList.add('finished');
+                            // Also ensure the highlight + animation fired so CSS state is correct
+                            if (!dot.classList.contains('highlight')) {
+                                AmLyrics.updateSyllableAnimation(dot);
+                            }
+                        }
+                        else if (newTime >= dotStart && newTime <= dotEnd) {
+                            // Currently within this dot's window — trigger its highlight
+                            AmLyrics.updateSyllableAnimation(dot);
                         }
                     });
+                    // Scroll to the gap element so dots animate in with
+                    // the staggered scroll rather than popping in.
+                    if (this.autoScroll &&
+                        !this.isUserScrolling &&
+                        !this.isClickSeeking) {
+                        this.scrollToActiveLineYouLy(gap);
+                    }
                 }
                 else if (shouldStartExiting) {
                     // Exiting gap: keep visible while dots animate out