Bump Version

Merge pull request #97 增加对QQ音乐微云网盘格式的支持

.drone.yml

@@ -10,7 +10,7 @@ steps:
   - name: installDependencies
     image: node:lts
     commands:
-      - npm ci --verbose --registry=https://registry.npm.taobao.org
+      - npm ci --registry=https://registry.npm.taobao.org
 
   - name: build
     image: node:lts
@@ -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/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,38 @@
+---
+name: Bug报告
+about: 报告Bug以帮助改进程序
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+- 请按照此模板填写，否则可能立即被关闭
+- [x] 我确认已经搜索过Issue不存并确认相同的Issue
+- [x] 我认为这是程序导致的问题（如不确认，请先通过Telegram或者Email进行咨询）
+
+
+**Bug描述**
+
+简要地复述你遇到的Bug
+
+**复现方法**
+
+描述复现方法，必要时请提供样本文件
+
+**程序截图或者Console报错信息**
+
+如果可以请提供二者之一
+
+
+**环境信息:**
+
+ - 操作系统和浏览器：
+ - 程序版本：
+ - 获取音乐文件所使用的客户端及其版本信息：
+
+
+**附加信息**
+
+其他能够帮助确认问题的信息
+

.github/ISSUE_TEMPLATE/new-feature.md

@@ -0,0 +1,26 @@
+---
+name: 新功能
+about: 对于程序新的想法或建议
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+- 请按照此模板填写，否则可能立即被关闭
+
+**背景和说明**
+
+简要说明产生此想法的背景和此想法的具体内容
+
+
+**实现途径**
+
+- 如果没有设计方案，请简要描述实现思路
+- 如果你没有任何的实现思路，请通过Telegram进行讨论
+
+
+**附加信息**
+
+更多你想要表达的内容
+

.github/workflows/release.yml

@@ -0,0 +1,106 @@
+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: Get current time
+      id: date
+      run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
+
+    - 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 ${{ steps.date.outputs.date }}"
+        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 the 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] 在浏览器中解锁
@@ -33,6 +34,7 @@
 # 使用方法
 ## 使用已构建版本
 - 从[GitHub Release](https://github.com/ix64/unlock-music/releases/latest)下载已构建的版本
+    - 本地使用请下载`legacy版本`（`modern版本`只能通过**http/https协议**访问）
 - 解压缩后即可部署或本地使用（**请勿直接运行源代码**）
 
 ## 自行构建

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unlock-music",
-  "version": "1.5.0",
+  "version": "1.6.4",
-  "updateInfo": "支持酷我.kwm;支持虾米.xm",
+  "updateInfo": "支持QQ音乐微云网盘格式；.kgm解锁的一些优化",
   "license": "MIT",
   "description": "Unlock encrypted music file in browser.",
   "repository": {
@@ -15,22 +15,25 @@
     "fix-compatibility": "node ./src/fix-compatibility.js"
   },
   "dependencies": {
+    "base64-js": "^1.3.1",
     "browser-id3-writer": "^4.4.0",
     "core-js": "^3.6.4",
     "crypto-js": "^4.0.0",
     "element-ui": "^2.13.0",
     "iconv-lite": "^0.5.1",
-    "music-metadata-browser": "^2.0.5",
+    "jimp": "^0.14.0",
+    "metaflac-js": "^1.0.5",
+    "music-metadata-browser": "^2.1.4",
     "register-service-worker": "^1.7.1",
-    "vue": "^2.6.11"
+    "vue": "^2.6.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.3.0",
+    "@vue/cli-plugin-babel": "^4.5.6",
-    "@vue/cli-plugin-pwa": "^4.3.0",
+    "@vue/cli-plugin-pwa": "^4.5.6",
-    "@vue/cli-service": "^4.3.0",
+    "@vue/cli-service": "^4.5.6",
     "babel-plugin-component": "^1.1.1",
     "vue-cli-plugin-element": "^1.0.1",
-    "vue-template-compiler": "^2.6.11",
+    "vue-template-compiler": "^2.6.12",
-    "workerize-loader": "^1.1.0"
+    "workerize-loader": "^1.3.0"
   }
 }

