From 8ecf55b508e8d5fe9e2611287ed63eb652d0e4e0 Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sat, 14 Jun 2025 19:12:58 +0800 Subject: [PATCH] add: add request time limit to luahook api --- module/luahook/api.py | 7 ++++--- module/luahook/crack.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/luahook/api.py b/module/luahook/api.py index 578712bd0..078f3d06d 100644 --- a/module/luahook/api.py +++ b/module/luahook/api.py @@ -50,8 +50,9 @@ class CrackApi: class ExerciseMorePowerRate(BaseModel): rate: float - def __init__(self, base_url): + def __init__(self, base_url, timeout=10): self.api_url = base_url + self.timeout = timeout def get(self, path, **kwargs): args = [] @@ -66,7 +67,7 @@ class CrackApi: try: response = requests.get(url, headers={ "Connection": "close", - }) # TODO: add timeout + }, timeout=self.timeout) except requests.exceptions.Timeout: raise CrackerError('CrackApi request timeout') except Exception as e: @@ -84,7 +85,7 @@ class CrackApi: try: response = requests.post(url, data=data_str, headers={ "Connection": "close", - }) # TODO: add timeout + }, timeout=self.timeout) except requests.exceptions.Timeout: raise CrackerError('CrackApi request timeout') except Exception as e: diff --git a/module/luahook/crack.py b/module/luahook/crack.py index 8c0268dd8..7f44bc484 100644 --- a/module/luahook/crack.py +++ b/module/luahook/crack.py @@ -84,7 +84,8 @@ def do_crack_op(config: AzurLaneConfig, device: Device, ops: Union[Type[CrackOp. l = [ops] base_url = f"http://127.0.0.1:{device.adb.forward_port(REMOTE_PORT)}" - api = CrackApi(base_url) + timeout = deep_get(config.data, "Hook.HookGeneral.RequestTimeLimit", 10) + api = CrackApi(base_url, timeout=timeout) for op in l: if op == CrackOp.DisableAll: api.disable_all()