Only send messages for operations that exist

Author: SmileyChris

graphql_ws/base.py

@@ -125,9 +125,9 @@ def on_close(self, connection_context):
         return connection_context.unsubscribe_all()
 
     def send_message(self, connection_context, op_id=None, op_type=None, payload=None):
-        message = self.build_message(op_id, op_type, payload)
-        assert message, "You need to send at least one thing"
-        return connection_context.send(message)
+        if op_id is None or connection_context.has_operation(op_id):
+            message = self.build_message(op_id, op_type, payload)
+            return connection_context.send(message)
 
     def build_message(self, id, op_type, payload):
         message = {}
@@ -137,6 +137,7 @@ def build_message(self, id, op_type, payload):
             message["type"] = op_type
         if payload is not None:
             message["payload"] = payload
+        assert message, "You need to send at least one thing"
         return message
 
     def send_execution_result(self, connection_context, op_id, execution_result):

graphql_ws/base_async.py

@@ -142,6 +142,7 @@ async def on_start(self, connection_context, op_id, params):
 
         execution_result = self.execute(params)
 
+        connection_context.register_operation(op_id, execution_result)
         if is_awaitable(execution_result):
             execution_result = await execution_result
 
@@ -157,7 +158,6 @@ async def on_start(self, connection_context, op_id, params):
                     )
             except Exception as e:
                 await self.send_error(connection_context, op_id, e)
-            connection_context.remove_operation(op_id)
         else:
             try:
                 await self.send_execution_result(
@@ -166,8 +166,16 @@ async def on_start(self, connection_context, op_id, params):
             except Exception as e:
                 await self.send_error(connection_context, op_id, e)
         await self.send_message(connection_context, op_id, GQL_COMPLETE)
+        connection_context.remove_operation(op_id)
         await self.on_operation_complete(connection_context, op_id)
 
+    async def send_message(
+        self, connection_context, op_id=None, op_type=None, payload=None
+    ):
+        if op_id is None or connection_context.has_operation(op_id):
+            message = self.build_message(op_id, op_type, payload)
+            return await connection_context.send(message)
+
     async def on_operation_complete(self, connection_context, op_id):
         pass