Merge pull request #809 from vesellov/master

more progress with routed web socket connctions

Author: vesellov

bitdust/access/group_access_donor.py

@@ -67,6 +67,7 @@
 
 
 class GroupAccessDonor(automat.Automat):
+
     """
     This class implements all the functionality of ``group_access_donor()`` state machine.
     """

bitdust/access/shared_access_donor.py

@@ -89,6 +89,7 @@
 
 
 class SharedAccessDonor(automat.Automat):
+
     """
     This class implements all the functionality of the ``shared_access_donor()`` state machine.
     """
@@ -235,6 +236,7 @@ def doSendMyIdentityToUser(self, *args, **kwargs):
         """
         Action method.
         """
+
         def _on_ack(response):
             self.ping_response = time.time()
             self.automat('ack', response)

bitdust/automats/automat.py

@@ -342,6 +342,7 @@ def SetGlobalLogTransitions(value=False):
 
 
 class Automat(object):
+
     """
     Base class of the State Machine Object.
 
@@ -393,6 +394,7 @@ class Automat(object):
     You also must set that flag in the MS Visio document and rebuild the code:
     put ``[post]`` string into the last line of the LABEL shape.
     """
+
     def __init__(self, name, state, debug_level=_DebugLevel, log_events=_Debug, log_transitions=_Debug, publish_events=False, publish_event_state_not_changed=False, publish_fast=True, **kwargs):
         self.id, self.index = create_index(name)
         self.name = name

bitdust/broadcast/broadcast_listener.py

@@ -88,10 +88,12 @@ def A(event=None, *args, **kwargs):
 
 
 class BroadcastListener(automat.Automat):
+
     """
     This class implements all the functionality of the ``broadcast_listener()``
     state machine.
     """
+
     def init(self):
         """
         Method to initialize additional variables and flags at creation phase

bitdust/broadcast/broadcaster_node.py

@@ -94,6 +94,7 @@ def A(event=None, *args, **kwargs):
 
 
 class BroadcasterNode(automat.Automat):
+
     """
     This class implements all the functionality of the ``broadcaster_node()``
     state machine.

bitdust/broadcast/broadcasters_finder.py

@@ -92,6 +92,7 @@ def A(event=None, *args, **kwargs):
 
 
 class BroadcastersFinder(automat.Automat):
+
     """
     This class implements all the functionality of the
     ``broadcasters_finder()`` state machine.

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/chat/nickname_holder.py

@@ -113,6 +113,7 @@ def Destroy():
 
 
 class NicknameHolder(automat.Automat):
+
     """
     This class implements all the functionality of the ``nickname_holder()``
     state machine.

bitdust/chat/nickname_observer.py

@@ -110,10 +110,12 @@ def stop_all():
 
 
 class NicknameObserver(automat.Automat):
+
     """
     This class implements all the functionality of the ``nickname_observer()``
     state machine.
     """
+
     def init(self):
         """
         Method to initialize additional variables and flags at creation of the

bitdust/coins/accountant_node.py

@@ -103,6 +103,7 @@ def A(event=None, *args, **kwargs):
 
 
 class AccountantNode(automat.Automat):
+
     """
     This class implements all the functionality of the ``accountant_node()``
     state machine.

bitdust/coins/accountants_finder.py

@@ -92,6 +92,7 @@ def A(event=None, *args, **kwargs):
 
 
 class AccountantsFinder(automat.Automat):
+
     """
     This class implements all the functionality of the ``accountants_finder()``
     state machine.

bitdust/coins/coins_index.py

@@ -162,6 +162,7 @@ def make_key(self, key):
 
 
 class BaseMD5Index(BaseHashIndex):
+
     def transform_key(self, key):
         return md5(key).digest()
 

bitdust/coins/coins_miner.py

@@ -111,6 +111,7 @@ def A(event=None, *args, **kwargs):
 
 
 class CoinsMiner(automat.Automat):
+
     """
     This class implements all the functionality of the ``coins_miner()`` state
     machine.

bitdust/coins/contract_chain_consumer.py

@@ -87,6 +87,7 @@ def A(event=None, *args, **kwargs):
 
 
 class ContractChainConsumer(automat.Automat):
+
     """
     This class implements all the functionality of the ``contract_chain_consumer()`` state machine.
     """

bitdust/coins/contract_chain_node.py

@@ -105,6 +105,7 @@ def send_to_miner(coins):
 
 
 class Query(object):
+
     def __init__(self, query_dict):
         """
         """

bitdust/coins/customer_contract_executor.py

@@ -119,6 +119,7 @@ def recheck_contract(supplier_idurl):
 
 
 class CustomerContractExecutor(automat.Automat):
+
     """
     This class implements all the functionality of the ``customer_contract_executor()`` state machine.
     """

bitdust/coins/mine_old.py

