Benoit Marty
3 months ago
committed by
GitHub
15 changed files with 318 additions and 214 deletions
@ -1,61 +0,0 @@ |
|||||||
/* |
|
||||||
* Copyright (c) 2024 New Vector Ltd |
|
||||||
* |
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
|
||||||
* you may not use this file except in compliance with the License. |
|
||||||
* You may obtain a copy of the License at |
|
||||||
* |
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0 |
|
||||||
* |
|
||||||
* Unless required by applicable law or agreed to in writing, software |
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS, |
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
|
||||||
* See the License for the specific language governing permissions and |
|
||||||
* limitations under the License. |
|
||||||
*/ |
|
||||||
|
|
||||||
package io.element.android.features.call.impl.utils |
|
||||||
|
|
||||||
import com.squareup.anvil.annotations.ContributesBinding |
|
||||||
import io.element.android.features.call.impl.wellknown.CallWellknownAPI |
|
||||||
import io.element.android.libraries.core.coroutine.CoroutineDispatchers |
|
||||||
import io.element.android.libraries.di.AppScope |
|
||||||
import io.element.android.libraries.di.SingleIn |
|
||||||
import io.element.android.libraries.matrix.api.core.SessionId |
|
||||||
import io.element.android.libraries.network.RetrofitFactory |
|
||||||
import kotlinx.coroutines.withContext |
|
||||||
import retrofit2.HttpException |
|
||||||
import timber.log.Timber |
|
||||||
import java.net.HttpURLConnection |
|
||||||
import javax.inject.Inject |
|
||||||
|
|
||||||
interface ElementCallBaseUrlProvider { |
|
||||||
suspend fun provides(sessionId: SessionId): String? |
|
||||||
} |
|
||||||
|
|
||||||
@SingleIn(AppScope::class) |
|
||||||
@ContributesBinding(AppScope::class) |
|
||||||
class DefaultElementCallBaseUrlProvider @Inject constructor( |
|
||||||
private val retrofitFactory: RetrofitFactory, |
|
||||||
private val coroutineDispatchers: CoroutineDispatchers, |
|
||||||
) : ElementCallBaseUrlProvider { |
|
||||||
private val apiCache = mutableMapOf<SessionId, CallWellknownAPI>() |
|
||||||
|
|
||||||
override suspend fun provides(sessionId: SessionId): String? = withContext(coroutineDispatchers.io) { |
|
||||||
val domain = sessionId.value.substringAfter(":") |
|
||||||
val callWellknownAPI = apiCache.getOrPut(sessionId) { |
|
||||||
retrofitFactory.create("https://$domain") |
|
||||||
.create(CallWellknownAPI::class.java) |
|
||||||
} |
|
||||||
try { |
|
||||||
callWellknownAPI.getCallWellKnown().widgetUrl |
|
||||||
} catch (e: HttpException) { |
|
||||||
// Ignore Http 404, but re-throws any other exceptions |
|
||||||
if (e.code() != HttpURLConnection.HTTP_NOT_FOUND) { |
|
||||||
throw e |
|
||||||
} |
|
||||||
Timber.w(e, "Failed to fetch wellknown data") |
|
||||||
null |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
@ -0,0 +1,52 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2024 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.libraries.matrix.impl.call |
||||||
|
|
||||||
|
import com.squareup.anvil.annotations.ContributesBinding |
||||||
|
import io.element.android.libraries.di.AppScope |
||||||
|
import io.element.android.libraries.matrix.api.MatrixClient |
||||||
|
import io.element.android.libraries.matrix.api.call.ElementCallBaseUrlProvider |
||||||
|
import timber.log.Timber |
||||||
|
import javax.inject.Inject |
||||||
|
|
||||||
|
@ContributesBinding(AppScope::class) |
||||||
|
class DefaultElementCallBaseUrlProvider @Inject constructor( |
||||||
|
private val elementWellKnownParser: ElementWellKnownParser, |
||||||
|
) : ElementCallBaseUrlProvider { |
||||||
|
override suspend fun provides(matrixClient: MatrixClient): String? { |
||||||
|
val url = buildString { |
||||||
|
append("https://") |
||||||
|
append(matrixClient.userIdServerName()) |
||||||
|
append("/.well-known/element/element.json") |
||||||
|
} |
||||||
|
return matrixClient.getUrl(url) |
||||||
|
.onFailure { failure -> |
||||||
|
Timber.w(failure, "Failed to fetch well-known element.json") |
||||||
|
} |
||||||
|
.getOrNull() |
||||||
|
?.let { wellKnownStr -> |
||||||
|
elementWellKnownParser.parse(wellKnownStr) |
||||||
|
.onFailure { failure -> |
||||||
|
// Can be a HTML 404. |
||||||
|
Timber.w(failure, "Failed to parse content") |
||||||
|
} |
||||||
|
.getOrNull() |
||||||
|
} |
||||||
|
?.call |
||||||
|
?.widgetUrl |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,36 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2024 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.libraries.matrix.impl.call |
||||||
|
|
||||||
|
import com.squareup.anvil.annotations.ContributesBinding |
||||||
|
import io.element.android.libraries.di.AppScope |
||||||
|
import org.matrix.rustcomponents.sdk.ElementWellKnown |
||||||
|
import org.matrix.rustcomponents.sdk.makeElementWellKnown |
||||||
|
import javax.inject.Inject |
||||||
|
|
||||||
|
interface ElementWellKnownParser { |
||||||
|
fun parse(str: String): Result<ElementWellKnown> |
||||||
|
} |
||||||
|
|
||||||
|
@ContributesBinding(AppScope::class) |
||||||
|
class RustElementWellKnownParser @Inject constructor() : ElementWellKnownParser { |
||||||
|
override fun parse(str: String): Result<ElementWellKnown> { |
||||||
|
return runCatching { |
||||||
|
makeElementWellKnown(str) |
||||||
|
} |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,32 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2024 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.libraries.matrix.impl.server |
||||||
|
|
||||||
|
import com.squareup.anvil.annotations.ContributesBinding |
||||||
|
import io.element.android.libraries.di.SessionScope |
||||||
|
import io.element.android.libraries.matrix.api.MatrixClient |
||||||
|
import io.element.android.libraries.matrix.api.server.UserServerResolver |
||||||
|
import javax.inject.Inject |
||||||
|
|
||||||
|
@ContributesBinding(SessionScope::class) |
||||||
|
class DefaultUserServerResolver @Inject constructor( |
||||||
|
private val matrixClient: MatrixClient, |
||||||
|
) : UserServerResolver { |
||||||
|
override fun resolve(): String { |
||||||
|
return matrixClient.userIdServerName() |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,107 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2024 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.libraries.matrix.impl.call |
||||||
|
|
||||||
|
import com.google.common.truth.Truth.assertThat |
||||||
|
import io.element.android.libraries.matrix.test.AN_EXCEPTION |
||||||
|
import io.element.android.libraries.matrix.test.FakeMatrixClient |
||||||
|
import io.element.android.tests.testutils.lambda.lambdaRecorder |
||||||
|
import io.element.android.tests.testutils.lambda.value |
||||||
|
import kotlinx.coroutines.test.runTest |
||||||
|
import org.junit.Test |
||||||
|
import org.matrix.rustcomponents.sdk.ElementCallWellKnown |
||||||
|
import org.matrix.rustcomponents.sdk.ElementWellKnown |
||||||
|
|
||||||
|
class DefaultElementCallBaseUrlProviderTest { |
||||||
|
@Test |
||||||
|
fun `provides returns null when getUrl returns an error`() = runTest { |
||||||
|
val userIdServerNameLambda = lambdaRecorder<String> { "example.com" } |
||||||
|
val getUrlLambda = lambdaRecorder<String, Result<String>> { _ -> |
||||||
|
Result.failure(AN_EXCEPTION) |
||||||
|
} |
||||||
|
val sut = DefaultElementCallBaseUrlProvider( |
||||||
|
FakeElementWellKnownParser( |
||||||
|
Result.success(createElementWellKnown("")) |
||||||
|
) |
||||||
|
) |
||||||
|
val matrixClient = FakeMatrixClient( |
||||||
|
userIdServerNameLambda = userIdServerNameLambda, |
||||||
|
getUrlLambda = getUrlLambda, |
||||||
|
) |
||||||
|
val result = sut.provides(matrixClient) |
||||||
|
assertThat(result).isNull() |
||||||
|
userIdServerNameLambda.assertions().isCalledOnce() |
||||||
|
getUrlLambda.assertions().isCalledOnce() |
||||||
|
.with(value("https://example.com/.well-known/element/element.json")) |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
fun `provides returns null when content parsing fails`() = runTest { |
||||||
|
val userIdServerNameLambda = lambdaRecorder<String> { "example.com" } |
||||||
|
val getUrlLambda = lambdaRecorder<String, Result<String>> { _ -> |
||||||
|
Result.success("""{"call":{"widget_url":"https://example.com/call"}}""") |
||||||
|
} |
||||||
|
val sut = DefaultElementCallBaseUrlProvider( |
||||||
|
createFakeElementWellKnownParser( |
||||||
|
Result.failure(AN_EXCEPTION) |
||||||
|
) |
||||||
|
) |
||||||
|
val matrixClient = FakeMatrixClient( |
||||||
|
userIdServerNameLambda = userIdServerNameLambda, |
||||||
|
getUrlLambda = getUrlLambda, |
||||||
|
) |
||||||
|
val result = sut.provides(matrixClient) |
||||||
|
assertThat(result).isNull() |
||||||
|
userIdServerNameLambda.assertions().isCalledOnce() |
||||||
|
getUrlLambda.assertions().isCalledOnce() |
||||||
|
.with(value("https://example.com/.well-known/element/element.json")) |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
fun `provides returns value when getUrl returns correct content`() = runTest { |
||||||
|
val userIdServerNameLambda = lambdaRecorder<String> { "example.com" } |
||||||
|
val getUrlLambda = lambdaRecorder<String, Result<String>> { _ -> |
||||||
|
Result.success("""{"call":{"widget_url":"https://example.com/call"}}""") |
||||||
|
} |
||||||
|
val sut = DefaultElementCallBaseUrlProvider( |
||||||
|
createFakeElementWellKnownParser( |
||||||
|
Result.success(createElementWellKnown("aUrl")) |
||||||
|
) |
||||||
|
) |
||||||
|
val matrixClient = FakeMatrixClient( |
||||||
|
userIdServerNameLambda = userIdServerNameLambda, |
||||||
|
getUrlLambda = getUrlLambda, |
||||||
|
) |
||||||
|
val result = sut.provides(matrixClient) |
||||||
|
assertThat(result).isEqualTo("aUrl") |
||||||
|
userIdServerNameLambda.assertions().isCalledOnce() |
||||||
|
getUrlLambda.assertions().isCalledOnce() |
||||||
|
.with(value("https://example.com/.well-known/element/element.json")) |
||||||
|
} |
||||||
|
|
||||||
|
private fun createFakeElementWellKnownParser(result: Result<ElementWellKnown>): FakeElementWellKnownParser { |
||||||
|
return FakeElementWellKnownParser(result) |
||||||
|
} |
||||||
|
|
||||||
|
private fun createElementWellKnown(widgetUrl: String): ElementWellKnown { |
||||||
|
return ElementWellKnown( |
||||||
|
call = ElementCallWellKnown( |
||||||
|
widgetUrl = widgetUrl |
||||||
|
) |
||||||
|
) |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,27 @@ |
|||||||
|
/* |
||||||
|
* Copyright (c) 2024 New Vector Ltd |
||||||
|
* |
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||||
|
* you may not use this file except in compliance with the License. |
||||||
|
* You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0 |
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
|
||||||
|
package io.element.android.libraries.matrix.impl.call |
||||||
|
|
||||||
|
import org.matrix.rustcomponents.sdk.ElementWellKnown |
||||||
|
|
||||||
|
class FakeElementWellKnownParser( |
||||||
|
private val result: Result<ElementWellKnown> |
||||||
|
) : ElementWellKnownParser { |
||||||
|
override fun parse(str: String): Result<ElementWellKnown> { |
||||||
|
return result |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue