添加自定义源二进制数据传输支持

.eslintrc

@@ -0,0 +1,119 @@
+{
+  "root": true,
+  "extends": [
+    "standard"
+  ],
+  "plugins": [
+    "html"
+  ],
+  "parser": "@babel/eslint-parser",
+  "parserOptions": {
+    // "requireConfigFile": false
+  },
+  "rules": {
+    "no-new": "off",
+    "camelcase": "off",
+    "no-return-assign": "off",
+    "space-before-function-paren": ["error", "never"],
+    "no-var": "error",
+    "no-fallthrough": "off",
+    "prefer-promise-reject-errors": "off",
+    "eqeqeq": "off",
+    "no-multiple-empty-lines": [1, {"max": 2}],
+    "comma-dangle": [2, "always-multiline"],
+    "standard/no-callback-literal": "off",
+    "prefer-const": "off",
+    "no-labels": "off",
+    "node/no-callback-literal": "off"
+  },
+  "ignorePatterns": ["vendors", "*.min.js", "dist"],
+  "overrides": [
+    {
+      "files": [ "*.vue" ],
+      "rules": {
+        "no-new": "off",
+        "camelcase": "off",
+        "no-return-assign": "off",
+        "space-before-function-paren": ["error", "never"],
+        "no-var": "error",
+        "no-fallthrough": "off",
+        "prefer-promise-reject-errors": "off",
+        "eqeqeq": "off",
+        "no-multiple-empty-lines": [1, {"max": 2}],
+        "comma-dangle": [2, "always-multiline"],
+        "standard/no-callback-literal": "off",
+        "prefer-const": "off",
+        "no-labels": "off",
+        "node/no-callback-literal": "off",
+        "vue/multi-word-component-names": "off",
+        "@typescript-eslint/strict-boolean-expressions": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/space-before-function-paren": "off",
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "vue/max-attributes-per-line": "off",
+        "vue/singleline-html-element-content-newline": "off",
+        "vue/use-v-on-exact": "off",
+        "@typescript-eslint/restrict-template-expressions": "off",
+        // "no-undef": "off"
+      },
+      "parser": "vue-eslint-parser",
+      "extends": [
+        "plugin:vue/base",
+        // "plugin:vue/strongly-recommended"
+        "plugin:vue/vue3-recommended",
+        "standard-with-typescript",
+      ],
+      "parserOptions": {
+        "sourceType": "module",
+        "parser": {
+          // Script parser for `<script>`
+         "js": "@typescript-eslint/parser",
+
+          // Script parser for `<script lang="ts">`
+         "ts": "@typescript-eslint/parser"
+        },
+        "extraFileExtensions": [".vue"]
+      }
+    },
+    {
+      "files": [ "*.ts" ],
+      "rules": {
+        "no-new": "off",
+        "camelcase": "off",
+        "no-return-assign": "off",
+        "space-before-function-paren": ["error", "never"],
+        "no-var": "error",
+        "no-fallthrough": "off",
+        "prefer-promise-reject-errors": "off",
+        "eqeqeq": "off",
+        "no-multiple-empty-lines": [1, {"max": 2}],
+        "comma-dangle": [2, "always-multiline"],
+        "standard/no-callback-literal": "off",
+        "prefer-const": "off",
+        "no-labels": "off",
+        "node/no-callback-literal": "off",
+        "@typescript-eslint/strict-boolean-expressions": "off",
+        "@typescript-eslint/explicit-function-return-type": "off",
+        "@typescript-eslint/space-before-function-paren": "off",
+        "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/restrict-template-expressions": [1, {
+          "allowBoolean": true
+        }],
+        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/return-await": "off",
+        "@typescript-eslint/ban-ts-comment": "off",
+        "multiline-ternary": "off",
+        "@typescript-eslint/comma-dangle": "off",
+      },
+      "parser": "@typescript-eslint/parser",
+      "extends": [
+        "standard-with-typescript"
+      ],
+      "parserOptions": {
+        "project": "./src/**/tsconfig.json"
+      }
+    }
+  ]
+}

.eslintrc.base.cjs

@@ -1,98 +0,0 @@
-const baseRule = {
-  'no-new': 'off',
-  camelcase: 'off',
-  'no-return-assign': 'off',
-  'space-before-function-paren': ['error', 'never'],
-  'no-var': 'error',
-  'no-fallthrough': 'off',
-  eqeqeq: 'off',
-  'require-atomic-updates': ['error', { allowProperties: true }],
-  'no-multiple-empty-lines': [1, { max: 2 }],
-  'comma-dangle': [2, 'always-multiline'],
-  'standard/no-callback-literal': 'off',
-  'prefer-const': 'off',
-  'no-labels': 'off',
-  'node/no-callback-literal': 'off',
-  'multiline-ternary': 'off',
-}
-const typescriptRule = {
-  ...baseRule,
-  '@typescript-eslint/strict-boolean-expressions': 'off',
-  '@typescript-eslint/explicit-function-return-type': 'off',
-  '@typescript-eslint/space-before-function-paren': 'off',
-  '@typescript-eslint/no-non-null-assertion': 'off',
-  '@typescript-eslint/restrict-template-expressions': [1, {
-    allowBoolean: true,
-    allowAny: true,
-  }],
-  '@typescript-eslint/restrict-plus-operands': [1, {
-    allowBoolean: true,
-    allowAny: true,
-  }],
-  '@typescript-eslint/no-misused-promises': [
-    'error',
-    {
-      checksVoidReturn: {
-        arguments: false,
-        attributes: false,
-      },
-    },
-  ],
-  '@typescript-eslint/naming-convention': 'off',
-  '@typescript-eslint/return-await': 'off',
-  '@typescript-eslint/ban-ts-comment': 'off',
-  '@typescript-eslint/comma-dangle': 'off',
-  '@typescript-eslint/no-unsafe-argument': 'off',
-}
-const vueRule = {
-  ...typescriptRule,
-  'vue/multi-word-component-names': 'off',
-  'vue/max-attributes-per-line': 'off',
-  'vue/singleline-html-element-content-newline': 'off',
-  'vue/use-v-on-exact': 'off',
-}
-
-exports.base = {
-  extends: ['standard'],
-  rules: baseRule,
-  parser: '@babel/eslint-parser',
-}
-
-exports.html = {
-  files: ['*.html'],
-  plugins: ['html'],
-}
-
-exports.typescript = {
-  files: ['*.ts'],
-  rules: typescriptRule,
-  parser: '@typescript-eslint/parser',
-  extends: [
-    'standard-with-typescript',
-  ],
-}
-
-exports.vue = {
-  files: ['*.vue'],
-  rules: vueRule,
-  parser: 'vue-eslint-parser',
-  extends: [
-    // 'plugin:vue/vue3-essential',
-    'plugin:vue/base',
-    'plugin:vue/vue3-recommended',
-    'plugin:vue-pug/vue3-recommended',
-    // "plugin:vue/strongly-recommended"
-    'standard-with-typescript',
-  ],
-  parserOptions: {
-    sourceType: 'module',
-    parser: {
-      // Script parser for `<script>`
-      js: '@typescript-eslint/parser',
-
-      // Script parser for `<script lang="ts">`
-      ts: '@typescript-eslint/parser',
-    },
-    extraFileExtensions: ['.vue'],
-  },
-}

.eslintrc.cjs

@@ -1,20 +0,0 @@
-const { base, typescript } = require('./.eslintrc.base.cjs')
-
-module.exports = {
-  root: true,
-  ...base,
-  overrides: [
-    {
-      ...typescript,
-      parserOptions: {
-        project: './tsconfig.json',
-      },
-    },
-  ],
-  ignorePatterns: [
-    'node_modules',
-    '*.min.js',
-    'dist',
-    'build',
-  ],
-}

.github/actions/setup/action.yml

