From 5d43a77fb09814f566a65a7e0845f976235cf58f Mon Sep 17 00:00:00 2001
From: Christopher Pitstick <cmp@pitstick.net>
Date: Sat, 11 Jan 2025 23:13:58 -0500
Subject: [PATCH] Restore missing functions

---
 proxy/server.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/proxy/server.py b/proxy/server.py
index 6ed3049..995d2e6 100755
--- a/proxy/server.py
+++ b/proxy/server.py
@@ -287,14 +287,14 @@ def __init__(self, *args, configuration: PROXY_CONFIG, pw: pypowerwall.Powerwall
 
     def log_message(self, log_format, *args):
         if self.configuration[CONFIG_TYPE.PW_DEBUG]:
-            log.debug("%s %s" % (self.address_string(), log_format % args))
+            log.debug(f"{self.address_string()} {log_format % args}")
 
     def address_string(self):
         # replace function to avoid lookup delays
         hostaddr, hostport = self.client_address[:2]
         return hostaddr
 
-    def send_json_response(self, data, status_code=HTTPStatus.OK, content_type='application/json'):
+    def send_json_response(self, data, status_code=HTTPStatus.OK, content_type='application/json') -> bool:
         response = json.dumps(data)
         try:
             self.send_response(status_code)
@@ -302,9 +302,12 @@ def send_json_response(self, data, status_code=HTTPStatus.OK, content_type='appl
             self.send_header('Content-Length', str(len(response)))
             self.send_header("Access-Control-Allow-Origin", "*")
             self.end_headers()
-            self.wfile.write(response.encode(UTF_8))
+            if self.wfile.write(response.encode(UTF_8)) > 0:
+                return True
         except Exception as exc:
             log.debug(f"Error sending response: {exc}")
+        return False
+
 
     def handle_control_post(self) -> bool:
         """Handle control POST requests."""
@@ -474,14 +477,14 @@ def handle_aggregates(self):
         self.send_json_response(aggregates)
 
 
-    def handle_soe(self):
+    def handle_soe(self) -> bool:
         soe = self.pw.poll('/api/system_status/soe', jsonformat=True)
-        self.send_json_response(json.loads(soe))
+        return self.send_json_response(json.loads(soe))
 
 
-    def handle_soe(self):
-        soe = self.pw.poll('/api/system_status/soe', jsonformat=True)
-        self.send_json_response(json.loads(soe))
+    def handle_soe_scaled(self) -> bool:
+        level = self.pw.level(scale=True)
+        return self.send_json_response({"percentage": level})
 
 
     def handle_grid_status(self):
@@ -752,6 +755,9 @@ def handle_help(self):
     def handle_problems(self):
         self.send_json_response({"problems": []})
 
+    def handle_allowlist(self, path) -> bool:
+        response = self.pw.poll(path, jsonformat=True)
+        return self.send_json_response(json.loads(response))
 
     def handle_tedapi(self, path):
         if not self.pw.tedapi: