Bump Version

Fix #78 write flac cover sometimes fail

.drone.yml

@@ -19,7 +19,7 @@ steps:
       - npm run build
       - tar -czf legacy.tar.gz -C ./dist .
       - npm run build -- --modern
-      - tar -czf morden.tar.gz -C ./dist .
+      - tar -czf modern.tar.gz -C ./dist .
 
 
   - name: release
@@ -27,7 +27,7 @@ steps:
     settings:
       base_url: https://git.ixarea.com
       files:
-        - morden.tar.gz
+        - modern.tar.gz
         - legacy.tar.gz
       api_key:
         from_secret: gitea_token

.github/workflows/release.yml

@@ -0,0 +1,102 @@
+name: Release and GitHub Pages
+
+on:
+  push:
+    tags:
+    - "v*"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use Node.js 12.x
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    - name: Install Dependencies
+      run: |
+        npm ci
+        npm run fix-compatibility
+    - name: Build Legacy
+      run: |
+        npm run build
+        tar -czf legacy.tar.gz -C ./dist .
+        zip -rJ9 legacy.zip ./dist
+    - name: Build Modern
+      run: |
+        npm run build -- --modern
+        tar -czf modern.tar.gz -C ./dist .
+        zip -rJ9 modern.zip ./dist
+    - run: sha256sum *.tar.gz *.zip > sha256sum.txt
+
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./dist
+
+    - name: Create a Release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: "Build $(date %Y/%m/%d)"
+        draft: true
+
+    - name: Upload Release Assets - legacy.tar.gz
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./legacy.tar.gz
+        asset_name: legacy.tar.gz
+        asset_content_type: application/gzip
+
+    - name: Upload Release Assets - legacy.zip
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./legacy.zip
+        asset_name: legacy.zip
+        asset_content_type: application/zip
+
+    - name: Upload Release Assets - modern.tar.gz
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./modern.tar.gz
+        asset_name: modern.tar.gz
+        asset_content_type: application/gzip
+
+    - name: Upload Release Assets - modern.zip
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./modern.zip
+        asset_name: modern.zip
+        asset_content_type: application/zip
+
+    - name: Upload Release Assets - sha256sum.txt
+      uses: actions/upload-release-asset@v1.0.2
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./sha256sum.txt
+        asset_name: sha256sum.txt
+        asset_content_type: text/plain
+

README.md

@@ -1,25 +1,26 @@
 # Unlock Music 音乐解锁
-- Unlock encrypted music file in browser. 
-- 在浏览器中解锁加密的音乐文件。
+- 在浏览器中解锁加密的音乐文件。 Unlock encrypted music file in browser. 
 - unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
