Bump Version

Add Local Experimental Support For Mgg

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 多线程 
 
 # 使用方法
 ## 下载已构建版本

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unlock-music",
-  "version": "1.2.0",
+  "version": "1.3.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -9,9 +9,9 @@
   "dependencies": {
     "browser-id3-writer": "^4.3.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"
   },

src/App.vue

@@ -7,13 +7,16 @@
             <el-row id="app-control">
                 <el-row style="padding-bottom: 1em; font-size: 14px">
                     歌曲命名格式：
-                    <el-radio name="format" v-model="download_format" label="1">歌曲名</el-radio>
-                    <el-radio name="format" v-model="download_format" label="2">歌手-歌曲名</el-radio>
-                    <el-radio name="format" v-model="download_format" label="3">歌曲名-歌手</el-radio>
-                    <el-checkbox v-model="instant_download" border>立即保存</el-checkbox>
+                    <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>
-                <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-row>
             <audio :autoplay="playing_auto" :src="playing_url" controls/>
 
@@ -23,18 +26,19 @@
         </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" 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>
-                <span>Copyright &copy; 2019</span>
-                <a href="https://github.com/ix64" target="_blank">MengYX</a>
+                目前支持网易云音乐(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>
-                开放
-                <a href="https://github.com/ix64/unlock-music" target="_blank">源代码</a>
+                开放源代码
             </el-row>
         </el-footer>
     </el-container>
@@ -46,6 +50,7 @@
     import upload from "./component/upload"
     import preview from "./component/preview"
     import {DownloadBlobMusic, RemoveBlobMusic} from "./component/util"
+    import config from "../package"
 
     export default {
         name: 'app',
@@ -55,11 +60,12 @@
         },
         data() {
             return {
+                version: config.version,
                 activeIndex: '1',
                 tableData: [],
                 playing_url: "",
                 playing_auto: false,
-                download_format: '2',
+                download_format: '1',
                 instant_download: false,
             }
         },
@@ -69,18 +75,39 @@
             });
         },
         methods: {
-            finishLoad() {
+            async finishLoad() {
                 const mask = document.getElementById("loader-mask");
                 if (!!mask) 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'
-                });
+                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) {
+                }
+                if (!!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/>最近更新：提供实验性mgg支持' +
+                            '<br/><a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
+                        dangerouslyUseHTMLString: true,
+                        duration: 10000,
+                        position: 'top-left'
+                    });
+                }
             },
             showSuccess(data) {
                 if (data.status) {

src/component/preview.vue

@@ -10,17 +10,17 @@
                 </el-image>
             </template>
         </el-table-column>
-        <el-table-column label="歌曲" sortable>
+        <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="歌手" sortable>
+        <el-table-column label="歌手">
             <template slot-scope="scope">
                 <p>{{ scope.row.artist }}</p>
             </template>
         </el-table-column>
-        <el-table-column label="专辑" sortable>
+        <el-table-column label="专辑">
             <template slot-scope="scope">
                 <p>{{ scope.row.album }}</p>
             </template>

src/component/upload.vue

@@ -27,14 +27,19 @@
         },
         mounted() {
             if (document.location.host !== "" && process.env.NODE_ENV === 'production') {
-                //todo: Fail on Hot Reload
-                const worker = require("workerize-loader!../decrypt/common");
                 this.thread_num = navigator.hardwareConcurrency || 1;
-                for (let i = 0; i < this.thread_num; i++) {
-                    // noinspection JSValidateTypes,JSUnresolvedVariable
-                    this.workers.push(worker().CommonDecrypt);
-                    this.idle_workers.push(i);
-                }
+                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);

src/component/util.js

@@ -2,16 +2,19 @@ export function DownloadBlobMusic(data, format) {
     const a = document.createElement('a');
     a.href = data.file;
     switch (format) {
-        case "1":
-            a.download = data.title + "." + data.ext;
-            break;
         default:
-        case "2":
+        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();

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

src/decrypt/mflac.js

@@ -1,129 +0,0 @@
-const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
-const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43, 0x00];
-
-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"});
-
-    // 读取Meta
-    let tag = await musicMetadata.parseBlob(musicData);
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
-    reportKeyInfo(new Uint8Array(fileBuffer.slice(-0x170)), seed.mask128,
-        info.artist, info.title, tag.common.album, raw_filename);
-
-    // 返回
-    return {
-        status: true,
-        title: info.title,
-        artist: info.artist,
-        ext: 'flac',
-        album: tag.common.album,
-        picture: util.GetCoverURL(tag),
-        file: URL.createObjectURL(musicData),
-        mime: "audio/flac"
-    }
-}
-
-class Mask {
-
-
-    constructor() {
-        this.index = -1;
-        this.mask_index = -1;
-        this.mask128 = new Uint8Array(128);
-        this.mask58_martix = new Uint8Array(56);
-        this.mask58_super1 = 0x00;
-        this.mask58_super2 = 0x00;
-    }
-
-    DetectMask(data) {
-        let search_len = Math.min(0x8000, data.length), mask;
-        for (let block_idx = 0; block_idx < search_len; block_idx += 128) {
-            mask = data.slice(block_idx, block_idx + 128);
-            const mask58 = this.Convert128to58(mask);
-            if (mask58 === undefined) continue;
-
-            if (!FLAC_HEADER.every((val, idx) => {
-                return val === mask[idx] ^ data[idx];
-            })) continue;
-
-            this.mask128 = mask;
-            this.mask58_martix = mask58.matrix;
-            this.mask58_super1 = mask58.super_8_1;
-            this.mask58_super2 = mask58.super_8_2;
-            return true;
-        }
-        return false;
-    }
-
-    Convert128to58(mask128) {
-        const super_8_1 = mask128[0], super_8_2 = mask128[8];
-        let matrix = [];
-        for (let row_idx = 0; row_idx < 8; row_idx++) {
-            const len_start = 16 * row_idx;
-            const len_right_start = 120 - len_start;//16*(8-row_idx-1)+8
-
-            if (mask128[len_start] !== super_8_1 || mask128[len_start + 8] !== super_8_2) {
-                return
-            }
-
-            const row_left = mask128.slice(len_start + 1, len_start + 8);
-            const row_right = mask128.slice(len_right_start + 1, len_right_start + 8).reverse();
-            if (row_left.every((val, idx) => {
-                return row_right[idx] === val
-            })) {
-                matrix.push(row_left);
-            } else {
-                return
-            }
-        }
-        return {matrix, super_8_1, super_8_2}
-    }
-
-    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.mask128[this.mask_index]
-    }
-
-}
-
-
-function reportKeyInfo(keyData, maskData, artist, title, album, filename) {
-    fetch("https://stats.ixarea.com/collect/mflac/mask", {
-        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
-        }),
-    }).then().catch()
-}

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,27 +23,16 @@ 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") {
+    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});
     return {

src/decrypt/qmc.js

@@ -1,87 +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, QmcMaskGetDefault, QmcMaskDetectMgg, QmcMaskDetectMflac} 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!"}
-    }
-    const 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});
-    // 读取Meta
-    const tag = await musicMetadata.parseBlob(musicData);
-    const info = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
+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,
         title: info.title,
         artist: info.artist,
