Merge branch 'ix-master'

# Conflicts:
#	src/App.vue

.drone.yml

@@ -7,34 +7,27 @@ clone:
   depth: 1
 
 steps:
-  - name: restore-cache
-    image: drillster/drone-volume-cache
-    volumes:
-      - name: cache
-        path: /cache
-    settings:
-      restore: true
-      mount:
-        - ./node_modules
-
   - name: installDependencies
     image: node:lts
     commands:
-      - npm config set registry http://registry.npm.taobao.org --global
+      - npm ci
-      - npm install
 
   - name: build
     image: node:lts
     commands:
+      - npm run build
+      - tar -czf legacy.tar.gz -C ./dist .
       - npm run build -- --modern
-      - tar -czf dist.tar.gz ./dist/*
+      - tar -czf morden.tar.gz -C ./dist .
+
 
   - name: release
     image: plugins/gitea-release
     settings:
       base_url: https://git.ixarea.com
       files:
-        - dist.tar.gz
+        - morden.tar.gz
+        - legacy.tar.gz
       api_key:
         from_secret: gitea_token
       checksum:
@@ -51,20 +44,21 @@ steps:
       secret_key:
         from_secret: aws_secret_access_key
       source: dist/**/*
-      target: /
+      strip_prefix: dist/
+      target: /public
       path_style: true
       endpoint: https://fs.sz2.ixarea.com
 
-  - name: rebuild-cache
+
-    image: drillster/drone-volume-cache
+  - name: upload
-    volumes:
+    image: plugins/s3
-      - name: cache
-        path: /cache
     settings:
