Bump Version

Add fix-compatibility npm command
Update Dependencies
2020-03-04 09:30:48 +08:00 · 2020-03-04 09:29:05 +08:00 · 2020-03-04 08:37:54 +08:00 · 2020-03-04 08:37:39 +08:00 · 2020-03-04 08:37:16 +08:00 · 2020-03-03 20:01:42 +08:00
22 changed files with 1436 additions and 1100 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,11 +10,12 @@ steps:
  - name: installDependencies
    image: node:lts
    commands:
-      - npm ci
+      - npm ci --verbose --registry=https://registry.npm.taobao.org

  - name: build
    image: node:lts
    commands:
+      - npm run fix-compatibility
      - npm run build
      - tar -czf legacy.tar.gz -C ./dist .
      - npm run build -- --modern
--- a/README.md
+++ b/README.md
@@ -11,15 +11,16 @@
 - [x] QQMusic Format QQ音乐格式 (.qmc0/.qmc3/.qmcflac/.qmcogg/.tkm)
 - [x] MooMusic Format Moo音乐格式 ([.bkcmp3/.bkcflac](https://github.com/ix64/unlock-music/issues/11))
 - [x] QQMusic Tm Format QQ音乐Tm格式 (.tm0/.tm2/.tm3/.tm6)
- [ ] QQMusic New Format QQ音乐新格式
-    - [x] .mflac (Partial 部分支持)
-    - [ ] .mgg
+- [x] QQMusic New Format QQ音乐新格式 (Experimental 实验性支持)
+    - [x] .mflac 
+    - [x] .mgg
 - [x] Netease Format 网易云音乐格式 (.ncm)
 - [x] Drag and Drop 拖放文件
 - [x] Play instantly 在线播放
 - [x] Batch unlocking 批量解锁
 - [x] Progressive Web App 渐进式Web应用
 - [x] Complete ID3 for ncm 补全ncm的ID3信息
+- [x] Multi-threads 多线程 

 # 使用方法
 ## 下载已构建版本
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,11 @@
 module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset'
-  ]
-}
+    presets: [
+        '@vue/app'
+    ],
+    plugins: [
+        ["component", {
+            "libraryName": "element-ui",
+            "styleLibraryName": "theme-chalk"
+        }]
+    ]
+};
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,24 +1,32 @@
 {
  "name": "unlock-music",
-  "version": "1.1.3",
+  "version": "1.3.3",
+  "updateInfo": "支持网易云音乐DJ类型ncm；优化旧浏览器的支持",
+  "license": "MIT",
+  "description": "Unlock encrypted music file in browser.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/ix64/unlock-music"
+  },
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
+    "fix-compatibility": "node ./src/fix-compatibility.js"
  },
  "dependencies": {
-    "browser-id3-writer": "^4.3.0",
+    "browser-id3-writer": "^4.4.0",
    "core-js": "^3.6.4",
-    "crypto-js": "^3.1.9-1",
+    "crypto-js": "^4.0.0",
    "element-ui": "^2.13.0",
-    "music-metadata-browser": "^2.0.3",
+    "music-metadata-browser": "^2.0.4",
    "register-service-worker": "^1.6.2",
    "vue": "^2.6.11"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.2",
-    "@vue/cli-plugin-pwa": "^4.1.2",
-    "@vue/cli-service": "^4.1.2",
+    "@vue/cli-plugin-babel": "^4.2.3",
+    "@vue/cli-plugin-pwa": "^4.2.3",
+    "@vue/cli-service": "^4.2.3",
    "babel-plugin-component": "^1.1.1",
    "vue-cli-plugin-element": "^1.0.1",
    "vue-template-compiler": "^2.6.11",
--- a/public/index.html
+++ b/public/index.html
@@ -2,17 +2,19 @@
 <html lang="zh-CN">
 <head>
    <meta charset="utf-8">
-    <meta content="IE=edge" http-equiv="X-UA-Compatible">
+    <meta content="webkit" name="renderer">
+    <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
    <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <script>var _paq = window._paq || [];
-    _paq.push(['setRequestMethod', 'POST'], ['trackPageView'], ['enableLinkTracking'], ['setSiteId', '2'],
-        ['setTrackerUrl', 'https://stats.ixarea.com/ixarea-stats/report']);
-    </script>
+    <!--@formatter:off-->
+    <script>var _paq=window._paq||[];_paq.push(["setRequestMethod","POST"],["trackPageView"],["enableLinkTracking"],["setSiteId","2"],["setTrackerUrl","https://stats.ixarea.com/ixarea-stats/report"]);</script>
+    <!--@formatter:on-->
    <script async src="https://stats.ixarea.com/ixarea-stats.js"></script>
    <title>音乐解锁 - By IXarea</title>
    <meta content="音乐,解锁,ncm,qmc,qmc0,qmc3,qmcflac,qmcogg,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>
+    <!--@formatter:on-->
 </head>
 <body>

@@ -23,13 +25,46 @@
             src="https://stats.ixarea.com/ixarea-stats/report?idsite=2&rec=1&action_name=音乐解锁+-+By+IXarea"
             style="border:0"/>
    </noscript>
-    <strong>音乐解锁采用了一些新特性！建议使用
+    <div hidden id="loader-tips-outdated">
+        <h2>您可能在使用不受支持的<span style="color:#f00;">过时</span>浏览器，这可能导致此应用无法正常工作。</h2>
+        <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.google.cn/chrome/" target="_blank">Google Chrome</a>
        <a href="https://www.firefox.com.cn/" target="_blank">Mozilla Firefox</a>
-        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Mozilla Firefox</a>
        | <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
-    </strong>
+    </h3>
 </div>
 <div id="app"></div>
+<script>
+    (function () {
+        setTimeout(function () {
+            var ele = document.getElementById("loader-tips-timeout");
+            if (ele != null) {
+                ele.hidden = false;
+            }
+        }, 2000);
+
+        var ua = navigator && navigator.userAgent;
+        var detected = (function () {
+            var m;
+            if (!ua) return true;
+            if (/MSIE |Trident\//.exec(ua)) return true; // no IE
+            m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 16
+            if (m && Number(m[1]) < 16) return true;
+            m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 50
+            if (m && Number(m[1]) < 50) return true;
+            m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 38
+            return m && Number(m[1]) < 38;
+        })();
+        if (detected) {
+            document.getElementById('loader-tips-outdated').hidden = false;
+            document.getElementById("loader-tips-timeout").hidden = false;
+        }
+    })();
+</script>
 </body>
 </html>
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,248 +1,155 @@
 <template>
-    <div id="app">
-        <el-container>
-            <el-main>
-                <el-upload
-                        :auto-upload="false"
-                        :on-change="handleFile"
-                        :show-file-list="false"
-                        action=""
-                        drag
-                        multiple>
-                    <i class="el-icon-upload"/>
-                    <div class="el-upload__text">将文件拖到此处，或<em>点击选择</em></div>
-                    <div class="el-upload__tip" slot="tip">本工具仅在浏览器内对文件进行解锁，无需消耗流量</div>
-                </el-upload>

-                <el-row id="app-control">
-
-                    <el-row style="padding-bottom: 1em; font-size: 14px">
-                        歌曲命名格式：
-                        <el-radio name="format" v-model="format" label="1">歌曲名</el-radio>
-                        <el-radio name="format" v-model="format" label="2">歌手-歌曲名</el-radio>
-                        <el-radio name="format" v-model="format" label="3">歌曲名-歌手</el-radio>
-                        <el-checkbox v-model="instantDownload" border>立即保存</el-checkbox>
-                    </el-row>
+    <el-container id="app">
+        <el-main>
+            <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>

+            <el-row id="app-control">
+                <el-row style="padding-bottom: 1em; font-size: 14px">
+                    歌曲命名格式：
+                    <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>
+                    <el-radio label="4" name="format" v-model="download_format">同原文件名</el-radio>
+                </el-row>
+                <el-row>
                    <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-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
                </el-row>
-                <audio :autoplay="playing_auto" :src="playing_url" controls/>
+            </el-row>
+            <audio :autoplay="playing_auto" :src="playing_url" controls/>

+            <x-preview :download_format="download_format" :table-data="tableData"
+                       v-on:music_changed="changePlaying"></x-preview>

-                <el-table :data="tableData" style="width: 100%">
+        </el-main>
+        <el-footer id="app-footer">
+            <el-row>
+                <a href="https://github.com/ix64/unlock-music" target="_blank">音乐解锁</a>(v<span
+                    v-text="version"></span>)：移除已购音乐的加密保护。
+                <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
+            </el-row>
+            <el-row>
+                目前支持网易云音乐(ncm)、QQ音乐(qmc, mflac, mgg, tkm)以及
+                <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">其他格式</a>。
+            </el-row>
+            <el-row>
+                <span>Copyright &copy; 2019</span> MengYX
+                音乐解锁使用
+                <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
+                开放源代码
+            </el-row>
+        </el-footer>
+    </el-container>

-                    <el-table-column label="封面">
-                        <template slot-scope="scope">
-                            <el-image :src="scope.row.picture" style="width: 100px; height: 100px">
-                                <div class="image-slot el-image__error" slot="error">
-                                    暂无封面
-                                </div>
-                            </el-image>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="歌曲" sortable>
-                        <template slot-scope="scope">
-                            <span style="margin-left: 10px">{{ scope.row.title }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="歌手" sortable>
-                        <template slot-scope="scope">
-                            <p>{{ scope.row.artist }}</p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="专辑" sortable>
-                        <template slot-scope="scope">
-                            <p>{{ scope.row.album }}</p>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作">
-                        <template slot-scope="scope">
-                            <el-button @click="handlePlay(scope.$index, scope.row)"
-                                       circle icon="el-icon-video-play" type="success">
-                            </el-button>
-                            <el-button @click="handleDownload(scope.row)"
-                                       circle icon="el-icon-download">
-                            </el-button>
-                            <el-button @click="handleDelete(scope.$index, scope.row)"
-                                       circle icon="el-icon-delete" type="danger">
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </el-main>
-            <el-footer id="app-footer">
-                <el-row>
-                    音乐解锁：移除已购音乐的加密保护。
-                    目前支持网易云音乐(ncm)、QQ音乐(qmc, mflac, tkm)以及
-                    <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">其他格式</a>。
-                    <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
-                </el-row>
-                <el-row>
-                    <span>Copyright &copy; 2019</span>
-                    <a href="https://github.com/ix64" target="_blank">MengYX</a>
-                    音乐解锁使用
-                    <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
-                    开放
-                    <a href="https://github.com/ix64/unlock-music" target="_blank">源代码</a>
-                </el-row>
-            </el-footer>
-        </el-container>
-    </div>
 </template>

 <script>
-    // 严格模式 用于尾调用优化
-    "use strict";

-    const worker = require("workerize-loader!./decrypt/common");
-    const dec = require('./decrypt/common');
+    import upload from "./component/upload"
+    import preview from "./component/preview"
+    import {DownloadBlobMusic, RemoveBlobMusic} from "./component/util"
+    import config from "../package"
+
    export default {
        name: 'app',
-        components: {},
+        components: {
+            xUpload: upload,
+            xPreview: preview
+        },
        data() {
            return {
+                version: config.version,
                activeIndex: '1',
                tableData: [],
                playing_url: "",
                playing_auto: false,
-                format: '2',
-                instantDownload: false,
-                workCount: 0,
-                cacheQueue: [],
-                cacheQueueOption: {
-                    push: (element) => {
-                        this.cacheQueue.push(element);
-                    },
-                    pop: () => {
-                        return this.cacheQueue.shift();
-                    },
-                    size: () => {
-                        return this.cacheQueue.length;
-                    }
-                },
-                workers: [],
-                idle_workers: [],
-                thread_num: 1
+                download_format: '1',
+                instant_download: false,
            }
        },
-        mounted() {
+        created() {
            this.$nextTick(function () {
                this.finishLoad();
            });
-            if (document.location.host !== "") {
-                this.thread_num = Math.max(navigator.hardwareConcurrency, 1);
-                for (let i = 0; i < this.thread_num; i++) {
-                    this.workers.push(worker().CommonDecrypt);
-                    this.idle_workers.push(i);
-                }
-            } else {
-                this.workers.push(dec.CommonDecrypt);
-                this.idle_workers.push(0)
-            }
        },
        methods: {
-            finishLoad() {
-                document.getElementById("loader-mask").remove();
-                this.$notify.info({
-                    title: '离线使用',
-                    message: '我们使用PWA技术，无网络也能使用<br/>' +
-                        '最近更新：支持bkcmp3/bkcflac/tkm<br/>' +
-                        '点击查看 <a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
-                    dangerouslyUseHTMLString: true,
-                    duration: 10000,
-                    position: 'top-left'
-                });
-            },
-            handleFile(file) {
-                // 有空闲worker 立刻处理文件
-                if (this.idle_workers.length > 0) {
-                    this.handleDoFile(file, this.idle_workers.shift());
+            async finishLoad() {
+                const mask = document.getElementById("loader-mask");
+                if (!!mask) mask.remove();
+                let updateInfo;
+                try {
+                    const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", {
+                        method: "POST", headers: {"Content-Type": "application/json"},
+                        body: JSON.stringify({Version: this.version})
+                    });
+                    updateInfo = await resp.json();
+                } catch (e) {
                }
-                // 无空闲worker 则放入缓存队列
-                else {
-                    this.cacheQueueOption.push(file);
+                if (!!updateInfo && !!updateInfo.Found) {
+                    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: '离线使用',
+                        message: '我们使用PWA技术，无网络也能使用' +
+                            '<br/>最近更新：' + config.updateInfo +
+                            '<br/><a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
+                        dangerouslyUseHTMLString: true,
+                        duration: 10000,
+                        position: 'top-left'
+                    });
                }
            },
-            handleCacheQueue(worker_id) {
-                // 调用方法消费缓存队列中的数据
-                if (this.cacheQueue.length === 0) {
-                    this.idle_workers.push(worker_id);
-                    return
-                }
-                this.handleDoFile(this.cacheQueueOption.pop(), worker_id);
-            },
-            handleDoFile(file, worker_id) {
-                this.workers[worker_id](file).then(data => {
-                    if (data.status) {
-                        if (this.instantDownload) {
-                            this.handleDownload(data);
-                            this.handleDelete(null, data);
-                        } else {
-                            this.tableData.push(data);
-                            this.$notify.success({
-                                title: '解锁成功',
-                                message: '成功解锁 ' + data.title,
-                                duration: 3000
-                            });
-                        }
+            showSuccess(data) {
+                if (data.status) {
+                    if (this.instant_download) {
+                        DownloadBlobMusic(data, this.download_format);
+                        RemoveBlobMusic(data);
+                    } else {
+                        this.tableData.push(data);
+                        this.$notify.success({
+                            title: '解锁成功',
+                            message: '成功解锁 ' + data.title,
+                            duration: 3000
+                        });
+                    }
+                    if (process.env.NODE_ENV === 'production') {
                        let _rp_data = [data.title, data.artist, data.album];
                        window._paq.push(["trackEvent", "Unlock", data.rawExt + "," + data.mime, JSON.stringify(_rp_data)]);
-                    } else {
-                        this.$notify.error({
-                            title: '出现问题',
-                            message: data.message + "，" + file.name +
-                                '，参考<a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
-                            dangerouslyUseHTMLString: true,
-                            duration: 6000
-                        });
-                        window._paq.push(["trackEvent", "Error", data.message, file.name]);
                    }
-                    // 完成之后 执行新任务 todo: 可能导致call stack过长
-                    this.handleCacheQueue(worker_id);
-                }).catch(err => {
-                    console.error(err, file);
-                    window._paq.push(["trackEvent", "Error", err, file.name]);
-                    this.handleCacheQueue(worker_id);
-                })
+                } else {
+                    this.showFail(data.message, data.rawFilename + "." + data.rawExt)
+                }
            },
-            handlePlay(index, row) {
-                this.playing_url = row.file;
+            showFail(errInfo, filename) {
+                this.$notify.error({
+                    title: '出现问题',
+                    message: errInfo + "，" + filename +
+                        '，参考<a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
+                    dangerouslyUseHTMLString: true,
+                    duration: 6000
+                });
+                if (process.env.NODE_ENV === 'production') {
+                    window._paq.push(["trackEvent", "Error", errInfo, filename]);
+                    console.error(errInfo, filename);
+                }
+            },
+            changePlaying(url) {
+                this.playing_url = url;
                this.playing_auto = true;
            },
-            handleDelete(index, row) {
-                URL.revokeObjectURL(row.file);
-                URL.revokeObjectURL(row.picture);
-                if (index != null) {
-                    this.tableData.splice(index, 1);
-                }
-            },
-            handleDownload(row) {
-                let a = document.createElement('a');
-                a.href = row.file;
-                switch (this.format) {
-                    case "1":
-                        a.download = row.title + "." + row.ext;
-                        break;
-                    case "2":
-                        a.download = row.artist + " - " + row.title + "." + row.ext;
-                        break;
-                    case "3":
-                        a.download = row.title + " - " + row.artist + "." + row.ext;
-                        break;
-                    default:
-                        a.download = row.filename;
-                        break;
-                }
-                document.body.append(a);
-                a.click();
-                a.remove();
-            },
            handleDeleteAll() {
                this.tableData.forEach(value => {
-                    URL.revokeObjectURL(value.file);
-                    URL.revokeObjectURL(value.picture);
+                    RemoveBlobMusic(value);
                });
                this.tableData = [];
            },
@@ -250,15 +157,15 @@
                let index = 0;
                let c = setInterval(() => {
                    if (index < this.tableData.length) {
-                        this.handleDownload(this.tableData[index]);
+                        DownloadBlobMusic(this.tableData[index], this.download_format);
                        index++;
                    } else {
                        clearInterval(c);
                    }
-                }, 1000);
-
+                }, 300);
            }
-        }
+        },
+
    }

 </script>
@@ -284,15 +191,9 @@
        font-size: small;
    }

-    /*noinspection CssUnusedSymbol*/
-    .el-upload-dragger {
-        width: 80vw !important;
-    }
-
    #app-control {
        padding-top: 1em;
        padding-bottom: 1em;
    }

-
 </style>
--- a/src/component/preview.vue
+++ b/src/component/preview.vue
@@ -0,0 +1,71 @@
+<template>
+    <el-table :data="tableData" style="width: 100%">
+
+        <el-table-column label="封面">
+            <template slot-scope="scope">
+                <el-image :src="scope.row.picture" style="width: 100px; height: 100px">
+                    <div class="image-slot el-image__error" slot="error">
+                        暂无封面
+                    </div>
+                </el-image>
+            </template>
+        </el-table-column>
+        <el-table-column label="歌曲">
+            <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.title }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="歌手">
+            <template slot-scope="scope">
+                <p>{{ scope.row.artist }}</p>
+            </template>
+        </el-table-column>
+        <el-table-column label="专辑">
+            <template slot-scope="scope">
+                <p>{{ scope.row.album }}</p>
+            </template>
+        </el-table-column>
+        <el-table-column label="操作">
+            <template slot-scope="scope">
+                <el-button @click="handlePlay(scope.$index, scope.row)"
+                           circle icon="el-icon-video-play" type="success">
+                </el-button>
+                <el-button @click="handleDownload(scope.row)"
+                           circle icon="el-icon-download">
+                </el-button>
+                <el-button @click="handleDelete(scope.$index, scope.row)"
+                           circle icon="el-icon-delete" type="danger">
+                </el-button>
+            </template>
+        </el-table-column>
+    </el-table>
+</template>
+
+<script>
+    import {DownloadBlobMusic, RemoveBlobMusic} from './util'
+
+    export default {
+        name: "preview",
+        props: {
+            tableData: {type: Array, required: true},
+            download_format: {type: String, required: true}
+        },
+
+        methods: {
+            handlePlay(index, row) {
+                this.$emit("music_changed", row.file);
+            },
+            handleDelete(index, row) {
+                RemoveBlobMusic(row);
+                this.tableData.splice(index, 1);
+            },
+            handleDownload(row) {
+                DownloadBlobMusic(row, this.download_format)
+            },
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
--- a/src/component/upload.vue
+++ b/src/component/upload.vue
@@ -0,0 +1,87 @@
+<template>
+    <el-upload
+            :auto-upload="false"
+            :on-change="handleFile"
+            :show-file-list="false"
+            action=""
+            drag
+            multiple>
+        <i class="el-icon-upload"/>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击选择</em></div>
+        <div class="el-upload__tip" slot="tip">本工具仅在浏览器内对文件进行解锁，无需消耗流量</div>
+    </el-upload>
+</template>
+
+<script>
+    "use strict";// 严格模式 用于尾调用优化
+
+    export default {
+        name: "upload",
+        data() {
+            return {
+                cacheQueue: [],
+                workers: [],
+                idle_workers: [],
+                thread_num: 1
+            }
+        },
+        mounted() {
+            if (document.location.host !== "" && process.env.NODE_ENV === 'production') {
+                this.thread_num = navigator.hardwareConcurrency || 1;
+                const worker = require("workerize-loader!../decrypt/common");
+                // noinspection JSValidateTypes,JSUnresolvedVariable
+                this.workers.push(worker().CommonDecrypt);
+                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);
+            } else {
+                const dec = require('../decrypt/common');
+                this.workers.push(dec.CommonDecrypt);
+                this.idle_workers.push(0)
+            }
+        },
+        methods: {
+            handleFile(file) {
+                // 有空闲worker 立刻处理文件
+                if (this.idle_workers.length > 0) {
+                    this.handleDoFile(file, this.idle_workers.shift());
+                }
+                // 无空闲worker 则放入缓存队列
+                else {
+                    this.cacheQueue.push(file);
+                }
+            },
+            handleCacheQueue(worker_id) {
+                // 调用方法消费缓存队列中的数据
+                if (this.cacheQueue.length === 0) {
+                    this.idle_workers.push(worker_id);
+                    return
+                }
+                this.handleDoFile(this.cacheQueue.shift(), worker_id);
+            },
+            handleDoFile(file, worker_id) {
+                this.workers[worker_id](file).then(data => {
+                    this.$emit("handle_finish", data);
+                    // 完成之后 执行新任务 todo: 可能导致call stack过长
+                    this.handleCacheQueue(worker_id);
+                }).catch(err => {
+                    this.$emit("handle_error", err, file.name);
+                    this.handleCacheQueue(worker_id);
+                })
+            },
+        }
+    }
+</script>
+
+<style scoped>
+    /*noinspection CssUnusedSymbol*/
+    .el-upload-dragger {
+        width: 80vw !important;
+    }
+</style>
--- a/src/component/util.js
+++ b/src/component/util.js
@@ -0,0 +1,27 @@
+export function DownloadBlobMusic(data, format) {
+    const a = document.createElement('a');
+    a.href = data.file;
+    switch (format) {
+        default:
+        case "1":
+            a.download = data.artist + " - " + data.title + "." + data.ext;
+            break;
+        case "2":
+            a.download = data.title + "." + data.ext;
+            break;
+        case "3":
+            a.download = data.title + " - " + data.artist + "." + data.ext;
+            break;
+        case "4":
+            a.download = data.rawFilename + "." + data.ext;
+            break;
+    }
+    document.body.append(a);
+    a.click();
+    a.remove();
+}
+
+export function RemoveBlobMusic(data) {
+    URL.revokeObjectURL(data.file);
+    URL.revokeObjectURL(data.picture);
+}
--- a/src/decrypt/common.js
+++ b/src/decrypt/common.js
@@ -1,10 +1,8 @@
 const NcmDecrypt = require("./ncm");
 const QmcDecrypt = require("./qmc");
 const RawDecrypt = require("./raw");
-const MFlacDecrypt = require("./mflac");
 const TmDecrypt = require("./tm");

-
 export async function CommonDecrypt(file) {
    let raw_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
    let raw_filename = file.name.substring(0, file.name.lastIndexOf("."));
@@ -30,10 +28,9 @@ export async function CommonDecrypt(file) {
        case "tkm"://QQ Music Accompaniment M4a
        case "bkcmp3"://Moo Music Mp3
        case "bkcflac"://Moo Music Flac
-            rt_data = await QmcDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
-            break;
        case "mflac"://QQ Music Desktop Flac
-            rt_data = await MFlacDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+        case "mgg": //QQ Music Desktop Ogg
+            rt_data = await QmcDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
        case "tm2":// QQ Music IOS M4a
        case "tm6":// QQ Music IOS M4a
@@ -42,9 +39,9 @@ export async function CommonDecrypt(file) {
        default:
            rt_data = {status: false, message: "不支持此文件格式",}
    }
-    if (rt_data.status) {
-        rt_data.rawExt = raw_ext;
-        rt_data.rawFilename = raw_filename;
-    }
+
+    rt_data.rawExt = raw_ext;
+    rt_data.rawFilename = raw_filename;
+
    return rt_data;
 }
--- a/src/decrypt/mflac.js
+++ b/src/decrypt/mflac.js
@@ -1,100 +0,0 @@
-const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
-
-async function Decrypt(file, raw_filename, raw_ext) {
-    // 获取扩展名
-    if (raw_ext !== "mflac") return {
-        status: false,
-        message: "File type is incorrect!",
-    };
-    // 读取文件
-    const fileBuffer = await util.GetArrayBuffer(file);
-    const audioData = new Uint8Array(fileBuffer.slice(0, -0x170));
-    const audioDataLen = audioData.length;
-
-    // 转换数据
-    const seed = new Mask();
-    if (!seed.DetectMask(audioData)) return {
-        status: false,
-        message: "此音乐无法解锁，目前mflac格式不提供完整支持",
-    };
-    for (let cur = 0; cur < audioDataLen; ++cur) {
-        audioData[cur] ^= seed.NextMask();
-    }
-    // 导出
-    const musicData = new Blob([audioData], {type: "audio/flac"});
-    const musicUrl = URL.createObjectURL(musicData);
-
-    // 读取Meta
-    let tag = await musicMetadata.parseBlob(musicData);
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename, "flac");
-    let picUrl = util.GetCoverURL(tag);
-    // 返回
-    return {
-        status: true,
-        filename: info.filename,
-        title: info.title,
-        artist: info.artist,
-        ext: 'flac',
-        album: tag.common.album,
-        picture: picUrl,
-        file: musicUrl,
-        mime: "audio/flac"
-    }
-}
-
-class Mask {
-    FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43, 0x00];
-
-    constructor() {
-        this.index = -1;
-        this.mask_index = -1;
-        this.mask = Array(128).fill(0x00);
-    }
-
-    DetectMask(data) {
-
-        let search_len = data.length - 256, mask;
-        for (let block_idx = 0; block_idx < search_len; block_idx += 128) {
-            let flag = true;
-            mask = data.slice(block_idx, block_idx + 128);
-            let next_mask = data.slice(block_idx + 128, block_idx + 256);
-            for (let idx = 0; idx < 128; idx++) {
-                if (mask[idx] !== next_mask[idx]) {
-                    flag = false;
-                    break;
-                }
-            }
-            if (!flag) continue;
-
-
-            for (let test_idx = 0; test_idx < this.FLAC_HEADER.length; test_idx++) {
-                let p = data[test_idx] ^ mask[test_idx];
-                if (p !== this.FLAC_HEADER[test_idx]) {
-                    flag = false;
-                    debugger;
-                    break;
-                }
-            }
-            if (!flag) continue;
-            this.mask = mask;
-            return true;
-        }
-        return false;
-    }
-
-    NextMask() {
-        this.index++;
-        this.mask_index++;
-        if (this.index === 0x8000 || (this.index > 0x8000 && (this.index + 1) % 0x8000 === 0)) {
-            this.index++;
-            this.mask_index++;
-        }
-        if (this.mask_index >= 128) {
-            this.mask_index -= 128;
-        }
-        return this.mask[this.mask_index]
-    }
-
-}
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -1,15 +1,12 @@
 const CryptoJS = require("crypto-js");
 const ID3Writer = require("browser-id3-writer");
