update: use new lyric parser

ref: type
update: font and style
2024-11-17 17:01:10 +08:00 · 2024-11-09 23:21:12 +08:00 · 2024-11-08 20:45:29 +08:00 · 2024-11-03 00:42:05 +08:00 · 2024-10-30 21:10:37 +08:00 · 2024-10-30 21:09:46 +08:00
36 changed files with 257 additions and 4824 deletions
--- a/bun.lockb
+++ b/bun.lockb
--- a/bunfig.toml
+++ b/bunfig.toml
@ -0,0 +1,2 @@
+[install.scopes]
+"@jsr" = "https://npm.jsr.io"
--- a/package.json
+++ b/package.json
@ -30,11 +30,13 @@
    "svelte-check": "^3.7.1",
    "typescript": "^5.4.5",
    "vite-plugin-wasm": "^3.3.0",
-    "vitest": "^1.6.0",
+    "vitest": "^2.1.4",
    "@types/bun": "^1.1.6",
    "concurrently": "^9.0.1",
    "cross-env": "^7.0.3"
  },
-  "dependencies": {
-  }
+  "dependencies": {},
+  "trustedDependencies": [
+    "svelte-preprocess"
+  ]
 }
--- a/packages/core/components/background.svelte
+++ b/packages/core/components/background.svelte
@ -46,7 +46,6 @@
        height: 100%;
        object-fit: cover;
        z-index: -1;
-        overflow: hidden;
    }
    canvas {
        position: relative;
@ -55,6 +54,6 @@
        height: 100%;
        opacity: 0;
        transition: .45s;
-        filter: brightness(0.8);
+        filter: saturate(1.2);
    }
 </style>
--- a/packages/core/components/cover.svelte
+++ b/packages/core/components/cover.svelte
@ -12,8 +12,9 @@
 {#if hasLyrics}
 <img
    class="absolute shadow-md select-none z-10 object-cover rounded-lg md:rounded-2xl max-md:h-20 max-xl:h-32 max-xl:top-6 md:max-h-[calc(94vh-20rem)] xl:w-auto max-w-[90%] xl:max-w-[37vw]
-    md:bottom-80 left-6 md:left-[calc(7vw-1rem)] lg:left-[calc(12vw-1rem)] xl:translate-x-[-50%] xl:left-[25vw]"
+    md:bottom-[21rem] left-6 md:left-[calc(7vw-1rem)] lg:left-[calc(12vw-1rem)] xl:translate-x-[-50%] xl:left-[25vw]"
    src={path}
+    width="1200"
    alt="封面"
 />
 {:else}
--- a/packages/core/components/interactiveBox.svelte
+++ b/packages/core/components/interactiveBox.svelte
@ -78,7 +78,7 @@
 {/if}

 <div
-    class={'absolute select-none bottom-2 h-60 w-[86vw] left-[7vw] z-10 ' +
+    class={'absolute select-none bottom-12 h-60 w-[86vw] left-[7vw] z-10 ' +
        (hasLyrics
            ? 'lg:w-[76vw] lg:left-[12vw] xl:w-[37vw] xl:left-[7vw]'
            : 'lg:w-[76vw] lg:left-[12vw] xl:w-[37vw] xl:left-[31.5vw]')}
--- a/packages/core/components/lyrics/lyricLine.svelte
+++ b/packages/core/components/lyrics/lyricLine.svelte
@ -1,6 +1,6 @@
 <script lang="ts">
    import createSpring from '@core/graphics/spring';
-    import type { ScriptItem } from '@core/lyrics/type';
+    import type { LyricWord, ScriptItem } from '@core/lyrics/type';
    import type { LyricPos } from './type';
    import type { Spring } from '@core/graphics/spring/spring';

@ -91,7 +91,7 @@
            } else {
                blurRadius = Math.min(offset * blurRatio, 16);
            }
-            if (scrolling) blurRadius=0;
+            if (scrolling) blurRadius = 0;
            ref.style.filter = `blur(${blurRadius}px)`;
        }
    }
@ -134,6 +134,53 @@
    };

    export const getRef = () => ref;
+
+    // Calculate if the current character should be highlighted based on progress
+    const isCharacterHighlighted = (line: ScriptItem, word: LyricWord, charIndex: number, progress: number) => {
+        const charProgress = getCharacterProgress(word, charIndex);
+        return line.start <= progress &&
+            progress <= line.end &&
+            progress > charProgress;
+    };
+
+    // Get the progress timing for a specific character in a word
+    const getCharacterProgress = (word: LyricWord, charIndex: number) => {
+        const { startTime, endTime } = word;
+        const wordDuration = endTime - startTime;
+        return wordDuration * (charIndex / word.word.length) + startTime;
+    };
+
+    // Calculate the transition duration for a character
+    const getTransitionDuration = (word: LyricWord, charIndex: number) => {
+        const { startTime, endTime } = word;
+        const wordDuration = endTime - startTime;
+        const charDuration = wordDuration * ((charIndex + 1) / word.word.length);
+
+        // If duration is less than 0.6s, we'll use CSS class with fixed duration
+        if (charDuration < 0.6) {
+            return null;
+        }
+
+        // Otherwise, calculate custom duration
+        return charDuration / 1.6;
+    };
+
+    // Generate the CSS classes for a character
+    const getCharacterClasses = (line: ScriptItem, word: LyricWord, charIndex: number, progress: number) => {
+        const baseClasses = 'inline-block';
+        const opacityClass = isCharacterHighlighted(line, word, charIndex, progress)
+            ? 'opacity-100 text-glow'
+            : 'opacity-35';
+
+        return `${baseClasses} ${opacityClass}`.trim();
+    };
+
+    // Generate the style string for a character
+    const getCharacterStyle = (line: ScriptItem, word: LyricWord, charIndex: number, progress: number) => {
+        const duration = getTransitionDuration(word, charIndex);
+        const progressAtCurrentLine = progress <= line.end;
+        return (duration && progressAtCurrentLine) ? `transition-duration: ${duration}s;` : 'transition-duration: 200ms;';
+    };
 </script>

 <!-- svelte-ignore a11y-click-events-have-key-events -->
@ -150,30 +197,28 @@
    on:touchstart={() => {
        clickMask.style.backgroundColor = 'rgba(255,255,255,.3)';
    }}
-    style="transform: translate3d({positionX}px, {positionY}px, 0); transition-property: text-shadow;
-    transition-duration: 0.36s; transition-timing-function: ease-out;
-    transform-origin: center left;"
+    style="transform: translate3d({positionX}px, {positionY}px, 0);
+    transform-origin: center left; font-family: LyricFont, sans-serif;"
 >
    <span
        bind:this={clickMask}
        class="absolute w-[calc(100%-2.5rem)] lg:w-[calc(100%-3rem)] h-full
