golib/xiaomihome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 重构 token 管理，新增 NATS adapter 和多示例

Browse Source 
按照 TOKEN_REFACTOR.md / FIX_CONFIG.md 方案重构核心层：
- miot: Init() 优先读 storage token，新增 RefreshAuthInfo() 和刷新回调
- xiaomi: Config 改用 AuthInfo 结构体（含 UUID/UID/DataDir/OnTokenRefreshed）
- xiaomi: NewClient(ctx, Config) 新签名，新增 RefreshToken()，后台自动刷新
- xiaomi/devices: 设备控制接口重构
- 新增示例 12_ac_subscribe，其余示例适配新 Config
This commit is contained in:
4566704
2026-06-30 12:16:49 +08:00
parent a3d94c4b9f
commit 8ffc9e4e44
33 changed files with 1019 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xiaomi/examples/01_user_home/main.go
+9 -4
View File
@@ -21,10 +21,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/02_device_list/main.go
+10 -5
View File
@@ -7,8 +7,8 @@ import (
"log"
"time"
"xiaomihome/xiaomi"
miotconfig "xiaomihome/miot/examples/config"
"xiaomihome/xiaomi"
)
func main() {
@@ -21,10 +21,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/03_switch_control/main.go
+9 -4
View File
@@ -22,10 +22,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/04_light_control/main.go
+13 -7
View File
@@ -22,10 +22,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
@@ -88,9 +93,10 @@ func main() {
log.Printf("当前颜色: R=%d G=%d B=%d", r, g, b)
}
subID, err := lt.OnStateChanged(func(state devices.LightState) {
log.Printf("灯光状态变化: power=%v brightness=%d colorTemp=%dK rgb=[%d,%d,%d]",
state.Power, state.Brightness, state.ColorTemp,
subID, err := lt.OnStateChanged(func(state devices.LightState, changed string) {
log.Printf("灯光状态变化: %s → on=%v brightness=%d colorTemp=%dK rgb=[%d,%d,%d]",
changed,
state.On, state.Brightness, state.ColorTemperature,
state.ColorRGB[0], state.ColorRGB[1], state.ColorRGB[2])
})
if err != nil {
xiaomi/examples/05_ac_control/main.go
+13 -8
View File
@@ -22,10 +22,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
@@ -96,10 +101,10 @@ func main() {
log.Println("开启节能模式...")
ac.SetEco(ctx, true)
subID, err := ac.OnStateChanged(func(state devices.ACState) {
log.Printf("空调状态变化: power=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
state.Power, state.Mode, state.TargetTemp, state.CurrentTemp,
state.FanSpeed, state.Swing)
subID, err := ac.OnStateChanged(func(state devices.ACState, changed string) {
log.Printf("空调状态变化: %s → on=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
changed, state.On, state.Mode, state.TargetTemperature, state.Temperature,
state.FanLevel, state.Swing)
})
if err != nil {
log.Printf("订阅状态失败: %v", err)
xiaomi/examples/06_fan_control/main.go
+9 -4
View File
@@ -22,10 +22,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/07_prop_subscribe/main.go
+9 -4
View File
@@ -21,10 +21,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/08_adv_filter_classify/main.go
+9 -4
View File
@@ -26,10 +26,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/09_spec_parser/main.go
+9 -4
View File
@@ -27,10 +27,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/10_cover_control/main.go
+9 -4
View File
@@ -22,10 +22,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/11_sensor_control/main.go
+9 -4
View File
@@ -21,10 +21,15 @@ func main() {
}
client, err := xiaomi.NewClient(ctx, xiaomi.Config{
ClientSecret: "",
AccessToken: cfg.AuthInfo.AccessToken,
UID: cfg.UID,
UUID: cfg.UUID,
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
xiaomi/examples/12_ac_subscribe/data/cert/mihome_ca.cert
+21
View File
@@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIBazCCAQ+gAwIBAgIEA/UKYDAMBggqhkjOPQQDAgUAMCIxEzARBgNVBAoTCk1p
amlhIFJvb3QxCzAJBgNVBAYTAkNOMCAXDTE2MTEyMzAxMzk0NVoYDzIwNjYxMTEx
MDEzOTQ1WjAiMRMwEQYDVQQKEwpNaWppYSBSb290MQswCQYDVQQGEwJDTjBZMBMG
ByqGSM49AgEGCCqGSM49AwEHA0IABL71iwLa4//4VBqgRI+6xE23xpovqPCxtv96
2VHbZij61/Ag6jmi7oZ/3Xg/3C+whglcwoUEE6KALGJ9vccV9PmjLzAtMAwGA1Ud
EwQFMAMBAf8wHQYDVR0OBBYEFJa3onw5sblmM6n40QmyAGDI5sURMAwGCCqGSM49
BAMCBQADSAAwRQIgchciK9h6tZmfrP8Ka6KziQ4Lv3hKfrHtAZXMHPda4IYCIQCG
az93ggFcbrG9u2wixjx1HKW4DUA5NXZG0wWQTpJTbQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIBjzCCATWgAwIBAgIBATAKBggqhkjOPQQDAjAiMRMwEQYDVQQKEwpNaWppYSBS
b290MQswCQYDVQQGEwJDTjAgFw0yMjA2MDkxNDE0MThaGA8yMDcyMDUyNzE0MTQx
OFowLDELMAkGA1UEBhMCQ04xHTAbBgNVBAoMFE1JT1QgQ0VOVFJBTCBHQVRFV0FZ
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEdYrzbnp/0x/cZLZnuEDXTFf8mhj4
CVpZPwgj9e9Ve5r3K7zvu8Jjj7JF1JjQYvEC6yhp1SzBgglnK4L8xQzdiqNQME4w
HQYDVR0OBBYEFCf9+YBU7pXDs6K6CAQPRhlGJ+cuMB8GA1UdIwQYMBaAFJa3onw5
sblmM6n40QmyAGDI5sURMAwGA1UdEwQFMAMBAf8wCgYIKoZIzj0EAwIDSAAwRQIh
AKUv+c8v98vypkGMTzMwckGjjVqTef8xodsy6PhcSCq+AiA/n9mDs62hAo5zXyJy
Bs1s7mqXPf1XgieoxIvs1MqyiA==
-----END CERTIFICATE-----
xiaomi/examples/12_ac_subscribe/data/specs/urn_miot-spec-v2_device_air-condition-outlet_0000A045_sixwgh-ym01_1_0000D01F.json
+1
View File
File diff suppressed because one or more lines are too long
xiaomi/examples/12_ac_subscribe/main.go
+71
View File
@@ -0,0 +1,71 @@
// Package main demonstrates AirConditioner.OnStateChanged subscription.
// 运行后等待状态变化，Ctrl+C 退出。
package main
import (
"context"
"log"
"os"
"os/signal"
"xiaomihome/xiaomi"
"xiaomihome/xiaomi/devices"
miotconfig "xiaomihome/miot/examples/config"
)
func main() {
cfg, err := miotconfig.LoadConfig("../../../miot/examples/config.json")
if err != nil {
log.Fatal("请先运行 miot/examples/cloud_oauth 获取 token:", err)
}
client, err := xiaomi.NewClient(context.Background(), xiaomi.Config{
AuthInfo: xiaomi.AuthInfo{
AccessToken: cfg.AuthInfo.AccessToken,
RefreshToken: cfg.AuthInfo.RefreshToken,
ExpiresIn: cfg.AuthInfo.ExpiresIn,
ExpiresTS: cfg.AuthInfo.ExpiresTS,
},
DataDir: "./data",
UUID: cfg.UUID,
UID: cfg.UID,
})
if err != nil {
log.Fatal(err)
}
defer client.Close()
const targetDID = "2053225728"
info, err := client.GetDevice(context.Background(), targetDID)
if err != nil {
log.Fatalf("获取设备 %s 失败: %v", targetDID, err)
}
log.Printf("设备: %s (DID: %s, 型号: %s)", info.Name, info.DID, info.Model)
ac, err := devices.NewAirConditioner(client, info)
if err != nil {
log.Fatal("创建 AirConditioner 失败:", err)
}
// 先查一次当前状态
on, _ := ac.IsOn(context.Background())
log.Printf("初始状态: on=%v", on)
// 订阅状态变化
subID, err := ac.OnStateChanged(func(state devices.ACState, changed string) {
log.Printf("[%s] on=%v mode=%s target=%.1f current=%.1f fan=%s swing=%s",
changed, state.On, state.Mode, state.TargetTemperature, state.Temperature,
state.FanLevel, state.Swing)
})
if err != nil {
log.Printf("订阅失败: %v", err)
} else {
log.Printf("已订阅: subID=%s", subID)
}
log.Println("\n等待状态变化，Ctrl+C 退出...")
ch := make(chan os.Signal, 1)
signal.Notify(ch, os.Interrupt)
<-ch
log.Println("退出")
}