@@ -1,28 +0,0 @@
-name: Setup
-description: Setup Node Env
-
-runs:
-  using: composite
-  steps:
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '20'
-
-    # - 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
-      with:
-        path: ${{ env.NPM_CACHE }}
-        key: ${{ runner.os }}-npm-cache-${{ hashFiles('package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-npm-cache-
-
-    - name: Install dependencies
-      run: npm ci
-      shell: bash

.github/workflows/beta-pack.yml

@@ -5,125 +5,93 @@ 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
-
-  #     - name: Install Node.js
-  #       uses: actions/setup-node@v4
-  #       with:
-  #         node-version: 20
-
-  #     - name: Cache file
-  #       uses: actions/cache@v4
-  #       with:
-  #         path: |
-  #           node_modules
-  #           $HOME/.cache/electron
-  #           $HOME/.cache/electron-builder
-  #           $HOME/.npm/_prebuilds
-  #         key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-build-
-
-  #     - name: Install Dependencies
-  #       run: |
-  #         npm ci
-
-  #     - name: Lint src code
-  #       run: npm run lint
-
   Windows:
     name: Windows
     runs-on: windows-latest
-    # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - name: Get npm cache directory
-        shell: pwsh
-        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
 
-      - name: Setup Node Env
-        env:
-          NPM_CACHE: ${{ env.NPM_CACHE }}
-        uses: ./.github/actions/setup
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            %APPDATA%\npm-cache
+            %LOCALAPPDATA%\electron\Cache
+            %LOCALAPPDATA%\electron-builder\Cache
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
       - 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@v3
         with:
           name: lx-music-desktop-x64-Setup
-          path: build/*-x64-Setup.exe
+          path: build/* x64 Setup.exe
 
       - 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@v3
         with:
           name: lx-music-desktop-win_x64-green
-          path: build/*win_x64-green.7z
+          path: build/*win_x64 green.7z
+
+      - name: Build Package Setup x86
+        run: npm run pack:win:setup:x86
+      - name: Upload Artifact Setup x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: lx-music-desktop-x86-Setup
+          path: build/* x86 Setup.exe
+
+      - name: Build Package 7z x86
+        run: npm run pack:win:7z:x86
+      - name: Upload Artifact 7z x86
+        uses: actions/upload-artifact@v3
+        with:
+          name: lx-music-desktop-win_x86-green
+          path: build/*win_x86 green.7z
 
       - 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@v3
         with:
           name: lx-music-desktop-arm64-Setup
-          path: build/*-arm64-Setup.exe
+          path: build/* arm64 Setup.exe
 
       - 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@v3
         with:
           name: lx-music-desktop-win_arm64-green
-          path: build/*win_arm64-green.7z
+          path: build/*win_arm64 green.7z
 
-
-      - name: Install old electron
-        run: npm install electron@22
-
-      - name: Install python setuptools
-        run: 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
+      - name: Build Package Setup x86_64
+        run: npm run pack:win:setup:x86_64
+      - name: Upload Artifact Setup x86_64
+        uses: actions/upload-artifact@v3
         with:
-          name: lx-music-desktop-win7_x64-Setup
-          path: build/*win7_x64-Setup.exe
-
-      - name: Build Package win7 7z x64
-        run: npm run pack:win7:7z:x64
-      - name: Upload Artifact win7 7z x64
-        uses: actions/upload-artifact@v4
-        with:
-          name: lx-music-desktop-win7_x64-green
-          path: build/*win7_x64-green.7z
-
-      - name: Build Package win7 7z x86
-        run: npm run pack:win7:7z:x86
-      - name: Upload Artifact win7 7z x86
-        uses: actions/upload-artifact@v4
-        with:
-          name: lx-music-desktop-win7_x86-green
-          path: build/*win7_x86-green.7z
+          name: lx-music-desktop-x86_64-Setup
+          path: build/*x86_64 Setup.exe
 
       - name: Generate file MD5
         run: |
@@ -133,46 +101,51 @@ jobs:
   Mac:
     name: Mac
     runs-on: macos-latest
-    # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - name: Install python setuptools
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            $HOME/.cache/electron
+            $HOME/.cache/electron-builder
+            $HOME/.npm/_prebuilds
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
+      - name: Install Dependencies
         run: |
-          mkdir ~/.venv
-          python3 -m venv ~/.venv
-          source ~/.venv/bin/activate
-          python3 -m pip install 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
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
       - name: Build Package dmg
         run: |
           npm run pack:mac:dmg
           npm run pack:mac:dmg:arm64
+        env:
+          ELECTRON_CACHE: $HOME/.cache/electron
+          ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
 
       - name: Upload Artifact dmg
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         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@v3
         with:
           name: lx-music-desktop-mac-dmg-arm64
           path: build/*-arm64.dmg
@@ -185,75 +158,84 @@ jobs:
   Linux:
     name: Linux
     runs-on: ubuntu-latest
-    # 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@v3
 
-      - name: Get npm cache directory
-        shell: bash
-        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
 
-      - name: Setup Node Env
-        env:
-          NPM_CACHE: ${{ env.NPM_CACHE }}
-        uses: ./.github/actions/setup
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            $HOME/.cache/electron
+            $HOME/.cache/electron-builder
+            $HOME/.npm/_prebuilds
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
-      - name: Build Package deb amd64
-        run: npm run pack:linux:deb:amd64
-      - name: Upload Artifact deb amd64
-        uses: actions/upload-artifact@v4
+      - name: Build Package deb x64
+        run: npm run pack:linux:deb:x64
+      - name: Upload Artifact deb x64
+        uses: actions/upload-artifact@v3
         with:
-          name: lx-music-desktop-deb-amd64
-          path: build/*_amd64.deb
+          name: lx-music-desktop-deb-x64
+          path: build/* x64.deb
 
       - 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@v3
         with:
           name: lx-music-desktop-deb-arm64
-          path: build/*_arm64.deb
+          path: build/* arm64.deb
 
       - 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@v3
         with:
           name: lx-music-desktop-deb-armv7l
-          path: build/*_armv7l.deb
+          path: build/* armv7l.deb
 
       - 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@v3
         with:
           name: lx-music-desktop-x64-appImage
-          path: build/*_x64.AppImage
+          path: build/* x64.AppImage
 
       - 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@v3
         with:
           name: lx-music-desktop-x64-rpm
-          path: build/*.x64.rpm
+          path: build/* x64.rpm
 
       - 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@v3
         with:
           name: lx-music-desktop-x64-pacman
-          path: build/*_x64.pacman
+          path: build/* x64.pacman
 
       - name: Generate file MD5
         run: |

.github/workflows/build-test.yml

@@ -1,28 +0,0 @@
-name: Run build test
-
-on:
-  pull_request:
-    branches:
-      - dev
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out git repository
-        uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: Eslint check
-        run: npm run lint
-
-      - name: Test Build
-        run: npm run build

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

@@ -1,16 +0,0 @@
-name: Publish NPM Version Info
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  dispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.PAT }}
-          repository: lyswhut/lx-music-desktop-version-info
-          event-type: npm-release

.github/workflows/release.yml

@@ -5,114 +5,47 @@ 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
-
-  #     - name: Install Node.js
-  #       uses: actions/setup-node@v4
-  #       with:
-  #         node-version: 20
-
-  #     - name: Cache file
-  #       uses: actions/cache@v4
-  #       with:
-  #         path: |
-  #           node_modules
-  #           $HOME/.cache/electron
-  #           $HOME/.cache/electron-builder
-  #           $HOME/.npm/_prebuilds
-  #         key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-build-
-
-  #     - name: Install Dependencies
-  #       run: |
-  #         npm ci
-
-  #     - name: Lint src code
-  #       run: npm run lint
-
   Windows:
     name: Windows
     runs-on: windows-latest
-    # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - name: Get npm cache directory
-        shell: pwsh
-        run: echo "NPM_CACHE=$(npm config get cache)" >> $env:GITHUB_ENV
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
 
-      - name: Show Env
-        run: echo "${{ env.NPM_CACHE }}"
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            %APPDATA%\npm-cache
+            %LOCALAPPDATA%\electron\Cache
+            %LOCALAPPDATA%\electron-builder\Cache
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
 
-      - name: Setup Node Env
-        env:
-          NPM_CACHE: ${{ env.NPM_CACHE }}
-        uses: ./.github/actions/setup
+      - name: Install Dependencies
+        run: |
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
       - name: Release package
         run: |
+          npm run publish:win:setup:x64:always
           npm run publish:win:7z:x64
-          npm run publish:win:7z:arm64
+          npm run publish:win:setup:x86
+          npm run publish:win:7z:x86
           npm run publish:win:setup:arm64
-          npm run publish:win:setup:x64
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BT_TOKEN: ${{ secrets.BT_TOKEN }}
-
-      - name: Generate file MD5
-        run: |
-          cd build
-          Get-FileHash *.exe,*.7z -Algorithm MD5 | Format-List
-
-
-  Windows_7:
-    name: Windows_7
-    runs-on: windows-latest
-    # needs: CheckCode
-    steps:
-      - name: Check out git repository
-        uses: actions/checkout@v4
-
-      - 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: |
-          git status --porcelain
-          npm run build
-
-      - name: Prepare win7 electron env
-        run: |
-          npm install electron@22
-          pip.exe install setuptools
-
-      - name: Release win7 package
-        run: |
-          npm run publish:win7:setup:x64
-          npm run publish:win7:7z:x64
-          npm run publish:win7:7z:x86
+          npm run publish:win:7z:arm64
+          npm run publish:win:setup:x86_64
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BT_TOKEN: ${{ secrets.BT_TOKEN }}
@@ -125,39 +58,41 @@ jobs:
   Mac:
     name: Mac
     runs-on: macos-latest
-    # needs: CheckCode
     steps:
       - name: Check out git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
-      - name: Install python3 setuptools
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            $HOME/.cache/electron
+            $HOME/.cache/electron-builder
+            $HOME/.npm/_prebuilds
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
+      - name: Install Dependencies
         run: |
-          mkdir ~/.venv
-          python3 -m venv ~/.venv
-          source ~/.venv/bin/activate
-          python3 -m pip install 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
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
       - name: Release package
         run: |
-          npm run publish:mac:dmg
+          npm run publish:mac:dmg:always
           npm run publish:mac:dmg:arm64
         env:
+          ELECTRON_CACHE: $HOME/.cache/electron
+          ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BT_TOKEN: ${{ secrets.BT_TOKEN }}
 
@@ -169,33 +104,40 @@ jobs:
   Linux:
     name: Linux
     runs-on: ubuntu-latest
-    # 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@v3
 
-      - name: Get npm cache directory
-        shell: bash
-        run: echo "NPM_CACHE=$(npm config get cache)" >> $GITHUB_ENV
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
 
-      - name: Show Env
-        run: echo "${{ env.NPM_CACHE }}"
-      - name: Setup Node Env
-        env:
-          NPM_CACHE: ${{ env.NPM_CACHE }}
-        uses: ./.github/actions/setup
+      - name: Cache file
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            $HOME/.cache/electron
+            $HOME/.cache/electron-builder
+            $HOME/.npm/_prebuilds
+          key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
 
       - name: Build src code
-        run: |
-          git status --porcelain
-          npm run build
+        run: npm run build:src
 
       - name: Release package
         run: |
-          npm run publish:linux:deb:amd64
+          npm run publish:linux:deb:x64:always
           npm run publish:linux:deb:arm64
           npm run publish:linux:deb:armv7l
           npm run publish:linux:appImage

.ncurc.js

@@ -5,31 +5,15 @@ module.exports = {
     'chalk',
     'del',
     'comlink',
-    'vue',
-    'image-size',
-    'message2call',
-    '@types/ws',
-    'eslint',
-    'electron-debug',
-    // 'eslint-config-standard-with-typescript',
-    // 'typescript', // https://github.com/microsoft/TypeScript/pull/54567
   ],
-
   // target: 'newest',
   // filter: [
   //   'electron-builder',
   //   'electron-updater',
   // ],
 
-  // target: 'patch',
-  // filter: [
-  //   'vue',
-  // ],
-
   // target: 'minor',
   // filter: [
   //   'electron',
-  //   'eslint',
-  //   'electron-debug',
   // ],
 }

CHANGELOG.md

@@ -6,295 +6,6 @@ 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.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
-
-提交祝大家新年快乐！
-
-更新前需要注意：
-由于自定义源的调用方式变更，可能会导致某些第三方源停止工作，如果出现这种情况，你需要将LX回退到 v2.5.0
-
-### 新增
-
-- 若自定义源初始化失败，将会出现弹窗提示初始化失败的详情
-- 添加win7_x64架构的安装版安装包构建
-- 新增播放歌曲时阻止电脑休眠，默认启用，可到设置-播放设置关闭（#1563）
-
-### 优化
-
-- 更新zh-tw翻译
-- 自定义源列显示源版本号、作者名字
-- 优化列表全选机制，修复列表未获得焦点时仍然可以全选的问题
-- 优化搜索框交互逻辑，防止鼠标操作时意外搜索候选列表的内容
-- 添加对wy源某些歌曲有问题的歌词进行修复
-- 改进本地音乐在线信息的匹配机制
-- 优化任务下载状态显示，现在下载时若数据传输完成但数据写入未完成时会显示相应的状态
-- 添加对下载歌曲时封面图片大小的控制处理（#1609）
-- 添加创建同名列表时的二次确认（#1621）
-
-### 修复
-
-- 修复备份文件无法导入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`的获取操作详情看自定义源文档说明
-
-## [2.5.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.4.1...v2.5.0) - 2023-09-28
-
-落雪提前祝大家中秋快乐~🥮😘！
-
-### 不兼容性变更
-
-- 由于微软及Electron即将结束对 Windows 7、Windows 8 的支持，所以从这个版本起，LX的默认 Windows 版也不再支持这些版本的系统，但考虑到仍然有许多人使用 Windows 7，我们特别构建了能在 Windows 7 上使用的免安装版（文件名带win7），需要注意的是这个版本将缺乏安全更新，若非必要情况，不要使用该版本
-- 由于微软在 Windows 10 2004版本已删除对32位的OEM支持，所以在这个版本起，LX的默认 Windows 版已不再提供32位的支持
-- 更改构建的文件名格式，主要修改linux下deb、rpm文件命名格式
-
-### 新增
-
-- 新增Scheme URL对播放器的控制操作，新增的操作包含 播放、暂停、下一首、上一首等，详情看Scheme URL文档
-
-### 优化
-
-- 通过歌曲菜单添加不喜欢歌曲时需要二次确认防止手抖
-
-### 修复
-
-- 修复音频输出设备设置在重启软件后被重置的问题（#1568）
-- 修复更换语言设置后源名称未更新的问题
-- 修复点击搜索、排行榜等在线列表歌曲右键菜单歌曲详情页会意外将该歌曲添加不喜欢的问题
-
-### 其他
-
-- 更新 electron 到 v25.8.3
-
-## [2.4.1](https://github.com/lyswhut/lx-music-desktop/compare/v2.4.0...v2.4.1) - 2023-09-09
-
-目前本项目的原始发布地址只有 **GitHub** 及 **蓝奏网盘** ，其他渠道均为第三方转载发布，可信度请自行鉴别。
-本项目无微信公众号之类的官方账号，谨防被骗。
-
-### 修复
-
-- 修复 v2.4.0 的默认数据库版本号不对导致首次安装该版本的用户无法再次启动软件的问题
-
-## [2.4.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.3.0...v2.4.0) - 2023-09-09
-
-目前本项目的原始发布地址只有 **GitHub** 及 **蓝奏网盘** ，其他渠道均为第三方转载发布，可信度请自行鉴别。
-本项目无微信公众号之类的官方账号，谨防被骗。
-
-### 不兼容性变更
-
-该版本修改了同步协议逻辑，同步功能至少需要PC端v2.4.0或移动端v1.1.0版本或同步服务v2.0.0才能连接使用。
-
-### 新增
-
-- 新增我的列表名右键菜单-排序歌曲-随机乱序功能，使用它可以对选中列表内歌曲进行随机重排（#1440）
-- 新增数据同步服务端模式已认证设备列表管理，该功能位置：设置-数据同步-服务端模式-已认证设备列表
-- 新增“不喜欢歌曲”功能，可以在我的列表或者在线列表内歌曲的右击菜单使用，还可以去“设置-其他”手动编辑不喜欢规则，注：“上一曲”、“下一曲”功能将跳过符合“不喜欢歌曲”规则的歌曲，但你仍可以手动播放这些歌曲
-- 新增同步功能对“不喜欢歌曲”列表的同步
-- 新增软件内快捷键“不喜欢该歌曲”设置，全局快捷键“收藏歌曲”、“取消收藏”、“不喜欢该歌曲”设置
-- 新增设置-播放设置-点击相同列表内的歌曲切歌时是否清空已播放列表（随机模式下列表内所有歌曲会重新参与随机）选项，默认关闭
-
-### 优化
-
-- 优化音效设置-环境音效启用、禁用时的操作效果显示，修复禁用环境音效时仍然可以调整增益、新增预设的问题
-- 过滤翻译歌词或罗马音歌词中只有“//”的行（#1499）
-- 点击打开歌单弹窗背景将不再自动关闭弹窗，防止选择输入框里的内容时意外关闭弹窗
-- 优化数据传输逻辑，列表同步指令使用队列机制，保证列表同步操作的顺序
-- 优化桌面歌词在开启 缩放当前播放的歌词 并关闭 延迟歌词滚动 时的歌词滚动位置计算问题，现在歌词滚动应该可以正确滚动到目标位置了
-- 优化歌词在短时间内快速播放时的滚动效果，现在遇到这种情况时滚动将更平滑
-
-### 修复
-
-- 修复字体设置某些字体无法应用的问题
-- 修复搜索提示功能失效的问题（#1452, @Folltoshe）
-- 修复我的列表名右键菜单-排序歌曲按专辑名排序无效的问题（#1440）
-- 修复若路径存在 # 字符时，软件无法启动的问题
-- 修复搜索框在某些情况下输入内容后搜索时会自动清空的问题（#1472）
-- 修复某些tx源歌词因数据异常解析失败的问题
-- 修复windows平台下隐藏窗口后再显示时任务栏按钮丢失的问题
-- 修复首句歌词被提前播放的问题
-- 修复潜在导致列表数据不同步的问题
-- 修复kg无评论时的加载处理问题
-
-### 变更
-
-- 播放模式应该只适用于列表内的歌曲，所以单曲循环模式不应对“稍后播放”的歌曲有效，该行为现在与移动端一致
-- 随机模式下，通过点击与播放列表相同的列表切歌时，将不再清空已播放列表，即已播放的歌曲不再重新参与随机，若想恢复之前的行为可以去设置-播放设置启用清空已播放列表选项
-
-### 其他
-
-- 更新 electron 到 v22.3.23
-- 重构同步服务端功能部分代码，使其更易扩展新功能
-
-## [2.3.0](https://github.com/lyswhut/lx-music-desktop/compare/v2.2.2...v2.3.0) - 2023-06-29
-
-### 新增
-
-- 新增音效设置（实验性功能），支持10段均衡器设置、内置的一些环境混响音效、音调升降调节、3D立体环绕音效（由于升降调需要实时处理音频数据，这会导致额外的CPU占用，已知问题：如果CPU资源不够时将处理导致任务堆积而出现声音异常，这时需要暂停播放一段时间等堆积的任务处理完毕再播放）
-- 播放速率设置面板新增是否音调补偿设置，在调整播放速率后，可以选择是否启用音调补偿，默认启用
-
-### 优化
-
-- Windows、MacOS平台下的字体列表改用原生方式获取，现在Windows平台下能显示当前已安装的更多类型字体了（注：MacOS平台未测，可用性未知）
-- 移除桌面歌词窗口透明边距，在Linux下的桌面歌词可以完全拖到贴合屏幕边缘了
-- 过滤嵌入、下载的翻译、罗马音歌词时间标签，与主歌词时间不匹配的歌词将被丢弃，防止出现原歌词与翻译歌词顺序错乱的问题（#1358）
-
-### 修复
-
-- 修复列表名翻译显示
-- 修复因插入数字类型的ID导致其意外在末尾追加 .0 导致列表数据异常的问题，同时也可能导致同步数据丢失的问题（要完全修复这个问题还需要同时将移动端、同步服务更新到最新版本）
-- 修复下载时出现302错误的问题
-- 修复播放某些在线音频会没有声音的问题
-- 修复改变播放速率时会导致歌词报错的问题
-- 修复tx热门评论昵称被错误切割的问题 (#1397, By: @helloplhm-qwq, @Folltoshe)
-- 修复wy源热搜词失效的问题（#1401, @Folltoshe）
-- 修复Deepin 20下启用桌面歌词时可能会导致桌面卡死的问题（#1288）
-- 修复添加单首歌曲弹窗列表创建按钮无法取消的问题
-- 修复mg歌单搜索歌单播放数量显示问题
-- 修复tx翻译歌词解析丢失的问题（更新版本后需手动清理一次歌词缓存）
-
-### 其他
-
-- 更新 electron 到 v22.3.15
-
 ## [2.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v2.2.1...v2.2.2) - 2023-05-01
 
 ### 修复

README.md

@@ -52,8 +52,6 @@
 
 目前本项目的原始发布地址只有**GitHub**及**蓝奏网盘**，其他渠道均为第三方转载发布，与本项目无关！
 
-为了提高使用门槛，本软件内的默认设置、UI操作不以新手友好为目标，所以使用前建议先根据你的喜好浏览调整一遍软件设置，阅读一遍[音乐播放列表机制](https://lyswhut.github.io/lx-music-doc/desktop/faq/playlist)及[可用的鼠标、键盘快捷操作](https://lyswhut.github.io/lx-music-doc/desktop/faq/hotkey)
-
 #### Scheme URL支持
 
 从v1.17.0起支持 Scheme URL，可以使用此功能从浏览器等场景下调用LX Music，我们开发了一个[油猴脚本](https://github.com/lyswhut/lx-music-script#readme)配套使用，<br>
@@ -91,7 +89,25 @@
 
 ### 源码使用方法
 
-已迁移至：<https://lyswhut.github.io/lx-music-doc/desktop/use-source-code>
+环境要求：Node.js 16+
+
+```bash
+# 开发模式
+npm run dev
+
+# 构建免安装版
+npm run pack:dir
+
+# 构建安装包（Windows版）
+npm run pack:win
+
+# 构建安装包（Mac版）
+npm run pack:mac
+
+# 构建安装包（Linux版）
+npm run pack:linux
+
+```
 
 ### UI界面
 
@@ -113,58 +129,23 @@
 
 1. 参照[源码使用方法](https://lyswhut.github.io/lx-music-doc/desktop/use-source-code)设置开发环境
 2. 克隆本仓库代码并切换到`dev`分支开发
-3. 提交PR至`dev`分支
+3. 提交PR
 
 ### 项目协议
 
 本项目基于 [Apache License 2.0](https://github.com/lyswhut/lx-music-desktop/blob/master/LICENSE) 许可证发行，以下协议是对于 Apache License 2.0 的补充，如有冲突，以以下协议为准。
 
----
-
 词语约定：本协议中的“本项目”指洛雪音乐桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
-#### 一、数据来源
+1. 本项目的数据来源原理是从各官方音乐平台的公开服务器中拉取数据，经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的准确性负责。
+2. 使用本项目的过程中可能会产生版权数据，对于这些版权数据，本项目不拥有它们的所有权，为了避免造成侵权，使用者务必在**24小时**内清除使用本项目的过程中所产生的版权数据。
+3. 本项目内的官方音乐平台别名为本项目内对官方音乐平台的一个称呼，不包含恶意，如果官方音乐平台觉得不妥，可联系本项目更改或移除。
+4. 本项目内使用的部分包括但不限于字体、图片等资源来源于互联网，如果出现侵权可联系本项目移除。
+5. 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
+6. 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本项目不对项目内的技术可能存在违反当地法律法规的行为作保证，**禁止在违反当地法律法规的情况下使用本项目**，对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
 
-1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台APP获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
+若你使用了本项目，将代表你接受以上协议。
 
-1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“音乐来源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名字、歌手名字等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
-
-1.3 本项目的非官方平台数据（例如我的收藏列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
-
-#### 二、版权数据
-
-2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在**24小时内**清除使用本项目的过程中所产生的版权数据。
-
-#### 三、音乐平台别名
-
-3.1 本项目内的官方音乐平台别名为本项目内对官方音乐平台的一个称呼，不包含恶意。如果官方音乐平台觉得不妥，可联系本项目更改或移除。
-
-#### 四、资源使用
-
-4.1 本项目内使用的部分包括但不限于字体、图片等资源来源于互联网。如果出现侵权可联系本项目移除。
-
-#### 五、免责声明
-
-5.1 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
-
-#### 六、使用限制
-
-6.1 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流。本项目不对项目内的技术可能存在违反当地法律法规的行为作保证。
-
-6.2 **禁止在违反当地法律法规的情况下使用本项目。** 对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
-
-#### 七、版权保护
-
-7.1 音乐平台不易，请尊重版权，支持正版。
-
-#### 八、非商业性质
-
-8.1 本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作及捐赠。
-
-#### 九、接受协议
-
-9.1 若你使用了本项目，将代表你接受本协议。
-
----
-
-若对此有疑问请 mail to: lyswhut+qq.com (请将`+`替换成`@`)
+音乐平台不易，请尊重版权，支持正版。<br>
+本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作及捐赠。<br>
+若对此有疑问请 mail to: lyswhut+qq.com (请将`+`替换成`@`)<br>

build-config/build-after-pack.js

@@ -16,7 +16,7 @@ module.exports = async(context) => {
   const resPath = `${appOutDir}/${productFilename}.app/Contents/Resources`
 
   // 创建APP语言包文件
-  return Promise.all(
+  return await Promise.all(
     Object.entries(macLanguagesInfoPlistStrings).map(([lang, config]) => {
       let infos = Object.entries(config).map(([k, v]) => `"${k}" = "${v}";`).join('\n')
       return fs.writeFile(`${resPath}/${lang}.lproj/InfoPlist.strings`, infos)

build-config/build-before-pack.js

@@ -2,47 +2,45 @@ const fs = require('fs')
 const fsPromises = require('fs').promises
 const path = require('path')
 const { Arch } = require('electron-builder')
-const nodeAbi = require('node-abi')
 
 const better_sqlite3_fileNameMap = {
-  [Arch.x64]: 'linux-x64',
-  [Arch.arm64]: 'linux-arm64',
-  [Arch.armv7l]: 'linux-arm',
+  [Arch.x64]: 'electron-v110-linux-x64',
+  [Arch.arm64]: 'electron-v110-linux-arm64',
+  [Arch.armv7l]: 'electron-v110-linux-arm',
 }
 
 const qrc_decode_fileNameMap = {
   win32: {
-    [Arch.x64]: 'win32-x64',
-    [Arch.ia32]: 'win32-ia32',
-    [Arch.arm64]: 'win32-arm64',
+    [Arch.x64]: 'electron-v110-win32-x64',
+    [Arch.ia32]: 'electron-v110-win32-ia32',
+    [Arch.arm64]: 'electron-v110-win32-arm64',
   },
   linux: {
-    [Arch.x64]: 'linux-x64',
-    [Arch.arm64]: 'linux-arm64',
-    [Arch.armv7l]: 'linux-arm',
+    [Arch.x64]: 'electron-v110-linux-x64',
+    [Arch.arm64]: 'electron-v110-linux-arm64',
+    [Arch.armv7l]: 'electron-v110-linux-arm',
   },
   darwin: {
-    [Arch.x64]: 'darwin-x64',
-    [Arch.arm64]: 'darwin-arm64',
+    [Arch.x64]: 'electron-v110-darwin-x64',
+    [Arch.arm64]: 'electron-v110-darwin-arm64',
   },
 }
 
-const replaceSqliteLib = async(electronNodeAbi, arch) => {
+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_electron-v${electronNodeAbi}-${better_sqlite3_fileNameMap[arch]}.node`)
-  console.log(filePath)
+  const filePath = path.join(__dirname, `./lib/better_sqlite3_${better_sqlite3_fileNameMap[arch]}.node`)
   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 replaceQrcDecodeLib = async(platform, arch) => {
+  console.log('replace qrc_decode lib...', platform, qrc_decode_fileNameMap[platform][arch])
+  const filePath = path.join(__dirname, `./lib/qrc_decode_${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(_ => _)
@@ -53,9 +51,7 @@ const replaceQrcDecodeLib = async(electronNodeAbi, platform, arch) => {
 
 module.exports = async(context) => {
   const { electronPlatformName, 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)
+  await replaceQrcDecodeLib(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')
@@ -67,7 +63,7 @@ module.exports = async(context) => {
         // console.log('rename binding file...')
         await fsPromises.rename(bindingFilePath, bindingBakFilePath)
       }
-      await replaceSqliteLib(electronNodeAbi, arch)
+      await replaceSqliteLib(arch)
       break
 
     default:

build-config/build-pack.js

@@ -1,302 +0,0 @@
-/* eslint-disable no-template-curly-in-string */
-
-const builder = require('electron-builder')
-const beforePack = require('./build-before-pack')
-const afterPack = require('./build-after-pack')
-
-/**
-* @type {import('electron-builder').Configuration}
-* @see https://www.electron.build/configuration/configuration
-*/
-const options = {
-  appId: 'cn.toside.music.desktop',
-  beforePack,
-  afterPack,
-  protocols: {
-    name: 'lx-music-protocol',
-    schemes: [
-      'lxmusic',
-    ],
-  },
-  directories: {
-    buildResources: './resources',
-    output: './build',
-  },
-  files: [
-    '!node_modules/**/*',
-    'node_modules/font-list',
-    'node_modules/better-sqlite3/lib',
-    'node_modules/better-sqlite3/package.json',
-    'node_modules/better-sqlite3/build/Release/better_sqlite3.node',
-    'node_modules/electron-font-manager/index.js',
-    'node_modules/electron-font-manager/package.json',
-    'node_modules/electron-font-manager/build/Release/font_manager.node',
-    'node_modules/node-gyp-build',
-    'node_modules/bufferutil',
-    'node_modules/utf-8-validate',
-    'build/Release/qrc_decode.node',
-    'dist/**/*',
-  ],
-  asar: {
-    smartUnpack: false,
-  },
-  extraResources: [
-    './licenses',
-  ],
-  publish: [
-    {
-      provider: 'github',
-      owner: 'lyswhut',
-      repo: 'lx-music-desktop',
-    },
-  ],
-}
-/**
- * @type {import('electron-builder').Configuration}
- * @see https://www.electron.build/configuration/configuration
- */
-const winOptions = {
-  win: {
-    icon: './resources/icons/icon.ico',
-    legalTrademarks: 'lyswhut',
-    // artifactName: '${productName}-v${version}-${env.ARCH}-${env.TARGET}.${ext}',
-  },
-  nsis: {
-    oneClick: false,
-    language: '2052',
-    allowToChangeInstallationDirectory: true,
-    differentialPackage: true,
-    license: './licenses/license.rtf',
-    shortcutName: 'LX Music',
-  },
-}
-/**
- * @type {import('electron-builder').Configuration}
- * @see https://www.electron.build/configuration/configuration
- */
-const linuxOptions = {
-  linux: {
-    maintainer: 'lyswhut <lyswhut@qq.com>',
-    // artifactName: '${productName}-${version}.${env.ARCH}.${ext}',
-    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',
-    },
-  },
-  appImage: {
-    license: './licenses/license_zh.txt',
-    category: 'Utility;AudioVideo;Audio;Player;Music;',
-  },
-}
-/**
- * @type {import('electron-builder').Configuration}
- * @see https://www.electron.build/configuration/configuration
- */
-const macOptions = {
-  mac: {
-    icon: './resources/icons/icon.icns',
-    category: 'public.app-category.music',
-    // artifactName: '${productName}-${version}.${ext}',
-  },
-  dmg: {
-    window: {
-      width: 530,
-      height: 380,
-    },
-    contents: [
-      {
-        x: 140,
-        y: 200,
-      },
-      {
-        x: 390,
-        y: 200,
-        type: 'link',
-        path: '/Applications',
-      },
-    ],
-    title: '洛雪音乐助手 v${version}',
-  },
-}
-
-// win: {
-// tagret: {
-//   setup: ['nsis', '${productName}-v${version}-${env.ARCH}-Setup.${ext}'],
-//   green: ['7z', '${productName}-v${version}-${env.ARCH}-green.${ext}'],
-//   portable: ['portable', '${productName}-v${version}-${env.ARCH}-portable.${ext}'],
-// },
-// },
-// linux: {
-// platform: Platform.WINDOWS,
-// arch: {
-//   x64: builder.Arch.x64,
-//   arm64: builder.Arch.arm64,
-//   armv7l: builder.Arch.armv7l,
-// },
-// tagret: {
-//   deb: ['deb', '${productName}_${version}_${env.ARCH}.${ext}'],
-//   appImage: ['AppImage', '${productName}_${version}_${env.ARCH}.${ext}'],
-//   pacman: ['pacman', '${productName}_${version}_${env.ARCH}.${ext}'],
-//   rpm: ['rpm', '${productName}-${version}.${env.ARCH}.${ext}'],
-// },
-// },
-// mac: {
-// arch: {
-//   x64: builder.Arch.x64,
-//   x86: builder.Arch.ia32,
-//   arm64: builder.Arch.arm64,
-// },
-// tagret: {
-//   dmg: ['dmg', '${productName}-${version}-${env.ARCH}.${ext}'],
-// },
-// },
-
-const createTarget = {
-  /**
-   *
-   * @param {*} arch
-   * @param {*} packageType
-   * @returns {{ buildOptions: import('electron-builder').CliOptions, options: import('electron-builder').Configuration }}
-   */
-  win(arch, packageType) {
-    switch (packageType) {
-      case 'setup':
-        winOptions.artifactName = `\${productName}-v\${version}-${arch}-Setup.\${ext}`
-        return {
-          buildOptions: { win: ['nsis'] },
-          options: winOptions,
-        }
-      case 'green':
-        winOptions.artifactName = `\${productName}-v\${version}-win_${arch}-green.\${ext}`
-        return {
-          buildOptions: { win: ['7z'] },
-          options: winOptions,
-        }
-      case 'win7_setup':
-        winOptions.artifactName = `\${productName}-v\${version}-win7_${arch}-Setup.\${ext}`
-        return {
-          buildOptions: { win: ['nsis'] },
-          options: winOptions,
-        }
-      case 'win7_green':
-        winOptions.artifactName = `\${productName}-v\${version}-win7_${arch}-green.\${ext}`
-        return {
-          buildOptions: { win: ['7z'] },
-          options: winOptions,
-        }
-      case 'portable':
-        winOptions.artifactName = `\${productName}-v\${version}-${arch}-portable.\${ext}`
-        return {
-          buildOptions: { win: ['portable'] },
-          options: winOptions,
-        }
-      default: throw new Error('Unknown package type: ' + packageType)
-    }
-  },
-  /**
-   *
-   * @param {*} arch
-   * @param {*} packageType
-   * @returns {{ buildOptions: import('electron-builder').CliOptions, options: import('electron-builder').Configuration }}
-   */
-  linux(arch, packageType) {
-    switch (packageType) {
-      case 'deb':
-        linuxOptions.artifactName = `\${productName}_\${version}_${arch == 'x64' ? 'amd64' : arch}.\${ext}`
-        return {
-          buildOptions: { linux: ['deb'] },
-          options: linuxOptions,
-        }
-      case 'appImage':
-        linuxOptions.artifactName = `\${productName}_\${version}_${arch}.\${ext}`
-        return {
-          buildOptions: { linux: ['AppImage'] },
-          options: linuxOptions,
-        }
-      case 'pacman':
-        linuxOptions.artifactName = `\${productName}_\${version}_${arch}.\${ext}`
-        return {
-          buildOptions: { linux: ['pacman'] },
-          options: linuxOptions,
-        }
-      case 'rpm':
-        linuxOptions.artifactName = `\${productName}-\${version}.${arch}.\${ext}`
-        return {
-          buildOptions: { linux: ['rpm'] },
-          options: linuxOptions,
-        }
-      default: throw new Error('Unknown package type: ' + packageType)
-    }
-  },
-  /**
-   *
-   * @param {*} arch
-   * @param {*} packageType
-   * @returns {{ buildOptions: import('electron-builder').CliOptions, options: import('electron-builder').Configuration }}
-   */
-  mac(arch, packageType) {
-    switch (packageType) {
-      case 'dmg':
-        macOptions.artifactName = `\${productName}-\${version}-${arch}.\${ext}`
-        return {
-          buildOptions: { mac: ['dmg'] },
-          options: macOptions,
-        }
-      default: throw new Error('Unknown package type: ' + packageType)
-    }
-  },
-}
-
-/**
- *
- * @param {'win' | 'mac' | 'linux' | 'dir'} target 构建目标平台
- * @param {'x86_64' | 'x64' | 'x86' | 'arm64' | 'armv7l'} arch 包架构
- * @param {*} packageType 包类型
- * @param {'onTagOrDraft' | 'always' | 'never'} publishType 发布类型
- */
-const build = async(target, arch, packageType, publishType) => {
-  if (target == 'dir') {
-    await builder.build({
-      dir: true,
-      config: { ...options, ...winOptions, ...linuxOptions, ...macOptions },
-    })
-    return
-  }
-  const targetInfo = createTarget[target](arch, packageType)
-  // Promise is returned
-  await builder.build({
-    ...targetInfo.buildOptions,
-    publish: publishType ?? 'never',
-    x64: arch == 'x64' || arch == 'x86_64',
-    ia32: arch == 'x86' || arch == 'x86_64',
-    arm64: arch == 'arm64',
-    armv7l: arch == 'armv7l',
-    config: { ...options, ...targetInfo.options },
-  })
-  // .then((result) => {
-  //   console.log(JSON.stringify(result))
-  // })
-  // .catch((error) => {
-  //   console.error(error)
-  // })
-}
-
-const params = {}
-
-for (const param of process.argv.slice(2)) {
-  const [name, value] = param.split('=')
-  params[name] = value
-}
-
-if (params.target == null) throw new Error('Missing target')
-if (params.target != 'dir' && params.arch == null) throw new Error('Missing arch')
-if (params.target != 'dir' && params.type == null) throw new Error('Missing type')
-
-console.log(params.target, params.arch, params.type, params.publish ?? '')
-build(params.target, params.arch, params.type, params.publish)

build-config/css-loader.config.js

@@ -4,7 +4,6 @@ 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

@@ -1,38 +0,0 @@
-// 修补依赖源码以使vite构建的依赖恢复正常工作
-
-const fs = require('node:fs')
-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"',
-  ],
-]
-
-;(async() => {
-  for (const [filePath, fromStr, toStr] of patchs) {
-    console.log(`Patching ${filePath.replace(rootPath, '')}`)
-    try {
-      const file = (await fs.promises.readFile(filePath)).toString()
-      await fs.promises.writeFile(filePath, file.replace(fromStr, toStr))
-    } catch (err) {
-      console.error(`Patch ${filePath.replace(rootPath, '')} failed: ${err.message}`)
-    }
-  }
-  console.log('\nDependencies patch finished.\n')
-})()
-

