core, ui: add remote host/controller stop reasons to events (#3472)
This commit is contained in:
parent
d29f1bb0cf
commit
d4ac1c0cf2
@ -613,7 +613,7 @@ public enum ChatResponse: Decodable, Error {
|
|||||||
case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
|
case remoteCtrlConnecting(remoteCtrl_: RemoteCtrlInfo?, ctrlAppInfo: CtrlAppInfo, appVersion: String)
|
||||||
case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
|
case remoteCtrlSessionCode(remoteCtrl_: RemoteCtrlInfo?, sessionCode: String)
|
||||||
case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
|
case remoteCtrlConnected(remoteCtrl: RemoteCtrlInfo)
|
||||||
case remoteCtrlStopped
|
case remoteCtrlStopped(rcsState: RemoteCtrlSessionState, rcStopReason: RemoteCtrlStopReason)
|
||||||
// misc
|
// misc
|
||||||
case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
|
case versionInfo(versionInfo: CoreVersionInfo, chatMigrations: [UpMigration], agentMigrations: [UpMigration])
|
||||||
case cmdOk(user: UserRef?)
|
case cmdOk(user: UserRef?)
|
||||||
@ -1552,6 +1552,13 @@ public enum RemoteCtrlSessionState: Decodable {
|
|||||||
case connected(sessionCode: String)
|
case connected(sessionCode: String)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum RemoteCtrlStopReason: Decodable {
|
||||||
|
case discoveryFailed(chatError: ChatError)
|
||||||
|
case connectionFailed(chatError: ChatError)
|
||||||
|
case setupFailed(chatError: ChatError)
|
||||||
|
case disconnected
|
||||||
|
}
|
||||||
|
|
||||||
public struct CtrlAppInfo: Decodable {
|
public struct CtrlAppInfo: Decodable {
|
||||||
public var appVersionRange: AppVersionRange
|
public var appVersionRange: AppVersionRange
|
||||||
public var deviceName: String
|
public var deviceName: String
|
||||||
|
@ -2945,6 +2945,14 @@ sealed class RemoteCtrlSessionState {
|
|||||||
@Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteCtrlSessionState()
|
@Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteCtrlSessionState()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
sealed class RemoteCtrlStopReason {
|
||||||
|
@Serializable @SerialName("discoveryFailed") class DiscoveryFailed(val chatError: ChatError): RemoteCtrlStopReason()
|
||||||
|
@Serializable @SerialName("connectionFailed") class ConnectionFailed(val chatError: ChatError): RemoteCtrlStopReason()
|
||||||
|
@Serializable @SerialName("setupFailed") class SetupFailed(val chatError: ChatError): RemoteCtrlStopReason()
|
||||||
|
@Serializable @SerialName("disconnected") object Disconnected: RemoteCtrlStopReason()
|
||||||
|
}
|
||||||
|
|
||||||
sealed class UIRemoteCtrlSessionState {
|
sealed class UIRemoteCtrlSessionState {
|
||||||
object Starting: UIRemoteCtrlSessionState()
|
object Starting: UIRemoteCtrlSessionState()
|
||||||
object Searching: UIRemoteCtrlSessionState()
|
object Searching: UIRemoteCtrlSessionState()
|
||||||
|
@ -3581,6 +3581,13 @@ sealed class RemoteHostSessionState {
|
|||||||
@Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteHostSessionState()
|
@Serializable @SerialName("connected") data class Connected(val sessionCode: String): RemoteHostSessionState()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Serializable
|
||||||
|
sealed class RemoteHostStopReason {
|
||||||
|
@Serializable @SerialName("connectionFailed") data class ConnectionFailed(val chatError: ChatError): RemoteHostStopReason()
|
||||||
|
@Serializable @SerialName("crashed") data class Crashed(val chatError: ChatError): RemoteHostStopReason()
|
||||||
|
@Serializable @SerialName("disconnected") object Disconnected: RemoteHostStopReason()
|
||||||
|
}
|
||||||
|
|
||||||
val json = Json {
|
val json = Json {
|
||||||
prettyPrint = true
|
prettyPrint = true
|
||||||
ignoreUnknownKeys = true
|
ignoreUnknownKeys = true
|
||||||
@ -3804,7 +3811,7 @@ sealed class CR {
|
|||||||
@Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
|
@Serializable @SerialName("remoteHostSessionCode") class RemoteHostSessionCode(val remoteHost_: RemoteHostInfo?, val sessionCode: String): CR()
|
||||||
@Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
|
@Serializable @SerialName("newRemoteHost") class NewRemoteHost(val remoteHost: RemoteHostInfo): CR()
|
||||||
@Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
|
@Serializable @SerialName("remoteHostConnected") class RemoteHostConnected(val remoteHost: RemoteHostInfo): CR()
|
||||||
@Serializable @SerialName("remoteHostStopped") class RemoteHostStopped(val remoteHostId_: Long?): CR()
|
@Serializable @SerialName("remoteHostStopped") class RemoteHostStopped(val remoteHostId_: Long?, val rhsState: RemoteHostSessionState, val rhStopReason: RemoteHostStopReason): CR()
|
||||||
@Serializable @SerialName("remoteFileStored") class RemoteFileStored(val remoteHostId: Long, val remoteFileSource: CryptoFile): CR()
|
@Serializable @SerialName("remoteFileStored") class RemoteFileStored(val remoteHostId: Long, val remoteFileSource: CryptoFile): CR()
|
||||||
// remote events (mobile)
|
// remote events (mobile)
|
||||||
@Serializable @SerialName("remoteCtrlList") class RemoteCtrlList(val remoteCtrls: List<RemoteCtrlInfo>): CR()
|
@Serializable @SerialName("remoteCtrlList") class RemoteCtrlList(val remoteCtrls: List<RemoteCtrlInfo>): CR()
|
||||||
@ -3812,7 +3819,7 @@ sealed class CR {
|
|||||||
@Serializable @SerialName("remoteCtrlConnecting") class RemoteCtrlConnecting(val remoteCtrl_: RemoteCtrlInfo?, val ctrlAppInfo: CtrlAppInfo, val appVersion: String): CR()
|
@Serializable @SerialName("remoteCtrlConnecting") class RemoteCtrlConnecting(val remoteCtrl_: RemoteCtrlInfo?, val ctrlAppInfo: CtrlAppInfo, val appVersion: String): CR()
|
||||||
@Serializable @SerialName("remoteCtrlSessionCode") class RemoteCtrlSessionCode(val remoteCtrl_: RemoteCtrlInfo?, val sessionCode: String): CR()
|
@Serializable @SerialName("remoteCtrlSessionCode") class RemoteCtrlSessionCode(val remoteCtrl_: RemoteCtrlInfo?, val sessionCode: String): CR()
|
||||||
@Serializable @SerialName("remoteCtrlConnected") class RemoteCtrlConnected(val remoteCtrl: RemoteCtrlInfo): CR()
|
@Serializable @SerialName("remoteCtrlConnected") class RemoteCtrlConnected(val remoteCtrl: RemoteCtrlInfo): CR()
|
||||||
@Serializable @SerialName("remoteCtrlStopped") class RemoteCtrlStopped(): CR()
|
@Serializable @SerialName("remoteCtrlStopped") class RemoteCtrlStopped(val rcsState: RemoteCtrlSessionState, val rcStopReason: RemoteCtrlStopReason): CR()
|
||||||
@Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
|
@Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
|
||||||
@Serializable @SerialName("cmdOk") class CmdOk(val user: UserRef?): CR()
|
@Serializable @SerialName("cmdOk") class CmdOk(val user: UserRef?): CR()
|
||||||
@Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: UserRef?, val chatError: ChatError): CR()
|
@Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: UserRef?, val chatError: ChatError): CR()
|
||||||
|
@ -1084,8 +1084,8 @@ data RemoteHostError
|
|||||||
deriving (Show, Exception)
|
deriving (Show, Exception)
|
||||||
|
|
||||||
data RemoteHostStopReason
|
data RemoteHostStopReason
|
||||||
= RHSRConnectionFailed ChatError
|
= RHSRConnectionFailed {chatError :: ChatError}
|
||||||
| RHSRCrashed ChatError
|
| RHSRCrashed {chatError :: ChatError}
|
||||||
| RHSRDisconnected
|
| RHSRDisconnected
|
||||||
deriving (Show, Exception)
|
deriving (Show, Exception)
|
||||||
|
|
||||||
@ -1106,9 +1106,9 @@ data RemoteCtrlError
|
|||||||
deriving (Show, Exception)
|
deriving (Show, Exception)
|
||||||
|
|
||||||
data RemoteCtrlStopReason
|
data RemoteCtrlStopReason
|
||||||
= RCSRDiscoveryFailed ChatError
|
= RCSRDiscoveryFailed {chatError :: ChatError}
|
||||||
| RCSRConnectionFailed ChatError
|
| RCSRConnectionFailed {chatError :: ChatError}
|
||||||
| RCSRSetupFailed ChatError
|
| RCSRSetupFailed {chatError :: ChatError}
|
||||||
| RCSRDisconnected
|
| RCSRDisconnected
|
||||||
deriving (Show, Exception)
|
deriving (Show, Exception)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user