ESP8266无睡眠轮询版 + 服务端推送记录
- 固件: 去掉 deepSleep(D0->RST 跳线依赖), 上电常驻每60秒轮询抓取上报; WiFi 掉线自动重连(30s超时), 失败也POST占位body让服务器记录fail - server: /api/raw 成功/失败均记 ReportRec(时间/来源/结果/客户端数/HTTP码), 持久化 reports.csv, /api/site 返回最近50条 - 看板: 新增"最近推送记录"面板(成功/失败徽标), 移动端兼容 - secrets.h.example 同步轮询版配置说明
This commit is contained in:
1 parent
da141e4c79
commit
e76d6984e0
4 files changed
+196
-60
No files matched your search
@@ -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()
|
||||
|
||||
Reference in new issue
Block a user