mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 17:11:20 -08:00
Nuke StatusSystem
This commit is contained in:
4 files changed
-143
No files matched your search
@@ -26,7 +26,6 @@ import dev.slimevr.serial.SerialHandler
|
||||
import dev.slimevr.serial.SerialHandlerStub
|
||||
import dev.slimevr.setup.HandshakeHandler
|
||||
import dev.slimevr.setup.TapSetupHandler
|
||||
import dev.slimevr.status.StatusSystem
|
||||
import dev.slimevr.tracking.processor.HumanPoseManager
|
||||
import dev.slimevr.tracking.processor.skeleton.HumanSkeleton
|
||||
import dev.slimevr.tracking.trackers.*
|
||||
@@ -113,9 +112,6 @@ class VRServer @JvmOverloads constructor(
|
||||
@JvmField
|
||||
val resetHandler: ResetHandler
|
||||
|
||||
@JvmField
|
||||
val statusSystem = StatusSystem()
|
||||
|
||||
@JvmField
|
||||
val handshakeHandler = HandshakeHandler()
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ import dev.slimevr.protocol.rpc.settings.createSettingsResponse
|
||||
import dev.slimevr.protocol.rpc.setup.RPCHandshakeHandler
|
||||
import dev.slimevr.protocol.rpc.setup.RPCTapSetupHandler
|
||||
import dev.slimevr.protocol.rpc.setup.RPCUtil.getLocalIp
|
||||
import dev.slimevr.protocol.rpc.status.RPCStatusHandler
|
||||
import dev.slimevr.protocol.rpc.trackingchecklist.RPCTrackingChecklistHandler
|
||||
import dev.slimevr.protocol.rpc.trackingpause.RPCTrackingPause
|
||||
import dev.slimevr.tracking.processor.config.SkeletonConfigOffsets
|
||||
@@ -44,7 +43,6 @@ class RPCHandler(private val api: ProtocolAPI) : ProtocolHandler<RpcMessageHeade
|
||||
RPCProvisioningHandler(this, api)
|
||||
RPCSettingsHandler(this, api)
|
||||
RPCTapSetupHandler(this, api)
|
||||
RPCStatusHandler(this, api)
|
||||
RPCAutoBoneHandler(this, api)
|
||||
RPCHandshakeHandler(this, api)
|
||||
RPCTrackingPause(this, api)
|
||||
@@ -110,11 +108,6 @@ class RPCHandler(private val api: ProtocolAPI) : ProtocolHandler<RpcMessageHeade
|
||||
::onLegTweaksTmpClear,
|
||||
)
|
||||
|
||||
registerPacketListener(
|
||||
RpcMessage.StatusSystemRequest,
|
||||
::onStatusSystemRequest,
|
||||
)
|
||||
|
||||
registerPacketListener(
|
||||
RpcMessage.SetPauseTrackingRequest,
|
||||
::onSetPauseTrackingRequest,
|
||||
@@ -395,23 +388,6 @@ class RPCHandler(private val api: ProtocolAPI) : ProtocolHandler<RpcMessageHeade
|
||||
|
||||
override fun messagesCount(): Int = RpcMessage.names.size
|
||||
|
||||
fun onStatusSystemRequest(conn: GenericConnection, messageHeader: RpcMessageHeader) {
|
||||
val req = messageHeader
|
||||
.message(StatusSystemRequest()) as? StatusSystemRequest ?: return
|
||||
|
||||
val statuses = api.server.statusSystem.getStatuses()
|
||||
|
||||
val fbb = FlatBufferBuilder(
|
||||
statuses.size * RPCStatusHandler.STATUS_EXPECTED_SIZE,
|
||||
)
|
||||
val response = StatusSystemResponseT()
|
||||
response.currentStatuses = statuses
|
||||
val offset = StatusSystemResponse.pack(fbb, response)
|
||||
val outbound = this.createRPCMessage(fbb, RpcMessage.StatusSystemResponse, offset, messageHeader)
|
||||
fbb.finish(outbound)
|
||||
conn.send(fbb.dataBuffer())
|
||||
}
|
||||
|
||||
fun onSetPauseTrackingRequest(conn: GenericConnection, messageHeader: RpcMessageHeader) {
|
||||
val req = messageHeader
|
||||
.message(SetPauseTrackingRequest()) as? SetPauseTrackingRequest ?: return
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
package dev.slimevr.protocol.rpc.status
|
||||
|
||||
import com.google.flatbuffers.FlatBufferBuilder
|
||||
import dev.slimevr.protocol.ProtocolAPI
|
||||
import dev.slimevr.protocol.rpc.RPCHandler
|
||||
import dev.slimevr.status.StatusListener
|
||||
import solarxr_protocol.rpc.RpcMessage
|
||||
import solarxr_protocol.rpc.StatusDataUnion
|
||||
import solarxr_protocol.rpc.StatusMessage
|
||||
import solarxr_protocol.rpc.StatusSystemFixed
|
||||
import solarxr_protocol.rpc.StatusSystemUpdate
|
||||
|
||||
class RPCStatusHandler(
|
||||
private val rpcHandler: RPCHandler,
|
||||
val api: ProtocolAPI,
|
||||
) : StatusListener {
|
||||
|
||||
init {
|
||||
api.server.statusSystem.addListener(this)
|
||||
}
|
||||
|
||||
override fun onStatusChanged(
|
||||
id: UInt,
|
||||
message: StatusDataUnion,
|
||||
prioritized: Boolean,
|
||||
) {
|
||||
val fbb = FlatBufferBuilder(STATUS_EXPECTED_SIZE)
|
||||
|
||||
val messageOffset = StatusDataUnion.pack(fbb, message)
|
||||
|
||||
StatusMessage.startStatusMessage(fbb)
|
||||
StatusMessage.addData(fbb, messageOffset)
|
||||
StatusMessage.addId(fbb, id.toLong())
|
||||
StatusMessage.addDataType(fbb, message.type)
|
||||
StatusMessage.addPrioritized(fbb, prioritized)
|
||||
val statusOffset = StatusMessage.endStatusMessage(fbb)
|
||||
|
||||
StatusSystemUpdate.startStatusSystemUpdate(fbb)
|
||||
StatusSystemUpdate.addNewStatus(fbb, statusOffset)
|
||||
val update = StatusSystemUpdate.endStatusSystemUpdate(fbb)
|
||||
|
||||
val outbound = this.rpcHandler.createRPCMessage(
|
||||
fbb,
|
||||
RpcMessage.StatusSystemUpdate,
|
||||
update,
|
||||
)
|
||||
fbb.finish(outbound)
|
||||
|
||||
this.api.apiServers.forEach { apiServer ->
|
||||
apiServer.apiConnections.forEach { it.send(fbb.dataBuffer()) }
|
||||
}
|
||||
}
|
||||
|
||||
override fun onStatusRemoved(id: UInt) {
|
||||
val fbb = FlatBufferBuilder(4)
|
||||
|
||||
StatusSystemFixed.startStatusSystemFixed(fbb)
|
||||
StatusSystemFixed.addFixedStatusId(fbb, id.toLong())
|
||||
val update = StatusSystemFixed.endStatusSystemFixed(fbb)
|
||||
|
||||
val outbound = this.rpcHandler.createRPCMessage(
|
||||
fbb,
|
||||
RpcMessage.StatusSystemFixed,
|
||||
update,
|
||||
)
|
||||
fbb.finish(outbound)
|
||||
|
||||
this.api.apiServers.forEach { apiServer ->
|
||||
apiServer.apiConnections.forEach { it.send(fbb.dataBuffer()) }
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val STATUS_EXPECTED_SIZE = 32
|
||||
}
|
||||
}
|
||||
@@ -1,39 +0,0 @@
|
||||
package dev.slimevr.status
|
||||
|
||||
import solarxr_protocol.rpc.StatusDataUnion
|
||||
import solarxr_protocol.rpc.StatusMessageT
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import java.util.concurrent.CopyOnWriteArrayList
|
||||
import java.util.concurrent.atomic.AtomicInteger
|
||||
|
||||
class StatusSystem {
|
||||
private val listeners: MutableList<StatusListener> = CopyOnWriteArrayList()
|
||||
private val statuses: MutableMap<Int, StatusDataUnion> = ConcurrentHashMap()
|
||||
private val prioritizedStatuses: MutableSet<Int> = ConcurrentHashMap.newKeySet()
|
||||
private val idCounter = AtomicInteger(1)
|
||||
|
||||
fun addListener(listener: StatusListener) {
|
||||
listeners.add(listener)
|
||||
}
|
||||
|
||||
fun removeListener(listener: StatusListener) {
|
||||
listeners.remove(listener)
|
||||
}
|
||||
|
||||
fun getStatuses(): Array<StatusMessageT> = statuses.map { (id, message) ->
|
||||
val status = StatusMessageT()
|
||||
status.id = id.toUInt().toLong()
|
||||
status.data = message
|
||||
status.prioritized = prioritizedStatuses.contains(id)
|
||||
status
|
||||
}.toTypedArray()
|
||||
|
||||
fun hasStatusType(dataType: Byte): Boolean = statuses.any {
|
||||
it.value.type == dataType
|
||||
}
|
||||
}
|
||||
|
||||
interface StatusListener {
|
||||
fun onStatusChanged(id: UInt, message: StatusDataUnion, prioritized: Boolean)
|
||||
fun onStatusRemoved(id: UInt)
|
||||
}
|
||||
Reference in new issue
Block a user