Combine socket #34
There are no files selected for viewing
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package com.ivanempire.lighthouse.socket | ||
|
|
||
| import com.ivanempire.lighthouse.LighthouseLogger | ||
| import com.ivanempire.lighthouse.models.Constants.DEFAULT_MULTICAST_ADDRESS | ||
| import com.ivanempire.lighthouse.models.search.SearchRequest | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.currentCoroutineContext | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.catch | ||
| import kotlinx.coroutines.flow.flow | ||
| import kotlinx.coroutines.flow.flowOn | ||
| import kotlinx.coroutines.flow.onCompletion | ||
| import kotlinx.coroutines.isActive | ||
| import java.net.DatagramPacket | ||
| import java.net.InetAddress | ||
| import java.net.InetSocketAddress | ||
| import java.net.MulticastSocket | ||
|
|
||
| /** Specific implementation of [SocketListener] */ | ||
| internal abstract class BaseSocketListener( | ||
| private val retryCount: Int, | ||
| private val logger: LighthouseLogger? = null, | ||
| ) : SocketListener { | ||
|
|
||
| private val multicastGroup: InetAddress by lazy { | ||
| InetAddress.getByName(DEFAULT_MULTICAST_ADDRESS) | ||
| } | ||
|
|
||
| protected abstract fun acquireMulticastLock() | ||
|
|
||
| private fun setupSocket(): MulticastSocket { | ||
| acquireMulticastLock() | ||
|
|
||
| val multicastSocket = MulticastSocket(null) | ||
| multicastSocket.reuseAddress = true | ||
| multicastSocket.broadcast = true | ||
| multicastSocket.loopbackMode = true // disable LoopbackMode | ||
|
|
||
| try { | ||
| multicastSocket.joinGroup(multicastGroup) | ||
| multicastSocket.bind(InetSocketAddress(MULTICAST_PORT)) | ||
| logger?.logStatusMessage(TAG, "MulticastSocket has been setup") | ||
| } catch (ex: Exception) { | ||
| logger?.logErrorMessage( | ||
| TAG, | ||
| "Could finish setting up the multicast socket and group", | ||
| ex | ||
| ) | ||
| } | ||
|
|
||
| return multicastSocket | ||
| } | ||
|
|
||
| override fun listenForPackets(searchRequest: SearchRequest): Flow<DatagramPacket> { | ||
| logger?.logStatusMessage(TAG, "Setting up datagram packet flow") | ||
| val multicastSocket = setupSocket() | ||
|
|
||
| return flow { | ||
| val datagramPacketRequest = searchRequest.toDatagramPacket(multicastGroup) | ||
|
|
||
| repeat(retryCount + 1) { | ||
| if (!multicastSocket.isClosed) { | ||
| multicastSocket.send(datagramPacketRequest) | ||
| } | ||
| } | ||
|
|
||
| while (currentCoroutineContext().isActive && !multicastSocket.isClosed) { | ||
| val discoveryBuffer = ByteArray(MULTICAST_DATAGRAM_SIZE) | ||
| val discoveryDatagram = | ||
| DatagramPacket(discoveryBuffer, discoveryBuffer.size) | ||
| multicastSocket.receive(discoveryDatagram) | ||
| emit(discoveryDatagram) | ||
| } | ||
| } | ||
| .catch { cause -> | ||
|
There was a problem hiding this comment. I should have broken this into multiple commits, sorry. This is a bit tricky to notify with flows. If the connection gets closed, we should handle it gracefully. Also, it would be nice to notify the user. Perhaps the top level data passed to the user should include a connection state. |
||
| logger?.logErrorMessage(TAG, "", cause) | ||
| } | ||
| .onCompletion { | ||
| teardownSocket(multicastSocket) | ||
| } | ||
| .flowOn(Dispatchers.IO) | ||
| } | ||
|
|
||
| protected abstract fun releaseMulticastLock() | ||
|
|
||
| private fun teardownSocket(multicastSocket: MulticastSocket) { | ||
| logger?.logStatusMessage(TAG, "Releasing resources") | ||
|
|
||
| releaseMulticastLock() | ||
|
|
||
| if (!multicastSocket.isClosed) { | ||
| multicastSocket.leaveGroup(multicastGroup) | ||
| multicastSocket.close() | ||
| } | ||
| } | ||
|
|
||
| private companion object { | ||
| const val TAG = "BaseSocketListener" | ||
| const val MULTICAST_DATAGRAM_SIZE = 2048 | ||
| const val MULTICAST_PORT = 1900 | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,18 @@ | ||
| package com.ivanempire.lighthouse.socket | ||
|
|
||
| import com.ivanempire.lighthouse.LighthouseLogger | ||
|
|
||
| /** Specific implementation of [SocketListener] */ | ||
| internal class JvmSocketListener( | ||
| retryCount: Int, | ||
| logger: LighthouseLogger? = null, | ||
| ) : BaseSocketListener(retryCount, logger) { | ||
|
|
||
| override fun acquireMulticastLock() { | ||
| // Nothing to do on JVM | ||
| } | ||
|
|
||
| override fun releaseMulticastLock() { | ||
| // Nothing to do on JVM | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is to fix a crash I experienced. Not sure why the socket wasn't open, but there are apparently times when it's not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am guessing you've seen this on desktop? Or did you observe this on Android?