mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Format with black

Browse source 
Formatting code with black
- pipenv update
This commit is contained in:
Brian Martin 2019-05-30 06:55:15 -04:00
parent 401af5652f
commit c3098e03e4
8 changed files with 741 additions and 663 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Pipfile.lock generated
View file

@ -333,11 +333,11 @@
}, },
"pbr": { "pbr": {
"hashes": [ "hashes": [
"sha256:6901995b9b686cb90cceba67a0f6d4d14ae003cd59bc12beb61549bdfbe3bc89", "sha256:0ce920b865091450bbcd452b35cf6d6eb8a6d9ce13ad2210d6e77557f85cf32b",
"sha256:d950c64aeea5456bbd147468382a5bb77fe692c13c9f00f0219814ce5b642755" "sha256:93d2dc6ee0c9af4dbc70bc1251d0e545a9910ca8863774761f92716dece400b6"
], ],
"index": "pypi", "index": "pypi",
"version": "==5.2.0" "version": "==5.2.1"
}, },
"pylint": { "pylint": {
"hashes": [ "hashes": [

146
bumper/__init__.py
View file

@ -27,7 +27,9 @@ db = None
# Logs # Logs
os.makedirs("logs", exist_ok=True) # Ensure logs directory exists or create os.makedirs("logs", exist_ok=True) # Ensure logs directory exists or create
# Set format for all logs # Set format for all logs
logformat = logging.Formatter("[%(asctime)s] :: %(levelname)s :: %(name)s :: %(module)s :: %(funcName)s :: %(lineno)d :: %(message)s") logformat = logging.Formatter(
"[%(asctime)s] :: %(levelname)s :: %(name)s :: %(module)s :: %(funcName)s :: %(lineno)d :: %(message)s"
)
bumperlog = logging.getLogger("bumper") bumperlog = logging.getLogger("bumper")
bumper_rotate = RotatingFileHandler("logs/bumper.log", maxBytes=5000000, backupCount=5) bumper_rotate = RotatingFileHandler("logs/bumper.log", maxBytes=5000000, backupCount=5)
@ -37,28 +39,36 @@ bumperlog.addHandler(bumper_rotate)
# bumperlog.setLevel(logging.INFO) # bumperlog.setLevel(logging.INFO)
confserverlog = logging.getLogger("confserver") confserverlog = logging.getLogger("confserver")
conf_rotate = RotatingFileHandler("logs/confserver.log", maxBytes=5000000, backupCount=5) conf_rotate = RotatingFileHandler(
"logs/confserver.log", maxBytes=5000000, backupCount=5
)
conf_rotate.setFormatter(logformat) conf_rotate.setFormatter(logformat)
confserverlog.addHandler(conf_rotate) confserverlog.addHandler(conf_rotate)
# Override the logging level # Override the logging level
# confserverlog.setLevel(logging.INFO) # confserverlog.setLevel(logging.INFO)
mqttserverlog = logging.getLogger("mqttserver") mqttserverlog = logging.getLogger("mqttserver")
mqtt_rotate = RotatingFileHandler("logs/mqttserver.log", maxBytes=5000000, backupCount=5) mqtt_rotate = RotatingFileHandler(
"logs/mqttserver.log", maxBytes=5000000, backupCount=5
)
mqtt_rotate.setFormatter(logformat) mqtt_rotate.setFormatter(logformat)
mqttserverlog.addHandler(mqtt_rotate) mqttserverlog.addHandler(mqtt_rotate)
# Override the logging level # Override the logging level
# mqttserverlog.setLevel(logging.INFO) # mqttserverlog.setLevel(logging.INFO)
helperbotlog = logging.getLogger("helperbot") helperbotlog = logging.getLogger("helperbot")
helperbot_rotate = RotatingFileHandler("logs/helperbot.log", maxBytes=5000000, backupCount=5) helperbot_rotate = RotatingFileHandler(
"logs/helperbot.log", maxBytes=5000000, backupCount=5
)
helperbot_rotate.setFormatter(logformat) helperbot_rotate.setFormatter(logformat)
helperbotlog.addHandler(helperbot_rotate) helperbotlog.addHandler(helperbot_rotate)
# Override the logging level # Override the logging level
# helperbotlog.setLevel(logging.INFO) # helperbotlog.setLevel(logging.INFO)
xmppserverlog = logging.getLogger("xmppserver") xmppserverlog = logging.getLogger("xmppserver")
xmpp_rotate = RotatingFileHandler("logs/xmppserver.log", maxBytes=5000000, backupCount=5) xmpp_rotate = RotatingFileHandler(
"logs/xmppserver.log", maxBytes=5000000, backupCount=5
)
xmpp_rotate.setFormatter(logformat) xmpp_rotate.setFormatter(logformat)
xmppserverlog.addHandler(xmpp_rotate) xmppserverlog.addHandler(xmpp_rotate)
# Override the logging level # Override the logging level
@ -81,12 +91,17 @@ def db_file():
def os_db_path(): def os_db_path():
if platform.system() == "Windows": if platform.system() == "Windows":
os.makedirs(os.getenv("APPDATA"), exist_ok=True) #Ensure db_path directory exists or create os.makedirs(
os.getenv("APPDATA"), exist_ok=True
) # Ensure db_path directory exists or create
return os.path.join(os.getenv("APPDATA"), "bumper.db") return os.path.join(os.getenv("APPDATA"), "bumper.db")
else: else:
os.makedirs(os.path.expanduser("~/.config"), exist_ok=True) #Ensure db_path directory exists or create os.makedirs(
os.path.expanduser("~/.config"), exist_ok=True
) # Ensure db_path directory exists or create
return os.path.expanduser("~/.config/bumper.db") return os.path.expanduser("~/.config/bumper.db")
def db_get(): def db_get():
try: try:
# Will create the database if it doesn't exist # Will create the database if it doesn't exist
@ -100,7 +115,6 @@ def db_get():
return db return db
except json.decoder.JSONDecodeError as jerr: except json.decoder.JSONDecodeError as jerr:
bumperlog.error("JsonErr: {} - Doc: {}".format(jerr.msg, jerr.doc)) bumperlog.error("JsonErr: {} - Doc: {}".format(jerr.msg, jerr.doc))
@ -284,16 +298,15 @@ class VacBotDevice(object):
} }
def toJSON(self): def toJSON(self):
return json.dumps(self, default=lambda o: o.__dict__, return json.dumps(
sort_keys=False)#, indent=4) self, default=lambda o: o.__dict__, sort_keys=False
) # , indent=4)
class GlobalVacBotDevice(VacBotDevice): # EcoVacs Home class GlobalVacBotDevice(VacBotDevice): # EcoVacs Home
UILogicId = "" UILogicId = ""
ota = True ota = True
updateInfo = { updateInfo = {"changeLog": "", "needUpdate": False}
"changeLog": "",
"needUpdate": False
}
icon = "" icon = ""
deviceName = "" deviceName = ""
@ -315,9 +328,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "02uwxm", "classid": "02uwxm",
@ -333,9 +346,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "y79a7u", "classid": "y79a7u",
@ -351,9 +364,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "jr3pqa", "classid": "jr3pqa",
@ -369,9 +382,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "uv242z", "classid": "uv242z",
@ -387,9 +400,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "ls1ok3", "classid": "ls1ok3",
@ -405,9 +418,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "eyi9jv", "classid": "eyi9jv",
@ -423,9 +436,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "4zfacv", "classid": "4zfacv",
@ -441,9 +454,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "vi829v", "classid": "vi829v",
@ -459,9 +472,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "gd4uut", "classid": "gd4uut",
@ -477,9 +490,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": False, "share": False,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "9akc61", "classid": "9akc61",
@ -495,9 +508,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "r8ead0", "classid": "r8ead0",
@ -513,9 +526,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "emzppx", "classid": "emzppx",
@ -531,9 +544,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "vsc5ia", "classid": "vsc5ia",
@ -549,9 +562,9 @@ EcoVacsHomeProducts = [
"alexa": True, "alexa": True,
"assistant": True, "assistant": True,
"share": True, "share": True,
"tmjl": False "tmjl": False,
} },
} },
}, },
{ {
"classid": "aqdd5p", "classid": "aqdd5p",
@ -567,16 +580,13 @@ EcoVacsHomeProducts = [
"alexa": False, "alexa": False,
"assistant": False, "assistant": False,
"share": False, "share": False,
"tmjl": False "tmjl": False,
} },
} },
} },
] ]
class VacBotClient(object): class VacBotClient(object):
def __init__(self, userid="", realm="", token=""): def __init__(self, userid="", realm="", token=""):
self.userid = userid self.userid = userid
@ -616,6 +626,7 @@ def check_authcode(uid, authcode):
return False return False
def loginByItToken(authcode): def loginByItToken(authcode):
bumperlog.debug("Checking for authcode: {}".format(authcode)) bumperlog.debug("Checking for authcode: {}".format(authcode))
tokens = db_get().table("tokens") tokens = db_get().table("tokens")
@ -666,7 +677,9 @@ def bot_add(sn, did, devclass, resource, company):
bot = bot_get(did) bot = bot_get(did)
if not bot: # Not existing bot in database if not bot: # Not existing bot in database
if not devclass == "" or "@" not in sn or "tmp" not in sn: # try to prevent bad additions to the bot list if (
not devclass == "" or "@" not in sn or "tmp" not in sn
): # try to prevent bad additions to the bot list
bumperlog.info( bumperlog.info(
"Adding new bot with SN: {} DID: {}".format(newbot.name, newbot.did) "Adding new bot with SN: {} DID: {}".format(newbot.name, newbot.did)
) )
@ -691,8 +704,9 @@ def bot_toEcoVacsHome_JSON(bot): #EcoVacs Home
bot["UILogicId"] = botprod["product"]["UILogicId"] bot["UILogicId"] = botprod["product"]["UILogicId"]
bot["ota"] = botprod["product"]["ota"] bot["ota"] = botprod["product"]["ota"]
bot["icon"] = botprod["product"]["iconUrl"] bot["icon"] = botprod["product"]["iconUrl"]
return json.dumps(bot, default=lambda o: o.__dict__, return json.dumps(
sort_keys=False)#, indent=4) bot, default=lambda o: o.__dict__, sort_keys=False
) # , indent=4)
def bot_full_upsert(vacbot): def bot_full_upsert(vacbot):

