clash-controller 0.0.2__tar.gz → 0.1.0__tar.gz

{clash_controller-0.0.2 → clash_controller-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clash_controller
-Version: 0.0.2
+Version: 0.1.0
 Summary: A controller for Clash
 Author-email: Moha-Master <hongkongreporter@outlook.com>
 License-Expression: MIT
@@ -14,6 +14,8 @@ Description-Content-Type: text/markdown
 Requires-Dist: requests
 Requires-Dist: requests_unixsocket
 Requires-Dist: InquirerPy
+Requires-Dist: paramiko
+Requires-Dist: scp
 
 # Clash Controller
 

{clash_controller-0.0.2 → clash_controller-0.1.0}/clash_controller/api.py

@@ -109,7 +109,7 @@ class ClashAPI:
             # connection problems and the API is local, return the sentinel so
             # caller can ask user to verify the outcome manually.
             try:
-                longer_timeout = max(self.timeout * 3, 15)
+                longer_timeout = 15
                 if self.debug:
                     print(f"[DEBUG] ReadTimeout occurred, retrying with timeout={longer_timeout}")
                 response = do_request(longer_timeout)
@@ -133,6 +133,9 @@ class ClashAPI:
             except requests.exceptions.RequestException as exc:
                 if self.debug:
                     print(f"[DEBUG] ReadTimeout retry failed: {exc}")
+                # Reload config may legitimately finish server-side while client times out.
+                if method.upper() == 'PUT' and endpoint.startswith('/configs'):
+                    return None, self.SENT_BUT_DISCONNECTED
                 # If this is a local API, we conservatively cannot determine the final
                 # state (server may have applied the operation then closed the connection),
                 # so inform the caller to verify manually.
@@ -145,6 +148,8 @@ class ClashAPI:
             # can prompt user to manually verify; otherwise return the error.
             if self.debug:
                 print(f"[DEBUG] Connection error: {e}")
+            if method.upper() == 'PUT' and endpoint.startswith('/configs'):
+                return None, self.SENT_BUT_DISCONNECTED
             if self._is_local():
                 return None, self.SENT_BUT_DISCONNECTED
             return None, str(e)