0.2.8

.drone.yml

@@ -27,7 +27,9 @@ steps:
       NETLIFY_API_KEY:
         from_secret: NETLIFY_API_KEY
     commands:
-      # - git config --global --add safe.directory "/drone/src"
+      - |
-      - python3 -m zipfile -c um-react.zip dist/.
+        python3 -m zipfile -c um-react.zip dist/.
+        cp um-react.zip dist/release-"${DRONE_COMMIT_SHA}".zip
+        python3 -m zipfile -c um-react-site.zip dist/.
       # - ./scripts/publish.sh
       - ./scripts/deploy.sh

.gitignore

@@ -27,3 +27,8 @@ dist-ssr
 # Files created when running "drone exec" locally
 /.pnpm-store/
 /*.zip
+
+/um-react-wry-*
+/um-react*.exe
+
+/win64/

.npmrc

@@ -1,3 +1,4 @@
 use-node-version=20.10.0
 node-version=20.10.0
 engine-strict=true
+@um:registry=https://git.unlock-music.dev/api/packages/um/npm/

README.MD

@@ -73,12 +73,25 @@
 
 满足上述条件后发起 Pull Request，仓库管理员审阅后将合并到主分支。
 
+## 相关项目
+
+- [Unlock Music (Web)](https://git.unlock-music.dev/um/web) - 原始项目
+- [Unlock Music (Cli)](https://git.unlock-music.dev/um/cli) - 命令行批量处理版
+- [um-react (Electron 前端)](https://github.com/CarlGao4/um-react-electron) - 使用 Electron 框架封装的本地可执行文件。
+  - [GitHub 下载](https://github.com/CarlGao4/um-react-electron/releases/latest) | [仓库镜像](https://git.unlock-music.dev/CarlGao4/um-react-electron)
+- [um-react-wry](https://git.unlock-music.dev/um/um-react-wry) - 使用 WRY 框架封装的 Win64 单文件 (需要[安装 Edge WebView2 运行时][webview2_redist]，Win10+ 操作系统自带)
+  - [本地下载](https://git.unlock-music.dev/um/um-react/releases/latest) | 寻找文件名为 `um-react-win64-` 开头的附件
+
+[webview2_redist]: https://go.microsoft.com/fwlink/p/?LinkId=2124703
+
+有新的项目提交？欢迎[提交 issue][project-issues]，请带上项目名称和链接。
+
 ## TODO
 
 - 待定
   - [ ] 各类算法 [追踪 `crypto` 标签](https://git.unlock-music.dev/um/um-react/issues?labels=67)
-  - [ ] #7 简易元数据编辑器
 - 完成
+  - [x] #7 ~~简易元数据编辑器~~ 放弃
   - [x] #8 ~~添加单元测试~~ 框架加上了，以后慢慢添加更多测试即可。
   - [x] #2 解密内容探测 (解密过程)
   - [x] #6 文件拖放 (利用 `react-dropzone`?)

docs/faq_zh-hans.md

@@ -63,6 +63,8 @@
 
 如果希望不破坏系统完整性，你可以考虑使用模拟器。
 
+※ **注意**：根据应用厂商的风控策略，使用模拟器登录的账号**有可能会被封锁**；使用前请自行评估风险。
+
 目前常见的带有 root 特权支持的的安卓模拟器方案，分别是雷电模拟器（※ 官方版有内置广告）和微软在 Windows 11 开始支援的适用于 Android™ 的 Windows 子系统 (WSA)。
 
 - WSA 可以参考 [MagiskOnWSALocal](https://github.com/LSPosed/MagiskOnWSALocal) 的说明操作。

docs/getting-started.zh.md

@@ -33,3 +33,31 @@ pnpm build
 如果需要预览构建版本，运行 `pnpm preview` 然后打开[项目预览页面][vite-preview-url]即可。
 
 [vite-preview-url]: http://localhost:4173/
+
+## 打包 `.zip`
+
+建议在 Linux 环境下执行，可参考 `.drone.yml` CI 文件。
+
+1. 确保上述的构建步骤已完成。
+2. 确保 `python3` 已安装。
+3. 执行下述代码
+   ```sh
+   python3 -m zipfile -c um-react.zip dist/.
+   ```
+
+## 打包 win64 单文件
+
+利用 Windows 系统自带的 [Edge WebView2 组件](https://learn.microsoft.com/zh-cn/microsoft-edge/webview2/)
+和 [wry](https://github.com/tauri-apps/wry) 进行一个单文件的打包。
+
+大部分 Windows 10 或以上版本的操作系统已经集成了 WebView2 运行时。若无法正常启动，请[下载并安装 Edge WebView2 运行时](https://go.microsoft.com/fwlink/p/?LinkId=2124703)。
+
+其它系统兼容性未知。
+
+1. 确保你现在在 `linux-amd64` 环境下。
+2. 确保上述的 `um-react.zip` 构建已完成。
+3. 执行下述代码
+   ```sh
+   ./scripts/make-win64.sh
+   ```
+4. 等待提示 `[Build OK]` 即可。

package.json

@@ -1,11 +1,12 @@
 {
   "name": "um-react",
   "private": true,
-  "version": "0.2.4",
+  "version": "0.2.8",
   "type": "module",
   "scripts": {
     "start": "vite",
-    "build": "tsc -p tsconfig.prod.json && vite build",
+    "build": "tsc -p tsconfig.prod.json && vite build && pnpm build:finalize",
+    "build:finalize": "node scripts/write-version.mjs && node scripts/minify-mjs.mjs",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "format": "prettier -w .",
     "test": "vitest run",
@@ -21,8 +22,8 @@
     "@chakra-ui/react": "^2.8.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@jixun/libparakeet": "0.4.3",
     "@reduxjs/toolkit": "^2.0.1",
+    "@um/libparakeet": "0.4.5",
     "framer-motion": "^10.16.16",
     "nanoid": "^5.0.4",
     "radash": "^11.0.0",
@@ -59,6 +60,7 @@
     "jsdom": "^23.0.1",
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.1",
+    "terser": "^5.27.0",
     "typescript": "^5.3.3",
     "vite": "^5.0.10",
     "vite-plugin-pwa": "^0.17.4",

scripts/deploy.sh

@@ -104,7 +104,7 @@ deploy_netlify() {
 # For deployment, we care a bit less
 if [[ -n "${NETLIFY_API_KEY}" && -n "${NETLIFY_SITE_ID}" ]]; then
     echo "Deploy to netlify..."
-    deploy_netlify um-react.zip
+    deploy_netlify um-react-site.zip
 else
     echo "skip netlify deployment."
 fi

scripts/make-win64.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# sudo apt install -y jq zip
+
+pushd "$(dirname "${BASH_SOURCE[0]}")/../"
+
+WRY_VER="0.1.1"
+
+mkdir -p win64/{deps,dist}
+dl_file() {
+    local FILE="$1"
+    if [[ ! -f "win64/deps/$FILE" ]]; then
+        curl -fsL "https://um-react.app/files/${FILE}.gz" | gzip -d >"win64/deps/${FILE}"
+    fi
+}
+
+dl_file "um-react-wry-builder-${WRY_VER}-linux-amd64"
+dl_file "um-react-wry-stub-${WRY_VER}-win64.exe"
+chmod a+x win64/deps/um-react-wry-builder-${WRY_VER}-linux-amd64
+
+APP_VERSION="$(jq -r '.version' <package.json)"
+EXE_NAME="um-react-win64-${APP_VERSION}.exe"
+ZIP_NAME="um-react-win64-${APP_VERSION}.zip"
+"./win64/deps/um-react-wry-builder-${WRY_VER}-linux-amd64" \
+    -t "win64/deps/um-react-wry-stub-${WRY_VER}-win64.exe" \
+    -r um-react.zip \
+    -o "win64/dist/${EXE_NAME}"
+
+touch -d 1970-01-01T00:00:00Z "win64/dist/${EXE_NAME}"
+zip -9oX "win64/dist/${ZIP_NAME}" -- "win64/dist/${EXE_NAME}"
+echo "[Build OK] 'win64/dist/${ZIP_NAME}'."
+
+popd

scripts/minify-mjs.mjs

@@ -0,0 +1,19 @@
+import { minify } from 'terser';
+import { readFileSync, writeFileSync, readdirSync } from 'fs';
+
+for (const file of readdirSync('dist/assets')) {
+  if (!/\.(mjs|js)$/.test(file)) {
+    continue;
+  }
+
+  console.log(`minifying ${file}...`);
+  const isModule = /\.mjs$/.test(file);
+
+  const output = await minify(readFileSync(`dist/assets/${file}`, 'utf-8'), {
+    compress: true,
+    mangle: true,
+    module: isModule,
+  });
+
+  writeFileSync(`dist/assets/${file}`, output.code);
+}

scripts/write-version.mjs

@@ -0,0 +1,14 @@
+/* eslint-env node */
+import { readFileSync, writeFileSync } from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+import { execSync } from 'node:child_process';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const commitHash = execSync('git rev-parse --short HEAD').toString('utf-8').trim();
+
+const pkgJson = JSON.parse(readFileSync(__dirname + '/../package.json', 'utf-8'));
+const pkgVer = `${pkgJson.version ?? 'unknown'}-${commitHash ?? 'unknown'}` + '\n';
+writeFileSync(__dirname + '/../dist/version.txt', pkgVer, 'utf-8');