-      rebuild: true
+      bucket: unlock-music
-      mount:
+      access_key:
-        - ./node_modules
+        from_secret: aws_access_key_id
-volumes:
+      secret_key:
-  - name: cache
+        from_secret: aws_secret_access_key
-    host:
+      source: ./*.tar.gz
-      path: /tmp/cache
+      target: /build/${DRONE_BUILD_NUMBER}
+      path_style: true
+      endpoint: https://fs.sz2.ixarea.com

README.md

@@ -1,13 +1,16 @@
 # Unlock Music 音乐解锁
 - Unlock encrypted music file in browser. 
 - 在浏览器中解锁加密的音乐文件。
-- [Online Demo](https://tool.ixarea.com/music)
+- unlock-music项目是以学习和技术研究的初衷创建的。
+- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务。
 
 [![Build Status](https://ci.ixarea.com/api/badges/ix64/unlock-music/status.svg)](https://ci.ixarea.com/ix64/unlock-music)
 
 # Features
 - [x] Unlock in browser 在浏览器中解锁
-- [x] QQMusic File QQ音乐格式 (.qmc0/.qmc3/.qmcflac/.qmcogg)
+- [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
@@ -17,7 +20,6 @@
 - [x] Batch unlocking 批量解锁
 - [x] Progressive Web App 渐进式Web应用
 - [x] Complete ID3 for ncm 补全ncm的ID3信息
-- [ ] Multi-language 多语言
 
 # 使用方法
 ## 下载已构建版本

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
   presets: [
-    '@vue/app'
+    '@vue/cli-plugin-babel/preset'
   ]
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unlock-music",
-  "version": "1.0.2",
+  "version": "1.1.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -8,19 +8,20 @@
   },
   "dependencies": {
     "browser-id3-writer": "^4.3.0",
-    "core-js": "^2.6.10",
+    "core-js": "^3.6.4",
     "crypto-js": "^3.1.9-1",
     "element-ui": "^2.13.0",
-    "music-metadata-browser": "^1.8.1",
+    "music-metadata-browser": "^2.0.3",
     "register-service-worker": "^1.6.2",
-    "vue": "^2.6.10"
+    "vue": "^2.6.11"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.11.0",
+    "@vue/cli-plugin-babel": "^4.1.2",
-    "@vue/cli-plugin-pwa": "^3.11.0",
+    "@vue/cli-plugin-pwa": "^4.1.2",
-    "@vue/cli-service": "^3.11.0",
+    "@vue/cli-service": "^4.1.2",
     "babel-plugin-component": "^1.1.1",
     "vue-cli-plugin-element": "^1.0.1",
-    "vue-template-compiler": "^2.6.10"
+    "vue-template-compiler": "^2.6.11",
+    "workerize-loader": "^1.1.0"
   }
 }

public/index.html

@@ -12,43 +12,7 @@
     <title>音乐解锁 - By IXarea</title>
     <meta content="音乐,解锁,ncm,qmc,qmc0,qmc3,qmcflac,qmcogg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
     <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
-    <style>
+    <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #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>
-        #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>
 </head>
 <body>
 
@@ -62,6 +26,7 @@
     <strong>音乐解锁采用了一些新特性！建议使用
         <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>
 </div>

src/App.vue

@@ -9,18 +9,26 @@
                         action=""
                         drag
                         multiple>
-                    <i class="el-icon-upload"></i>
+                    <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-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></audio>
+                <audio :autoplay="playing_auto" :src="playing_url" controls/>
 
 
                 <el-table :data="tableData" style="width: 100%">
@@ -67,7 +75,8 @@
             <el-footer id="app-footer">
                 <el-row>
                     音乐解锁：移除已购音乐的加密保护。
-                    目前支持网易云音乐(ncm)和QQ音乐(qmc0, qmc3, qmcflac, qmcogg, mflac)。
+                    目前支持网易云音乐(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>
@@ -84,11 +93,11 @@
 </template>
 
 <script>
+    // 严格模式 用于尾调用优化
+    "use strict";
 
-    const NcmDecrypt = require("./plugins/ncm");
+    const worker = require("workerize-loader!./decrypt/common");
-    const QmcDecrypt = require("./plugins/qmc");
+    const dec = require('./decrypt/common');
-    const RawDecrypt = require("./plugins/raw");
-    const MFlacDecrypt = require("./plugins/mflac");
     export default {
         name: 'app',
         components: {},
@@ -98,12 +107,40 @@
                 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
             }
         },
         mounted() {
             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() {
@@ -111,7 +148,7 @@
                 this.$notify.info({
                     title: '离线使用',
                     message: '我们使用PWA技术，无网络也能使用<br/>' +
-                        '最近更新：支持qmcogg,mflac<br/>' +
+                        '最近更新：支持bkcmp3/bkcflac/tkm<br/>' +
                         '点击查看 <a target="_blank" href="https://github.com/ix64/unlock-music/wiki/使用提示">使用提示</a>',
                     dangerouslyUseHTMLString: true,
                     duration: 10000,
@@ -119,43 +156,39 @@
                 });
             },
             handleFile(file) {
-                let ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
+                // 有空闲worker 立刻处理文件
-                (async () => {
+                if (this.idle_workers.length > 0) {
-                    let data = null;
+                    this.handleDoFile(file, this.idle_workers.shift());
-                    switch (ext) {
-                        case "ncm":
-                            data = await NcmDecrypt.Decrypt(file.raw);
-                            break;
-                        case "mp3":
-                        case "flac":
-                            data = await RawDecrypt.Decrypt(file.raw);
-                            break;
-                        case "qmc3":
-                        case "qmc0":
-                        case "qmcflac":
-                        case "qmcogg":
-                            data = await QmcDecrypt.Decrypt(file.raw);
-                            break;
-                        case "mflac":
-                            data = await MFlacDecrypt.Decrypt(file.raw);
-                            break;
-                        default:
-                            data = {
-                                status: false,
-                                message: "不支持此文件格式",
-                            };
-                            break;
                 }
+                // 无空闲worker 则放入缓存队列
+                else {
+                    this.cacheQueueOption.push(file);
+                }
+            },
+            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
                             });
+                        }
                         let _rp_data = [data.title, data.artist, data.album];
-                        console.log(data);
+                        window._paq.push(["trackEvent", "Unlock", data.rawExt + "," + data.mime, JSON.stringify(_rp_data)]);
-                        window._paq.push(["trackEvent", "Unlock", ext + "," + data.mime, JSON.stringify(_rp_data)]);
                     } else {
                         this.$notify.error({
                             title: '出现问题',
@@ -166,22 +199,42 @@
                         });
                         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);
+                })
             },
             handlePlay(index, row) {
                 this.playing_url = row.file;
                 this.playing_auto = true;
             },
             handleDelete(index, row) {
-                console.log(index);
                 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();
@@ -222,8 +275,8 @@
     }
 
     #app-footer a {
-        padding-left: 0.5em;
+        padding-left: 0.2em;
-        padding-right: 0.5em;
+        padding-right: 0.2em;
     }
 
     #app-footer {
@@ -231,6 +284,7 @@
         font-size: small;
     }
 
+    /*noinspection CssUnusedSymbol*/
     .el-upload-dragger {
         width: 80vw !important;
     }