build-config/lib-update.js

@@ -1,53 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const tar = require('tar')
-
-const libDir = path.join(__dirname, 'lib')
-
-const getGzipFiles = async() => {
-  const names = await fs.promises.readdir(libDir)
-  // for (const name of names) {
-  //   if (name.endsWith('.node')) await fs.promises.unlink(path.join(libDir, name))
-  // }
-  return names.filter(name => name.endsWith('.gz'))
-}
-
-const unzip = async(filePath) => {
-  const targetDir = filePath.replace('.tar.gz', '')
-  if (fs.existsSync(targetDir)) await fs.promises.rm(targetDir, { recursive: true })
-  await fs.promises.mkdir(targetDir)
-  await tar.x({
-    file: filePath,
-    strip: 1,
-    C: targetDir,
-  })
-  return targetDir
-}
-
-const files = [
-  'qrc_decode',
-  'better_sqlite3',
-]
-const moveFile = async(filePath) => {
-  const name = 'electron-' + path.basename(filePath).split('-electron-')[1]
-  for (const fileName of files) {
-    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.rm(filePath, { recursive: true })
-}
-
-const run = async() => {
-  const files = await getGzipFiles()
-  for (const name of files) {
-    await moveFile(await unzip(path.join(libDir, name)))
-  }
-  for (const name of files) {
-    await fs.promises.unlink(path.join(libDir, name))
-  }
-}
-
-run()
-

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

@@ -15,7 +15,6 @@ module.exports = {
   externals: {
     'font-list': 'font-list',
     'better-sqlite3': 'better-sqlite3',
-    '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'),

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

@@ -7,12 +7,11 @@ 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: false,
   entry: {
     main: path.join(__dirname, '../../src/main/index.ts'),
     // 'dbService.worker': path.join(__dirname, '../../src/main/worker/dbService/index.ts'),
@@ -45,6 +44,6 @@ module.exports = merge(baseConfig, {
     maxAssetSize: 1024 * 1024 * 20,
   },
   optimization: {
-    minimize: false,
+    minimize: buildConfig.minimize,
   },
 })

build-config/pack.js

@@ -17,7 +17,6 @@ const { Worker, isMainThread, parentPort } = require('worker_threads')
 
 
 function build() {
-  console.time('build')
   del.sync(['dist/**', 'build/**'])
 
   const spinners = new Spinnies({ color: 'blue' })
@@ -37,7 +36,6 @@ function build() {
     process.stdout.write('\x1B[2J\x1B[0f')
     console.log(`\n\n${results}`)
     console.log(`${okayLog}take it away ${chalk.yellow('`electron-builder`')}\n`)
-    console.timeEnd('build')
     process.exit()
   }
 

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

@@ -20,21 +20,26 @@ module.exports = {
       type: 'commonjs2',
     },
     path: path.join(__dirname, '../../dist'),
-    publicPath: '',
+    publicPath: 'auto',
   },
   resolve: {
     alias: {
-      '@root': path.join(__dirname, '../../src'),
+      '@': path.join(__dirname, '../../src'),
       '@main': path.join(__dirname, '../../src/main'),
       '@renderer': path.join(__dirname, '../../src/renderer'),
       '@lyric': path.join(__dirname, '../../src/renderer-lyric'),
       '@static': path.join(__dirname, '../../src/static'),
       '@common': path.join(__dirname, '../../src/common'),
     },
-    extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
+    extensions: ['.tsx', '.ts', '.js', '.json', '.vue', '.node'],
   },
   module: {
     rules: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+      },
       {
         test: /\.tsx?$/,
         exclude: /node_modules/,

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

@@ -16,7 +16,6 @@ module.exports = merge(baseConfig, {
       },
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
-      __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
       staticPath: `"${path.join(__dirname, '../../src/static').replace(/\\/g, '\\\\')}"`,
     }),
   ],

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

@@ -15,19 +15,10 @@ const buildConfig = require('../webpack-build-config')
 
 module.exports = merge(baseConfig, {
   mode: 'production',
-  devtool: 'source-map',
+  devtool: false,
   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': {
@@ -35,7 +26,6 @@ module.exports = merge(baseConfig, {
       },
       __VUE_OPTIONS_API__: 'true',
       __VUE_PROD_DEVTOOLS__: 'false',
-      __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: 'false',
     }),
   ],
   optimization: {

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

@@ -12,21 +12,26 @@ module.exports = {
       type: 'commonjs2',
     },
     path: path.join(__dirname, '../../dist'),
-    publicPath: '',
+    publicPath: 'auto',
   },
   resolve: {
     alias: {
-      '@root': path.join(__dirname, '../../src'),
+      '@': path.join(__dirname, '../../src'),
       '@main': path.join(__dirname, '../../src/main'),
       '@renderer': path.join(__dirname, '../../src/renderer'),
       '@lyric': path.join(__dirname, '../../src/renderer-lyric'),
       '@static': path.join(__dirname, '../../src/static'),
       '@common': path.join(__dirname, '../../src/common'),
     },
-    extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
+    extensions: ['.tsx', '.ts', '.js', '.json', '.vue', '.node'],
   },
   module: {
     rules: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+      },
       {
         test: /\.tsx?$/,
         exclude: /node_modules/,

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

@@ -14,19 +14,10 @@ const buildConfig = require('../webpack-build-config')
 
 module.exports = merge(baseConfig, {
   mode: 'production',
-  devtool: 'source-map',
+  devtool: false,
   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.base.js

@@ -20,21 +20,26 @@ module.exports = {
       type: 'commonjs2',
     },
     path: path.join(__dirname, '../../dist'),
-    publicPath: '',
+    publicPath: 'auto',
   },
   resolve: {
     alias: {
-      '@root': path.join(__dirname, '../../src'),
+      '@': path.join(__dirname, '../../src'),
       '@main': path.join(__dirname, '../../src/main'),
       '@renderer': path.join(__dirname, '../../src/renderer'),
       '@lyric': path.join(__dirname, '../../src/renderer-lyric'),
       '@static': path.join(__dirname, '../../src/static'),
       '@common': path.join(__dirname, '../../src/common'),
     },
-    extensions: ['.tsx', '.ts', '.js', '.json', '.node'],
+    extensions: ['.tsx', '.ts', '.js', '.json', '.vue', '.node'],
   },
   module: {
     rules: [
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+        exclude: /node_modules/,
+      },
       {
         test: /\.tsx?$/,
         exclude: /node_modules/,
@@ -44,12 +49,6 @@ module.exports = {
             appendTsSuffixTo: [/\.vue$/],
           },
         },
-        parser: {
-          worker: [
-            '*audioContext.audioWorklet.addModule()',
-            '...',
-          ],
-        },
       },
       {
         test: /\.node$/,

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

@@ -5,11 +5,6 @@ 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',
@@ -22,9 +17,6 @@ module.exports = merge(baseConfig, {
       // ENVIRONMENT: 'process.env',
       __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,5 +1,4 @@
 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')
@@ -13,35 +12,13 @@ const buildConfig = require('../webpack-build-config')
 
 // let whiteListedModules = ['vue', 'vue-router', 'vuex', 'vue-i18n']
 
-const gitInfo = {
-  commit_id: '',
-  commit_date: '',
-}
-
-try {
-  if (!execSync('git status --porcelain').toString().trim()) {
-    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',
-  devtool: 'source-map',
+  devtool: false,
   externals: [
     // ...Object.keys(dependencies || {}).filter(d => !whiteListedModules.includes(d)),
   ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
   plugins: [
     new CopyWebpackPlugin({
       patterns: [
@@ -58,9 +35,6 @@ module.exports = merge(baseConfig, {
       // ENVIRONMENT: 'process.env',
       __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,10 +16,9 @@ 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
 
@@ -133,11 +132,9 @@ 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) => {
@@ -149,19 +146,23 @@ function startMain() {
     compiler.watch({}, (err, stats) => {
       if (err) {
         console.log(err)
-        reject(err)
         return
       }
 
       // logStats('Main', stats)
-      if (electronProcess) {
-        electronProcess.removeAllListeners()
-        treeKill(electronProcess.pid)
+
+      if (electronProcess && electronProcess.kill) {
+        manualRestart = true
+        process.kill(electronProcess.pid)
+        electronProcess = null
+        startElectron()
+
+        setTimeout(() => {
+          manualRestart = false
+        }, 5000)
       }
-      if (firstRun) {
-        firstRun = false
-        resolve()
-      } else runElectronDelay()
+
+      resolve()
     })
   })
 }
@@ -190,7 +191,7 @@ function startElectron() {
   })
 
   electronProcess.on('close', () => {
-    process.exit()
+    if (!manualRestart) process.exit()
   })
 }
 

build-config/utils.js

@@ -31,12 +31,7 @@ exports.mergeCSSLoader = beforeLoader => {
             esModule: false,
           },
         },
-        {
-          loader: 'css-loader',
-          options: {
-            esModule: false,
-          },
-        },
+        'css-loader',
         'postcss-loader',
       ],
     },
@@ -68,15 +63,3 @@ 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)
-  }
-}

build-config/webpack-build-config.js

@@ -1,3 +1,3 @@
 module.exports = {
-  minimize: true,
+  minimize: false,
 }

jsconfig.json

@@ -9,10 +9,5 @@
       "@common/*": ["src/common/*"],
     }
   },
-  "vueCompilerOptions": {
-    "plugins": [
-      "@vue/language-plugin-pug"
-    ]
-  },
   "exclude": ["node_modules", "build", "dist"]
 }

licenses/license.rtf

@@ -38,12 +38,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\rsid3950508\rsid4133944\rsid4355753\rsid9533173\rsid10447395\rsid11081282\rsid12910709\rsid13643782\rsid14384001\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\yr2020\mo4\dy28\hr13\min46}{\version8}{\edmins3}{\nofpages1}{\nofwords135}{\nofchars772}{\nofcharsws906}{\vern1}}
+{\*\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\viewscale120\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,120 +53,64 @@ $([\'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 
-\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
+\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb \dbch (}{\pntxta \dbch )}}\pard\plain \ltrpar\s15\qj \li0\ri0\nowidctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1398824 \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\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'b1\'be\'cf\'ee\'c4\'bf\'a3\'a8
+\'c8\'ed\'bc\'fe\'a3\'a9\'bb\'f9\'d3\'da}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid4133944 \hich\af13\dbch\af13\loch\f13 Apache License 2.0}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13  }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'d0\'ed\'bf\'c9\'d6\'a4\'b7\'a2
+\'d0\'d0\'a3\'ac\'d4\'da\'ca\'b9\'d3\'c3\'b1\'be\'c8\'ed\'bc\'fe\'c7\'b0\'a3\'ac\'c4\'e3\'a3\'a8\'ca\'b9\'d3\'c3\'d5\'df\'a3\'a9\'d0\'e8\'c7\'a9\'ca\'f0\'b1\'be\'d0\'ad\'d2\'e9\'b2\'c5\'bf\'c9\'bc\'cc\'d0\'f8\'ca\'b9\'d3\'c3\'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\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13  Apache Li\hich\af13\dbch\af13\loch\f13 cense 2.0 }{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \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\insrsid1398824 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid15226681 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid10447395\charrsid1398824 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \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\'c8\'ed\'bc\'fe\'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
+\'c6\'bd\'cc\'a8\'a1\'b1\'d6\'b8\'b6\'d4\'b1\'be\'c8\'ed\'bc\'fe\'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 
+\'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\insrsid1398824\charrsid1398824 
 \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 
-\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 
-\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 
-\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 
-\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 
-\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 
-\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 
-\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 
-\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 
-\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 
-\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
+\par \hich\af13\dbch\af13\loch\f13 1}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'b1\'be\'c8\'ed\'bc\'fe\'b5\'c4\'ca\'fd\'be\'dd\'c0\'b4\'d4\'b4\'d4\'ad\'c0\'ed\'ca\'c7
+\'b4\'d3\'b8\'f7\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b5\'c4\'b9\'ab\'bf\'aa\'b7\'fe\'ce\'f1\'c6\'f7\'d6\'d0\'c0\'ad\'c8\'a1\'ca\'fd\'be\'dd\'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\'c8\'ed\'bc\'fe\'b2\'bb\'b6\'d4\'ca\'fd\'be\'dd\'b5\'c4\'d7\'bc\'c8\'b7\'d0\'d4\'b8\'ba\'d4\'f0\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 
+\par \hich\af13\dbch\af13\loch\f13 2}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'ca\'b9\'d3\'c3\'b1\'be\'c8\'ed\'bc\'fe\'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\'a3\'ac\'b6\'d4\'d3\'da\'d5\'e2\'d0\'a9\'b0\'e6\'c8\'a8\'ca\'fd\'be\'dd\'a3\'ac\'b1\'be\'c8\'ed\'bc\'fe\'b2\'bb\'d3\'b5\'d3\'d0\'cb\'fc\loch\af13\hich\af13\dbch\f13 \'c3\'c7\'b5\'c4\'cb\'f9\'d3\'d0
+\'c8\'a8\'a3\'ac\'ce\'aa\'c1\'cb\'b1\'dc\'c3\'e2\'d4\'ec\'b3\'c9\'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\insrsid1398824\charrsid1398824 
+\hich\af13\dbch\af13\loch\f13 24}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'d0\'a1\'ca\'b1\'c4\'da\'c7\'e5\'b3\'fd\'ca\'b9\'d3\'c3\'b1\'be\'c8\'ed\'bc\'fe\'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\insrsid1398824\charrsid1398824 
+\par \hich\af13\dbch\af13\loch\f13 3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'b1\'be\'c8\'ed\'bc\'fe\'c4\'da\'b5\'c4\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8
+\'b1\'f0\'c3\'fb\'ce\'aa\'b1\'be\'c8\'ed\'bc\'fe\'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\'a3\'ac\'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\'c8\'ed\'bc\'fe\'b8\'fc\'b8\'c4\'bb\'f2\'d2\'c6\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 
+
+\par \hich\af13\dbch\af13\loch\f13 4}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'b1\'be\'c8\'ed\'bc\'fe\'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\'a3\'ac\'c8\'e7\'b9\'fb\'b3\'f6\'cf\'d6\'c7\'d6\'c8\'a8\'bf\'c9\'c1\'aa\'cf\'b5\'b1\'be\'c8\'ed\'bc\'fe
+\'d2\'c6\'b3\'fd\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 
+\par \hich\af13\dbch\af13\loch\f13 5}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'d3\'c9\'d3\'da\'ca\'b9\'d3\'c3\'b1\'be\'c8\'ed\'bc\'fe\'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\'c8\'ed\'bc\'fe\'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 
-\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 
-\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 
-\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 
-\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
-\'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 
-\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 
-\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 
-\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 
-\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
-\'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 
-\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 
-\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 
+\'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\loch\af13\hich\af13\dbch\f13 \'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\insrsid1398824\charrsid1398824 
+\par \hich\af13\dbch\af13\loch\f13 6}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 \'a1\'a2\'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\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13  GitHub }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 
+\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\'a3\'ac\'b1\'be\'c8\'ed\'bc\'fe\'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\'a3\'ac\'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\'c8\'ed\'bc\'fe\'a3\'ac\'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\'c8\'ed\'bc\'fe\'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\'c8\'ed\'bc\'fe\'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\insrsid1398824 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid15226681 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid10447395\charrsid1398824 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13 * }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \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\insrsid1398824\charrsid15226681 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13 * }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 
+\'b1\'be\'c8\'ed\'bc\'fe\'b5\'c4\'b3\'f5\'d6\'d4\'ca\'c7\'b0\'ef\'d6\'fa\'b9\'d9\'b7\'bd\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'bc\'f2\'bb\'af\'ca\'fd\'be\'dd\'ba\'f3\'b4\'fa\'ce\'aa\'d5\'b9\'ca\'be\'a3\'ac\'b0\'ef\'d6\'fa\'ca\'b9\'d3\'c3\'d5\'df\'b8\'f9
+\'be\'dd\'b8\'e8\'c7\'fa\loch\af13\hich\af13\dbch\f13 \'c3\'fb\'a1\'a2\'d2\'d5\'ca\'f5\'bc\'d2\'b5\'c8\'b9\'d8\'bc\'fc\'d7\'d6\'bf\'ec\'cb\'d9\'b5\'d8\'b6\'a8\'ce\'bb\'cb\'f9\'d0\'e8\'c4\'da\'c8\'dd\'cb\'f9\'d4\'da\'b5\'c4\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8
+\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid15226681 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \hich\af13\dbch\af13\loch\f13 * }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid1398824\charrsid1398824 \loch\af13\hich\af13\dbch\f13 
+\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'b2\'bb\'d2\'d7\'a3\'ac\'bd\'a8\'d2\'e9\'b5\'bd\'b6\'d4\'d3\'a6\'d2\'f4\'c0\'d6\'c6\'bd\'cc\'a8\'d6\'a7\'b3\'d6\'d5\'fd\'b0\'e6\'d7\'ca\'d4\'b4\'a1\'a3}{\rtlch\fcs1 \af13 \ltrch\fcs0 
+\loch\af13\hich\af13\dbch\af13\insrsid12910709 
+\par }{\rtlch\fcs1 \af13 \ltrch\fcs0 \loch\af13\hich\af13\dbch\af13\insrsid9533173\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 
 
@@ -311,8 +255,8 @@ fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000c03d
-9b1957f7d901feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e5000000000000000000000000b026
+8d59201dd601feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
 000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000105000000000000}}