src/decrypt-worker/crypto/kwm/kwm.ts

@@ -3,7 +3,7 @@ import type { CryptoBase } from '../CryptoBase';
 import { KWM_KEY } from './kwm.key';
 import { DecryptCommandOptions } from '~/decrypt-worker/types';
 import { makeQMCv2KeyCrypto } from '~/decrypt-worker/util/qmc2KeyCrypto';
-import { fetchParakeet } from '@jixun/libparakeet';
+import { fetchParakeet } from '@um/libparakeet';
 import { stringToUTF8Bytes } from '~/decrypt-worker/util/utf8Encoder';
 
 // v1 only

src/decrypt-worker/crypto/qmc/qmc_v2.ts

@@ -1,7 +1,7 @@
 import { transformBlob } from '~/decrypt-worker/util/transformBlob';
 import type { CryptoBase } from '../CryptoBase';
 import type { DecryptCommandOptions } from '~/decrypt-worker/types.ts';
-import { fetchParakeet } from '@jixun/libparakeet';
+import { fetchParakeet } from '@um/libparakeet';
 import { stringToUTF8Bytes } from '~/decrypt-worker/util/utf8Encoder.ts';
 import { makeQMCv2FooterParser, makeQMCv2KeyCrypto } from '~/decrypt-worker/util/qmc2KeyCrypto.ts';
 

