dorkbox/Network
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated API

Browse Source
This commit is contained in:
Robinson 2023-03-02 19:37:51 +01:00
parent 07219d058c
commit 2455f08b9a
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dorkbox/network/Client.kt
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2020 dorkbox, llc * Copyright 2023 dorkbox, llc
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -41,10 +41,10 @@ import dorkbox.network.handshake.ClientHandshake
import dorkbox.network.ping.Ping import dorkbox.network.ping.Ping
import dorkbox.network.ping.PingManager import dorkbox.network.ping.PingManager
import kotlinx.atomicfu.atomic import kotlinx.atomicfu.atomic
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import mu.KotlinLogging
import java.lang.Thread.sleep import java.lang.Thread.sleep
import java.net.Inet4Address import java.net.Inet4Address
import java.net.Inet6Address import java.net.Inet6Address
@ -178,7 +178,7 @@ open class Client<CONNECTION : Connection>(
private var connection0: CONNECTION? = null private var connection0: CONNECTION? = null
// This is set by the client so if there is a "connect()" call in the the disconnect callback, we can have proper // This is set by the client so if there is a "connect()" call in the disconnect callback, we can have proper
// lock-stop ordering for how disconnect and connect work with each-other // lock-stop ordering for how disconnect and connect work with each-other
// GUARANTEE that the callbacks for 'onDisconnect' happens-before the 'onConnect'. // GUARANTEE that the callbacks for 'onDisconnect' happens-before the 'onConnect'.
private val lockStepForConnect = atomic<Mutex?>(null) private val lockStepForConnect = atomic<Mutex?>(null)
@ -767,14 +767,16 @@ open class Client<CONNECTION : Connection>(
// make sure to call our client.notifyDisconnect() callbacks // make sure to call our client.notifyDisconnect() callbacks
// this always has to be on event dispatch, otherwise we can have weird logic loops if we reconnect within a disconnect callback // this always has to be on event dispatch, otherwise we can have weird logic loops if we reconnect within a disconnect callback
actionDispatch.launch { eventDispatch.launch {
listenerManager.notifyDisconnect(connection)
lockStepForConnect.getAndSet(null)?.unlock() lockStepForConnect.getAndSet(null)?.unlock()
listenerManager.notifyDisconnect(connection)
} }
} }
// before we finish creating the connection, we initialize it (in case there needs to be logic that happens-before `onConnect` calls occur // before we finish creating the connection, we initialize it (in case there needs to be logic that happens-before `onConnect` calls occur
listenerManager.notifyInit(newConnection) runBlocking {
listenerManager.notifyInit(newConnection)
}
connection0 = newConnection connection0 = newConnection
addConnection(newConnection) addConnection(newConnection)