licenses/license_en.txt

@@ -1,48 +1,18 @@
-This project is issued based on the Apache License 2.0 license. The following protocols are supplemented by Apache License 2.0.
+This project (software) is issued based on the Apache License 2.0 license. Before using this software, you (users) need to sign this agreement before you can continue to use it. The following agreement is a supplement to the Apache License 2.0. In case of conflict, use the following agreement 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.
 
-1. Data source
+Terms agreed: "this software" in this agreement refers to the Luo Xue Music desktop version of the project; "user" refers to the user who signed this agreement; "official music platform" refers to the built-in software including Kuwo, Kugou, Migu The official platforms of music sources, etc. are collectively referred to; "copyright data" refers to data including but not limited to images, audio, names, etc. that 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. The principle of the data source of this software is to pull data from the public servers of each official music platform. After simply filtering and merging the data for display, this software is not responsible for the accuracy of the data.
+2. Copyright data may be generated during the use of this software. For this copyright data, the software does not own their ownership. In order to avoid infringement, users must clear the copyright generated during the use of this software within 24 hours data.
+3. The alias of the official music platform in this software is a name for the official music platform in the software. It does not contain maliciousness. If the official music platform feels inappropriate, you can contact the software to change or remove it.
+4. The parts used in this software include but are not limited to fonts, pictures and other resources from the Internet. If there is infringement, you can contact this software to remove it.
+5. Any direct, indirect, special, accidental or consequential damage of any nature arising from the use of this software, including this agreement or the use or inability to use this software (including but not limited to due to loss of goodwill, work stoppage, Compensation for computer failure or damage caused by the failure, or any and all other commercial damage or loss) is the responsibility of the user.
+6. This project is completely free, and the open source is published on GitHub. It is used by people all over the world to learn and exchange technology. This software does not guarantee that the technology in the project may violate local laws and regulations. It is prohibited to violate local laws and regulations. Using this software, the user shall be responsible for any violations caused by the user's use of the software without knowing or not permitted by local laws and regulations. The software shall not be responsible for any direct, indirect, special, accidental Or consequential responsibility.
 
-2. Copyright 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.
-
-3. Alias of Music Platform
-
-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.
-
-Fourth, resource use
-
-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.
-
-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.
-
-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.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.
-
-7. Copyright protection
-
-7.1 Music platform is not easy, please respect the copyright and support genuine.
-
-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.
-
-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 without prior notice, you can check it at the open source address.
+* The original intention of this software is to help the official music platform to simplify the data generation for display, and to help users quickly locate the music platform where the desired content is based on the song title, artist and other keywords.
+* Music platform is not easy, it is recommended to support genuine resources to the corresponding music platform.
 
 By: lyswhut

licenses/license_zh.txt

@@ -1,47 +1,18 @@
-本项目基于 Apache License 2.0 许可证发行，以下协议是对于 Apache License 2.0 的补充，如有冲突，以以下协议为准。
+本项目（软件）基于Apache License 2.0 许可证发行，在使用本软件前，你（使用者）需签署本协议才可继续使用，以下协议是对于 Apache License 2.0 的补充，如有冲突，以以下协议为准。
 
-词语约定：本协议中的“本项目”指洛雪音乐桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本项目内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
-一、数据来源
+词语约定：本协议中的“本软件”指洛雪音乐桌面版项目；“使用者”指签署本协议的使用者；“官方音乐平台”指对本软件内置的包括酷我、酷狗、咪咕等音乐源的官方平台统称；“版权数据”指包括但不限于图像、音频、名字等在内的他人拥有所属版权的数据。
 
-1.1 本项目的各官方平台在线数据来源原理是从其公开服务器中拉取数据（与未登录状态在官方平台APP获取的数据相同），经过对数据简单地筛选与合并后进行展示，因此本项目不对数据的合法性、准确性负责。
-1.2 本项目本身没有获取某个音频数据的能力，本项目使用的在线音频数据来源来自软件设置内“音乐来源”设置所选择的“源”返回的在线链接。例如播放某首歌，本项目所做的只是将希望播放的歌曲名字、歌手名字等信息传递给“源”，若“源”返回了一个链接，则本项目将认为这就是该歌曲的音频数据而进行使用，至于这是不是正确的音频数据本项目无法校验其准确性，所以使用本项目的过程中可能会出现希望播放的音频与实际播放的音频不对应或者无法播放的问题。
-1.3 本项目的非官方平台数据（例如我的收藏列表）来自使用者本地系统或者使用者连接的同步服务，本项目不对这些数据的合法性、准确性负责。
+1、本软件的数据来源原理是从各官方音乐平台的公开服务器中拉取数据，经过对数据简单地筛选与合并后进行展示，因此本软件不对数据的准确性负责。
+2、使用本软件的过程中可能会产生版权数据，对于这些版权数据，本软件不拥有它们的所有权，为了避免造成侵权，使用者务必在24小时内清除使用本软件的过程中所产生的版权数据。
+3、本软件内的官方音乐平台别名为本软件内对官方音乐平台的一个称呼，不包含恶意，如果官方音乐平台觉得不妥，可联系本软件更改或移除。
+4、本软件内使用的部分包括但不限于字体、图片等资源来源于互联网，如果出现侵权可联系本软件移除。
+5、由于使用本软件产生的包括由于本协议或由于使用或无法使用本软件而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
+6、本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流，本软件不对项目内的技术可能存在违反当地法律法规的行为作保证，禁止在违反当地法律法规的情况下使用本软件，对于使用者在明知或不知当地法律法规不允许的情况下使用本软件所造成的任何违法违规行为由使用者承担，本软件不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
 
-二、版权数据
-
-2.1 使用本项目的过程中可能会产生版权数据。对于这些版权数据，本项目不拥有它们的所有权。为了避免侵权，使用者务必在**24小时内**清除使用本项目的过程中所产生的版权数据。
-
-三、音乐平台别名
-
-3.1 本项目内的官方音乐平台别名为本项目内对官方音乐平台的一个称呼，不包含恶意。如果官方音乐平台觉得不妥，可联系本项目更改或移除。
-
-四、资源使用
-
-4.1 本项目内使用的部分包括但不限于字体、图片等资源来源于互联网。如果出现侵权可联系本项目移除。
-
-五、免责声明
-
-5.1 由于使用本项目产生的包括由于本协议或由于使用或无法使用本项目而引起的任何性质的任何直接、间接、特殊、偶然或结果性损害（包括但不限于因商誉损失、停工、计算机故障或故障引起的损害赔偿，或任何及所有其他商业损害或损失）由使用者负责。
-
-六、使用限制
-
-6.1 本项目完全免费，且开源发布于 GitHub 面向全世界人用作对技术的学习交流。本项目不对项目内的技术可能存在违反当地法律法规的行为作保证。
-
-6.2 **禁止在违反当地法律法规的情况下使用本项目。** 对于使用者在明知或不知当地法律法规不允许的情况下使用本项目所造成的任何违法违规行为由使用者承担，本项目不承担由此造成的任何直接、间接、特殊、偶然或结果性责任。
-
-七、版权保护
-
-7.1 音乐平台不易，请尊重版权，支持正版。
-
-八、非商业性质
-
-8.1 本项目仅用于对技术可行性的探索及研究，不接受任何商业（包括但不限于广告等）合作及捐赠。
-
-九、接受协议
-
-9.1 若你使用了本项目，将代表你接受本协议。
 
 * 若协议更新，恕不另行通知，可到开源地址查看。
+* 本软件的初衷是帮助官方音乐平台简化数据后代为展示，帮助使用者根据歌曲名、艺术家等关键字快速地定位所需内容所在的音乐平台。
+* 音乐平台不易，建议到对应音乐平台支持正版资源。
 
 By: 落雪无痕

package.json

@@ -1,80 +1,177 @@
 {
   "name": "lx-music-desktop",
-  "version": "2.9.0",
+  "version": "2.3.0-beta.3",
   "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",
-    "pack:win:setup:x86_64": "node build-config/build-pack.js target=win arch=x86_64 type=setup",
-    "pack:win:setup:x64": "node build-config/build-pack.js target=win arch=x64 type=setup",
-    "pack:win:setup:x86": "node build-config/build-pack.js target=win arch=x86 type=setup",
-    "pack:win:setup:arm64": "node build-config/build-pack.js target=win arch=arm64 type=setup",
+    "pack:win:setup:x86_64": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p never",
+    "pack:win:setup:x64": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p never",
+    "pack:win:setup:x86": "cross-env TARGET=Setup ARCH=x86 electron-builder -w=nsis --ia32 -p never",
+    "pack:win:setup:arm64": "cross-env TARGET=Setup ARCH=arm64 electron-builder -w=nsis --arm64 -p never",
     "pack:win:portable": "npm run pack:win:portable:x86_64 && npm run pack:win:portable:x64 && npm run pack:win:portable:x86",
-    "pack:win:portable:x86_64": "node build-config/build-pack.js target=win arch=x86_64 type=portable",
-    "pack:win:portable:x64": "node build-config/build-pack.js target=win arch=x64 type=portable",
-    "pack:win:portable:x86": "node build-config/build-pack.js target=win arch=x86 type=portable",
-    "pack:win:7z": "npm run pack:win:7z:x64",
-    "pack:win:7z:x64": "node build-config/build-pack.js target=win arch=x64 type=green",
-    "pack:win:7z:arm64": "node build-config/build-pack.js target=win arch=arm64 type=green",
-    "pack:win7:setup:x64": "node build-config/build-pack.js target=win arch=x64 type=win7_setup",
-    "pack:win7:7z:x64": "node build-config/build-pack.js target=win arch=x64 type=win7_green",
-    "pack:win7:7z:x86": "node build-config/build-pack.js target=win arch=x86 type=win7_green",
+    "pack:win:portable:x86_64": "cross-env TARGET=portable ARCH=x86_64 electron-builder -w=portable --x64 --ia32 -p never",
+    "pack:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p never",
+    "pack:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p never",
+    "pack:win:7z": "npm run pack:win:7z:x64 && npm run pack:win:7z:x86",
+    "pack:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p never",
+    "pack:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p never",
+    "pack:win:7z:arm64": "cross-env TARGET=green ARCH=win_arm64 electron-builder -w=7z --arm64 -p never",
     "pack:linux": "node build-config/pack.js && npm run pack:linux:deb && npm run pack:linux:appImage && npm run pack:linux:rpm && npm run pack:linux:pacman",
-    "pack:linux:appImage": "node build-config/build-pack.js target=linux arch=x64 type=appImage",
-    "pack:linux:deb": "npm run pack:linux:deb:amd64 && npm run pack:linux:deb:arm64 && npm run pack:linux:deb:armv7l",
-    "pack:linux:deb:amd64": "node build-config/build-pack.js target=linux arch=x64 type=deb",
-    "pack:linux:deb:arm64": "node build-config/build-pack.js target=linux arch=arm64 type=deb",
-    "pack:linux:deb:armv7l": "node build-config/build-pack.js target=linux arch=armv7l type=deb",
-    "pack:linux:rpm": "node build-config/build-pack.js target=linux arch=x64 type=rpm",
-    "pack:linux:pacman": "node build-config/build-pack.js target=linux arch=x64 type=pacman",
+    "pack:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p never",
+    "pack:linux:deb": "npm run pack:linux:deb:x64 && npm run pack:linux:deb:arm64 && npm run pack:linux:deb:armv7l",
+    "pack:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p never",
+    "pack:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64 -p never",
+    "pack:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l -p never",
+    "pack:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p never",
+    "pack:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p never",
     "pack:mac": "node build-config/pack.js && npm run pack:mac:dmg && npm run pack:mac:dmg:arm64",
-    "pack:mac:dmg": "node build-config/build-pack.js target=mac arch=x64 type=dmg",
-    "pack:mac:dmg:arm64": "node build-config/build-pack.js target=mac arch=arm64 type=dmg",
-    "pack:dir": "node build-config/pack.js && node build-config/build-pack.js target=dir",
+    "pack:mac:dmg": "cross-env electron-builder -m=dmg -p never",
+    "pack:mac:dmg:arm64": "cross-env electron-builder -m=dmg --arm64 -p never",
+    "pack:dir": "node build-config/pack.js && electron-builder --dir",
     "publish": "node publish",
-    "publish:win:setup:x64": "node build-config/build-pack.js target=win arch=x64 type=setup publish=always",
-    "publish:win:setup:x86": "node build-config/build-pack.js target=win arch=x86 type=setup publish=always",
-    "publish:win:setup:arm64": "node build-config/build-pack.js target=win arch=arm64 type=setup publish=always",
-    "publish:win:setup:x86_64": "node build-config/build-pack.js target=win arch=x86_64 type=setup publish=always",
+    "publish:win:setup:x64:always": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p always",
+    "publish:win:setup:x64": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p always",
+    "publish:win:setup:x86": "cross-env TARGET=Setup ARCH=x86 electron-builder -w=nsis --ia32 -p onTagOrDraft",
+    "publish:win:setup:arm64": "cross-env TARGET=Setup ARCH=arm64 electron-builder -w=nsis --arm64 -p onTagOrDraft",
+    "publish:win:setup:x86_64": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft",
     "publish:win:portable": "npm run publish:win:portable:x86_64 && npm run publish:win:portable:x64 && npm run publish:win:portable:x86",
-    "publish:win:portable:x86_64": "node build-config/build-pack.js target=win arch=x86_64 type=portable publish=always",
-    "publish:win:portable:x64": "node build-config/build-pack.js target=win arch=x64 type=portable publish=always",
-    "publish:win:portable:x86": "node build-config/build-pack.js target=win arch=x86 type=portable publish=always",
-    "publish:win:7z:x64": "node build-config/build-pack.js target=win arch=x64 type=green publish=always",
-    "publish:win:7z:arm64": "node build-config/build-pack.js target=win arch=arm64 type=green publish=always",
-    "publish:win7:setup:x64": "node build-config/build-pack.js target=win arch=x64 type=win7_setup publish=always",
-    "publish:win7:7z:x64": "node build-config/build-pack.js target=win arch=x64 type=win7_green publish=always",
-    "publish:win7:7z:x86": "node build-config/build-pack.js target=win arch=x86 type=win7_green publish=always",
-    "publish:mac:dmg": "node build-config/build-pack.js target=mac arch=x64 type=dmg publish=always",
-    "publish:mac:dmg:arm64": "node build-config/build-pack.js target=mac arch=arm64 type=dmg publish=always",
-    "publish:linux:deb:amd64": "node build-config/build-pack.js target=linux arch=x64 type=deb publish=always",
-    "publish:linux:deb:arm64": "node build-config/build-pack.js target=linux arch=arm64 type=deb publish=always",
-    "publish:linux:deb:armv7l": "node build-config/build-pack.js target=linux arch=armv7l type=deb publish=always",
-    "publish:linux:appImage": "node build-config/build-pack.js target=linux arch=x64 type=appImage publish=always",
-    "publish:linux:rpm": "node build-config/build-pack.js target=linux arch=x64 type=rpm publish=always",
-    "publish:linux:pacman": "node build-config/build-pack.js target=linux arch=x64 type=pacman publish=always",
+    "publish:win:portable:x86_64": "cross-env TARGET=portable ARCH=x86_64 electron-builder -w=portable --x64 --ia32 -p onTagOrDraft",
+    "publish:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p onTagOrDraft",
+    "publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft",
+    "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft",
+    "publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft",
+    "publish:win:7z:arm64": "cross-env TARGET=green ARCH=win_arm64 electron-builder -w=7z --arm64 -p onTagOrDraft",
+    "publish:mac:dmg:always": "electron-builder -m=dmg -p always",
+    "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",
+    "publish:mac:dmg:arm64": "electron-builder -m=dmg --arm64 -p onTagOrDraft",
+    "publish:linux:deb:x64:always": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p always",
+    "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft",
+    "publish:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64 -p onTagOrDraft",
+    "publish:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l -p onTagOrDraft",
+    "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
+    "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p onTagOrDraft",
+    "publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p onTagOrDraft",
     "dev": "cross-env NODE_OPTIONS=--max-http-header-size=200000 node build-config/runner-dev.js",
+    "clean:electron": "rimraf dist",
+    "clean": "rimraf dist && rimraf build",
     "build:theme": "node src/common/theme/createThemes.js",
-    "build": "node build-config/pack.js",
+    "build:src": "node build-config/pack.js",
     "build:main": "cross-env NODE_ENV=production webpack --config build-config/main/webpack.config.prod.js --progress",
     "build:renderer": "cross-env NODE_ENV=production webpack --config build-config/renderer/webpack.config.prod.js --progress",
     "build:renderer-lyric": "cross-env NODE_ENV=production webpack --config build-config/renderer-lyric/webpack.config.prod.js --progress",
     "build:renderer-scripts": "cross-env NODE_ENV=production webpack --config build-config/renderer-scripts/webpack.config.prod.js --progress",
+    "build": "npm run clean:electron && npm run build:main && npm run build:renderer && npm run build:renderer-lyric && npm run build:renderer-scripts",
     "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",
-    "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"
+    "dp": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:1081 npm run pack",
+    "up": "cross-env ELECTRON_GET_USE_PROXY=true GLOBAL_AGENT_HTTPS_PROXY=http://127.0.0.1:1081 npm i"
   },
   "browserslist": [
     "Electron 22.3.0"
   ],
   "engines": {
-    "node": ">= 18",
+    "node": ">= 16",
     "npm": ">=8.5.2"
   },
