mirror of
https://github.com/Xevion/go-ha.git
synced 2025-12-06 01:15:10 -06:00
two things:
fix bug with newer HA versions by sending int id instead of string add warning to logs when receiving unsuccessful websocket response
This commit is contained in:
@@ -2,7 +2,6 @@ package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"saml.dev/gome-assistant/internal"
|
||||
ws "saml.dev/gome-assistant/internal/websocket"
|
||||
@@ -32,7 +31,7 @@ func BuildService[
|
||||
}
|
||||
|
||||
type BaseServiceRequest struct {
|
||||
Id string `json:"id"`
|
||||
Id int64 `json:"id"`
|
||||
RequestType string `json:"type"` // hardcoded "call_service"
|
||||
Domain string `json:"domain"`
|
||||
Service string `json:"service"`
|
||||
@@ -45,7 +44,7 @@ type BaseServiceRequest struct {
|
||||
func NewBaseServiceRequest(entityId string) BaseServiceRequest {
|
||||
id := internal.GetId()
|
||||
bsr := BaseServiceRequest{
|
||||
Id: fmt.Sprint(id),
|
||||
Id: id,
|
||||
RequestType: "call_service",
|
||||
}
|
||||
if entityId != "" {
|
||||
|
||||
@@ -3,6 +3,7 @@ package websocket
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
|
||||
"github.com/gorilla/websocket"
|
||||
@@ -11,11 +12,13 @@ import (
|
||||
type BaseMessage struct {
|
||||
Type string `json:"type"`
|
||||
Id int64 `json:"id"`
|
||||
Success bool `json:"success"`
|
||||
}
|
||||
|
||||
type ChanMsg struct {
|
||||
Id int64
|
||||
Type string
|
||||
Success bool
|
||||
Raw []byte
|
||||
}
|
||||
|
||||
@@ -29,11 +32,18 @@ func ListenWebsocket(conn *websocket.Conn, ctx context.Context, c chan ChanMsg)
|
||||
break
|
||||
}
|
||||
|
||||
base := BaseMessage{}
|
||||
base := BaseMessage{
|
||||
// default to true for messages that don't include "success" at all
|
||||
Success: true,
|
||||
}
|
||||
json.Unmarshal(bytes, &base)
|
||||
if !base.Success {
|
||||
fmt.Println("WARNING: received unsuccessful response:", string(bytes))
|
||||
}
|
||||
chanMsg := ChanMsg{
|
||||
Type: base.Type,
|
||||
Id: base.Id,
|
||||
Success: base.Success,
|
||||
Raw: bytes,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user