-        -translate-x-2 lg:-translate-x-5 -translate-y-5 rounded-lg duration-300 lg:hover:bg-[rgba(255,255,255,.15)] z-[100] "
+        -translate-x-2 lg:-translate-x-5 -translate-y-5 rounded-lg duration-300 lg:hover:bg-[rgba(255,255,255,.15)] z-[100]"
    >
    </span>
    {#if debugMode}
-        <span class="text-lg absolute -translate-y-7">
+        <span class="text-white text-lg absolute -translate-y-7">
            {index}: duration: {(line.end - line.start).toFixed(3)}, {line.start.toFixed(3)}~{line.end.toFixed(3)}
        </span>
    {/if}
    {#if line.words !== undefined && line.words.length > 0}
-        <span
-            class={`text-white text-[2rem] leading-9 lg:text-5xl lg:leading-[4rem] font-semibold mr-4 `}
-        >
+        <span class={`text-white text-[2rem] leading-9 lg:text-5xl lg:leading-[4rem] font-semibold mr-4 `}>
            {#each line.words as word}
                {#if word.word}
-                    {#each word.word.split("") as chr, i}
+                    {#each word.word.split('') as chr, i}
                        <span
-                            class={(line.start <= progress && progress <= line.end && progress > (word.endTime - word.startTime) * ((i)/word.word.length) + word.startTime ? "opacity-100 text-glow" : "opacity-35") + " inline-block duration-300"}
+                            class={getCharacterClasses(line, word, i, progress)}
+                            style={getCharacterStyle(line, word, i, progress)}
                        >
                            {chr}
                        </span>
@ -183,7 +228,8 @@
        </span>
    {:else}
        <span
-            class={`text-white text-[2rem] leading-9 lg:text-5xl lg:leading-[4rem] font-semibold mr-4 duration-200 ${line.start <= progress && progress <= line.end ? "opacity-100 text-glow" : "opacity-35"}`}
+            class={`text-white text-[2rem] leading-9 lg:text-5xl lg:leading-[4rem] font-semibold mr-4 duration-200
+            ${line.start <= progress && progress <= line.end ? 'opacity-100 text-glow' : 'opacity-35'}`}
        >
            {line.text}
        </span>
@ -197,13 +243,11 @@
    {/if}
 </div>

-
 <style>
    .text-glow {
-        text-shadow:
-                0 0 3px #ffffff2c,
-                0 0 6px #ffffff2c,
-                0 15px 30px rgba(0, 0, 0, 0.11),
-                0 5px 15px rgba(0, 0, 0, 0.08);
+        text-shadow: 0 0 3px #ffffff2c,
+        0 0 6px #ffffff2c,
+        0 15px 30px rgba(0, 0, 0, 0.11),
+        0 5px 15px rgba(0, 0, 0, 0.08);
    }
 </style>
--- a/packages/core/components/lyrics/newLyrics.svelte
+++ b/packages/core/components/lyrics/newLyrics.svelte
@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { LrcJsonData, ScriptItem } from '@core/lyrics/type';
+    import { type ScriptItem, type LyricData } from '@alikia/aqualyrics';
    import { onMount } from 'svelte';
    import LyricLine from './lyricLine.svelte';
    import createLyricsSearcher from '@core/lyrics/lyricSearcher';
@ -15,7 +15,7 @@
    document.body.style.overflow = 'hidden';

    // Props
-    export let originalLyrics: LrcJsonData;
+    export let originalLyrics: LyricData;
    export let progress: number;
    export let player: HTMLAudioElement | null;

@ -243,13 +243,32 @@
        player.currentTime = originalLyrics.scripts[lyricIndex].start;
        player.play();
    }
+
+    let lastFPSTime = performance.now();
+    let frameCount = 0;
+    let fps = 0;
+
+    function calculateFPS(t: number) {
+        // 计算时间差
+        const deltaTime = t - lastFPSTime;
+        frameCount ++;
+        if (frameCount % 5 == 0) {
+            fps = 1000 / deltaTime;
+        }
+        lastFPSTime = t;
+        // 请求下一帧
+        requestAnimationFrame(calculateFPS);
+    }
+
+    // 开始检测帧率
+    requestAnimationFrame(calculateFPS);
 </script>

 <svelte:window on:keydown={onKeyDown} />

 {#if debugMode}
-    <span class="text-lg absolute">
-        progress: {progress.toFixed(2)}, nextUpdate: {nextUpdate}, scrolling: {scrolling}, current: {currentLyricIndex}
+    <span class="text-white text-lg absolute z-50 px-2 py-0.5 m-2 rounded-3xl bg-white bg-opacity-20 backdrop-blur-lg right-0 font-mono">
+        {fps.toFixed(1)}fps, progress: {progress.toFixed(2)}, nextUpdate: {nextUpdate}, scrolling: {scrolling}, current: {currentLyricIndex}
    </span>
 {/if}

--- a/packages/core/graphics/spring/spring.ts
+++ b/packages/core/graphics/spring/spring.ts
@ -47,7 +47,6 @@ export class Spring {
        return (
            Math.abs(this.targetPosition - this.currentPosition) < 0.01 &&
            this.getV(this.currentTime) < 0.01 &&
-            this.getV2(this.currentTime) < 0.01 &&
            this.queueParams === undefined &&
            this.queuePosition === undefined
        );
--- a/packages/core/lyrics/LRCtoAMLL.ts
+++ b/packages/core/lyrics/LRCtoAMLL.ts
@ -1,20 +0,0 @@
-import type { LyricLine } from '@applemusic-like-lyrics/core';
-import type { ScriptItem } from './LRCparser';
-
-export default function mapLRCtoAMLL(line: ScriptItem, i: number, lines: ScriptItem[]): LyricLine {
-    return {
-        words: [
-            {
-                word: line.text,
-                startTime: line.start * 1000,
-                endTime: line.end * 1000
-            }
-        ],
-        startTime: line.start * 1000,
-        endTime: line.end * 1000,
-        translatedLyric: line.translation ?? "",
-        romanLyric: '',
-        isBG: false,
-        isDuet: false
-    };
-}
--- a/packages/core/lyrics/lrc/type.d.ts
+++ b/packages/core/lyrics/lrc/type.d.ts
@ -1,13 +1,3 @@
-import type { ScriptWordsItem } from "../type";
-
-export interface ParserScriptItem {
-    start: number;
-    text: string;
-    words?: ScriptWordsItem[];
-    translation?: string;
-    singer?: string;
-}
-
 export interface IDTag {
    [key: string]: string;
 }
--- a/packages/core/lyrics/ttml/index.ts
+++ b/packages/core/lyrics/ttml/index.ts
@ -2,14 +2,13 @@ import type { LrcJsonData } from '../type';
 import { parseTTML as ttmlParser } from './parser';
 import type { LyricLine } from './ttml-types';

-export * from './writer';
 export type * from './ttml-types';

 export function parseTTML(text: string) {
    let lyrics: LrcJsonData;
    const lyricLines = ttmlParser(text).lyricLines;
    lyrics = {
-        scripts: lyricLines.map((value: LyricLine, index: number, array: LyricLine[]) => {
+        scripts: lyricLines.map((value: LyricLine, _index: number, _array: LyricLine[]) => {
            let words = value.words.length == 0 ? undefined : value.words;
            if (words) {
                words = words.map((word) => {
--- a/packages/core/lyrics/ttml/writer.ts
+++ b/packages/core/lyrics/ttml/writer.ts
@ -1,254 +0,0 @@
-import type { LyricLine, LyricWord, TTMLLyric } from "./ttml-types";
-
-function msToTimestamp(timeMS: number): string {
-	let time = timeMS;
-	if (!Number.isSafeInteger(time) || time < 0) {
-		return "00:00.000";
-	}
-	if (time === Infinity) {
-		return "99:99.999";
-	}
-	time = time / 1000;
-	const secs = time % 60;
-	time = (time - secs) / 60;
-	const mins = time % 60;
-	const hrs = (time - mins) / 60;
-
-	const h = hrs.toString().padStart(2, "0");
-	const m = mins.toString().padStart(2, "0");
-	const s = secs.toFixed(3).padStart(6, "0");
-
-	if (hrs > 0) {
-		return `${h}:${m}:${s}`;
-	}
-	return `${m}:${s}`;
-}
-
-export function exportTTML(ttmlLyric: TTMLLyric, pretty = false): string {
-	const params: LyricLine[][] = [];
-	const lyric = ttmlLyric.lyricLines;
-
-	let tmp: LyricLine[] = [];
-	for (const line of lyric) {
-		if (line.words.length === 0 && tmp.length > 0) {
-			params.push(tmp);
-			tmp = [];
-		} else {
-			tmp.push(line);
-		}
-	}
-
-	if (tmp.length > 0) {
-		params.push(tmp);
-	}
-
-	const doc = new Document();
-
-	function createWordElement(word: LyricWord): Element {
-		const span = doc.createElement("span");
-		span.setAttribute("begin", msToTimestamp(word.startTime));
-		span.setAttribute("end", msToTimestamp(word.endTime));
-		if (word.emptyBeat) {
-			span.setAttribute("amll:empty-beat", `${word.emptyBeat}`);
-		}
-		span.appendChild(doc.createTextNode(word.word));
-		return span;
-	}
-
-	const ttRoot = doc.createElement("code");
-
-	ttRoot.setAttribute("xmlns", "http://www.w3.org/ns/ttml");
-	ttRoot.setAttribute("xmlns:ttm", "http://www.w3.org/ns/ttml#metadata");
-	ttRoot.setAttribute("xmlns:amll", "http://www.example.com/ns/amll");
-	ttRoot.setAttribute(
-		"xmlns:itunes",
-		"http://music.apple.com/lyric-ttml-internal",
-	);
-
-	doc.appendChild(ttRoot);
-
-	const head = doc.createElement("head");
-
-	ttRoot.appendChild(head);
-
-	const body = doc.createElement("body");
-	const hasOtherPerson = !!lyric.find((v) => v.isDuet);
-
-	const metadataEl = doc.createElement("metadata");
-	const mainPersonAgent = doc.createElement("ttm:agent");
-	mainPersonAgent.setAttribute("type", "person");
-	mainPersonAgent.setAttribute("xml:id", "v1");
-
-	metadataEl.appendChild(mainPersonAgent);
-
-	if (hasOtherPerson) {
-		const otherPersonAgent = doc.createElement("ttm:agent");
-		otherPersonAgent.setAttribute("type", "other");
-		otherPersonAgent.setAttribute("xml:id", "v2");
-
-		metadataEl.appendChild(otherPersonAgent);
-	}
-
-	for (const metadata of ttmlLyric.metadata) {
-		for (const value of metadata.value) {
-			const metaEl = doc.createElement("amll:meta");
-			metaEl.setAttribute("key", metadata.key);
-			metaEl.setAttribute("value", value);
-			metadataEl.appendChild(metaEl);
-		}
-	}
-
-	head.appendChild(metadataEl);
-
-	let i = 0;
-
-	const guessDuration = lyric[lyric.length - 1]?.endTime ?? 0;
-	body.setAttribute("dur", msToTimestamp(guessDuration));
-
-	for (const param of params) {
-		const paramDiv = doc.createElement("div");
-		const beginTime = param[0]?.startTime ?? 0;
-		const endTime = param[param.length - 1]?.endTime ?? 0;
-
-		paramDiv.setAttribute("begin", msToTimestamp(beginTime));
-		paramDiv.setAttribute("end", msToTimestamp(endTime));
-
-		for (let lineIndex = 0; lineIndex < param.length; lineIndex++) {
-			const line = param[lineIndex];
-			const lineP = doc.createElement("p");
-			const beginTime = line.startTime ?? 0;
-			const endTime = line.endTime;
-
-			lineP.setAttribute("begin", msToTimestamp(beginTime));
-			lineP.setAttribute("end", msToTimestamp(endTime));
-
-			lineP.setAttribute("ttm:agent", line.isDuet ? "v2" : "v1");
-			lineP.setAttribute("itunes:key", `L${++i}`);
-
-			if (line.words.length > 1) {
-				let beginTime = Infinity;
-				let endTime = 0;
-				for (const word of line.words) {
-					if (word.word.trim().length === 0) {
-						lineP.appendChild(doc.createTextNode(word.word));
-					} else {
-						const span = createWordElement(word);
-						lineP.appendChild(span);
-						beginTime = Math.min(beginTime, word.startTime);
-						endTime = Math.max(endTime, word.endTime);
-					}
-				}
-				lineP.setAttribute("begin", msToTimestamp(line.startTime));
-				lineP.setAttribute("end", msToTimestamp(line.endTime));
-			} else if (line.words.length === 1) {
-				const word = line.words[0];
-				lineP.appendChild(doc.createTextNode(word.word));
-				lineP.setAttribute("begin", msToTimestamp(word.startTime));
-				lineP.setAttribute("end", msToTimestamp(word.endTime));
-			}
-
-			const nextLine = param[lineIndex + 1];
-			if (nextLine?.isBG) {
-				lineIndex++;
-				const bgLine = nextLine;
-				const bgLineSpan = doc.createElement("span");
-				bgLineSpan.setAttribute("ttm:role", "x-bg");
-
-				if (bgLine.words.length > 1) {
-					let beginTime = Infinity;
-					let endTime = 0;
-					for (
-						let wordIndex = 0;
-						wordIndex < bgLine.words.length;
-						wordIndex++
-					) {
-						const word = bgLine.words[wordIndex];
-						if (word.word.trim().length === 0) {
-							bgLineSpan.appendChild(doc.createTextNode(word.word));
-						} else {
-							const span = createWordElement(word);
-							if (wordIndex === 0) {
-								span.prepend(doc.createTextNode("("));
-							} else if (wordIndex === bgLine.words.length - 1) {
-								span.appendChild(doc.createTextNode(")"));
-							}
-							bgLineSpan.appendChild(span);
-							beginTime = Math.min(beginTime, word.startTime);
-							endTime = Math.max(endTime, word.endTime);
-						}
-					}
-					bgLineSpan.setAttribute("begin", msToTimestamp(beginTime));
-					bgLineSpan.setAttribute("end", msToTimestamp(endTime));
-				} else if (bgLine.words.length === 1) {
-					const word = bgLine.words[0];
-					bgLineSpan.appendChild(doc.createTextNode(`(${word.word})`));
-					bgLineSpan.setAttribute("begin", msToTimestamp(word.startTime));
-					bgLineSpan.setAttribute("end", msToTimestamp(word.endTime));
-				}
-
-				if (bgLine.translatedLyric) {
-					const span = doc.createElement("span");
-					span.setAttribute("ttm:role", "x-translation");
-					span.setAttribute("xml:lang", "zh-CN");
-					span.appendChild(doc.createTextNode(bgLine.translatedLyric));
-					bgLineSpan.appendChild(span);
-				}
-
-				if (bgLine.romanLyric) {
-					const span = doc.createElement("span");
-					span.setAttribute("ttm:role", "x-roman");
-					span.appendChild(doc.createTextNode(bgLine.romanLyric));
-					bgLineSpan.appendChild(span);
-				}
-
-				lineP.appendChild(bgLineSpan);
-			}
-
-			if (line.translatedLyric) {
-				const span = doc.createElement("span");
-				span.setAttribute("ttm:role", "x-translation");
-				span.setAttribute("xml:lang", "zh-CN");
-				span.appendChild(doc.createTextNode(line.translatedLyric));
-				lineP.appendChild(span);
-			}
-
-			if (line.romanLyric) {
-				const span = doc.createElement("span");
-				span.setAttribute("ttm:role", "x-roman");
-				span.appendChild(doc.createTextNode(line.romanLyric));
-				lineP.appendChild(span);
-			}
-
-			paramDiv.appendChild(lineP);
-		}
-
-		body.appendChild(paramDiv);
-	}
-
-	ttRoot.appendChild(body);
-
-	if (pretty) {
-		const xsltDoc = new DOMParser().parseFromString(
-			[
-				'<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">',
-				'  <xsl:strip-space elements="*"/>',
-				'  <xsl:template match="para[content-style][not(text())]">',
-				'    <xsl:value-of select="normalize-space(.)"/>',
-				"  </xsl:template>",
-				'  <xsl:template match="node()|@*">',
-				'    <xsl:copy><xsl:apply-templates select="node()|@*"/></xsl:copy>',
-				"  </xsl:template>",
-				'  <xsl:output indent="yes"/>',
-				"</xsl:stylesheet>",
-			].join("\n"),
-			"application/xml",
-		);
-
-		const xsltProcessor = new XSLTProcessor();
-		xsltProcessor.importStylesheet(xsltDoc);
-		const resultDoc = xsltProcessor.transformToDocument(doc);
-
-		return new XMLSerializer().serializeToString(resultDoc);
-	}
-	return new XMLSerializer().serializeToString(doc);
-}
--- a/packages/core/lyrics/type.d.ts
+++ b/packages/core/lyrics/type.d.ts
@ -1,8 +1,11 @@
-import type { ParserScriptItem } from "./lrc/type";
-
-export interface ScriptItem extends ParserScriptItem {
+export interface ScriptItem{
    end: number;
    chorus?: string;
+    start: number;
+    text: string;
+    words?: LyricWord[];
+    translation?: string;
+    singer?: string;
 }

 export interface LyricWord {
@ -12,7 +15,7 @@ export interface LyricWord {
    emptyBeat?: number;
 }

-export interface LrcMetaData {
+export interface LyricMetadata {
    ar?: string;
    ti?: string;
    al?: string;
@ -23,14 +26,8 @@ export interface LrcMetaData {
    ve?: string;
 }

-export interface ParsedLrc extends LrcMetaData {
-    scripts?: ParserScriptItem[];
-
-    [key: string]: any;
-}
-
-export interface LrcJsonData extends LrcMetaData {
-    scripts?: ScriptItem[];
+export interface LyricData extends LyricMetadata {
+scripts?: ScriptItem[];

    [key: string]: any;
 }
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -23,10 +23,10 @@
    "tailwindcss": "^3.4.3",
    "typescript": "^5.4.5",
    "vite": "5.4.6",
-    "vite-plugin-wasm": "^3.3.0",
-    "vitest": "^1.6.0"
+    "vite-plugin-wasm": "^3.3.0"
  },
  "dependencies": {
+    "@alikia/aqualyrics": "npm:@jsr/alikia__aqualyrics",
    "@applemusic-like-lyrics/core": "^0.1.3",
    "@applemusic-like-lyrics/lyric": "^0.2.2",
    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
--- a/packages/core/test/lyrics/lrcParser.test.ts
+++ b/packages/core/test/lyrics/lrcParser.test.ts
@ -1,13 +1,11 @@
 import { describe, expect, it } from 'vitest';
 import fs from 'fs';
-import { parseLRC } from '../../packages/core/lyrics/lrc/parser';
+import { parseLRC } from '@core/lyrics/lrc/parser';

 describe('LRC parser test', () => {
-    const test01Buffer = fs.readFileSync('./src/test/resources/test-01.lrc');
+    const test01Buffer = fs.readFileSync('./packages/core/test/lyrics/resources/test-01.lrc');
    const test01Text = test01Buffer.toString('utf-8');
-    const test02Buffer = fs.readFileSync('./src/test/resources/test-02.lrc');
-    const test02Text = test02Buffer.toString('utf-8');
-    const test03Buffer = fs.readFileSync('./src/test/resources/test-03.lrc');
+    const test03Buffer = fs.readFileSync('./packages/core/test/lyrics/resources/test-03.lrc');
    const test03Text = test03Buffer.toString('utf-8');

    const lf_alternatives = ['\n', '\r\n', '\r'];
@ -26,17 +24,6 @@ describe('LRC parser test', () => {
            expect(result.scripts!![1].start).toBe(49000 + 588);
        }
    })
-    it('Parses test-02.lrc', () => {
-        const result = parseLRC(test02Text, { wordDiv: ' ', strict: true });
-
-        expect(result.ti).toBe("Somebody to Love");
-        expect(result.ar).toBe("Jefferson Airplane");
-        expect(result.scripts!!.length).toBe(3);
-        expect(result.scripts!![0].text).toBe("When the truth is found to be lies");
-        expect(result.scripts!![0].start).toBe(0);
-        expect(result.scripts!![0].words!![1].beginIndex).toBe("[00:00.00] <00:00.04> When <00:00.16> the".indexOf("the"));
-        expect(result.scripts!![0].words!![1].start).toBe(160);
-    });
    it('Parses test-03.lrc', () => {
        const result = parseLRC(test03Text, { wordDiv: ' ', strict: true });
        expect(result.scripts!![5].text).toBe("བྲོ་ར་འདི་ལ་བྲོ་ཅིག་འཁྲབ།");
@ -46,18 +33,6 @@ describe('LRC parser test', () => {
        expect(result.scripts!![11].singer).toBeUndefined();
        expect(result.scripts!![11].translation).toBe("我们在此相聚");
    });
-    it('Rejects some invalid LRCs', () => {
-        const cases = [
-            "[<00:00.00>] <00:00.04> When <00:00.16> the",
-            "[00:00.00] <00:00.04> <When> <00:00.16> the",
-            "[00:00.00> <00:00.04> When <00:00.16> the",
-            "<00:00.00> <00:00.04> When <00:00.16> the",
-            "<1:00:00.00> <00:00.04> When <00:00.16> the",
-        ]
-        for (const c of cases) {
-            expect(() => parseLRC(c, { strict: true })).toThrow();
-        }
-    })
    it('Accepts some weird but parsable LRCs', () => {
        const cases = [
            "[ti: []]",
@ -74,14 +49,4 @@ describe('LRC parser test', () => {
            expect(() => parseLRC(c, { strict: false })).not.toThrow();
        }
    })
-    it('Parses a legacy LRC', () => {
-        const result = parseLRC(test02Text, { wordDiv: ' ', strict: true, legacy: true });
-
-        expect(result.ti).toBe("Somebody to Love");
-        expect(result.ar).toBe("Jefferson Airplane");
-        expect(result.scripts!!.length).toBe(3);
-        expect(result.scripts!![1].text).toBe("<00:07.67> And <00:07.94> all <00:08.36> the <00:08.63> joy <00:10.28> within <00:10.53> you <00:13.09> dies");
-        expect(result.scripts!![1].start).toBe(6000 + 470);
-        result.scripts!!.forEach((s) => expect(s.words).not.toBeDefined());
-    });
 });
--- a/packages/electron/src/test/resources/test-01.lrc
+++ b/packages/electron/src/test/resources/test-01.lrc
--- a/packages/electron/src/test/resources/test-03.lrc
+++ b/packages/electron/src/test/resources/test-03.lrc
--- a/packages/core/test/server/index.test.ts
+++ b/packages/core/test/server/index.test.ts
@ -1,28 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import formatDuration from '$lib/utils/formatDuration.js';
-import { safePath } from '$lib/server/safePath';
-
-describe('formatDuration test', () => {
-    it('converts 120 seconds to "2:00"', () => {
-        expect(formatDuration(120)).toBe('2:00');
-    });
-
-    it('converts 119.935429 seconds to "1:59"', () => {
-        expect(formatDuration(119.935429)).toBe('1:59');
-    });
-
-    it('converts 185 seconds to "3:05"', () => {
-        expect(formatDuration(185)).toBe('3:05');
-    });
-
-    it('converts 601 seconds to "10:01"', () => {
-        expect(formatDuration(601)).toBe('10:01');
-    });
-
-    it('converts 3601 seconds to "1:00:01"', () => {
-        expect(formatDuration(3601)).toBe('1:00:01');
-    });
-});
+import { safePath } from '@core/server/safePath.js';

 describe('safePath test', () => {
    const base = "data/subdir";
--- a/packages/core/test/utils/index.test.ts
+++ b/packages/core/test/utils/index.test.ts
@ -0,0 +1,24 @@
+import { describe, it, expect } from 'vitest';
+import formatDuration from '@core/utils/formatDuration';
+
+describe('formatDuration test', () => {
+    it('converts 120 seconds to "2:00"', () => {
+        expect(formatDuration(120)).toBe('2:00');
+    });
+
+    it('converts 119.935429 seconds to "1:59"', () => {
+        expect(formatDuration(119.935429)).toBe('1:59');
+    });
+
+    it('converts 185 seconds to "3:05"', () => {
+        expect(formatDuration(185)).toBe('3:05');
+    });
+
+    it('converts 601 seconds to "10:01"', () => {
+        expect(formatDuration(601)).toBe('10:01');
+    });
+
+    it('converts 3601 seconds to "1:00:01"', () => {
+        expect(formatDuration(3601)).toBe('1:00:01');
+    });
+});
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@ -1,6 +1,7 @@
 {
    "extends": ["../../tsconfig.base.json"],
    "compilerOptions": {
+        "target": "ES2019",
        "baseUrl": ".",
        "paths": {
            "@core/*": ["./*"]
@ -13,6 +14,7 @@
        "skipLibCheck": true,
        "sourceMap": true,
        "strict": true,
-        "types": ["bun"]
+        "types": ["bun"],
+        "moduleResolution": "bundler"
    }
 }
--- a/packages/electron/src/electron.js
+++ b/packages/electron/src/electron.js
@ -2,7 +2,6 @@ import windowStateManager from 'electron-window-state';
 import { app, BrowserWindow, ipcMain } from 'electron';
 import contextMenu from 'electron-context-menu';
 import serve from 'electron-serve';
-import { join } from 'path';

 try {
 	require('electron-reloader')(module);
--- a/packages/electron/src/routes/play/[id]/+page.svelte
+++ b/packages/electron/src/routes/play/[id]/+page.svelte
@ -81,10 +81,46 @@
        });
        localforage.getItem(`${audioId}-cover`, function (err, file) {
            if (file) {
-                const path = URL.createObjectURL(file as File);
-                coverPath.set(path);
+                const img = new Image();
+                img.src = URL.createObjectURL(file as File);
+
+                img.onload = function () {
+                    const canvas = document.createElement('canvas');
+                    const ctx = canvas.getContext('2d');
+
+                    // 计算新的宽度和高度，确保宽度至少为1200px
+                    let newWidth = img.width;
+                    let newHeight = img.height;
+
+                    console.log(newWidth)
+
+                    if (newWidth < 1200) {
+                        newWidth = 1200;
+                        newHeight = (img.height * 1200) / img.width;
+                    }
+
+                    canvas.width = newWidth;
+                    canvas.height = newHeight;
+
+                    // 绘制放大后的图片到canvas
+                    ctx!.drawImage(img, 0, 0, newWidth, newHeight);
+
+                    // 将canvas内容转换为Blob
+                    canvas.toBlob(function (blob) {
+                        const path = URL.createObjectURL(blob!);
+                        coverPath.set(path);
+                    }, 'image/jpeg'); // 你可以根据需要更改图片格式
+
+                    prepared.push('cover');
+                };
+
+                img.onerror = function () {
+                    console.error('Failed to load image');
+                    prepared.push('cover');
+                };
+            } else {
+                prepared.push('cover');
            }
-            prepared.push('cover');
        });
        localforage.getItem(`${audioId}-file`, function (err, file) {
            if (audioPlayer === null) return;
@ -211,7 +247,7 @@
    {hasLyrics}
 />

-<NewLyrics {originalLyrics} progress={currentProgress} player={audioPlayer}/>
+<NewLyrics {originalLyrics} progress={currentProgress} player={audioPlayer} />

 <!-- <Lyrics lyrics={lyricsText} {originalLyrics} progress={currentProgress} player={audioPlayer} class="hidden" /> -->

--- a/packages/electron/src/test/lrcParser.test.ts
+++ b/packages/electron/src/test/lrcParser.test.ts
@ -1,87 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import fs from 'fs';
-import { parseLRC } from '../../packages/core/lyrics/lrc/parser';
-
-describe('LRC parser test', () => {
-    const test01Buffer = fs.readFileSync('./src/test/resources/test-01.lrc');
-    const test01Text = test01Buffer.toString('utf-8');
-    const test02Buffer = fs.readFileSync('./src/test/resources/test-02.lrc');
-    const test02Text = test02Buffer.toString('utf-8');
-    const test03Buffer = fs.readFileSync('./src/test/resources/test-03.lrc');
-    const test03Text = test03Buffer.toString('utf-8');
-
-    const lf_alternatives = ['\n', '\r\n', '\r'];
-
-    it('Parses test-01.lrc', () => {
-        for (const lf of lf_alternatives) {
-            const text = test01Text.replaceAll('\n', lf);
-
-            const result = parseLRC(text, { wordDiv: '', strict: true });
-
-            expect(result.ar).toBe("洛天依");
-            expect(result.ti).toBe("中华少女·终");
-            expect(result.al).toBe("中华少女");
-            expect(result["tool"]).toBe("歌词滚动姬 https://lrc-maker.github.io");
-            expect(result.scripts!![1].text).toBe("因果与恩怨牵杂等谁来诊断");
-            expect(result.scripts!![1].start).toBe(49000 + 588);
-        }
-    })
-    it('Parses test-02.lrc', () => {
-        const result = parseLRC(test02Text, { wordDiv: ' ', strict: true });
-
-        expect(result.ti).toBe("Somebody to Love");
-        expect(result.ar).toBe("Jefferson Airplane");
-        expect(result.scripts!!.length).toBe(3);
-        expect(result.scripts!![0].text).toBe("When the truth is found to be lies");
-        expect(result.scripts!![0].start).toBe(0);
-        expect(result.scripts!![0].words!![1].beginIndex).toBe("[00:00.00] <00:00.04> When <00:00.16> the".indexOf("the"));
-        expect(result.scripts!![0].words!![1].start).toBe(160);
-    });
-    it('Parses test-03.lrc', () => {
-        const result = parseLRC(test03Text, { wordDiv: ' ', strict: true });
-        expect(result.scripts!![5].text).toBe("བྲོ་ར་འདི་ལ་བྲོ་ཅིག་འཁྲབ།");
-        expect(result.scripts!![5].translation).toBe("在舞池里舞一舞");
-        expect(result.scripts!![6].text).toBe("祝祷转过千年 五色经幡飘飞");
-        expect(result.scripts!![6].singer).toBe("a");
-        expect(result.scripts!![11].singer).toBeUndefined();
-        expect(result.scripts!![11].translation).toBe("我们在此相聚");
-    });
-    it('Rejects some invalid LRCs', () => {
-        const cases = [
-            "[<00:00.00>] <00:00.04> When <00:00.16> the",
-            "[00:00.00] <00:00.04> <When> <00:00.16> the",
-            "[00:00.00> <00:00.04> When <00:00.16> the",
-            "<00:00.00> <00:00.04> When <00:00.16> the",
-            "<1:00:00.00> <00:00.04> When <00:00.16> the",
-        ]
-        for (const c of cases) {
-            expect(() => parseLRC(c, { strict: true })).toThrow();
-        }
-    })
-    it('Accepts some weird but parsable LRCs', () => {
-        const cases = [
-            "[ti: []]",
-            "[ar: [<]]",
-            "[ar: <ar>]",
-            "[ar: a b c]",
-            "[00:00.00] <00:00.04> When the <00:00.16> the",
-            "[00:00.00] [00:00.04] When [00:00.16] the",
-            "[00:00.0000000] <00:00.04> When <00:00.16> the",
-            "[00:00.00] <00:00.04> [When] <00:00.16> the",
-        ];
-
-        for (const c of cases) {
-            expect(() => parseLRC(c, { strict: false })).not.toThrow();
-        }
-    })
-    it('Parses a legacy LRC', () => {
-        const result = parseLRC(test02Text, { wordDiv: ' ', strict: true, legacy: true });
-
-        expect(result.ti).toBe("Somebody to Love");
-        expect(result.ar).toBe("Jefferson Airplane");
-        expect(result.scripts!!.length).toBe(3);
-        expect(result.scripts!![1].text).toBe("<00:07.67> And <00:07.94> all <00:08.36> the <00:08.63> joy <00:10.28> within <00:10.53> you <00:13.09> dies");
-        expect(result.scripts!![1].start).toBe(6000 + 470);
-        result.scripts!!.forEach((s) => expect(s.words).not.toBeDefined());
-    });
-});
--- a/packages/electron/src/test/resources/test-02.lrc
+++ b/packages/electron/src/test/resources/test-02.lrc
@ -1,9 +0,0 @@
-[ti: Somebody to Love]
-[ar: Jefferson Airplane]
-[al: Surrealistic Pillow]
-[lr: Lyricists of that song]
-[length: 2:58]
-
-[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies 
-[00:06.47] <00:07.67> And <00:07.94> all <00:08.36> the <00:08.63> joy <00:10.28> within <00:10.53> you <00:13.09> dies 
-[00:13.34] <00:14.32> Don't <00:14.73> you <00:15.14> want <00:15.57> somebody <00:16.09> to <00:16.46> love
--- a/packages/web/package.json
+++ b/packages/web/package.json
@ -12,43 +12,44 @@
  },
  "devDependencies": {
    "@iconify/svelte": "^4.0.2",
-    "@sveltejs/adapter-auto": "^3.2.0",
-    "@sveltejs/adapter-node": "^5.0.1",
-    "@sveltejs/kit": "^2.5.9",
-    "@sveltejs/vite-plugin-svelte": "^3.1.0",
-    "@types/eslint": "^8.56.10",
-    "@types/node": "^20.14.10",
+    "@sveltejs/adapter-auto": "^3.3.1",
+    "@sveltejs/adapter-node": "^5.2.9",
+    "@sveltejs/kit": "^2.8.1",
+    "@sveltejs/vite-plugin-svelte": "^3.1.2",
+    "@types/eslint": "^8.56.12",
+    "@types/node": "^20.17.6",
    "@types/uuid": "^9.0.8",
-    "autoprefixer": "^10.4.19",
-    "eslint": "^8.57.0",
+    "autoprefixer": "^10.4.20",
+    "eslint": "^8.57.1",
    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-svelte": "^2.39.0",
-    "postcss": "^8.4.38",
-    "prettier": "^3.2.5",
-    "prettier-plugin-svelte": "^3.2.3",
+    "eslint-plugin-svelte": "^2.46.0",
+    "postcss": "^8.4.49",
+    "prettier": "^3.3.3",
+    "prettier-plugin-svelte": "^3.2.8",
    "svelte": "^4.2.19",
-    "svelte-check": "^3.7.1",
-    "tailwindcss": "^3.4.3",
-    "typescript": "^5.4.5",
+    "svelte-check": "^3.8.6",
+    "tailwindcss": "^3.4.15",
+    "typescript": "^5.6.3",
    "vite": "5.4.6",
    "vite-plugin-wasm": "^3.3.0",
    "vitest": "^1.6.0"
  },
  "dependencies": {
+    "@alikia/aqualyrics": "npm:@jsr/alikia__aqualyrics",
    "@applemusic-like-lyrics/core": "^0.1.3",
-    "@applemusic-like-lyrics/lyric": "^0.2.2",
+    "@applemusic-like-lyrics/lyric": "^0.2.4",
    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
    "@rollup/plugin-commonjs": "^28.0.1",
    "@rollup/plugin-node-resolve": "^15.3.0",
-    "@types/bun": "^1.1.6",
+    "@types/bun": "^1.1.13",
    "bezier-easing": "^2.1.0",
-    "jotai": "^2.8.0",
+    "jotai": "^2.10.2",
    "jotai-svelte": "^0.0.2",
    "jss": "^10.10.0",
    "jss-preset-default": "^10.10.0",
    "localforage": "^1.10.0",
    "lrc-parser-ts": "^1.0.3",
-    "music-metadata-browser": "^2.5.10",
+    "music-metadata-browser": "^2.5.11",
    "node-cache": "^5.1.2",
    "rollup-plugin-node-polyfills": "^0.2.1",
    "uuid": "^9.0.1"
--- a/packages/web/pnpm-lock.yaml
+++ b/packages/web/pnpm-lock.yaml
--- a/packages/web/src/app.css
+++ b/packages/web/src/app.css
@ -28,7 +28,13 @@ h2 {

 body,
 html {
-  position: fixed;
-  overflow: hidden;
-  overscroll-behavior: none;
+    position: fixed;
+    overflow: hidden;
+    overscroll-behavior: none;
+}
+
+@font-face {
+    font-family: 'LyricFont';
+    src: url('/font.otf') format('opentype');
+    font-weight: 600; /* Semibold weight */
 }
--- a/packages/web/src/app.html
+++ b/packages/web/src/app.html
@ -3,8 +3,6 @@
    <head>
        <meta charset="utf-8" />
        <!-- <link rel="icon" href="%sveltekit.assets%/favicon.png" /> -->
-        <link rel="preconnect" href="https://fonts.googleapis.com" />
-        <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
        <meta name="viewport" content="width=device-width, initial-scale=1" />
        <title>AquaVox</title>
        %sveltekit.head%
--- a/packages/web/src/index.test.js
+++ b/packages/web/src/index.test.js
@ -1,47 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import formatDuration from '$lib/utils/formatDuration.js';
-import { safePath } from '$lib/server/safePath';
-
-describe('formatDuration test', () => {
-    it('converts 120 seconds to "2:00"', () => {
-        expect(formatDuration(120)).toBe('2:00');
-    });
-
-    it('converts 119.935429 seconds to "1:59"', () => {
-        expect(formatDuration(119.935429)).toBe('1:59');
-    });
-
-    it('converts 185 seconds to "3:05"', () => {
-        expect(formatDuration(185)).toBe('3:05');
-    });
-
-    it('converts 601 seconds to "10:01"', () => {
-        expect(formatDuration(601)).toBe('10:01');
-    });
-
-    it('converts 3601 seconds to "1:00:01"', () => {
-        expect(formatDuration(3601)).toBe('1:00:01');
-    });
-});
-
-describe('safePath test', () => {
-    const base = "data/subdir";
-    it('rejects empty string', () => {
-        expect(safePath('', { base })).toBe(null);
-    });
-    it('accepts a regular path', () => {
-        expect(safePath('subsubdir/file.txt', { base })).toBe('data/subdir/subsubdir/file.txt');
-    });
-    it('rejects path with ..', () => {
-        expect(safePath('../file.txt', { base })).toBe(null);
-    });
-    it('accepts path with .', () => {
-        expect(safePath('./file.txt', { base })).toBe('data/subdir/file.txt');
-    });
-    it('accepts path traversal within base', () => {
-        expect(safePath('subsubdir/../file.txt', { base })).toBe('data/subdir/file.txt');
-    });
-    it('rejects path with subdir if noSubDir is true', () => {
-        expect(safePath('subsubdir/file.txt', { base, noSubDir: true })).toBe(null);
-    });
-});
--- a/packages/web/src/routes/api/database/song/[id]/+server.ts
+++ b/packages/web/src/routes/api/database/song/[id]/+server.ts
@ -1,8 +1,9 @@
-import { safePath } from '$lib/server/safePath';
-import { getCurrentFormattedDateTime } from '$lib/utils/songUpdateTime';
+import { safePath } from '@core/server/safePath';
+import { getCurrentFormattedDateTime } from '@core/utils/songUpdateTime';
 import { json, error } from '@sveltejs/kit';
 import fs from 'fs';
 import type { RequestHandler } from './$types';
+import type { MusicMetadata } from '@core/server/database/musicInfo';

 export const GET: RequestHandler = async ({ params }) => {
    const filePath = safePath(`${params.id}.json`, { base: './data/song' });
--- a/packages/web/src/routes/play/[id]/+page.svelte
+++ b/packages/web/src/routes/play/[id]/+page.svelte
@ -7,13 +7,12 @@
    import extractFileName from '@core/utils/extractFileName';
    import localforage from 'localforage';
    import { writable } from 'svelte/store';
-    import lrcParser from '@core/lyrics/lrc/parser';
-    import type { LrcJsonData } from '@core/lyrics/type';
+    import { type LyricData } from "@alikia/aqualyrics";
    import userAdjustingProgress from '@core/state/userAdjustingProgress';
    import type { IAudioMetadata } from 'music-metadata-browser';
    import { onMount } from 'svelte';
    import progressBarRaw from '@core/state/progressBarRaw';
-    import { parseTTML } from '@core/lyrics/ttml';
+    import { parseTTML, parseLRC } from '@alikia/aqualyrics';
    import NewLyrics from '@core/components/lyrics/newLyrics.svelte';

    const audioId = $page.params.id;
@ -27,7 +26,7 @@
    let paused: boolean = true;
    let launched = false;
    let prepared: string[] = [];
-    let originalLyrics: LrcJsonData;
+    let originalLyrics: LyricData;
    let lyricsText: string[] = [];
    let hasLyrics: boolean;
    const coverPath = writable('');
@ -81,10 +80,46 @@
        });
        localforage.getItem(`${audioId}-cover`, function (err, file) {
            if (file) {
-                const path = URL.createObjectURL(file as File);
-                coverPath.set(path);
+                const img = new Image();
+                img.src = URL.createObjectURL(file as File);
+
+                img.onload = function () {
+                    const canvas = document.createElement('canvas');
+                    const ctx = canvas.getContext('2d');
+
+                    // 计算新的宽度和高度，确保宽度至少为1200px
+                    let newWidth = img.width;
+                    let newHeight = img.height;
+
+                    console.log(newWidth)
+
+                    if (newWidth < 1200) {
+                        newWidth = 1200;
+                        newHeight = (img.height * 1200) / img.width;
+                    }
+
+                    canvas.width = newWidth;
+                    canvas.height = newHeight;
+
+                    // 绘制放大后的图片到canvas
+                    ctx!.drawImage(img, 0, 0, newWidth, newHeight);
+
+                    // 将canvas内容转换为Blob
+                    canvas.toBlob(function (blob) {
+                        const path = URL.createObjectURL(blob!);
+                        coverPath.set(path);
+                    }, 'image/jpeg'); // 你可以根据需要更改图片格式
+
+                    prepared.push('cover');
+                };
+
+                img.onerror = function () {
+                    console.error('Failed to load image');
+                    prepared.push('cover');
+                };
+            } else {
+                prepared.push('cover');
            }
-            prepared.push('cover');
        });
        localforage.getItem(`${audioId}-file`, function (err, file) {
            if (audioPlayer === null) return;
@ -103,12 +138,13 @@
                f.text().then((lr) => {
                    if (f.name.endsWith('.ttml')) {
                        originalLyrics = parseTTML(lr);
+                        console.log(originalLyrics);
                        for (const line of originalLyrics.scripts!) {
                            lyricsText.push(line.text);
                        }
                        hasLyrics = true;
                    } else if (f.name.endsWith('.lrc')) {
-                        originalLyrics = lrcParser(lr);
+                        originalLyrics = parseLRC(lr);
                        if (!originalLyrics.scripts) return;
                        for (const line of originalLyrics.scripts) {
                            lyricsText.push(line.text);
--- a/packages/web/src/test/resources/test-01.lrc
+++ b/packages/web/src/test/resources/test-01.lrc
@ -1,56 +0,0 @@
-[ti: 中华少女·终]
-[ar: 洛天依]
-[al: 中华少女]
-[tool: 歌词滚动姬 https://lrc-maker.github.io]
-[00:46.706] 我想要仗剑天涯却陷入纷乱
-[00:49.588] 因果与恩怨牵杂等谁来诊断
-[00:52.284] 暗箭在身后是否该回身看
-[00:55.073] 人心有了鬼心房便要过鬼门关
-[00:57.875] 早已茫然染了谁的血的这抹长衫
-[01:00.702] 独木桥上独目瞧的人一夫当关
-[01:03.581] 复仇或是诅咒缠在身上的宿命
-[01:06.591] 棋子在棋盘被固定移动不停转
-[01:09.241] 仇恨与仇恨周而复始往返
-[01:12.586] 酒楼深胭脂一点分隔光暗
-[01:15.205] 数求问天涯海角血债偿还
-[01:18.015] 终是神念迷茫只做旁观
-[01:21.087] 是非恩怨三生纠葛轮转
-[01:23.709] 回望从前苦笑将杯酒斟满
-[01:26.573] 那时明月今日仍旧皎洁
-[01:29.115] 只叹换拨人看
-[01:31.024] 你可是这样的少年
-[01:33.971] 梦想着穿越回从前
-[01:36.554] 弦月下着青衫抚长剑
-[01:42.341] 风起时以血绘长卷
-[01:45.276] 三寸剑只手撼江山
-[01:47.838] 拂衣去逍遥天地间
-[01:52.991]
-[02:16.707] 黄藓绿斑苔痕将岁月扒谱
-[02:20.077] 望眼欲穿你何时寄来家书
-[02:22.788] 踱步间院落飞絮聚散化作愁字
-[02:25.601] 当泪水成河能否凫上一位游子
-[02:28.050] 当庭间嫣红轻轻闻着雨声
-[02:30.841] 电闪雷鸣院中青翠摇曳倚风
-[02:33.362] 青丝落指尖模糊记忆更为清晰
-[02:36.334] 那一朵英姿遮挡于一抹旌旗飘
-[02:39.511] 厮杀与厮杀周而复始招摇
-[02:42.576] 血渍滑落于枪尖映照宵小
-[02:45.726] 城池下红莲飞溅绽放照耀
-[02:48.509] 碧落黄泉再无叨扰
-[02:51.338] 北风呼啸三生等待轮转
-[02:53.660] 山崖古道思绪被光阴晕染
-[02:56.895] 那时明月今日仍旧皎洁
-[02:59.293] 只叹孤身人看
-[03:01.335] 你可是这样的少年
-[03:04.377] 梦想着穿越回从前
-[03:06.924] 北风里铁衣冷槊光寒
-[03:12.607] 一朝去大小三百战
-[03:15.623] 岁月欺万里定江山
-[03:18.126] 再与她同游天地间
-[03:24.356] 说书人或许会留恋
-[03:27.057] 但故事毕竟有终点
-[03:29.590] 最好的惊堂木是时间
-[03:35.157] 就让我合上这书卷
-[03:38.242] 愿那些梦中的玩伴
-[03:40.857] 梦醒后仍然是少年
-[03:46.139]
--- a/packages/web/src/test/resources/test-02.lrc
+++ b/packages/web/src/test/resources/test-02.lrc
@ -1,9 +0,0 @@
-[ti: Somebody to Love]
-[ar: Jefferson Airplane]
-[al: Surrealistic Pillow]
-[lr: Lyricists of that song]
-[length: 2:58]
-
-[00:00.00] <00:00.04> When <00:00.16> the <00:00.82> truth <00:01.29> is <00:01.63> found <00:03.09> to <00:03.37> be <00:05.92> lies 
-[00:06.47] <00:07.67> And <00:07.94> all <00:08.36> the <00:08.63> joy <00:10.28> within <00:10.53> you <00:13.09> dies 
-[00:13.34] <00:14.32> Don't <00:14.73> you <00:15.14> want <00:15.57> somebody <00:16.09> to <00:16.46> love
--- a/packages/web/src/test/resources/test-03.lrc
+++ b/packages/web/src/test/resources/test-03.lrc
@ -1,77 +0,0 @@
-[ti: 雪山之眼]
-[ar: 洛天依 & 旦增益西]
-[al: 游四方]
-[tool: 歌词滚动姬 https://lrc-maker.github.io]
-[length: 04:17.400]
-[00:34.280] 浸透了经卷 记忆的呼喊
-[00:37.800] 雪珠滚落山巅 栽下一个春天
-[00:47.390] 松石敲响玲珑清脆的银花
-[00:51.600] 穿过玛瑙的红霞
-[00:54.430] 在她眼中结编 亘久诗篇
-[01:05.440] a: བྲོ་ར་འདི་ལ་བྲོ་ཅིག་འཁྲབ། | 在舞池里舞一舞
-[01:08.780] a: 祝祷转过千年 五色经幡飘飞
-[01:12.040] 奏起悠扬巴叶 任岁月拨弦
-[01:19.130] གཞས་ར་འདི་ལ་གཞས་གཅིག་བཏང་། 我在歌坛献首歌
-[01:22.330] 宫殿 塔尖 彩绘 日月 同辉
-[01:25.810] 那层厚重壁垒化身 蝉翼一片
-[01:29.110] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། | 我们在此相聚
-[01:30.790] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[01:32.510] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[01:34.120] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[01:35.920] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[01:37.630] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[01:39.350] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[01:41.050] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[01:42.740] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[01:44.630] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[01:46.280] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[01:48.010] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[01:49.600] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[01:51.380] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[01:53.070] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[01:54.820] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[01:58.580] སྔོན་དང་པོ་གྲུབ་ཐོབ་ཐང་སྟོང་རྒྱལ་པོས་མཛད་པའི་མཛད་ཚུལ་དུ། དང་པོ་རྔོན་པའི་ས་སྦྱངས་ས་འདུལ། གཉིས་པ་རྒྱ་ལུའི་བྱིན་འབེབས། གསུམ་པ་ལྷ་མོའི་གླུ་གར་སོགས་རིན་ཆེན་གསུང་མགུར་གཞུང་བཟང་མང་པོ་འདུག་སྟེ། དེ་ཡང་མ་ཉུང་གི་ཚིག་ལ་དུམ་མཚམས་གཅིག་ཞུས་པ་བྱུང་བ་ཡིན་པ་ལགས་སོ། 如祖师唐东杰布所著，一有温巴净地，二有甲鲁祈福，三有仙女歌舞，所著繁多，在此简略献之。
-[02:24.240] 浸透了经卷 记忆的呼喊
-[02:27.450] 雪珠滚落山巅 栽下一个春天
-[02:37.090] 松石敲响玲珑清脆的银花
-[02:41.280] 穿过玛瑙的红霞
-[02:44.010] 在她眼中结编 亘久诗篇
-[02:55.250] བྲོ་ར་འདི་ལ་བྲོ་ཅིག་འཁྲབ། 在舞池里舞一舞
-[02:58.410] 祝祷转过千年 五色经幡飘飞
-[03:01.750] 奏起悠扬巴叶 任岁月拨弦
-[03:08.840] གཞས་ར་འདི་ལ་གཞས་གཅིག་བཏང་། 我在歌坛献首歌
-[03:12.050] 宫殿 塔尖 彩绘 日月 同辉
-[03:15.400] 那层厚重壁垒化身 蝉翼一片
-[03:18.850] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:20.480] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:22.210] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:23.910] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:25.662] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:27.391] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:29.096] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:30.789] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:32.496] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:34.175] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:35.876] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:37.606] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:39.290] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:41.030] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:42.679] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:44.455] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:46.176] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:47.910] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:49.625] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:51.293] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:53.005] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[03:54.742] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[03:56.479] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[03:58.159] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[03:59.859] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[04:01.548] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[04:03.312] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[04:05.026] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[04:06.721] ང་ཚོ་འདི་ལ་འཛོམས་འཛོམས། 我们在此相聚
-[04:08.479] གཏན་དུ་འཛོམས་རྒྱུ་བྱུང་ན། 希望可以常聚
-[04:10.175] གཏན་དུ་འཛོམས་པའི་མི་ལ། 在此相聚的人们
-[04:11.923] སྙུན་གཞི་གོད་ཆགས་མ་གཏོང༌། 祝愿平安富足
-[04:17.400] 
--- a/packages/web/static/font.otf
+++ b/packages/web/static/font.otf
Author	SHA1	Message	Date
alikia2x	57de9f426f	update: use new lyric parser	2024-11-17 17:01:10 +08:00
alikia2x	b3ba38c91c	ref: type	2024-11-09 23:21:12 +08:00
alikia2x	2d10240983	update: font and style	2024-11-08 20:45:29 +08:00
alikia2x	630692b507	fix: when cover resolution too low, image on the UI won't fill the container improve: adjust margin of cover and interactiveBox	2024-11-03 00:42:05 +08:00
alikia2x	2b6d1e7439	improve: rename unused parameter	2024-10-30 21:10:37 +08:00
alikia2x	935bb64958	ref: clean project, especially for tests	2024-10-30 21:09:46 +08:00