raise events during api device handshake process

Author: vesellov

bitdust/interface/api.py

@@ -609,6 +609,7 @@ def devices_list(sort=False):
         device_instance = api_device.instances(device_name)
         if device_instance:
             result['instance'] = device_instance.to_json()
+            result['instance'].pop('device_name')
             result['url'] = result['instance'].pop('url', None)
         results.append(result)
     if sort:
@@ -640,6 +641,7 @@ def device_info(name):
     if not device_instance:
         return OK(result)
     result['instance'] = device_instance.to_json()
+    result['instance'].pop('device_name')
     result['url'] = result['instance'].pop('url', None)
     return OK(result)
 

bitdust/interface/routed_web_socket.py

@@ -89,6 +89,8 @@
 
 from bitdust.dht import dht_records
 
+from bitdust.main import events
+
 from bitdust.p2p import lookup
 
 from bitdust.services import driver
@@ -420,6 +422,7 @@ def init(self):
         self.active_router_url = None
         self.handshaked_routers = []
         self.server_code = None
+        self.device_name = None
 
     def state_changed(self, oldstate, newstate, event, *args, **kwargs):
         """
@@ -438,6 +441,7 @@ def to_json(self, short=True):
             'url': self.active_router_url,
             'connected_routers': self.handshaked_routers,
             'server_code': self.server_code,
+            'device_name': self.device_name,
         })
         return ret
 
@@ -759,6 +763,7 @@ def doGenerateServerCode(self, *args, **kwargs):
             self.server_code = BITDUST_WEB_SOCKET_SERVER_CODE_GENERATED.strip()
         else:
             self.server_code = cipher.generate_digits(6, as_text=True)
+        events.send('web-socket-handshake-started', data=self.to_json())
         if _Debug:
             lg.args(_DebugLevel, server_code=self.server_code)
 
@@ -807,6 +812,7 @@ def doWaitClientCodeInput(self, *args, **kwargs):
         """
         Action method.
         """
+        events.send('web-socket-handshake-proceeding', data=self.to_json())
         BITDUST_WEB_SOCKET_CLIENT_CODE_INPUT = os.environ.get('BITDUST_WEB_SOCKET_CLIENT_CODE_INPUT', None)
         if BITDUST_WEB_SOCKET_CLIENT_CODE_INPUT:
             self.on_client_code_input_received(BITDUST_WEB_SOCKET_CLIENT_CODE_INPUT.strip())

bitdust/p2p/network_service.py

@@ -34,7 +34,7 @@
 
 #------------------------------------------------------------------------------
 
-_Debug = True
+_Debug = False
 _DebugLevel = 10
 
 #------------------------------------------------------------------------------