package.json

@@ -21,7 +21,7 @@
     "@chakra-ui/react": "^2.7.0",
     "@emotion/react": "^11.11.0",
     "@emotion/styled": "^11.11.0",
-    "@jixun/libparakeet": "0.2.0",
+    "@jixun/libparakeet": "0.1.2",
     "@reduxjs/toolkit": "^1.9.5",
     "framer-motion": "^10.12.16",
     "immer": "^10.0.2",

src/crypto/pasreKuwo.ts

@@ -1,25 +0,0 @@
-import { bytesToUTF8String } from '~/decrypt-worker/util/utf8Encoder';
-import { strlen } from './strlen';
-
-export interface KuwoHeader {
-  rid: string; // uint64
-  encVersion: 1 | 2; // uint32
-  quality: string;
-}
-
-export function parseKuwoHeader(view: DataView): KuwoHeader | null {
-  const magic = view.buffer.slice(view.byteOffset, view.byteOffset + 0x10);
-  if (bytesToUTF8String(magic) !== 'yeelion-kuwo-tme') {
-    return null; // not kuwo-encrypted file
-  }
-
-  const qualityBytes = new Uint8Array(view.buffer.slice(view.byteOffset + 0x30, view.byteOffset + 0x40));
-  const qualityLen = strlen(qualityBytes);
-  const quality = bytesToUTF8String(qualityBytes.slice(0, qualityLen));
-
-  return {
-    encVersion: view.getUint32(0x10, true) as 1 | 2,
-    rid: view.getUint32(0x18, true).toString(),
-    quality,
-  };
-}

src/crypto/strlen.ts

@@ -1,9 +0,0 @@
-export function strlen(data: Uint8Array): number {
-  const n = data.byteLength;
-  for (let i = 0; i < n; i++) {
-    if (data[i] === 0) {
-      return i;
-    }
-  }
-  return n;
-}

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

