feat: support more api features

Author: firstof9

openevsehttp/__init__.py

@@ -360,6 +360,8 @@ def _update_status(self, msgtype, data, error):
             _LOGGER.debug("ws_data: %s", data)
             if "wh" in data.keys():
                 data["watthour"] = data.pop("wh")
+            elif "config_version" in data.keys():
+                self.update()
             self._status.update(data)
 
             if self.callback is not None:
@@ -922,6 +924,57 @@ def charging_power(self) -> float | None:
             return round(self._status["voltage"] * self._status["amp"], 2)
         return None
 
+    @property
+    def shaper_active(self) -> bool | None:
+        """Return if shper is active."""
+        if self._status is not None and "shaper" in self._status:
+            return bool(self._status["shaper"])
+        return None
+
+    @property
+    def shaper_live_power(self) -> int | None:
+        """Return shaper live power reading."""
+        if self._status is not None and "shaper_live_pwr" in self._status:
+            return self._status["shaper_live_pwr"]
+        return None
+
+    @property
+    def shaper_current_power(self) -> int | None:
+        """Return shaper live power reading."""
+        if self._status is not None and "shaper_cur" in self._status:
+            if self._status["shaper_cur"] == 255:
+                return self._status["pilot"]
+            return self._status["shaper_cur"]
+        return None
+
+    @property
+    def shaper_max_power(self) -> int | None:
+        """Return shaper live power reading."""
+        if self._status is not None and "shaper_max_pwr" in self._status:
+            return self._status["shaper_max_pwr"]
+        return None
+
+    @property
+    def vehicle_soc(self) -> int | None:
+        """Return battery level."""
+        if self._status is not None and "vehicle_soc" in self._status:
+            return self._status["vehicle_soc"]
+        return None
+
+    @property
+    def vehicle_range(self) -> int | None:
+        """Return battery range."""
+        if self._status is not None and "vehicle_range" in self._status:
+            return self._status["vehicle_range"]
+        return None
+
+    @property
+    def vehicle_eta(self) -> int | None:
+        """Return tiem to full charge."""
+        if self._status is not None and "vehicle_eta" in self._status:
+            return self._status["vehicle_eta"]
+        return None
+
     # There is currently no min/max amps JSON data
     # available via HTTP API methods
     @property

tests/fixtures/v4_json/status.json

@@ -41,5 +41,12 @@
     "divert_update": 11,
     "ota_update": 0,
     "time": "2021-08-10T23:00:11Z",
-    "offset": "-0700"
+    "offset": "-0700",
+    "shaper": 1,
+    "shaper_live_pwr": 2299, 
+    "shaper_max_pwr": 4000, 
+    "shaper_cur": 21,
+    "vehicle_soc": "75%",
+    "vehicle_range": "468KM",
+    "vehicle_eta": 18000
   }

tests/test_init.py

@@ -823,3 +823,80 @@ async def test_evse_restart(test_charger_v2, mock_aioclient, caplog):
     with caplog.at_level(logging.DEBUG):
         await test_charger_v2.restart_evse()
     assert "EVSE Restart response: $OK^20" in caplog.text
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", True), ("test_charger_v2", None)]
+)
+async def test_shaper_active(fixture, expected, request):
+    """Test shaper_active reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.shaper_active
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", 2299), ("test_charger_v2", None)]
+)
+async def test_shaper_live_power(fixture, expected, request):
+    """Test shaper_live_power reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.shaper_live_power
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", 21), ("test_charger_v2", None)]
+)
+async def test_shaper_current_power(fixture, expected, request):
+    """Test shaper_current_power reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.shaper_current_power
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", 4000), ("test_charger_v2", None)]
+)
+async def test_shaper_max_power(fixture, expected, request):
+    """Test shaper_max_power reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.shaper_max_power
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", "75%"), ("test_charger_v2", None)]
+)
+async def test_vehicle_soc(fixture, expected, request):
+    """Test vehicle_soc reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.vehicle_soc
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", "468KM"), ("test_charger_v2", None)]
+)
+async def test_vehicle_range(fixture, expected, request):
+    """Test vehicle_range reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.vehicle_range
+    assert status == expected
+
+
+@pytest.mark.parametrize(
+    "fixture, expected", [("test_charger", 18000), ("test_charger_v2", None)]
+)
+async def test_vehicle_eta(fixture, expected, request):
+    """Test vehicle_eta reply."""
+    charger = request.getfixturevalue(fixture)
+    await charger.update()
+    status = charger.vehicle_eta
+    assert status == expected