-- 由于存在可能的法律风险以及滥用风险，不再提供Demo服务；Unlock Music的CLI版本正在开发中。
+- Unlock Music的CLI版本正在开发中。
+- 我们新建了Telegram群组，欢迎加入！[https://t.me/unlock_music_chat](https://t.me/unlock_music_chat)
 - [其他测试版工具](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7)
     
-[![Build Status](https://ci.ixarea.com/api/badges/ix64/unlock-music/status.svg)](https://ci.ixarea.com/ix64/unlock-music)
+- ![Release and GitHub Pages](https://github.com/ix64/unlock-music/workflows/Release%20and%20GitHub%20Pages/badge.svg)
 
 # 特性
 ## 支持的格式
 - [x] QQ音乐 (.qmc0/.qmc2/.qmc3/.qmcflac/.qmcogg/[.tkm](https://github.com/ix64/unlock-music/issues/9))
+    - [x] 写入封面图片
 - [x] Moo音乐格式 ([.bkcmp3/.bkcflac](https://github.com/ix64/unlock-music/issues/11))
 - [x] QQ音乐Tm格式 (.tm0/.tm2/.tm3/.tm6)
 - [x] QQ音乐新格式 (实验性支持)
     - [x] .mflac 
     - [x] [.mgg](https://github.com/ix64/unlock-music/issues/3)
 - [x] 网易云音乐格式 (.ncm)
-    - [x] 补全ncm的ID3信息
+    - [x] 补全ncm的ID3/FlacMeta信息
 - [x] 虾米音乐格式 (.xm) (测试阶段)
 - [x] 酷我音乐格式 (.kwm) (测试阶段)
-- [ ] 酷狗音乐格式 (.kgm) ([Alpha测试](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
+- [x] 酷狗音乐格式 (.kgm) ([CLI版本](https://github.com/ix64/unlock-music/wiki/%E5%85%B6%E4%BB%96%E9%9F%B3%E4%B9%90%E6%A0%BC%E5%BC%8F%E5%B7%A5%E5%85%B7#%E9%85%B7%E7%8B%97%E9%9F%B3%E4%B9%90-kgmvpr%E8%A7%A3%E9%94%81%E5%B7%A5%E5%85%B7))
 
 ## 其他特性
 - [x] 在浏览器中解锁

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unlock-music",
-  "version": "1.5.1",
-  "updateInfo": "改善.mgg解锁算法",
+  "version": "1.6.1",
+  "updateInfo": "修复flac文件的meta写入",
   "license": "MIT",
   "description": "Unlock encrypted music file in browser.",
   "repository": {
@@ -21,17 +21,18 @@
     "crypto-js": "^4.0.0",
     "element-ui": "^2.13.0",
     "iconv-lite": "^0.5.1",
+    "metaflac-js": "^1.0.5",
     "music-metadata-browser": "^2.0.5",
     "register-service-worker": "^1.7.1",
     "vue": "^2.6.11"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.3.0",
-    "@vue/cli-plugin-pwa": "^4.3.0",
-    "@vue/cli-service": "^4.3.0",
+    "@vue/cli-plugin-babel": "^4.4.6",
+    "@vue/cli-plugin-pwa": "^4.4.6",
+    "@vue/cli-service": "^4.4.6",
     "babel-plugin-component": "^1.1.1",
     "vue-cli-plugin-element": "^1.0.1",
     "vue-template-compiler": "^2.6.11",
-    "workerize-loader": "^1.1.0"
+    "workerize-loader": "^1.3.0"
   }
 }

public/index.html

@@ -21,10 +21,12 @@
 <div id="loader-mask">
     <div id="loader"></div>
     <noscript>
+        <h3 id="loader-js">请启用JavaScript</h3>
         <img alt=""
              src="https://stats.ixarea.com/ixarea-stats/report?rec=1&action_name=音乐解锁-NoJS&idsite=2"
              style="border:0"/>
     </noscript>
+    <h3 id="loader-source"> 请勿直接运行源代码！ </h3>
     <div hidden id="loader-tips-outdated">
         <h2>您可能在使用不受支持的<span style="color:#f00;">过时</span>浏览器，这可能导致此应用无法正常工作。</h2>
         <h3>如果您使用双核浏览器，您可以尝试切换<span style="color:#f00;">“极速模式”</span>解决此问题。</h3>

src/App.vue

@@ -41,10 +41,11 @@
                 <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
             </el-row>
             <el-row>
-                目前支持网易云音乐(ncm), QQ音乐(qmc, mflac, mgg), 虾米音乐(xm), 酷我音乐(.kwm)
+                目前支持网易云音乐(ncm), QQ音乐(qmc, mflac, mgg), 酷狗音乐(kgm), 虾米音乐(xm), 酷我音乐(.kwm)
                 <a href="https://github.com/ix64/unlock-music/blob/master/README.md" target="_blank">更多</a>。
             </el-row>
             <el-row>
+                <!--如果进行二次开发，此行版权信息不得移除且应明显地标注于页面上-->
                 <span>Copyright &copy; 2019-</span><span v-text="(new Date()).getFullYear()"></span> MengYX
                 音乐解锁使用
                 <a href="https://github.com/ix64/unlock-music/blob/master/LICENSE" target="_blank">MIT许可协议</a>
@@ -61,6 +62,7 @@
     import preview from "./component/preview"
     import {DownloadBlobMusic, RemoveBlobMusic} from "./component/util"
     import config from "../package"
+    import {IXAREA_API_ENDPOINT} from "./decrypt/util";
 
     export default {
         name: 'app',
@@ -90,7 +92,7 @@
                 if (!!mask) mask.remove();
                 let updateInfo;
                 try {
-                    const resp = await fetch("https://stats.ixarea.com/collect/music/app-version", {
+                    const resp = await fetch(IXAREA_API_ENDPOINT + "/music/app-version", {
                         method: "POST", headers: {"Content-Type": "application/json"},
                         body: JSON.stringify({"Version": this.version})
                     });

src/decrypt/common.js

@@ -4,6 +4,7 @@ const XmDecrypt = require("./xm");
 const QmcDecrypt = require("./qmc");
 const RawDecrypt = require("./raw");
 const TmDecrypt = require("./tm");
+const KgmDecrypt = require("./kgm");
 
 export async function CommonDecrypt(file) {
     let raw_ext = file.name.substring(file.name.lastIndexOf(".") + 1, file.name.length).toLowerCase();
@@ -46,12 +47,17 @@ export async function CommonDecrypt(file) {
         case "tm6":// QQ Music IOS M4a
             rt_data = await TmDecrypt.Decrypt(file.raw, raw_filename);
             break;
+        case "vpr":
+        case "kgm":
+        case "kgma":
+            rt_data = await KgmDecrypt.Decrypt(file.raw, raw_filename, raw_ext);
+            break
         default:
             rt_data = {status: false, message: "不支持此文件格式",}
     }
 
-    rt_data.rawExt = raw_ext;
-    rt_data.rawFilename = raw_filename;
-
+    if (!rt_data.rawExt) rt_data.rawExt = raw_ext;
+    if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename;
+    console.log(rt_data);
     return rt_data;
 }

src/decrypt/kgm.js

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

src/decrypt/kwm.js

@@ -1,11 +1,4 @@
-import {
-    AudioMimeType,
-    DetectAudioExt,
-    GetArrayBuffer,
-    GetFileInfo,
-    GetMetaCoverURL,
-    IsBytesEqual
-} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
 
 const musicMetadata = require("music-metadata-browser");
 const MagicHeader = [
@@ -21,17 +14,6 @@ export async function Decrypt(file, raw_filename, raw_ext) {
 
     let fileKey = oriData.slice(0x18, 0x20)
     let mask = createMaskFromKey(fileKey)
-
-    function Uint8ArrayToString(fileData) {
-        var dataString = "";
-        for (var i = 0; i < fileData.length; i++) {
-            dataString += String.fromCharCode(fileData[i]);
-        }
-
-        return dataString
-    }
-
-
     let audioData = oriData.slice(0x400);
     let lenAudioData = audioData.length;
     for (let cur = 0; cur < lenAudioData; ++cur)

src/decrypt/ncm.js

@@ -1,14 +1,23 @@
 const CryptoJS = require("crypto-js");
+const MetaFlac = require('metaflac-js');
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetWebImage, WriteMp3Meta} from "./util"
+const MagicHeader = [0x43, 0x54, 0x45, 0x4E, 0x46, 0x44, 0x41, 0x4D];
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetWebImage,
+    IsBytesEqual,
+    WriteMp3Meta
+} from "./util"
 
 export async function Decrypt(file, raw_filename, raw_ext) {
     const fileBuffer = await GetArrayBuffer(file);
     const dataView = new DataView(fileBuffer);
 
-    if (dataView.getUint32(0, true) !== 0x4e455443 ||
-        dataView.getUint32(4, true) !== 0x4d414446)
+    if (!IsBytesEqual(MagicHeader, new Uint8Array(fileBuffer, 0, 8)))
         return {status: false, message: "此ncm文件已损坏"};
 
     const keyDataObj = getKeyData(dataView, fileBuffer, 10);
@@ -22,7 +31,6 @@ export async function Decrypt(file, raw_filename, raw_ext) {
     let lenAudioData = audioData.length;
     for (let cur = 0; cur < lenAudioData; ++cur) audioData[cur] ^= keyBox[cur & 0xff];
 
-
     if (musicMeta.album === undefined) musicMeta.album = "";
 
     const artists = [];
@@ -31,13 +39,29 @@ 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");
+    console.log(musicMeta)
 
     const imageInfo = await GetWebImage(musicMeta.albumPic);
-    if (musicMeta.format === "mp3") audioData = await WriteMp3Meta(
-        audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+    console.log(imageInfo)
+    try {
+        if (musicMeta.format === "mp3") {
+            audioData = await WriteMp3Meta(
+                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+        } else if (musicMeta.format === "flac") {
+            const writer = new MetaFlac(Buffer.from(audioData))
+            //writer.setTag("TITLE=" + info.title);
+            //writer.setTag("ALBUM=" + musicMeta.album);
+            //artists.forEach(artist => writer.setTag("ARTIST=" + artist));
+            writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
+            audioData = writer.save()
+        }
+    } catch (e) {
+        console.warn("Error while appending cover image to file " + e)
+    }
 
     const mime = AudioMimeType[musicMeta.format];
     const musicData = new Blob([audioData], {type: mime});
+
     return {
         status: true,
         title: info.title,
@@ -132,7 +156,7 @@ function getMetaData(dataView, fileBuffer, offset) {
     if (plainText.slice(0, labelIndex) === "dj") {
         result = result.mainMusic;
     }
-    result.albumPic = result.albumPic.replace("http:", "https:");
+    if (!!result.albumPic) result.albumPic = result.albumPic.replace("http://", "https://");
     return {data: result, offset: offset};
 }
 

src/decrypt/qmc.js

@@ -1,9 +1,22 @@
-import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, RequestJsonp} from "./util";
+import {
+    AudioMimeType,
+    DetectAudioExt,
+    GetArrayBuffer,
+    GetFileInfo,
+    GetMetaCoverURL,
+    GetWebImage,
+    IXAREA_API_ENDPOINT
+} from "./util";
 import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";
-
-
 import {fromByteArray as Base64Encode, toByteArray as Base64Decode} from 'base64-js'
 
+const MetaFlac = require('metaflac-js');
+
+const ID3Writer = require("browser-id3-writer");
+
+const iconv = require('iconv-lite');
+const decode = iconv.decode
+
 const musicMetadata = require("music-metadata-browser");
 
 const HandlerMap = {
@@ -47,6 +60,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
     const musicMeta = await musicMetadata.parseBlob(musicBlob);
     for (let metaIdx in musicMeta.native) {
         if (musicMeta.native[metaIdx].some(item => item.id === "TCON" && item.value === "(12)")) {
+            console.log("The metadata is using gbk encoding")
             musicMeta.common.artist = decode(musicMeta.common.artist, "gbk");
             musicMeta.common.title = decode(musicMeta.common.title, "gbk");
             musicMeta.common.album = decode(musicMeta.common.album, "gbk");
@@ -60,7 +74,32 @@ export async function Decrypt(file, raw_filename, raw_ext) {
     let imgUrl = GetMetaCoverURL(musicMeta);
     if (imgUrl === "") {
         imgUrl = await queryAlbumCoverImage(info.artist, info.title, musicMeta.common.album);
-        //todo: 解决跨域获取图像的问题
+        if (imgUrl !== "") {
+            const imageInfo = await GetWebImage(imgUrl);
+            if (imageInfo.url !== "") {
+                imgUrl = imageInfo.url
+                try {
+                    if (ext === "mp3") {
+                        let writer = new ID3Writer(musicDecoded)
+                        writer.setFrame('APIC', {
+                            type: 3,
+                            data: imageInfo.buffer,
+                            description: "Cover",
+                        })
+                        writer.addTag();
+                        musicDecoded = writer.arrayBuffer
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    } else if (ext === 'flac') {
+                        const writer = new MetaFlac(Buffer.from(musicDecoded))
+                        writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
+                        musicDecoded = writer.save()
+                        musicBlob = new Blob([musicDecoded], {type: mime});
+                    }
+                } catch (e) {
+                    console.warn("Error while appending cover image to file " + e)
+                }
+            }
+        }
     }
     return {
         status: true,
@@ -75,7 +114,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
 }
 
 function reportKeyUsage(keyData, maskData, artist, title, album, filename, format) {
-    fetch("https://stats.ixarea.com/collect/qmcmask/usage", {
+    fetch(IXAREA_API_ENDPOINT + "/qmcmask/usage", {
         method: "POST",
         headers: {"Content-Type": "application/json"},
         body: JSON.stringify({
@@ -87,7 +126,7 @@ function reportKeyUsage(keyData, maskData, artist, title, album, filename, forma
 
 async function queryKeyInfo(keyData, filename, format) {
     try {
-        const resp = await fetch("https://stats.ixarea.com/collect/qmcmask/query", {
+        const resp = await fetch(IXAREA_API_ENDPOINT + "/qmcmask/query", {
             method: "POST",
             headers: {"Content-Type": "application/json"},
             body: JSON.stringify({Format: format, Key: Base64Encode(keyData), Filename: filename, Type: 44}),
@@ -100,23 +139,21 @@ async function queryKeyInfo(keyData, filename, format) {
 }
 
 async function queryAlbumCoverImage(artist, title, album) {
-    let song_query_url = "https://c.y.qq.com/soso/fcgi-bin/client_search_cp?n=10&new_json=1&w=" +
-        encodeURIComponent(artist + " " + title + " " + album);
-    let jsonpData;
-    let queriedSong = undefined;
+    const song_query_url = IXAREA_API_ENDPOINT + "/music/qq-cover"
     try {
-        jsonpData = await RequestJsonp(song_query_url, "callback");
-        queriedSong = jsonpData["data"]["song"]["list"][0];
-    } catch (e) {
-    }
-    let imgUrl = "";
-    if (!!queriedSong && !!queriedSong["album"]) {
-        if (queriedSong["album"]["pmid"] !== undefined) {
-            imgUrl = "https://y.gtimg.cn/music/photo_new/T002M000" + queriedSong["album"]["pmid"] + ".jpg"
-        } else if (queriedSong["album"]["id"] !== undefined) {
-            imgUrl = "https://imgcache.qq.com/music/photo/album/" +
-                queriedSong["album"]["id"] % 100 + "/albumpic_" + queriedSong["album"]["id"] + "_0.jpg"
+        const params = {Artist: artist, Title: title, Album: album};
+        let _url = song_query_url + "?";
+        for (let pKey in params) {
+            _url += pKey + "=" + encodeURIComponent(params[pKey]) + "&"
         }
+        const resp = await fetch(_url)
+        if (resp.ok) {
+            let data = await resp.json();
+            return song_query_url + "/" + data.Type + "/" + data.Id
+        }
+
+    } catch (e) {
+        console.log(e);
     }
-    return imgUrl;
+    return "";
 }

src/decrypt/util.js

@@ -16,6 +16,7 @@ export const AudioMimeType = {
     wma: "audio/x-ms-wma",
     wav: "audio/x-wav"
 };
+export const IXAREA_API_ENDPOINT = "https://stats.ixarea.com/apis"
 
 // Also a new draft API: blob.arrayBuffer()
 export async function GetArrayBuffer(blobObject) {
@@ -91,7 +92,7 @@ export async function GetWebImage(pic_url) {
     return {"buffer": null, "url": "", "type": ""}
 }
 
-export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
+export function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
     const writer = new ID3Writer(audioData);
     writer.setFrame("TPE1", artistList)
         .setFrame("TIT2", title)

src/decrypt/xm.js

@@ -1,11 +1,4 @@
-import {
-    AudioMimeType,
-    DetectAudioExt,
-    GetArrayBuffer,
-    GetFileInfo,
-    GetMetaCoverURL,
-    IsBytesEqual
-} from "./util";
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
 
 import {Decrypt as RawDecrypt} from "./raw";
 
@@ -24,7 +17,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
     if (!IsBytesEqual(MagicHeader, oriData.slice(0, 4)) ||
         !IsBytesEqual(MagicHeader2, oriData.slice(8, 12))) {
         if (raw_ext === "xm") {
-            return {status: false, message: "Not a valid xm file!"}
+            return {status: false, message: "此xm文件已损坏"}
         } else {
             return await RawDecrypt(file, raw_filename, raw_ext, true)
         }
@@ -32,7 +25,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
 
     let typeText = (new TextDecoder()).decode(oriData.slice(4, 8))
     if (!FileTypeMap.hasOwnProperty(typeText)) {
-        return {status: false, message: "New Xiami file category!"}
+        return {status: false, message: "未知的xm文件类型"}
     }
 
     let key = oriData[0xf]
@@ -66,7 +59,8 @@ export async function Decrypt(file, raw_filename, raw_ext) {
         album: musicMeta.common.album,
         picture: imgUrl,
         file: URL.createObjectURL(musicBlob),
-        mime: mime
+        mime: mime,
+        rawExt: "xm"
     }
 }
 

src/main.js

@@ -2,9 +2,23 @@ import Vue from 'vue'
 import App from './App.vue'
 import './registerServiceWorker'
 import {
-    Button, Col, Container, Footer, Icon, Image, Link, Main,
-    Row, Table, TableColumn, Upload, Radio, Checkbox, Progress,
-    Notification, Tooltip,
+    Button,
+    Checkbox,
+    Col,
+    Container,
+    Footer,
+    Icon,
+    Image,
+    Link,
+    Main,
+    Notification,
+    Progress,
+    Radio,
+    Row,
+    Table,
+    TableColumn,
+    Tooltip,
+    Upload
 } from 'element-ui';
 import 'element-ui/lib/theme-chalk/base.css';
 
@@ -27,7 +41,7 @@ Vue.use(Progress);
 Vue.prototype.$notify = Notification;
 
 Vue.config.productionTip = false;
-
+document.getElementById("loader-source").remove()
 new Vue({
     render: h => h(App),
 }).$mount('#app');