Bump Version

适配浏览器深色模式

.github/ISSUE_TEMPLATE/bug-report.md

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

.github/ISSUE_TEMPLATE/new-feature.md

@@ -7,13 +7,20 @@ assignees: ''
 
 ---
 
+- 请按照此模板填写，否则可能立即被关闭
+
 **背景和说明**
+
 简要说明产生此想法的背景和此想法的具体内容
 
+
 **实现途径**
 
 - 如果没有设计方案，请简要描述实现思路
 - 如果你没有任何的实现思路，请通过Telegram进行讨论
 
+
 **附加信息**
+
 更多你想要表达的内容
+

.github/workflows/build.yml

@@ -0,0 +1,67 @@
+name: Build
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+  pull_request:
+    branches: [ master ]
+    types: [ opened, synchronize, reopened ]
+    paths:
+      - "**/*.js"
+      - "**/*.vue"
+      - "public/**/*"
+      - "package-lock.json"
+      - "package.json"
+
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        build: [ legacy, modern ]
+        include:
+          - build: legacy
+            BUILD_ARGS:
+          - build: modern
+            BUILD_ARGS: "-- --modern"
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+
+      - name: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
+
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
+
+      - name: Build
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build ${{ matrix.BUILD_ARGS }}
+          tar -czvf dist.tar.gz -C ./dist .
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unlock-music-${{ matrix.build }}.tar.gz
+          path: ./dist.tar.gz

.github/workflows/release.yml

@@ -3,104 +3,119 @@ name: Release and GitHub Pages
 on:
   push:
     tags:
-    - "v*"
+      - "v*"
 
 jobs:
   build:
-
-    runs-on: ubuntu-18.04
-
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Use Node.js 12.x
-      uses: actions/setup-node@v1
-      with:
-        node-version: 12.x
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.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: Get npm cache directory
+        id: npm-cache
+        run: echo "::set-output name=dir::$(npm config get cache)"
+      - uses: actions/cache@v2
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: ${{ runner.os }}-node-
 
-    - name: Deploy
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./dist
+      - name: Install Dependencies
+        run: |
+          npm ci
+          npm run fix-compatibility
 
-    - name: Get current time
-      id: date
-      run: echo "::set-output name=date::$(date +'%Y/%m/%d')"
+      - name: Build Legacy
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build
+          tar -czf legacy.tar.gz -C ./dist .
+          zip -rJ9 legacy.zip ./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 ${{ steps.date.outputs.date }}"
-        draft: true
+      - name: Build Modern
+        env:
+          GZIP: "--best"
+        run: |
+          npm run build -- --modern
+          tar -czf modern.tar.gz -C ./dist .
+          zip -rJ9 modern.zip ./dist
 
-    - 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: Checksum
+        run: sha256sum *.tar.gz *.zip > sha256sum.txt
 
-    - 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: Deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist
 
-    - name: Upload Release Assets - modern.tar.gz
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - 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:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./modern.tar.gz
-        asset_name: modern.tar.gz
-        asset_content_type: application/gzip
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: "Build ${{ steps.date.outputs.date }}"
+          draft: true
 
-    - name: Upload Release Assets - modern.zip
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - 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: ./modern.zip
-        asset_name: modern.zip
-        asset_content_type: application/zip
+        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 - sha256sum.txt
-      uses: actions/upload-release-asset@v1.0.2
-      env:
+      - 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: ./sha256sum.txt
-        asset_name: sha256sum.txt
-        asset_content_type: text/plain
+        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

