发布 v2.12.6

resolves https://github.com/lyswhut/lx-music-desktop/issues/2932

.babelrc

@@ -1,26 +0,0 @@
-{
-  "presets": [
-    "@babel/preset-typescript",
-    [
-      "@babel/preset-env",
-      {
-        "corejs": "3",
-        "useBuiltIns": "usage"
-      }
-    ]
-    // [
-    //   "minify",
-    //   {
-    //     "builtIns": false,
-    //     "evaluate": false,
-    //     "mangle": false
-    //   }
-    // ]
-  ],
-  "plugins": [
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-transform-modules-umd",
-    "@babel/plugin-transform-runtime",
-    "@babel/plugin-proposal-class-properties"
-  ]
-}

.eslintrc.base.cjs

@@ -55,7 +55,6 @@ const vueRule = {
 exports.base = {
   extends: ['standard'],
   rules: baseRule,
-  parser: '@babel/eslint-parser',
 }
 
 exports.html = {

.github/ISSUE_TEMPLATE/--bug.yml

@@ -1,55 +0,0 @@
-name: 🐞报告Bug
-description: 报告bug，请先查看常见问题及搜索issue列表中有无你要提的问题
-title: "[Bug]: "
-body:
-- type: checkboxes
-  id: check-answer
-  attributes:
-    label: 解决方案检查
-    description: 请确保你已完成以下所有操作
-    options:
-      - label: 我已阅读常见问题(<https://lyswhut.github.io/lx-music-doc/desktop/faq>)，并没有找到解决方案
-        required: true
-      - label: 我已搜索issue列表(<https://github.com/lyswhut/lx-music-desktop/issues?utf8=✓&q=>)，并没有发现类似的问题
-        required: true
-- type: textarea
-  id: expected-behavior
-  attributes:
-    label: 预期行为
-    description: 对期望发生的事情的清晰简明描述
-  validations:
-    required: true
-- type: textarea
-  id: actual-behavior
-  attributes:
-    label: 实际行为
-    description: 对实际发生的事情的清晰简明描述
-  validations:
-    required: true
-- type: input
-  id: version
-  attributes:
-    label: Lx Music 版本
-    description: 你使用什么版本的LX Music？
-    placeholder: 1.15.0
-  validations:
-    required: true
-- type: input
-  id: last-known-working-version
-  attributes:
-    label: 最后正常的版本
-    description: 如果有，请在此处填写最后正常的版本是多少？
-    placeholder: 1.15.0
-- type: input
-  id: operating-system-version
-  attributes:
-    label: 操作系统版本
-    description: 您使用的是什么操作系统版本？在 Windows 上，单击开始按钮 > 设置 > 系统 > 关于；在 macOS 上，单击 Apple 菜单 > 关于本机；在 Linux 上，使用 lsb_release 或 uname -a
-    placeholder: "例如 Windows 10 版本 1909、macOS Catalina 10.15.7 或 Ubuntu 20.04"
-  validations:
-    required: true
-- type: textarea
-  id: additional-information
-  attributes:
-    label: 附加信息
-    description: 如果你的问题需要进一步解释，或者你所遇到的问题不容易重现，请在此处添加更多信息。（直接把图片、视频拖到编辑框即可添加图片或视频）

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,59 @@
+name: 🐞 报告错误
+description: 报告一个错误（Bug），请先查看常见问题及搜索 Issue 列表中有无你要提的问题。
+title: "[Bug]: "
+body:
+- type: checkboxes
+  id: check-answer
+  attributes:
+    label: 解决方案检查
+    description: 请确保你已完成以下所有操作。
+    options:
+      - label: 我已阅读 [常见问题](https://lyswhut.github.io/lx-music-doc/desktop/faq)，并没有找到解决方案。
+        required: true
+      - label: 我已搜索 [Issue 列表](https://github.com/lyswhut/lx-music-desktop/issues?q=is%3Aissue+)，并没有发现类似的问题。
+        required: true
+- type: textarea
+  id: expected-behavior
+  attributes:
+    label: 预期行为
+    description: 对期望发生的事情的清晰简明描述。
+  validations:
+    required: true
+- type: textarea
+  id: actual-behavior
+  attributes:
+    label: 实际行为
+    description: 对实际发生的事情的清晰简明描述。
+  validations:
+    required: true
+- type: input
+  id: version
+  attributes:
+    label: LX Music 版本
+    description: 你使用什么版本的 LX Music？
+    placeholder: 例如 2.9.0
+  validations:
+    required: true
+- type: input
+  id: last-known-working-version
+  attributes:
+    label: 最后正常的版本
+    description: 如果有，请在此处填写最后正常的版本。
+    placeholder: 例如 2.8.0
+- type: input
+  id: operating-system-version
+  attributes:
+    label: 操作系统版本
+    description: |
+      你使用什么版本的操作系统？
+      在 macOS 上，单击「Apple 菜单 > 关于本机」；
+      在 Linux 上，执行 `lsb_release` 或 `uname -a` 命令；
+      在 Windows 上，单击「开始按钮 > 设置 > 系统 > 关于」。
+    placeholder: "例如 Windows 11 版本 24H2、macOS Sequoia 15.1.1 或 Ubuntu 24.10"
+  validations:
+    required: true
+- type: textarea
+  id: additional-information
+  attributes:
+    label: 附加信息
+    description: 如果你的问题需要进一步解释，或者你所遇到的问题不容易重现，请在此处添加更多信息。（直接把图片/视频拖到编辑框即可添加图片/视频）

.github/ISSUE_TEMPLATE/feature.yml

@@ -1,40 +1,38 @@
-name: ✨功能请求
-description: 为这个项目提出一个想法，请先查看常见问题及搜索issue列表中有无你要提的问题
+name: ✨ 功能请求
+description: 为这个项目提出一个想法，请先查看常见问题及搜索 Issue 列表中有无你要提的问题。
 title: "[Feature]: "
 body:
 - type: checkboxes
   id: check-answer
   attributes:
     label: 解决方案检查
-    description: 请确保你已完成以下所有操作
+    description: 请确保你已完成以下所有操作。
     options:
-      - label: 我已阅读常见问题(<https://lyswhut.github.io/lx-music-doc/desktop/faq>)，但没有找到解决方案
+      - label: 我已阅读 [常见问题](https://lyswhut.github.io/lx-music-doc/desktop/faq)，但没有找到解决方案。
         required: true
-      - label: 我已搜索issue列表(<https://github.com/lyswhut/lx-music-desktop/issues?utf8=✓&q=>)，但没有发现类似的问题
+      - label: 我已搜索 [Issue 列表](https://github.com/lyswhut/lx-music-desktop/issues?q=is%3Aissue+)，但没有发现类似的问题。
         required: true
 - type: textarea
   id: problem-description
   attributes:
     label: 问题描述
-    description: 请添加清晰简洁的描述，说明你希望通过此功能请求解决的问题
+    description: 请添加清晰简洁的描述，说明你希望通过此功能请求解决的问题。
   validations:
     required: true
 - type: textarea
   id: proposed-solution
   attributes:
     label: 描述你想要的解决方案
-    description: 简洁明了地描述你要发生的事情
+    description: 简洁明了地描述你要发生的事情。
   validations:
     required: true
 - type: textarea
   id: alternatives-considered
   attributes:
     label: 描述你考虑过的替代方案
-    description: 对你考虑过的所有替代解决方案或功能的简洁明了的描述
-  validations:
-    required: false
+    description: 对你考虑过的所有替代解决方案或功能的简洁明了的描述。
 - type: textarea
   id: additional-information
   attributes:
     label: 附加信息
-    description: 如果你的问题需要进一步解释，或者想要表达其他内容，请在此处添加更多信息。（直接把图片、视频拖到编辑框即可添加图片或视频）
+    description: 如果你的问题需要进一步解释，或者想要表达其他内容，请在此处添加更多信息。（直接把图片/视频拖到编辑框即可添加图片/视频）

.github/actions/setup/action.yml

@@ -5,21 +5,23 @@ runs:
   using: composite
   steps:
     - name: Setup Node.js
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v6
       with:
-        node-version: '16'
+        node-version: '22'
 
+    # - name: Get npm cache directory
+    #   run: node -p -e '`NPM_CACHE_DIR=${require("child_process").execSync("npm config get cache").toString()}`' >> $GITHUB_ENV
+    #   run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV
+
+    # https://docs.npmjs.com/cli/v10/configuring-npm/folders#cache
     - name: Cache node modules
       id: cache-npm
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       with:
-        path: |
-          ${{ env.NPM_CACHE }}
-          ${{ env.ELECTRON_CACHE }}
-          ${{ env.ELECTRON_BUILDERCACHE }}
-        key: ${{ runner.os }}-node-modules-cache-${{ hashFiles('package-lock.json') }}
+        path: ${{ env.NPM_CACHE }}
+        key: ${{ runner.os }}-npm-cache-${{ hashFiles('package-lock.json') }}
         restore-keys: |
-          ${{ runner.os }}-node-modules-cache-
+          ${{ runner.os }}-npm-cache-
 
     - name: Install dependencies
       run: npm ci

.github/workflows/beta-pack.yml

@@ -5,18 +5,21 @@ on:
     branches:
       - beta
 
+env:
+  IS_CI: 'true'
+
 jobs:
   # CheckCode:
   #   name: Lint Code
   #   runs-on: ubuntu-latest
   #   steps:
   #     - name: Check out git repository
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v6
 
   #     - name: Install Node.js
   #       uses: actions/setup-node@v4
   #       with:
-  #         node-version: '16'
+  #         node-version: 20
 
   #     - name: Cache file
   #       uses: actions/cache@v4
@@ -40,25 +43,29 @@ jobs:
   Windows:
     name: Windows
     runs-on: windows-latest
-    env:
-      NPM_CACHE: '%APPDATA%\npm-cache'
-      ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
-      ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
     # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Get npm cache directory
+        shell: pwsh
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
 
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Build Package Setup x64
         run: npm run pack:win:setup:x64
       - name: Upload Artifact Setup x64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-x64-Setup
           path: build/*-x64-Setup.exe
@@ -66,7 +73,7 @@ jobs:
       - name: Build Package 7z x64
         run: npm run pack:win:7z:x64
       - name: Upload Artifact 7z x64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-win_x64-green
           path: build/*win_x64-green.7z
@@ -74,7 +81,7 @@ jobs:
       - name: Build Package Setup arm64
         run: npm run pack:win:setup:arm64
       - name: Upload Artifact Setup arm64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-arm64-Setup
           path: build/*-arm64-Setup.exe
@@ -82,22 +89,56 @@ jobs:
       - name: Build Package 7z arm64
         run: npm run pack:win:7z:arm64
       - name: Upload Artifact 7z arm64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-win_arm64-green
           path: build/*win_arm64-green.7z
 
+      - name: Generate file MD5
+        run: |
+          cd build
+          Get-FileHash *.exe,*.7z -Algorithm MD5 | Format-List
 
-      - name: Install old electron
-        run: npm install electron@22
+  Windows_7:
+    name: Windows_7
+    runs-on: windows-latest
+    env:
+      BUILD_WIN7: true
+    # needs: CheckCode
+    steps:
+      - name: Check out git repository
+        uses: actions/checkout@v6
 
-      - name: Install python setuptools
-        run: pip.exe install setuptools
+      - name: Get npm cache directory
+        shell: pwsh
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
+
+      - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
+        uses: ./.github/actions/setup
+
+      - name: Prepare win7 undici env
+        run: |
+          npm install undici@5
+          Set-Content -Path .\src\common\utils\request.ts -Value "export * from './request_node16'"
+
+      - name: Build src code
+        env:
+          BUILD_WIN7: true
+        run: |
+          git status --porcelain
+          npm run build
+
+      - name: Prepare win7 electron env
+        run: |
+          npm install electron@22 better-sqlite3@12
+          pip.exe install setuptools
 
       - name: Build Package win7 Setup x64
         run: npm run pack:win7:setup:x64
       - name: Upload Artifact win7 Setup x64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-win7_x64-Setup
           path: build/*win7_x64-Setup.exe
@@ -105,7 +146,7 @@ jobs:
       - name: Build Package win7 7z x64
         run: npm run pack:win7:7z:x64
       - name: Upload Artifact win7 7z x64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-win7_x64-green
           path: build/*win7_x64-green.7z
@@ -113,7 +154,7 @@ jobs:
       - name: Build Package win7 7z x86
         run: npm run pack:win7:7z:x86
       - name: Upload Artifact win7 7z x86
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-win7_x86-green
           path: build/*win7_x86-green.7z
@@ -127,22 +168,26 @@ jobs:
     name: Mac
     runs-on: macos-latest
     # needs: CheckCode
-    env:
-      NPM_CACHE: $HOME/.npm
-      ELECTRON_CACHE: $HOME/.cache/electron
-      ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install python setuptools
-        run: python3 -m pip install setuptools
+        run: brew install python-setuptools
+
+      - name: Get npm cache directory
+        shell: bash
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
 
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Build Package dmg
         run: |
@@ -150,14 +195,14 @@ jobs:
           npm run pack:mac:dmg:arm64
 
       - name: Upload Artifact dmg
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-mac-dmg
           path: |
             build/*.dmg
             !build/*-arm64.dmg
       - name: Upload Artifact dmg
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-mac-dmg-arm64
           path: build/*-arm64.dmg
@@ -170,28 +215,32 @@ jobs:
   Linux:
     name: Linux
     runs-on: ubuntu-latest
-    env:
-      NPM_CACHE: $HOME/.npm
-      ELECTRON_CACHE: $HOME/.cache/electron
-      ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
     # needs: CheckCode
     steps:
       - name: Install package
         run: sudo apt-get update && sudo apt-get install -y rpm libarchive-tools
 
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Get npm cache directory
+        shell: bash
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
 
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Build Package deb amd64
         run: npm run pack:linux:deb:amd64
       - name: Upload Artifact deb amd64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-deb-amd64
           path: build/*_amd64.deb
@@ -199,7 +248,7 @@ jobs:
       - name: Build Package deb arm64
         run: npm run pack:linux:deb:arm64
       - name: Upload Artifact deb arm64
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-deb-arm64
           path: build/*_arm64.deb
@@ -207,7 +256,7 @@ jobs:
       - name: Build Package deb armv7l
         run: npm run pack:linux:deb:armv7l
       - name: Upload Artifact deb armv7l
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-deb-armv7l
           path: build/*_armv7l.deb
@@ -215,7 +264,7 @@ jobs:
       - name: Build Package x64 appImage
         run: npm run pack:linux:appImage
       - name: Upload Artifact x64 appImage
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-x64-appImage
           path: build/*_x64.AppImage
@@ -223,7 +272,7 @@ jobs:
       - name: Build Package x64 rpm
         run: npm run pack:linux:rpm
       - name: Upload Artifact x64 rpm
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-x64-rpm
           path: build/*.x64.rpm
@@ -231,7 +280,7 @@ jobs:
       - name: Build Package x64 pacman
         run: npm run pack:linux:pacman
       - name: Upload Artifact x64 pacman
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lx-music-desktop-x64-pacman
           path: build/*_x64.pacman

.github/workflows/build-test.yml

@@ -11,12 +11,12 @@ jobs:
 
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '16'
+          node-version: 22
 
       - name: Install Dependencies
         run: npm ci

.github/workflows/publish-version-info.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v4
         with:
           token: ${{ secrets.PAT }}
           repository: lyswhut/lx-music-desktop-version-info

.github/workflows/release.yml

@@ -5,18 +5,21 @@ on:
     branches:
       - master
 
+env:
+  IS_CI: 'true'
+
 jobs:
   # CheckCode:
   #   name: Lint Code
   #   runs-on: ubuntu-latest
   #   steps:
   #     - name: Check out git repository
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v6
 
   #     - name: Install Node.js
   #       uses: actions/setup-node@v4
   #       with:
-  #         node-version: '16'
+  #         node-version: 20
 
   #     - name: Cache file
   #       uses: actions/cache@v4
@@ -40,20 +43,27 @@ jobs:
   Windows:
     name: Windows
     runs-on: windows-latest
-    env:
-      NPM_CACHE: '%APPDATA%\npm-cache'
-      ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
-      ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
     # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Get npm cache directory
+        shell: pwsh
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
+
+      - name: Show Env
+        run: echo "${{ env.NPM_CACHE }}"
 
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Release package
         run: |
@@ -72,26 +82,37 @@ jobs:
 
 
   Windows_7:
-    name: Windows
+    name: Windows_7
     runs-on: windows-latest
-    env:
-      NPM_CACHE: '%APPDATA%\npm-cache'
-      ELECTRON_CACHE: '%LOCALAPPDATA%\electron\Cache'
-      ELECTRON_BUILDERCACHE: '%LOCALAPPDATA%\electron-builder\Cache'
     # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - name: Get npm cache directory
+        shell: pwsh
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
 
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
+      - name: Prepare win7 undici env
+        run: |
+          npm install undici@5
+          Set-Content -Path .\src\common\utils\request.ts -Value "export * from './request_node16'"
+
       - name: Build src code
-        run: npm run build
+        env:
+          BUILD_WIN7: true
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Prepare win7 electron env
         run: |
-          npm install electron@22
+          npm install electron@22 better-sqlite3@12
           pip.exe install setuptools
 
       - name: Release win7 package
@@ -111,23 +132,29 @@ jobs:
   Mac:
     name: Mac
     runs-on: macos-latest
-    env:
-      NPM_CACHE: $HOME/.npm
-      ELECTRON_CACHE: $HOME/.cache/electron
-      ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
     # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install python3 setuptools
-        run: python3 -m pip install setuptools
+        run: brew install python-setuptools
 
+      - name: Get npm cache directory
+        shell: bash
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
+
+      - name: Show Env
+        run: echo "${{ env.NPM_CACHE }}"
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Release package
         run: |
@@ -145,23 +172,29 @@ jobs:
   Linux:
     name: Linux
     runs-on: ubuntu-latest
-    env:
-      NPM_CACHE: $HOME/.npm
-      ELECTRON_CACHE: $HOME/.cache/electron
-      ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
     # needs: CheckCode
     steps:
       - name: Install package
         run: sudo apt-get update && sudo apt-get install -y rpm libarchive-tools
 
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
+      - name: Get npm cache directory
+        shell: bash
+        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
+
+      - name: Show Env
+        run: echo "${{ env.NPM_CACHE }}"
       - name: Setup Node Env
+        env:
+          NPM_CACHE: ${{ env.NPM_CACHE }}
         uses: ./.github/actions/setup
 
       - name: Build src code
-        run: npm run build
+        run: |
+          git status --porcelain
+          npm run build
 
       - name: Release package
         run: |

.ncurc.js

@@ -6,11 +6,25 @@ module.exports = {
     'del',
     'comlink',
     'vue',
+    'vue-router',
     'image-size',
     'message2call',
     '@types/ws',
+    'eslint',
+    '@types/node',
+    'electron-debug',
+    'eslint-webpack-plugin',
+    'typescript',
+    'undici',
+    '@types/better-sqlite3',
+    'changelog-parser',
+    'webpack-dev-server',
+
+    'eslint-plugin-vue',
+    'vue-eslint-parser',
     // 'eslint-config-standard-with-typescript',
-    // 'typescript', // https://github.com/microsoft/TypeScript/pull/54567
+
+    'webpack',
   ],
 
   // target: 'newest',
@@ -21,11 +35,25 @@ module.exports = {
 
   // target: 'patch',
   // filter: [
+  //   'electron',
   //   'vue',
+  //   'vue-router',
   // ],
 
   // target: 'minor',
   // filter: [
   //   'electron',
+  //   'eslint',
+  //   'eslint-webpack-plugin',
+  //   'electron-debug',
+  //   'typescript',
+  //   '@types/node',
+  //   'undici',
+
+  //   'eslint-plugin-vue',
+  //   'vue-eslint-parser',
+  //   'better-sqlite3',
+  //   '@types/better-sqlite3',
+  //   'webpack-dev-server',
   // ],
 }

CHANGELOG.md

@@ -6,6 +6,356 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [2.12.6](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.5...v2.12.6) - 2026-09-19
+
+目前新项目 Any Listen 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+Any Listen 的项目地址为 https://github.com/any-listen/any-listen
+
+### 优化
+
+- 优化 tx 推荐歌单列表
+- 优化禁用透明窗口的窗口边框显示效果
+
+### 修复
+
+- 修复打开某些 kg 歌单时歌曲丢失的问题
+- 修复 Windows 7 无法启动的问题
+- 修复禁用透明窗口时按 F11 无法全屏的问题
+
+## [2.12.5](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.4...v2.12.5) - 2026-09-14
+
+目前新项目 Any Listen 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+Any Listen 的项目地址为 https://github.com/any-listen/any-listen
+
+### 修复
+
+- 修复自定义主题编辑器的颜色选择器默认值显示异常的问题（#2957）
+- 修复下载的 MP3 文件内嵌歌曲数据失败的问题（#2959）
+
+## [2.12.4](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.3...v2.12.4) - 2026-09-12
+
+目前新项目 Any Listen 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+Any Listen 的项目地址为 https://github.com/any-listen/any-listen
+
+### 修复
+
+- 修复自定义主题背景图片无法显示的问题
+
+## [2.12.3](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.2...v2.12.3) - 2026-09-12
+
+目前新项目 Any Listen 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+Any Listen 的项目地址为 https://github.com/any-listen/any-listen
+
+### 优化
+
+- 优化kw歌单列表数据显示
+- 同步服务在连接时允许URL重定向
+- Linux 点击托盘时将显示主界面（#2840）
+- 优化自动换源歌曲匹配机制
+
+### 修复
+
+- 修复 kg 搜索结果显示问题 (#2782)
+- 修复某些情况下开放 API 获取到的音量为 0 的问题 (#2790)
+- 修复 mg 图片、歌词获取
+- 修复某些 tx 歌单打开失败的问题 (#1060, @ght-000)
+- 修复在某些情况下添加、移动歌曲时可能导致保存的歌曲顺序不对的问题（#2842）
+- 修复歌词标签解析格式没有严格按照标准的问题（#2855）
+- 修复 tx 歌曲搜索失败的问题（#2848, @ikun0014）
+
+## [2.12.2](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.1...v2.12.2) - 2026-05-01
+
+我们很高兴地宣布新项目 Any Listen 的桌面版已发布，目前已支持列表跟随本地文件自动更新、加载并播放WebDAV上的歌曲等功能，更多功能仍在积极开发中，桌面版与Web版将同步更新。
+对于有播放本地音乐或播放服务器上音乐需求的人可以试试，若遇到任何问题可以发 issue 反馈。
+
+### 优化
+
+- 优化歌单内歌曲搜索结果排序 (#2734)
+
+### 修复
+
+- 修复桌面歌词的 鼠标移入歌词区域时提高透明度 设置不稳定的问题（#2679, @Little100）
+- 修复某些情况下可能播放没有声音的问题（#2693）
+- 修复 tx 搜索结果显示异常的问题（#2753）
+- 修复音乐名称和歌手信息格式化问题（#2733）
+
+### 其他
+
+- 更新 Electron 到 40.8.3
+
+## [2.12.1](https://github.com/lyswhut/lx-music-desktop/compare/v2.12.0...v2.12.1) - 2026-02-16
+
+我们很高兴地宣布新项目 Any Listen 的桌面版已发布，目前已支持列表跟随本地文件自动更新、加载并播放WebDAV上的歌曲等功能，更多功能仍在积极开发中，桌面版与Web版将同步更新。
+对于有播放本地音乐或播放服务器上音乐需求的人可以试试，若遇到任何问题可以发 issue 反馈。
+
+### 优化
+
+- 优化托盘图标行为：在非 Windows 系统中，点击托盘图标时不再显示主窗口
+
+### 修复
+
+- 修复音量条在调整音量时实际音量与显示的数值不一致的问题（#2606）
+- 修复某些情况下搜索框的搜索按钮布局错位的问题（#2622）
+
+## [2.12.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.11.0...v2.12.0) - 2025-11-29
+
+我们很高兴地宣布新项目 Any Listen 的桌面版已发布，目前已支持列表跟随本地文件自动更新、加载并播放WebDAV上的歌曲等功能，更多功能仍在积极开发中，桌面版与Web版将同步更新。
+对于有播放本地音乐或播放服务器上音乐需求的人可以试试，若遇到任何问题可以发 issue 反馈。
+
+### 新增
+
+- 新增「设置 → 其他设置 → 主窗口使用软件内置的圆角及阴影」选项 (#2360)
+  *默认启用，关闭后将使用系统原生的窗口样式，该选项重启软件后生效*
+- 开放 API 新增播放器声音大小、静音、播放进度控制、完整歌词获取，详情看接入文档 (#2386)
+- 新增「设置 → 播放设置 → 调换歌词翻译与歌词罗马音位置」选项，默认关闭 (#2451)
+- 新增启动参数 `-hidden`，在启动时将软件最小化到系统托盘 (#2459)
+- 新增 Any Listen 歌词（用于支持已下载歌曲的歌词逐字播放）标签数据读取与播放 (#2485)
+- 新增 Any Listen 歌词（包含逐字歌词、翻译、罗马音歌词，如果有）嵌入与下载，默认启用
+- 下载列表菜单新增歌曲添加弹窗，允许将所选歌曲的在线版本添加到收藏列表 (#2537)
+
+### 修复
+
+- 尝试修复进度为0时仍然显示下载完成的问题 (#2471)
+- 修复TX源搜索失败 (#2575 @Folltoshe)
+- 修复MG源歌单加载失败
+- 修复MG源评论加载失败
+
+### 变更
+
+- 调换「歌词翻译」与「歌词罗马音」的位置，现在歌词罗马音在歌词翻译的上方展示
+  *若你想要恢复以前的行为，可以开启「调换歌词翻译与歌词罗马音位置」选项*
+- 更新代理配置规则，现在不启用代理时，图片、音频加载将不再走系统代理 (#2382 @Folltoshe)
+- 字体设置可以最多设置两种字体（[any-listen#82](https://github.com/any-listen/any-listen/issues/82)）
+
+### 其他
+
+- 更新 Electron 到 37.6.0
+
+## [2.11.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.10.0...v2.11.0) - 2025-05-01
+
+### 新增
+
+- 新增「快进/快退5秒」自定义快捷键设置（#2289）
+- 新增「设置 → 桌面歌词设置 → 暂停时提高歌词透明度」设置，默认启用（#2294）
+
+### 修复
+
+- 修复 Windows 下桌面歌词最小高度与宽度设置问题（#2244）
+- 修复 Windows 下界面缩放后移动桌面歌词会改变歌词窗口大小的问题（#2244）
+- 修复 tx 歌单搜索名字、描述出现乱码的问题（#2250）
+- 修复本地 FLAC 文件内嵌歌词无法读取的问题
+- 修复潜在播放暂停的问题
+- 修复 kw 歌单详情出现打开失败的问题（#2317）
+- 修复 kg 热门评论无法获取的问题
+- 修复桌面歌词被遮挡时会被暂停的问题（#2320）
+- 修复 kg 歌单打开失败的问题（thanks @Folltoshe）
+
+### 优化
+
+- 允许更小的桌面歌词窗口宽度
+- 允许拖动桌面歌词控制栏空白处移动歌词窗口（#2280）
+- 优化「自定义源管理」对话框在小窗口下的布局（#2247, @3gf8jv4dv）
+- 优化软件文案编排（#2259, #2266, #2269, #2296, @3gf8jv4dv）
+
+### 变更
+
+- 我的列表-歌曲菜单中的 歌曲换源 功能从之前的类似软连接的形式改成替换歌曲的形式，也就是说，现在该功能相当于快速在线搜索歌曲，确认换源后将自动将原来的歌曲删除再将选择的歌曲插入被删除歌曲的位置。
+
+### 其他
+
+- 更新项目文档（@3gf8jv4dv）
+- 更新 Electron 到 35.2.2
+
+## [2.10.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.9.0...v2.10.0) - 2025-01-27
+
+落雪祝大家新年快乐！
+
+### 关于之前提到的新项目
+
+新项目我取名叫 Any Listen，希望它能像它的名字一样让我们能到处任意听歌。
+经过一年多的开发，因各种原因，实际进度比预期的慢，但还是赶在年前发布了第一个web服务预览版，第一个版本仅支持播放服务器上的歌曲，扩展功能暂时未能开放，但已趋于完成，一两个月内可以搞定。
+目前的版本仅是“能用”的状态，因时间关系，部分UI未能重新设计，但后面会继续完善。
+该项目目前的目标用户是拥有自己服务器且上面存储有歌曲的人使用。
+
+项目刚发布，文档未能完善，遇到使用问题或有任何建议欢迎提 issue 交流，
+项目地址： https://github.com/any-listen/any-listen
+
+---
+
+*感谢 @3gf8jv4dv 对 LX 系列项目翻译、文档等文案的大幅修订优化。*
+
+### 不兼容性变更
+
+Linux 系统至少需要 `GLIBC_2.29` 版本才能运行。
+
+由于将 Electron 升级到 v32.x，原生库的编译被限制到不低于 C++ 20，试了几次无法在 docker 镜像 `node:16` 安装 gcc-10，最终将构建使用镜像更新到 `node:18`。
+
+### 新增
+
+- 新增下载的歌曲按列表名分组的功能，默认关闭，可以通过「设置 → 下载设置 → 将文件保存到以对应列表命名的子目录中」启用（#2145）
+- 新增托盘图标样式「跟随系统亮暗模式」设置，可以在「设置 → 其他」里启用 （#2016）
+- 支持本地同名 `.krc` 格式歌词文件的读取（#2053）
+- 开放 API 新增播放器播放/暂停、切歌、收藏当前播放歌曲等接口调用，详情看文档「开放 API 服务」部分（#2077, @14Kay）
+
+### 优化
+
+- 优化正常播放结束时的下一首歌曲播放衔接度，在歌曲即将结束播放时将预获取下一首歌曲的播放链接，减少自动切歌时的等待时间（#2126）
+- 优化歌曲换源机制，提升换源正确率
+- 优化 Windows 平台上桌面歌词窗口大小调整机制，改用原生的窗口调整方式（#2137）
+- 修正搜索歌曲提示框文案（#2050）
+- 优化播放详情页 UI，修复「歌曲名」「艺术家」等文字过长时被截断的问题（#2049）
+- Scheme URL 的播放歌曲允许更长的专辑名称
+- 播放本地歌曲时，将优先尝试读取本地同名 `.jpg` 或 `.png` 图片作为播放封面显示，若文件不存在则从音频文件内读取，最后再尝试使用在线图片（#2096）
+- 客户端模式的同步服务连接允许重定向 5 次（#2109）
+- 更新软件默认使用的字体，修复 macOS Sequoia (15) 上界面出现乱码的问题（#2076）
+- 优化简体、繁体中文文案编排，大幅修订英语文案编排（#2159, #2166, #2174 等, @3gf8jv4dv）
+- 优化排序歌曲、主题名称、添加/编辑主题、列表更新管理等对话框布局及长文本显示效果（#2176, #2188, #2189, #2198 等, @3gf8jv4dv）
+
+### 修复
+
+- 修复歌单详情页内歌单名字过长时的 UI 显示问题（#2028）
+- 修复获取自定义环境音效预设列表逻辑问题
+- 修复 `.m4a` 文件内嵌歌词无法读取的问题（#2090）
+- 修复 Windows 任务管理器中的进程名显示为软件描述的问题（#2147）
+- 修复本地歌曲同名歌词文件调整偏移时间后，下次再播放时调整的设置未被应用的问题（#2139）
+- 修复首次打开软件后直接创建并删除列表时的报错问题（#2175, @14Kay）
+
+### 变更
+
+- 不再长期缓存换源歌曲信息
+- 更新软件默认使用的字体，现在软件尽量使用系统自带的默认字体
+- Linux 系统至少需要 `GLIBC_2.29` 版本才能运行
+
+### 其他
+
+- 更新 Readme 文档，优化文案编排（#2146, Thanks @3gf8jv4dv）
+- 更新 Issue 模板（#2153, @3gf8jv4dv）
+- 更新项目文档（@3gf8jv4dv）
+- 修订项目协议文件（#2146, #2152, @3gf8jv4dv）
+- 更新 Electron 到 v32.3.0
+
+## [2.9.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.8.0...v2.9.0) - 2024-08-24
+
+### 新增
+
+- 新增 设置-播放设置-是否将歌词显示在状态栏 设置，默认关闭，该功能只在 MacOS 下可用（#1940）
+- 新增设置-播放详情页设置-延迟歌词滚动设置（#1985）
+- 新增鼠标在音量按钮使用滚轮时可以调整音量大小的功能（#2000）
+- 新增设置-下载设置-同时下载任务数设置（#1498）
+- 新增 我的列表-歌曲右击菜单-歌曲换源 功能，换源后下次再播放该列表的该歌曲时将优先尝试播放所选源的歌曲，该功能允许你手动指定来源以解决自动换源失败或者换源不准确的问题
+
+### 优化
+
+- 优化侧栏图标显示，修复图标可能被裁切的问题（#1960）
+- 托盘图标添加当前播放歌曲名字显示
+- 优化本地歌曲内嵌封面过大时的加载方式
+- 将下载歌曲的歌手信息中的分隔符从 `、` 替换为 `;` 以确保音乐元数据在写入时的兼容性和一致性（#1989 @qnnp-me）
+
+### 修复
+
+- 修复 MacOS 下点击 dock 右键菜单的退出按钮时，程序没有退出的问题（#1923）
+- 修复 OpenAPI 的 `lyricLineAllText` 在切换到无歌词的音乐时内容没有更新的问题（#1925）
+- 修复切换音源时可能出现切换死循环的问题
+- 尝试修复某些情况下播放音频时，处于播放状态但是进度条不走的问题
+- 修复程序目录路径存在 `#` 或 `%` 时，自定义源、托盘等图标异常的问题（#1997）
+
+### 变更
+
+- 简化了应用退出行为，据测试，现在 linux 下，若启用了托盘，dock 右键菜单的 退出、关闭所有 之类的功能将不再退出程序，需改用托盘的退出按钮退出程序
+- 现在如果在设置或者启动参数配置了代理服务，那么应用内的图片、音频加载，歌曲下载也将走代理
+
+### 其他
+
+- 更新 electron 到 v30.4.0
+
+## [2.8.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.7.0...v2.8.0) - 2024-06-01
+
+我们发布了关于 LX Music 项目发展调整与新项目计划的说明，
+详情看： https://github.com/lyswhut/lx-music-desktop/issues/1912
+
+### 新增
+
+- 新增 设置-播放设置-使用设备能处理的最大声道数输出音频 设置（未启用时固定为2声道输出），由于这用到高级音频API，考虑到在某些设备上的兼容问题，默认禁用（#1873）
+- 允许添加 `m4a`、`oga` 格式的本地歌曲到列表中（#1864）
+- 开放API支持跨域请求（#1872 @Ceale）
+- Scheme URL API新增 `music/searchPlay` 支持，用于搜索并播放指定的歌曲名字，详细入参请阅读 Scheme URL 支持文档（#1886）
+
+### 优化
+
+- 优化白色托盘图标显示，修复windows下托盘图标不清晰的问题（#1842）
+
+### 修复
+
+- 修复存在多级弹窗时的背景显示问题
+- 增大在线导入自定义源文件的大小限制问题（#1857）
+- 修复Mac下窗口出现残留阴影的问题，这解决了Mac下桌面歌词出现残留阴影的远古bug，感谢 @zclorne （#1869, Thanks @zclorne）
+- 增大在线导入自定义源文件的大小限制，解决某些音源无法导入的问题（#1857）
+- 修复Mac下即使开启了托盘， `cmd+w` 仍会中断播放的问题（#1844）
+- 修复播放详情页的歌词无法使用触碰拖动的问题（#1865）
+- 修复与优化繁体中文、英语翻译显示（#1845）
+- 修复歌曲时文件名过长导致歌曲无法下载的问题（#1877）
+- 修复文本提示气泡在内容过长时，文本未被换行而被截断的问题
+- 修复翻页按钮栏切页按钮只显示前几页的问题
+
+### 变更
+
+- 设置-播放设置-优先播放320k音质选项改为“优先播放的音质”，允许选择更高优先播放的音质，如果歌曲及音源支持的话（#1839）
+
+### 开放API变更
+
+- `/status` 的入参现在与 `/subscribe-player-status` 保持一致
+- `/status` 新增 `filter` 入参用于过滤返回的字段，并内置了默认值，与之前相比默认不再返回 `picUrl`
+- `/status` 及 `/subscribe-player-status` 的可用字段名添加了 `lyricLineAllText`，它对应的值是当前句歌词及扩展歌词文本（扩展歌词包含翻译、罗马音等，按换行符分割）
+
+详情看开放API接入文档
+
+### 其他
+
+- 更新 electron 到 v28.3.3
+
+## [2.7.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.6.0...v2.7.0) - 2024-04-14
+
+### 新增
+
+- 主题编辑器添加“深色字体”选项，启用后将减少字体颜色梯度，各类字体（正文、标签字体等）颜色将更接近，这有助于解决创建全透明主题时可能出现的字体配色问题（#1799）
+- 新增在线自定义源导入功能，允许通过http/https链接导入自定义源
+- 新增HTTP开放API服务，默认关闭，该服务可以为第三方软件提供调用LX的能力，可用API看[说明文档](https://lyswhut.github.io/lx-music-doc/desktop/open-api)（#1824）
+- 托盘菜单新增播放、切歌、收藏控制
+- 添加当前软件版本所对应的代码提交版本、提交时间的显示，可到设置-版本更新查看
+
+### 优化
+
+- 主题设置默认折叠其他主题以优化进入设置界面时的性能
+- 不再丢弃kg源逐行歌词（@helloplhm-qwq）
+- 支持kw源排行榜显示大小（revert @Folltoshe #1460）
+- 托盘菜单添加多语言支持（#1802）
+- 优化本地歌曲换源匹配机制
+
+### 修复
+
+- 修复某些情况下歌曲加载时间过长时不会自动跳到下一首的问题
+- 修复mg歌词在某些情况下获取失败的问题（#1783）
+- 修复mg歌单搜索（@helloplhm-qwq）
+- 修复kg最新评论无法获取的问题（@helloplhm-qwq）
+- 修复更新超时弹窗在非更新阶段意外弹出的问题（#1797）
+- 修复网络代理设置没有对自定义源的网络请求生效的问题（#1814）
+
+### 移除
+
+- 移除未使用的网络代理设置用户名、密码设置，实际上在 v1.20.0 起这两个设置就没有在被内部使用
+
+### 其他
+
+- 更新 electron 到 v28.3.0
+
 ## [2.6.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.5.0...v2.6.0) - 2024-02-01
 
 提交祝大家新年快乐！

FAQ.md

@@ -1,6 +1,6 @@
 # lx-music-desktop 常见问题
 
-本文档已迁移到：<https://lyswhut.github.io/lx-music-doc/desktop/faq>
+本文档已迁移至：<https://lyswhut.github.io/lx-music-doc/desktop/faq>
 
 <!--
 在阅读本常见问题后，仍然无法解决你的问题，请提交issue或者加企鹅群`830125506`反馈（无事勿加，入群先看群公告），反馈时请**注明**已阅读常见问题！

README.md

@@ -1,5 +1,7 @@
 <p align="center"><a href="https://github.com/lyswhut/lx-music-desktop"><img width="200" src="https://github.com/lyswhut/lx-music-desktop/blob/master/doc/images/icon.png" alt="lx-music logo"></a></p>
 
+<h1 align="center">LX Music 桌面版</h1>
+
 <p align="center">
   <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/release/lyswhut/lx-music-desktop" alt="Release version"></a>
   <a href="https://github.com/lyswhut/lx-music-desktop/actions/workflows/release.yml"><img src="https://github.com/lyswhut/lx-music-desktop/workflows/Build/badge.svg" alt="Build status"></a>
@@ -28,143 +30,138 @@
 [9]: https://img.shields.io/github/license/lyswhut/lx-music-desktop
 [10]: https://github.com/lyswhut/lx-music-desktop/blob/master/LICENSE -->
 
-<h2 align="center">洛雪音乐助手桌面版</h2>
+<p align="center">一个基于 Electron & Vue 开发的音乐软件</p>
 
-### 说明
-
-一个基于 Electron + Vue 开发的音乐软件。
+## 说明
 
 所用技术栈：
 
-- Electron 15+
+- Electron 30+
 - Vue 3
 
 已支持的平台：
 
-- Windows 7 及以上
-- Mac OS
 - Linux
+- macOS
+- Windows 7 及以上
 
-软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)<br>
-软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)<br>
-或者到网盘下载（网盘内有MAC、windows版）：`https://www.lanzoui.com/b0bf2cfa/` 密码：`glqw`（若链接无法打开请百度：蓝奏云链接打不开）<br>
-使用常见问题请转至：[常见问题](https://lyswhut.github.io/lx-music-doc/desktop/faq)
+*移动版项目地址：https://github.com/lyswhut/lx-music-mobile*
 
-目前本项目的原始发布地址只有**GitHub**及**蓝奏网盘**，其他渠道均为第三方转载发布，与本项目无关！
+> [!NOTE]
+> 目前新项目 [Any Listen](https://github.com/any-listen/any-listen) 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+> 我们以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+> 对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+>
+> 关于我们开发新项目的原因，可以参考：[LX Music 项目发展调整与新项目计划](https://github.com/lyswhut/lx-music-desktop/issues/1912)。
 
-为了提高使用门槛，本软件内的默认设置、UI操作不以新手友好为目标，所以使用前建议先根据你的喜好浏览调整一遍软件设置，阅读一遍[音乐播放列表机制](https://lyswhut.github.io/lx-music-doc/desktop/faq/playlist)及[可用的鼠标、键盘快捷操作](https://lyswhut.github.io/lx-music-doc/desktop/faq/hotkey)
+软件变化请查看[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)。
 
-#### Scheme URL支持
+软件下载请查看 [GitHub Releases](https://github.com/lyswhut/lx-music-desktop/releases)。
 
-从v1.17.0起支持 Scheme URL，可以使用此功能从浏览器等场景下调用LX Music，我们开发了一个[油猴脚本](https://github.com/lyswhut/lx-music-script#readme)配套使用，<br>
-脚本安装地址：<https://greasyfork.org/zh-CN/scripts/438148><br>
+使用常见问题请参阅[桌面版常见问题](https://lyswhut.github.io/lx-music-doc/desktop/faq)。
 
-若你想自己调用LX Music，可以看[Scheme URL支持](https://lyswhut.github.io/lx-music-doc/desktop/scheme-url)
+目前本项目的原始发布地址只有 [**GitHub**](https://github.com/lyswhut/lx-music-desktop/releases)，其他渠道均为第三方转载发布，与本项目无关！
 
-#### 数据同步服务
+为了提高使用门槛，本软件内的默认设置、UI 操作不以新手友好为目标，所以使用前建议先根据你的喜好浏览调整一遍软件设置，阅读一遍[音乐播放列表机制](https://lyswhut.github.io/lx-music-doc/desktop/faq/playlist)及[可用的鼠标、键盘快捷操作](https://lyswhut.github.io/lx-music-doc/desktop/faq/hotkey)。
 
-从v2.2.0起，我们发布了一个独立版的[数据同步服务](https://github.com/lyswhut/lx-music-sync-server#readme)，如果你有服务器，可以将其部署到服务器上作为私人多端同步服务使用，详情看该项目说明
+### Scheme URL 支持
 
-#### 启动参数
+从 v1.17.0 起支持 Scheme URL，可以使用此功能在浏览器等场景下调用 LX Music，我们开发了一个[油猴脚本](https://github.com/lyswhut/lx-music-script#readme)配套使用。
 
-目前软件已支持的启动参数如下：
+脚本安装地址：[LX Music 辅助脚本](https://greasyfork.org/zh-CN/scripts/438148)。
 
-- `-proxy-server` 设置代理服务器，代理应用的所有流量
-- `-proxy-bypass-list` 以分号分隔的主机列表绕过代理服务器
-- `-play` 启动时播放指定列表的音乐
-- `-search`  启动软件时自动在搜索框搜索指定的内容
-- `-dha`  禁用硬件加速启动（Disable Hardware Acceleration）
-- `-dt` 以非透明模式启动（Disable Transparent）
-- `-dhmkh` 禁用硬件媒体密钥处理（Disable Hardware Media Key Handling）
+若你想自己调用 LX Music，可以参考文档「[Scheme URL 支持](https://lyswhut.github.io/lx-music-doc/desktop/scheme-url)」部分。
 
-启动参数的详细说明请看[启动参数说明](https://lyswhut.github.io/lx-music-doc/desktop/run-params)
+### 数据同步服务
 
-#### 数据存储路径
+从 v2.2.0 起，我们发布了一个独立的[数据同步服务](https://github.com/lyswhut/lx-music-sync-server#readme)。如果你有服务器，可以将其部署到服务器上作为私人多端同步服务使用，详情看该项目说明。
+
+### 开放 API 支持
+
+从 v2.7.0 起支持开放 API 服务。启用该功能后，将会在本地启动一个 HTTP 服务，提供播放器相关的接口供第三方软件调用，详情看文档「[开放 API 服务](https://lyswhut.github.io/lx-music-doc/desktop/open-api)」部分。
+
+### 数据存储目录
 
 默认情况下，软件的数据存储在：
 
-- Windows：`%APPDATA%/lx-music-desktop`
 - Linux：`$XDG_CONFIG_HOME/lx-music-desktop` 或 `~/.config/lx-music-desktop`
 - macOS：`~/Library/Application Support/lx-music-desktop`
+- Windows：`%APPDATA%/lx-music-desktop`
 
-在Windows平台下，若程序目录下存在`portable`目录，则自动使用此目录作为数据存储目录（v1.17.0新增）。
+在 Windows 平台上，若程序文件夹中存在 `portable` 文件夹，则自动使用此文件夹作为数据存储文件夹（适用于 v1.17.0 及以上版本）。
 
-### 源码使用方法
+## 用户界面
 
-已迁移至：<https://lyswhut.github.io/lx-music-doc/desktop/use-source-code>
+<p><img width="100%" src="./doc/images/app.png" alt="lx-music desktop UI"></p>
 
-### UI界面
+## 贡献代码
 
-<p><a href="https://github.com/lyswhut/lx-music-desktop"><img width="100%" src="https://github.com/lyswhut/lx-music-desktop/blob/master/doc/images/app.png" alt="lx-music UI"></a></p>
+本项目欢迎 PR，但为了 PR 能顺利合并，需要注意以下几点：
 
-### 常见问题
-
-常见问题已移至：<https://lyswhut.github.io/lx-music-doc/desktop/faq>
-
-### 贡献代码
-
-本项目欢迎PR，但为了PR能顺利合并，需要注意以下几点：
-
-- 对于添加新功能的PR，建议在PR前先创建issue说明，以确认该功能是否确实需要
-- 对于修复Bug PR，请提供修复前后的说明及重现方式
-- 其他类型的PR则适当附上说明
+- 对于添加新功能的 PR，建议在提交 PR 前先创建 Issue 进行说明，以确认该功能是否确实需要。
+- 对于修复 bug 的 PR，请提供修复前后的说明及重现方式。
+- 对于其他类型的 PR，则适当附上说明。
 
 贡献代码步骤：
 
-1. 参照[源码使用方法](https://lyswhut.github.io/lx-music-doc/desktop/use-source-code)设置开发环境
-2. 克隆本仓库代码并切换到`dev`分支开发
-3. 提交PR至`dev`分支
+1. 参照[源码使用方法](https://lyswhut.github.io/lx-music-doc/desktop/use-source-code)设置开发环境；
+2. 克隆本仓库代码并切换至 `dev` 分支进行开发；
+3. 提交 PR 至 `dev` 分支。
 
-### 项目协议
+## 源码使用方法
+
+请参阅：<https://lyswhut.github.io/lx-music-doc/desktop/use-source-code>
+
+## 项目协议
 
 本项目基于 [Apache License 2.0](https://github.com/lyswhut/lx-music-desktop/blob/master/LICENSE) 许可证发行，以下协议是对于 Apache License 2.0 的补充，如有冲突，以以下协议为准。
 
 ---
 
-词语约定：本协议中的“本项目”指洛雪音乐桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
+*词语约定：本协议中的“本项目”指 LX Music（洛雪音乐助手）桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。*
 
-#### 一、数据来源
+### 一、数据来源
 
-1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台APP获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
+1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台 APP 获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
 
-1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“音乐来源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名字、歌手名字等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
+1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“自定义源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名、艺术家等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
 
-1.3 本项目的非官方平台数据（例如我的收藏列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
+1.3 本项目的非官方平台数据（例如“我的列表”内列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
 
-#### 二、版权数据
+### 二、版权数据
 
-2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在**24小时内**清除使用本项目的过程中所产生的版权数据。
+2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在 **24 小时内** 清除使用本项目的过程中所产生的版权数据。
 
-#### 三、音乐平台别名
+### 三、音乐平台别名
 
 3.1 本项目内的官方音乐平台别名为本项目内对官方音乐平台的一个称呼，不包含恶意。如果官方音乐平台觉得不妥，可联系本项目更改或移除。
 
-#### 四、资源使用
+### 四、资源使用
 
 4.1 本项目内使用的部分包括但不限于字体、图片等资源来源于互联网。如果出现侵权可联系本项目移除。
 
-#### 五、免责声明
+### 五、免责声明
 
 5.1 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
 
-#### 六、使用限制
+### 六、使用限制
 
 6.1 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流。本项目不对项目内的技术可能存在违反当地法律法规的行为作保证。
 
 6.2 **禁止在违反当地法律法规的情况下使用本项目。** 对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
 
-#### 七、版权保护
+### 七、版权保护
 
 7.1 音乐平台不易，请尊重版权，支持正版。
 
-#### 八、非商业性质
+### 八、非商业性质
 
 8.1 本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作及捐赠。
 
-#### 九、接受协议
+### 九、接受协议
 
-9.1 若你使用了本项目，将代表你接受本协议。
+9.1 若你使用了本项目，即代表你接受本协议。
 
 ---
 
-若对此有疑问请 mail to: lyswhut+qq.com (请将`+`替换成`@`)
+若对此有疑问请 mail to: lyswhut+qq.com (请将 `+` 替换为 `@`)

build-config/build-after-pack.js

@@ -1,9 +1,12 @@
+const { afterPack } = require('./deps')
+
 const fs = require('fs').promises
 
 // https://github.com/electron-userland/electron-builder/issues/4630
 // https://github.com/electron-userland/electron-builder/issues/4630#issuecomment-782020139
 
 module.exports = async(context) => {
+  await afterPack()
   const { electronPlatformName, appOutDir } = context
   if (electronPlatformName !== 'darwin') return
   const {

build-config/build-before-pack.js

@@ -1,79 +1,60 @@
-const fs = require('fs')
-const fsPromises = require('fs').promises
-const path = require('path')
+// const fs = require('fs')
+// const fsPromises = require('fs').promises
+// const path = require('path')
 const { Arch } = require('electron-builder')
-const nodeAbi = require('node-abi')
+// const nodeAbi = require('node-abi')
+const { beforePack, copyLib } = require('./deps')
 
-const better_sqlite3_fileNameMap = {
-  [Arch.x64]: 'linux-x64',
-  [Arch.arm64]: 'linux-arm64',
-  [Arch.armv7l]: 'linux-arm',
+// const better_sqlite3_fileNameMap = {
+//   [Arch.x64]: 'linux-x64',
+//   [Arch.arm64]: 'linux-arm64',
+//   [Arch.armv7l]: 'linux-arm',
+// }
+
+// const replaceSqliteLib = async(arch) => {
+//   // console.log(await fs.readdir(path.join(context.appOutDir, './resources/')))
+//   // if (context.electronPlatformName != 'linux' || context.arch != Arch.arm64) return
+//   // https://github.com/lyswhut/lx-music-desktop/issues/1102
+//   // https://github.com/lyswhut/lx-music-desktop/issues/1161
+//   console.log('replace sqlite lib...')
+//   const filePath = path.join(__dirname, `./lib/better_sqlite3_${better_sqlite3_fileNameMap[arch]}.node`)
+//   console.log(filePath)
+//   const targetPath = path.join(__dirname, '../node_modules/better-sqlite3/build/Release/better_sqlite3.node')
+//   await fsPromises.unlink(targetPath).catch(_ => _)
+//   await fsPromises.copyFile(filePath, targetPath)
+// }
+
+const archMap = {
+  [Arch.x64]: 'x64',
+  [Arch.ia32]: 'ia32',
+  [Arch.arm64]: 'arm64',
+  [Arch.armv7l]: 'arm',
 }
-
-const qrc_decode_fileNameMap = {
-  win32: {
-    [Arch.x64]: 'win32-x64',
-    [Arch.ia32]: 'win32-ia32',
-    [Arch.arm64]: 'win32-arm64',
-  },
-  linux: {
-    [Arch.x64]: 'linux-x64',
-    [Arch.arm64]: 'linux-arm64',
-    [Arch.armv7l]: 'linux-arm',
-  },
-  darwin: {
-    [Arch.x64]: 'darwin-x64',
-    [Arch.arm64]: 'darwin-arm64',
-  },
-}
-
-const replaceSqliteLib = async(electronNodeAbi, arch) => {
-  // console.log(await fs.readdir(path.join(context.appOutDir, './resources/')))
-  // if (context.electronPlatformName != 'linux' || context.arch != Arch.arm64) return
-  // https://github.com/lyswhut/lx-music-desktop/issues/1102
-  // https://github.com/lyswhut/lx-music-desktop/issues/1161
-  console.log('replace sqlite lib...')
-  const filePath = path.join(__dirname, `./lib/better_sqlite3_electron-v${electronNodeAbi}-${better_sqlite3_fileNameMap[arch]}.node`)
-  console.log(filePath)
-  const targetPath = path.join(__dirname, '../node_modules/better-sqlite3/build/Release/better_sqlite3.node')
-  await fsPromises.unlink(targetPath).catch(_ => _)
-  await fsPromises.copyFile(filePath, targetPath)
-}
-
-const replaceQrcDecodeLib = async(electronNodeAbi, platform, arch) => {
-  console.log('replace qrc_decode lib...', platform, electronNodeAbi, qrc_decode_fileNameMap[platform][arch])
-  const filePath = path.join(__dirname, `./lib/qrc_decode_electron-v${electronNodeAbi}-${qrc_decode_fileNameMap[platform][arch]}.node`)
-  const targetPath = path.join(__dirname, '../build/Release/qrc_decode.node')
-  const targetDir = path.dirname(targetPath)
-  if (fs.existsSync(targetDir)) await fsPromises.unlink(targetPath).catch(_ => _)
-  else await fsPromises.mkdir(targetDir, { recursive: true })
-  await fsPromises.copyFile(filePath, targetPath)
-}
-
-
 module.exports = async(context) => {
-  const { electronPlatformName, arch } = context
+  await beforePack()
+  const { arch } = context
   const electronVersion = context.packager?.info?._framework?.version ?? require('../package.json').devDependencies.electron.replace(/^[^\d]*?(\d+)/, '$1')
-  const electronNodeAbi = nodeAbi.getAbi(electronVersion, 'electron')
-  await replaceQrcDecodeLib(electronNodeAbi, electronPlatformName, arch)
-  if (electronPlatformName !== 'linux' || process.env.FORCE) return
-  const bindingFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp')
-  const bindingBakFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp.bak')
-  switch (arch) {
-    case Arch.x64:
-    case Arch.arm64:
-    case Arch.armv7l:
-      if (fs.existsSync(bindingFilePath)) {
-        // console.log('rename binding file...')
-        await fsPromises.rename(bindingFilePath, bindingBakFilePath)
-      }
-      await replaceSqliteLib(electronNodeAbi, arch)
-      break
+  await copyLib(archMap[arch], parseInt(electronVersion) == 22)
+  // const electronNodeAbi = nodeAbi.getAbi(electronVersion, 'electron')
+  // if (electronPlatformName !== 'linux' || process.env.FORCE) return
+  // // const bindingFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp')
+  // // const bindingBakFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp.bak')
+  // switch (arch) {
+  //   case Arch.x64:
+  //   case Arch.arm64:
+  //   case Arch.armv7l:
+  //     // if (fs.existsSync(bindingFilePath)) {
+  //     //   // console.log('rename binding file...')
+  //     //   await fsPromises.rename(bindingFilePath, bindingBakFilePath)
+  //     // }
+  //     await replaceSqliteLib(arch)
+  //     break
 
-    default:
-      if (fs.existsSync(bindingFilePath)) return
-      // console.log('restore binding file...')
-      await fsPromises.rename(bindingBakFilePath, bindingFilePath)
-      break
-  }
+  //   default:
+  //     // if (fs.existsSync(bindingFilePath)) return
+  //     // console.log('restore binding file...')
+  //     // await fsPromises.rename(bindingBakFilePath, bindingFilePath)
+  //     await copyLib(arch)
+  //     break
+  // }
 }

build-config/build-pack.js

@@ -10,6 +10,7 @@ const afterPack = require('./build-after-pack')
 */
 const options = {
   appId: 'cn.toside.music.desktop',
+  productName: 'lx-music-desktop',
   beforePack,
   afterPack,
   protocols: {
@@ -34,7 +35,6 @@ const options = {
     'node_modules/node-gyp-build',
     'node_modules/bufferutil',
     'node_modules/utf-8-validate',
-    'build/Release/qrc_decode.node',
     'dist/**/*',
   ],
   asar: {
@@ -65,7 +65,7 @@ const winOptions = {
     oneClick: false,
     language: '2052',
     allowToChangeInstallationDirectory: true,
-    differentialPackage: true,
+    // differentialPackage: true,
     license: './licenses/license.rtf',
     shortcutName: 'LX Music',
   },
@@ -81,12 +81,18 @@ const linuxOptions = {
     icon: './resources/icons',
     category: 'Utility;AudioVideo;Audio;Player;Music;',
     desktop: {
-      Name: 'LX Music',
-      'Name[zh_CN]': 'LX Music',
-      'Name[zh_TW]': 'LX Music',
-      Encoding: 'UTF-8',
-      MimeType: 'x-scheme-handler/lxmusic',
-      StartupNotify: 'false',
+      // https://www.electron.build/app-builder-lib.interface.linuxdesktopfile
+      // https://www.electronjs.org/docs/latest/tutorial/linux-desktop-actions
+      // https://specifications.freedesktop.org/desktop-entry-spec/latest/example.html
+      // https://developer.gnome.org/documentation/guidelines/maintainer/integrating.html#desktop-files
+      entry: {
+        Name: 'LX Music',
+        'Name[zh_CN]': 'LX Music',
+        'Name[zh_TW]': 'LX Music',
+        Encoding: 'UTF-8',
+        MimeType: 'x-scheme-handler/lxmusic',
+        StartupNotify: 'false',
+      },
     },
   },
   appImage: {
@@ -106,23 +112,22 @@ const macOptions = {
   },
   dmg: {
     window: {
-      width: 600,
-      height: 400,
+      width: 530,
+      height: 380,
     },
     contents: [
       {
-        x: 106,
-        y: 252,
-        name: 'LX Music',
+        x: 140,
+        y: 200,
       },
       {
-        x: 490,
-        y: 252,
+        x: 390,
+        y: 200,
         type: 'link',
         path: '/Applications',
       },
     ],
-    title: '洛雪音乐助手 v${version}',
+    title: 'LX Music v${version}',
   },
 }
 

build-config/css-loader.config.js

@@ -4,6 +4,7 @@ module.exports = {
   modules: {
     localIdentName: isDev ? '[path][name]__[local]--[hash:base64:5]' : '[hash:base64:5]',
     exportLocalsConvention: 'camelCase',
+    namedExport: false,
   },
   sourceMap: isDev,
 }

build-config/dependencies-patch.js

@@ -6,20 +6,28 @@ const path = require('node:path')
 const rootPath = path.join(__dirname, '../')
 
 const patchs = [
+  // [
+  //   path.join(rootPath, './node_modules/ws/package.json'),
+  //   '\n      "browser": "./browser.js",',
+  //   '',
+  // ],
+  // [
+  //   path.join(rootPath, './node_modules/music-metadata/package.json'),
+  //   '"default": "./lib/core.js"',
+  //   '"default": "./lib/index.js"',
+  // ],
+  // [
+  //   path.join(rootPath, './node_modules/strtok3/package.json'),
+  //   '"default": "./lib/core.js"',
+  //   '"default": "./lib/index.js"',
+  // ],
   [
-    path.join(rootPath, './node_modules/ws/package.json'),
-    '\n      "browser": "./browser.js",',
-    '',
-  ],
-  [
-    path.join(rootPath, './node_modules/music-metadata/package.json'),
-    '"default": "./lib/core.js"',
-    '"default": "./lib/index.js"',
-  ],
-  [
-    path.join(rootPath, './node_modules/strtok3/package.json'),
-    '"default": "./lib/core.js"',
-    '"default": "./lib/index.js"',
+    path.join(rootPath, './node_modules/better-sqlite3/package.json'),
+    `{
+    "build-release": "node-gyp clean && node-gyp rebuild --release --force_build=1",`,
+    `{
+    "install": "node -e \\"process.exit(require('fs').existsSync('build/Release/better_sqlite3.node') ? 0 : 1)\\" || node-gyp rebuild --release --force_build=1",
+    "build-release": "node-gyp clean && node-gyp rebuild --release --force_build=1",`,
   ],
 ]
 

build-config/deps.js

@@ -0,0 +1,55 @@
+const fs = require('fs')
+const path = require('path')
+const bindingFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp')
+const bindingBakFilePath = path.join(__dirname, '../node_modules/better-sqlite3/binding.gyp.bak')
+exports.beforePack = async() => {
+  if (!fs.existsSync(bindingFilePath)) return
+  fs.renameSync(bindingFilePath, bindingBakFilePath)
+  // try {
+  //   fs.writeFileSync(
+  //     bindingFilePath,
+  //     fs.readFileSync(bindingFilePath, 'utf-8').replace('\'force_build%\': 0,', '\'force_build%\': 1,'),
+  //   )
+  // } catch (error) {
+  //   console.error(error)
+  // }
+}
+exports.afterPack = async() => {
+  if (fs.existsSync(bindingFilePath)) return
+  fs.renameSync(bindingBakFilePath, bindingFilePath)
+  // try {
+  //   fs.writeFileSync(
+  //     bindingFilePath,
+  //     fs.readFileSync(bindingFilePath, 'utf-8').replace('\'force_build%\': 1,', '\'force_build%\': 0,'),
+  //   )
+  // } catch (error) {
+  //   console.error(error)
+  // }
+}
+
+
+const replaceSqliteLib = async(arch) => {
+  // console.log(await fs.readdir(path.join(context.appOutDir, './resources/')))
+  // if (context.electronPlatformName != 'linux' || context.arch != Arch.arm64) return
+  // https://github.com/lyswhut/lx-music-desktop/issues/1102
+  // https://github.com/lyswhut/lx-music-desktop/issues/1161
+  console.log('replace sqlite lib...')
+  const filePath = path.join(__dirname, `./lib/better_sqlite3_${process.platform}-${arch}.node`)
+  console.log(filePath)
+  const targetPath = path.join(__dirname, '../node_modules/better-sqlite3/build/Release/better_sqlite3.node')
+  await fs.promises.unlink(targetPath).catch(_ => _)
+  await fs.promises.copyFile(filePath, targetPath)
+}
+exports.copyLib = async(arch = process.arch, replaceLocal = false) => {
+  if (process.platform === 'linux' || replaceLocal) {
+    await replaceSqliteLib(arch)
+    return
+  }
+  const libPath = path.join(__dirname, `../node_modules/better-sqlite3/prebuilds/${process.platform}-${arch}.node`)
+  if (!fs.existsSync(libPath)) {
+    console.error(`Better-sqlite3 prebuild not found for ${process.platform}-${arch}`)
+    return
+  }
+  const targetPath = path.join(__dirname, '../node_modules/better-sqlite3/build/Release/better_sqlite3.node')
+  await fs.promises.cp(libPath, targetPath, { recursive: true, force: true })
+}

build-config/lib-update.js

@@ -9,7 +9,7 @@ const getGzipFiles = async() => {
   // for (const name of names) {
   //   if (name.endsWith('.node')) await fs.promises.unlink(path.join(libDir, name))
   // }
-  return names.filter(name => name.endsWith('.gz'))
+  return names.filter((name) => name.endsWith('.gz'))
 }
 
 const unzip = async(filePath) => {
@@ -18,23 +18,20 @@ const unzip = async(filePath) => {
   await fs.promises.mkdir(targetDir)
   await tar.x({
     file: filePath,
-    strip: 1,
+    strip: 0,
     C: targetDir,
   })
   return targetDir
 }
 
-const files = [
-  'qrc_decode',
-  'better_sqlite3',
-]
+const files = ['better_sqlite3']
 const moveFile = async(filePath) => {
-  const name = 'electron-' + path.basename(filePath).split('-electron-')[1]
+  const name = `${path.basename(filePath).split('_v')[0].replace('_', '-')}`
   for (const fileName of files) {
-    if (fileName == 'better_sqlite3' && !name.includes('linux')) continue
+    // if (fileName == 'better_sqlite3' && !name.includes('linux')) continue
     const targetPath = path.join(libDir, `${fileName}_${name}.node`)
     if (fs.existsSync(targetPath)) await fs.promises.unlink(targetPath)
-    await fs.promises.rename(path.join(filePath, 'Release', fileName + '.node'), targetPath)
+    await fs.promises.rename(path.join(filePath, `${fileName}.node`), targetPath)
   }
   await fs.promises.rm(filePath, { recursive: true })
 }
@@ -50,4 +47,3 @@ const run = async() => {
 }
 
 run()
-

build-config/main/webpack.config.base.js

@@ -1,8 +1,6 @@
 const path = require('path')
 const ESLintPlugin = require('eslint-webpack-plugin')
 
-const isDev = process.env.NODE_ENV === 'development'
-
 module.exports = {
   target: 'electron-main',
   output: {
@@ -18,7 +16,6 @@ module.exports = {
     'electron-font-manager': 'electron-font-manager',
     bufferutil: 'bufferutil',
     'utf-8-validate': 'utf-8-validate',
-    'qrc_decode.node': isDev ? path.join(__dirname, '../../build/Release/qrc_decode.node') : path.join('../build/Release/qrc_decode.node'),
   },
   resolve: {
     alias: {

build-config/main/webpack.config.prod.js

@@ -7,12 +7,12 @@ const baseConfig = require('./webpack.config.base')
 
 // const { dependencies } = require('../../package.json')
 
-const buildConfig = require('../webpack-build-config')
+// const buildConfig = require('../webpack-build-config')
 
 
 module.exports = merge(baseConfig, {
   mode: 'production',
-  devtool: 'source-map',
+  devtool: false,
   entry: {
     main: path.join(__dirname, '../../src/main/index.ts'),
     // 'dbService.worker': path.join(__dirname, '../../src/main/worker/dbService/index.ts'),
@@ -37,6 +37,7 @@ module.exports = merge(baseConfig, {
     new webpack.DefinePlugin({
       'process.env': {
         NODE_ENV: '"production"',
+        BUILD_WIN7: `'${process.env.BUILD_WIN7}'`,
       },
     }),
   ],
@@ -45,6 +46,6 @@ module.exports = merge(baseConfig, {
     maxAssetSize: 1024 * 1024 * 20,
   },
   optimization: {
-    minimize: buildConfig.minimize,
+    minimize: false,
   },
 })

build-config/postinstall.js

@@ -0,0 +1,3 @@
+const { copyLib } = require('./deps')
+
+copyLib()

build-config/renderer-lyric/webpack.config.prod.js

@@ -19,15 +19,6 @@ module.exports = merge(baseConfig, {
   externals: [
     // ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {

build-config/renderer-scripts/webpack.config.prod.js

@@ -18,15 +18,6 @@ module.exports = merge(baseConfig, {
   externals: [
     // ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
   plugins: [
     new webpack.DefinePlugin({
       'process.env': {

build-config/renderer/webpack.config.dev.js

@@ -5,6 +5,11 @@ const { merge } = require('webpack-merge')
 
 const baseConfig = require('./webpack.config.base')
 
+const gitInfo = {
+  commit_id: '',
+  commit_date: '',
+}
+
 module.exports = merge(baseConfig, {
   mode: 'development',
   devtool: 'eval-source-map',
@@ -18,6 +23,8 @@ module.exports = merge(baseConfig, {
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
       __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
+      COMMIT_ID: `"${gitInfo.commit_id}"`,
+      COMMIT_DATE: `"${gitInfo.commit_date}"`,
       staticPath: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
     }),
   ],

build-config/renderer/webpack.config.prod.js

@@ -1,4 +1,5 @@
 const path = require('path')
+const { execSync } = require('child_process')
 const webpack = require('webpack')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 const TerserPlugin = require('terser-webpack-plugin')
@@ -12,6 +13,25 @@ const buildConfig = require('../webpack-build-config')
 
 // let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n']
 
+const gitInfo = {
+  commit_id: '',
+  commit_date: '',
+}
+
+try {
+  let isClean = !execSync('git status --porcelain').toString().trim()
+  if (process.env.BUILD_WIN7) {
+    console.warn('BUILD_WIN7 is set, skipping git status check.')
+    console.log('Workspace status:', execSync('git status --porcelain').toString().trim())
+    isClean = true
+  }
+  if (isClean) {
+    gitInfo.commit_id = execSync('git log -1 --pretty=format:"%H"').toString().trim()
+    gitInfo.commit_date = execSync('git log -1 --pretty=format:"%ad" --date=iso-strict').toString().trim()
+  } else if (process.env.IS_CI) {
+    throw new Error('Working directory is not clean')
+  }
+} catch {}
 
 module.exports = merge(baseConfig, {
   mode: 'production',
@@ -19,15 +39,6 @@ module.exports = merge(baseConfig, {
   externals: [
     // ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
   plugins: [
     new CopyWebpackPlugin({
       patterns: [
@@ -45,6 +56,8 @@ module.exports = merge(baseConfig, {
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
       __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
+      COMMIT_ID: `"${gitInfo.commit_id}"`,
+      COMMIT_DATE: `"${gitInfo.commit_date}"`,
     }),
   ],
   optimization: {

build-config/runner-dev.js

@@ -16,9 +16,10 @@ const rendererLyricConfig = require('./renderer-lyric/webpack.config.dev')
 const rendererScriptConfig = require('./renderer-scripts/webpack.config.dev')
 const { Arch } = require('electron-builder')
 const replaceLib = require('./build-before-pack')
+const treeKill = require('tree-kill')
+const { debounce } = require('./utils')
 
 let electronProcess = null
-let manualRestart = false
 let hotMiddlewareRenderer
 let hotMiddlewareRendererLyric
 
@@ -60,7 +61,9 @@ function startRenderer() {
       },
       setupMiddlewares(middlewares, devServer) {
         devServer.app.use(hotMiddlewareRenderer)
-        devServer.middleware.waitUntilValid(resolve)
+        setImmediate(() => {
+          devServer.middleware.waitUntilValid(resolve)
+        })
 
         return middlewares
       },
@@ -106,7 +109,9 @@ function startRendererLyric() {
       },
       setupMiddlewares(middlewares, devServer) {
         devServer.app.use(hotMiddlewareRenderer)
-        devServer.middleware.waitUntilValid(resolve)
+        setImmediate(() => {
+          devServer.middleware.waitUntilValid(resolve)
+        })
         return middlewares
       },
     }, compiler)
@@ -132,9 +137,11 @@ function startRendererScripts() {
 }
 
 function startMain() {
+  let firstRun = true
   return new Promise((resolve, reject) => {
     // mainConfig.entry.main = [path.join(__dirname, '../src/main/index.dev.js')].concat(mainConfig.entry.main)
     // mainConfig.mode = 'development'
+    const runElectronDelay = debounce(startElectron, 200)
     const compiler = webpack(mainConfig)
 
     compiler.hooks.watchRun.tapAsync('watch-run', (compilation, done) => {
@@ -146,23 +153,19 @@ function startMain() {
     compiler.watch({}, (err, stats) => {
       if (err) {
         console.log(err)
+        reject(err)
         return
       }
 
       // logStats('Main', stats)
-
-      if (electronProcess && electronProcess.kill) {
-        manualRestart = true
-        process.kill(electronProcess.pid)
-        electronProcess = null
-        startElectron()
-
-        setTimeout(() => {
-          manualRestart = false
-        }, 5000)
+      if (electronProcess) {
+        electronProcess.removeAllListeners()
+        treeKill(electronProcess.pid)
       }
-
-      resolve()
+      if (firstRun) {
+        firstRun = false
+        resolve()
+      } else runElectronDelay()
     })
   })
 }
@@ -191,7 +194,7 @@ function startElectron() {
   })
 
   electronProcess.on('close', () => {
-    if (!manualRestart) process.exit()
+    process.exit()
   })
 }
 

build-config/utils.js

@@ -31,7 +31,12 @@ exports.mergeCSSLoader = beforeLoader => {
             esModule: false,
           },
         },
-        'css-loader',
+        {
+          loader: 'css-loader',
+          options: {
+            esModule: false,
+          },
+        },
         'postcss-loader',
       ],
     },
@@ -63,3 +68,15 @@ exports.logStats = (proc, data) => {
   console.log(log)
 }
 
+exports.debounce = (fn, delay = 100) => {
+  let timer = null
+  let _args
+  return (...args) => {
+    _args = args
+    if (timer) clearTimeout(timer)
+    timer = setTimeout(() => {
+      timer = null
+      fn(..._args)
+    }, delay)
+  }
+}

jsconfig.json

@@ -1,12 +1,12 @@
 {
   "compilerOptions": {
-    "baseUrl": "./",
+    "rootDir": "./",
     "paths": {
-      "@main/*": ["src/main/*"],
-      "@renderer/*": ["src/renderer/*"],
-      "@lyric/*": ["src/renderer-lyric/*"],
-      "@static/*": ["src/static/*"],
-      "@common/*": ["src/common/*"],
+      "@main/*": ["./src/main/*"],
+      "@renderer/*": ["./src/renderer/*"],
+      "@lyric/*": ["./src/renderer-lyric/*"],
+      "@static/*": ["./src/static/*"],
+      "@common/*": ["./src/common/*"],
     }
   },
   "vueCompilerOptions": {

licenses/license.rtf

@@ -1,16 +1,19 @@
 {\rtf1\adeflang1025\ansi\ansicpg936\uc2\adeff0\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi0\deflang1033\deflangfe2052\themelang1033\themelangfe2052\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f2\fbidi \fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New;}
 {\f13\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'cb\'ce\'cc\'e5{\*\falt SimSun};}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
-{\f44\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@\'cb\'ce\'cc\'e5;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\f36\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'b5\'c8\'cf\'df{\*\falt DengXian};}{\f44\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@\'cb\'ce\'cc\'e5;}
+{\f45\fbidi \fnil\fcharset134\fprq2{\*\panose 00000000000000000000}@\'b5\'c8\'cf\'df;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\fdbmajor\f31501\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'b5\'c8\'cf\'df Light;}{\fhimajor\f31502\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'b5\'c8\'cf\'df Light;}
 {\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
 {\fdbminor\f31505\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'b5\'c8\'cf\'df{\*\falt DengXian};}{\fhiminor\f31506\fbidi \fnil\fcharset134\fprq2{\*\panose 02010600030101010101}\'b5\'c8\'cf\'df{\*\falt DengXian};}
-{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f45\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f46\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\f48\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f49\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f50\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f51\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\f52\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f53\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f65\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f66\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
-{\f68\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f69\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f70\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f71\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
-{\f72\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f73\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f177\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt SimSun};}{\f385\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
-{\f386\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f388\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f389\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f392\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
-{\f393\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f487\fbidi \fnil\fcharset0\fprq2 @SimSun Western;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f46\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f47\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f49\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f50\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f51\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f52\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f53\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f54\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f66\fbidi \fmodern\fcharset238\fprq1 Courier New CE;}{\f67\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}
+{\f69\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f70\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f71\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}{\f72\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}
+{\f73\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f74\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f178\fbidi \fnil\fcharset0\fprq2 SimSun Western{\*\falt SimSun};}{\f386\fbidi \froman\fcharset238\fprq2 Cambria Math CE;}
+{\f387\fbidi \froman\fcharset204\fprq2 Cambria Math Cyr;}{\f389\fbidi \froman\fcharset161\fprq2 Cambria Math Greek;}{\f390\fbidi \froman\fcharset162\fprq2 Cambria Math Tur;}{\f393\fbidi \froman\fcharset186\fprq2 Cambria Math Baltic;}
+{\f394\fbidi \froman\fcharset163\fprq2 Cambria Math (Vietnamese);}{\f408\fbidi \fnil\fcharset0\fprq2 DengXian Western{\*\falt DengXian};}{\f406\fbidi \fnil\fcharset238\fprq2 DengXian CE{\*\falt DengXian};}
+{\f407\fbidi \fnil\fcharset204\fprq2 DengXian Cyr{\*\falt DengXian};}{\f409\fbidi \fnil\fcharset161\fprq2 DengXian Greek{\*\falt DengXian};}{\f488\fbidi \fnil\fcharset0\fprq2 @SimSun Western;}{\f498\fbidi \fnil\fcharset0\fprq2 @DengXian Western;}
+{\f496\fbidi \fnil\fcharset238\fprq2 @DengXian CE;}{\f497\fbidi \fnil\fcharset204\fprq2 @DengXian Cyr;}{\f499\fbidi \fnil\fcharset161\fprq2 @DengXian Greek;}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
 {\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
 {\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
 {\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31520\fbidi \fnil\fcharset0\fprq2 DengXian Light Western;}{\fdbmajor\f31518\fbidi \fnil\fcharset238\fprq2 DengXian Light CE;}
@@ -38,12 +41,12 @@
 \fs21\lang1033\langfe2052\kerning2\loch\f31505\hich\af2\dbch\af31505\cgrid\langnp1033\langfenp2052 \sbasedon0 \snext15 \slink16 \sunhideused Plain Text;}{\*\cs16 \additive \rtlch\fcs1 \af2 \ltrch\fcs0 \loch\f31505\hich\af2 \sbasedon10 \slink15 \slocked 
 \'b4\'bf\'ce\'c4\'b1\'be \'d7\'d6\'b7\'fb;}{\*\cs17 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf19 \sbasedon10 \sunhideused \styrsid9533173 Hyperlink;}{\*\cs18 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \cf20\chshdng0\chcfpat0\chcbpat21 
 \sbasedon10 \ssemihidden \sunhideused \styrsid9533173 Unresolved Mention;}{\*\cs19 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf22 \sbasedon10 \ssemihidden \sunhideused \styrsid9533173 FollowedHyperlink;}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}
-{\*\rsidtbl \rsid927107\rsid1398824\rsid2109456\rsid3758332\rsid3950508\rsid4133944\rsid4355753\rsid9533173\rsid10447395\rsid11081282\rsid12910709\rsid13643782\rsid14384001\rsid14511311\rsid15226681}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0
-\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author lysyw}{\operator lysyw}{\creatim\yr2019\mo8\dy17\hr10\min22}{\revtim\yr2023\mo10\dy5\hr14\min42}{\version10}{\edmins4}{\nofpages1}{\nofwords193}{\nofchars1105}
-{\nofcharsws1296}{\vern77}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl2253\margr2253\margt1440\margb1440\gutter0\ltrsect 
+{\*\rsidtbl \rsid927107\rsid1398824\rsid2109456\rsid2766548\rsid3758332\rsid3950508\rsid4133944\rsid4355753\rsid9533173\rsid10447395\rsid11081282\rsid12910709\rsid13643782\rsid14384001\rsid14511311\rsid15225067\rsid15226681}{\mmathPr\mmathFont34\mbrkBin0
+\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\author lysyw}{\operator lysyw}{\creatim\yr2019\mo8\dy17\hr10\min22}{\revtim\yr2025\mo2\dy22\hr15\min34}{\version12}{\edmins5}{\nofpages2}
+{\nofwords195}{\nofchars1117}{\nofcharsws1310}{\vern77}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}}\paperw11906\paperh16838\margl2253\margr2253\margt1440\margb1440\gutter0\ltrsect 
 \deftab420\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont1\relyonvml0\donotembedlingdata0\grfdocevents0\validatexml1\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors1\formshade\horzdoc\dgmargin\dghspace180\dgvspace156
-\dghorigin450\dgvorigin0\dghshow0\dgvshow2\jcompress\lnongrid
-\viewkind5\viewscale100\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot3950508\newtblstyruls
+\dghorigin2253\dgvorigin1440\dghshow0\dgvshow2\jcompress\lnongrid
+\viewkind1\viewscale100\splytwnine\ftnlytwnine\htmautsp\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct\asianbrkrule\rsidroot3950508\newtblstyruls
 \nogrowautofit\usenormstyforlist\noindnmbrts\felnbrelev\nocxsptable\indrlsweleven\noafcnsttbl\afelev\utinl\hwelev\spltpgpar\notcvasp\notbrkcnstfrctbl\notvatxbx\krnprsnet\cachedcolbal \nouicompat {\upr{\*\fchars 
 !%),.:\'3b>?]\'7d\'a1\'e9\'a1\'a7\'a1\'e3\'a1\'a4\'a1\'a6\'a1\'a5\'a8\'44\'a1\'ac\'a1\'af\'a1\'b1\'a1\'ad\'a1\'eb\'a1\'e4\'a1\'e5?\'a1\'e6\'a1\'c3\'a1\'a2\'a1\'a3\'a1\'a8\'a1\'b5\'a1\'b7\'a1\'b9\'a1\'bb\'a1\'bf\'a1\'b3\'a1\'bd\'a8\'95\'a6\'e1\'a6\'e3\'a6\'e7\'a6\'e5\'a6\'eb\'a9\'77\'a9\'79\'a9\'7b\'a3\'a1\'a3\'a2\'a3\'a5\'a3\'a7\'a3\'a9\'a3\'ac\'a3\'ae\'a3\'ba\'a3\'bb\'a3\'bf\'a3\'dd\'a3\'e0\'a3\'fc\'a3\'fd\'a1\'ab\'a1\'e9
 }{\*\ud\uc0{\*\fchars 
@@ -53,122 +56,128 @@ $([\'7b{\uc2\u163 \'a1\'ea\u165 \'a3\'a4\'a1\'a4\'a1\'ae\'a1\'b0\'a1\'b4\'a1\'b6
 \ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\headery851\footery992\colsx425\endnhere\sectlinegrid312\sectspecifyl\sectrsid2109456\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta \dbch .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang
 {\pntxta \dbch .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta \dbch .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta \dbch )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl6
 \pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}{\*\pnseclvl9
-\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\s15\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14511311 \rtlch\fcs1 \af2\afs22\alang1025 \ltrch\fcs0 
-\fs21\lang1033\langfe2052\kerning2\loch\af31505\hich\af2\dbch\af31505\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf
-\'bb\'f9\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13  Apache License 2.0 }{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d0\'ed\'bf\'c9\'d6\'a4\'b7\'a2\'d0\'d0\'a3\'ac\'d2\'d4\'cf\'c2\'d0\'ad\'d2\'e9\'ca\'c7\'b6\'d4\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13  Apache License 2.0 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b5\'c4
-\'b2\'b9\'b3\'e4\'a3\'ac\'c8\'e7\'d3\'d0\'b3\'e5\'cd\'bb\'a3\'ac\'d2\'d4\'d2\'d4\'cf\'c2\'d0\'ad\'d2\'e9\'ce\'aa\'d7\'bc\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid2766548 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 
+\fs21\lang1033\langfe2052\kerning2\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp1033\langfenp2052 {\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf
+\'bb\'f9\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13  Apache License 2.0 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\loch\af13\hich\af13\dbch\f13 \'d0\'ed\'bf\'c9\'d6\'a4\'b7\'a2\'d0\'d0\'a3\'ac\'d2\'d4\'cf\'c2\'d0\'ad\'d2\'e9\'ca\'c7\'b6\'d4\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\hich\af13\dbch\af13\loch\f13  Apache License 2.0 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b5\'c4\'b2\'b9\'b3\'e4\'a3\'ac\'c8\'e7\'d3\'d0\'b3\'e5\'cd\'bb\'a3\'ac\'d2\'d4
+\'d2\'d4\'cf\'c2\'d0\'ad\'d2\'e9\'ce\'aa\'d7\'bc\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b4\'ca\'d3\'ef\'d4\'bc\'b6\'a8\'a3\'ba\'b1\'be\'d0\'ad\'d2\'e9\'d6\'d0\'b5\'c4\'a1\'b0\'b1\'be\'cf\'ee\'c4\'bf\'a1\'b1\'d6\'b8
-\'c2\'e5\'d1\'a9\'d2\'f4\'c0\'d6\'d7\'c0\'c3\'e6\'b0\'e6\'cf\'ee\'c4\'bf\'a3\'bb\'a1\'b0\'ca\'b9\'d3\'c3\'d5\'df\'a1\'b1\'d6\'b8\'c7\'a9\'ca\'f0\'b1\'be\'d0\'ad\'d2\'e9\'b5\'c4\'ca\'b9\'d3\'c3\'d5\'df\'a3\'bb\'a1\'b0\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6
-\'c6\'bd\'cc\'a8\'a1\'b1\'d6\'b8\'b6\'d4\'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'d6\'c3\'b5\'c4\'b0\'fc\'c0\'a8\'bf\'e1\'ce\'d2\'a1\'a2\'bf\'e1\'b9\'b7\'a1\'a2\'df\'e4\'b9\'be\'b5\'c8\'d2\'f4\'c0\'d6\'d4\'b4\'b5\'c4\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'cd\'b3
-\'b3\'c6\'a3\'bb\'a1\'b0\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a1\'b1\'d6\'b8\'b0\'fc\'c0\'a8\'b5\'ab\'b2\'bb\'cf\'de\'d3\'da\'cd\'bc\'cf\'f1\'a1\'a2\'d2\'f4\'c6\'b5\'a1\'a2\'c3\'fb\'d7\'d6\'b5\'c8\'d4\'da\'c4\'da\'b5\'c4\'cb\'fb\'c8\'cb\'d3\'b5\'d3\'d0
-\'cb\'f9\'ca\'f4\'b0\'e6\'c8\'a8\'b5\'c4\'ca\'fd\'be\'dd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b4\'ca\'d3\'ef\'d4\'bc\'b6\'a8\'a3\'ba\'b1\'be\'d0\'ad\'d2\'e9\'d6\'d0\'b5\'c4\'a1\'b0\'b1\'be\'cf\'ee\'c4\'bf\'a1\'b1\'d6\'b8}{
+\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13  LX Music }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\loch\af13\hich\af13\dbch\f13 \'d7\'c0\'c3\'e6\'b0\'e6\'cf\'ee\'c4\'bf\'a3\'bb}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'ca\'b9\'d3\'c3\'d5\'df}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 
+\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d6\'b8\'c7\'a9\'ca\'f0\'b1\'be\'d0\'ad\'d2\'e9\'b5\'c4\'ca\'b9\'d3\'c3\'d5\'df\'a3\'bb}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8}{
+\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d6\'b8\'b6\'d4\'b1\'be
+\'cf\'ee\'c4\'bf\'c4\'da\'d6\'c3\'b5\'c4\'b0\'fc\'c0\'a8\'bf\'e1\'ce\'d2\'a1\'a2\'bf\'e1\'b9\'b7\'a1\'a2\'df\'e4\'b9\'be\'b5\'c8\'d2\'f4\'c0\'d6\'d4\'b4\'b5\'c4\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'cd\'b3\'b3\'c6\'a3\'bb}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd}{\rtlch\fcs1 \af13 
+\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d6\'b8\'b0\'fc\'c0\'a8\'b5\'ab\'b2\'bb
+\'cf\'de\'d3\'da\'cd\'bc\'cf\'f1\'a1\'a2\'d2\'f4\'c6\'b5\'a1\'a2\'c3\'fb\'d7\'d6\'b5\'c8\'d4\'da\'c4\'da\'b5\'c4\'cb\'fb\'c8\'cb\'d3\'b5\'d3\'d0\'cb\'f9\'ca\'f4\'b0\'e6\'c8\'a8\'b5\'c4\'ca\'fd\'be\'dd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d2\'bb\'a1\'a2\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d2\'bb\'a1\'a2\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 1.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b8\'f7\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'d4\'da\'cf\'df
-\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4\'d4\'ad\'c0\'ed\'ca\'c7\'b4\'d3\'c6\'e4\'b9\'ab\'bf\'aa\'b7\'fe\'ce\'f1\'c6\'f7\'d6\'d0\'c0\'ad\'c8\'a1\'ca\'fd\'be\'dd\'a3\'a8\'d3\'eb\'ce\'b4\'b5\'c7\'c2\'bc\'d7\'b4\'cc\'ac\'d4\'da\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13 APP}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 
-\'bb\'f1\'c8\'a1\'b5\'c4\'ca\'fd\'be\'dd\'cf\'e0\'cd\'ac\'a3\'a9\'a3\'ac\'be\'ad\'b9\'fd\'b6\'d4\'ca\'fd\'be\'dd\'bc\'f2\'b5\'a5\'b5\'d8\'c9\'b8\'d1\'a1\'d3\'eb\'ba\'cf\'b2\'a2\'ba\'f3\'bd\'f8\'d0\'d0\'d5\'b9\'ca\'be\'a3\'ac\'d2\'f2\'b4\'cb\'b1\'be
-\'cf\'ee\'c4\'bf\'b2\'bb\'b6\'d4\'ca\'fd\'be\'dd\'b5\'c4\'ba\'cf\'b7\'a8\'d0\'d4\'a1\'a2\'d7\'bc\'c8\'b7\'d0\'d4\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
-\par \hich\af13\dbch\af13\loch\f13 1.2 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b1\'be\'c9\'ed\'c3\'bb\'d3\'d0\'bb\'f1\'c8\'a1\'c4\'b3\'b8\'f6
-\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'b5\'c4\'c4\'dc\'c1\'a6\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'ca\'b9\'d3\'c3\'b5\'c4\'d4\'da\'cf\'df\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4\'c0\'b4\'d7\'d4\'c8\'ed\'bc\'fe\'c9\'e8\'d6\'c3\'c4\'da}{\rtlch\fcs1 \af13 
-\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d2\'f4\'c0\'d6\'c0\'b4\'d4\'b4}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'c9\'e8\'d6\'c3
-\'cb\'f9\'d1\'a1\'d4\'f1\'b5\'c4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
-\loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 1.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b8\'f7\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'d4\'da\'cf\'df\'ca\'fd
+\'be\'dd\'c0\'b4\'d4\'b4\'d4\'ad\'c0\'ed\'ca\'c7\'b4\'d3\'c6\'e4\'b9\'ab\'bf\'aa\'b7\'fe\'ce\'f1\'c6\'f7\'d6\'d0\'c0\'ad\'c8\'a1\'ca\'fd\'be\'dd\'a3\'a8\'d3\'eb\'ce\'b4\'b5\'c7\'c2\'bc\'d7\'b4\'cc\'ac\'d4\'da\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8}{\rtlch\fcs1 
+\af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13  APP }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'bb\'f1\'c8\'a1
+\'b5\'c4\'ca\'fd\'be\'dd\'cf\'e0\'cd\'ac\'a3\'a9\'a3\'ac\'be\'ad\'b9\'fd\'b6\'d4\'ca\'fd\'be\'dd\'bc\'f2\'b5\'a5\'b5\'d8\'c9\'b8\'d1\'a1\'d3\'eb\'ba\'cf\'b2\'a2\'ba\'f3\'bd\'f8\'d0\'d0\'d5\'b9\'ca\'be\'a3\'ac\'d2\'f2\'b4\'cb\'b1\'be\'cf\'ee\'c4\'bf
+\'b2\'bb\'b6\'d4\'ca\'fd\'be\'dd\'b5\'c4\'ba\'cf\'b7\'a8\'d0\'d4\'a1\'a2\'d7\'bc\'c8\'b7\'d0\'d4\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\par 
+\par \hich\af13\dbch\af13\loch\f13 1.2 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b1\'be\'c9\'ed\'c3\'bb\'d3\'d0\'bb\'f1\'c8\'a1\'c4\'b3\'b8\'f6\'d2\'f4
+\'c6\'b5\'ca\'fd\'be\'dd\'b5\'c4\'c4\'dc\'c1\'a6\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'ca\'b9\'d3\'c3\'b5\'c4\'d4\'da\'cf\'df\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4\'c0\'b4\'d7\'d4\'c8\'ed\'bc\'fe\'c9\'e8\'d6\'c3\'c4\'da}{\rtlch\fcs1 \af13 
+\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d7\'d4\'b6\'a8\'d2\'e5\'d4\'b4}{
+\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c9\'e8\'d6\'c3\'cb\'f9
+\'d1\'a1\'d4\'f1\'b5\'c4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \loch\af13\hich\af13\dbch\f13 \'b7\'b5\'bb\'d8\'b5\'c4\'d4\'da\'cf\'df\'c1\'b4\'bd\'d3\'a1\'a3\'c0\'fd\'c8\'e7\'b2\'a5\'b7\'c5\'c4\'b3\'ca\'d7\'b8\'e8\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'cb\'f9\'d7\'f6\'b5\'c4\'d6\'bb\'ca\'c7\'bd\'ab\'cf\'a3\'cd\'fb\'b2\'a5
-\'b7\'c5\'b5\'c4\'b8\'e8\'c7\'fa\'c3\'fb\'d7\'d6\'a1\'a2\'b8\'e8\'ca\'d6\'c3\'fb\'d7\'d6\'b5\'c8\'d0\'c5\'cf\'a2\'b4\'ab\'b5\'dd\'b8\'f8}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8220\'a1\'b0}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8221\'a1\'b1}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'a3\'ac\'c8\'f4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8220\'a1\'b0}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \u8221\'a1\'b1}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b7\'b5\'bb\'d8\'c1\'cb\'d2\'bb\'b8\'f6\'c1\'b4\'bd\'d3\'a3\'ac\'d4\'f2\'b1\'be\'cf\'ee\'c4\'bf\'bd\'ab\'c8\'cf\'ce\'aa\'d5\'e2
-\'be\'cd\'ca\'c7\'b8\'c3\'b8\'e8\'c7\'fa\'b5\'c4\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'b6\'f8\'bd\'f8\'d0\'d0\'ca\'b9\'d3\'c3\'a3\'ac\'d6\'c1\'d3\'da\'d5\'e2\'ca\'c7\'b2\'bb\'ca\'c7\'d5\'fd\'c8\'b7\'b5\'c4\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'b1\'be\'cf\'ee
-\'c4\'bf\'ce\'de\'b7\'a8\'d0\'a3\'d1\'e9\'c6\'e4\'d7\'bc\'c8\'b7\'d0\'d4\'a3\'ac\'cb\'f9\'d2\'d4\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc\'d6\'d0\'bf\'c9\'c4\'dc\'bb\'e1\'b3\'f6\'cf\'d6\'cf\'a3\'cd\'fb\'b2\'a5\'b7\'c5\'b5\'c4
-\'d2\'f4\'c6\'b5\'d3\'eb\'ca\'b5\'bc\'ca\'b2\'a5\'b7\'c5\'b5\'c4\'d2\'f4\'c6\'b5\'b2\'bb\'b6\'d4\'d3\'a6\'bb\'f2\'d5\'df\'ce\'de\'b7\'a8\'b2\'a5\'b7\'c5\'b5\'c4\'ce\'ca\'cc\'e2\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
-\par \hich\af13\dbch\af13\loch\f13 1.3 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b7\'c7\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'ca\'fd\'be\'dd
-\'a3\'a8\'c0\'fd\'c8\'e7\'ce\'d2\'b5\'c4\'ca\'d5\'b2\'d8\'c1\'d0\'b1\'ed\'a3\'a9\'c0\'b4\'d7\'d4\'ca\'b9\'d3\'c3\'d5\'df\'b1\'be\'b5\'d8\'cf\'b5\'cd\'b3\'bb\'f2\'d5\'df\'ca\'b9\'d3\'c3\'d5\'df\'c1\'ac\'bd\'d3\'b5\'c4\'cd\'ac\'b2\'bd\'b7\'fe\'ce\'f1
-\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'b2\'bb\'b6\'d4\'d5\'e2\'d0\'a9\'ca\'fd\'be\'dd\'b5\'c4\'ba\'cf\'b7\'a8\'d0\'d4\'a1\'a2\'d7\'bc\'c8\'b7\'d0\'d4\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\'b7\'c5\'b5\'c4\'b8\'e8\'c7\'fa\'c3\'fb\'a1\'a2\'d2\'d5\'ca\'f5\'bc\'d2\'b5\'c8\'d0\'c5\'cf\'a2\'b4\'ab\'b5\'dd\'b8\'f8}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 
+\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'a3\'ac\'c8\'f4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d4\'b4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b7\'b5\'bb\'d8\'c1\'cb\'d2\'bb\'b8\'f6\'c1\'b4\'bd\'d3\'a3\'ac\'d4\'f2\'b1\'be\'cf\'ee\'c4\'bf\'bd\'ab\'c8\'cf\'ce\'aa\'d5\'e2\'be\'cd\'ca\'c7\'b8\'c3\'b8\'e8
+\'c7\'fa\'b5\'c4\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'b6\'f8\'bd\'f8\'d0\'d0\'ca\'b9\'d3\'c3\'a3\'ac\'d6\'c1\'d3\'da\'d5\'e2\'ca\'c7\'b2\'bb\'ca\'c7\'d5\'fd\'c8\'b7\'b5\'c4\'d2\'f4\'c6\'b5\'ca\'fd\'be\'dd\'b1\'be\'cf\'ee\'c4\'bf\'ce\'de\'b7\'a8\'d0\'a3
+\'d1\'e9\'c6\'e4\'d7\'bc\'c8\'b7\'d0\'d4\'a3\'ac\'cb\'f9\'d2\'d4\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc\'d6\'d0\'bf\'c9\'c4\'dc\'bb\'e1\'b3\'f6\'cf\'d6\'cf\'a3\'cd\'fb\'b2\'a5\'b7\'c5\'b5\'c4\'d2\'f4\'c6\'b5\'d3\'eb\'ca\'b5
+\'bc\'ca\'b2\'a5\'b7\'c5\'b5\'c4\'d2\'f4\'c6\'b5\'b2\'bb\'b6\'d4\'d3\'a6\'bb\'f2\'d5\'df\'ce\'de\'b7\'a8\'b2\'a5\'b7\'c5\'b5\'c4\'ce\'ca\'cc\'e2\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b6\'fe\'a1\'a2\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 1.3 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b7\'c7\'b9\'d9\'b7\'bd\'c6\'bd\'cc\'a8\'ca\'fd\'be\'dd\'a3\'a8
+\'c0\'fd\'c8\'e7}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8220\'a1\'b0}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 
+\'ce\'d2\'b5\'c4\'c1\'d0\'b1\'ed}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \u8221\'a1\'b1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\loch\af13\hich\af13\dbch\f13 \'c4\'da\'c1\'d0\'b1\'ed\'a3\'a9\'c0\'b4\'d7\'d4\'ca\'b9\'d3\'c3\'d5\'df\'b1\'be\'b5\'d8\'cf\'b5\'cd\'b3\'bb\'f2\'d5\'df\'ca\'b9\'d3\'c3\'d5\'df\'c1\'ac\'bd\'d3\'b5\'c4\'cd\'ac\'b2\'bd\'b7\'fe\'ce\'f1\'a3\'ac\'b1\'be\'cf\'ee
+\'c4\'bf\'b2\'bb\'b6\'d4\'d5\'e2\'d0\'a9\'ca\'fd\'be\'dd\'b5\'c4\'ba\'cf\'b7\'a8\'d0\'d4\'a1\'a2\'d7\'bc\'c8\'b7\'d0\'d4\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 2.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc\'d6\'d0\'bf\'c9\'c4\'dc
-\'bb\'e1\'b2\'fa\'c9\'fa\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a1\'a3\'b6\'d4\'d3\'da\'d5\'e2\'d0\'a9\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'b2\'bb\'d3\'b5\'d3\'d0\'cb\'fc\'c3\'c7\'b5\'c4\'cb\'f9\'d3\'d0\'c8\'a8\'a1\'a3\'ce\'aa
-\'c1\'cb\'b1\'dc\'c3\'e2\'c7\'d6\'c8\'a8\'a3\'ac\'ca\'b9\'d3\'c3\'d5\'df\'ce\'f1\'b1\'d8\'d4\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13 **24}{\rtlch\fcs1 \af13 
-\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d0\'a1\'ca\'b1\'c4\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
-\hich\af13\dbch\af13\loch\f13 **}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'c7\'e5\'b3\'fd\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc\'d6\'d0\'cb\'f9
-\'b2\'fa\'c9\'fa\'b5\'c4\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b6\'fe\'a1\'a2\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'c8\'fd\'a1\'a2\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b1\'f0\'c3\'fb}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 2\hich\af13\dbch\af13\loch\f13 .1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc
+\'d6\'d0\'bf\'c9\'c4\'dc\'bb\'e1\'b2\'fa\'c9\'fa\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a1\'a3\'b6\'d4\'d3\'da\'d5\'e2\'d0\'a9\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf\'b2\'bb\'d3\'b5\'d3\'d0\'cb\'fc\'c3\'c7\'b5\'c4\'cb\'f9\'d3\'d0
+\'c8\'a8\'a1\'a3\'ce\'aa\'c1\'cb\'b1\'dc\'c3\'e2\'c7\'d6\'c8\'a8\'a3\'ac\'ca\'b9\'d3\'c3\'d5\'df\'ce\'f1\'b1\'d8\'d4\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13  **24 }{
+\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d0\'a1\'ca\'b1\'c4\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\hich\af13\dbch\af13\loch\f13 ** }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c7\'e5\'b3\'fd\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b5\'c4\'b9\'fd\'b3\'cc\'d6\'d0\'cb\'f9
+\'b2\'fa\'c9\'fa\'b5\'c4\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 3.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'b5\'c4\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8
-\'b1\'f0\'c3\'fb\'ce\'aa\'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'b6\'d4\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b5\'c4\'d2\'bb\'b8\'f6\'b3\'c6\'ba\'f4\'a3\'ac\'b2\'bb\'b0\'fc\'ba\'ac\'b6\'f1\'d2\'e2\'a1\'a3\'c8\'e7\'b9\'fb\'b9\'d9\'b7\'bd\'d2\'f4
-\'c0\'d6\'c6\'bd\'cc\'a8\'be\'f5\'b5\'c3\'b2\'bb\'cd\'d7\'a3\'ac\'bf\'c9\'c1\'aa\'cf\'b5\'b1\'be\'cf\'ee\'c4\'bf\'b8\'fc\'b8\'c4\'bb\'f2\'d2\'c6\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c8\'fd\'a1\'a2\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b1\'f0\'c3\'fb}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'cb\'c4\'a1\'a2\'d7\'ca\'d4\'b4\'ca\'b9\'d3\'c3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 3.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'b5\'c4\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b1\'f0
+\'c3\'fb\'ce\'aa\'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'b6\'d4\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b5\'c4\'d2\'bb\'b8\'f6\'b3\'c6\'ba\'f4\'a3\'ac\'b2\'bb\'b0\'fc\'ba\'ac\'b6\'f1\'d2\'e2\'a1\'a3\'c8\'e7\'b9\'fb\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6
+\'c6\'bd\'cc\'a8\'be\'f5\'b5\'c3\'b2\'bb\'cd\'d7\'a3\'ac\'bf\'c9\'c1\'aa\'cf\'b5\'b1\'be\'cf\'ee\'c4\'bf\'b8\'fc\'b8\'c4\'bb\'f2\'d2\'c6\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 4.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'ca\'b9\'d3\'c3\'b5\'c4\'b2\'bf\'b7\'d6\'b0\'fc\'c0\'a8
-\'b5\'ab\'b2\'bb\'cf\'de\'d3\'da\'d7\'d6\'cc\'e5\'a1\'a2\'cd\'bc\'c6\'ac\'b5\'c8\'d7\'ca\'d4\'b4\'c0\'b4\'d4\'b4\'d3\'da\'bb\'a5\'c1\'aa\'cd\'f8\'a1\'a3\'c8\'e7\'b9\'fb\'b3\'f6\'cf\'d6\'c7\'d6\'c8\'a8\'bf\'c9\'c1\'aa\'cf\'b5\'b1\'be\'cf\'ee\'c4\'bf
-\'d2\'c6\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'cb\'c4\'a1\'a2\'d7\'ca\'d4\'b4\'ca\'b9\'d3\'c3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'ce\'e5\'a1\'a2\'c3\'e2\'d4\'f0\'c9\'f9\'c3\'f7}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 4.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'c4\'da\'ca\'b9\'d3\'c3\'b5\'c4\'b2\'bf\'b7\'d6\'b0\'fc\'c0\'a8\'b5\'ab
+\'b2\'bb\'cf\'de\'d3\'da\'d7\'d6\'cc\'e5\'a1\'a2\'cd\'bc\'c6\'ac\'b5\'c8\'d7\'ca\'d4\'b4\'c0\'b4\'d4\'b4\'d3\'da\'bb\'a5\'c1\'aa\'cd\'f8\'a1\'a3\'c8\'e7\'b9\'fb\'b3\'f6\'cf\'d6\'c7\'d6\'c8\'a8\'bf\'c9\'c1\'aa\'cf\'b5\'b1\'be\'cf\'ee\'c4\'bf\'d2\'c6
+\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 5.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'d3\'c9\'d3\'da\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b2\'fa\'c9\'fa\'b5\'c4\'b0\'fc
-\'c0\'a8\'d3\'c9\'d3\'da\'b1\'be\'d0\'ad\'d2\'e9\'bb\'f2\'d3\'c9\'d3\'da\'ca\'b9\'d3\'c3\'bb\'f2\'ce\'de\'b7\'a8\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b6\'f8\'d2\'fd\'c6\'f0\'b5\'c4\'c8\'ce\'ba\'ce\'d0\'d4\'d6\'ca\'b5\'c4\'c8\'ce\'ba\'ce\'d6\'b1
-\'bd\'d3\'a1\'a2\'bc\'e4\'bd\'d3\'a1\'a2\'cc\'d8\'ca\'e2\'a1\'a2\'c5\'bc\'c8\'bb\'bb\'f2\'bd\'e1\'b9\'fb\'d0\'d4\'cb\'f0\'ba\'a6\'a3\'a8\'b0\'fc\'c0\'a8\'b5\'ab\'b2\'bb\'cf\'de\'d3\'da\'d2\'f2\'c9\'cc\'d3\'fe\'cb\'f0\'ca\'a7\'a1\'a2\'cd\'a3\'b9\'a4
-\'a1\'a2\'bc\'c6\'cb\'e3\'bb\'fa\'b9\'ca\'d5\'cf\'bb\'f2\'b9\'ca\'d5\'cf\'d2\'fd\'c6\'f0\'b5\'c4\'cb\'f0\'ba\'a6\'c5\'e2\'b3\'a5\'a3\'ac\'bb\'f2\'c8\'ce\'ba\'ce\'bc\'b0\'cb\'f9\loch\af13\hich\af13\dbch\f13 \'d3\'d0\'c6\'e4\'cb\'fb\'c9\'cc\'d2\'b5\'cb\'f0
-\'ba\'a6\'bb\'f2\'cb\'f0\'ca\'a7\'a3\'a9\'d3\'c9\'ca\'b9\'d3\'c3\'d5\'df\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'ce\'e5\'a1\'a2\'c3\'e2\'d4\'f0\'c9\'f9\'c3\'f7}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'c1\'f9\'a1\'a2\'ca\'b9\'d3\'c3\'cf\'de\'d6\'c6}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par \hich\af13\dbch\af13\loch\f13 5.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d3\'c9\'d3\'da\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b2\'fa\'c9\'fa\'b5\'c4\'b0\'fc\'c0\'a8
+\'d3\'c9\'d3\'da\'b1\'be\'d0\'ad\'d2\'e9\'bb\'f2\'d3\'c9\'d3\'da\'ca\'b9\'d3\'c3\'bb\'f2\'ce\'de\'b7\'a8\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'b6\'f8\'d2\'fd\'c6\'f0\'b5\'c4\'c8\'ce\'ba\'ce\'d0\'d4\'d6\'ca\'b5\'c4\'c8\'ce\'ba\'ce\'d6\'b1\'bd\'d3
+\'a1\'a2\'bc\'e4\'bd\'d3\'a1\'a2\'cc\'d8\'ca\'e2\'a1\'a2\'c5\'bc\'c8\'bb\'bb\'f2\'bd\'e1\'b9\'fb\'d0\'d4\'cb\'f0\'ba\'a6\'a3\'a8\'b0\'fc\'c0\'a8\'b5\'ab\'b2\'bb\'cf\'de\'d3\'da\'d2\'f2\'c9\'cc\'d3\'fe\'cb\'f0\'ca\'a7\'a1\'a2\'cd\'a3\'b9\'a4\'a1\'a2
+\'bc\'c6\'cb\'e3\'bb\'fa\'b9\'ca\'d5\'cf\'bb\'f2\'b9\'ca\'d5\'cf\'d2\'fd\'c6\'f0\'b5\'c4\'cb\'f0\'ba\'a6\'c5\'e2\'b3\'a5\'a3\'ac\'bb\'f2\'c8\'ce\'ba\'ce\'bc\'b0\'cb\'f9\'d3\'d0\'c6\'e4\'cb\'fb\'c9\'cc\'d2\'b5\'cb\'f0\'ba\'a6\'bb\'f2\'cb\'f0\'ca\'a7
+\'a3\'a9\'d3\'c9\'ca\'b9\'d3\'c3\'d5\'df\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 6.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'cd\'ea\'c8\'ab\'c3\'e2\'b7\'d1\'a3\'ac\'c7\'d2\'bf\'aa\'d4\'b4
-\'b7\'a2\'b2\'bc\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13  GitHub }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c1\'f9\'a1\'a2\'ca\'b9\'d3\'c3\'cf\'de\'d6\'c6}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\par 
+\par \hich\af13\dbch\af13\loch\f13 6.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'cd\'ea\'c8\'ab\'c3\'e2\'b7\'d1\'a3\'ac\'c7\'d2\'bf\'aa\'d4\'b4\'b7\'a2
+\'b2\'bc\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13  GitHub }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \loch\af13\hich\af13\dbch\f13 \'c3\'e6\'cf\'f2\'c8\'ab\'ca\'c0\'bd\'e7\'c8\'cb\'d3\'c3\'d7\'f7\'b6\'d4\'bc\'bc\'ca\'f5\'b5\'c4\'d1\'a7\'cf\'b0\'bd\'bb\'c1\'f7\'a1\'a3\'b1\'be\'cf\'ee\'c4\'bf\'b2\'bb\'b6\'d4\'cf\'ee\'c4\'bf\'c4\'da\'b5\'c4\'bc\'bc\'ca\'f5
-\'bf\'c9\'c4\'dc\'b4\'e6\'d4\'da\'ce\'a5\'b7\'b4\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6\'b5\'c4\'d0\'d0\'ce\'aa\'d7\'f7\'b1\'a3\'d6\'a4\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\'bf\'c9\'c4\'dc\'b4\'e6\'d4\'da\'ce\'a5\'b7\'b4\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6\'b5\'c4\'d0\'d0\'ce\'aa\'d7\'f7\'b1\'a3\'d6\'a4\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 6.2 **}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'bd\'fb\'d6\'b9\'d4\'da\'ce\'a5\'b7\'b4\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6
-\'b5\'c4\'c7\'e9\'bf\'f6\'cf\'c2\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13 ** }{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'b6\'d4\'d3\'da\'ca\'b9\'d3\'c3\'d5\'df\'d4\'da\'c3\'f7\'d6\'aa\'bb\'f2\'b2\'bb\'d6\'aa\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6\'b2\'bb\'d4\'ca\'d0\'ed
+\par \hich\af13\dbch\af13\loch\f13 6.2 **}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'bd\'fb\'d6\'b9\'d4\'da\'ce\'a5\'b7\'b4\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6
+\'b5\'c4\'c7\'e9\'bf\'f6\'cf\'c2\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \hich\af13\dbch\af13\loch\f13 ** }{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b6\'d4\'d3\'da\'ca\'b9\'d3\'c3\'d5\'df\'d4\'da\'c3\'f7\'d6\'aa\'bb\'f2\'b2\'bb\'d6\'aa\'b5\'b1\'b5\'d8\'b7\'a8\'c2\'c9\'b7\'a8\'b9\'e6\'b2\'bb\'d4\'ca\'d0\'ed
 \'b5\'c4\'c7\'e9\'bf\'f6\'cf\'c2\'ca\'b9\'d3\'c3\'b1\'be\'cf\'ee\'c4\'bf\'cb\'f9\'d4\'ec\'b3\'c9\'b5\'c4\'c8\'ce\'ba\'ce\'ce\'a5\'b7\'a8\'ce\'a5\'b9\'e6\'d0\'d0\'ce\'aa\'d3\'c9\'ca\'b9\'d3\'c3\'d5\'df\'b3\'d0\'b5\'a3\'a3\'ac\'b1\'be\'cf\'ee\'c4\'bf
 \'b2\'bb\'b3\'d0\'b5\'a3\'d3\'c9\'b4\'cb\'d4\'ec\'b3\'c9\'b5\'c4\'c8\'ce\'ba\'ce\'d6\'b1\'bd\'d3\'a1\'a2\'bc\'e4\'bd\'d3\'a1\'a2\'cc\'d8\'ca\'e2\'a1\'a2\'c5\'bc\'c8\'bb\'bb\'f2\'bd\'e1\'b9\'fb\'d0\'d4\'d4\'f0\'c8\'ce\'a1\'a3}{\rtlch\fcs1 \af13 
-\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 
+\ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }\pard \ltrpar\s15\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid3758332 {\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'c6\'df
-\'a1\'a2\'b0\'e6\'c8\'a8\'b1\'a3\'bb\'a4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c6\'df\'a1\'a2\'b0\'e6\'c8\'a8\'b1\'a3\'bb\'a4}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 7.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b2\'bb\'d2\'d7\'a3\'ac\'c7\'eb\'d7\'f0\'d6\'d8\'b0\'e6\'c8\'a8
-\'a3\'ac\'d6\'a7\'b3\'d6\'d5\'fd\'b0\'e6\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 
+\par \hich\af13\dbch\af13\loch\f13 7.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b2\'bb\'d2\'d7\'a3\'ac\'c7\'eb\'d7\'f0\'d6\'d8\'b0\'e6\'c8\'a8
+\'a3\'ac\'d6\'a7\'b3\'d6\'d5\'fd\'b0\'e6\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'b0\'cb\'a1\'a2\'b7\'c7\'c9\'cc\'d2\'b5\'d0\'d4\'d6\'ca}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b0\'cb\'a1\'a2\'b7\'c7\'c9\'cc\'d2\'b5\'d0\'d4\'d6\'ca}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 8.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'bd\'f6\'d3\'c3\'d3\'da\'b6\'d4\'bc\'bc\'ca\'f5\'bf\'c9\'d0\'d0\'d0\'d4
+\par \hich\af13\dbch\af13\loch\f13 8.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'bd\'f6\'d3\'c3\'d3\'da\'b6\'d4\'bc\'bc\'ca\'f5\'bf\'c9\'d0\'d0\'d0\'d4
 \'b5\'c4\'cc\'bd\'cb\'f7\'bc\'b0\'d1\'d0\'be\'bf\'a3\'ac\'b2\'bb\'bd\'d3\'ca\'dc\'c8\'ce\'ba\'ce\'c9\'cc\'d2\'b5\'a3\'a8\'b0\'fc\'c0\'a8\'b5\'ab\'b2\'bb\'cf\'de\'d3\'da\'b9\'e3\'b8\'e6\'b5\'c8\'a3\'a9\'ba\'cf\'d7\'f7\'bc\'b0\'be\'e8\'d4\'f9\'a1\'a3}{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 
+\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'be\'c5\'a1\'a2\'bd\'d3\'ca\'dc\'d0\'ad\'d2\'e9}{\rtlch\fcs1 \af13 \ltrch\fcs0 
-\loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'be\'c5\'a1\'a2\'bd\'d3\'ca\'dc\'d0\'ad\'d2\'e9}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
 \par 
-\par \hich\af13\dbch\af13\loch\f13 9.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid3758332 \loch\af13\hich\af13\dbch\f13 \'c8\'f4\'c4\'e3\'ca\'b9\'d3\'c3\'c1\'cb\'b1\'be\'cf\'ee\'c4\'bf\'a3\'ac\'bd\'ab\'b4\'fa\'b1\'ed
-\'c4\'e3\'bd\'d3\'ca\'dc\'b1\'be\'d0\'ad\'d2\'e9\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid3758332\charrsid14511311 
-\par }\pard \ltrpar\s15\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid14511311 {\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \hich\af13\dbch\af13\loch\f13 * }{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid14511311 \loch\af13\hich\af13\dbch\f13 \'c8\'f4\'d0\'ad\'d2\'e9\'b8\'fc\'d0\'c2\'a3\'ac\'cb\'a1\loch\af13\hich\af13\dbch\f13 \'b2\'bb\'c1\'ed\'d0\'d0\'cd\'a8\'d6\'aa
-\'a3\'ac\'bf\'c9\'b5\'bd\'bf\'aa\'d4\'b4\'b5\'d8\'d6\'b7\'b2\'e9\'bf\'b4\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid9533173 
-\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid14511311\charrsid15226681 
-\par }\pard \ltrpar\s15\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12910709 {\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid12910709\charrsid12910709 \hich\af13\dbch\af13\loch\f13 By: }{
-\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid12910709\charrsid12910709 \loch\af13\hich\af13\dbch\f13 \'c2\'e4\'d1\'a9\'ce\'de\'ba\'db}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid12910709\charrsid12910709 
+\par \hich\af13\dbch\af13\loch\f13 9.1 }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c8\'f4\'c4\'e3\'ca\'b9\'d3\'c3\'c1\'cb\'b1\'be\'cf\'ee\'c4\'bf\'a3\'ac\'bc\'b4\'b4\'fa\'b1\'ed
+\'c4\'e3\'bd\'d3\'ca\'dc\'b1\'be\'d0\'ad\'d2\'e9\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\par 
+\par \hich\af13\dbch\af13\loch\f13 * }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c8\'f4\'d0\'ad\'d2\'e9\'b8\'fc\'d0\'c2\'a3\'ac\'cb\'a1\'b2\'bb\'c1\'ed\'d0\'d0\'cd\'a8\'d6\'aa
+\'a3\'ac\'bf\'c9\'b5\'bd\'bf\'aa\'d4\'b4\'b5\'d8\'d6\'b7\'b2\'e9\'bf\'b4\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 
+\par 
+\par \hich\af13\dbch\af13\loch\f13 By: }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid2766548\charrsid2766548 \loch\af13\hich\af13\dbch\f13 \'c2\'e4\'d1\'a9\'ce\'de\'ba\'db}{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid12910709\charrsid2766548 
 
 \par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
 9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
@@ -311,8 +320,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000c03d
-9b1957f7d901feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000d096
+bf3efc84db01feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}

licenses/license_en.txt

@@ -1,48 +1,52 @@
-This project is issued based on the Apache License 2.0 license. The following protocols are supplemented by Apache License 2.0.
+This project is issued based on the Apache License 2.0 license. The following agreements are supplemental to the Apache License 2.0. In the event of a conflict, the following agreements shall prevail.
 
-Words stipulate: "this project" in this agreement refers to the Luoxue Music Desktop Edition project; "user" refers to the user who signed this agreement; the "official music platform" refers to The official platform of the music source is collectively referred to; "copyright data" refers to the data that includes but not limited to images, audio, names, etc.
+DEFINITIONS:
 
-1. Data source
+"This Project" refers to the LX Music Desktop Edition (aka lx-music-desktop) project. "User" refers to the user who signed this agreement. "Official Music Streaming Service" refers to collectively the official streaming service corresponding to the music source. "Copyrighted Data" refers to data including, but not limited to, pictures, audio, names, etc., for which others own the copyright.
 
-1.1 The principle of online data sources of various official platforms of this project is to draw data from its open server (the same data obtained from the unsproting state in the official platform app). After simply screening and merging data, this project Responsible for the legitimacy and accuracy of the data.
-1.2 The ability of this project itself does not obtain a certain audio data. The online audio data source used in this project comes from the online link of the "Source" selected in the software settings. For example, when playing a song, the project only transmits information such as the song name, singer name and other information to be played to "source". If the "source" returns a link, this project will think that this is the audio data of the song For use, as for whether this is the correct audio data, this project cannot verify its accuracy, so the audio that you want to play may occur during the process of using this project.
-1.3 The unofficial platform data (such as my collection list) of this project comes from synchronous services connected by the user's local system or user connection. This project is not responsible for the legality and accuracy of these data.
+1. Data Source
 
-2. Copyright data
+1.1 The principle of the online data sources of the various official music streaming services of this project is to draw data from its open servers (the same as the data obtained in the unlogged-in state in the official music streaming service app). After simply screening and merging the data, this project is responsible for the legitimacy and accuracy of the data.
 
-2.1 During the process of using this project, copyright data may be generated. For these copyright data, this project does not have their ownership. In order to avoid infringement, users must remove copyright data generated during the process of using this project within ** 24 hours.
+1.2 The ability of this project itself does not obtain certain audio data. The online audio data source used in this project comes from the online link provided by the "API" selected in the software settings. For example, when playing a song, this project only transmits information such as the song title, artist, and other information to the "API". If the "API" returns a link, this project will think that this is the audio data of the song for use, but as for whether this is the correct audio data, this project cannot verify its accuracy. So, in the process of using this project, there may be a problem that the audio you want to play does not correspond to the audio you actually play, or you cannot play it.
 
-3. Alias of Music Platform
+1.3 Data in this project other than official music streaming service (such as lists in "Your Library") comes from the user's local system or a synchronization service that the user connected to. This project is not responsible for the legality and accuracy of this data.
 
-3.1 The official music platform in this project is named a name for the official music platform in this project, without maliciousness. If the official music platform feels inappropriate, you can contact this project to change or remove.
+2. Copyrighted Data
 
-Fourth, resource use
+2.1 During the process of using this project, copyrighted data may be generated. For this copyrighted data, this project does not have their ownership. In order to avoid infringement, users must remove copyrighted data generated during the process of using this project ** within  24 hours **.
 
-4.1 The parts used in this project include, but not limited to fonts, pictures and other resources from the Internet. If infringement occurs, you can contact this project.
+3. Alias of Music Streaming Service
+
+3.1 The official music streaming service alias within this project is a term used within this project to refer to the official music streaming service and does not contain malicious intent. If the operator of the official music streaming service feels it is inappropriate, you can contact this project to request changes or removals.
+
+4. Use of Resources
+
+4.1 The parts used in this project include, but are not limited to, fonts, pictures, and other resources from the Internet. If infringement occurs, you can contact this project.
 
 5. Disclaimer
 
-5.1 The use of this project includes any direct, indirect, special, accidental, or result damage due to any nature caused by this agreement or use or unable to use this item (including but not limited to the loss of goodwill, stop work, computer, computer Damage compensation caused by faults or faults, or any or all other commercial damage or losses) is responsible for users.
+5.1 The use of this project includes any direct, indirect, special, accidental, or result damage due to any nature caused by this agreement or use or inability to use this item (including but not limited to the loss of goodwill, stop work, computer, computer Damage compensation caused by faults or any or all other commercial damage or losses) is the responsibility of users.
 
-6. Use restrictions
+6. Use Restrictions
 
-6.1 This project is completely free, and open source is published in GitHub for the learning exchanges of technology for people all over the world. This project does not guarantee that the technology in the project may violate local laws and regulations.
+6.1 This project is completely free and open source and is published on GitHub for the learning exchanges of technology for people all over the world. This project does not guarantee that the technology in this project may violate local laws and regulations.
 
-6.2 ** This project is prohibited in violation of local laws and regulations. ** For the user's use of any illegal and illegal acts caused by the use of the project if the user is not allowed to be allowed to the user, it is undertaken by the user. Sexual responsibility.
+6.2 ** This project is prohibited in violation of local laws and regulations. ** The user is solely responsible for any violation of law caused by the use of this project that the user knows or does not know is not permitted by local law and regulations.
 
-7. Copyright protection
+7. Copyright Protection
 
-7.1 Music platform is not easy, please respect the copyright and support genuine.
+7.1 The operation of a music streaming service is not an easy task. Please respect copyrights and support the genuine.
 
-8. Non -commercial nature
+8. Non-commercial Nature
 
-8.1 This project is only used for exploring and research on technical feasibility, and does not accept any business (including but not limited to advertising, etc.) cooperation and donations.
+8.1 This project is only used for exploring and research on technical feasibility and does not accept any business (including but not limited to advertising, etc.) cooperation and donations.
 
-9. Accepting agreement
+9. Accepting Agreement
 
 9.1 If you use this project, it will represent you accept this agreement.
 
-* If the agreement is updated, you will not be notified separately, you can check the open source address.
-* The content of this agreement is translated from the Chinese version of the agreement
+* If the agreement is updated, you will not be notified separately. You can check it out by visiting the project address.
+* The content of this agreement is translated from the Chinese version of the agreement.
 
 By: lyswhut

licenses/license_zh.txt

@@ -1,16 +1,18 @@
 本项目基于 Apache License 2.0 许可证发行，以下协议是对于 Apache License 2.0 的补充，如有冲突，以以下协议为准。
 
-词语约定：本协议中的“本项目”指洛雪音乐桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
+词语约定：本协议中的“本项目”指 LX Music 桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
 一、数据来源
 
-1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台APP获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
-1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“音乐来源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名字、歌手名字等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
-1.3 本项目的非官方平台数据（例如我的收藏列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
+1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台 APP 获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
+
+1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“自定义源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名、艺术家等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
+
+1.3 本项目的非官方平台数据（例如“我的列表”内列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
 
 二、版权数据
 
-2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在**24小时内**清除使用本项目的过程中所产生的版权数据。
+2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在 **24 小时内** 清除使用本项目的过程中所产生的版权数据。
 
 三、音乐平台别名
 
@@ -40,7 +42,7 @@
 
 九、接受协议
 
-9.1 若你使用了本项目，将代表你接受本协议。
+9.1 若你使用了本项目，即代表你接受本协议。
 
 * 若协议更新，恕不另行通知，可到开源地址查看。
 

package.json

@@ -1,9 +1,8 @@
 {
   "name": "lx-music-desktop",
-  "version": "2.6.0",
+  "version": "2.12.6",
   "description": "一个免费的音乐查找助手",
   "main": "./dist/main.js",
-  "productName": "lx-music-desktop",
   "scripts": {
     "pack": "node build-config/pack.js && npm run pack:win:setup:x64",
     "pack:win": "node build-config/pack.js && npm run pack:win:setup:x64 && npm run pack:win:setup:x86 && npm run pack:win:setup:arm64 && npm run pack:win:setup:x86_64 && npm run pack:win:7z",
@@ -64,7 +63,7 @@
     "build:renderer-scripts": "cross-env NODE_ENV=production webpack --config build-config/renderer-scripts/webpack.config.prod.js --progress",
     "lint": "eslint --ext .ts,.js,.vue -f node_modules/eslint-formatter-friendly src",
     "lint:fix": "eslint --ext .ts,.js,.vue -f node_modules/eslint-formatter-friendly --fix src",
-    "postinstall": "electron-builder install-app-deps",
+    "postinstall": "node build-config/postinstall.js",
     "dp": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:2081 npm run pack",
     "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:2081 npm i"
   },
@@ -72,7 +71,7 @@
     "Electron 22.3.0"
   ],
   "engines": {
-    "node": ">= 16",
+    "node": ">= 22",
     "npm": ">=8.5.2"
   },
   "macLanguagesInfoPlistStrings": {
@@ -108,110 +107,117 @@
   },
   "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
   "devDependencies": {
-    "@babel/core": "^7.23.9",
-    "@babel/eslint-parser": "^7.23.10",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-umd": "^7.23.3",
-    "@babel/plugin-transform-runtime": "^7.23.9",
-    "@babel/preset-env": "^7.23.9",
-    "@babel/preset-typescript": "^7.23.3",
-    "@tsconfig/recommended": "^1.0.3",
-    "@types/better-sqlite3": "^7.6.9",
+    "@tsconfig/recommended": "^1.0.13",
+    "@types/better-sqlite3": "^7.6.13",
     "@types/needle": "^3.3.0",
+    "@types/node": "^20.19.43",
     "@types/tunnel": "^0.0.7",
     "@types/ws": "8.5.4",
-    "@volar/vue-language-plugin-pug": "^1.6.5",
-    "@vue/language-plugin-pug": "^1.8.27",
-    "babel-loader": "^9.1.3",
-    "browserslist": "^4.22.3",
+    "@vue/language-plugin-pug": "^3.3.11",
+    "browserslist": "^4.28.9",
     "chalk": "^4.1.2",
-    "changelog-parser": "^3.0.1",
-    "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.35.1",
-    "cross-env": "^7.0.3",
-    "css-loader": "^6.10.0",
-    "css-minimizer-webpack-plugin": "^6.0.0",
+    "changelog-parser": "3.0.1",
+    "copy-webpack-plugin": "^14.0.0",
+    "core-js": "^3.50.0",
+    "cross-env": "^10.1.0",
+    "css-loader": "^7.1.5",
+    "css-minimizer-webpack-plugin": "^8.0.0",
     "del": "^6.1.1",
-    "electron": "^25.9.8",
-    "electron-builder": "^24.10.0",
+    "electron": "42.11.6",
+    "electron-builder": "^26.15.7",
     "electron-debug": "^3.2.0",
-    "electron-devtools-installer": "^3.2.0",
-    "electron-to-chromium": "^1.4.653",
-    "electron-updater": "^6.1.7",
-    "eslint": "^8.56.0",
+    "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
+    "electron-to-chromium": "^1.5.427",
+    "electron-updater": "6.8.9",
+    "eslint": "^8.57.1",
     "eslint-config-standard": "^17.1.0",
     "eslint-config-standard-with-typescript": "^43.0.1",
     "eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53",
-    "eslint-plugin-html": "^7.1.0",
-    "eslint-plugin-vue": "^9.21.1",
-    "eslint-plugin-vue-pug": "^0.6.1",
-    "eslint-webpack-plugin": "^4.0.1",
-    "html-webpack-plugin": "^5.6.0",
-    "less": "^4.2.0",
-    "less-loader": "^12.2.0",
-    "mini-css-extract-plugin": "^2.7.7",
-    "node-loader": "^2.0.0",
-    "postcss": "^8.4.33",
-    "postcss-loader": "^8.1.0",
+    "eslint-plugin-html": "^8.2.0",
+    "eslint-plugin-vue": "^9.33.0",
+    "eslint-plugin-vue-pug": "^0.6.2",
+    "eslint-webpack-plugin": "^4.2.0",
+    "html-webpack-plugin": "^5.6.8",
+    "less": "^4.9.1",
+    "less-loader": "^13.0.0",
+    "mini-css-extract-plugin": "^2.10.2",
+    "node-loader": "^2.1.0",
+    "postcss": "^8.5.28",
+    "postcss-loader": "^8.2.1",
     "postcss-pxtorem": "^6.1.0",
-    "pug": "^3.0.2",
+    "pug": "^3.0.4",
     "pug-plain-loader": "^1.1.0",
-    "rimraf": "^5.0.5",
+    "rimraf": "^6.1.3",
     "spinnies": "github:lyswhut/spinnies#233305c58694aa3b053e3ab9af9049993f918b9d",
     "svg-sprite-loader": "^6.0.11",
     "svg-transform-loader": "^2.0.13",
-    "svgo-loader": "^4.0.0",
-    "terser": "^5.27.0",
-    "terser-webpack-plugin": "^5.3.10",
-    "ts-loader": "^9.5.1",
-    "typescript": "^5.3.3",
-    "vue-eslint-parser": "^9.4.2",
+    "svgo-loader": "^5.0.0",
+    "terser": "^5.51.2",
+    "terser-webpack-plugin": "^5.6.1",
+    "tree-kill": "^1.2.2",
+    "ts-loader": "^9.6.2",
+    "typescript": "5.9.3",
+    "vue-eslint-parser": "^9.4.3",
     "vue-loader": "^17.4.2",
-    "vue-template-compiler": "^2.7.16",
-    "webpack": "^5.90.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^4.15.1",
+    "webpack": "5.106.2",
+    "webpack-cli": "^7.2.3",
+    "webpack-dev-server": "5.2.6",
     "webpack-hot-middleware": "github:lyswhut/webpack-hot-middleware#329c4375134b89d39da23a56a94db651247c74a1",
-    "webpack-merge": "^5.10.0"
+    "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "@simonwep/pickr": "^1.9.0",
-    "better-sqlite3": "^9.3.0",
-    "bufferutil": "^4.0.8",
+    "@simonwep/pickr": "1.9.1",
+    "better-sqlite3": "^13.0.3",
+    "bufferutil": "^4.1.0",
     "comlink": "~4.3.1",
     "crypto-js": "^4.2.0",
-    "electron-log": "^5.1.0",
-    "font-list": "^1.5.1",
-    "iconv-lite": "^0.6.3",
+    "electron-log": "^5.4.4",
+    "font-list": "^2.1.0",
+    "iconv-lite": "^0.7.3",
     "image-size": "^1.1.0",
-    "jschardet": "^3.0.0",
-    "long": "^5.2.3",
+    "jschardet": "^3.1.4",
+    "long": "^5.3.2",
     "message2call": "^0.1.3",
-    "music-metadata": "^8.1.4",
+    "music-metadata": "^11.15.0",
     "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060",
-    "node-id3": "^0.2.6",
-    "sortablejs": "^1.15.2",
+    "node-id3": "^0.2.9",
+    "sortablejs": "^1.15.7",
     "tunnel": "^0.0.6",
-    "utf-8-validate": "^6.0.3",
+    "undici": "^7.29.1",
+    "utf-8-validate": "^6.0.6",
     "vue": "~3.3.13",
-    "vue-router": "^4.2.5",
-    "ws": "^8.16.0"
+    "vue-router": "~4.5.1",
+    "ws": "^8.21.3"
   },
   "overrides": {
     "got": "^11",
     "json5": "latest",
+    "node-abi": "latest",
     "minimatch": "latest",
     "semver": "latest",
+    "posthtml": "latest",
+    "node-gyp": "latest",
+    "sockjs": {
+      "uuid": "^12"
+    },
     "svg-transform-loader": {
-      "postcss": "latest"
+      "postcss": "^8"
     },
     "svg-sprite-loader": {
-      "postcss": "latest"
+      "postcss": "^8"
     },
     "svg-baker": {
-      "postcss": "latest"
+      "postcss": "^8"
     },
+    "braces": "latest",
+    "node-gyp-build": "latest",
+    "micromatch": "latest",
     "http-cache-semantics": "latest"
+  },
+  "allowScripts": {
+    "bufferutil": false,
+    "core-js": false,
+    "electron-winstaller": false,
+    "utf-8-validate": false
   }
 }

publish/changeLog.md

@@ -1,54 +1,15 @@
-提交祝大家新年快乐！
-
-更新前需要注意：
-由于自定义源的调用方式变更，可能会导致某些第三方源停止工作，如果出现这种情况，你需要将LX回退到 v2.5.0
-
-### 新增
-
-- 若自定义源初始化失败，将会出现弹窗提示初始化失败的详情
-- 添加win7_x64架构的安装版安装包构建
-- 新增播放歌曲时阻止电脑休眠，默认启用，可到设置-播放设置关闭（#1563）
+目前新项目 Any Listen 的桌面版、Web 版已实现 LX Music 的大部分功能，并额外支持 WebDAV 歌曲播放、WebDAV 数据同步、独立播放列表等功能。
+以后的开发精力将主要集中在新项目上，之前大家在 LX Music 提的功能我们也会考虑在新项目中添加。
+对于日常使用 LX Music 的人可以试试迁移到 Any Listen，若遇到任何问题可以发 issue 反馈。
+Any Listen 的项目地址为 https://github.com/any-listen/any-listen
 
 ### 优化
 
-- 更新zh-tw翻译
-- 自定义源列显示源版本号、作者名字
-- 优化列表全选机制，修复列表未获得焦点时仍然可以全选的问题
-- 优化搜索框交互逻辑，防止鼠标操作时意外搜索候选列表的内容
-- 添加对wy源某些歌曲有问题的歌词进行修复
-- 改进本地音乐在线信息的匹配机制
-- 优化任务下载状态显示，现在下载时若数据传输完成但数据写入未完成时会显示相应的状态
-- 添加对下载歌曲时封面图片大小的控制处理（#1609）
-- 添加创建同名列表时的二次确认（#1621）
+- 优化 tx 推荐歌单列表
+- 优化禁用透明窗口的窗口边框显示效果
 
 ### 修复
 
-- 修复备份文件无法导入json格式的问题
-- Windows、MacOS平台下的字体列表取消使用原生方式获取以修复某些字体应用后无效的问题（#1596）
-- 修复亮暗主题自动切换功能无效的问题（#1697）
-- 修复 MacOS 平台在 Finder 打开文件或目录时应用卡死的问题（#1684）
-- 修复下载模块在数据写入速度较慢的情况下出现任务及文件异常的问题
-- 修复临时列表变更会意外触发同步的问题
-- 修复最小化后再隐藏窗口时，托盘菜单的显示主界面功能异常的问题
-
-### 变更
-
-- 播放歌曲时默认会阻止系统进入休眠状态，若你不行软件阻止系统休眠，可以到设置-播放设置取消勾选“播放歌曲时阻止电脑休眠”设置
-
-### 其他
-
-- 移除所有内置源，由于收到腾讯投诉要求停止提供软件内置的连接到他们平台的在线播放及下载服务，所以从即日（2023年10月18日）起LX本身不再提供上述服务
-- 更新 electron 到 v25.9.8
-- 更新许可协议的排版，使其看起来更加清晰明了，更新数据来源原理说明
-
-### 自定义源的不兼容变更与新增内容（源开发者需要看）
-
-自定义源的调用方式已改变：
-
-- 为了与移动端的调用方式统一，不再推荐使用 `window.lx` 对象（移动端无`window`对象），改用 `globalThis.lx`
-- `inited` 事件不再需要传递 `status` 属性，脚本运行过程中，在成功调用 `inited` 事件之前的任何首次未捕获的错误都将视为初始化失败，所以现在若想人为让脚本初始化失败，直接抛出一个错误即可
-- 新增 `globalThis.lx.env` 属性，桌面端环境固定为 `desktop`，移动端环境固定为 `mobile`
-- 新增 `globalThis.lx.currentScriptInfo` 对象，可以从这里获取解析后的脚本头部注释信息及脚本原始内容，具体可用属性看文档说明
-- `globalThis.lx.version` 属性更新到 `2.0.0`
-- 自定义源不再使用`script`标签的形式执行，若要获取脚本原始代码字符串需从 `globalThis.lx.currentScriptInfo.rawScript` 属性获取
-- 自定义源新增支持`local`源的`musicUrl`、`pic`、`lyric`的获取操作详情看自定义源文档说明
+- 修复打开某些 kg 歌单时歌曲丢失的问题
+- 修复 Windows 7 无法启动的问题
+- 修复禁用透明窗口时按 F11 无法全屏的问题

publish/utils/index.js

@@ -34,7 +34,7 @@ function fm(value) {
 exports.sizeFormate = size => {
   // https://gist.github.com/thomseddon/3511330
   if (!size) return '0 b'
-  let units = ['b', 'kB', 'MB', 'GB', 'TB']
+  let units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
   let number = Math.floor(Math.log(size) / Math.log(1024))
   return `${(size / Math.pow(1024, Math.floor(number))).toFixed(2)} ${units[number]}`
 }

publish/utils/parseChangelog.js

@@ -0,0 +1,40 @@
+/**
+ *
+ * @param {string} text
+ * @returns
+ */
+export const parseChangelog = async(text) => {
+  const versions = []
+  const lines = text.split(/\r\n|\r|\n/)
+  let currentVersion = null
+  let currentDate = null
+  let currentDesc = ''
+
+  for (const line of lines) {
+    const versionMatch = line.match(/^\s*##\s+\[?(\d+\.\d+\.\d+)\]?.*?-\s+(\d{4}-\d{2}-\d{2})$/)
+    if (versionMatch) {
+      if (currentVersion) {
+        versions.push({
+          version: currentVersion,
+          date: currentDate,
+          desc: currentDesc.trim(),
+        })
+      }
+      currentVersion = versionMatch[1]
+      currentDate = versionMatch[3]
+      currentDesc = ''
+    } else {
+      currentDesc += `${line}\n`
+    }
+  }
+
+  if (currentVersion) {
+    versions.push({
+      version: currentVersion,
+      date: currentDate,
+      desc: currentDesc.trim(),
+    })
+  }
+
+  return versions
+}

publish/utils/updateChangeLog.js

@@ -6,8 +6,8 @@ const version = require('../version.json')
 const chalk = require('chalk')
 const pkg_bak = JSON.stringify(pkg, null, 2)
 const version_bak = JSON.stringify(version, null, 2)
-const parseChangelog = require('changelog-parser')
 const changelogPath = jp('../../CHANGELOG.md')
+const { parseChangelog } = require('./parseChangelog')
 
 // const md_renderer = markdownStr => new (require('markdown-it'))({
 //   html: true,
@@ -16,27 +16,23 @@ const changelogPath = jp('../../CHANGELOG.md')
 //   breaks: true,
 // }).render(markdownStr)
 
-const getPrevVer = () => parseChangelog(changelogPath).then(res => {
-  if (!res.versions.length) throw new Error('CHANGELOG 无法解析到版本号')
-  return res.versions[0].version
+const getPrevVer = () => parseChangelog(fs.readFileSync(changelogPath, 'utf-8').toString()).then(versions => {
+  if (!versions.length) throw new Error('CHANGELOG 无法解析到版本号')
+  return versions[0].version
 })
 
 const updateChangeLog = async(newVerNum, newChangeLog) => {
   let changeLog = fs.readFileSync(changelogPath, 'utf-8')
   const prevVer = await getPrevVer()
   const log = `## [${newVerNum}](${pkg.repository.url.replace(/^git\+(http.+)\.git$/, '$1')}/compare/v${prevVer}...v${newVerNum}) - ${formatTime()}\n\n${newChangeLog}`
-  fs.writeFileSync(changelogPath, changeLog.replace(new RegExp('(## [?0.1.1]?)'), log + '\n$1'), 'utf-8')
+  fs.writeFileSync(changelogPath, changeLog.replace(/(## \[(?:\d+\.))/, log + '\n$1'), 'utf-8')
 }
 
 // const renderChangeLog = md => md_renderer(md)
 
 
 module.exports = async newVerNum => {
-  if (!newVerNum) {
-    let verArr = pkg.version.split('.')
-    verArr[verArr.length - 1] = parseInt(verArr[verArr.length - 1]) + 1
-    newVerNum = verArr.join('.')
-  }
+  if (!newVerNum) newVerNum = pkg.version
   const newMDChangeLog = fs.readFileSync(jp('../changeLog.md'), 'utf-8')
   // const newChangeLog = renderChangeLog(newMDChangeLog)
   version.history.unshift({

src/common/constants.ts

@@ -80,3 +80,5 @@ export const DOWNLOAD_STATUS = {
 } as const
 
 export const QUALITYS = ['flac24bit', 'flac', 'wav', 'ape', '320k', '192k', '128k'] as const
+
+export const TRAY_AUTO_ID = -1

src/common/defaultSetting.ts

@@ -19,24 +19,28 @@ const defaultSetting: LX.AppSetting = {
   'common.isAgreePact': false,
   'common.controlBtnPosition': isMac ? 'left' : 'right',
   'common.playBarProgressStyle': 'mini',
+  'common.transparentWindow': !isMac,
   'common.tryAutoUpdate': true,
   'common.showChangeLog': true,
 
   'player.startupAutoPlay': false,
   'player.togglePlayMethod': 'listLoop',
-  'player.highQuality': false,
+  'player.playQuality': '128k',
   'player.isShowTaskProgess': true,
+  'player.isShowStatusBarLyric': false,
   'player.volume': 1,
   'player.powerSaveBlocker': true,
   'player.isMute': false,
   'player.playbackRate': 1,
   'player.preservesPitch': true,
+  'player.isMaxOutputChannelCount': false,
   'player.mediaDeviceId': 'default',
   'player.isMediaDeviceRemovedStopPlay': false,
   'player.isShowLyricTranslation': false,
   'player.isShowLyricRoma': false,
+  'player.isSwapLyricTranslationAndRoma': false,
   'player.isS2t': false,
-  'player.isPlayLxlrc': isWin,
+  'player.isPlayLxlrc': !isMac,
   'player.isSavePlayTime': false,
   'player.audioVisualization': false,
   'player.waitPlayEndStop': true,
@@ -63,8 +67,9 @@ const defaultSetting: LX.AppSetting = {
 
   'playDetail.isZoomActiveLrc': false,
   'playDetail.isShowLyricProgressSetting': false,
-  'playDetail.style.fontSize': 100,
+  'playDetail.style.fontSize': 140,
   'playDetail.style.align': 'center',
+  'playDetail.isDelayScroll': true,
 
   'desktopLyric.enable': false,
   'desktopLyric.isLock': false,
@@ -73,6 +78,7 @@ const defaultSetting: LX.AppSetting = {
   'desktopLyric.isShowTaskbar': false,
   'desktopLyric.audioVisualization': false,
   'desktopLyric.fullscreenHide': true,
+  'desktopLyric.pauseHide': true,
   'desktopLyric.width': 450,
   'desktopLyric.height': 300,
   'desktopLyric.x': null,
@@ -104,16 +110,19 @@ const defaultSetting: LX.AppSetting = {
   'list.actionButtonsVisible': false,
 
   'download.enable': false,
+  'download.isSavePathGroupByListName': false,
   'download.savePath': path.join(os.homedir(), 'Desktop'),
   'download.fileName': '歌名 - 歌手',
   'download.maxDownloadNum': 3,
   'download.skipExistFile': true,
   'download.isDownloadLrc': false,
+  'download.isDownloadLxLrc': true,
   'download.isDownloadTLrc': false,
   'download.isDownloadRLrc': false,
   'download.lrcFormat': 'utf8',
   'download.isEmbedPic': true,
   'download.isEmbedLyric': false,
+  'download.isEmbedLyricLx': true,
   'download.isEmbedLyricT': false,
   'download.isEmbedLyricR': false,
   'download.isUseOtherSource': false,
@@ -125,8 +134,6 @@ const defaultSetting: LX.AppSetting = {
   'network.proxy.enable': false,
   'network.proxy.host': '',
   'network.proxy.port': '',
-  'network.proxy.username': '',
-  'network.proxy.password': '',
 
   'tray.enable': false,
   // 'tray.isToTray': false,
@@ -138,6 +145,10 @@ const defaultSetting: LX.AppSetting = {
   'sync.server.maxSsnapshotNum': 5,
   'sync.client.host': '',
 
+  'openAPI.enable': false,
+  'openAPI.port': '23330',
+  'openAPI.bindLan': false,
+
   // 'theme.id': 'blue_plus',
   'theme.id': 'green',
   'theme.lightId': 'green',

src/common/hotKey.ts

@@ -51,6 +51,16 @@ const hotKey = {
       action: 'prev',
       type: '',
     },
+    seekbackward: {
+      name: 'seekbackward',
+      action: 'seekbackward',
+      type: '',
+    },
+    seekforward: {
+      name: 'seekforward',
+      action: 'seekforward',
+      type: '',
+    },
     volume_up: {
       name: 'volume_up',
       action: 'volume_up',

src/common/ipcNames.ts

@@ -59,7 +59,7 @@ const modules = {
     open_dev_tools: 'open_dev_tools',
     set_power_save_blocker: 'set_power_save_blocker',
 
-    progress: 'progress',
+    player_status: 'player_status',
     change_tray: 'change_tray',
     quit_update: 'quit_update',
     update_check: 'update_check',
@@ -78,10 +78,6 @@ const modules = {
 
     restart_window: 'restart_window',
 
-    // lang_s2t: 'lang_s2t',
-
-    handle_kw_decode_lyric: 'handle_kw_decode_lyric',
-    handle_tx_decode_lyric: 'handle_tx_decode_lyric',
     get_lyric_info: 'get_lyric_info',
     set_lyric_info: 'set_lyric_info',
     set_config: 'set_config',
@@ -134,6 +130,7 @@ const modules = {
     clear_music_url: 'clear_music_url',
     get_music_url_count: 'get_music_url_count',
 
+    open_api_action: 'open_api_action',
     sync_action: 'sync_action',
     sync_get_server_devices: 'sync_get_server_devices',
     sync_remove_server_device: 'sync_remove_server_device',
@@ -161,9 +158,11 @@ const modules = {
     on_config_change: 'on_config_change',
     main_window_inited: 'main_window_inited',
     set_win_bounds: 'set_win_bounds',
+    set_win_resizeable: 'set_win_resizeable',
     key_down: 'key_down',
     request_main_window_channel: 'request_main_window_channel',
     provide_main_window_channel: 'provide_main_window_channel',
+    mouse_enter_leave: 'mouse_enter_leave',
   },
   hotKey: {
     enable: 'enable',

src/common/theme/createThemes.js

@@ -9,6 +9,7 @@ const defaultThemes = [
     id: 'green',
     name: '绿意盎然',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(77, 175, 124)',
       font: 'rgb(33, 33, 33)',
@@ -32,6 +33,7 @@ const defaultThemes = [
     id: 'blue',
     name: '蓝田生玉',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(52, 152, 219)',
       font: 'rgb(33, 33, 33)',
@@ -55,6 +57,7 @@ const defaultThemes = [
     id: 'blue_plus',
     name: '蛋雅深蓝',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(77, 131, 175)',
       font: 'rgb(33, 33, 33)',
@@ -78,6 +81,7 @@ const defaultThemes = [
     id: 'orange',
     name: '橙黄橘绿',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(245, 171, 53)',
       font: 'rgb(33, 33, 33)',
@@ -101,6 +105,7 @@ const defaultThemes = [
     id: 'red',
     name: '热情似火',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(214, 69, 65)',
       font: 'rgb(33, 33, 33)',
@@ -124,6 +129,7 @@ const defaultThemes = [
     id: 'pink',
     name: '粉装玉琢',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(241, 130, 141)',
       font: 'rgb(33, 33, 33)',
@@ -147,6 +153,7 @@ const defaultThemes = [
     id: 'purple',
     name: '重斤球紫',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(155, 89, 182)',
       font: 'rgb(33, 33, 33)',
@@ -170,6 +177,7 @@ const defaultThemes = [
     id: 'grey',
     name: '灰常美丽',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(108, 122, 137)',
       font: 'rgb(33, 33, 33)',
@@ -193,6 +201,7 @@ const defaultThemes = [
     id: 'ming',
     name: '青出于黑',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(51, 110, 123)',
       font: 'rgb(33, 33, 33)',
@@ -216,6 +225,7 @@ const defaultThemes = [
     id: 'blue2',
     name: '清热板蓝',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(79, 98, 208)',
       font: 'rgb(33, 33, 33)',
@@ -239,6 +249,7 @@ const defaultThemes = [
     id: 'black',
     name: '黑灯瞎火',
     isDark: true,
+    isDarkFont: false,
     config: {
       primary: 'rgb(150, 150, 150)',
       font: 'rgb(229, 229, 229)',
@@ -262,6 +273,7 @@ const defaultThemes = [
     id: 'mid_autumn',
     name: '月里嫦娥',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(74, 55, 82)',
       font: 'rgb(33, 33, 33)',
@@ -286,6 +298,7 @@ const defaultThemes = [
     id: 'naruto',
     name: '木叶之村',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(87, 144, 167)',
       font: 'rgb(33, 33, 33)',
@@ -309,6 +322,7 @@ const defaultThemes = [
     id: 'china_ink',
     name: '近墨者黑',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgba(47, 47, 47, 1)',
       font: 'rgb(33, 33, 33)',
@@ -333,6 +347,7 @@ const defaultThemes = [
     id: 'happy_new_year',
     name: '新年快乐',
     isDark: false,
+    isDarkFont: false,
     config: {
       primary: 'rgb(192, 57, 43)',
       font: 'rgb(33, 33, 33)',

src/common/theme/index.json

@@ -3,6 +3,7 @@
     "id": "green",
     "name": "绿意盎然",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -259,6 +260,7 @@
     "id": "blue",
     "name": "蓝田生玉",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -515,6 +517,7 @@
     "id": "blue_plus",
     "name": "蛋雅深蓝",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -771,6 +774,7 @@
     "id": "orange",
     "name": "橙黄橘绿",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1027,6 +1031,7 @@
     "id": "red",
     "name": "热情似火",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1283,6 +1288,7 @@
     "id": "pink",
     "name": "粉装玉琢",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1539,6 +1545,7 @@
     "id": "purple",
     "name": "重斤球紫",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1795,6 +1802,7 @@
     "id": "grey",
     "name": "灰常美丽",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2051,6 +2059,7 @@
     "id": "ming",
     "name": "青出于黑",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2307,6 +2316,7 @@
     "id": "blue2",
     "name": "清热板蓝",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2563,6 +2573,7 @@
     "id": "black",
     "name": "黑灯瞎火",
     "isDark": true,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2819,6 +2830,7 @@
     "id": "mid_autumn",
     "name": "月里嫦娥",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3075,6 +3087,7 @@
     "id": "naruto",
     "name": "木叶之村",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3331,6 +3344,7 @@
     "id": "china_ink",
     "name": "近墨者黑",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3587,6 +3601,7 @@
     "id": "happy_new_year",
     "name": "新年快乐",
     "isDark": false,
+    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {

src/common/theme/utils.js

@@ -1,6 +1,6 @@
 const { RGB_Linear_Shade, RGB_Alpha_Shade } = require('./colorUtils')
 
-exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark) => {
+exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark, isDarkFont) => {
   const colors = {
     '--color-primary': rgbaColor,
   }
@@ -30,19 +30,19 @@ exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark) => {
 
   colors['--color-theme'] = isDark ? colors['--color-primary-light-900'] : rgbaColor
 
-  return { ...colors, ...createFontColors(fontRgbaColor, isDark) }
+  return { ...colors, ...createFontColors(fontRgbaColor, isDark, isDarkFont) }
 }
 
-const createFontColors = (rgbaColor, isDark) => {
+const createFontColors = (rgbaColor, isDark, isDarkFont) => {
   // rgb(238, 238, 238)
   // let prec = 'rgb(255, 255, 255)'
   rgbaColor ??= isDark ? 'rgb(229, 229, 229)' : 'rgb(33, 33, 33)'
-  if (isDark) return createFontDarkColors(rgbaColor)
+  if (isDark) return createFontDarkColors(rgbaColor, isDarkFont)
 
   let colors = {
     '--color-1000': rgbaColor,
   }
-  let step = isDark ? -0.05 : 0.05
+  let step = (isDarkFont ? 0.02 : 0.05) * (isDark ? -1 : 1)
   for (let i = 1; i < 21; i += 1) {
     colors[`--color-${String(1000 - 50 * i).padStart(3, '0')}`] = RGB_Linear_Shade(step * i, rgbaColor)
   }
@@ -50,14 +50,14 @@ const createFontColors = (rgbaColor, isDark) => {
   return colors
 }
 
-const createFontDarkColors = (rgbaColor) => {
+const createFontDarkColors = (rgbaColor, isDarkFont) => {
   // rgb(238, 238, 238)
   // let prec = 'rgb(255, 255, 255)'
 
   let colors = {
     '--color-1000': rgbaColor,
   }
-  const step = -0.05
+  const step = isDarkFont ? -0.015 : -0.05
   let preColor = rgbaColor
   for (let i = 1; i < 21; i += 1) {
     preColor = RGB_Linear_Shade(step, preColor)

src/common/tsconfig.json

@@ -5,7 +5,7 @@
       "./types"
     ],
     "paths": {                                           /* Specify a set of entries that re-map imports to additional lookup locations. */
-      "@common/*": ["common/*"],
+      "@common/*": ["./*"],
     },
   },
 }

src/common/types/app_setting.d.ts

@@ -1,4 +1,4 @@
-import type { I18n } from '@root/lang/i18n'
+import type { I18n } from '../../lang/i18n'
 
 declare global {
 
@@ -68,6 +68,11 @@ declare global {
        */
       'common.playBarProgressStyle': 'mini' | 'full' | 'middle'
 
+      /**
+       * 启用透明窗口
+       */
+      'common.transparentWindow': boolean
+
       /**
        * 尝试自动更新
        */
@@ -89,15 +94,21 @@ declare global {
       'player.togglePlayMethod': 'listLoop' | 'random' | 'list' | 'singleLoop' | 'none'
 
       /**
-       * 是否优先播放320k音质
+       * 优先播放的音质
        */
-      'player.highQuality': boolean
+      'player.playQuality': LX.Quality
 
       /**
        * 是否显示任务栏进度条
        */
       'player.isShowTaskProgess': boolean
 
+
+      /**
+       * 是否将歌词显示在状态栏
+       */
+      'player.isShowStatusBarLyric': boolean
+
       /**
        * 音量大小
        */
@@ -123,6 +134,11 @@ declare global {
        */
       'player.preservesPitch': boolean
 
+      /**
+       * 使用设备能处理的最大声道数输出音频
+       */
+      'player.isMaxOutputChannelCount': boolean
+
       /**
        * 音频输出设备id
        */
@@ -143,6 +159,11 @@ declare global {
        */
       'player.isShowLyricRoma': boolean
 
+      /**
+       * 是否调换翻译歌词与罗马音歌词位置
+       */
+      'player.isSwapLyricTranslationAndRoma': boolean
+
       /**
        * 是否将歌词从简体转换为繁体
        */
@@ -288,6 +309,11 @@ declare global {
        */
       'playDetail.style.align': 'center' | 'left' | 'right'
 
+      /**
+       * 播放详情页-是否延迟桌面歌词滚动
+       */
+      'playDetail.isDelayScroll': boolean
+
 
       /**
        * 是否启用桌面歌词
@@ -324,6 +350,11 @@ declare global {
        */
       'desktopLyric.fullscreenHide': boolean
 
+      /**
+       * 是否在暂停时隐藏歌词
+       */
+      'desktopLyric.pauseHide': boolean
+
       /**
        * 桌面歌词窗口宽度
        */
@@ -469,6 +500,11 @@ declare global {
        */
       'download.enable': boolean
 
+      /**
+       * 按列表名分组保存
+       */
+      'download.isSavePathGroupByListName': boolean
+
       /**
        * 下载路径
        */
@@ -494,6 +530,11 @@ declare global {
        */
       'download.isDownloadLrc': boolean
 
+      /**
+       * 是否在下载 lx 歌词
+       */
+      'download.isDownloadLxLrc': boolean
+
       /**
        * 是否下载翻译歌词文件
        */
@@ -514,6 +555,11 @@ declare global {
        */
       'download.isEmbedPic': boolean
 
+      /**
+       * 是否在音频文件中嵌入 lx 歌词
+       */
+      'download.isEmbedLyricLx': boolean
+
       /**
        * 是否在音频文件中嵌入歌词
        */
@@ -579,16 +625,6 @@ declare global {
        */
       'network.proxy.port': string
 
-      /**
-       * 代理服务器用户名
-       */
-      'network.proxy.username': string
-
-      /**
-       * 代理服务器密码
-       */
-      'network.proxy.password': string
-
       /**
        * 是否启用托盘
        */
@@ -629,6 +665,22 @@ declare global {
        */
       'sync.client.host': string
 
+
+      /**
+       * 是否启用开放API服务
+       */
+      'openAPI.enable': boolean
+
+      /**
+       * API服务端口号
+       */
+      'openAPI.port': '23330' | string
+
+      /**
+       * 是否绑定到局域网
+       */
+      'openAPI.bindLan': boolean
+
       /**
        * 是否在离开搜索界面时自动清空搜索框
        */

src/common/types/common.d.ts

@@ -37,6 +37,11 @@ declare namespace LX {
      */
     play?: string
 
+    /**
+     * 启动后最小化到系统托盘
+     */
+    hidden?: boolean
+
     [key: string]: boolean | number | string
   }
 

src/common/types/desktop_lyric.d.ts

@@ -6,6 +6,7 @@ declare namespace LX {
       'desktopLyric.isAlwaysOnTop': LX.AppSetting['desktopLyric.isAlwaysOnTop']
       'desktopLyric.isAlwaysOnTopLoop': LX.AppSetting['desktopLyric.isAlwaysOnTopLoop']
       'desktopLyric.isShowTaskbar': LX.AppSetting['desktopLyric.isShowTaskbar']
+      'desktopLyric.pauseHide': LX.AppSetting['desktopLyric.pauseHide']
       'desktopLyric.audioVisualization': LX.AppSetting['desktopLyric.audioVisualization']
       'desktopLyric.width': LX.AppSetting['desktopLyric.width']
       'desktopLyric.height': LX.AppSetting['desktopLyric.height']
@@ -33,6 +34,7 @@ declare namespace LX {
       'common.langId': LX.AppSetting['common.langId']
       'player.isShowLyricTranslation': LX.AppSetting['player.isShowLyricTranslation']
       'player.isShowLyricRoma': LX.AppSetting['player.isShowLyricRoma']
+      'player.isSwapLyricTranslationAndRoma': LX.AppSetting['player.isSwapLyricTranslationAndRoma']
       'player.isPlayLxlrc': LX.AppSetting['player.isPlayLxlrc']
       'player.playbackRate': LX.AppSetting['player.playbackRate']
     }

src/common/types/download_list.d.ts

@@ -59,6 +59,7 @@ declare global {
           ext: FileExt
           fileName: string
           filePath: string
+          listId?: string
         }
       }
 

src/common/types/music.d.ts

@@ -22,6 +22,7 @@ declare namespace LX {
       songId: string | number // 歌曲ID，mg源为copyrightId，local为文件路径
       albumName: string // 歌曲专辑名称
       picUrl?: string | null // 歌曲图片链接
+      toggleMusicInfo?: MusicInfoOnline | null
     }
 
     interface MusicInfoMeta_online extends MusicInfoMetaBase {
@@ -57,6 +58,7 @@ declare namespace LX {
       qualitys: MusicQualityTypeKg[]
       _qualitys: _MusicQualityTypeKg
       hash: string // 歌曲hash
+      albumAudioId?: string // 专辑内歌曲ID(MixSongID)，用于歌词精确搜索
     }
     interface MusicInfo_kg extends MusicInfoBase<'kg'> {
       meta: MusicInfoMeta_kg

src/common/types/open_api.d.ts

@@ -0,0 +1,26 @@
+declare namespace LX {
+  namespace OpenAPI {
+    interface Status {
+      status: boolean
+      message: string
+      address: string
+    }
+    interface EnableServer {
+      enable: boolean
+      port: string
+      bindLan: boolean
+    }
+
+    interface ActionBase <A> {
+      action: A
+    }
+    interface ActionData<A, D> extends ActionBase<A> {
+      data: D
+    }
+    type Action<A, D = undefined> = D extends undefined ? ActionBase<A> : ActionData<A, D>
+
+    type Actions = Action<'status'>
+    | Action<'enable', EnableServer>
+
+  }
+}

src/common/types/player.d.ts

@@ -11,9 +11,32 @@ declare namespace LX {
     | 'pause'
     | 'play'
     | 'next'
+    | 'seek'
+    | 'volume'
+    | 'mute'
 
     interface LyricInfo extends LX.Music.LyricInfo {
       rawlrcInfo: LX.Music.LyricInfo
     }
+
+    interface Status {
+      status: 'playing' | 'paused' | 'error' | 'stoped'
+      name: string
+      singer: string
+      albumName: string
+      picUrl: string
+      progress: number
+      duration: number
+      playbackRate: number
+      lyricLineText: string
+      lyricLineAllText: string
+      lyric: string
+      tlyric: string
+      rlyric: string
+      lxlyric: string
+      collect: boolean
+      volume: number
+      mute: boolean
+    }
   }
 }

src/common/types/theme.d.ts

@@ -262,6 +262,7 @@ declare namespace LX {
     id: string
     name: string
     isDark: boolean
+    isDarkFont: boolean
     isCustom: boolean
     config: {
       themeColors: ThemeColors

src/common/utils/common.ts

@@ -1,5 +1,6 @@
 // 非业务工具方法
 
+import { pathToFileURL } from 'url'
 /**
  * 获取两个数之间的随机整数，大于等于min，小于max
  * @param {*} min
@@ -11,7 +12,7 @@ export const getRandom = (min: number, max: number): number => Math.floor(Math.r
 export const sizeFormate = (size: number): string => {
   // https://gist.github.com/thomseddon/3511330
   if (!size) return '0 B'
-  let units = ['B', 'KB', 'MB', 'GB', 'TB']
+  let units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
   let number = Math.floor(Math.log(size) / Math.log(1024))
   return `${(size / Math.pow(1024, Math.floor(number))).toFixed(2)} ${units[number]}`
 }
@@ -71,19 +72,6 @@ export const formatPlayTime2 = (time: number) => {
 }
 
 
-const encodeNames = {
-  ' ': ' ',
-  '&': '&',
-  '&lt;': '<',
-  '&gt;': '>',
-  '&quot;': '"',
-  '&apos;': "'",
-  '&#039;': "'",
-} as const
-export const decodeName = (str: string | null = '') => {
-  return str?.replace(/(?:&amp;|&lt;|&gt;|&quot;|&apos;|&#039;|&nbsp;)/gm, (s: string) => encodeNames[s as keyof typeof encodeNames]) ?? ''
-}
-
 export const isUrl = (path: string) => /https?:\/\//.test(path)
 
 // 解析URL参数为对象
@@ -201,7 +189,7 @@ export const sortInsert = <T>(arr: Array<{ num: number, data: T }>, data: { num:
 }
 
 export const encodePath = (path: string) => {
-  return encodeURI(path.replaceAll('\\', '/'))
+  return pathToFileURL(path).href
 }
 
 

src/common/utils/download/Downloader.ts

@@ -230,6 +230,11 @@ class Task extends EventEmitter {
   __handleComplete() {
     if (this.status == STATUS.error) return
     this.__clearTimeout()
+    if (this.progress.progress <= 0) {
+      this.status = STATUS.error
+      this.emit('error', new Error('Progress is 0, download failed.'))
+      return
+    }
     void this.__closeWriteStream().then(() => {
       if (this.progress.downloaded == this.progress.total) {
         this.status = STATUS.completed
@@ -321,7 +326,7 @@ class Task extends EventEmitter {
       if (err) {
         console.log(err)
         this.__handleError(err)
-        void this.stop()
+        return
       }
       if (this.closeWaiting && !this.dataWriteQueueLength) this.ws?.close()
     })

src/common/utils/index.ts

@@ -1,4 +1,5 @@
 import log from 'electron-log/node'
+import os from 'node:os'
 
 
 export const isLinux = process.platform == 'linux'
@@ -6,6 +7,19 @@ export const isWin = process.platform == 'win32'
 export const isMac = process.platform == 'darwin'
 export const isProd = process.env.NODE_ENV == 'production'
 
+export const getPlatform = (platform: NodeJS.Platform = process.platform) => {
+  switch (platform) {
+    case 'win32': return 'windows'
+    case 'darwin': return 'mac'
+    default: return 'linux'
+  }
+}
+export const getOSVersion = (): string => {
+  const release = os.release()
+  const versionMatch = /^(\d+)/.exec(release)
+  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+  return versionMatch?.[1] || release
+}
 
 // https://stackoverflow.com/a/53387532
 export function compareVer(currentVer: string, targetVer: string): -1 | 0 | 1 {

src/common/utils/lyric-font-player/index.js

@@ -227,4 +227,8 @@ export default class Lyric {
       this._handleLinePlayerOnPlay(num, '', this.linePlayer._currentTime())
     } else this.playingLineNum = 0
   }
+
+  setDisabledAutoPause(autoPause) {
+    this.linePlayer.setDisabledAutoPause(autoPause)
+  }
 }

src/common/utils/lyric-font-player/line-player.js

@@ -2,6 +2,7 @@ import { getNow, TimeoutTools } from './utils'
 
 const timeFieldExp = /^(?:\[[\d:.]+\])+/g
 const timeExp = /\d{1,3}(:\d{1,3}){0,2}(?:\.\d{1,3})/g
+const msTimeRxp = /\[\d{1,3}(:\d{1,3}){0,2}\.\d{3}]/
 const tagRegMap = {
   title: 'ti',
   artist: 'ar',
@@ -82,6 +83,7 @@ export default class LinePlayer {
 
   _initLines() {
     this.lines = []
+    const isMsTime = msTimeRxp.test(this.lyric)
     const lines = this.lyric.split(/\r\n|\r|\n/)
     const linesMap = {}
     for (let i = 0; i < lines.length; i++) {
@@ -103,9 +105,10 @@ export default class LinePlayer {
             if (timeArr.length > 3) continue
             else if (timeArr.length < 3) for (let i = 3 - timeArr.length; i--;) timeArr.unshift('0')
             if (timeArr[2].indexOf('.') > -1) timeArr.splice(2, 1, ...timeArr[2].split('.'))
+            const msTime = timeArr[3] || '0'
 
             linesMap[timeStr] = {
-              time: parseInt(timeArr[0]) * 60 * 60 * 1000 + parseInt(timeArr[1]) * 60 * 1000 + parseInt(timeArr[2]) * 1000 + parseInt(timeArr[3] || 0),
+              time: parseInt(timeArr[0]) * 60 * 60 * 1000 + parseInt(timeArr[1]) * 60 * 1000 + parseInt(timeArr[2]) * 1000 + parseInt(isMsTime ? msTime : msTime.padEnd(3, '0')),
               text,
               extendedLyrics: [],
             }
@@ -224,4 +227,16 @@ export default class LinePlayer {
     this.extendedLyrics = extendedLyrics
     this._init()
   }
+
+  setDisabledAutoPause(disabledAutoPause) {
+    if (disabledAutoPause) {
+      timeoutTools.nextTick = (handler) => {
+        return setTimeout(handler, 20)
+      }
+      timeoutTools.cancelNextTick = clearTimeout.bind(global)
+    } else {
+      timeoutTools.nextTick = window.requestAnimationFrame.bind(window)
+      timeoutTools.cancelNextTick = window.cancelAnimationFrame.bind(window)
+    }
+  }
 }

src/common/utils/lyric-font-player/utils.js

@@ -3,6 +3,8 @@ export const getNow = typeof performance == 'object' && window.performance.now ?
 
 export class TimeoutTools {
   constructor(thresholdTime = 80) {
+    this.nextTick = window.requestAnimationFrame.bind(window)
+    this.cancelNextTick = window.cancelAnimationFrame.bind(window)
     this.invokeTime = 0
     this.animationFrameId = null
     this.timeoutId = null
@@ -11,7 +13,7 @@ export class TimeoutTools {
   }
 
   run() {
-    this.animationFrameId = window.requestAnimationFrame(() => {
+    this.animationFrameId = this.nextTick(() => {
       this.animationFrameId = null
       let diff = this.invokeTime - getNow()
       // console.log('diff', diff)
@@ -39,7 +41,7 @@ export class TimeoutTools {
 
   clear() {
     if (this.animationFrameId) {
-      window.cancelAnimationFrame(this.animationFrameId)
+      this.cancelNextTick(this.animationFrameId)
       this.animationFrameId = null
     }
     if (this.timeoutId) {

src/common/utils/lyricUtils/kg.js

@@ -0,0 +1,74 @@
+import { inflate } from 'zlib'
+import { decodeName } from './util'
+
+// https://github.com/lyswhut/lx-music-desktop/issues/296#issuecomment-683285784
+const enc_key = Buffer.from([0x40, 0x47, 0x61, 0x77, 0x5e, 0x32, 0x74, 0x47, 0x51, 0x36, 0x31, 0x2d, 0xce, 0xd2, 0x6e, 0x69], 'binary')
+const decodeLyric = str => new Promise((resolve, reject) => {
+  if (!str.length) return
+  const buf_str = Buffer.from(str, 'base64').subarray(4)
+  for (let i = 0, len = buf_str.length; i < len; i++) {
+    buf_str[i] = buf_str[i] ^ enc_key[i % 16]
+  }
+  inflate(buf_str, (err, result) => {
+    if (err) return reject(err)
+    resolve(result.toString())
+  })
+})
+
+const headExp = /^.*\[id:\$\w+\]\n/
+
+const parseLyric = str => {
+  str = str.replace(/\r/g, '')
+  if (headExp.test(str)) str = str.replace(headExp, '')
+  let trans = str.match(/\[language:([\w=\\/+]+)\]/)
+  let lyric
+  let rlyric
+  let tlyric
+  if (trans) {
+    str = str.replace(/\[language:[\w=\\/+]+\]\n/, '')
+    let json = JSON.parse(Buffer.from(trans[1], 'base64').toString())
+    for (const item of json.content) {
+      switch (item.type) {
+        case 0:
+          rlyric = item.lyricContent
+          break
+        case 1:
+          tlyric = item.lyricContent
+          break
+      }
+    }
+  }
+  let i = 0
+  let lxlyric = str.replace(/\[((\d+),\d+)\].*/g, str => {
+    let result = str.match(/\[((\d+),\d+)\].*/)
+    let time = parseInt(result[2])
+    let ms = (time % 1000).toString().padStart(3, '0')
+    time /= 1000
+    let m = parseInt(time / 60).toString().padStart(2, '0')
+    time %= 60
+    let s = parseInt(time).toString().padStart(2, '0')
+    time = `${m}:${s}.${ms}`
+    if (rlyric) rlyric[i] = `[${time}]${rlyric[i]?.join('') ?? ''}`
+    if (tlyric) tlyric[i] = `[${time}]${tlyric[i]?.join('') ?? ''}`
+    i++
+    return str.replace(result[1], time)
+  })
+  rlyric = rlyric ? rlyric.join('\n') : ''
+  tlyric = tlyric ? tlyric.join('\n') : ''
+  lxlyric = lxlyric.replace(/<(\d+,\d+),\d+>/g, '<$1>')
+  lxlyric = decodeName(lxlyric)
+  lyric = lxlyric.replace(/<\d+,\d+>/g, '')
+  rlyric = decodeName(rlyric)
+  tlyric = decodeName(tlyric)
+  return {
+    lyric,
+    tlyric,
+    rlyric,
+    lxlyric,
+  }
+}
+
+
+export const decodeKrc = async(data) => {
+  return decodeLyric(data).then(parseLyric)
+}

src/common/utils/lyricUtils/util.ts

@@ -0,0 +1,13 @@
+const encodeNames = {
+  ' ': ' ',
+  '&': '&',
+  '&lt;': '<',
+  '&gt;': '>',
+  '&quot;': '"',
+  '&apos;': "'",
+  '&#039;': "'",
+} as const
+
+export const decodeName = (str: string | null = '') => {
+  return str?.replace(/(?:&amp;|&lt;|&gt;|&quot;|&apos;|&#039;|&nbsp;)/gm, (s: string) => encodeNames[s as keyof typeof encodeNames]) ?? ''
+}

src/common/utils/migrateSetting.ts

@@ -57,7 +57,6 @@ export default (setting: any): Partial<LX.AppSetting> => {
     setting['common.controlBtnPosition'] = setting.controlBtnPosition
 
     setting['player.togglePlayMethod'] = setting.player?.togglePlayMethod
-    setting['player.highQuality'] = setting.player?.highQuality
     setting['player.isShowTaskProgess'] = setting.player?.isShowTaskProgess
     setting['player.volume'] = setting.player?.volume
     setting['player.isMute'] = setting.player?.isMute
@@ -117,8 +116,6 @@ export default (setting: any): Partial<LX.AppSetting> => {
     setting['network.proxy.enable'] = setting.network?.proxy?.enable
     setting['network.proxy.host'] = setting.network?.proxy?.host
     setting['network.proxy.port'] = setting.network?.proxy?.port
-    setting['network.proxy.username'] = setting.network?.proxy?.username
-    setting['network.proxy.password'] = setting.network?.proxy?.password
 
     setting['tray.enable'] = setting.tray?.enable
     setting['tray.themeId'] = setting.tray?.themeId

src/common/utils/musicMeta/downloader.js

@@ -1,14 +1,21 @@
 const http = require('http')
 const https = require('https')
 const fs = require('fs')
+const { httpOverHttp, httpsOverHttp } = require('tunnel')
 
-const sendRequest = (url) => {
+const httpsRxp = /^https:/
+const getRequestAgent = (url, proxy) => {
+  return proxy ? (httpsRxp.test(url) ? httpsOverHttp : httpOverHttp)({ proxy }) : undefined
+}
+
+const sendRequest = (url, proxy) => {
   const urlParse = new URL(url)
   const httpOptions = {
     method: 'get',
     host: urlParse.hostname,
     port: urlParse.port,
     path: urlParse.pathname + urlParse.search,
+    agent: getRequestAgent(url, proxy),
     headers: {
       'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
     },
@@ -20,9 +27,9 @@ const sendRequest = (url) => {
     : http.request(httpOptions)
 }
 
-module.exports = (url, filePath) => {
+module.exports = (url, filePath, proxy) => {
   return new Promise((resolve) => {
-    sendRequest(url)
+    sendRequest(url, proxy)
       .on('response', response => {
         // console.log(response.statusCode)
         if (response.statusCode !== 200 && response.statusCode != 206) {

src/common/utils/musicMeta/flacMeta.js

@@ -57,7 +57,7 @@ const writeMeta = async(filePath, meta, picPath) => {
   })
 }
 
-module.exports = (filePath, meta) => {
+module.exports = (filePath, meta, proxy) => {
   if (!meta.APIC) return writeMeta(filePath, meta)
   let picUrl = meta.APIC
   delete meta.APIC
@@ -68,7 +68,7 @@ module.exports = (filePath, meta) => {
   let picPath = filePath.replace(/\.flac$/, '') + (ext ? ext.replace(extReg, '$1') : '.jpg')
 
   if (picUrl.includes('music.126.net')) picUrl += `${picUrl.includes('?') ? '&' : '?'}param=500y500`
-  download(picUrl, picPath).then(success => {
+  download(picUrl, picPath, proxy).then(success => {
     if (success) {
       writeMeta(filePath, meta, picPath).finally(() => {
         fs.unlink(picPath, err => {

src/common/utils/musicMeta/index.d.ts

@@ -5,4 +5,4 @@ export interface MusicMeta {
   APIC: string | null
   lyrics: string | null
 }
-export function setMeta(filePath: string, meta: MusicMeta): void
+export function setMeta(filePath: string, meta: MusicMeta, proxy?: { host: string, port: number }): void

src/common/utils/musicMeta/index.js

@@ -2,13 +2,13 @@ const path = require('path')
 const mp3Meta = require('./mp3Meta')
 const flacMeta = require('./flacMeta')
 
-exports.setMeta = (filePath, meta) => {
+exports.setMeta = (filePath, meta, proxy) => {
   switch (path.extname(filePath)) {
     case '.mp3':
-      mp3Meta(filePath, meta)
+      mp3Meta(filePath, meta, proxy)
       break
     case '.flac':
-      flacMeta(filePath, meta)
+      flacMeta(filePath, meta, proxy)
       break
   }
 }

src/common/utils/musicMeta/mp3Meta.js

@@ -15,7 +15,7 @@ const handleWriteMeta = (meta, filePath) => {
   NodeID3.write(meta, filePath)
 }
 
-module.exports = (filePath, meta) => {
+module.exports = (filePath, meta, proxy) => {
   if (!meta.APIC) return handleWriteMeta(meta, filePath)
   if (!/^http/.test(meta.APIC)) {
     delete meta.APIC
@@ -26,7 +26,7 @@ module.exports = (filePath, meta) => {
 
   let picUrl = meta.APIC
   if (picUrl.includes('music.126.net')) picUrl += `${picUrl.includes('?') ? '&' : '?'}param=500y500`
-  download(picUrl, picPath).then(success => {
+  download(picUrl, picPath, proxy).then(success => {
     if (success) {
       meta.APIC = picPath
       handleWriteMeta(meta, filePath)

src/common/utils/nodejs.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import crypto from 'node:crypto'
 import { gzip, gunzip } from 'node:zlib'
 import path from 'node:path'
+import { networkInterfaces } from 'node:os'
 import { log } from '@common/utils'
 
 export const joinPath = (...paths: string[]): string => path.join(...paths)
@@ -30,6 +31,25 @@ export const checkPath = async(path: string): Promise<boolean> => {
   })
 }
 
+/**
+ * 检查路径并创建目录
+ * @param path
+ * @returns
+ */
+export const checkAndCreateDir = async(path: string) => {
+  return fs.promises.access(path, fs.constants.F_OK | fs.constants.W_OK)
+    .catch(async(err: NodeJS.ErrnoException) => {
+      if (err.code != 'ENOENT') throw err as Error
+      return fs.promises.mkdir(path, { recursive: true })
+    })
+    .then(() => true)
+    .catch((err) => {
+      console.error(err)
+      return false
+    })
+}
+
+
 export const getFileStats = async(path: string): Promise<fs.Stats | null> => {
   return new Promise(resolve => {
     if (!path) {
@@ -185,3 +205,20 @@ export const copyFile = async(sourcePath: string, distPath: string) => {
 export const moveFile = async(sourcePath: string, distPath: string) => {
   return fs.promises.rename(sourcePath, distPath)
 }
+
+export const getAddress = (): string[] => {
+  const nets = networkInterfaces()
+  const results: string[] = []
+  // console.log(nets)
+
+  for (const interfaceInfos of Object.values(nets)) {
+    if (!interfaceInfos) continue
+    // Skip over non-IPv4 and internal (i.e. 127.0.0.1) addresses
+    for (const interfaceInfo of interfaceInfos) {
+      if (interfaceInfo.family === 'IPv4' && !interfaceInfo.internal) {
+        results.push(interfaceInfo.address)
+      }
+    }
+  }
+  return results
+}

src/common/utils/renderer.ts

@@ -342,7 +342,7 @@ export const scrollXRTo = (element: ScrollElement<HTMLElement>, to: number, dura
   */
 let dom_title = document.getElementsByTagName('title')[0]
 export const setTitle = (title: string | null) => {
-  title ||= '洛雪音乐助手'
+  title ||= 'LX Music'
   dom_title.innerText = title
 }
 

src/common/utils/request.ts

@@ -0,0 +1,274 @@
+import qs from 'node:querystring'
+import {
+  FormData,
+  getGlobalDispatcher,
+  interceptors,
+  request as nodeRrequest,
+  ProxyAgent,
+  setGlobalDispatcher,
+  type Dispatcher,
+} from 'undici'
+
+const defaultOptions: Options = {
+  timeout: 15000,
+  headers: {
+    'User-Agent':
+      'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
+  },
+  maxRedirect: 5,
+} as const
+const redirectDispatcher = interceptors.redirect({ maxRedirections: defaultOptions.maxRedirect })
+const dispatchers = [
+  interceptors.retry({
+    maxRetries: 3,
+    minTimeout: 1000,
+    maxTimeout: 10000,
+    timeoutFactor: 2,
+    retryAfter: true,
+  }),
+  // interceptors.responseError(),
+] as const
+let proxyAgent: ProxyAgent | null = null
+let globalDispatcher = getGlobalDispatcher()
+const buildDispatcher = (redirectDispatcher: Dispatcher.DispatcherComposeInterceptor | null, retryNum = 3) => {
+  const otherInterceptors =
+    retryNum == 3
+      ? dispatchers
+      : [
+          interceptors.retry({
+            maxRetries: retryNum,
+            minTimeout: 1000,
+            maxTimeout: 6000,
+            timeoutFactor: 2,
+            retryAfter: true,
+          }),
+        ]
+  if (redirectDispatcher) {
+    return (proxyAgent ?? globalDispatcher).compose(redirectDispatcher, ...otherInterceptors)
+  }
+  return (proxyAgent ?? globalDispatcher).compose(...otherInterceptors)
+}
+
+setGlobalDispatcher(buildDispatcher(redirectDispatcher))
+
+export const setProxy = (url?: string) => {
+  proxyAgent = url ? new ProxyAgent(url) : null
+  setGlobalDispatcher(buildDispatcher(redirectDispatcher))
+}
+export const setProxyByHost = (host?: string, port?: string) => {
+  setProxy(host ? `http://${host}:${port}` : undefined)
+}
+const CONTENT_TYPE = {
+  json: 'application/json',
+  form: 'application/x-www-form-urlencoded',
+  text: 'text/plain',
+  formdata: 'multipart/form-data',
+  xml: 'application/xml',
+  binary: 'application/octet-stream',
+}
+type ParamsData = Record<string, string | number | null | undefined | boolean>
+export interface Options {
+  method?:
+  | 'GET'
+  | 'HEAD'
+  | 'POST'
+  | 'PUT'
+  | 'DELETE'
+  | 'OPTIONS'
+  | 'PATCH'
+  | 'PROPFIND'
+  | 'COPY'
+  | 'MOVE'
+  | 'MKCOL'
+  | 'PROPPATCH'
+  | 'QUOTA'
+  query?: ParamsData
+  headers?: Record<string, string | string[]>
+  timeout?: number
+  maxRedirect?: number
+  signal?: AbortController['signal']
+  json?: Record<string, unknown>
+  form?: ParamsData
+  binary?: Buffer | Uint8Array
+  text?: string
+  formdata?: Record<string, string | Buffer | Uint8Array>
+  xml?: string
+  needBody?: boolean
+  needRaw?: boolean
+  retryNum?: number
+}
+export interface Response<Res> {
+  headers: {
+    accept?: string | undefined
+    'accept-language'?: string | undefined
+    'accept-patch'?: string | undefined
+    'accept-ranges'?: string | undefined
+    'access-control-allow-credentials'?: string | undefined
+    'access-control-allow-headers'?: string | undefined
+    'access-control-allow-methods'?: string | undefined
+    'access-control-allow-origin'?: string | undefined
+    'access-control-expose-headers'?: string | undefined
+    'access-control-max-age'?: string | undefined
+    'access-control-request-headers'?: string | undefined
+    'access-control-request-method'?: string | undefined
+    age?: string | undefined
+    allow?: string | undefined
+    'alt-svc'?: string | undefined
+    authorization?: string | undefined
+    'cache-control'?: string | undefined
+    connection?: string | undefined
+    'content-disposition'?: string | undefined
+    'content-encoding'?: string | undefined
+    'content-language'?: string | undefined
+    'content-length'?: string | undefined
+    'content-location'?: string | undefined
+    'content-range'?: string | undefined
+    'content-type'?: string | undefined
+    cookie?: string | undefined
+    date?: string | undefined
+    etag?: string | undefined
+    expect?: string | undefined
+    expires?: string | undefined
+    forwarded?: string | undefined
+    from?: string | undefined
+    host?: string | undefined
+    'if-match'?: string | undefined
+    'if-modified-since'?: string | undefined
+    'if-none-match'?: string | undefined
+    'if-unmodified-since'?: string | undefined
+    'last-modified'?: string | undefined
+    location?: string | undefined
+    origin?: string | undefined
+    pragma?: string | undefined
+    'proxy-authenticate'?: string | undefined
+    'proxy-authorization'?: string | undefined
+    'public-key-pins'?: string | undefined
+    range?: string | undefined
+    referer?: string | undefined
+    'retry-after'?: string | undefined
+    'sec-websocket-accept'?: string | undefined
+    'sec-websocket-extensions'?: string | undefined
+    'sec-websocket-key'?: string | undefined
+    'sec-websocket-protocol'?: string | undefined
+    'sec-websocket-version'?: string | undefined
+    'set-cookie'?: string[] | undefined
+    'strict-transport-security'?: string | undefined
+    tk?: string | undefined
+    trailer?: string | undefined
+    'transfer-encoding'?: string | undefined
+    upgrade?: string | undefined
+    'user-agent'?: string | undefined
+    vary?: string | undefined
+    via?: string | undefined
+    warning?: string | undefined
+    'www-authenticate'?: string | undefined
+  }
+  body: Res
+  raw: Uint8Array
+  statusCode?: number
+  statusMessage?: string
+}
+
+const buildRequestBody = (options: Options) => {
+  let contentType: string | undefined
+  let body: string | Buffer | Uint8Array | FormData | undefined
+  if (options.json != null) {
+    contentType = CONTENT_TYPE.json
+    body = JSON.stringify(options.json)
+  } else if (options.form != null) {
+    contentType = CONTENT_TYPE.form
+    body = qs.stringify(options.form)
+  } else if (options.binary != null) {
+    contentType = CONTENT_TYPE.binary
+    body = options.binary
+  } else if (options.formdata != null) {
+    const formdata = new FormData()
+    // eslint-disable-next-line guard-for-in
+    for (const key in options.formdata) {
+      formdata.append(key, options.formdata[key])
+    }
+    contentType = CONTENT_TYPE.formdata
+    body = formdata
+  } else if (options.xml != null) {
+    contentType = CONTENT_TYPE.xml
+    body = options.xml
+  } else if (options.text != null) {
+    contentType = CONTENT_TYPE.text
+    body = options.text
+  }
+  const headers = options.headers ?? {}
+  if (headers['Content-Type']) {
+    contentType = headers['Content-Type'] as string
+  }
+  const finalHeaders: NonNullable<Options['headers']> = { ...defaultOptions.headers, ...headers }
+  if (contentType) finalHeaders['Content-Type'] = contentType
+  return [finalHeaders, body] as const
+}
+
+const buildRequestDispatcher = (options: Options) => {
+  let dispatcher: Dispatcher.ComposedDispatcher | undefined
+
+  if (options.maxRedirect != null) {
+    if (options.maxRedirect != defaultOptions.maxRedirect) {
+      if (options.maxRedirect) {
+        dispatcher = buildDispatcher(interceptors.redirect({ maxRedirections: options.maxRedirect }), options.retryNum)
+      } else {
+        dispatcher = buildDispatcher(null, options.retryNum)
+      }
+    }
+  }
+  return dispatcher
+}
+
+export const request = async <T = unknown>(url: string, options: Options = {}): Promise<Response<T>> => {
+  const method = options.method?.toUpperCase() ?? 'GET'
+  const timeout = options.timeout ?? defaultOptions.timeout
+  const [headers, body] = buildRequestBody(options)
+  // console.log(url, {
+  //   method,
+  //   bodyTimeout: timeout,
+  //   headersTimeout: timeout,
+  //   headers,
+  //   query: options.query,
+  //   body,
+  //   signal: options.signal,
+  //   dispatcher: buildRequestDispatcher(options),
+  // })
+  return nodeRrequest(url, {
+    method,
+    bodyTimeout: timeout,
+    headersTimeout: timeout,
+    headers,
+    query: options.query,
+    body,
+    signal: options.signal,
+    dispatcher: buildRequestDispatcher(options),
+  }).then(async(response) => {
+    if (options.needBody) {
+      return {
+        headers: response.headers,
+        statusCode: response.statusCode,
+        body: response.body as unknown as T,
+      } satisfies Omit<Response<T>, 'raw'> as Response<T>
+    }
+    if (options.needRaw) {
+      return {
+        headers: response.headers,
+        statusCode: response.statusCode,
+        raw: await response.body.bytes(),
+      } satisfies Omit<Response<T>, 'body'> as Response<T>
+    }
+    // console.log(response)
+    let body = (await response.body.text()) as T
+    if (!headers['Content-Type'] || headers['Content-Type'].includes(CONTENT_TYPE.json)) {
+      try {
+        body = JSON.parse(body as string) as T
+      } catch {}
+    }
+    return {
+      body,
+      headers: response.headers,
+      statusCode: response.statusCode,
+    } satisfies Omit<Response<T>, 'raw'> as Response<T>
+  })
+}

src/common/utils/request_node16.ts

@@ -0,0 +1,238 @@
+import qs from 'node:querystring'
+import {
+  FormData,
+  getGlobalDispatcher,
+  request as nodeRrequest,
+  ProxyAgent,
+  setGlobalDispatcher,
+  type Dispatcher,
+} from 'undici'
+
+const defaultOptions: Options = {
+  timeout: 15000,
+  headers: {
+    'User-Agent':
+      'Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36',
+  },
+  maxRedirect: 5,
+} as const
+let proxyAgent: ProxyAgent | null = null
+let globalDispatcher = getGlobalDispatcher()
+const buildDispatcher = () => {
+  return proxyAgent ?? globalDispatcher
+}
+
+setGlobalDispatcher(buildDispatcher())
+
+export const setProxy = (url?: string) => {
+  proxyAgent = url ? new ProxyAgent(url) : null
+  setGlobalDispatcher(buildDispatcher())
+}
+export const setProxyByHost = (host?: string, port?: string) => {
+  console.log(host)
+  setProxy(host ? `http://${host}:${port}` : undefined)
+}
+const CONTENT_TYPE = {
+  json: 'application/json',
+  form: 'application/x-www-form-urlencoded',
+  text: 'text/plain',
+  formdata: 'multipart/form-data',
+  xml: 'application/xml',
+  binary: 'application/octet-stream',
+}
+type ParamsData = Record<string, string | number | null | undefined | boolean>
+export interface Options {
+  method?:
+  | 'GET'
+  | 'HEAD'
+  | 'POST'
+  | 'PUT'
+  | 'DELETE'
+  | 'OPTIONS'
+  | 'PATCH'
+  | 'PROPFIND'
+  | 'COPY'
+  | 'MOVE'
+  | 'MKCOL'
+  | 'PROPPATCH'
+  | 'QUOTA'
+  query?: ParamsData
+  headers?: Record<string, string | string[]>
+  timeout?: number
+  maxRedirect?: number
+  signal?: AbortController['signal']
+  json?: Record<string, unknown>
+  form?: ParamsData
+  binary?: Buffer | Uint8Array
+  text?: string
+  formdata?: Record<string, string | Buffer | Uint8Array>
+  xml?: string
+  needBody?: boolean
+  needRaw?: boolean
+  retryNum?: number
+}
+export interface Response<Res> {
+  headers: {
+    accept?: string | undefined
+    'accept-language'?: string | undefined
+    'accept-patch'?: string | undefined
+    'accept-ranges'?: string | undefined
+    'access-control-allow-credentials'?: string | undefined
+    'access-control-allow-headers'?: string | undefined
+    'access-control-allow-methods'?: string | undefined
+    'access-control-allow-origin'?: string | undefined
+    'access-control-expose-headers'?: string | undefined
+    'access-control-max-age'?: string | undefined
+    'access-control-request-headers'?: string | undefined
+    'access-control-request-method'?: string | undefined
+    age?: string | undefined
+    allow?: string | undefined
+    'alt-svc'?: string | undefined
+    authorization?: string | undefined
+    'cache-control'?: string | undefined
+    connection?: string | undefined
+    'content-disposition'?: string | undefined
+    'content-encoding'?: string | undefined
+    'content-language'?: string | undefined
+    'content-length'?: string | undefined
+    'content-location'?: string | undefined
+    'content-range'?: string | undefined
+    'content-type'?: string | undefined
+    cookie?: string | undefined
+    date?: string | undefined
+    etag?: string | undefined
+    expect?: string | undefined
+    expires?: string | undefined
+    forwarded?: string | undefined
+    from?: string | undefined
+    host?: string | undefined
+    'if-match'?: string | undefined
+    'if-modified-since'?: string | undefined
+    'if-none-match'?: string | undefined
+    'if-unmodified-since'?: string | undefined
+    'last-modified'?: string | undefined
+    location?: string | undefined
+    origin?: string | undefined
+    pragma?: string | undefined
+    'proxy-authenticate'?: string | undefined
+    'proxy-authorization'?: string | undefined
+    'public-key-pins'?: string | undefined
+    range?: string | undefined
+    referer?: string | undefined
+    'retry-after'?: string | undefined
+    'sec-websocket-accept'?: string | undefined
+    'sec-websocket-extensions'?: string | undefined
+    'sec-websocket-key'?: string | undefined
+    'sec-websocket-protocol'?: string | undefined
+    'sec-websocket-version'?: string | undefined
+    'set-cookie'?: string[] | undefined
+    'strict-transport-security'?: string | undefined
+    tk?: string | undefined
+    trailer?: string | undefined
+    'transfer-encoding'?: string | undefined
+    upgrade?: string | undefined
+    'user-agent'?: string | undefined
+    vary?: string | undefined
+    via?: string | undefined
+    warning?: string | undefined
+    'www-authenticate'?: string | undefined
+  }
+  body: Res
+  raw: Uint8Array
+  statusCode?: number
+  statusMessage?: string
+}
+
+const buildRequestBody = (options: Options) => {
+  let contentType: string | undefined
+  let body: string | Buffer | Uint8Array | FormData | undefined
+  if (options.json != null) {
+    contentType = CONTENT_TYPE.json
+    body = JSON.stringify(options.json)
+  } else if (options.form != null) {
+    contentType = CONTENT_TYPE.form
+    body = qs.stringify(options.form)
+  } else if (options.binary != null) {
+    contentType = CONTENT_TYPE.binary
+    body = options.binary
+  } else if (options.formdata != null) {
+    const formdata = new FormData()
+    // eslint-disable-next-line guard-for-in
+    for (const key in options.formdata) {
+      formdata.append(key, options.formdata[key])
+    }
+    contentType = CONTENT_TYPE.formdata
+    body = formdata
+  } else if (options.xml != null) {
+    contentType = CONTENT_TYPE.xml
+    body = options.xml
+  } else if (options.text != null) {
+    contentType = CONTENT_TYPE.text
+    body = options.text
+  }
+  const headers = options.headers ?? {}
+  if (headers['Content-Type']) {
+    contentType = headers['Content-Type'] as string
+  }
+  const finalHeaders: NonNullable<Options['headers']> = { ...defaultOptions.headers, ...headers }
+  if (contentType) finalHeaders['Content-Type'] = contentType
+  return [finalHeaders, body] as const
+}
+
+const buildRequestDispatcher = (options: Options) => {
+  return buildDispatcher()
+}
+
+export const request = async <T = unknown>(url: string, options: Options = {}): Promise<Response<T>> => {
+  const method = (options.method?.toUpperCase() ?? 'GET') as Dispatcher.RequestOptions['method']
+  const timeout = options.timeout ?? defaultOptions.timeout
+  const [headers, body] = buildRequestBody(options)
+  // console.log(url, {
+  //   method,
+  //   bodyTimeout: timeout,
+  //   headersTimeout: timeout,
+  //   headers,
+  //   query: options.query,
+  //   body,
+  //   signal: options.signal,
+  //   dispatcher: buildRequestDispatcher(options),
+  // })
+  return nodeRrequest(url, {
+    method,
+    bodyTimeout: timeout,
+    headersTimeout: timeout,
+    headers,
+    query: options.query,
+    body,
+    signal: options.signal,
+    dispatcher: buildRequestDispatcher(options),
+    maxRedirections: options.maxRedirect ?? defaultOptions.maxRedirect,
+  }).then(async(response) => {
+    if (options.needBody) {
+      return {
+        headers: response.headers,
+        statusCode: response.statusCode,
+        body: response.body as unknown as T,
+      } satisfies Omit<Response<T>, 'raw'> as Response<T>
+    }
+    if (options.needRaw) {
+      return {
+        headers: response.headers,
+        statusCode: response.statusCode,
+        raw: new Uint8Array(await response.body.arrayBuffer()),
+      } satisfies Omit<Response<T>, 'body'> as unknown as Response<T>
+    }
+    // console.log(response)
+    let body = (await response.body.text()) as T
+    if (!headers['Content-Type'] || headers['Content-Type'].includes(CONTENT_TYPE.json)) {
+      try {
+        body = JSON.parse(body as string) as T
+      } catch {}
+    }
+    return {
+      body,
+      headers: response.headers,
+      statusCode: response.statusCode,
+    } satisfies Omit<Response<T>, 'raw'> as Response<T>
+  })
+}

src/common/utils/tools.ts

@@ -6,6 +6,14 @@ export const toNewMusicInfo = (oldMusicInfo: any): LX.Music.MusicInfo => {
     albumName: oldMusicInfo.albumName, // 歌曲专辑名称
     picUrl: oldMusicInfo.img, // 歌曲图片链接
   }
+  const newInfo = {
+    id: `${oldMusicInfo.source}_${oldMusicInfo.songmid}`,
+    name: oldMusicInfo.name,
+    singer: oldMusicInfo.singer,
+    source: oldMusicInfo.source,
+    interval: oldMusicInfo.interval,
+    meta: meta as LX.Music.MusicInfoOnline['meta'],
+  }
 
   if (oldMusicInfo.source == 'local') {
     meta.filePath = oldMusicInfo.filePath ?? oldMusicInfo.songmid ?? ''
@@ -27,6 +35,8 @@ export const toNewMusicInfo = (oldMusicInfo: any): LX.Music.MusicInfo => {
     switch (oldMusicInfo.source) {
       case 'kg':
         meta.hash = oldMusicInfo.hash
+        meta.albumAudioId = oldMusicInfo.albumAudioId
+        newInfo.id = oldMusicInfo.songmid + '_' + oldMusicInfo.hash
         break
       case 'tx':
         meta.strMediaMid = oldMusicInfo.strMediaMid
@@ -42,14 +52,7 @@ export const toNewMusicInfo = (oldMusicInfo: any): LX.Music.MusicInfo => {
     }
   }
 
-  return {
-    id: `${oldMusicInfo.source as string}_${oldMusicInfo.songmid as string}`,
-    name: oldMusicInfo.name,
-    singer: oldMusicInfo.singer,
-    source: oldMusicInfo.source,
-    interval: oldMusicInfo.interval,
-    meta: meta as LX.Music.MusicInfoOnline['meta'],
-  }
+  return newInfo
 }
 
 export const toOldMusicInfo = (minfo: LX.Music.MusicInfo) => {
@@ -77,6 +80,7 @@ export const toOldMusicInfo = (minfo: LX.Music.MusicInfo) => {
     switch (minfo.source) {
       case 'kg':
         oInfo.hash = minfo.meta.hash
+        oInfo.albumAudioId = minfo.meta.albumAudioId
         break
       case 'tx':
         oInfo.strMediaMid = minfo.meta.strMediaMid
@@ -128,3 +132,25 @@ export const filterMusicList = <T extends LX.Music.MusicInfo>(list: T[]): T[] =>
     return true
   })
 }
+
+
+const MAX_NAME_LENGTH = 80
+const MAX_FILE_NAME_LENGTH = 150
+export const clipNameLength = (name: string) => {
+  if (name.length <= MAX_NAME_LENGTH || !name.includes('、')) return name
+  const names = name.split('、')
+  let newName = names.shift()!
+  for (const name of names) {
+    if (newName.length + name.length > MAX_NAME_LENGTH) break
+    newName = newName + '、' + name
+  }
+  return newName
+}
+export const clipFileNameLength = (name: string) => {
+  return name.length > MAX_FILE_NAME_LENGTH ? name.substring(0, MAX_FILE_NAME_LENGTH) : name
+}
+
+export const formatMusicName = (format: string, name: string, singer: string) => {
+  // return format.replace(/歌名|歌手/g, match => match === '歌名' ? name : singer)
+  return format.replace('歌手', singer).replace('歌名', name)
+}

src/lang/index.ts

@@ -1,14 +1,28 @@
 import zh_cn from './zh-cn.json'
 import zh_tw from './zh-tw.json'
 import en_us from './en-us.json'
+import ko_kr from './ko-kr.json'
 
 type Message = Record<keyof typeof zh_cn, string>
 | Record<keyof typeof zh_tw, string>
 | Record<keyof typeof en_us, string>
+| Record<keyof typeof ko_kr, string>
 
 type Messages = Record<(typeof langs)[number]['locale'], Message>
 
 const langs = [
+  {
+    name: 'English',
+    locale: 'en-us',
+    country: 'us',
+    message: en_us,
+  },
+  {
+    name: '한국어',
+    locale: 'ko-kr',
+    country: 'kr',
+    message: ko_kr,
+  },
   {
     name: '简体中文',
     locale: 'zh-cn',
@@ -18,18 +32,12 @@ const langs = [
     message: zh_cn,
   },
   {
-    name: '繁体中文',
+    name: '繁體中文',
     locale: 'zh-tw',
     // alternate: 'zh-hk',
     country: 'cn',
     message: zh_tw,
   },
-  {
-    name: 'English',
-    locale: 'en-us',
-    country: 'us',
-    message: en_us,
-  },
 ] as const
 
 const langList: Array<{

src/lang/ko-kr.json

@@ -0,0 +1,748 @@
+{
+  "action": "동작",
+  "agree": "동의",
+  "alert_button_text": "확인",
+  "audio_visualization": "오디오 시각화 (실험적 기능)",
+  "back": "뒤로",
+  "btn_cancel": "취소",
+  "btn_close": "닫기",
+  "btn_confirm": "확인",
+  "btn_save": "저장",
+  "cancel_button_text": "취소",
+  "cancel_button_text_2": "아니요, 잘못 눌렀어요",
+  "close": "닫기",
+  "comment__hot_load_error": "인기 댓글을 불러오지 못했습니다. 클릭하여 다시 시도하세요.",
+  "comment__hot_loading": "인기 댓글을 불러오는 중...",
+  "comment__hot_title": "인기 댓글",
+  "comment__location": "{location}에서",
+  "comment__new_load_error": "최신 댓글을 불러오지 못했습니다. 클릭하여 다시 시도하세요.",
+  "comment__new_loading": "최신 댓글을 불러오는 중...",
+  "comment__new_title": "최신 댓글",
+  "comment__no_content": "아직 댓글이 없습니다",
+  "comment__refresh": "댓글 새로고침",
+  "comment__show": "노래 댓글",
+  "comment__title": "\"{name}\"의 댓글",
+  "comment__unavailable": "이 노래의 댓글을 가져올 수 없습니다.",
+  "confirm_button_text": "예",
+  "copy_tip": " (클릭하여 복사)",
+  "date_format_hour": "{num}시간 전",
+  "date_format_minute": "{num}분 전",
+  "date_format_second": "{num}초 전",
+  "deep_link__handle_error_tip": "호출 실패: {message}",
+  "default": "기본값",
+  "default_list": "기본 목록",
+  "desktop_lyric__back": "뒤로",
+  "desktop_lyric__close": "닫기",
+  "desktop_lyric__font_decrease": "글자 크기 줄이기",
+  "desktop_lyric__font_increase": "글자 크기 늘리기",
+  "desktop_lyric__lock": "잠금",
+  "desktop_lyric__lrc_active_zoom_off": "재생 중인 가사 확대 해제",
+  "desktop_lyric__lrc_active_zoom_on": "재생 중인 가사 확대",
+  "desktop_lyric__opacity_decrease": "투명도 높이기\n(우클릭하여 세밀 조정)",
+  "desktop_lyric__opacity_increase": "투명도 낮추기\n(우클릭하여 세밀 조정)",
+  "desktop_lyric__theme": "테마 색상",
+  "desktop_lyric__unlock": "잠금 해제",
+  "desktop_lyric__win_top_off": "항상 위 유지",
+  "desktop_lyric__win_top_on": "항상 위 해제",
+  "download": "다운로드",
+  "download___status_completed": "다운로드 완료",
+  "download___status_error": "오류",
+  "download___status_paused": "일시정지됨",
+  "download___status_running": "다운로드 중",
+  "download___status_waiting": "다운로드 대기 중",
+  "download__all": "전체 작업",
+  "download__error": "오류",
+  "download__finished": "완료",
+  "download__high_quality": "고음질",
+  "download__lossless": "무손실",
+  "download__multiple_tip": "{len}곡 선택됨",
+  "download__multiple_tip2": "원하는 다운로드 음질을 선택하세요",
+  "download__normal": "일반",
+  "download__not_available_tip": "해당 음질을 사용할 수 없습니다.",
+  "download__paused": "일시정지됨",
+  "download__progress": "진행률",
+  "download__quality": "음질",
+  "download__running": "다운로드 중",
+  "download__status": "상태",
+  "download_status_error_check_path": "다운로드 경로 확인 중 오류가 발생했습니다. 설정한 다운로드 폴더가 정상인지 확인해 주세요",
+  "download_status_error_check_path_exist": "동일한 이름의 파일이 존재하여 다운로드를 건너뛰었습니다",
+  "download_status_error_refresh_url": "링크가 만료되어 새로고침 중...",
+  "download_status_error_response": "다운로드 실패: ",
+  "download_status_error_url_failed": "노래 링크를 가져오지 못했습니다",
+  "download_status_error_write": "다운로드 위치가 사용 중이거나 쓰기 권한이 없습니다. 다운로드 폴더를 변경하거나 앱/기기를 재시작해 보세요. 오류 상세: ",
+  "download_status_start": "다운로드 시작",
+  "download_status_url_getting": "노래 링크를 가져오는 중...",
+  "download_status_write_queue": "데이터 쓰는 중 ({num})",
+  "duplicate_list_tip": "이미 \"{name}\" 목록을 담은 적이 있습니다. 목록의 곡을 업데이트하시겠습니까?",
+  "export": "내보내기",
+  "fullscreen_exit": "전체화면 종료",
+  "history_clear": "기록 지우기",
+  "history_remove": "우클릭하여 이 항목 삭제",
+  "history_search": "검색 기록",
+  "import": "가져오기",
+  "leaderboard": "차트",
+  "list__add_to": "추가할 위치...",
+  "list__collect": "담기",
+  "list__copy_name": "이름 복사",
+  "list__dislike": "싫어요",
+  "list__download": "다운로드",
+  "list__export_part_desc": "목록 파일을 저장할 위치를 선택하세요",
+  "list__file": "파일 위치 열기",
+  "list__import_part_button_cancel": "취소",
+  "list__import_part_button_confirm": "덮어쓰기",
+  "list__import_part_confirm": "가져온 목록({importName})의 ID가 로컬 목록({localName})과 동일합니다. 로컬 목록을 덮어쓰시겠습니까?",
+  "list__import_part_desc": "목록 파일을 선택하세요",
+  "list__load_failed": "이런, 불러오기에 실패했습니다 😭",
+  "list__loading": "목록을 불러오는 중...⏳",
+  "list__move_to": "이동할 위치...",
+  "list__movedown": "아래로 이동",
+  "list__moveup": "위로 이동",
+  "list__name_default": "기본 목록",
+  "list__name_love": "좋아요",
+  "list__new_list_btn": "새 목록",
+  "list__new_list_input": "새 목록...",
+  "list__pause": "정지",
+  "list__play": "재생",
+  "list__play_later": "다음에 재생",
+  "list__remove": "삭제",
+  "list__remove_tip": "\"{name}\"을(를) 정말 삭제하시겠습니까?",
+  "list__remove_tip_button": "예, 맞습니다",
+  "list__rename": "이름 변경",
+  "list__search": "검색",
+  "list__sort": "순서 조정",
+  "list__source_detail": "노래 상세정보",
+  "list__start": "재개",
+  "list__sync": "업데이트",
+  "list__toggle_source": "소스 변경",
+  "list_add__btn_title": "\"{name}\"에 곡 추가",
+  "list_add__multiple_btn_title": "이 곡들을 \"{name}\"에 추가",
+  "list_add__multiple_title_add": "선택한 {num}곡을 다음 위치에 추가...",
+  "list_add__multiple_title_move": "선택한 {num}곡을 다음 위치로 이동...",
+  "list_add__title_first_add": "추가",
+  "list_add__title_first_move": "이동",
+  "list_add__title_last": "위치로...",
+  "list_duplicate_tip": "동일한 이름의 목록이 이미 존재합니다. 계속 생성하시겠습니까?",
+  "list_import_tip__alldata": "가져오기에 실패했습니다. 이 파일은 \"전체 데이터\" 백업 파일입니다. 다음 위치에서 가져와야 합니다: \n\n설정 → 백업 및 복원 → 전체 데이터 → 가져오기",
+  "list_import_tip__playlist": "가져오기에 실패했습니다. 이 파일은 \"목록\" 백업 파일입니다. 다음 위치에서 가져와야 합니다: \n\n설정 → 백업 및 복원 → 일부 데이터 → 목록 가져오기",
+  "list_import_tip__playlist_part": "가져오기에 실패했습니다. 이 파일은 \"목록 전용\" 백업 파일입니다. 다음 위치에서 가져와야 합니다: \n\n내 서재 → 아무 목록 이름에서 우클릭 → 메뉴에서 '가져오기' 선택",
+  "list_import_tip__setting": "가져오기에 실패했습니다. 이 파일은 \"설정\" 백업 파일입니다. 다음 위치에서 가져와야 합니다: \n\n설정 → 백업 및 복원 → 일부 데이터 → 설정 가져오기",
+  "list_import_tip__unknown": "가져오기에 실패했습니다. 알 수 없는 파일 형식입니다. 앱을 최신 버전으로 업데이트한 후 다시 시도해 주세요.",
+  "list_sort_modal_by_album": "앨범",
+  "list_sort_modal_by_down": "내림차순",
+  "list_sort_modal_by_field": "정렬 기준",
+  "list_sort_modal_by_name": "제목",
+  "list_sort_modal_by_random": "무작위",
+  "list_sort_modal_by_singer": "아티스트",
+  "list_sort_modal_by_source": "음악 서비스",
+  "list_sort_modal_by_time": "길이",
+  "list_sort_modal_by_type": "정렬 항목",
+  "list_sort_modal_by_up": "오름차순",
+  "list_sort_modal_tip_confirm": "정말로 실행하시겠습니까?",
+  "list_update_modal__auto_update": "자동 업데이트",
+  "list_update_modal__tips": "💡 \"자동 업데이트\"가 체크된 목록은 앱을 시작할 때마다 자동으로 업데이트됩니다.",
+  "list_update_modal__title": "목록 업데이트 관리",
+  "list_update_modal__update": "동기화",
+  "lists__add_local_file_desc": "노래 파일을 선택하세요",
+  "lists__dislike_music_singer_tip": "{singer}의 \"{name}\"을(를) 정말 싫어요 처리하시겠습니까?",
+  "lists__dislike_music_tip": "\"{name}\"을(를) 정말 싫어요 처리하시겠습니까?",
+  "lists__duplicate": "중복된 곡",
+  "lists__export": "내보내기",
+  "lists__export_part_desc": "목록 파일을 저장할 위치를 선택하세요",
+  "lists__import": "가져오기",
+  "lists__import_part_button_cancel": "아니요",
+  "lists__import_part_button_confirm": "덮어쓰기",
+  "lists__import_part_confirm": "가져온 목록({importName})의 ID가 로컬 목록({localName})과 동일합니다. 로컬 목록을 덮어쓰시겠습니까?",
+  "lists__import_part_desc": "목록 파일을 선택하세요",
+  "lists__new_list_btn": "목록 만들기",
+  "lists__new_list_input": "새 목록...",
+  "lists__remove": "삭제",
+  "lists__remove_music_tip": "선택한 {len}곡을 정말 삭제하시겠습니까?",
+  "lists__remove_tip": "\"{name}\"을(를) 정말 삭제하시겠습니까?",
+  "lists__remove_tip_button": "예, 맞습니다",
+  "lists__rename": "이름 변경",
+  "lists__select_local_file": "로컬 곡 추가",
+  "lists__sort_list": "곡 정렬",
+  "lists__source_detail": "재생목록 페이지",
+  "lists__sync": "업데이트",
+  "lists__sync_confirm_tip": "\"{name}\"의 곡을 온라인 목록의 곡으로 교체합니다. 업데이트하시겠습니까?",
+  "load_list_file_error_detail": "이전 목록 파일을 {path}에 백업해 두었습니다.\nJSON 형식으로 저장되어 있으며, 수동으로 복구를 시도할 수 있습니다.\n\n오류 상세: {detail}",
+  "load_list_file_error_title": "재생목록 데이터 로드 오류",
+  "loading": "불러오는 중...",
+  "love_list": "즐겨찾기",
+  "lyric__load_error": "가사를 가져오지 못했습니다",
+  "lyric__select": "가사 텍스트 선택 허용",
+  "lyric_menu__align": "가사 정렬",
+  "lyric_menu__align_center": "가운데",
+  "lyric_menu__align_left": "왼쪽",
+  "lyric_menu__lrc_size": "글자 크기 [{size}]",
+  "lyric_menu__offset": "오프셋 [{offset}ms]",
+  "lyric_menu__offset_add_10": "10ms 늘리기",
+  "lyric_menu__offset_add_100": "100ms 늘리기",
+  "lyric_menu__offset_dec_10": "10ms 줄이기",
+  "lyric_menu__offset_dec_100": "100ms 줄이기",
+  "lyric_menu__offset_reset": "초기화",
+  "lyric_menu__size_add": "글자 크기 늘리기\n(우클릭하여 세밀 조정)",
+  "lyric_menu__size_dec": "글자 크기 줄이기\n(우클릭하여 세밀 조정)",
+  "lyric_menu__size_reset": "초기화",
+  "media_device__empty_device_tip": "오디오 출력 장치가 비어 있습니다. 재생이 되지 않는다면 사운드 카드 드라이버가 설치되어 있는지 확인해 주세요. \n또는 소프트웨어를 제거한 후 재설치할 때 \"나만 사용\"을 선택하고 기본 설치 경로를 유지해 보세요.",
+  "min": "최소화",
+  "music_album": "앨범",
+  "music_duplicate": "중복된 곡",
+  "music_name": "제목",
+  "music_singer": "아티스트",
+  "music_sort__input_tip": "이동할 위치를 입력하세요",
+  "music_sort__title": "\"{name}\"의 위치를 다음으로 조정: ",
+  "music_sort__title_multiple": "선택한 {num}곡의 위치를 다음으로 조정: ",
+  "music_time": "길이",
+  "music_toggle_clean": "변경 취소",
+  "music_toggle_confirm": "확인",
+  "music_toggle_duplicate_tip": "목록에 동일한 곡이 이미 존재합니다. 삭제하고 계속할까요?",
+  "my_list": "내 서재",
+  "no_item": "아무것도 없습니다...",
+  "not_agree": "거부",
+  "ok": "확인",
+  "pagination__next": "다음 페이지",
+  "pagination__page": "{num} 페이지",
+  "pagination__prev": "이전 페이지",
+  "play_timeout": "타이머 정지",
+  "play_timeout_close": "닫기",
+  "play_timeout_confirm": "확인",
+  "play_timeout_end": "곡이 끝난 후 정지",
+  "play_timeout_stop": "타이머 취소",
+  "play_timeout_tip": "{time} 후 정지",
+  "play_timeout_unit": "분",
+  "play_timeout_update": "시간 업데이트",
+  "player__add_music_to": "현재 곡을 다음 위치에 추가...",
+  "player__buffering": "버퍼링 중...",
+  "player__desktop_lyric_lock": "우클릭하여 가사창 잠금",
+  "player__desktop_lyric_off": "가사창 숨기기",
+  "player__desktop_lyric_on": "가사창 표시",
+  "player__desktop_lyric_unlock": "우클릭하여 가사창 잠금 해제",
+  "player__end": "정지됨",
+  "player__error": "음악을 불러오는 중 오류가 발생했습니다. 5초 후 다음 곡으로 전환합니다",
+  "player__getting_url": "음악 링크를 가져오는 중...",
+  "player__getting_url_delay_retry": "서버가 혼잡합니다. {time}초 후 다시 시도합니다...",
+  "player__hide_detail_tip": "상세 페이지 숨기기\n(앱 창에서 우클릭하면 상세 페이지를 빠르게 숨길 수 있습니다)",
+  "player__loading": "음악을 불러오는 중...",
+  "player__music_album": "앨범: ",
+  "player__music_name": "제목: ",
+  "player__music_singer": "아티스트: ",
+  "player__next": "다음 곡",
+  "player__pause": "일시정지",
+  "player__pic_tip": "재생 상세 페이지\n(우클릭하면 \"내 서재\"에서 현재 재생 중인 곡을 찾을 수 있습니다)",
+  "player__play": "재생",
+  "player__play_toggle_mode_list": "순서대로",
+  "player__play_toggle_mode_list_loop": "목록 반복",
+  "player__play_toggle_mode_off": "사용 안 함",
+  "player__play_toggle_mode_random": "무작위 재생",
+  "player__play_toggle_mode_single_loop": "한 곡 반복",
+  "player__playback_preserves_pitch": "음정 보정",
+  "player__playback_rate": "현재 재생 속도: ",
+  "player__playback_rate_reset_btn": "초기화",
+  "player__playing": "재생 중...",
+  "player__prev": "이전 곡",
+  "player__refresh_url": "음악 URL이 만료되어 새로고침 중...",
+  "player__sound_effect": "음향 옵션 (실험적 기능)",
+  "player__sound_effect_biquad_filter": "이퀄라이저",
+  "player__sound_effect_biquad_filter_preset_classical": "클래식",
+  "player__sound_effect_biquad_filter_preset_dance": "댄스",
+  "player__sound_effect_biquad_filter_preset_electronic": "일렉트로닉",
+  "player__sound_effect_biquad_filter_preset_pop": "팝",
+  "player__sound_effect_biquad_filter_preset_rock": "록",
+  "player__sound_effect_biquad_filter_preset_slow": "슬로우",
+  "player__sound_effect_biquad_filter_preset_soft": "소프트",
+  "player__sound_effect_biquad_filter_preset_subwoofer": "서브우퍼",
+  "player__sound_effect_biquad_filter_preset_vocal": "보컬",
+  "player__sound_effect_biquad_filter_reset_btn": "초기화",
+  "player__sound_effect_biquad_filter_save_btn": "프리셋 다른 이름으로 저장",
+  "player__sound_effect_biquad_filter_save_input": "새 프리셋...",
+  "player__sound_effect_convolution": "환경 리버브 음향 효과",
+  "player__sound_effect_convolution_file_bright_hall": "홀",
+  "player__sound_effect_convolution_file_cardiod_35_10_spread": "하트형 확산",
+  "player__sound_effect_convolution_file_cinema_diningroom": "영화관",
+  "player__sound_effect_convolution_file_dining_living_true_stereo": "식당",
+  "player__sound_effect_convolution_file_feedback_spring": "피드백 스프링",
+  "player__sound_effect_convolution_file_living_bedroom_leveled": "욕실",
+  "player__sound_effect_convolution_file_matrix_1": "매트릭스 (1)",
+  "player__sound_effect_convolution_file_matrix_2": "매트릭스 (2)",
+  "player__sound_effect_convolution_file_s2_r4_bd": "교회",
+  "player__sound_effect_convolution_file_s3_r1_bd": "스테레오",
+  "player__sound_effect_convolution_file_spreader50_65ms": "실내",
+  "player__sound_effect_convolution_file_telephone": "전화기",
+  "player__sound_effect_convolution_file_tim_omni_35_10_magnetic": "마그네틱 스테레오",
+  "player__sound_effect_convolution_main_gain": "원음 게인",
+  "player__sound_effect_convolution_send_gain": "환경 음향 효과 게인",
+  "player__sound_effect_features_tip": "안내: 음향 옵션은 사용자 지정 오디오 출력 장치와 충돌합니다. 음향 옵션을 활성화하면 오디오 출력 장치가 기본 출력 장치로 재설정됩니다. 현재로서는 이 문제를 해결할 수 없습니다.",
+  "player__sound_effect_panner": "3D 입체 서라운드 (헤드폰 사용 필요)",
+  "player__sound_effect_panner_enabled": "사용",
+  "player__sound_effect_panner_sound_r": "음원 거리",
+  "player__sound_effect_panner_sound_speed": "서라운드 속도",
+  "player__sound_effect_pitch_shifter": "음정 조정",
+  "player__sound_effect_pitch_shifter_preset_semitones": "{num}반음",
+  "player__sound_effect_pitch_shifter_reset_btn": "초기화",
+  "player__sound_effect_pitch_shifter_tip": "음정을 높이거나 낮추려면 오디오 데이터를 실시간으로 처리해야 하므로 CPU 사용량이 추가로 발생합니다.\n\n알려진 문제:\nCPU 자원이 부족하면 처리 작업이 쌓여 소리에 이상이 발생할 수 있습니다.\n이 경우 재생을 잠시 멈추고 쌓인 작업이 처리될 때까지 기다린 후 재생해야 합니다.",
+  "player__stop": "일시정지됨",
+  "player__volume": "볼륨: ",
+  "player__volume_mute_label": "음소거",
+  "player__volume_muted": "음소거됨",
+  "search": "검색",
+  "search__hot_search": "인기 검색어",
+  "search__type_music": "노래",
+  "search__type_songlist": "재생목록",
+  "search__welcome": "원하는 것을 검색해보세요~~ 😉",
+  "setting": "설정",
+  "setting__about": "LX Music 정보",
+  "setting__backup": "백업 및 복원",
+  "setting__backup_all": "전체 데이터 (\"목록\" 데이터와 \"설정\" 데이터)",
+  "setting__backup_all_export": "내보내기",
+  "setting__backup_all_export_desc": "백업을 저장할 위치...",
+  "setting__backup_all_import": "가져오기",
+  "setting__backup_all_import_desc": "백업 파일을 선택하세요",
+  "setting__backup_other": "기타 백업 형식 (해당 백업 파일의 복원은 현재 지원하지 않습니다)",
+  "setting__backup_other_export_dir": "파일을 저장할 위치를 선택하세요",
+  "setting__backup_other_export_list_csv": "CSV 형식으로 목록 내보내기",
+  "setting__backup_other_export_list_text": "TXT 형식으로 목록 내보내기",
+  "setting__backup_other_export_list_text_confirm": "모든 목록을 하나의 파일로 합치시겠습니까?",
+  "setting__backup_part": "일부 데이터 (\"목록\" 데이터에는 \"기본\", \"좋아요\" 및 사용자가 만든 목록이 포함됩니다. \"설정\" 데이터에는 \"단축키\" 설정이 포함되지 않습니다)",
+  "setting__backup_part_export_list": "목록 내보내기",
+  "setting__backup_part_export_list_desc": "목록을 저장할 위치...",
+  "setting__backup_part_export_setting": "설정 내보내기",
+  "setting__backup_part_export_setting_desc": "설정을 저장할 위치...",
+  "setting__backup_part_import_list": "목록 가져오기",
+  "setting__backup_part_import_list_confirm": "백업 파일의 목록이 기존 목록과 동일한 ID를 가지고 있으면 기존 목록의 곡이 덮어써집니다. 계속하시겠습니까?",
+  "setting__backup_part_import_list_desc": "목록 백업 파일을 선택하세요",
+  "setting__backup_part_import_setting": "설정 가져오기",
+  "setting__backup_part_import_setting_desc": "설정 백업 파일을 선택하세요",
+  "setting__basic": "일반",
+  "setting__basic_animation": "팝업 애니메이션 무작위 적용",
+  "setting__basic_control_btn_position": "컨트롤 버튼 위치",
+  "setting__basic_control_btn_position_left": "왼쪽",
+  "setting__basic_control_btn_position_right": "오른쪽",
+  "setting__basic_font": "글꼴",
+  "setting__basic_font_size": "글자 크기",
+  "setting__basic_font_size_14px": "더 작게",
+  "setting__basic_font_size_15px": "작게",
+  "setting__basic_font_size_16px": "표준",
+  "setting__basic_font_size_17px": "크게",
+  "setting__basic_font_size_18px": "더 크게",
+  "setting__basic_font_size_19px": "매우 크게",
+  "setting__basic_lang": "언어",
+  "setting__basic_lang_title": "앱에 표시되는 언어",
+  "setting__basic_playbar_progress_style": "재생바 진행바 스타일",
+  "setting__basic_playbar_progress_style_full": "전체 너비",
+  "setting__basic_playbar_progress_style_middle": "중간",
+  "setting__basic_playbar_progress_style_mini": "미니",
+  "setting__basic_show_animation": "애니메이션 표시",
+  "setting__basic_source": "음악 API",
+  "setting__basic_source_status_failed": "초기화 실패",
+  "setting__basic_source_status_initing": "초기화 중...",
+  "setting__basic_source_status_success": "초기화 성공",
+  "setting__basic_source_temp": "임시 API (일부 기능 사용 불가. 테스트 API를 사용할 수 없을 때의 대안)",
+  "setting__basic_source_test": "테스트 API (대부분의 앱 기능 사용 가능)",
+  "setting__basic_source_user_api_btn": "음악 API 관리",
+  "setting__basic_sourcename": "음악 스트리밍 서비스 이름",
+  "setting__basic_sourcename_alias": "별칭",
+  "setting__basic_sourcename_real": "원래 이름",
+  "setting__basic_sourcename_title": "음악 스트리밍 서비스 이름 표시 방식을 선택하세요",
+  "setting__basic_start_in_fullscreen": "전체화면 모드로 시작",
+  "setting__basic_theme": "테마",
+  "setting__basic_theme_auto_tip": "이것은 동적 테마입니다. 라이트 테마와 다크 테마를 미리 설정해 두면 시스템의 라이트/다크 모드에 따라 자동으로 해당 테마로 전환됩니다.\n\n참고: 이 테마 항목을 우클릭하면 라이트/다크 테마 설정 창이 열립니다.",
+  "setting__basic_to_tray": "앱 창을 닫을 때 시스템 트레이로 최소화",
+  "setting__basic_window_size": "창 크기",
+  "setting__basic_window_size_big": "크게",
+  "setting__basic_window_size_huge": "아주 크게",
+  "setting__basic_window_size_larger": "더 크게",
+  "setting__basic_window_size_medium": "중간",
+  "setting__basic_window_size_oversized": "매우 크게",
+  "setting__basic_window_size_small": "작게",
+  "setting__basic_window_size_smaller": "더 작게",
+  "setting__basic_window_size_title": "창 크기를 설정하세요",
+  "setting__click_copy": "클릭하여 복사",
+  "setting__click_open": "클릭하여 열기",
+  "setting__desktop_lyric": "데스크톱 가사",
+  "setting__desktop_lyric_align": "가사 정렬",
+  "setting__desktop_lyric_align_center": "가운데",
+  "setting__desktop_lyric_align_left": "왼쪽",
+  "setting__desktop_lyric_align_right": "오른쪽",
+  "setting__desktop_lyric_always_on_top": "항상 위 유지",
+  "setting__desktop_lyric_always_on_top_loop": "\"항상 위 유지\"가 활성화된 경우 가사창을 반복적으로 새로고침",
+  "setting__desktop_lyric_always_on_top_loop_tip": "다른 프로그램에 가사창이 계속 가려질 경우 이 옵션을 활성화해 보세요.",
+  "setting__desktop_lyric_audio_visualization": "오디오 시각화 활성화 (실험적 기능)",
+  "setting__desktop_lyric_color": "가사 글자 색상",
+  "setting__desktop_lyric_color_reset": "색상 초기화",
+  "setting__desktop_lyric_delay_scroll": "가사 스크롤 지연",
+  "setting__desktop_lyric_direction": "가사 표시 방향",
+  "setting__desktop_lyric_direction_horizontal": "가로",
+  "setting__desktop_lyric_direction_vertical": "세로",
+  "setting__desktop_lyric_ellipsis": "가사 줄바꿈 안 함",
+  "setting__desktop_lyric_enable": "가사창 표시",
+  "setting__desktop_lyric_font": "가사 글꼴",
+  "setting__desktop_lyric_font_default": "기본값",
+  "setting__desktop_lyric_font_weight": "굵은 글꼴",
+  "setting__desktop_lyric_font_weight_extended": "번역 및 로마자 가사",
+  "setting__desktop_lyric_font_weight_font": "글자 단위 가사",
+  "setting__desktop_lyric_font_weight_line": "줄 단위 가사",
+  "setting__desktop_lyric_fullscreen_hide": "전체화면일 때 가사창 숨기기",
+  "setting__desktop_lyric_hover_hide": "마우스가 가사창 위로 이동하면 가사창 투명도 높이기",
+  "setting__desktop_lyric_hover_hide_tip": "이 기능은 플랫폼 호환성 문제가 있을 수 있습니다.",
+  "setting__desktop_lyric_line_gap": "가사 간격 ({num})",
+  "setting__desktop_lyric_line_gap_add": "간격 늘리기",
+  "setting__desktop_lyric_line_gap_dec": "간격 줄이기",
+  "setting__desktop_lyric_lock": "가사창 잠금",
+  "setting__desktop_lyric_lock_screen": "가사창을 메인 화면 밖으로 드래그하지 못하도록 제한",
+  "setting__desktop_lyric_pause_hide": "음악을 일시정지하면 가사창 투명도 높이기",
+  "setting__desktop_lyric_played_color": "재생된 부분",
+  "setting__desktop_lyric_reset": "초기화",
+  "setting__desktop_lyric_reset_window": "데스크톱 가사 옵션 초기화",
+  "setting__desktop_lyric_scroll_align": "재생 중 가사 스크롤 위치",
+  "setting__desktop_lyric_scroll_align_center": "가운데",
+  "setting__desktop_lyric_scroll_align_top": "위쪽",
+  "setting__desktop_lyric_shadow_color": "그림자",
+  "setting__desktop_lyric_show_taskbar": "작업 표시줄에 가사창 프로세스 표시",
+  "setting__desktop_lyric_show_taskbar_tip": "화면 녹화 프로그램이 가사창을 캡처하지 못할 때 대안으로 사용하는 옵션입니다.",
+  "setting__desktop_lyric_unplay_color": "재생 안 된 부분",
+  "setting__dislike_list_input_tip": "곡명@아티스트명\n곡명\n@아티스트명",
+  "setting__dislike_list_save_btn": "저장",
+  "setting__dislike_list_tips": "1. 한 줄에 하나의 항목을 입력합니다. 곡명이나 아티스트명에 \"@\" 기호가 있으면 \"#\"로 대체해야 합니다\n2. 특정 아티스트의 곡 지정: 곡명@아티스트명\n3. 곡 지정: 곡명\n4. 아티스트 지정: @아티스트명",
+  "setting__dislike_list_title": "싫어요 곡 규칙 목록",
+  "setting__download": "다운로드",
+  "setting__download_data_embed": "다음 항목을 오디오 파일에 삽입",
+  "setting__download_embed_lxlyric": "LX Music 가사도 함께 삽입 (있는 경우, LX Music으로 재생 시 글자 단위 가사를 지원합니다)",
+  "setting__download_embed_lyric": "가사 삽입",
+  "setting__download_embed_pic": "커버 이미지 삽입",
+  "setting__download_embed_rlyric": "가능한 경우 로마자 가사도 함께 삽입",
+  "setting__download_embed_tlyric": "가능한 경우 번역 가사도 함께 삽입",
+  "setting__download_enable": "다운로드 활성화",
+  "setting__download_lxlyric": "LX Music 가사도 가사 파일에 함께 기록 (있는 경우, LX Music으로 재생 시 글자 단위 가사를 지원합니다)",
+  "setting__download_lyric": "가사 다운로드",
+  "setting__download_lyric_format": "다운로드한 가사 파일의 인코딩 형식",
+  "setting__download_lyric_format_gbk": "GBK",
+  "setting__download_lyric_format_tip": "일부 기기에서 중국어가 깨져 보인다면 GBK 형식을 선택해 보세요.",
+  "setting__download_lyric_format_utf8": "UTF-8",
+  "setting__download_lyric_title": "가사 파일 다운로드 여부를 선택하세요",
+  "setting__download_max_num": "동시 다운로드 개수",
+  "setting__download_max_num_tip": "동시 다운로드 개수가 너무 많으면 음악 API에서 IP가 차단될 수 있습니다. 변경하시겠습니까?",
+  "setting__download_max_num_tooltip": "값을 너무 높게 설정하면 음악 API에 따라 IP가 차단될 수 있습니다.",
+  "setting__download_name": "음악 파일 이름 규칙",
+  "setting__download_name1": "\"제목 - 아티스트\"",
+  "setting__download_name2": "\"아티스트 - 제목\"",
+  "setting__download_name3": "제목만",
+  "setting__download_name_title": "다운로드 시 음악 파일 이름 형식을 선택하세요",
+  "setting__download_path": "다운로드 경로",
+  "setting__download_path_change_btn": "변경",
+  "setting__download_path_label": "현재: ",
+  "setting__download_path_open_label": "클릭하여 이 경로 열기",
+  "setting__download_path_title": "다운로드 경로를 선택하세요",
+  "setting__download_rlyric": "가능한 경우 로마자 가사도 가사 파일에 함께 기록",
+  "setting__download_select_save_path": "저장 경로를 선택하세요",
+  "setting__download_skip_exist_file": "다운로드 폴더에 동일한 이름의 파일이 있으면 다운로드 작업 건너뛰기",
+  "setting__download_tlyric": "가능한 경우 번역 가사도 가사 파일에 함께 기록",
+  "setting__download_use_other_source": "다운로드 시 자동 소스 전환",
+  "setting__download_use_other_source_tip": "원래 소스에서 곡을 다운로드할 수 없을 때 다른 소스로 전환하여 다운로드를 시도합니다.\n참고: 소스를 변경한 후의 곡 버전이 원래 버전과 100% 일치한다고 보장하지는 않습니다.",
+  "setting__hot_key": "단축키",
+  "setting__hot_key_common_focus_search_input": "검색창 포커스",
+  "setting__hot_key_common_min": "앱 최소화",
+  "setting__hot_key_common_toggle_close": "앱 종료",
+  "setting__hot_key_common_toggle_hide": "앱 표시/숨기기",
+  "setting__hot_key_common_toggle_min": "앱 최소화/복원",
+  "setting__hot_key_desktop_lyric_toggle_always_top": "데스크톱 가사 항상 위/해제",
+  "setting__hot_key_desktop_lyric_toggle_lock": "데스크톱 가사 잠금/잠금 해제",
+  "setting__hot_key_desktop_lyric_toggle_visible": "데스크톱 가사 표시/숨기기",
+  "setting__hot_key_global_title": "전역 단축키",
+  "setting__hot_key_local_title": "앱 내 단축키",
+  "setting__hot_key_player_music_dislike": "곡 싫어요",
+  "setting__hot_key_player_music_love": "곡 좋아요",
+  "setting__hot_key_player_music_unlove": "곡 좋아요 취소",
+  "setting__hot_key_player_next": "다음 곡",
+  "setting__hot_key_player_prev": "이전 곡",
+  "setting__hot_key_player_seekbackward": "5초 되감기",
+  "setting__hot_key_player_seekforward": "5초 빨리감기",
+  "setting__hot_key_player_toggle_play": "재생/일시정지",
+  "setting__hot_key_player_volume_down": "볼륨 낮추기",
+  "setting__hot_key_player_volume_mute": "음소거 전환",
+  "setting__hot_key_player_volume_up": "볼륨 높이기",
+  "setting__hot_key_tip_input": "새 키를 입력하세요",
+  "setting__hot_key_unset_input": "설정 안 됨",
+  "setting__is_enable": "사용",
+  "setting__is_show": "표시",
+  "setting__list": "목록",
+  "setting__list_action_btn": "목록 작업 버튼 표시",
+  "setting__list_add_music_location_type": "목록에 곡 추가 시 위치",
+  "setting__list_add_music_location_type_bottom": "맨 아래",
+  "setting__list_add_music_location_type_top": "맨 위",
+  "setting__list_click_action": "목록에서 곡을 더블클릭하면 자동으로 현재 목록으로 전환 (\"재생목록\" 및 \"차트\" 페이지에서만 적용)",
+  "setting__list_scroll": "재생목록 스크롤 위치 기억 (\"내 서재\" 페이지에서만 적용)",
+  "setting__list_source": "곡이 어느 음악 스트리밍 서비스에서 왔는지 표시 (\"내 서재\" 페이지에서만 적용)",
+  "setting__network": "네트워크",
+  "setting__network_proxy_host": "호스트",
+  "setting__network_proxy_password": "비밀번호",
+  "setting__network_proxy_port": "포트",
+  "setting__network_proxy_title": "HTTP 프록시 (설정이 잘못되면 앱이 네트워크에 연결되지 않습니다)",
+  "setting__network_proxy_username": "사용자 이름",
+  "setting__odc": "자동 비우기",
+  "setting__odc_clear_search_input": "검색하지 않을 때 검색창 비우기",
+  "setting__odc_clear_search_list": "검색하지 않을 때 검색 목록 비우기",
+  "setting__open_api": "오픈 API",
+  "setting__open_api_address": "서비스 주소: ",
+  "setting__open_api_bind_lan": "LAN에서 접속 허용",
+  "setting__open_api_enable": "오픈 API 서비스 활성화",
+  "setting__open_api_port": "서비스 포트",
+  "setting__open_api_port_tip": "오픈 API 서비스 포트를 입력하세요",
+  "setting__open_api_tip": "이 기능은 타사 프로그램이 LX Music을 호출할 수 있도록 제공합니다. 현재 사용 가능한 기능을 확인하세요: ",
+  "setting__open_api_tip_link": "문서 보기",
+  "setting__other": "기타",
+  "setting__other_dislike_list": "싫어요 곡 규칙",
+  "setting__other_dislike_list_label": "규칙 개수: ",
+  "setting__other_dislike_list_show_btn": "규칙 편집",
+  "setting__other_listdata": "목록 데이터 정리",
+  "setting__other_listdata_clear_btn": "\"내 서재\" 데이터 지우기",
+  "setting__other_listdata_clear_tip_confirm": "생성한 모든 목록과 좋아요한 모든 곡이 지워집니다. 정말 계속하시겠습니까?",
+  "setting__other_lyric_edited_cache": "오프셋 조정된 가사 관리",
+  "setting__other_lyric_edited_clear_btn": "시간 조정된 가사 지우기",
+  "setting__other_lyric_edited_clear_tip_confirm": "이전에 오프셋을 조정한 모든 가사가 지워집니다. 지우시겠습니까? \n(손 떨림으로 확인 🤪)",
+  "setting__other_lyric_edited_label": "가사 개수: ",
+  "setting__other_lyric_raw_clear_btn": "가사 캐시 지우기",
+  "setting__other_lyric_raw_label": "가사 개수: ",
+  "setting__other_music_url_clear_btn": "곡 URL 캐시 지우기",
+  "setting__other_music_url_label": "곡 URL 개수: ",
+  "setting__other_other_cache": "기타 캐시 관리",
+  "setting__other_other_source_clear_btn": "소스 변경된 곡 캐시 지우기",
+  "setting__other_other_source_label": "소스가 변경된 곡 정보 개수: ",
+  "setting__other_resource_cache": "리소스 캐시 관리",
+  "setting__other_resource_cache_clear_btn": "리소스 캐시 지우기",
+  "setting__other_resource_cache_confirm": "지우겠습니다",
+  "setting__other_resource_cache_label": "앱이 사용 중인 캐시 크기: ",
+  "setting__other_resource_cache_tip": "이미지, 오디오 등의 캐시를 포함합니다. 정리 후에는 해당 리소스를 다시 다운로드해야 합니다. 정리하지 않는 것을 권장하며, 앱이 디스크 공간에 따라 캐시 크기를 동적으로 관리합니다.",
+  "setting__other_resource_cache_tip_confirm": "이미지, 오디오 등의 캐시를 포함하며, 정리 후에는 해당 리소스를 다시 다운로드해야 합니다. 정리하지 않는 것을 권장하며, 앱이 디스크 공간에 따라 캐시 크기를 동적으로 관리합니다. 그래도 정리하시겠습니까?",
+  "setting__other_transparent_window": "메인 창에 내장된 둥근 모서리와 그림자 사용",
+  "setting__other_transparent_window_tip": "이 옵션을 끄면 시스템 기본 창 스타일을 사용합니다. 변경 사항을 적용하려면 소프트웨어를 재시작해야 합니다.",
+  "setting__other_tray_theme": "트레이 아이콘 스타일",
+  "setting__other_tray_theme_auto": "시스템 따르기",
+  "setting__other_tray_theme_black": "검정",
+  "setting__other_tray_theme_native": "흰색",
+  "setting__other_tray_theme_origin": "기본값",
+  "setting__play": "재생",
+  "setting__play_advanced_audio_features_tip": "사용자 지정 오디오 출력 장치는 이 기능과 충돌합니다. 이 기능을 활성화하면 오디오 출력 장치가 기본 출력 장치로 재설정됩니다. 현재로서는 이 문제를 해결할 수 없습니다. 그래도 활성화하시겠습니까?",
+  "setting__play_auto_clean_played_list": "현재 재생목록과 동일한 목록을 재생할 때 재생 완료 목록 비우기",
+  "setting__play_auto_clean_played_list_tip": "무작위 재생 모드에서 목록의 모든 곡이 다시 무작위 대상에 포함됩니다.",
+  "setting__play_auto_skip_on_error": "재생 오류 발생 시 자동으로 곡 전환",
+  "setting__play_detail": "재생 상세 페이지",
+  "setting__play_detail_align": "가사 정렬",
+  "setting__play_detail_align_center": "가운데",
+  "setting__play_detail_align_left": "왼쪽",
+  "setting__play_detail_align_right": "오른쪽",
+  "setting__play_detail_font_size": "가사 글자 크기 (재생 상세 페이지에서 키보드 \"+\"와 \"-\"로 글자 크기를 조정할 수 있습니다)",
+  "setting__play_detail_font_size_current": "현재 글자 크기: {size}",
+  "setting__play_detail_font_size_reset": "초기화",
+  "setting__play_detail_font_zoom": "재생 중인 가사 확대",
+  "setting__play_detail_lyric_delay_scroll": "가사 스크롤 지연",
+  "setting__play_detail_lyric_progress": "가사를 드래그하여 재생 진행 위치 조정 허용",
+  "setting__play_lyric_lxlrc": "가능한 경우 노래방 스타일 가사로 재생",
+  "setting__play_lyric_lxlrc_tip": "이 기능은 높은 성능을 요구하므로 저사양 기기에서는 사용을 권장하지 않습니다!",
+  "setting__play_lyric_roma": "가능한 경우 로마자 가사 표시",
+  "setting__play_lyric_s2t": "재생 및 다운로드 중인 중국어 가사를 번체자로 변환",
+  "setting__play_lyric_transition": "가능한 경우 번역 가사 표시",
+  "setting__play_max_output_channel_count": "기기가 지원하는 최대 채널 수로 오디오 출력",
+  "setting__play_mediaDevice": "오디오 출력",
+  "setting__play_mediaDevice_remove_stop_play": "현재 오디오 출력 장치가 변경되면 재생 일시정지",
+  "setting__play_mediaDevice_title": "오디오 출력에 사용할 미디어 장치를 선택하세요",
+  "setting__play_media_device_error_tip": "이 기능은 고급 오디오 기능(오디오 시각화, 음향 옵션, 기기 최대 채널 수 오디오 출력)과 충돌합니다. 이번 앱 실행 시 해당 기능이 활성화되어 있어 이 옵션을 일시적으로 사용할 수 없습니다. 해당 기능을 끄고 앱을 재시작한 후 다시 변경해 주세요.",
+  "setting__play_media_device_tip": "이 기능은 오디오 시각화 기능과 충돌하여 동시에 사용할 수 없습니다. 오디오 시각화를 끄고 선택한 오디오 출력 옵션을 적용하시겠습니까?",
+  "setting__play_playQuality": "가능한 경우 재생 시 음질 우선",
+  "setting__play_power_save_blocker": "곡 재생 중 기기 절전 모드 방지",
+  "setting__play_save_play_time": "재생 진행 위치 기억",
+  "setting__play_startup_auto_play": "시작 시 자동으로 음악 재생",
+  "setting__play_statusbar_lyric": "상태 메뉴에 가사 표시",
+  "setting__play_statusbar_lyric_tip": "설정 → 일반에서 \"앱 창을 닫을 때 시스템 트레이로 최소화\"를 활성화해야 합니다",
+  "setting__play_task_bar": "작업 표시줄에 재생 진행률 표시",
+  "setting__play_timeout": "타이머 정지",
+  "setting__player_audio_visualization_tip": "사용자 지정 오디오 출력 장치 기능은 오디오 시각화 기능과 충돌합니다. 오디오 시각화를 활성화하면 오디오 출력 장치가 기본값으로 재설정됩니다. 현재로서는 이 문제를 해결할 수 없습니다. 그래도 활성화하시겠습니까?",
+  "setting__player_swap_lyric_trans_roma": "번역 가사와 로마자 가사의 위치 바꾸기",
+  "setting__search": "검색",
+  "setting__search_focus_search_box": "시작 시 검색창 자동 포커스",
+  "setting__search_history": "검색 기록 활성화",
+  "setting__search_hot": "인기 검색어 활성화",
+  "setting__sync": "데이터 동기화",
+  "setting__sync_client_address": "현재 기기 주소: {address}",
+  "setting__sync_client_host": "동기화 서비스 주소",
+  "setting__sync_client_host_tip": "http://<호스트>:<포트>",
+  "setting__sync_client_mode": "클라이언트 모드",
+  "setting__sync_client_status": "상태: {status}",
+  "setting__sync_code_blocked_ip": "현재 기기의 IP가 서버에 의해 차단되었습니다!",
+  "setting__sync_code_fail": "유효하지 않은 연결 코드",
+  "setting__sync_enable": "동기화 활성화",
+  "setting__sync_mode": "동기화 모드",
+  "setting__sync_mode_client": "클라이언트",
+  "setting__sync_mode_server": "서버",
+  "setting__sync_server_address": "동기화 서비스 주소: {address}",
+  "setting__sync_server_auth_code": "연결 코드: {code}",
+  "setting__sync_server_device": "연결된 기기: {devices}",
+  "setting__sync_server_device_list_btn_remove": "삭제",
+  "setting__sync_server_device_list_noitem": "아무것도 없습니다 ┗( ▔, ▔ )┛",
+  "setting__sync_server_device_list_time": "마지막 연결 시간: {time}",
+  "setting__sync_server_device_list_tips": "💡 기기를 삭제한 후 다시 연결하려면 연결 코드를 다시 입력해야 합니다",
+  "setting__sync_server_device_list_title": "인증된 기기",
+  "setting__sync_server_mode": "서버 모드 (데이터가 평문으로 전송되므로 신뢰할 수 있는 네트워크에서 사용하세요)",
+  "setting__sync_server_port": "동기화 포트",
+  "setting__sync_server_port_tip": "포트 번호를 입력하세요",
+  "setting__sync_server_refresh_code": "연결 코드 새로고침",
+  "setting__sync_server_show_device_list": "인증된 기기 목록",
+  "setting__sync_tip": "사용 방법은 FAQ의 \"동기화 기능\" 항목을 참고하세요",
+  "setting__update": "업데이트",
+  "setting__update_checking": "업데이트 확인 중...",
+  "setting__update_commit_date": "커밋 날짜: ",
+  "setting__update_commit_id": "커밋 해시: ",
+  "setting__update_current_label": "현재 버전: ",
+  "setting__update_downloading": "업데이트를 찾아 다운로드하는 중...⏳",
+  "setting__update_init": "업데이트 중...",
+  "setting__update_latest": "앱이 최신 버전입니다. 즐거운 시간 되세요!🥂",
+  "setting__update_latest_label": "최신 버전: ",
+  "setting__update_new_version": "새 버전을 찾았습니다. 어서 업데이트하세요~🚀🚀",
+  "setting__update_open_version_modal_btn": "업데이트 창 열기",
+  "setting__update_progress": "상태: ",
+  "setting__update_show_change_log": "업데이트 후 첫 실행 시 변경 로그 표시",
+  "setting__update_try_auto_update": "새 버전을 찾으면 자동으로 업데이트 다운로드 시도",
+  "setting__update_unknown": "알 수 없음",
+  "setting__update_unknown_tip": "❓ 최신 버전 정보를 가져오지 못했습니다. 정보 페이지에서 프로젝트 릴리스 주소를 열어 현재 버전이 최신인지 확인하는 것을 권장합니다",
+  "setting_download_save_group_list_name": "해당 목록 이름의 하위 폴더에 파일 저장",
+  "setting_sync_status_enabled": "연결됨",
+  "song_list": "재생목록",
+  "songlist__import_input_btn_confirm": "열기",
+  "songlist__import_input_show_btn": "재생목록 열기",
+  "songlist__import_input_tip": "재생목록 링크/ID를 입력하세요",
+  "songlist__import_input_tip_1": "다른 서비스 간 재생목록은 지원되지 않습니다. 열려는 재생목록이 현재 선택한 서비스에 해당하는지 확인해 주세요",
+  "songlist__import_input_tip_2": "열리지 않는 재생목록 링크가 있다면 피드백을 보내주세요",
+  "songlist__import_input_tip_3": "간편판의 재생목록 ID나 링크로는 쿠거우 재생목록을 열 수 없지만, 정식판의 쿠거우 코드나 링크로는 열 수 있습니다",
+  "songlist__import_input_tip_4": "넷이즈의 \"프라이빗 레이더\" 재생목록은 접근하려면 토큰이 필요합니다. 텐센트의 개인 재생목록은 프로필을 공개해야 접근할 수 있습니다. 자세한 내용은 다음을 참고하세요: ",
+  "songlist__import_input_title": "공유된 재생목록 열기",
+  "songlist__open_list": "\"{name}\" 재생목록 열기",
+  "songlist__tag_info_hot_tag": "인기 태그",
+  "source_alias_all": "통합",
+  "source_alias_bd": "BD 뮤직",
+  "source_alias_kg": "KG 뮤직",
+  "source_alias_kw": "KW 뮤직",
+  "source_alias_mg": "MG 뮤직",
+  "source_alias_tx": "TX 뮤직",
+  "source_alias_wy": "WY 뮤직",
+  "source_alias_xm": "XM 뮤직",
+  "source_all": "통합",
+  "source_bd": "바이두",
+  "source_kg": "쿠거우",
+  "source_kw": "쿠워",
+  "source_mg": "미구",
+  "source_tx": "텐센트",
+  "source_wy": "넷이즈",
+  "source_xm": "샤미",
+  "sync__auth_code_input_tip": "연결 코드를 입력하세요",
+  "sync__auth_code_title": "연결 코드 입력이 필요합니다",
+  "sync__dislike_merge_tip_desc": "두 목록의 내용을 병합하고 중복 항목을 제거합니다.",
+  "sync__dislike_other_tip_desc": "\"동기화 취소\"를 선택하면 \"싫어요 곡\" 목록을 동기화하지 않습니다.",
+  "sync__dislike_overwrite_tip_desc": "덮어써지는 쪽의 목록이 덮어쓰는 쪽의 목록으로 교체됩니다.",
+  "sync__dislike_title": "{name}의 \"싫어요 곡\" 목록과 동기화할 방법을 선택하세요",
+  "sync__list_merge_tip_desc": "두 목록을 병합합니다. 동일한 곡은 제거되고(병합 대상의 곡이 제거됨), 다른 곡은 추가됩니다.",
+  "sync__list_other_tip_desc": "\"동기화 취소\"를 선택하면 목록을 동기화하지 않습니다.",
+  "sync__list_overwrite_tip_desc": "덮어써지는 목록과 동일한 ID를 가진 목록은 삭제되고 덮어쓰는 쪽의 목록으로 교체됩니다(ID가 다른 목록은 병합됩니다). \"전체 덮어쓰기\"가 선택된 경우, 덮어써지는 쪽의 모든 목록이 제거되고 덮어쓰는 쪽의 목록으로 교체됩니다.",
+  "sync__list_title": "\"{name}\"과(와) 목록을 동기화할 방법을 선택하세요",
+  "sync__merge_btn_local_remote": "\"로컬 목록\"을 \"원격 목록\"과 병합",
+  "sync__merge_btn_remote_local": "\"원격 목록\"을 \"로컬 목록\"과 병합",
+  "sync__merge_label": "병합",
+  "sync__merge_tip": "병합: ",
+  "sync__other_label": "기타",
+  "sync__other_tip": "기타: ",
+  "sync__overwrite": "전체 덮어쓰기",
+  "sync__overwrite_btn_cancel": "동기화 취소",
+  "sync__overwrite_btn_local_remote": "\"로컬 목록\"으로 \"원격 목록\" 덮어쓰기",
+  "sync__overwrite_btn_none": "실시간 동기화만 사용",
+  "sync__overwrite_btn_remote_local": "\"원격 목록\"으로 \"로컬 목록\" 덮어쓰기",
+  "sync__overwrite_label": "덮어쓰기",
+  "sync__overwrite_tip": "덮어쓰기: ",
+  "sync_status_disabled": "연결 안 됨",
+  "tag__high_quality": "HQ",
+  "tag__lossless": "SQ",
+  "tag__lossless_24bit": "24bit",
+  "theme_add": "테마 추가",
+  "theme_auto": "자동",
+  "theme_auto_tip": "우클릭하여 라이트/다크 테마 옵션 창 열기",
+  "theme_black": "블랙",
+  "theme_blue": "블루",
+  "theme_blue2": "퍼플 블루",
+  "theme_blue_plus": "블루 플러스",
+  "theme_china_ink": "수묵",
+  "theme_edit_modal__app_bg": "앱 배경 색상",
+  "theme_edit_modal__aside_color": "사이드바 버튼 색상",
+  "theme_edit_modal__badge": "라벨 색상",
+  "theme_edit_modal__badge_primary": "메인 색상",
+  "theme_edit_modal__badge_secondary": "보조 색상",
+  "theme_edit_modal__badge_tertiary": "세 번째 색상",
+  "theme_edit_modal__bg_image": "배경 이미지",
+  "theme_edit_modal__bg_image_add": "배경 이미지 추가",
+  "theme_edit_modal__bg_image_change": "배경 이미지 변경",
+  "theme_edit_modal__bg_image_remove": "배경 이미지 제거",
+  "theme_edit_modal__close_btn": "닫기",
+  "theme_edit_modal__control_btn": "왼쪽 컨트롤 버튼 색상",
+  "theme_edit_modal__copy": "테마 복사",
+  "theme_edit_modal__dark": "다크 테마",
+  "theme_edit_modal__dark_font": "다크 글꼴",
+  "theme_edit_modal__font": "글꼴 색상",
+  "theme_edit_modal__hide_btn": "상세 페이지 숨기기",
+  "theme_edit_modal__main_bg": "콘텐츠 영역 배경 색상",
+  "theme_edit_modal__min_btn": "최소화",
+  "theme_edit_modal__pick_cancel": "초기화",
+  "theme_edit_modal__pick_color": "색상 선택",
+  "theme_edit_modal__pick_last_color": "이전 색상 사용",
+  "theme_edit_modal__pick_save": "확인",
+  "theme_edit_modal__preview": "미리보기",
+  "theme_edit_modal__primary": "테마 색상",
+  "theme_edit_modal__remove": "삭제",
+  "theme_edit_modal__remove_tip": "이 테마를 정말 삭제하시겠습니까?",
+  "theme_edit_modal__save_new": "복사",
+  "theme_edit_modal__select_bg_file": "배경 이미지를 선택하세요",
+  "theme_edit_modal__title_add": "테마 추가",
+  "theme_edit_modal__title_edit": "테마 편집",
+  "theme_green": "그린",
+  "theme_grey": "그레이",
+  "theme_happy_new_year": "새해",
+  "theme_max_tip": "테마는 최대 10개까지 추가할 수 있습니다. 일부를 삭제하고 다시 추가해 보세요 😜",
+  "theme_mid_autumn": "추석",
+  "theme_ming": "밍",
+  "theme_more_btn_show": "더 많은 테마",
+  "theme_naruto": "나루토",
+  "theme_orange": "오렌지",
+  "theme_pink": "핑크",
+  "theme_purple": "퍼플",
+  "theme_red": "레드",
+  "theme_selector_modal__dark_title": "다크 테마",
+  "theme_selector_modal__light_title": "라이트 테마",
+  "theme_selector_modal__theme_name": "테마 이름",
+  "theme_selector_modal__title": "시스템 테마 따르기 옵션",
+  "theme_selector_modal__title_tip": "참고: 라이트 테마와 다크 테마를 미리 설정해 두면 시스템의 라이트/다크 모드에 따라 자동으로 미리 설정한 테마로 전환됩니다.",
+  "toggle_source_failed": "소스 변경에 실패했습니다. 검색 페이지에서 다른 서비스를 지정하여 직접 곡을 검색해 보세요.",
+  "toggle_source_try": "다른 소스로 전환을 시도하는 중...",
+  "update__downgrade_tip": "버전을 다운그레이드({ver})하신 것을 확인했습니다. 새 버전을 사용하다가 문제가 발생하면 먼저 FAQ를 확인해 주세요. FAQ에 문서화되지 않았거나 해결되지 않는 문제는 문서에 안내된 피드백 채널을 통해 알려주세요😘!\n\n참고: 새 버전에서 이전 버전으로 다운그레이드할 때는 먼저 재생목록을 백업하는 것을 권장합니다. 문제가 발생하면 데이터를 정리하여 해결할 수 있습니다. 데이터 폴더 경로는 문서에서 확인할 수 있습니다.",
+  "update__error_top": "새 버전 다운로드에 실패했습니다. 다시 다운로드를 시도하거나 GitHub에서 직접 다운로드해 보세요.\n\n새 버전의 주소는 업데이트 팝업창에 포함되어 있습니다. 새 버전을 다운로드하여 바로 설치하세요. 설치에 실패하면 FAQ를 참고하세요.\n\n참고: 현재는 Windows Setup 버전만 자동 업데이트가 가능합니다. Linux의 AppImage 및 deb 버전도 동작하는 것으로 보이나 테스트되지 않았습니다. 다른 버전으로 설치한 사용자는 수동으로 다운로드하여 업데이트해야 합니다.",
+  "update__ignore_cancel": "업데이트하지 않겠습니다 🤨",
+  "update__ignore_confirm": "네, 업데이트할게요 ❤️",
+  "update__ignore_confirm_tip": "현재는 Windows Setup 버전만 자동 업데이트가 가능합니다. Linux의 AppImage 및 deb 버전도 동작하는 것으로 보이나 테스트되지 않았습니다. 다른 버전으로 설치한 사용자는 수동으로 다운로드하여 업데이트해야 합니다.\n\n새 버전의 주소는 업데이트 팝업창에 포함되어 있습니다. 새 버전을 다운로드하여 바로 설치하세요. 설치에 실패하면 FAQ를 참고하세요.",
+  "update__ignore_confirm_tip_confirm": "네, 이해했습니다",
+  "update__ignore_tip": "현재 사용 중인 버전이 최신 버전보다 {num}개 버전 뒤처져 있습니다🤪. 더 나은 사용 경험을 위해 최신 버전으로 업데이트하는 것을 권장합니다~!\n참고: 새 버전을 사용하다가 문제가 발생하면 먼저 FAQ를 확인해 주세요. FAQ에 문서화되지 않았거나 해결되지 않는 문제는 문서에 안내된 피드백 채널을 통해 알려주세요😘!",
+  "update__timeout_top": "다운로드 시간 초과 안내\n\n현재 GitHub 접속 속도가 느려 새 버전을 한 시간째 다운로드하고 있지만 아직 완료되지 않았습니다😳. 계속 기다릴 수도 있지만, 수동으로 업데이트하는 것을 강력히 권장합니다!",
+  "user_api__allow_show_update_alert": "업데이트 팝업 표시 허용",
+  "user_api__btn_export": "내보내기",
+  "user_api__btn_import": "로컬 파일에서 가져오기",
+  "user_api__btn_import_online": "네트워크에서 가져오기",
+  "user_api__btn_remove": "삭제",
+  "user_api__import_file": "음악 API 스크립트 파일을 선택하세요",
+  "user_api__init_failed_alert": "음악 API \"{name}\" 초기화 실패: ",
+  "user_api__max_tip": "동시에 최대 20개의 API만 사용할 수 있습니다🤪.\n\n계속 가져오려면 불필요한 API를 삭제하여 공간을 확보해 주세요.",
+  "user_api__noitem": "아무것도 없습니다...😲",
+  "user_api__note": "안내: API 스크립트의 실행 환경을 최대한 격리했지만, 악의적인 동작을 포함한 API 스크립트를 가져오면 시스템에 영향을 줄 수 있습니다. 신중하게 가져와 주세요.",
+  "user_api__readme": "API 작성 안내: ",
+  "user_api__title": "음악 API 관리",
+  "user_api__update_alert": "음악 API \"{name}\"의 새 버전을 찾았습니다: ",
+  "user_api__update_alert_open_url": "업데이트 주소 열기",
+  "user_api_import__failed": "음악 API 가져오기에 실패했습니다:\n\n{message}",
+  "user_api_import_online__input_confirm": "가져오기",
+  "user_api_import_online__input_loading": "가져오는 중...",
+  "user_api_import_online__input_tip": "HTTP 링크를 입력하세요",
+  "user_api_import_online__title": "네트워크에서 음악 API 가져오기"
+}

src/lang/languages.json

@@ -1,4 +1,14 @@
 [
+  {
+    "name": "English",
+    "locale": "en-us",
+    "country": "us"
+  },
+  {
+    "name": "한국어",
+    "locale": "ko-kr",
+    "country": "kr"
+  },
   {
     "name": "简体中文",
     "locale": "zh-cn",
@@ -7,14 +17,9 @@
     "fallback": true
   },
   {
-    "name": "繁体中文",
+    "name": "繁體中文",
     "locale": "zh-tw",
     "alternate": "zh-hk",
     "country": "cn"
-  },
-  {
-    "name": "English",
-    "locale": "en-us",
-    "country": "us"
   }
 ]