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:
+13
-15
@@ -14,20 +14,28 @@ import (
|
||||
type TokenResult struct {
|
||||
AccessToken string `json:"access_token"`
|
||||
RefreshToken string `json:"refresh_token"`
|
||||
ExpiresIn int `json:"expires_in"`
|
||||
ExpiresIn int32 `json:"expires_in"`
|
||||
ExpiresTS int64 `json:"expires_ts"`
|
||||
UID string `json:"uid"`
|
||||
}
|
||||
|
||||
// AuthURL 生成小米 OAuth 授权页面 URL。
|
||||
func AuthURL(cfg Config) string {
|
||||
oa := miot.NewMIoTOauthClient(miot.OAUTH2_CLIENT_ID, "", "cn", generateUUID())
|
||||
uuid := cfg.UUID
|
||||
if uuid == "" { uuid = generateUUID() }
|
||||
redirectURL := cfg.RedirectURL
|
||||
if redirectURL == "" { redirectURL = miot.OAUTH_REDIRECT_URL }
|
||||
oa := miot.NewMIoTOauthClient(miot.OAUTH2_CLIENT_ID, redirectURL, "cn", uuid)
|
||||
return oa.GenAuthURL("", "", nil, false)
|
||||
}
|
||||
|
||||
// ExchangeCode 用 authorization code 交换 access token。
|
||||
func ExchangeCode(ctx context.Context, cfg Config, code string) (*TokenResult, error) {
|
||||
oa := miot.NewMIoTOauthClient(miot.OAUTH2_CLIENT_ID, "", "cn", generateUUID())
|
||||
uuid := cfg.UUID
|
||||
if uuid == "" { uuid = generateUUID() }
|
||||
redirectURL := cfg.RedirectURL
|
||||
if redirectURL == "" { redirectURL = miot.OAUTH_REDIRECT_URL }
|
||||
oa := miot.NewMIoTOauthClient(miot.OAUTH2_CLIENT_ID, redirectURL, "cn", uuid)
|
||||
result, err := oa.GetAccessToken(code)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("xiaomi: exchange token: %w", err)
|
||||
@@ -36,7 +44,7 @@ func ExchangeCode(ctx context.Context, cfg Config, code string) (*TokenResult, e
|
||||
return &TokenResult{
|
||||
AccessToken: strVal(result, "access_token"),
|
||||
RefreshToken: strVal(result, "refresh_token"),
|
||||
ExpiresIn: expiresIn,
|
||||
ExpiresIn: int32(expiresIn),
|
||||
ExpiresTS: time.Now().Unix() + int64(expiresIn),
|
||||
UID: strVal(result, "uid"),
|
||||
}, nil
|
||||
@@ -45,15 +53,5 @@ func ExchangeCode(ctx context.Context, cfg Config, code string) (*TokenResult, e
|
||||
func generateUUID() string {
|
||||
b := make([]byte, 16)
|
||||
rand.Read(b)
|
||||
buf := make([]byte, 36)
|
||||
hex.Encode(buf[:8], b[:4])
|
||||
buf[8] = '-'
|
||||
hex.Encode(buf[9:13], b[4:6])
|
||||
buf[13] = '-'
|
||||
hex.Encode(buf[14:18], b[6:8])
|
||||
buf[18] = '-'
|
||||
hex.Encode(buf[19:23], b[8:10])
|
||||
buf[23] = '-'
|
||||
hex.Encode(buf[24:], b[10:16])
|
||||
return string(buf)
|
||||
return hex.EncodeToString(b)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user