Bump Version and Update Deps

Merge pull request #113 from KyleBing/master
调整暗黑模式样式，新增全局统一样式 by @KyleBing
2020-11-26 17:28:14 +08:00 · 2020-11-26 16:56:44 +08:00 · 2020-11-25 14:47:23 +08:00 · 2020-11-25 14:38:29 +08:00 · 2020-11-25 13:50:38 +08:00 · 2020-11-24 22:28:56 +08:00
26 changed files with 4642 additions and 3076 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,7 +19,7 @@ steps:
      - npm run build
      - tar -czf legacy.tar.gz -C ./dist .
      - npm run build -- --modern
-      - tar -czf morden.tar.gz -C ./dist .
+      - tar -czf modern.tar.gz -C ./dist .


  - name: release
@@ -27,7 +27,7 @@ steps:
    settings:
      base_url: https://git.ixarea.com
      files:
-        - morden.tar.gz
+        - modern.tar.gz
        - legacy.tar.gz
      api_key:
        from_secret: gitea_token
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,38 @@
+---
+name: Bug报告
+about: 报告Bug以帮助改进程序
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+- 请按照此模板填写，否则可能立即被关闭
+- [x] 我确认已经搜索过Issue不存并确认相同的Issue
+- [x] 我认为这是程序导致的问题（如不确认，请先通过Telegram或者Email进行咨询）
+
+
+**Bug描述**
+
+简要地复述你遇到的Bug
+
+**复现方法**
+
+描述复现方法，必要时请提供样本文件
+
+**程序截图或者Console报错信息**
+
+如果可以请提供二者之一
+
+
+**环境信息:**
+
+ - 操作系统和浏览器：
+ - 程序版本：
+ - 获取音乐文件所使用的客户端及其版本信息：
+
+
+**附加信息**
+
+其他能够帮助确认问题的信息
+
--- a/.github/ISSUE_TEMPLATE/new-feature.md
+++ b/.github/ISSUE_TEMPLATE/new-feature.md
@@ -0,0 +1,26 @@
+---
+name: 新功能
+about: 对于程序新的想法或建议
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+- 请按照此模板填写，否则可能立即被关闭
+
+**背景和说明**
+
+简要说明产生此想法的背景和此想法的具体内容
+
+
+**实现途径**
+
+- 如果没有设计方案，请简要描述实现思路
+- 如果你没有任何的实现思路，请通过Telegram进行讨论
+
+
+**附加信息**
+
+更多你想要表达的内容
+
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,67 @@
+name: Build
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+  pull_request:
+    branches: [ master ]
+    types: [ opened, synchronize, reopened ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build: [ legacy, modern ]
+        include:
+          - build: legacy
+            BUILD_ARGS:
+          - build: modern
+            BUILD_ARGS: "-- --modern"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
+
+      - name: Build
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build ${{ matrix.BUILD_ARGS }}
+          tar -czvf dist.tar.gz -C ./dist .
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unlock-music-${{ matrix.build }}.tar.gz
+          path: ./dist.tar.gz
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,121 @@
+name: Release and GitHub Pages
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
+
+      - name: Build Legacy
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build
+          tar -czf legacy.tar.gz -C ./dist .
+          zip -rJ9 legacy.zip ./dist
+
+      - name: Build Modern
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build -- --modern
+          tar -czf modern.tar.gz -C ./dist .
+          zip -rJ9 modern.zip ./dist
+
+      - name: Checksum
+        run: sha256sum *.tar.gz *.zip > sha256sum.txt
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist
+
+      - name: Get current time
+        id: date
+        run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
+
+      - name: Create a Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: "Build ${{ steps.date.outputs.date }}"
+          draft: true
+
+      - name: Upload Release Assets - legacy.tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./legacy.tar.gz
+          asset_name: legacy.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload Release Assets - legacy.zip
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./legacy.zip
+          asset_name: legacy.zip
+          asset_content_type: application/zip
+
+      - name: Upload Release Assets - modern.tar.gz
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./modern.tar.gz
+          asset_name: modern.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload Release Assets - modern.zip
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./modern.zip
+          asset_name: modern.zip
+          asset_content_type: application/zip
+
+      - name: Upload Release Assets - sha256sum.txt
+        uses: actions/upload-release-asset@v1.0.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./sha256sum.txt
+          asset_name: sha256sum.txt
+          asset_content_type: text/plain
+
--- a/README.md
+++ b/README.md
@@ -1,25 +1,26 @@
 # Unlock Music 音乐解锁
- Unlock encrypted music file in browser. 
- 在浏览器中解锁加密的音乐文件。
+- 在浏览器中解锁加密的音乐文件。 Unlock encrypted music file in the browser. 
 - unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务；Unlock Music的CLI版本正在开发中。
+- Unlock Music的CLI版本正在开发中。
+- 我们新建了Telegram群组，欢迎加入！[https://t.me/unlock_music_chat](https://t.me/unlock_music_chat)
 - [其他测试版工具](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7)
-    
-[![Build Status](https://ci.ixarea.com/api/badges/ix64/unlock-music/status.svg)](https://ci.ixarea.com/ix64/unlock-music)
+- [相关的其他项目](https://github.com/ix64/unlock-music/wiki/%E5%92%8CUnlockMusic%E7%9B%B8%E5%85%B3%E7%9A%84%E9%A1%B9%E7%9B%AE)    
+- ![Release and GitHub Pages](https://github.com/ix64/unlock-music/workflows/Release%20and%20GitHub%20Pages/badge.svg)

 # 特性
 ## 支持的格式
 - [x] QQ音乐 (.qmc0/.qmc2/.qmc3/.qmcflac/.qmcogg/[.tkm](https://github.com/ix64/unlock-music/issues/9))
+    - [x] 写入封面图片
 - [x] Moo音乐格式 ([.bkcmp3/.bkcflac](https://github.com/ix64/unlock-music/issues/11))
 - [x] QQ音乐Tm格式 (.tm0/.tm2/.tm3/.tm6)
 - [x] QQ音乐新格式 (实验性支持)
    - [x] .mflac 
    - [x] [.mgg](https://github.com/ix64/unlock-music/issues/3)
 - [x] 网易云音乐格式 (.ncm)
-    - [x] 补全ncm的ID3信息
+    - [x] 补全ncm的ID3/FlacMeta信息
 - [x] 虾米音乐格式 (.xm) (测试阶段)
 - [x] 酷我音乐格式 (.kwm) (测试阶段)
- [ ] 酷狗音乐格式 (.kgm) ([Alpha测试](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
+- [x] 酷狗音乐格式 (.kgm) ([CLI版本](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))

 ## 其他特性
 - [x] 在浏览器中解锁
@@ -33,6 +34,7 @@
 # 使用方法
 ## 使用已构建版本
 - 从[GitHub Release](https://github.com/ix64/unlock-music/releases/latest)下载已构建的版本
+    - 本地使用请下载`legacy版本`（`modern版本`只能通过**http/https协议**访问）
 - 解压缩后即可部署或本地使用（**请勿直接运行源代码**）

 ## 自行构建
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "unlock-music",
-  "version": "1.5.1",
-  "updateInfo": "改善.mgg解锁算法",
+  "version": "1.7.1",
+  "updateInfo": "适配深色模式；修复.ncm解锁的一些问题",
  "license": "MIT",
  "description": "Unlock encrypted music file in browser.",
  "repository": {
@@ -15,23 +15,27 @@
    "fix-compatibility": "node ./src/fix-compatibility.js"
  },
  "dependencies": {
-    "base64-js": "^1.3.1",
+    "base64-js": "^1.5.1",
    "browser-id3-writer": "^4.4.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.8.0",
    "crypto-js": "^4.0.0",
-    "element-ui": "^2.13.0",
+    "element-ui": "^2.14.1",
    "iconv-lite": "^0.5.1",
-    "music-metadata-browser": "^2.0.5",
+    "jimp": "^0.14.0",
+    "metaflac-js": "^1.0.5",
+    "music-metadata-browser": "^2.1.6",
+    "node-sass": "^4.14.1",
    "register-service-worker": "^1.7.1",
-    "vue": "^2.6.11"
+    "sass-loader": "^10.0.2",
+    "vue": "^2.6.12"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.3.0",
-    "@vue/cli-plugin-pwa": "^4.3.0",
-    "@vue/cli-service": "^4.3.0",
+    "@vue/cli-plugin-babel": "^4.5.9",
+    "@vue/cli-plugin-pwa": "^4.5.9",
+    "@vue/cli-service": "^4.5.9",
    "babel-plugin-component": "^1.1.1",
    "vue-cli-plugin-element": "^1.0.1",
-    "vue-template-compiler": "^2.6.11",
-    "workerize-loader": "^1.1.0"
+    "vue-template-compiler": "^2.6.12",
+    "workerize-loader": "^1.3.0"
  }
 }
--- a/public/index.html
+++ b/public/index.html
@@ -13,7 +13,7 @@
    <meta content="音乐,解锁,ncm,qmc,mgg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
    <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
    <!--@formatter:off-->
-    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #3498db;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}#loader-mask{position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,0.88)}</style>
+    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #1db1ff;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}#loader-mask{text-align:center;position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,.88)}@media (prefers-color-scheme:dark){#loader-mask{color:#fff;background-color:rgba(0,0,0,.85)}#loader-mask a{color:#ddd}#loader-mask a:hover{color:#1db1ff}}#loader-source{font-size:1.5rem}#loader-tips-timeout{font-size:1.2rem}</style>
    <!--@formatter:on-->
 </head>
 <body>
@@ -21,18 +21,20 @@
 <div id="loader-mask">
    <div id="loader"></div>
    <noscript>
+        <h3 id="loader-js">请启用JavaScript</h3>
        <img alt=""
             src="https://stats.ixarea.com/ixarea-stats/report?rec=1&action_name=音乐解锁-NoJS&idsite=2"
             style="border:0"/>
    </noscript>
+    <h3 id="loader-source"> 请勿直接运行源代码！ </h3>
    <div hidden id="loader-tips-outdated">
        <h2>您可能在使用不受支持的<span style="color:#f00;">过时</span>浏览器，这可能导致此应用无法正常工作。</h2>
-        <h3>如果您使用双核浏览器，您可以尝试切换<span style="color:#f00;">“极速模式”</span>解决此问题。</h3>
+        <h3>如果您使用双核浏览器，您可以尝试切换到 <span style="color:#f00;">“极速模式”</span> 解决此问题。</h3>
        <h3>或者，您可以尝试更换下方的几个浏览器之一。</h3>
    </div>
    <h3 hidden id="loader-tips-timeout">
        音乐解锁采用了一些新特性！建议使用
-        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Microsoft Edge Chromium</a>
+        <a href="https://www.microsoft.com/zh-cn/edge" target="_blank">Microsoft Edge Chromium</a>
        <a href="https://www.google.cn/chrome/" target="_blank">Google Chrome</a>
        <a href="https://www.firefox.com.cn/" target="_blank">Mozilla Firefox</a>
        | <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
@@ -67,4 +69,4 @@
    })();
 </script>
 </body>
-</html>
+</html>
--- a/public/static/kgm.mask
+++ b/public/static/kgm.mask
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,8 +5,8 @@
            <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>

            <div id="app-control">
-                <el-row style="padding-bottom: 1em; font-size: 14px">
-                    歌曲命名格式：
+                <el-row class="mb-3">
+                    <span>歌曲命名格式：</span>
                    <el-radio label="1" name="format" v-model="download_format">歌手-歌曲名</el-radio>
                    <el-radio label="2" name="format" v-model="download_format">歌曲名</el-radio>
                    <el-radio label="3" name="format" v-model="download_format">歌曲名-歌手</el-radio>
@@ -16,18 +16,16 @@
                    <el-button @click="handleDownloadAll" icon="el-icon-download" plain>下载全部</el-button>
                    <el-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">清除全部</el-button>

-
                    <el-tooltip class="item" effect="dark" placement="top-start">
                        <div slot="content">
                            当您使用此工具进行大量文件解锁的时候，建议开启此选项。<br/>
                            开启后，解锁结果将不会存留于浏览器中，防止内存不足。
                        </div>
-                        <el-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
+                        <el-checkbox border class="ml-2" v-model="instant_download">立即保存</el-checkbox>
                    </el-tooltip>
-
-
                </el-row>
            </div>
+
            <audio :autoplay="playing_auto" :src="playing_url" controls/>

            <x-preview :download_format="download_format" :table-data="tableData"
@@ -41,10 +39,11 @@
                <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
            </el-row>
            <el-row>
-                目前支持网易云音乐(ncm), QQ音乐(qmc, mflac, mgg), 虾米音乐(xm), 酷我音乐(.kwm)
+                目前支持网易云音乐(ncm), QQ音乐(qmc, mflac, mgg), 酷狗音乐(kgm), 虾米音乐(xm), 酷我音乐(.kwm)
                <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">更多</a>。
            </el-row>
            <el-row>
+                <!--如果进行二次开发，此行版权信息不得移除且应明显地标注于页面上-->
                <span>Copyright &copy; 2019-</span><span v-text="(new Date()).getFullYear()"></span> MengYX
                音乐解锁使用
                <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
@@ -61,6 +60,7 @@
    import preview from "./component/preview"
    import {DownloadBlobMusic, RemoveBlobMusic} from "./component/util"
    import config from "../package"
+    import {IXAREA_API_ENDPOINT} from "./decrypt/util";

    export default {
        name: 'app',
@@ -90,7 +90,7 @@
                if (!!mask) mask.remove();
                let updateInfo;
                try {
-                    const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", {
+                    const resp = await fetch(IXAREA_API_ENDPOINT + "/music/app-version", {
                        method: "POST", headers: {"Content-Type": "application/json"},
                        body: JSON.stringify({"Version": this.version})
                    });
@@ -99,15 +99,15 @@
                }
                if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
                    (!!updateInfo.Found && window.location.protocol !== "https:"))) {
-                    this.$notify.warning({
-                        title: '发现更新',
-                        message: '发现新版本 v' + updateInfo.Version +
-                            '<br/>更新详情：' + updateInfo.Detail +
-                            '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
-                        dangerouslyUseHTMLString: true,
-                        duration: 15000,
-                        position: 'top-left'
-                    });
+                  this.$notify.warning({
+                    title: '发现更新',
+                    message: '发现新版本 v' + updateInfo.Version +
+                        '<br/>更新详情：' + updateInfo.Detail +
+                        '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
+                    dangerouslyUseHTMLString: true,
+                    duration: 15000,
+                    position: 'top-left'
+                  });
                } else {
                    this.$notify.info({
                        title: '离线使用',
@@ -176,35 +176,9 @@
                }, 300);
            }
        },
-
    }
-
 </script>

-<style>
-    #app {
-        font-family: "Helvetica Neue", Helvetica, "PingFang SC",
-        "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        text-align: center;
-        color: #2c3e50;
-        padding-top: 30px;
-    }
-
-    #app-footer a {
-        padding-left: 0.2em;
-        padding-right: 0.2em;
-    }
-
-    #app-footer {
-        text-align: center;
-        font-size: small;
-    }
-
-    #app-control {
-        padding-top: 1em;
-        padding-bottom: 1em;
-    }
-
+<style lang="scss">
+   @import "scss/unlock-music";
 </style>
--- a/src/component/preview.vue
+++ b/src/component/preview.vue
@@ -12,7 +12,7 @@
        </el-table-column>
        <el-table-column label="歌曲">
            <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.title }}</span>
+                <span>{{ scope.row.title }}</span>
            </template>
        </el-table-column>
        <el-table-column label="歌手">
--- a/src/component/upload.vue
+++ b/src/component/upload.vue
@@ -47,12 +47,12 @@
                this.idle_workers.push(0);
                // delay to optimize for first loading
                setTimeout(() => {
-                    for (let i = 1; i < this.thread_num; i++) {
-                        // noinspection JSValidateTypes,JSUnresolvedVariable
-                        this.workers.push(worker().CommonDecrypt);
-                        this.idle_workers.push(i);
-                    }
-                }, 1000);
+                  for (let i = 1; i < this.thread_num; i++) {
+                    // noinspection JSValidateTypes,JSUnresolvedVariable
+                    this.workers.push(worker().CommonDecrypt);
+                    this.idle_workers.push(i);
+                  }
+                }, 5000);
            } else {
                const dec = require('../decrypt/common');
                this.workers.push(dec.CommonDecrypt);
--- a/src/decrypt/common.js
+++ b/src/decrypt/common.js
@@ -4,6 +4,7 @@ const XmDecrypt = require("./xm");
 const QmcDecrypt = require("./qmc");
 const RawDecrypt = require("./raw");
 const TmDecrypt = require("./tm");
+const KgmDecrypt = require("./kgm");

 export async function CommonDecrypt(file) {
    let raw_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
@@ -40,18 +41,28 @@ export async function CommonDecrypt(file) {
        case "bkcflac"://Moo Music Flac
        case "mflac"://QQ Music Desktop Flac
        case "mgg": //QQ Music Desktop Ogg
+        case "666c6163"://QQ Music Weiyun Flac
+        case "6d7033"://QQ Music Weiyun Mp3
+        case "6f6767"://QQ Music Weiyun Ogg
+        case "6d3461"://QQ Music Weiyun M4a
+        case "776176"://QQ Music Weiyun Wav
            rt_data = await QmcDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
        case "tm2":// QQ Music IOS M4a
        case "tm6":// QQ Music IOS M4a
            rt_data = await TmDecrypt.Decrypt(file.raw, raw_filename);
            break;
+        case "vpr":
+        case "kgm":
+        case "kgma":
+            rt_data = await KgmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+            break
        default:
            rt_data = {status: false, message: "不支持此文件格式",}
    }

-    rt_data.rawExt = raw_ext;
-    rt_data.rawFilename = raw_filename;
-
+    if (!rt_data.rawExt) rt_data.rawExt = raw_ext;
+    if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename;
+    console.log(rt_data);
    return rt_data;
 }
--- a/src/decrypt/kgm.js
+++ b/src/decrypt/kgm.js
@@ -0,0 +1,120 @@
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
+
+const musicMetadata = require("music-metadata-browser");
+const VprHeader = [
+    0x05, 0x28, 0xBC, 0x96, 0xE9, 0xE4, 0x5A, 0x43,
+    0x91, 0xAA, 0xBD, 0xD0, 0x7A, 0xF5, 0x36, 0x31]
+const KgmHeader = [
+    0x7C, 0xD5, 0x32, 0xEB, 0x86, 0x02, 0x7F, 0x4B,
+    0xA8, 0xAF, 0xA6, 0x8E, 0x0F, 0xFF, 0x99, 0x14]
+const VprMaskDiff = [0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
+    0x2F, 0x80, 0xF3, 0x2D, 0xB8, 0xB6, 0xE3, 0x11,
+    0x00]
+
+export async function Decrypt(file, raw_filename, raw_ext) {
+    try {
+        if (window.location.protocol === "file:") {
+            return {
+                status: false,
+                message: "请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+            }
+        }
+    } catch {
+    }
+    const oriData = new Uint8Array(await GetArrayBuffer(file));
+    if (raw_ext === "vpr") {
+        if (!IsBytesEqual(VprHeader, oriData.slice(0, 0x10)))
+            return {status: false, message: "Not a valid vpr file!"}
+    } else {
+        if (!IsBytesEqual(KgmHeader, oriData.slice(0, 0x10)))
+            return {status: false, message: "Not a valid kgm/kgma file!"}
+    }
+    let bHeaderLen = new DataView(oriData.slice(0x10, 0x14).buffer)
+    let headerLen = bHeaderLen.getUint32(0, true)
+
+    let audioData = oriData.slice(headerLen)
+    let dataLen = audioData.length
+    if (audioData.byteLength > 1 << 26) {
+        return {
+            status: false,
+            message: "文件过大，请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+        }
+    }
+
+    let key1 = new Uint8Array(17)
+    key1.set(oriData.slice(0x1c, 0x2c), 0)
+    if (MaskV2 == null) {
+        if (!await LoadMaskV2()) {
+            return {status: false, message: "加载Kgm/Vpr Mask数据失败"}
+        }
+    }
+
+    for (let i = 0; i < dataLen; i++) {
+        let med8 = key1[i % 17] ^ audioData[i]
+        med8 ^= (med8 & 0xf) << 4
+
+        let msk8 = GetMask(i)
+        msk8 ^= (msk8 & 0xf) << 4
+        audioData[i] = med8 ^ msk8
+    }
+    if (raw_ext === "vpr") {
+        for (let i = 0; i < dataLen; i++) audioData[i] ^= VprMaskDiff[i % 17]
+    }
+
+    const ext = DetectAudioExt(audioData, "mp3");
+    const mime = AudioMimeType[ext];
+    let musicBlob = new Blob([audioData], {type: mime});
+    const musicMeta = await musicMetadata.parseBlob(musicBlob);
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename);
+    const imgUrl = GetMetaCoverURL(musicMeta);
+    return {
+        status: true,
+        title: info.title,
+        artist: info.artist,
+        ext: ext,
+        album: musicMeta.common.album,
+        picture: imgUrl,
+        file: URL.createObjectURL(musicBlob),
+        mime: mime
+    }
+}
+
+function GetMask(pos) {
+    return MaskV2PreDef[pos % 272] ^ MaskV2[pos >> 4]
+}
+
+let MaskV2 = null;
+
+async function LoadMaskV2() {
+    try {
+        let resp = await fetch("./static/kgm.mask", {
+            method: "GET"
+        })
+        MaskV2 = new Uint8Array(await resp.arrayBuffer());
+        return true
+    } catch (e) {
+        console.error(e)
+        return false
+    }
+}
+
+const MaskV2PreDef = [
+    0xB8, 0xD5, 0x3D, 0xB2, 0xE9, 0xAF, 0x78, 0x8C, 0x83, 0x33, 0x71, 0x51, 0x76, 0xA0, 0xCD, 0x37,
+    0x2F, 0x3E, 0x35, 0x8D, 0xA9, 0xBE, 0x98, 0xB7, 0xE7, 0x8C, 0x22, 0xCE, 0x5A, 0x61, 0xDF, 0x68,
+    0x69, 0x89, 0xFE, 0xA5, 0xB6, 0xDE, 0xA9, 0x77, 0xFC, 0xC8, 0xBD, 0xBD, 0xE5, 0x6D, 0x3E, 0x5A,
+    0x36, 0xEF, 0x69, 0x4E, 0xBE, 0xE1, 0xE9, 0x66, 0x1C, 0xF3, 0xD9, 0x02, 0xB6, 0xF2, 0x12, 0x9B,
+    0x44, 0xD0, 0x6F, 0xB9, 0x35, 0x89, 0xB6, 0x46, 0x6D, 0x73, 0x82, 0x06, 0x69, 0xC1, 0xED, 0xD7,
+    0x85, 0xC2, 0x30, 0xDF, 0xA2, 0x62, 0xBE, 0x79, 0x2D, 0x62, 0x62, 0x3D, 0x0D, 0x7E, 0xBE, 0x48,
+    0x89, 0x23, 0x02, 0xA0, 0xE4, 0xD5, 0x75, 0x51, 0x32, 0x02, 0x53, 0xFD, 0x16, 0x3A, 0x21, 0x3B,
+    0x16, 0x0F, 0xC3, 0xB2, 0xBB, 0xB3, 0xE2, 0xBA, 0x3A, 0x3D, 0x13, 0xEC, 0xF6, 0x01, 0x45, 0x84,
+    0xA5, 0x70, 0x0F, 0x93, 0x49, 0x0C, 0x64, 0xCD, 0x31, 0xD5, 0xCC, 0x4C, 0x07, 0x01, 0x9E, 0x00,
+    0x1A, 0x23, 0x90, 0xBF, 0x88, 0x1E, 0x3B, 0xAB, 0xA6, 0x3E, 0xC4, 0x73, 0x47, 0x10, 0x7E, 0x3B,
+    0x5E, 0xBC, 0xE3, 0x00, 0x84, 0xFF, 0x09, 0xD4, 0xE0, 0x89, 0x0F, 0x5B, 0x58, 0x70, 0x4F, 0xFB,
+    0x65, 0xD8, 0x5C, 0x53, 0x1B, 0xD3, 0xC8, 0xC6, 0xBF, 0xEF, 0x98, 0xB0, 0x50, 0x4F, 0x0F, 0xEA,
+    0xE5, 0x83, 0x58, 0x8C, 0x28, 0x2C, 0x84, 0x67, 0xCD, 0xD0, 0x9E, 0x47, 0xDB, 0x27, 0x50, 0xCA,
+    0xF4, 0x63, 0x63, 0xE8, 0x97, 0x7F, 0x1B, 0x4B, 0x0C, 0xC2, 0xC1, 0x21, 0x4C, 0xCC, 0x58, 0xF5,
+    0x94, 0x52, 0xA3, 0xF3, 0xD3, 0xE0, 0x68, 0xF4, 0x00, 0x23, 0xF3, 0x5E, 0x0A, 0x7B, 0x93, 0xDD,
+    0xAB, 0x12, 0xB2, 0x13, 0xE8, 0x84, 0xD7, 0xA7, 0x9F, 0x0F, 0x32, 0x4C, 0x55, 0x1D, 0x04, 0x36,
+    0x52, 0xDC, 0x03, 0xF3, 0xF9, 0x4E, 0x42, 0xE9, 0x3D, 0x61, 0xEF, 0x7C, 0xB6, 0xB3, 0x93, 0x50,
+]
+
--- a/src/decrypt/kwm.js
+++ b/src/decrypt/kwm.js
@@ -1,11 +1,4 @@
-import {
-    AudioMimeType,
-    DetectAudioExt,
-    GetArrayBuffer,
-    GetFileInfo,
-    GetMetaCoverURL,
-    IsBytesEqual
-} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";

 const musicMetadata = require("music-metadata-browser");
 const MagicHeader = [
@@ -21,17 +14,6 @@ export async function Decrypt(file, raw_filename, raw_ext) {

    let fileKey = oriData.slice(0x18, 0x20)
    let mask = createMaskFromKey(fileKey)
-
-    function Uint8ArrayToString(fileData) {
-        var dataString = "";
-        for (var i = 0; i < fileData.length; i++) {
-            dataString += String.fromCharCode(fileData[i]);
-        }
-
-        return dataString
-    }
-
-
    let audioData = oriData.slice(0x400);
    let lenAudioData = audioData.length;
    for (let cur = 0; cur < lenAudioData; ++cur)
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -1,14 +1,26 @@
 const CryptoJS = require("crypto-js");
+const MetaFlac = require('metaflac-js');
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetWebImage, WriteMp3Meta} from "./util"
+const MagicHeader = [0x43, 0x54, 0x45, 0x4E, 0x46, 0x44, 0x41, 0x4D];
+const musicMetadata = require("music-metadata-browser");
+import jimp from 'jimp';
+
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetWebImage,
+    IsBytesEqual,
+    WriteMp3Meta
+} from "./util"

 export async function Decrypt(file, raw_filename, raw_ext) {
    const fileBuffer = await GetArrayBuffer(file);
    const dataView = new DataView(fileBuffer);

-    if (dataView.getUint32(0, true) !== 0x4e455443 ||
-        dataView.getUint32(4, true) !== 0x4d414446)
+    if (!IsBytesEqual(MagicHeader, new Uint8Array(fileBuffer, 0, 8)))
        return {status: false, message: "此ncm文件已损坏"};

    const keyDataObj = getKeyData(dataView, fileBuffer, 10);
@@ -22,22 +34,49 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    let lenAudioData = audioData.length;
    for (let cur = 0; cur < lenAudioData; ++cur) audioData[cur] ^= keyBox[cur & 0xff];

-
    if (musicMeta.album === undefined) musicMeta.album = "";

    const artists = [];
    if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0]));
