22import json
33import ssl
44from threading import Event
5- from typing import Union , Optional
5+ from typing import Union , Optional , Callable
66
77from ovos_bus_client import Message as MycroftMessage , MessageBusClient as OVOSBusClient
88from ovos_bus_client .session import Session
@@ -32,13 +32,14 @@ class HiveMessageWaiter:
3232 message_type: message type to wait for
3333 """
3434
35- def __init__ (self , bus , message_type : Union [HiveMessageType , str ]):
35+ def __init__ (self , bus : 'HiveMessageBusClient' ,
36+ message_type : Union [HiveMessageType , str ]):
3637 self .bus = bus
3738 self .msg_type = message_type
3839 self .received_msg = None
3940 # Setup response handler
4041 self .response_event = Event ()
41- self .bus .on (message_type , self ._handler )
42+ self .bus .on (self . msg_type , self ._handler )
4243
4344 def _handler (self , message ):
4445 """Receive response data."""
@@ -60,9 +61,12 @@ def wait(self, timeout=3.0):
6061
6162
6263class HivePayloadWaiter (HiveMessageWaiter ):
63- def __init__ (self , payload_type : Union [HiveMessageType , str ],
64+ def __init__ (self , bus : 'HiveMessageBusClient' ,
65+ payload_type : Union [HiveMessageType , str ],
66+ message_type : Union [HiveMessageType , str ] = HiveMessageType .BUS ,
6467 * args , ** kwargs ):
65- super (HivePayloadWaiter , self ).__init__ (* args , ** kwargs )
68+ super (HivePayloadWaiter , self ).__init__ (bus = bus , message_type = message_type ,
69+ * args , ** kwargs )
6670 self .payload_type = payload_type
6771
6872 def _handler (self , message ):
@@ -355,6 +359,12 @@ def on(self, event_name, func):
355359 LOG .debug (f"registering handler: { event_name } )
356360 self .emitter .on (event_name , func )
357361
362+ def remove (self , event_name : str , func : Callable ):
363+ if event_name not in list (HiveMessageType ):
364+ self .internal_bus .remove (event_name , func )
365+ else : # hivemind message
366+ self .emitter .remove_listener (event_name , func )
367+
358368 # utility
359369 def wait_for_message (self , message_type : Union [HiveMessageType , str ], timeout = 3.0 ):
360370 """Wait for a message of a specific type.
@@ -404,10 +414,11 @@ def wait_for_response(self, message: Union[MycroftMessage, HiveMessage],
404414 Returns:
405415 The received message or None if the response timed out
406416 """
407- if isinstance (message , MycroftMessage ):
408- message = HiveMessage (msg_type = HiveMessageType .BUS , payload = message )
409417 message_type = reply_type or message .msg_type
410- waiter = HiveMessageWaiter (self , message_type ) # Setup response handler
418+ if isinstance (message , MycroftMessage ):
419+ waiter = HivePayloadWaiter (bus = self , payload_type = message_type )
420+ else :
421+ waiter = HiveMessageWaiter (bus = self , message_type = message_type ) # Setup response handler
411422 # Send message and wait for it's response
412423 self .emit (message )
413424 return waiter .wait (timeout )
0 commit comments