Update

Author: remicaumette

xweb/cors.go

@@ -27,11 +27,11 @@ func Cors(opts *CorsOptions) func(h http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if r.Method == http.MethodOptions {
-				w.WriteHeader(http.StatusNoContent)
 				w.Header().Add("Access-Control-Allow-Origin", opts.Origin)
 				w.Header().Add("Access-Control-Allow-Credentials", strconv.FormatBool(opts.AllowCredentials))
 				w.Header().Add("Access-Control-Allow-Methods", strings.Join(opts.AllowMethods, ","))
 				w.Header().Add("Access-Control-Allow-Headers", strings.Join(opts.AllowHeaders, ","))
+				w.WriteHeader(http.StatusNoContent)
 				return
 			}
 

xweb/error.go

@@ -0,0 +1,17 @@
+package xweb
+
+type (
+	errorWithResponse struct {
+		error
+		response Response
+	}
+
+	ErrorPayload struct {
+		Message string            `json:"message,omitempty"`
+		Fields  map[string]string `json:"fields,omitempty"`
+	}
+)
+
+func WrapErrorWithResponse(err error, res Response) error {
+	return &errorWithResponse{error: err, response: res}
+}

xweb/handler.go

@@ -1,6 +1,7 @@
 package xweb
 
 import (
+	"fmt"
 	"net/http"
 )
 
@@ -10,15 +11,15 @@ func (h Handler[P]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	xr := &Request[P]{Request: r}
 	response, err := h(xr)
 	if err != nil {
-		//if wrappedError, ok := err.(*errorWithResponse); ok {
-		//	response = wrappedError.response
-		//} else {
-		//	LogError(r.Context(), err)
-		//	response = &xweb.JSONResponse{
-		//		StatusCode: http.StatusInternalServerError,
-		//		Payload:    ErrorPayload{Message: http.StatusText(http.StatusInternalServerError)},
-		//	}
-		//}
+		if wrappedError, ok := err.(*errorWithResponse); ok {
+			response = wrappedError.response
+		} else {
+			LogError(r.Context(), err)
+			response = &JSONResponse{
+				StatusCode: http.StatusInternalServerError,
+				Payload:    ErrorPayload{Message: http.StatusText(http.StatusInternalServerError)},
+			}
+		}
 	}
 
 	if response == nil {
@@ -32,6 +33,6 @@ func (h Handler[P]) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	w.WriteHeader(response.GetStatusCode())
 	if err := response.WriteBody(w); err != nil {
-		//LogError(r.Context(), fmt.Errorf("response.WriteBody: %v", err))
+		LogError(r.Context(), fmt.Errorf("response.WriteBody: %v", err))
 	}
 }

xweb/provider.go

@@ -9,8 +9,9 @@ import (
 )
 
 type Provider struct {
-	Addr   string
-	Routes func(router *Router)
+	Addr    string
+	BaseURL string
+	Routes  func(router *Router)
 }
 
 func (p *Provider) Register(app *xfoundation.App) error {
@@ -24,7 +25,12 @@ func (p *Provider) Register(app *xfoundation.App) error {
 		if err != nil {
 			return err
 		}
-		app.Logger.Info("starting http server", zap.String("addr", listener.Addr().String()))
+
+		if p.BaseURL == "" {
+			p.BaseURL = "http://" + listener.Addr().String()
+		}
+		app.Logger.Info("starting http server", zap.String("url", p.BaseURL))
+
 		go httpServer.Serve(listener)
 		return nil
 	})