@uimaxbai/am-lyrics 1.1.4 → 1.1.6

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.4';
+const VERSION = '1.1.6';
 const INSTRUMENTAL_THRESHOLD_MS = 7000; // Show dots for gaps >= 7s
 const KPOE_SERVERS = [
     'https://lyricsplus.binimum.org',
@@ -576,28 +576,32 @@ class AmLyrics extends i {
             return 4;
         if (lower.includes('lrclib') && hasWordSync)
             return 5;
-        if (lower.includes('apple') && !hasWordSync && !isUnsynced)
+        if (hasWordSync)
             return 6;
-        if (isQQ && !hasWordSync && !isUnsynced)
+        if (lower.includes('apple') && !hasWordSync && !isUnsynced)
             return 7;
-        if (lower.includes('musixmatch') && !hasWordSync && !isUnsynced)
+        if (isQQ && !hasWordSync && !isUnsynced)
             return 8;
-        if (lower.includes('tidal') && !hasWordSync && !isUnsynced)
+        if (lower.includes('musixmatch') && !hasWordSync && !isUnsynced)
             return 9;
-        if (lower.includes('lrclib') && !hasWordSync && !isUnsynced)
+        if (lower.includes('tidal') && !hasWordSync && !isUnsynced)
             return 10;
-        if (lower.includes('apple') && isUnsynced)
+        if (lower.includes('lrclib') && !hasWordSync && !isUnsynced)
             return 11;
-        if (isQQ && isUnsynced)
+        if (!hasWordSync && !isUnsynced)
             return 12;
-        if (lower.includes('musixmatch') && isUnsynced)
+        if (lower.includes('apple') && isUnsynced)
             return 13;
-        if (lower.includes('tidal') && isUnsynced)
+        if (isQQ && isUnsynced)
             return 14;
-        if (lower.includes('lrclib') && isUnsynced)
+        if (lower.includes('musixmatch') && isUnsynced)
             return 15;
-        if (lower.includes('genius'))
+        if (lower.includes('tidal') && isUnsynced)
             return 16;
+        if (lower.includes('lrclib') && isUnsynced)
+            return 17;
+        if (lower.includes('genius'))
+            return 18;
         return 20;
     }
     static mergeAndSortSources(collectedSources) {
@@ -836,19 +840,23 @@ class AmLyrics extends i {
                 return 2;
             if (lower.includes('musixmatch') && hasWordSync)
                 return 3;
-            if (lower.includes('apple') && !hasWordSync && !isUnsynced)
+            if (hasWordSync)
                 return 4;
-            if (isQQ && !hasWordSync && !isUnsynced)
+            if (lower.includes('apple') && !hasWordSync && !isUnsynced)
                 return 5;
-            if (lower.includes('musixmatch') && !hasWordSync && !isUnsynced)
+            if (isQQ && !hasWordSync && !isUnsynced)
                 return 6;
-            if (lower.includes('apple') && isUnsynced)
+            if (lower.includes('musixmatch') && !hasWordSync && !isUnsynced)
                 return 7;
-            if (isQQ && isUnsynced)
+            if (!hasWordSync && !isUnsynced)
                 return 8;
-            if (lower.includes('musixmatch') && isUnsynced)
+            if (lower.includes('apple') && isUnsynced)
                 return 9;
-            return 10;
+            if (isQQ && isUnsynced)
+                return 10;
+            if (lower.includes('musixmatch') && isUnsynced)
+                return 11;
+            return 20;
         };
         const allResults = [];
         // Try cache API first
@@ -881,28 +889,30 @@ class AmLyrics extends i {
                         }
                     }
                     else {
-                        // Not word type, try QQ
-                        const qqParams = new URLSearchParams(params);
-                        qqParams.set('source', 'qq');
-                        const qqUrl = `https://lyricsplus.binimum.org/v2/lyrics/get?${qqParams.toString()}`;
+                        // 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 qqRes = await fetch(qqUrl);
-                            if (qqRes.ok) {
-                                const payload = await qqRes.json();
+                            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) {
-                                    allResults.push({ lines, source: 'QQ (Cache Fallback)' });
+                                    const sourceLabel = payload?.metadata?.source ||
+                                        payload?.metadata?.provider ||
+                                        'LyricsPlus (KPoe)';
+                                    allResults.push({ lines, source: sourceLabel });
                                     return allResults;
                                 }
                             }
                         }
-                        catch (qqError) {
-                            // Ignore QQ fetch error
+                        catch (fallbackError) {
+                            // Ignore fallback fetch error
                         }
-                        // If QQ fails or has no word sync, fall back to bini lyrics
+                        // 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) {
@@ -911,7 +921,7 @@ class AmLyrics extends i {
                                 if (lines && lines.length > 0) {
                                     allResults.push({
                                         lines,
-                                        source: 'Apple Music (Cache Fallback)',
+                                        source: 'BiniLyrics',
                                     });
                                     return allResults;
                                 }
@@ -961,14 +971,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();
@@ -977,14 +986,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;
@@ -1661,15 +1671,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