src/decrypt-worker/util/qmc2KeyCrypto.ts

@@ -1,4 +1,4 @@
-import type { Parakeet } from '@jixun/libparakeet';
+import type { Parakeet } from '@um/libparakeet';
 import { SEED, ENC_V2_KEY_1, ENC_V2_KEY_2 } from '../crypto/qmc/qmc_v2.key';
 
 export const makeQMCv2KeyCrypto = (p: Parakeet) => p.make.QMCv2KeyCrypto(SEED, ENC_V2_KEY_1, ENC_V2_KEY_2);

src/decrypt-worker/util/transformBlob.ts

@@ -1,11 +1,11 @@
-import { Transformer, Parakeet, TransformResult, fetchParakeet } from '@jixun/libparakeet';
+import { Transformer, Parakeet, TransformResult, fetchParakeet } from '@um/libparakeet';
 import { toArrayBuffer } from './buffer';
 import { UnsupportedSourceFile } from './DecryptError';
 
 export async function transformBlob(
   blob: Blob | ArrayBuffer,
   transformerFactory: (p: Parakeet) => Transformer | Promise<Transformer>,
-  { cleanup, parakeet }: { cleanup?: () => void; parakeet?: Parakeet } = {}
+  { cleanup, parakeet }: { cleanup?: () => void; parakeet?: Parakeet } = {},
 ) {
   const registeredCleanupFns: (() => void)[] = [];
   if (cleanup) {

src/decrypt-worker/worker.ts

@@ -1,7 +1,7 @@
 import { WorkerServerBus } from '~/util/WorkerEventBus';
 import { DECRYPTION_WORKER_ACTION_NAME } from './constants';
 
-import { getSDKVersion } from '@jixun/libparakeet';
+import { getSDKVersion } from '@um/libparakeet';
 
 import { workerDecryptHandler } from './worker/handler/decrypt';
 import { workerParseMusicExMediaName } from './worker/handler/qmcv2_parser';

src/decrypt-worker/worker/handler/decrypt.ts

@@ -1,4 +1,4 @@
-import { Parakeet, fetchParakeet } from '@jixun/libparakeet';
+import { Parakeet, fetchParakeet } from '@um/libparakeet';
 import { timedLogger, withGroupedLogs as withTimeGroupedLogs } from '~/util/logUtils';
 import type { DecryptCommandOptions, DecryptCommandPayload } from '~/decrypt-worker/types';
 import { allCryptoFactories } from '../../crypto/CryptoFactory';

src/decrypt-worker/worker/handler/qmcv2_parser.ts

@@ -1,4 +1,4 @@
-import { fetchParakeet, FooterParserState } from '@jixun/libparakeet';
+import { fetchParakeet, FooterParserState } from '@um/libparakeet';
 import type { FetchMusicExNamePayload } from '~/decrypt-worker/types';
 import { makeQMCv2FooterParser } from '~/decrypt-worker/util/qmc2KeyCrypto';
 import { timedLogger, withGroupedLogs as withTimeGroupedLogs } from '~/util/logUtils';
@@ -10,6 +10,7 @@ export const workerParseMusicExMediaName = async ({ id, blobURI }: FetchMusicExN
     const blob = await timedLogger(`${label}/fetch-src`, async () =>
       fetch(blobURI, { headers: { Range: 'bytes=-1024' } }).then((r) => r.blob()),
     );
+
     const buffer = await timedLogger(`${label}/read-src`, async () => {
       // Firefox: the range header does not work...?
       const blobBuffer = await blob.arrayBuffer();
@@ -18,10 +19,12 @@ export const workerParseMusicExMediaName = async ({ id, blobURI }: FetchMusicExN
       }
       return blobBuffer;
     });
+
     const parsed = makeQMCv2FooterParser(parakeet).parse(buffer);
     if (parsed.state === FooterParserState.OK) {
       return parsed.mediaName;
     }
-    return '# N/A';
+
+    return null;
   });
 };

