populate all api messages to remotely connected device

Author: vesellov

bitdust/chat/message_keeper.py

@@ -42,6 +42,7 @@
 from bitdust.logs import lg
 
 from bitdust.interface import api_web_socket
+from bitdust.interface import api_device
 
 from bitdust.crypt import my_keys
 
@@ -155,6 +156,7 @@ def store_message(data, message_id, sender_id, recipient_id, message_type=None,
         lg.warn('message %r was not stored' % message_id)
         return message_json
     api_web_socket.on_stream_message(message_json)
+    api_device.on_stream_message(message_json)
     if _Debug:
         lg.out(_DebugLevel, 'message_keeper.store_message [%s]:%s from %r to %r' % (message_type, message_id, sender_id, recipient_id))
     return message_json

bitdust/interface/api.py

@@ -240,7 +240,9 @@ def enable_model_listener(model_name, request_all=False):
         lg.args(_DebugLevel, m=model_name, request_all=request_all)
     from bitdust.main import listeners
     from bitdust.interface import api_web_socket
+    from bitdust.interface import api_device
     listeners.add_listener(api_web_socket.on_model_changed, model_name)
+    listeners.add_listener(api_device.on_model_changed, model_name)
     if request_all:
         return request_model_data(model_name)
     return OK()
@@ -257,6 +259,7 @@ def disable_model_listener(model_name):
         lg.args(_DebugLevel, m=model_name)
     from bitdust.main import listeners
     from bitdust.interface import api_web_socket
+    from bitdust.interface import api_device
     if model_name == 'key':
         listeners.populate_later('key', stop=True)
     elif model_name == 'conversation':
@@ -276,6 +279,7 @@ def disable_model_listener(model_name):
     elif model_name == 'shared_location':
         listeners.populate_later('shared_location', stop=True)
     listeners.remove_listener(api_web_socket.on_model_changed, model_name)
+    listeners.remove_listener(api_device.on_model_changed, model_name)
     return OK()
 
 

bitdust/interface/api_device.py

@@ -37,6 +37,8 @@
 _Debug = True
 _DebugLevel = 10
 
+_APILogFileEnabled = False
+
 #------------------------------------------------------------------------------
 
 import os
@@ -81,6 +83,8 @@
 
 def init():
     global _AllAPIMethods
+    global _APILogFileEnabled
+    _APILogFileEnabled = settings.config.conf().getBool('logs/api-enabled')
     from bitdust.interface import api
     encrypted_web_socket.SetIncomingAPIMessageCallback(do_process_incoming_message)
     routed_web_socket.SetIncomingAPIMessageCallback(do_process_incoming_message)
@@ -96,6 +100,7 @@ def init():
             'RESULT',
             '_Debug',
             '_DebugLevel',
+            '_APILogFileEnabled',
             'strng',
             'sys',
             'time',
@@ -428,6 +433,7 @@ def reset_authorization(device_name):
 
 def do_process_incoming_message(device_object, json_data):
     global _AllAPIMethods
+    global _APILogFileEnabled
     from bitdust.interface import api
     command = json_data.get('command')
     if command == 'api_call':
@@ -460,8 +466,8 @@ def do_process_incoming_message(device_object, json_data):
         if _Debug:
             lg.out(_DebugLevel, '*** %s  API WS IN  %s(%r)' % (call_id, method, kwargs))
 
-        # if _APILogFileEnabled:
-        #     lg.out(0, '*** %s  WS IN  %s(%r)' % (call_id, method, kwargs), log_name='api', showtime=True)
+        if _APILogFileEnabled:
+            lg.out(0, '*** %s  WS IN %s %s(%r)' % (device_object.device_name, call_id, method, kwargs), log_name='api', showtime=True)
 
         func = getattr(api, method)
         try:
@@ -520,42 +526,38 @@ def _eb(err):
 
 
 def on_event(evt):
-    for inst in instances().values():
-        inst.on_outgoing_message({
-            'cmd': 'push',
-            'type': 'event',
-            'payload': {
-                'event_id': evt.event_id,
-                'data': evt.data,
-            },
-        })
+    push({
+        'cmd': 'push',
+        'type': 'event',
+        'payload': {
+            'event_id': evt.event_id,
+            'data': evt.data,
+        },
+    })
 
 
 def on_stream_message(message_json):
-    for inst in instances().values():
-        inst.on_outgoing_message({
-            'cmd': 'push',
-            'type': 'stream_message',
-            'payload': message_json,
-        })
+    push({
+        'cmd': 'push',
+        'type': 'stream_message',
+        'payload': message_json,
+    })
 
 
 def on_online_status_changed(status_info):
-    for inst in instances().values():
-        inst.on_outgoing_message({
-            'cmd': 'push',
-            'type': 'online_status',
-            'payload': status_info,
-        })
+    push({
+        'cmd': 'push',
+        'type': 'online_status',
+        'payload': status_info,
+    })
 
 
 def on_model_changed(snapshot_object):
-    for inst in instances().values():
-        inst.on_outgoing_message({
-            'cmd': 'push',
-            'type': 'model',
-            'payload': snapshot_object.to_json(),
-        })
+    push({
+        'cmd': 'push',
+        'type': 'model',
+        'payload': snapshot_object.to_json(),
+    })
 
 
 def on_device_client_code_input_received(device_name, client_code):
@@ -566,6 +568,17 @@ def on_device_client_code_input_received(device_name, client_code):
     inst.on_client_code_input_received(client_code)
 
 
+#------------------------------------------------------------------------------
+
+
+def push(json_data):
+    global _APILogFileEnabled
+    for inst in instances().values():
+        inst.on_outgoing_message(json_data)
+        if _APILogFileEnabled:
+            lg.out(0, '*** WS PUSH  %s : %r' % (inst.device_name, json_data), log_name='api', showtime=True)
+
+
 #------------------------------------------------------------------------------
 
 if __name__ == '__main__':

bitdust/interface/routed_web_socket.py

@@ -812,6 +812,7 @@ def doWaitClientCodeInput(self, *args, **kwargs):
         """
         Action method.
         """
+        self.server_code = None
         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: