Misc: Bump Version

Fix: [Extension] Disable Service Worker

.drone.yml

@@ -1,65 +0,0 @@
----
-kind: pipeline
-type: docker
-name: default
-
-clone:
-  depth: 1
-
-steps:
-  - name: installDependencies
-    image: node:lts
-    commands:
-      - npm ci --registry=https://registry.npm.taobao.org
-
-  - name: build
-    image: node:lts
-    commands:
-      - npm run fix-compatibility
-      - npm run build
-      - tar -czf legacy.tar.gz -C ./dist .
-      - npm run build -- --modern
-      - tar -czf modern.tar.gz -C ./dist .
-
-
-  - name: release
-    image: plugins/gitea-release
-    settings:
-      base_url: https://git.ixarea.com
-      files:
-        - modern.tar.gz
-        - legacy.tar.gz
-      api_key:
-        from_secret: gitea_token
-      checksum:
-        - sha256
-    when:
-      event: [tag]
-
-  - name: deploy
-    image: plugins/s3
-    settings:
-      bucket: unlock-music
-      access_key:
-        from_secret: aws_access_key_id
-      secret_key:
-        from_secret: aws_secret_access_key
-      source: dist/**/*
-      strip_prefix: dist/
-      target: /public
-      path_style: true
-      endpoint: https://fs.sz2.ixarea.com
-
-
-  - name: upload
-    image: plugins/s3
-    settings:
-      bucket: unlock-music
-      access_key:
-        from_secret: aws_access_key_id
-      secret_key:
-        from_secret: aws_secret_access_key
-      source: ./*.tar.gz
-      target: /build/${DRONE_BUILD_NUMBER}
-      path_style: true
-      endpoint: https://fs.sz2.ixarea.com

.github/ISSUE_TEMPLATE/bug-report.md

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

.github/ISSUE_TEMPLATE/new-feature.md

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

.github/workflows/build.yml

@@ -0,0 +1,83 @@
+name: Build
+on:
+  push:
+    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_EXTENSION: true
+          - build: modern
+            BUILD_ARGS: "-- --modern"
+            BUILD_EXTENSION: false
+    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: Build Extension
+        if: ${{ matrix.BUILD_EXTENSION }}
+        run: |
+          npm run make-extension
+          cd dist
+          zip -rJ9 ../extension.zip *
+          cd ..
+
+      - name: Publish artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: unlock-music-${{ matrix.build }}.tar.gz
+          path: ./dist.tar.gz
+
+      - name: Publish artifact - Extension
+        if: ${{ matrix.BUILD_EXTENSION }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: extension.zip
+          path: ./extension.zip

.github/workflows/release.yml

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

@@ -3,8 +3,8 @@
 - unlock-music项目是以学习和技术研究的初衷创建的，修改、再分发时请遵循[License](https://github.com/ix64/unlock-music/blob/master/LICENSE)
 - 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)
+- [CLI版本 Alpha](https://github.com/unlock-music/cli) 大批量转换建议使用CLI版本
-    
+- [相关的其他项目](https://github.com/ix64/unlock-music/wiki/%E5%92%8CUnlockMusic%E7%9B%B8%E5%85%B3%E7%9A%84%E9%A1%B9%E7%9B%AE)    
 - ![Release and GitHub Pages](https://github.com/ix64/unlock-music/workflows/Release%20and%20GitHub%20Pages/badge.svg)
 
 # 特性

extension-manifest.json

@@ -0,0 +1,16 @@
+{
+  "manifest_version": 2,
+  "name": "音乐解锁",
+  "short_name": "音乐解锁",
+  "icons": {
+    "128": "./img/icons/msapplication-icon-144x144.png"
+  },
+  "description": "在任何设备上解锁已购的加密音乐！",
+  "offline_enabled": true,
+  "options_page": "./index.html",
+  "homepage_url": "https://github.com/ix64/unlock-music",
+  "browser_action": {
+    "default_popup": "./popup.html"
+  },
+  "content_security_policy": "script-src 'self' https://stats.ixarea.com; object-src 'self'"
+}

make-extension.js

@@ -0,0 +1,20 @@
+const fs = require('fs')
+const path = require('path')
+const src = "./src/extension/"
+const dst = "./dist"
+fs.readdirSync(src).forEach(file => {
+    let srcPath = path.join(src, file)
+    let dstPath = path.join(dst, file)
+    fs.copyFileSync(srcPath, dstPath)
+    console.log(`Copy: ${srcPath} => ${dstPath}`)
+})
+
+const manifestRaw = fs.readFileSync("./extension-manifest.json", "utf-8")
+const manifest = JSON.parse(manifestRaw)
+
+const pkgRaw = fs.readFileSync("./package.json", "utf-8")
+const pkg = JSON.parse(pkgRaw)
+
+manifest["version"] = pkg["version"]
+fs.writeFileSync("./dist/manifest.json", JSON.stringify(manifest), "utf-8")
+console.log("Write: manifest.json")

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unlock-music",
-  "version": "1.6.3",
+  "version": "1.8.0",
-  "updateInfo": ".ncm和.kgm解锁的一些优化",
+  "updateInfo": "支持构建为浏览器扩展(Chrome & Firefox)",
   "license": "MIT",
   "description": "Unlock encrypted music file in browser.",
   "repository": {
@@ -12,28 +12,31 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "fix-compatibility": "node ./src/fix-compatibility.js"
+    "fix-compatibility": "node ./src/fix-compatibility.js",
+    "make-extension": "node ./make-extension.js"
   },
   "dependencies": {
-    "base64-js": "^1.3.1",
+    "base64-js": "^1.5.1",
     "browser-id3-writer": "^4.4.0",
-    "core-js": "^3.6.4",
+    "core-js": "^3.8.3",
     "crypto-js": "^4.0.0",
-    "element-ui": "^2.13.0",
+    "element-ui": "^2.15.0",
-    "iconv-lite": "^0.5.1",
+    "iconv-lite": "^0.6.2",
-    "jimp": "^0.14.0",
+    "jimp": "^0.16.1",
     "metaflac-js": "^1.0.5",
-    "music-metadata-browser": "^2.1.2",
+    "music-metadata-browser": "^2.2.4",
-    "register-service-worker": "^1.7.1",
+    "register-service-worker": "^1.7.2",
     "vue": "^2.6.12"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.4",
+    "@vue/cli-plugin-babel": "^4.5.11",
-    "@vue/cli-plugin-pwa": "^4.5.4",
+    "@vue/cli-plugin-pwa": "^4.5.11",
-    "@vue/cli-service": "^4.5.4",
+    "@vue/cli-service": "^4.5.11",
     "babel-plugin-component": "^1.1.1",
     "vue-cli-plugin-element": "^1.0.1",
     "vue-template-compiler": "^2.6.12",
-    "workerize-loader": "^1.3.0"
+    "workerize-loader": "^1.3.0",
+    "sass-loader": "^10.1.1",
+    "node-sass": "^5.0.0"
   }
 }

public/index.html

@@ -5,15 +5,12 @@
     <meta content="webkit" name="renderer">
     <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
     <meta content="width=device-width,initial-scale=1.0" name="viewport">
-    <!--@formatter:off-->
+    <title>音乐解锁</title>
-    <script>var _paq=window._paq||[];_paq.push(["setRequestMethod","POST"],["trackPageView"],["enableLinkTracking"],["setSiteId","2"],["setTrackerUrl","https://stats.ixarea.com/ixarea-stats/report"]);</script>
-    <!--@formatter:on-->
-    <script async src="https://stats.ixarea.com/ixarea-stats.js"></script>
-    <title>音乐解锁 - By IXarea</title>
     <meta content="音乐,解锁,ncm,qmc,mgg,mflac,qq音乐,网易云音乐,加密" name="keywords"/>
     <meta content="音乐解锁 - 在任何设备上解锁已购的加密音乐！" name="description"/>
+    <script src="./ixarea-stats.js"></script>
     <!--@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>#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 #1db1ff;width:120px;height:120px;animation:spin 2s linear infinite}@keyframes spin{0%{transform:rotate(0)}100%{transform:rotate(360deg)}}#loader-mask{text-align:center;position:absolute;width:100%;height:100%;bottom:0;left:0;right:0;top:0;z-index:1009;background-color:rgba(242,246,252,.88)}@media (prefers-color-scheme:dark){#loader-mask{color:#fff;background-color:rgba(0,0,0,.85)}#loader-mask a{color:#ddd}#loader-mask a:hover{color:#1db1ff}}#loader-source{font-size:1.5rem}#loader-tips-timeout{font-size:1.2rem}</style>
     <!--@formatter:on-->
 </head>
 <body>
@@ -27,46 +24,20 @@
              style="border:0"/>
     </noscript>
     <h3 id="loader-source"> 请勿直接运行源代码！ </h3>
-    <div hidden id="loader-tips-outdated">
+    <div id="loader-tips-outdated" hidden>
         <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">
+    <h3 id="loader-tips-timeout" hidden>
         音乐解锁采用了一些新特性！建议使用
-        <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>
     </h3>
 </div>
 <div id="app"></div>
-<script>
+<script src="./loader.js"></script>
-    (function () {
-        setTimeout(function () {
-            var ele = document.getElementById("loader-tips-timeout");
-            if (ele != null) {
-                ele.hidden = false;
-            }
-        }, 2000);
-
-        var ua = navigator && navigator.userAgent;
-        var detected = (function () {
-            var m;
-            if (!ua) return true;
-            if (/MSIE |Trident\//.exec(ua)) return true; // no IE
-            m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
-            if (m && Number(m[1]) < 17) return true;
-            m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
-            if (m && Number(m[1]) < 58) return true;
-            m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
-            return m && Number(m[1]) < 45;
-        })();
-        if (detected) {
-            document.getElementById('loader-tips-outdated').hidden = false;
-            document.getElementById("loader-tips-timeout").hidden = false;
-        }
-    })();
-</script>
 </body>
 </html>

public/ixarea-stats.js

@@ -0,0 +1,10 @@
+var _paq = window._paq || [];
+_paq.push(["setRequestMethod", "POST"], ["trackPageView"], ["enableLinkTracking"],
+    ["setSiteId", "2"], ["setTrackerUrl", "https://stats.ixarea.com/ixarea-stats/report"]);
+
+var tag = document.createElement('script');
+tag.type = 'text/javascript';
+tag.async = true;
+tag.src = 'https://stats.ixarea.com/ixarea-stats.js';
+var s = document.getElementsByTagName('script')[0];
+s.parentNode.insertBefore(tag, s);

public/loader.js

@@ -0,0 +1,25 @@
+(function () {
+    setTimeout(function () {
+        var ele = document.getElementById("loader-tips-timeout");
+        if (ele != null) {
+            ele.hidden = false;
+        }
+    }, 2000);
+
+    var ua = navigator && navigator.userAgent;
+    var detected = (function () {
+        var m;
+        if (!ua) return true;
+        if (/MSIE |Trident\//.exec(ua)) return true; // no IE
+        m = /Edge\/([\d.]+)/.exec(ua); // Edge >= 17
+        if (m && Number(m[1]) < 17) return true;
+        m = /Chrome\/([\d.]+)/.exec(ua); // Chrome >= 58
+        if (m && Number(m[1]) < 58) return true;
+        m = /Firefox\/([\d.]+)/.exec(ua); // Firefox >= 45
+        return m && Number(m[1]) < 45;
+    })();
+    if (detected) {
+        document.getElementById('loader-tips-outdated').hidden = false;
+        document.getElementById("loader-tips-timeout").hidden = false;
+    }
+})();

public/manifest.json

@@ -1,21 +0,0 @@
-{
-  "name": "音乐解锁 - By IXarea",
-  "short_name": "音乐解锁",
-  "description": "在任何设备上解锁已购的加密音乐！支持QQ音乐与网易云音乐！",
-  "icons": [
-    {
-      "src": "./img/icons/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
-    },
-    {
-      "src": "./img/icons/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    }
-  ],
-  "start_url": "./index.html",
-  "display": "standalone",
-  "background_color": "#000000",
-  "theme_color": "#4DBA87"
-}

src/App.vue

@@ -5,8 +5,8 @@
             <x-upload v-on:handle_error="showFail" v-on:handle_finish="showSuccess"></x-upload>
 
             <div id="app-control">
-                <el-row style="padding-bottom: 1em; font-size: 14px">
+                <el-row class="mb-3">
-                    歌曲命名格式：
+                    <span>歌曲命名格式：</span>
                     <el-radio label="1" name="format" v-model="download_format">歌手-歌曲名</el-radio>
                     <el-radio label="2" name="format" v-model="download_format">歌曲名</el-radio>
                     <el-radio label="3" name="format" v-model="download_format">歌曲名-歌手</el-radio>
@@ -16,18 +16,16 @@
                     <el-button @click="handleDownloadAll" icon="el-icon-download" plain>下载全部</el-button>
                     <el-button @click="handleDeleteAll" icon="el-icon-delete" plain type="danger">清除全部</el-button>
 
-
                     <el-tooltip class="item" effect="dark" placement="top-start">
                         <div slot="content">
                             当您使用此工具进行大量文件解锁的时候，建议开启此选项。<br/>
                             开启后，解锁结果将不会存留于浏览器中，防止内存不足。
                         </div>
-                        <el-checkbox border style="margin-left: 1em" v-model="instant_download">立即保存</el-checkbox>
+                        <el-checkbox border class="ml-2" v-model="instant_download">立即保存</el-checkbox>
                     </el-tooltip>
-
-
                 </el-row>
             </div>
+
             <audio :autoplay="playing_auto" :src="playing_url" controls/>
 
             <x-preview :download_format="download_format" :table-data="tableData"
@@ -100,7 +98,7 @@
                 } catch (e) {
                 }
                 if ((!!updateInfo && process.env.NODE_ENV === 'production') && (!!updateInfo.HttpsFound ||
-                    (!!updateInfo.Found && document.location.protocol !== "https:"))) {
+                    (!!updateInfo.Found && window.location.protocol !== "https:"))) {
                   this.$notify.warning({
                     title: '发现更新',
                     message: '发现新版本 v' + updateInfo.Version +
@@ -178,35 +176,9 @@
                 }, 300);
             }
         },
-
     }
-
 </script>
 
-<style>
+<style lang="scss">
-    #app {
+   @import "scss/unlock-music";
-        font-family: "Helvetica Neue", Helvetica, "PingFang SC",
-        "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
-        -webkit-font-smoothing: antialiased;
-        -moz-osx-font-smoothing: grayscale;
-        text-align: center;
-        color: #2c3e50;
-        padding-top: 30px;
-    }
-
-    #app-footer a {
-        padding-left: 0.2em;
-        padding-right: 0.2em;
-    }
-
-    #app-footer {
-        text-align: center;
-        font-size: small;
-    }
-
-    #app-control {
-        padding-top: 1em;
-        padding-bottom: 1em;
-    }
-
 </style>

src/component/preview.vue

@@ -12,7 +12,7 @@
         </el-table-column>
         <el-table-column label="歌曲">
             <template slot-scope="scope">
-                <span style="margin-left: 10px">{{ scope.row.title }}</span>
+                <span>{{ scope.row.title }}</span>
             </template>
         </el-table-column>
         <el-table-column label="歌手">

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

@@ -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

@@ -12,11 +12,14 @@ const VprMaskDiff = [0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
     0x00]
 
 export async function Decrypt(file, raw_filename, raw_ext) {
-    if (document.location.protocol === "file:") {
+    try {
-        return {
+        if (window.location.protocol === "file:") {
-            status: false,
+            return {
-            message: "请使用<a target='_blank' href='https://github.com/ix64/unlock-music/wiki/其他音乐格式工具'>CLI版本</a>进行解锁"
+                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") {

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,23 @@ 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);
+        console.log(originalMeta)
+        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 ? null : originalMeta)
         } else if (musicMeta.format === "flac") {
             const writer = new MetaFlac(Buffer.from(audioData))
-            if (writer.getTag("TITLE") === "") writer.setTag("TITLE=" + info.title)
+            if (shouldWrite) {
-            if (writer.getTag("ALBUM") === "") writer.setTag("ALBUM=" + musicMeta.album)
+                writer.setTag("TITLE=" + info.title)
-            writer.removeTag("ARTIST")
+                writer.setTag("ALBUM=" + musicMeta.album)
-            artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+                writer.removeTag("ARTIST")
+                artists.forEach(artist => writer.setTag("ARTIST=" + artist))
+            }
             writer.importPictureFromBuffer(Buffer.from(imageInfo.buffer))
             audioData = writer.save()
         }
@@ -67,8 +75,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 +86,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
         picture: imageInfo.url,
         file: URL.createObjectURL(musicData),
         mime: mime
-    };
+    }
 }
 
 

src/decrypt/qmc.js

@@ -5,7 +5,8 @@ import {
     GetFileInfo,
     GetMetaCoverURL,
     GetWebImage,
-    IXAREA_API_ENDPOINT
+    IXAREA_API_ENDPOINT,
+    WriteMp3Meta
 } from "./util";
 import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";
 import {fromByteArray as Base64Encode, toByteArray as Base64Decode} from 'base64-js'
@@ -29,7 +30,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) {
@@ -80,20 +86,17 @@ export async function Decrypt(file, raw_filename, raw_ext) {
                 imgUrl = imageInfo.url
                 try {
                     if (ext === "mp3") {
-                        let writer = new ID3Writer(musicDecoded)
+                        musicDecoded = await WriteMp3Meta(musicDecoded,
-                        writer.setFrame('APIC', {
+                            info.artist.split(" _ "), info.title, "",
-                            type: 3,
+                            imageInfo.buffer, "Cover", musicMeta)
-                            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});
+                    } else {
+                        console.info("writing metadata for " + ext + " is not being supported for now")
                     }
                 } catch (e) {
                     console.warn("Error while appending cover image to file " + e)

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,25 @@ 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", originalMeta = null) {
     const writer = new ID3Writer(audioData);
-    writer.setFrame("TPE1", artistList)
+    if (originalMeta !== null) {
-        .setFrame("TIT2", title)
+        artistList = originalMeta.common.artists || artistList
-        .setFrame("TALB", album);
+        title = originalMeta.common.title || title
+        album = originalMeta.common.album || album
+        const frames = originalMeta.native['ID3v2.4'] || originalMeta.native['ID3v2.3'] || originalMeta.native['ID3v2.2'] || []
+        frames.forEach(frame => {
+            if (frame.id !== 'TPE1' && frame.id !== 'TIT2' && frame.id !== 'TALB') {
+                try {
+                    writer.setFrame(frame.id, frame.value)
+                } catch (e) {
+                }
+            }
+        })
+    }
+    writer.setFrame('TPE1', artistList)
+        .setFrame('TIT2', title)
+        .setFrame('TALB', album);
     if (pictureData !== null) {
         writer.setFrame('APIC', {
             type: 3,

src/extension/popup.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+</head>
+<body>
+<script src="./popup.js"></script>
+<a href="./index.html" target="_blank">
+    <button>立即使用</button>
+</a>
+</body>
+</html>
+

src/extension/popup.js

@@ -0,0 +1,5 @@
+const bs = chrome || browser
+bs.tabs.create({
+    url: bs.runtime.getURL('./index.html')
+}, tab => console.log(tab))
+

src/registerServiceWorker.js

@@ -2,7 +2,8 @@
 
 import {register} from 'register-service-worker'
 
-if (process.env.NODE_ENV === 'production') {
+if (process.env.NODE_ENV === 'production' && window.location.protocol === "https:") {
+
     register(`${process.env.BASE_URL}service-worker.js`, {
         ready() {
             console.log('App is being served from cache by a service worker.')

src/scss/_dark-mode.scss

@@ -0,0 +1,166 @@
+/*
+ * name:    样式 - 夜间模式
+ * author:  @KyleBing
+ * date:    2020-11-24
+ */
+
+@media (prefers-color-scheme: dark) {
+  #app{
+    color: $dark-text-info;
+  }
+  body{
+    background-color: $dark-bg;
+  }
+
+  // FORM
+  .el-radio{
+    &__label{
+      color: $dark-text-main;
+    }
+    &__input{
+      color: $dark-text-info;
+      .el-radio__inner{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+      }
+    }
+
+    &.is-checked{
+      .el-radio__inner{
+        background-color: $blue;
+      }
+      .el-radio__label{
+        font-weight: bold;
+      }
+    }
+  }
+
+  .el-checkbox.is-bordered{
+    border-color: $dark-border;
+    .el-checkbox__inner{
+      background-color: $dark-btn-bg;
+      border-color: $dark-border;
+    }
+    &:hover{
+      border-color: $dark-border-highlight;
+      .el-checkbox__inner{
+        background-color: $dark-btn-bg-highlight;
+        border-color: $dark-border-highlight;
+      }
+      .el-checkbox__label{
+        color: $dark-text-info;
+      }
+    }
+    &.is-checked{
+      background-color: $blue;
+      .el-checkbox__inner{
+        border-color: $dark-btn-bg-highlight;
+      }
+      .el-checkbox__label{
+        color: white;
+        font-weight: bold;
+      }
+    }
+  }
+
+
+
+  // BUTTON
+  .el-button{
+    background-color: $dark-btn-bg;
+    border-color: $dark-border;
+    color: $dark-text-main;
+
+    &:active{
+      transform: translateY(2px);
+    }
+
+    &--default{
+      &.is-plain {
+        background-color: $dark-btn-bg;
+        &:hover {
+          background-color: $blue;
+          border-color: $blue;
+          color: white;
+        }
+      }
+    }
+    &--danger{
+      &.is-plain{
+        border-color: $dark-border;
+        background-color: $dark-btn-bg;
+        &:hover{
+          background-color: $red;
+          border-color: $red;
+        }
+      }
+    }
+  }
+
+  // 文件拖放区
+  .el-upload__tip{
+    color: $dark-text-info;
+  }
+  .el-upload-dragger{
+    background-color: $dark-uploader-bg;
+    border-color: $dark-border;
+    .el-upload__text{
+      color: $dark-text-info;
+    }
+    &:hover{
+      background: $dark-uploader-bg-highlight;
+      border-color: $dark-border-highlight;
+    }
+  }
+
+  //TABLE
+  .el-table{
+    background-color: $dark-bg-td;
+    &:before{ // 去除表格末尾的横线
+      content: none;
+    }
+    &__header{
+      th{
+        border-bottom-color: $dark-border !important;
+      }
+    }
+    th{
+      background-color: $dark-bg-th;
+      color: $dark-text-info;
+    }
+    td{
+      border-bottom-color: $dark-border !important;
+    }
+    tr{
+      background-color: $dark-bg-td;
+      color: $dark-text-main;
+      &:hover{
+        td{
+          background-color: $dark-bg-th !important;
+        }
+      }
+    }
+  }
+
+
+  // LINKS
+  a{
+    text-decoration: none;
+    color: darken($dark-color-link, 15%);
+    &:hover{
+      color: $dark-color-link;
+    }
+  }
+
+  // ALERT
+  .el-notification{
+    background-color: $dark-btn-bg-highlight;
+    border-color: $dark-border;
+    &__title{
+      color: white;
+    }
+    &__content{
+      color: $dark-text-info;
+    }
+  }
+}

