optimization.

Author: efectn

redirect.go

@@ -121,43 +121,41 @@ func (r *Redirect) Route(name string, config ...RedirectConfig) error {
 	}
 
 	// Flash messages
-	if len(r.messages) > 0 {
+	if len(r.messages) > 0 || len(r.oldInput) > 0 {
 		messageText := bytebufferpool.Get()
 		defer bytebufferpool.Put(messageText)
 
+		// flash messages
 		i := 1
 		for k, v := range r.messages {
-			_, _ = messageText.WriteString("k:" + k + ":" + v)
+			if i != 1 {
+				_, _ = messageText.WriteString("k:")
+			}
+
+			_, _ = messageText.WriteString(k + ":" + v)
 			if len(r.messages) != i {
 				_, _ = messageText.WriteString(",")
 			}
 			i++
 		}
 
-		r.c.Cookie(&Cookie{
-			Name:        "fiber_flash",
-			Value:       r.c.app.getString(messageText.Bytes()),
-			SessionOnly: true,
-		})
-	}
-
-	// Old input data
-	if len(r.oldInput) > 0 {
-		inputText := bytebufferpool.Get()
-		defer bytebufferpool.Put(inputText)
-
-		i := 1
+		// old input data
+		i = 1
 		for k, v := range r.oldInput {
-			_, _ = inputText.WriteString("k:" + k + ":" + v)
+			if i == 1 {
+				_, _ = messageText.WriteString("k:")
+			}
+
+			_, _ = messageText.WriteString("k:old_input_data_" + k + ":" + v)
 			if len(r.oldInput) != i {
-				_, _ = inputText.WriteString(",")
+				_, _ = messageText.WriteString(",")
 			}
 			i++
 		}
 
 		r.c.Cookie(&Cookie{
-			Name:        "fiber_flash_old_input",
-			Value:       r.c.app.getString(inputText.Bytes()),
+			Name:        "fiber_flash",
+			Value:       r.c.app.getString(messageText.Bytes()),
 			SessionOnly: true,
 		})
 	}
@@ -198,28 +196,20 @@ func (r *Redirect) setFlash() {
 	// parse flash messages
 	if r.c.Cookies("fiber_flash") != "" {
 		messages := strings.Split(r.c.Cookies("fiber_flash"), ",k:")
-		r.c.flashMessages = make(map[string]string, len(messages))
-
-		for _, msg := range messages {
-			msg = strings.Replace(msg, "k:", "", 1)
-			splitMsg := strings.Split(msg, ":")
-
-			r.c.flashMessages[splitMsg[0]] = splitMsg[1]
-		}
-	}
-
-	// parse old input data
-	if r.c.Cookies("fiber_flash_old_input") != "" {
-		messages := strings.Split(r.c.Cookies("fiber_flash_old_input"), ",k:")
-		r.c.oldInput = make(map[string]string, len(messages))
+		r.c.flashMessages = make(map[string]string)
+		r.c.oldInput = make(map[string]string)
 
 		for _, msg := range messages {
-			msg = strings.Replace(msg, "k:", "", 1)
 			splitMsg := strings.Split(msg, ":")
 
-			r.c.oldInput[splitMsg[0]] = splitMsg[1]
+			// check old input data
+			if strings.HasPrefix(msg, "old_input_data_") {
+				r.c.oldInput[splitMsg[0][15:]] = splitMsg[1]
+			} else {
+				r.c.flashMessages[splitMsg[0]] = splitMsg[1]
+			}
 		}
 	}
 
-	r.c.ClearCookie("fiber_flash", "fiber_flash_old_input")
+	r.c.ClearCookie("fiber_flash")
 }

redirect_test.go

@@ -303,11 +303,11 @@ func Benchmark_Redirect_Route_WithFlashMessages(b *testing.B) {
 	utils.AssertEqual(b, 302, c.Response().StatusCode())
 	utils.AssertEqual(b, "/user", string(c.Response().Header.Peek(HeaderLocation)))
 
-	equal := string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=k:success:1,k:message:test; path=/; SameSite=Lax" || string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=k:message:test,k:success:1; path=/; SameSite=Lax"
+	equal := string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=success:1,k:message:test; path=/; SameSite=Lax" || string(c.Response().Header.Peek(HeaderSetCookie)) == "fiber_flash=message:test,k:success:1; path=/; SameSite=Lax"
 	utils.AssertEqual(b, true, equal)
 
 	c.Redirect().setFlash()
-	utils.AssertEqual(b, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT; fiber_flash_old_input=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
+	utils.AssertEqual(b, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
 }
 
 // go test -v -run=^$ -bench=Benchmark_Redirect_Route_WithFlashMessages -benchmem -count=4
@@ -319,8 +319,7 @@ func Benchmark_Redirect_setFlash(b *testing.B) {
 
 	c := app.NewCtx(&fasthttp.RequestCtx{}).(*DefaultCtx)
 
-	c.Request().Header.Set(HeaderCookie, "fiber_flash_old_input=k:name:tom,k:id:1")
-	c.Request().Header.Set(HeaderCookie, "fiber_flash=k:success:1,k:message:test")
+	c.Request().Header.Set(HeaderCookie, "fiber_flash=success:1,k:message:test,k:old_input_data_name:tom,k:old_input_data_id:1")
 
 	b.ReportAllocs()
 	b.ResetTimer()
@@ -329,7 +328,7 @@ func Benchmark_Redirect_setFlash(b *testing.B) {
 		c.Redirect().setFlash()
 	}
 
-	utils.AssertEqual(b, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT; fiber_flash_old_input=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
+	utils.AssertEqual(b, "fiber_flash=; expires=Tue, 10 Nov 2009 23:00:00 GMT", string(c.Response().Header.Peek(HeaderSetCookie)))
 
 	utils.AssertEqual(b, "1", c.Redirect().Message("success"))
 	utils.AssertEqual(b, "test", c.Redirect().Message("message"))