Merge pull request #15 from tubleronchik/master

Generate pubkey

Author: Vourhey

src/stations/.vscode/settings.json

@@ -6,16 +6,22 @@
 import json
 import cgi
 import nacl.signing
+import copy
 
 from stations import IStation, StationData, Measurement, STATION_VERSION
-#from collections import deque
 from http.server import BaseHTTPRequestHandler, HTTPServer
 
-#q = deque()
 
 thlock = threading.RLock()
 sessions = dict()
 
+def _generate_pubkey() -> str:
+    signing_key = nacl.signing.SigningKey.generate()
+    verify_key = signing_key.verify_key
+    verify_key_hex = bytes(verify_key).hex()
+    return str(verify_key_hex)
+
+
 class RequestHandler(BaseHTTPRequestHandler):
 
     def _set_headers(self):
@@ -29,19 +35,14 @@ def do_HEAD(self):
     def do_GET(self):
         self._set_headers()
 
-    def _generate_pubkey(self) -> str:
-        signing_key = nacl.signing.SigningKey.generate()
-        verify_key = signing_key.verify_key
-        verify_key_hex = bytes(verify_key).hex()
-        return str(verify_key_hex)
 
-    def parser(self, data) -> Measurement:
+    def _parser(self, data: dict) -> Measurement:
         global sessions
         global thlock
         #rospy.loginfo(f"parser data: {data}")
         try:
             if data["esp8266id"]:
-                self.client_id = data["esp8266id"]
+                self.client_id = int(data["esp8266id"])
             for d in data["sensordatavalues"]:
                 if d["value_type"] == "SDS_P1":
                     pm10 = float(d["value"])
@@ -57,7 +58,7 @@ def parser(self, data) -> Measurement:
             with thlock:
                 if self.client_id not in sessions:
                     #rospy.loginfo(f"There is no such address: {self.client_address}")
-                    public = self._generate_pubkey()
+                    public = _generate_pubkey()
                 else:
                     #rospy.loginfo(f"Found such address: {self.client_address}")
                     public = sessions[self.client_id].public
@@ -84,7 +85,7 @@ def do_POST(self):
         length = int(self.headers.get("content-length"))
         self.data = json.loads(self.rfile.read(length))
         rospy.loginfo(self.data)
-        meas = self.parser(self.data)
+        meas = self._parser(self.data)
         rospy.loginfo(meas)
         with thlock:
             if meas:
@@ -116,7 +117,7 @@ def __init__(self, config: dict):
         self.version = f"airalab-http-{STATION_VERSION}"
         self.DEAD_SENSOR_TIME = 60*60 # 1 hour
 
-    def get_data(self):
+    def get_data(self) -> StationData:
         global sessions
         rospy.loginfo(sessions)
 
@@ -138,9 +139,12 @@ def _drop_dead_sensors(self) -> dict:
         stripped = dict()
         current_time = int(time.time())
         with thlock:
-            for k, v in sessions.items():
+            sessions_copy = copy.deepcopy(sessions)
+            for k, v in sessions_copy.items():
                 if (current_time - v.timestamp) < self.DEAD_SENSOR_TIME:
                     stripped[k] = v
+                else:
+                    del sessions[k]
 
         return stripped