@@ -34,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.6.2",
-  "updateInfo": ".ncm和.xm解锁的一些修复",
+  "version": "1.7.0",
+  "updateInfo": "适配深色模式；修复.ncm解锁的一些问题",
   "license": "MIT",
   "description": "Unlock encrypted music file in browser.",
   "repository": {
@@ -17,23 +17,23 @@
   "dependencies": {
     "base64-js": "^1.3.1",
     "browser-id3-writer": "^4.4.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.7.0",
     "crypto-js": "^4.0.0",
-    "element-ui": "^2.13.0",
+    "element-ui": "^2.14.0",
     "iconv-lite": "^0.5.1",
     "jimp": "^0.14.0",
     "metaflac-js": "^1.0.5",
-    "music-metadata-browser": "^2.0.5",
+    "music-metadata-browser": "^2.1.6",
     "register-service-worker": "^1.7.1",
-    "vue": "^2.6.11"
+    "vue": "^2.6.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.4.6",
-    "@vue/cli-plugin-pwa": "^4.4.6",
-    "@vue/cli-service": "^4.4.6",
+    "@vue/cli-plugin-babel": "^4.5.8",
+    "@vue/cli-plugin-pwa": "^4.5.8",
+    "@vue/cli-service": "^4.5.8",
     "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.3.0"
   }
 }

public/index.html

@@ -14,6 +14,7 @@
     <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>
+    <!--深色模式--><style>@media(prefers-color-scheme:dark){#loader-mask,html,.el-notification,.el-upload-dragger,.el-icon-upload,.el-table,.el-table__expanded-cell,.el-table th,.el-table tr{background-color:#111 !important;}html,.el-notification__content,.el-notification__title,#app,.el-upload__text,.el-table,.el-table__expanded-cell,.el-table th,.el-table tr{color:#DDD !important;}.el-upload__tip,.el-radio__label,.el-checkbox__label,.el-table__empty-text{color:#AAA !important;}.el-table tr:hover,.el-table tr:hover td{background-color:#555 !important;transition:background-color .4s !important;}}</style>
     <!--@formatter:on-->
 </head>
 <body>
@@ -29,12 +30,12 @@
     <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>
+        <h3>如果您使用双核浏览器，您可以尝试切换到 <span style="color:#f00;">“极速模式”</span> 解决此问题。</h3>
         <h3>或者，您可以尝试更换下方的几个浏览器之一。</h3>
     </div>
     <h3 hidden id="loader-tips-timeout">
         音乐解锁采用了一些新特性！建议使用
-        <a href="https://www.microsoftedgeinsider.com/zh-cn/download" target="_blank">Microsoft Edge Chromium</a>
+        <a href="https://www.microsoft.com/zh-cn/edge" target="_blank">Microsoft Edge Chromium</a>
         <a href="https://www.google.cn/chrome/" target="_blank">Google Chrome</a>
         <a href="https://www.firefox.com.cn/" target="_blank">Mozilla Firefox</a>
         | <a href="https://github.com/ix64/unlock-music/wiki/使用提示" target="_blank">使用提示</a>
@@ -69,4 +70,4 @@
     })();
 </script>
 </body>
-</html>
+</html>

src/App.vue

@@ -101,15 +101,15 @@
                 }
                 if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
                     (!!updateInfo.Found && window.location.protocol !== "https:"))) {
-                    this.$notify.warning({
-                        title: '发现更新',
-                        message: '发现新版本 v' + updateInfo.Version +
-                            '<br/>更新详情：' + updateInfo.Detail +
-                            '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
-                        dangerouslyUseHTMLString: true,
-                        duration: 15000,
-                        position: 'top-left'
-                    });
+                  this.$notify.warning({
+                    title: '发现更新',
+                    message: '发现新版本 v' + updateInfo.Version +
+                        '<br/>更新详情：' + updateInfo.Detail +
+                        '<br/><a target="_blank" href="' + updateInfo.URL + '">获取更新</a>',
+                    dangerouslyUseHTMLString: true,
+                    duration: 15000,
+                    position: 'top-left'
+                  });
                 } else {
                     this.$notify.info({
                         title: '离线使用',

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++) {
-                        // noinspection JSValidateTypes,JSUnresolvedVariable
-                        this.workers.push(worker().CommonDecrypt);
-                        this.idle_workers.push(i);
-                    }
-                }, 1000);
+                  for (let i = 1; i < this.thread_num; i++) {
+                    // noinspection JSValidateTypes,JSUnresolvedVariable
+                    this.workers.push(worker().CommonDecrypt);
+                    this.idle_workers.push(i);
+                  }
+                }, 5000);
             } else {
                 const dec = require('../decrypt/common');
                 this.workers.push(dec.CommonDecrypt);

src/decrypt/common.js

@@ -41,6 +41,11 @@ 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

src/decrypt/kgm.js

@@ -10,9 +10,17 @@ const KgmHeader = [
 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) {
+    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)))