@@ -150,6 +150,7 @@ def work_from_known_hash(coin_json, prev_hash, simplification=2, starter_length=
 
 
 class MininigCounter(object):
+
     def __init__(self, max_counts, max_seconds):
         self.max_counts = max_counts
         self.max_seconds = max_seconds

bitdust/coins/miner_old.py

@@ -169,6 +169,7 @@ def finish_contract(typ, partner, **kwargs):
 
 
 class Contract(object):
+
     def __init__(self, **kwargs):
         for key, value in kwargs.items():
             setattr(self, key, value)
@@ -178,6 +179,7 @@ def __init__(self, **kwargs):
 
 
 class CoinsMinerNode(object):
+
     def inbox_packet(self, newpacket, info):
         return False
 

bitdust/coins/supplier_contract_executor.py

@@ -129,6 +129,7 @@ def recheck_contract(customer_idurl):
 
 
 class SupplierContractExecutor(automat.Automat):
+
     """
     This class implements all the functionality of the ``supplier_contract_executor()`` state machine.
     """

bitdust/contacts/contactsdb.py

@@ -36,7 +36,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 24
 
 #------------------------------------------------------------------------------
 

bitdust/contacts/identitycache.py

@@ -39,7 +39,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 24
 
 #------------------------------------------------------------------------------
 

bitdust/contacts/identitydb.py

@@ -39,7 +39,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 24
 
 #------------------------------------------------------------------------------
 

bitdust/crypt/encrypted.py

@@ -61,7 +61,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 20
 
 #------------------------------------------------------------------------------
 

bitdust/crypt/signed.py

@@ -49,7 +49,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 20
 
 #------------------------------------------------------------------------------
 

bitdust/currency/geth_service.py

@@ -130,6 +130,7 @@ def make(callback=None):
 
 
 def deploy(callback=None):
+
     def _clone(out, retcode):
         make(callback=callback)
 
@@ -196,6 +197,7 @@ def fake_createprocess(_appName, _commandLine, _processAttributes, _threadAttrib
 
 
 class GethProcessProtocol(protocol.ProcessProtocol):
+
     def __init__(self, callback):
         """
         """

bitdust/customer/supplier_finder.py

@@ -113,6 +113,7 @@ def A(event=None, *args, **kwargs):
 
 
 class SupplierFinder(automat.Automat):
+
     """
     This class implements all the functionality of the ``supplier_finder()``
     state machine.

bitdust/dht/dht_service.py

@@ -34,7 +34,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 10
+_DebugLevel = 24
 
 #------------------------------------------------------------------------------
 
@@ -1244,6 +1244,7 @@ def get_cached_json_value(key, layer_id=0, cache_ttl=DEFAULT_CACHE_TTL):
 
 
 class DHTNode(MultiLayerNode):
+
     def __init__(self, udpPort=4000, dataStores=None, routingTables=None, networkProtocol=None, nodeID=None):
         super(DHTNode, self).__init__(
             udpPort=udpPort,
@@ -1392,6 +1393,7 @@ def reconnect(self, knownNodeAddresses=None):
 
 
 class DHTProtocol(KademliaMultiLayerProtocol):
+
     def __init__(self, node, msgEncoder=encoding.Bencode(), msgTranslator=msgformat.MultiLayerFormat()):
         KademliaMultiLayerProtocol.__init__(self, node, msgEncoder=msgEncoder, msgTranslator=msgTranslator)
         self._counter = count

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()
 
 
@@ -603,11 +607,14 @@ def devices_list(sort=False):
         result = device_object.toDict()
         result['name'] = result.pop('label')
         result['instance'] = None
+        result['url'] = None
         result.pop('body', None)
         result.pop('local_key_id', None)
         device_instance = api_device.instances(device_name)
         if device_instance:
-            result.update({'instance': device_instance.to_json()})
+            result['instance'] = device_instance.to_json()
+            result['instance'].pop('device_name')
+            result['url'] = result['instance'].pop('url', None)
         results.append(result)
     if sort:
         results = sorted(results, key=lambda i: i['label'])
@@ -631,12 +638,15 @@ def device_info(name):
     device_instance = api_device.instances(name)
     result = device_object.toDict()
     result['name'] = result.pop('label')
+    result['url'] = None
     result['instance'] = None
     result.pop('body', None)
     result.pop('local_key_id', None)
     if not device_instance:
         return OK(result)
-    result.update({'instance': device_instance.to_json()})
+    result['instance'] = device_instance.to_json()
+    result['instance'].pop('device_name')
+    result['url'] = result['instance'].pop('url', None)
     return OK(result)
 
 
@@ -728,6 +738,34 @@ def _on_listening_started(success):
     return ret
 
 
+def device_authorization_reset(name, start=True, wait_listening=False):
+    """
+    """
+    from bitdust.interface import api_device
+    if _Debug:
+        lg.args(_DebugLevel, name=name)
+    try:
+        api_device.reset_authorization(device_name=name)
+    except Exception as exc:
+        return ERROR(exc)
+    if not start:
+        return OK()
+    return device_start(name, wait_listening=wait_listening)
+
+
+def device_client_code_input(name, client_code):
+    """
+    """
+    from bitdust.interface import api_device
+    if _Debug:
+        lg.args(_DebugLevel, name=name, client_code=client_code)
+    try:
+        api_device.on_device_client_code_input_received(device_name=name, client_code=client_code)
+    except Exception as exc:
+        return ERROR(exc)
+    return OK()
+
+
 def device_stop(name):
     """
     This will stop accepting incoming connections from given API device and deactivate it.