140
bumper/confserver.py
View file

@ -31,7 +31,10 @@ class aiohttp_filter(logging.Filter):
confserverlog = logging.getLogger("confserver") confserverlog = logging.getLogger("confserver")
logging.getLogger("aiohttp.access").addFilter(aiohttp_filter()) #Add logging filter above to aiohttp.access logging.getLogger("aiohttp.access").addFilter(
aiohttp_filter()
) # Add logging filter above to aiohttp.access
class EcoVacs_Login: class EcoVacs_Login:
accessToken = "" accessToken = ""
@ -41,14 +44,17 @@ class EcoVacs_Login:
username = "" username = ""
def toJSON(self): def toJSON(self):
return json.dumps(self, default=lambda o: o.__dict__, return json.dumps(
sort_keys=False)#, indent=4) self, default=lambda o: o.__dict__, sort_keys=False
) # , indent=4)
class EcoVacsHome_Login(EcoVacs_Login): class EcoVacsHome_Login(EcoVacs_Login):
loginName = "" loginName = ""
mobile = "" mobile = ""
ucUid = "" ucUid = ""
class ConfServer: class ConfServer:
def __init__(self, address, usessl=False, helperbot=None): def __init__(self, address, usessl=False, helperbot=None):
self.helperbot = helperbot self.helperbot = helperbot
@ -85,8 +91,7 @@ class ConfServer:
self.handle_getAuthCode, self.handle_getAuthCode,
), ),
web.get( # EcoVacs Home GetAuthCode web.get( # EcoVacs Home GetAuthCode
"/{apiversion}/{apptype}/auth/getAuthCode", "/{apiversion}/{apptype}/auth/getAuthCode", self.handle_getAuthCode
self.handle_getAuthCode
), ),
web.get( web.get(
"/{apiversion}/private/{country}/{language}/{devid}/{apptype}/{appversion}/{devtype}/{aid}/user/checkAgreement", "/{apiversion}/private/{country}/{language}/{devid}/{apptype}/{appversion}/{devtype}/{aid}/user/checkAgreement",
@ -121,8 +126,7 @@ class ConfServer:
self.handle_hasUnreadMessage, self.handle_hasUnreadMessage,
), ),
web.get( # EcoVacs Home neng message hasUnreadMsg web.get( # EcoVacs Home neng message hasUnreadMsg
"/api/neng/message/hasUnreadMsg", "/api/neng/message/hasUnreadMsg", self.handle_neng_hasUnreadMessage
self.handle_neng_hasUnreadMessage,
), ),
web.get( # EcoVacs Home message getMsgList web.get( # EcoVacs Home message getMsgList
"/{apiversion}/private/{country}/{language}/{devid}/{apptype}/{appversion}/{devtype}/{aid}/message/getMsgList", "/{apiversion}/private/{country}/{language}/{devid}/{apptype}/{appversion}/{devtype}/{aid}/message/getMsgList",
@ -149,7 +153,9 @@ class ConfServer:
), ),
web.post("/api/lg/log.do", self.handle_lg_log), # EcoVacs Home web.post("/api/lg/log.do", self.handle_lg_log), # EcoVacs Home
web.post("/api/iot/devmanager.do", self.handle_devmanager_botcommand), web.post("/api/iot/devmanager.do", self.handle_devmanager_botcommand),
web.post("/api/dim/devmanager.do", self.handle_dim_devmanager), #EcoVacs Home web.post(
"/api/dim/devmanager.do", self.handle_dim_devmanager
), # EcoVacs Home
web.post("/lookup.do", self.handle_lookup), web.post("/lookup.do", self.handle_lookup),
] ]
) )
@ -158,7 +164,9 @@ class ConfServer:
async def start_server(self): async def start_server(self):
try: try:
confserverlog.info("Starting ConfServer at {}:{}".format(self.address[0], self.address[1])) confserverlog.info(
"Starting ConfServer at {}:{}".format(self.address[0], self.address[1])
)
runner = web.AppRunner(self.app) runner = web.AppRunner(self.app)
await runner.setup() await runner.setup()
@ -221,7 +229,9 @@ class ConfServer:
if "global_" in apptype: # EcoVacs Home if "global_" in apptype: # EcoVacs Home
login_details = EcoVacsHome_Login() login_details = EcoVacsHome_Login()
login_details.ucUid = "fuid_{}".format(user["userid"]) login_details.ucUid = "fuid_{}".format(user["userid"])
login_details.loginName = "fusername_{}".format(user["userid"]) login_details.loginName = "fusername_{}".format(
user["userid"]
)
login_details.mobile = None login_details.mobile = None
else: else:
@ -293,8 +303,7 @@ class ConfServer:
body = { body = {
"code": bumper.RETURN_API_SUCCESS, "code": bumper.RETURN_API_SUCCESS,
"data": "data": {
{
"email": login_details.email, "email": login_details.email,
"hasMobile": "N", "hasMobile": "N",
"hasPassword": "Y", "hasPassword": "Y",
@ -302,7 +311,7 @@ class ConfServer:
"userName": login_details.username, "userName": login_details.username,
"obfuscatedMobile": None, "obfuscatedMobile": None,
"mobile": None, "mobile": None,
"loginName": login_details.loginName "loginName": login_details.loginName,
}, },
"msg": "操作成功", "msg": "操作成功",
"time": bumper.get_milli_time(datetime.utcnow().timestamp()), "time": bumper.get_milli_time(datetime.utcnow().timestamp()),
@ -312,7 +321,6 @@ class ConfServer:
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
def check_token(self, apptype, countrycode, user, token): def check_token(self, apptype, countrycode, user, token):
try: try:
if bumper.check_token(user["userid"], token): if bumper.check_token(user["userid"], token):
@ -431,7 +439,6 @@ class ConfServer:
# Deactivate old tokens and authcodes # Deactivate old tokens and authcodes
bumper.user_revoke_expired_tokens(tmpuser["userid"]) bumper.user_revoke_expired_tokens(tmpuser["userid"])
body = { body = {
"code": bumper.RETURN_API_SUCCESS, "code": bumper.RETURN_API_SUCCESS,
"data": json.loads(login_details.toJSON()), "data": json.loads(login_details.toJSON()),
@ -646,30 +653,20 @@ class ConfServer:
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_neng_hasUnreadMessage(self, request): # EcoVacs Home async def handle_neng_hasUnreadMessage(self, request): # EcoVacs Home
try: try:
body = { body = {"code": 0, "data": {"hasUnRead": True}}
"code": 0,
"data": {
"hasUnRead": True
},
}
return web.json_response(body) return web.json_response(body)
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_getMsgList(self, request): # EcoVacs Home async def handle_getMsgList(self, request): # EcoVacs Home
try: try:
body = { body = {
"code": bumper.RETURN_API_SUCCESS, "code": bumper.RETURN_API_SUCCESS,
"data": { "data": {"hasNextPage": 0, "items": []},
"hasNextPage": 0,
"items": []
},
"msg": "操作成功", "msg": "操作成功",
"success": True, "success": True,
"time": bumper.get_milli_time(datetime.utcnow().timestamp()), "time": bumper.get_milli_time(datetime.utcnow().timestamp()),
@ -688,7 +685,7 @@ class ConfServer:
"myShopShowFlag": "N", "myShopShowFlag": "N",
"myShopUrl": "", "myShopUrl": "",
"shopIndexShowFlag": "N", "shopIndexShowFlag": "N",
"shopIndexUrl": "" "shopIndexUrl": "",
}, },
"msg": "操作成功", "msg": "操作成功",
"success": True, "success": True,
@ -704,16 +701,13 @@ class ConfServer:
try: try:
body = { body = {
"code": bumper.RETURN_API_SUCCESS, "code": bumper.RETURN_API_SUCCESS,
"data": "data": {
{ "iosGradeTime": {"iodGradeFlag": "N"},
"iosGradeTime": {
"iodGradeFlag": "N"
},
"openNotification": { "openNotification": {
"openNotificationContent": None, "openNotificationContent": None,
"openNotificationFlag": "N", "openNotificationFlag": "N",
"openNotificationTitle": None "openNotificationTitle": None,
} },
}, },
"msg": "操作成功", "msg": "操作成功",
"success": True, "success": True,
@ -737,15 +731,15 @@ class ConfServer:
"id": "20180804040641_7d746faf18b8cb22a50d145598fe4c90", "id": "20180804040641_7d746faf18b8cb22a50d145598fe4c90",
"type": "USER", "type": "USER",
"url": "https://bumper.ecovacs.com/content/agreement?id=20180804040641_7d746faf18b8cb22a50d145598fe4c90&language=EN", # "https://gl-us-wap.ecovacs.com/content/agreement?id=20180804040641_7d746faf18b8cb22a50d145598fe4c90&language=EN "url": "https://bumper.ecovacs.com/content/agreement?id=20180804040641_7d746faf18b8cb22a50d145598fe4c90&language=EN", # "https://gl-us-wap.ecovacs.com/content/agreement?id=20180804040641_7d746faf18b8cb22a50d145598fe4c90&language=EN
"version": "1.01" "version": "1.01",
}, },
{ {
"force": "N", "force": "N",
"id": "20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac", "id": "20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac",
"type": "PRIVACY", "type": "PRIVACY",
"url": "https://bumper.ecovacs.com/content/agreement?id=20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac&language=EN", # "https://gl-us-wap.ecovacs.com/content/agreement?id=20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac&language=EN" "url": "https://bumper.ecovacs.com/content/agreement?id=20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac&language=EN", # "https://gl-us-wap.ecovacs.com/content/agreement?id=20180804040245_4e7c56dfb7ebd3b81b1f2747d0859fac&language=EN"
"version": "1.01" "version": "1.01",
} },
], ],
"msg": "操作成功", "msg": "操作成功",
"success": True, "success": True,
@ -886,18 +880,18 @@ class ConfServer:
srvip = socket.gethostbyname(socket.gethostname()) srvip = socket.gethostbyname(socket.gethostname())
srvport = 5223 srvport = 5223
confserverlog.info( confserverlog.info(
"Reporting FindBest-EcoMsgNew Server to Bot as: {}:{}".format(srvip, srvport) "Reporting FindBest-EcoMsgNew Server to Bot as: {}:{}".format(
srvip, srvport
) )
body = { )
"result": "ok", body = {"result": "ok", "ip": srvip, "port": srvport}
"ip": srvip,
"port": srvport,
}
elif service == "EcoUpdate": elif service == "EcoUpdate":
srvip = "47.88.66.164" # EcoVacs Server srvip = "47.88.66.164" # EcoVacs Server
srvport = 8005 srvport = 8005
confserverlog.info( confserverlog.info(
"Reporting FindBest-EcoUpdate Server to Bot as: {}:{}".format(srvip, srvport) "Reporting FindBest-EcoUpdate Server to Bot as: {}:{}".format(
srvip, srvport
)
) )
body = {"result": "ok", "ip": srvip, "port": srvport} body = {"result": "ok", "ip": srvip, "port": srvport}
@ -924,7 +918,6 @@ class ConfServer:
else: else:
body = {"result": "fail", "todo": "result"} body = {"result": "fail", "todo": "result"}
elif todo == "GetDeviceList": elif todo == "GetDeviceList":
body = { body = {
"devices": bumper.db_get().table("bots").all(), "devices": bumper.db_get().table("bots").all(),
@ -957,8 +950,6 @@ class ConfServer:
body = {"result": "fail", "todo": "result"} body = {"result": "fail", "todo": "result"}
return web.json_response(body) return web.json_response(body)
async def handle_appsvr_api(self, request): async def handle_appsvr_api(self, request):
if not request.method == "GET": # Skip GET for now if not request.method == "GET": # Skip GET for now
try: try:
@ -979,7 +970,9 @@ class ConfServer:
for bot in bots: for bot in bots:
if bot["class"] != "": if bot["class"] != "":
b = bumper.bot_toEcoVacsHome_JSON(bot) b = bumper.bot_toEcoVacsHome_JSON(bot)
if not b is None: #Happens if the bot isn't on the EcoVacs Home list if (
not b is None
): # Happens if the bot isn't on the EcoVacs Home list
botlist.append(json.loads(b)) botlist.append(json.loads(b))
body = { body = {
@ -1002,7 +995,6 @@ class ConfServer:
body = {"result": "fail", "todo": "result"} body = {"result": "fail", "todo": "result"}
return web.json_response(body) return web.json_response(body)
async def handle_lookup(self, request): async def handle_lookup(self, request):
try: try:
@ -1023,7 +1015,9 @@ class ConfServer:
srvip = socket.gethostbyname(socket.gethostname()) srvip = socket.gethostbyname(socket.gethostname())
srvport = 5223 srvport = 5223
confserverlog.info( confserverlog.info(
"Reporting FindBest-EcoMsgNew Server to Bot as: {}:{}".format(srvip, srvport) "Reporting FindBest-EcoMsgNew Server to Bot as: {}:{}".format(
srvip, srvport
)
) )
msgserver = {"ip": srvip, "port": srvport, "result": "ok"} msgserver = {"ip": srvip, "port": srvport, "result": "ok"}
msgserver = json.dumps(msgserver) msgserver = json.dumps(msgserver)
@ -1047,7 +1041,6 @@ class ConfServer:
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_lg_log(self, request): # EcoVacs Home async def handle_lg_log(self, request): # EcoVacs Home
try: try:
json_body = json.loads(await request.text()) json_body = json.loads(await request.text())
@ -1078,20 +1071,15 @@ class ConfServer:
json_body["payload"] = "" json_body["payload"] = ""
if json_body["td"] == "GetCleanLogs": if json_body["td"] == "GetCleanLogs":
json_body["td"] = "q" json_body["td"] = "q"
json_body["payload"] = '<ctl count=\"30\"/>' #<ctl />" json_body["payload"] = '<ctl count="30"/>' # <ctl />"
if did != "": if did != "":
bot = bumper.bot_get(did) bot = bumper.bot_get(did)
if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True: if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True:
body = "" body = ""
retcmd = await self.helperbot.send_command(json_body, randomid) retcmd = await self.helperbot.send_command(json_body, randomid)
confserverlog.debug( confserverlog.debug("Send Bot - {}".format(json_body))
"Send Bot - {}".format(json_body) confserverlog.debug("Bot Response - {}".format(body))
)
confserverlog.debug(
"Bot Response - {}".format(body)
)
logs = [] logs = []
logsroot = ET.fromstring(retcmd["resp"]) logsroot = ET.fromstring(retcmd["resp"])
if logsroot.attrib["ret"] == "ok": if logsroot.attrib["ret"] == "ok":
@ -1102,14 +1090,11 @@ class ConfServer:
body = { body = {
"ret": "ok", "ret": "ok",
# "logs": logs, #TODO: Doesn't parse correctly, new protocol & server side processing # "logs": logs, #TODO: Doesn't parse correctly, new protocol & server side processing
"logs": [] "logs": [],
} }
else: else:
body = { body = {"ret": "ok", "logs": []}
"ret": "ok",
"logs": [],
}
confserverlog.debug( confserverlog.debug(
"\r\n POST: {} \r\n Response: {}".format(json_body, body) "\r\n POST: {} \r\n Response: {}".format(json_body, body)
@ -1126,7 +1111,6 @@ class ConfServer:
body = {"id": randomid, "errno": bumper.ERR_COMMON, "ret": "fail"} body = {"id": randomid, "errno": bumper.ERR_COMMON, "ret": "fail"}
return web.json_response(body) return web.json_response(body)
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
@ -1144,12 +1128,8 @@ class ConfServer:
if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True: if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True:
retcmd = await self.helperbot.send_command(json_body, randomid) retcmd = await self.helperbot.send_command(json_body, randomid)
body = retcmd body = retcmd
confserverlog.debug( confserverlog.debug("Send Bot - {}".format(json_body))
"Send Bot - {}".format(json_body) confserverlog.debug("Bot Response - {}".format(body))
)
confserverlog.debug(
"Bot Response - {}".format(body)
)
return web.json_response(body) return web.json_response(body)
else: else:
# No response, send error back # No response, send error back
@ -1158,7 +1138,12 @@ class ConfServer:
json_body["toId"] json_body["toId"]
) )
) )
body = {"id": randomid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} body = {
"id": randomid,
"errno": 500,
"ret": "fail",
"debug": "wait for response timed out",
}
return web.json_response(body) return web.json_response(body)
else: else:
@ -1174,7 +1159,6 @@ class ConfServer:
except Exception as e: except Exception as e:
confserverlog.exception("{}".format(e)) confserverlog.exception("{}".format(e))
async def handle_dim_devmanager(self, request): # Used in EcoVacs Home App async def handle_dim_devmanager(self, request): # Used in EcoVacs Home App
try: try:
json_body = json.loads(await request.text()) json_body = json.loads(await request.text())
@ -1189,12 +1173,8 @@ class ConfServer:
if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True: if bot["company"] == "eco-ng" and bot["mqtt_connection"] == True:
retcmd = await self.helperbot.send_command(json_body, randomid) retcmd = await self.helperbot.send_command(json_body, randomid)
body = retcmd body = retcmd
confserverlog.debug( confserverlog.debug("Send Bot - {}".format(json_body))
"Send Bot - {}".format(json_body) confserverlog.debug("Bot Response - {}".format(body))
)
confserverlog.debug(
"Bot Response - {}".format(body)
)
return web.json_response(body) return web.json_response(body)
else: else:
# No response, send error back # No response, send error back

75
bumper/mqttserver.py
View file

@ -34,10 +34,7 @@ class MQTTHelperBot:
Client = MQTTClient() Client = MQTTClient()
def __init__( def __init__(self, address):
self,
address
):
self.address = address self.address = address
self.client_id = "helper1@bumper/helper1" self.client_id = "helper1@bumper/helper1"
self.command_responses = [] self.command_responses = []
@ -72,7 +69,11 @@ class MQTTHelperBot:
if str(message.topic).split("/")[6] == "helper1": if str(message.topic).split("/")[6] == "helper1":
# Response to command # Response to command
helperbotlog.debug("Received Response - Topic: {} - Message: {}".format(message.topic, str(message.data.decode("utf-8")))) helperbotlog.debug(
"Received Response - Topic: {} - Message: {}".format(
message.topic, str(message.data.decode("utf-8"))
)
)
self.command_responses.append( self.command_responses.append(
{ {
"time": time.time(), "time": time.time(),
@ -82,12 +83,24 @@ class MQTTHelperBot:
) )
elif str(message.topic).split("/")[3] == "helper1": elif str(message.topic).split("/")[3] == "helper1":
# Helperbot sending command # Helperbot sending command
helperbotlog.debug("Send Command - Topic: {} - Message: {}".format(message.topic, str(message.data.decode("utf-8")))) helperbotlog.debug(
"Send Command - Topic: {} - Message: {}".format(
message.topic, str(message.data.decode("utf-8"))
)
)
elif str(message.topic).split("/")[1] == "atr": elif str(message.topic).split("/")[1] == "atr":
# Broadcast message received on atr # Broadcast message received on atr
helperbotlog.debug("Received Broadcast - Topic: {} - Message: {}".format(message.topic, str(message.data.decode("utf-8")))) helperbotlog.debug(
"Received Broadcast - Topic: {} - Message: {}".format(
message.topic, str(message.data.decode("utf-8"))
)
)
else: else:
helperbotlog.debug("Received Message - Topic: {} - Message: {}".format(message.topic, str(message.data.decode("utf-8")))) helperbotlog.debug(
"Received Message - Topic: {} - Message: {}".format(
message.topic, str(message.data.decode("utf-8"))
)
)
# Cleanup "expired messages" > 60 seconds from time # Cleanup "expired messages" > 60 seconds from time
for msg in self.command_responses: for msg in self.command_responses:
@ -95,10 +108,13 @@ class MQTTHelperBot:
datetime.fromtimestamp(msg["time"]) + timedelta(seconds=10) datetime.fromtimestamp(msg["time"]) + timedelta(seconds=10)
).timestamp() ).timestamp()
if time.time() > expire_time: if time.time() > expire_time:
helperbotlog.debug("Pruning Message Time: {}, MsgTime: {}, MsgTime+60: {}".format(time.time(), msg['time'], expire_time)) helperbotlog.debug(
"Pruning Message Time: {}, MsgTime: {}, MsgTime+60: {}".format(
time.time(), msg["time"], expire_time
)
)
self.command_responses.remove(msg) self.command_responses.remove(msg)
async def wait_for_resp(self, requestid): async def wait_for_resp(self, requestid):
try: try:
@ -119,13 +135,28 @@ class MQTTHelperBot:
self.command_responses.remove(msg) self.command_responses.remove(msg)
return resp return resp
return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} return {
"id": requestid,
"errno": 500,
"ret": "fail",
"debug": "wait for response timed out",
}
except asyncio.CancelledError as e: except asyncio.CancelledError as e:
helperbotlog.debug("wait_for_resp cancelled by asyncio") helperbotlog.debug("wait_for_resp cancelled by asyncio")
return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} return {
"id": requestid,
"errno": 500,
"ret": "fail",
"debug": "wait for response timed out",
}
except Exception as e: except Exception as e:
helperbotlog.exception("{}".format(e)) helperbotlog.exception("{}".format(e))
return {"id": requestid, "errno": 500, "ret": "fail", "debug": "wait for response timed out"} return {
"id": requestid,
"errno": 500,
"ret": "fail",
"debug": "wait for response timed out",
}
async def send_command(self, cmdjson, requestid): async def send_command(self, cmdjson, requestid):
try: try:
@ -158,7 +189,9 @@ class MQTTServer:
async def broker_coro(self): async def broker_coro(self):
try: try:
mqttserverlog.info("Starting MQTT Server at {}:{}".format(self.address[0], self.address[1])) mqttserverlog.info(
"Starting MQTT Server at {}:{}".format(self.address[0], self.address[1])
)
broker = hbmqtt.broker.Broker(config=self.default_config) broker = hbmqtt.broker.Broker(config=self.default_config)
await broker.start() await broker.start()
@ -175,11 +208,7 @@ class MQTTServer:
mqttserverlog.exception("{}".format(e)) mqttserverlog.exception("{}".format(e))
exit(1) exit(1)
def __init__(self, address):
def __init__(
self,
address
):
try: try:
self.mqttserverthread = None self.mqttserverthread = None
self.address = address self.address = address
@ -254,8 +283,8 @@ class BumperMQTTServer_Plugin:
didsplit = str(client_id).split("@") didsplit = str(client_id).split("@")
if not ( # if ecouser or bumper aren't in details it is a bot if not ( # if ecouser or bumper aren't in details it is a bot
"ecouser" in didsplit[1] "ecouser" in didsplit[1] or "bumper" in didsplit[1]
or "bumper" in didsplit[1]): ):
tmpbotdetail = str(didsplit[1]).split("/") tmpbotdetail = str(didsplit[1]).split("/")
bumper.bot_add( bumper.bot_add(
username, username,
@ -298,7 +327,9 @@ class BumperMQTTServer_Plugin:
authenticated = False authenticated = False
except Exception as e: except Exception as e:
mqttserverlog.exception("Session: {} - {}".format((kwargs.get("session", None)),e)) mqttserverlog.exception(
"Session: {} - {}".format((kwargs.get("session", None)), e)
)
authenticated = False authenticated = False
return authenticated return authenticated

109
bumper/xmppserver.py
View file

@ -9,7 +9,8 @@ import asyncio, functools
xmppserverlog = logging.getLogger("xmppserver") xmppserverlog = logging.getLogger("xmppserver")
class XMPPServer():
class XMPPServer:
server_id = "ecouser.net" server_id = "ecouser.net"
clients = [] clients = []
exit_flag = False exit_flag = False
@ -45,6 +46,7 @@ class XMPPServer():
except Exception as e: except Exception as e:
xmppserverlog.error("{}".format(e)) xmppserverlog.error("{}".format(e))
class XMPPServer_Protocol(asyncio.Protocol): class XMPPServer_Protocol(asyncio.Protocol):
client_id = None client_id = None
exit_flag = False exit_flag = False
@ -56,7 +58,9 @@ class XMPPServer_Protocol(asyncio.Protocol):
def connection_made(self, transport): def connection_made(self, transport):
if self.aclient: # Existing client... upgrading to TLS if self.aclient: # Existing client... upgrading to TLS
xmppserverlog.debug("Upgraded connection for {}".format(self.aclient.address)) xmppserverlog.debug(
"Upgraded connection for {}".format(self.aclient.address)
)
self.aclient.transport = transport self.aclient.transport = transport
else: else:
aclient = XMPPAsyncClient(transport) aclient = XMPPAsyncClient(transport)
@ -65,11 +69,16 @@ class XMPPServer_Protocol(asyncio.Protocol):
self.aclient.state = getattr(aclient, "CONNECT") self.aclient.state = getattr(aclient, "CONNECT")
xmppserverlog.debug("New Connection from {}".format(aclient.address)) xmppserverlog.debug("New Connection from {}".format(aclient.address))
def connection_lost(self, error): def connection_lost(self, error):
XMPPServer.clients.remove(self.aclient) XMPPServer.clients.remove(self.aclient)
self.aclient._set_state("DISCONNECT") self.aclient._set_state("DISCONNECT")
xmppserverlog.debug("End Connection for ({}:{} | {})".format(self.aclient.address[0], self.aclient.address[1], self.aclient.bumper_jid)) xmppserverlog.debug(
"End Connection for ({}:{} | {})".format(
self.aclient.address[0],
self.aclient.address[1],
self.aclient.bumper_jid,
)
)
def data_received(self, data): def data_received(self, data):
self.aclient._parse_data(data) self.aclient._parse_data(data)
@ -103,7 +112,11 @@ class XMPPAsyncClient:
def send(self, command): def send(self, command):
try: try:
if self.log_sent_message: if self.log_sent_message:
xmppserverlog.debug("send to ({}:{} | {}) - {}".format(self.address[0], self.address[1], self.bumper_jid, command)) xmppserverlog.debug(
"send to ({}:{} | {}) - {}".format(
self.address[0], self.address[1], self.bumper_jid, command
)
)
self.transport.write(command.encode()) self.transport.write(command.encode())
@ -145,7 +158,11 @@ class XMPPAsyncClient:
) )
) )
xmppserverlog.debug("({}:{} | {}) state: {}".format(self.address[0],self.address[1],self.bumper_jid, state)) xmppserverlog.debug(
"({}:{} | {}) state: {}".format(
self.address[0], self.address[1], self.bumper_jid, state
)
)
self.state = new_state self.state = new_state
@ -172,7 +189,8 @@ class XMPPAsyncClient:
self.send( self.send(
'<iq type="error" id="{}"><error type="cancel" code="501"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/></error></iq>'.format( '<iq type="error" id="{}"><error type="cancel" code="501"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"/></error></iq>'.format(
xml.get("id") xml.get("id")
)) )
)
return return
if "disco#info" in data: if "disco#info" in data:
@ -184,7 +202,6 @@ class XMPPAsyncClient:
) )
return return
if xml.get("type") == "set": if xml.get("type") == "set":
if ( if (
"com:sf" in data and xml.get("to") == "rl.ecorobot.net" "com:sf" in data and xml.get("to") == "rl.ecorobot.net"
@ -255,7 +272,6 @@ class XMPPAsyncClient:
pingstring = pingstring.replace('iq xmlns="urn:xmpp:ping"', "iq") pingstring = pingstring.replace('iq xmlns="urn:xmpp:ping"', "iq")
pingstring = pingstring.replace("<ping", '<ping xmlns="urn:xmpp:ping"') pingstring = pingstring.replace("<ping", '<ping xmlns="urn:xmpp:ping"')
for client in XMPPServer.clients: for client in XMPPServer.clients:
if ( if (
client.bumper_jid != self.bumper_jid client.bumper_jid != self.bumper_jid
@ -267,10 +283,11 @@ class XMPPAsyncClient:
except Exception as e: except Exception as e:
xmppserverlog.exception("{}".format(e)) xmppserverlog.exception("{}".format(e))
async def schedule_ping(self, time): async def schedule_ping(self, time):
if not self.state == 5: # disconnected if not self.state == 5: # disconnected
pingstring = "<iq from='{}' to='{}' id='s2c1' type='get'><ping xmlns='urn:xmpp:ping'/></iq>".format(XMPPServer.server_id, self.bumper_jid) pingstring = "<iq from='{}' to='{}' id='s2c1' type='get'><ping xmlns='urn:xmpp:ping'/></iq>".format(
XMPPServer.server_id, self.bumper_jid
)
self.send(pingstring) self.send(pingstring)
await asyncio.sleep(time) await asyncio.sleep(time)
asyncio.Task(self.schedule_ping(time)) asyncio.Task(self.schedule_ping(time))
@ -290,7 +307,9 @@ class XMPPAsyncClient:
adminuser = ctlerr.replace("permission denied, please contact ", "") adminuser = ctlerr.replace("permission denied, please contact ", "")
adminuser = adminuser.replace(" ", "") adminuser = adminuser.replace(" ", "")
if not ( if not (
adminuser.startswith("fuid_") or adminuser.startswith("fusername_") or bumper.use_auth adminuser.startswith("fuid_")
or adminuser.startswith("fusername_")
or bumper.use_auth
): # if not fuid_ then its ecovacs OR ignore bumper auth ): # if not fuid_ then its ecovacs OR ignore bumper auth
# TODO: Implement auth later, should this user have access to bot? # TODO: Implement auth later, should this user have access to bot?
@ -435,13 +454,20 @@ class XMPPAsyncClient:
except Exception as e: except Exception as e:
xmppserverlog.exception("{}".format(e)) xmppserverlog.exception("{}".format(e))
async def _handle_starttls(self, data): async def _handle_starttls(self, data):
try: try:
if self.TLSUpgraded == False: if self.TLSUpgraded == False:
self.TLSUpgraded = True #Set TLSUpgraded true to prevent further attempts to upgrade connection self.TLSUpgraded = (
xmppserverlog.debug("Upgrading connection with STARTTLS for {}:{}".format(self.address[0],self.address[1])) True
self.send("<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>") #send process to client ) # Set TLSUpgraded true to prevent further attempts to upgrade connection
xmppserverlog.debug(
"Upgrading connection with STARTTLS for {}:{}".format(
self.address[0], self.address[1]
)
)
self.send(
"<proceed xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>"
) # send process to client
# After proceed the connection should be upgraded to TLS # After proceed the connection should be upgraded to TLS
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
@ -452,14 +478,14 @@ class XMPPAsyncClient:
ssl_ctx.load_cert_chain(bumper.server_cert, bumper.server_key) ssl_ctx.load_cert_chain(bumper.server_cert, bumper.server_key)
ssl_ctx.load_verify_locations(cafile=bumper.ca_cert) ssl_ctx.load_verify_locations(cafile=bumper.ca_cert)
new_transport = await loop.start_tls(transport , protocol, ssl_ctx, server_side=True) new_transport = await loop.start_tls(
transport, protocol, ssl_ctx, server_side=True
)
protocol.connection_made(new_transport) protocol.connection_made(new_transport)
except Exception as e: except Exception as e:
xmppserverlog.exception("{}".format(e)) xmppserverlog.exception("{}".format(e))
def _handle_iq_auth(self, data): def _handle_iq_auth(self, data):
try: try:
xml = ET.fromstring(data.decode("utf-8")) xml = ET.fromstring(data.decode("utf-8"))
@ -525,9 +551,7 @@ class XMPPAsyncClient:
self._set_state("INIT") self._set_state("INIT")
# Successful auth # Successful auth
self.send( self.send('<iq type="result" id="{}"/>'.format(xml.get("id")))
'<iq type="result" id="{}"/>'.format(xml.get("id"))
)
else: else:
# Failed auth # Failed auth
@ -631,7 +655,11 @@ class XMPPAsyncClient:
self.bumper_jid = "{}@{}.ecorobot.net/atom".format( self.bumper_jid = "{}@{}.ecorobot.net/atom".format(
self.uid, self.devclass self.uid, self.devclass
) )
xmppserverlog.debug("new bot ({}:{} | {})".format(self.address[0],self.address[1], self.bumper_jid)) xmppserverlog.debug(
"new bot ({}:{} | {})".format(
self.address[0], self.address[1], self.bumper_jid
)
)
res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format( res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format(
xml.get("id"), self.bumper_jid xml.get("id"), self.bumper_jid
) )
@ -641,14 +669,22 @@ class XMPPAsyncClient:
self.bumper_jid = "{}@{}/{}".format( self.bumper_jid = "{}@{}/{}".format(
self.uid, XMPPServer.server_id, self.clientresource self.uid, XMPPServer.server_id, self.clientresource
) )
xmppserverlog.debug("new client ({}:{} | {})".format(self.address[0],self.address[1], self.bumper_jid)) xmppserverlog.debug(
"new client ({}:{} | {})".format(
self.address[0], self.address[1], self.bumper_jid
)
)
res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format( res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format(
xml.get("id"), self.bumper_jid xml.get("id"), self.bumper_jid
) )
else: else:
self.name = "XMPP_Client_{}_{}".format(self.uid, self.address) self.name = "XMPP_Client_{}_{}".format(self.uid, self.address)
self.bumper_jid = "{}@{}".format(self.uid, XMPPServer.server_id) self.bumper_jid = "{}@{}".format(self.uid, XMPPServer.server_id)
xmppserverlog.debug("new client ({}:{} | {})".format(self.address[0],self.address[1], self.bumper_jid)) xmppserverlog.debug(
"new client ({}:{} | {})".format(
self.address[0], self.address[1], self.bumper_jid
)
)
res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format( res = '<iq type="result" id="{}"><bind xmlns="urn:ietf:params:xml:ns:xmpp-bind"><jid>{}</jid></bind></iq>'.format(
xml.get("id"), self.bumper_jid xml.get("id"), self.bumper_jid
) )
@ -666,7 +702,6 @@ class XMPPAsyncClient:
self.send(res) self.send(res)
asyncio.Task(self.schedule_ping(30)) asyncio.Task(self.schedule_ping(30))
except Exception as e: except Exception as e:
xmppserverlog.exception("{}".format(e)) xmppserverlog.exception("{}".format(e))
@ -675,7 +710,9 @@ class XMPPAsyncClient:
if len(xml) and xml[0].tag == "status": if len(xml) and xml[0].tag == "status":
xmppserverlog.debug( xmppserverlog.debug(
"bot presence {} ".format(ET.tostring(xml, encoding="utf-8").decode("utf-8")) "bot presence {} ".format(
ET.tostring(xml, encoding="utf-8").decode("utf-8")
)
) )
# Most likely a bot, possibly hello world in text # Most likely a bot, possibly hello world in text
@ -684,8 +721,6 @@ class XMPPAsyncClient:
'<presence to="{}"> dummy </presence>'.format(self.bumper_jid) '<presence to="{}"> dummy </presence>'.format(self.bumper_jid)
) )
# If it is a BOT, send extras # If it is a BOT, send extras
if self.type == self.BOT: if self.type == self.BOT:
# get device info # get device info
@ -695,17 +730,18 @@ class XMPPAsyncClient:
) )
) )
else: else:
xmppserverlog.debug( xmppserverlog.debug(
"client presence - {} ".format(ET.tostring(xml, encoding="utf-8").decode("utf-8")) "client presence - {} ".format(
ET.tostring(xml, encoding="utf-8").decode("utf-8")
)
) )
if xml.get("type") == "available": if xml.get("type") == "available":
xmppserverlog.debug( xmppserverlog.debug(
"client presence available - {} ".format( "client presence available - {} ".format(
ET.tostring(xml, encoding="utf-8").decode("utf-8")) ET.tostring(xml, encoding="utf-8").decode("utf-8")
)
) )
# Send dummy return # Send dummy return
@ -715,7 +751,8 @@ class XMPPAsyncClient:
elif xml.get("type") == "unavailable": elif xml.get("type") == "unavailable":
xmppserverlog.debug( xmppserverlog.debug(
"client presence unavailable (DISCONNECT) - {} ".format( "client presence unavailable (DISCONNECT) - {} ".format(
ET.tostring(xml, encoding="utf-8").decode("utf-8")) ET.tostring(xml, encoding="utf-8").decode("utf-8")
)
) )
self._set_state("DISCONNECT") self._set_state("DISCONNECT")
@ -756,7 +793,9 @@ class XMPPAsyncClient:
if self.log_incoming_data: if self.log_incoming_data:
xmppserverlog.debug( xmppserverlog.debug(
"from ({}:{} | {}) - {}".format( "from ({}:{} | {}) - {}".format(
self.address[0],self.address[1],self.bumper_jid, self.address[0],
self.address[1],
self.bumper_jid,
str( str(
ET.tostring(item, encoding="utf-8").decode( ET.tostring(item, encoding="utf-8").decode(
"utf-8" "utf-8"

7
start_bumper.py
View file

@ -6,6 +6,7 @@ import sys, socket
import time import time
import platform import platform
import os import os
# os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG # os.environ['PYTHONASYNCIODEBUG'] = '1' # Uncomment to enable ASYNCIODEBUG
import asyncio import asyncio
@ -47,9 +48,7 @@ async def main():
xmpp_address = (listen_host, 5223) xmpp_address = (listen_host, 5223)
mqtt_address = (listen_host, 8883) mqtt_address = (listen_host, 8883)
xmpp_server = bumper.XMPPServer( xmpp_server = bumper.XMPPServer(xmpp_address)
xmpp_address
)
mqtt_server = bumper.MQTTServer(mqtt_address) mqtt_server = bumper.MQTTServer(mqtt_address)
mqtt_helperbot = bumper.MQTTHelperBot(mqtt_address) mqtt_helperbot = bumper.MQTTHelperBot(mqtt_address)
conf_server = bumper.ConfServer( conf_server = bumper.ConfServer(
@ -86,6 +85,7 @@ async def main():
task.cancel() task.cancel()
loop.close() loop.close()
async def maintenance_tasks(): async def maintenance_tasks():
while True: while True:
await asyncio.sleep(30) # Sleep 30 seconds await asyncio.sleep(30) # Sleep 30 seconds
@ -101,4 +101,3 @@ if __name__ == "__main__":
pass pass
finally: finally:
bumper.bumperlog.info("Bumper Exiting!") bumper.bumperlog.info("Bumper Exiting!")

5
tests/test_bumper.py
View file

@ -181,4 +181,7 @@ def test_client_db():
assert_false( assert_false(
bumper.client_get("resource_123")["xmpp_connection"] bumper.client_get("resource_123")["xmpp_connection"]
) # Test that xmpp was set False for client ) # Test that xmpp was set False for client
assert_equals(len(bumper.get_disconnected_xmpp_clients()), 1) # Test len of connected xmpp clients is 1 assert_equals(
len(bumper.get_disconnected_xmpp_clients()), 1
) # Test len of connected xmpp clients is 1

22
tests/test_confserver.py
View file

@ -12,13 +12,14 @@ confserver = bumper.ConfServer("127.0.0.1:11111", False, mock.MagicMock)
confserver.confserver_app() confserver.confserver_app()
app = confserver.app app = confserver.app
def async_return(result): def async_return(result):
f = asyncio.Future() f = asyncio.Future()
f.set_result(result) f.set_result(result)
return f return f
def test_disconnect():
def test_disconnect():
async def test_disconnect_async(): async def test_disconnect_async():
await confserver.disconnect() await confserver.disconnect()
@ -513,6 +514,7 @@ def test_postLookup():
client.close() client.close()
) # Close test server after all tests are done ) # Close test server after all tests are done
def test_devmgr(): def test_devmgr():
if os.path.exists("tests/tmp.db"): if os.path.exists("tests/tmp.db"):
os.remove("tests/tmp.db") # Remove existing db os.remove("tests/tmp.db") # Remove existing db
@ -551,20 +553,30 @@ def test_devmgr():
postbody = {"toId": "did_1234"} postbody = {"toId": "did_1234"}
# Test return get status # Test return get status
command_getstatus_resp = { "id": "resp_1234", "resp": "<ctl ret='ok' status='idle'/>", "ret": "ok" } command_getstatus_resp = {
confserver.helperbot.send_command = mock.MagicMock(return_value=async_return(command_getstatus_resp)) "id": "resp_1234",
"resp": "<ctl ret='ok' status='idle'/>",
"ret": "ok",
}
confserver.helperbot.send_command = mock.MagicMock(
return_value=async_return(command_getstatus_resp)
)
# Test # Test
loop.run_until_complete(test_devmanager(postbody, command=True)) loop.run_until_complete(test_devmanager(postbody, command=True))
# Test return fail timeout # Test return fail timeout
command_timeout_resp = {"id": "resp_1234", "errno": "timeout", "ret": "fail"} command_timeout_resp = {"id": "resp_1234", "errno": "timeout", "ret": "fail"}
confserver.helperbot.send_command = mock.MagicMock(return_value=async_return(command_timeout_resp)) confserver.helperbot.send_command = mock.MagicMock(
return_value=async_return(command_timeout_resp)
)
# Test # Test
loop.run_until_complete(test_devmanager(postbody, command=True)) loop.run_until_complete(test_devmanager(postbody, command=True))
# Set bot not on mqtt # Set bot not on mqtt
bumper.bot_set_mqtt("did_1234", False) bumper.bot_set_mqtt("did_1234", False)
confserver.helperbot.send_command = mock.MagicMock(return_value=async_return(command_getstatus_resp)) confserver.helperbot.send_command = mock.MagicMock(
return_value=async_return(command_getstatus_resp)
)
# Test # Test
loop.run_until_complete(test_devmanager(postbody, command=True)) loop.run_until_complete(test_devmanager(postbody, command=True))