fix: bugs

Author: hiddify-com

hiddify_support_bot/modules/user/reply_handler.py

@@ -13,15 +13,16 @@
 import copy
 
 
-@bot.message_handler(func=lambda msg: msg.sender_chat)
+# @bot.message_handler(func=lambda msg: msg.sender_chat and not((msg.text or "").startswith("/")))
+@bot.message_handler(func=lambda msg: msg.sender_chat and "    SSH Site" in ((msg.text or "")))
 async def main_message_from_channel(msg: HMessage):
     # print(msg)
     newmsg = copy.deepcopy(msg)
     newmsg.reply_to_message = msg
     newmsg.main_message = msg
-    # newmsg.text = ""
+    newmsg.text = ""
     await is_reply_to_user_condition(newmsg)
-    await reply_to_user(newmsg, add_reply_text=True)
+    await reply_to_user(newmsg, False)
     from .ssh import check
     await check(newmsg)
 
@@ -121,7 +122,7 @@ async def reply_to_user(msg: HMessage, add_reply_text=True):
         return
     user_data = await bot.get_user_data(reply_to_chat_data['user_id'], reply_to_chat_data['chat_id'])
     target_chat_lang = user_data.get('lang', 'en')
-
+    
     caption = f"""[ ](https://hiddify.com/reply_to_us/?chat={msg.chat_id}&msg={msg.message_id})  
 {_("chat.reply_insrtuction",target_chat_lang)}
 =====

hiddify_support_bot/modules/user/ssh_utils.py

@@ -12,30 +12,47 @@ def get_public_key():
 SSH_PUB_PATH = SSH_PK_PATH+".pub"
 SSH_PUB_STR = get_public_key()
 
-ansi_escape_pattern = re.compile(r'\x1B[@-_][0-?]*[ -/]*[@-~]')
 
-# Remove ANSI escape sequences
 
+ansi_escape_pattern = re.compile(r"\x1B[@-_][0-?]*[ -/]*[@-~]")
+
+
+def _text(stream: bytes | str | None) -> str:
+    if stream is None:
+        return ""
+    if isinstance(stream, bytes):
+        return stream.decode(errors="replace")
+    return str(stream)
+
+
+def _format_result(result: asyncssh.SSHCompletedProcess) -> str:
+    return f"{_text(result.stdout)}  {_text(result.stderr)}".strip()
+
+
+async def test_ssh(host: str,port: int,username: str, key_path: str) -> str:
+    async with asyncssh.connect(host,port=port,username=username,client_keys=[key_path],known_hosts=None,connect_timeout=10,encoding="utf-8") as conn:
+        result = await conn.run("cat /opt/hiddify-manager/VERSION", check=False)
+        out = _format_result(result)
+        print(f"VERSION (exit {result.exit_status}):\n{out}\n")
+
+        try:
+            status = await conn.run("/opt/hiddify-manager/status.sh", check=False)
+            cleaned = ansi_escape_pattern.sub("", _text(status.stdout))
+            cleaned = cleaned.replace("                      ", " ")
+            cleaned = cleaned.replace("-----------------------------------", " ")
+            out += f"\n```bash\n{cleaned}\n{_text(status.stderr)}```"
+            print(f"status.sh (exit {status.exit_status}):\n{cleaned}\n")
+        except Exception as e:
+            out += f"\nError running status.sh: {e}"
+            print(f"status.sh failed: {e}")
+
+        return out
 
 async def test_ssh_connection(ssh_info):
     if not ssh_info:
         return False
-    print("TEST")
     try:
-        async with asyncssh.connect(
-            ssh_info["host"], port=ssh_info["port"], username=ssh_info["user"], client_keys=[SSH_PK_PATH], known_hosts=None, connect_timeout=2
-        ) as conn:
-            # result = await conn.run("pip3 freeze | grep hiddifypanel | awk -F ' == ' '{ print $2 }'")
-            result = await conn.run("cat /opt/hiddify-manager/VERSION")
-            out = f"{result.stdout}  {result.stderr}".strip()
-            try:
-                status = await conn.run("/opt/hiddify-manager/status.sh")
-                out += f"\n```bash\n{ansi_escape_pattern.sub('', status.stdout)}\n{status.stderr}```"
-            except Exception as e:
-                out += (f"Error: {e}")
-            print("SUCCESS")
-            return f'{out}'
-        return "WTF?"
+        return await test_ssh(ssh_info["host"], ssh_info["port"], ssh_info["user"], SSH_PK_PATH)
     except Exception as e:
         print(f"Error: {e}")
     return False

pyproject.toml

@@ -12,7 +12,7 @@ dependencies = [
     "pyTelegramBotAPI==4.21.0",
     "aiohttp==3.13.5",
     "python-dotenv==1.0.1",
-    "asyncssh==2.15.0",
+    "asyncssh==2.23.0",
     "cryptography==42.0",
 ]