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:
@@ -0,0 +1,97 @@
|
||||
// 示例 15:OAuth 授权流程(无需 import miot)
|
||||
//
|
||||
// go run . 首次运行自动创建 user.json,打开授权链接完成授权后粘贴 code。
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"crypto/rand"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
|
||||
"xiaomihome/xiaomi"
|
||||
)
|
||||
|
||||
type userFile struct {
|
||||
UID string `json:"uid"`
|
||||
UUID string `json:"uuid"`
|
||||
Auth struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
ExpiresTS int64 `json:"expires_ts"`
|
||||
} `json:"auth"`
|
||||
DataDir string `json:"data_dir"`
|
||||
}
|
||||
|
||||
const filePath = "user.json"
|
||||
|
||||
func load() *userFile {
|
||||
data, _ := os.ReadFile(filePath)
|
||||
var u userFile
|
||||
json.Unmarshal(data, &u)
|
||||
if u.UUID == "" {
|
||||
u.UUID = newUUID()
|
||||
save(&u)
|
||||
}
|
||||
return &u
|
||||
}
|
||||
|
||||
func save(u *userFile) {
|
||||
data, _ := json.MarshalIndent(u, "", " ")
|
||||
os.WriteFile(filePath, data, 0600)
|
||||
}
|
||||
|
||||
func newUUID() string {
|
||||
b := make([]byte, 16)
|
||||
rand.Read(b)
|
||||
return fmt.Sprintf("%x", b)
|
||||
}
|
||||
|
||||
func main() {
|
||||
ctx := context.Background()
|
||||
u := load()
|
||||
|
||||
if u.Auth.AccessToken != "" {
|
||||
fmt.Println("已完成授权")
|
||||
fmt.Printf("UID: %s\n", u.UID)
|
||||
fmt.Printf("AccessToken: %s...\n", u.Auth.AccessToken[:min(20, len(u.Auth.AccessToken))])
|
||||
fmt.Printf("RefreshToken: %s...\n", u.Auth.RefreshToken[:min(20, len(u.Auth.RefreshToken))])
|
||||
return
|
||||
}
|
||||
|
||||
authURL := xiaomi.AuthURL(xiaomi.Config{UUID: u.UUID})
|
||||
fmt.Println("========== OAuth 授权 ==========")
|
||||
fmt.Println("请打开以下链接完成授权,然后把地址栏中的 code 粘贴回来:")
|
||||
fmt.Println()
|
||||
fmt.Println(" ", authURL)
|
||||
fmt.Println()
|
||||
fmt.Print("输入 code: ")
|
||||
|
||||
scanner := bufio.NewScanner(os.Stdin)
|
||||
scanner.Scan()
|
||||
code := scanner.Text()
|
||||
if code == "" {
|
||||
log.Fatal("未输入 code")
|
||||
}
|
||||
|
||||
result, err := xiaomi.ExchangeCode(ctx, xiaomi.Config{UUID: u.UUID}, code)
|
||||
if err != nil {
|
||||
log.Fatal("ExchangeCode 失败:", err)
|
||||
}
|
||||
|
||||
u.UID = result.UID
|
||||
u.Auth.AccessToken = result.AccessToken
|
||||
u.Auth.RefreshToken = result.RefreshToken
|
||||
u.Auth.ExpiresTS = result.ExpiresTS
|
||||
u.DataDir = "./data/" + u.UID
|
||||
save(u)
|
||||
|
||||
fmt.Println("\n=== Token 已保存 ===")
|
||||
fmt.Printf("UID: %s\n", u.UID)
|
||||
fmt.Printf("AccessToken: %s...\n", u.Auth.AccessToken[:min(20, len(u.Auth.AccessToken))])
|
||||
fmt.Printf("RefreshToken: %s...\n", u.Auth.RefreshToken[:min(20, len(u.Auth.RefreshToken))])
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
{
|
||||
"uid": "",
|
||||
"uuid": "2882aa541cfc47b78ed178bb42b43302",
|
||||
"auth": {
|
||||
"access_token": "V3_iTf6riwKt698wtjY8tvu1o6kX1Izsid-XHKCJK1RNZXscm3htdWXCV6lUj8nwncsk58pjy3Vmnu93Ggfa1mYUNe-839wtyCAGyND-Q-diRcC4LbVO_tUDyvNXPAN2VknYKfY7tzUGYzEzOzSFq_Feo_vhZsPEJ6oHnY58s2xtqQOxPAJRa8B3mZrggi2TNkm",
|
||||
"refresh_token": "R3_9Z2sYiFbiOWSRTTUBmVOTlSXnyqOpIpY2IJ0oadNpJqrcrPPKKbvGrADaadudLjaF3VIYJTY2mM9HgXlnr3eoRQCbNETOoEsAS04zxJa9K8YH8pkJT9voDDTPEuhpXdATv5SOrzyZgDxn-gJKMUHzxotwAyfaTlxuA6Dtv80uoyYZuHresy-zqfiiABVCwUVY0saSa1fayXCeUYzRfEgng",
|
||||
"expires_ts": 1783080922
|
||||
},
|
||||
"data_dir": "./data/"
|
||||
}
|
||||
Reference in New Issue
Block a user