-
Notifications
You must be signed in to change notification settings - Fork 1.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Foundation for remote control of the bot over websocket #2000
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
774e852
improved websocket and logging handler
douglascamata db59e8a
added support for remote command execution through websocket and a pl…
douglascamata 08eb339
Merge branch 'dev' of github.com:PokemonGoF/PokemonGo-Bot into featur…
douglascamata daaa74f
adding a missing variable
douglascamata e022b51
only execute remote command if it exists and is callable, else return…
douglascamata ff36396
wait forever instead of 5 secs in an infinite loop
douglascamata File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. oh shit, I deleted a line |
||
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' | ||
} | ||
) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do we need this
formatted_msg
for? It seems like it would make logging more complicated if things are sending event, formatted_msg and data.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
because we might want to have logger messages with real text,
Pokemon Foobar (CP X IV Y) was caught!
instead of just parameters for eventsevent: catch pokemon, data: {CP: X, name: Foobar, IV: Y}