-    const info = GetFileInfo(artists.join(" & "), musicMeta.musicName, raw_filename);
+    const info = GetFileInfo(artists.join("; "), musicMeta.musicName, raw_filename);
    if (artists.length === 0) artists.push(info.artist);

    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
+    console.log(musicMeta)

    const imageInfo = await GetWebImage(musicMeta.albumPic);
-    if (musicMeta.format === "mp3") audioData = await WriteMp3Meta(
-        audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+    while (!!imageInfo.buffer && imageInfo.buffer.byteLength >= 16 * 1024 * 1024) {
+        let img = await jimp.read(imageInfo.buffer)
+        await img.resize(Math.round(img.getHeight() / 2), jimp.AUTO)
+        imageInfo.buffer = await img.getBufferAsync("image/jpeg")
+    }
+    console.log(imageInfo)
+    const mime = AudioMimeType[musicMeta.format]
+    try {
+        let musicBlob = new Blob([audioData], {type: mime});
+        const originalMeta = await musicMetadata.parseBlob(musicBlob);
+        console.log(originalMeta)
+        let shouldWrite = !originalMeta.common.album && !originalMeta.common.artists && !originalMeta.common.title
+        if (musicMeta.format === "mp3") {
+            audioData = await WriteMp3Meta(
+                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic, shouldWrite ? null : originalMeta)
+        } else if (musicMeta.format === "flac") {
+            const writer = new MetaFlac(Buffer.from(audioData))
+            if (shouldWrite) {
+                writer.setTag("TITLE=" + info.title)
+                writer.setTag("ALBUM=" + musicMeta.album)
+                writer.removeTag("ARTIST")
+                artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+            }
+            writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
+            audioData = writer.save()
+        }
+    } catch (e) {
+        console.warn("Error while appending cover image to file " + e)
+    }
+
+    const musicData = new Blob([audioData], {type: mime})

-    const mime = AudioMimeType[musicMeta.format];
-    const musicData = new Blob([audioData], {type: mime});
    return {
        status: true,
        title: info.title,
@@ -47,7 +86,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        picture: imageInfo.url,
        file: URL.createObjectURL(musicData),
        mime: mime
-    };
+    }
 }