-        ext: new_ext,
+        ext: ext,
         album: tag.common.album,
-        picture: util.GetCoverURL(tag),
+        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) {
+    }
 }

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
+}

src/decrypt/raw.js

@@ -1,19 +1,23 @@
 const musicMetadata = require("music-metadata-browser");
-const util = require("./util");
-export {Decrypt}
+import {GetCoverURL, GetFileInfo, AudioMimeType, DetectAudioExt, GetArrayBuffer} from "./util";
 
-
-async function Decrypt(file, raw_filename, raw_ext) {
+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 = util.GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
+    const info = GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
     return {
         status: true,
         title: info.title,
         artist: info.artist,
-        ext: raw_ext,
+        ext: ext,
         album: tag.common.album,
-        picture: util.GetCoverURL(tag),
+        picture: GetCoverURL(tag),
         file: URL.createObjectURL(file),
-        mime: util.AudioMimeType[raw_ext]
+        mime: AudioMimeType[ext]
     }
 }

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)
 }

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) {
+export function GetFileInfo(artist, title, filenameNoExt) {
     let newArtist = "", newTitle = "";
     let filenameArray = filenameNoExt.split("-");
     if (filenameArray.length > 1) {
@@ -28,19 +30,15 @@ function GetFileInfo(artist, title, filenameNoExt) {
         newTitle = filenameArray[0].trim();
     }
 
-    if (typeof artist == "string" && artist !== "") {
-        newArtist = artist;
-    }
-    if (typeof title == "string" && title !== "") {
-        newTitle = title;
-    }
+    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});
@@ -48,3 +46,21 @@ function GetCoverURL(metadata) {
     }
     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;
+}

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({

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.')

vue.config.js

@@ -1,4 +1,9 @@
 module.exports = {
     publicPath: '',
-    productionSourceMap: true
-};
+    productionSourceMap: true,
+    pwa: {
+        workboxOptions: {
+            skipWaiting: true
+        }
+    }
+};