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

@@ -30,3 +30,5 @@ dist-ssr
 
 /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/

package.json

@@ -1,11 +1,12 @@
 {
   "name": "um-react",
   "private": true,
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "scripts": {
     "start": "vite",
-    "build": "tsc -p tsconfig.prod.json && vite build && node scripts/write-version.mjs",
+    "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

@@ -1,28 +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 "$FILE" ]]; then
+    if [[ ! -f "win64/deps/$FILE" ]]; then
-        curl -fsL "https://um-react.app/files/${FILE}.gz" | gzip -d >"${FILE}"
+        curl -fsL "https://um-react.app/files/${FILE}.gz" | gzip -d >"win64/deps/${FILE}"
     fi
 }
 
-dl_file "um-react-wry-builder-0.1.0-linux-amd64"
+dl_file "um-react-wry-builder-${WRY_VER}-linux-amd64"
-dl_file "um-react-wry-stub-0.1.0-win64.exe"
+dl_file "um-react-wry-stub-${WRY_VER}-win64.exe"
-chmod a+x um-react-wry-builder-0.1.0-linux-amd64
+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"
-./um-react-wry-builder-0.1.0-linux-amd64 \
+"./win64/deps/um-react-wry-builder-${WRY_VER}-linux-amd64" \
-    -t um-react-wry-stub-0.1.0-win64.exe \
+    -t "win64/deps/um-react-wry-stub-${WRY_VER}-win64.exe" \
     -r um-react.zip \
-    -o "${EXE_NAME}"
+    -o "win64/dist/${EXE_NAME}"
 
-touch -d 1970-01-01T00:00:00Z "${EXE_NAME}"
+touch -d 1970-01-01T00:00:00Z "win64/dist/${EXE_NAME}"
-zip -9oX "${ZIP_NAME}" -- "${EXE_NAME}"
+zip -9oX "win64/dist/${ZIP_NAME}" -- "win64/dist/${EXE_NAME}"
-echo "[Build OK] '${ZIP_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);
+}

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';

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({