src/scss/_gaps.scss

@@ -0,0 +1,18 @@
+/*
+ * 间隔工具集
+ */
+
+$gap: 5px;
+@for $item from 1 through 7 {
+  .mt-#{$item} { margin-top     : $gap * $item !important;}
+  .mb-#{$item} { margin-bottom  : $gap * $item !important;}
+  .ml-#{$item} { margin-left    : $gap * $item !important;}
+  .mr-#{$item} { margin-right   : $gap * $item !important;}
+   .m-#{$item} { margin         : $gap * $item !important;}
+
+  .pt-#{$item} { padding-top    : $gap * $item !important;}
+  .pb-#{$item} { padding-bottom : $gap * $item !important;}
+  .pl-#{$item} { padding-left   : $gap * $item !important;}
+  .pr-#{$item} { padding-right  : $gap * $item !important;}
+   .p-#{$item} { padding        : $gap * $item !important;}
+}

src/scss/_normal.scss

@@ -0,0 +1,38 @@
+body{
+  font-family: $font-family;
+  font-size: $fz-main;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+#app {
+  text-align: center;
+  color: $text-main;
+  padding-top: 30px;
+}
+
+#app-footer a {
+  padding-left: 0.2em;
+  padding-right: 0.2em;
+}
+
+#app-footer {
+  text-align: center;
+  font-size: small;
+}
+
+#app-control {
+  padding-top: 1em;
+  padding-bottom: 1em;
+}
+
+audio{
+  margin-bottom: 15px; // 播放控件与表格间隔
+}
+
+a{
+  color: darken($color-link, 15%);
+  &:hover{
+    color: $color-link;
+  }
+}