+  "build": {
+    "appId": "cn.toside.music.desktop",
+    "beforePack": "./build-config/build-before-pack.js",
+    "afterPack": "./build-config/build-after-pack.js",
+    "protocols": {
+      "name": "lx-music-protocol",
+      "schemes": [
+        "lxmusic"
+      ]
+    },
+    "directories": {
+      "buildResources": "./resources",
+      "output": "./build"
+    },
+    "files": [
+      "!node_modules/**/*",
+      "node_modules/font-list",
+      "node_modules/better-sqlite3/lib",
+      "node_modules/better-sqlite3/package.json",
+      "node_modules/better-sqlite3/build/Release/better_sqlite3.node",
+      "node_modules/node-gyp-build",
+      "node_modules/bufferutil",
+      "node_modules/utf-8-validate",
+      "build/Release/qrc_decode.node",
+      "dist/**/*"
+    ],
+    "asar": {
+      "smartUnpack": false
+    },
+    "extraResources": [
+      "./licenses"
+    ],
+    "win": {
+      "icon": "./resources/icons/icon.ico",
+      "legalTrademarks": "lyswhut",
+      "artifactName": "${productName} v${version} ${env.ARCH} ${env.TARGET}.${ext}"
+    },
+    "mac": {
+      "icon": "./resources/icons/icon.icns",
+      "category": "public.app-category.music"
+    },
+    "linux": {
+      "maintainer": "lyswhut <lyswhut@qq.com>",
+      "artifactName": "${productName} v${version} ${env.ARCH}.${ext}",
+      "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"
+      }
+    },
+    "nsis": {
+      "oneClick": false,
+      "language": "2052",
+      "allowToChangeInstallationDirectory": true,
+      "differentialPackage": true,
+      "license": "./licenses/license.rtf",
+      "shortcutName": "LX Music"
+    },
+    "dmg": {
+      "window": {
+        "width": 600,
+        "height": 400
+      },
+      "contents": [
+        {
+          "x": 106,
+          "y": 252,
+          "name": "LX Music"
+        },
+        {
+          "x": 490,
+          "y": 252,
+          "type": "link",
+          "path": "/Applications"
+        }
+      ],
+      "title": "洛雪音乐助手 v${version}"
+    },
+    "appImage": {
+      "license": "./licenses/license_zh.txt",
+      "category": "Utility;AudioVideo;Audio;Player;Music;"
+    },
+    "publish": [
+      {
+        "provider": "github",
+        "owner": "lyswhut",
+        "repo": "lx-music-desktop"
+      }
+    ]
+  },
   "macLanguagesInfoPlistStrings": {
     "en": {
       "CFBundleDisplayName": "LX Music",
@@ -108,113 +205,107 @@
   },
   "homepage": "https://github.com/lyswhut/lx-music-desktop#readme",
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/eslint-parser": "^7.25.1",
+    "@babel/core": "^7.21.8",
+    "@babel/eslint-parser": "^7.21.8",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-modules-umd": "^7.24.7",
-    "@babel/plugin-transform-runtime": "^7.25.4",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-typescript": "^7.24.7",
-    "@tsconfig/recommended": "^1.0.7",
-    "@types/better-sqlite3": "^7.6.11",
-    "@types/needle": "^3.3.0",
-    "@types/tunnel": "^0.0.7",
-    "@types/ws": "8.5.4",
-    "@volar/vue-language-plugin-pug": "^1.6.5",
-    "@vue/language-plugin-pug": "^2.0.29",
-    "babel-loader": "^9.1.3",
-    "browserslist": "^4.23.3",
+    "@babel/plugin-transform-modules-umd": "^7.18.6",
+    "@babel/plugin-transform-runtime": "^7.21.4",
+    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-typescript": "^7.21.5",
+    "@types/better-sqlite3": "^7.6.4",
+    "@types/needle": "^3.2.0",
+    "@types/tunnel": "^0.0.3",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "@volar/vue-language-plugin-pug": "^1.6.4",
+    "babel-loader": "^9.1.2",
+    "browserslist": "^4.21.5",
     "chalk": "^4.1.2",
     "changelog-parser": "^3.0.1",
-    "copy-webpack-plugin": "^12.0.2",
-    "core-js": "^3.38.1",
+    "copy-webpack-plugin": "^11.0.0",
+    "core-js": "^3.30.2",
     "cross-env": "^7.0.3",
-    "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^7.0.0",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^5.0.0",
     "del": "^6.1.1",
-    "electron": "^30.4.0",
-    "electron-builder": "^24.13.3",
+    "electron": "^22.3.8",
+    "electron-builder": "^24.3.0",
     "electron-debug": "^3.2.0",
-    "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03",
-    "electron-to-chromium": "^1.5.13",
-    "electron-updater": "^6.2.1",
-    "eslint": "^8.57.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-config-standard-with-typescript": "^43.0.1",
+    "electron-devtools-installer": "^3.2.0",
+    "electron-to-chromium": "^1.4.385",
+    "electron-updater": "^6.1.0",
+    "eslint": "^8.40.0",
+    "eslint-config-standard": "^17.0.0",
+    "eslint-config-standard-with-typescript": "^34.0.1",
     "eslint-formatter-friendly": "github:lyswhut/eslint-friendly-formatter#2170d1320e2fad13615a9dcf229669f0bb473a53",
-    "eslint-plugin-html": "^8.1.1",
-    "eslint-plugin-vue": "^9.27.0",
-    "eslint-plugin-vue-pug": "^0.6.2",
-    "eslint-webpack-plugin": "^4.2.0",
-    "html-webpack-plugin": "^5.6.0",
-    "less": "^4.2.0",
-    "less-loader": "^12.2.0",
-    "mini-css-extract-plugin": "^2.9.1",
+    "eslint-plugin-html": "^7.1.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-n": "^15.7.0",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-vue": "^9.11.1",
+    "eslint-webpack-plugin": "^4.0.1",
+    "html-webpack-plugin": "^5.5.1",
+    "less": "^4.1.3",
+    "less-loader": "^11.1.0",
+    "mini-css-extract-plugin": "^2.7.5",
     "node-loader": "^2.0.0",
-    "postcss": "^8.4.41",
-    "postcss-loader": "^8.1.1",
-    "postcss-pxtorem": "^6.1.0",
-    "pug": "^3.0.3",
+    "postcss": "^8.4.23",
+    "postcss-loader": "^7.3.0",
+    "postcss-pxtorem": "^6.0.0",
+    "pug": "^3.0.2",
     "pug-plain-loader": "^1.1.0",
-    "rimraf": "^6.0.1",
+    "rimraf": "^5.0.0",
     "spinnies": "github:lyswhut/spinnies#233305c58694aa3b053e3ab9af9049993f918b9d",
     "svg-sprite-loader": "^6.0.11",
     "svg-transform-loader": "^2.0.13",
     "svgo-loader": "^4.0.0",
-    "terser": "^5.31.6",
-    "terser-webpack-plugin": "^5.3.10",
-    "tree-kill": "^1.2.2",
-    "ts-loader": "^9.5.1",
-    "typescript": "^5.5.4",
-    "vue-eslint-parser": "^9.4.3",
-    "vue-loader": "^17.4.2",
-    "vue-template-compiler": "^2.7.16",
-    "webpack": "^5.94.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-dev-server": "^5.0.4",
+    "terser": "^5.17.1",
+    "terser-webpack-plugin": "^5.3.8",
+    "ts-loader": "^9.4.2",
+    "typescript": "^5.0.4",
+    "vue-eslint-parser": "^9.2.1",
+    "vue-loader": "^17.1.0",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.82.0",
+    "webpack-cli": "^5.1.0",
+    "webpack-dev-server": "^4.15.0",
     "webpack-hot-middleware": "github:lyswhut/webpack-hot-middleware#329c4375134b89d39da23a56a94db651247c74a1",
-    "webpack-merge": "^6.0.1"
+    "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@simonwep/pickr": "^1.9.1",
-    "better-sqlite3": "^11.2.1",
-    "bufferutil": "^4.0.8",
+    "@simonwep/pickr": "^1.8.2",
+    "better-sqlite3": "^8.3.0",
+    "bufferutil": "^4.0.7",
     "comlink": "~4.3.1",
-    "crypto-js": "^4.2.0",
-    "electron-log": "^5.1.7",
-    "font-list": "^1.5.1",
+    "crypto-js": "^4.1.1",
+    "electron-log": "^4.4.8",
+    "electron-store": "^8.1.0",
+    "font-list": "^1.4.5",
     "iconv-lite": "^0.6.3",
-    "image-size": "^1.1.0",
-    "jschardet": "^3.1.3",
+    "image-size": "^1.0.2",
+    "jschardet": "^3.0.0",
     "long": "^5.2.3",
-    "message2call": "^0.1.3",
-    "music-metadata": "^10.2.0",
+    "music-metadata": "^8.1.4",
     "needle": "github:lyswhut/needle#93299ac841b7e9a9f82ca7279b88aaaeda404060",
     "node-id3": "^0.2.6",
-    "sortablejs": "^1.15.2",
+    "sortablejs": "^1.15.0",
     "tunnel": "^0.0.6",
-    "utf-8-validate": "^6.0.4",
-    "vue": "~3.3.13",
-    "vue-router": "^4.4.3",
-    "ws": "^8.18.0"
+    "utf-8-validate": "^6.0.3",
+    "vue": "^3.2.47",
+    "vue-router": "^4.1.6",
+    "ws": "^8.13.0"
   },
   "overrides": {
     "got": "^11",
     "json5": "latest",
     "minimatch": "latest",
-    "semver": "latest",
-    "svg-transform-loader": {
-      "postcss": "latest"
-    },
     "svg-sprite-loader": {
       "postcss": "latest"
     },
     "svg-baker": {
       "postcss": "latest"
     },
-    "braces": "latest",
-    "node-gyp-build": "latest",
     "http-cache-semantics": "latest"
   }
 }

publish/changeLog.md

@@ -1,31 +1,7 @@
 ### 新增
 
-- 新增 设置-播放设置-是否将歌词显示在状态栏 设置，默认关闭，该功能只在 MacOS 下可用（#1940）
-- 新增设置-播放详情页设置-延迟歌词滚动设置（#1985）
-- 新增鼠标在音量按钮使用滚轮时可以调整音量大小的功能（#2000）
-- 新增设置-下载设置-同时下载任务数设置（#1498）
-- 新增 我的列表-歌曲右击菜单-歌曲换源 功能，换源后下次再播放该列表的该歌曲时将优先尝试播放所选源的歌曲，该功能允许你手动指定来源以解决自动换源失败或者换源不准确的问题
-
-### 优化
-
-- 优化侧栏图标显示，修复图标可能被裁切的问题（#1960）
-- 托盘图标添加当前播放歌曲名字显示
-- 优化本地歌曲内嵌封面过大时的加载方式
-- 将下载歌曲的歌手信息中的分隔符从 `、` 替换为 `;` 以确保音乐元数据在写入时的兼容性和一致性（#1989 @qnnp-me）
-
-### 修复
-
-- 修复 MacOS 下点击 dock 右键菜单的退出按钮时，程序没有退出的问题（#1923）
-- 修复 OpenAPI 的 `lyricLineAllText` 在切换到无歌词的音乐时内容没有更新的问题（#1925）
-- 修复切换音源时可能出现切换死循环的问题
-- 尝试修复某些情况下播放音频时，处于播放状态但是进度条不走的问题
-- 修复程序目录路径存在 `#` 或 `%` 时，自定义源、托盘等图标异常的问题（#1997）
-
-### 变更
-
-- 简化了应用退出行为，据测试，现在 linux 下，若启用了托盘，dock 右键菜单的 退出、关闭所有 之类的功能将不再退出程序，需改用托盘的退出按钮退出程序
-- 现在如果在设置或者启动参数配置了代理服务，那么应用内的图片、音频加载，歌曲下载也将走代理
+- 新增音效设置（实验性功能），支持10段均衡器设置、内置的一些环境混响音效、3D立体环绕音效
 
 ### 其他
 
-- 更新 electron 到 v30.4.0
+- 更新 electron 到 v22.3.8

src/common/.eslintrc.cjs

@@ -1,15 +0,0 @@
-/* eslint-env node */
-const { base, typescript } = require('../../.eslintrc.base.cjs')
-
-module.exports = {
-  root: true,
-  ...base,
-  overrides: [
-    {
-      ...typescript,
-      parserOptions: {
-        project: './tsconfig.json',
-      },
-    },
-  ],
-}

src/common/constants.ts

@@ -1,9 +1,5 @@
 export const URL_SCHEME_RXP = /^lxmusic:\/\//
 
