added event ClientBase.Reconnecting() for detection of a dropped conn…

…ection that is about to be restored
Ninjastorm380 · Jun 13, 2021 · 930f6e0 · 930f6e0
1 parent 29b5ac6
commit 930f6e0
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 13 deletions.
diff --git a/.vs/Networking/DesignTimeBuild/.dtbcache.v2 b/.vs/Networking/DesignTimeBuild/.dtbcache.v2
diff --git a/.vs/Networking/v16/.suo b/.vs/Networking/v16/.suo
diff --git a/NetworkLibTester/Form1.Designer.vb b/NetworkLibTester/Form1.Designer.vb
diff --git a/NetworkLibTester/Form1.vb b/NetworkLibTester/Form1.vb
@@ -21,4 +21,8 @@
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
         TestClient1.TestCommand()
     End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+        TestClient1.TestAutoReconnect()
+    End Sub
 End Class
diff --git a/NetworkLibTester/TestClient.vb b/NetworkLibTester/TestClient.vb
@@ -1,7 +1,14 @@
 Public Class TestClient : Inherits Networking.ClientBase
     Private Client As Networking.TcpClient = Nothing
+    Public Sub TestAutoReconnect()
+        Client.Close()
+    End Sub
+    Protected Friend Sub IsReconnecting() Handles Me.Reconnecting
+        MsgBox("lost connection, but we reconnected successfully!", MsgBoxStyle.OkOnly, "TestForm - test client")
+    End Sub
     Public Sub TestCommand()
         If Client IsNot Nothing AndAlso Client.Connected = True Then
+            MsgBox("sending test message...", MsgBoxStyle.OkOnly, "TestForm - test client")
             Client.WriteJagged({Text.Encoding.ASCII.GetBytes("test message")})
         End If
     End Sub
@@ -16,7 +23,7 @@
                 Dim ReceivedMessage As String = Text.Encoding.ASCII.GetString(ReceivedData(0))
                 Select Case ReceivedMessage
                     Case "test response"
-                        Debug.Print("received test message!")
+                        MsgBox("client received test response!", MsgBoxStyle.OkOnly, "TestForm - test client")
                 End Select
             End If
             Limiter.Limit()

diff --git a/NetworkLibTester/TestServer.vb b/NetworkLibTester/TestServer.vb
@@ -9,6 +9,7 @@
                 Dim ReceivedMessage As String = Text.Encoding.ASCII.GetString(ReceivedData(0))
                 Select Case ReceivedMessage
                     Case "test message"
+                        MsgBox("server received test message, responding...", MsgBoxStyle.OkOnly, "TestForm - test server")
                         Client.WriteJagged({Text.Encoding.ASCII.GetBytes("test response")})
                 End Select
             End If

diff --git a/NetworkLibTester/bin/Release/NetworkLibTester.exe b/NetworkLibTester/bin/Release/NetworkLibTester.exe
diff --git a/NetworkLibTester/bin/Release/Networking.dll b/NetworkLibTester/bin/Release/Networking.dll
diff --git a/NetworkLibTester/obj/Release/DesignTimeResolveAssemblyReferences.cache b/NetworkLibTester/obj/Release/DesignTimeResolveAssemblyReferences.cache
diff --git a/NetworkLibTester/obj/Release/NetworkLibTester.exe b/NetworkLibTester/obj/Release/NetworkLibTester.exe
diff --git a/NetworkLibTester/obj/Release/NetworkLibTester.vbproj.GenerateResource.cache b/NetworkLibTester/obj/Release/NetworkLibTester.vbproj.GenerateResource.cache
diff --git a/NetworkLibTester/obj/Release/NetworkLibTester.vbprojAssemblyReference.cache b/NetworkLibTester/obj/Release/NetworkLibTester.vbprojAssemblyReference.cache
diff --git a/Networking/BaseClasses.vb b/Networking/BaseClasses.vb
@@ -2,10 +2,11 @@
     Private Client As TcpClient
     Private PurposeClosed As Boolean = False
     Private Endpoint As Net.IPEndPoint
+    Protected Friend Event Reconnecting As EventHandler
 
     Public Sub Connect(Endpoint As Net.IPEndPoint)
         Me.Endpoint = Endpoint
-        PurposeClosed = False
+
         If Client Is Nothing Then
             Client = New TcpClient(Endpoint)
             Dim AsyncLaunch As New Threading.Thread(AddressOf Prerun) : AsyncLaunch.Start()
@@ -25,8 +26,13 @@
         Client = Nothing
     End Sub
     Private Sub Prerun()
+        PurposeClosed = False
         Run(Client)
-        If PurposeClosed = False Then Connect(Endpoint)
+        If PurposeClosed = False Then
+            RaiseEvent Reconnecting(Me, EventArgs.Empty)
+            Connect(Endpoint)
+
+        End If
     End Sub
 
     Public MustOverride Sub Run(ByVal Client As TCPClient)
@@ -35,8 +41,8 @@ Public MustInherit Class ServerBase
     Private Listener As Net.Sockets.TcpListener
     Private OnlineBase As Boolean = False
     Private HoldingTMP As TcpClient
-    Public Event ServerStarting As EventHandler
-    Public Event ServerStopping As EventHandler
+    Protected Friend Event ServerStarting As EventHandler
+    Protected Friend Event ServerStopping As EventHandler
     Public ReadOnly Property Online As Boolean
         Get
             Return OnlineBase

diff --git a/Networking/bin/Release/netstandard2.0/Networking.dll b/Networking/bin/Release/netstandard2.0/Networking.dll
diff --git a/Networking/obj/Release/netstandard2.0/Networking.dll b/Networking/obj/Release/netstandard2.0/Networking.dll
diff --git a/Networking/obj/Release/netstandard2.0/Networking.vbproj.FileListAbsolute.txt b/Networking/obj/Release/netstandard2.0/Networking.vbproj.FileListAbsolute.txt
@@ -4,4 +4,3 @@ C:\Users\demon4hire\source\repos\Ninjastorm380\Networking\Networking\obj\Release
 C:\Users\demon4hire\source\repos\Ninjastorm380\Networking\Networking\obj\Release\netstandard2.0\Networking.AssemblyInfo.vb
 C:\Users\demon4hire\source\repos\Ninjastorm380\Networking\Networking\obj\Release\netstandard2.0\Networking.vbproj.CoreCompileInputs.cache
 C:\Users\demon4hire\source\repos\Ninjastorm380\Networking\Networking\obj\Release\netstandard2.0\Networking.dll
-C:\Users\demon4hire\source\repos\Ninjastorm380\Networking\Networking\obj\Release\netstandard2.0\Networking.vbprojAssemblyReference.cache
diff --git a/Networking/obj/Release/netstandard2.0/Networking.vbprojAssemblyReference.cache b/Networking/obj/Release/netstandard2.0/Networking.vbprojAssemblyReference.cache