Refactoring

server/api/ginext/cors.go

@@ -0,0 +1,21 @@
+package ginext
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func CorsMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Writer.Header().Set("Access-Control-Allow-Origin", "*")
+		c.Writer.Header().Set("Access-Control-Allow-Credentials", "true")
+		c.Writer.Header().Set("Access-Control-Allow-Headers", "Content-Type, Content-Length, Accept-Encoding, X-CSRF-Token, Authorization, accept, origin, Cache-Control, X-Requested-With")
+		c.Writer.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS, GET, PUT")
+
+		if c.Request.Method == "OPTIONS" {
+			c.AbortWithStatus(http.StatusOK)
+		} else {
+			c.Next()
+		}
+	}
+}

server/api/ginext/gin.go

@@ -0,0 +1,31 @@
+package ginext
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"github.com/gin-gonic/gin"
+)
+
+var SuppressGinLogs = false
+
+func NewEngine(cfg scn.Config) *gin.Engine {
+	engine := gin.New()
+
+	engine.RedirectFixedPath = false
+	engine.RedirectTrailingSlash = false
+
+	if cfg.Cors {
+		engine.Use(CorsMiddleware())
+	}
+
+	if cfg.GinDebug {
+		ginlogger := gin.Logger()
+		engine.Use(func(context *gin.Context) {
+			if SuppressGinLogs {
+				return
+			}
+			ginlogger(context)
+		})
+	}
+
+	return engine
+}

server/api/ginext/handler.go

@@ -0,0 +1,24 @@
+package ginext
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+func RedirectFound(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusFound, newuri)
+	}
+}
+
+func RedirectTemporary(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusTemporaryRedirect, newuri)
+	}
+}
+
+func RedirectPermanent(newuri string) gin.HandlerFunc {
+	return func(g *gin.Context) {
+		g.Redirect(http.StatusPermanentRedirect, newuri)
+	}
+}

server/api/ginresp/apiError.go

@@ -0,0 +1,16 @@
+package ginresp
+
+type apiError struct {
+	Success        bool    `json:"success"`
+	Error          int     `json:"error"`
+	ErrorHighlight int     `json:"errhighlight"`
+	Message        string  `json:"message"`
+	RawError       *string `json:"errorObj,omitempty"`
+	Trace          string  `json:"traceObj,omitempty"`
+}
+
+type compatAPIError struct {
+	Success bool   `json:"success"`
+	ErrorID int    `json:"errid,omitempty"`
+	Message string `json:"message"`
+}

server/api/ginresp/resp.go

@@ -0,0 +1,139 @@
+package ginresp
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"blackforestbytes.com/simplecloudnotifier/api/apierr"
+	"blackforestbytes.com/simplecloudnotifier/api/apihighlight"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"runtime/debug"
+)
+
+type HTTPResponse interface {
+	Write(g *gin.Context)
+}
+
+type jsonHTTPResponse struct {
+	statusCode int
+	data       any
+}
+
+func (j jsonHTTPResponse) Write(g *gin.Context) {
+	g.JSON(j.statusCode, j.data)
+}
+
+type emptyHTTPResponse struct {
+	statusCode int
+}
+
+func (j emptyHTTPResponse) Write(g *gin.Context) {
+	g.Status(j.statusCode)
+}
+
+type textHTTPResponse struct {
+	statusCode int
+	data       string
+}
+
+func (j textHTTPResponse) Write(g *gin.Context) {
+	g.String(j.statusCode, "%s", j.data)
+}
+
+type dataHTTPResponse struct {
+	statusCode  int
+	data        []byte
+	contentType string
+}
+
+func (j dataHTTPResponse) Write(g *gin.Context) {
+	g.Data(j.statusCode, j.contentType, j.data)
+}
+
+type errorHTTPResponse struct {
+	statusCode int
+	data       any
+	error      error
+}
+
+func (j errorHTTPResponse) Write(g *gin.Context) {
+	g.JSON(j.statusCode, j.data)
+}
+
+func Status(sc int) HTTPResponse {
+	return &emptyHTTPResponse{statusCode: sc}
+}
+
+func JSON(sc int, data any) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: sc, data: data}
+}
+
+func Data(sc int, contentType string, data []byte) HTTPResponse {
+	return &dataHTTPResponse{statusCode: sc, contentType: contentType, data: data}
+}
+
+func Text(sc int, data string) HTTPResponse {
+	return &textHTTPResponse{statusCode: sc, data: data}
+}
+
+func InternalError(e error) HTTPResponse {
+	return createApiError(nil, "InternalError", 500, apierr.INTERNAL_EXCEPTION, 0, e.Error(), e)
+}
+
+func APIError(g *gin.Context, status int, errorid apierr.APIError, msg string, e error) HTTPResponse {
+	return createApiError(g, "APIError", status, errorid, 0, msg, e)
+}
+
+func SendAPIError(g *gin.Context, status int, errorid apierr.APIError, highlight apihighlight.ErrHighlight, msg string, e error) HTTPResponse {
+	return createApiError(g, "SendAPIError", status, errorid, highlight, msg, e)
+}
+
+func NotImplemented(g *gin.Context) HTTPResponse {
+	return createApiError(g, "NotImplemented", 500, apierr.UNDEFINED, 0, "Not Implemented", nil)
+}
+
+func createApiError(g *gin.Context, ident string, status int, errorid apierr.APIError, highlight apihighlight.ErrHighlight, msg string, e error) HTTPResponse {
+	reqUri := ""
+	if g != nil && g.Request != nil {
+		reqUri = g.Request.Method + " :: " + g.Request.RequestURI
+	}
+
+	log.Error().
+		Int("errorid", int(errorid)).
+		Int("highlight", int(highlight)).
+		Str("uri", reqUri).
+		AnErr("err", e).
+		Stack().
+		Msg(fmt.Sprintf("[%s] %s", ident, msg))
+
+	if scn.Conf.ReturnRawErrors {
+		return &errorHTTPResponse{
+			statusCode: status,
+			data: apiError{
+				Success:        false,
+				Error:          int(errorid),
+				ErrorHighlight: int(highlight),
+				Message:        msg,
+				RawError:       langext.Ptr(langext.Conditional(e == nil, "", fmt.Sprintf("%+v", e))),
+				Trace:          string(debug.Stack()),
+			},
+			error: e,
+		}
+	} else {
+		return &errorHTTPResponse{
+			statusCode: status,
+			data: apiError{
+				Success:        false,
+				Error:          int(errorid),
+				ErrorHighlight: int(highlight),
+				Message:        msg,
+			},
+			error: e,
+		}
+	}
+}
+
+func CompatAPIError(errid int, msg string) HTTPResponse {
+	return &jsonHTTPResponse{statusCode: 200, data: compatAPIError{Success: false, ErrorID: errid, Message: msg}}
+}

