refactor(CookieCloud): Consolidate crypto and hash operations into HashUtils and CryptoJsUtils

app/helper/cookiecloud.py

@@ -1,24 +1,27 @@
 import json
-from hashlib import md5
 from typing import Any, Dict, Tuple, Optional
 
 from app.core.config import settings
-from app.utils.common import decrypt
+from app.utils.crypto import CryptoJsUtils, HashUtils
 from app.utils.http import RequestUtils
 from app.utils.string import StringUtils
+from app.utils.url import UrlUtils
 
 
 class CookieCloudHelper:
     _ignore_cookies: list = ["CookieAutoDeleteBrowsingDataCleanup", "CookieAutoDeleteCleaningDiscarded"]
 
     def __init__(self):
-        self._sync_setting()
+        self.__sync_setting()
         self._req = RequestUtils(content_type="application/json")
 
-    def _sync_setting(self):
-        self._server = settings.COOKIECLOUD_HOST
-        self._key = settings.COOKIECLOUD_KEY
-        self._password = settings.COOKIECLOUD_PASSWORD
+    def __sync_setting(self):
+        """
+        同步CookieCloud配置项
+        """
+        self._server = UrlUtils.standardize_base_url(settings.COOKIECLOUD_HOST)
+        self._key = StringUtils.safe_strip(settings.COOKIECLOUD_KEY)
+        self._password = StringUtils.safe_strip(settings.COOKIECLOUD_PASSWORD)
         self._enable_local = settings.COOKIECLOUD_ENABLE_LOCAL
         self._local_path = settings.COOKIE_PATH
 
@@ -28,7 +31,7 @@ class CookieCloudHelper:
         :return: Cookie数据、错误信息
         """
         # 更新为最新设置
-        self._sync_setting()
+        self.__sync_setting()
 
         if ((not self._server and not self._enable_local)
                 or not self._key
@@ -37,11 +40,11 @@ class CookieCloudHelper:
 
         if self._enable_local:
             # 开启本地服务时，从本地直接读取数据
-            result = self._load_local_encrypt_data(self._key)
+            result = self.__load_local_encrypt_data(self._key)
             if not result:
                 return {}, "未从本地CookieCloud服务加载到cookie数据，请检查服务器设置、用户KEY及加密密码是否正确"
         else:
-            req_url = "%s/get/%s" % (self._server, str(self._key).strip())
+            req_url = UrlUtils.combine_url(host=self._server, path=f"get/{self._key}")
             ret = self._req.get_res(url=req_url)
             if ret and ret.status_code == 200:
                 try:
@@ -59,9 +62,9 @@ class CookieCloudHelper:
         if not encrypted:
             return {}, "未获取到cookie密文"
         else:
-            crypt_key = self._get_crypt_key()
+            crypt_key = self.__get_crypt_key()
             try:
-                decrypted_data = decrypt(encrypted, crypt_key).decode('utf-8')
+                decrypted_data = CryptoJsUtils.decrypt(encrypted, crypt_key).decode("utf-8")
                 result = json.loads(decrypted_data)
             except Exception as e:
                 return {}, "cookie解密失败：" + str(e)
@@ -105,15 +108,17 @@ class CookieCloudHelper:
             ret_cookies[domain] = cookie_str
         return ret_cookies, ""
 
-    def _get_crypt_key(self) -> bytes:
+    def __get_crypt_key(self) -> bytes:
         """
         使用UUID和密码生成CookieCloud的加解密密钥
         """
-        md5_generator = md5()
-        md5_generator.update((str(self._key).strip() + '-' + str(self._password).strip()).encode('utf-8'))
-        return (md5_generator.hexdigest()[:16]).encode('utf-8')
+        combined_string = f"{self._key}-{self._password}"
+        return HashUtils.md5(combined_string)[:16].encode("utf-8")
 
-    def _load_local_encrypt_data(self, uuid: str) -> Dict[str, Any]:
+    def __load_local_encrypt_data(self, uuid: str) -> Dict[str, Any]:
+        """
+        获取本地CookieCloud数据
+        """
         file_path = self._local_path / f"{uuid}.json"
         # 检查文件是否存在
         if not file_path.exists():