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:
2026-07-13 10:40:20 +08:00
parent 8ffc9e4e44
commit b808e51b3e
68 changed files with 2506 additions and 688 deletions
+109
View File
@@ -0,0 +1,109 @@
// 示例 13:多用户模式(bridge 包)
//
// 演示 Pool + UserBridge 门面,外部只需 import bridge 一个包。
// 不直接依赖 xiaomi / devices / miot。
package main
import (
"context"
"encoding/json"
"fmt"
"log"
"os"
"os/signal"
"xiaomihome/bridge"
"xiaomihome/xiaomi"
)
type UserCfg struct {
UID int64 `json:"uid,string"`
UUID string `json:"uuid"`
Auth xiaomi.AuthInfo `json:"auth"`
DataDir string `json:"data_dir"`
HomeIDs []int64 `json:"home_ids,omitempty"`
}
func loadUsers(path string) ([]UserCfg, error) {
data, _ := os.ReadFile(path)
var users []UserCfg
if err := json.Unmarshal(data, &users); err != nil {
return nil, err
}
return users, nil
}
func main() {
allUsers, err := loadUsers("users.json")
if err != nil || len(allUsers) == 0 {
log.Fatalf("请创建 users.json: %v", err)
}
ctx := context.Background()
pool := bridge.NewPool()
for _, u := range allUsers {
b, err := pool.Add(ctx, u.UID, u.UUID, u.Auth, u.DataDir, u.HomeIDs)
if err != nil {
log.Printf("用户 %d 初始化失败: %v", u.UID, err)
continue
}
// 注册全局回调 → 推送到 NATS / WebSocket / 数据库
b.OnStateChanged(func(id int64, did, deviceType, changed string, state interface{}) {
log.Printf("[%d] %s/%s changed=%s → %+v", id, did, deviceType, changed, state)
})
// 下单 MQTT 订阅
b.StartReceiving()
// 云端拉初始状态
b.FetchAllStates(ctx)
}
defer pool.Close()
log.Printf("\n%d 个用户就绪", len(allUsers))
// 演示:操作某台空调
demoControl(ctx, pool, 2897121707, "2053225728")
ch := make(chan os.Signal, 1)
signal.Notify(ch, os.Interrupt)
<-ch
log.Println("退出")
}
func demoControl(ctx context.Context, pool *bridge.Pool, id int64, did string) {
b, ok := pool.Get(id)
if !ok {
log.Printf("id %d 不存在", id)
return
}
ac, err := b.AC(did)
if err != nil {
log.Printf("设备 %s 不是空调: %v", did, err)
return
}
// 读缓存
state := ac.GetState()
fmt.Printf("[demo] 缓存: on=%v mode=%s target=%.1f current=%.1f\n",
state.On, state.Mode, state.TargetTemperature, state.Temperature)
// 云端刷新
state2, err := ac.FetchState(ctx)
if err != nil {
log.Printf("[demo] 云端刷新失败: %v", err)
return
}
fmt.Printf("[demo] 云端: on=%v mode=%s target=%.1f current=%.1f\n",
state2.On, state2.Mode, state2.TargetTemperature, state2.Temperature)
// 控制
ac.TurnOn(ctx)
ac.SetMode(ctx, "cool")
ac.SetTargetTemp(ctx, 26)
}
@@ -0,0 +1,24 @@
[
{
"uid": "2897121707",
"uuid": "0684e27d49b7a234ff1a4d82f8fca234",
"data_dir": "./data/2897121707",
"auth": {
"access_token": "这里填你的token",
"refresh_token": "这里填你的refresh_token",
"expires_in": 86400,
"expires_ts": 1751289600
}
},
{
"uid": "another_uid",
"uuid": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"data_dir": "./data/another_uid",
"auth": {
"access_token": "",
"refresh_token": "",
"expires_in": 0,
"expires_ts": 0
}
}
]