src/scss/_variables.scss

@@ -0,0 +1,28 @@
+// COLORS
+$blue      : #409EFF;
+$red       : #F56C6C;
+$green     : #85ce61;
+
+// TEXT
+$text-main : #2C3E50;
+$color-link: $blue;
+
+$fz-main: 14px;
+
+$font-family: "Helvetica Neue", Helvetica, "PingFang SC",
+"Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+
+
+// DARK MODE
+$dark-border                : lighten(black, 25%);
+$dark-border-highlight      : lighten(black, 55%);
+$dark-bg                    : lighten(black, 10%);
+$dark-text-main             : lighten(black, 90%);
+$dark-text-info             : lighten(black, 60%);
+$dark-uploader-bg           : lighten(black, 13%);
+$dark-uploader-bg-highlight : lighten(black, 18%);
+$dark-btn-bg                : lighten(black, 20%);
+$dark-btn-bg-highlight      : lighten(black, 30%);
+$dark-bg-th                 : lighten(black, 18%);
+$dark-bg-td                 : lighten(black, 13%);
+$dark-color-link            : $green;

src/scss/unlock-music.scss

@@ -0,0 +1,5 @@
+@import "variables";
+@import "gaps";
+
+@import "normal";
+@import "dark-mode"; // dark-mode 放在 normal 后面，以获得更高优先级

