Commit graph

44 commits

Author SHA1 Message Date
Brian Martin
5ac6663502 fix send_command payloadType
Used toType instead of payloadType...
2019-10-01 20:20:23 -04:00
Brian Martin
e233fe933e send_command json instead of str
send_command json instead of str
2019-10-01 16:27:58 -04:00
Brian Martin
c8acac767f More MQTT Logging
MQTT Server logs routed to mqttserver.log
2019-09-27 17:25:57 -04:00
Brian Martin
2663c46d52 remove a few try
remove a few try
2019-06-20 21:05:36 -04:00
Brian Martin
7fc7cb80cb api - restart_{service}
add restart_{service}

- restart_Helperbot
- restart_MQTTServer

- Removed a few outstanding references to threads
2019-06-20 08:48:01 -04:00
Brian Martin
58b3567887 split models and db from init
Move models into their own file
Move db functions into their own file
Update tests
2019-06-19 09:29:45 -04:00
Brian Martin
b48905b4e4 catch bot errors in log
Close #10
- New boterror log
- Works for MQTT and XMPP
2019-06-19 07:29:12 -04:00
Brian Martin
6c429b93e6 more grace
more graceful shutdown and error handling
2019-06-07 00:54:12 -04:00
Brian Martin
4e46d7e810 add autoflake
add autoflake
remove unused imports
2019-06-06 23:18:28 -04:00
Brian Martin
72f3b5d049 change execution
bumper.start/shutdown
- allow envionrment variables (prep for docker)
- move bumper.db to new "data" directory
start_bumper reworked
- use argparse
2019-06-06 22:46:40 -04:00
Brian Martin
105f0ad632 more mqtt tests
more mqtt tests
2019-06-04 17:29:39 -04:00
Brian Martin
c3098e03e4 Format with black
Formatting code with black
- pipenv update
2019-05-30 06:55:15 -04:00
Brian Martin
2dd59a5b98 STARTTLS working
Addresses #35

Re-worked XMPP to use protocol and adds support for STARTTLS.

Re-worked start and added graceful close on Ctrl+C
2019-05-29 20:48:47 -04:00
Brian Martin
2460182f4f Fix the things
XMPP is now async and works - Closes #27
Full async - Closes #22
Individual log files - Closes #21
2019-05-23 09:01:30 -04:00
Brian Martin
3ae24976af
Merge branch 'dev_broken-XMPP' into fix-#31 2019-05-21 10:28:24 -04:00
Brian Martin
5bf202189d Return 500 errors for command timeout
Bumper was returning an invalid errno when a command for MQTT would timeout.  Change to return a 500 errno with a debug message.

Closes #31
2019-05-21 10:13:21 -04:00
Brian Martin
d238ded6c1 Better MQTT logging and asyncio debug on
Better MQTT logging and asyncio debug on
2019-05-18 08:35:08 -04:00
Brian Martin
652a0b0e9b Fix command_responses
Final removal of contextvars
2019-05-12 15:42:47 -04:00
Brian Martin
d6816a02ec Remove vars
Start removal
2019-05-12 15:31:52 -04:00
Brian Martin
a296f038a7 rearrange start to use asyncio
Create an asyncio loop then start confservers, mqtt, and mqtthelper in loop.

TODO: Re-work xmpp for asyncio
2019-03-21 21:19:29 -04:00
Brian Martin
5efd5112a2 Cleanup remaining contextvar
Remove remaining context vars
Fix minor formatting
Rename bumper.py to run_bumper.py to remove conflict with module name
2019-03-18 13:13:38 -04:00
Brian Martin
a1ff95cc23 Add session to mqtt
Add session to mqtt
2019-03-17 11:35:52 -04:00
Brian Martin
af3e4ab1ce reformat files with black
reformat files with black
2019-03-11 21:32:55 -04:00
Brian Martin
8806e804f0 Updated confserver
Updated confserver to use tinydb and set users, tokens, authcodes
2019-03-03 10:28:52 -05:00
Brian Martin
a4fec85717 WIP: Bot and Client
- Using tinydb
- Bot and clients tracked in db
2019-03-02 16:33:56 -05:00
Brian Martin
e97b28a5c8 ozmo xmpp authentication
ozmo auths and shows up in the app
2019-02-24 02:29:40 -05:00
Brian Martin
e7e41ed56b add black and format 2019-02-22 00:09:19 -05:00
Brian Martin
e17a0cb30b cleaning up formatting
cleaning up formatting
2019-02-20 21:17:35 -05:00
Brian Martin
0a5d93b099 update auth mechanisms
use_auth allows the newer auth mechanisms to be optional
changes and fixes to support
TODO: need to get a bot that would connect on XMPP or get sniffed traffic to see the login details
2019-02-20 02:53:49 -05:00
Brian Martin
d316862120 Handle connected states 2019-02-20 00:00:06 -05:00
Brian Martin
716a067be8 auth for mqtt and rename bot
Add auth for mqtt and rename bot
2019-02-17 11:01:38 -05:00
Brian Martin
54325fbe29 add basic auth
Add a very basic authentication and user system
2019-02-16 23:37:54 -05:00
Brian Martin
acbcb8707a Revamp xmpp and rearranging code
Rework XMPP to support iq and sasl auth
Organize and rework the run code
Support for threading
2019-02-15 23:12:33 -05:00
Brian Martin
a1b1b1a23b Manageable logging
Manageable logging
2019-02-06 10:42:50 -05:00
Brian Martin
eb4cb2b996 Try except
Try except
2019-02-05 22:08:51 -05:00
Brian Martin
f7d91aa650 Split bots and clients, Fix XMPP threads not exiting
Split bots and clients, Fix XMPP threads not exiting
2019-02-03 16:16:29 -05:00
Brian Martin
d9bf97ce57 Remove paho and use hbmqtt for helper
Remove paho and use hbmqtt for helper
Fix sleep bug
2019-02-02 04:57:47 -05:00
Brian Martin
99508f25dc Fix logging
Fix logging
2019-02-01 18:05:26 -05:00
Brian Martin
e3179d36a8 Change Confserver to AIOHTTP
Change Confserver to AIOHTTP
Better threading and performance across
2019-02-01 17:19:07 -05:00
Brian Martin
98068046e9 Working with app and Add CA
Tested with the EcoVacs app, almost everything works.
CA Added for managing certs.  A self-signed may work as well. TBD
2019-02-01 01:47:14 -05:00
Brian Martin
58e7ce0653 WIP: Working POC
Basics are in and this can act as a bumper server for control of D901.
TODO: Better threading and cleanup
2019-01-31 09:43:06 -05:00
Brian Martin
b184e1c2c6 Add bumper plugin to mqtt 2019-01-30 10:20:54 -05:00
Brian Martin
134d698eeb WIP: Moving along
Getting closer to handling
2019-01-30 02:24:02 -05:00
Brian Martin
2e874307ed WIP: MQTT 2019-01-29 08:35:10 -05:00