-const util = require("./util");
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer} from "./util"

+export async function Decrypt(file) {

-export {Decrypt};
-
-async function Decrypt(file) {
-
-    const fileBuffer = await util.GetArrayBuffer(file);
+    const fileBuffer = await GetArrayBuffer(file);
    const dataView = new DataView(fileBuffer);

    if (dataView.getUint32(0, true) !== 0x4e455443 ||
@@ -26,40 +23,26 @@ async function Decrypt(file) {
    let audioOffset = musicMetaObj.offset + dataView.getUint32(musicMetaObj.offset + 5, true) + 13;
    let audioData = new Uint8Array(fileBuffer, audioOffset);

-    for (let cur = 0; cur < audioData.length; ++cur) {
-        audioData[cur] ^= keyBox[cur & 0xff];
-    }
+    for (let cur = 0; cur < audioData.length; ++cur) audioData[cur] ^= keyBox[cur & 0xff];

-    if (musicMeta.format === undefined) {
-        const [f, L, a, C] = audioData;
-        if (f === 0x66 && L === 0x4c && a === 0x61 && C === 0x43) {
-            musicMeta.format = "flac";
-        } else {
-            musicMeta.format = "mp3";
-        }
-    }
-    const mime = util.AudioMimeType[musicMeta.format];
+    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
+
+    const mime = AudioMimeType[musicMeta.format];

    const artists = [];
-    musicMeta.artist.forEach(arr => {
-        artists.push(arr[0]);
-    });
-    if (musicMeta.format === "mp3") {
-        audioData = await writeID3(audioData, artists, musicMeta.musicName, musicMeta.album, musicMeta.albumPic)
-    }
+    musicMeta.artist.forEach(arr => artists.push(arr[0]));
+    if (musicMeta.format === "mp3")
+        audioData = await writeID3(audioData, artists, musicMeta.musicName, musicMeta.album, musicMeta.albumPic);

    const musicData = new Blob([audioData], {type: mime});
-    const musicUrl = URL.createObjectURL(musicData);
-    const filename = artists.join(" & ") + " - " + musicMeta.musicName + "." + musicMeta.format;
    return {
        status: true,
-        filename: filename,
        title: musicMeta.musicName,
        artist: artists.join(" & "),
        ext: musicMeta.format,
        album: musicMeta.album,
        picture: musicMeta.albumPic,
-        file: musicUrl,
+        file: URL.createObjectURL(musicData),
        mime: mime
    };
 }
@@ -162,9 +145,12 @@ function getMetaData(dataView, fileBuffer, offset) {
        },
        META_KEY,
        {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}
-    );
-
-    const result = JSON.parse(plainText.toString(CryptoJS.enc.Utf8).slice(6));
+    ).toString(CryptoJS.enc.Utf8);
+    const labelIndex = plainText.indexOf(":");
+    let result = JSON.parse(plainText.slice(labelIndex + 1));
+    if (plainText.slice(0, labelIndex) === "dj") {
+        result = result.mainMusic;
+    }
    result.albumPic = result.albumPic.replace("http:", "https:");
    return {data: result, offset: offset};
 }
