generated from rmcguire/go-server-with-otel
Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8effff311b | |||
| 52ed5a7e3a | |||
| 8e0e59db16 | |||
| 22137e7ebe | |||
| 18e9cbecea | |||
| 49e6d11180 | |||
| 5867750437 | |||
| f89e2be74b | |||
| 44d43b0ac8 | |||
| 4645c5d5a1 | |||
| 211d833489 | |||
| b84cef01f4 | |||
| 307d31491e | |||
| 39424ce663 | |||
| e9cdc1435e | |||
| a2faf4d412 | |||
| b8e2c2c064 | |||
| defd5b861c |
@@ -25,12 +25,12 @@ jobs:
|
||||
if: startsWith(github.ref, 'refs/tags/v') # Only run on tag push
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Set up Go Environment
|
||||
uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: '1.24'
|
||||
go-version: '1.26'
|
||||
|
||||
- name: Build Binary
|
||||
run: make build
|
||||
@@ -72,7 +72,7 @@ jobs:
|
||||
if: startsWith(github.ref, 'refs/tags/v') # Only run on tag push
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v3
|
||||
@@ -102,7 +102,7 @@ jobs:
|
||||
outputs:
|
||||
chart-updated: ${{ steps.filter.outputs.chart }}
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v7
|
||||
- name: Check Chart Changed
|
||||
uses: dorny/paths-filter@v3
|
||||
id: filter
|
||||
@@ -118,7 +118,7 @@ jobs:
|
||||
if: ${{ needs.check-chart.outputs.chart-updated == 'true' }}
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@v4
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Install Helm
|
||||
env:
|
||||
|
||||
@@ -16,16 +16,35 @@ Exporter for Rheem EcoNet / Rheemcloud water heaters, built on the
|
||||
HTTP/gRPC server startup. The client is stateless REST, so `ShutdownFunc` is
|
||||
effectively a no-op (the poll goroutine stops on ctx cancel).
|
||||
- `pkg/econet/econetclient/` — a minimal EcoNet REST client (ClearBlade
|
||||
backend). `client.go` does the 3 REST calls (auth → `getUserDataForApp` →
|
||||
backend). `client.go` does the read REST calls (auth → `getUserDataForApp` →
|
||||
`dynamicAction` usage) and caches a snapshot under an `RWMutex`; `device.go`
|
||||
decodes the `@...` datapoints into a flat `Device` struct (ported from
|
||||
kevinburke/rheemcloud-go, minus MQTT). `Devices()` is empty until the first
|
||||
`Refresh` succeeds — consumers just see an empty list (no nil-guarding).
|
||||
**No MQTT**, so `WiFiSignal` and `Running`/`RunningState` stay zero.
|
||||
- **Writes (SetMode)**: `Client.SetMode` changes a unit's operating mode by
|
||||
publishing a desired-state message over ClearBlade's REST publish endpoint
|
||||
(`POST /message/{systemKey}/publish`, topic `user/{account_id}/device/desired`,
|
||||
payload `{transactionId, device_name, serial_number, "@MODE": <idx>}`). This
|
||||
is the HTTP equivalent of the app's MQTT publish — **no MQTT client needed**.
|
||||
`@MODE` is an *index* into the device's reported mode list, so `device.go`
|
||||
retains that list (`modeEnumText`) and maps a slug → index (`modeIndex`);
|
||||
supported modes are device-specific (`Device.SupportedModes`). The change is
|
||||
**applied asynchronously** — the new mode only shows up on a later `Refresh`,
|
||||
and a 200 from publish means "accepted", not "applied".
|
||||
- `pkg/econet/econetgrpc/` — `EconetService` gRPC impl (`ListDevices`,
|
||||
`GetDevice`) + `deviceToProto`. Does **not** own a client; it's injected.
|
||||
- `pkg/econet/econetmcp/` — MCP server at `/api/mcp`; the `list_water_heaters`
|
||||
tool delegates to the gRPC server.
|
||||
`GetDevice`, `SetMode`) + `deviceToProto`. Does **not** own a client; it's
|
||||
injected. `SetMode` maps the proto `Mode` enum → client slug; note MCP calls
|
||||
it in-process and so **bypass the protovalidate interceptor** (the gRPC/REST
|
||||
paths don't), hence `SetMode` re-checks the enum itself.
|
||||
- `pkg/econet/econetmcpgen/` — **active** MCP server at `/api/mcp`. Registers
|
||||
the tools generated by protoc-gen-go-mcp (`api/econet/v1alpha1/v1alpha1mcp/`)
|
||||
against our go-sdk `*mcp.Server` via the `runtime/gosdk` adapter, forwarding
|
||||
in-process to the gRPC server. Exposes the same package API as `econetmcp`.
|
||||
- `pkg/econet/econetmcp/` — the older hand-written MCP server; a single
|
||||
`list_water_heaters` tool delegating to the gRPC server. Kept in place as a
|
||||
fallback. **Switch between the two** with the aliased `econetmcp` import in
|
||||
`pkg/econet/econet.go` (one line — both packages export identical symbols).
|
||||
- `pkg/econet/econetmetrics/` — OTEL observable gauges (read the client
|
||||
snapshot at scrape time; no poller of its own).
|
||||
|
||||
@@ -68,6 +87,8 @@ that's all it takes — no extra wiring.
|
||||
## Workflow
|
||||
|
||||
- Regenerate proto: `make proto` (buf; `PROTO_DIRS=proto/econet/v1alpha1/*`).
|
||||
This also runs the `protoc-gen-go-mcp` plugin (see `buf.gen.yaml`), emitting
|
||||
the MCP registrars under `api/econet/v1alpha1/v1alpha1mcp/`.
|
||||
- Regenerate config schema after config changes: `make schema`.
|
||||
- Build/test: `go build ./... && go test ./...`.
|
||||
- `econetclient.Device` is a plain struct, so `deviceToProto` and the datapoint
|
||||
@@ -82,3 +103,11 @@ Creds are configured via `ECONET_EMAIL` / `ECONET_PASSWORD`. Run
|
||||
(streamable HTTP; POST to `/api/mcp/` with trailing slash — bare `/api/mcp`
|
||||
307-redirects). The REST gateway needs `grpcGatewayPathStrip: true` in
|
||||
config.yaml (otherwise the `/api` prefix isn't stripped and routes 404).
|
||||
|
||||
`SetMode` (write) can be driven three ways once a real device is loaded:
|
||||
`grpcurl -plaintext -d '{"serial_number":"<sn>","mode":"MODE_HEAT_PUMP"}' :8081 econet.v1alpha1.EconetService/SetMode`,
|
||||
`POST /api/v1alpha1/devices/<sn>/mode` with `{"mode":"MODE_HEAT_PUMP"}`, or the
|
||||
MCP `econet_v1alpha1_EconetService_SetMode` tool. **Unverified against a live
|
||||
account**: whether the user token is authorized to publish over REST (same
|
||||
authority as MQTT, but Rheem's topic ACL is untested) — this is the one thing
|
||||
that can't be confirmed without a real unit.
|
||||
|
||||
@@ -4,6 +4,44 @@ All notable changes to econet-exporter are documented here. The format is
|
||||
based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this
|
||||
project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
## [v0.4.0] - 2026-07-16
|
||||
|
||||
### Added
|
||||
|
||||
* **Mode control (first mutating RPC).** New `SetMode` RPC on `EconetService`,
|
||||
exposed over gRPC, the REST gateway (`POST /v1alpha1/devices/{serial}/mode`),
|
||||
and as an MCP tool. Writes go out over ClearBlade's REST publish endpoint
|
||||
(`POST /message/{systemKey}/publish`, topic `user/{account_id}/device/desired`,
|
||||
payload `{"@MODE": <idx>, ...}`) — the HTTP equivalent of the app's MQTT
|
||||
publish, so **no MQTT client is required**. The mode is applied
|
||||
asynchronously by the Rheem cloud and only reflected on a later poll.
|
||||
* `Mode` proto enum (`off`, `electric`, `energy-saving`, `heat-pump`,
|
||||
`high-demand`, `gas`, `performance`, `vacation`) with protovalidate rejecting
|
||||
the unspecified value. The enum flows into the MCP tool's input schema, so
|
||||
clients see the valid modes. Supported modes are validated per-device against
|
||||
the unit's reported mode list (`@MODE` is published as an index into it).
|
||||
* Generated MCP server (`econetmcpgen`) built from the proto via
|
||||
`protoc-gen-go-mcp`, now mounted at `/api/mcp`, forwarding in-process to the
|
||||
gRPC server through the go-sdk adapter. The hand-written `econetmcp` package
|
||||
is retained as a one-line-switchable fallback in `pkg/econet/econet.go`.
|
||||
* Optional Grafana dashboard shipped as a ConfigMap in the Helm chart. Enable
|
||||
with `hull.config.settings.grafanaDashboard.enabled=true`; the ConfigMap is
|
||||
labeled `grafana_dashboard: "1"` for the Grafana sidecar to auto-import. The
|
||||
dashboard uses the default Prometheus datasource (no hard-coded UID) and has a
|
||||
multi-select `Device` filter driven by `econet_friendly_name`. Covers connect/
|
||||
heating/mode/setpoint/hot-water/alerts, setpoint range, hot-water availability,
|
||||
energy + cost + water usage, a heating-state timeline, WiFi signal, and a
|
||||
device-info table. Sidecar label/value and Grafana folder are configurable.
|
||||
|
||||
### Changed
|
||||
|
||||
* MCP tool surface changed with the switch to generated tools: `/api/mcp` now
|
||||
serves `econet_v1alpha1_EconetService_ListDevices`, `_GetDevice`, and
|
||||
`_SetMode` (structured JSON output) instead of the single `list_water_heaters`
|
||||
summary tool. Switch back via the aliased import in `pkg/econet/econet.go`.
|
||||
|
||||
## [v0.3.0] - 2026-07-05
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -58,6 +58,22 @@ Polled usage: `econet_energy_usage_kwh`, `econet_water_usage_gallons`,
|
||||
> Note: `econet_wifi_signal_db` is only delivered over Rheem's MQTT push stream,
|
||||
> which this exporter does not use — it stays at `0`.
|
||||
|
||||
### 📈 Grafana dashboard
|
||||
|
||||
The Helm chart ships a ready-made Grafana dashboard
|
||||
(`helm/dashboards/econet-exporter.json`). It is **off by default**; enable it by
|
||||
setting `hull.config.settings.grafanaDashboard.enabled=true`, which renders a
|
||||
ConfigMap labeled `grafana_dashboard: "1"` for the [Grafana sidecar](https://github.com/grafana/helm-charts/tree/main/charts/grafana#sidecar-for-dashboards)
|
||||
to auto-import. The dashboard uses the **default Prometheus datasource** (no
|
||||
hard-coded UID) and has a multi-select **Device** filter backed by
|
||||
`econet_friendly_name`. Tunables under `grafanaDashboard`: `label` / `labelValue`
|
||||
(match your sidecar's watch config) and `folder` (target Grafana folder).
|
||||
|
||||
```sh
|
||||
helm upgrade --install econet ./helm \
|
||||
--set hull.config.settings.grafanaDashboard.enabled=true
|
||||
```
|
||||
|
||||
## 📂 Project Structure
|
||||
- `proto/econet/v1alpha1/` - Protobuf definitions (source).
|
||||
- `api/econet/v1alpha1/` - Generated proto, grpc, grpc-gateway code.
|
||||
|
||||
@@ -24,6 +24,77 @@ const (
|
||||
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
|
||||
)
|
||||
|
||||
// Mode is a settable operating mode for a water heater. The values mirror the
|
||||
// kebab-case slugs reported in Device.mode. Not every device supports every
|
||||
// mode; the supported set is device-specific (derived from the unit's reported
|
||||
// mode list), so SetMode validates against the target device.
|
||||
type Mode int32
|
||||
|
||||
const (
|
||||
Mode_MODE_UNSPECIFIED Mode = 0
|
||||
Mode_MODE_OFF Mode = 1
|
||||
Mode_MODE_ELECTRIC Mode = 2
|
||||
Mode_MODE_ENERGY_SAVING Mode = 3
|
||||
Mode_MODE_HEAT_PUMP Mode = 4
|
||||
Mode_MODE_HIGH_DEMAND Mode = 5
|
||||
Mode_MODE_GAS Mode = 6
|
||||
Mode_MODE_PERFORMANCE Mode = 7
|
||||
Mode_MODE_VACATION Mode = 8
|
||||
)
|
||||
|
||||
// Enum value maps for Mode.
|
||||
var (
|
||||
Mode_name = map[int32]string{
|
||||
0: "MODE_UNSPECIFIED",
|
||||
1: "MODE_OFF",
|
||||
2: "MODE_ELECTRIC",
|
||||
3: "MODE_ENERGY_SAVING",
|
||||
4: "MODE_HEAT_PUMP",
|
||||
5: "MODE_HIGH_DEMAND",
|
||||
6: "MODE_GAS",
|
||||
7: "MODE_PERFORMANCE",
|
||||
8: "MODE_VACATION",
|
||||
}
|
||||
Mode_value = map[string]int32{
|
||||
"MODE_UNSPECIFIED": 0,
|
||||
"MODE_OFF": 1,
|
||||
"MODE_ELECTRIC": 2,
|
||||
"MODE_ENERGY_SAVING": 3,
|
||||
"MODE_HEAT_PUMP": 4,
|
||||
"MODE_HIGH_DEMAND": 5,
|
||||
"MODE_GAS": 6,
|
||||
"MODE_PERFORMANCE": 7,
|
||||
"MODE_VACATION": 8,
|
||||
}
|
||||
)
|
||||
|
||||
func (x Mode) Enum() *Mode {
|
||||
p := new(Mode)
|
||||
*p = x
|
||||
return p
|
||||
}
|
||||
|
||||
func (x Mode) String() string {
|
||||
return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
|
||||
}
|
||||
|
||||
func (Mode) Descriptor() protoreflect.EnumDescriptor {
|
||||
return file_econet_v1alpha1_econet_proto_enumTypes[0].Descriptor()
|
||||
}
|
||||
|
||||
func (Mode) Type() protoreflect.EnumType {
|
||||
return &file_econet_v1alpha1_econet_proto_enumTypes[0]
|
||||
}
|
||||
|
||||
func (x Mode) Number() protoreflect.EnumNumber {
|
||||
return protoreflect.EnumNumber(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use Mode.Descriptor instead.
|
||||
func (Mode) EnumDescriptor() ([]byte, []int) {
|
||||
return file_econet_v1alpha1_econet_proto_rawDescGZIP(), []int{0}
|
||||
}
|
||||
|
||||
// Device is the live state of a single Rheem EcoNet device
|
||||
// (typically a water heater) as reported by the Rheem cloud.
|
||||
type Device struct {
|
||||
@@ -374,6 +445,104 @@ func (x *GetDeviceResponse) GetDevice() *Device {
|
||||
return nil
|
||||
}
|
||||
|
||||
type SetModeRequest struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
SerialNumber string `protobuf:"bytes,1,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
|
||||
Mode Mode `protobuf:"varint,2,opt,name=mode,proto3,enum=econet.v1alpha1.Mode" json:"mode,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
|
||||
func (x *SetModeRequest) Reset() {
|
||||
*x = SetModeRequest{}
|
||||
mi := &file_econet_v1alpha1_econet_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *SetModeRequest) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*SetModeRequest) ProtoMessage() {}
|
||||
|
||||
func (x *SetModeRequest) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_econet_v1alpha1_econet_proto_msgTypes[5]
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use SetModeRequest.ProtoReflect.Descriptor instead.
|
||||
func (*SetModeRequest) Descriptor() ([]byte, []int) {
|
||||
return file_econet_v1alpha1_econet_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *SetModeRequest) GetSerialNumber() string {
|
||||
if x != nil {
|
||||
return x.SerialNumber
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *SetModeRequest) GetMode() Mode {
|
||||
if x != nil {
|
||||
return x.Mode
|
||||
}
|
||||
return Mode_MODE_UNSPECIFIED
|
||||
}
|
||||
|
||||
type SetModeResponse struct {
|
||||
state protoimpl.MessageState `protogen:"open.v1"`
|
||||
// Last-known device state. The mode change is applied asynchronously by the
|
||||
// Rheem cloud, so this reflects the requested mode only after a later poll.
|
||||
Device *Device `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"`
|
||||
unknownFields protoimpl.UnknownFields
|
||||
sizeCache protoimpl.SizeCache
|
||||
}
|
||||
|
||||
func (x *SetModeResponse) Reset() {
|
||||
*x = SetModeResponse{}
|
||||
mi := &file_econet_v1alpha1_econet_proto_msgTypes[6]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *SetModeResponse) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*SetModeResponse) ProtoMessage() {}
|
||||
|
||||
func (x *SetModeResponse) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_econet_v1alpha1_econet_proto_msgTypes[6]
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use SetModeResponse.ProtoReflect.Descriptor instead.
|
||||
func (*SetModeResponse) Descriptor() ([]byte, []int) {
|
||||
return file_econet_v1alpha1_econet_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *SetModeResponse) GetDevice() *Device {
|
||||
if x != nil {
|
||||
return x.Device
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_econet_v1alpha1_econet_proto protoreflect.FileDescriptor
|
||||
|
||||
const file_econet_v1alpha1_econet_proto_rawDesc = "" +
|
||||
@@ -407,10 +576,27 @@ const file_econet_v1alpha1_econet_proto_rawDesc = "" +
|
||||
"\x10GetDeviceRequest\x12,\n" +
|
||||
"\rserial_number\x18\x01 \x01(\tB\a\xbaH\x04r\x02\x10\x01R\fserialNumber\"D\n" +
|
||||
"\x11GetDeviceResponse\x12/\n" +
|
||||
"\x06device\x18\x01 \x01(\v2\x17.econet.v1alpha1.DeviceR\x06device2\x83\x02\n" +
|
||||
"\x06device\x18\x01 \x01(\v2\x17.econet.v1alpha1.DeviceR\x06device\"u\n" +
|
||||
"\x0eSetModeRequest\x12,\n" +
|
||||
"\rserial_number\x18\x01 \x01(\tB\a\xbaH\x04r\x02\x10\x01R\fserialNumber\x125\n" +
|
||||
"\x04mode\x18\x02 \x01(\x0e2\x15.econet.v1alpha1.ModeB\n" +
|
||||
"\xbaH\a\x82\x01\x04\x10\x01 \x00R\x04mode\"B\n" +
|
||||
"\x0fSetModeResponse\x12/\n" +
|
||||
"\x06device\x18\x01 \x01(\v2\x17.econet.v1alpha1.DeviceR\x06device*\xb6\x01\n" +
|
||||
"\x04Mode\x12\x14\n" +
|
||||
"\x10MODE_UNSPECIFIED\x10\x00\x12\f\n" +
|
||||
"\bMODE_OFF\x10\x01\x12\x11\n" +
|
||||
"\rMODE_ELECTRIC\x10\x02\x12\x16\n" +
|
||||
"\x12MODE_ENERGY_SAVING\x10\x03\x12\x12\n" +
|
||||
"\x0eMODE_HEAT_PUMP\x10\x04\x12\x14\n" +
|
||||
"\x10MODE_HIGH_DEMAND\x10\x05\x12\f\n" +
|
||||
"\bMODE_GAS\x10\x06\x12\x14\n" +
|
||||
"\x10MODE_PERFORMANCE\x10\a\x12\x11\n" +
|
||||
"\rMODE_VACATION\x10\b2\x84\x03\n" +
|
||||
"\rEconetService\x12s\n" +
|
||||
"\vListDevices\x12#.econet.v1alpha1.ListDevicesRequest\x1a$.econet.v1alpha1.ListDevicesResponse\"\x19\x82\xd3\xe4\x93\x02\x13\x12\x11/v1alpha1/devices\x12}\n" +
|
||||
"\tGetDevice\x12!.econet.v1alpha1.GetDeviceRequest\x1a\".econet.v1alpha1.GetDeviceResponse\")\x82\xd3\xe4\x93\x02#\x12!/v1alpha1/devices/{serial_number}B\xcb\x01\n" +
|
||||
"\tGetDevice\x12!.econet.v1alpha1.GetDeviceRequest\x1a\".econet.v1alpha1.GetDeviceResponse\")\x82\xd3\xe4\x93\x02#\x12!/v1alpha1/devices/{serial_number}\x12\x7f\n" +
|
||||
"\aSetMode\x12\x1f.econet.v1alpha1.SetModeRequest\x1a .econet.v1alpha1.SetModeResponse\"1\x82\xd3\xe4\x93\x02+:\x01*\"&/v1alpha1/devices/{serial_number}/modeB\xcb\x01\n" +
|
||||
"\x13com.econet.v1alpha1B\vEconetProtoP\x01ZJgitea.libretechconsulting.com/rmcguire/econet-exporter/api/econet/v1alpha1\xa2\x02\x03EXX\xaa\x02\x0fEconet.V1alpha1\xca\x02\x0fEconet\\V1alpha1\xe2\x02\x1bEconet\\V1alpha1\\GPBMetadata\xea\x02\x10Econet::V1alpha1b\x06proto3"
|
||||
|
||||
var (
|
||||
@@ -425,28 +611,36 @@ func file_econet_v1alpha1_econet_proto_rawDescGZIP() []byte {
|
||||
return file_econet_v1alpha1_econet_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_econet_v1alpha1_econet_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
|
||||
var file_econet_v1alpha1_econet_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_econet_v1alpha1_econet_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
||||
var file_econet_v1alpha1_econet_proto_goTypes = []any{
|
||||
(*Device)(nil), // 0: econet.v1alpha1.Device
|
||||
(*ListDevicesRequest)(nil), // 1: econet.v1alpha1.ListDevicesRequest
|
||||
(*ListDevicesResponse)(nil), // 2: econet.v1alpha1.ListDevicesResponse
|
||||
(*GetDeviceRequest)(nil), // 3: econet.v1alpha1.GetDeviceRequest
|
||||
(*GetDeviceResponse)(nil), // 4: econet.v1alpha1.GetDeviceResponse
|
||||
(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
|
||||
(Mode)(0), // 0: econet.v1alpha1.Mode
|
||||
(*Device)(nil), // 1: econet.v1alpha1.Device
|
||||
(*ListDevicesRequest)(nil), // 2: econet.v1alpha1.ListDevicesRequest
|
||||
(*ListDevicesResponse)(nil), // 3: econet.v1alpha1.ListDevicesResponse
|
||||
(*GetDeviceRequest)(nil), // 4: econet.v1alpha1.GetDeviceRequest
|
||||
(*GetDeviceResponse)(nil), // 5: econet.v1alpha1.GetDeviceResponse
|
||||
(*SetModeRequest)(nil), // 6: econet.v1alpha1.SetModeRequest
|
||||
(*SetModeResponse)(nil), // 7: econet.v1alpha1.SetModeResponse
|
||||
(*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp
|
||||
}
|
||||
var file_econet_v1alpha1_econet_proto_depIdxs = []int32{
|
||||
5, // 0: econet.v1alpha1.Device.last_updated:type_name -> google.protobuf.Timestamp
|
||||
0, // 1: econet.v1alpha1.ListDevicesResponse.devices:type_name -> econet.v1alpha1.Device
|
||||
0, // 2: econet.v1alpha1.GetDeviceResponse.device:type_name -> econet.v1alpha1.Device
|
||||
1, // 3: econet.v1alpha1.EconetService.ListDevices:input_type -> econet.v1alpha1.ListDevicesRequest
|
||||
3, // 4: econet.v1alpha1.EconetService.GetDevice:input_type -> econet.v1alpha1.GetDeviceRequest
|
||||
2, // 5: econet.v1alpha1.EconetService.ListDevices:output_type -> econet.v1alpha1.ListDevicesResponse
|
||||
4, // 6: econet.v1alpha1.EconetService.GetDevice:output_type -> econet.v1alpha1.GetDeviceResponse
|
||||
5, // [5:7] is the sub-list for method output_type
|
||||
3, // [3:5] is the sub-list for method input_type
|
||||
3, // [3:3] is the sub-list for extension type_name
|
||||
3, // [3:3] is the sub-list for extension extendee
|
||||
0, // [0:3] is the sub-list for field type_name
|
||||
8, // 0: econet.v1alpha1.Device.last_updated:type_name -> google.protobuf.Timestamp
|
||||
1, // 1: econet.v1alpha1.ListDevicesResponse.devices:type_name -> econet.v1alpha1.Device
|
||||
1, // 2: econet.v1alpha1.GetDeviceResponse.device:type_name -> econet.v1alpha1.Device
|
||||
0, // 3: econet.v1alpha1.SetModeRequest.mode:type_name -> econet.v1alpha1.Mode
|
||||
1, // 4: econet.v1alpha1.SetModeResponse.device:type_name -> econet.v1alpha1.Device
|
||||
2, // 5: econet.v1alpha1.EconetService.ListDevices:input_type -> econet.v1alpha1.ListDevicesRequest
|
||||
4, // 6: econet.v1alpha1.EconetService.GetDevice:input_type -> econet.v1alpha1.GetDeviceRequest
|
||||
6, // 7: econet.v1alpha1.EconetService.SetMode:input_type -> econet.v1alpha1.SetModeRequest
|
||||
3, // 8: econet.v1alpha1.EconetService.ListDevices:output_type -> econet.v1alpha1.ListDevicesResponse
|
||||
5, // 9: econet.v1alpha1.EconetService.GetDevice:output_type -> econet.v1alpha1.GetDeviceResponse
|
||||
7, // 10: econet.v1alpha1.EconetService.SetMode:output_type -> econet.v1alpha1.SetModeResponse
|
||||
8, // [8:11] is the sub-list for method output_type
|
||||
5, // [5:8] is the sub-list for method input_type
|
||||
5, // [5:5] is the sub-list for extension type_name
|
||||
5, // [5:5] is the sub-list for extension extendee
|
||||
0, // [0:5] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_econet_v1alpha1_econet_proto_init() }
|
||||
@@ -459,13 +653,14 @@ func file_econet_v1alpha1_econet_proto_init() {
|
||||
File: protoimpl.DescBuilder{
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: unsafe.Slice(unsafe.StringData(file_econet_v1alpha1_econet_proto_rawDesc), len(file_econet_v1alpha1_econet_proto_rawDesc)),
|
||||
NumEnums: 0,
|
||||
NumMessages: 5,
|
||||
NumEnums: 1,
|
||||
NumMessages: 7,
|
||||
NumExtensions: 0,
|
||||
NumServices: 1,
|
||||
},
|
||||
GoTypes: file_econet_v1alpha1_econet_proto_goTypes,
|
||||
DependencyIndexes: file_econet_v1alpha1_econet_proto_depIdxs,
|
||||
EnumInfos: file_econet_v1alpha1_econet_proto_enumTypes,
|
||||
MessageInfos: file_econet_v1alpha1_econet_proto_msgTypes,
|
||||
}.Build()
|
||||
File_econet_v1alpha1_econet_proto = out.File
|
||||
|
||||
@@ -95,6 +95,51 @@ func local_request_EconetService_GetDevice_0(ctx context.Context, marshaler runt
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func request_EconetService_SetMode_0(ctx context.Context, marshaler runtime.Marshaler, client EconetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq SetModeRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
if req.Body != nil {
|
||||
_, _ = io.Copy(io.Discard, req.Body)
|
||||
}
|
||||
val, ok := pathParams["serial_number"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "serial_number")
|
||||
}
|
||||
protoReq.SerialNumber, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "serial_number", err)
|
||||
}
|
||||
msg, err := client.SetMode(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
func local_request_EconetService_SetMode_0(ctx context.Context, marshaler runtime.Marshaler, server EconetServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
|
||||
var (
|
||||
protoReq SetModeRequest
|
||||
metadata runtime.ServerMetadata
|
||||
err error
|
||||
)
|
||||
if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
|
||||
}
|
||||
val, ok := pathParams["serial_number"]
|
||||
if !ok {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "serial_number")
|
||||
}
|
||||
protoReq.SerialNumber, err = runtime.String(val)
|
||||
if err != nil {
|
||||
return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "serial_number", err)
|
||||
}
|
||||
msg, err := server.SetMode(ctx, &protoReq)
|
||||
return msg, metadata, err
|
||||
}
|
||||
|
||||
// RegisterEconetServiceHandlerServer registers the http handlers for service EconetService to "mux".
|
||||
// UnaryRPC :call EconetServiceServer directly.
|
||||
// StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
|
||||
@@ -141,6 +186,26 @@ func RegisterEconetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM
|
||||
}
|
||||
forward_EconetService_GetDevice_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_EconetService_SetMode_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
var stream runtime.ServerTransportStream
|
||||
ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/econet.v1alpha1.EconetService/SetMode", runtime.WithHTTPPathPattern("/v1alpha1/devices/{serial_number}/mode"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := local_request_EconetService_SetMode_0(annotatedContext, inboundMarshaler, server, req, pathParams)
|
||||
md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_EconetService_SetMode_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
|
||||
return nil
|
||||
}
|
||||
@@ -215,15 +280,34 @@ func RegisterEconetServiceHandlerClient(ctx context.Context, mux *runtime.ServeM
|
||||
}
|
||||
forward_EconetService_GetDevice_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
mux.Handle(http.MethodPost, pattern_EconetService_SetMode_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
|
||||
ctx, cancel := context.WithCancel(req.Context())
|
||||
defer cancel()
|
||||
inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
|
||||
annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/econet.v1alpha1.EconetService/SetMode", runtime.WithHTTPPathPattern("/v1alpha1/devices/{serial_number}/mode"))
|
||||
if err != nil {
|
||||
runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
resp, md, err := request_EconetService_SetMode_0(annotatedContext, inboundMarshaler, client, req, pathParams)
|
||||
annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
|
||||
if err != nil {
|
||||
runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
|
||||
return
|
||||
}
|
||||
forward_EconetService_SetMode_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
var (
|
||||
pattern_EconetService_ListDevices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1alpha1", "devices"}, ""))
|
||||
pattern_EconetService_GetDevice_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1alpha1", "devices", "serial_number"}, ""))
|
||||
pattern_EconetService_SetMode_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3}, []string{"v1alpha1", "devices", "serial_number", "mode"}, ""))
|
||||
)
|
||||
|
||||
var (
|
||||
forward_EconetService_ListDevices_0 = runtime.ForwardResponseMessage
|
||||
forward_EconetService_GetDevice_0 = runtime.ForwardResponseMessage
|
||||
forward_EconetService_SetMode_0 = runtime.ForwardResponseMessage
|
||||
)
|
||||
|
||||
@@ -21,6 +21,7 @@ const _ = grpc.SupportPackageIsVersion9
|
||||
const (
|
||||
EconetService_ListDevices_FullMethodName = "/econet.v1alpha1.EconetService/ListDevices"
|
||||
EconetService_GetDevice_FullMethodName = "/econet.v1alpha1.EconetService/GetDevice"
|
||||
EconetService_SetMode_FullMethodName = "/econet.v1alpha1.EconetService/SetMode"
|
||||
)
|
||||
|
||||
// EconetServiceClient is the client API for EconetService service.
|
||||
@@ -31,6 +32,7 @@ const (
|
||||
type EconetServiceClient interface {
|
||||
ListDevices(ctx context.Context, in *ListDevicesRequest, opts ...grpc.CallOption) (*ListDevicesResponse, error)
|
||||
GetDevice(ctx context.Context, in *GetDeviceRequest, opts ...grpc.CallOption) (*GetDeviceResponse, error)
|
||||
SetMode(ctx context.Context, in *SetModeRequest, opts ...grpc.CallOption) (*SetModeResponse, error)
|
||||
}
|
||||
|
||||
type econetServiceClient struct {
|
||||
@@ -61,6 +63,16 @@ func (c *econetServiceClient) GetDevice(ctx context.Context, in *GetDeviceReques
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *econetServiceClient) SetMode(ctx context.Context, in *SetModeRequest, opts ...grpc.CallOption) (*SetModeResponse, error) {
|
||||
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
|
||||
out := new(SetModeResponse)
|
||||
err := c.cc.Invoke(ctx, EconetService_SetMode_FullMethodName, in, out, cOpts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// EconetServiceServer is the server API for EconetService service.
|
||||
// All implementations should embed UnimplementedEconetServiceServer
|
||||
// for forward compatibility.
|
||||
@@ -69,6 +81,7 @@ func (c *econetServiceClient) GetDevice(ctx context.Context, in *GetDeviceReques
|
||||
type EconetServiceServer interface {
|
||||
ListDevices(context.Context, *ListDevicesRequest) (*ListDevicesResponse, error)
|
||||
GetDevice(context.Context, *GetDeviceRequest) (*GetDeviceResponse, error)
|
||||
SetMode(context.Context, *SetModeRequest) (*SetModeResponse, error)
|
||||
}
|
||||
|
||||
// UnimplementedEconetServiceServer should be embedded to have
|
||||
@@ -84,6 +97,9 @@ func (UnimplementedEconetServiceServer) ListDevices(context.Context, *ListDevice
|
||||
func (UnimplementedEconetServiceServer) GetDevice(context.Context, *GetDeviceRequest) (*GetDeviceResponse, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method GetDevice not implemented")
|
||||
}
|
||||
func (UnimplementedEconetServiceServer) SetMode(context.Context, *SetModeRequest) (*SetModeResponse, error) {
|
||||
return nil, status.Error(codes.Unimplemented, "method SetMode not implemented")
|
||||
}
|
||||
func (UnimplementedEconetServiceServer) testEmbeddedByValue() {}
|
||||
|
||||
// UnsafeEconetServiceServer may be embedded to opt out of forward compatibility for this service.
|
||||
@@ -140,6 +156,24 @@ func _EconetService_GetDevice_Handler(srv interface{}, ctx context.Context, dec
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _EconetService_SetMode_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(SetModeRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(EconetServiceServer).SetMode(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: EconetService_SetMode_FullMethodName,
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(EconetServiceServer).SetMode(ctx, req.(*SetModeRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
// EconetService_ServiceDesc is the grpc.ServiceDesc for EconetService service.
|
||||
// It's only intended for direct use with grpc.RegisterService,
|
||||
// and not to be introspected or modified (even as a copy)
|
||||
@@ -155,6 +189,10 @@ var EconetService_ServiceDesc = grpc.ServiceDesc{
|
||||
MethodName: "GetDevice",
|
||||
Handler: _EconetService_GetDevice_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "SetMode",
|
||||
Handler: _EconetService_SetMode_Handler,
|
||||
},
|
||||
},
|
||||
Streams: []grpc.StreamDesc{},
|
||||
Metadata: "econet/v1alpha1/econet.proto",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -24,5 +24,9 @@ plugins:
|
||||
opt:
|
||||
- merge_file_name=econet-exporter
|
||||
- allow_merge=true
|
||||
- local: ["go", "run", "github.com/redpanda-data/protoc-gen-go-mcp/cmd/protoc-gen-go-mcp@latest"]
|
||||
out: api
|
||||
opt:
|
||||
- paths=source_relative
|
||||
inputs:
|
||||
- directory: proto
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
version: v2
|
||||
deps:
|
||||
- name: buf.build/bufbuild/protovalidate
|
||||
commit: 50325440f8f24053b047484a6bf60b76
|
||||
digest: b5:74cb6f5c0853c3c10aafc701614194bbd63326bdb8ef4068214454b8894b03ba4113e04b3a33a8321cdf05336e37db4dc14a5e2495db8462566914f36086ba31
|
||||
commit: 435963d1631043e694e56e6bcc3c79c3
|
||||
digest: b5:f4ea07ad2dd94bd7243562f9908b9fb104feef8076040c89d9f7c1dedc074de4d4ce2b997686ef4400f3eccb765a7cfc20ed4acdd70b9a3699351245c61dba97
|
||||
- name: buf.build/googleapis/googleapis
|
||||
commit: c17df5b2beca46928cc87d5656bd5343
|
||||
digest: b5:648a01e0170d4512dea7d564016165decd1ed6e34bef79fe54753e51ad7e27545709ad9157d7551270147d551155c595a2fb0bf5bb33b1c83040ddbce915c604
|
||||
|
||||
@@ -67,9 +67,55 @@
|
||||
"EconetService"
|
||||
]
|
||||
}
|
||||
},
|
||||
"/v1alpha1/devices/{serialNumber}/mode": {
|
||||
"post": {
|
||||
"operationId": "EconetService_SetMode",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "A successful response.",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/v1alpha1SetModeResponse"
|
||||
}
|
||||
},
|
||||
"default": {
|
||||
"description": "An unexpected error response.",
|
||||
"schema": {
|
||||
"$ref": "#/definitions/rpcStatus"
|
||||
}
|
||||
}
|
||||
},
|
||||
"parameters": [
|
||||
{
|
||||
"name": "serialNumber",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"type": "string"
|
||||
},
|
||||
{
|
||||
"name": "body",
|
||||
"in": "body",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"$ref": "#/definitions/EconetServiceSetModeBody"
|
||||
}
|
||||
}
|
||||
],
|
||||
"tags": [
|
||||
"EconetService"
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"definitions": {
|
||||
"EconetServiceSetModeBody": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"mode": {
|
||||
"$ref": "#/definitions/v1alpha1Mode"
|
||||
}
|
||||
}
|
||||
},
|
||||
"protobufAny": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -190,6 +236,31 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"v1alpha1Mode": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"MODE_UNSPECIFIED",
|
||||
"MODE_OFF",
|
||||
"MODE_ELECTRIC",
|
||||
"MODE_ENERGY_SAVING",
|
||||
"MODE_HEAT_PUMP",
|
||||
"MODE_HIGH_DEMAND",
|
||||
"MODE_GAS",
|
||||
"MODE_PERFORMANCE",
|
||||
"MODE_VACATION"
|
||||
],
|
||||
"default": "MODE_UNSPECIFIED",
|
||||
"description": "Mode is a settable operating mode for a water heater. The values mirror the\nkebab-case slugs reported in Device.mode. Not every device supports every\nmode; the supported set is device-specific (derived from the unit's reported\nmode list), so SetMode validates against the target device."
|
||||
},
|
||||
"v1alpha1SetModeResponse": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"device": {
|
||||
"$ref": "#/definitions/v1alpha1Device",
|
||||
"description": "Last-known device state. The mode change is applied asynchronously by the\nRheem cloud, so this reflects the requested mode only after a later poll."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
module gitea.libretechconsulting.com/rmcguire/econet-exporter
|
||||
|
||||
go 1.26
|
||||
go 1.26.1
|
||||
|
||||
require (
|
||||
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260415201107-50325440f8f2.1
|
||||
connectrpc.com/connect v1.20.0
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.17.1
|
||||
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0
|
||||
github.com/modelcontextprotocol/go-sdk v1.6.1
|
||||
github.com/redpanda-data/protoc-gen-go-mcp v0.0.0-20260709214304-372b2d56e470
|
||||
github.com/rs/zerolog v1.35.1
|
||||
go.opentelemetry.io/otel/metric v1.44.0
|
||||
go.opentelemetry.io/otel/trace v1.44.0
|
||||
@@ -36,6 +38,7 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.34.2-20240917150400-3f349e63f44a.2 // indirect
|
||||
buf.build/go/protovalidate v1.2.0 // indirect
|
||||
cel.dev/expr v0.25.2 // indirect
|
||||
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
|
||||
@@ -55,6 +58,7 @@ require (
|
||||
github.com/prometheus/common v0.69.0 // indirect
|
||||
github.com/prometheus/otlptranslator v1.0.0 // indirect
|
||||
github.com/prometheus/procfs v0.21.1 // indirect
|
||||
github.com/redpanda-data/common-go/api v0.0.0-20250801174835-9eea07f1ea06 // indirect
|
||||
github.com/rs/cors v1.11.1 // indirect
|
||||
github.com/segmentio/asm v1.2.1 // indirect
|
||||
github.com/segmentio/encoding v0.5.4 // indirect
|
||||
|
||||
@@ -1,9 +1,13 @@
|
||||
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260415201107-50325440f8f2.1 h1:s6hzCXtND/ICdGPTMGk7C+/BFlr2Jg5GyH0NKf4XGXg=
|
||||
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.11-20260415201107-50325440f8f2.1/go.mod h1:tvtbpgaVXZX4g6Pn+AnzFycuRK3MOz5HJfEGeEllXYM=
|
||||
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.34.2-20240917150400-3f349e63f44a.2 h1:JyGBchZNUPlQ7/qjieeKq/Cy+/i1vc0H+cIniGZNSFg=
|
||||
buf.build/gen/go/redpandadata/common/protocolbuffers/go v1.34.2-20240917150400-3f349e63f44a.2/go.mod h1:wThyg02xJx4K/DA5fg0QlKts8XVPyTT86JC8hPfEzno=
|
||||
buf.build/go/protovalidate v1.2.0 h1:DQVrUWkmGTBij+kOYv/x2LLxwcLaGKMdzShj1/6/3H0=
|
||||
buf.build/go/protovalidate v1.2.0/go.mod h1:7rYiQEhqvAipoazpVNBBH2S2f8bjG4huMVy1V2Yofn4=
|
||||
cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
|
||||
cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
|
||||
connectrpc.com/connect v1.20.0 h1:6TNDAB+WeNd2uolWNlYczB5E0KNNaVMNUEx8JEUsPmQ=
|
||||
connectrpc.com/connect v1.20.0/go.mod h1:A2ygJrukXwWy32vkCAAHNVguZrqZ+jeZ9rGRnGR4dN4=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.17.1 h1:OdUNAXRoDpB5sC3KdaJC7Rav8MmxiRZC0fRx9YNH1Ks=
|
||||
gitea.libretechconsulting.com/rmcguire/go-app v0.17.1/go.mod h1:YBygVa9JBYAP+ibF8FevN1KUe3h5GHWxAdFyU6I8QgA=
|
||||
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
|
||||
@@ -65,6 +69,8 @@ github.com/modelcontextprotocol/go-sdk v1.6.1 h1:0zOSupjKUxPKSocPT1Wtago+mUHU2/u
|
||||
github.com/modelcontextprotocol/go-sdk v1.6.1/go.mod h1:kzm3kzFL1/+AziGOE0nUs3gvPoNxMCvkxokMkuFapXQ=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
|
||||
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
|
||||
@@ -77,6 +83,10 @@ github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEo
|
||||
github.com/prometheus/otlptranslator v1.0.0/go.mod h1:vRYWnXvI6aWGpsdY/mOT/cbeVRBlPWtBNDb7kGR3uKM=
|
||||
github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
|
||||
github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
|
||||
github.com/redpanda-data/common-go/api v0.0.0-20250801174835-9eea07f1ea06 h1:9Ecc+Cg1EyqSTIQ6wQKoKk8BqDlBQmR74bJui4qIqsM=
|
||||
github.com/redpanda-data/common-go/api v0.0.0-20250801174835-9eea07f1ea06/go.mod h1:klAmWfc8Q3hEZk8geFTMu6f2sk3VUKRS7cv/LvB05ig=
|
||||
github.com/redpanda-data/protoc-gen-go-mcp v0.0.0-20260709214304-372b2d56e470 h1:gBvQBXc+MtBa8aGjXTOFLPu+1a+7I0UMu6Np9ofY1Ow=
|
||||
github.com/redpanda-data/protoc-gen-go-mcp v0.0.0-20260709214304-372b2d56e470/go.mod h1:1Ulz0OS7NpChjyMu6NWZucui6SEbIsOzAshGfpqWCV8=
|
||||
github.com/rodaine/protogofakeit v0.1.1 h1:ZKouljuRM3A+TArppfBqnH8tGZHOwM/pjvtXe9DaXH8=
|
||||
github.com/rodaine/protogofakeit v0.1.1/go.mod h1:pXn/AstBYMaSfc1/RqH3N82pBuxtWgejz1AlYpY1mI0=
|
||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||
|
||||
+2
-2
@@ -15,7 +15,7 @@ type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: 0.1.6
|
||||
version: 0.2.10
|
||||
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
@@ -26,5 +26,5 @@ appVersion: "v0.3.0"
|
||||
dependencies:
|
||||
- name: hull
|
||||
repository: https://vidispine.github.io/hull
|
||||
version: 1.32.2
|
||||
version: 1.36.0
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,20 @@
|
||||
{{- $gd := .Values.hull.config.settings.grafanaDashboard | default dict }}
|
||||
{{- if $gd.enabled }}
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Release.Name }}-grafana-dashboard
|
||||
namespace: {{ .Release.Namespace }}
|
||||
labels:
|
||||
app.kubernetes.io/name: {{ .Chart.Name }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- /* Label the Grafana sidecar watches for to auto-import dashboards */}}
|
||||
{{ $gd.label | default "grafana_dashboard" }}: {{ $gd.labelValue | default "1" | quote }}
|
||||
{{- with $gd.folder }}
|
||||
annotations:
|
||||
grafana_folder: {{ . | quote }}
|
||||
{{- end }}
|
||||
data:
|
||||
econet-exporter.json: |-
|
||||
{{ .Files.Get "dashboards/econet-exporter.json" | indent 4 }}
|
||||
{{- end }}
|
||||
@@ -58,6 +58,18 @@ hull:
|
||||
otelResourceAttributes: app=econet-exporter
|
||||
otlpEndpoint: http://otel.otel.svc.cluster.local:4317 # Replace me
|
||||
|
||||
# Ship a ready-made Grafana dashboard as a ConfigMap for the Grafana
|
||||
# sidecar to auto-import (kiwigrid/k8s-sidecar). Flip enabled to true;
|
||||
# the dashboard uses the default Prometheus datasource and filters by
|
||||
# device name. No datasource UID hard-coding required.
|
||||
grafanaDashboard:
|
||||
enabled: false
|
||||
# Label/value the Grafana sidecar is configured to watch for.
|
||||
label: grafana_dashboard
|
||||
labelValue: "1"
|
||||
# Optional Grafana folder to file the dashboard under (blank = General).
|
||||
folder: ""
|
||||
|
||||
serviceType: ClusterIP
|
||||
serviceLbIP: "" # Used if serviceTyps=LoadBalancer
|
||||
|
||||
|
||||
@@ -16,7 +16,11 @@ import (
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetclient"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetgrpc"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetmcp"
|
||||
// MCP server. Aliased so switching implementations is a one-line change.
|
||||
// Generated (protoc-gen-go-mcp) tools:
|
||||
econetmcp "gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetmcpgen"
|
||||
// Hand-written tools (switch back by using this import instead):
|
||||
// econetmcp "gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetmcp"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetmetrics"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/service"
|
||||
)
|
||||
|
||||
@@ -113,6 +113,53 @@ func (c *Client) Refresh(ctx context.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// SetMode changes a device's operating mode. It resolves the normalized mode
|
||||
// slug to the device's @MODE enum index and publishes a desired-state message
|
||||
// to the EcoNet cloud over ClearBlade's REST publish endpoint (the HTTP
|
||||
// equivalent of the app's MQTT publish). The change is applied asynchronously;
|
||||
// the new mode is only reflected after a subsequent Refresh.
|
||||
func (c *Client) SetMode(ctx context.Context, serial, mode string) error {
|
||||
c.mu.RLock()
|
||||
d, account := c.devices[serial], c.accountID
|
||||
c.mu.RUnlock()
|
||||
if d == nil {
|
||||
return fmt.Errorf("econet: unknown device %q", serial)
|
||||
}
|
||||
idx, ok := d.modeIndex(mode)
|
||||
if !ok {
|
||||
return fmt.Errorf("econet: device %q does not support mode %q (supported: %s)",
|
||||
serial, mode, strings.Join(d.SupportedModes(), ", "))
|
||||
}
|
||||
|
||||
if err := c.ensureAuth(ctx); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
desired, err := json.Marshal(map[string]any{
|
||||
"transactionId": transactionID(),
|
||||
"device_name": d.DeviceID,
|
||||
"serial_number": d.SerialNumber,
|
||||
"@MODE": idx,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
publish := map[string]any{
|
||||
"topic": "user/" + account + "/device/desired",
|
||||
"body": string(desired),
|
||||
"qos": 1,
|
||||
}
|
||||
|
||||
path := "/message/" + clearBladeSystemKey + "/publish"
|
||||
if err := c.do(ctx, path, c.userToken(), publish, nil); err != nil {
|
||||
c.clearToken() // token may have expired; re-auth next call
|
||||
return fmt.Errorf("econet: set mode: %w", err)
|
||||
}
|
||||
c.log.Info().Str("serial", serial).Str("mode", mode).Int("modeIndex", idx).
|
||||
Msg("econet: published mode change")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Client) clearToken() {
|
||||
c.mu.Lock()
|
||||
c.token = ""
|
||||
@@ -274,6 +321,11 @@ func (c *Client) do(ctx context.Context, path, token string, body, out any) erro
|
||||
if resp.StatusCode != http.StatusOK {
|
||||
return fmt.Errorf("HTTP %d: %s", resp.StatusCode, bytes.TrimSpace(raw))
|
||||
}
|
||||
// The publish endpoint replies 200 with an empty (or non-JSON) body; callers
|
||||
// that don't need the response pass out == nil.
|
||||
if out == nil || len(bytes.TrimSpace(raw)) == 0 {
|
||||
return nil
|
||||
}
|
||||
return json.Unmarshal(raw, out)
|
||||
}
|
||||
|
||||
@@ -285,6 +337,12 @@ func (c *Client) userToken() string {
|
||||
|
||||
// --- usage helpers -------------------------------------------------------
|
||||
|
||||
// transactionID mirrors the identifier the Rheem Android app stamps on each
|
||||
// desired-state publish: "ANDROID_" + a local second-resolution timestamp.
|
||||
func transactionID() string {
|
||||
return "ANDROID_" + time.Now().Format("2006-01-02T15:04:05")
|
||||
}
|
||||
|
||||
// dayWindow returns ISO-8601 start/end strings covering the current local day,
|
||||
// matching pyeconet's formats: energy includes the timezone offset, water does
|
||||
// not (the upstream parser is picky).
|
||||
|
||||
@@ -26,6 +26,11 @@ type Device struct {
|
||||
Running bool // true when actively heating (decoded from @RUNNING over REST)
|
||||
RunningState string // normalized @RUNNING label: "compressor-running" | "element-running" | "idle" | ...
|
||||
|
||||
// modeEnumText is the raw @MODE enum label list; the slice index is the
|
||||
// integer value published to change the mode. Empty for units without a
|
||||
// settable @MODE (mode changes are unsupported for those).
|
||||
modeEnumText []string
|
||||
|
||||
Setpoint int
|
||||
SetpointMin int
|
||||
SetpointMax int
|
||||
@@ -62,9 +67,31 @@ func newDevice(info map[string]json.RawMessage, now time.Time) *Device {
|
||||
d.FriendlyName = friendlyName(info, d.DeviceID)
|
||||
d.Setpoint, d.SetpointMin, d.SetpointMax = setpoint(info["@SETPOINT"])
|
||||
d.Running, d.RunningState = running(info)
|
||||
d.modeEnumText = modeLabels(info)
|
||||
return d
|
||||
}
|
||||
|
||||
// SupportedModes returns the normalized mode slugs this device can be set to,
|
||||
// in publish-index order. Empty for units without a settable @MODE.
|
||||
func (d *Device) SupportedModes() []string {
|
||||
out := make([]string, 0, len(d.modeEnumText))
|
||||
for _, label := range d.modeEnumText {
|
||||
out = append(out, modeFromEnumText(label))
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// modeIndex maps a normalized mode slug to the integer value the EcoNet cloud
|
||||
// expects in a @MODE publish, matching pyeconet's enumText-position lookup.
|
||||
func (d *Device) modeIndex(slug string) (int, bool) {
|
||||
for i, label := range d.modeEnumText {
|
||||
if modeFromEnumText(label) == slug {
|
||||
return i, true
|
||||
}
|
||||
}
|
||||
return 0, false
|
||||
}
|
||||
|
||||
// --- field decoders ------------------------------------------------------
|
||||
|
||||
func connected(info map[string]json.RawMessage) bool {
|
||||
|
||||
@@ -70,3 +70,49 @@ func (s *EconetGRPCServer) GetDevice(ctx context.Context, req *pb.GetDeviceReque
|
||||
span.SetStatus(codes.Ok, "")
|
||||
return &pb.GetDeviceResponse{Device: deviceToProto(d)}, nil
|
||||
}
|
||||
|
||||
// modeSlugs maps the settable proto Mode enum to the normalized slugs the
|
||||
// client (and Device.mode) use. MODE_UNSPECIFIED is intentionally absent;
|
||||
// protovalidate rejects it before we get here.
|
||||
var modeSlugs = map[pb.Mode]string{
|
||||
pb.Mode_MODE_OFF: "off",
|
||||
pb.Mode_MODE_ELECTRIC: "electric",
|
||||
pb.Mode_MODE_ENERGY_SAVING: "energy-saving",
|
||||
pb.Mode_MODE_HEAT_PUMP: "heat-pump",
|
||||
pb.Mode_MODE_HIGH_DEMAND: "high-demand",
|
||||
pb.Mode_MODE_GAS: "gas",
|
||||
pb.Mode_MODE_PERFORMANCE: "performance",
|
||||
pb.Mode_MODE_VACATION: "vacation",
|
||||
}
|
||||
|
||||
func (s *EconetGRPCServer) SetMode(ctx context.Context, req *pb.SetModeRequest) (
|
||||
*pb.SetModeResponse, error,
|
||||
) {
|
||||
ctx, span := s.tracer.Start(ctx, "setMode", trace.WithAttributes(
|
||||
attribute.String("serialNumber", req.GetSerialNumber()),
|
||||
attribute.String("mode", req.GetMode().String()),
|
||||
))
|
||||
defer span.End()
|
||||
|
||||
slug, ok := modeSlugs[req.GetMode()]
|
||||
if !ok {
|
||||
err := status.Errorf(grpccodes.InvalidArgument, "unsupported mode %q", req.GetMode())
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := s.client.SetMode(ctx, req.GetSerialNumber(), slug); err != nil {
|
||||
err := status.Error(grpccodes.FailedPrecondition, err.Error())
|
||||
span.SetStatus(codes.Error, err.Error())
|
||||
return nil, err
|
||||
}
|
||||
|
||||
span.SetStatus(codes.Ok, "")
|
||||
// State applies asynchronously; return the last-known snapshot. Guard against
|
||||
// a concurrent refresh evicting the device between publish and lookup.
|
||||
resp := &pb.SetModeResponse{}
|
||||
if d := s.client.Device(req.GetSerialNumber()); d != nil {
|
||||
resp.Device = deviceToProto(d)
|
||||
}
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
package econetmcp
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
"k8s.io/utils/ptr"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/econet-exporter/api/econet/v1alpha1"
|
||||
)
|
||||
|
||||
var ListDevicesTool = &mcp.Tool{
|
||||
Name: "list_water_heaters",
|
||||
Title: "List EcoNet Water Heaters",
|
||||
Description: "Lists Rheem EcoNet devices and their current state (mode, setpoint, " +
|
||||
"hot water availability, connectivity). Optionally filter to one serial number.",
|
||||
Annotations: &mcp.ToolAnnotations{
|
||||
ReadOnlyHint: true,
|
||||
OpenWorldHint: ptr.To(true),
|
||||
},
|
||||
}
|
||||
|
||||
type ListDevicesParams struct {
|
||||
SerialNumber string `json:"serial_number,omitempty" jsonschema:"Optional device serial number to return a single device"`
|
||||
}
|
||||
|
||||
func (m *EconetMCPServer) addListDevicesTool() {
|
||||
mcp.AddTool(m.server, ListDevicesTool, m.listDevicesHandler)
|
||||
}
|
||||
|
||||
func (m *EconetMCPServer) listDevicesHandler(ctx context.Context, _ *mcp.CallToolRequest, args *ListDevicesParams) (
|
||||
*mcp.CallToolResult, any, error,
|
||||
) {
|
||||
m.log.Debug().Str("serial", args.SerialNumber).Msg("list water heaters tool called")
|
||||
|
||||
devices, err := m.lookup(ctx, args.SerialNumber)
|
||||
if err != nil {
|
||||
return &mcp.CallToolResult{IsError: true, Meta: mcp.Meta{"error": err.Error()}}, nil, err
|
||||
}
|
||||
|
||||
return &mcp.CallToolResult{
|
||||
Content: []mcp.Content{&mcp.TextContent{Text: summarizeDevices(devices)}},
|
||||
}, nil, nil
|
||||
}
|
||||
|
||||
func (m *EconetMCPServer) lookup(ctx context.Context, serial string) ([]*pb.Device, error) {
|
||||
if serial != "" {
|
||||
resp, err := m.econetGRPC.GetDevice(ctx, &pb.GetDeviceRequest{SerialNumber: serial})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return []*pb.Device{resp.GetDevice()}, nil
|
||||
}
|
||||
|
||||
resp, err := m.econetGRPC.ListDevices(ctx, &pb.ListDevicesRequest{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return resp.GetDevices(), nil
|
||||
}
|
||||
|
||||
func summarizeDevices(devices []*pb.Device) string {
|
||||
if len(devices) == 0 {
|
||||
return "No EcoNet devices found."
|
||||
}
|
||||
var b strings.Builder
|
||||
for _, d := range devices {
|
||||
fmt.Fprintf(&b, "%s (%s, serial %s): mode=%s setpoint=%d°F running=%t connected=%t hotWater=%d%% alerts=%d\n",
|
||||
d.GetFriendlyName(), d.GetGenericType(), d.GetSerialNumber(),
|
||||
d.GetMode(), d.GetSetpoint(), d.GetRunning(), d.GetConnected(),
|
||||
d.GetHotWaterAvailability(), d.GetAlertCount())
|
||||
}
|
||||
return strings.TrimRight(b.String(), "\n")
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
package econetmcp
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
pb "gitea.libretechconsulting.com/rmcguire/econet-exporter/api/econet/v1alpha1"
|
||||
)
|
||||
|
||||
func TestSummarizeDevices(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
devices []*pb.Device
|
||||
want string // substring that must appear
|
||||
}{
|
||||
{"empty", nil, "No EcoNet devices found."},
|
||||
{
|
||||
name: "single",
|
||||
devices: []*pb.Device{{
|
||||
FriendlyName: "Garage",
|
||||
GenericType: "heatpumpWaterHeater",
|
||||
SerialNumber: "ABC123",
|
||||
Mode: "heat-pump",
|
||||
Setpoint: 125,
|
||||
}},
|
||||
want: "Garage (heatpumpWaterHeater, serial ABC123): mode=heat-pump setpoint=125",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got := summarizeDevices(tt.devices)
|
||||
if !strings.Contains(got, tt.want) {
|
||||
t.Errorf("summarizeDevices() = %q, want substring %q", got, tt.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,13 @@
|
||||
/*
|
||||
Package econetmcp exposes an MCP server, mounted as an HTTP handler at
|
||||
/api/mcp, whose tools wrap the EconetService gRPC API.
|
||||
Package econetmcpgen exposes an MCP server, mounted as an HTTP handler at
|
||||
/api/mcp, whose tools are generated from the EconetService proto by
|
||||
protoc-gen-go-mcp and forwarded to the in-process gRPC server.
|
||||
|
||||
It is the generated-code counterpart to econetmcp (which hand-writes a single
|
||||
list_water_heaters tool). Both expose an identical package API, so switching
|
||||
between them is a one-line import change in pkg/econet/econet.go.
|
||||
*/
|
||||
package econetmcp
|
||||
package econetmcpgen
|
||||
|
||||
import (
|
||||
"context"
|
||||
@@ -10,8 +15,10 @@ import (
|
||||
|
||||
"gitea.libretechconsulting.com/rmcguire/go-app/pkg/srv/http/opts"
|
||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
||||
"github.com/redpanda-data/protoc-gen-go-mcp/pkg/runtime/gosdk"
|
||||
"github.com/rs/zerolog"
|
||||
|
||||
v1alpha1mcp "gitea.libretechconsulting.com/rmcguire/econet-exporter/api/econet/v1alpha1/v1alpha1mcp"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/config"
|
||||
"gitea.libretechconsulting.com/rmcguire/econet-exporter/pkg/econet/econetgrpc"
|
||||
)
|
||||
@@ -46,14 +53,15 @@ func NewEconetMCPServer(ctx context.Context, cfg *config.ServiceConfig,
|
||||
}
|
||||
|
||||
func (m *EconetMCPServer) GetHandlers() []opts.HTTPHandler {
|
||||
// NOTE: Add other tools here
|
||||
m.addListDevicesTool()
|
||||
// Register the generated tools against the in-process gRPC server via the
|
||||
// go-sdk adapter, so the generated code shares our configured *mcp.Server.
|
||||
v1alpha1mcp.RegisterEconetServiceHandler(gosdk.Wrap(m.server), m.econetGRPC)
|
||||
|
||||
handler := mcp.NewStreamableHTTPHandler(func(*http.Request) *mcp.Server {
|
||||
return m.server
|
||||
}, &mcp.StreamableHTTPOptions{})
|
||||
|
||||
m.log.Debug().Msg("Econet MCP tools ready")
|
||||
m.log.Debug().Msg("Econet MCP tools ready (generated)")
|
||||
|
||||
return []opts.HTTPHandler{
|
||||
{
|
||||
@@ -30,6 +30,22 @@ message Device {
|
||||
google.protobuf.Timestamp last_updated = 18;
|
||||
}
|
||||
|
||||
// Mode is a settable operating mode for a water heater. The values mirror the
|
||||
// kebab-case slugs reported in Device.mode. Not every device supports every
|
||||
// mode; the supported set is device-specific (derived from the unit's reported
|
||||
// mode list), so SetMode validates against the target device.
|
||||
enum Mode {
|
||||
MODE_UNSPECIFIED = 0;
|
||||
MODE_OFF = 1;
|
||||
MODE_ELECTRIC = 2;
|
||||
MODE_ENERGY_SAVING = 3;
|
||||
MODE_HEAT_PUMP = 4;
|
||||
MODE_HIGH_DEMAND = 5;
|
||||
MODE_GAS = 6;
|
||||
MODE_PERFORMANCE = 7;
|
||||
MODE_VACATION = 8;
|
||||
}
|
||||
|
||||
message ListDevicesRequest {}
|
||||
|
||||
message ListDevicesResponse {
|
||||
@@ -44,6 +60,20 @@ message GetDeviceResponse {
|
||||
Device device = 1;
|
||||
}
|
||||
|
||||
message SetModeRequest {
|
||||
string serial_number = 1 [(buf.validate.field).string.min_len = 1];
|
||||
Mode mode = 2 [(buf.validate.field).enum = {
|
||||
defined_only: true
|
||||
not_in: [0]
|
||||
}];
|
||||
}
|
||||
|
||||
message SetModeResponse {
|
||||
// Last-known device state. The mode change is applied asynchronously by the
|
||||
// Rheem cloud, so this reflects the requested mode only after a later poll.
|
||||
Device device = 1;
|
||||
}
|
||||
|
||||
// EconetService exposes read-only access to Rheem EcoNet device state.
|
||||
service EconetService {
|
||||
rpc ListDevices(ListDevicesRequest) returns (ListDevicesResponse) {
|
||||
@@ -52,4 +82,10 @@ service EconetService {
|
||||
rpc GetDevice(GetDeviceRequest) returns (GetDeviceResponse) {
|
||||
option (google.api.http) = {get: "/v1alpha1/devices/{serial_number}"};
|
||||
}
|
||||
rpc SetMode(SetModeRequest) returns (SetModeResponse) {
|
||||
option (google.api.http) = {
|
||||
post: "/v1alpha1/devices/{serial_number}/mode"
|
||||
body: "*"
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user