@@ -1,25 +1,14 @@
 import { transformBlob } from '~/decrypt-worker/util/transformBlob';
 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 { stringToUTF8Bytes } from '~/decrypt-worker/util/utf8Encoder';
 
 // v1 only
 export class KWMCrypto implements CryptoBase {
   cryptoName = 'KWM';
   checkByDecryptHeader = true;
 
-  async decrypt(buffer: ArrayBuffer, opts: DecryptCommandOptions): Promise<Blob> {
+  async decrypt(buffer: ArrayBuffer): Promise<Blob> {
-    const kwm2key = opts.kwm2key ?? '';
+    return transformBlob(buffer, (p) => p.make.KuwoKWM(KWM_KEY));
-
-    const parakeet = await fetchParakeet();
-    const keyCrypto = makeQMCv2KeyCrypto(parakeet);
-    return transformBlob(buffer, (p) => p.make.KuwoKWMv2(KWM_KEY, stringToUTF8Bytes(kwm2key), keyCrypto), {
-      cleanup: () => keyCrypto.delete(),
-      parakeet,
-    });
   }
 
   public static make() {

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

@@ -3,8 +3,6 @@ import type { CryptoBase } from '../CryptoBase';
 import type { DecryptCommandOptions } from '~/decrypt-worker/types.ts';
 import { SEED, ENC_V2_KEY_1, ENC_V2_KEY_2 } from './qmc_v2.key.ts';
 import { fetchParakeet } from '@jixun/libparakeet';
-import { stringToUTF8Bytes } from '~/decrypt-worker/util/utf8Encoder.ts';
-import { makeQMCv2KeyCrypto } from '~/decrypt-worker/util/qmc2KeyCrypto.ts';
 
 export class QMC2Crypto implements CryptoBase {
   cryptoName = 'QMC/v2';
@@ -38,8 +36,9 @@ export class QMC2CryptoWithKey implements CryptoBase {
     }
 
     const parakeet = await fetchParakeet();
-    const key = stringToUTF8Bytes(options.qmc2Key);
+    const textEncoder = new TextEncoder();
-    const keyCrypto = makeQMCv2KeyCrypto(parakeet);
+    const key = textEncoder.encode(options.qmc2Key);
+    const keyCrypto = parakeet.make.QMCv2KeyCrypto(SEED, ENC_V2_KEY_1, ENC_V2_KEY_2);
     return transformBlob(buffer, (p) => p.make.QMCv2EKey(key, keyCrypto), {
       parakeet,
       cleanup: () => keyCrypto.delete(),

src/decrypt-worker/types.ts

@@ -1,6 +1,5 @@
 export interface DecryptCommandOptions {
   qmc2Key?: string;
-  kwm2key?: string;
 }
 
 export interface DecryptCommandPayload {

src/decrypt-worker/util/qmc2KeyCrypto.ts

@@ -1,4 +0,0 @@
-import type { Parakeet } from '@jixun/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/utf8Encoder.ts

@@ -1,10 +0,0 @@
-export const utf8Encoder = new TextEncoder();
-export const utf8Decoder = new TextDecoder('utf-8');
-
-export function stringToUTF8Bytes(str: string) {
-  return utf8Encoder.encode(str);
-}
-
-export function bytesToUTF8String(str: BufferSource) {
-  return utf8Decoder.decode(str);
-}

src/features/file-listing/fileListingSlice.ts

@@ -1,12 +1,11 @@
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import type { PayloadAction } from '@reduxjs/toolkit';
 import type { RootState } from '~/store';
+import { decryptionQueue } from '~/decrypt-worker/client';
 
 import type { DecryptionResult } from '~/decrypt-worker/constants';
-import type { DecryptCommandOptions } from '~/decrypt-worker/types';
-import { decryptionQueue } from '~/decrypt-worker/client';
 import { DecryptErrorType } from '~/decrypt-worker/util/DecryptError';
-import { selectQMCv2KeyByFileName, selectKWMv2Key } from '../settings/settingsSelector';
+import { selectDecryptOptionByFile } from '../settings/settingsSelector';
 
 export enum ProcessState {
   QUEUED = 'QUEUED',
@@ -64,18 +63,7 @@ export const processFile = createAsyncThunk<
     thunkAPI.dispatch(setFileAsProcessing({ id: fileId }));
   };
 
-  const fileHeader = await fetch(file.raw, {
+  const options = selectDecryptOptionByFile(state, file.fileName);
-    headers: {
-      Range: 'bytes=0-1023',
-    },
-  })
-    .then((r) => r.blob())
-    .then((r) => r.arrayBuffer());
-
-  const options: DecryptCommandOptions = {
-    qmc2Key: selectQMCv2KeyByFileName(state, file.fileName),
-    kwm2key: selectKWMv2Key(state, new DataView(fileHeader)),
-  };
   return decryptionQueue.add({ id: fileId, blobURI: file.raw, options }, onPreProcess);
 });
 

src/features/settings/keyFormats.ts

@@ -51,13 +51,6 @@ export interface StagingKWMv2Key {
 
 export type ProductionKWMv2Keys = Record<string /* `${rid}-${quality}` */, string /* ekey */>;
 
-export const parseKwm2ProductionKey = (key: string): null | { rid: string; quality: string } => {
-  const m = key.match(/^(\d+)-(\w+)$/);
-  if (!m) return null;
-  const [_, rid, quality] = m;
-
-  return { rid, quality };
-};
 export const kwm2StagingToProductionKey = (key: StagingKWMv2Key) => `${key.rid}-${key.quality}`;
 export const kwm2StagingToProductionValue = (key: StagingKWMv2Key) => key.ekey;
 export const kwm2ProductionToStaging = (
@@ -66,8 +59,9 @@ export const kwm2ProductionToStaging = (
 ): null | StagingKWMv2Key => {
   if (typeof value !== 'string') return null;
 
-  const parsed = parseKwm2ProductionKey(key);
+  const m = key.match(/^(\d+)-(\w+)$/);
-  if (!parsed) return null;
+  if (!m) return null;
 
-  return { id: nanoid(), rid: parsed.rid, quality: parsed.quality, ekey: value };
+  const [_, rid, quality] = m;
+  return { id: nanoid(), rid, quality, ekey: value };
 };

src/features/settings/persistSettings.ts

@@ -5,7 +5,6 @@ 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';
 
 const DEFAULT_STORAGE_KEY = 'um-react-settings';
 
@@ -23,16 +22,6 @@ function mergeSettings(settings: ProductionSettings): ProductionSettings {
         draft.qmc2.allowFuzzyNameSearch = allowFuzzyNameSearch;
       }
     }
-
-    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;
-        }
-      }
-    }
   });
 }
 

src/features/settings/settingsSelector.ts

