[miio] Add Xiaomi cloud logon (token download) and map download #7255

marcelrv · 2020-03-29T21:46:23Z

[miio] WIP cloudlogon to get device tokens and map
[miio] save server responses
[miio] cloudstuff cleanup
[miio] Cloud - more updates map download
[miio] WIP get vacuum map from cloud
[miio] WIP get tokens from cloud
[miio] WIP output vacuum image
[miio] first working version with map and tokens from cloud
[miio] improvements map downloads
[miio] improve map decoding
[miio] finalized map drawing logic
[miio] 2nd alpha version cloud+map funcionality
[miio] fixing spotbugs issues
[miio] more spot bug issues resolving
[miio] improved map reading
[miio] map version 1.1
[miio] cleanup many notnullbydefault issues alpha release3
[miio] cleaning cloudconnector
[miio] alpha release 3
[mio] cached logons
[miio] small cleanup
[miio] minor fix text drawing
[miio] alpha 4
[miio] new models added
[miio] Improve path color
[miio] generic county request
[miio] mapviewer cleanup
[miio] log levels adjustment
[miio] update readme

Signed-off-by: Marcel Verpaalen [email protected]

[miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [mio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme Signed-off-by: Marcel Verpaalen [email protected]

TravisBuddy · 2020-03-29T21:48:47Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

cpmeister

I'll have to take a second look later, but this is what I found from my first pass.

cpmeister · 2020-03-30T05:23:08Z

...openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java

@@ -41,10 +46,27 @@
 public class MiIoHandlerFactory extends BaseThingHandlerFactory {

    private MiIoDatabaseWatchService miIoDatabaseWatchService;
+    private @NonNullByDefault({}) HttpClient httpClient;


Why does this need the NonNullByDefault annotation? It is already non-null.

ah, I think it is remaining from the time the class was not yet NonNullByDefault..
I'll remove it

cpmeister · 2020-03-30T05:24:44Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+    private @Nullable HttpClient httpClient;
+
+    private @Nullable MiCloudConnector cloudConnector;
+    public static final CloudConnector CC_INSTANCE = new CloudConnector();


Instead of a singleton instance I would prefer you make this an OSGI component instead.

gave that a shot.. seems indeed to work. Not sure if I understand if I need to make it a service or not. For now it appears to work as just a component

cpmeister · 2020-03-30T05:26:42Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+    public List<JsonObject> getDevicesList() {
+        refreshDeviceList.getValue();
+        return deviceList;
+


please remove this blank line.

cpmeister · 2020-03-30T05:28:05Z

....openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudCrypto.java

+            sha256Hmac.init(secretKey);
+            return Base64.getEncoder().encodeToString(sha256Hmac.doFinal(cipherText));
+        } catch (NoSuchAlgorithmException | InvalidKeyException e) {
+            throw new MiIoCryptoException(e.getMessage());


Make sure to include the cause exception.

I'm not sure if I understand what you mean with this.

Do you mean I should make add a

public MiCloudException(String arg0, Exception e) { super(arg0, e); }

and pass the exception as well?

Yep, that is exactly what I mean. I guess I should have been clearer though

cpmeister · 2020-03-30T05:28:22Z

....openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudCrypto.java

+            MessageDigest md = MessageDigest.getInstance("SHA-256");
+            return Base64.getEncoder().encodeToString(md.digest(inBytes));
+        } catch (NoSuchAlgorithmException e) {
+            throw new MiIoCryptoException(e.getMessage());


Make sure to include the cause exception

cpmeister · 2020-03-30T06:10:34Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudException.java

+    /**
+     * required variable to avoid IncorrectMultilineIndexException warning
+     */
+    private static final long serialVersionUID = -1280858607995252321L;


Please put static variables above the constructors

cpmeister · 2020-03-30T06:11:10Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

+
+    private final String clientId;
+    private String userId = "";
+    private String serviceToken = "";


Why not use Optional<String> instead?

I did not know about this Optional way, is indeed useful.
Though in this particular case I'm not clear what it will bring additionally as a empty string as servicetoken won't be helping me to logon. It would add test for isPresent() on top of the existing isempty ones

cpmeister · 2020-03-30T06:12:27Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+            throw new MiCloudException("Cannot execute request. Cloudservice not available");
+        }
+        if (country.isEmpty()) {
+            // TODO: pick the right server in a more intelligent way


Can you do the todo?

cpmeister · 2020-03-30T06:12:40Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+            // TODO: pick the right server in a more intelligent way
+            logger.debug("Server not defined in thing. Trying servers: {}", this.country);
+            for (String mapCountryServer : this.country.split(",")) {
+                ;


orphan semicolon

cpmeister · 2020-03-30T06:13:56Z

bundles/org.openhab.binding.miio/README.md

@@ -1501,9 +1528,9 @@ Switch childlock "Child Lock" (G_humidifier) {channel="miio:basic:humidifier:chi
 note: Autogenerated example. Replace the id (humidifier) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.

 ```java


This was requested in a PR review some age ago. Guess it helps the formatter.
#4780 (comment)

leave as is then

Signed-off-by: Marcel Verpaalen <[email protected]>

TravisBuddy · 2020-04-01T14:17:21Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

* feedback improvements * token obfuscation for log sharing * basic handler cleanup and improvements Signed-off-by: Marcel Verpaalen <[email protected]>

TravisBuddy · 2020-04-01T14:50:15Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

marcelrv · 2020-04-01T14:58:15Z

@cpmeister I think I made all the updates you suggested. Would be great if you can take another look.
Except for the one on ... if you think that is a real improvement I can make that update, just didn't see a good case for it.

Signed-off-by: Marcel Verpaalen <[email protected]>

TravisBuddy · 2020-04-01T19:01:53Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

cpmeister · 2020-04-02T15:00:39Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+    private static final int STARTING = 0;
+    private static final int REFRESHING = 1;
+    private static final int AVAILABLE = 2;
+    private int deviceListState = STARTING;


Suggested change

private int deviceListState = STARTING;

private volatile int deviceListState = STARTING;

cpmeister · 2020-04-02T16:29:56Z

...openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoHandlerFactory.java

+        String password = (String) properties.get("password");
+        @Nullable
+        String country = (String) properties.get("country");
+        scheduler.schedule(() -> cloudConnector.setCredentials(username, password, country), 0, TimeUnit.SECONDS);


Suggested change

scheduler.schedule(() -> cloudConnector.setCredentials(username, password, country), 0, TimeUnit.SECONDS);

scheduler.submit(() -> cloudConnector.setCredentials(username, password, country));

I did not know this one yet. Thx!

cpmeister · 2020-04-02T16:38:23Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

+
+        Fields fields = new Fields();
+        fields.put("sid", "xiaomiio");
+        // fields.put("hash", encodePassword(password));


cpmeister · 2020-04-02T16:40:28Z

....binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java

+                        scheduler.schedule(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)), 0,
+                                TimeUnit.MILLISECONDS);


Suggested change

scheduler.schedule(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)), 0,

TimeUnit.MILLISECONDS);

scheduler.submit(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)));

cpmeister · 2020-04-02T16:41:22Z

....binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java

+                        String fn = ConfigConstants.getUserDataFolder() + File.separator + BINDING_ID + File.separator
+                                + map;
+                        CloudUtil.writeBytesToFileNio(mapData,
+                                fn + (new SimpleDateFormat("yyyyMMdd-HHss")).format(new Date()) + ".rrmap");


SimpleDateFormat instance should be static to allow for reuse.

cpmeister · 2020-04-02T18:13:14Z

...rg.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java

+    }
+
+    public static void printDevices(String response, String country, Logger logger) {
+        try {


Since this method is only for logging purposes, there is no point in running it if nothing would get logged anyway.

Suggested change

try {

if(!logger.isDebugEnabled()){

return;

}

try {

cpmeister · 2020-04-02T18:26:23Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

+        request.cookie(new HttpCookie("yetAnotherServiceToken", this.serviceToken));
+        request.cookie(new HttpCookie("serviceToken", this.serviceToken));
+        request.cookie(new HttpCookie("locale", locale.toString()));
+        request.cookie(new HttpCookie("timezone", "GMT%2B01%3A00"));


Shouldn't the timezone be the local timezone, or no?

Probable indeed... this stuff is mostly from reverse engineering and MITM logging of traffic from phone to the cloud. It is unclear what it actually is doing. I'll make it dynamic based on the OS setting

cpmeister · 2020-04-02T18:26:53Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

+        request.cookie(new HttpCookie("serviceToken", this.serviceToken));
+        request.cookie(new HttpCookie("locale", locale.toString()));
+        request.cookie(new HttpCookie("timezone", "GMT%2B01%3A00"));
+        request.cookie(new HttpCookie("is_daylight", "1"));


Doesn't this change? Why is this constant?

cpmeister · 2020-04-02T18:27:55Z

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

+        for (HttpCookie cookie : request.getCookies()) {
+            logger.trace("Cookie set for request ({}) : {} --> {}     (path: {})", cookie.getDomain(), cookie.getName(),
+                    cookie.getValue(), cookie.getPath());
+        }


Just minimizing cpu waste.

Suggested change

for (HttpCookie cookie : request.getCookies()) {

logger.trace("Cookie set for request ({}) : {} --> {} (path: {})", cookie.getDomain(), cookie.getName(),

cookie.getValue(), cookie.getPath());

}

if(logger.isTraceEnabled){

for (HttpCookie cookie : request.getCookies()) {

logger.trace("Cookie set for request ({}) : {} --> {} (path: {})", cookie.getDomain(), cookie.getName(),

cookie.getValue(), cookie.getPath());

}

}

...hab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/MiCloudConnector.java

cpmeister · 2020-04-02T18:38:50Z

...rg.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java

        } catch (IOException e) {
-            // no joy
+            logger.debug("Error loading image ohlogo.png:: {}", e.getMessage());
        }
        Font font = new Font("TimesRoman", Font.BOLD, 14);


You are still using TimesRoman here.

yes, I think something went wrong with the final save. Should be fixed now

Fix for re-logon move to DTO Updates based on review feedback Signed-off-by: Marcel Verpaalen <[email protected]>

Conflicts: bundles/org.openhab.binding.miio/README.md bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java

Signed-off-by: Marcel Verpaalen <[email protected]>

TravisBuddy · 2020-04-05T23:13:20Z

Travis tests have failed

Hey @marcelrv,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

Signed-off-by: Marcel Verpaalen <[email protected]>

TravisBuddy · 2020-04-05T23:27:00Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

marcelrv · 2020-04-05T23:29:48Z

@cpmeister would be great if you could review the update.
I think i processed majority of your suggestions (all, except for the parser).

...b.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudDeviceListDTO.java

cpmeister · 2020-04-05T23:36:29Z

...penhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudLoginDTO.java

+    public void setCaptchaUrl(Object captchaUrl) {
+        this.captchaUrl = captchaUrl;
+    }
+}


Some of our build tools don't like EOF without a newline. So add a newline here.

cpmeister · 2020-04-05T23:43:27Z

...g.miio/src/main/java/org/openhab/binding/miio/internal/transport/MiIoAsyncCommunication.java

@@ -310,7 +313,7 @@ private void pingSuccess() {
        if (!connected) {
            connected = true;
            status = ThingStatusDetail.NONE;
-            updateStatus(ThingStatus.ONLINE, ThingStatusDetail.NONE);
+            updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE);


You need two pings to go online?

this is one of the most confusing parts of the current binding behavior.

If the user has wrong token, currently the thing becomes online. As it responds to the ping, but does not respond to commands. This confuses everyone. Hence I want to make it more transparent for the users and only make the thing online if it actually responds to a command.

Ping only means that a Xiaomi device is there, but it does not mean online in the sense that it is working.

The annoying part of the devices is they simply don't respond at all if a wrong token is used, so not even a 'wrong token' sort of response.

cpmeister · 2020-04-06T00:02:13Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+        if (username != null && password != null) {
+            this.username = username;
+            this.password = password;
+            logon();


Why do you need to logon here? Can it be done lazily?

yes, can. removed the logon

cpmeister · 2020-04-06T00:50:05Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudDeviceDTO.java

+    @SerializedName("family_id")
+    @Expose
+    private Integer familyId;
+    private @NonNull String server = "undefined";


might be cleaner if you made all these fields public, you could get rid of all the bloat of your getter methods.

I actually did that first. But for the fields that I actually use I wanted to avoid null checks everywhere in the code, so I added those in the getters (only to the current relevant fields).
It did not seem very clean to have half of the fields in with public and the remaining with getters in private or have a public one that also has a getter

cpmeister · 2020-04-06T01:02:44Z

...rg.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/robot/RRMapDraw.java

+            g2d.setStroke(new BasicStroke());
+            g2d.setColor(Color.YELLOW);
+            int x3[] = { (int) x, (int) (x - 2 * scale), (int) (x + 2 * scale) };
+            int y3[] = { (int) y, (int) (y - 5 * scale), (int) (y - 5 * scale) };


is this correct?

Suggested change

int y3[] = { (int) y, (int) (y - 5 * scale), (int) (y - 5 * scale) };

int y3[] = { (int) y, (int) (y - 5 * scale), (int) (y + 5 * scale) };

It is suppose to draw a triangle. Bottom of the triangle at the xy

cpmeister · 2020-04-06T01:07:51Z

bundles/org.openhab.binding.miio/README.base.md

@@ -49,6 +27,10 @@ Accept only one of the 2 discovery results, the alternate one can further be ign
 ## Tokens

 The binding needs a token from the Xiaomi Mi Device in order to be able to control it.
+The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use the one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.


Please put each sentence on a separate line. It makes it easier see changes.

Suggested change

The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use the one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.

The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.

bundles/org.openhab.binding.miio/README.base.md

cpmeister · 2020-04-06T01:10:08Z

bundles/org.openhab.binding.miio/README.md

+## Tokens
+
+The binding needs a token from the Xiaomi Mi Device in order to be able to control it.
+The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use the one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.


same changes here

cpmeister · 2020-04-06T01:14:32Z

...enhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudConnector.java

+    private static final int FAILED = -1;
+    private static final int STARTING = 0;
+    private static final int REFRESHING = 1;
+    private static final int AVAILABLE = 2;
+    private volatile int deviceListState = STARTING;


Can you make this an enum instead?

Signed-off-by: Marcel Verpaalen [email protected] Co-Authored-By: cpmeister <[email protected]>

TravisBuddy · 2020-04-06T09:25:57Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

Signed-off-by: Marcel Verpaalen <[email protected]>

marcelrv · 2020-04-06T18:52:37Z

@cpmeister hope we are getting there...
Made the updates, kept the DTO's as is, see for rationale the comment there.

cpmeister

This is the last change.

...rg.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java

…ding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-Authored-By: cpmeister <[email protected]>

TravisBuddy · 2020-04-07T06:21:42Z

Travis tests were successful

Hey @marcelrv,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

cpmeister

LGTM

marcelrv · 2020-04-07T19:20:09Z

@cpmeister thanks for your time and support

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]> Signed-off-by: Hans-Reiner Hoffmann <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]> Signed-off-by: Eugen Freiter <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]> Signed-off-by: CSchlipp <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]> Signed-off-by: Daan Meijer <[email protected]>

…hab#7255) * [miio] Squash/rebase Xiaomi cloud logon and map download [miio] WIP cloudlogon to get device tokens and map [miio] save server responses [miio] cloudstuff cleanup [miio] Cloud - more updates map download [miio] WIP get vacuum map from cloud [miio] WIP get tokens from cloud [miio] WIP output vacuum image [miio] first working version with map and tokens from cloud [miio] improvements map downloads [miio] improve map decoding [miio] finalized map drawing logic [miio] 2nd alpha version cloud+map funcionality [miio] fixing spotbugs issues [miio] more spot bug issues resolving [miio] improved map reading [miio] map version 1.1 [miio] cleanup many notnullbydefault issues alpha release3 [miio] cleaning cloudconnector [miio] alpha release 3 [miio] cached logons [miio] small cleanup [miio] minor fix text drawing [miio] alpha 4 [miio] new models added [miio] Improve path color [miio] generic county request [miio] mapviewer cleanup [miio] log levels adjustment [miio] update readme [miio] fix updating basic devices (openhab#7254) [miio] improvements based on feedback feedback improvements token obfuscation for log sharing basic handler cleanup and improvements [miio] schedule login to avoid activation issues [miio] updates based on feedback Fix for re-logon move to DTO Updates based on review feedback [miio] update readme & small cleanup [miio] small fix Apply suggestions from code review Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-authored-by: cpmeister <[email protected]>

marcelrv added the enhancement An enhancement or new feature for an existing add-on label Mar 29, 2020

marcelrv requested a review from cpmeister March 29, 2020 21:46

cpmeister requested changes Mar 30, 2020

View reviewed changes

marcelrv and others added 2 commits March 31, 2020 13:57

[miio] fix updating basic devices (openhab#7254)

84e113a

Signed-off-by: Marcel Verpaalen <[email protected]>

Merge remote-tracking branch 'origin/2.5.x' into miio-cloudconnect

07b902f

[miio] improvements based on feedback

75bcaf7

* feedback improvements * token obfuscation for log sharing * basic handler cleanup and improvements Signed-off-by: Marcel Verpaalen <[email protected]>

marcelrv force-pushed the miio-cloudconnect branch from 8307eb7 to 75bcaf7 Compare April 1, 2020 14:47

[miio] schedule login to avoid activation issues

83ebc3d

Signed-off-by: Marcel Verpaalen <[email protected]>

marcelrv mentioned this pull request Apr 2, 2020

[miio] OFFLINE (COMMUNICATION_ERROR): maximum number of DatagramSockets reached #5784

Closed

cpmeister requested changes Apr 2, 2020

View reviewed changes

cpmeister reviewed Apr 2, 2020

View reviewed changes

marcelrv added 3 commits April 6, 2020 00:03

[miio] updates based on feedback

c0c7db5

Fix for re-logon move to DTO Updates based on review feedback Signed-off-by: Marcel Verpaalen <[email protected]>

Merge remote-tracking branch 'origin/2.5.x' into miio-cloudconnect

f59e3fe

Conflicts: bundles/org.openhab.binding.miio/README.md bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/discovery/MiIoDiscovery.java

[miio] update readme & small cleanup

98bbf1a

Signed-off-by: Marcel Verpaalen <[email protected]>

[miio] small fix

fdf64d4

Signed-off-by: Marcel Verpaalen <[email protected]>

cpmeister requested changes Apr 6, 2020

View reviewed changes

Apply suggestions from code review

c6dec0f

Signed-off-by: Marcel Verpaalen [email protected] Co-Authored-By: cpmeister <[email protected]>

[miio] updates based on feedback

2b100a3

Signed-off-by: Marcel Verpaalen <[email protected]>

cpmeister requested changes Apr 6, 2020

View reviewed changes

...rg.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java Outdated Show resolved Hide resolved

Update bundles/org.openhab.binding.miio/src/main/java/org/openhab/bin…

da9657e

…ding/miio/internal/cloud/CloudUtil.java Signed-off-by: Marcel Verpaalen <[email protected]> Co-Authored-By: cpmeister <[email protected]>

cpmeister approved these changes Apr 7, 2020

View reviewed changes

cpmeister merged commit cc61af2 into openhab:2.5.x Apr 7, 2020

cpmeister added this to the 2.5.4 milestone Apr 7, 2020

marcelrv deleted the miio-cloudconnect branch April 7, 2020 19:20

		@@ -1501,9 +1528,9 @@ Switch childlock "Child Lock" (G_humidifier) {channel="miio:basic:humidifier:chi
		note: Autogenerated example. Replace the id (humidifier) in the channel with your own. Replace `basic` with `generic` in the thing UID depending on how your thing was discovered.

		```java

	private int deviceListState = STARTING;
	private volatile int deviceListState = STARTING;

	scheduler.schedule(() -> cloudConnector.setCredentials(username, password, country), 0, TimeUnit.SECONDS);
	scheduler.submit(() -> cloudConnector.setCredentials(username, password, country));

		scheduler.schedule(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)), 0,
		TimeUnit.MILLISECONDS);

	scheduler.schedule(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)), 0,
	TimeUnit.MILLISECONDS);
	scheduler.submit(() -> updateState(CHANNEL_VACUUM_MAP, getMap(mapresponse)));

-        try {
+        if(!logger.isDebugEnabled()){
+            return;
+        }
+        try {

	int y3[] = { (int) y, (int) (y - 5 * scale), (int) (y - 5 * scale) };
	int y3[] = { (int) y, (int) (y - 5 * scale), (int) (y + 5 * scale) };

	The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use the one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.
	The binding can retrieve the needed tokens from the Xiaomi cloud. Go to the binding config page and enter your cloud username and password. The server(s) to which your devices are connected need to be entered as well. Use one of the regional servers: ru,us,tw,sg,cn,de. Multiple servers can be separated with comma, or leave blank to test all known servers.

[miio] Add Xiaomi cloud logon (token download) and map download #7255

[miio] Add Xiaomi cloud logon (token download) and map download #7255

Conversation

marcelrv commented Mar 29, 2020

TravisBuddy commented Mar 29, 2020

Travis tests were successful

cpmeister left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcelrv Mar 30, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TravisBuddy commented Apr 1, 2020

Travis tests were successful

TravisBuddy commented Apr 1, 2020

Travis tests were successful

marcelrv commented Apr 1, 2020

TravisBuddy commented Apr 1, 2020

Travis tests were successful

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cpmeister Apr 2, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TravisBuddy commented Apr 5, 2020

Travis tests have failed

TravisBuddy commented Apr 5, 2020

Travis tests were successful

marcelrv commented Apr 5, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

marcelrv Apr 6, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TravisBuddy commented Apr 6, 2020

Travis tests were successful

marcelrv commented Apr 6, 2020

cpmeister left a comment

Choose a reason for hiding this comment

TravisBuddy commented Apr 7, 2020

Travis tests were successful

cpmeister left a comment

Choose a reason for hiding this comment

marcelrv commented Apr 7, 2020

cpmeister left a comment •

edited

Loading

marcelrv Mar 30, 2020 •

edited

Loading

cpmeister Apr 2, 2020 •

edited

Loading

marcelrv Apr 6, 2020 •

edited

Loading