Bug Fix in Worker Mode

Remove Console Log
Update README.md
2020-04-23 21:23:01 +08:00 · 2020-04-23 21:16:41 +08:00 · 2020-04-23 21:12:11 +08:00 · 2020-04-23 21:10:25 +08:00 · 2020-04-23 20:46:08 +08:00 · 2020-04-23 18:17:58 +08:00
18 changed files with 3634 additions and 2748 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) [2019] [MengYX]
+Copyright (c) 2019-2020 MengYX

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,30 +1,39 @@
 # Unlock Music 音乐解锁
 - Unlock encrypted music file in browser. 
 - 在浏览器中解锁加密的音乐文件。
- unlock-music项目是以学习和技术研究的初衷创建的。
- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务。
-
+- unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
+- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务；Unlock Music的CLI版本正在开发中。
+- [其他测试版工具](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7)
+    
 [![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 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)
- [x] QQMusic New Format QQ音乐新格式 (Experimental 实验性支持)
+# 特性
+## 支持的格式
+- [x] QQ音乐 (.qmc0/.qmc2/.qmc3/.qmcflac/.qmcogg/[.tkm](https://github.com/ix64/unlock-music/issues/9))
+- [x] Moo音乐格式 ([.bkcmp3/.bkcflac](https://github.com/ix64/unlock-music/issues/11))
+- [x] QQ音乐Tm格式 (.tm0/.tm2/.tm3/.tm6)
+- [x] QQ音乐新格式 (实验性支持)
    - [x] .mflac 
-    - [x] .mgg
- [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 多线程 
+    - [x] [.mgg](https://github.com/ix64/unlock-music/issues/3)
+- [x] 网易云音乐格式 (.ncm)
+    - [x] 补全ncm的ID3信息
+- [x] 虾米音乐格式 (.xm) (测试阶段)
+- [x] 酷我音乐格式 (.kwm) (测试阶段)
+- [ ] 酷狗音乐格式 (.kgm) ([Alpha测试](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
+
+## 其他特性
+- [x] 在浏览器中解锁
+- [x] 拖放文件
+- [x] 在线播放
+- [x] 批量解锁
+- [x] 渐进式Web应用
+- [x] 多线程 
+

 # 使用方法
-## 下载已构建版本
- 已构建的版本发布在 [GitHub Release](https://github.com/ix64/unlock-music/releases/latest), 下载解压缩后即可部署或本地使用
+## 使用已构建版本
+- 从[GitHub Release](https://github.com/ix64/unlock-music/releases/latest)下载已构建的版本
+- 解压缩后即可部署或本地使用（**请勿直接运行源代码**）

 ## 自行构建
 - 环境要求 
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "unlock-music",
-  "version": "1.3.4",
-  "updateInfo": "修复解锁无元数据的ncm文件时会产生的错误",
+  "version": "1.5.0",
+  "updateInfo": "支持酷我.kwm;支持虾米.xm",
  "license": "MIT",
  "description": "Unlock encrypted music file in browser.",
  "repository": {
@@ -19,14 +19,15 @@
    "core-js": "^3.6.4",
    "crypto-js": "^4.0.0",
    "element-ui": "^2.13.0",
-    "music-metadata-browser": "^2.0.4",
-    "register-service-worker": "^1.7.0",
+    "iconv-lite": "^0.5.1",
+    "music-metadata-browser": "^2.0.5",
+    "register-service-worker": "^1.7.1",
    "vue": "^2.6.11"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.2.3",
-    "@vue/cli-plugin-pwa": "^4.2.3",
-    "@vue/cli-service": "^4.2.3",
+    "@vue/cli-plugin-babel": "^4.3.0",
+    "@vue/cli-plugin-pwa": "^4.3.0",
+    "@vue/cli-service": "^4.3.0",
    "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
@@ -22,7 +22,7 @@
    <div id="loader"></div>
    <noscript>
        <img alt=""
-             src="https://stats.ixarea.com/ixarea-stats/report?idsite=2&rec=1&action_name=音乐解锁+-+By+IXarea"
+             src="https://stats.ixarea.com/ixarea-stats/report?rec=1&action_name=音乐解锁-NoJS&idsite=2"
             style="border:0"/>
    </noscript>
    <div hidden id="loader-tips-outdated">
@@ -53,12 +53,12 @@
            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;
+            m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
+            if (m && Number(m[1]) < 17) return true;
+            m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
+            if (m && Number(m[1]) < 58) return true;
+            m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
+            return m && Number(m[1]) < 45;
        })();
        if (detected) {
            document.getElementById('loader-tips-outdated').hidden = false;
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
        <el-main>
            <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>

-            <el-row id="app-control">
+            <div id="app-control">
                <el-row style="padding-bottom: 1em; font-size: 14px">
                    歌曲命名格式：
                    <el-radio label="1" name="format" v-model="download_format">歌手-歌曲名</el-radio>
@@ -14,10 +14,20 @@
                </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-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">清除全部</el-button>
+
+
+                    <el-tooltip class="item" effect="dark" placement="top-start">
+                        <div slot="content">
+                            当您使用此工具进行大量文件解锁的时候，建议开启此选项。<br/>
+                            开启后，解锁结果将不会存留于浏览器中，防止内存不足。
+                        </div>
+                        <el-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
+                    </el-tooltip>
+
+
                </el-row>
-            </el-row>
+            </div>
            <audio :autoplay="playing_auto" :src="playing_url" controls/>

            <x-preview :download_format="download_format" :table-data="tableData"
@@ -31,11 +41,11 @@
                <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>。
+                目前支持网易云音乐(ncm), QQ音乐(qmc, mflac, mgg), 虾米音乐(xm), 酷我音乐(.kwm)
+                <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">更多</a>。
            </el-row>
            <el-row>
-                <span>Copyright &copy; 2019</span> MengYX
+                <span>Copyright &copy; 2019-</span><span v-text="(new Date()).getFullYear()"></span> MengYX
                音乐解锁使用
                <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
                开放源代码
@@ -82,12 +92,13 @@
                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})
+                        body: JSON.stringify({"Version": this.version})
                    });
                    updateInfo = await resp.json();
                } catch (e) {
                }
-                if (!!updateInfo && !!updateInfo.Found) {
+                if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
+                    (!!updateInfo.Found && window.location.protocol !== "https:"))) {
                    this.$notify.warning({
                        title: '发现更新',
                        message: '发现新版本 v' + updateInfo.Version +
--- a/src/component/upload.vue
+++ b/src/component/upload.vue
@@ -9,6 +9,13 @@
        <i class="el-icon-upload"/>
        <div class="el-upload__text">将文件拖到此处，或<em>点击选择</em></div>
        <div class="el-upload__tip" slot="tip">本工具仅在浏览器内对文件进行解锁，无需消耗流量</div>
+        <transition name="el-fade-in">
+            <el-progress
+                    :format="progressFormat" :percentage="progress_percent" :stroke-width="16"
+                    :text-inside="true" style="margin: 16px 6px 0 6px"
+                    v-show="progress_show"
+            ></el-progress>
+        </transition>
    </el-upload>
 </template>

@@ -22,7 +29,13 @@
                cacheQueue: [],
                workers: [],
                idle_workers: [],
-                thread_num: 1
+                thread_num: 1,
+
+                progress_show: false,
+
+                progress_finished: 0,
+                progress_all: 0,
+                progress_percent: 0,
            }
        },
        mounted() {
@@ -47,7 +60,25 @@
            }
        },
        methods: {
+            progressFormat() {
+                return this.progress_finished + "/" + (this.progress_all)
+            },
+            progressChange(finish, all) {
+                this.progress_all += all;
+                this.progress_finished += finish;
+                this.progress_percent = Math.round(this.progress_finished / this.progress_all * 100);
+                if (this.progress_finished === this.progress_all) {
+                    setTimeout(() => {
+                        this.progress_show = false;
+                        this.progress_finished = 0;
+                        this.progress_all = 0;
+                    }, 3000);
+                } else {
+                    this.progress_show = true;
+                }
+            },
            handleFile(file) {
+                this.progressChange(0, +1);
                // 有空闲worker 立刻处理文件
                if (this.idle_workers.length > 0) {
                    this.handleDoFile(file, this.idle_workers.shift());
@@ -70,9 +101,11 @@
                    this.$emit("handle_finish", data);
                    // 完成之后 执行新任务 todo: 可能导致call stack过长
                    this.handleCacheQueue(worker_id);
+                    this.progressChange(+1, 0);
                }).catch(err => {
                    this.$emit("handle_error", err, file.name);
                    this.handleCacheQueue(worker_id);
+                    this.progressChange(+1, 0);
                })
            },
        }
--- a/src/component/util.js
+++ b/src/component/util.js
@@ -23,5 +23,8 @@ export function DownloadBlobMusic(data, format) {

 export function RemoveBlobMusic(data) {
    URL.revokeObjectURL(data.file);
-    URL.revokeObjectURL(data.picture);
+    if (data.picture.startsWith("blob:")) {
+        URL.revokeObjectURL(data.picture);
+    }
+
 }
--- a/src/decrypt/common.js
+++ b/src/decrypt/common.js
@@ -1,4 +1,6 @@
 const NcmDecrypt = require("./ncm");
+const KwmDecrypt = require("./kwm");
+const XmDecrypt = require("./xm");
 const QmcDecrypt = require("./qmc");
 const RawDecrypt = require("./raw");
 const TmDecrypt = require("./tm");
@@ -11,9 +13,16 @@ export async function CommonDecrypt(file) {
        case "ncm":// Netease Mp3/Flac
            rt_data = await NcmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
-        case "mp3":// Raw Mp3
-        case "flac"://Raw Flac
-        case "m4a":// Raw M4a
+        case "kwm":// Kuwo Mp3/Flac
+            rt_data = await KwmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+            break
+        case "xm": // Xiami Wav/M4a/Mp3/Flac
+        case "wav":// Xiami/Raw Wav
+        case "mp3":// Xiami/Raw Mp3
+        case "flac":// Xiami/Raw Flac
+        case "m4a":// Xiami/Raw M4a
+            rt_data = await XmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+            break;
        case "ogg":// Raw Ogg
            rt_data = await RawDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
            break;
@@ -22,6 +31,7 @@ export async function CommonDecrypt(file) {
            rt_data = await RawDecrypt.Decrypt(file.raw, raw_filename, "mp3");
            break;
        case "qmc3"://QQ Music Android Mp3
+        case "qmc2"://QQ Music Android Ogg
        case "qmc0"://QQ Music Android Mp3
        case "qmcflac"://QQ Music Android Flac
        case "qmcogg"://QQ Music Android Ogg
--- a/src/decrypt/kwm.js
+++ b/src/decrypt/kwm.js
@@ -0,0 +1,84 @@
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetMetaCoverURL,
+    IsBytesEqual
+} from "./util";
+
+const musicMetadata = require("music-metadata-browser");
+const MagicHeader = [
+    0x79, 0x65, 0x65, 0x6C, 0x69, 0x6F, 0x6E, 0x2D,
+    0x6B, 0x75, 0x77, 0x6F, 0x2D, 0x74, 0x6D, 0x65,
+]
+const PreDefinedKey = "MoOtOiTvINGwd2E6n0E1i7L5t2IoOoNk"
+
+export async function Decrypt(file, raw_filename, raw_ext) {
+    const oriData = new Uint8Array(await GetArrayBuffer(file));
+    if (!IsBytesEqual(MagicHeader, oriData.slice(0, 0x10)))
+        return {status: false, message: "Not a valid kwm file!"}
+
+    let fileKey = oriData.slice(0x18, 0x20)
+    let mask = createMaskFromKey(fileKey)
+
+    function Uint8ArrayToString(fileData) {
+        var dataString = "";
+        for (var i = 0; i < fileData.length; i++) {
+            dataString += String.fromCharCode(fileData[i]);
+        }
+
+        return dataString
+    }
+
+
+    let audioData = oriData.slice(0x400);
+    let lenAudioData = audioData.length;
+    for (let cur = 0; cur < lenAudioData; ++cur)
+        audioData[cur] ^= mask[cur % 0x20];
+
+
+    const ext = DetectAudioExt(audioData, "mp3");
+    const mime = AudioMimeType[ext];
+    let musicBlob = new Blob([audioData], {type: mime});
+
+    const musicMeta = await musicMetadata.parseBlob(musicBlob);
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename);
+
+    const imgUrl = GetMetaCoverURL(musicMeta);
+
+    return {
+        status: true,
+        title: info.title,
+        artist: info.artist,
+        ext: ext,
+        album: musicMeta.common.album,
+        picture: imgUrl,
+        file: URL.createObjectURL(musicBlob),
+        mime: mime
+    }
+}
+
+
+function createMaskFromKey(keyBytes) {
+    let keyView = new DataView(keyBytes.buffer)
+    let keyStr = keyView.getBigUint64(0, true).toString()
+    let keyStrTrim = trimKey(keyStr)
+    let key = new Uint8Array(32)
+    for (let i = 0; i < 32; i++) {
+        key[i] = PreDefinedKey[i].charCodeAt() ^ keyStrTrim[i].charCodeAt()
+    }
+    return key
+}
+
+
+function trimKey(keyRaw) {
+    let lenRaw = keyRaw.length;
+    let out = keyRaw;
+    if (lenRaw > 32) {
+        out = keyRaw.slice(0, 32)
+    } else if (lenRaw < 32) {
+        out = keyRaw.padEnd(32, keyRaw)
+    }
+    return out
+}
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -1,8 +1,7 @@
 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");
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo} from "./util"
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetWebImage, WriteMp3Meta} from "./util"

 export async function Decrypt(file, raw_filename, raw_ext) {
    const fileBuffer = await GetArrayBuffer(file);
@@ -20,7 +19,8 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    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];
+    let lenAudioData = audioData.length;
+    for (let cur = 0; cur < lenAudioData; ++cur) audioData[cur] ^= keyBox[cur & 0xff];


    if (musicMeta.album === undefined) musicMeta.album = "";
@@ -31,8 +31,10 @@ export async function Decrypt(file, raw_filename, raw_ext) {
    if (artists.length === 0) artists.push(info.artist);

    if (musicMeta.format === undefined) musicMeta.format = DetectAudioExt(audioData, "mp3");
-    if (musicMeta.format === "mp3")
-        audioData = await writeID3(audioData, artists, info.title, musicMeta.album, musicMeta.albumPic);
+
+    const imageInfo = await GetWebImage(musicMeta.albumPic);
+    if (musicMeta.format === "mp3") audioData = await WriteMp3Meta(
+        audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);

    const mime = AudioMimeType[musicMeta.format];
    const musicData = new Blob([audioData], {type: mime});
@@ -42,32 +44,12 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        artist: info.artist,
        ext: musicMeta.format,
        album: musicMeta.album,
-        picture: musicMeta.albumPic,
+        picture: imageInfo.url,
        file: URL.createObjectURL(musicData),
        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);
--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -1,12 +1,15 @@
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, RequestJsonp} from "./util";
 import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";

+import {decode} from "iconv-lite"
+
 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},
+    "qmc2": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
    "qmc3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
    "qmcogg": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
    "qmcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
@@ -31,25 +34,39 @@ export async function Decrypt(file, raw_filename, raw_ext) {
        audioData = fileData;
        seed = handler.handler(audioData);
    }
-    const dec = seed.Decrypt(audioData);
+    let musicDecoded = seed.Decrypt(audioData);

-    const ext = DetectAudioExt(dec, handler.ext);
+    const ext = DetectAudioExt(musicDecoded, handler.ext);
    const mime = AudioMimeType[ext];

-    const musicData = new Blob([dec], {type: mime});
+    let musicBlob = new Blob([musicDecoded], {type: mime});

-    const tag = await musicMetadata.parseBlob(musicData);
-    const info = GetFileInfo(tag.common.artist, tag.common.title, raw_filename);
+    const musicMeta = await musicMetadata.parseBlob(musicBlob);
+    for (let metaIdx in musicMeta.native) {
+        if (musicMeta.native[metaIdx].some(item => item.id === "TCON" && item.value === "(12)")) {
+            musicMeta.common.artist = decode(musicMeta.common.artist, "gbk");
+            musicMeta.common.title = decode(musicMeta.common.title, "gbk");
+            musicMeta.common.album = decode(musicMeta.common.album, "gbk");
+        }
+    }
+
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename);
    if (handler.detect) reportKeyUsage(keyData, seed.Matrix128,
-        info.artist, info.title, tag.common.album, raw_filename, raw_ext);
+        info.artist, info.title, musicMeta.common.album, raw_filename, raw_ext);
+
+    let imgUrl = GetMetaCoverURL(musicMeta);
+    if (imgUrl === "") {
+        imgUrl = await queryAlbumCoverImage(info.artist, info.title, musicMeta.common.album);
+        //todo: 解决跨域获取图像的问题
+    }
    return {
        status: true,
        title: info.title,
        artist: info.artist,
        ext: ext,
-        album: tag.common.album,
-        picture: GetCoverURL(tag),
-        file: URL.createObjectURL(musicData),
+        album: musicMeta.common.album,
+        picture: imgUrl,
+        file: URL.createObjectURL(musicBlob),
        mime: mime
    }
 }