-export const SPLIT_CHAR = {
-  DISLIKE_NAME: '@',
-  DISLIKE_NAME_ALIAS: '#',
-} as const
 
 export const STORE_NAMES = {
   APP_SETTINGS: 'config_v2',
@@ -54,8 +50,8 @@ export const DEFAULT_SETTING = {
   },
 
   songList: {
-    source: 'kw',
-    sortId: 'new',
+    source: 'kg',
+    sortId: '5',
     tagId: '',
   },
 
@@ -80,3 +76,24 @@ export const DOWNLOAD_STATUS = {
 } as const
 
 export const QUALITYS = ['flac24bit', 'flac', 'wav', 'ape', '320k', '192k', '128k'] as const
+
+export const SYNC_CODE = {
+  helloMsg: 'Hello~::^-^::~v3~',
+  idPrefix: 'OjppZDo6',
+  authMsg: 'lx-music auth::',
+  authFailed: 'Auth failed',
+  missingAuthCode: 'Missing auth code',
+  getServiceIdFailed: 'Get service id failed',
+  connectServiceFailed: 'Connect service failed',
+  connecting: 'Connecting...',
+  unknownServiceAddress: 'Unknown service address',
+  msgBlockedIp: 'Blocked IP',
+  msgConnect: 'lx-music connect',
+  msgAuthFailed: 'Auth failed',
+} as const
+
+export const SYNC_CLOSE_CODE = {
+  normal: 1000,
+  failed: 4100,
+} as const
+

src/common/constants_sync.ts

@@ -1,74 +0,0 @@
-export const ENV_PARAMS = [
-  'PORT',
-  'BIND_IP',
-  'CONFIG_PATH',
-  'LOG_PATH',
-  'DATA_PATH',
-  'PROXY_HEADER',
-  'MAX_SNAPSHOT_NUM',
-  'LIST_ADD_MUSIC_LOCATION_TYPE',
-  'LX_USER_',
-] as const
-
-
-export const LIST_IDS = {
-  DEFAULT: 'default',
-  LOVE: 'love',
-  TEMP: 'temp',
-  DOWNLOAD: 'download',
-  PLAY_LATER: null,
-} as const
-
-export const SYNC_CODE = {
-  helloMsg: 'Hello~::^-^::~v4~',
-  idPrefix: 'OjppZDo6',
-  authMsg: 'lx-music auth::',
-  msgAuthFailed: 'Auth failed',
-  msgBlockedIp: 'Blocked IP',
-  msgConnect: 'lx-music connect',
-
-
-  authFailed: 'Auth failed',
-  missingAuthCode: 'Missing auth code',
-  getServiceIdFailed: 'Get service id failed',
-  connectServiceFailed: 'Connect service failed',
-  connecting: 'Connecting...',
-  unknownServiceAddress: 'Unknown service address',
-} as const
-
-export const SYNC_CLOSE_CODE = {
-  normal: 1000,
-  failed: 4100,
-} as const
-
-export const TRANS_MODE: Readonly<Record<LX.Sync.List.SyncMode, LX.Sync.List.SyncMode>> = {
-  merge_local_remote: 'merge_remote_local',
-  merge_remote_local: 'merge_local_remote',
-  overwrite_local_remote: 'overwrite_remote_local',
-  overwrite_remote_local: 'overwrite_local_remote',
-  overwrite_local_remote_full: 'overwrite_remote_local_full',
-  overwrite_remote_local_full: 'overwrite_local_remote_full',
-  cancel: 'cancel',
-} as const
-
-export const File = {
-  serverDataPath: 'sync/server',
-  clientDataPath: 'sync/client',
-
-  serverInfoJSON: 'serverInfo.json',
-  userDir: 'users',
-  userDevicesJSON: 'devices.json',
-  listDir: 'list',
-  listSnapshotDir: 'snapshot',
-  listSnapshotInfoJSON: 'snapshotInfo.json',
-  dislikeDir: 'dislike',
-  dislikeSnapshotDir: 'snapshot',
-  dislikeSnapshotInfoJSON: 'snapshotInfo.json',
-
-  syncAuthKeysJSON: 'syncAuthKey.json',
-} as const
-
-export const FeaturesList = [
-  'list',
-  'dislike',
-] as const

src/common/defaultSetting.ts

@@ -1,5 +1,5 @@
-import path from 'node:path'
-import os from 'node:os'
+import { join } from 'path'
+import { homedir } from 'os'
 
 const isMac = process.platform == 'darwin'
 const isWin = process.platform == 'win32'
@@ -24,27 +24,22 @@ const defaultSetting: LX.AppSetting = {
 
   'player.startupAutoPlay': false,
   'player.togglePlayMethod': 'listLoop',
-  'player.playQuality': '128k',
+  'player.highQuality': false,
   '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.isS2t': false,
-  'player.isPlayLxlrc': !isMac,
+  'player.isPlayLxlrc': isWin,
   'player.isSavePlayTime': false,
   'player.audioVisualization': false,
   'player.waitPlayEndStop': true,
   'player.waitPlayEndStopTime': '',
   'player.autoSkipOnError': true,
-  'player.isAutoCleanPlayedList': false,
   'player.soundEffect.convolution.fileName': '',
   'player.soundEffect.convolution.mainGain': 10,
   'player.soundEffect.convolution.sendGain': 0,
@@ -61,13 +56,11 @@ const defaultSetting: LX.AppSetting = {
   'player.soundEffect.panner.enable': false,
   'player.soundEffect.panner.soundR': 5,
   'player.soundEffect.panner.speed': 25,
-  'player.soundEffect.pitchShifter.playbackRate': 1,
 
   'playDetail.isZoomActiveLrc': false,
   'playDetail.isShowLyricProgressSetting': false,
-  'playDetail.style.fontSize': 140,
+  'playDetail.style.fontSize': 100,
   'playDetail.style.align': 'center',
-  'playDetail.isDelayScroll': true,
 
   'desktopLyric.enable': false,
   'desktopLyric.isLock': false,
@@ -80,7 +73,7 @@ const defaultSetting: LX.AppSetting = {
   'desktopLyric.height': 300,
   'desktopLyric.x': null,
   'desktopLyric.y': null,
-  'desktopLyric.isLockScreen': isWin,
+  'desktopLyric.isLockScreen': true,
   'desktopLyric.isDelayScroll': true,
   'desktopLyric.scrollAlign': 'center',
   'desktopLyric.isHoverHide': false,
@@ -107,7 +100,7 @@ const defaultSetting: LX.AppSetting = {
   'list.actionButtonsVisible': false,
 
   'download.enable': false,
-  'download.savePath': path.join(os.homedir(), 'Desktop'),
+  'download.savePath': join(homedir(), 'Desktop'),
   'download.fileName': '歌名 - 歌手',
   'download.maxDownloadNum': 3,
   'download.skipExistFile': true,
@@ -128,6 +121,8 @@ 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,
@@ -139,12 +134,8 @@ 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.id': 'blue_plus',
+  // 'theme.id': 'green',
   'theme.lightId': 'green',
   'theme.darkId': 'black',
 

src/common/error.ts

@@ -6,7 +6,7 @@ const ignoreErrorMessage = [
 ]
 
 process.on('uncaughtException', err => {
-  if (ignoreErrorMessage.includes(err?.message)) return
+  if (ignoreErrorMessage.includes(err.message)) return
   console.error('An uncaught error occurred!')
   console.error(err)
   log.error(err)

src/common/hotKey.ts

@@ -66,21 +66,6 @@ const hotKey = {
       action: 'volume_mute',
       type: '',
     },
-    music_love: {
-      name: 'music_love',
-      action: 'music_love',
-      type: '',
-    },
-    music_unlove: {
-      name: 'music_unlove',
-      action: 'music_unlove',
-      type: '',
-    },
-    music_dislike: {
-      name: 'music_dislike',
-      action: 'music_dislike',
-      type: '',
-    },
   },
   desktop_lyric: {
     toggle_visible: {

src/common/ipcNames.ts

@@ -36,12 +36,6 @@ const modules = {
     list_music_check_exist: 'list_music_check_exist',
     list_music_get_list_ids: 'list_music_get_list_ids',
   },
-  dislike: {
-    get_dislike_music_infos: 'get_dislike_music_infos',
-    add_dislike_music_infos: 'add_dislike_music_infos',
-    overwrite_dislike_music_infos: 'overwrite_dislike_music_infos',
-    clear_dislike_music_infos: 'clear_dislike_music_infos',
-  },
   winMain: {
     focus: 'focus',
     close: 'close',
@@ -55,11 +49,9 @@ const modules = {
     show_save_dialog: 'show_save_dialog',
     show_select_dialog: 'show_select_dialog',
     show_dialog: 'show_dialog',
-    open_dir_in_explorer: 'open_dir_in_explorer',
     open_dev_tools: 'open_dev_tools',
-    set_power_save_blocker: 'set_power_save_blocker',
 
-    player_status: 'player_status',
+    progress: 'progress',
     change_tray: 'change_tray',
     quit_update: 'quit_update',
     update_check: 'update_check',
@@ -102,8 +94,6 @@ const modules = {
     save_sound_effect_eq_preset: 'save_sound_effect_eq_preset',
     get_sound_effect_convolution_preset: 'get_sound_effect_convolution_preset',
     save_sound_effect_convolution_preset: 'save_sound_effect_convolution_preset',
-    // get_sound_effect_pitch_shifter_preset: 'get_sound_effect_pitch_shifter_preset',
-    // save_sound_effect_pitch_shifter_preset: 'save_sound_effect_pitch_shifter_preset',
     get_hot_key: 'get_hot_key',
 
     import_user_api: 'import_user_api',
@@ -134,10 +124,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',
 
     process_new_desktop_lyric_client: 'process_new_desktop_lyric_client',
 
@@ -191,7 +178,6 @@ for (const moduleName of Object.keys(modules) as Array<keyof typeof modules>) {
 
 export const CMMON_EVENT_NAME = modules.common
 export const PLAYER_EVENT_NAME = modules.player
-export const DISLIKE_EVENT_NAME = modules.dislike
 export const WIN_MAIN_RENDERER_EVENT_NAME = modules.winMain
 export const WIN_LYRIC_RENDERER_EVENT_NAME = modules.winLyric
 export const HOTKEY_RENDERER_EVENT_NAME = modules.hotKey

src/common/mainIpc.ts

@@ -30,7 +30,7 @@ export function mainHandle<V>(name: string, listener: LX.IpcMainInvokeEventListe
 export function mainHandle<T, V>(name: string, listener: LX.IpcMainInvokeEventListenerParamsValue<T, V>): void
 export function mainHandle<T, V>(name: string, listener: LX.IpcMainInvokeEventListenerParamsValue<T, V>): void {
   ipcMain.handle(name, async(event, params) => {
-    return listener({ event, params })
+    return await listener({ event, params })
   })
 }
 
@@ -40,7 +40,7 @@ export function mainHandleOnce<V>(name: string, listener: LX.IpcMainInvokeEventL
 export function mainHandleOnce<T, V>(name: string, listener: LX.IpcMainInvokeEventListenerParamsValue<T, V>): void
 export function mainHandleOnce<T, V>(name: string, listener: LX.IpcMainInvokeEventListenerParamsValue<T, V>): void {
   ipcMain.handleOnce(name, async(event, params) => {
-    return listener({ event, params })
+    return await listener({ event, params })
   })
 }
 export const mainHandleRemove = (name: string) => {

src/common/rendererIpc.ts

@@ -17,7 +17,7 @@ export async function rendererInvoke<V>(name: string): Promise<V>
 export async function rendererInvoke<T>(name: string, params: T): Promise<void>
 export async function rendererInvoke<T, V>(name: string, params: T): Promise<V>
 export async function rendererInvoke <T, V>(name: string, params?: T): Promise<V> {
-  return ipcRenderer.invoke(name, params)
+  return await ipcRenderer.invoke(name, params)
 }
 
 export function rendererOn(name: string, listener: LX.IpcRendererEventListener): void

src/common/theme/createThemes.js

@@ -9,7 +9,6 @@ const defaultThemes = [
     id: 'green',
     name: '绿意盎然',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(77, 175, 124)',
       font: 'rgb(33, 33, 33)',
@@ -33,7 +32,6 @@ const defaultThemes = [
     id: 'blue',
     name: '蓝田生玉',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(52, 152, 219)',
       font: 'rgb(33, 33, 33)',
@@ -57,7 +55,6 @@ const defaultThemes = [
     id: 'blue_plus',
     name: '蛋雅深蓝',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(77, 131, 175)',
       font: 'rgb(33, 33, 33)',
@@ -81,7 +78,6 @@ const defaultThemes = [
     id: 'orange',
     name: '橙黄橘绿',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(245, 171, 53)',
       font: 'rgb(33, 33, 33)',
@@ -105,7 +101,6 @@ const defaultThemes = [
     id: 'red',
     name: '热情似火',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(214, 69, 65)',
       font: 'rgb(33, 33, 33)',
@@ -129,7 +124,6 @@ const defaultThemes = [
     id: 'pink',
     name: '粉装玉琢',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(241, 130, 141)',
       font: 'rgb(33, 33, 33)',
@@ -153,7 +147,6 @@ const defaultThemes = [
     id: 'purple',
     name: '重斤球紫',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(155, 89, 182)',
       font: 'rgb(33, 33, 33)',
@@ -177,7 +170,6 @@ const defaultThemes = [
     id: 'grey',
     name: '灰常美丽',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(108, 122, 137)',
       font: 'rgb(33, 33, 33)',
@@ -201,7 +193,6 @@ const defaultThemes = [
     id: 'ming',
     name: '青出于黑',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(51, 110, 123)',
       font: 'rgb(33, 33, 33)',
@@ -225,7 +216,6 @@ const defaultThemes = [
     id: 'blue2',
     name: '清热板蓝',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(79, 98, 208)',
       font: 'rgb(33, 33, 33)',
@@ -249,7 +239,6 @@ const defaultThemes = [
     id: 'black',
     name: '黑灯瞎火',
     isDark: true,
-    isDarkFont: false,
     config: {
       primary: 'rgb(150, 150, 150)',
       font: 'rgb(229, 229, 229)',
@@ -273,7 +262,6 @@ const defaultThemes = [
     id: 'mid_autumn',
     name: '月里嫦娥',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(74, 55, 82)',
       font: 'rgb(33, 33, 33)',
@@ -298,7 +286,6 @@ const defaultThemes = [
     id: 'naruto',
     name: '木叶之村',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgb(87, 144, 167)',
       font: 'rgb(33, 33, 33)',
@@ -322,7 +309,6 @@ const defaultThemes = [
     id: 'china_ink',
     name: '近墨者黑',
     isDark: false,
-    isDarkFont: false,
     config: {
       primary: 'rgba(47, 47, 47, 1)',
       font: 'rgb(33, 33, 33)',
@@ -347,7 +333,6 @@ 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,7 +3,6 @@
     "id": "green",
     "name": "绿意盎然",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -260,7 +259,6 @@
     "id": "blue",
     "name": "蓝田生玉",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -517,7 +515,6 @@
     "id": "blue_plus",
     "name": "蛋雅深蓝",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -774,7 +771,6 @@
     "id": "orange",
     "name": "橙黄橘绿",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1031,7 +1027,6 @@
     "id": "red",
     "name": "热情似火",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1288,7 +1283,6 @@
     "id": "pink",
     "name": "粉装玉琢",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1545,7 +1539,6 @@
     "id": "purple",
     "name": "重斤球紫",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -1802,7 +1795,6 @@
     "id": "grey",
     "name": "灰常美丽",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2059,7 +2051,6 @@
     "id": "ming",
     "name": "青出于黑",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2316,7 +2307,6 @@
     "id": "blue2",
     "name": "清热板蓝",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2573,7 +2563,6 @@
     "id": "black",
     "name": "黑灯瞎火",
     "isDark": true,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -2777,16 +2766,16 @@
         "--color-primary-light-900-alpha-700": "rgba(59, 59, 59, 0.30)",
         "--color-primary-light-900-alpha-800": "rgba(59, 59, 59, 0.20)",
         "--color-primary-light-900-alpha-900": "rgba(59, 59, 59, 0.10)",
-        "--color-primary-light-1000": "rgb(38,38,38)",
-        "--color-primary-light-1000-alpha-100": "rgba(38, 38, 38, 0.90)",
-        "--color-primary-light-1000-alpha-200": "rgba(38, 38, 38, 0.80)",
-        "--color-primary-light-1000-alpha-300": "rgba(38, 38, 38, 0.70)",
-        "--color-primary-light-1000-alpha-400": "rgba(38, 38, 38, 0.60)",
-        "--color-primary-light-1000-alpha-500": "rgba(38, 38, 38, 0.50)",
-        "--color-primary-light-1000-alpha-600": "rgba(38, 38, 38, 0.40)",
-        "--color-primary-light-1000-alpha-700": "rgba(38, 38, 38, 0.30)",
-        "--color-primary-light-1000-alpha-800": "rgba(38, 38, 38, 0.20)",
-        "--color-primary-light-1000-alpha-900": "rgba(38, 38, 38, 0.10)",
+        "--color-primary-light-1000": "rgb(47,47,47)",
+        "--color-primary-light-1000-alpha-100": "rgba(47, 47, 47, 0.90)",
+        "--color-primary-light-1000-alpha-200": "rgba(47, 47, 47, 0.80)",
+        "--color-primary-light-1000-alpha-300": "rgba(47, 47, 47, 0.70)",
+        "--color-primary-light-1000-alpha-400": "rgba(47, 47, 47, 0.60)",
+        "--color-primary-light-1000-alpha-500": "rgba(47, 47, 47, 0.50)",
+        "--color-primary-light-1000-alpha-600": "rgba(47, 47, 47, 0.40)",
+        "--color-primary-light-1000-alpha-700": "rgba(47, 47, 47, 0.30)",
+        "--color-primary-light-1000-alpha-800": "rgba(47, 47, 47, 0.20)",
+        "--color-primary-light-1000-alpha-900": "rgba(47, 47, 47, 0.10)",
         "--color-theme": "rgb(59,59,59)",
         "--color-1000": "rgb(229, 229, 229)",
         "--color-950": "rgb(218,218,218)",
@@ -2830,7 +2819,6 @@
     "id": "mid_autumn",
     "name": "月里嫦娥",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3087,7 +3075,6 @@
     "id": "naruto",
     "name": "木叶之村",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3344,7 +3331,6 @@
     "id": "china_ink",
     "name": "近墨者黑",
     "isDark": false,
-    "isDarkFont": false,
     "isCustom": false,
     "config": {
       "themeColors": {
@@ -3601,7 +3587,6 @@
     "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, isDarkFont) => {
+exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark) => {
   const colors = {
     '--color-primary': rgbaColor,
   }
@@ -22,7 +22,7 @@ exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark, isDarkFont) => {
       colors[`--color-primary-light-${i * 100}-alpha-${j * 100}`] = RGB_Alpha_Shade(0.1 * j, preColor)
     }
   }
-  preColor = RGB_Linear_Shade(isDark ? -0.35 : 1, preColor)
+  preColor = RGB_Linear_Shade(isDark ? -0.2 : 1, preColor)
   colors[`--color-primary-light-${1000}`] = preColor
   for (let j = 1; j < 10; j += 1) {
     colors[`--color-primary-light-${1000}-alpha-${j * 100}`] = RGB_Alpha_Shade(0.1 * j, preColor)
@@ -30,19 +30,19 @@ exports.createThemeColors = (rgbaColor, fontRgbaColor, isDark, isDarkFont) => {
 
   colors['--color-theme'] = isDark ? colors['--color-primary-light-900'] : rgbaColor
 
-  return { ...colors, ...createFontColors(fontRgbaColor, isDark, isDarkFont) }
+  return { ...colors, ...createFontColors(fontRgbaColor, isDark) }
 }
 
-const createFontColors = (rgbaColor, isDark, isDarkFont) => {
+const createFontColors = (rgbaColor, isDark) => {
   // 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, isDarkFont)
+  if (isDark) return createFontDarkColors(rgbaColor)
 
   let colors = {
     '--color-1000': rgbaColor,
   }
-  let step = (isDarkFont ? 0.02 : 0.05) * (isDark ? -1 : 1)
+  let step = isDark ? -0.05 : 0.05
   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, isDarkFont) => {
   return colors
 }
 
-const createFontDarkColors = (rgbaColor, isDarkFont) => {
+const createFontDarkColors = (rgbaColor) => {
   // rgb(238, 238, 238)
   // let prec = 'rgb(255, 255, 255)'
 
   let colors = {
     '--color-1000': rgbaColor,
   }
-  const step = isDarkFont ? -0.015 : -0.05
+  const step = -0.05
   let preColor = rgbaColor
   for (let i = 1; i < 21; i += 1) {
     preColor = RGB_Linear_Shade(step, preColor)

src/common/tsconfig.json

@@ -1,11 +1,16 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "typeRoots": [
+    "module": "esnext",
+    "moduleResolution": "nodenext",
+    "typeRoots": [                                       /* Specify multiple folders that act like './node_modules/@types'. */
       "./types"
     ],
-    "paths": {                                           /* Specify a set of entries that re-map imports to additional lookup locations. */
-      "@common/*": ["common/*"],
-    },
   },
+  // "include": [
+	//   "**/*.ts",
+	//   "**/*.js",
+	//   "**/*.vue",
+	//   "**/*.json",
+	// ],
 }

src/common/types/app_setting.d.ts

@@ -1,4 +1,4 @@
-import type { I18n } from '../../lang/i18n'
+import type { I18n } from '@/lang/i18n'
 
 declare global {
 
@@ -89,31 +89,20 @@ declare global {
       'player.togglePlayMethod': 'listLoop' | 'random' | 'list' | 'singleLoop' | 'none'
 
       /**
-       * 优先播放的音质
+       * 是否优先播放320k音质
        */
-      'player.playQuality': LX.Quality
+      'player.highQuality': boolean
 
       /**
        * 是否显示任务栏进度条
        */
       'player.isShowTaskProgess': boolean
 
-
-      /**
-       * 是否将歌词显示在状态栏
-       */
-      'player.isShowStatusBarLyric': boolean
-
       /**
        * 音量大小
        */
       'player.volume': number
 
-      /**
-       * 播放歌曲时是否阻止电脑休眠
-       */
-      'player.powerSaveBlocker': boolean
-
       /**
        * 是否静音
        */
@@ -124,16 +113,6 @@ declare global {
        */
       'player.playbackRate': number
 
-      /**
-       * 是否自动调整音频的音高以补偿对播放速率设置所做的更改
-       */
-      'player.preservesPitch': boolean
-
-      /**
-       * 使用设备能处理的最大声道数输出音频
-       */
-      'player.isMaxOutputChannelCount': boolean
-
       /**
        * 音频输出设备id
        */
@@ -264,21 +243,11 @@ declare global {
        */
       'player.soundEffect.panner.speed': number
 
-      /**
-       * 升降声调
-       */
-      'player.soundEffect.pitchShifter.playbackRate': number
-
       /**
        * 是否启用音频加载失败时自动切歌
        */
       'player.autoSkipOnError': boolean
 
-      /**
-       * 点击相同列表内的歌曲切歌时是否清空已播放列表（随机模式下列表内所有歌曲会重新参与随机）
-       */
-      'player.isAutoCleanPlayedList': boolean
-
       /**
        * 播放详情页-是否缩放当前播放的歌词行
        */
@@ -299,11 +268,6 @@ declare global {
        */
       'playDetail.style.align': 'center' | 'left' | 'right'
 
-      /**
-       * 播放详情页-是否延迟桌面歌词滚动
-       */
-      'playDetail.isDelayScroll': boolean
-
 
       /**
        * 是否启用桌面歌词
@@ -595,6 +559,16 @@ declare global {
        */
       'network.proxy.port': string
 
+      /**
+       * 代理服务器用户名
+       */
+      'network.proxy.username': string
+
+      /**
+       * 代理服务器密码
+       */
+      'network.proxy.password': string
+
       /**
        * 是否启用托盘
        */
@@ -635,22 +609,6 @@ declare global {
        */
       'sync.client.host': string
 
-
-      /**
-       * 是否启用开放API服务
-       */
-      'openAPI.enable': boolean
-
-      /**
-       * API服务端口号
-       */
-      'openAPI.port': '23330' | string
-
-      /**
-       * 是否绑定到局域网
-       */
-      'openAPI.bindLan': boolean
-
       /**
        * 是否在离开搜索界面时自动清空搜索框
        */

src/common/types/dislike_list.d.ts

@@ -1,37 +0,0 @@
-
-
-declare namespace LX {
-  namespace Dislike {
-    // interface ListItemMusicText {
-    //   id?: string
-    //   // type: 'music'
-    //   name: string | null
-    //   singer: string | null
-    // }
-    // interface ListItemMusic {
-    //   id?: number
-    //   type: 'musicId'
-    //   musicId: string
-    //   meta: LX.Music.MusicInfo
-    // }
-    // type ListItem = ListItemMusicText
-    // type ListItem = string
-    // type ListItem = ListItemMusic | ListItemMusicText
-
-    interface DislikeMusicInfo {
-      name: string
-      singer: string
-    }
-
-    type DislikeRules = string
-
-    interface DislikeInfo {
-      // musicIds: Set<string>
-      names: Set<string>
-      musicNames: Set<string>
-      singerNames: Set<string>
-      // list: LX.Dislike.ListItem[]
-      rules: DislikeRules
-    }
-  }
-}

src/common/types/dislike_list_sync.d.ts

@@ -1,30 +0,0 @@
-declare namespace LX {
-
-  namespace Sync {
-    namespace Dislike {
-      interface ListInfo {
-        lastSyncDate?: number
-        snapshotKey: string
-      }
-
-      interface SyncActionBase <A> {
-        action: A
-      }
-      interface SyncActionData<A, D> extends SyncActionBase<A> {
-        data: D
-      }
-      type SyncAction<A, D = undefined> = D extends undefined ? SyncActionBase<A> : SyncActionData<A, D>
-      type ActionList = SyncAction<'dislike_data_overwrite', LX.Dislike.DislikeRules>
-      | SyncAction<'dislike_music_add', LX.Dislike.DislikeMusicInfo[]>
-      | SyncAction<'dislike_music_clear'>
-
-      type SyncMode = 'merge_local_remote'
-      | 'merge_remote_local'
-      | 'overwrite_local_remote'
-      | 'overwrite_remote_local'
-      // | 'none'
-      | 'cancel'
-    }
-
-  }
-}

src/common/types/download_list.d.ts

@@ -1,4 +1,4 @@
-import { type Message } from '@root/lang'
+import { type Message } from '@/lang'
 
 // interface DownloadList {
 
@@ -21,7 +21,6 @@ declare global {
         speed: string
         downloaded: number
         total: number
-        writeQueue: number
       }
 
       interface DownloadTaskActionBase <A> {
@@ -51,7 +50,6 @@ declare global {
         total: number
         progress: number
         speed: string
-        writeQueue: number
         metadata: {
           musicInfo: LX.Music.MusicInfoOnline
           url: string | null

src/common/types/list.d.ts

@@ -139,5 +139,6 @@ declare namespace LX {
       userList: UserListInfoFull[]
       tempList: LX.Music.MusicInfo[]
     }
+
   }
 }

src/common/types/list_sync.d.ts

@@ -1,34 +0,0 @@
-declare namespace LX {
-
-  namespace Sync {
-    namespace List {
-      interface ListInfo {
-        lastSyncDate?: number
-        snapshotKey: string
-      }
-
-      type ActionList = LX.Sync.SyncAction<'list_data_overwrite', LX.List.ListActionDataOverwrite>
-      | SyncAction<'list_create', LX.List.ListActionAdd>
-      | SyncAction<'list_remove', LX.List.ListActionRemove>
-      | SyncAction<'list_update', LX.List.ListActionUpdate>
-      | SyncAction<'list_update_position', LX.List.ListActionUpdatePosition>
-      | SyncAction<'list_music_add', LX.List.ListActionMusicAdd>
-      | SyncAction<'list_music_move', LX.List.ListActionMusicMove>
-      | SyncAction<'list_music_remove', LX.List.ListActionMusicRemove>
-      | SyncAction<'list_music_update', LX.List.ListActionMusicUpdate>
-      | SyncAction<'list_music_update_position', LX.List.ListActionMusicUpdatePosition>
-      | SyncAction<'list_music_overwrite', LX.List.ListActionMusicOverwrite>
-      | SyncAction<'list_music_clear', LX.List.ListActionMusicClear>
-
-      type ListData = Omit<LX.List.ListDataFull, 'tempList'>
-      type SyncMode = 'merge_local_remote'
-      | 'merge_remote_local'
-      | 'overwrite_local_remote'
-      | 'overwrite_remote_local'
-      | 'overwrite_local_remote_full'
-      | 'overwrite_remote_local_full'
-      // | 'none'
-      | 'cancel'
-    }
-  }
-}

src/common/types/music.d.ts

@@ -22,7 +22,6 @@ declare namespace LX {
       songId: string | number // 歌曲ID，mg源为copyrightId，local为文件路径
       albumName: string // 歌曲专辑名称
       picUrl?: string | null // 歌曲图片链接
-      toggleMusicInfo?: MusicInfoOnline | null
     }
 
     interface MusicInfoMeta_online extends MusicInfoMetaBase {

src/common/types/open_api.d.ts

@@ -1,26 +0,0 @@
-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

@@ -15,20 +15,5 @@ declare namespace LX {
     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
-      collect: boolean
-    }
   }
 }

src/common/types/sound_effect.d.ts

@@ -21,10 +21,5 @@ declare namespace LX {
       mainGain: number
       sendGain: number
     }
-    // interface PitchShifterPreset {
-    //   id: string
-    //   name: string
-    //   playbackRate: number
-    // }
   }
 }

src/common/types/sync.d.ts

@@ -19,27 +19,52 @@ declare namespace LX {
     }
     type SyncAction<A, D = undefined> = D extends undefined ? SyncActionBase<A> : SyncActionData<A, D>
 
-
-    interface ModeTypes {
-      list: LX.Sync.List.SyncMode
-      dislike: LX.Sync.Dislike.SyncMode
-    }
-
-    type ModeType = { [K in keyof ModeTypes]: { type: K, mode: ModeTypes[K] } }[keyof ModeTypes]
-
-    type SyncMainWindowActions = SyncAction<'select_mode', { deviceName: string, type: keyof ModeTypes }>
+    type SyncMainWindowActions = SyncAction<'select_mode', string>
     | SyncAction<'close_select_mode'>
     | SyncAction<'client_status', ClientStatus>
     | SyncAction<'server_status', ServerStatus>
 
-    type SyncServiceActions = SyncAction<'select_mode', ModeType>
+    type SyncServiceActions = SyncAction<'select_mode', Mode>
     | SyncAction<'get_server_status'>
     | SyncAction<'get_client_status'>
     | SyncAction<'generate_code'>
     | SyncAction<'enable_server', EnableServer>
     | SyncAction<'enable_client', EnableClient>
 
-    type ServerDevices = ServerKeyInfo[]
+    type ActionList = SyncAction<'list_data_overwrite', LX.List.ListActionDataOverwrite>
+    | SyncAction<'list_create', LX.List.ListActionAdd>
+    | SyncAction<'list_remove', LX.List.ListActionRemove>
+    | SyncAction<'list_update', LX.List.ListActionUpdate>
+    | SyncAction<'list_update_position', LX.List.ListActionUpdatePosition>
+    | SyncAction<'list_music_add', LX.List.ListActionMusicAdd>
+    | SyncAction<'list_music_move', LX.List.ListActionMusicMove>
+    | SyncAction<'list_music_remove', LX.List.ListActionMusicRemove>
+    | SyncAction<'list_music_update', LX.List.ListActionMusicUpdate>
+    | SyncAction<'list_music_update_position', LX.List.ListActionMusicUpdatePosition>
+    | SyncAction<'list_music_overwrite', LX.List.ListActionMusicOverwrite>
+    | SyncAction<'list_music_clear', LX.List.ListActionMusicClear>
+
+    type ActionSync = SyncAction<'list:sync:list_sync_get_md5', string>
+    | SyncAction<'list:sync:list_sync_get_list_data', ListData>
+    | SyncAction<'list:sync:list_sync_get_sync_mode', Mode>
+    | SyncAction<'list:sync:action', ActionList>
+    // | SyncAction<'finished'>
+
+    type ActionSyncType = Actions<ActionSync>
+
+    type ActionSyncSend = SyncAction<'list:sync:list_sync_get_md5'>
+    | SyncAction<'list:sync:list_sync_get_list_data'>
+    | SyncAction<'list:sync:list_sync_get_sync_mode'>
+    | SyncAction<'list:sync:list_sync_set_data', LX.Sync.ListData>
+    | SyncAction<'list:sync:action', ActionList>
+    | SyncAction<'list:sync:finished'>
+
+    type ActionSyncSendType = Actions<ActionSyncSend>
+
+    interface List {
+      action: string
+      data: any
+    }
 
     interface ServerStatus {
       status: boolean
@@ -65,21 +90,21 @@ declare namespace LX {
       clientId: string
       key: string
       deviceName: string
-      lastConnectDate?: number
+      lastSyncDate?: number
+      snapshotKey: string
       isMobile: boolean
     }
 
-    interface ListConfig {
-      skipSnapshot: boolean
-    }
-    interface DislikeConfig {
-      skipSnapshot: boolean
-    }
-    type ServerType = 'desktop-app' | 'server'
-    interface EnabledFeatures {
-      list?: false | ListConfig
-      dislike?: false | DislikeConfig
-    }
-    type SupportedFeatures = Partial<{ [k in keyof EnabledFeatures]: number }>
+    type ListData = Omit<LX.List.ListDataFull, 'tempList'>
+
+    type Mode = 'merge_local_remote'
+    | 'merge_remote_local'
+    | 'overwrite_local_remote'
+    | 'overwrite_remote_local'
+    | 'overwrite_local_remote_full'
+    | 'overwrite_remote_local_full'
+    // | 'none'
+    | 'cancel'
+
   }
 }

src/common/types/theme.d.ts

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

src/common/types/user_api.d.ts

@@ -1,7 +1,7 @@
 declare namespace LX {
   namespace UserApi {
     type UserApiSourceInfoType = 'music'
-    type UserApiSourceInfoActions = 'musicUrl' | 'lyric' | 'pic'
+    type UserApiSourceInfoActions = 'musicUrl'
 
     interface UserApiSourceInfo {
       name: string
@@ -13,20 +13,15 @@ declare namespace LX {
     type UserApiSources = Record<LX.Source, UserApiSourceInfo>
 
 
-    interface UserApiInfoFull {
+    interface UserApiInfo {
       id: string
       name: string
       description: string
       script: string
       allowShowUpdateAlert: boolean
-      author?: string
-      homepage?: string
-      version?: string
       sources?: UserApiSources
     }
 
-    type UserApiInfo = Omit<UserApiInfoFull, 'script'>
-
     interface UserApiStatus {
       status: boolean
       message?: string

src/common/types/utils.d.ts

@@ -10,13 +10,3 @@ type Modify<T, R> = Omit<T, keyof R> & R
 type Actions<T extends { action: string, data?: any }> = {
   [U in T as U['action']]: 'data' extends keyof U ? U['data'] : undefined
 }
-
-type WarpPromiseValue<T> = T extends ((...args: infer P) => Promise<infer R>)
-  ? ((...args: P) => Promise<R>)
-  : T extends ((...args: infer P2) => infer R2)
-    ? ((...args: P2) => Promise<R2>)
-    : Promise<T>
-
-type WarpPromiseRecord<T extends Record<string, any>> = {
-  [K in keyof T]: WarpPromiseValue<T[K]>
-}

src/common/utils/common.ts

@@ -225,23 +225,3 @@ export const arrPushByPosition = <T>(list: T[], newList: T[], position: number)
   }
   return list
 }
-
-
-// https://stackoverflow.com/a/2450976
-export const arrShuffle = <T>(array: T[]) => {
-  let currentIndex = array.length
-  let randomIndex
-
-  // While there remain elements to shuffle.
-  while (currentIndex != 0) {
-    // Pick a remaining element.
-    randomIndex = Math.floor(Math.random() * currentIndex)
-    currentIndex--;
-
-    // And swap it with the current element.
-    [array[currentIndex], array[randomIndex]] = [
-      array[randomIndex], array[currentIndex]]
-  }
-
-  return array
-}

src/common/utils/download/Downloader.ts

@@ -8,7 +8,6 @@ import { request, type Options as RequestOptions } from './request'
 
 export interface Options {
   forceResume: boolean
-  timeout: number
   requestOptions: RequestOptions
 }
 
@@ -24,7 +23,6 @@ const defaultRequestOptions: Options['requestOptions'] = {
 }
 const defaultOptions: Options = {
   forceResume: true,
-  timeout: 20_000,
   requestOptions: { ...defaultRequestOptions },
 }
 
@@ -39,11 +37,6 @@ class Task extends EventEmitter {
   progress = { total: 0, downloaded: 0, speed: 0, progress: 0 }
   statsEstimate = { time: 0, bytes: 0, prevBytes: 0 }
   requestInstance: http.ClientRequest | null = null
-  maxRedirectNum = 2
-  private redirectNum = 0
-  private dataWriteQueueLength = 0
-  private closeWaiting = false
-  private timeout: null | NodeJS.Timeout = null
 
 
   constructor(url: string, savePath: string, filename: string, options: Partial<Options> = {}) {
@@ -66,14 +59,9 @@ class Task extends EventEmitter {
 
   async __init() {
     const { path, startByte, endByte } = this.chunkInfo
-    this.redirectNum = 0
     this.progress.downloaded = 0
     this.progress.progress = 0
     this.progress.speed = 0
-    this.dataWriteQueueLength = 0
-    this.closeWaiting = false
-    this.__clearTimeout()
-    this.__startTimeout()
     if (startByte) this.requestOptions.headers!.range = `bytes=${startByte}-${endByte}`
 
     if (!path) return
@@ -124,7 +112,6 @@ class Task extends EventEmitter {
 
   __httpFetch(url: string, options: Options['requestOptions']) {
     // console.log(options)
-    let redirected = false
     this.requestInstance = request(url, options)
       .on('response', response => {
         if (response.statusCode !== 200 && response.statusCode !== 206) {
@@ -138,18 +125,8 @@ class Task extends EventEmitter {
             })
             return
           }
-          if ((response.statusCode == 301 || response.statusCode == 302) && response.headers.location && this.redirectNum < this.maxRedirectNum) {
-            console.log('current url:', url)
-            console.log('redirect to:', response.headers.location)
-            redirected = true
-            this.redirectNum++
-            const location = response.headers.location
-            this.__httpFetch(location, options)
-            return
-          }
           this.status = STATUS.failed
           this.emit('fail', response)
-          this.__clearTimeout()
           this.__closeRequest()
           void this.__closeWriteStream()
           return
@@ -162,7 +139,6 @@ class Task extends EventEmitter {
           return
         }
         this.status = STATUS.running
-        this.__startTimeout()
         response
           .on('data', this.__handleWriteData.bind(this))
           .on('error', err => { this.__handleError(err) })
@@ -177,7 +153,6 @@ class Task extends EventEmitter {
       })
       .on('error', err => { this.__handleError(err) })
       .on('close', () => {
-        if (redirected) return
         void this.__closeWriteStream()
       })
       .end()
@@ -213,7 +188,6 @@ class Task extends EventEmitter {
     this.ws = fs.createWriteStream(this.chunkInfo.path, options)
 
     this.ws.on('finish', () => {
-      if (this.closeWaiting) return
       void this.__closeWriteStream()
     })
     this.ws.on('error', err => {
@@ -229,7 +203,6 @@ class Task extends EventEmitter {
 
   __handleComplete() {
     if (this.status == STATUS.error) return
-    this.__clearTimeout()
     void this.__closeWriteStream().then(() => {
       if (this.progress.downloaded == this.progress.total) {
         this.status = STATUS.completed
@@ -245,7 +218,6 @@ class Task extends EventEmitter {
   __handleError(error: Error) {
     if (this.status == STATUS.error) return
     this.status = STATUS.error
-    this.__clearTimeout()
     this.__closeRequest()
     void this.__closeWriteStream()
     if (error.message == 'aborted') return
@@ -259,21 +231,16 @@ class Task extends EventEmitter {
         return
       }
       // console.log('close write stream')
-      if (this.closeWaiting || this.dataWriteQueueLength) {
-        this.closeWaiting ||= true
-        this.ws.on('close', resolve)
-      } else {
-        this.ws.close(err => {
-          if (err) {
-            this.status = STATUS.error
-            this.emit('error', err)
-            reject(err)
-            return
-          }
-          this.ws = null
-          resolve()
-        })
-      }
+      this.ws.close(err => {
+        if (err) {
+          this.status = STATUS.error
+          this.emit('error', err)
+          reject(err)
+          return
+        }
+        this.ws = null
+        resolve()
+      })
     })
   }
 
@@ -289,7 +256,7 @@ class Task extends EventEmitter {
       const result = this.__handleDiffChunk(chunk)
       if (result) chunk = result
       else {
-        void this.__handleStop().finally(() => {
+        this.__handleStop().finally(() => {
           // this.__handleError(new Error('Resume failed, response chunk does not match.'))
           // Resume failed, response chunk does not match, remove file and restart download
           console.log('Resume failed, response chunk does not match.')
@@ -312,18 +279,12 @@ class Task extends EventEmitter {
       console.log('cancel write')
       return
     }
-    this.dataWriteQueueLength++
-    this.__startTimeout()
     this.__calculateProgress(chunk.length)
     this.ws.write(chunk, err => {
-      this.dataWriteQueueLength--
-      if (this.status == STATUS.running) this.__calculateProgress(0)
-      if (err) {
-        console.log(err)
-        this.__handleError(err)
-        return
-      }
-      if (this.closeWaiting && !this.dataWriteQueueLength) this.ws?.close()
+      if (!err) return
+      console.log(err)
+      this.__handleError(err)
+      void this.stop()
     })
   }
 
@@ -333,36 +294,36 @@ class Task extends EventEmitter {
     let chunkLen = chunk.length
     let isOk
     if (chunkLen >= resumeLastChunkLen) {
-      isOk = chunk.subarray(0, resumeLastChunkLen).toString('hex') === this.resumeLastChunk!.toString('hex')
+      isOk = chunk.slice(0, resumeLastChunkLen).toString('hex') === this.resumeLastChunk!.toString('hex')
       if (!isOk) return null
 
       this.resumeLastChunk = null
-      return chunk.subarray(resumeLastChunkLen)
+      return chunk.slice(resumeLastChunkLen)
     } else {
-      isOk = chunk.subarray(0, chunkLen).toString('hex') === this.resumeLastChunk!.subarray(0, chunkLen).toString('hex')
+      isOk = chunk.slice(0, chunkLen).toString('hex') === this.resumeLastChunk!.slice(0, chunkLen).toString('hex')
       if (!isOk) return null
-      this.resumeLastChunk = this.resumeLastChunk!.subarray(chunkLen)
-      return chunk.subarray(chunkLen)
+      this.resumeLastChunk = this.resumeLastChunk!.slice(chunkLen)
+      return chunk.slice(chunkLen)
     }
   }
 
   async __handleStop() {
-    this.__clearTimeout()
-    this.__closeRequest()
-    return this.__closeWriteStream()
-  }
-
-  private __clearTimeout() {
-    if (!this.timeout) return
-    clearTimeout(this.timeout)
-    this.timeout = null
-  }
-
-  private __startTimeout() {
-    this.__clearTimeout()
-    this.timeout = setTimeout(() => {
-      this.__handleError(new Error('download timeout'))
-    }, this.options.timeout)
+    return new Promise<void>((resolve, reject) => {
+      this.__closeRequest()
+      if (this.ws) {
+        this.ws.close(err => {
+          if (err) {
+            reject(err)
+            this.emit('error', err)
+            return
+          }
+          this.ws = null
+          resolve()
+        })
+      } else {
+        resolve()
+      }
+    })
   }
 
   __calculateProgress(receivedBytes: number) {
@@ -375,7 +336,7 @@ class Task extends EventEmitter {
 
 
     // emit the progress every second or if finished
-    if ((progress.downloaded === progress.total && this.dataWriteQueueLength == 0) || elaspsedTime > 1000) {
+    if (progress.downloaded === progress.total || elaspsedTime > 1000) {
       this.statsEstimate.time = currentTime
       this.statsEstimate.bytes = progress.downloaded - this.statsEstimate.prevBytes
       this.statsEstimate.prevBytes = progress.downloaded
@@ -384,7 +345,6 @@ class Task extends EventEmitter {
         downloaded: progress.downloaded,
         progress: progress.progress,
         speed: this.statsEstimate.bytes,
-        writeQueue: this.dataWriteQueueLength,
       })
     }
   }

src/common/utils/download/index.ts

@@ -74,7 +74,6 @@ export const createDownload = ({
       speed,
       downloaded: stats.downloaded,
       total: stats.total,
-      writeQueue: stats.writeQueue,
     })
     // if (debugDownload) {
     //   const downloaded = sizeFormate(stats.downloaded)

src/common/utils/download/request.ts

@@ -27,7 +27,7 @@ const sendRequest = (url: string, options: Options, callback?: HttpCallback) =>
   }
 
   if (options.params) {
-    (httpOptions.path!) += `${urlParse.search ? '&' : '?'}${Object.entries(options.params)
+    (httpOptions.path as string) += `${urlParse.search ? '&' : '?'}${Object.entries(options.params)
       .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
       .join('&')}`
   }

src/common/utils/effects/snow.min.js

@@ -4,24 +4,24 @@
 // -------------------------------------------------------------------------------------------------
 
 // Change the following variables to customize the appearance of the particles
-let numParticles = window.innerWidth / 50
-let maxSpeed = 2.5
-let minSpeed = 1
-let maxSize = 5
-let minSize = 3
-let maxOpacity = 1
-let minOpacity = 0.2
+var numParticles = window.innerWidth / 50;
+var maxSpeed = 2.5;
+var minSpeed = 1;
+var maxSize = 5;
+var minSize = 3;
+var maxOpacity = 1;
+var minOpacity = 0.2;
 
 // If the following is true, the canvas resolution will be set to match the full viewport width and height.
 // var fixCanvasResolution = true;
 
-let snow_particles = []
+var snow_particles = [];
 
-let canvas
+var canvas
 
 window.onload = function() {
   canvas = document.createElement('canvas')
-  canvas.style.position = 'fixed'
+  canvas.style.position = 'fixed';
   canvas.style.top = '0px'
   canvas.style.left = '0px'
   canvas.style.pointerEvents = 'none'
@@ -30,62 +30,62 @@ window.onload = function() {
   canvas.height = document.documentElement.clientHeight
   document.body.appendChild(canvas)
 
-  // if (fixCanvasResolution) {
-  //  // canvas.width = window.innerWidth;
-  //  canvas.height = window.innerHeight;
-  // }
+	// if (fixCanvasResolution) {
+	// 	// canvas.width = window.innerWidth;
+	// 	canvas.height = window.innerHeight;
+	// }
 
-  InitPoints()
+	InitPoints();
 
-  window.requestAnimationFrame(Redraw, 15)
+	requestAnimationFrame(Redraw, 15);
   window.addEventListener('resize', this.onWindowResize)
 }
-// function onWindowResize(e) {
-//   canvas.width = document.documentElement.clientWidth
-//   canvas.height = document.documentElement.clientHeight
-// }
+function onWindowResize (e) {
+  canvas.width = document.documentElement.clientWidth
+  canvas.height = document.documentElement.clientHeight
+}
 
 function Redraw() {
-  let ctx = canvas.getContext('2d')
-  ctx.clearRect(0, 0, canvas.width, canvas.height)
-  for (let i = 0; i < snow_particles.length; i++) {
-    let newYPos = snow_particles[i].yPos + snow_particles[i].speed
-    if (newYPos > window.innerHeight) {
-      newYPos = getRandomInt(-100, -10)
-      snow_particles[i].xPos = getRandomInt(0, window.innerWidth)
-      snow_particles[i].speed = Math.random() * (maxSpeed - minSpeed) + minSpeed
-      snow_particles[i].opacity = Math.random() * (maxOpacity - minOpacity) + minOpacity
-      snow_particles[i].size = Math.random() * (maxSize - minSize) + minSize
-    }
-    snow_particles[i].yPos = newYPos
-    ctx.beginPath()
-    ctx.arc(snow_particles[i].xPos, newYPos, snow_particles[i].size, 0, 2 * Math.PI)
-    ctx.fillStyle = 'rgba(255, 255, 255, ' + snow_particles[i].opacity + ')'
-    ctx.fill()
-  }
-  window.requestAnimationFrame(Redraw)
+	var ctx = canvas.getContext("2d");
+	ctx.clearRect(0,0,canvas.width,canvas.height);
+	for (var i = 0; i < snow_particles.length; i++) {
+		var newYPos = snow_particles[i].yPos + snow_particles[i].speed;
+		if (newYPos > window.innerHeight) {
+			newYPos = getRandomInt(-100,-10);
+			snow_particles[i].xPos = getRandomInt(0, window.innerWidth);
+			snow_particles[i].speed = Math.random() * (maxSpeed - minSpeed) + minSpeed;
+			snow_particles[i].opacity = Math.random() * (maxOpacity - minOpacity) + minOpacity;
+			snow_particles[i].size = Math.random() * (maxSize - minSize) + minSize;
+		}
+		snow_particles[i].yPos = newYPos;
+		ctx.beginPath();
+		ctx.arc(snow_particles[i].xPos, newYPos, snow_particles[i].size, 0, 2 * Math.PI);
+		ctx.fillStyle = "rgba(255, 255, 255, " + snow_particles[i].opacity + ")";
+		ctx.fill();
+	}
+  requestAnimationFrame(Redraw)
 }
 
 function InitPoints() {
-  for (let i = 0; i < numParticles; i++) {
-    let startX = getRandomInt(0, window.innerWidth)
-    let startY = getRandomInt(0, window.innerHeight)
-    let speed = Math.random() * (maxSpeed - minSpeed) + minSpeed
-    let opacity = Math.random() * (maxOpacity - minOpacity) + minOpacity
-    let size = Math.random() * (maxSize - minSize) + minSize
+	for (var i = 0; i < numParticles; i++) {
+		var startX = getRandomInt(0, window.innerWidth);
+		var startY = getRandomInt(0, window.innerHeight);
+		var speed = Math.random() * (maxSpeed - minSpeed) + minSpeed;
+		var opacity = Math.random() * (maxOpacity - minOpacity) + minOpacity;
+		var size = Math.random() * (maxSize - minSize) + minSize;
 
-    snow_particles.push({
-      xPos: startX,
-      yPos: startY,
-      speed,
-      opacity,
-      size,
-    })
-  }
+		snow_particles.push({
+			"xPos": startX,
+			"yPos": startY,
+			"speed": speed,
+			"opacity": opacity,
+			"size": size,
+		});
+	}
 }
 
 function getRandomInt(min, max) {
-  min = Math.ceil(min)
-  max = Math.floor(max)
-  return Math.floor(Math.random() * (max - min)) + min
+	min = Math.ceil(min);
+	max = Math.floor(max);
+	return Math.floor(Math.random() * (max - min)) + min;
 }

src/common/utils/electron.ts

@@ -39,6 +39,5 @@ export const clipboardReadText = (): string => {
 
 export const encodePath = (path: string) => {
   // https://github.com/lyswhut/lx-music-desktop/issues/963
-  // https://github.com/lyswhut/lx-music-desktop/issues/1461
-  return path.replaceAll('%', '%25').replaceAll('#', '%23')
+  return path.replaceAll('%', '%25')
 }

src/common/utils/index.ts

@@ -1,5 +1,6 @@
-import log from 'electron-log/node'
+import log from 'electron-log'
 
+log.transports.file.level = 'info'
 
 export const isLinux = process.platform == 'linux'
 export const isWin = process.platform == 'win32'

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

@@ -1,4 +1,4 @@
-import { getNow, TimeoutTools } from './utils'
+const { getNow, TimeoutTools } = require('./utils')
 
 // const fontFormateRxp = /(?=<\d+,\d+>).*?/g
 const fontSplitRxp = /(?=<\d+,\d+>).*?/g
@@ -25,7 +25,7 @@ const createAnimation = (dom, duration, isVertical) => new window.Animation(new
 // https://jsfiddle.net/ceqpnbky/
 // https://jsfiddle.net/ceqpnbky/1/
 
-export default class FontPlayer {
+module.exports = class FontPlayer {
   constructor({
     time = 0,
     rate = 1,
@@ -69,8 +69,8 @@ export default class FontPlayer {
 
     this.lineContent = null
 
-    this.timeoutTools = new TimeoutTools(50)
-    this.waitPlayTimeout = new TimeoutTools(50)
+    this.timeoutTools = new TimeoutTools(80)
+    this.waitPlayTimeout = new TimeoutTools(80)
 
     this._init()
   }
@@ -133,8 +133,8 @@ export default class FontPlayer {
     // let lineText = ''
     let lrcShadowContent
     for (const font of fonts) {
-      if (!timeRxp.test(font)) return this._handleLineParse()
       text = font.replace(timeRxp, '')
+      if (RegExp.$2 == '') return this._handleLineParse()
       const time = parseInt(RegExp.$2)
 
       const dom = document.createElement('span')

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

@@ -1,9 +1,9 @@
-import LinePlayer from './line-player'
-import FontPlayer from './font-player'
+const LinePlayer = require('./line-player')
+const FontPlayer = require('./font-player')
 
 const fontTimeExp = /<(\d+),(\d+)>/g
 
-export default class Lyric {
+module.exports = class Lyric {
   constructor({
     lyric = '',
     extendedLyrics = [],
@@ -68,7 +68,7 @@ export default class Lyric {
   _handleLinePlayerOnPlay = (num, text, curTime) => {
     if (this.isLineMode) {
       if (num < this.playingLineNum + 1) {
-        for (let i = this.playingLineNum, minNum = Math.max(num, 0) - 1; i > minNum; i--) {
+        for (let i = this.playingLineNum; i > num - 1; i--) {
           const font = this._lineFonts[i]
           font.reset()
           font.lineContent.classList.remove(this.activeLineClassName)
@@ -86,7 +86,7 @@ export default class Lyric {
       }
     } else {
       if (num < this.playingLineNum + 1) {
-        for (let i = this.playingLineNum, minNum = Math.max(num, 0) - 1; i > minNum; i--) {
+        for (let i = this.playingLineNum; i > num - 1; i--) {
           const font = this._lineFonts[i]
           font.lineContent.classList.remove(this.activeLineClassName)
           font.reset()
@@ -103,12 +103,10 @@ export default class Lyric {
       }
     }
     this.playingLineNum = num
-    if (num > -1) {
-      const font = this._lineFonts[num]
-      font.lineContent.classList.add(this.activeLineClassName)
-      font.play(curTime - this._lines[num].time)
-    }
-    this.onPlay(num, this._lines[num]?.text ?? '')
+    const font = this._lineFonts[num]
+    font.lineContent.classList.add(this.activeLineClassName)
+    font.play(curTime - this._lines[num].time)
+    this.onPlay(num, this._lines[num].text)
   }
 
   _initLines = (lyricLines, offset, isUpdate) => {
@@ -227,8 +225,4 @@ 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

@@ -1,4 +1,4 @@
-import { getNow, TimeoutTools } from './utils'
+const { getNow, TimeoutTools } = require('./utils')
 
 const timeFieldExp = /^(?:\[[\d:.]+\])+/g
 const timeExp = /\d{1,3}(:\d{1,3}){0,2}(?:\.\d{1,3})/g
@@ -29,8 +29,7 @@ const parseExtendedLyric = (lrcLinesMap, extendedLyric) => {
     if (result) {
       const timeField = result[0]
       const text = line.replace(timeFieldExp, '').trim()
-      // https://github.com/lyswhut/lx-music-desktop/issues/1499
-      if (text && text != '//') {
+      if (text) {
         const times = timeField.match(timeExp)
         if (times == null) continue
         for (let time of times) {
@@ -43,7 +42,7 @@ const parseExtendedLyric = (lrcLinesMap, extendedLyric) => {
   }
 }
 
-export default class LinePlayer {
+module.exports = class LinePlayer {
   constructor({ offset = 0, rate = 1, onPlay = function() { }, onSetLyric = function() { } } = {}) {
     this.tags = {}
     this.lines = null
@@ -148,7 +147,7 @@ export default class LinePlayer {
     const currentTime = this._currentTime()
     const driftTime = currentTime - curLine.time
 
-    if (driftTime >= 0) {
+    if (driftTime >= 0 || this.curLineNum === 0) {
       let nextLine = this.lines[this.curLineNum + 1]
       const delay = (nextLine.time - curLine.time - driftTime) / this._rate
 
@@ -167,17 +166,6 @@ export default class LinePlayer {
         this._refresh()
         return
       }
-    } else if (this.curLineNum == 0) {
-      let firstLine = this.lines[0]
-      const delay = (firstLine.time - currentTime) / this._rate
-      if (this.isPlay) {
-        timeoutTools.start(() => {
-          if (!this.isPlay) return
-          this._refresh()
-        }, delay)
-      }
-      this.onPlay(-1, '', currentTime)
-      return
     }
 
     this.curLineNum = this._findCurLineNum(currentTime, this.curLineNum) - 1
@@ -224,16 +212,4 @@ 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

@@ -1,10 +1,8 @@
 
-export const getNow = typeof performance == 'object' && window.performance.now ? window.performance.now.bind(window.performance) : Date.now.bind(Date)
+const getNow = exports.getNow = typeof performance == 'object' && window.performance.now ? window.performance.now.bind(window.performance) : Date.now.bind(Date)
 
-export class TimeoutTools {
-  constructor(thresholdTime = 80) {
-    this.nextTick = window.requestAnimationFrame.bind(window)
-    this.cancelNextTick = window.cancelAnimationFrame.bind(window)
+exports.TimeoutTools = class TimeoutTools {
+  constructor(thresholdTime = 200) {
     this.invokeTime = 0
     this.animationFrameId = null
     this.timeoutId = null
@@ -13,13 +11,12 @@ export class TimeoutTools {
   }
 
   run() {
-    this.animationFrameId = this.nextTick(() => {
+    this.animationFrameId = window.requestAnimationFrame(() => {
       this.animationFrameId = null
       let diff = this.invokeTime - getNow()
       // console.log('diff', diff)
       if (diff > 0) {
         if (diff < this.thresholdTime) return this.run()
-        // console.log('run timeout', diff, diff - this.thresholdTime)
         return this.timeoutId = window.setTimeout(() => {
           this.timeoutId = null
           this.run()
@@ -41,7 +38,7 @@ export class TimeoutTools {
 
   clear() {
     if (this.animationFrameId) {
-      this.cancelNextTick(this.animationFrameId)
+      window.cancelAnimationFrame(this.animationFrameId)
       this.animationFrameId = null
     }
     if (this.timeoutId) {

src/common/utils/migrateSetting.ts

@@ -57,6 +57,7 @@ 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
@@ -116,6 +117,8 @@ 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,21 +1,14 @@
 const http = require('http')
 const https = require('https')
 const fs = require('fs')
-const { httpOverHttp, httpsOverHttp } = require('tunnel')
 
-const httpsRxp = /^https:/
-const getRequestAgent = (url, proxy) => {
-  return proxy ? (httpsRxp.test(url) ? httpsOverHttp : httpOverHttp)({ proxy }) : undefined
-}
-
-const sendRequest = (url, proxy) => {
+const sendRequest = (url) => {
   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',
     },
@@ -27,9 +20,9 @@ const sendRequest = (url, proxy) => {
     : http.request(httpOptions)
 }
 
-module.exports = (url, filePath, proxy) => {
+module.exports = (url, filePath) => {
   return new Promise((resolve) => {
-    sendRequest(url, proxy)
+    sendRequest(url)
       .on('response', response => {
         // console.log(response.statusCode)
         if (response.statusCode !== 200 && response.statusCode != 206) {

src/common/utils/musicMeta/flacMeta.js

@@ -57,9 +57,9 @@ const writeMeta = async(filePath, meta, picPath) => {
   })
 }
 
-module.exports = (filePath, meta, proxy) => {
+module.exports = (filePath, meta) => {
   if (!meta.APIC) return writeMeta(filePath, meta)
-  let picUrl = meta.APIC
+  const picUrl = meta.APIC
   delete meta.APIC
   if (!/^http/.test(picUrl)) {
     return writeMeta(filePath, meta)
@@ -67,8 +67,7 @@ module.exports = (filePath, meta, proxy) => {
   let ext = path.extname(picUrl)
   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, proxy).then(success => {
+  download(picUrl, picPath).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, proxy?: { host: string, port: number }): void
+export function setMeta(filePath: string, meta: MusicMeta): 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, proxy) => {
+exports.setMeta = (filePath, meta) => {
   switch (path.extname(filePath)) {
     case '.mp3':
-      mp3Meta(filePath, meta, proxy)
+      mp3Meta(filePath, meta)
       break
     case '.flac':
-      flacMeta(filePath, meta, proxy)
+      flacMeta(filePath, meta)
       break
   }
 }