diff --git a/firmware/esp8266/src/main.cpp b/firmware/esp8266/src/main.cpp index df2c71c..fd78617 100644 --- a/firmware/esp8266/src/main.cpp +++ b/firmware/esp8266/src/main.cpp @@ -1,7 +1,10 @@ -// ESP8266 低功耗 DHCP 抓取固件 +// ESP8266 DHCP 抓取固件 —— 无睡眠轮询版 // 功能: 登录水星 MW305R 路由器 → GET /userRpm/AssignedIpAddrListRpm.htm // 拿到原始页面 HTML → POST 给 dhcp-mon server 的 /api/raw -// → 深度睡眠 SLEEP_SECONDS 秒。 +// → 常驻轮询,每 SLEEP_SECONDS 秒循环一轮。 +// +// 与深睡版的区别: 不调用 ESP.deepSleep,不需要 D0→RST 跳线, +// 上电后一直运行,靠 loop() 里的 delay 控制采集间隔(简单可靠)。 // // 解析和上下线判定全部在服务器端(与 README 的 /api/raw 协议一致), // 本固件只做「登录 → 抓页面 → 原样转发」,逻辑极简。 @@ -123,6 +126,7 @@ static int reportPage(WiFiClient &wifi, const String &page) { http.addHeader("Content-Type", "text/html; charset=GBK"); http.addHeader("X-Token", X_TOKEN); http.addHeader("X-Site", X_SITE); + http.addHeader("X-Source", SOURCE_ID); int code = http.POST(page); String resp = http.getString(); http.end(); @@ -133,52 +137,74 @@ static int reportPage(WiFiClient &wifi, const String &page) { return code; } +// 确保 WiFi 已连接;未连接则重连(最多等 30s) +static bool ensureWiFi() { + if (WiFi.status() == WL_CONNECTED) { + return true; + } + Serial.printf("[wifi] 连接 %s ...\n", WIFI_SSID); + WiFi.mode(WIFI_STA); + WiFi.disconnect(); + delay(100); + WiFi.begin(WIFI_SSID, WIFI_PASS); + uint32_t t0 = millis(); + while (WiFi.status() != WL_CONNECTED) { + if (millis() - t0 > 30000) { + Serial.println("[wifi] 连接超时(30s),本轮跳过,下轮重试"); + return false; + } + delay(500); + } + Serial.printf("[wifi] 已连接,IP=%s\n", WiFi.localIP().toString().c_str()); + return true; +} + void setup() { Serial.begin(115200); Serial.println(); - Serial.println("=== ESP8266 DHCP 采集固件 ==="); + Serial.println("=== ESP8266 DHCP 采集固件(无睡眠轮询版) ==="); - // 短暂点亮板载 LED 提示本次唤醒 + // 启动信息: 复位原因 + 上电/复位计数(RTC memory,带 magic 校验) + Serial.printf("[boot] 复位原因: %s\n", ESP.getResetReason().c_str()); + static const uint32_t RTC_MAGIC = 0xDEADBEEF; + struct RTCState { uint32_t magic; uint32_t count; } st; + ESP.rtcUserMemoryRead(0, (uint32_t *)&st, sizeof(st)); + if (st.magic != RTC_MAGIC) { + st.magic = RTC_MAGIC; + st.count = 0; + } + st.count++; + ESP.rtcUserMemoryWrite(0, (uint32_t *)&st, sizeof(st)); + Serial.printf("[boot] 复位次数: %u\n", st.count); + + // 短暂点亮板载 LED 提示本次上电 pinMode(LED_BUILTIN, OUTPUT); digitalWrite(LED_BUILTIN, LOW); delay(150); digitalWrite(LED_BUILTIN, HIGH); - // 连接 WiFi(ESP8266 仅支持 2.4GHz) - WiFi.mode(WIFI_STA); - WiFi.begin(WIFI_SSID, WIFI_PASS); - Serial.printf("[wifi] 连接 %s ...\n", WIFI_SSID); - uint32_t t0 = millis(); - while (WiFi.status() != WL_CONNECTED) { - if (millis() - t0 > 20000) { - Serial.println("[wifi] 连接超时,直接进入深度睡眠"); - ESP.deepSleep(SLEEP_SECONDS * 1000000ULL, WAKE_RF_DEFAULT); - return; // 不会到达 - } - delay(500); - } - Serial.printf("[wifi] 已连接,IP=%s\n", WiFi.localIP().toString().c_str()); + // 首次连接 WiFi;失败不阻塞,loop 里每轮会重试 + ensureWiFi(); - WiFiClient wifi; - // 登录路由器 + 抓页面 - String page = fetchRouterPage(wifi); - if (page.length() > 0) { - // 原样转发原始 HTML(服务器端解析 DHCPDynList + 上下线判定) - reportPage(wifi, page); - } else { - Serial.println("[report] 无页面可上报,跳过本轮"); - } - - // 深度睡眠到下一轮(固定间隔,低功耗) - // 注: 自动唤醒需 GPIO16(D0) 短接到 RST;无跳线则按 RST 唤醒。 - // 单次深睡上限约 3.5 小时,间隔超过请拆成多段循环。 - Serial.printf("[sleep] 深度睡眠 %u 秒\n", SLEEP_SECONDS); - Serial.flush(); - ESP.deepSleep(SLEEP_SECONDS * 1000000ULL, WAKE_RF_DEFAULT); + Serial.printf("[setup] 完成,进入轮询模式,每 %u 秒采集一轮\n", SLEEP_SECONDS); } void loop() { - // setup() 里已深睡,不会到这里;安全兜底再睡一次 - ESP.deepSleep(SLEEP_SECONDS * 1000000ULL, WAKE_RF_DEFAULT); - delay(1000); + // 每轮: 确保 WiFi → 抓路由页面 → 上报服务器 + if (ensureWiFi()) { + WiFiClient wifi; + String page = fetchRouterPage(wifi); + if (page.length() > 0) { + // 原样转发原始 HTML(服务器端解析 DHCPDynList + 上下线判定) + reportPage(wifi, page); + } else { + // 抓页面失败也上报一个占位 body,服务器端会记一条“失败”推送记录 + Serial.println("[report] 抓页面失败,上报错误标记"); + reportPage(wifi, "device_fetch_failed"); + } + } + + // 等待到下一轮(固定间隔)。delay 期间 ESP8266 后台保持 WiFi 连接。 + Serial.printf("[loop] 本轮完成, %u 秒后下一轮\n", SLEEP_SECONDS); + delay(SLEEP_SECONDS * 1000UL); } diff --git a/firmware/esp8266/src/secrets.h.example b/firmware/esp8266/src/secrets.h.example index c0c4cf8..3db22cf 100644 --- a/firmware/esp8266/src/secrets.h.example +++ b/firmware/esp8266/src/secrets.h.example @@ -17,11 +17,13 @@ static const char *SERVER_URL = "http://your-vps-ip:8080/api/raw"; // ---- 认证与站点(需与 server 的 -stoken 一致)---- static const char *X_TOKEN = "与server的-stoken一致"; static const char *X_SITE = "home"; // 站点名,如 home/office/shop +// 上报来源标识(出现在看板"最近推送记录"),改成便于区分的名字 +static const char *SOURCE_ID = "esp8266-home"; // ---- 路由器(Mercury 水星 MW305R)---- static const char *ROUTER_HOST = "192.168.1.1"; static const char *ROUTER_ADMIN = "admin"; static const char *ROUTER_PASS = "123456"; -// ---- 采集间隔(秒): 深度睡眠时长,默认 15 分钟 ---- +// ---- 采集间隔(秒): 轮询间隔(无睡眠,常驻运行),默认 15 分钟 ---- static const uint32_t SLEEP_SECONDS = 900; \ No newline at end of file diff --git a/server.go b/server.go index 9c6fa7c..f7de319 100644 --- a/server.go +++ b/server.go @@ -10,6 +10,7 @@ import ( "os" "path/filepath" "sort" + "strconv" "strings" "sync" "time" @@ -25,6 +26,18 @@ type SiteData struct { // raw 模式(ESP8266 原始页面上报)的状态机字段 rawAbsentToOffline int // 连续缺席多少次判定下线(防抖) rawAbsent map[string]int // mac -> 连续缺席次数 + // reports 每次上报记录(含成功/失败),环形保留最近 50 条,持久化到 reports.csv + reports []ReportRec +} + +// ReportRec 一次上报记录 +type ReportRec struct { + Time time.Time `json:"time"` + Source string `json:"source"` // 上报来源(esp8266 序列号 / 客户端 IP / "report") + Result string `json:"result"` // ok / fail + Detail string `json:"detail"` // 错误或结果说明 + Clients int `json:"clients"` // 成功时解析到的客户端数 + Code int `json:"code"` // 收到/返回的 HTTP 码 } // Server 服务器(server 模式) @@ -263,18 +276,70 @@ func (s *Server) handleReport(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(map[string]interface{}{"ok": true, "site": p.Site, "events_received": recev, "time": now}) } +// getOrCreateSite 返回指定站点,不存在则创建(带 raw 状态机默认值) +func (s *Server) getOrCreateSite(name string) *SiteData { + s.mu.RLock() + sd, ok := s.sites[name] + s.mu.RUnlock() + if ok { + return sd + } + s.mu.Lock() + defer s.mu.Unlock() + if sd, ok = s.sites[name]; !ok { + sd = &SiteData{name: name, devices: make(map[string]*Device), rawAbsent: make(map[string]int), rawAbsentToOffline: 2} + s.sites[name] = sd + } + return sd +} + +// recordReport 追加一条上报记录(环形保留最近 50 条) +// 调用方需持有 sd.mu 写锁 +func (sd *SiteData) recordReport(t time.Time, source, result, detail string, clients int, code int) { + sd.reports = append(sd.reports, ReportRec{Time: t, Source: source, Result: result, Detail: detail, Clients: clients, Code: code}) + const maxReports = 50 + if len(sd.reports) > maxReports { + sd.reports = append([]ReportRec(nil), sd.reports[len(sd.reports)-maxReports:]...) + } +} + // handleRaw 接收采集端(ESP8266)上报的原始路由器页面 HTML。 // 认证方式: Header X-Token 或 query ?token,与站点校验一致。 // site 通过 Header X-Site 或 query ?site 指定。 // body 为 /userRpm/AssignedIpAddrListRpm.htm 的原始响应。 // 服务器端解析 DHCPDynList → 做上下线判定 → 记录事件 → 持久化。 +// 每次上报(无论成败)都会记一条 reports 记录。 func (s *Server) handleRaw(w http.ResponseWriter, r *http.Request) { + now := time.Now() + // 来源: 采集端可通过 X-Source 上报自己的标识(如 ESP8266 MAC/序列号),否则用客户端 IP + source := r.Header.Get("X-Source") + if source == "" { + source = r.RemoteAddr + if i := strings.LastIndex(source, ":"); i >= 0 { + source = source[:i] + } + } + fail := func(code int, msg string) { + site := r.Header.Get("X-Site") + if site == "" { + site = r.URL.Query().Get("site") + } + if site != "" { + sd := s.getOrCreateSite(site) + sd.mu.Lock() + sd.recordReport(now, source, "fail", msg, 0, code) + sd.mu.Unlock() + s.saveSite(sd) + } + http.Error(w, msg, code) + } + if r.Method != http.MethodPost { - http.Error(w, "method not allowed", http.StatusMethodNotAllowed) + fail(http.StatusMethodNotAllowed, "method not allowed") return } if !s.authOK(r) { - http.Error(w, "401: token 错误", http.StatusUnauthorized) + fail(http.StatusUnauthorized, "401: token 错误") return } site := r.Header.Get("X-Site") @@ -282,17 +347,17 @@ func (s *Server) handleRaw(w http.ResponseWriter, r *http.Request) { site = r.URL.Query().Get("site") } if site == "" { - http.Error(w, "缺少 site(Header X-Site 或 query ?site)", http.StatusBadRequest) + fail(http.StatusBadRequest, "缺少 site(Header X-Site 或 query ?site)") return } body, err := io.ReadAll(r.Body) if err != nil { - http.Error(w, "读取 body 失败: "+err.Error(), http.StatusBadRequest) + fail(http.StatusBadRequest, "读取 body 失败: "+err.Error()) return } if len(body) == 0 { - http.Error(w, "body 为空", http.StatusBadRequest) + fail(http.StatusBadRequest, "body 为空") return } @@ -303,30 +368,17 @@ func (s *Server) handleRaw(w http.ResponseWriter, r *http.Request) { text := string(body) switch { case strings.Contains(text, "403 Forbidden") || strings.Contains(text, "You have no authority"): - http.Error(w, "路由器认证被拒绝(403): 检查采集端密码或路由器锁定", http.StatusBadGateway) + fail(http.StatusBadGateway, "路由器认证被拒绝(403): 检查采集端密码或路由器锁定") return case strings.Contains(text, "httpAutErrorArray") || strings.Contains(text, "pcPassword"): - http.Error(w, "路由器认证失败: 密码不正确或多次输错被锁定", http.StatusBadGateway) + fail(http.StatusBadGateway, "路由器认证失败: 密码不正确或多次输错被锁定") return } - http.Error(w, "解析失败: "+err.Error(), http.StatusBadRequest) + fail(http.StatusBadRequest, "解析失败: "+err.Error()) return } - now := time.Now() - // lookup or 创建站点 - s.mu.RLock() - sd, ok := s.sites[site] - s.mu.RUnlock() - if !ok { - s.mu.Lock() - if sd, ok = s.sites[site]; !ok { - sd = &SiteData{name: site, devices: make(map[string]*Device), rawAbsent: make(map[string]int), rawAbsentToOffline: 2} - s.sites[site] = sd - } - s.mu.Unlock() - } - + sd := s.getOrCreateSite(site) sd.mu.Lock() sd.lastSeen = now // 缺省防抖次数与 client 默认一致(2 次) @@ -336,6 +388,7 @@ func (s *Server) handleRaw(w http.ResponseWriter, r *http.Request) { } sd.applyClients(now, clients, absent) devCount := len(sd.devices) + sd.recordReport(now, source, "ok", fmt.Sprintf("解析 %d 客户端", len(clients)), len(clients), 200) sd.mu.Unlock() // 持久化 @@ -421,6 +474,7 @@ func (s *Server) handleSite(w http.ResponseWriter, r *http.Request) { devs = append(devs, &cp) } evs := append([]Event(nil), sd.events...) + reps := append([]ReportRec(nil), sd.reports...) last := sd.lastSeen sd.mu.RUnlock() @@ -434,6 +488,10 @@ func (s *Server) handleSite(w http.ResponseWriter, r *http.Request) { for i, j := 0, len(evs)-1; i < j; i, j = i+1, j-1 { evs[i], evs[j] = evs[j], evs[i] } + // 上报记录最新在前 + for i, j := 0, len(reps)-1; i < j; i, j = i+1, j-1 { + reps[i], reps[j] = reps[j], reps[i] + } limit := 200 if v := r.URL.Query().Get("limit"); v != "" { fmt.Sscanf(v, "%d", &limit) @@ -447,6 +505,7 @@ func (s *Server) handleSite(w http.ResponseWriter, r *http.Request) { "site": name, "devices": devs, "events": evs, + "reports": reps, "last_seen": last.Format(time.RFC3339), "retain_days": s.retainDays, }) @@ -477,6 +536,18 @@ func (s *Server) saveSite(sd *SiteData) { w.Flush() f.Close() } + + // reports.csv (每次上报记录) + f2, err := os.Create(filepath.Join(dir, "reports.csv")) + if err == nil { + w := csv.NewWriter(f2) + w.Write([]string{"timestamp", "source", "result", "detail", "clients", "code"}) + for _, rp := range sd.reports { + w.Write([]string{rp.Time.Format(time.RFC3339), rp.Source, rp.Result, rp.Detail, strconv.Itoa(rp.Clients), strconv.Itoa(rp.Code)}) + } + w.Flush() + f2.Close() + } } // sanitize 站点名防目录穿越 @@ -517,6 +588,20 @@ func (s *Server) loadAll() { sd.events = append(sd.events, Event{Timestamp: t, Event: r[1], MAC: r[2], IP: r[3], Name: r[4], Detail: r[5]}) } } + if rows, err := readCSV(filepath.Join(dir, "reports.csv")); err == nil && len(rows) > 1 { + for _, r := range rows[1:] { + if len(r) < 6 { + continue + } + t, err := time.Parse(time.RFC3339, r[0]) + if err != nil { + continue + } + clients, _ := strconv.Atoi(r[4]) + code, _ := strconv.Atoi(r[5]) + sd.reports = append(sd.reports, ReportRec{Time: t, Source: r[1], Result: r[2], Detail: r[3], Clients: clients, Code: code}) + } + } if len(sd.devices) > 0 || len(sd.events) > 0 { sd.lastSeen = time.Now().Add(-24 * time.Hour) // 重启后推测离线 s.mu.Lock() diff --git a/web/dashboard.html b/web/dashboard.html index 1c05c43..45d3112 100644 --- a/web/dashboard.html +++ b/web/dashboard.html @@ -46,6 +46,13 @@ .evt .time { color: var(--muted); white-space: nowrap; } .evt .name { font-weight: 600; } .evt .detail { color: var(--muted); font-size: 12px; } + .rpt { display: flex; gap: 10px; align-items: center; padding: 7px 0; border-bottom: 1px solid rgba(51,65,85,.3); font-size: 13px; flex-wrap: wrap; } + .rpt:last-child { border-bottom: none; } + .rpt .time { color: var(--muted); white-space: nowrap; } + .rpt .src { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 12px; } + .rpt .detail { color: var(--muted); font-size: 12px; flex-basis: 100%; padding-left: 16px; } + .badge.ok { background: rgba(34,197,94,.15); color: var(--green); } + .badge.fail { background: rgba(239,68,68,.15); color: var(--red); } .footer { color: var(--muted); font-size: 12px; text-align: center; padding: 10px 0 30px; } .scroll { max-height: 460px; overflow-y: auto; } .empty { color: var(--muted); padding: 20px 0; text-align: center; } @@ -115,6 +122,11 @@
+