`);
+ const svgFolderClosed = `
`;
+ const svgFolderOpen = `
`;
+ const svgGroupClosed = `
`;
+ const svgGroupOpen = `
`;
+ const svgLeaf = `
`;
+ const expandAllIcon = `
`;
+ const collapseAllIcon = `
`;
+
for (const key in data) {
const value = data[key];
const currentPath = parentPath ? `${parentPath}::${key}` : key;
@@ -6668,12 +6654,6 @@ export function buildRealFilterTree(data, parentPath = '', hiddenKeys = [], isPa
let cliCommand = currentPath.replace(/::/g, ' ').replace(/\s*\[\d+\]/g, '');
- const svgFolderClosed = `
`;
- const svgFolderOpen = `
`;
- const svgGroupClosed = `
`;
- const svgGroupOpen = `
`;
- const svgLeaf = `
`;
-
const isFolder = typeof value === 'object' && value !== null && Object.keys(value).length > 0;
const onChangeEvent = isFolder ? 'toggleChildCheckboxes(this)' : 'updateParentCheckboxState(this)';
const checkboxHtml = `
`;
@@ -6683,16 +6663,12 @@ export function buildRealFilterTree(data, parentPath = '', hiddenKeys = [], isPa
const isCommandGroup = isParentCommandGroup || !hasNestedObject;
const elementId = `filter-${mode}-folder-${currentPath.replace(/[^a-zA-Z0-9]/g, '-')}`;
- // 🌟 存入過濾器專用快取
filterFolderCache[elementId] = { data: value, hiddenKeys: hiddenKeys };
const iconClosed = isCommandGroup ? svgGroupClosed : svgFolderClosed;
const iconOpen = isCommandGroup ? svgGroupOpen : svgFolderOpen;
const folderSuffix = isCommandGroup ? `
(指令群組)` : '';
- const expandAllIcon = `
`;
- const collapseAllIcon = `
`;
-
const expandCollapseBtns = `
`;
- // 🌟 加入 lazyLoadFolder 觸發
+ // 🚀 核心魔法：如果 forceExpand 為 true，直接在記憶體中遞迴生成子節點 HTML
+ const isOpenAttr = forceExpand ? 'open' : '';
+ const isLoadedAttr = forceExpand ? 'true' : 'false';
+ const displayClosed = forceExpand ? 'none' : 'inline-block';
+ const displayOpen = forceExpand ? 'inline-block' : 'none';
+
+ let innerContent = '';
+ if (forceExpand) {
+ innerContent = buildRealFilterTree(value, currentPath, hiddenKeys, isCommandGroup, mode, true);
+ }
+
htmlParts.push(`
-
+ ${innerContent}
`);
@@ -7177,7 +7163,10 @@ async def websocket_terminal(websocket: WebSocket, host: str, username: str, pas
await process.stdin.drain()
except WebSocketDisconnect:
# 主動拋出，讓外層捕捉以進行資源回收
- raise
+ # raise
+ # 🌟 修正：不要再 raise 拋出去了，直接 return 結束任務，讓外層自然回收
+ logger.debug("前端 WebSocket 正常斷開 (使用者重整或關閉網頁)")
+ return
except asyncio.CancelledError:
pass
except Exception as e:
@@ -7830,7 +7819,7 @@ from pydantic import BaseModel
from typing import List
from netmiko import ConnectHandler
# 🌟 [Priority 1 修復] 引入 cmts_config_locks
-from shared import CMTS_DEVICE, cmts_config_locks, parse_cli_to_tree, deep_split_tree, USE_DB
+from shared import CMTS_DEVICE, cmts_config_locks, parse_cli_to_tree, deep_split_tree
from collections import defaultdict
from fastapi.responses import StreamingResponse
from logger import get_all_log_levels, set_log_level
@@ -7846,45 +7835,18 @@ def get_filter_file_path(config_type: str) -> str:
return f"filters_{safe_type}.json"
async def load_tree_filters(config_type: str) -> list:
- if USE_DB:
- try:
- db_filters = await database.get_tree_filters(config_type)
- if db_filters is not None:
- return db_filters
- else:
- print("⚠️ [Fallback] 資料庫無法取得過濾器，自動切換至 JSON 快取讀取...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫讀取過濾器發生例外: {e}，自動切換至 JSON 快取讀取...")
-
- file_path = get_filter_file_path(config_type)
- if os.path.exists(file_path):
- try:
- with open(file_path, 'r', encoding='utf-8') as f:
- data = json.load(f)
- return data.get("hidden_keys", [])
- except Exception as e:
- print(f"讀取過濾器檔案失敗: {e}")
- return []
- return []
+ try:
+ db_filters = await database.get_tree_filters(config_type)
+ return db_filters if db_filters is not None else []
+ except Exception as e:
+ print(f"資料庫讀取過濾器發生例外: {e}")
+ return []
async def save_tree_filters(config_type: str, hidden_keys: list):
- db_success = False
- if USE_DB:
- try:
- if await database.upsert_tree_filters(config_type, hidden_keys):
- db_success = True
- else:
- print("⚠️ [Fallback] 資料庫儲存過濾器失敗，自動切換至 JSON 快取寫入...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫寫入過濾器發生例外: {e}，自動切換至 JSON 快取寫入...")
-
- if not db_success:
- file_path = get_filter_file_path(config_type)
- try:
- with open(file_path, 'w', encoding='utf-8') as f:
- json.dump({"hidden_keys": hidden_keys}, f, ensure_ascii=False, indent=4)
- except Exception as e:
- print(f"儲存過濾器檔案失敗: {e}")
+ try:
+ await database.upsert_tree_filters(config_type, hidden_keys)
+ except Exception as e:
+ print(f"資料庫寫入過濾器發生例外: {e}")
# ==========================================
@@ -8291,31 +8253,19 @@ from fastapi import APIRouter, BackgroundTasks, HTTPException, Request, Body
from fastapi.responses import StreamingResponse
from pydantic import BaseModel
from typing import List
-import json, os, asyncio, re
+import json, asyncio, re
import database
from cmts_scraper import sync_cmts_leaves_async
-from shared import CMTS_DEVICE, USE_DB
+from shared import CMTS_DEVICE
router = APIRouter(tags=["Options"])
-# 🌟 1. 動態獲取快取檔名 (加入 host 隔離)
-def get_cache_file(host: str, config_type: str):
- safe_host = host.replace(".", "_")
- return f"{safe_host}_{config_type}_cache.json"
-
-# ==========================================
-# 🌟 2. 全域廣播機制 (SSE) - 升級為「IP + 模式」頻道分流
-# ==========================================
-# 將狀態改為空字典，動態根據 host_configType 建立
SCAN_STATUS = {}
active_clients = {}
-async def broadcast_message(message_dict: dict, host: str, config_type: str = "running"):
- """將訊息推播給特定頻道的連線前端"""
- channel_key = f"{host}_{config_type}"
+async def broadcast_message(message_dict: dict, host: str):
+ channel_key = host
dead_clients = set()
-
- # SSE 協定嚴格要求必須以 "data: " 開頭，並以 "\n\n" 結尾
message_str = f"data: {json.dumps(message_dict)}\n\n"
for client_queue in active_clients.get(channel_key, set()):
@@ -8327,9 +8277,8 @@ async def broadcast_message(message_dict: dict, host: str, config_type: str = "r
active_clients[channel_key].discard(dead)
@router.get("/cmts-leaf-options/stream")
-async def sse_stream(request: Request, host: str, config_type: str = "running"):
- """前端一載入就會連上這個路由，持續監聽特定頻道的廣播"""
- channel_key = f"{host}_{config_type}"
+async def sse_stream(request: Request, host: str):
+ channel_key = host
client_queue = asyncio.Queue()
if channel_key not in active_clients:
@@ -8339,92 +8288,58 @@ async def sse_stream(request: Request, host: str, config_type: str = "running"):
async def event_generator():
try:
while True:
- # 主動檢查斷線，避免死鎖
if await request.is_disconnected():
break
try:
- # [修復 Leak] 延長 timeout 降低輪詢負擔
message = await asyncio.wait_for(client_queue.get(), timeout=5.0)
yield message
except asyncio.TimeoutError:
yield ": keepalive\n\n"
-
except asyncio.CancelledError:
pass
finally:
- # [修復 Leak] 確保斷線時 Queue 絕對會被移出 active_clients 釋放記憶體
if channel_key in active_clients:
active_clients[channel_key].discard(client_queue)
return StreamingResponse(event_generator(), media_type="text/event-stream")
@router.get("/scan-status")
-async def get_scan_status(host: str, config_type: str = "running"):
- channel_key = f"{host}_{config_type}"
- return {"is_scanning": SCAN_STATUS.get(channel_key, False)}
+async def get_scan_status(host: str):
+ return {"is_scanning": SCAN_STATUS.get(host, False)}
-# ==========================================
-# 🌟 3. 快取讀取與背景掃描任務
-# ==========================================
class SyncOptionsRequest(BaseModel):
- host: str # 🌟 新增 host 參數
- username: str = "" # 🌟 新增 username 參數
- password: str = "" # 🌟 新增 password 參數
+ host: str
+ username: str = ""
+ password: str = ""
leaf_paths: List[str]
- config_type: str = "running"
@router.get("/cmts-leaf-options")
-async def get_leaf_options(host: str, config_type: str = "running"):
- if USE_DB:
- try:
- db_options = await database.get_all_leaf_options(host, config_type)
- if db_options is not None:
- # 取得 metadata
- metadata = await database.get_device_status(host, config_type)
- if metadata:
- db_options["__metadata__"] = metadata
- return db_options
- else:
- # 若回傳 None 表示 DB 連線異常，執行 Fallback
- print("⚠️ [Fallback] 資料庫無法取得資料，自動切換至 JSON 快取讀取...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫讀取發生例外: {e}，自動切換至 JSON 快取讀取...")
-
- cache_file = get_cache_file(host, config_type)
- if not os.path.exists(cache_file): return {}
-
- # 🌟 優化 3：將讀取動作丟到背景執行緒
- def read_json_from_file(filepath):
- with open(filepath, "r", encoding="utf-8") as f:
- return json.load(f)
-
- return await asyncio.to_thread(read_json_from_file, cache_file)
-
-async def run_scan_task(host: str, username: str, password: str, paths: List[str], config_type: str):
- """在背景執行的爬蟲任務，並將進度廣播出去"""
- global SCAN_STATUS
- channel_key = f"{host}_{config_type}"
+async def get_leaf_options(host: str):
try:
- await broadcast_message({"event": "scan_start"}, host, config_type)
-
- # 呼叫爬蟲 (帶入設備連線資訊與 config_type)
- async for chunk in sync_cmts_leaves_async(
- host=host,
- username=username,
- password=password,
- leaf_paths=paths,
- config_type=config_type
- ):
- if isinstance(chunk, str):
- await broadcast_message(json.loads(chunk), host, config_type)
- else:
- await broadcast_message(chunk, host, config_type)
-
- await broadcast_message({"event": "done"}, host, config_type)
+ db_options = await database.get_all_leaf_options(host)
+ if db_options is not None:
+ metadata = await database.get_device_status(host)
+ if metadata:
+ db_options["__metadata__"] = metadata
+ return db_options
+ raise HTTPException(status_code=500, detail="資料庫連線異常")
except Exception as e:
- await broadcast_message({"event": "error", "message": str(e)}, host, config_type)
+ raise HTTPException(status_code=500, detail=f"資料庫讀取失敗: {e}")
+
+async def run_scan_task(host: str, username: str, password: str, paths: List[str]):
+ global SCAN_STATUS
+ channel_key = host
+ try:
+ await broadcast_message({"event": "scan_start"}, host)
+ async for chunk in sync_cmts_leaves_async(host=host, username=username, password=password, leaf_paths=paths):
+ if isinstance(chunk, str):
+ await broadcast_message(json.loads(chunk), host)
+ else:
+ await broadcast_message(chunk, host)
+ await broadcast_message({"event": "done"}, host)
+ except Exception as e:
+ await broadcast_message({"event": "error", "message": str(e)}, host)
finally:
- # 解除特定頻道的鎖定
SCAN_STATUS[channel_key] = False
@router.post("/cmts-leaf-options/sync")
@@ -8433,14 +8348,12 @@ async def sync_leaf_options(request: SyncOptionsRequest, background_tasks: Backg
if not request.leaf_paths:
raise HTTPException(status_code=400)
- channel_key = f"{request.host}_{request.config_type}"
-
+ channel_key = request.host
if SCAN_STATUS.get(channel_key, False):
- return {"status": "busy", "message": f"⚠️ {request.config_type} 模式的掃描任務正在執行中，請勿重複點擊！"}
+ return {"status": "busy", "message": "⚠️ 該設備的掃描任務正在執行中，請勿重複點擊！"}
SCAN_STATUS[channel_key] = True
- # 保留您原本完美的路徑清理邏輯
cmts_query_paths = []
for p in request.leaf_paths:
clean_p = p.replace("::", " ")
@@ -8448,61 +8361,19 @@ async def sync_leaf_options(request: SyncOptionsRequest, background_tasks: Backg
cmts_query_paths.append(clean_p)
cmts_query_paths = list(dict.fromkeys(cmts_query_paths))
-
- # 決定帳密 (優先使用 request 傳來的，否則 fallback 到 shared.CMTS_DEVICE)
- # 🌟 加上 or "" 確保最終結果絕對是字串，消除 Pylance 警告
user = request.username or CMTS_DEVICE.get("username") or ""
pwd = request.password or CMTS_DEVICE.get("password") or ""
- background_tasks.add_task(run_scan_task, request.host, user, pwd, cmts_query_paths, request.config_type)
+ background_tasks.add_task(run_scan_task, request.host, user, pwd, cmts_query_paths)
return {"status": "started"}
-# ==========================================
-# 🌟 4. 清除快取 API
-# ==========================================
@router.post("/clear_cache")
-async def clear_specific_cache(host: str, config_type: str = "running", paths_to_clear: list = Body(...)):
- cleared_count = 0
-
- # 1. 嘗試清除 DB
- if USE_DB:
- try:
- db_cleared = await database.delete_leaf_options(host, config_type, paths_to_clear)
- if db_cleared >= 0:
- cleared_count = db_cleared
- else:
- print("⚠️ [Fallback] 資料庫清除失敗，自動切換至 JSON 快取清除...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫清除發生例外: {e}，自動切換至 JSON 快取清除...")
-
- # 2. 清除 JSON (如果 DB 沒清掉，或 USE_DB=False，或者是連同舊檔一起清確保乾淨)
- cache_file = get_cache_file(host, config_type)
-
- if not os.path.exists(cache_file):
- # 如果是走 DB，且有清掉，回傳 DB 的結果
- if USE_DB and cleared_count > 0:
- return {"status": "success", "cleared_count": cleared_count}
- return {"status": "success", "cleared_count": 0, "message": "快取檔案不存在"}
-
+async def clear_specific_cache(host: str, paths_to_clear: list = Body(...)):
try:
- with open(cache_file, "r", encoding="utf-8") as f:
- cache_data = json.load(f)
-
- json_cleared_count = 0
- for path in paths_to_clear:
- if path in cache_data:
- del cache_data[path]
- json_cleared_count += 1
-
- if json_cleared_count > 0:
- with open(cache_file, "w", encoding="utf-8") as f:
- json.dump(cache_data, f, ensure_ascii=False, indent=4)
-
- # 回傳較大的那個數值
- final_count = max(cleared_count, json_cleared_count)
- return {"status": "success", "cleared_count": final_count}
-
+ cleared_count = await database.delete_leaf_options(host, paths_to_clear)
+ if cleared_count >= 0:
+ return {"status": "success", "cleared_count": cleared_count}
+ raise HTTPException(status_code=500, detail="資料庫清除失敗")
except Exception as e:
- # 確保回傳標準 JSON 格式
- return {"status": "error", "message": f"資料庫連線與快取存取皆失敗: {str(e)}"}
+ raise HTTPException(status_code=500, detail=f"資料庫清除失敗: {str(e)}")
diff --git a/cmts_scraper.py b/cmts_scraper.py
index a1193c3..6950e96 100644
--- a/cmts_scraper.py
+++ b/cmts_scraper.py
@@ -6,113 +6,108 @@ import json
import os
import time
import database
-from shared import USE_DB
from logger import get_logger
logger = get_logger("app.scraper")
def parse_question_mark_output(output: str) -> dict:
- """解析 '?' 回傳內容，支援無 Description、子命令判定與 dhcp-relay 混合欄位"""
+ """解析 '?' 回傳內容，無差別掃描支援所有標題排列組合"""
hint_lines = []
options = []
current_value = None
format_desc = None
is_format_only = False
-
- state = "INIT"
- has_description = False
has_bracket_value = False
- # 🌟 Case-5 特殊處理：dhcp-relay 混合型欄位 (選項 + IP輸入)
- # 直接在開頭掃描完整輸出，若包含 dhcp-relay，強制轉為純文字輸入框
if "dhcp-relay" in output.lower():
is_format_only = True
format_desc = "IP address or options"
for line in output.splitlines():
line = line.strip()
- # 過濾雜訊與終端機提示字元
- if not line or line.startswith('admin@') or line.startswith('cable') or line.startswith('%') or line.startswith('^'):
+
+ # ==========================================
+ # 🛡️ 1. 終極雜訊與 Echo 過濾器
+ # ==========================================
+ if not line or line.startswith('%') or line.startswith('^'):
continue
- if line.startswith('Description:'):
- state = "DESC"
- has_description = True
- hint_lines.append(line)
+ # 攔截 Echo 的問號指令 (例如 "logging buffered ?")
+ if line.endswith('?'):
continue
- if line.startswith('Possible completions:'):
- state = "COMPLETIONS"
- # 🌟 解除限制：無論有沒有 Description，都把這行加進 hint
- hint_lines.append(line)
+ # 攔截終端機 Prompt (例如 "admin@SERCOMM-COS-02(config)# ..." 或 "admin@SERCOMM-COS-02>")
+ if re.search(r"[a-zA-Z0-9_.@-]+\(.*\)#", line) or re.search(r"^[a-zA-Z0-9_.@-]+>", line):
continue
-
- if state == "DESC":
- hint_lines.append(line)
-
- elif state == "COMPLETIONS":
- # Case 1~4: 無 Description 時，將後續選項說明也納入提示
- # 🌟 解除限制：無論有沒有 Description，都把這行加進 hint
- hint_lines.append(line)
-
- # 規則 1: <格式說明>[當前值]
- match_format = re.search(r"<([^>]+)>\s*(?:\[([^\]]+)\])?", line)
- if match_format:
- is_format_only = True
- format_desc = match_format.group(1).strip()
- if match_format.group(2):
- current_value = match_format.group(2).strip()
- continue
-
- # 規則 1.5: 型態, 最小值 .. 最大值
- match_range = re.search(r"^\s*([a-zA-Z0-9_]+),\s*(\d+)\s*\.\.\s*(\d+)\s*$", line)
- if match_range:
- is_format_only = True
- format_desc = f"{match_range.group(1)} ({match_range.group(2)} .. {match_range.group(3)})"
- continue
-
- # 規則 1.6: IP address 等純文字關鍵字
- match_keyword = re.search(r"^(IP address|IPv4 address|IPv6 address|MAC address)$", line, re.IGNORECASE)
- if match_keyword:
- is_format_only = True
- format_desc = match_keyword.group(1)
- continue
-
- # 規則 2: 選項列表處理
- match_current = re.search(r"^\[([^\]]+)\]", line)
- if match_current:
- has_bracket_value = True # 標記：這是一個帶有現值的標準選項清單
- if not current_value:
- current_value = match_current.group(1).strip()
- clean_line = re.sub(r"^\[[^\]]+\]", "", line).strip()
- else:
- clean_line = line.strip()
+ # ==========================================
- # 🌟 Case-6 防呆：過濾垂直列表的說明文字
- # 利用「3 個以上的連續空白」作為選項與說明文字的分界線
- if re.search(r"\s{3,}", clean_line):
- clean_line = re.split(r"\s{3,}", clean_line)[0]
-
- parts = clean_line.split()
- for p in parts:
- if p and p not in ["|", ".."]:
- options.append(p)
+ # 2. 無差別收集所有有效行作為 Hint (保留最完整的說明給使用者看)
+ hint_lines.append(line)
- # 🌟 Case 2, 3, 4: 子命令防呆機制
- # 若在選項區塊從未發現 [現值]，且非已知格式，判定為子命令，強制轉純文字
- if state == "COMPLETIONS" and not has_bracket_value and not is_format_only and options:
+ # 3. 略過純標題行，不進行選項解析
+ if line.startswith('Description:') or line.startswith('Possible completions:'):
+ continue
+
+ # 4. 解析格式與選項 (無差別掃描每一行)
+
+ # 格式 A: <格式說明>[當前值] (例如: [Cold Start])
+ match_format = re.search(r"<([^>]+)>\s*(?:\[([^\]]+)\])?", line)
+ if match_format:
+ is_format_only = True
+ format_desc = match_format.group(1).strip()
+ if match_format.group(2):
+ current_value = match_format.group(2).strip()
+ continue
+
+ # 格式 B: 型態, 最小值 .. 最大值 (例如: unsignedInt, 1 .. 3000)
+ match_range = re.search(r"^\s*([a-zA-Z0-9_]+),\s*(\d+)\s*\.\.\s*(\d+)\s*$", line)
+ if match_range:
+ is_format_only = True
+ format_desc = f"{match_range.group(1)} ({match_range.group(2)} .. {match_range.group(3)})"
+ continue
+
+ # 格式 C: 純文字關鍵字
+ match_keyword = re.search(r"^(IP address|IPv4 address|IPv6 address|MAC address)$", line, re.IGNORECASE)
+ if match_keyword:
+ is_format_only = True
+ format_desc = match_keyword.group(1)
+ continue
+
+ # 格式 D: 選項列表 [現值] 選項1 選項2
+ match_current = re.search(r"^\[([^\]]+)\]", line)
+ if match_current:
+ has_bracket_value = True
+ if not current_value:
+ current_value = match_current.group(1).strip()
+ clean_line = re.sub(r"^\[[^\]]+\]", "", line).strip()
+ else:
+ clean_line = line.strip()
+
+ # 分離選項與說明 (完美支援水平列表，如 severity size-mb)
+ parts = re.split(r'\s{2,}', clean_line)
+ valid_options = []
+ for p in parts:
+ p = p.strip()
+ if not p: continue
+ # 如果這個片段包含空白，代表它是說明文字 (Description)，停止解析後續片段
+ if ' ' in p:
+ break
+ valid_options.append(p)
+
+ for p in valid_options:
+ if p not in ["|", ".."]:
+ options.append(p)
+
+ # 子命令防呆：如果抓到一堆單字，但沒有 [現值]，且不是已知格式，很可能是子命令列表
+ if not has_bracket_value and not is_format_only and options:
is_format_only = True
options = []
- # 確保現值一定包含在選項中（如果它是一般的下拉選單）
if current_value and options and current_value not in options:
options.append(current_value)
- hint_text = "\n".join(hint_lines).strip()
-
return {
- "hint": hint_text,
- # 若為純文字模式，強制回傳空陣列，確保前端正確渲染為 input
+ "hint": "\n".join(hint_lines).strip(),
"options": list(dict.fromkeys(options)) if not is_format_only else [],
"current_value": current_value,
"format_desc": format_desc,
@@ -120,9 +115,8 @@ def parse_question_mark_output(output: str) -> dict:
}
def parse_device_response(output: str) -> dict:
- """支援多種編輯狀態格式解析"""
+ # 完美支援 () (Cold Start): 格式
match = re.search(r"(?:\[(.*?)\]|\(<(.*?)>\))\s*\((.*?)\):", output)
-
if match:
enum_content = match.group(1)
desc_content = match.group(2)
@@ -144,11 +138,9 @@ def parse_device_response(output: str) -> dict:
"current_value": current_value,
"format_desc": desc_content.strip()
}
-
return {"type": "unknown", "options": [], "current_value": None, "raw_output": output.strip()}
-# 🌟 1. 函數簽名加上 config_type 參數，預設為 "running"
-async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, config_type: str = "running"):
+async def sync_cmts_leaves_async(host, username, password, leaf_paths: list):
try:
total_paths = len(leaf_paths)
processed_count = 0
@@ -156,13 +148,12 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
BATCH_SIZE = 30
batches = [leaf_paths[i:i + BATCH_SIZE] for i in range(0, len(leaf_paths), BATCH_SIZE)]
- cmts_version = "unknown" # 🌟 新增：用來記錄當前爬蟲抓到的版本
+ cmts_version = "unknown"
for batch_idx, batch in enumerate(batches):
logger.info(f"🔄 正在處理第 {batch_idx + 1}/{len(batches)} 批次 (共 {len(batch)} 個路徑)...")
try:
- # 🧹 [穩定性修復] 全面改用 async with 管理生命週期，確保連線與 process 絕對釋放
async with asyncssh.connect(host, username=username, password=password, known_hosts=None) as conn:
async with conn.create_process(term_type='xterm-256color', term_size=(200, 24), encoding='utf-8') as process:
@@ -176,43 +167,44 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
if "--More--" in chunk or "More" in chunk:
process.stdin.write(" ")
await process.stdin.drain()
- # 🌟 精準 Prompt 偵測
if prompt_pattern and re.search(prompt_pattern, output):
break
except asyncio.TimeoutError:
break
return output
- # 🌟 新增：在第一批次連線時，先抓取設備版本
+ # 🌟 關鍵修復 1：等待登入歡迎詞 (MOTD) 結束，確保設備準備好接收指令
+ await read_until_quiet(timeout=1.5, prompt_pattern=r"(?:#|>)")
+
if cmts_version == "unknown":
- # 🌟 補上 | nomore，並稍微延長等待時間，確保不會被分頁卡住
process.stdin.write("show version | nomore\n")
await process.stdin.drain()
version_output = await read_until_quiet(timeout=2.0, prompt_pattern=r"(?:#|>)")
- match = re.search(r"(?:infra|vcmts-cd-0)\s+([\w\.\-]+)", version_output)
+ match = re.search(r"(?:infra|vcmts-cd-0|CableOS)\s+([\w\.\-]+)", version_output, re.IGNORECASE)
if match:
cmts_version = match.group(1)
+ else:
+ cmts_version = "parse_failed" # 🌟 避免正則失敗導致每批次都重查
+ # 🌟 關鍵修復 2：確保成功進入 config 模式
process.stdin.write("config\n")
await process.stdin.drain()
- await read_until_quiet(timeout=1.5, prompt_pattern=r"\(config\)#")
+ await read_until_quiet(timeout=1.5, prompt_pattern=r"\(config.*\)#")
for path in batch:
- # 🌟 優化 1：強迫讓出事件迴圈控制權，讓 FastAPI 去處理其他使用者的請求
await asyncio.sleep(0.01)
- # --- 步驟 1：發送 '?' 查詢 ---
command_to_send = f"{path} ?"
process.stdin.write(command_to_send)
await process.stdin.drain()
- output_question = await read_until_quiet(timeout=1.0)
+ output_question = await read_until_quiet(timeout=0.8)
q_data = parse_question_mark_output(output_question)
- backspaces = "\x08" * (len(command_to_send) + 5)
- process.stdin.write(backspaces)
+ # 🌟 頂級優雅解法：使用 Ctrl+U (\x15) 瞬間清空整行輸入緩衝區
+ process.stdin.write("\x15")
await process.stdin.drain()
- await read_until_quiet(timeout=0.5)
+ await read_until_quiet(timeout=0.2)
parsed_data = {
"hint": q_data["hint"],
@@ -221,7 +213,6 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
"current_value": q_data.get("current_value")
}
- # --- 步驟 2：判斷是否需要發送 Enter ---
if q_data.get("is_format_only"):
parsed_data["type"] = "string_or_number"
@@ -229,7 +220,7 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
process.stdin.write(f"{path}\n")
await process.stdin.drain()
- output_enter = await read_until_quiet(timeout=1.0)
+ output_enter = await read_until_quiet(timeout=0.8)
enter_data = parse_device_response(output_enter)
parsed_data["type"] = enter_data["type"]
@@ -237,25 +228,24 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
parsed_data["current_value"] = enter_data["current_value"]
if enter_data["type"] != "unknown":
- process.stdin.write("\x03")
+ # 如果進入了互動式輸入 (例如 prompt 變成 (val): )，按 Enter 接受預設值並退出
+ process.stdin.write("\n")
await process.stdin.drain()
else:
- logger.debug(f"⚠️ [Debug] 未知格式 ({path}):\n{enter_data['raw_output']}")
- process.stdin.write("\n")
- await process.stdin.drain()
+ # 如果只是印出錯誤，我們不需要做什麼
+ pass
await read_until_quiet(timeout=0.5)
result_data[path] = parsed_data
processed_count += 1
- event_data = {
+ yield json.dumps({
"event": "progress",
"current": processed_count,
"total": total_paths,
"current_path": path
- }
- yield json.dumps(event_data) + "\n"
+ }) + "\n"
process.stdin.write("exit\n")
await process.stdin.drain()
@@ -265,75 +255,24 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
yield json.dumps({"event": "error", "message": f"批次錯誤: {str(e)}"}) + "\n"
continue
- # --- 步驟 3：寫入快取 (DB or JSON) ---
try:
- db_success = False
current_ts = int(time.time())
formatted_time = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
- # 1. 嘗試寫入資料庫
- if USE_DB:
- try:
- # 寫入 metadata
- if cmts_version != "unknown":
- await database.upsert_device_status(host, config_type, {"cmts_version": cmts_version, "last_scanned": formatted_time})
- else:
- await database.upsert_device_status(host, config_type, {"last_scanned": formatted_time})
-
- # 寫入 options
- db_write_count = 0
- for p in batch:
- if p in result_data:
- result_data[p]["updated_at"] = current_ts
- success = await database.upsert_leaf_option(host, config_type, p, result_data[p])
- if success:
- db_write_count += 1
-
- if db_write_count > 0:
- db_success = True
- logger.info(f"💾 [DB] 第 {batch_idx + 1}/{len(batches)} 批次已非同步寫入資料庫！")
- else:
- logger.warning("⚠️ [Fallback] 資料庫寫入 0 筆，退回寫入 JSON 快取...")
- except Exception as e:
- logger.warning(f"⚠️ [Fallback] 資料庫寫入發生例外: {e}，自動切換至 JSON 快取寫入...")
-
- # 2. 如果 DB 寫入失敗或 USE_DB=False，則 Fallback 寫入 JSON
- if not db_success:
- # 🌟 動態決定快取檔名 (加入 IP 隔離)
- safe_host = host.replace(".", "_")
- cache_file = f"{safe_host}_{config_type}_cache.json"
+ # 寫入資料庫
+ if cmts_version not in ["unknown", "parse_failed"]:
+ await database.upsert_device_status(host, {"cmts_version": cmts_version, "last_scanned": formatted_time})
+ else:
+ await database.upsert_device_status(host, {"last_scanned": formatted_time})
- def read_json_from_file(filepath):
- if os.path.exists(filepath):
- with open(filepath, "r", encoding="utf-8") as f:
- return json.load(f)
- return {}
+ for p in batch:
+ if p in result_data:
+ result_data[p]["updated_at"] = current_ts
+ await database.upsert_leaf_option(host, p, result_data[p])
- cache_data = await asyncio.to_thread(read_json_from_file, cache_file)
-
- # 🌟 新增：寫入 Metadata (版本與掃描時間)
- if "__metadata__" not in cache_data:
- cache_data["__metadata__"] = {}
-
- if cmts_version != "unknown":
- cache_data["__metadata__"]["cmts_version"] = cmts_version
-
- cache_data["__metadata__"]["last_scanned"] = formatted_time
-
- for p in batch:
- if p in result_data:
- result_data[p]["updated_at"] = current_ts
- cache_data[p] = result_data[p]
-
- def write_json_to_file(filepath, data):
- with open(filepath, "w", encoding="utf-8") as f:
- json.dump(data, f, indent=4, ensure_ascii=False)
-
- await asyncio.to_thread(write_json_to_file, cache_file, cache_data)
- logger.info(f"💾 [JSON] 第 {batch_idx + 1}/{len(batches)} 批次已非同步寫入快取檔！(版本: {cmts_version}, 檔案: {cache_file})")
-
+ logger.info(f"💾 [DB] 第 {batch_idx + 1}/{len(batches)} 批次已寫入資料庫！")
except Exception as e:
- logger.error(f"⚠️ 寫入快取失敗 (DB 與 JSON 皆失敗): {e}")
+ logger.error(f"⚠️ 資料庫寫入失敗: {e}")
if batch_idx < len(batches) - 1:
await asyncio.sleep(2)
@@ -344,9 +283,7 @@ async def sync_cmts_leaves_async(host, username, password, leaf_paths: list, con
yield json.dumps({"event": "error", "message": f"爬蟲嚴重錯誤: {str(e)}"}) + "\n"
async def fetch_raw_config(host: str, username: str, password: str, config_type: str = "running") -> str:
- """連線至設備並抓取完整的純文字設定檔"""
try:
- # 🧹 [穩定性修復] 全面改用 async with 管理生命週期
async with asyncssh.connect(host, username=username, password=password, known_hosts=None) as conn:
async with conn.create_process(term_type='xterm-256color', term_size=(200, 24), encoding='utf-8') as process:
@@ -357,65 +294,46 @@ async def fetch_raw_config(host: str, username: str, password: str, config_type:
chunk = await asyncio.wait_for(process.stdout.read(4096), timeout=timeout)
if not chunk: break
output += chunk
- # 自動翻頁
if "--More--" in chunk or "More" in chunk:
process.stdin.write(" ")
await process.stdin.drain()
- # 🌟 精準 Prompt 偵測
if prompt_pattern and re.search(prompt_pattern, output):
break
except asyncio.TimeoutError:
break
return output
- # 🌟 新增這行：剛連線成功後，先清空終端機的登入歡迎詞 (MOTD) 與雜訊
await read_until_quiet(timeout=1.0, prompt_pattern=r"(?:#|>)")
- # 關鍵修改：根據 config_type 切換模式與指令，並加上 | nomore 關閉分頁
if config_type == "full":
- # 1. 先進入 config 模式
process.stdin.write("config\n")
await process.stdin.drain()
- await read_until_quiet(timeout=1.5, prompt_pattern=r"\(config\)#") # 等待提示字元變成 (config)#
+ await read_until_quiet(timeout=1.5, prompt_pattern=r"\(config\)#")
- # 2. 下達 full-configuration 指令 (🌟 加上 | nomore)
cmd = "show full-configuration | nomore"
process.stdin.write(f"{cmd}\n")
await process.stdin.drain()
raw_output = await read_until_quiet(timeout=3.0, prompt_pattern=r"\(config\)#")
- # 3. 抓完後退回上一層 (保持良好習慣)
process.stdin.write("exit\n")
await process.stdin.drain()
else:
- # running-config 在一般模式即可下達 (🌟 加上 | nomore)
cmd = "show running-config | nomore"
process.stdin.write(f"{cmd}\n")
await process.stdin.drain()
raw_output = await read_until_quiet(timeout=3.0)
- # 最終退出設備
process.stdin.write("exit\n")
await process.stdin.drain()
- # 簡單清理頭尾的雜訊 (例如指令本身的 echo)
- # 🌟 關鍵修正 1：強化 ANSI 正規表達式，加入對 '?' 的支援 (精準捕捉 \x1b[?7h)
cleaned_output = re.sub(r'\x1b\[[0-9;?]*[a-zA-Z]|\x08', '', raw_output)
-
- # 2. 清除失去 \x1b 殘留的字面分頁符號 (精準捕捉 [7m--More--[27m[8D[K)
cleaned_output = re.sub(r'\[7m\s*--More--\s*\[27m\[\d+D\[K', '', cleaned_output)
-
- # 3. 清除純文字的 --More-- (防呆)
cleaned_output = re.sub(r'\s*--More--\s*', '', cleaned_output)
-
- # 🌟 新增 4：清除 CableOS 終端機特有的 (END) 結尾標記
cleaned_output = re.sub(r'\s*\(END\)\s*', '', cleaned_output)
- # 關鍵修正：這裡改用 cleaned_output 來切行！
lines = cleaned_output.splitlines()
- # 🌟 關鍵修正 2：加入 strip() 避免空白干擾，確保精準踢掉提示字元
clean_lines = [
line for line in lines
if not line.strip().startswith(cmd)
@@ -426,14 +344,5 @@ async def fetch_raw_config(host: str, username: str, password: str, config_type:
except Exception as e:
raise Exception(f"SSH 連線或抓取設定失敗: {str(e)}")
- finally:
- if conn:
- conn.close()
-
def parse_config_to_tree(raw_cli: str) -> dict:
- """將純文字設定檔轉換為簡單的階層式 JSON 樹狀圖 (Phase 3 會用到)"""
- # 這裡先實作一個基礎的縮排解析器，未來可依據您的設備格式優化
- tree = {}
- # 暫時回傳空字典，確保 Phase 1 & 2 能順利走通
- # 真正的樹狀解析邏輯我們可以在 Phase 3 完善
- return {"_raw_length": len(raw_cli), "status": "pending_parser"}
\ No newline at end of file
+ return {"_raw_length": len(raw_cli), "status": "pending_parser"}
diff --git a/database.py b/database.py
index 98ba8eb..f848aa1 100644
--- a/database.py
+++ b/database.py
@@ -1,22 +1,27 @@
import asyncpg
import json
import uuid
+import os
+from dotenv import load_dotenv # 🌟 1. 引入 load_dotenv
from typing import Dict, List, Optional, Any
from logger import get_logger
+# 🌟 2. 明確指示 Python 讀取同目錄下的 .env 檔案
+load_dotenv()
+
# ==========================================
# 💡 PostgreSQL 連線與操作 (高可用性版)
# ==========================================
logger = get_logger("app.database")
-# DB 設定 (從您的 init_db.py 中提取)
+# 🌟 2. 同步改用 os.getenv 讀取環境變數
DB_CONFIG = {
- "database": "cmts_nms",
- "user": "swpa",
- "password": "swpa4920",
- "host": "127.0.0.1",
- "port": "5432"
+ "database": os.getenv("DB_NAME", "cmts_nms"),
+ "user": os.getenv("DB_USER", "postgres"), # 本地開發常用的預設帳號，或留空 ""
+ "password": os.getenv("DB_PASS", ""), # 🌟 絕對機密：預設留空！
+ "host": os.getenv("DB_HOST", "127.0.0.1"),
+ "port": os.getenv("DB_PORT", "5432")
}
_pool: Optional[asyncpg.Pool] = None
@@ -56,148 +61,95 @@ async def get_pool() -> Optional[asyncpg.Pool]:
# CRUD Functions for cmts_options
# ------------------------------------------
-async def upsert_leaf_option(host: str, config_type: str, path: str, data: dict) -> bool:
- """將選項寫入或更新至資料庫"""
+async def upsert_leaf_option(host: str, path: str, data: dict) -> bool:
pool = await get_pool()
- if not pool:
- return False
-
+ if not pool: return False
query = """
- INSERT INTO cmts_options (host, config_type, path, data)
- VALUES ($1, $2, $3, $4)
- ON CONFLICT (host, config_type, path)
+ INSERT INTO cmts_options (host, path, data)
+ VALUES ($1, $2, $3)
+ ON CONFLICT (host, path)
DO UPDATE SET data = EXCLUDED.data, updated_at = CURRENT_TIMESTAMP;
"""
try:
async with pool.acquire() as conn:
- await conn.execute(query, host, config_type, path, json.dumps(data))
+ await conn.execute(query, host, path, json.dumps(data))
return True
- except asyncpg.PostgresError as e:
+ except Exception as e:
logger.error(f"❌ DB Error (upsert_leaf_option): {e}")
return False
- except Exception as e:
- logger.error(f"❌ Unknown Error (upsert_leaf_option): {e}")
- return False
-async def get_all_leaf_options(host: str, config_type: str) -> Optional[Dict[str, Any]]:
- """取得特定 host 與 config_type 的所有選項"""
+async def get_all_leaf_options(host: str) -> Optional[Dict[str, Any]]:
pool = await get_pool()
- if not pool:
- return None
-
- query = """
- SELECT path, data FROM cmts_options
- WHERE host = $1 AND config_type = $2;
- """
+ if not pool: return None
+ query = "SELECT path, data FROM cmts_options WHERE host = $1;"
try:
async with pool.acquire() as conn:
- records = await conn.fetch(query, host, config_type)
+ records = await conn.fetch(query, host)
result = {}
for record in records:
- # asyncpg returns strings for JSON if not explicitly configured with type mapping,
- # but usually it's fine to just json.loads it.
data_val = record['data']
- if isinstance(data_val, str):
- result[record['path']] = json.loads(data_val)
- else:
- result[record['path']] = data_val
+ result[record['path']] = json.loads(data_val) if isinstance(data_val, str) else data_val
return result
- except asyncpg.PostgresError as e:
+ except Exception as e:
logger.error(f"❌ DB Error (get_all_leaf_options): {e}")
return None
- except Exception as e:
- logger.error(f"❌ Unknown Error (get_all_leaf_options): {e}")
- return None
-async def delete_leaf_options(host: str, config_type: str, paths: List[str]) -> int:
- """刪除特定路徑的選項快取"""
+async def delete_leaf_options(host: str, paths: List[str]) -> int:
pool = await get_pool()
- if not pool or not paths:
- return -1
-
- query = """
- DELETE FROM cmts_options
- WHERE host = $1 AND config_type = $2 AND path = ANY($3);
- """
+ if not pool or not paths: return -1
+ query = "DELETE FROM cmts_options WHERE host = $1 AND path = ANY($2);"
try:
async with pool.acquire() as conn:
- # Execute returns the command tag, e.g., 'DELETE 5'
- status = await conn.execute(query, host, config_type, paths)
- deleted_count = int(status.split()[-1])
- return deleted_count
- except asyncpg.PostgresError as e:
- logger.error(f"❌ DB Error (delete_leaf_options): {e}")
- return -1
+ status = await conn.execute(query, host, paths)
+ return int(status.split()[-1])
except Exception as e:
- logger.error(f"❌ Unknown Error (delete_leaf_options): {e}")
+ logger.error(f"❌ DB Error (delete_leaf_options): {e}")
return -1
# ------------------------------------------
# CRUD Functions for device_status
# ------------------------------------------
-async def upsert_device_status(host: str, config_type: str, metadata: dict) -> bool:
- """更新設備的 metadata"""
+async def upsert_device_status(host: str, metadata: dict) -> bool:
pool = await get_pool()
- if not pool:
- return False
-
+ if not pool: return False
cmts_version = metadata.get("cmts_version")
last_scanned = metadata.get("last_scanned", None)
-
try:
async with pool.acquire() as conn:
- # 🌟 關鍵修正：如果傳入的是 unknown 或空值，只更新時間，絕對不動版本號！
if cmts_version and cmts_version != "unknown":
query = """
- INSERT INTO device_status (host, config_type, cmts_version, last_scanned)
- VALUES ($1, $2, $3, $4)
- ON CONFLICT (host, config_type)
- DO UPDATE SET
- cmts_version = EXCLUDED.cmts_version,
- last_scanned = EXCLUDED.last_scanned,
- updated_at = CURRENT_TIMESTAMP;
+ INSERT INTO device_status (host, cmts_version, last_scanned)
+ VALUES ($1, $2, $3)
+ ON CONFLICT (host)
+ DO UPDATE SET cmts_version = EXCLUDED.cmts_version, last_scanned = EXCLUDED.last_scanned, updated_at = CURRENT_TIMESTAMP;
"""
- await conn.execute(query, host, config_type, cmts_version, last_scanned)
+ await conn.execute(query, host, cmts_version, last_scanned)
else:
query = """
- INSERT INTO device_status (host, config_type, last_scanned)
- VALUES ($1, $2, $3)
- ON CONFLICT (host, config_type)
- DO UPDATE SET
- last_scanned = EXCLUDED.last_scanned,
- updated_at = CURRENT_TIMESTAMP;
+ INSERT INTO device_status (host, last_scanned)
+ VALUES ($1, $2)
+ ON CONFLICT (host)
+ DO UPDATE SET last_scanned = EXCLUDED.last_scanned, updated_at = CURRENT_TIMESTAMP;
"""
- await conn.execute(query, host, config_type, last_scanned)
+ await conn.execute(query, host, last_scanned)
return True
except Exception as e:
logger.error(f"❌ DB Error (upsert_device_status): {e}")
return False
-async def get_device_status(host: str, config_type: str) -> Optional[Dict[str, Any]]:
- """獲取設備 metadata"""
+async def get_device_status(host: str) -> Optional[Dict[str, Any]]:
pool = await get_pool()
- if not pool:
- return None
-
- query = """
- SELECT cmts_version, last_scanned FROM device_status
- WHERE host = $1 AND config_type = $2;
- """
+ if not pool: return None
+ query = "SELECT cmts_version, last_scanned FROM device_status WHERE host = $1;"
try:
async with pool.acquire() as conn:
- record = await conn.fetchrow(query, host, config_type)
+ record = await conn.fetchrow(query, host)
if record:
- return {
- "cmts_version": record["cmts_version"],
- "last_scanned": record["last_scanned"]
- }
+ return {"cmts_version": record["cmts_version"], "last_scanned": record["last_scanned"]}
return None
- except asyncpg.PostgresError as e:
- logger.error(f"❌ DB Error (get_device_status): {e}")
- return None
except Exception as e:
- logger.error(f"❌ Unknown Error (get_device_status): {e}")
+ logger.error(f"❌ DB Error (get_device_status): {e}")
return None
# ------------------------------------------
diff --git a/index.html b/index.html
index 2ff8ccf..b1af884 100644
--- a/index.html
+++ b/index.html
@@ -20,9 +20,10 @@
diff --git a/init_db.py b/init_db.py
index 27fa2f3..ca811f1 100644
--- a/init_db.py
+++ b/init_db.py
@@ -1,20 +1,26 @@
import asyncio
import asyncpg
import logging
+import sys
+import os
+from dotenv import load_dotenv # 🌟 1. 引入 load_dotenv
+
+# 🌟 2. 明確指示 Python 讀取同目錄下的 .env 檔案
+load_dotenv()
logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__)
-# DB 設定
+# 🌟 2. 改用 os.getenv 讀取環境變數，並保留原本的設定作為安全預設值
DB_CONFIG = {
- "database": "cmts_nms",
- "user": "swpa",
- "password": "swpa4920",
- "host": "127.0.0.1",
- "port": "5432"
+ "database": os.getenv("DB_NAME", "cmts_nms"),
+ "user": os.getenv("DB_USER", "postgres"), # 本地開發常用的預設帳號，或留空 ""
+ "password": os.getenv("DB_PASS", ""), # 🌟 絕對機密：預設留空！
+ "host": os.getenv("DB_HOST", "127.0.0.1"),
+ "port": os.getenv("DB_PORT", "5432")
}
-async def init_database():
+async def init_database(force_reset: bool = False):
try:
logger.info("🔄 正在連線到 PostgreSQL (asyncpg)...")
conn = await asyncpg.connect(
@@ -25,34 +31,46 @@ async def init_database():
port=int(DB_CONFIG["port"])
)
- # 1. 建立選項快取表 cmts_options
- logger.info("🛠️ 正在建立 cmts_options 資料表...")
+ # ==========================================
+ # 💣 核彈模式：清除舊有資料表
+ # ==========================================
+ if force_reset:
+ logger.warning("⚠️ 警告：啟動強制重建模式，正在刪除現有資料表...")
+ await conn.execute("DROP TABLE IF EXISTS cmts_options;")
+ await conn.execute("DROP TABLE IF EXISTS device_status;")
+ await conn.execute("DROP TABLE IF EXISTS system_filters;")
+ # 💡 備份表通常極度重要，即使 reset 也不建議輕易 DROP，除非你確定要連備份一起砍
+ # await conn.execute("DROP TABLE IF EXISTS config_backups;")
+ logger.info("🗑️ 舊資料表已清除完畢。")
+
+ # ==========================================
+ # 🏗️ 安全建置模式：建立資料表 (IF NOT EXISTS)
+ # ==========================================
+ # 1. 建立選項快取表 cmts_options (無 config_type)
+ logger.info("🛠️ 正在檢查/建立 cmts_options 資料表...")
await conn.execute("""
CREATE TABLE IF NOT EXISTS cmts_options (
host VARCHAR(255) NOT NULL,
- config_type VARCHAR(50) NOT NULL,
path VARCHAR(500) NOT NULL,
data JSONB NOT NULL,
updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (host, config_type, path)
+ PRIMARY KEY (host, path)
);
""")
- # 2. 建立設備狀態表 device_status
- logger.info("🛠️ 正在建立 device_status 資料表...")
+ # 2. 建立設備狀態表 device_status (無 config_type)
+ logger.info("🛠️ 正在檢查/建立 device_status 資料表...")
await conn.execute("""
CREATE TABLE IF NOT EXISTS device_status (
- host VARCHAR(255) NOT NULL,
- config_type VARCHAR(50) NOT NULL,
+ host VARCHAR(255) NOT NULL PRIMARY KEY,
cmts_version VARCHAR(100) DEFAULT 'unknown',
last_scanned VARCHAR(100),
- updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- PRIMARY KEY (host, config_type)
+ updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
""")
# 3. 建立過濾器設定表 system_filters
- logger.info("🛠️ 正在建立 system_filters 資料表...")
+ logger.info("🛠️ 正在檢查/建立 system_filters 資料表...")
await conn.execute("""
CREATE TABLE IF NOT EXISTS system_filters (
config_type VARCHAR(50) PRIMARY KEY,
@@ -61,8 +79,8 @@ async def init_database():
);
""")
- # 4. 建立設備配置備份表 config_backups (Phase 1 新增)
- logger.info("🛠️ 正在建立 config_backups 資料表與索引...")
+ # 4. 建立設備配置備份表 config_backups
+ logger.info("🛠️ 正在檢查/建立 config_backups 資料表與索引...")
await conn.execute("""
CREATE TABLE IF NOT EXISTS config_backups (
id UUID PRIMARY KEY,
@@ -70,6 +88,7 @@ async def init_database():
config_type VARCHAR(50) NOT NULL DEFAULT 'running',
timestamp TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
snapshot_name VARCHAR(255),
+ description TEXT DEFAULT '',
is_auto BOOLEAN NOT NULL DEFAULT FALSE,
raw_cli TEXT,
parsed_tree JSONB,
@@ -77,7 +96,6 @@ async def init_database():
);
""")
- # 建立複合索引以加速列表查詢與排序
await conn.execute("""
CREATE INDEX IF NOT EXISTS idx_config_backups_host_type_ts
ON config_backups (host, config_type, timestamp DESC);
@@ -90,4 +108,18 @@ async def init_database():
logger.error(f"❌ 資料庫初始化失敗: {e}")
if __name__ == "__main__":
- asyncio.run(init_database())
+ # 偵測命令列參數是否包含 --reset
+ is_reset = "--reset" in sys.argv
+
+ if is_reset:
+ print("\n" + "="*50)
+ print("🚨 你正在執行資料庫重置 (--reset) 🚨")
+ print("這將會清空所有的選項快取與系統設定！")
+ print("="*50 + "\n")
+ confirm = input("確定要繼續嗎？(輸入 yes 繼續): ")
+ if confirm.lower() != "yes":
+ print("已取消操作。")
+ sys.exit(0)
+
+ asyncio.run(init_database(force_reset=is_reset))
+
diff --git a/routers/auth.py b/routers/auth.py
index a9e84ea..00b6e89 100644
--- a/routers/auth.py
+++ b/routers/auth.py
@@ -13,8 +13,8 @@ class GodModeRequest(BaseModel):
@router.post("/auth/god-mode", summary="驗證上帝模式進階密碼")
async def verify_god_mode(req: GodModeRequest):
- # 從環境變數讀取正確密碼，預設為 "admin999"
- expected_password = os.getenv("GOD_MODE_SECRET", "swpa@Serc0mm")
+ # 從環境變數讀取正確密碼，預設為 "19760107@Serc0mm"
+ expected_password = os.getenv("GOD_MODE_SECRET", "19760107@Serc0mm")
# 使用 compare_digest 防禦計時攻擊
if secrets.compare_digest(req.password, expected_password):
diff --git a/routers/config.py b/routers/config.py
index 25c0ffe..3ddab08 100644
--- a/routers/config.py
+++ b/routers/config.py
@@ -10,7 +10,7 @@ from pydantic import BaseModel
from typing import List
from netmiko import ConnectHandler
# 🌟 [Priority 1 修復] 引入 cmts_config_locks
-from shared import CMTS_DEVICE, cmts_config_locks, parse_cli_to_tree, deep_split_tree, USE_DB
+from shared import CMTS_DEVICE, cmts_config_locks, parse_cli_to_tree, deep_split_tree
from collections import defaultdict
from fastapi.responses import StreamingResponse
from logger import get_all_log_levels, set_log_level
@@ -26,45 +26,18 @@ def get_filter_file_path(config_type: str) -> str:
return f"filters_{safe_type}.json"
async def load_tree_filters(config_type: str) -> list:
- if USE_DB:
- try:
- db_filters = await database.get_tree_filters(config_type)
- if db_filters is not None:
- return db_filters
- else:
- print("⚠️ [Fallback] 資料庫無法取得過濾器，自動切換至 JSON 快取讀取...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫讀取過濾器發生例外: {e}，自動切換至 JSON 快取讀取...")
-
- file_path = get_filter_file_path(config_type)
- if os.path.exists(file_path):
- try:
- with open(file_path, 'r', encoding='utf-8') as f:
- data = json.load(f)
- return data.get("hidden_keys", [])
- except Exception as e:
- print(f"讀取過濾器檔案失敗: {e}")
- return []
- return []
+ try:
+ db_filters = await database.get_tree_filters(config_type)
+ return db_filters if db_filters is not None else []
+ except Exception as e:
+ print(f"資料庫讀取過濾器發生例外: {e}")
+ return []
async def save_tree_filters(config_type: str, hidden_keys: list):
- db_success = False
- if USE_DB:
- try:
- if await database.upsert_tree_filters(config_type, hidden_keys):
- db_success = True
- else:
- print("⚠️ [Fallback] 資料庫儲存過濾器失敗，自動切換至 JSON 快取寫入...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫寫入過濾器發生例外: {e}，自動切換至 JSON 快取寫入...")
-
- if not db_success:
- file_path = get_filter_file_path(config_type)
- try:
- with open(file_path, 'w', encoding='utf-8') as f:
- json.dump({"hidden_keys": hidden_keys}, f, ensure_ascii=False, indent=4)
- except Exception as e:
- print(f"儲存過濾器檔案失敗: {e}")
+ try:
+ await database.upsert_tree_filters(config_type, hidden_keys)
+ except Exception as e:
+ print(f"資料庫寫入過濾器發生例外: {e}")
# ==========================================
diff --git a/routers/leaf_options.py b/routers/leaf_options.py
index d91afc5..e1f25ff 100644
--- a/routers/leaf_options.py
+++ b/routers/leaf_options.py
@@ -3,31 +3,19 @@ from fastapi import APIRouter, BackgroundTasks, HTTPException, Request, Body
from fastapi.responses import StreamingResponse
from pydantic import BaseModel
from typing import List
-import json, os, asyncio, re
+import json, asyncio, re
import database
from cmts_scraper import sync_cmts_leaves_async
-from shared import CMTS_DEVICE, USE_DB
+from shared import CMTS_DEVICE
router = APIRouter(tags=["Options"])
-# 🌟 1. 動態獲取快取檔名 (加入 host 隔離)
-def get_cache_file(host: str, config_type: str):
- safe_host = host.replace(".", "_")
- return f"{safe_host}_{config_type}_cache.json"
-
-# ==========================================
-# 🌟 2. 全域廣播機制 (SSE) - 升級為「IP + 模式」頻道分流
-# ==========================================
-# 將狀態改為空字典，動態根據 host_configType 建立
SCAN_STATUS = {}
active_clients = {}
-async def broadcast_message(message_dict: dict, host: str, config_type: str = "running"):
- """將訊息推播給特定頻道的連線前端"""
- channel_key = f"{host}_{config_type}"
+async def broadcast_message(message_dict: dict, host: str):
+ channel_key = host
dead_clients = set()
-
- # SSE 協定嚴格要求必須以 "data: " 開頭，並以 "\n\n" 結尾
message_str = f"data: {json.dumps(message_dict)}\n\n"
for client_queue in active_clients.get(channel_key, set()):
@@ -39,9 +27,8 @@ async def broadcast_message(message_dict: dict, host: str, config_type: str = "r
active_clients[channel_key].discard(dead)
@router.get("/cmts-leaf-options/stream")
-async def sse_stream(request: Request, host: str, config_type: str = "running"):
- """前端一載入就會連上這個路由，持續監聽特定頻道的廣播"""
- channel_key = f"{host}_{config_type}"
+async def sse_stream(request: Request, host: str):
+ channel_key = host
client_queue = asyncio.Queue()
if channel_key not in active_clients:
@@ -51,92 +38,58 @@ async def sse_stream(request: Request, host: str, config_type: str = "running"):
async def event_generator():
try:
while True:
- # 主動檢查斷線，避免死鎖
if await request.is_disconnected():
break
try:
- # [修復 Leak] 延長 timeout 降低輪詢負擔
message = await asyncio.wait_for(client_queue.get(), timeout=5.0)
yield message
except asyncio.TimeoutError:
yield ": keepalive\n\n"
-
except asyncio.CancelledError:
pass
finally:
- # [修復 Leak] 確保斷線時 Queue 絕對會被移出 active_clients 釋放記憶體
if channel_key in active_clients:
active_clients[channel_key].discard(client_queue)
return StreamingResponse(event_generator(), media_type="text/event-stream")
@router.get("/scan-status")
-async def get_scan_status(host: str, config_type: str = "running"):
- channel_key = f"{host}_{config_type}"
- return {"is_scanning": SCAN_STATUS.get(channel_key, False)}
+async def get_scan_status(host: str):
+ return {"is_scanning": SCAN_STATUS.get(host, False)}
-# ==========================================
-# 🌟 3. 快取讀取與背景掃描任務
-# ==========================================
class SyncOptionsRequest(BaseModel):
- host: str # 🌟 新增 host 參數
- username: str = "" # 🌟 新增 username 參數
- password: str = "" # 🌟 新增 password 參數
+ host: str
+ username: str = ""
+ password: str = ""
leaf_paths: List[str]
- config_type: str = "running"
@router.get("/cmts-leaf-options")
-async def get_leaf_options(host: str, config_type: str = "running"):
- if USE_DB:
- try:
- db_options = await database.get_all_leaf_options(host, config_type)
- if db_options is not None:
- # 取得 metadata
- metadata = await database.get_device_status(host, config_type)
- if metadata:
- db_options["__metadata__"] = metadata
- return db_options
- else:
- # 若回傳 None 表示 DB 連線異常，執行 Fallback
- print("⚠️ [Fallback] 資料庫無法取得資料，自動切換至 JSON 快取讀取...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫讀取發生例外: {e}，自動切換至 JSON 快取讀取...")
-
- cache_file = get_cache_file(host, config_type)
- if not os.path.exists(cache_file): return {}
-
- # 🌟 優化 3：將讀取動作丟到背景執行緒
- def read_json_from_file(filepath):
- with open(filepath, "r", encoding="utf-8") as f:
- return json.load(f)
-
- return await asyncio.to_thread(read_json_from_file, cache_file)
-
-async def run_scan_task(host: str, username: str, password: str, paths: List[str], config_type: str):
- """在背景執行的爬蟲任務，並將進度廣播出去"""
- global SCAN_STATUS
- channel_key = f"{host}_{config_type}"
+async def get_leaf_options(host: str):
try:
- await broadcast_message({"event": "scan_start"}, host, config_type)
-
- # 呼叫爬蟲 (帶入設備連線資訊與 config_type)
- async for chunk in sync_cmts_leaves_async(
- host=host,
- username=username,
- password=password,
- leaf_paths=paths,
- config_type=config_type
- ):
- if isinstance(chunk, str):
- await broadcast_message(json.loads(chunk), host, config_type)
- else:
- await broadcast_message(chunk, host, config_type)
-
- await broadcast_message({"event": "done"}, host, config_type)
+ db_options = await database.get_all_leaf_options(host)
+ if db_options is not None:
+ metadata = await database.get_device_status(host)
+ if metadata:
+ db_options["__metadata__"] = metadata
+ return db_options
+ raise HTTPException(status_code=500, detail="資料庫連線異常")
except Exception as e:
- await broadcast_message({"event": "error", "message": str(e)}, host, config_type)
+ raise HTTPException(status_code=500, detail=f"資料庫讀取失敗: {e}")
+
+async def run_scan_task(host: str, username: str, password: str, paths: List[str]):
+ global SCAN_STATUS
+ channel_key = host
+ try:
+ await broadcast_message({"event": "scan_start"}, host)
+ async for chunk in sync_cmts_leaves_async(host=host, username=username, password=password, leaf_paths=paths):
+ if isinstance(chunk, str):
+ await broadcast_message(json.loads(chunk), host)
+ else:
+ await broadcast_message(chunk, host)
+ await broadcast_message({"event": "done"}, host)
+ except Exception as e:
+ await broadcast_message({"event": "error", "message": str(e)}, host)
finally:
- # 解除特定頻道的鎖定
SCAN_STATUS[channel_key] = False
@router.post("/cmts-leaf-options/sync")
@@ -145,14 +98,12 @@ async def sync_leaf_options(request: SyncOptionsRequest, background_tasks: Backg
if not request.leaf_paths:
raise HTTPException(status_code=400)
- channel_key = f"{request.host}_{request.config_type}"
-
+ channel_key = request.host
if SCAN_STATUS.get(channel_key, False):
- return {"status": "busy", "message": f"⚠️ {request.config_type} 模式的掃描任務正在執行中，請勿重複點擊！"}
+ return {"status": "busy", "message": "⚠️ 該設備的掃描任務正在執行中，請勿重複點擊！"}
SCAN_STATUS[channel_key] = True
- # 保留您原本完美的路徑清理邏輯
cmts_query_paths = []
for p in request.leaf_paths:
clean_p = p.replace("::", " ")
@@ -160,60 +111,18 @@ async def sync_leaf_options(request: SyncOptionsRequest, background_tasks: Backg
cmts_query_paths.append(clean_p)
cmts_query_paths = list(dict.fromkeys(cmts_query_paths))
-
- # 決定帳密 (優先使用 request 傳來的，否則 fallback 到 shared.CMTS_DEVICE)
- # 🌟 加上 or "" 確保最終結果絕對是字串，消除 Pylance 警告
user = request.username or CMTS_DEVICE.get("username") or ""
pwd = request.password or CMTS_DEVICE.get("password") or ""
- background_tasks.add_task(run_scan_task, request.host, user, pwd, cmts_query_paths, request.config_type)
+ background_tasks.add_task(run_scan_task, request.host, user, pwd, cmts_query_paths)
return {"status": "started"}
-# ==========================================
-# 🌟 4. 清除快取 API
-# ==========================================
@router.post("/clear_cache")
-async def clear_specific_cache(host: str, config_type: str = "running", paths_to_clear: list = Body(...)):
- cleared_count = 0
-
- # 1. 嘗試清除 DB
- if USE_DB:
- try:
- db_cleared = await database.delete_leaf_options(host, config_type, paths_to_clear)
- if db_cleared >= 0:
- cleared_count = db_cleared
- else:
- print("⚠️ [Fallback] 資料庫清除失敗，自動切換至 JSON 快取清除...")
- except Exception as e:
- print(f"⚠️ [Fallback] 資料庫清除發生例外: {e}，自動切換至 JSON 快取清除...")
-
- # 2. 清除 JSON (如果 DB 沒清掉，或 USE_DB=False，或者是連同舊檔一起清確保乾淨)
- cache_file = get_cache_file(host, config_type)
-
- if not os.path.exists(cache_file):
- # 如果是走 DB，且有清掉，回傳 DB 的結果
- if USE_DB and cleared_count > 0:
- return {"status": "success", "cleared_count": cleared_count}
- return {"status": "success", "cleared_count": 0, "message": "快取檔案不存在"}
-
+async def clear_specific_cache(host: str, paths_to_clear: list = Body(...)):
try:
- with open(cache_file, "r", encoding="utf-8") as f:
- cache_data = json.load(f)
-
- json_cleared_count = 0
- for path in paths_to_clear:
- if path in cache_data:
- del cache_data[path]
- json_cleared_count += 1
-
- if json_cleared_count > 0:
- with open(cache_file, "w", encoding="utf-8") as f:
- json.dump(cache_data, f, ensure_ascii=False, indent=4)
-
- # 回傳較大的那個數值
- final_count = max(cleared_count, json_cleared_count)
- return {"status": "success", "cleared_count": final_count}
-
+ cleared_count = await database.delete_leaf_options(host, paths_to_clear)
+ if cleared_count >= 0:
+ return {"status": "success", "cleared_count": cleared_count}
+ raise HTTPException(status_code=500, detail="資料庫清除失敗")
except Exception as e:
- # 確保回傳標準 JSON 格式
- return {"status": "error", "message": f"資料庫連線與快取存取皆失敗: {str(e)}"}
+ raise HTTPException(status_code=500, detail=f"資料庫清除失敗: {str(e)}")
diff --git a/routers/terminal.py b/routers/terminal.py
index 5afc345..9122d5c 100644
--- a/routers/terminal.py
+++ b/routers/terminal.py
@@ -53,7 +53,10 @@ async def websocket_terminal(websocket: WebSocket, host: str, username: str, pas
await process.stdin.drain()
except WebSocketDisconnect:
# 主動拋出，讓外層捕捉以進行資源回收
- raise
+ # raise
+ # 🌟 修正：不要再 raise 拋出去了，直接 return 結束任務，讓外層自然回收
+ logger.debug("前端 WebSocket 正常斷開 (使用者重整或關閉網頁)")
+ return
except asyncio.CancelledError:
pass
except Exception as e:
diff --git a/shared.py b/shared.py
index cf6f59d..cc4fe60 100644
--- a/shared.py
+++ b/shared.py
@@ -6,18 +6,17 @@ import re
from collections import defaultdict
DEBUG_MODE = False
-USE_DB = True # PostgreSQL Feature Toggle
def debug_print(msg: str):
if DEBUG_MODE:
print(msg)
-# 預設的 CMTS 連線樣板
+# 🌟 2. 淨化預設的 CMTS 連線樣板
CMTS_DEVICE = {
'device_type': 'cisco_ios',
- 'host': '10.14.110.4',
- 'username': 'admin',
- 'password': 'nsgadmin',
+ 'host': os.getenv("DEFAULT_CMTS_HOST", ""),
+ 'username': os.getenv("DEFAULT_CMTS_USER", ""),
+ 'password': os.getenv("DEFAULT_CMTS_PASS", ""),
'port': 22,
'fast_cli': False,
'global_delay_factor': 2
diff --git a/static/api.js b/static/api.js
index 6c2c2d8..4113405 100644
--- a/static/api.js
+++ b/static/api.js
@@ -48,24 +48,21 @@ export async function apiGetFullConfig(host, username, password, skipFilter = fa
return response.json();
}
-// 🌟 1. 取得選項快取 (加上 configType 查詢參數)
-export async function apiGetLeafOptions(host, configType = 'running') {
- const response = await fetch(`/api/v1/cmts-leaf-options?host=${encodeURIComponent(host)}&config_type=${configType}`);
+export async function apiGetLeafOptions(host) {
+ const response = await fetch(`/api/v1/cmts-leaf-options?host=${encodeURIComponent(host)}`);
return response.json();
}
-// 🌟 2. 同步選項快取 (將 config_type 塞入 Body)
-export async function apiSyncLeafOptions(host, paths, configType = 'running') {
+export async function apiSyncLeafOptions(host, paths) {
return fetch('/api/v1/cmts-leaf-options/sync', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ host, leaf_paths: paths, config_type: configType })
+ body: JSON.stringify({ host, leaf_paths: paths })
});
}
-// 🌟 3. 清除快取 (加上 configType 查詢參數)
-export async function apiClearCache(host, paths, configType = 'running') {
- const response = await fetch(`/api/v1/clear_cache?host=${encodeURIComponent(host)}&config_type=${configType}`, {
+export async function apiClearCache(host, paths) {
+ const response = await fetch(`/api/v1/clear_cache?host=${encodeURIComponent(host)}`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(paths)
@@ -80,9 +77,9 @@ export async function apiGetCmtsVersion(host, username, password) {
return response.json();
}
-export async function apiGetScanStatus(host, configType = 'running') {
+export async function apiGetScanStatus(host) {
try {
- const response = await fetch(`/api/v1/scan-status?host=${encodeURIComponent(host)}&config_type=${configType}`);
+ const response = await fetch(`/api/v1/scan-status?host=${encodeURIComponent(host)}`);
const data = await response.json();
return data.is_scanning;
} catch (e) {
@@ -167,37 +164,25 @@ export async function apiListRpds(host, username, password) {
// ==========================================
// 6. 專門處理串流的 API 呼叫函數 (UI 可以即時更新)
// ==========================================
-// 🌟 4. 串流掃描 API (將 config_type 塞入 Body)
-export async function apiSyncLeafOptionsStream(host, paths, onProgress, configType = 'running') {
+export async function apiSyncLeafOptionsStream(host, paths, onProgress) {
const response = await fetch('/api/v1/cmts-leaf-options/sync', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ host, leaf_paths: paths, config_type: configType })
+ body: JSON.stringify({ host, leaf_paths: paths })
});
-
if (!response.body) throw new Error("瀏覽器不支援 ReadableStream");
-
- // 🌟 核心修改：讀取串流資料
const reader = response.body.getReader();
const decoder = new TextDecoder("utf-8");
-
while (true) {
const { done, value } = await reader.read();
- if (done) break; // 伺服器斷開連線 (任務完成)
-
- // 解碼二進位資料為文字
+ if (done) break;
const chunk = decoder.decode(value, { stream: true });
-
- // 因為一次可能收到多行 JSON，我們用換行符號切開
const lines = chunk.split("\n").filter(line => line.trim() !== "");
-
for (const line of lines) {
try {
const data = JSON.parse(line);
- onProgress(data); // 將解析後的資料傳給 UI 介面
- } catch (e) {
- console.error("JSON 解析錯誤:", e, line);
- }
+ onProgress(data);
+ } catch (e) {}
}
}
}
diff --git a/static/app.js b/static/app.js
index cb54e01..ac011bb 100644
--- a/static/app.js
+++ b/static/app.js
@@ -16,7 +16,9 @@ import {
apiGetCmDiagnostics,
apiListCms, apiListRpds,
apiGetLogLevels, apiSetLogLevel,
- apiVerifyGodMode
+ apiVerifyGodMode,
+ apiGetLeafOptions, // 🌟 補上這個
+ apiSyncLeafOptions // 🌟 補上這個
} from './api.js';
// 3. 共用工具模組 (Utils)
@@ -40,6 +42,11 @@ import {
} from './mac-domain.js';
+// ============================================================================
+// 🌟 全域記憶體 (Dual-Track Memory)
+// ============================================================================
+window.treeDataStore = { running: null, full: null };
+
// ============================================================================
// 🌟 1. 全域生命週期、閒置偵測與 SSE 廣播監聽
// ============================================================================
@@ -48,18 +55,28 @@ let idleTimer;
const IDLE_TIMEOUT = 300000; // 5 分鐘 (毫秒)
let globalSSE = null;
-// 初始化全域 SSE 監聽器，加上 mode 參數，並在連線前關閉舊頻道
-function initGlobalSSE(mode = 'running') {
+// 初始化全域 SSE 監聽器 (設備級別)
+function initGlobalSSE() {
+ // 🌟 新增防線：如果尚未連線，強制關閉舊的 SSE 並退出
+ if (!isConnected) {
+ if (globalSSE) {
+ globalSSE.close();
+ globalSSE = null;
+ }
+ return;
+ }
+
const connInfo = getGlobalConnectionInfo();
- if (!connInfo || !connInfo.host) return; // 🌟 確保有連線才建立 SSE
+ if (!connInfo || !connInfo.host) return;
if (globalSSE) globalSSE.close();
- globalSSE = new EventSource(`/api/v1/cmts-leaf-options/stream?host=${encodeURIComponent(connInfo.host)}&config_type=${mode}`);
+
+ // 🌟 拔除 config_type，純粹監聽該設備的廣播
+ globalSSE = new EventSource(`/api/v1/cmts-leaf-options/stream?host=${encodeURIComponent(connInfo.host)}`);
globalSSE.onmessage = (event) => {
const data = JSON.parse(event.data);
const statusEl = document.getElementById('scan-status');
- // 🌟 關鍵修復：只要收到「開始」或「進度」訊號，一律強制鎖定按鈕！(確保中途加入的使用者也會被鎖定)
if (data.event === 'scan_start' || data.event === 'progress') {
setAdminButtonsState(true, "⏳ 系統更新中...");
}
@@ -82,7 +99,6 @@ function initGlobalSSE(mode = 'running') {
statusEl.style.color = "#27ae60";
setTimeout(() => statusEl.textContent = "", 5000);
}
- // 掃描完成才解鎖
setAdminButtonsState(false);
localStorage.removeItem('scanLockUntil');
}
@@ -91,7 +107,6 @@ function initGlobalSSE(mode = 'running') {
statusEl.innerHTML = `❌ 錯誤: ${data.message}`;
statusEl.style.color = "#e74c3c";
}
- // 發生錯誤也要解鎖
setAdminButtonsState(false);
localStorage.removeItem('scanLockUntil');
}
@@ -117,6 +132,8 @@ function startLockStatusPolling() {
if (lockPollingTimer) clearInterval(lockPollingTimer);
lockPollingTimer = setInterval(async () => {
+ if (!isConnected) return; // 🌟 新增防線：未連線時不進行輪詢
+
const connInfo = getGlobalConnectionInfo();
if (!connInfo || !connInfo.host) return;
const host = connInfo.host;
@@ -139,82 +156,84 @@ function startLockStatusPolling() {
for (const [path, lockInfo] of Object.entries(currentLocks)) {
const lockKey = `${host}@@${path}`;
- // 🛡️ 防閃爍機制：如果這個鎖是我們剛剛才主動釋放的，忽略後端傳來的舊狀態 (冷卻 8 秒)
+ // 🛡️ 防閃爍機制
if (window.recentlyReleasedLocks[lockKey]) {
if (now - window.recentlyReleasedLocks[lockKey] < 8000) {
- continue; // 跳過，不當作鎖定
+ continue;
} else {
- delete window.recentlyReleasedLocks[lockKey]; // 超過冷卻時間，清除記憶
+ delete window.recentlyReleasedLocks[lockKey];
}
}
- newLockState.add(lockKey); // 記憶體加入 Host 標籤
+ newLockState.add(lockKey);
const safePath = path.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
- // 🌟 擴大選擇器：同時選取完全匹配的節點，以及所有子節點
- const targetBtns = document.querySelectorAll(`.edit-btn[data-path="${safePath}"], .edit-btn[data-path^="${safePath}::"]`);
- targetBtns.forEach(btn => {
- // 略過目前正在編輯的那個實體按鈕
- if (btn.id === `edit-btn-${currentEditElementId}`) return;
+ // 🌟 效能優化：只在當前啟用的視圖中搜尋，避免掃描隱藏的龐大 DOM
+ const currentMode = document.getElementById('configTask')?.value === 'form-full-config' ? 'full' : 'running';
+ const activeContainer = document.getElementById(`tree-container-${currentMode}`);
+
+ if (activeContainer) {
+ const targetBtns = activeContainer.querySelectorAll(`.edit-btn[data-path="${safePath}"], .edit-btn[data-path^="${safePath}::"]`);
+
+ targetBtns.forEach(btn => {
+ if (btn.id === `edit-btn-${currentEditElementId}`) return;
- if (btn.innerText !== "🔒") {
- btn.style.pointerEvents = 'none';
- btn.style.opacity = '0.2';
-
- const btnPath = btn.getAttribute('data-path');
- if (btnPath === path) {
- // 判斷是別人鎖的，還是自己在另一個視圖鎖的
- if (lockInfo.user_id !== SESSION_USER_ID) {
- btn.title = `🔒 此區塊正由 [${lockInfo.username}] 編輯中`;
+ if (btn.innerText !== "🔒") {
+ btn.style.pointerEvents = 'none';
+ btn.style.opacity = '0.2';
+
+ const btnPath = btn.getAttribute('data-path');
+ if (btnPath === path) {
+ btn.title = lockInfo.user_id !== SESSION_USER_ID ? `🔒 此區塊正由 [${lockInfo.username}] 編輯中` : `🔒 您正在另一個視圖編輯此項目`;
} else {
- btn.title = `🔒 您正在另一個視圖編輯此項目`;
+ btn.title = `🔒 父層級已被鎖定，無法編輯此項目`;
}
- } else {
- // 子節點被父節點鎖定
- btn.title = `🔒 父層級已被鎖定，無法編輯此項目`;
+ btn.innerText = "🔒";
}
- btn.innerText = "🔒";
- }
- });
+ });
+ }
}
// 🔓 任務 2：處理「解除鎖定」的節點
activeLockState.forEach(oldKey => {
const [oldHost, oldPath] = oldKey.split('@@');
- // 🛡️ 嚴格限制：只解除「當前設備」且「已不在新鎖定清單中」的節點
if (oldHost === host && !newLockState.has(oldKey)) {
const safePath = oldPath.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
- // 🌟 擴大選擇器：同時選取完全匹配的節點，以及所有子節點
- const targetBtns = document.querySelectorAll(`.edit-btn[data-path="${safePath}"], .edit-btn[data-path^="${safePath}::"]`);
- targetBtns.forEach(btn => {
- if (btn.innerText === "🔒") {
- const btnPath = btn.getAttribute('data-path');
- let stillLockedByOther = false;
-
- // 檢查自己是否還在鎖定清單中
- if (currentLocks[btnPath]) {
- stillLockedByOther = true;
- } else {
- // 檢查是否有其他父節點鎖定它
- for (const lockedPath of Object.keys(currentLocks)) {
- if (btnPath.startsWith(lockedPath + "::")) {
- stillLockedByOther = true;
- break;
+ // 🌟 效能優化：同樣只在當前啟用的視圖中搜尋
+ const currentMode = document.getElementById('configTask')?.value === 'form-full-config' ? 'full' : 'running';
+ const activeContainer = document.getElementById(`tree-container-${currentMode}`);
+
+ if (activeContainer) {
+ const targetBtns = activeContainer.querySelectorAll(`.edit-btn[data-path="${safePath}"], .edit-btn[data-path^="${safePath}::"]`);
+
+ targetBtns.forEach(btn => {
+ if (btn.innerText === "🔒") {
+ const btnPath = btn.getAttribute('data-path');
+ let stillLockedByOther = false;
+
+ if (currentLocks[btnPath]) {
+ stillLockedByOther = true;
+ } else {
+ for (const lockedPath of Object.keys(currentLocks)) {
+ if (btnPath.startsWith(lockedPath + "::")) {
+ stillLockedByOther = true;
+ break;
+ }
}
}
+
+ if (!stillLockedByOther) {
+ btn.style.pointerEvents = 'auto';
+ btn.style.opacity = '0.3';
+ btn.title = "鎖定並編輯此項目";
+ btn.innerText = "✏️";
+ }
}
-
- if (!stillLockedByOther) {
- btn.style.pointerEvents = 'auto';
- btn.style.opacity = '0.3';
- btn.title = "鎖定並編輯此項目";
- btn.innerText = "✏️";
- }
- }
- });
+ });
+ }
}
});
@@ -231,7 +250,7 @@ function startLockStatusPolling() {
window.onload = () => {
initTerminal();
resetIdleTimer(); // 頁面載入時啟動閒置計時器
- initGlobalSSE(); // 啟動全域廣播監聽
+ // initGlobalSSE(); <--- 🌟 刪除這行！不要在網頁剛開時就偷聽
startLockStatusPolling(); // 啟動鎖定狀態輪詢
// 🌟 新增：網頁載入時，自動觸發一次「選擇配置任務」的切換，確保畫面與選單同步
@@ -420,7 +439,7 @@ function switchConfigTask() {
}
}
- initGlobalSSE(currentMode);
+ initGlobalSSE();
}
}
@@ -596,7 +615,7 @@ async function fetchFullConfig(configType = 'running') {
const versionRes = await apiGetCmtsVersion(connInfo.host, connInfo.user, connInfo.pass);
if (versionRes.status === 'success') {
const currentVersion = versionRes.version;
- const optRes = await fetch(`/api/v1/cmts-leaf-options?host=${encodeURIComponent(connInfo.host)}&config_type=${configType}`);
+ const optRes = await fetch(`/api/v1/cmts-leaf-options?host=${encodeURIComponent(connInfo.host)}`);
const optData = await optRes.json();
const cachedVersion = optData.__metadata__?.cmts_version;
@@ -678,7 +697,8 @@ async function fetchFullConfig(configType = 'running') {
if (!finalTreeData) throw new Error("未收到完整的配置資料，連線可能中斷。");
- window.currentTreeData = finalTreeData;
+ // 🌟 1. 存入雙軌記憶體，不再污染全域變數
+ window.treeDataStore[configType] = finalTreeData;
const currentSelectedTask = document.getElementById('configTask').value;
const expectedTask = configType === 'running' ? 'form-running-config' : 'form-full-config';
@@ -686,19 +706,29 @@ async function fetchFullConfig(configType = 'running') {
if (currentSelectedTask !== expectedTask) return;
if (treeContainer) {
- treeContainer.innerHTML = buildTree(finalTreeData, '', false, configType);
- if (loadingMsg) loadingMsg.style.display = 'none';
-
- const isSomeoneScanning = await apiGetScanStatus(connInfo.host, configType);
- if (isSomeoneScanning) {
- alert("💡 提示：系統正在背景更新設備選項快取，部分選單題示內容可能稍後才會顯示完整。");
- lockScanButton(60000);
- } else {
- enableGlobalScanButton();
- if (needAutoScan) {
- setTimeout(() => scanGlobalMissingOptions(configType), 500);
+ // 🌟 統一渲染作法：先顯示 UI 提示，讓出主執行緒
+ treeContainer.innerHTML = `⏳ 正在極速建構樹狀圖，請稍候...
`;
+ document.body.style.cursor = 'wait';
+
+ // 因為內部有 await apiGetScanStatus，所以這裡使用 async () => {}
+ setTimeout(async () => {
+ treeContainer.innerHTML = buildTree(finalTreeData, '', false, configType);
+ if (loadingMsg) loadingMsg.style.display = 'none';
+ document.body.style.cursor = 'default';
+
+ // 🌟 拔除 configType，檢查設備級別的掃描狀態
+ const isSomeoneScanning = await apiGetScanStatus(connInfo.host);
+ if (isSomeoneScanning) {
+ alert("💡 提示：系統正在背景更新設備選項快取，部分選單題示內容可能稍後才會顯示完整。");
+ lockScanButton(60000);
+ } else {
+ enableGlobalScanButton();
+ if (needAutoScan) {
+ // 🌟 呼叫新的全域掃描函數
+ setTimeout(() => scanMissingOptions(), 500);
+ }
}
- }
+ }, 20);
}
} catch (error) {
@@ -707,7 +737,7 @@ async function fetchFullConfig(configType = 'running') {
if (progressInterval) clearInterval(progressInterval);
if (loadingMsg) {
loadingMsg.style.display = 'none';
- loadingMsg.style.color = "#f39c12"; // 🌟 確保重置為橘色
+ loadingMsg.style.color = "#f39c12";
}
}
}
@@ -913,16 +943,14 @@ function renderMerChart(channelName, histogramData) {
// 🌟 4. 選項快取與背景掃描 (Cache & Background Scanning)
// ============================================================================
-// 為現有的 input 加上下拉選項 (不破壞原有結構)，加上 mode 參數
-async function enhanceInputWithOptions(path, elementId, mode = 'running') {
- // 🌟 1. 取得當前連線的 IP
+// 為現有的 input 加上下拉選項 (不破壞原有結構)
+async function enhanceInputWithOptions(path, elementId) {
const connInfo = getGlobalConnectionInfo();
if (!connInfo || !connInfo.host) return;
try {
- // 🌟 2. GET 請求：網址加上 host 參數
- const optRes = await fetch(`/api/v1/cmts-leaf-options?host=${encodeURIComponent(connInfo.host)}&config_type=${mode}`);
- const optData = await optRes.json();
+ // 🌟 拔除 config_type 參數
+ const optData = await apiGetLeafOptions(connInfo.host);
const cacheKey = path.replace(/::/g, ' ').replace(/\s*\[\d+\]/g, '');
const leafCache = optData[cacheKey];
@@ -944,11 +972,11 @@ async function enhanceInputWithOptions(path, elementId, mode = 'running') {
dataList.innerHTML = leafCache.options.map(opt => `
-
+ ${innerContent}
`);
@@ -209,13 +251,9 @@ export function buildTree(node, path = '', isParentCommandGroup = false, mode =
cliCommand = baseCmd ? `${baseCmd} no ${safeValue}` : `no ${safeValue}`;
}
- const svgLeaf = ``);
+ const svgFolderClosed = `
`;
+ const svgFolderOpen = `
`;
+ const svgGroupClosed = `
`;
+ const svgGroupOpen = `
`;
+ const svgLeaf = `
`;
+ const expandAllIcon = `
`;
+ const collapseAllIcon = `
`;
+
for (const key in data) {
const value = data[key];
const currentPath = parentPath ? `${parentPath}::${key}` : key;
@@ -331,12 +366,6 @@ export function buildRealFilterTree(data, parentPath = '', hiddenKeys = [], isPa
let cliCommand = currentPath.replace(/::/g, ' ').replace(/\s*\[\d+\]/g, '');
- const svgFolderClosed = `
`;
- const svgFolderOpen = `
`;
- const svgGroupClosed = `
`;
- const svgGroupOpen = `
`;
- const svgLeaf = `
`;
-
const isFolder = typeof value === 'object' && value !== null && Object.keys(value).length > 0;
const onChangeEvent = isFolder ? 'toggleChildCheckboxes(this)' : 'updateParentCheckboxState(this)';
const checkboxHtml = `
`;
@@ -346,16 +375,12 @@ export function buildRealFilterTree(data, parentPath = '', hiddenKeys = [], isPa
const isCommandGroup = isParentCommandGroup || !hasNestedObject;
const elementId = `filter-${mode}-folder-${currentPath.replace(/[^a-zA-Z0-9]/g, '-')}`;
- // 🌟 存入過濾器專用快取
filterFolderCache[elementId] = { data: value, hiddenKeys: hiddenKeys };
const iconClosed = isCommandGroup ? svgGroupClosed : svgFolderClosed;
const iconOpen = isCommandGroup ? svgGroupOpen : svgFolderOpen;
const folderSuffix = isCommandGroup ? `
(指令群組)` : '';
- const expandAllIcon = `
`;
- const collapseAllIcon = `
`;
-
const expandCollapseBtns = `
`;
- // 🌟 加入 lazyLoadFolder 觸發
+ // 🚀 核心魔法：如果 forceExpand 為 true，直接在記憶體中遞迴生成子節點 HTML
+ const isOpenAttr = forceExpand ? 'open' : '';
+ const isLoadedAttr = forceExpand ? 'true' : 'false';
+ const displayClosed = forceExpand ? 'none' : 'inline-block';
+ const displayOpen = forceExpand ? 'inline-block' : 'none';
+
+ let innerContent = '';
+ if (forceExpand) {
+ innerContent = buildRealFilterTree(value, currentPath, hiddenKeys, isCommandGroup, mode, true);
+ }
+
htmlParts.push(`
-
+ ${innerContent}
`);
@@ -430,4 +465,23 @@ export function buildRealFilterTree(data, parentPath = '', hiddenKeys = [], isPa
}
htmlParts.push('