src/decrypt/ncm.js

@@ -3,6 +3,7 @@ const MetaFlac = require('metaflac-js');
 const CORE_KEY = CryptoJS.enc.Hex.parse("687a4852416d736f356b496e62617857");
 const META_KEY = CryptoJS.enc.Hex.parse("2331346C6A6B5F215C5D2630553C2728");
 const MagicHeader = [0x43, 0x54, 0x45, 0x4E, 0x46, 0x44, 0x41, 0x4D];
+const musicMetadata = require("music-metadata-browser");
 import jimp from 'jimp';
 
 import {
@@ -50,16 +51,22 @@ export async function Decrypt(file, raw_filename, raw_ext) {
         imageInfo.buffer = await img.getBufferAsync("image/jpeg")
     }
     console.log(imageInfo)
+    const mime = AudioMimeType[musicMeta.format]
     try {
+        let musicBlob = new Blob([audioData], {type: mime});
+        const originalMeta = await musicMetadata.parseBlob(musicBlob);
+        let shouldWrite = !originalMeta.common.album && !originalMeta.common.artists && !originalMeta.common.title
         if (musicMeta.format === "mp3") {
             audioData = await WriteMp3Meta(
-                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic);
+                audioData, artists, info.title, musicMeta.album, imageInfo.buffer, musicMeta.albumPic, !shouldWrite)
         } 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))
+            if (shouldWrite) {
+                writer.setTag("TITLE=" + info.title)
+                writer.setTag("ALBUM=" + musicMeta.album)
+                writer.removeTag("ARTIST")
+                artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+            }
             writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
             audioData = writer.save()
         }
@@ -67,8 +74,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
         console.warn("Error while appending cover image to file " + e)
     }
 
-    const mime = AudioMimeType[musicMeta.format];
-    const musicData = new Blob([audioData], {type: mime});
+    const musicData = new Blob([audioData], {type: mime})
 
     return {
         status: true,
@@ -79,7 +85,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
         picture: imageInfo.url,
         file: URL.createObjectURL(musicData),
         mime: mime
-    };
+    }
 }
 
 
@@ -164,7 +170,9 @@ function getMetaData(dataView, fileBuffer, offset) {
     if (plainText.slice(0, labelIndex) === "dj") {
         result = result.mainMusic;
     }
-    if (!!result.albumPic) 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

@@ -29,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) {

src/decrypt/util.js

@@ -1,4 +1,5 @@
 const ID3Writer = require("browser-id3-writer");
+const musicMetadata = require("music-metadata-browser");
 export const FLAC_HEADER = [0x66, 0x4C, 0x61, 0x43];
 export const MP3_HEADER = [0x49, 0x44, 0x33];
 export const OGG_HEADER = [0x4F, 0x67, 0x67, 0x53];
@@ -92,11 +93,9 @@ export async function GetWebImage(pic_url) {
     return {"buffer": null, "src": pic_url, "url": "", "type": ""}
 }
 
-export function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover") {
+export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover", cover_only = true) {
     const writer = new ID3Writer(audioData);
-    writer.setFrame("TPE1", artistList)
-        .setFrame("TIT2", title)
-        .setFrame("TALB", album);
+    if (!cover_only) writer.setFrame("TPE1", artistList).setFrame("TIT2", title).setFrame("TALB", album);
     if (pictureData !== null) {
         writer.setFrame('APIC', {
             type: 3,