v0.0.209 removed g context from err func

ginext/engine.go

@@ -3,8 +3,10 @@ package ginext
 import (
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"gogs.mikescher.com/BlackForestBytes/goext/mathext"
+	"net"
 	"net/http"
 	"strings"
 	"time"
@@ -65,16 +67,47 @@ func NewEngine(allowCors bool, ginDebug bool, timeout time.Duration) *GinWrapper
 	return wrapper
 }
 
-func (w *GinWrapper) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
+func (w *GinWrapper) ListenAndServeHTTP(addr string, postInit func(port string)) (chan error, *http.Server) {
 
-	if w.ginDebug {
-		w.debugPrintRoutes()
+	w.DebugPrintRoutes()
+
+	httpserver := &http.Server{
+		Addr:    addr,
+		Handler: w.engine,
 	}
 
-	w.engine.ServeHTTP(writer, request)
+	errChan := make(chan error)
+
+	go func() {
+
+		ln, err := net.Listen("tcp", httpserver.Addr)
+		if err != nil {
+			errChan <- err
+			return
+		}
+
+		_, port, err := net.SplitHostPort(ln.Addr().String())
+		if err != nil {
+			errChan <- err
+			return
+		}
+
+		log.Info().Str("address", httpserver.Addr).Msg("HTTP-Server started on http://localhost:" + port)
+
+		if postInit != nil {
+			postInit(port) // the net.Listener a few lines above is at this point actually already buffering requests
+		}
+
+		errChan <- httpserver.Serve(ln)
+	}()
+
+	return errChan, httpserver
 }
 
-func (w *GinWrapper) debugPrintRoutes() {
+func (w *GinWrapper) DebugPrintRoutes() {
+	if !w.ginDebug {
+		return
+	}
 
 	lines := make([][4]string, 0)
 
@@ -85,8 +118,8 @@ func (w *GinWrapper) debugPrintRoutes() {
 		line := [4]string{
 			spec.Method,
 			spec.URL,
-			strings.Join(spec.Middlewares, " --> "),
-			spec.Method,
+			strings.Join(spec.Middlewares, " -> "),
+			spec.Handler,
 		}
 
 		lines = append(lines, line)
@@ -99,8 +132,8 @@ func (w *GinWrapper) debugPrintRoutes() {
 
 	for _, line := range lines {
 
-		fmt.Printf("Gin-Route: [%s] @ %s --> %s --> %s",
-			langext.StrPadRight(line[0], " ", pad[0]),
+		fmt.Printf("Gin-Route: %s  %s  -->  %s  -->  %s\n",
+			langext.StrPadRight("["+line[0]+"]", " ", pad[0]+2),
 			langext.StrPadRight(line[1], " ", pad[1]),
 			langext.StrPadRight(line[2], " ", pad[2]),
 			langext.StrPadRight(line[3], " ", pad[3]))

ginext/funcWrapper.go

@@ -25,7 +25,7 @@ func Wrap(w *GinWrapper, fn WHandlerFunc) gin.HandlerFunc {
 				Str("trace", stackTrace).
 				Build()
 
-			wrap = APIError(g, err)
+			wrap = Error(err)
 		}
 
 		if g.Writer.Written() {

ginext/preContext.go

@@ -52,7 +52,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailURI).
 				Str("struct_type", fmt.Sprintf("%T", pctx.uri)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -62,7 +62,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailQuery).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -73,13 +73,13 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailJSON).
 					Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 					Build()
-				return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+				return nil, nil, langext.Ptr(Error(err))
 			}
 		} else {
 			err := exerr.New(exerr.TypeBindFailJSON, "missing JSON body").
 				Str("struct_type", fmt.Sprintf("%T", pctx.body)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -90,13 +90,13 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 					WithType(exerr.TypeBindFailFormData).
 					Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 					Build()
-				return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+				return nil, nil, langext.Ptr(Error(err))
 			}
 		} else {
 			err := exerr.New(exerr.TypeBindFailFormData, "missing form body").
 				Str("struct_type", fmt.Sprintf("%T", pctx.form)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 
@@ -106,7 +106,7 @@ func (pctx PreContext) Start() (*AppContext, *gin.Context, *HTTPResponse) {
 				WithType(exerr.TypeBindFailHeader).
 				Str("struct_type", fmt.Sprintf("%T", pctx.query)).
 				Build()
-			return nil, nil, langext.Ptr(APIError(pctx.ginCtx, err))
+			return nil, nil, langext.Ptr(Error(err))
 		}
 	}
 

ginext/response.go

@@ -170,12 +170,18 @@ func Redirect(sc int, newURL string) HTTPResponse {
 	return &redirectHTTPResponse{statusCode: sc, url: newURL}
 }
 
-func APIError(g *gin.Context, e error) HTTPResponse {
+func Error(e error) HTTPResponse {
 	return &jsonAPIErrResponse{
 		err: exerr.FromError(e),
 	}
 }
 
-func NotImplemented(g *gin.Context) HTTPResponse {
-	return APIError(g, exerr.New(exerr.TypeNotImplemented, "").Build())
+func ErrWrap(e error, errorType exerr.ErrorType, msg string) HTTPResponse {
+	return &jsonAPIErrResponse{
+		err: exerr.FromError(exerr.Wrap(e, msg).WithType(errorType).Build()),
+	}
+}
+
+func NotImplemented() HTTPResponse {
+	return Error(exerr.New(exerr.TypeNotImplemented, "").Build())
 }

ginext/routes.go

@@ -3,8 +3,10 @@ package ginext
 import (
 	"github.com/gin-gonic/gin"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/rext"
 	"net/http"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strings"
 )
@@ -123,12 +125,25 @@ func (w *GinWrapper) NoRoute(handler WHandlerFunc) {
 
 func nameOfFunction(f any) string {
 
-	n := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
+	fname := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
 
-	split := strings.Split(n, "/")
+	split := strings.Split(fname, "/")
 	if len(split) == 0 {
 		return ""
 	}
 
-	return split[len(split)-1]
+	fname = split[len(split)-1]
+
+	// https://stackoverflow.com/a/32925345/1761622
+	if strings.HasSuffix(fname, "-fm") {
+		fname = fname[:len(fname)-len("-fm")]
+	}
+
+	suffix := rext.W(regexp.MustCompile("\\.func[0-9]+$"))
+
+	if match, ok := suffix.MatchFirst(fname); ok {
+		fname = fname[:len(fname)-match.FullMatch().Length()]
+	}
+
+	return fname
 }

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.201"
+const GoextVersion = "0.0.209"
 
-const GoextVersionTimestamp = "2023-07-24T18:22:36+0200"
+const GoextVersionTimestamp = "2023-07-25T10:56:03+0200"