Second phase of network refactoring #1853
Open
+7,057
−4,728
Conversation
This file contains hidden or 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
# Conflicts: # app/src/main/java/org/session/libsession/network/SnodeClientErrorManager.kt # app/src/main/java/org/session/libsession/network/onion/PathManager.kt # app/src/test/java/org/thoughtcrime/securesms/network/PathManagerTest.kt # app/src/test/java/org/thoughtcrime/securesms/network/SnodeClientErrorManagerTest.kt
# Conflicts: # app/src/main/java/org/session/libsession/network/snode/SnodeDirectory.kt # app/src/main/java/org/session/libsignal/utilities/Snode.kt
| @@ -0,0 +1,3 @@ | |||
| package org.thoughtcrime.securesms.api.error | |||
|
|
|||
| class ClockOutOfSyncException : RuntimeException("Clock is out of sync is reported by a server") No newline at end of file | |||
Collaborator
There was a problem hiding this comment.
I don't think we need this level of abstraction for the COS
| * | ||
| * Normally this is up to the caller to handle. | ||
| */ | ||
| class UnknownStatusCodeException( |
Collaborator
There was a problem hiding this comment.
Unhandled instead of unknown?
| ) | ||
| return parseSnodePoolFromJsonBytes(responseBytes) | ||
| private suspend fun fetchSnodePoolFromSnode(snode: Snode): List<Snode> { | ||
| //TODO: Onion should request over onion |
Collaborator
There was a problem hiding this comment.
can remove this todo now
| val parsed = parseSnodePoolFromJsonBytes(localBytes) | ||
| @Suppress("OPT_IN_USAGE") | ||
| val parsed: ListSnodeApi.Response = appContext.assets.open(LOCAL_SNODE_POOL_ASSET) | ||
| .use(json::decodeFromStream) |
Collaborator
There was a problem hiding this comment.
deserialise will fail - missing result
| @@ -20,13 +19,4 @@ data class BatchResponse(val results: List<Item>, ) { | |||
| val isSnodeNoLongerPartOfSwarm: Boolean | |||
Collaborator
There was a problem hiding this comment.
Might not be needed anymore now
| .execute( | ||
| req = SnodeApiRequest( | ||
| snode = snodePoolStorage.getSnodePool().first { it !in pathCandidate }, | ||
| api = getNetworkTimeApi.get() |
Collaborator
There was a problem hiding this comment.
should getNetworkTime be renamed to info?
| item to result.map { response -> | ||
| when { | ||
| response.isSuccess() -> Unit | ||
| response.error == 403 -> throw NonRetryableException("Request failed: code = ${response.error}, message = ${response.message}") |
Collaborator
There was a problem hiding this comment.
Are we missing some of these error handling cases?
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 PR reorganises code around and makes use of the concept of
ApiExecutor: different executors operate on different levels, and they normally just pass data down to another level for handling.