src/decrypt/common.js

@@ -0,0 +1,50 @@
+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("."));
+    let rt_data;
+    switch (raw_ext) {
+        case "ncm":// Netease Mp3/Flac
+            rt_data = await NcmDecrypt.Decrypt(file.raw);
+            break;
+        case "mp3":// Raw Mp3
+        case "flac"://Raw Flac
+        case "m4a":// Raw M4a
+        case "ogg":// Raw Ogg
+            rt_data = await RawDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+            break;
+        case "tm0":// QQ Music IOS Mp3
+        case "tm3":// QQ Music IOS Mp3
+            rt_data = await RawDecrypt.Decrypt(file.raw, raw_filename, "mp3");
+            break;
+        case "qmc3"://QQ Music Android Mp3
+        case "qmc0"://QQ Music Android Mp3
+        case "qmcflac"://QQ Music Android Flac
+        case "qmcogg"://QQ Music Android Ogg
+        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);
+            break;
+        case "tm2":// QQ Music IOS M4a
+        case "tm6":// QQ Music IOS M4a
+            rt_data = await TmDecrypt.Decrypt(file.raw, raw_filename);
+            break;
+        default:
+            rt_data = {status: false, message: "不支持此文件格式",}
+    }
+    if (rt_data.status) {
+        rt_data.rawExt = raw_ext;
+        rt_data.rawFilename = raw_filename;
+    }
+    return rt_data;
+}

src/decrypt/mflac.js

@@ -1,27 +1,21 @@
 const musicMetadata = require("music-metadata-browser");
+const util = require("./util");
 export {Decrypt}
 
