refactor(vars): replace expvar with atomic types and fix Result logic

Author: kooksee

component/gormclient/client.go

@@ -23,7 +23,7 @@ func (c *Client) Ping() error {
 	return _db.Ping()
 }
 
-func (c *Client) Vars() vars.Value {
+func (c *Client) Vars() vars.Func {
 	return func() interface{} {
 		_db, err := c.DB.DB()
 		if err != nil {

v2/result/result.go

@@ -116,14 +116,14 @@ func (r Result[T]) Log(events ...func(e *zerolog.Event)) Result[T] {
 }
 
 func (r Result[T]) Map(fn func(T) T) Result[T] {
-	if r.IsOK() {
+	if r.IsErr() {
 		return r
 	}
 	return OK(fn(r.getValue()))
 }
 
 func (r Result[T]) FlatMap(fn func(T) Result[T]) Result[T] {
-	if r.IsOK() {
+	if r.IsErr() {
 		return r
 	}
 	return fn(r.getValue())

vars/vars.go

@@ -8,6 +8,7 @@ import (
 	"strconv"
 	"strings"
 	"sync"
+	"time"
 
 	"github.com/rs/xid"
 	"go.uber.org/atomic"
@@ -22,61 +23,41 @@ func Bool(name string) *atomic.Bool {
 	return Any(name, atomic.NewBool(false))
 }
 
-func Float(name string) *expvar.Float {
-	mux.Lock()
-	defer mux.Unlock()
-
-	v := expvar.Get(name)
-	if v == nil {
-		return expvar.NewFloat(name)
-	}
-	return v.(*expvar.Float)
+func Float(name string) *atomic.Float64 {
+	return Any(name, atomic.NewFloat64(0))
 }
 
-func Int(name string) *expvar.Int {
-	mux.Lock()
-	defer mux.Unlock()
-
-	v := expvar.Get(name)
-	if v == nil {
-		return expvar.NewInt(name)
-	}
-	return v.(*expvar.Int)
+func Int(name string) *atomic.Int64 {
+	return Any(name, atomic.NewInt64(0))
 }
 
-func String(name string) *expvar.String {
-	mux.Lock()
-	defer mux.Unlock()
+func String(name string) *atomic.String {
+	return Any(name, atomic.NewString(""))
+}
 
-	v := expvar.Get(name)
-	if v == nil {
-		return expvar.NewString(name)
-	}
-	return v.(*expvar.String)
+func Duration(name string) *atomic.Duration {
+	return Any(name, atomic.NewDuration(0))
 }
 
-func Map(name string) *expvar.Map {
-	mux.Lock()
-	defer mux.Unlock()
+func Time(name string) *atomic.Time {
+	return Any(name, atomic.NewTime(time.Now()))
+}
 
-	v := expvar.Get(name)
-	if v == nil {
-		return expvar.NewMap(name)
-	}
-	return v.(*expvar.Map)
+func Error(name string) *atomic.Error {
+	return Any(name, atomic.NewError(nil))
 }
 
-var _ json.Marshaler = (*Value)(nil)
+var _ json.Marshaler = (*Func)(nil)
 
-type Value func() any
+type Func func() any
 
-func (f Value) MarshalJSON() ([]byte, error) {
+func (f Func) MarshalJSON() ([]byte, error) {
 	return json.Marshal(f())
 }
 
-func (f Value) Value() any { return f() }
+func (f Func) Value() any { return f() }
 
-func (f Value) String() (r string) {
+func (f Func) String() (r string) {
 	return toString(f())
 }
 
@@ -87,6 +68,7 @@ func errToString(err error) string {
 
 	return strconv.Quote(fmt.Sprintf("err:%s detail:%#v", err.Error(), err))
 }
+
 func toString(dt any) (r string) {
 	var jsonStr = func(data any) string {
 		ret, err := json.Marshal(data)
@@ -106,6 +88,8 @@ func toString(dt any) (r string) {
 		return strconv.Quote(dt)
 	case []byte:
 		return strconv.Quote(string(dt))
+	case json.Marshaler:
+		return jsonStr(dt)
 	case fmt.Stringer:
 		return strconv.Quote(dt.String())
 	case error:
@@ -142,9 +126,7 @@ func (a anyValue) MarshalJSON() ([]byte, error) {
 	return json.Marshal(a.v)
 }
 
-func (a anyValue) Value() any { return a.v }
-
-func Register(name string, value Value) {
+func Register(name string, value Func) {
 	assert.If(Has(name), "name:%s already exists", name)
 	expvar.Publish(name, value)
 }

vars/z_test.go

@@ -2,7 +2,6 @@ package vars_test
 
 import (
 	"expvar"
-	"strconv"
 	"testing"
 
 	"github.com/pubgo/funk/assert"
@@ -17,5 +16,5 @@ func TestAny(t *testing.T) {
 	assert.If(bb.Load() != false, "not match")
 	assert.If(vars.Bool(name).String() != "false", "not match")
 	vars.Bool(name).Store(true)
-	assert.MustEqual(expvar.Get(name).String(), strconv.Quote("true"))
+	assert.MustEqual(expvar.Get(name).String(), "true")
 }