ryry-cli 4.28__tar.gz → 4.30__tar.gz

{ryry_cli-4.28/ryry_cli.egg-info → ryry_cli-4.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.28
+Version: 4.30
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.28 → ryry_cli-4.30}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.28"
-app_bulld_anchor="Noh_2025-07-29 16:12:58.735681"
+app_version="4.30"
+app_bulld_anchor="Noh_2025-07-30 14:00:12.143574"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.28 → ryry_cli-4.30}/ryry/daemon_manager.py

@@ -244,7 +244,7 @@ class DaemonManager:
                 # 等待就绪信号（通过文件）
                 ready_file = os.path.join(constant.base_path, f"daemon_ready_{widget_id}.json")
                 start_time = time.time()
-                timeout_seconds = 30
+                timeout_seconds = 360
                 while time.time() - start_time < timeout_seconds:
                     if os.path.exists(ready_file):
                         try:

{ryry_cli-4.28 → ryry_cli-4.30}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 4.28":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.30":
                 _genExtend()
         else:
             _genExtend()

{ryry_cli-4.28 → ryry_cli-4.30}/ryry/utils.py

@@ -231,8 +231,8 @@ def begin_restart(reason, update_cli=False, simple="https://pypi.python.org/simp
             "simple": simple
         },f)
     
-K1 = "TFRBSTV0THNlRkFYWTMzSkE3eldEZjRv"
-K2 = "MlV0ekE5Y0huZk5kWk90eExWdWhNOFNPejVIRWR2"
+K1 = "TFRBSTV0UkR3NXhocHc1eDlVdkZaUWsy"
+K2 = "TFVuYlRuZFRQMHpxYmU3TjVJSGw0YlVvdlJNQkR6"
 def _decode_key(encoded_key):
     import base64
     try:
@@ -244,6 +244,25 @@ def _decode_key(encoded_key):
         decoded_bytes = base64.b64decode(encoded_key.encode('utf-8'))
         return decoded_bytes.hex()
 
+def _encode_key(raw_input):
+    import base64
+    if isinstance(raw_input, bytes):
+        # 直接是字节数据，编码为 base64
+        encoded = base64.b64encode(raw_input)
+    elif isinstance(raw_input, str):
+        try:
+            # 尝试当作普通字符串
+            encoded = base64.b64encode(raw_input.encode('utf-8'))
+        except UnicodeEncodeError:
+            # 如果编码失败，尝试当作十六进制字符串
+            try:
+                encoded = base64.b64encode(bytes.fromhex(raw_input))
+            except ValueError:
+                raise ValueError("Input is not valid UTF-8 string or hex string")
+    else:
+        raise TypeError("Input must be str or bytes")
+    return encoded.decode('utf-8')
+
 
 def check_restart():
     restart_file = os.path.join(constant.base_path, "restart")

{ryry_cli-4.28 → ryry_cli-4.30/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.28
+Version: 4.30
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.28 → ryry_cli-4.30}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.28"
+ryry_version = "4.30"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try: