refactor: 重大架构升级 — HomeID/RoomID int64化 + 设备驱动重构 + 结构化日志
主要变更: **类型系统重构** - HomeInfo.ID/RoomInfo.ID/HomeID 从 string 改为 int64,json tag 使用 ,string - GetHome/GetRooms/GetRoomDevices 接口同步修改 - 新增 int64FromStr 工具函数,更新 parseHomeInfo 解析逻辑 **新增 Speaker 设备** - 新增 KindSpeaker 类型 - classify 映射覆盖 speaker/bluetooth-speaker/alarm-clock/media-player/playback/music **设备驱动重构** - AC 驱动彻底重写:从硬编码常量改为基于 SPEC ValueList 的动态 valMapper - 所有设备(Fan/Humidifier/Light/OccupancySensor/Switch/TempHumiditySensor/Thermostat/Vacuum/WaterHeater/Cover)新增 GetState() 和 FetchState(ctx) 接口 - base.go 新增 specResolver.format() 方法 **MIoT 模块增强** - MIoTClient 新增 homeIDs 字段,支持按家庭过滤设备 - RefreshDevices 支持 homeIDs 参数 - SpecStdLib 引入 logger.Logger,log.Printf 全部迁移为结构化日志 **其他** - Config 新增 RedirectURL 和 HomeIDs 字段 - AuthInfo.ExpiresIn 类型从 int 改为 int32 - UUID 生成简化为 hex.EncodeToString - 新增 github.com/sirupsen/logrus 依赖 - .gitignore 新增 examples/*/data/ 忽略规则 - 删除已提交的 config.json 敏感配置
This commit is contained in:
+11
-4
@@ -4,7 +4,6 @@ package miot
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"net"
|
||||
"net/http"
|
||||
"os/exec"
|
||||
@@ -12,6 +11,8 @@ import (
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"xiaomihome/logger"
|
||||
)
|
||||
|
||||
// ============================================================================
|
||||
@@ -70,6 +71,8 @@ func (n *NetworkInfo) String() string {
|
||||
type MIoTNetwork struct {
|
||||
mu sync.Mutex
|
||||
|
||||
lgr logger.Logger
|
||||
|
||||
// Detection addresses with cached response times (seconds)
|
||||
ipAddrMap map[string]float64
|
||||
httpAddrMap map[string]float64
|
||||
@@ -123,6 +126,7 @@ func NewMIoTNetwork(ipAddrList, urlAddrList []string, refreshInterval time.Durat
|
||||
}
|
||||
|
||||
n := &MIoTNetwork{
|
||||
lgr: logger.Default(),
|
||||
ipAddrMap: make(map[string]float64),
|
||||
httpAddrMap: make(map[string]float64),
|
||||
httpClient: &http.Client{Timeout: defaultDetectTimeout},
|
||||
@@ -145,6 +149,9 @@ func NewMIoTNetwork(ipAddrList, urlAddrList []string, refreshInterval time.Durat
|
||||
return n
|
||||
}
|
||||
|
||||
// SetLogger sets a custom logger for MIoTNetwork.
|
||||
func (n *MIoTNetwork) SetLogger(l logger.Logger) { n.lgr = l }
|
||||
|
||||
// Init starts the network monitor.
|
||||
func (n *MIoTNetwork) Init() {
|
||||
// Initial refresh
|
||||
@@ -248,7 +255,7 @@ func (n *MIoTNetwork) loop() {
|
||||
// refresh performs a full refresh: network status detection + interface info.
|
||||
func (n *MIoTNetwork) refresh() {
|
||||
newStatus := checkNetworkStatus(n)
|
||||
newInfo := getNetworkInterfaces()
|
||||
newInfo := n.getNetworkInterfaces()
|
||||
|
||||
n.mu.Lock()
|
||||
oldStatus := n.networkStatus
|
||||
@@ -518,12 +525,12 @@ func httpMulti(urls []string) map[string]float64 {
|
||||
// ============================================================================
|
||||
|
||||
// getNetworkInterfaces returns all non-loopback, non-docker IPv4 interfaces.
|
||||
func getNetworkInterfaces() map[string]*NetworkInfo {
|
||||
func (n *MIoTNetwork) getNetworkInterfaces() map[string]*NetworkInfo {
|
||||
results := make(map[string]*NetworkInfo)
|
||||
|
||||
ifaces, err := net.Interfaces()
|
||||
if err != nil {
|
||||
log.Printf("[network] get interfaces error: %v", err)
|
||||
n.lgr.Infof("[network] get interfaces error: %v", err)
|
||||
return results
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user