@@ -77,3 +94,25 @@ async function queryKeyInfo(keyData, filename, format) {
    } catch (e) {
    }
 }
+
+async function queryAlbumCoverImage(artist, title, album) {
+    let song_query_url = "https://c.y.qq.com/soso/fcgi-bin/client_search_cp?n=10&new_json=1&w=" +
+        encodeURIComponent(artist + " " + title + " " + album);
+    let jsonpData;
+    let queriedSong = undefined;
+    try {
+        jsonpData = await RequestJsonp(song_query_url, "callback");
+        queriedSong = jsonpData["data"]["song"]["list"][0];
+    } catch (e) {
+    }
+    let imgUrl = "";
+    if (!!queriedSong && !!queriedSong["album"]) {
+        if (queriedSong["album"]["pmid"] !== undefined) {
+            imgUrl = "https://y.gtimg.cn/music/photo_new/T002M000" + queriedSong["album"]["pmid"] + ".jpg"
+        } else if (queriedSong["album"]["id"] !== undefined) {
+            imgUrl = "https://imgcache.qq.com/music/photo/album/" +
+                queriedSong["album"]["id"] % 100 + "/albumpic_" + queriedSong["album"]["id"] + "_0.jpg"
+        }
+    }
+    return imgUrl;
+}
--- a/src/decrypt/qmcMask.js
+++ b/src/decrypt/qmcMask.js
@@ -1,4 +1,4 @@
-import {FLAC_HEADER, IsBytesEqual} from "./util"
+import {FLAC_HEADER, IsBytesEqual, OGG_HEADER} from "./util"

 const QMOggConstHeader = [
    0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -119,18 +119,18 @@ export function QmcMaskDetectMflac(data) {
        } catch (e) {
        }
    }
