yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

GODT-1770: handle UserBadEvent in CLI and gRPC.

Browse Source
This commit is contained in:
Xavier Michelon
2023-01-23 14:53:44 +01:00
parent f019ba3713
commit 5a70a16149
23 changed files with 1591 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

955
internal/frontend/grpc/bridge.pb.go
View File

File diff suppressed because it is too large Load Diff

6
internal/frontend/grpc/bridge.proto
View File

@ -440,6 +440,7 @@ message UserEvent {
ToggleSplitModeFinishedEvent toggleSplitModeFinished= 1;
UserDisconnectedEvent userDisconnected = 2;
UserChangedEvent userChanged = 3;
UserBadEvent userBadEvent = 4;
}
}
@ -455,6 +456,11 @@ message UserChangedEvent {
string userID = 1;
}
message UserBadEvent {
string userID = 1;
string errorMessage = 2;
}
//**********************************************************
// Generic errors
//**********************************************************

4
internal/frontend/grpc/event_factory.go
View File

@ -173,6 +173,10 @@ func NewUserChangedEvent(userID string) *StreamEvent {
return userEvent(&UserEvent{Event: &UserEvent_UserChanged{UserChanged: &UserChangedEvent{UserID: userID}}})
}
func NewUserBadEvent(userID string, errorMessage string) *StreamEvent {
return userEvent(&UserEvent{Event: &UserEvent_UserBadEvent{UserBadEvent: &UserBadEvent{UserID: userID, ErrorMessage: errorMessage}}})
}
func NewGenericErrorEvent(errorCode ErrorCode) *StreamEvent {
return genericErrorEvent(&GenericErrorEvent{Code: errorCode})
}

5
internal/frontend/grpc/service.go
View File

@ -313,11 +313,14 @@ func (s *Service) watchEvents() {
// This is the event the GUI cares about.
_ = s.SendEvent(NewUserChangedEvent(event.UserID))
// The GUI doesn't care about this event... not sure why we still emit it.
// The GUI doesn't care about this event... not sure why we still emit it. GODT-2128.
if user, err := s.bridge.GetUserInfo(event.UserID); err == nil {
_ = s.SendEvent(NewUserDisconnectedEvent(user.Username))
}
case events.UserBadEvent:
_ = s.SendEvent(NewUserBadEvent(event.UserID, event.Error.Error()))
case events.UpdateLatest:
safe.RLock(func() {
s.latest = event.Version