solved issue with correct web socket router url returned in the API

Author: vesellov

bitdust/interface/api.py

@@ -803,11 +803,6 @@ def device_remove(name):
         websocket.send('{"command": "api_call", "method": "device_remove", "kwargs": {"name": "my_iPhone_12"} }');
     """
     from bitdust.interface import api_device
-    if api_device.instances(name):
-        try:
-            api_device.stop_device(name)
-        except Exception as exc:
-            return ERROR(exc)
     try:
         api_device.remove_device(name)
     except Exception as exc:

bitdust/interface/api_device.py

@@ -269,16 +269,15 @@ def add_routed_device(device_name, key_size=4096):
 def remove_device(device_name):
     validate_device_name(device_name)
     device_key_object = devices(device_name)
-    if not device_key_object:
-        raise Exception('device %r does not exist' % device_name)
     if instances(device_name):
         stop_device(device_name)
     device_file_path = os.path.join(settings.DevicesDir(), device_name)
-    if not os.path.isfile(device_file_path):
+    if os.path.isfile(device_file_path):
+        os.remove(device_file_path)
+    else:
         lg.warn('device info file %s does not exist' % device_file_path)
-        return True
-    os.remove(device_file_path)
-    devices().pop(device_name, None)
+    if device_key_object:
+        devices().pop(device_name, None)
     if _Debug:
         lg.args(_DebugLevel, device_name=device_name, device_file_path=device_file_path)
     return True

bitdust/interface/routed_web_socket.py

@@ -459,6 +459,8 @@ def on_incoming_message(self, url, json_data):
             return True
         cmd = json_data.get('cmd')
         if cmd == 'api':
+            if self.active_router_url and self.active_router_url != url:
+                lg.warn('active web socket router %r switched to %r' % (self.active_router_url, url))
             self.active_router_url = url
             self.client_connected = True
             self.event('api-message', url=url, json_data=json_data)
@@ -477,6 +479,8 @@ def on_incoming_message(self, url, json_data):
                 lg.exc()
                 self.automat('auth-error')
                 return False
+            if self.active_router_url and self.active_router_url != url:
+                lg.warn('active web socket router %r switched to %r' % (self.active_router_url, url))
             self.active_router_url = url
             self.automat('client-pub-key-received', client_key_object=client_key_object)
             return True
@@ -934,7 +938,8 @@ def _on_web_socket_handshake_accepted(self, url, route_url):
             if url in self.connecting_routers:
                 self.connecting_routers.remove(url)
         if not self.active_router_url:
-            self.active_router_url = route_url
+            self.active_router_url = url
+            lg.info('connected active web socket router %r' % self.active_router_url)
         self.handshaked_routers.append(route_url)
         handshaked_count = len(self.handshaked_routers)
         if _Debug:

bitdust_forks/Bismuth/connectionmanager.py

@@ -71,4 +71,4 @@ def connection_manager(self):
                     if not self.node.IS_STOPPING:
                         time.sleep(1)
             except Exception as e:
-                self.node.logger.app_log.warning(f'Error in connection manger ({e})')
+                self.node.logger.app_log.warning(f'Error in connection manager ({e})')