internal/ui: add little online indicator circles to the peer list (#132)

DeedleFake · web-flow · commit 764e58c0d56f · 2024-07-03T23:38:42.000-04:00
* internal/ui: add emoji prefixes for peer statuses

* internal/ui: use peer IDs as IDs instead of their public keys

* internal/ui: add a space after the circle indicators and add one for the Mullvad page

* internal/ui: add a missing circle

* meta: update README screenshot

* meta: update some dependencies

* meta: add v0.12.6 to metainfo

* meta: attempt to fix workflow

* cmd/trayscale: generate new `default.pgo`

* meta: attempt to fix the workflow again

* meta: update Go version

* meta: try to fix the workflow again

* meta: and again
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,9 +1,8 @@
 name: Lint and Test
 
 env:
-  image: ubuntu:23.10
   dependencies: libgtk-4-dev libadwaita-1-dev
-  go-version: 1.22.0
+  go-version: 1.22.5
 
 on:
   workflow_dispatch:
@@ -16,8 +15,6 @@ jobs:
   go-vet:
     name: go vet
     runs-on: ubuntu-latest
-    container:
-      image: ${{ ubuntu }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -35,8 +32,6 @@ jobs:
   staticcheck:
     name: staticcheck
     runs-on: ubuntu-latest
-    container:
-      image: ${{ ubuntu }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -56,8 +51,6 @@ jobs:
   go-test:
     name: go test
     runs-on: ubuntu-latest
-    container:
-      image: ${{ ubuntu }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Trayscale is an unofficial GUI interface for the Tailscale daemon particularly f
 
 _Disclaimer: This project is in a beta state. If it bricks your machine, it's not my fault. Use at your own risk._
 
-![screenshot](https://github.com/DeedleFake/trayscale/assets/326750/156e5138-ce60-4940-8cdc-67afa27fcf6f)
+![screenshot](https://github.com/DeedleFake/trayscale/assets/326750/103125df-2e6e-48ce-9711-82e408fddc67)
 
 Tailscale Config
 ----------------
diff --git a/cmd/trayscale/default.pgo b/cmd/trayscale/default.pgo
diff --git a/dev.deedles.Trayscale.metainfo.xml b/dev.deedles.Trayscale.metainfo.xml
@@ -54,6 +54,12 @@
 	<content_rating type="oars-1.1" />
 
 	<releases>
+		<release version="v0.12.6" date="2024-07-03">
+			<description>
+				<ul>Add online status indicators to peer list.</ul>
+				<ul>Use node IDs to identify them instead of keys.</ul>
+			</description>
+		</release>
 		<release version="v0.12.5" date="2024-07-01">
 			<description>
 				<ul>Remove calls to tailscale command.</ul>
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module deedles.dev/trayscale
 
-go 1.22.0
+go 1.22.5
 
 require (
 	deedles.dev/mk v0.1.0
@@ -10,7 +10,7 @@ require (
 	github.com/inhies/go-bytesize v0.0.0-20220417184213-4913239db9cf
 	golang.org/x/net v0.26.0
 	honnef.co/go/tools v0.4.7
-	tailscale.com v1.68.1
+	tailscale.com v1.68.2
 )
 
 require (
diff --git a/go.sum b/go.sum
@@ -152,5 +152,5 @@ sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
 software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
 software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
-tailscale.com v1.68.1 h1:Fh0P1kNqI6EiN48dDiDWAIZguzIkuOo7UHDVG9ulQ2U=
-tailscale.com v1.68.1/go.mod h1:uqtoDEA8tw5+S+HLGqQGfpQsqeVtBS/EVVv5mXIaAoQ=
+tailscale.com v1.68.2 h1:nxy9HTAXPjuTbu/xzF05mS/v9ABMRGGJdPWEScTJxUo=
+tailscale.com v1.68.2/go.mod h1:uqtoDEA8tw5+S+HLGqQGfpQsqeVtBS/EVVv5mXIaAoQ=
diff --git a/internal/ui/mullvadpage.go b/internal/ui/mullvadpage.go
@@ -14,6 +14,8 @@ import (
 	"tailscale.com/tailcfg"
 )
 
+const mullvadPageBaseName = "🟡 Mullvad Exit Nodes"
+
 //go:embed mullvadpage.ui
 var mullvadPageXML string
 
@@ -47,7 +49,7 @@ func (page *MullvadPage) Name() string {
 }
 
 func (page *MullvadPage) init(a *App, status tsutil.Status) {
-	page.name = "Mullvad Exit Nodes"
+	page.name = mullvadPageBaseName
 
 	page.exitNodeRows.Parent = page.ExitNodesGroup
 	page.exitNodeRows.New = func(peer *ipnstate.PeerStatus) row[*ipnstate.PeerStatus] {
@@ -93,7 +95,7 @@ func (page *MullvadPage) init(a *App, status tsutil.Status) {
 }
 
 func (page *MullvadPage) Update(a *App, peer *ipnstate.PeerStatus, status tsutil.Status) {
-	page.name = "Mullvad Exit Nodes"
+	page.name = mullvadPageBaseName
 
 	var exitNodeID tailcfg.StableNodeID
 	if status.Status.ExitNodeStatus != nil {
@@ -105,7 +107,7 @@ func (page *MullvadPage) Update(a *App, peer *ipnstate.PeerStatus, status tsutil
 		if tsutil.IsMullvad(peer) {
 			nodes = append(nodes, peer)
 			if peer.ID == exitNodeID {
-				page.name = fmt.Sprintf("Mullvad Exit Nodes [%v]", mullvadExitNodeName(peer))
+				page.name = fmt.Sprintf("%v [%v]", mullvadPageBaseName, mullvadExitNodeName(peer))
 			}
 		}
 	}
diff --git a/internal/ui/peerpage.go b/internal/ui/peerpage.go
@@ -86,7 +86,7 @@ func (page *PeerPage) Root() gtk.Widgetter {
 }
 
 func (page *PeerPage) ID() string {
-	return page.peer.PublicKey.String()
+	return string(page.peer.ID)
 }
 
 func (page *PeerPage) Name() string {
diff --git a/internal/ui/selfpage.go b/internal/ui/selfpage.go
@@ -81,7 +81,7 @@ func (page *SelfPage) Root() gtk.Widgetter {
 }
 
 func (page *SelfPage) ID() string {
-	return page.peer.PublicKey.String()
+	return string(page.peer.ID)
 }
 
 func (page *SelfPage) Name() string {
diff --git a/internal/ui/ui.go b/internal/ui/ui.go
@@ -49,21 +49,36 @@ func readAssetString(file string) string {
 
 func peerName(status tsutil.Status, peer *ipnstate.PeerStatus) string {
 	const maxNameLength = 30
+	self := peer.ID == status.Status.Self.ID
+
+	var buf strings.Builder
+
+	switch {
+	case self, peer == nil:
+		buf.WriteString("🔵 ")
+	case peer.Online:
+		buf.WriteString("🟢 ")
+	default:
+		buf.WriteString("🔴 ")
+	}
+
 	name := tsutil.DNSOrQuoteHostname(status.Status, peer)
 	if len(name) > maxNameLength {
 		name = name[:maxNameLength-3] + "..."
 	}
+	buf.WriteString(name)
 
-	if peer.PublicKey == status.Status.Self.PublicKey {
-		return name + " [This machine]"
+	if self {
+		buf.WriteString(" [This machine]")
 	}
 	if peer.ExitNode {
-		return name + " [Exit node]"
+		buf.WriteString(" [Exit node]")
 	}
 	if peer.ExitNodeOption {
-		return name + " [Exit node option]"
+		buf.WriteString(" [Exit node option]")
 	}
-	return name
+
+	return buf.String()
 }
 
 func peerIcon(peer *ipnstate.PeerStatus) string {

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ import (`
`14`	`14`	`"tailscale.com/tailcfg"`
`15`	`15`	`)`
`16`	`16`
	`17`	`+const mullvadPageBaseName = "🟡 Mullvad Exit Nodes"`
	`18`	`+`
`17`	`19`	`//go:embed mullvadpage.ui`
`18`	`20`	`var mullvadPageXML string`
`19`	`21`
`@@ -47,7 +49,7 @@ func (page *MullvadPage) Name() string {`
`47`	`49`	`}`
`48`	`50`
`49`	`51`	`func (page MullvadPage) init(a App, status tsutil.Status) {`
`50`		`- page.name = "Mullvad Exit Nodes"`
	`52`	`+ page.name = mullvadPageBaseName`
`51`	`53`
`52`	`54`	`page.exitNodeRows.Parent = page.ExitNodesGroup`
`53`	`55`	`page.exitNodeRows.New = func(peer ipnstate.PeerStatus) row[ipnstate.PeerStatus] {`
`@@ -93,7 +95,7 @@ func (page MullvadPage) init(a App, status tsutil.Status) {`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`func (page MullvadPage) Update(a App, peer *ipnstate.PeerStatus, status tsutil.Status) {`
`96`		`- page.name = "Mullvad Exit Nodes"`
	`98`	`+ page.name = mullvadPageBaseName`
`97`	`99`
`98`	`100`	`var exitNodeID tailcfg.StableNodeID`
`99`	`101`	`if status.Status.ExitNodeStatus != nil {`
`@@ -105,7 +107,7 @@ func (page MullvadPage) Update(a App, peer *ipnstate.PeerStatus, status tsutil`
`105`	`107`	`if tsutil.IsMullvad(peer) {`
`106`	`108`	`nodes = append(nodes, peer)`
`107`	`109`	`if peer.ID == exitNodeID {`
`108`		`- page.name = fmt.Sprintf("Mullvad Exit Nodes [%v]", mullvadExitNodeName(peer))`
	`110`	`+ page.name = fmt.Sprintf("%v [%v]", mullvadPageBaseName, mullvadExitNodeName(peer))`
`109`	`111`	`}`
`110`	`112`	`}`
`111`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ func (page *PeerPage) Root() gtk.Widgetter {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`func (page *PeerPage) ID() string {`
`89`		`- return page.peer.PublicKey.String()`
	`89`	`+ return string(page.peer.ID)`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func (page *PeerPage) Name() string {`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func (page *SelfPage) Root() gtk.Widgetter {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`func (page *SelfPage) ID() string {`
`84`		`- return page.peer.PublicKey.String()`
	`84`	`+ return string(page.peer.ID)`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`func (page *SelfPage) Name() string {`