fix(load): fix load string

decorator.go

@@ -260,7 +260,10 @@ checkCache:
 
 	// 3.1 check if marshal needed
 	if hasCache && c.cacheMap.NeedMarshal() {
-		err = json.Unmarshal(value.([]byte), &retv)
+		err2 := json.Unmarshal(value.([]byte), &retv)
+		if err == nil {
+			err = err2
+		}
 		return retv, err
 	}
 

examples/decorator-redis-err_test.go

@@ -0,0 +1,56 @@
+package examples
+
+import (
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/ahuigo/gofnext"
+)
+
+func TestRedisCacheClientPanic(t *testing.T) {
+	defer func() {
+		r := recover() //r.(string)
+		if r==nil{
+			t.Error("should panic")
+		}
+	}()
+	gofnext.NewCacheRedis("")
+
+}
+
+func TestRedisCacheFuncErr(t *testing.T) {
+	// Original function
+	executeCount := 0
+	getUserScore := func(more int) (int, error) {
+		executeCount++
+		return 98 + more, errors.New("db error")
+	}
+
+	// Cacheable Function
+	getUserScoreFromDbWithCache := gofnext.CacheFn1Err(getUserScore, &gofnext.Config{
+		TTL:      500*time.Second,
+		CacheMap: gofnext.NewCacheRedis("redis-cache-key").ClearAll(),
+	})
+
+	// Parallel invocation of multiple functions.
+	for i := 0; i < 10; i++ {
+		score, err := getUserScoreFromDbWithCache(1)
+		if err == nil {
+			t.Errorf("should be error, but get nil")
+		}
+		if score != 99 {
+			t.Errorf("score should be 99, but get %d", score)
+		}
+		score, _ = getUserScoreFromDbWithCache(2)
+		if score != 100 {
+			t.Fatalf("score should be 100, but get %d", score)
+		}
+		getUserScoreFromDbWithCache(3)
+		getUserScoreFromDbWithCache(3)
+	}
+
+	if executeCount != 3 {
+		t.Errorf("executeCount should be 1, but get %d", executeCount)
+	}
+}

examples/decorator-redis_test.go

@@ -24,6 +24,7 @@ func TestRedisCacheClient(t *testing.T) {
 	cache.SetRedisUniversalOpts(&redis.UniversalOptions{
 		Addrs: []string{"localhost:6379"},
 	})
+	cache.SetMaxHashKeyLen(0)
 	cache.SetMaxHashKeyLen(100)
 }
 

readme.md

@@ -3,7 +3,7 @@
 ![Go Version](https://img.shields.io/badge/Go-%3E%3D%201.21-%23007d9c)
 [![GoDoc](https://godoc.org/github.com/ahuigo/gofnext?status.svg)](https://pkg.go.dev/github.com/ahuigo/gofnext)
 ![Build Status](https://github.com/ahuigo/gofnext/actions/workflows/test.yml/badge.svg)
-[![Go report](https://goreportcard.com/badge/github.com/ahuigo/gofnext)](https://goreportcard.com/report/github.com/ahuigo/gofnext)
+[![Go report](https://goreportcard.com/badge/github.com/ahuigo/gofnext?a=1)](https://goreportcard.com/report/github.com/ahuigo/gofnext)
 [![Coverage](https://img.shields.io/codecov/c/github/ahuigo/gofnext)](https://codecov.io/gh/ahuigo/gofnext)
 [![Contributors](https://img.shields.io/github/contributors/ahuigo/gofnext)](https://github.com/ahuigo/gofnext/graphs/contributors)
 [![License](https://img.shields.io/github/license/ahuigo/gofnext)](./LICENSE)

serial/load.go

@@ -82,6 +82,7 @@ func (l *Loader) loadString(start int, rv reflect.Value) (end int, err error) {
 	start++
 	maxIndex := len(data) - 1
 	i := start
+	stop := false
 LOOP:
 	for ; i <= maxIndex; i++ {
 		switch data[i] {
@@ -99,16 +100,22 @@ LOOP:
 				buf.WriteByte(0x09)
 			case 'n':
 				buf.WriteByte(0x0a)
+			case 'r':
+				buf.WriteByte(0x0d)
 			default:
 				buf.WriteByte(data[i])
 			}
 		case '"':
+			stop = true
 			i++
 			break LOOP
 		default:
 			buf.WriteByte(data[i])
 		}
 	}
+	if !stop {
+		return -1, fmt.Errorf("unterminated string: %s", data[start:])
+	}
 	rv.SetString(buf.String())
 	l.pos = i
 	return i, nil

serial/load_test.go

@@ -20,12 +20,17 @@ func TestLoad(t *testing.T) {
 	}
 
 	var str string
-	data := []byte(`"Hello, World!"`)
+	data := []byte(`"Hello, World!chars:\"\r\n\t\b"`)
 	_ = Load(data, &str)
-	expected := "Hello, World!"
+	expected := "Hello, World!chars:\"\r\n\t\b"
 	if str != expected {
 		t.Errorf("got %q, want %q", str, expected)
 	}
+	data = []byte(`"Hello, World!`)
+	err := Load(data, &str)
+	if err == nil {
+		t.Errorf("should be error, but get nil")
+	}
 
 	var i int
 	Load([]byte(`-42`), &i)

version

@@ -1 +1 @@
-v0.0.14
+v0.0.15