Add truncate string util function

Author: tommysitu

core/cmd/hoverfly/main.go

@@ -252,6 +252,7 @@ func main() {
 
 	hoverfly.StoreLogsHook.LogsLimit = *logsSize
 	hoverfly.Journal.EntryLimit = *journalSize
+	hoverfly.Journal.BodyMemoryLimit = journalBodyMemoryLimit
 
 	// getting settings
 	cfg := hv.InitSettings()

core/journal/journal.go

@@ -39,10 +39,11 @@ type PostServeActionEntry struct {
 }
 
 type Journal struct {
-	entries    []JournalEntry
-	Indexes    []Index
-	EntryLimit int
-	mutex      sync.Mutex
+	entries         []JournalEntry
+	Indexes         []Index
+	EntryLimit      int
+	BodyMemoryLimit util.MemorySize
+	mutex           sync.Mutex
 }
 
 func NewJournal() *Journal {

core/util/memory_size.go

@@ -7,21 +7,21 @@ import (
 )
 
 // MemorySize is a custom type for parsing memory sizes (e.g., "128KB", "2MB")
-type MemorySize int64
+type MemorySize int
 
 // String returns the string representation of the memory size
 func (m *MemorySize) String() string {
 	return fmt.Sprintf("%d bytes", *m)
 }
 
-// ToBytes returns the memory size as an int64 in bytes.
-func (m *MemorySize) ToBytes() int64 {
-	return int64(*m)
+// ToBytes returns the memory size as an int in bytes.
+func (m *MemorySize) ToBytes() int {
+	return int(*m)
 }
 
 // Set parses a string like "128KB" or "2MB" and converts it to bytes
 func (m *MemorySize) Set(value string) error {
-	multiplier := int64(1)
+	multiplier := 1
 
 	value = strings.ToUpper(strings.TrimSpace(value))
 
@@ -37,7 +37,7 @@ func (m *MemorySize) Set(value string) error {
 		value = strings.TrimSuffix(value, "GB")
 	}
 
-	size, err := strconv.ParseInt(value, 10, 64)
+	size, err := strconv.Atoi(value)
 	if err != nil || size < 0 {
 		return fmt.Errorf("invalid memory size: %s", value)
 	}

core/util/memory_size_test.go

@@ -61,8 +61,8 @@ func TestMemorySize_AsBytes(t *testing.T) {
 
 	// Set a value and check its string representation
 	ms = 128 * 1024
-	Expect(ms.ToBytes()).To(Equal(int64(131072)))
+	Expect(ms.ToBytes()).To(Equal(131072))
 
 	ms = 2 * 1024 * 1024
-	Expect(ms.ToBytes()).To(Equal(int64(2097152)))
+	Expect(ms.ToBytes()).To(Equal(2097152))
 }

core/util/util.go

@@ -22,10 +22,10 @@ import (
 	"reflect"
 	"regexp"
 	"sort"
-	"strings"
-
 	"strconv"
+	"strings"
 	"time"
+	"unicode/utf8"
 
 	xj "github.com/SpectoLabs/goxml2json"
 	"github.com/tdewolff/minify/v2"
@@ -557,3 +557,21 @@ func ResolveAndValidatePath(absBasePath, relativePath string) (string, error) {
 
 	return resolvedPath, nil
 }
+
+func truncateStringWithEllipsis(input string, maxSize int) string {
+	ellipsis := "..."
+
+	if len(input) <= maxSize{
+		return input
+	}
+
+	truncated := input[:maxSize-len(ellipsis)]
+
+	// Ensure valid UTF-8 after truncation
+	for !utf8.ValidString(truncated) {
+		truncated = truncated[:len(truncated)-1]
+	}
+
+	return truncated + ellipsis
+}
+

core/util/util_test.go

@@ -416,3 +416,67 @@ func TestResolveAndValidatePath(t *testing.T) {
 		})
 	}
 }
+
+
+func TestTruncateStringWithEllipsis(t *testing.T) {
+
+	tests := []struct {
+		name     string
+		input    string
+		maxSize  int
+		expected string
+	}{
+		{
+			name:     "No truncation required",
+			input:    "Hello",
+			maxSize:  10,
+			expected: "Hello",
+		},
+		{
+			name:     "Truncate with ellipsis",
+			input:    "Hello, World!",
+			maxSize:  10,
+			expected: "Hello, ...",
+		},
+		{
+			name:     "String exactly maxSize",
+			input:    "Hello, World!",
+			maxSize:  13,
+			expected: "Hello, World!",
+		},
+		{
+			name:     "Small maxSize adds ellipsis only",
+			input:    "Hello",
+			maxSize:  3,
+			expected: "...",
+		},
+		{
+			name:     "UTF-8 truncation valid",
+			input:    "你好，世界", // "Hello, World" in Chinese
+			maxSize:  8,
+			expected: "你...",
+		},
+		{
+			name:     "Empty string",
+			input:    "",
+			maxSize:  5,
+			expected: "",
+		},
+		{
+			name:     "UTF-8 truncation with invalid byte",
+			input:    "Hello, 世界\xef\xbf\xbd", // Invalid UTF-8 at the end
+			maxSize:  10,
+			expected: "Hello, ...",
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			g := NewWithT(t)
+			result := truncateStringWithEllipsis(test.input, test.maxSize)
+			g.Expect(result).To(Equal(test.expected), "Expected %q but got %q for input %q with maxSize %d", test.expected, result, test.input, test.maxSize)
+		})
+	}
+}
+
+