pymscada 0.1.11b5__tar.gz → 0.1.11b7__tar.gz

{pymscada-0.1.11b5 → pymscada-0.1.11b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pymscada
-Version: 0.1.11b5
+Version: 0.1.11b7
 Summary: Shared tag value SCADA with python backup and Angular UI
 Author-Email: Jamie Walton <jamie@walton.net.nz>
 License: GPL-3.0-or-later

{pymscada-0.1.11b5 → pymscada-0.1.11b7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pymscada"
-version = "0.1.11b5"
+version = "0.1.11b7"
 description = "Shared tag value SCADA with python backup and Angular UI"
 authors = [
     { name = "Jamie Walton", email = "jamie@walton.net.nz" },

{pymscada-0.1.11b5 → pymscada-0.1.11b7}/src/pymscada/www_server.py

@@ -56,27 +56,15 @@ class WSHandler():
         try:
             while True:
                 as_bytes, message = await self.queue.get()
-                if self.ws.closed:
-                    logging.debug(f'{self.rta_id}: WebSocket closed, stopping send_queue')
-                    break
-                try:
-                    if as_bytes:
-                        await self.ws.send_bytes(message)
-                    else:
-                        await self.ws.send_json(message)
-                except ConnectionResetError:
-                    logging.debug(f'{self.rta_id}: Connection reset, stopping send_queue')
-                    break
-                except Exception as e:
-                    logging.warning(f'{self.rta_id}: Error sending message: {e}')
-                    break
+                if as_bytes:
+                    # logging.debug(f'{self.rta_id} as bytes {message}')
+                    await self.ws.send_bytes(message)
+                else:
+                    # logging.debug(f'{self.rta_id} as json {message}')
+                    await self.ws.send_json(message)
         except asyncio.CancelledError:
-            logging.debug(f'{self.rta_id}: Send queue cancelled')
-        finally:
-            # Clean up subscriptions when the connection ends
-            for tag in self.tag_by_id.values():
-                tag.del_callback_id(self.notify_id)
-                tag.del_callback(self.publish)
+            logging.warning(f'{self.rta_id}: send queue error, close '
+                            f'{self.ws.exception()}')
 
     def publish(self, tag: Tag):
         """
@@ -194,6 +182,8 @@ class WSHandler():
                 if action == 'set':  # pc.CMD_SET
                     self.tag_by_name[tagname].value = value, time_us, bus
                 elif action == 'rta':  # pc.CMD_RTA
+                    if tagname not in self.tag_by_name:
+                        self.do_sub(tagname)
                     if 'File' in value:
                         file = await anext(self.ws)
                         value['_file_data'] = file.data