Foundation for remote control of the bot over websocket

pokecli.py

@@ -148,8 +148,24 @@ def init_config():
         parser,
         load,
         short_flag="-ws",
-        long_flag="--websocket_server",
-        help="Start websocket server (format 'host:port')",
+        long_flag="--websocket.server_url",
+        help="Connect to websocket server at given url",
+        default=False
+    )
+    add_config(
+        parser,
+        load,
+        short_flag="-wss",
+        long_flag="--websocket.start_embedded_server",
+        help="Start embedded websocket server",
+        default=False
+    )
+    add_config(
+        parser,
+        load,
+        short_flag="-wsr",
+        long_flag="--websocket.remote_control",
+        help="Enable remote control through websocket (requires websocekt server url)",
         default=False
     )
     add_config(
@@ -245,7 +261,6 @@ def init_config():
         type=str,
         default=None
     )
-
     add_config(
         parser,
         load,
@@ -374,9 +389,7 @@ def init_config():
     config.item_filter = load.get('item_filter', {})
     config.action_wait_max = load.get('action_wait_max', 4)
     config.action_wait_min = load.get('action_wait_min', 1)
-
     config.raw_tasks = load.get('tasks', [])
-
     config.vips = load.get('vips',{})
 
     if len(config.raw_tasks) == 0:

pokemongo_bot/__init__.py

@@ -63,11 +63,12 @@ def start(self):
     def _setup_event_system(self):
         handlers = [LoggingHandler()]
         if self.config.websocket_server:
-            websocket_handler = SocketIoHandler(self.config.websocket_server)
+            websocket_handler = SocketIoHandler(self.config.websocket_server_url)
             handlers.append(websocket_handler)
 
-            self.sio_runner = SocketIoRunner(self.config.websocket_server)
-            self.sio_runner.start_listening_async()
+            if self.config.websocket_start_embedded_server:
+                self.sio_runner = SocketIoRunner(self.config.websocket_server_url)
+                self.sio_runner.start_listening_async()
 
         self.event_manager = EventManager(*handlers)
 

pokemongo_bot/event_handlers/logging_handler.py

@@ -4,7 +4,10 @@
 
 
 class LoggingHandler(EventHandler):
-    def handle_event(self, event, sender, level, data):
+    def handle_event(self, event, sender, level, formatted_msg, data):
         logger = logging.getLogger(type(sender).__name__)
-        message = '{}: {}'.format(event, str(data))
+        if formatted_msg:
+            message = formatted_msg
+        else:
+            message = '{}: {}'.format(event, str(data))
         getattr(logger, level)(message)

pokemongo_bot/event_handlers/socketio_handler.py

@@ -11,7 +11,14 @@ def __init__(self, url):
         self.host, port_str = url.split(':')
         self.port = int(port_str)
 
-
-    def handle_event(self, event, sender, level, data):
+    def handle_event(self, event, sender, level, msg, data):
+        if msg:
+            date['msg'] = msg
         with SocketIO(self.host, self.port) as sio:
-            sio.emit('bot:broadcast', {'event': event, 'data': data})
+            sio.emit(
+                'bot:broadcast',
+                {
+                    'event': event,
+                    'data': data,
+                }
+            )

pokemongo_bot/event_manager.py

@@ -25,7 +25,7 @@ def add_handler(self, event_handler):
     def register_event(self, name, parameters=None):
         self._registered_events[name] = parameters
 
-    def emit(self, event, sender=None, level='info', data={}):
+    def emit(self, event, sender=None, level='info', formatted=None, data={}):
         if not sender:
             raise ArgumentError('Event needs a sender!')
 
@@ -42,6 +42,8 @@ def emit(self, event, sender=None, level='info', data={}):
             if k not in parameters:
                 raise EventMalformedException("Event %s does not require parameter %s" % (event, k))
 
+        formatted_msg = formatted.format(**data)
+
         # send off to the handlers
         for handler in self._handlers:
-            handler.handle_event(event, sender, level, data)
+            handler.handle_event(event, sender, level, formatted_msg, data)

pokemongo_bot/socketio_server/app.py

@@ -15,6 +15,16 @@
     "websocket_client_connected",
 )
 
+# client asks for data
+@sio.on('remote:send_request')
+def remote_control(sid, command):
+    sio.emit('bot:process_request', data=command)
+
+# sending bot response to client
+@sio.on('bot:send_reply')
+def request_reply(sid, response):
+    sio.emit(response['command'], response['response'])
+
 @sio.on('bot:broadcast')
 def bot_broadcast(sid, env):
     sio.emit(env['event'], data=env['data'])

pokemongo_bot/websocket_remote_control.py

@@ -0,0 +1,48 @@
+import threading
+from socketIO_client import SocketIO, BaseNamespace
+
+
+class WebsocketRemoteControl(object):
+
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.host, port_str = self.bot.config.websocket_server_url.split(':')
+        self.port = int(port_str)
+        self.sio = SocketIO(self.host, self.port)
+        self.sio.on('bot:process_request', self.on_remote_command)
+        self.thread = threading.Thread(target=self.process_messages)
+
+    def start(self):
+        self.thread.start()
+        return self
+
+    def process_messages(self):
+        self.sio.wait()
+
+    def on_remote_command(self, command):
+        name = command['name']
+        command_handler = getattr(self, name, None)
+        if not command_handler or not callable(command_handler):
+            self.sio.emit(
+                'bot:send_reply',
+                {
+                    'response': '',
+                    'command': 'command_not_found'
+                }
+            )
+            return
+        if 'args' in command:
+            command_handler(*args)
+            return
+        command_handler()
+
+    def get_player_info(self):
+        player_info = self.bot.get_inventory()['responses']['GET_INVENTORY']
+        self.sio.emit(
+            'bot:send_reply',
+            {
+                'response': player_info,
+                'command': 'get_player_info'
+            }
+        )