curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-3238: Update UI when connection re-connects

This commit is contained in:
Rachel Williams 2020-08-10 16:09:02 -07:00 committed by Areg Harutyunyan
parent b57a953caa
commit 094e0c7592
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cmd/cloudflared/ui/launch_ui.go
View File

@ -18,6 +18,7 @@ type status int
const ( const (
Disconnected status = iota Disconnected status = iota
Connected Connected
Reconnecting
) )
type ConnEvent struct { type ConnEvent struct {
@ -39,6 +40,7 @@ type palette struct {
connected string connected string
defaultText string defaultText string
disconnected string disconnected string
reconnecting string
} }
func NewUIModel(version, hostname, metricsURL, proxyURL string, haConnections int) *uiModel { func NewUIModel(version, hostname, metricsURL, proxyURL string, haConnections int) *uiModel {
@ -52,7 +54,7 @@ func NewUIModel(version, hostname, metricsURL, proxyURL string, haConnections in
} }
func (data *uiModel) LaunchUI(ctx context.Context, logger logger.Service, connEventChan <-chan ConnEvent) { func (data *uiModel) LaunchUI(ctx context.Context, logger logger.Service, connEventChan <-chan ConnEvent) {
palette := palette{url: "#4682B4", connected: "#00FF00", defaultText: "white", disconnected: "red"} palette := palette{url: "#4682B4", connected: "#00FF00", defaultText: "white", disconnected: "red", reconnecting: "orange"}
app := tview.NewApplication() app := tview.NewApplication()
@ -96,7 +98,7 @@ func (data *uiModel) LaunchUI(ctx context.Context, logger logger.Service, connEv
switch conn.EventType { switch conn.EventType {
case Connected: case Connected:
data.setConnTableCell(conn, connTable, palette) data.setConnTableCell(conn, connTable, palette)
case Disconnected: case Disconnected, Reconnecting:
data.changeConnStatus(conn, connTable, logger, palette) data.changeConnStatus(conn, connTable, logger, palette)
} }
} }
@ -117,7 +119,7 @@ func newDynamicColorTextView() *tview.TextView {
func (data *uiModel) changeConnStatus(conn ConnEvent, table *tview.Table, logger logger.Service, palette palette) { func (data *uiModel) changeConnStatus(conn ConnEvent, table *tview.Table, logger logger.Service, palette palette) {
index := int(conn.Index) index := int(conn.Index)
// Get table row and connection location // Get connection location and state
connState := data.getConnState(index) connState := data.getConnState(index)
// Check if connection is already displayed in UI // Check if connection is already displayed in UI
if connState == nil { if connState == nil {
@ -125,12 +127,20 @@ func (data *uiModel) changeConnStatus(conn ConnEvent, table *tview.Table, logger
return return
} }
locationState := conn.Location
if conn.EventType == Disconnected {
connState.state = Disconnected connState.state = Disconnected
} else if conn.EventType == Reconnecting {
connState.state = Reconnecting
locationState = "Reconnecting..."
}
connectionNum := index + 1 connectionNum := index + 1
// Get table cell // Get table cell
cell := table.GetCell(index, 0) cell := table.GetCell(index, 0)
// Change text in cell to have red dot in front // Change dot color in front of text as well as location state
text := newCellText(palette, connectionNum, connState.location, false) text := newCellText(palette, connectionNum, locationState, conn.EventType)
cell.SetText(text) cell.SetText(text)
} }
@ -152,17 +162,22 @@ func (data *uiModel) setConnTableCell(conn ConnEvent, table *tview.Table, palett
data.connections[index].location = conn.Location data.connections[index].location = conn.Location
// Update text in table cell to show disconnected state // Update text in table cell to show disconnected state
text := newCellText(palette, connectionNum, conn.Location, true) text := newCellText(palette, connectionNum, conn.Location, conn.EventType)
cell := tview.NewTableCell(text) cell := tview.NewTableCell(text)
table.SetCell(index, 0, cell) table.SetCell(index, 0, cell)
} }
func newCellText(palette palette, connectionNum int, location string, connected bool) string { func newCellText(palette palette, connectionNum int, location string, connectedStatus status) string {
const connFmtString = "[%s]\u2022[%s] #%d: %s" const connFmtString = "[%s]\u2022[%s] #%d: %s"
dotColor := palette.disconnected var dotColor string
if connected { switch connectedStatus {
case Connected:
dotColor = palette.connected dotColor = palette.connected
case Disconnected:
dotColor = palette.disconnected
case Reconnecting:
dotColor = palette.reconnecting
} }
return fmt.Sprintf(connFmtString, dotColor, palette.defaultText, connectionNum, location) return fmt.Sprintf(connFmtString, dotColor, palette.defaultText, connectionNum, location)

4
origin/tunnel.go
View File

@ -236,6 +236,10 @@ func ServeTunnelLoop(ctx context.Context,
) )
if recoverable { if recoverable {
if duration, ok := backoff.GetBackoffDuration(ctx); ok { if duration, ok := backoff.GetBackoffDuration(ctx); ok {
if config.ConnEventChan != nil {
config.ConnEventChan <- ui.ConnEvent{Index: connectionIndex, EventType: ui.Reconnecting}
}
config.Logger.Infof("Retrying connection %d in %s seconds", connectionIndex, duration) config.Logger.Infof("Retrying connection %d in %s seconds", connectionIndex, duration)
backoff.Backoff(ctx) backoff.Backoff(ctx)
continue continue