zhaarey/AppleMusicDecrypt
1
0
Fork 0
mirror of https://github.com/zhaarey/AppleMusicDecrypt.git synced 2025-10-23 15:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enhance stability

Browse Source
This commit is contained in:
WorldObservationLog
2024-05-21 22:33:41 +08:00
parent 9614ff15f0
commit 10067fe160
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/decrypt.py
View File

@@ -2,16 +2,18 @@ import asyncio
import logging import logging
from loguru import logger from loguru import logger
from tenacity import retry, retry_if_exception_type, stop_after_attempt, before_sleep_log from tenacity import retry, retry_if_exception_type, stop_after_attempt, before_sleep_log, RetryCallState
from src.adb import Device from src.adb import Device
from src.exceptions import DecryptException from src.exceptions import DecryptException, RetryableDecryptException
from src.models.song_data import Datum from src.models.song_data import Datum
from src.mp4 import SongInfo, SampleInfo from src.mp4 import SongInfo, SampleInfo
from src.types import defaultId, prefetchKey from src.types import defaultId, prefetchKey
retry_count = {}
@retry(retry=retry_if_exception_type(DecryptException), stop=stop_after_attempt(3),
@retry(retry=retry_if_exception_type(RetryableDecryptException), stop=stop_after_attempt(3),
before_sleep=before_sleep_log(logger, logging.WARN)) before_sleep=before_sleep_log(logger, logging.WARN))
async def decrypt(info: SongInfo, keys: list[str], manifest: Datum, device: Device) -> bytes: async def decrypt(info: SongInfo, keys: list[str], manifest: Datum, device: Device) -> bytes:
async with device.decryptLock: async with device.decryptLock:
@@ -34,10 +36,19 @@ async def decrypt(info: SongInfo, keys: list[str], manifest: Datum, device: Devi
last_index = sample.descIndex last_index = sample.descIndex
try: try:
result = await decrypt_sample(writer, reader, sample) result = await decrypt_sample(writer, reader, sample)
except DecryptException as e: except RetryableDecryptException as e:
writer.write(bytes([0, 0, 0, 0])) if 0 <= retry_count.get(device.device.serial, 0) < 3 or 4 <= retry_count.get(device.device.serial, 0) < 6:
writer.close() logger.warning(f"Failed to decrypt song: {manifest.attributes.artistName} - {manifest.attributes.name}, retrying")
raise e writer.write(bytes([0, 0, 0, 0]))
writer.close()
raise e
elif retry_count == 3:
logger.warning(f"Failed to decrypt song: {manifest.attributes.artistName} - {manifest.attributes.name}, re-injecting")
device.restart_inject_frida()
raise e
else:
logger.error(f"Failed to decrypt song: {manifest.attributes.artistName} - {manifest.attributes.name}")
raise DecryptException
decrypted += result decrypted += result
writer.write(bytes([0, 0, 0, 0])) writer.write(bytes([0, 0, 0, 0]))
writer.close() writer.close()
@@ -49,5 +60,5 @@ async def decrypt_sample(writer: asyncio.StreamWriter, reader: asyncio.StreamRea
writer.write(sample.data) writer.write(sample.data)
result = await reader.read(len(sample.data)) result = await reader.read(len(sample.data))
if not result: if not result:
raise DecryptException raise RetryableDecryptException
return result return result

4
src/exceptions.py
View File

@@ -24,3 +24,7 @@ class NotTimeSyncedLyricsException(Exception):
class CodecNotFoundException(Exception): class CodecNotFoundException(Exception):
... ...
class RetryableDecryptException(Exception):
...