Use device timestamp for communication #13
Conversation
Signed-off-by: SchumyHao <bob-hjl@126.com>
Signed-off-by: SchumyHao <bob-hjl@126.com>
Signed-off-by: SchumyHao <bob-hjl@126.com>
| self.__enter__() # when called outside of cm, initialize. | ||
| delta_ts = int(time.mktime(datetime.datetime.utcnow().timetuple())) - self._ts_server |
There was a problem hiding this comment.
isn't this duplicate from the above?
| @@ -22,13 +23,17 @@ def __init__(self, ip, token, debug=0): | |||
| self.__id = 0 | |||
| self._devtype = None | |||
| self._serial = None | |||
| self._ts = None | |||
| self._ts_server = int(time.mktime(datetime.datetime.utcnow().timetuple())) | |||
There was a problem hiding this comment.
_ts_server indicates that it is a server timestamp, and if so, initializing it here sounds wrong? In anycase it's better to use datetime objects instead of converting it to an int.
| @@ -1,6 +1,7 @@ | |||
| import logging | |||
| import socket | |||
| import datetime | |||
| import time | |||
| return m.data.value["result"] | ||
| except Exception as ex: | ||
| _LOGGER.error("got error when receiving: %s" % ex) | ||
| self.__enter__() |
There was a problem hiding this comment.
What's the purpose of this? I don't think an exception handler should be doing this kind of logic.
| @@ -125,9 +133,12 @@ def send(self, command, parameters=None): | |||
| _LOGGER.debug("%s:%s (ts: %s) << %s" % (self.ip, self.port, | |||
| m.header.value.ts, | |||
| m.data.value)) | |||
| self._ts = m.header.value.ts | |||
| self._ts_server = int(time.mktime(datetime.datetime.utcnow().timetuple())) | |||
There was a problem hiding this comment.
Weren't these set already above to proper values?
| @@ -85,8 +90,10 @@ def discover(addr=None): | |||
|
|
|||
| def send(self, command, parameters=None): | |||
| """Build and send the given command.""" | |||
| if self._devtype is None or self._serial is None: | |||
| delta_ts = int(time.mktime(datetime.datetime.utcnow().timetuple())) - self._ts_server | |||
There was a problem hiding this comment.
timedelta object has total_seconds() which avoids casting to int and allow using datetime objects.
|
As a general comment, as the protocol is the same or at least similar, I think it would make sense to create separate classes (and cli tools) for separate devices (and maybe rename this project later to reflect the change) for controlling those too? edit: to add, at least the air purifier and maybe also the bulbs when not using developer mode use the same protocol, probably many other xioami devices do so too. |
|
Hi rytilahti Most of the code is forked your code. Do you mind what I have done? We cannot get token by invoke the discover function. But there is still another way to get those token. |
|
Hi SchumyHao, just wondering, would it not make more sense to start adding features to this library (and considering renaming the library when the time comes) instead of having a fork? Anyway, as the code is GPLv3 it's of course okay to fork as you want, in my eyes it would make more sense to concentrate the effort :-) I'm glad to hear about possibility to get the token from the app data, could you perhaps explain how to do that to help others who do not want to do a reset and have rooted devices available? |
|
Because my purpose is separate send and discover function into a general device(call is miio device). Vacuum or other device can inherit this general device. So I think if you separate general device function and vacuum device function. I can add more device support to this lib. And I'm willing to do this. About HACK MiJia app things, you can read my step-by-step guide |
|
Guys not sure if you saw this but there's an entire Xiaomi component working pretty nicely on the forum https://community.home-assistant.io/t/beta-xiaomi-gateway-integration/8213/1. (and its github repo https://github.com/lazcad/homeassistant) I've been using it for weeks for my Xiaomi sensors and is super nice. Not sure if it's worth integrate all of it? |
|
@jcastro the gateway is indeed a completely different beast, and I suppose it makes no sense to put effort on that as long as the developer mode keeps working. The same applies for yeelight bulbs. @SchumyHao I have refactored the communication handling and created a new Device superclass to allow easier extension of the library. The vacuum class is still there, but you could now just inherit from Device for other types of devices. I also made tokens device-specific so no more problems trying to access multiple devices with different tokens. I modified the README to contain some information about adding support for new devices, and added a link to your instructions on how to get the token from rooted devices, thanks! |
|
@jcastro the repo you motioned is nice work, we using this repo to add gateway related devices. @rytilahti Thank you for your work. I'll try to push what I have done to your repo. |
Hi Rytilahti
Thank you for your brilliant work on miio.
I want to use your code to control some other Xiaomi devices.
But I found some xiaomi devices time stamp is not sync with network, it reset to zero when device power-off.
So when using your code to send message to those device will got recv timeout.
I pushed this patch, this patch will set message time stamp according to device time stamp. And increase time stamp when send next message.
This can work on vacumm device too.
May you merge this commit to your code and release to PIP?