public/index.html

@@ -10,7 +10,7 @@
     <!--@formatter:on-->
     <script async src="https://stats.ixarea.com/ixarea-stats.js"></script>
     <title>音乐解锁 - By IXarea</title>
-    <meta content="音乐,解锁,ncm,qmc,qmc0,qmc3,qmcflac,qmcogg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
+    <meta content="音乐,解锁,ncm,qmc,mgg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
     <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
     <!--@formatter:off-->
     <style>#loader{position:absolute;left:50%;top:50%;z-index:1010;margin:-75px 0 0 -75px;border:16px solid #f3f3f3;border-radius:50%;border-top:16px solid #3498db;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(360deg)}}#loader-mask{position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,0.88)}</style>
@@ -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})
                     });
@@ -99,15 +101,15 @@
                 }
                 if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
                     (!!updateInfo.Found && window.location.protocol !== "https:"))) {
-                    this.$notify.warning({
+                  this.$notify.warning({
-                        title: '发现更新',
+                    title: '发现更新',
-                        message: '发现新版本 v' + updateInfo.Version +
+                    message: '发现新版本 v' + updateInfo.Version +
-                            '<br/>更新详情：' + updateInfo.Detail +
+                        '<br/>更新详情：' + updateInfo.Detail +
-                            '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
+                        '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
-                        dangerouslyUseHTMLString: true,
+                    dangerouslyUseHTMLString: true,
-                        duration: 15000,
+                    duration: 15000,
-                        position: 'top-left'
+                    position: 'top-left'
-                    });
+                  });
                 } else {
                     this.$notify.info({
                         title: '离线使用',

src/component/upload.vue

@@ -47,12 +47,12 @@
                 this.idle_workers.push(0);
                 // delay to optimize for first loading
                 setTimeout(() => {
-                    for (let i = 1; i < this.thread_num; i++) {
+                  for (let i = 1; i < this.thread_num; i++) {
-                        // noinspection JSValidateTypes,JSUnresolvedVariable
+                    // noinspection JSValidateTypes,JSUnresolvedVariable
-                        this.workers.push(worker().CommonDecrypt);
+                    this.workers.push(worker().CommonDecrypt);
-                        this.idle_workers.push(i);
+                    this.idle_workers.push(i);
-                    }
+                  }
-                }, 1000);
+                }, 5000);
             } else {
                 const dec = require('../decrypt/common');
                 this.workers.push(dec.CommonDecrypt);

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();
@@ -40,18 +41,28 @@ export async function CommonDecrypt(file) {
         case "bkcflac"://Moo Music Flac
         case "mflac"://QQ Music Desktop Flac
         case "mgg": //QQ Music Desktop Ogg
+        case "666c6163"://QQ Music Weiyun Flac
+        case "6d7033"://QQ Music Weiyun Mp3
+        case "6f6767"://QQ Music Weiyun Ogg
+        case "6d3461"://QQ Music Weiyun M4a
+        case "776176"://QQ Music Weiyun Wav
             rt_data = await QmcDecrypt.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;
+        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;
+    if (!rt_data.rawExt) rt_data.rawExt = raw_ext;
-    rt_data.rawFilename = raw_filename;
+    if (!rt_data.rawFilename) rt_data.rawFilename = raw_filename;
-
+    console.log(rt_data);
     return rt_data;
 }

src/decrypt/kgm.js

@@ -0,0 +1,120 @@
+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]
+
+export async function Decrypt(file, raw_filename, raw_ext) {
+    try {
+        if (window.location.protocol === "file:") {
+            return {
+                status: false,
+                message: "请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+            }
+        }
+    } catch {
+    }
+    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 {
+import {AudioMimeType, DetectAudioExt, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
-    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,25 @@
 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 jimp from 'jimp';
+
+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 ||
+    if (!IsBytesEqual(MagicHeader, new Uint8Array(fileBuffer, 0, 8)))
-        dataView.getUint32(4, true) !== 0x4d414446)
         return {status: false, message: "此ncm文件已损坏"};
 
     const keyDataObj = getKeyData(dataView, fileBuffer, 10);
@@ -22,22 +33,43 @@ 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 = [];
     if (!!musicMeta.artist) musicMeta.artist.forEach(arr => artists.push(arr[0]));
-    const info = GetFileInfo(artists.join(" & "), musicMeta.musicName, raw_filename);
+    const info = GetFileInfo(artists.join("; "), musicMeta.musicName, raw_filename);
     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(
+    while (!!imageInfo.buffer && imageInfo.buffer.byteLength >= 16 * 1024 * 1024) {
-        audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+        let img = await jimp.read(imageInfo.buffer)
+        await img.resize(Math.round(img.getHeight() / 2), jimp.AUTO)
+        imageInfo.buffer = await img.getBufferAsync("image/jpeg")
+    }
+    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))
+            if (writer.getTag("TITLE") === "") writer.setTag("TITLE=" + info.title)
+            if (writer.getTag("ALBUM") === "") writer.setTag("ALBUM=" + musicMeta.album)
+            writer.removeTag("ARTIST")
+            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 +164,9 @@ 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 = result.albumPic.replace("http://", "https://") + "?param=500y500";
+
     return {data: result, offset: offset};
 }
 

src/decrypt/qmc.js

@@ -1,7 +1,21 @@
-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'
 
-import {decode} from "iconv-lite"
+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");
 
@@ -15,7 +29,12 @@ const HandlerMap = {
     "qmcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
     "bkcmp3": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
     "bkcflac": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
-    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false}
+    "tkm": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "666c6163": {handler: QmcMaskGetDefault, ext: "flac", detect: false},
+    "6d7033": {handler: QmcMaskGetDefault, ext: "mp3", detect: false},
+    "6f6767": {handler: QmcMaskGetDefault, ext: "ogg", detect: false},
+    "6d3461": {handler: QmcMaskGetDefault, ext: "m4a", detect: false},
+    "776176": {handler: QmcMaskGetDefault, ext: "wav", detect: false}
 };
 
 export async function Decrypt(file, raw_filename, raw_ext) {
@@ -25,11 +44,13 @@ export async function Decrypt(file, raw_filename, raw_ext) {
     const fileData = new Uint8Array(await GetArrayBuffer(file));
     let audioData, seed, keyData;
     if (handler.detect) {
-        audioData = fileData.slice(0, -0x170);
+        const keyLen = new DataView(fileData.slice(fileData.length - 4).buffer).getUint32(0, true)
+        const keyPos = fileData.length - 4 - keyLen;
+        audioData = fileData.slice(0, keyPos);
         seed = handler.handler(audioData);
-        keyData = fileData.slice(-0x170);
+        keyData = fileData.slice(keyPos, keyPos + keyLen);
         if (seed === undefined) seed = await queryKeyInfo(keyData, raw_filename, raw_ext);
-        if (seed === undefined) return {status: false, message: raw_ext + "格式仅提供实验性支持！"};
+        if (seed === undefined) return {status: false, message: raw_ext + "格式仅提供实验性支持"};
     } else {
         audioData = fileData;
         seed = handler.handler(audioData);
@@ -44,6 +65,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.warn("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");
@@ -57,7 +79,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,
@@ -72,11 +119,11 @@ 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({
-            Mask: Array.from(maskData), Key: Array.from(keyData),
+            Mask: Base64Encode(new Uint8Array(maskData)), Key: Base64Encode(keyData),
             Artist: artist, Title: title, Album: album, Filename: filename, Format: format
         }),
     }).then().catch()
@@ -84,35 +131,34 @@ 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: Array.from(keyData), Filename: filename}),
+            body: JSON.stringify({Format: format, Key: Base64Encode(keyData), Filename: filename, Type: 44}),
         });
         let data = await resp.json();
