From c48532121d17158baf43c07f3191430acfe02f9e Mon Sep 17 00:00:00 2001 From: xhacker-zzz <959220793@qq.com> Date: Thu, 19 Jan 2023 19:41:01 +0800 Subject: [PATCH 1/3] small fixes --- src/QmcWasm/qmc.hpp | 8 ++++---- src/decrypt/index.ts | 8 +++++++- src/decrypt/qmc.ts | 12 +++++++++++- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/QmcWasm/qmc.hpp b/src/QmcWasm/qmc.hpp index c56c8e9..3f26ecf 100644 --- a/src/QmcWasm/qmc.hpp +++ b/src/QmcWasm/qmc.hpp @@ -131,6 +131,10 @@ public: int PreDecode(std::string ext) { cipherType = checkType(ext); size_t tailSize = 0; + if (cipherType == "invalid" || cipherType == "STag") { + error = "file is invalid or not supported (Please downgrade your app)."; + return -1; + } if (cipherType == "QTag") { tailSize = 8; } @@ -156,10 +160,6 @@ public: } rawKeyBuf = tmp; } - if (cipherType == "invalid") { - error = "file is invalid or not supported(Please downgrade your app.)"; - return -1; - } return keySize + tailSize; } diff --git a/src/decrypt/index.ts b/src/decrypt/index.ts index 58d09bb..e7c464b 100644 --- a/src/decrypt/index.ts +++ b/src/decrypt/index.ts @@ -50,9 +50,12 @@ export async function Decrypt(file: FileInfo, config: Record): Prom case 'tm3': // QQ Music IOS Mp3 rt_data = await RawDecrypt(file.raw, raw.name, 'mp3'); break; + case 'qmc0': //QQ Music Android Mp3 case 'qmc3': //QQ Music Android Mp3 case 'qmc2': //QQ Music Android Ogg - case 'qmc0': //QQ Music Android Mp3 + case 'qmc4': //QQ Music Android Ogg + case 'qmc6': //QQ Music Android Ogg + case 'qmc8': //QQ Music Android Ogg case 'qmcflac': //QQ Music Android Flac case 'qmcogg': //QQ Music Android Ogg case 'tkm': //QQ Music Accompaniment M4a @@ -68,6 +71,7 @@ export async function Decrypt(file: FileInfo, config: Record): Prom case 'mggl': //QQ Music Mac case 'mflac': //QQ Music New Flac case 'mflac0': //QQ Music New Flac + case 'mflach': //QQ Music New Flac case 'mgg': //QQ Music New Ogg case 'mgg1': //QQ Music New Ogg case 'mgg0': @@ -98,6 +102,8 @@ export async function Decrypt(file: FileInfo, config: Record): Prom case 'x3m': rt_data = await XimalayaDecrypt(file.raw, raw.name, raw.ext); break; + case 'mflach': //QQ Music New Flac + throw '网页版无法解锁，请使用CLI版本' default: throw '不支持此文件格式'; } diff --git a/src/decrypt/qmc.ts b/src/decrypt/qmc.ts index ebeebfe..3154f90 100644 --- a/src/decrypt/qmc.ts +++ b/src/decrypt/qmc.ts @@ -28,8 +28,16 @@ export const HandlerMap: { [key: string]: Handler } = { qmc0: { ext: 'mp3', version: 2 }, qmc2: { ext: 'ogg', version: 2 }, qmc3: { ext: 'mp3', version: 2 }, + qmc4: { ext: 'ogg', version: 2 }, + qmc6: { ext: 'ogg', version: 2 }, + qmc8: { ext: 'ogg', version: 2 }, bkcmp3: { ext: 'mp3', version: 1 }, + bkcm4a: { ext: 'm4a', version: 1 }, bkcflac: { ext: 'flac', version: 1 }, + bkcwav: { ext: 'wav', version: 1 }, + bkcape: { ext: 'ape', version: 1 }, + bkcogg: { ext: 'ogg', version: 1 }, + bkcwma: { ext: 'wma', version: 1 }, tkm: { ext: 'm4a', version: 1 }, '666c6163': { ext: 'flac', version: 1 }, '6d7033': { ext: 'mp3', version: 1 }, @@ -131,7 +139,9 @@ export class QmcDecoder { private searchKey() { const last4Byte = this.file.slice(-4); const textEnc = new TextDecoder(); - if (textEnc.decode(last4Byte) === 'QTag') { + if (textEnc.decode(last4Byte) === 'STag') { + throw new Error('文件中没有写入密钥，无法解锁，请降级App并重试'); + } else if (textEnc.decode(last4Byte) === 'QTag') { const sizeBuf = this.file.slice(-8, -4); const sizeView = new DataView(sizeBuf.buffer, sizeBuf.byteOffset); const keySize = sizeView.getUint32(0, false); From 8e361691bc2b55db82d66f5903b5c00ba94fdc81 Mon Sep 17 00:00:00 2001 From: xhacker-zzz <959220793@qq.com> Date: Thu, 19 Jan 2023 19:41:22 +0800 Subject: [PATCH 2/3] update copyright year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index e18948e..6e26d40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019-2022 MengYX +Copyright (c) 2019-2023 MengYX Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 6d8389ce19e98f6d8811710f0a0d118776281908 Mon Sep 17 00:00:00 2001 From: xhacker-zzz <959220793@qq.com> Date: Thu, 19 Jan 2023 19:41:52 +0800 Subject: [PATCH 3/3] update readme --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e9c15f0..34c10be 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ - [x] 酷我音乐格式 (.kwm) - [x] 酷狗音乐格式 (.kgm/.vpr) - [x] Android版喜马拉雅文件格式 (.x2m/.x3m) +- [x] 咪咕音乐格式 (.mg3d) ### 其他特性 @@ -35,7 +36,7 @@ - [x] 批量解锁 - [x] 渐进式 Web 应用 (PWA) - [x] 多线程 -- [x] 写入元信息与专辑封面 +- [x] 写入和编辑元信息与专辑封面 ## 使用方法