Add support for Shelly Gen2 power meters

Only ones implementing the "Switch" component for now

src/config.ts

@@ -6,7 +6,14 @@ import {
 } from './iotawatt'
 import { getSensorData as getVirtualSensorData } from './virtual'
 import { getSensorData as getUnmeteredSensorData } from './unmetered'
-import { CharacteristicsSensorType, SensorType, UnmeteredSensor, VirtualSensor } from './sensor'
+import {
+  CharacteristicsSensorType,
+  SensorType,
+  ShellySensor,
+  ShellyType,
+  UnmeteredSensor,
+  VirtualSensor,
+} from './sensor'
 import { Circuit, CircuitType } from './circuit'
 import { Publisher, PublisherType } from './publisher'
 import { InfluxDBPublisher, InfluxDBPublisherImpl } from './publisher/influxdb'
@@ -29,6 +36,14 @@ export const parseConfig = (configFileContents: string): Config => {
     if (circuit.type === undefined) {
       circuit.type = CircuitType.Circuit
     }
+
+    if (circuit.sensor.type === SensorType.Shelly) {
+      // Use Gen1 as default Shelly type
+      const shellySensor = circuit.sensor as ShellySensor
+      if (shellySensor.shelly.type === undefined) {
+        shellySensor.shelly.type = ShellyType.Gen1
+      }
+    }
   }
 
   // Resolve parent relationships

src/sensor.ts

@@ -8,6 +8,11 @@ export enum SensorType {
   Unmetered = 'unmetered',
 }
 
+export enum ShellyType {
+  Gen1 = 'gen1',
+  Gen2PM = 'gen2-pm',
+}
+
 export enum CharacteristicsSensorType {
   Iotawatt = 'iotawatt',
 }
@@ -40,6 +45,7 @@ export interface IotawattCharacteristicsSensor extends CharacteristicsSensor {
 
 interface ShellySensorSettings {
   address: string
+  type: undefined | ShellyType
   meter: number
 }
 

src/shelly.ts

@@ -1,19 +1,52 @@
-import { emptySensorData, PowerSensorData, PowerSensorPollFunction, ShellySensor } from './sensor'
+import { emptySensorData, PowerSensorData, PowerSensorPollFunction, ShellySensor, ShellyType } from './sensor'
 import { Circuit } from './circuit'
 import { getDedupedResponse } from './http/client'
+import { AxiosResponse } from 'axios'
 
-type MeterResult = {
+type Gen1MeterResult = {
   power: number
 }
 
-type StatusResult = {
-  meters: MeterResult[]
+type Gen1StatusResult = {
+  meters: Gen1MeterResult[]
+}
+
+type Gen2GetStatusResult = {
+  apower: number
 }
 
 const getSensorDataUrl = (sensor: ShellySensor): string => {
   const address = sensor.shelly.address
+  const meter = sensor.shelly.meter
+
+  // Request a different endpoint depending on what type of Shelly we're dealing with
+  switch (sensor.shelly.type as ShellyType) {
+    case ShellyType.Gen2PM:
+      return `http://${address}/rpc/Switch.GetStatus?id=${meter}`
+    case ShellyType.Gen1:
+      return `http://${address}/status`
+  }
+}
+
+const parseGen1Response = (timestamp: number, circuit: Circuit, httpResponse: AxiosResponse): PowerSensorData => {
+  const sensor = circuit.sensor as ShellySensor
+  const data = httpResponse.data as Gen1StatusResult
+
+  return {
+    timestamp: timestamp,
+    circuit: circuit,
+    watts: data.meters[sensor.shelly.meter].power,
+  }
+}
+
+const parseGen2PMResponse = (timestamp: number, circuit: Circuit, httpResponse: AxiosResponse): PowerSensorData => {
+  const data = httpResponse.data as Gen2GetStatusResult
 
-  return `http://${address}/status`
+  return {
+    timestamp: timestamp,
+    circuit: circuit,
+    watts: data.apower,
+  }
 }
 
 export const getSensorData: PowerSensorPollFunction = async (
@@ -24,13 +57,14 @@ export const getSensorData: PowerSensorPollFunction = async (
   const url = getSensorDataUrl(sensor)
 
   try {
-    const result = await getDedupedResponse(timestamp, url)
-    const data = result.data as StatusResult
+    const httpResponse = await getDedupedResponse(timestamp, url)
 
-    return {
-      timestamp: timestamp,
-      circuit: circuit,
-      watts: data.meters[sensor.shelly.meter].power,
+    // Parse the response differently depending on what type of Shelly we're dealing with
+    switch (sensor.shelly.type as ShellyType) {
+      case ShellyType.Gen1:
+        return parseGen1Response(timestamp, circuit, httpResponse)
+      case ShellyType.Gen2PM:
+        return parseGen2PMResponse(timestamp, circuit, httpResponse)
     }
   } catch (e) {
     console.error((e as Error).message)