Revise device (broadcast-using) discovery process #437
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is the initial commit to rework the handshake/discovery process, separating them to separate entities. The discovery part from Device class is moved into MiIODiscovery class usable for broadcast discovery of available devices. Also, instead of printing out the details from discovered devices, a list of Devices is being returned. The discover() method of the class is extended to allow discovery on all network interfaces (instead of using 255.255.255.255), making it easier to perform the initial configuration of non-provisioned devices and/or work with devices in other subnets. Although the change cause some duplicate code (mainly the handshake payload), this will make the responsibilities of corresponding classes clearer and code more usable for 3rd party developers. There will be cleanups and (likely also) renamings of some of the parts, but I wanted to make this available for others to comment. TODO: * Upcasting the Device to a corresponding implementation class (miIO.info model information could be useful, too..) * Decide how to handle the returning of discovered devices. Use a separate DiscoveredDevice class which can be used to initialize the real device, or use the existing Device and do the casting trick? Related to #152 (and maybe #422).
houndci-bot
reviewed
Dec 12, 2018
| "the device should connect to the given network") | ||
| except DeviceException as ex: | ||
| click.echo("Unable to configure the wifi connection: %s" % ex) | ||
|
|
| continue | ||
| all_devices.extend(devices) | ||
|
|
||
| return all_devices |
| _LOGGER.debug("Broadcast addreses: %s", ipv4_broadcasts) | ||
| for broadcast in ipv4_broadcasts: | ||
| _LOGGER.debug("Sending discovery to %s with timeout of %ss..", | ||
| broadcast, timeout) |
There was a problem hiding this comment.
continuation line under-indented for visual indent
| break | ||
|
|
||
| return devices | ||
|
|
| import socket | ||
| from . import Message | ||
|
|
||
| class MiIODiscovery: |
| @@ -161,3 +158,83 @@ def discover_mdns() -> Dict[str, Device]: | |||
| browser.cancel() | |||
|
|
|||
| return listener.found_devices | |||
|
|
|||
| import socket | |||
| from . import Message | |||
There was a problem hiding this comment.
module level import not at top of file
| @@ -161,3 +158,83 @@ def discover_mdns() -> Dict[str, Device]: | |||
| browser.cancel() | |||
|
|
|||
| return listener.found_devices | |||
|
|
|||
| import socket | |||
There was a problem hiding this comment.
expected 2 blank lines after class or function definition, found 1
module level import not at top of file
| @@ -1,7 +1,9 @@ | |||
| import binascii | |||
This was referenced Nov 27, 2019
|
The codebase has changed so much that improving the discovery process should be done from scratch. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the initial commit to rework the handshake/discovery process,
separating them to separate entities.
The discovery part from Device class is moved into MiIODiscovery class usable for broadcast discovery of available devices.
Also, instead of printing out the details from discovered devices, a list of Devices is being returned.
The discover() method of the class is extended to allow discovery on all network interfaces (instead of using 255.255.255.255),
making it easier to perform the initial configuration of non-provisioned devices and/or work with devices in other subnets.
Although the change cause some duplicate code (mainly the handshake payload),
this will make the responsibilities of corresponding classes clearer and code more usable for 3rd party developers.
There will be cleanups and (likely also) renamings of some of the parts, but I wanted to make
this available for others to comment.
TODO:
to initialize the real device, or use the existing Device and do the casting trick?
Related to #152 (and maybe #422).