@@ -132,7 +171,9 @@ function getMetaData(dataView, fileBuffer, offset) {
    if (plainText.slice(0, labelIndex) === "dj") {
        result = result.mainMusic;
    }
-    result.albumPic = result.albumPic.replace("http:", "https:");
+    if (!!result.albumPic && result.albumPic !== "")
+        result.albumPic = result.albumPic.replace("http://", "https://") + "?param=500y500";
+
    return {data: result, offset: offset};
 }

--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -1,9 +1,22 @@
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, RequestJsonp} from "./util";
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetMetaCoverURL,
+    GetWebImage,
+    IXAREA_API_ENDPOINT
+} from "./util";
 import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";
-
-
 import {fromByteArray as Base64Encode, toByteArray as Base64Decode} from 'base64-js'

+const MetaFlac = require('metaflac-js');
+
+const ID3Writer = require("browser-id3-writer");
+
+const iconv = require('iconv-lite');
+const decode = iconv.decode
+
 const musicMetadata = require("music-metadata-browser");

 const HandlerMap = {
@@ -16,7 +29,12 @@ const HandlerMap = {
    "qmcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
    "bkcmp3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
    "bkcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
-    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false}
+    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "666c6163": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
+    "6d7033": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "6f6767": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
+    "6d3461": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "776176": {handler: QmcMaskGetDefault, ext: "wav", detect: false}
 };

 export async function Decrypt(file, raw_filename, raw_ext) {
@@ -47,6 +65,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    const musicMeta = await musicMetadata.parseBlob(musicBlob);
    for (let metaIdx in musicMeta.native) {
        if (musicMeta.native[metaIdx].some(item => item.id === "TCON" && item.value === "(12)")) {
+            console.warn("The metadata is using gbk encoding")
            musicMeta.common.artist = decode(musicMeta.common.artist, "gbk");
            musicMeta.common.title = decode(musicMeta.common.title, "gbk");
            musicMeta.common.album = decode(musicMeta.common.album, "gbk");
@@ -60,7 +79,32 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    let imgUrl = GetMetaCoverURL(musicMeta);
    if (imgUrl === "") {
        imgUrl = await queryAlbumCoverImage(info.artist, info.title, musicMeta.common.album);
-        //todo: 解决跨域获取图像的问题
+        if (imgUrl !== "") {
+            const imageInfo = await GetWebImage(imgUrl);
+            if (imageInfo.url !== "") {
+                imgUrl = imageInfo.url
+                try {
+                    if (ext === "mp3") {
+                        let writer = new ID3Writer(musicDecoded)
+                        writer.setFrame('APIC', {
+                            type: 3,
+                            data: imageInfo.buffer,
+                            description: "Cover",
+                        })
+                        writer.addTag();
+                        musicDecoded = writer.arrayBuffer
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    } else if (ext === 'flac') {
+                        const writer = new MetaFlac(Buffer.from(musicDecoded))
+                        writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
+                        musicDecoded = writer.save()
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    }
+                } catch (e) {
+                    console.warn("Error while appending cover image to file " + e)
+                }
+            }
+        }
    }
    return {
        status: true,
@@ -75,7 +119,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
 }

 function reportKeyUsage(keyData, maskData, artist, title, album, filename, format) {
-    fetch("https://stats.ixarea.com/collect/qmcmask/usage", {
+    fetch(IXAREA_API_ENDPOINT + "/qmcmask/usage", {
        method: "POST",
        headers: {"Content-Type": "application/json"},
        body: JSON.stringify({
@@ -87,7 +131,7 @@ function reportKeyUsage(keyData, maskData, artist, title, album, filename, forma

 async function queryKeyInfo(keyData, filename, format) {
    try {
-        const resp = await fetch("https://stats.ixarea.com/collect/qmcmask/query", {
+        const resp = await fetch(IXAREA_API_ENDPOINT + "/qmcmask/query", {
            method: "POST",
            headers: {"Content-Type": "application/json"},
            body: JSON.stringify({Format: format, Key: Base64Encode(keyData), Filename: filename, Type: 44}),
@@ -100,23 +144,21 @@ async function queryKeyInfo(keyData, filename, format) {
 }

 async function queryAlbumCoverImage(artist, title, album) {
-    let song_query_url = "https://c.y.qq.com/soso/fcgi-bin/client_search_cp?n=10&new_json=1&w=" +
-        encodeURIComponent(artist + " " + title + " " + album);
-    let jsonpData;
-    let queriedSong = undefined;
+    const song_query_url = IXAREA_API_ENDPOINT + "/music/qq-cover"
    try {
-        jsonpData = await RequestJsonp(song_query_url, "callback");
-        queriedSong = jsonpData["data"]["song"]["list"][0];
-    } catch (e) {
-    }
-    let imgUrl = "";
-    if (!!queriedSong && !!queriedSong["album"]) {
-        if (queriedSong["album"]["pmid"] !== undefined) {
-            imgUrl = "https://y.gtimg.cn/music/photo_new/T002M000" + queriedSong["album"]["pmid"] + ".jpg"
-        } else if (queriedSong["album"]["id"] !== undefined) {
-            imgUrl = "https://imgcache.qq.com/music/photo/album/" +
-                queriedSong["album"]["id"] % 100 + "/albumpic_" + queriedSong["album"]["id"] + "_0.jpg"
+        const params = {Artist: artist, Title: title, Album: album};
+        let _url = song_query_url + "?";
+        for (let pKey in params) {
+            _url += pKey + "=" + encodeURIComponent(params[pKey]) + "&"
        }
+        const resp = await fetch(_url)
+        if (resp.ok) {
+            let data = await resp.json();
+            return song_query_url + "/" + data.Type + "/" + data.Id
+        }
+
+    } catch (e) {
+        console.log(e);
    }
-    return imgUrl;
+    return "";
 }
--- a/src/decrypt/util.js
+++ b/src/decrypt/util.js
@@ -1,4 +1,5 @@
 const ID3Writer = require("browser-id3-writer");
+const musicMetadata = require("music-metadata-browser");
 export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43];
 export const MP3_HEADER = [0x49, 0x44, 0x33];
 export const OGG_HEADER = [0x4F, 0x67, 0x67, 0x53];
@@ -16,6 +17,7 @@ export const AudioMimeType = {
    wma: "audio/x-ms-wma",
    wav: "audio/x-wav"
 };
+export const IXAREA_API_ENDPOINT = "https://stats.ixarea.com/apis"

 // Also a new draft API: blob.arrayBuffer()
 export async function GetArrayBuffer(blobObject) {
@@ -84,18 +86,32 @@ export async function GetWebImage(pic_url) {
            let buf = await resp.arrayBuffer();
            let objBlob = new Blob([buf], {type: mime});
            let objUrl = URL.createObjectURL(objBlob);
-            return {"buffer": buf, "url": objUrl, "type": mime};
+            return {"buffer": buf, "src": pic_url, "url": objUrl, "type": mime};
        }
    } catch (e) {
    }
-    return {"buffer": null, "url": "", "type": ""}
+    return {"buffer": null, "src": pic_url, "url": "", "type": ""}
 }

-export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
+export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover", originalMeta = null) {
    const writer = new ID3Writer(audioData);
-    writer.setFrame("TPE1", artistList)
-        .setFrame("TIT2", title)
-        .setFrame("TALB", album);
+    if (originalMeta !== null) {
+        artistList = originalMeta.common.artists || artistList
+        title = originalMeta.common.title || title
+        album = originalMeta.common.album || album
+        const frames = originalMeta.native['ID3v2.4'] || originalMeta.native['ID3v2.3'] || originalMeta.native['ID3v2.2'] || []
+        frames.forEach(frame => {
+            if (frame.id !== 'TPE1' && frame.id !== 'TIT2' && frame.id !== 'TALB') {
+                try {
+                    writer.setFrame(frame.id, frame.value)
+                } catch (e) {
+                }
+            }
+        })
+    }
+    writer.setFrame('TPE1', artistList)
+        .setFrame('TIT2', title)
+        .setFrame('TALB', album);
    if (pictureData !== null) {
        writer.setFrame('APIC', {
            type: 3,
@@ -107,20 +123,3 @@ export async function WriteMp3Meta(audioData, artistList, title, album, pictureD
    return writer.arrayBuffer;
 }

-export function RequestJsonp(url, callback_name = "callback") {
-    return new Promise((resolve, reject) => {
-        let node;
-        window[callback_name] = function (data) {
-            delete window[callback_name];
-            if (node.parentNode) node.parentNode.removeChild(node);
-            resolve(data)
-        };
-        node = document.createElement('script');
-        node.type = "text/javascript";
-        node.src = url;
-        node.addEventListener('error', msg => {
-            reject(msg);
-        });
-        document.head.appendChild(node);
-    });
-}
--- a/src/decrypt/xm.js
+++ b/src/decrypt/xm.js
@@ -1,11 +1,4 @@
-import {
-    AudioMimeType,
-    DetectAudioExt,
-    GetArrayBuffer,
-    GetFileInfo,
-    GetMetaCoverURL,
-    IsBytesEqual
-} from "./util";
+import {AudioMimeType, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";

 import {Decrypt as RawDecrypt} from "./raw";

@@ -24,7 +17,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    if (!IsBytesEqual(MagicHeader, oriData.slice(0, 4)) ||
        !IsBytesEqual(MagicHeader2, oriData.slice(8, 12))) {
        if (raw_ext === "xm") {
-            return {status: false, message: "Not a valid xm file!"}
+            return {status: false, message: "此xm文件已损坏"}
        } else {
            return await RawDecrypt(file, raw_filename, raw_ext, true)
        }
@@ -32,29 +25,30 @@ export async function Decrypt(file, raw_filename, raw_ext) {

    let typeText = (new TextDecoder()).decode(oriData.slice(4, 8))
    if (!FileTypeMap.hasOwnProperty(typeText)) {
-        return {status: false, message: "New Xiami file category!"}
+        return {status: false, message: "未知的xm文件类型"}
    }

    let key = oriData[0xf]
-    let dataOffset = oriData[0xc] | oriData[0xd] << 8
+    let dataOffset = oriData[0xc] | oriData[0xd] << 8 | oriData[0xe] << 16
    let audioData = oriData.slice(0x10);
    let lenAudioData = audioData.length;
    for (let cur = dataOffset; cur < lenAudioData; ++cur)
        audioData[cur] = (audioData[cur] - key) ^ 0xff;

-    const ext = DetectAudioExt(audioData, "mp3");
+    const ext = FileTypeMap[typeText];
    const mime = AudioMimeType[ext];
    let musicBlob = new Blob([audioData], {type: mime});

    const musicMeta = await musicMetadata.parseBlob(musicBlob);
    if (ext === "wav") {
        //todo:未知的编码方式
+        console.log(musicMeta.common)
        musicMeta.common.album = "";
        musicMeta.common.artist = "";
        musicMeta.common.title = "";
    }
-
-    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, "_");
+    let _sep = raw_filename.indexOf("_") === -1 ? "-" : "_"
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, _sep);

    const imgUrl = GetMetaCoverURL(musicMeta);

@@ -66,7 +60,8 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        album: musicMeta.common.album,
        picture: imgUrl,
        file: URL.createObjectURL(musicBlob),
-        mime: mime
+        mime: mime,
+        rawExt: "xm"
    }
 }

--- a/src/main.js
+++ b/src/main.js
@@ -2,9 +2,23 @@ import Vue from 'vue'
 import App from './App.vue'
 import './registerServiceWorker'
 import {
-    Button, Col, Container, Footer, Icon, Image, Link, Main,
-    Row, Table, TableColumn, Upload, Radio, Checkbox, Progress,
-    Notification, Tooltip,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Footer,
+    Icon,
+    Image,
+    Link,
+    Main,
+    Notification,
+    Progress,
+    Radio,
+    Row,
+    Table,
+    TableColumn,
+    Tooltip,
+    Upload
 } from 'element-ui';
 import 'element-ui/lib/theme-chalk/base.css';

@@ -27,7 +41,7 @@ Vue.use(Progress);
 Vue.prototype.$notify = Notification;

 Vue.config.productionTip = false;
-
+document.getElementById("loader-source").remove()
 new Vue({
    render: h => h(App),
 }).$mount('#app');
--- a/src/scss/_dark-mode.scss
+++ b/src/scss/_dark-mode.scss
@@ -0,0 +1,166 @@
+/*
+ * name:    样式 - 夜间模式
+ * author:  @KyleBing
+ * date:    2020-11-24
+ */
+
+@media (prefers-color-scheme: dark) {
+  #app{
+    color: $dark-text-info;
+  }
+  body{
+    background-color: $dark-bg;
+  }
+
+  // FORM
+  .el-radio{
+    &__label{
+      color: $dark-text-main;
+    }
+    &__input{
+      color: $dark-text-info;
+      .el-radio__inner{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+      }
+    }
+
+    &.is-checked{
+      .el-radio__inner{
+        background-color: $blue;
+      }
+      .el-radio__label{
+        font-weight: bold;
+      }
+    }
+  }
+
+  .el-checkbox.is-bordered{
+    border-color: $dark-border;
+    .el-checkbox__inner{
+      background-color: $dark-btn-bg;
+      border-color: $dark-border;
+    }
+    &:hover{
+      border-color: $dark-border-highlight;
+      .el-checkbox__inner{
+        background-color: $dark-btn-bg-highlight;
+        border-color: $dark-border-highlight;
+      }
+      .el-checkbox__label{
+        color: $dark-text-info;
+      }
+    }
+    &.is-checked{
+      background-color: $blue;
+      .el-checkbox__inner{
+        border-color: $dark-btn-bg-highlight;
+      }
+      .el-checkbox__label{
+        color: white;
+        font-weight: bold;
+      }
+    }
+  }
+
+
+
+  // BUTTON
+  .el-button{
+    background-color: $dark-btn-bg;
+    border-color: $dark-border;
+    color: $dark-text-main;
+
+    &:active{
+      transform: translateY(2px);
+    }
+
+    &--default{
+      &.is-plain {
+        background-color: $dark-btn-bg;
+        &:hover {
+          background-color: $blue;
+          border-color: $blue;
+          color: white;
+        }
+      }
+    }
+    &--danger{
+      &.is-plain{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+        &:hover{
+          background-color: $red;
+          border-color: $red;
+        }
+      }
+    }
+  }
+
+  // 文件拖放区
+  .el-upload__tip{
+    color: $dark-text-info;
+  }
+  .el-upload-dragger{
+    background-color: $dark-uploader-bg;
+    border-color: $dark-border;
+    .el-upload__text{
+      color: $dark-text-info;
+    }
+    &:hover{
+      background: $dark-uploader-bg-highlight;
+      border-color: $dark-border-highlight;
+    }
+  }
+
+  //TABLE
+  .el-table{
+    background-color: $dark-bg-td;
+    &:before{ // 去除表格末尾的横线
+      content: none;
+    }
+    &__header{
+      th{
+        border-bottom-color: $dark-border !important;
+      }
+    }
+    th{
+      background-color: $dark-bg-th;
+      color: $dark-text-info;
+    }
+    td{
+      border-bottom-color: $dark-border !important;
+    }
+    tr{
+      background-color: $dark-bg-td;
+      color: $dark-text-main;
+      &:hover{
+        td{
+          background-color: $dark-bg-th !important;
+        }
+      }
+    }
+  }
+
+
+  // LINKS
+  a{
+    text-decoration: none;
+    color: darken($dark-color-link, 15%);
+    &:hover{
+      color: $dark-color-link;
+    }
+  }
+
+  // ALERT
+  .el-notification{
+    background-color: $dark-btn-bg-highlight;
+    border-color: $dark-border;
+    &__title{
+      color: white;
+    }
+    &__content{
+      color: $dark-text-info;
+    }
+  }
+}
--- a/src/scss/_gaps.scss
+++ b/src/scss/_gaps.scss
@@ -0,0 +1,18 @@
+/*
+ * 间隔工具集
+ */
+
+$gap: 5px;
+@for $item from 1 through 7 {
+  .mt-#{$item} { margin-top     : $gap * $item !important;}
+  .mb-#{$item} { margin-bottom  : $gap * $item !important;}
+  .ml-#{$item} { margin-left    : $gap * $item !important;}
+  .mr-#{$item} { margin-right   : $gap * $item !important;}
+   .m-#{$item} { margin         : $gap * $item !important;}
+
+  .pt-#{$item} { padding-top    : $gap * $item !important;}
+  .pb-#{$item} { padding-bottom : $gap * $item !important;}
+  .pl-#{$item} { padding-left   : $gap * $item !important;}
+  .pr-#{$item} { padding-right  : $gap * $item !important;}
+   .p-#{$item} { padding        : $gap * $item !important;}
+}
--- a/src/scss/_normal.scss
+++ b/src/scss/_normal.scss
@@ -0,0 +1,38 @@
+body{
+  font-family: $font-family;
+  font-size: $fz-main;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+#app {
+  text-align: center;
+  color: $text-main;
+  padding-top: 30px;
+}
+
+#app-footer a {
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+#app-footer {
+  text-align: center;
+  font-size: small;
+}
+
+#app-control {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+audio{
+  margin-bottom: 15px; // 播放控件与表格间隔
+}
+
+a{
+  color: darken($color-link, 15%);
+  &:hover{
+    color: $color-link;
+  }
+}
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -0,0 +1,28 @@
+// COLORS
+$blue      : #409EFF;
+$red       : #F56C6C;
+$green     : #85ce61;
+
+// TEXT
+$text-main : #2C3E50;
+$color-link: $blue;
+
+$fz-main: 14px;
+
+$font-family: "Helvetica Neue", Helvetica, "PingFang SC",
+"Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+
+
+// DARK MODE
+$dark-border                : lighten(black, 25%);
+$dark-border-highlight      : lighten(black, 55%);
+$dark-bg                    : lighten(black, 10%);
+$dark-text-main             : lighten(black, 90%);
+$dark-text-info             : lighten(black, 60%);
+$dark-uploader-bg           : lighten(black, 13%);
+$dark-uploader-bg-highlight : lighten(black, 18%);
+$dark-btn-bg                : lighten(black, 20%);
+$dark-btn-bg-highlight      : lighten(black, 30%);
+$dark-bg-th                 : lighten(black, 18%);
+$dark-bg-td                 : lighten(black, 13%);
+$dark-color-link            : $green;
--- a/src/scss/unlock-music.scss
+++ b/src/scss/unlock-music.scss
@@ -0,0 +1,5 @@
+@import "variables";
+@import "gaps";
+
+@import "normal";
+@import "dark-mode"; // dark-mode 放在 normal 后面，以获得更高优先级
Author	SHA1	Message	Date
MengYX	8e135f7004	Bump Version and Update Deps	2020-11-26 17:28:14 +08:00
MengYX	0fb30ddc17	Merge pull request #113 from KyleBing/master 调整暗黑模式样式，新增全局统一样式 by @KyleBing	2020-11-26 16:56:44 +08:00
KyleBing	e9a25f3140	^ package-lock.json	2020-11-25 14:47:23 +08:00
KyleBing	5e2f3d36c2	暗黑模式颜色调整，载入页颜色适配黑色	2020-11-25 14:38:29 +08:00
KyleBing	a040c88a07	use scss source file, remove pre-compiled css file.	2020-11-25 13:50:38 +08:00
KyleBing	b370f4ceb6	调整暗黑模式样式，新增全局统一样式	2020-11-24 22:28:56 +08:00
MengYX	bf0df4e68d	Merge pull request #112 from flosacca/master Fix #100 by @flosacca	2020-11-23 21:34:58 +08:00
flosacca	f24ea6a07b	Fix #100	2020-11-21 07:03:57 +08:00
MengYX	c11f3fd130	Update README	2020-11-07 22:46:27 +08:00
MengYX	2ffcbf79b5	Bump Version	2020-11-07 01:22:45 +08:00
MengYX	6a2b98798b	Fix #103 #100 duplicated metadata	2020-11-07 01:12:04 +08:00
MengYX	60e2039e56	Update CI	2020-11-06 22:40:23 +08:00
MengYX	fbdad625c5	Update Deps	2020-11-06 22:40:13 +08:00
MengYX	10814ea109	Merge pull request #106 from lc6464/master 适配浏览器深色模式	2020-11-01 11:40:21 +08:00
NULL-LC	52657046d6	适配浏览器深色模式	2020-10-31 19:25:14 +08:00
MengYX	175112180d	Merge pull request #101 from renbaoshuo/patch-1 更新 Edge 浏览器下载链接	2020-10-30 10:48:45 +08:00
Baoshuo Ren	7b26630428	更新 Edge 浏览器下载链接	2020-10-18 19:02:40 +08:00
MengYX	55b2f17ed7	Bump Version	2020-09-23 16:51:17 +08:00
MengYX	be09790810	Merge pull request #97 from qq1010903229/patch-1 Merge pull request #97 增加对QQ音乐微云网盘格式的支持	2020-09-23 16:45:54 +08:00
MengYX	df2d409351	Fix Kgm Decrypt Bug	2020-09-23 14:15:47 +08:00
MengYX	a558dac34b	Update Deps	2020-09-23 12:55:14 +08:00
MengYX	44642b1c39	Fix kgm bug	2020-09-23 12:54:54 +08:00
qq1010903229	6e66d2da4f	Update qmc.js	2020-09-19 12:03:02 +08:00
qq1010903229	e1cf15cf8c	Update common.js	2020-09-19 12:00:58 +08:00
MengYX	1d415cae52	Add Comment for Issue Template	2020-09-04 19:12:58 +08:00
MengYX	66e2b96bad	Bump Version	2020-09-02 00:04:26 +08:00
MengYX	79c0c85ab3	Merge remote-tracking branch into master	2020-09-01 23:31:43 +08:00
MengYX	ad47a713ad	Add Tips for .kgm while using "file:" protocol	2020-09-01 23:26:02 +08:00
MengYX	6ef0850c40	Use Small Cover Image for .ncm	2020-09-01 23:17:17 +08:00
MengYX	9af2ba5e62	Update README.md	2020-08-15 10:30:13 +08:00
MengYX	0f52c53d6c	fix .xm filename detect	2020-08-13 21:27:50 +08:00
MengYX	24764875f3	Update CI	2020-08-13 21:27:25 +08:00
MengYX	65a41b21c3	Merge remote-tracking branch 'origin/master'	2020-08-13 16:01:55 +08:00
MengYX	b93b93110b	Update GitHub CI	2020-08-13 16:01:35 +08:00
MengYX	7a5cefd950	Bump Version and Update Deps	2020-08-13 15:58:31 +08:00
MengYX	3b885f82ca	Fix .xm read info from filename	2020-08-13 15:33:15 +08:00
MengYX	b6757e81a2	Fix #84	2020-08-13 15:26:15 +08:00
MengYX	8d79035675	Fix .xm file type recognize error	2020-08-13 15:25:41 +08:00
MengYX	6592f304b6	Update issue templates	2020-08-07 19:33:28 +08:00
MengYX	e5bff35f89	Fix ncm cover image too big to write into meta	2020-08-03 15:04:54 +08:00
MengYX	9b28676c43	Clean up	2020-08-03 14:03:10 +08:00
MengYX	4a2d31238b	Fix #79 ncm->flac no metadata (file downloaded from phone)	2020-08-03 14:02:17 +08:00
MengYX	fd2866f53d	Bump Version	2020-08-02 18:25:56 +08:00
MengYX	5e8af22f08	Fix wrong zip file in release [Skip CI]	2020-08-01 01:20:56 +08:00
MengYX	4aa2ff7f91	Fix #77 ncm flac meta duplicated Fix #78 write flac cover sometimes fail	2020-08-01 01:10:27 +08:00
MengYX	c9a4a901be	Update README.md	2020-07-19 00:03:41 +08:00
MengYX	a824bf1f63	Fix GitHub CI	2020-07-18 23:37:07 +08:00
MengYX	bb811178d4	Bump Version	2020-07-18 23:04:26 +08:00
MengYX	c25055f875	Change IXarea Api Endpoint	2020-07-18 22:43:25 +08:00
MengYX	62e36ef228	Change IXarea Api Endpoint	2020-07-18 21:58:07 +08:00
MengYX	438383979d	Add Support qq music cover	2020-07-18 21:45:53 +08:00
MengYX	59d47c755e	Add Support for flac meta/cover	2020-07-18 19:25:41 +08:00
MengYX	e2d4283003	Write meta for qq music mp3	2020-07-18 18:48:07 +08:00
MengYX	6b1c08663a	Resolve QQMusic Cover(By IXarea Server)	2020-07-17 00:33:10 +08:00
MengYX	c338b6ef04	Fix dep security problem	2020-07-16 22:44:42 +08:00
MengYX	c95cfcb984	Update Tips	2020-07-16 22:41:22 +08:00
MengYX	26b6b03ef3	Add Init Support for Kgm/Vpr	2020-07-16 22:22:32 +08:00
MengYX	f548412d8d	Update Deps	2020-07-16 21:28:49 +08:00
MengYX	f8a1ec137c	Update and rename deploy.yml to release.yml	2020-05-28 02:24:32 +08:00
MengYX	8622aef21f	Create GitHub Pages	2020-05-28 00:41:17 +08:00
MengYX	ecff3d34b0	Fix typo #62	2020-05-21 09:36:59 +08:00
MengYX	a140b45e5f	Bump Version & Update Deps	2020-05-18 16:41:10 +08:00
MengYX	d42e6e3259	Add Tips	2020-05-18 16:40:39 +08:00
MengYX	bceabe4fcf	Simplify	2020-05-14 23:46:21 +08:00
MengYX	7b9070f99d	Fix ncm unlock while no album pic #58	2020-05-14 17:37:58 +08:00
MengYX	6410576adb	Fix Xiami return info	2020-05-14 17:36:16 +08:00