added service stats

Author: ginuerzh

appicon.png

@@ -103,6 +103,7 @@ type Tunnel struct {
 	Keepalive bool   `yaml:",omitempty"`
 	TTL       int    `yaml:"ttl,omitempty"`
 
+	Stats     ServiceStats
 	Favorite  bool
 	Closed    bool
 	CreatedAt time.Time
@@ -137,3 +138,15 @@ func (c *Config) Write() error {
 
 	return os.WriteFile(filepath.Join(configDir, configFile), buf.Bytes(), 0644)
 }
+
+type ServiceStats struct {
+	Time            time.Time
+	TotalConns      uint64
+	RequestRate     float64
+	CurrentConns    uint64
+	TotalErrs       uint64
+	InputBytes      uint64
+	InputRateBytes  uint64
+	OutputBytes     uint64
+	OutputRateBytes uint64
+}

config/config.go

@@ -3,19 +3,63 @@ module github.com/go-gost/gost.plus
 go 1.22.0
 
 require (
-	gioui.org v0.5.0
-	gioui.org/x v0.5.0
+	gioui.org v0.6.0
+	gioui.org/x v0.6.1
+	github.com/go-gost/core v0.0.0-20240309124515-fea73cf68235
+	github.com/go-gost/x v0.0.0-20240131151842-25dcf536c6f5
+	github.com/google/uuid v1.6.0
 	golang.org/x/exp/shiny v0.0.0-20240103183307-be819d1f06fc
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	gioui.org/cpu v0.0.0-20210817075930-8d6a761490d2 // indirect
 	gioui.org/shader v1.0.8 // indirect
-	github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/go-gost/gosocks5 v0.4.0 // indirect
+	github.com/go-gost/plugin v0.0.0-20240103125338-9c84e29cb81a // indirect
+	github.com/go-gost/relay v0.5.0 // indirect
+	github.com/go-gost/tls-dissector v0.0.2-0.20220408131628-aac992c27451 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
+	github.com/go-text/typesetting v0.1.1 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/pires/go-proxyproto v0.7.0 // indirect
+	github.com/prometheus/client_golang v1.17.0 // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
+	github.com/rs/xid v1.3.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.18.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/xtaci/smux v1.5.24 // indirect
+	github.com/yl2chen/cidranger v1.0.2 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
 	golang.org/x/image v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )

go.mod

@@ -1,15 +1,18 @@
 package main
 
 import (
+	"context"
 	_ "net"
 	"os"
+	"time"
 
 	"gioui.org/app"
 	_ "gioui.org/app/permission/storage"
-	"gioui.org/io/key"
 	"gioui.org/op"
 	"github.com/go-gost/core/logger"
 	"github.com/go-gost/gost.plus/config"
+	"github.com/go-gost/gost.plus/runner"
+	"github.com/go-gost/gost.plus/runner/task"
 	"github.com/go-gost/gost.plus/tunnel"
 	"github.com/go-gost/gost.plus/tunnel/entrypoint"
 	"github.com/go-gost/gost.plus/ui"
@@ -20,11 +23,10 @@ func main() {
 	Init()
 
 	go func() {
-		w := app.NewWindow(
-			app.Title("GOST+"),
-			app.MinSize(800, 600),
-		)
-		err := run(w)
+		var w app.Window
+		w.Option(app.Title("GOST+"))
+		w.Option(app.MinSize(800, 600))
+		err := run(&w)
 		if err != nil {
 			logger.Default().Fatal(err)
 		}
@@ -34,20 +36,26 @@ func main() {
 }
 
 func run(w *app.Window) error {
+	go func() {
+		for e := range runner.Event() {
+			if e.TaskID == runner.TaskUpdateStats {
+				w.Invalidate()
+			}
+		}
+	}()
+
 	ui := ui.NewUI()
 	var ops op.Ops
 	for {
-		switch e := w.NextEvent().(type) {
+		switch e := w.Event().(type) {
 		case app.DestroyEvent:
+			tunnel.SaveConfig()
+			entrypoint.SaveConfig()
 			return e.Err
 		case app.FrameEvent:
 			gtx := app.NewContext(&ops, e)
 			ui.Layout(gtx)
 			e.Frame(gtx.Ops)
-		case key.Event:
-			if e.Name == key.NameBack {
-				return nil
-			}
 		}
 	}
 }
@@ -56,4 +64,10 @@ func Init() {
 	config.Init()
 	tunnel.LoadConfig()
 	entrypoint.LoadConfig()
+
+	runner.Exec(context.Background(), task.UpdateStats(),
+		runner.WithAync(true),
+		runner.WithInterval(time.Second),
+		runner.WithCancel(true),
+	)
 }

go.sum

@@ -0,0 +1,193 @@
+package runner
+
+import (
+	"context"
+	"sync"
+	"time"
+
+	"github.com/go-gost/core/logger"
+)
+
+var (
+	runner = NewRunner()
+)
+
+type TaskEvent struct {
+	TaskID TaskID
+	Err    error
+}
+
+type taskState struct {
+	task   Task
+	cancel context.CancelFunc
+}
+
+type Options struct {
+	Async    bool
+	Interval time.Duration
+	Cancel   bool
+}
+
+type Option func(opts *Options)
+
+func WithAync(aync bool) Option {
+	return func(opts *Options) {
+		opts.Async = aync
+	}
+}
+
+func WithInterval(interval time.Duration) Option {
+	return func(opts *Options) {
+		opts.Interval = interval
+	}
+}
+
+func WithCancel(cancel bool) Option {
+	return func(opts *Options) {
+		opts.Cancel = cancel
+	}
+}
+
+func Event() <-chan *TaskEvent {
+	return runner.Event()
+}
+
+func Exec(ctx context.Context, task Task, opts ...Option) error {
+	return runner.Exec(ctx, task, opts...)
+}
+
+func Cancel(id TaskID) {
+	runner.Cancel(id)
+}
+
+type Runner struct {
+	events chan *TaskEvent
+	states map[TaskID]taskState
+	mu     sync.RWMutex
+}
+
+func NewRunner() *Runner {
+	return &Runner{
+		events: make(chan *TaskEvent, 16),
+		states: make(map[TaskID]taskState),
+	}
+}
+
+func (r *Runner) Event() <-chan *TaskEvent {
+	return r.events
+}
+
+func (r *Runner) Exec(ctx context.Context, task Task, opts ...Option) error {
+	if task == nil || task.ID() == "" {
+		return nil
+	}
+
+	var options Options
+	for _, opt := range opts {
+		opt(&options)
+	}
+
+	if options.Cancel {
+		r.Cancel(task.ID())
+	}
+
+	ctx, cancel := context.WithCancel(ctx)
+	r.setState(taskState{
+		task:   task,
+		cancel: cancel,
+	})
+
+	log := logger.Default().WithFields(map[string]any{
+		"kind":  "runner",
+		"async": options.Async,
+	})
+	log.Debugf("task %s started", task.ID())
+
+	if !options.Async {
+		t := time.Now()
+		err := task.Run(ctx)
+
+		log.WithFields(map[string]any{
+			"duration": time.Since(t),
+		}).Debugf("task %s done: %v", task.ID(), err)
+
+		select {
+		case r.events <- &TaskEvent{
+			TaskID: task.ID(),
+			Err:    err,
+		}:
+		default:
+		}
+
+		return err
+	}
+
+	go func() {
+		defer cancel()
+
+		t := time.Now()
+		defer func() {
+			log.WithFields(map[string]any{
+				"duration": time.Since(t),
+			}).Debugf("task %s done", task.ID())
+		}()
+
+		run := func() {
+			select {
+			case r.events <- &TaskEvent{
+				TaskID: task.ID(),
+				Err:    task.Run(ctx),
+			}:
+			default:
+			}
+		}
+
+		run()
+
+		interval := options.Interval
+		if interval <= 0 {
+			return
+		}
+
+		ticker := time.NewTicker(interval)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				run()
+			case <-ctx.Done():
+				return
+			}
+		}
+	}()
+
+	return nil
+}
+
+func (r *Runner) Cancel(id TaskID) {
+	r.delState(id)
+}
+
+func (r *Runner) setState(state taskState) {
+	if state.task == nil {
+		return
+	}
+
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	r.states[state.task.ID()] = state
+}
+
+func (r *Runner) delState(id TaskID) {
+	r.mu.Lock()
+	defer r.mu.Unlock()
+
+	state := r.states[id]
+	if state.cancel != nil {
+		state.cancel()
+	}
+
+	delete(r.states, id)
+}

main.go

@@ -0,0 +1,16 @@
+package runner
+
+import (
+	"context"
+)
+
+type TaskID string
+
+const (
+	TaskUpdateStats TaskID = "service.stats.update"
+)
+
+type Task interface {
+	ID() TaskID
+	Run(ctx context.Context) error
+}