--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -1,90 +1,79 @@
-const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
-const SEED_MAP = [
-    [0x4a, 0xd6, 0xca, 0x90, 0x67, 0xf7, 0x52],
-    [0x5e, 0x95, 0x23, 0x9f, 0x13, 0x11, 0x7e],
-    [0x47, 0x74, 0x3d, 0x90, 0xaa, 0x3f, 0x51],
-    [0xc6, 0x09, 0xd5, 0x9f, 0xfa, 0x66, 0xf9],
-    [0xf3, 0xd6, 0xa1, 0x90, 0xa0, 0xf7, 0xf0],
-    [0x1d, 0x95, 0xde, 0x9f, 0x84, 0x11, 0xf4],
-    [0x0e, 0x74, 0xbb, 0x90, 0xbc, 0x3f, 0x92],
-    [0x00, 0x09, 0x5b, 0x9f, 0x62, 0x66, 0xa1]];
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";
+import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";

-const OriginalExtMap = {
-    "qmc0": "mp3",
-    "qmc3": "mp3",
-    "qmcogg": "ogg",
-    "qmcflac": "flac",
-    "bkcmp3": "mp3",
-    "bkcflac": "flac",
-    "tkm": "m4a"
+const musicMetadata = require("music-metadata-browser");
+
+const HandlerMap = {
+    "mgg": {handler: QmcMaskDetectMgg, ext: "ogg", detect: true},
+    "mflac": {handler: QmcMaskDetectMflac, ext: "flac", detect: true},
+    "qmc0": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "qmc3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "qmcogg": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
+    "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}
 };

-async function Decrypt(file, raw_filename, raw_ext) {
-    // 获取扩展名
-    if (!(raw_ext in OriginalExtMap)) {
-        return {status: false, message: "File type is incorrect!"}
-    }
-    let new_ext = OriginalExtMap[raw_ext];
-    const mime = util.AudioMimeType[new_ext];
-    // 读取文件
-    const fileBuffer = await util.GetArrayBuffer(file);
-    const audioData = new Uint8Array(fileBuffer);
-    // 转换数据
-    const seed = new Mask();
-    for (let cur = 0; cur < audioData.length; ++cur) {
-        audioData[cur] ^= seed.NextMask();
-    }
-    // 导出
-    const musicData = new Blob([audioData], {type: mime});
-    const musicUrl = URL.createObjectURL(musicData);
-    // 读取Meta
-    let tag = await musicMetadata.parseBlob(musicData);
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename, new_ext);
-    let picUrl = util.GetCoverURL(tag);
+export async function Decrypt(file, raw_filename, raw_ext) {
+    if (!(raw_ext in HandlerMap)) return {status: false, message: "File type is incorrect!"};
+    const handler = HandlerMap[raw_ext];

-    // 返回
+    const fileData = new Uint8Array(await GetArrayBuffer(file));
+    let audioData, seed, keyData;
+    if (handler.detect) {
+        audioData = fileData.slice(0, -0x170);
+        seed = handler.handler(audioData);
+        keyData = fileData.slice(-0x170);
+        if (seed === undefined) seed = await queryKeyInfo(keyData, raw_filename, raw_ext);
+        if (seed === undefined) return {status: false, message: raw_ext + "格式仅提供实验性支持！"};
+    } else {
+        audioData = fileData;
+        seed = handler.handler(audioData);
+    }
+    const dec = seed.Decrypt(audioData);
+
+    const ext = DetectAudioExt(dec, handler.ext);
+    const mime = AudioMimeType[ext];
+
+    const musicData = new Blob([dec], {type: mime});
+
+    const tag = await musicMetadata.parseBlob(musicData);
+    const info = GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
+    if (handler.detect) reportKeyUsage(keyData, seed.Matrix128,
+        info.artist, info.title, tag.common.album, raw_filename, raw_ext);
    return {
        status: true,
-        filename: info.filename,
        title: info.title,
        artist: info.artist,
-        ext: new_ext,
+        ext: ext,
        album: tag.common.album,
-        picture: picUrl,
-        file: musicUrl,
+        picture: GetCoverURL(tag),
+        file: URL.createObjectURL(musicData),
        mime: mime
    }
 }

-class Mask {
-    constructor() {
-        this.x = -1;
-        this.y = 8;
-        this.dx = 1;
-        this.index = -1;
-    }
-
-    NextMask() {
-        let ret;
-        this.index++;
-        if (this.x < 0) {
-            this.dx = 1;
-            this.y = (8 - this.y) % 8;
-            ret = 0xc3
-        } else if (this.x > 6) {
-            this.dx = -1;
-            this.y = 7 - this.y;
-            ret = 0xd8
-        } else {
-            ret = SEED_MAP[this.y][this.x]
-        }
-        this.x += this.dx;
-        if (this.index === 0x8000 || (this.index > 0x8000 && (this.index + 1) % 0x8000 === 0)) {
-            return this.NextMask()
-        }
-        return ret
-    }
-
+function reportKeyUsage(keyData, maskData, artist, title, album, filename, format) {
+    fetch("https://stats.ixarea.com/collect/qmcmask/usage", {
+        method: "POST",
+        headers: {"Content-Type": "application/json"},
+        body: JSON.stringify({
+            Mask: Array.from(maskData), Key: Array.from(keyData),
+            Artist: artist, Title: title, Album: album, Filename: filename, Format: format
+        }),
+    }).then().catch()
+}
+
+async function queryKeyInfo(keyData, filename, format) {
+    try {
+        const resp = await fetch("https://stats.ixarea.com/collect/qmcmask/query", {
+            method: "POST",
+            headers: {"Content-Type": "application/json"},
+            body: JSON.stringify({Format: format, Key: Array.from(keyData), Filename: filename}),
+        });
+        let data = await resp.json();
+        return QmcMaskCreate58(data.Matrix58, data.Super58A, data.Super58B);
+    } catch (e) {
+    }
 }
--- a/src/decrypt/qmcMask.js
+++ b/src/decrypt/qmcMask.js
@@ -0,0 +1,202 @@
+import {FLAC_HEADER, IsBytesEqual} from "./util"
+
+const QMOggConstHeader = [
+    0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1E, 0x01, 0x76, 0x6F, 0x72,
+    0x62, 0x69, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x44, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xEE, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x01, 0x4F, 0x67, 0x67, 0x53, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x03, 0x76, 0x6F, 0x72, 0x62, 0x69, 0x73, 0x2C, 0x00, 0x00, 0x00,
+    0x58, 0x69, 0x70, 0x68, 0x2E, 0x4F, 0x72, 0x67, 0x20, 0x6C, 0x69, 0x62, 0x56, 0x6F, 0x72, 0x62,
+    0x69, 0x73, 0x20, 0x49, 0x20, 0x32, 0x30, 0x31, 0x35, 0x30, 0x31, 0x30, 0x35, 0x20, 0x28, 0xE2,
+    0x9B, 0x84, 0xE2, 0x9B, 0x84, 0xE2, 0x9B, 0x84, 0xE2, 0x9B, 0x84, 0x29, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x54, 0x49, 0x54, 0x4C, 0x45, 0x3D];
+const QMOggConstHeaderConfidence = [
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0,
+    0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 6, 3, 3, 3, 3, 6, 6, 6, 6,
+    3, 3, 3, 3, 6, 6, 6, 6, 6, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9,
+    0, 0, 0, 0, 6, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    3, 3, 3, 3, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 1, 9, 9,
+    0, 1, 9, 9, 9, 9, 9, 9, 9, 9];
+const QMCDefaultMaskMatrix = [
+    0x4A, 0xD6, 0xCA, 0x90, 0x67, 0xF7, 0x52, 0x5E,
+    0x95, 0x23, 0x9F, 0x13, 0x11, 0x7E, 0x47, 0x74,
+    0x3D, 0x90, 0xAA, 0x3F, 0x51, 0xC6, 0x09, 0xD5,
+    0x9F, 0xFA, 0x66, 0xF9, 0xF3, 0xD6, 0xA1, 0x90,
+    0xA0, 0xF7, 0xF0, 0x1D, 0x95, 0xDE, 0x9F, 0x84,
+    0x11, 0xF4, 0x0E, 0x74, 0xBB, 0x90, 0xBC, 0x3F,
+    0x92, 0x00, 0x09, 0x5B, 0x9F, 0x62, 0x66, 0xA1];
+const QMCDefaultMaskSuperA = 0xC3;
+const QMCDefaultMaskSuperB = 0xD8;
+
+class QmcMask {
+    constructor(matrix, superA, superB) {
+        if (superA === undefined || superB === undefined) {
+            this.Matrix128 = matrix;
+            this.generateMask58from128()
+        } else {
+            this.Matrix58 = matrix;
+            this.Super58A = superA;
+            this.Super58B = superB;
+            this.generateMask128from58();
+        }
+    }
+
+    generateMask128from58() {
+        if (this.Matrix58.length !== 56) throw "incorrect mask58 matrix length";
+
+        let matrix128 = [];
+        for (let rowIdx = 0; rowIdx < 8; rowIdx += 1) {
+            matrix128 = matrix128.concat(
+                [this.Super58A],
+                this.Matrix58.slice(7 * rowIdx, 7 * rowIdx + 7),
+                [this.Super58B],
+                this.Matrix58.slice(56 - 7 - 7 * rowIdx, 56 - 7 * rowIdx).reverse()
+            );
+        }
+        this.Matrix128 = matrix128;
+    }
+
+    generateMask58from128() {
+        if (this.Matrix128.length !== 128) throw "incorrect mask128 length";
+
+        const superA = this.Matrix128[0], superB = this.Matrix128[8];
+        let matrix58 = [];
+
+        for (let rowIdx = 0; rowIdx < 8; rowIdx += 1) {
+            let lenStart = 16 * rowIdx;
+            let lenRightStart = 120 - lenStart;
+            if (this.Matrix128[lenStart] !== superA || this.Matrix128[lenStart + 8] !== superB) {
+                throw "decode mask-128 to mask-58 failed"
+            }
+            let rowLeft = this.Matrix128.slice(lenStart + 1, lenStart + 8);
+            let rowRight = this.Matrix128.slice(lenRightStart + 1, lenRightStart + 8).reverse();
+            if (IsBytesEqual(rowLeft, rowRight)) {
+                matrix58 = matrix58.concat(rowLeft);
+            } else {
+                throw "decode mask-128 to mask-58 failed"
+            }
+        }
+        this.Matrix58 = matrix58;
+        this.Super58A = superA;
+        this.Super58B = superB;
+    }
+
+    Decrypt(data) {
+        let dst = data.slice(0);
+        let index = -1;
+        let maskIdx = -1;
+        for (let cur = 0; cur < data.length; cur++) {
+            index++;
+            maskIdx++;
+            if (index === 0x8000 || (index > 0x8000 && (index + 1) % 0x8000 === 0)) {
+                index++;
+                maskIdx++;
+            }
+            if (maskIdx >= 128) maskIdx -= 128;
+            dst[cur] ^= this.Matrix128[maskIdx];
+        }
+        return dst;
+    }
+}
+
+export function QmcMaskGetDefault() {
+    return new QmcMask(QMCDefaultMaskMatrix, QMCDefaultMaskSuperA, QMCDefaultMaskSuperB)
+}
+
+export function QmcMaskDetectMflac(data) {
+    let search_len = Math.min(0x8000, data.length), mask;
+    for (let block_idx = 0; block_idx < search_len; block_idx += 128) {
+        try {
+            mask = new QmcMask(data.slice(block_idx, block_idx + 128));
+            if (IsBytesEqual(FLAC_HEADER, mask.Decrypt(data.slice(0, FLAC_HEADER.length)))) break;
+        } catch (e) {
+        }
+    }
+    return mask
+}
+
+export function QmcMaskDetectMgg(input) {
+    if (input.length < QMOggConstHeader.length) return;
+    let matrixConfidence = {};
+    for (let i = 0; i < 58; i++) matrixConfidence[i] = {};
+
+    for (let idx128 = 0; idx128 < QMOggConstHeader.length; idx128++) {
+        if (QMOggConstHeaderConfidence[idx128] === 0) continue;
+        let idx58 = GetMask58Index(idx128);
+        let mask = input[idx128] ^ QMOggConstHeader[idx128];
+        let confidence = QMOggConstHeaderConfidence[idx128];
+        if (mask in matrixConfidence[idx58]) {
+            matrixConfidence[idx58][mask] += confidence
+        } else {
+            matrixConfidence[idx58][mask] = confidence
+        }
+    }
+    let matrix = [], superA, superB;
+    try {
+        for (let i = 0; i < 56; i++) matrix[i] = getMaskConfidenceResult(matrixConfidence[i]);
+        superA = getMaskConfidenceResult(matrixConfidence[56]);
+        superB = getMaskConfidenceResult(matrixConfidence[57]);
+    } catch (e) {
+        return;
+    }
+    return new QmcMask(matrix, superA, superB);
+}
+
+export function QmcMaskCreate128(mask128) {
+    return new QmcMask(mask128)
+}
+
+export function QmcMaskCreate58(matrix, superA, superB) {
+    return new QmcMask(matrix, superA, superB)
+}
+
+/**
+ * @param confidence {{}}
+ * @returns {number}
+ */
+function getMaskConfidenceResult(confidence) {
+    if (confidence.length === 0) throw "can not match at least one key";
+    let result, conf = 0;
+    for (let idx in confidence) {
+        if (confidence[idx] > conf) {
+            result = idx;
+            conf = confidence[idx];
+        }
+    }
+    return parseInt(result)
+}
+
+/**
+ * @return {number}
+ */
+function GetMask58Index(idx128) {
+    if (idx128 > 127) idx128 = idx128 % 128;
+    let col = idx128 % 16;
+    let row = (idx128 - col) / 16;
+    switch (col) {
+        case 0://Super 1
+            row = 8;
+            col = 0;
+            break;
+        case 8://Super 2
+            row = 8;
+            col = 1;
+            break;
+        default:
+            if (col > 7) {
+                row = 7 - row;
+                col = 15 - col;
+            } else {
+                col -= 1;
+            }
+            break;
+    }
+    return row * 7 + col
+}
--- a/src/decrypt/raw.js
+++ b/src/decrypt/raw.js
@@ -1,26 +1,23 @@
 const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
-
-
-async function Decrypt(file, raw_filename, raw_ext) {
-    let tag = await musicMetadata.parseBlob(file);
-
-    let fileUrl = URL.createObjectURL(file);
-
-    const picUrl = util.GetCoverURL(tag);
-    const mime = util.AudioMimeType[raw_ext];
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename, raw_ext);
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";

+export async function Decrypt(file, raw_filename, raw_ext, detect = true) {
+    let ext = raw_ext;
+    if (detect) {
+        const buffer = new Uint8Array(await GetArrayBuffer(file));
+        ext = DetectAudioExt(buffer, raw_ext);
+        if (ext !== raw_ext) file = new Blob([buffer], {type: AudioMimeType[ext]})
+    }
+    const tag = await musicMetadata.parseBlob(file);
+    const info = GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
    return {
        status: true,
-        filename: info.filename,
        title: info.title,
        artist: info.artist,
-        ext: raw_ext,
+        ext: ext,
        album: tag.common.album,
-        picture: picUrl,
-        file: fileUrl,
-        mime: mime
+        picture: GetCoverURL(tag),
+        file: URL.createObjectURL(file),
+        mime: AudioMimeType[ext]
    }
 }
--- a/src/decrypt/tm.js
+++ b/src/decrypt/tm.js
@@ -1,14 +1,14 @@
-const rawDecrypt = require("./raw");
-const util = require("./util");
-export {Decrypt}
-const header = [0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70];
+import {Decrypt as RawDecrypt} from "./raw";
+import {GetArrayBuffer} from "./util";

-async function Decrypt(file, raw_filename) {
-    const fileBuffer = await util.GetArrayBuffer(file);
+const TM_HEADER = [0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70];
+
+export async function Decrypt(file, raw_filename) {
+    const fileBuffer = await GetArrayBuffer(file);
    const audioData = new Uint8Array(fileBuffer);
    for (let cur = 0; cur < 8; ++cur) {
-        audioData[cur] = header[cur];
+        audioData[cur] = TM_HEADER[cur];
    }
    const musicData = new Blob([audioData], {type: "audio/mp4"});
-    return await rawDecrypt.Decrypt(musicData, raw_filename, "m4a")
+    return await RawDecrypt(musicData, raw_filename, "m4a", false)
 }
--- a/src/decrypt/util.js
+++ b/src/decrypt/util.js
@@ -1,7 +1,16 @@
-export {GetArrayBuffer, GetFileInfo, GetCoverURL, AudioMimeType}
+export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43];
+export const MP3_HEADER = [0x49, 0x44, 0x33];
+export const OGG_HEADER = [0x4F, 0x67, 0x67, 0x53];
+export const M4A_HEADER = [0x66, 0x74, 0x79, 0x70];
+export const AudioMimeType = {
+    mp3: "audio/mpeg",
+    flac: "audio/flac",
+    m4a: "audio/mp4",
+    ogg: "audio/ogg"
+};

 // Also a new draft API: blob.arrayBuffer()
-async function GetArrayBuffer(blobObject) {
+export async function GetArrayBuffer(blobObject) {
    return await new Promise(resolve => {
        const reader = new FileReader();
        reader.onload = (e) => {
@@ -11,14 +20,7 @@ async function GetArrayBuffer(blobObject) {
    });
 }

-const AudioMimeType = {
-    mp3: "audio/mpeg",
-    flac: "audio/flac",
-    m4a: "audio/mp4",
-    ogg: "audio/ogg"
-};
-
-function GetFileInfo(artist, title, filenameNoExt, ext) {
+export function GetFileInfo(artist, title, filenameNoExt) {
    let newArtist = "", newTitle = "";
    let filenameArray = filenameNoExt.split("-");
    if (filenameArray.length > 1) {
@@ -28,24 +30,37 @@ function GetFileInfo(artist, title, filenameNoExt, ext) {
        newTitle = filenameArray[0].trim();
    }

-    if (typeof artist == "string" && artist !== "") {
-        newArtist = artist;
-    }
-    if (typeof title == "string" && title !== "") {
-        newTitle = title;
-    }
-    let newFilename = newArtist + " - " + newTitle + "." + ext;
-    return {artist: newArtist, title: newTitle, filename: newFilename};
+    if (typeof artist == "string" && artist !== "") newArtist = artist;
+    if (typeof title == "string" && title !== "") newTitle = title;
+    return {artist: newArtist, title: newTitle};
 }

 /**
 * @return {string}
 */
-function GetCoverURL(metadata) {
+export function GetCoverURL(metadata) {
    let pic_url = "";
    if (metadata.common.picture !== undefined && metadata.common.picture.length > 0) {
        let pic = new Blob([metadata.common.picture[0].data], {type: metadata.common.picture[0].format});
        pic_url = URL.createObjectURL(pic);
    }
    return pic_url;
-}
+}
+
+export function IsBytesEqual(first, second) {
+    // if want wholly check, should length first>=second
+    return first.every((val, idx) => {
+        return val === second[idx];
+    })
+}
+
+/**
+ * @return {string}
+ */
+export function DetectAudioExt(data, fallbackExt) {
+    if (IsBytesEqual(MP3_HEADER, data.slice(0, MP3_HEADER.length))) return "mp3";
+    if (IsBytesEqual(FLAC_HEADER, data.slice(0, FLAC_HEADER.length))) return "flac";
+    if (IsBytesEqual(OGG_HEADER, data.slice(0, OGG_HEADER.length))) return "ogg";
+    if (IsBytesEqual(M4A_HEADER, data.slice(4, 8))) return "m4a";
+    return fallbackExt;
+}
--- a/src/fix-compatibility.js
+++ b/src/fix-compatibility.js
@@ -0,0 +1,25 @@
+//TODO: Use other method to fix this
+// !! Only Temporary Solution
+// it seems like that @babel/plugin-proposal-object-rest-spread not working
+// to fix up the compatibility for Edge 18 and some older Chromium
+// now manually edit the dependency files
+
+const fs = require('fs');
+const filePath = "./node_modules/file-type/core.js";
+const regReplace = /{\s*([a-zA-Z0-9:,\s]*),\s*\.\.\.([a-zA-Z0-9]*)\s*};/m;
+if (fs.existsSync(filePath)) {
+    console.log("File Found!");
+    let data = fs.readFileSync(filePath).toString();
+    const regResult = regReplace.exec(data);
+    if (regResult != null) {
+        data = data.replace(regResult[0],
+            "Object.assign({ " + regResult[1] + " }, " + regResult[2] + ");"
+        );
+        fs.writeFileSync(filePath, data);
+        console.log("Object rest spread in file-type fixed!");
+    } else {
+        console.log("No fix needed.");
+    }
+} else {
+    console.log("File Not Found!");
+}
--- a/src/main.js
+++ b/src/main.js
@@ -2,21 +2,9 @@ import Vue from 'vue'
 import App from './App.vue'
 import './registerServiceWorker'
 import {
-    Button,
-    Col,
-    Container,
-    Footer,
-    Icon,
-    Image,
-    Link,
-    Main,
+    Button, Col, Container, Footer, Icon, Image, Link, Main,
+    Row, Table, TableColumn, Upload, Radio, Checkbox,
    Notification,
-    Row,
-    Table,
-    TableColumn,
-    Upload,
-    Radio,
-    Checkbox
 } from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css'

@@ -36,7 +24,6 @@ Vue.use(Checkbox);
 Vue.use(Radio);
 Vue.prototype.$notify = Notification;

-// only if your build system can import css, otherwise import it wherever you would import your css.
 Vue.config.productionTip = false;

 new Vue({
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -20,7 +20,8 @@ if (process.env.NODE_ENV === 'production') {
            console.log('New content is downloading.')
        },
        updated() {
-            console.log('New content is available; please refresh.')
+            console.log('New content is available.');
+            window.location.reload();
        },
        offline() {
            console.log('No internet connection found. App is running in offline mode.')
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,4 +1,9 @@
 module.exports = {
    publicPath: '',
-    productionSourceMap: true
-};
+    productionSourceMap: true,
+    pwa: {
+        workboxOptions: {
+            skipWaiting: true
+        }
+    }
+};
Author	SHA1	Message	Date
MengYX	97ca09dbae	Bump Version	2020-03-04 09:30:48 +08:00
MengYX	e78118b4d0	Add fix-compatibility npm command	2020-03-04 09:29:05 +08:00
MengYX	37c60caa06	Update Dependencies	2020-03-04 08:37:54 +08:00
MengYX	fba020969b	Update Babel config	2020-03-04 08:37:39 +08:00
MengYX	790715726a	Add temporary solution to fix compatibility for Edge 18	2020-03-04 08:37:16 +08:00
MengYX	4ca45e1233	Merge branch 'pull/22'	2020-03-03 20:01:42 +08:00
MengYX	cfacb77d15	Optimize loader tips for outdated browser	2020-03-03 20:00:44 +08:00
任宝硕	5f7461e8aa	Update index.html	2020-03-03 16:41:45 +08:00
MengYX	aa98ec422c	Reformat Code	2020-03-01 23:36:16 +08:00
MengYX	d2ec667c19	Fix Update Check	2020-03-01 23:34:24 +08:00
任宝硕	94ee8eb3bd	Update index.html	2020-03-01 16:16:34 +08:00
任宝硕	c13f7fcced	对部分老旧浏览器进行显示调整 + 部分内容修复	2020-03-01 16:14:43 +08:00
MengYX	1d83898f08	#20 Add Support For Netease DJ Files	2020-02-29 19:52:41 +08:00
MengYX	98ca5bc8ff	Bump Version	2020-02-23 13:52:03 +08:00
MengYX	984b549448	#19 Add Download Type: Origin Filename	2020-02-23 13:45:30 +08:00
MengYX	9fd7177ebb	Add Update Check	2020-02-23 13:44:19 +08:00
MengYX	f7d19e62fd	Immediately Load Latest App	2020-02-23 13:42:50 +08:00
MengYX	86d59f4e6f	Update Dependencies	2020-02-23 13:42:20 +08:00
MengYX	3906572723	Optimize UI	2020-02-23 13:41:39 +08:00
MengYX	179f72687a	Fix Decrypt Mflac Error	2020-02-12 23:04:48 +08:00
MengYX	ce251e3c9e	Fix Decrypt Algorithm Error	2020-02-11 17:03:46 +08:00
MengYX	cc8e818142	Optimize Loading	2020-02-11 16:35:45 +08:00
MengYX	f99e885d9f	Fix Mgg Mask Detect Bug	2020-02-11 16:23:50 +08:00
MengYX	58d9039960	Update README and Bump Version	2020-02-11 16:00:34 +08:00
MengYX	c314a251c2	Add Detect Media Type by File	2020-02-11 15:52:22 +08:00
MengYX	10f09958c4	Optimize Import	2020-02-11 14:48:27 +08:00
MengYX	41a45176be	Use Universal Decoder for Qmc,Mgg,Mflac	2020-02-11 14:35:17 +08:00
MengYX	47cea6eae9	Use Universal Mask for Qmc,Mgg,Mflac Add Local Experimental Support For Mgg	2020-02-11 00:34:26 +08:00
MengYX	2fc9368a92	Add Experimental Support For Mgg	2020-02-10 20:10:48 +08:00
MengYX	4e1bfb0b55	Bump Version	2020-02-09 15:16:23 +08:00
MengYX	27b74ea5dd	Better Way to Detect Mflac Mask	2020-02-09 14:05:40 +08:00
MengYX	9aab7a7713	Adjust for Debugging	2020-02-07 20:17:45 +08:00
MengYX	dcde0d3fbb	Fix Babel Config	2020-02-07 14:41:21 +08:00
MengYX	0c0299d63a	Remove Useless Information	2020-02-06 16:18:40 +08:00
MengYX	3ee9f5d2d1	Split App.vue	2020-02-06 16:01:35 +08:00
MengYX	e3ca175258	Optimize Bundle Size	2020-02-06 14:05:46 +08:00