Firehawk52-backup/AppleMusicDecrypt
28
0
Fork 0
mirror of https://github.com/WorldObservationLog/AppleMusicDecrypt.git synced 2026-01-15 22:32:54 -03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: decrypt improvement

Browse Source
This commit is contained in:
世界观察日志
2025-06-09 17:03:26 +08:00
parent 6a7124f421
commit c3932bc852
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/grpc/manager.py
View File

@@ -4,9 +4,11 @@ from asyncio import AbstractEventLoop
from queue import SimpleQueue
from typing import Awaitable, Callable, Type
from creart import AbstractCreator, CreateTargetInfo, exists_module
from async_lru import alru_cache
from creart import AbstractCreator, CreateTargetInfo, exists_module, it
from grpc.aio import insecure_channel, Channel
from tenacity import retry_if_exception_type, retry, wait_random_exponential, stop_after_attempt
from tenacity import retry_if_exception_type, retry, wait_random_exponential, stop_after_attempt, \
retry_if_not_exception_message, before_sleep_log
from src.grpc.manager_pb2 import *
from src.grpc.manager_pb2_grpc import WrapperManagerServiceStub, google_dot_protobuf_dot_empty__pb2
@@ -40,6 +42,7 @@ class WrapperManager:
self._stub = WrapperManagerServiceStub(self._channel)
return self
@alru_cache
async def status(self) -> StatusData:
resp: StatusReply = await self._stub.Status(google_dot_protobuf_dot_empty__pb2.Empty)
if resp.header.code != 0:
@@ -72,10 +75,7 @@ class WrapperManager:
async def _decrypt_request_generator(self):
while True:
item = await self._decrypt_queue.get()
if item is None:
continue
yield item
yield await self._decrypt_queue.get()
async def decrypt_init(self, on_success: Callable[[str, str, bytes, int], Awaitable[None]],
on_failure: Callable[[str, str, bytes, int], Awaitable[None]]):
@@ -84,22 +84,22 @@ class WrapperManager:
reply: DecryptReply
match reply.header.code:
case -1:
await on_failure(reply.data.adam_id, reply.data.key, reply.data.sample, reply.data.sample_index)
it(AbstractEventLoop).create_task(on_failure(reply.data.adam_id, reply.data.key, reply.data.sample, reply.data.sample_index))
case 0:
await on_success(reply.data.adam_id, reply.data.key, reply.data.sample, reply.data.sample_index)
it(AbstractEventLoop).create_task(on_success(reply.data.adam_id, reply.data.key, reply.data.sample, reply.data.sample_index))
@retry(retry=retry_if_exception_type(WrapperManagerException),
@retry(retry=((retry_if_exception_type(WrapperManagerException)) & (retry_if_not_exception_message('no available instance'))),
wait=wait_random_exponential(multiplier=1, max=60),
stop=stop_after_attempt(32))
stop=stop_after_attempt(32), before_sleep=before_sleep_log(it(GlobalLogger).logger, logging.WARN))
async def m3u8(self, adam_id: str) -> str:
resp: M3U8Reply = await self._stub.M3U8(M3U8Request(data=M3U8DataRequest(adam_id=adam_id)))
if resp.header.code != 0:
raise WrapperManagerException(resp.header.msg)
return resp.data.m3u8
@retry(retry=retry_if_exception_type(WrapperManagerException),
@retry(retry=((retry_if_exception_type(WrapperManagerException)) & (retry_if_not_exception_message('no available instance'))),
wait=wait_random_exponential(multiplier=1, max=60),
stop=stop_after_attempt(32))
stop=stop_after_attempt(32), before_sleep=before_sleep_log(it(GlobalLogger).logger, logging.WARN))
async def lyrics(self, adam_id: str, language: str, region: str) -> str:
resp: LyricsReply = await self._stub.Lyrics(LyricsRequest(
data=LyricsDataRequest(adam_id=adam_id, language=language, region=region)))