-        return QmcMaskCreate58(data.Matrix58, data.Super58A, data.Super58B);
+        return QmcMaskCreate58(Base64Decode(data.Matrix44));
     } catch (e) {
+        console.log(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=" +
+    const song_query_url = IXAREA_API_ENDPOINT + "/music/qq-cover"
-        encodeURIComponent(artist + " " + title + " " + album);
-    let jsonpData;
-    let queriedSong = undefined;
     try {
-        jsonpData = await RequestJsonp(song_query_url, "callback");
+        const params = {Artist: artist, Title: title, Album: album};
-        queriedSong = jsonpData["data"]["song"]["list"][0];
+        let _url = song_query_url + "?";
-    } catch (e) {
+        for (let pKey in params) {
-    }
+            _url += pKey + "=" + encodeURIComponent(params[pKey]) + "&"
-    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 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/qmcMask.js

@@ -1,50 +1,57 @@
 import {FLAC_HEADER, IsBytesEqual, OGG_HEADER} from "./util"
 
-const QMOggConstHeader = [
+const QMOggPublicHeader1 = [
-    0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x4f, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1E, 0x01, 0x76, 0x6F, 0x72,
+    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x1e, 0x01, 0x76, 0x6f, 0x72,
-    0x62, 0x69, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x44, 0xAC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x62, 0x69, 0x73, 0x00, 0x00, 0x00, 0x00, 0x02, 0x44, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0xEE, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x01, 0x4F, 0x67, 0x67, 0x53, 0x00, 0x00,
+    0x00, 0xee, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x01, 0x4f, 0x67, 0x67, 0x53, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xff, 0xff, 0xff, 0xff];
-    0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x03, 0x76, 0x6F, 0x72, 0x62, 0x69, 0x73, 0x2C, 0x00, 0x00, 0x00,
+const QMOggPublicHeader2 = [
-    0x58, 0x69, 0x70, 0x68, 0x2E, 0x4F, 0x72, 0x67, 0x20, 0x6C, 0x69, 0x62, 0x56, 0x6F, 0x72, 0x62,
+    0x03, 0x76, 0x6f, 0x72, 0x62, 0x69, 0x73, 0x2c, 0x00, 0x00, 0x00, 0x58, 0x69, 0x70, 0x68, 0x2e,
-    0x69, 0x73, 0x20, 0x49, 0x20, 0x32, 0x30, 0x31, 0x35, 0x30, 0x31, 0x30, 0x35, 0x20, 0x28, 0xE2,
+    0x4f, 0x72, 0x67, 0x20, 0x6c, 0x69, 0x62, 0x56, 0x6f, 0x72, 0x62, 0x69, 0x73, 0x20, 0x49, 0x20,
-    0x9B, 0x84, 0xE2, 0x9B, 0x84, 0xE2, 0x9B, 0x84, 0xE2, 0x9B, 0x84, 0x29, 0x00, 0x00, 0x00, 0x00,
+    0x32, 0x30, 0x31, 0x35, 0x30, 0x31, 0x30, 0x35, 0x20, 0x28, 0xe2, 0x9b, 0x84, 0xe2, 0x9b, 0x84,
-    0x00, 0x00, 0x00, 0x00, 0x54, 0x49, 0x54, 0x4C, 0x45, 0x3D];
+    0xe2, 0x9b, 0x84, 0xe2, 0x9b, 0x84, 0x29, 0xff, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x54,
-const QMOggConstHeaderConfidence = [
+    0x49, 0x54, 0x4c, 0x45, 0x3d];
+const QMOggPublicConf1 = [
     9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 0,
     0, 0, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9,
     9, 9, 9, 9, 9, 9, 9, 6, 3, 3, 3, 3, 6, 6, 6, 6,
     3, 3, 3, 3, 6, 6, 6, 6, 6, 9, 9, 9, 9, 9, 9, 9,
     9, 9, 9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 9, 9, 9, 9,
-    0, 0, 0, 0, 6, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+    0, 0, 0, 0];
-    3, 3, 3, 3, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+const QMOggPublicConf2 = [
-    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 1, 9, 9,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    0, 1, 9, 9, 9, 9, 9, 9, 9, 9];
+    3, 3, 3, 3, 3, 3, 3, 0, 1, 3, 3, 0, 1, 3, 3, 3,
+    3, 3, 3, 3, 3];
 const QMCDefaultMaskMatrix = [
-    0x4A, 0xD6, 0xCA, 0x90, 0x67, 0xF7, 0x52, 0x5E,
+    0xde, 0x51, 0xfa, 0xc3, 0x4a, 0xd6, 0xca, 0x90,
-    0x95, 0x23, 0x9F, 0x13, 0x11, 0x7E, 0x47, 0x74,
+    0x7e, 0x67, 0x5e, 0xf7, 0xd5, 0x52, 0x84, 0xd8,
-    0x3D, 0x90, 0xAA, 0x3F, 0x51, 0xC6, 0x09, 0xD5,
+    0x47, 0x95, 0xbb, 0xa1, 0xaa, 0xc6, 0x66, 0x23,
-    0x9F, 0xFA, 0x66, 0xF9, 0xF3, 0xD6, 0xA1, 0x90,
+    0x92, 0x62, 0xf3, 0x74, 0xa1, 0x9f, 0xf4, 0xa0,
-    0xA0, 0xF7, 0xF0, 0x1D, 0x95, 0xDE, 0x9F, 0x84,
+    0x1d, 0x3f, 0x5b, 0xf0, 0x13, 0x0e, 0x09, 0x3d,
-    0x11, 0xF4, 0x0E, 0x74, 0xBB, 0x90, 0xBC, 0x3F,
+    0xf9, 0xbc, 0x00, 0x11];
-    0x92, 0x00, 0x09, 0x5B, 0x9F, 0x62, 0x66, 0xA1];
+
-const QMCDefaultMaskSuperA = 0xC3;
-const QMCDefaultMaskSuperB = 0xD8;
 
 class QmcMask {
     constructor(matrix, superA, superB) {
         if (superA === undefined || superB === undefined) {
-            this.Matrix128 = matrix;
+            if (matrix.length === 44) {
+                this.Matrix44 = matrix
+                this.generateMask128from44()
+            } else {
+                this.Matrix128 = matrix
+                this.generateMask44from128()
+            }
             this.generateMask58from128()
         } else {
             this.Matrix58 = matrix;
             this.Super58A = superA;
             this.Super58B = superB;
             this.generateMask128from58();
+            this.generateMask44from128()
         }
     }
 
@@ -88,6 +95,35 @@ class QmcMask {
         this.Super58B = superB;
     }
 
+    generateMask44from128() {
+        if (this.Matrix128.length !== 128) throw "incorrect mask128 matrix length";
+        let mapping = GetConvertMapping()
+        this.Matrix44 = []
+        let idxI44 = 0
+        mapping.forEach(it256 => {
+            let it256Len = it256.length
+            for (let i = 1; i < it256Len; i++) {
+                if (this.Matrix128[it256[0]] !== this.Matrix128[it256[i]]) {
+                    throw "decode mask-128 to mask-44 failed"
+                }
+            }
+            this.Matrix44[idxI44] = this.Matrix128[it256[0]]
+            idxI44++
+        })
+    }
+
+    generateMask128from44() {
+        if (this.Matrix44.length !== 44) throw "incorrect mask length"
+        this.Matrix128 = []
+        let idx44 = 0
+        GetConvertMapping().forEach(it256 => {
+            it256.forEach(m => {
+                this.Matrix128[m] = this.Matrix44[idx44]
+            })
+            idx44++
+        })
+    }
+
     Decrypt(data) {
         let dst = data.slice(0);
         let index = -1;
@@ -107,7 +143,7 @@ class QmcMask {
 }
 
 export function QmcMaskGetDefault() {
-    return new QmcMask(QMCDefaultMaskMatrix, QMCDefaultMaskSuperA, QMCDefaultMaskSuperB)
+    return new QmcMask(QMCDefaultMaskMatrix)
 }
 
 export function QmcMaskDetectMflac(data) {
@@ -123,31 +159,38 @@ export function QmcMaskDetectMflac(data) {
 }
 
 export function QmcMaskDetectMgg(data) {
-    if (data.length < QMOggConstHeader.length) return;
+    if (data.length < 0x100) return
     let matrixConfidence = {};
-    for (let i = 0; i < 58; i++) matrixConfidence[i] = {};
+    for (let i = 0; i < 44; i++) matrixConfidence[i] = {};
 
-    for (let idx128 = 0; idx128 < QMOggConstHeader.length; idx128++) {
+    const page2 = data[0x54] ^ data[0xC] ^ QMOggPublicHeader1[0xC];
-        if (QMOggConstHeaderConfidence[idx128] === 0) continue;
+    const spHeader = QmcGenerateOggHeader(page2)
-        let idx58 = GetMask58Index(idx128);
+    const spConf = QmcGenerateOggConf(page2)
-        let mask = data[idx128] ^ QMOggConstHeader[idx128];
+
-        let confidence = QMOggConstHeaderConfidence[idx128];
+    for (let idx128 = 0; idx128 < spHeader.length; idx128++) {
-        if (mask in matrixConfidence[idx58]) {
+        if (spConf[idx128] === 0) continue;
-            matrixConfidence[idx58][mask] += confidence
+        let idx44 = GetMask44Index(idx128);
+        let _m = data[idx128] ^ spHeader[idx128]
+        let confidence = spConf[idx128];
+        if (_m in matrixConfidence[idx44]) {
+            matrixConfidence[idx44][_m] += confidence
         } else {
-            matrixConfidence[idx58][mask] = confidence
+            matrixConfidence[idx44][_m] = confidence
         }
     }
-    let matrix = [], superA, superB;
+    let matrix = [];
     try {
-        for (let i = 0; i < 56; i++) matrix[i] = getMaskConfidenceResult(matrixConfidence[i]);
+        for (let i = 0; i < 44; i++)
-        superA = getMaskConfidenceResult(matrixConfidence[56]);
+            matrix[i] = getMaskConfidenceResult(matrixConfidence[i]);
-        superB = getMaskConfidenceResult(matrixConfidence[57]);
     } catch (e) {
         return;
     }
-    const mask = new QmcMask(matrix, superA, superB);
+    const mask = new QmcMask(matrix);
-    if (!IsBytesEqual(OGG_HEADER, mask.Decrypt(data.slice(0, OGG_HEADER.length)))) return;
+    let dx = mask.Decrypt(data.slice(0, OGG_HEADER.length));
+    if (!IsBytesEqual(OGG_HEADER, dx)) {
+        return;
+    }
+
     return mask;
 }
 
@@ -159,12 +202,17 @@ export function QmcMaskCreate58(matrix, superA, superB) {
     return new QmcMask(matrix, superA, superB)
 }
 
+export function QmcMaskCreate44(mask44) {
+    return new QmcMask(mask44)
+}
+
 /**
  * @param confidence {{}}
  * @returns {number}
  */
 function getMaskConfidenceResult(confidence) {
     if (confidence.length === 0) throw "can not match at least one key";
+    if (confidence.length > 1) console.warn("There are 2 potential value for the mask!")
     let result, conf = 0;
     for (let idx in confidence) {
         if (confidence[idx] > conf) {
@@ -178,27 +226,48 @@ function getMaskConfidenceResult(confidence) {
 /**
  * @return {number}
  */
-function GetMask58Index(idx128) {
+
-    if (idx128 > 127) idx128 = idx128 % 128;
+
-    let col = idx128 % 16;
+const allMapping = [];
-    let row = (idx128 - col) / 16;
+const mask128to44 = [];
-    switch (col) {
+
-        case 0://Super 1
+(function () {
-            row = 8;
+    for (let i = 0; i < 128; i++) {
-            col = 0;
+        let realIdx = (i * i + 27) % 256
-            break;
+        if (realIdx in allMapping) {
-        case 8://Super 2
+            allMapping[realIdx].push(i)
-            row = 8;
+        } else {
-            col = 1;
+            allMapping[realIdx] = [i]
-            break;
+        }
-        default:
-            if (col > 7) {
-                row = 7 - row;
-                col = 15 - col;
-            } else {
-                col -= 1;
-            }
-            break;
     }
-    return row * 7 + col
+
+    let idx44 = 0
+    allMapping.forEach(all128 => {
+        all128.forEach(_i128 => {
+            mask128to44[_i128] = idx44
+        })
+        idx44++
+    })
+})();
+
+function GetConvertMapping() {
+    return allMapping;
 }
+
+function GetMask44Index(idx128) {
+    return mask128to44[idx128 % 128]
+}
+
+function QmcGenerateOggHeader(page2) {
+    let spec = [page2, 0xFF]
+    for (let i = 2; i < page2; i++) spec.push(0xFF)
+    spec.push(0xFF)
+    return QMOggPublicHeader1.concat(spec, QMOggPublicHeader2)
+}
+
+function QmcGenerateOggConf(page2) {
+    let specConf = [6, 0]
+    for (let i = 2; i < page2; i++) specConf.push(4)
+    specConf.push(0)
+    return QMOggPublicConf1.concat(specConf, QMOggPublicConf2)
+}

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) {
@@ -84,14 +85,14 @@ export async function GetWebImage(pic_url) {
             let buf = await resp.arrayBuffer();
             let objBlob = new Blob([buf], {type: mime});
             let objUrl = URL.createObjectURL(objBlob);
-            return {"buffer": buf, "url": objUrl, "type": mime};
+            return {"buffer": buf, "src": pic_url, "url": objUrl, "type": mime};
         }
     } catch (e) {
     }
-    return {"buffer": null, "url": "", "type": ""}
+    return {"buffer": null, "src": pic_url, "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)
@@ -107,20 +108,3 @@ export async function WriteMp3Meta(audioData, artistList, title, album, pictureD
     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);
-    });
-}

src/decrypt/xm.js

@@ -1,11 +1,4 @@
-import {
+import {AudioMimeType, GetArrayBuffer, GetFileInfo, GetMetaCoverURL, IsBytesEqual} from "./util";
-    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,29 +25,30 @@ 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]
-    let dataOffset = oriData[0xc] | oriData[0xd] << 8
+    let dataOffset = oriData[0xc] | oriData[0xd] << 8 | oriData[0xe] << 16
     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 ext = FileTypeMap[typeText];
     const mime = AudioMimeType[ext];
     let musicBlob = new Blob([audioData], {type: mime});
 
     const musicMeta = await musicMetadata.parseBlob(musicBlob);
     if (ext === "wav") {
         //todo:未知的编码方式
+        console.log(musicMeta.common)
         musicMeta.common.album = "";
         musicMeta.common.artist = "";
         musicMeta.common.title = "";
     }
-
+    let _sep = raw_filename.indexOf("_") === -1 ? "-" : "_"
-    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, "_");
+    const info = GetFileInfo(musicMeta.common.artist, musicMeta.common.title, raw_filename, _sep);
 
     const imgUrl = GetMetaCoverURL(musicMeta);
 
@@ -66,7 +60,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,
+    Button,
-    Row, Table, TableColumn, Upload, Radio, Checkbox, Progress,
+    Checkbox,
-    Notification, Tooltip,
+    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');