-    return mask
+    return mask;
 }

-export function QmcMaskDetectMgg(input) {
-    if (input.length < QMOggConstHeader.length) return;
+export function QmcMaskDetectMgg(data) {
+    if (data.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 mask = data[idx128] ^ QMOggConstHeader[idx128];
        let confidence = QMOggConstHeaderConfidence[idx128];
        if (mask in matrixConfidence[idx58]) {
            matrixConfidence[idx58][mask] += confidence
@@ -146,7 +146,9 @@ export function QmcMaskDetectMgg(input) {
    } catch (e) {
        return;
    }
-    return new QmcMask(matrix, superA, superB);
+    const mask = new QmcMask(matrix, superA, superB);
+    if (!IsBytesEqual(OGG_HEADER, mask.Decrypt(data.slice(0, OGG_HEADER.length)))) return;
+    return mask;
 }

 export function QmcMaskCreate128(mask128) {
--- a/src/decrypt/raw.js
+++ b/src/decrypt/raw.js
@@ -1,5 +1,5 @@
 const musicMetadata = require("music-metadata-browser");
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetCoverURL, GetFileInfo} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetMetaCoverURL, GetFileInfo} from "./util";

 export async function Decrypt(file, raw_filename, raw_ext, detect = true) {
    let ext = raw_ext;
@@ -16,7 +16,7 @@ export async function Decrypt(file, raw_filename, raw_ext, detect = true) {
        artist: info.artist,
        ext: ext,
        album: tag.common.album,
-        picture: GetCoverURL(tag),
+        picture: GetMetaCoverURL(tag),
        file: URL.createObjectURL(file),
        mime: AudioMimeType[ext]
    }
--- a/src/decrypt/util.js
+++ b/src/decrypt/util.js
@@ -1,12 +1,20 @@
+const ID3Writer = require("browser-id3-writer");
 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 WMA_HEADER = [
+    0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11,
+    0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C,
+]
+export const WAV_HEADER = [0x52, 0x49, 0x46, 0x46]
 export const AudioMimeType = {
    mp3: "audio/mpeg",
    flac: "audio/flac",
    m4a: "audio/mp4",
-    ogg: "audio/ogg"
+    ogg: "audio/ogg",
+    wma: "audio/x-ms-wma",
+    wav: "audio/x-wav"
 };

 // Also a new draft API: blob.arrayBuffer()
@@ -20,9 +28,9 @@ export async function GetArrayBuffer(blobObject) {
    });
 }

-export function GetFileInfo(artist, title, filenameNoExt) {
+export function GetFileInfo(artist, title, filenameNoExt, separator = "-") {
    let newArtist = "", newTitle = "";
-    let filenameArray = filenameNoExt.split("-");
+    let filenameArray = filenameNoExt.split(separator);
    if (filenameArray.length > 1) {
        newArtist = filenameArray[0].trim();
        newTitle = filenameArray[1].trim();
@@ -38,7 +46,7 @@ export function GetFileInfo(artist, title, filenameNoExt) {
 /**
 * @return {string}
 */
-export function GetCoverURL(metadata) {
+export function GetMetaCoverURL(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});
@@ -61,6 +69,58 @@ 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";
+    if (IsBytesEqual(M4A_HEADER, data.slice(4, 4 + M4A_HEADER.length))) return "m4a";
+    if (IsBytesEqual(WMA_HEADER, data.slice(0, WMA_HEADER.length))) return "wma";
+    if (IsBytesEqual(WAV_HEADER, data.slice(0, WAV_HEADER.length))) return "wav";
    return fallbackExt;
 }
+
+
+export async function GetWebImage(pic_url) {
+    try {
+        let resp = await fetch(pic_url);
+        let mime = resp.headers.get("Content-Type");
+        if (mime.startsWith("image/")) {
+            let buf = await resp.arrayBuffer();
+            let objBlob = new Blob([buf], {type: mime});
+            let objUrl = URL.createObjectURL(objBlob);
+            return {"buffer": buf, "url": objUrl, "type": mime};
+        }
+    } catch (e) {
+    }
+    return {"buffer": null, "url": "", "type": ""}
+}
+
+export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
+    const writer = new ID3Writer(audioData);
+    writer.setFrame("TPE1", artistList)
+        .setFrame("TIT2", title)
+        .setFrame("TALB", album);
+    if (pictureData !== null) {
+        writer.setFrame('APIC', {
+            type: 3,
+            data: pictureData,
+            description: pictureDesc,
+        })
+    }
+    writer.addTag();
+    return writer.arrayBuffer;
+}
+
+export function RequestJsonp(url, callback_name = "callback") {
+    return new Promise((resolve, reject) => {
+        let node;
+        window[callback_name] = function (data) {
+            delete window[callback_name];
+            if (node.parentNode) node.parentNode.removeChild(node);
+            resolve(data)
+        };
+        node = document.createElement('script');
+        node.type = "text/javascript";
+        node.src = url;
+        node.addEventListener('error', msg => {
+            reject(msg);
+        });
+        document.head.appendChild(node);
+    });
+}
--- a/src/decrypt/xm.js
+++ b/src/decrypt/xm.js
@@ -0,0 +1,72 @@
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetMetaCoverURL,
+    IsBytesEqual
+} from "./util";
+
+import {Decrypt as RawDecrypt} from "./raw";
+
+const musicMetadata = require("music-metadata-browser");
+const MagicHeader = [0x69, 0x66, 0x6D, 0x74]
+const MagicHeader2 = [0xfe, 0xfe, 0xfe, 0xfe]
+const FileTypeMap = {
+    " WAV": ".wav",
+    "FLAC": ".flac",
+    " MP3": ".mp3",
+    " A4M": ".m4a",
+}
+
+export async function Decrypt(file, raw_filename, raw_ext) {
+    const oriData = new Uint8Array(await GetArrayBuffer(file));
+    if (!IsBytesEqual(MagicHeader, oriData.slice(0, 4)) ||
+        !IsBytesEqual(MagicHeader2, oriData.slice(8, 12))) {
+        if (raw_ext === "xm") {
+            return {status: false, message: "Not a valid xm file!"}
+        } else {
+            return await RawDecrypt(file, raw_filename, raw_ext, true)
+        }
+    }
+
+    let typeText = (new TextDecoder()).decode(oriData.slice(4, 8))
+    if (!FileTypeMap.hasOwnProperty(typeText)) {
+        return {status: false, message: "New Xiami file category!"}
+    }
+
+    let key = oriData[0xf]
+    let dataOffset = oriData[0xc] | oriData[0xd] << 8
+    let audioData = oriData.slice(0x10);
+    let lenAudioData = audioData.length;
+    for (let cur = dataOffset; cur < lenAudioData; ++cur)
+        audioData[cur] = (audioData[cur] - key) ^ 0xff;
+
+    const ext = DetectAudioExt(audioData, "mp3");
+    const mime = AudioMimeType[ext];
+    let musicBlob = new Blob([audioData], {type: mime});
+
+    const musicMeta = await musicMetadata.parseBlob(musicBlob);
+    if (ext === "wav") {
+        //todo:未知的编码方式
+        musicMeta.common.album = "";
+        musicMeta.common.artist = "";
+        musicMeta.common.title = "";
+    }
+
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, "_");
+
+    const imgUrl = GetMetaCoverURL(musicMeta);
+
+    return {
+        status: true,
+        title: info.title,
+        artist: info.artist,
+        ext: ext,
+        album: musicMeta.common.album,
+        picture: imgUrl,
+        file: URL.createObjectURL(musicBlob),
+        mime: mime
+    }
+}
+
--- a/src/main.js
+++ b/src/main.js
@@ -3,10 +3,10 @@ import App from './App.vue'
 import './registerServiceWorker'
 import {
    Button, Col, Container, Footer, Icon, Image, Link, Main,
-    Row, Table, TableColumn, Upload, Radio, Checkbox,
-    Notification,
+    Row, Table, TableColumn, Upload, Radio, Checkbox, Progress,
+    Notification, Tooltip,
 } from 'element-ui';
-import 'element-ui/lib/theme-chalk/index.css'
+import 'element-ui/lib/theme-chalk/base.css';

 Vue.use(Link);
 Vue.use(Image);
@@ -22,6 +22,8 @@ Vue.use(Col);
 Vue.use(Upload);
 Vue.use(Checkbox);
 Vue.use(Radio);
+Vue.use(Tooltip);
+Vue.use(Progress);
 Vue.prototype.$notify = Notification;

 Vue.config.productionTip = false;
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -5,10 +5,7 @@ import {register} from 'register-service-worker'
 if (process.env.NODE_ENV === 'production') {
    register(`${process.env.BASE_URL}service-worker.js`, {
        ready() {
-            console.log(
-                'App is being served from cache by a service worker.\n' +
-                'For more details, visit https://goo.gl/AFskqB'
-            )
+            console.log('App is being served from cache by a service worker.')
        },
        registered() {
            console.log('Service worker has been registered.')
Author	SHA1	Message	Date
MengYX	e31eb9c1f1	Bug Fix in Worker Mode	2020-04-23 21:23:01 +08:00
MengYX	f64fa71b1e	Remove Console Log	2020-04-23 21:16:41 +08:00
MengYX	181a3c402f	Update README.md	2020-04-23 21:12:11 +08:00
MengYX	4c4e4061f5	Update Description and Bump Version Small Fixes	2020-04-23 21:10:25 +08:00
MengYX	2526adcab0	Add Support For Xiami .xm Files!	2020-04-23 20:46:08 +08:00
MengYX	f2ea85bae9	Merge remote-tracking branch 'ixarea/master'	2020-04-23 18:17:58 +08:00
MengYX	c07d55565d	Small Changes	2020-04-23 18:16:33 +08:00
MengYX	71a8d9fab7	Unlock Kuwo .kwm Files!	2020-04-23 18:15:07 +08:00
MengYX	7233fdc707	Update README Tips	2020-04-22 06:43:40 +00:00
MengYX	0d119094df	Update README.md	2020-04-21 14:31:01 +00:00
MengYX	1f804e1037	Update README.md	2020-04-09 08:37:54 +00:00
MengYX	77d9ca4ba8	Change Browser Tips Condition	2020-04-08 22:47:38 +08:00
MengYX	8f3c74c100	Update README.md	2020-04-08 14:12:05 +00:00
MengYX	29c27bbfd9	Limit Update Tips	2020-04-07 19:02:57 +08:00
MengYX	c87e6e04ed	Bump Version	2020-04-06 18:20:40 +08:00
MengYX	0b52a0acb2	Fix GBK Detect Bug	2020-04-06 13:03:17 +08:00
MengYX	a087da67b2	Update Deps	2020-04-05 19:26:05 +08:00
MengYX	3ca3142d11	Hello 2020!	2020-04-05 19:23:30 +08:00
MengYX	23b01d5f87	Fix GBK Encoding Reading in QQMusic Mp3	2020-04-05 19:20:22 +08:00
MengYX	12025e3709	Get QQMusic Cover URL (Only Display)	2020-04-05 17:56:10 +08:00
MengYX	2415db67be	Move ID3 Writer to Util	2020-04-05 17:31:41 +08:00
MengYX	9569e2f145	Add progress bar for unlocking #37 Add tips for instant save	2020-04-05 12:35:11 +08:00
MengYX	87356a0514	Add Support For .qmc2	2020-04-05 01:01:59 +08:00
MengYX	ff63c420eb	Add Header Check For .mgg	2020-03-18 23:03:39 +08:00
MengYX	1d3725f9a4	Use Npm Registry	2020-03-18 22:45:07 +08:00
MengYX	a70aaf03af	Merge pull request #31 Bump acorn from 6.4.0 to 6.4.1 to fix a security vulnerability	2020-03-15 23:09:18 +08:00
dependabot[bot]	31fdaf11f7	Bump acorn from 6.4.0 to 6.4.1 Bumps [acorn](https://github.com/acornjs/acorn) from 6.4.0 to 6.4.1. - [Release notes](https://github.com/acornjs/acorn/releases) - [Commits](https://github.com/acornjs/acorn/compare/6.4.0...6.4.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-03-15 14:56:29 +00:00