-async function Decrypt(file) {
+async function Decrypt(file, raw_filename, raw_ext) {
     // 获取扩展名
-    let filename_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
+    if (raw_ext !== "mflac") return {
-    if (filename_ext !== "mflac") return {
         status: false,
         message: "File type is incorrect!",
     };
     // 读取文件
-    const fileBuffer = await new Promise(resolve => {
+    const fileBuffer = await util.GetArrayBuffer(file);
-        const reader = new FileReader();
-        reader.onload = (e) => {
-            resolve(e.target.result);
-        };
-        reader.readAsArrayBuffer(file);
-    });
     const audioData = new Uint8Array(fileBuffer.slice(0, -0x170));
     const audioDataLen = audioData.length;
 
     // 转换数据
     const seed = new Mask();
-    if (!seed.DetectMask(audioData)) return{
+    if (!seed.DetectMask(audioData)) return {
         status: false,
         message: "此音乐无法解锁，目前mflac格式不提供完整支持",
     };
@@ -34,35 +28,17 @@ async function Decrypt(file) {
 
     // 读取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);
-    let filename_array = file.name.substring(0, file.name.lastIndexOf(".")).split("-");
+    // 返回
-    let title = tag.common.title;
-    let artist = tag.common.artist;
-    if (filename_array.length > 1) {
-        if (artist === undefined) artist = filename_array[0].trim();
-        if (title === undefined) title = filename_array[1].trim();
-    } else if (filename_array.length === 1) {
-        if (title === undefined) title = filename_array[0].trim();
-    }
-    const filename = artist + " - " + title + ".flac";
-    // 处理无封面
-    let pic_url = "";
-
-    if (tag.common.picture !== undefined && tag.common.picture.length >= 1) {
-        const picture = tag.common.picture[0];
-        const blobPic = new Blob([picture.data], {type: picture.format});
-        pic_url = URL.createObjectURL(blobPic);
-    }
-    // 返回*/
     return {
         status: true,
-        message: "",
+        filename: info.filename,
-        filename: filename,
+        title: info.title,
-        title: title,
+        artist: info.artist,
-        artist: artist,
+        ext: 'flac',
         album: tag.common.album,
-        picture: pic_url,
+        picture: picUrl,
         file: musicUrl,
         mime: "audio/flac"
     }

src/decrypt/ncm.js

@@ -0,0 +1,172 @@
+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");
+
+
+export {Decrypt};
+
+async function Decrypt(file) {
+
+    const fileBuffer = await util.GetArrayBuffer(file);
+    const dataView = new DataView(fileBuffer);
+
+    if (dataView.getUint32(0, true) !== 0x4e455443 ||
+        dataView.getUint32(4, true) !== 0x4d414446)
+        return {status: false, message: "此ncm文件已损坏"};
+
+
+    const keyDataObj = getKeyData(dataView, fileBuffer, 10);
+    const keyBox = getKeyBox(keyDataObj.data);
+
+    const musicMetaObj = getMetaData(dataView, fileBuffer, keyDataObj.offset);
+    const musicMeta = musicMetaObj.data;
+
+    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];
+    }
+
+    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];
+
+    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)
+    }
+
+    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,
+        mime: mime
+    };
+}
+
+async function writeID3(audioData, artistList, title, album, picture) {
+    const writer = new ID3Writer(audioData);
+    writer.setFrame("TPE1", artistList)
+        .setFrame("TIT2", title)
+        .setFrame("TALB", album);
+    if (picture !== "") {
+        try {
+            const img = await (await fetch(picture)).arrayBuffer();
+            writer.setFrame('APIC', {
+                type: 3,
+                data: img,
+                description: 'Cover'
+            })
+        } catch (e) {
+            console.log("Fail to write cover image!");
+        }
+    }
+    writer.addTag();
+    return writer.arrayBuffer;
+}
+
+function getKeyData(dataView, fileBuffer, offset) {
+    const keyLen = dataView.getUint32(offset, true);
+    offset += 4;
+    const cipherText = new Uint8Array(fileBuffer, offset, keyLen).map(
+        uint8 => uint8 ^ 0x64
+    );
+    offset += keyLen;
+
+    const plainText = CryptoJS.AES.decrypt(
+        {ciphertext: CryptoJS.lib.WordArray.create(cipherText)},
+        CORE_KEY,
+        {
+            mode: CryptoJS.mode.ECB,
+            padding: CryptoJS.pad.Pkcs7
+        }
+    );
+
+    const result = new Uint8Array(plainText.sigBytes);
+
+    const words = plainText.words;
+    const sigBytes = plainText.sigBytes;
+    for (let i = 0; i < sigBytes; i++) {
+        result[i] = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+    }
+
+    return {offset: offset, data: result.slice(17)};
+}
+
+function getKeyBox(keyData) {
+    const box = new Uint8Array(Array(256).keys());
+
+    const keyDataLen = keyData.length;
+
+    let j = 0;
+
+    for (let i = 0; i < 256; i++) {
+        j = (box[i] + j + keyData[i % keyDataLen]) & 0xff;
+        [box[i], box[j]] = [box[j], box[i]];
+    }
+
+    return box.map((_, i, arr) => {
+        i = (i + 1) & 0xff;
+        const si = arr[i];
+        const sj = arr[(i + si) & 0xff];
+        return arr[(si + sj) & 0xff];
+    });
+}
+
+/**
+ * @typedef {Object} MusicMetaType
+ * @property {Number} musicId
+ * @property {String} musicName
+ * @property {[[String, Number]]} artist
+ * @property {String} album
+ * @property {"flac"|"mp3"} format
+ * @property {String} albumPic
+ */
+
+function getMetaData(dataView, fileBuffer, offset) {
+    const metaDataLen = dataView.getUint32(offset, true);
+    offset += 4;
+    if (metaDataLen === 0) {
+        return {};
+    }
+
+    const cipherText = new Uint8Array(fileBuffer, offset, metaDataLen).map(
+        data => data ^ 0x63
+    );
+    offset += metaDataLen;
+
+    const plainText = CryptoJS.AES.decrypt({
+            ciphertext: CryptoJS.enc.Base64.parse(
+                CryptoJS.lib.WordArray.create(cipherText.slice(22)).toString(CryptoJS.enc.Utf8)
+            )
+        },
+        META_KEY,
+        {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}
+    );
+
+    const result = JSON.parse(plainText.toString(CryptoJS.enc.Utf8).slice(6));
+    result.albumPic = result.albumPic.replace("http:", "https:");
+    return {data: result, offset: offset};
+}
+
+

src/decrypt/qmc.js

@@ -0,0 +1,90 @@
+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]];
+
+const OriginalExtMap = {
+    "qmc0": "mp3",
+    "qmc3": "mp3",
+    "qmcogg": "ogg",
+    "qmcflac": "flac",
+    "bkcmp3": "mp3",
+    "bkcflac": "flac",
+    "tkm": "m4a"
+};
+
+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);
+
+    // 返回
+    return {
+        status: true,
+        filename: info.filename,
+        title: info.title,
+        artist: info.artist,
+        ext: new_ext,
+        album: tag.common.album,
+        picture: picUrl,
+        file: musicUrl,
+        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
+    }
+
+}

