Ensure unsubscribe when disabling inspection. Fixes #164

dashboard/dashboard.py

@@ -115,19 +115,24 @@ def on_websocket_message(self, frame: WebsocketFrame) -> None:
 
                 self.reply({'id': message['id'], 'response': 'inspection_enabled'})
         elif message['method'] == 'disable_inspection':
-            if self.inspection_enabled:
-                self.shutdown_relay()
+            self.shutdown_relay()
             self.inspection_enabled = False
             self.reply({'id': message['id'], 'response': 'inspection_disabled'})
         else:
             logger.info(frame.data)
             logger.info(frame.opcode)
+            self.reply({'id': message['id'], 'response': 'not_implemented'})
 
     def shutdown_relay(self) -> None:
+        if not self.inspection_enabled:
+            return
+
         assert self.relay_manager
         assert self.relay_shutdown
         assert self.relay_thread
+        assert self.relay_sub_id
 
+        self.event_queue.unsubscribe(self.relay_sub_id)
         self.relay_shutdown.set()
         self.relay_thread.join()
         self.relay_manager.shutdown()
@@ -140,8 +145,7 @@ def shutdown_relay(self) -> None:
 
     def on_websocket_close(self) -> None:
         logger.info('app ws closed')
-        if self.inspection_enabled:
-            self.shutdown_relay()
+        self.shutdown_relay()
 
     def reply(self, data: Dict[str, Any]) -> None:
         self.client.queue(

proxy/core/event.py

@@ -78,6 +78,14 @@ def subscribe(
             'event_payload': {'sub_id': sub_id, 'channel': channel},
         })
 
+    def unsubscribe(
+            self,
+            sub_id: str) -> None:
+        self.queue.put({
+            'event_name': eventNames.UNSUBSCRIBE,
+            'event_payload': {'sub_id': sub_id},
+        })
+
 
 class EventDispatcher:
     """Core EventDispatcher.