@@ -1,47 +1,30 @@
-import { parseKuwoHeader } from '~/crypto/pasreKuwo';
+import type { DecryptCommandOptions } from '~/decrypt-worker/types';
 import type { RootState } from '~/store';
 import { closestByLevenshtein } from '~/util/levenshtein';
 import { hasOwn } from '~/util/objects';
-import { kwm2StagingToProductionKey } from './keyFormats';
 
 export const selectStagingQMCv2Settings = (state: RootState) => state.settings.staging.qmc2;
 export const selectFinalQMCv2Settings = (state: RootState) => state.settings.production.qmc2;
 
 export const selectStagingKWMv2Keys = (state: RootState) => state.settings.staging.kwm2.keys;
-export const selectFinalKWMv2Keys = (state: RootState) => state.settings.production.kwm2.keys;
 
-export const selectQMCv2KeyByFileName = (state: RootState, name: string): string | undefined => {
+export const selectDecryptOptionByFile = (state: RootState, name: string): DecryptCommandOptions => {
   const normalizedName = name.normalize();
 
-  let ekey: string | undefined;
+  let qmc2Key: string | undefined;
-  const { keys, allowFuzzyNameSearch } = selectFinalQMCv2Settings(state);
+  const { keys: qmc2Keys, allowFuzzyNameSearch } = selectFinalQMCv2Settings(state);
-  if (hasOwn(keys, normalizedName)) {
+  if (hasOwn(qmc2Keys, normalizedName)) {
-    ekey = keys[normalizedName];
+    qmc2Key = qmc2Keys[normalizedName];
   } else if (allowFuzzyNameSearch) {
-    const qmc2KeyStoreNames = Object.keys(keys);
+    const qmc2KeyStoreNames = Object.keys(qmc2Keys);
     if (qmc2KeyStoreNames.length > 0) {
       const closestName = closestByLevenshtein(normalizedName, qmc2KeyStoreNames);
       console.debug('qmc2: key db could not find %o, using closest %o instead.', normalizedName, closestName);
-      ekey = keys[closestName];
+      qmc2Key = qmc2Keys[closestName];
     }
   }
 
-  return ekey;
+  return {
-};
+    qmc2Key,
-
+  };
-export const selectKWMv2Key = (state: RootState, headerView: DataView): string | undefined => {
-  const hdr = parseKuwoHeader(headerView);
-  if (!hdr) {
-    return;
-  }
-
-  const keys = selectFinalKWMv2Keys(state);
-  const lookupKey = kwm2StagingToProductionKey({ id: '', ekey: '', quality: hdr.quality, rid: hdr.rid });
-
-  let ekey: string | undefined;
-  if (hasOwn(keys, lookupKey)) {
-    ekey = keys[lookupKey];
-  }
-
-  return ekey;
 };

src/util/MMKVParser.ts

@@ -1,7 +1,8 @@
 import type { StagingKWMv2Key } from '~/features/settings/keyFormats';
-import { bytesToUTF8String } from '~/decrypt-worker/util/utf8Encoder';
 import { formatHex } from './formatHex';
 
+const textDecoder = new TextDecoder('utf-8', { ignoreBOM: true });
+
 export class MMKVParser {
   private offset = 4;
   private length: number;
@@ -66,7 +67,7 @@ export class MMKVParser {
     // ]
     const strByteLen = this.readInt();
     const data = this.readBytes(strByteLen);
-    return bytesToUTF8String(data).normalize();
+    return textDecoder.decode(data).normalize();
   }
 
   public readVariantString() {

src/util/levenshtein.ts

@@ -1,6 +1,6 @@
-// translation of pseudocode from Wikipedia:
+const textEncoder = new TextEncoder();
-import { stringToUTF8Bytes } from '~/decrypt-worker/util/utf8Encoder';
 
+// translation of pseudocode from Wikipedia:
 // https://en.wikipedia.org/wiki/Levenshtein_distance#Iterative_with_two_matrix_rows
 export function levenshtein(str1: string, str2: string) {
   if (str1 === str2) {
@@ -14,8 +14,8 @@ export function levenshtein(str1: string, str2: string) {
   }
 
   // Convert them to Uint8Array to avoid expensive string APIs.
-  const s = stringToUTF8Bytes(str1.normalize().toLowerCase());
+  const s = textEncoder.encode(str1.toLowerCase());
-  const t = stringToUTF8Bytes(str2.normalize().toLowerCase());
+  const t = textEncoder.encode(str2.toLowerCase());
   const m = s.byteLength;
   const n = t.byteLength;