src/decrypt/raw.js

@@ -0,0 +1,26 @@
+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);
+
+    return {
+        status: true,
+        filename: info.filename,
+        title: info.title,
+        artist: info.artist,
+        ext: raw_ext,
+        album: tag.common.album,
+        picture: picUrl,
+        file: fileUrl,
+        mime: mime
+    }
+}

src/decrypt/tm.js

@@ -0,0 +1,14 @@
+const rawDecrypt = require("./raw");
+const util = require("./util");
+export {Decrypt}
+const header = [0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, 0x70];
+
+async function Decrypt(file, raw_filename) {
+    const fileBuffer = await util.GetArrayBuffer(file);
+    const audioData = new Uint8Array(fileBuffer);
+    for (let cur = 0; cur < 8; ++cur) {
+        audioData[cur] = header[cur];
+    }
+    const musicData = new Blob([audioData], {type: "audio/mp4"});
+    return await rawDecrypt.Decrypt(musicData, raw_filename, "m4a")
+}

src/decrypt/util.js

@@ -0,0 +1,51 @@
+export {GetArrayBuffer, GetFileInfo, GetCoverURL, AudioMimeType}
+
+// Also a new draft API: blob.arrayBuffer()
+async function GetArrayBuffer(blobObject) {
+    return await new Promise(resolve => {
+        const reader = new FileReader();
+        reader.onload = (e) => {
+            resolve(e.target.result);
+        };
+        reader.readAsArrayBuffer(blobObject);
+    });
+}
+
+const AudioMimeType = {
+    mp3: "audio/mpeg",
+    flac: "audio/flac",
+    m4a: "audio/mp4",
+    ogg: "audio/ogg"
+};
+
+function GetFileInfo(artist, title, filenameNoExt, ext) {
+    let newArtist = "", newTitle = "";
+    let filenameArray = filenameNoExt.split("-");
+    if (filenameArray.length > 1) {
+        newArtist = filenameArray[0].trim();
+        newTitle = filenameArray[1].trim();
+    } else if (filenameArray.length === 1) {
+        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};
+}
+
+/**
+ * @return {string}
+ */
+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;
+}

src/main.js

@@ -1,7 +1,40 @@
 import Vue from 'vue'
 import App from './App.vue'
 import './registerServiceWorker'
-import './plugins/element.js'
+import {
+    Button,
+    Col,
+    Container,
+    Footer,
+    Icon,
+    Image,
+    Link,
+    Main,
+    Notification,
+    Row,
+    Table,
+    TableColumn,
+    Upload,
+    Radio,
+    Checkbox
+} from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css'
+
+Vue.use(Link);
+Vue.use(Image);
+Vue.use(Button);
+Vue.use(Table);
+Vue.use(TableColumn);
+Vue.use(Main);
+Vue.use(Footer);
+Vue.use(Container);
+Vue.use(Icon);
+Vue.use(Row);
+Vue.use(Col);
+Vue.use(Upload);
+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;

src/plugins/element.js

@@ -1,31 +0,0 @@
-import Vue from 'vue'
-import {
-    Button,
-    Col,
-    Container,
-    Footer,
-    Icon,
-    Image,
-    Link,
-    Main,
-    Notification,
-    Row,
-    Table,
-    TableColumn,
-    Upload
-} from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css'
-
-Vue.use(Link);
-Vue.use(Image);
-Vue.use(Button);
-Vue.use(Table);
-Vue.use(TableColumn);
-Vue.use(Main);
-Vue.use(Footer);
-Vue.use(Container);
-Vue.use(Icon);
-Vue.use(Row);
-Vue.use(Col);
-Vue.use(Upload);
-Vue.prototype.$notify = Notification;

src/plugins/ncm.js