vue.config.js

@@ -2,6 +2,36 @@ module.exports = {
     publicPath: '',
     productionSourceMap: false,
     pwa: {
+        manifestPath: "web-manifest.json",
+        name: "音乐解锁",
+        themeColor: "#4DBA87",
+        msTileColor: "#000000",
+        manifestOptions: {
+            start_url: "./index.html",
+            description: "在任何设备上解锁已购的加密音乐！",
+            icons: [
+                {
+                    'src': './img/icons/android-chrome-192x192.png',
+                    'sizes': '192x192',
+                    'type': 'image/png'
+                },
+                {
+                    'src': './img/icons/android-chrome-512x512.png',
+                    'sizes': '512x512',
+                    'type': 'image/png'
+                }
+            ]
+        },
+        appleMobileWebAppCapable: 'yes',
+        iconPaths: {
+            faviconSVG: './img/icons/safari-pinned-tab.svg',
+            favicon32: './img/icons/favicon-32x32.png',
+            favicon16: './img/icons/favicon-16x16.png',
+            appleTouchIcon: './img/icons/apple-touch-icon-152x152.png',
+            maskIcon: './img/icons/safari-pinned-tab.svg',
+            msTileImage: './img/icons/msapplication-icon-144x144.png'
+        },
+        workboxPluginMode: "GenerateSW",
         workboxOptions: {
             skipWaiting: true
         }