feat: support for qmcv2 musicex tail

src/features/file-listing/fileListingSlice.ts

@@ -2,9 +2,9 @@ import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import type { PayloadAction } from '@reduxjs/toolkit';
 import type { RootState } from '~/store';
 
-import type { DecryptionResult } from '~/decrypt-worker/constants';
-import type { DecryptCommandOptions } from '~/decrypt-worker/types';
-import { decryptionQueue } from '~/decrypt-worker/client';
+import { DECRYPTION_WORKER_ACTION_NAME, type DecryptionResult } from '~/decrypt-worker/constants';
+import type { DecryptCommandOptions, FetchMusicExNamePayload } from '~/decrypt-worker/types';
+import { decryptionQueue, workerClientBus } from '~/decrypt-worker/client';
 import { DecryptErrorType } from '~/decrypt-worker/util/DecryptError';
 import { selectQMCv2KeyByFileName, selectKWMv2Key, selectQtfmAndroidKey } from '../settings/settingsSelector';
 
@@ -44,7 +44,7 @@ export interface FileListingState {
   displayMode: ListingMode;
 }
 const initialState: FileListingState = {
-  files: Object.create(null),
+  files: {},
   displayMode: ListingMode.LIST,
 };
 
@@ -64,17 +64,27 @@ export const processFile = createAsyncThunk<
     thunkAPI.dispatch(setFileAsProcessing({ id: fileId }));
   };
 
-  const fileHeader = await fetch(file.raw, {
-    headers: {
-      Range: 'bytes=0-1023',
-    },
-  })
+  const fileHeader = await fetch(file.raw, { headers: { Range: 'bytes=0-1023' } })
     .then((r) => r.blob())
-    .then((r) => r.arrayBuffer());
+    .then((r) => r.arrayBuffer())
+    .then((r) => {
+      if (r.byteLength > 1024) {
+        return r.slice(0, 1024);
+      }
+      return r;
+    });
+
+  const qmcv2MusicExMediaFile = await workerClientBus.request<string, FetchMusicExNamePayload>(
+    DECRYPTION_WORKER_ACTION_NAME.FIND_QMC_MUSICEX_NAME,
+    {
+      id: fileId,
+      blobURI: file.raw,
+    },
+  );
 
   const options: DecryptCommandOptions = {
     fileName: file.fileName,
-    qmc2Key: selectQMCv2KeyByFileName(state, file.fileName),
+    qmc2Key: selectQMCv2KeyByFileName(state, qmcv2MusicExMediaFile || file.fileName),
     kwm2key: selectKWMv2Key(state, new DataView(fileHeader)),
     qingTingAndroidKey: selectQtfmAndroidKey(state),
   };

src/features/settings/panels/PanelQMCv2Key.tsx

@@ -61,7 +61,7 @@ export function PanelQMCv2Key() {
           alert(`不是支持的 SQLite 数据库文件。`);
           return;
         }
-      } else if (/MMKVStreamEncryptId|filenameEkeyMap/i.test(file.name)) {
+      } else if (/MMKVStreamEncryptId|filenameEkeyMap|qmpc-mmkv-v1/i.test(file.name)) {
         const fileBuffer = await file.arrayBuffer();
         const map = parseAndroidQmEKey(new DataView(fileBuffer));
         qmc2Keys = Array.from(map.entries(), ([name, ekey]) => ({ name: getFileName(name), ekey }));

src/features/settings/persistSettings.ts

@@ -1,43 +1,44 @@
 import { debounce } from 'radash';
-import { produce } from 'immer';
 
 import type { AppStore } from '~/store';
 import { settingsSlice, setProductionChanges, ProductionSettings } from './settingsSlice';
 import { enumObject } from '~/util/objects';
 import { getLogger } from '~/util/logUtils';
 import { parseKwm2ProductionKey } from './keyFormats';
+import { deepClone } from '~/util/deepClone';
 
 const DEFAULT_STORAGE_KEY = 'um-react-settings';
 
 function mergeSettings(settings: ProductionSettings): ProductionSettings {
-  return produce(settingsSlice.getInitialState().production, (draft) => {
-    if (settings?.qmc2) {
-      const { allowFuzzyNameSearch, keys } = settings.qmc2;
-      for (const [k, v] of enumObject(keys)) {
-        if (typeof v === 'string') {
-          draft.qmc2.keys[k] = v;
-        }
-      }
-
-      if (typeof allowFuzzyNameSearch === 'boolean') {
-        draft.qmc2.allowFuzzyNameSearch = allowFuzzyNameSearch;
+  const draft = deepClone(settingsSlice.getInitialState().production);
+  if (settings?.qmc2) {
+    const { allowFuzzyNameSearch, keys } = settings.qmc2;
+    for (const [k, v] of enumObject(keys)) {
+      if (typeof v === 'string') {
+        draft.qmc2.keys[k] = v;
       }
     }
 
-    if (settings?.kwm2) {
-      const { keys } = settings.kwm2;
+    if (typeof allowFuzzyNameSearch === 'boolean') {
+      draft.qmc2.allowFuzzyNameSearch = allowFuzzyNameSearch;
+    }
+  }
 
-      for (const [k, v] of enumObject(keys)) {
-        if (typeof v === 'string' && parseKwm2ProductionKey(k)) {
-          draft.kwm2.keys[k] = v;
-        }
+  if (settings?.kwm2) {
+    const { keys } = settings.kwm2;
+
+    for (const [k, v] of enumObject(keys)) {
+      if (typeof v === 'string' && parseKwm2ProductionKey(k)) {
+        draft.kwm2.keys[k] = v;
       }
     }
+  }
 
-    if (typeof settings?.qtfm?.android === 'string') {
-      draft.qtfm.android = settings.qtfm.android.replace(/[^0-9a-fA-F]/g, '');
-    }
-  });
+  if (typeof settings?.qtfm?.android === 'string') {
+    draft.qtfm.android = settings.qtfm.android.replace(/[^0-9a-fA-F]/g, '');
+  }
+
+  return draft;
 }
 
 export function persistSettings(store: AppStore, storageKey = DEFAULT_STORAGE_KEY) {