src/faq/OtherFAQ.tsx

@@ -1,4 +1,4 @@
-import { Img, ListItem, Text, UnorderedList } from '@chakra-ui/react';
+import { Alert, AlertIcon, Code, Container, Flex, Img, ListItem, Text, UnorderedList } from '@chakra-ui/react';
 import { ExtLink } from '~/components/ExtLink';
 import { Header4 } from '~/components/HelpText/Header4';
 import { VQuote } from '~/components/HelpText/VQuote';
@@ -57,6 +57,19 @@ export function OtherFAQ() {
         </ExtLink>
         。
       </Text>
+
+      <Container p={2}>
+        <Alert status="warning" borderRadius={5}>
+          <AlertIcon />
+          <Flex flexDir="column">
+            <Text>
+              <strong>注意</strong>：根据应用厂商的风控策略，使用模拟器登录的账号<strong>有可能会被封锁</strong>
+              {'；使用前请自行评估风险。'}
+            </Text>
+          </Flex>
+        </Alert>
+      </Container>
+
       <UnorderedList>
         <ListItem>
           <Text>
@@ -73,6 +86,48 @@ export function OtherFAQ() {
         </ListItem>
       </UnorderedList>
 
+      <Header4>相关项目</Header4>
+      <UnorderedList>
+        <ListItem>
+          <Text>
+            <ExtLink href="https://github.com/CarlGao4/um-react-electron">
+              <strong>
+                <Code>um-react-electron</Code>
+              </strong>
+            </ExtLink>
+            ：利用 Electron 框架打包的本地版，提供适用于 Windows、Linux 和 Mac 平台的可执行文件。
+          </Text>
+          <UnorderedList>
+            <ListItem>
+              <Text>
+                <ExtLink href="https://github.com/CarlGao4/um-react-electron/releases/latest">GitHub 下载</ExtLink>
+              </Text>
+            </ListItem>
+          </UnorderedList>
+        </ListItem>
+        <ListItem>
+          <Text>
+            <ExtLink href="https://git.unlock-music.dev/um/um-react-wry">
+              <strong>
+                <Code>um-react-wry</Code>
+              </strong>
+            </ExtLink>
+            : 使用 WRY 框架封装的 Win64 单文件（需要
+            <ExtLink href="https://go.microsoft.com/fwlink/p/?LinkId=2124703">安装 Edge WebView2 运行时</ExtLink>
+            {'，Win10+ 操作系统自带）'}
+          </Text>
+          <UnorderedList>
+            <ListItem>
+              <Text>
+                <ExtLink href="https://git.unlock-music.dev/um/um-react/releases/latest">仓库下载</ExtLink>
+                {' | 寻找文件名为 '}
+                <Code>um-react-win64-</Code> 开头的附件
+              </Text>
+            </ListItem>
+          </UnorderedList>
+        </ListItem>
+      </UnorderedList>
+
       <Header4>有更多问题？</Header4>
       <Text>
         {'欢迎进入 '}

src/features/settings/panels/PanelQingTing.tsx

@@ -13,7 +13,7 @@ import {
 } from '@chakra-ui/react';
 
 import { useAppDispatch, useAppSelector } from '~/hooks';
-import { fetchParakeet } from '@jixun/libparakeet';
+import { fetchParakeet } from '@um/libparakeet';
 import { ExtLink } from '~/components/ExtLink';
 import { ChangeEvent, ClipboardEvent } from 'react';
 import { VQuote } from '~/components/HelpText/VQuote';

vite.config.ts

@@ -40,7 +40,7 @@ export default defineConfig({
   },
   base: './',
   optimizeDeps: {
-    exclude: ['@jixun/libparakeet', 'sql.js'],
+    exclude: ['@um/libparakeet', 'sql.js'],
   },
   plugins: [
     replace({