diff --git a/src/decrypt/kgm.js b/src/decrypt/kgm.ts
similarity index 75%
rename from src/decrypt/kgm.js
rename to src/decrypt/kgm.ts
index a6320b8..5e6ace8 100644
--- a/src/decrypt/kgm.js
+++ b/src/decrypt/kgm.ts
@@ -7,6 +7,7 @@ import {
SniffAudioExt
} from "@/decrypt/utils.ts";
import {parseBlob as metaParseBlob} from "music-metadata-browser";
+import {DecryptResult} from "@/decrypt/entity";
const VprHeader = [
0x05, 0x28, 0xBC, 0x96, 0xE9, 0xE4, 0x5A, 0x43,
@@ -14,27 +15,22 @@ const VprHeader = [
const KgmHeader = [
0x7C, 0xD5, 0x32, 0xEB, 0x86, 0x02, 0x7F, 0x4B,
0xA8, 0xAF, 0xA6, 0x8E, 0x0F, 0xFF, 0x99, 0x14]
-const VprMaskDiff = [0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
+const VprMaskDiff = [
+ 0x25, 0xDF, 0xE8, 0xA6, 0x75, 0x1E, 0x75, 0x0E,
0x2F, 0x80, 0xF3, 0x2D, 0xB8, 0xB6, 0xE3, 0x11,
0x00]
-export async function Decrypt(file, raw_filename, raw_ext) {
- try {
- if (window.location.protocol === "file:") {
- return {
- status: false,
- message: "请使用CLI版本进行解锁"
- }
- }
- } catch {
+
+export async function Decrypt(file: File, raw_filename: string, raw_ext: string): Promise {
+ if (window?.location?.protocol === "file:") {
+ throw Error("请使用 CLI版本 进行解锁")
}
+
const oriData = new Uint8Array(await GetArrayBuffer(file));
if (raw_ext === "vpr") {
- if (!BytesHasPrefix(oriData, VprHeader))
- return {status: false, message: "Not a valid vpr file!"}
+ if (!BytesHasPrefix(oriData, VprHeader)) throw Error("Not a valid vpr file!")
} else {
- if (!BytesHasPrefix(oriData, KgmHeader))
- return {status: false, message: "Not a valid kgm/kgma file!"}
+ if (!BytesHasPrefix(oriData, KgmHeader)) throw Error("Not a valid kgm(a) file!")
}
let bHeaderLen = new DataView(oriData.slice(0x10, 0x14).buffer)
let headerLen = bHeaderLen.getUint32(0, true)
@@ -42,18 +38,13 @@ export async function Decrypt(file, raw_filename, raw_ext) {
let audioData = oriData.slice(headerLen)
let dataLen = audioData.length
if (audioData.byteLength > 1 << 26) {
- return {
- status: false,
- message: "文件过大，请使用CLI版本进行解锁"
- }
+ throw Error("文件过大，请使用 CLI版本 进行解锁")
}
let key1 = new Uint8Array(17)
key1.set(oriData.slice(0x1c, 0x2c), 0)
- if (MaskV2 == null) {
- if (!await LoadMaskV2()) {
- return {status: false, message: "加载Kgm/Vpr Mask数据失败"}
- }
+ if (MaskV2.length === 0) {
+ if (!await LoadMaskV2()) throw Error("加载Kgm/Vpr Mask数据失败")
}
for (let i = 0; i < dataLen; i++) {
@@ -85,17 +76,16 @@ export async function Decrypt(file, raw_filename, raw_ext) {
}
}
-function GetMask(pos) {
+
+function GetMask(pos: number) {
return MaskV2PreDef[pos % 272] ^ MaskV2[pos >> 4]
}
-let MaskV2 = null;
+let MaskV2: Uint8Array = new Uint8Array(0);
-async function LoadMaskV2() {
+async function LoadMaskV2(): Promise {
try {
- let resp = await fetch("./static/kgm.mask", {
- method: "GET"
- })
+ const resp = await fetch("./static/kgm.mask", {method: "GET"})
MaskV2 = new Uint8Array(await resp.arrayBuffer());
return true
} catch (e) {
diff --git a/src/decrypt/ncm.js b/src/decrypt/ncm.js
index eb3934e..47124e3 100644
--- a/src/decrypt/ncm.js
+++ b/src/decrypt/ncm.js
@@ -1,4 +1,11 @@
-import {AudioMimeType, BytesHasPrefix, GetArrayBuffer, GetMetaFromFile, SniffAudioExt} from "@/decrypt/utils.ts";
+import {
+ AudioMimeType,
+ BytesHasPrefix,
+ GetArrayBuffer,
+ GetImageFromURL,
+ GetMetaFromFile,
+ SniffAudioExt
+} from "@/decrypt/utils.ts";
import {parseBlob as metaParseBlob} from "music-metadata-browser";
const CryptoJS = require("crypto-js");
@@ -10,7 +17,6 @@ const MagicHeader = [0x43, 0x54, 0x45, 0x4E, 0x46, 0x44, 0x41, 0x4D];
import jimp from 'jimp';
import {
- GetWebImage,
WriteMp3Meta
} from "./util"
@@ -41,8 +47,8 @@ export async function Decrypt(file, raw_filename, _) {
if (musicMeta.format === undefined) musicMeta.format = SniffAudioExt(audioData);
- const imageInfo = await GetWebImage(musicMeta.albumPic);
- while (!!imageInfo.buffer && imageInfo.buffer.byteLength >= 16 * 1024 * 1024) {
+ const imageInfo = await GetImageFromURL(musicMeta.albumPic);
+ while (imageInfo && imageInfo.buffer.byteLength >= 1 << 24) {
let img = await jimp.read(imageInfo.buffer)
await img.resize(Math.round(img.getHeight() / 2), jimp.AUTO)
imageInfo.buffer = await img.getBufferAsync("image/jpeg")
diff --git a/src/decrypt/qmc.js b/src/decrypt/qmc.js
index 30cbd6b..55b51c7 100644
--- a/src/decrypt/qmc.js
+++ b/src/decrypt/qmc.js
@@ -1,11 +1,17 @@
import {
- GetWebImage,
IXAREA_API_ENDPOINT,
WriteMp3Meta
} from "./util";
import {QmcMaskCreate58, QmcMaskDetectMflac, QmcMaskDetectMgg, QmcMaskGetDefault} from "./qmcMask";
import {fromByteArray as Base64Encode, toByteArray as Base64Decode} from 'base64-js'
-import {AudioMimeType, GetArrayBuffer, GetCoverFromFile, GetMetaFromFile, SniffAudioExt} from "@/decrypt/utils.ts";
+import {
+ AudioMimeType,
+ GetArrayBuffer,
+ GetCoverFromFile,
+ GetImageFromURL,
+ GetMetaFromFile,
+ SniffAudioExt
+} from "@/decrypt/utils.ts";
import {parseBlob as metaParseBlob} from "music-metadata-browser";
const MetaFlac = require('metaflac-js');
@@ -75,8 +81,8 @@ export async function Decrypt(file, raw_filename, raw_ext) {
if (!imgUrl) {
imgUrl = await queryAlbumCoverImage(info.artist, info.title, musicMeta.common.album);
if (imgUrl !== "") {
- const imageInfo = await GetWebImage(imgUrl);
- if (imageInfo.url !== "") {
+ const imageInfo = await GetImageFromURL(imgUrl);
+ if (imageInfo) {
imgUrl = imageInfo.url
try {
if (ext === "mp3") {
diff --git a/src/decrypt/util.js b/src/decrypt/util.js
index f5a77d5..03533d8 100644
--- a/src/decrypt/util.js
+++ b/src/decrypt/util.js
@@ -4,21 +4,6 @@ const ID3Writer = require("browser-id3-writer");
export const IXAREA_API_ENDPOINT = "https://stats.ixarea.com/apis"
-export async function GetWebImage(pic_url) {
- try {
- let resp = await fetch(pic_url);
- let mime = resp.headers.get("Content-Type");
- if (mime.startsWith("image/")) {
- let buf = await resp.arrayBuffer();
- let objBlob = new Blob([buf], {type: mime});
- let objUrl = URL.createObjectURL(objBlob);
- return {"buffer": buf, "src": pic_url, "url": objUrl, "type": mime};
- }
- } catch (e) {
- }
- return {"buffer": null, "src": pic_url, "url": "", "type": ""}
-}
-
export async function WriteMp3Meta(audioData, artistList, title, album, pictureData = null, pictureDesc = "Cover", originalMeta = null) {
const writer = new ID3Writer(audioData);
if (originalMeta !== null) {
diff --git a/src/decrypt/utils.ts b/src/decrypt/utils.ts
index 95e1b5a..25affac 100644
--- a/src/decrypt/utils.ts
+++ b/src/decrypt/utils.ts
@@ -89,3 +89,18 @@ export function GetMetaFromFile(filename: string, exist_title?: string, exist_ar
}
return meta
}
+
+export async function GetImageFromURL(src: string):
+ Promise<{ mime: string; buffer: ArrayBuffer; url: string } | undefined> {
+ try {
+ const resp = await fetch(src);
+ const mime = resp.headers.get("Content-Type");
+ if (mime?.startsWith("image/")) {
+ const buffer = await resp.arrayBuffer();
+ const url = URL.createObjectURL(new Blob([buffer], {type: mime}))
+ return {buffer, url, mime}
+ }
+ } catch (e) {
+ console.warn(e)
+ }
+}
diff --git a/src/decrypt/xm.js b/src/decrypt/xm.ts
similarity index 84%
rename from src/decrypt/xm.js
rename to src/decrypt/xm.ts
index 5443c47..b061498 100644
--- a/src/decrypt/xm.js
+++ b/src/decrypt/xm.ts
@@ -1,22 +1,23 @@
-import {Decrypt as RawDecrypt} from "./raw";
+import {Decrypt as RawDecrypt} from "@/decrypt/raw";
+import {DecryptResult} from "@/decrypt/entity";
import {AudioMimeType, BytesHasPrefix, GetArrayBuffer, GetCoverFromFile, GetMetaFromFile} from "@/decrypt/utils.ts";
import {parseBlob as metaParseBlob} from "music-metadata-browser";
const MagicHeader = [0x69, 0x66, 0x6D, 0x74]
const MagicHeader2 = [0xfe, 0xfe, 0xfe, 0xfe]
-const FileTypeMap = {
+const FileTypeMap: { [key: string]: string } = {
" WAV": ".wav",
"FLAC": ".flac",
" MP3": ".mp3",
" A4M": ".m4a",
}
-export async function Decrypt(file, raw_filename, raw_ext) {
+export async function Decrypt(file: File, raw_filename: string, raw_ext: string): Promise {
const oriData = new Uint8Array(await GetArrayBuffer(file));
if (!BytesHasPrefix(oriData, MagicHeader) || !BytesHasPrefix(oriData.slice(8, 12), MagicHeader2)) {
if (raw_ext === "xm") {
- return {status: false, message: "此xm文件已损坏"}
+ throw Error("此xm文件已损坏")
} else {
return await RawDecrypt(file, raw_filename, raw_ext, true)
}
@@ -24,7 +25,7 @@ export async function Decrypt(file, raw_filename, raw_ext) {
let typeText = (new TextDecoder()).decode(oriData.slice(4, 8))
if (!FileTypeMap.hasOwnProperty(typeText)) {
- return {status: false, message: "未知的xm文件类型"}
+ throw Error("未知的.xm文件类型")
}
let key = oriData[0xf]