Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send IP address of Matter device for on network commissioning #4069

Merged
merged 3 commits into from
Jan 4, 2024
Merged

Send IP address of Matter device for on network commissioning #4069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c772e13
[WIP] Send IP of device during commissioning
jpelgrom Dec 14, 2023
752be8d
Add version check for IP address in commission_on_network
jpelgrom Dec 18, 2023
54672be
Update minimal
jpelgrom Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/full/java/io/homeassistant/companion/android/matter/MatterCommissioningService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class MatterCommissioningService : Service(), CommissioningService.Callback {
commissioningServiceDelegate.sendCommissioningError(CommissioningError.OTHER)
return@launch
}
val result = matterManager.commissionOnNetworkDevice(metadata.passcode, serverId)
val result = matterManager.commissionOnNetworkDevice(metadata.passcode, metadata.networkLocation.formattedIpAddress, serverId)
Log.d(TAG, "Server commissioning was ${if (result?.success == true) "successful" else "not successful (${result?.errorCode})"}")

if (result?.success == true) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/full/java/io/homeassistant/companion/android/matter/MatterManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ class MatterManagerImpl @Inject constructor(
}
}

override suspend fun commissionOnNetworkDevice(pin: Long, serverId: Int): MatterCommissionResponse? {
override suspend fun commissionOnNetworkDevice(pin: Long, ip: String, serverId: Int): MatterCommissionResponse? {
return try {
serverManager.webSocketRepository(serverId).commissionMatterDeviceOnNetwork(pin)
serverManager.webSocketRepository(serverId).commissionMatterDeviceOnNetwork(pin, ip)
} catch (e: Exception) {
Log.e(TAG, "Error while executing server commissioning request", e)
null
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/homeassistant/companion/android/matter/MatterManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ interface MatterManager {
* Send a request to the server to commission an "on network" Matter device
* @return [MatterCommissionResponse], or `null` if it wasn't possible to complete the request
*/
suspend fun commissionOnNetworkDevice(pin: Long, serverId: Int): MatterCommissionResponse?
suspend fun commissionOnNetworkDevice(pin: Long, ip: String, serverId: Int): MatterCommissionResponse?
}
2 changes: 1 addition & 1 deletion app/src/minimal/java/io/homeassistant/companion/android/matter/MatterManagerImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ class MatterManagerImpl @Inject constructor() : MatterManager {

override suspend fun commissionDevice(code: String, serverId: Int): MatterCommissionResponse? = null

override suspend fun commissionOnNetworkDevice(pin: Long, serverId: Int): MatterCommissionResponse? = null
override suspend fun commissionOnNetworkDevice(pin: Long, ip: String, serverId: Int): MatterCommissionResponse? = null
}
2 changes: 1 addition & 1 deletion ...main/java/io/homeassistant/companion/android/common/data/websocket/WebSocketRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ interface WebSocketRepository {
* @return [MatterCommissionResponse] detailing the server's response, or `null` if the server
* did not return a response.
*/
suspend fun commissionMatterDeviceOnNetwork(pin: Long): MatterCommissionResponse?
suspend fun commissionMatterDeviceOnNetwork(pin: Long, ip: String): MatterCommissionResponse?

/**
* Return a list of all Thread datasets known to the server.
Expand Down
11 changes: 6 additions & 5 deletions .../io/homeassistant/companion/android/common/data/websocket/impl/WebSocketRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,14 @@ class WebSocketRepositoryImpl @AssistedInject constructor(
}
}

override suspend fun commissionMatterDeviceOnNetwork(pin: Long): MatterCommissionResponse? {
override suspend fun commissionMatterDeviceOnNetwork(pin: Long, ip: String): MatterCommissionResponse? {
val data = mapOf(
"type" to "matter/commission_on_network",
"pin" to pin
)
val response = sendMessage(
WebSocketRequest(
message = mapOf(
"type" to "matter/commission_on_network",
"pin" to pin
),
message = if (server?.version?.isAtLeast(2024, 1) == true) data.plus("ip_addr" to ip) else data,
timeout = 120000L // Matter commissioning takes at least 60 seconds + interview
)
)
Expand Down