server/api/ginresp/wrapper.go

@@ -0,0 +1,80 @@
+package ginresp
+
+import (
+	scn "blackforestbytes.com/simplecloudnotifier"
+	"github.com/gin-gonic/gin"
+	"github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
+	"time"
+)
+
+type WHandlerFunc func(*gin.Context) HTTPResponse
+
+func Wrap(fn WHandlerFunc) gin.HandlerFunc {
+
+	maxRetry := scn.Conf.RequestMaxRetry
+	retrySleep := scn.Conf.RequestRetrySleep
+
+	return func(g *gin.Context) {
+
+		reqctx := g.Request.Context()
+
+		if g.Request.Body != nil {
+			g.Request.Body = dataext.NewBufferedReadCloser(g.Request.Body)
+		}
+
+		for ctr := 1; ; ctr++ {
+
+			wrap := fn(g)
+
+			if g.Writer.Written() {
+				panic("Writing in WrapperFunc is not supported")
+			}
+
+			if ctr < maxRetry && isSqlite3Busy(wrap) {
+				log.Warn().Int("counter", ctr).Str("url", g.Request.URL.String()).Msg("Retry request (ErrBusy)")
+
+				err := resetBody(g)
+				if err != nil {
+					panic(err)
+				}
+
+				time.Sleep(retrySleep)
+				continue
+			}
+
+			if reqctx.Err() == nil {
+				wrap.Write(g)
+			}
+
+			return
+		}
+
+	}
+
+}
+
+func resetBody(g *gin.Context) error {
+	if g.Request.Body == nil {
+		return nil
+	}
+
+	err := g.Request.Body.(dataext.BufferedReadCloser).Reset()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func isSqlite3Busy(r HTTPResponse) bool {
+	if errwrap, ok := r.(*errorHTTPResponse); ok && errwrap != nil {
+		if s3err, ok := (errwrap.error).(sqlite3.Error); ok {
+			if s3err.Code == sqlite3.ErrBusy {
+				return true
+			}
+		}
+	}
+	return false
+}

server/api/handler/api.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"blackforestbytes.com/simplecloudnotifier/api/apierr"
 	hl "blackforestbytes.com/simplecloudnotifier/api/apihighlight"
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/db"
 	"blackforestbytes.com/simplecloudnotifier/db/cursortoken"
 	"blackforestbytes.com/simplecloudnotifier/logic"

server/api/handler/common.go

@@ -2,7 +2,7 @@ package handler
 
 import (
 	"blackforestbytes.com/simplecloudnotifier/api/apierr"
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"bytes"
 	"context"

server/api/handler/compat.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/db"
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"blackforestbytes.com/simplecloudnotifier/models"

server/api/handler/message.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"blackforestbytes.com/simplecloudnotifier/api/apierr"
 	hl "blackforestbytes.com/simplecloudnotifier/api/apihighlight"
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/db"
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"blackforestbytes.com/simplecloudnotifier/models"

server/api/handler/website.go

@@ -1,7 +1,7 @@
 package handler
 
 import (
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"blackforestbytes.com/simplecloudnotifier/website"
 	"errors"

server/api/router.go

@@ -1,9 +1,9 @@
 package api
 
 import (
+	"blackforestbytes.com/simplecloudnotifier/api/ginext"
+	"blackforestbytes.com/simplecloudnotifier/api/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/api/handler"
-	"blackforestbytes.com/simplecloudnotifier/common/ginext"
-	"blackforestbytes.com/simplecloudnotifier/common/ginresp"
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"blackforestbytes.com/simplecloudnotifier/swagger"
 	"github.com/gin-gonic/gin"