From 02d60d406a3ef3c3612c133e6f803993632edd40 Mon Sep 17 00:00:00 2001
From: hotyue <52734432+hotyue@users.noreply.github.com>
Date: Wed, 1 Apr 2026 10:32:28 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20V5.1=20=E5=AE=8C=E5=96=84=E4=B8=AD?=
 =?UTF-8?q?=E6=9E=A2=E9=9D=A2=E6=9D=BF=E4=B8=8E=20Webhook=20=E9=97=AD?=
 =?UTF-8?q?=E7=8E=AF=20-=20=E6=96=B0=E5=A2=9E=E4=B8=80=E9=94=AE=E7=B4=A2?=
 =?UTF-8?q?=E8=A6=81=E6=88=98=E6=8A=A5=E4=B8=8E=E5=AE=9E=E6=97=B6=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/agent_daemon.sh | 12 ++++++++++++
 master/tg_master.sh  | 28 ++++++++++++++++++----------
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/core/agent_daemon.sh b/core/agent_daemon.sh
index 41a9569..f79baff 100644
--- a/core/agent_daemon.sh
+++ b/core/agent_daemon.sh
@@ -59,6 +59,18 @@ class AgentHandler(http.server.BaseHTTPRequestHandler):
         elif self.path == '/trigger_report':
             # 另起后台进程执行战报生成
             subprocess.Popen(['bash', '/opt/ip_sentinel/core/tg_report.sh'])
+        elif self.path == '/trigger_log':
+            # 【新增升级】抓取最后15行日志并通过 TG 原路返回 (直接通过 bash -c 运行复合命令)
+            bash_cmd = """
+            source /opt/ip_sentinel/config.conf
+            LOG_DATA=$(tail -n 15 /opt/ip_sentinel/logs/sentinel.log)
+            NODE=$(hostname | cut -c 1-15)
+            curl -s -X POST "https://api.telegram.org/bot${TG_TOKEN}/sendMessage" \
+                -d "chat_id=${CHAT_ID}" \
+                -d "text=📄 **[${NODE}] 实时运行日志:**%0A\`\`\`log%0A${LOG_DATA}%0A\`\`\`" \
+                -d "parse_mode=Markdown"
+            """
+            subprocess.Popen(['bash', '-c', bash_cmd])
 
     def log_message(self, format, *args):
         # 关闭默认的控制台日志输出，保持后台清爽
diff --git a/master/tg_master.sh b/master/tg_master.sh
index ea43f6e..005fc09 100644
--- a/master/tg_master.sh
+++ b/master/tg_master.sh
@@ -2,7 +2,7 @@
 
 # ==========================================================
 # 脚本名称: tg_master.sh (Master 端调度枢纽)
-# 核心功能: 监听 TG、操作 SQLite、向 Agent 发送 Webhook 指令
+# 核心功能: 监听 TG、操作 SQLite、向 Agent 发送多维 Webhook 指令
 # ==========================================================
 
 CONF="/opt/ip_sentinel_master/master.conf"
@@ -82,26 +82,34 @@ while true; do
 
                 manage:*)
                     TARGET_NODE=${TEXT#*:}
-                    BTNS="[[{\"text\":\"▶️ 执行深度伪装\",\"callback_data\":\"run:$TARGET_NODE\"}, {\"text\":\"📜 索要战报\",\"callback_data\":\"report:$TARGET_NODE\"}], [{\"text\":\"⬅️ 返回主列表\",\"callback_data\":\"list_nodes\"}]]"
+                    # 【升级点】补齐包含 run、log、report 的复合面板菜单
+                    BTNS="[[{\"text\":\"▶️ 执行深度伪装\",\"callback_data\":\"run:$TARGET_NODE\"}, {\"text\":\"📜 查看实时日志\",\"callback_data\":\"log:$TARGET_NODE\"}], [{\"text\":\"📊 索要统计战报\",\"callback_data\":\"report:$TARGET_NODE\"}, {\"text\":\"⬅️ 返回主列表\",\"callback_data\":\"list_nodes\"}]]"
                     send_ui "$CHAT_ID" "⚙️ **目标锁定**: \`$TARGET_NODE\`\n请选择战术动作：" "$BTNS"
                     ;;
 
-                run:*)
-                    # 核心 Webhook 触发逻辑
-                    TARGET_NODE=${TEXT#*:}
+                run:*|report:*|log:*)
+                    # 【升级点】合并 Webhook 触发逻辑，智能识别动作类型
+                    ACTION_TYPE=$(echo "$TEXT" | cut -d':' -f1)
+                    TARGET_NODE=$(echo "$TEXT" | cut -d':' -f2)
+                    
                     # 从 DB 提取 IP 和 Port
                     AGENT_INFO=$(db_exec "SELECT agent_ip, agent_port FROM nodes WHERE chat_id='$CHAT_ID' AND node_name='$TARGET_NODE' LIMIT 1;")
                     AGENT_IP=$(echo "$AGENT_INFO" | cut -d'|' -f1)
                     AGENT_PORT=$(echo "$AGENT_INFO" | cut -d'|' -f2)
 
                     if [ -n "$AGENT_IP" ] && [ -n "$AGENT_PORT" ]; then
-                        send_msg "$CHAT_ID" "⏳ 正在向 \`$TARGET_NODE\` ($AGENT_IP) 下发作战指令..."
-                        # 向 Agent 的开放端口发送 Webhook 唤醒指令
-                        RESPONSE=$(curl -s -m 5 "http://${AGENT_IP}:${AGENT_PORT}/trigger_run" || echo "FAILED")
+                        send_msg "$CHAT_ID" "⏳ 正在向 \`$TARGET_NODE\` ($AGENT_IP) 下发 [$ACTION_TYPE] 指令，请稍候..."
+                        
+                        # 向 Agent 的开放端口发送动态 Webhook 唤醒指令 (如 trigger_run, trigger_log)
+                        RESPONSE=$(curl -s -m 5 "http://${AGENT_IP}:${AGENT_PORT}/trigger_${ACTION_TYPE}" || echo "FAILED")
+                        
                         if [ "$RESPONSE" == "FAILED" ]; then
-                            send_msg "$CHAT_ID" "❌ 指令下发失败！无法连接到边缘节点，请检查节点的公网 IP 或防火墙端口 ($AGENT_PORT) 是否放行。"
+                            send_msg "$CHAT_ID" "❌ 指令下发超时或失败！请检查节点公网 IP 或防火墙端口 ($AGENT_PORT) 是否放行。"
                         else
-                            send_msg "$CHAT_ID" "✅ 节点 \`$TARGET_NODE\` 回应: 指令已接收，伪装程序启动。"
+                            # 只有 run 指令需要主控单独回复确认，log 和 report 会由 Agent 直接将内容发到你的 TG
+                            if [ "$ACTION_TYPE" == "run" ]; then
+                                send_msg "$CHAT_ID" "✅ 节点 \`$TARGET_NODE\` 回应: 指令已接收，伪装程序启动。"
+                            fi
                         fi
                     else
                         send_msg "$CHAT_ID" "❌ 数据库中未找到该节点的通讯地址。"