@@ -1,183 +0,0 @@
-const CryptoJS = require("crypto-js");
-const ID3Writer = require("browser-id3-writer");
-const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
-const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
-
-const audio_mime_type = {
-    mp3: "audio/mpeg",
-    flac: "audio/flac"
-};
-
-export {Decrypt};
-
-async function Decrypt(file) {
-
-    const fileBuffer = await new Promise(reslove => {
-        const reader = new FileReader();
-        reader.onload = (e) => {
-            reslove(e.target.result);
-        };
-        reader.readAsArrayBuffer(file);
-    });
-
-    const dataView = new DataView(fileBuffer);
-
-    if (dataView.getUint32(0, true) !== 0x4e455443 ||
-        dataView.getUint32(4, true) !== 0x4d414446
-    ) return {
-        status: false,
-        message: "此ncm文件已损坏",
-    };
-
-    let offset = 10;
-
-    const keyData = (() => {
-        const keyLen = dataView.getUint32(offset, true);
-        offset += 4;
-        const cipherText = new Uint8Array(fileBuffer, offset, keyLen).map(
-            uint8 => uint8 ^ 0x64
-        );
-        offset += keyLen;
-
-        const plainText = CryptoJS.AES.decrypt(
-            {ciphertext: CryptoJS.lib.WordArray.create(cipherText)},
-            CORE_KEY,
-            {
-                mode: CryptoJS.mode.ECB,
-                padding: CryptoJS.pad.Pkcs7
-            }
-        );
-
-        const result = new Uint8Array(plainText.sigBytes);
-
-        const words = plainText.words;
-        const sigBytes = plainText.sigBytes;
-        for (let i = 0; i < sigBytes; i++) {
-            result[i] = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
-        }
-
-
-        return result.slice(17);
-    })();
-
-    const keyBox = (() => {
-        const box = new Uint8Array(Array(256).keys());
-
-        const keyDataLen = keyData.length;
-
-        let j = 0;
-
-        for (let i = 0; i < 256; i++) {
-            j = (box[i] + j + keyData[i % keyDataLen]) & 0xff;
-            [box[i], box[j]] = [box[j], box[i]];
-        }
-
-        return box.map((_, i, arr) => {
-            i = (i + 1) & 0xff;
-            const si = arr[i];
-            const sj = arr[(i + si) & 0xff];
-            return arr[(si + sj) & 0xff];
-        });
-    })();
-
-    /**
-     * @typedef {Object} MusicMetaType
-     * @property {Number} musicId
-     * @property {String} musicName
-     * @property {[[String, Number]]} artist
-     * @property {String} album
-     * @property {"flac"|"mp3"} format
-     * @property {String} albumPic
-     */
-
-    /** @type {MusicMetaType|undefined} */
-    const musicMeta = (() => {
-        const metaDataLen = dataView.getUint32(offset, true);
-        offset += 4;
-        if (metaDataLen === 0) {
-            return {};
-        }
-
-        const cipherText = new Uint8Array(fileBuffer, offset, metaDataLen).map(
-            data => data ^ 0x63
-        );
-        offset += metaDataLen;
-
-        const plainText = CryptoJS.AES.decrypt(
-            {
-                ciphertext: CryptoJS.enc.Base64.parse(
-                    CryptoJS.lib.WordArray.create(cipherText.slice(22)).toString(CryptoJS.enc.Utf8)
-                )
-            },
-            META_KEY,
-            {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}
-        );
-
-        const result = JSON.parse(plainText.toString(CryptoJS.enc.Utf8).slice(6));
-        result.albumPic = result.albumPic.replace("http:", "https:");
-        return result;
-    })();
-
-    offset += dataView.getUint32(offset + 5, true) + 13;
-
-    let audioData = new Uint8Array(fileBuffer, offset);
-    let audioDataLen = audioData.length;
-
-
-    for (let cur = 0; cur < audioDataLen; ++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 = audio_mime_type[musicMeta.format];
-
-    const artists = [];
-    musicMeta.artist.forEach(arr => {
-        artists.push(arr[0]);
-    });
-
-    if (musicMeta.format === "mp3") {
-        const writer = new ID3Writer(audioData);
-        writer.setFrame("TPE1", artists)
-            .setFrame("TIT2", musicMeta.musicName)
-            .setFrame("TALB", musicMeta.album);
-        if (musicMeta.albumPic !== "") {
-            try {
-                const img = await (await fetch(musicMeta.albumPic)).arrayBuffer();
-                writer.setFrame('APIC', {
-                    type: 3,
-                    data: img,
-                    description: 'Cover'
-                })
-            } catch (e) {
-                console.log("Fail to write cover image!");
-            }
-        }
-        writer.addTag();
-        audioData = writer.arrayBuffer;
-    }
-
-    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(" & "),
-        album: musicMeta.album,
-        picture: musicMeta.albumPic,
-        file: musicUrl,
-        mime: mime
-    };
-}
-

