Compare commits
10
Commits
9dcdf9a227
...
3f05417b83
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f05417b83 | ||
|
|
2cbac73f2a | ||
|
|
965e035052 | ||
|
|
503f7cd2b4 | ||
|
|
4ffd1b7eac | ||
|
|
8fea0c3c11 | ||
|
|
43c688af6f | ||
|
|
74486ebf08 | ||
|
|
88df3149be | ||
|
|
378ee865e7 |
@@ -1,4 +1,5 @@
|
||||
.mimocode/
|
||||
.worktrees/
|
||||
mijia-api/
|
||||
auth.json
|
||||
miot-cache/
|
||||
|
||||
@@ -41,6 +41,49 @@ func main() {
|
||||
|
||||
`auth.json` 包含 `serviceToken`、`passToken`、`ssecurity` 等敏感认证数据。库写入该文件时使用 `0600` 权限;请保持此权限,并且不要将该文件提交到版本库。
|
||||
|
||||
Web/GUI 应用可通过 `WithQRWriter` 接收登录输出,并在阻塞的 `Login` 等待期间实时展示给用户:
|
||||
|
||||
```go
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"io"
|
||||
|
||||
mijia "git.misaka.ren/m1saka/mijia-go-api"
|
||||
)
|
||||
|
||||
func streamLogin(ctx context.Context, renderLoginLine func(string)) error {
|
||||
reader, writer := io.Pipe()
|
||||
defer reader.Close()
|
||||
|
||||
client, err := mijia.NewClient("", mijia.WithQRWriter(writer))
|
||||
if err != nil {
|
||||
writer.Close()
|
||||
return err
|
||||
}
|
||||
|
||||
loginDone := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := client.Login(ctx)
|
||||
writer.CloseWithError(err)
|
||||
loginDone <- err
|
||||
}()
|
||||
|
||||
scanner := bufio.NewScanner(reader)
|
||||
for scanner.Scan() {
|
||||
renderLoginLine(scanner.Text())
|
||||
}
|
||||
|
||||
loginErr := <-loginDone
|
||||
if loginErr != nil {
|
||||
return loginErr
|
||||
}
|
||||
return scanner.Err()
|
||||
}
|
||||
```
|
||||
|
||||
`Login` 会阻塞等待扫码,因此必须同步消费 Writer 输出。Writer 可能由另一个 goroutine 写入,不能无同步地并发读写 `bytes.Buffer`。Writer 接收的内容包含登录二维码 URL,属于敏感登录信息;调用方不得将其写入日志、监控事件或其他持久化记录。
|
||||
|
||||
## 底层 API
|
||||
|
||||
以下示例展示设备、属性和 action 的直接调用。`GetDevices` 的 `homeID` 传空字符串时查询所有家庭。
|
||||
@@ -96,6 +139,8 @@ _, err = device.RunAction(ctx, "toggle", nil)
|
||||
_ = value
|
||||
```
|
||||
|
||||
执行 action 前可通过 `device.Actions()["toggle"].Inputs` 检查可信 MIoT 描述中的参数类型、范围和值列表。
|
||||
|
||||
可通过实际导出的 `DeviceOption` 调整行为:
|
||||
|
||||
```go
|
||||
@@ -134,4 +179,12 @@ case errors.As(err, &deviceErr):
|
||||
}
|
||||
```
|
||||
|
||||
Token 刷新失败且必须重新扫码授权时,可使用 `errors.Is` 稳定判断,同时仍可通过 `errors.As` 获取 `LoginError` 详情:
|
||||
|
||||
```go
|
||||
if errors.Is(err, mijia.ErrReauthenticationRequired) {
|
||||
log.Print("认证已失效,请重新扫码授权")
|
||||
}
|
||||
```
|
||||
|
||||
写属性和执行 action 时,对应错误类型为 `DeviceSetError` 和 `DeviceActionError`;设备选择还可能返回 `DeviceNotFoundError` 或 `MultipleDevicesFoundError`。
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"os"
|
||||
@@ -251,6 +252,25 @@ type longPollData struct {
|
||||
|
||||
type stringOrNumber string
|
||||
|
||||
type recordingWriter struct {
|
||||
w io.Writer
|
||||
err error
|
||||
}
|
||||
|
||||
func (writer *recordingWriter) Write(payload []byte) (int, error) {
|
||||
if writer.err != nil {
|
||||
return 0, writer.err
|
||||
}
|
||||
written, err := writer.w.Write(payload)
|
||||
if err == nil && written < len(payload) {
|
||||
err = io.ErrShortWrite
|
||||
}
|
||||
if err != nil {
|
||||
writer.err = err
|
||||
}
|
||||
return written, err
|
||||
}
|
||||
|
||||
func (value *stringOrNumber) UnmarshalJSON(payload []byte) error {
|
||||
decoded, err := decodeStringOrNumber(payload)
|
||||
if err != nil {
|
||||
@@ -282,10 +302,18 @@ func (client *Client) Login(ctx context.Context) (AuthData, error) {
|
||||
if _, err := qr.Encode(loginData.LoginURL, qr.L); err != nil {
|
||||
return AuthData{}, fmt.Errorf("encode login QR code: %w", err)
|
||||
}
|
||||
fmt.Fprintf(client.qrWriter, "请使用米家APP扫描下方二维码\n%s\n", loginData.LoginURL)
|
||||
qrterminal.GenerateHalfBlock(loginData.LoginURL, qrterminal.L, client.qrWriter)
|
||||
writer := &recordingWriter{w: client.qrWriter}
|
||||
if _, err := fmt.Fprintf(writer, "请使用米家APP扫描下方二维码\n%s\n", loginData.LoginURL); err != nil {
|
||||
return AuthData{}, fmt.Errorf("write QR login output: %w", err)
|
||||
}
|
||||
qrterminal.GenerateHalfBlock(loginData.LoginURL, qrterminal.L, writer)
|
||||
if writer.err != nil {
|
||||
return AuthData{}, fmt.Errorf("write QR login output: %w", writer.err)
|
||||
}
|
||||
if loginData.QR != "" {
|
||||
fmt.Fprintf(client.qrWriter, "二维码图片: %s\n", loginData.QR)
|
||||
if _, err := fmt.Fprintf(writer, "二维码图片: %s\n", loginData.QR); err != nil {
|
||||
return AuthData{}, fmt.Errorf("write QR login output: %w", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
return client.completeQRLogin(ctx, loginData)
|
||||
@@ -329,18 +357,22 @@ func (client *Client) getLocation(ctx context.Context) (url.Values, bool, error)
|
||||
if readErr != nil {
|
||||
return nil, false, fmt.Errorf("read token refresh response: %w", readErr)
|
||||
}
|
||||
if response.StatusCode == http.StatusOK && string(body) == "ok" {
|
||||
if response.StatusCode != http.StatusOK {
|
||||
return nil, false, &LoginError{Code: response.StatusCode, Message: string(body)}
|
||||
}
|
||||
if string(body) != "ok" {
|
||||
return nil, false, &LoginError{Code: -1, Message: string(body)}
|
||||
}
|
||||
candidate := client.AuthData()
|
||||
serviceTokenReceived := updateAuthDataFromCookies(&candidate, httpClient, response.Request.URL)
|
||||
candidate.Ssecurity = data.Ssecurity
|
||||
if !serviceTokenReceived || !candidate.complete() {
|
||||
return nil, false, &LoginError{Code: -1, Message: "刷新Token响应认证信息不完整"}
|
||||
return nil, false, fmt.Errorf("%w: %w", ErrReauthenticationRequired, &LoginError{Code: -1, Message: "刷新Token响应认证信息不完整"})
|
||||
}
|
||||
candidate.ExpireTime = time.Now().Add(30 * 24 * time.Hour).UnixMilli()
|
||||
client.setAuthData(candidate)
|
||||
return nil, true, nil
|
||||
}
|
||||
}
|
||||
locationURL, err := url.Parse(data.Location)
|
||||
if err != nil {
|
||||
return nil, false, fmt.Errorf("parse login location: %w", err)
|
||||
@@ -522,7 +554,7 @@ func (client *Client) refreshToken(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
if !refreshed {
|
||||
return &LoginError{Code: -1, Message: "刷新Token失败,请重新登录"}
|
||||
return fmt.Errorf("%w: %w", ErrReauthenticationRequired, &LoginError{Code: -1, Message: "刷新Token失败,请重新登录"})
|
||||
}
|
||||
if err := client.saveAuthData(); err != nil {
|
||||
return err
|
||||
|
||||
+254
@@ -12,10 +12,83 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mdp/qrterminal/v3"
|
||||
)
|
||||
|
||||
var errQRWriterFailed = errors.New("QR writer failed")
|
||||
|
||||
type failThenBlockWriter struct {
|
||||
calls atomic.Int32
|
||||
failOnCall int32
|
||||
blockWrites chan struct{}
|
||||
}
|
||||
|
||||
type shortWriter struct {
|
||||
calls atomic.Int32
|
||||
}
|
||||
|
||||
func (writer *shortWriter) Write(payload []byte) (int, error) {
|
||||
writer.calls.Add(1)
|
||||
return len(payload) - 1, nil
|
||||
}
|
||||
|
||||
func (writer *failThenBlockWriter) Write(payload []byte) (int, error) {
|
||||
call := writer.calls.Add(1)
|
||||
if call == writer.failOnCall {
|
||||
return 0, errQRWriterFailed
|
||||
}
|
||||
if call > writer.failOnCall {
|
||||
<-writer.blockWrites
|
||||
}
|
||||
return len(payload), nil
|
||||
}
|
||||
|
||||
func TestRecordingWriterStopsAfterFirstError(t *testing.T) {
|
||||
underlying := &failThenBlockWriter{failOnCall: 1, blockWrites: make(chan struct{})}
|
||||
writer := &recordingWriter{w: underlying}
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
qrterminal.GenerateHalfBlock("https://qr.example/login", qrterminal.L, writer)
|
||||
close(done)
|
||||
}()
|
||||
|
||||
select {
|
||||
case <-done:
|
||||
case <-time.After(time.Second):
|
||||
close(underlying.blockWrites)
|
||||
<-done
|
||||
t.Fatal("GenerateHalfBlock blocked after the first write failure")
|
||||
}
|
||||
if calls := underlying.calls.Load(); calls != 1 {
|
||||
t.Fatalf("underlying Write calls = %d, want 1", calls)
|
||||
}
|
||||
if !errors.Is(writer.err, errQRWriterFailed) {
|
||||
t.Fatalf("recorded error = %v, want %v", writer.err, errQRWriterFailed)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordingWriterRecordsShortWriteAndStops(t *testing.T) {
|
||||
underlying := &shortWriter{}
|
||||
writer := &recordingWriter{w: underlying}
|
||||
payload := []byte("payload")
|
||||
|
||||
written, err := writer.Write(payload)
|
||||
if written != len(payload)-1 || !errors.Is(err, io.ErrShortWrite) {
|
||||
t.Fatalf("first Write() = %d, %v, want %d, %v", written, err, len(payload)-1, io.ErrShortWrite)
|
||||
}
|
||||
written, err = writer.Write(payload)
|
||||
if written != 0 || !errors.Is(err, io.ErrShortWrite) {
|
||||
t.Fatalf("second Write() = %d, %v, want 0, %v", written, err, io.ErrShortWrite)
|
||||
}
|
||||
if calls := underlying.calls.Load(); calls != 1 {
|
||||
t.Fatalf("underlying Write calls = %d, want 1", calls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseServiceResponse(t *testing.T) {
|
||||
var result struct {
|
||||
Code int `json:"code"`
|
||||
@@ -128,6 +201,9 @@ func TestRefreshRejectsMissingNewServiceTokenWithoutSaving(t *testing.T) {
|
||||
}
|
||||
|
||||
err = client.refreshToken(context.Background())
|
||||
if !errors.Is(err, ErrReauthenticationRequired) {
|
||||
t.Fatalf("refreshToken() error = %v, want ErrReauthenticationRequired", err)
|
||||
}
|
||||
var loginErr *LoginError
|
||||
if !errors.As(err, &loginErr) {
|
||||
t.Fatalf("refreshToken() error = %v, want LoginError", err)
|
||||
@@ -144,6 +220,104 @@ func TestRefreshRejectsMissingNewServiceTokenWithoutSaving(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestRefreshWithoutNewTokenRequiresReauthentication(t *testing.T) {
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
switch request.URL.Path {
|
||||
case "/v2/message/v2/check_new_msg":
|
||||
_, _ = io.WriteString(writer, `{"code":-10030,"message":"expired"}`)
|
||||
case "/serviceLogin":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":70016,"location":"`+server.URL+`/qr"}`)
|
||||
default:
|
||||
http.NotFound(writer, request)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client := testClient(t, server.Client())
|
||||
client.baseURL = server.URL
|
||||
client.serviceLoginURL = server.URL + "/serviceLogin"
|
||||
client.availabilityValid = false
|
||||
|
||||
err := client.refreshToken(context.Background())
|
||||
if !errors.Is(err, ErrReauthenticationRequired) {
|
||||
t.Fatalf("refreshToken() error = %v, want ErrReauthenticationRequired", err)
|
||||
}
|
||||
var loginErr *LoginError
|
||||
if !errors.As(err, &loginErr) {
|
||||
t.Fatalf("refreshToken() error = %v, want LoginError", err)
|
||||
}
|
||||
if loginErr.Code != -1 || loginErr.Message != "刷新Token失败,请重新登录" {
|
||||
t.Fatalf("LoginError = %#v", loginErr)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRefreshCallbackFailuresDoNotRequireReauthentication(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
statusCode int
|
||||
body string
|
||||
wantCode int
|
||||
}{
|
||||
{name: "server error", statusCode: http.StatusServiceUnavailable, body: "temporarily unavailable", wantCode: http.StatusServiceUnavailable},
|
||||
{name: "unexpected body", statusCode: http.StatusOK, body: "pending", wantCode: -1},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
switch request.URL.Path {
|
||||
case "/v2/message/v2/check_new_msg":
|
||||
_, _ = io.WriteString(writer, `{"code":-10030,"message":"expired"}`)
|
||||
case "/serviceLogin":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":0,"location":"`+server.URL+`/refresh","ssecurity":"`+testSsecurity+`"}`)
|
||||
case "/refresh":
|
||||
writer.WriteHeader(test.statusCode)
|
||||
_, _ = io.WriteString(writer, test.body)
|
||||
default:
|
||||
http.NotFound(writer, request)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client := testClient(t, server.Client())
|
||||
client.baseURL = server.URL
|
||||
client.serviceLoginURL = server.URL + "/serviceLogin"
|
||||
client.availabilityValid = false
|
||||
|
||||
err := client.refreshToken(context.Background())
|
||||
if errors.Is(err, ErrReauthenticationRequired) {
|
||||
t.Fatalf("refreshToken() error = %v, do not want ErrReauthenticationRequired", err)
|
||||
}
|
||||
var loginErr *LoginError
|
||||
if !errors.As(err, &loginErr) {
|
||||
t.Fatalf("refreshToken() error = %v, want LoginError", err)
|
||||
}
|
||||
if loginErr.Code != test.wantCode || !strings.Contains(loginErr.Message, test.body) {
|
||||
t.Fatalf("LoginError = %#v, want code %d containing %q", loginErr, test.wantCode, test.body)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestQRLoginTimeoutDoesNotRequireReauthentication(t *testing.T) {
|
||||
ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(-time.Second))
|
||||
defer cancel()
|
||||
|
||||
client := testClient(t, http.DefaultClient)
|
||||
_, err := client.completeQRLogin(ctx, qrLoginData{LP: "https://example.invalid/long-poll"})
|
||||
var loginErr *LoginError
|
||||
if !errors.As(err, &loginErr) {
|
||||
t.Fatalf("completeQRLogin() error = %v, want LoginError", err)
|
||||
}
|
||||
if loginErr.Code != -1 {
|
||||
t.Fatalf("LoginError.Code = %d, want -1", loginErr.Code)
|
||||
}
|
||||
if errors.Is(err, ErrReauthenticationRequired) {
|
||||
t.Fatalf("completeQRLogin() error = %v, do not want ErrReauthenticationRequired", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAuthDataReturnsDeepCopy(t *testing.T) {
|
||||
client := testClient(t, http.DefaultClient)
|
||||
client.updateAuthData(func(authData *AuthData) { authData.Extra = map[string]string{"cookie": "original"} })
|
||||
@@ -244,6 +418,86 @@ func TestLoginQRCoreFlow(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoginReturnsQROutputErrorBeforeLongPoll(t *testing.T) {
|
||||
var longPollRequests atomic.Int32
|
||||
qrWriter := &failThenBlockWriter{failOnCall: 2, blockWrites: make(chan struct{})}
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
switch request.URL.Path {
|
||||
case "/serviceLogin":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":70016,"location":"`+server.URL+`/prepare"}`)
|
||||
case "/loginUrl":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":0,"loginUrl":"https://qr.example/login","qr":"https://qr.example/image","lp":"`+server.URL+`/lp"}`)
|
||||
case "/lp":
|
||||
longPollRequests.Add(1)
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":70016}`)
|
||||
default:
|
||||
http.NotFound(writer, request)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(t.TempDir(), WithHTTPClient(server.Client()), WithQRWriter(qrWriter))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client.serviceLoginURL = server.URL + "/serviceLogin"
|
||||
client.loginURL = server.URL + "/loginUrl"
|
||||
|
||||
done := make(chan error, 1)
|
||||
go func() {
|
||||
_, loginErr := client.Login(context.Background())
|
||||
done <- loginErr
|
||||
}()
|
||||
select {
|
||||
case err = <-done:
|
||||
case <-time.After(time.Second):
|
||||
close(qrWriter.blockWrites)
|
||||
<-done
|
||||
t.Fatal("Login() blocked after QR output failed")
|
||||
}
|
||||
if !errors.Is(err, errQRWriterFailed) {
|
||||
t.Fatalf("Login() error = %v, want %v", err, errQRWriterFailed)
|
||||
}
|
||||
if requests := longPollRequests.Load(); requests != 0 {
|
||||
t.Fatalf("long-poll requests = %d, want 0", requests)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoginReturnsShortQROutputErrorBeforeLongPoll(t *testing.T) {
|
||||
var longPollRequests atomic.Int32
|
||||
qrWriter := &shortWriter{}
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
switch request.URL.Path {
|
||||
case "/serviceLogin":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":70016,"location":"`+server.URL+`/prepare"}`)
|
||||
case "/loginUrl":
|
||||
_, _ = io.WriteString(writer, `&&&START&&&{"code":0,"loginUrl":"https://qr.example/login","lp":"`+server.URL+`/lp"}`)
|
||||
case "/lp":
|
||||
longPollRequests.Add(1)
|
||||
default:
|
||||
http.NotFound(writer, request)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client, err := NewClient(t.TempDir(), WithHTTPClient(server.Client()), WithQRWriter(qrWriter))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client.serviceLoginURL = server.URL + "/serviceLogin"
|
||||
client.loginURL = server.URL + "/loginUrl"
|
||||
|
||||
_, err = client.Login(context.Background())
|
||||
if !errors.Is(err, io.ErrShortWrite) {
|
||||
t.Fatalf("Login() error = %v, want %v", err, io.ErrShortWrite)
|
||||
}
|
||||
if requests := longPollRequests.Load(); requests != 0 {
|
||||
t.Fatalf("long-poll requests = %d, want 0", requests)
|
||||
}
|
||||
}
|
||||
|
||||
func TestQRLoginRejectsIncompleteCallbackWithoutSaving(t *testing.T) {
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
|
||||
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
"net/url"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
@@ -36,6 +37,25 @@ func WithHTTPClient(httpClient *http.Client) Option {
|
||||
}
|
||||
}
|
||||
|
||||
// WithQRWriter configures where QR login output is written.
|
||||
func WithQRWriter(writer io.Writer) Option {
|
||||
return func(client *Client) error {
|
||||
isNil := writer == nil
|
||||
if !isNil {
|
||||
value := reflect.ValueOf(writer)
|
||||
switch value.Kind() {
|
||||
case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice, reflect.UnsafePointer:
|
||||
isNil = value.IsNil()
|
||||
}
|
||||
}
|
||||
if isNil {
|
||||
return fmt.Errorf("QR writer must not be nil")
|
||||
}
|
||||
client.qrWriter = writer
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
authPath string
|
||||
authMu sync.RWMutex
|
||||
@@ -181,6 +201,10 @@ func (client *Client) request(ctx context.Context, uri string, data any, refresh
|
||||
return nil, fmt.Errorf("read API response: %w", err)
|
||||
}
|
||||
if response.StatusCode < 200 || response.StatusCode >= 300 {
|
||||
if response.StatusCode == http.StatusUnauthorized || response.StatusCode == http.StatusForbidden {
|
||||
loginErr := &LoginError{Code: response.StatusCode, Message: strings.TrimSpace(string(body))}
|
||||
return nil, fmt.Errorf("API HTTP status from %s: %w: %w", uri, ErrReauthenticationRequired, loginErr)
|
||||
}
|
||||
return nil, fmt.Errorf("API HTTP status %d: %s", response.StatusCode, strings.TrimSpace(string(body)))
|
||||
}
|
||||
result, err := decodeAPIResponse(authData.Ssecurity, nonce, body)
|
||||
@@ -214,7 +238,11 @@ func decodeAPIResponse(ssecurity, nonce string, body []byte) (json.RawMessage, e
|
||||
if message == "" {
|
||||
message = "未知错误"
|
||||
}
|
||||
return nil, &APIError{Code: envelope.Code, Message: message}
|
||||
apiErr := &APIError{Code: envelope.Code, Message: message}
|
||||
if envelope.Code == -10020 || envelope.Code == -10030 {
|
||||
return nil, fmt.Errorf("%w: %w", ErrReauthenticationRequired, apiErr)
|
||||
}
|
||||
return nil, apiErr
|
||||
}
|
||||
return envelope.Result, nil
|
||||
}
|
||||
|
||||
@@ -12,12 +12,61 @@ import (
|
||||
"net/http/cookiejar"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestWithQRWriter(t *testing.T) {
|
||||
var output bytes.Buffer
|
||||
client, err := NewClient(t.TempDir(), WithQRWriter(&output))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if client.qrWriter != &output {
|
||||
t.Fatalf("qrWriter = %v, want custom writer", client.qrWriter)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithQRWriterRejectsNil(t *testing.T) {
|
||||
_, err := NewClient(t.TempDir(), WithQRWriter(nil))
|
||||
if err == nil || err.Error() != "QR writer must not be nil" {
|
||||
t.Fatalf("error = %v, want QR writer must not be nil", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithQRWriterRejectsTypedNil(t *testing.T) {
|
||||
var output *bytes.Buffer
|
||||
_, err := NewClient(t.TempDir(), WithQRWriter(output))
|
||||
if err == nil || err.Error() != "QR writer must not be nil" {
|
||||
t.Fatalf("error = %v, want QR writer must not be nil", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestWithQRWriterAcceptsStructWriter(t *testing.T) {
|
||||
if _, err := NewClient(t.TempDir(), WithQRWriter(structWriter{})); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
type structWriter struct{}
|
||||
|
||||
func (structWriter) Write(data []byte) (int, error) {
|
||||
return len(data), nil
|
||||
}
|
||||
|
||||
func TestDefaultQRWriterIsStdout(t *testing.T) {
|
||||
client, err := NewClient(t.TempDir())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if client.qrWriter != os.Stdout {
|
||||
t.Fatalf("qrWriter = %v, want os.Stdout", client.qrWriter)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRequestEncryptedPostAndPlainResponse(t *testing.T) {
|
||||
var received url.Values
|
||||
handlerErrors := make(chan error, 1)
|
||||
@@ -182,6 +231,54 @@ func TestRequestRejectsHTTPStatus(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestBusinessRequestClassifiesReauthenticationFailures(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
status int
|
||||
body string
|
||||
wantSentinel bool
|
||||
wantCode int
|
||||
wantLogin bool
|
||||
}{
|
||||
{name: "HTTP 401", status: http.StatusUnauthorized, body: "expired", wantSentinel: true, wantCode: http.StatusUnauthorized, wantLogin: true},
|
||||
{name: "HTTP 403", status: http.StatusForbidden, body: "forbidden", wantSentinel: true, wantCode: http.StatusForbidden, wantLogin: true},
|
||||
{name: "API -10020", body: `{"code":-10020,"message":"oauth expired"}`, wantSentinel: true, wantCode: -10020},
|
||||
{name: "API -10030", body: `{"code":-10030,"message":"token expired"}`, wantSentinel: true, wantCode: -10030},
|
||||
{name: "HTTP 500", status: http.StatusInternalServerError, body: "failed", wantCode: http.StatusInternalServerError},
|
||||
}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) {
|
||||
if test.status != 0 {
|
||||
writer.WriteHeader(test.status)
|
||||
}
|
||||
_, _ = io.WriteString(writer, test.body)
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
client := testClient(t, server.Client())
|
||||
client.baseURL = server.URL
|
||||
_, err := client.request(context.Background(), "/business", nil, true)
|
||||
if errors.Is(err, ErrReauthenticationRequired) != test.wantSentinel {
|
||||
t.Fatalf("error = %v, ErrReauthenticationRequired = %v", err, errors.Is(err, ErrReauthenticationRequired))
|
||||
}
|
||||
if test.wantLogin {
|
||||
var loginErr *LoginError
|
||||
if !errors.As(err, &loginErr) || loginErr.Code != test.wantCode {
|
||||
t.Fatalf("error = %v, want LoginError code %d", err, test.wantCode)
|
||||
}
|
||||
return
|
||||
}
|
||||
if test.status == 0 {
|
||||
var apiErr *APIError
|
||||
if !errors.As(err, &apiErr) || apiErr.Code != test.wantCode {
|
||||
t.Fatalf("error = %v, want APIError code %d", err, test.wantCode)
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestRequestRejectsOversizedRawResponse(t *testing.T) {
|
||||
server := httptest.NewServer(http.HandlerFunc(func(writer http.ResponseWriter, _ *http.Request) {
|
||||
_, _ = writer.Write(bytes.Repeat([]byte{'x'}, maxHTTPResponseBytes+1))
|
||||
|
||||
@@ -21,6 +21,7 @@ import (
|
||||
const (
|
||||
deviceSpecUA = "mijiaAPI/4.1.2"
|
||||
deviceSpecMaxSize = 8 << 20
|
||||
deviceCacheVersion = 2
|
||||
)
|
||||
|
||||
var deviceSpecURL = "https://home.miot-spec.com/spec/"
|
||||
@@ -54,6 +55,7 @@ type ActionSpec struct {
|
||||
Description string `json:"description"`
|
||||
SIID int `json:"siid"`
|
||||
AIID int `json:"aiid"`
|
||||
Inputs []PropertySpec `json:"inputs,omitempty"`
|
||||
}
|
||||
|
||||
type DeviceSelector struct {
|
||||
@@ -160,7 +162,7 @@ func fetchDeviceInfo(ctx context.Context, httpClient *http.Client, model string)
|
||||
if err != nil {
|
||||
return DeviceInfo{}, fmt.Errorf("%w: %w", &GetDeviceInfoError{DeviceModel: model}, err)
|
||||
}
|
||||
if err := validateDeviceInfo(info, model); err != nil {
|
||||
if err := validateDeviceInfo(&info, model); err != nil {
|
||||
return DeviceInfo{}, fmt.Errorf("%w: %w", &GetDeviceInfoError{DeviceModel: model}, err)
|
||||
}
|
||||
return info, nil
|
||||
@@ -230,6 +232,7 @@ func parseDeviceInfoHTML(body []byte) (DeviceInfo, error) {
|
||||
IID int `json:"iid"`
|
||||
Type string `json:"type"`
|
||||
Description string `json:"description"`
|
||||
Inputs []int `json:"in"`
|
||||
} `json:"actions"`
|
||||
} `json:"services"`
|
||||
} `json:"tree"`
|
||||
@@ -245,6 +248,7 @@ func parseDeviceInfoHTML(body []byte) (DeviceInfo, error) {
|
||||
propertyNames := make(map[string]struct{})
|
||||
actionNames := make(map[string]struct{})
|
||||
for _, service := range page.Props.Tree.Services {
|
||||
serviceProperties := make(map[int]PropertySpec, len(service.Properties))
|
||||
for _, property := range service.Properties {
|
||||
propertyType := property.Format
|
||||
if strings.HasPrefix(propertyType, "int") {
|
||||
@@ -265,7 +269,9 @@ func parseDeviceInfoHTML(body []byte) (DeviceInfo, error) {
|
||||
for index, item := range property.ValueList {
|
||||
valueList[index] = ValueListItem{Value: item.Value, Description: item.Description, DescZhCN: page.Props.I18n.ZhCN[item.I18nKey]}
|
||||
}
|
||||
info.Properties = append(info.Properties, PropertySpec{Name: name, Description: description, Type: propertyType, RW: accessString(property.Access), Range: property.ValueRange, ValueList: valueList, SIID: service.IID, PIID: property.IID})
|
||||
propertySpec := PropertySpec{Name: name, Description: description, Type: propertyType, RW: accessString(property.Access), Range: property.ValueRange, ValueList: valueList, SIID: service.IID, PIID: property.IID}
|
||||
serviceProperties[property.IID] = propertySpec
|
||||
info.Properties = append(info.Properties, propertySpec)
|
||||
}
|
||||
for _, action := range service.Actions {
|
||||
name := action.Type
|
||||
@@ -274,7 +280,15 @@ func parseDeviceInfoHTML(body []byte) (DeviceInfo, error) {
|
||||
}
|
||||
actionNames[name] = struct{}{}
|
||||
description := localizedDescription(action.Description, page.Props.I18n.ZhCN[fmt.Sprintf("service:%03d:action:%03d", service.IID, action.IID)])
|
||||
info.Actions = append(info.Actions, ActionSpec{Name: name, Description: description, SIID: service.IID, AIID: action.IID})
|
||||
inputs := make([]PropertySpec, len(action.Inputs))
|
||||
for index, propertyIID := range action.Inputs {
|
||||
propertySpec, ok := serviceProperties[propertyIID]
|
||||
if !ok {
|
||||
return DeviceInfo{}, fmt.Errorf("action %q references unknown property IID %d", name, propertyIID)
|
||||
}
|
||||
inputs[index] = clonePropertySpec(propertySpec)
|
||||
}
|
||||
info.Actions = append(info.Actions, ActionSpec{Name: name, Description: description, SIID: service.IID, AIID: action.IID, Inputs: inputs})
|
||||
}
|
||||
}
|
||||
return info, nil
|
||||
@@ -431,7 +445,7 @@ func writeDeviceInfoCache(path string, info DeviceInfo) error {
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
|
||||
return fmt.Errorf("create device info cache directory: %w", err)
|
||||
}
|
||||
cache := deviceInfoCache{Name: info.Name, Model: info.Model}
|
||||
cache := deviceInfoCache{Version: deviceCacheVersion, Name: info.Name, Model: info.Model}
|
||||
for _, property := range info.Properties {
|
||||
cache.Properties = append(cache.Properties, propertyCache{
|
||||
PropertySpec: property,
|
||||
@@ -492,6 +506,7 @@ type actionCache struct {
|
||||
}
|
||||
|
||||
type deviceInfoCache struct {
|
||||
Version int `json:"version"`
|
||||
Name string `json:"name"`
|
||||
Model string `json:"model"`
|
||||
Properties []propertyCache `json:"properties"`
|
||||
@@ -511,6 +526,12 @@ func decodeDeviceInfo(data []byte, model string) (DeviceInfo, error) {
|
||||
}
|
||||
return DeviceInfo{}, fmt.Errorf("trailing content: %w", err)
|
||||
}
|
||||
if cache.Version < deviceCacheVersion {
|
||||
return DeviceInfo{}, fmt.Errorf("device info cache stale: version %d, want %d", cache.Version, deviceCacheVersion)
|
||||
}
|
||||
if cache.Version != deviceCacheVersion {
|
||||
return DeviceInfo{}, fmt.Errorf("unsupported device info cache version %d", cache.Version)
|
||||
}
|
||||
|
||||
info := DeviceInfo{Name: cache.Name, Model: cache.Model}
|
||||
for _, cachedProperty := range cache.Properties {
|
||||
@@ -533,26 +554,42 @@ func decodeDeviceInfo(data []byte, model string) (DeviceInfo, error) {
|
||||
}
|
||||
info.Actions = append(info.Actions, action)
|
||||
}
|
||||
if err := validateDeviceInfo(info, model); err != nil {
|
||||
if err := validateDeviceInfo(&info, model); err != nil {
|
||||
return DeviceInfo{}, err
|
||||
}
|
||||
return info, nil
|
||||
}
|
||||
|
||||
func validateDeviceInfo(info DeviceInfo, model string) error {
|
||||
func validateDeviceInfo(info *DeviceInfo, model string) error {
|
||||
if info.Model == "" || info.Model != model {
|
||||
return fmt.Errorf("model %q does not match requested model %q", info.Model, model)
|
||||
}
|
||||
type propertyID struct {
|
||||
siid int
|
||||
piid int
|
||||
}
|
||||
properties := make(map[propertyID]PropertySpec, len(info.Properties))
|
||||
for index, property := range info.Properties {
|
||||
if strings.TrimSpace(property.Name) == "" || !validPropertyType(property.Type) ||
|
||||
(property.RW != "r" && property.RW != "w" && property.RW != "rw") || property.SIID <= 0 || property.PIID <= 0 {
|
||||
return fmt.Errorf("property %d is invalid", index)
|
||||
}
|
||||
properties[propertyID{siid: property.SIID, piid: property.PIID}] = property
|
||||
}
|
||||
for index, action := range info.Actions {
|
||||
if strings.TrimSpace(action.Name) == "" || action.SIID <= 0 || action.AIID <= 0 {
|
||||
return fmt.Errorf("action %d is invalid", index)
|
||||
}
|
||||
for inputIndex, input := range action.Inputs {
|
||||
if !validPropertyType(input.Type) || input.SIID <= 0 || input.PIID <= 0 || input.SIID != action.SIID {
|
||||
return fmt.Errorf("action %d input %d is invalid", index, inputIndex)
|
||||
}
|
||||
property, exists := properties[propertyID{siid: input.SIID, piid: input.PIID}]
|
||||
if !exists {
|
||||
return fmt.Errorf("action %d input %d does not reference a property", index, inputIndex)
|
||||
}
|
||||
info.Actions[index].Inputs[inputIndex] = property
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@@ -620,9 +657,7 @@ func NewDevice(ctx context.Context, client *Client, selector DeviceSelector, opt
|
||||
func (device *Device) Properties() map[string]PropertySpec {
|
||||
properties := make(map[string]PropertySpec, len(device.properties))
|
||||
for name, property := range device.properties {
|
||||
property.Range = append([]json.Number(nil), property.Range...)
|
||||
property.ValueList = append([]ValueListItem(nil), property.ValueList...)
|
||||
properties[name] = property
|
||||
properties[name] = clonePropertySpec(property)
|
||||
}
|
||||
return properties
|
||||
}
|
||||
@@ -630,11 +665,22 @@ func (device *Device) Properties() map[string]PropertySpec {
|
||||
func (device *Device) Actions() map[string]ActionSpec {
|
||||
actions := make(map[string]ActionSpec, len(device.actions))
|
||||
for name, action := range device.actions {
|
||||
inputs := make([]PropertySpec, len(action.Inputs))
|
||||
for index, input := range action.Inputs {
|
||||
inputs[index] = clonePropertySpec(input)
|
||||
}
|
||||
action.Inputs = inputs
|
||||
actions[name] = action
|
||||
}
|
||||
return actions
|
||||
}
|
||||
|
||||
func clonePropertySpec(property PropertySpec) PropertySpec {
|
||||
property.Range = append([]json.Number(nil), property.Range...)
|
||||
property.ValueList = append([]ValueListItem(nil), property.ValueList...)
|
||||
return property
|
||||
}
|
||||
|
||||
func (device *Device) Get(ctx context.Context, name string) (any, error) {
|
||||
property, ok := device.properties[name]
|
||||
if !ok {
|
||||
|
||||
+126
-7
@@ -1,6 +1,7 @@
|
||||
package mijia
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
@@ -10,6 +11,7 @@ import (
|
||||
"net/http/httptest"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
@@ -123,6 +125,9 @@ func TestGetDeviceInfoParsesSpecAndCaches(t *testing.T) {
|
||||
if info.Properties[7].Name != "outlet-power" || info.Actions[1].Name != "outlet-toggle" {
|
||||
t.Fatalf("duplicates = %#v / %#v", info.Properties[7], info.Actions[1])
|
||||
}
|
||||
if got := info.Actions[0].Inputs; len(got) != 2 || got[0].PIID != 3 || got[1].PIID != 1 || got[0].Description != "Mode / 模式" || got[0].Type != "uint" || len(got[0].ValueList) != 2 {
|
||||
t.Fatalf("action inputs = %#v", got)
|
||||
}
|
||||
if testServer.specCalls != 1 || testServer.specPaths[0] != "/spec/test.light.v1" {
|
||||
t.Fatalf("spec requests = %v, want GET /spec/test.light.v1", testServer.specPaths)
|
||||
}
|
||||
@@ -136,6 +141,7 @@ func TestGetDeviceInfoParsesSpecAndCaches(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var pythonCache struct {
|
||||
Version int `json:"version"`
|
||||
Properties []struct {
|
||||
Method cacheMethod `json:"method"`
|
||||
} `json:"properties"`
|
||||
@@ -143,7 +149,7 @@ func TestGetDeviceInfoParsesSpecAndCaches(t *testing.T) {
|
||||
Method cacheMethod `json:"method"`
|
||||
} `json:"actions"`
|
||||
}
|
||||
if err := json.Unmarshal(cacheData, &pythonCache); err != nil || pythonCache.Properties[0].Method.SIID != 2 || pythonCache.Properties[0].Method.PIID != 1 || pythonCache.Actions[0].Method.SIID != 2 || pythonCache.Actions[0].Method.AIID != 1 {
|
||||
if err := json.Unmarshal(cacheData, &pythonCache); err != nil || pythonCache.Version != 2 || pythonCache.Properties[0].Method.SIID != 2 || pythonCache.Properties[0].Method.PIID != 1 || pythonCache.Actions[0].Method.SIID != 2 || pythonCache.Actions[0].Method.AIID != 1 {
|
||||
t.Fatalf("Python-compatible cache = %#v, %v", pythonCache, err)
|
||||
}
|
||||
testServer.fixture = nil
|
||||
@@ -151,6 +157,27 @@ func TestGetDeviceInfoParsesSpecAndCaches(t *testing.T) {
|
||||
if err != nil || cached.Name != info.Name || testServer.specCalls != 1 {
|
||||
t.Fatalf("cached = %#v, %v, calls=%d", cached, err, testServer.specCalls)
|
||||
}
|
||||
if len(cached.Actions[0].Inputs) != 2 || cached.Actions[0].Inputs[0].PIID != 3 || cached.Actions[0].Inputs[1].PIID != 1 {
|
||||
t.Fatalf("cached action inputs = %#v", cached.Actions[0].Inputs)
|
||||
}
|
||||
}
|
||||
|
||||
func TestParseDeviceInfoRejectsUnknownActionInput(t *testing.T) {
|
||||
fixture := bytes.Replace(loadSpecFixture(t), []byte(`"in":[3,1]`), []byte(`"in":[99]`), 1)
|
||||
if _, err := parseDeviceInfoHTML(fixture); err == nil || !strings.Contains(err.Error(), "unknown property IID 99") {
|
||||
t.Fatalf("parse error = %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDeviceActionsDeepCopyInputs(t *testing.T) {
|
||||
device := Device{actions: map[string]ActionSpec{"toggle": {Inputs: []PropertySpec{{Range: []json.Number{"1", "2"}, ValueList: []ValueListItem{{Value: "1"}}}}}}}
|
||||
actions := device.Actions()
|
||||
actions["toggle"].Inputs[0].Range[0] = "changed"
|
||||
actions["toggle"].Inputs[0].ValueList[0].Value = "changed"
|
||||
got := device.actions["toggle"].Inputs[0]
|
||||
if got.Range[0] != "1" || got.ValueList[0].Value != "1" {
|
||||
t.Fatalf("internal action input mutated: %#v", got)
|
||||
}
|
||||
}
|
||||
|
||||
func TestPythonDeviceInfoCacheSupportsOperations(t *testing.T) {
|
||||
@@ -160,7 +187,7 @@ func TestPythonDeviceInfoCacheSupportsOperations(t *testing.T) {
|
||||
"properties": [{"name":"power","description":"Power","type":"bool","rw":"rw","method":{"siid":7,"piid":8}}],
|
||||
"actions": [{"name":"toggle","description":"Toggle","method":{"siid":9,"aiid":10}}]
|
||||
}`
|
||||
testServer := newDeviceTestServer(t, nil, []string{
|
||||
testServer := newDeviceTestServer(t, loadSpecFixture(t), []string{
|
||||
`{"homelist":[{"id":"10","uid":1}]}`,
|
||||
`{"device_info":[{"did":"a","name":"Lamp","model":"test.light.v1"}],"has_more":false}`,
|
||||
`[{"did":"a","siid":7,"piid":8,"value":true,"code":0}]`,
|
||||
@@ -187,9 +214,9 @@ func TestPythonDeviceInfoCacheSupportsOperations(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
for index, want := range []map[string]any{
|
||||
{"siid": float64(7), "piid": float64(8)},
|
||||
{"siid": float64(7), "piid": float64(8)},
|
||||
{"siid": float64(9), "aiid": float64(10)},
|
||||
{"siid": float64(2), "piid": float64(1)},
|
||||
{"siid": float64(2), "piid": float64(1)},
|
||||
{"siid": float64(2), "aiid": float64(1)},
|
||||
} {
|
||||
params := testServer.requests[index+2]["params"]
|
||||
var request map[string]any
|
||||
@@ -204,8 +231,68 @@ func TestPythonDeviceInfoCacheSupportsOperations(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if testServer.specCalls != 0 {
|
||||
t.Fatalf("spec calls = %d, want 0", testServer.specCalls)
|
||||
if testServer.specCalls != 1 {
|
||||
t.Fatalf("spec calls = %d, want 1", testServer.specCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestOldDeviceInfoCacheRefreshesActionInputs(t *testing.T) {
|
||||
for _, version := range []int{0, 1} {
|
||||
t.Run(fmt.Sprintf("version %d", version), func(t *testing.T) {
|
||||
testServer := newDeviceTestServer(t, loadSpecFixture(t), nil)
|
||||
cacheDir := t.TempDir()
|
||||
cache := fmt.Sprintf(`{
|
||||
"version":%d,
|
||||
"name":"Old Lamp",
|
||||
"model":"test.light.v1",
|
||||
"properties":[{"name":"power","type":"bool","rw":"rw","siid":2,"piid":1}],
|
||||
"actions":[{"name":"toggle","siid":2,"aiid":1}]
|
||||
}`, version)
|
||||
if err := os.WriteFile(filepath.Join(cacheDir, "test.light.v1.json"), []byte(cache), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
info, err := GetDeviceInfo(context.Background(), testServer.server.Client(), "test.light.v1", cacheDir)
|
||||
if err != nil || testServer.specCalls != 1 || len(info.Actions) == 0 || len(info.Actions[0].Inputs) != 2 {
|
||||
t.Fatalf("GetDeviceInfo() = %#v, %v, calls=%d", info, err, testServer.specCalls)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestVersion2DeviceInfoCacheTrustsActionWithoutInputs(t *testing.T) {
|
||||
testServer := newDeviceTestServer(t, nil, nil)
|
||||
cacheDir := t.TempDir()
|
||||
const cache = `{
|
||||
"version":2,
|
||||
"name":"Cached Lamp",
|
||||
"model":"test.light.v1",
|
||||
"properties":[{"name":"power","type":"bool","rw":"rw","siid":2,"piid":1}],
|
||||
"actions":[{"name":"toggle","siid":2,"aiid":1}]
|
||||
}`
|
||||
if err := os.WriteFile(filepath.Join(cacheDir, "test.light.v1.json"), []byte(cache), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
info, err := GetDeviceInfo(context.Background(), testServer.server.Client(), "test.light.v1", cacheDir)
|
||||
if err != nil || testServer.specCalls != 0 || len(info.Actions) != 1 || len(info.Actions[0].Inputs) != 0 {
|
||||
t.Fatalf("GetDeviceInfo() = %#v, %v, calls=%d", info, err, testServer.specCalls)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStaleDeviceInfoCacheRefreshFailureIncludesBothErrors(t *testing.T) {
|
||||
testServer := newDeviceTestServer(t, []byte("unavailable"), nil)
|
||||
testServer.status = http.StatusServiceUnavailable
|
||||
cacheDir := t.TempDir()
|
||||
cachePath := filepath.Join(cacheDir, "test.light.v1.json")
|
||||
const cache = `{"version":1,"model":"test.light.v1","properties":[],"actions":[]}`
|
||||
if err := os.WriteFile(cachePath, []byte(cache), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
_, err := GetDeviceInfo(context.Background(), testServer.server.Client(), "test.light.v1", cacheDir)
|
||||
if err == nil || !strings.Contains(err.Error(), "cache stale") || !strings.Contains(err.Error(), "refresh failed") || !strings.Contains(err.Error(), "503") {
|
||||
t.Fatalf("error = %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -242,6 +329,38 @@ func TestInvalidDeviceInfoCacheRefreshesAndOverwrites(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDecodeDeviceInfoRejectsNonexistentActionInput(t *testing.T) {
|
||||
const cache = `{
|
||||
"version":2,
|
||||
"model":"test.light.v1",
|
||||
"properties":[{"name":"power","description":"Power","type":"bool","rw":"rw","siid":2,"piid":1}],
|
||||
"actions":[{"name":"toggle","siid":2,"aiid":1,"inputs":[{"name":"missing","type":"bool","rw":"rw","siid":2,"piid":99}]}]
|
||||
}`
|
||||
_, err := decodeDeviceInfo([]byte(cache), "test.light.v1")
|
||||
if err == nil || !strings.Contains(err.Error(), "does not reference a property") {
|
||||
t.Fatalf("decodeDeviceInfo() error = %v, want missing property error", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDecodeDeviceInfoCanonicalizesActionInputMetadata(t *testing.T) {
|
||||
const cache = `{
|
||||
"version":2,
|
||||
"model":"test.light.v1",
|
||||
"properties":[{"name":"power","description":"Power","type":"bool","rw":"rw","value-list":[{"value":0,"description":"Off"},{"value":1,"description":"On"}],"siid":2,"piid":1}],
|
||||
"actions":[{"name":"toggle","siid":2,"aiid":1,"inputs":[{"name":"forged","description":"Forged","type":"string","rw":"w","range":[1,9,1],"siid":2,"piid":1}]}]
|
||||
}`
|
||||
info, err := decodeDeviceInfo([]byte(cache), "test.light.v1")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(info.Actions) != 1 || len(info.Actions[0].Inputs) != 1 {
|
||||
t.Fatalf("actions = %#v", info.Actions)
|
||||
}
|
||||
if got, want := info.Actions[0].Inputs[0], info.Properties[0]; !reflect.DeepEqual(got, want) {
|
||||
t.Fatalf("canonical input = %#v, want %#v", got, want)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInvalidDeviceInfoCacheRefreshFailureIncludesBothErrors(t *testing.T) {
|
||||
testServer := newDeviceTestServer(t, []byte("unavailable"), nil)
|
||||
testServer.status = http.StatusServiceUnavailable
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
package mijia
|
||||
|
||||
import "fmt"
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
var ErrReauthenticationRequired = errors.New("reauthentication required")
|
||||
|
||||
var errorCodeMessages = map[int]string{
|
||||
-10000: "未知错误",
|
||||
|
||||
Vendored
+1
-1
@@ -2,6 +2,6 @@
|
||||
<html>
|
||||
<head><script>window.noise = "<script>not JSON</script>";</script></head>
|
||||
<body>
|
||||
<script data-page="app" type="application/json">{"props":{"product":{"name":"Test Lamp","model":"test.light.v1"},"i18n":{"zh_cn":{"service:002:property:001":"电源","service:002:property:002":"亮度","service:002:property:003":"模式","service:002:property:004":"温度","service:002:property:005":"序列号","service:002:property:006":"只写","service:002:property:007":"只读","service:002:action:001":"切换","service:003:property:001":"插座电源","service:003:action:001":"插座切换","mode.off":"关闭","mode.on":"开启"}},"tree":{"services":[{"iid":2,"type":"light","properties":[{"iid":1,"type":"power","description":"Power","format":"bool","access":["read","write","notify"]},{"iid":2,"type":"brightness","description":"Brightness","format":"uint8","access":["read","write"],"valueRange":[1,100,1]},{"iid":3,"type":"mode","description":"Mode","format":"uint16","access":["read","write"],"valueList":[{"value":0,"description":"Off","i18nKey":"mode.off"},{"value":1,"description":"On","i18nKey":"mode.on"}]},{"iid":4,"type":"temperature","description":"Temperature","format":"float","access":["read","write"],"valueRange":[0,1,0.1]},{"iid":5,"type":"serial-number","description":"Serial number","format":"string","access":["read","write"]},{"iid":6,"type":"write-only","description":"Write only","format":"int32","access":["write"]},{"iid":7,"type":"read-only","description":"Read only","format":"int64","access":["read"]}],"actions":[{"iid":1,"type":"toggle","description":"Toggle"}]},{"iid":3,"type":"outlet","properties":[{"iid":1,"type":"power","description":"Power","format":"bool","access":["read","write"]}],"actions":[{"iid":1,"type":"toggle","description":"Toggle"}]}]}}}</script>
|
||||
<script data-page="app" type="application/json">{"props":{"product":{"name":"Test Lamp","model":"test.light.v1"},"i18n":{"zh_cn":{"service:002:property:001":"电源","service:002:property:002":"亮度","service:002:property:003":"模式","service:002:property:004":"温度","service:002:property:005":"序列号","service:002:property:006":"只写","service:002:property:007":"只读","service:002:action:001":"切换","service:003:property:001":"插座电源","service:003:action:001":"插座切换","mode.off":"关闭","mode.on":"开启"}},"tree":{"services":[{"iid":2,"type":"light","properties":[{"iid":1,"type":"power","description":"Power","format":"bool","access":["read","write","notify"]},{"iid":2,"type":"brightness","description":"Brightness","format":"uint8","access":["read","write"],"valueRange":[1,100,1]},{"iid":3,"type":"mode","description":"Mode","format":"uint16","access":["read","write"],"valueList":[{"value":0,"description":"Off","i18nKey":"mode.off"},{"value":1,"description":"On","i18nKey":"mode.on"}]},{"iid":4,"type":"temperature","description":"Temperature","format":"float","access":["read","write"],"valueRange":[0,1,0.1]},{"iid":5,"type":"serial-number","description":"Serial number","format":"string","access":["read","write"]},{"iid":6,"type":"write-only","description":"Write only","format":"int32","access":["write"]},{"iid":7,"type":"read-only","description":"Read only","format":"int64","access":["read"]}],"actions":[{"iid":1,"type":"toggle","description":"Toggle","in":[3,1]}]},{"iid":3,"type":"outlet","properties":[{"iid":1,"type":"power","description":"Power","format":"bool","access":["read","write"]}],"actions":[{"iid":1,"type":"toggle","description":"Toggle","in":[1]}]}]}}}</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user