caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

NSCv3: improve WS handling

Browse source
This commit is contained in:
Milos Kozak 2023-02-11 14:33:06 +01:00
parent 2a9bc52a72
commit 7346ae3dd1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
View file

@ -273,6 +273,8 @@ class NSClientV3Plugin @Inject constructor(
disposable.clear() disposable.clear()
storageSocket?.disconnect() storageSocket?.disconnect()
alarmSocket?.disconnect() alarmSocket?.disconnect()
storageSocket = null
alarmSocket = null
super.onStop() super.onStop()
} }
@ -311,6 +313,8 @@ class NSClientV3Plugin @Inject constructor(
if (wsConnected) { if (wsConnected) {
storageSocket?.disconnect() storageSocket?.disconnect()
alarmSocket?.disconnect() alarmSocket?.disconnect()
storageSocket = null
alarmSocket = null
} }
SystemClock.sleep(2000) SystemClock.sleep(2000)
initializeWebSockets(reason) initializeWebSockets(reason)
@ -389,14 +393,15 @@ class NSClientV3Plugin @Inject constructor(
} }
private val onConnectAlarms = Emitter.Listener { private val onConnectAlarms = Emitter.Listener {
val socketId = alarmSocket?.id() ?: "NULL" val socket = alarmSocket
val socketId = socket?.id() ?: "NULL"
rxBus.send(EventNSClientNewLog("◄ WS", "connected alarms ID: $socketId")) rxBus.send(EventNSClientNewLog("◄ WS", "connected alarms ID: $socketId"))
if (alarmSocket != null) { if (socket != null) {
val authMessage = JSONObject().also { val authMessage = JSONObject().also {
it.put("accessToken", sp.getString(R.string.key_ns_client_token, "")) it.put("accessToken", sp.getString(R.string.key_ns_client_token, ""))
} }
rxBus.send(EventNSClientNewLog("► WS", "requesting auth for alarms")) rxBus.send(EventNSClientNewLog("► WS", "requesting auth for alarms"))
alarmSocket?.emit("subscribe", authMessage, Ack { args -> socket?.emit("subscribe", authMessage, Ack { args ->
val response = args[0] as JSONObject val response = args[0] as JSONObject
wsConnected = if (response.optBoolean("success")) { wsConnected = if (response.optBoolean("success")) {
rxBus.send(EventNSClientNewLog("◄ WS", response.optString("message"))) rxBus.send(EventNSClientNewLog("◄ WS", response.optString("message")))
@ -414,13 +419,11 @@ class NSClientV3Plugin @Inject constructor(
rxBus.send(EventNSClientNewLog("◄ WS", "disconnect storage event")) rxBus.send(EventNSClientNewLog("◄ WS", "disconnect storage event"))
wsConnected = false wsConnected = false
initialLoadFinished = false initialLoadFinished = false
storageSocket = null
} }
private val onDisconnectAlarm = Emitter.Listener { args -> private val onDisconnectAlarm = Emitter.Listener { args ->
aapsLogger.debug(LTag.NSCLIENT, "disconnect alarm reason: ${args[0]}") aapsLogger.debug(LTag.NSCLIENT, "disconnect alarm reason: ${args[0]}")
rxBus.send(EventNSClientNewLog("◄ WS", "disconnect alarm event")) rxBus.send(EventNSClientNewLog("◄ WS", "disconnect alarm event"))
alarmSocket = null
} }
private val onDataCreateUpdate = Emitter.Listener { args -> private val onDataCreateUpdate = Emitter.Listener { args ->