Merge remote-tracking branch 'origin/master'

Author: ToGoBananas

client_example.py

@@ -10,10 +10,8 @@ def main():
 
     # wait for initialization
     time.sleep(5)  # TODO: extract 'ready' event from thread
-    print(client.emit('event_test'))
-
-    time.sleep(3)
-    print(client.broadcast('event_test'))
+    client.emit('event_test')
+    client.broadcast('event_test')
 
 
 if __name__ == '__main__':

moleculer/client.py

@@ -14,15 +14,23 @@ def on_channel_open(self, channel):
         self.channel: Channel = channel
         self.add_on_channel_close_callback()
         info_queue = 'MOL.INFO.{node_id}'.format(node_id=self.NODE_ID)
+        disconnect_queue = 'MOL.DISCONNECT.{node_id}'.format(node_id=self.NODE_ID)
         self.setup_queue(info_queue)
+        self.setup_queue(disconnect_queue)
         self.channel.queue_bind(self.on_bindok, info_queue, 'MOL.INFO')
+        self.channel.queue_bind(self.on_bindok, disconnect_queue, 'MOL.DISCONNECT')
         self.channel.basic_consume(self.process_info_packages, info_queue)
+        self.channel.basic_consume(self.on_node_disconnect, disconnect_queue)
         self.discover_packet()
 
     def process_info_packages(self, unused_channel, basic_deliver, properties, body):
         info_packet = json.loads(body)
         self.network.add_node(info_packet)
 
+    def on_node_disconnect(self, unused_channel, basic_deliver, properties, body):
+        disconnect_package = json.loads(body)
+        self.network.disconnect_node(disconnect_package['sender'])
+
     def emit(self, event_name, data=None):
         candidates = self.get_emit_candidates(event_name)
         if len(candidates) == 0:
@@ -47,6 +55,12 @@ def broadcast(self, event_name, data=None):
                 queue_name = 'MOL.EVENT.{node_id}'.format(node_id=node_id)
                 self.channel.basic_publish('', queue_name, event_package)
 
+    def call(self):
+        pass
+
+    def dcall(self):
+        pass
+
     def get_emit_candidates(self, event_name):
         service_names = set()
         for node_id, node_info in self.network.NODES.items():

setup.py

@@ -0,0 +1,14 @@
+from distutils.core import setup
+
+setup(
+  name = 'moleculer',
+  packages = ['moleculer'], # this must be the same as the name above
+  version = '0.1',
+  description = 'Moleculer node and client for amqp with json serializer',
+  author = 'Andrei Khaliaukin',
+  author_email = 'endpoo@gmail.com',
+  url = 'https://github.com/ToGoBananas/moleculer-python', # use the URL to the github repo
+  download_url = 'https://github.com/ToGoBananas/moleculer-python/archive/0.1.tar.gz', # I'll explain this in a second
+  keywords = ['moleculer', 'microservices'], # arbitrary keywords
+  classifiers = [],
+)