src/plugins/qmc.js

@@ -1,124 +0,0 @@
-const musicMetadata = require("music-metadata-browser");
-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]];
-const audio_mime_type = {
-    mp3: "audio/mpeg",
-    flac: "audio/flac",
-    ogg: "audio/ogg"
-};
-
-async function Decrypt(file) {
-    // 获取扩展名
-    let filename_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
-    let new_ext;
-    switch (filename_ext) {
-        case "qmc0":
-        case "qmc3":
-            new_ext = "mp3";
-            break;
-        case "qmcogg":
-            new_ext = "ogg";
-            break;
-        case "qmcflac":
-            new_ext = "flac";
-            break;
-        default:
-            return {
-                status: false,
-                message: "File type is incorrect!",
-            };
-    }
-    const mime = audio_mime_type[new_ext];
-    // 读取文件
-    const fileBuffer = await new Promise(resolve => {
-        const reader = new FileReader();
-        reader.onload = (e) => {
-            resolve(e.target.result);
-        };
-        reader.readAsArrayBuffer(file);
-    });
-    const audioData = new Uint8Array(fileBuffer);
-    const audioDataLen = audioData.length;
-    // 转换数据
-    const seed = new Mask();
-    for (let cur = 0; cur < audioDataLen; ++cur) {
-        audioData[cur] ^= seed.NextMask();
-    }
-    // 导出
-    const musicData = new Blob([audioData], {
-        type: mime
-    });
-    const musicUrl = URL.createObjectURL(musicData);
-    // 读取Meta
-    let tag = await musicMetadata.parseBlob(musicData);
-
-    // 处理无标题歌手
-    let filename_array = file.name.substring(0, file.name.lastIndexOf(".")).split("-");
-    let title = tag.common.title;
-    let artist = tag.common.artist;
-    if (filename_array.length > 1) {
-        if (artist === undefined) artist = filename_array[0].trim();
-        if (title === undefined) title = filename_array[1].trim();
-    } else if (filename_array.length === 1) {
-        if (title === undefined) title = filename_array[0].trim();
-    }
-    const filename = artist + " - " + title + "." + new_ext;
-    // 处理无封面
-    let pic_url = "";
-
-    if (tag.common.picture !== undefined && tag.common.picture.length >= 1) {
-        const picture = tag.common.picture[0];
-        const blobPic = new Blob([picture.data], {type: picture.format});
-        pic_url = URL.createObjectURL(blobPic);
-    }
-    // 返回
-    return {
-        status:true,
-        filename: filename,
-        title: title,
-        artist: artist,
-        album: tag.common.album,
-        picture: pic_url,
-        file: musicUrl,
-        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
-    }
-
-}

src/plugins/raw.js

@@ -1,44 +0,0 @@
-const musicMetadata = require("music-metadata-browser");
-export {Decrypt}
-
-const audio_mime_type = {
-    mp3: "audio/mpeg",
-    flac: "audio/flac"
-};
-
-async function Decrypt(file) {
-    let tag = await musicMetadata.parseBlob(file);
-    let pic_url = "";
-    if (tag.common.picture !== undefined && tag.common.picture.length > 0) {
-        let pic = new Blob([tag.common.picture[0].data], {type: tag.common.picture[0].format});
-        pic_url = URL.createObjectURL(pic);
-    }
-
-    let file_url = URL.createObjectURL(file);
-
-    let filename_no_ext = file.name.substring(0, file.name.lastIndexOf("."));
-    let filename_array = filename_no_ext.split("-");
-    let filename_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
-    const mime = audio_mime_type[filename_ext];
-    let title = tag.common.title;
-    let artist = tag.common.artist;
-
-    if (filename_array.length > 1) {
-        if (artist === undefined) artist = filename_array[0].trim();
-        if (title === undefined) title = filename_array[1].trim();
-    } else if (filename_array.length === 1) {
-        if (title === undefined) title = filename_array[0].trim();
-    }
-
-    const filename = artist + " - " + title + "." + filename_ext;
-    return {
-        status:true,
-        filename: filename,
-        title: title,
-        artist: artist,
-        album: tag.common.album,
-        picture: pic_url,
-        file: file_url,
-        mime: mime
-    }
-}