add site_id

needs OpenVoiceOS/ovos-bus-client#47 companion to JarbasHiveMind/HiveMind-core#74
JarbasHiveMind · Sep 12, 2023 · 64b4f4d · 64b4f4d
1 parent 2f9e55d
commit 64b4f4d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/hivemind_bus_client/client.py b/hivemind_bus_client/client.py
@@ -101,7 +101,7 @@ def __init__(self, key, password=None, crypto_key=None, host='127.0.0.1', port=5
 
         super().__init__(host=host, port=port, ssl=ssl, emitter=EventEmitter())
 
-    def connect(self, bus=FakeBus(), identity=None, protocol=None):
+    def connect(self, bus=FakeBus(), identity=None, protocol=None, site_id=None):
         from hivemind_bus_client.protocol import HiveMindSlaveProtocol
         from hivemind_bus_client.identity import NodeIdentity
         ident = identity or NodeIdentity()
@@ -110,9 +110,13 @@ def connect(self, bus=FakeBus(), identity=None, protocol=None):
             LOG.debug("Initializing HiveMindSlaveProtocol")
             self.protocol = HiveMindSlaveProtocol(self,
                                                   shared_bus=self.share_bus,
+                                                  site_id=site_id or "unknown",
                                                   identity=ident)
         else:
             self.protocol = protocol
+            if site_id is not None:
+                self.protocol.site_id = site_id
+
         LOG.info("Connecting to Hivemind")
         self.run_in_thread()
         self.protocol.bind(bus)

diff --git a/hivemind_bus_client/protocol.py b/hivemind_bus_client/protocol.py
@@ -85,6 +85,7 @@ class HiveMindSlaveProtocol:
     mpubkey: str = ""  # asc public PGP key from master
     shared_bus: bool = False
     binarize: bool = False
+    site_id: str = "unknown"
 
     def bind(self, bus: Optional[MessageBusClient] = None):
         if self.identity is None:
@@ -141,10 +142,12 @@ def start_handshake(self,):
         if self.pswd_handshake is not None:
             envelope = self.pswd_handshake.generate_handshake()
             msg = HiveMessage(HiveMessageType.HANDSHAKE, {"envelope": envelope,
-                                                          "binarize": self.binarize})
+                                                          "binarize": self.binarize,
+                                                          "site_id": self.site_id})
         else:
             msg = HiveMessage(HiveMessageType.HANDSHAKE, {"pubkey": self.handshake.pubkey,
-                                                          "binarize": self.binarize})
+                                                          "binarize": self.binarize,
+                                                          "site_id": self.site_id})
         self.hm.emit(msg)
 
     def receive_handshake(self, envelope):

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
 ovos-bus-client
-ovos_utils
+ovos_utils>=0.0.6a5
 pycryptodomex
 bitstring