Repository navigation
Expose active Java socket for RTMP diagnostics #2215
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.
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
Merged
pedroSG94
merged 2 commits into
pedroSG94:master
from
AubreyHaskett:aeh/expose-java-socket
Oct 17, 2026
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
59 changes: 59 additions & 0 deletions
59
common/src/test/java/com/pedro/common/socket/java/TcpStreamSocketJavaBaseTest.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright (C) 2024 pedroSG94. | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. added because most (but not all) of the tests have this. hope that's okay. |
||
| * | ||
| * 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 com.pedro.common.socket.java | ||
|
|
||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.Assert.assertNull | ||
| import org.junit.Assert.assertSame | ||
| import org.junit.Test | ||
| import java.net.InetAddress | ||
| import java.net.ServerSocket | ||
| import java.net.Socket | ||
|
|
||
| class TcpStreamSocketJavaBaseTest { | ||
|
|
||
| @Test | ||
| fun `GIVEN a Java socket WHEN connecting and closing THEN expose only the active socket`() = runTest { | ||
| ServerSocket(0, 1, InetAddress.getLoopbackAddress()).use { serverSocket -> | ||
| val streamSocket = TestTcpStreamSocket(serverSocket) | ||
|
|
||
| assertNull(streamSocket.getJavaSocket()) | ||
|
|
||
| streamSocket.connect() | ||
| serverSocket.accept().use { | ||
| assertSame(streamSocket.connectedSocket, streamSocket.getJavaSocket()) | ||
|
|
||
| streamSocket.close() | ||
| assertNull(streamSocket.getJavaSocket()) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private class TestTcpStreamSocket( | ||
| private val serverSocket: ServerSocket, | ||
| ): TcpStreamSocketJavaBase() { | ||
|
|
||
| lateinit var connectedSocket: Socket | ||
| private set | ||
|
|
||
| override fun onConnectSocket(timeout: Long): Socket { | ||
| return Socket(serverSocket.inetAddress, serverSocket.localPort).also { | ||
| connectedSocket = it | ||
| } | ||
| } | ||
| } | ||
| } | ||
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
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
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
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
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.
Needed here and for the RtmpSocket so that every thread is told to read the latest value of the socket instead of potentially using a cached value. This is important for how I will be using the info from the socket, but should overall strengthen thread visibility without changing how the code behaves.
This will not do anything undesirable like change how the socket connects, sends data, reconnects, or closes.