diff --git a/internal/handler/auth.go b/internal/handler/auth.go index 0a64acb..07e2d68 100644 --- a/internal/handler/auth.go +++ b/internal/handler/auth.go @@ -33,7 +33,7 @@ func (h *AuthHandler) CreateSession(w http.ResponseWriter, r *http.Request) { return } if err != nil { - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } @@ -65,7 +65,7 @@ func (h *AuthHandler) RevokeSession(w http.ResponseWriter, r *http.Request) { return } if err != nil { - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } diff --git a/internal/handler/chat.go b/internal/handler/chat.go index f69e727..e5f9c1e 100644 --- a/internal/handler/chat.go +++ b/internal/handler/chat.go @@ -71,7 +71,7 @@ func (h *ChatHandler) Create(w http.ResponseWriter, r *http.Request) { ) return case err != nil: - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } @@ -106,7 +106,7 @@ func (h *ChatHandler) Get(w http.ResponseWriter, r *http.Request) { ) return case err != nil: - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } @@ -134,7 +134,7 @@ func (h *ChatHandler) List(w http.ResponseWriter, r *http.Request) { ) return case err != nil: - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } diff --git a/internal/handler/message.go b/internal/handler/message.go index 9d16b66..d181fa1 100644 --- a/internal/handler/message.go +++ b/internal/handler/message.go @@ -65,7 +65,7 @@ func (h *MessageHandler) Create(w http.ResponseWriter, r *http.Request) { ) return case err != nil: - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } @@ -114,7 +114,7 @@ func (h *MessageHandler) List(w http.ResponseWriter, r *http.Request) { ) return case err != nil: - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } diff --git a/internal/handler/user.go b/internal/handler/user.go index 4990f4b..66cc985 100644 --- a/internal/handler/user.go +++ b/internal/handler/user.go @@ -54,7 +54,7 @@ func (h *UserHandler) Create(w http.ResponseWriter, r *http.Request) { return } if err != nil { - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } @@ -82,7 +82,7 @@ func (h *UserHandler) Me(w http.ResponseWriter, r *http.Request) { return } if err != nil { - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return } diff --git a/internal/httpx/response.go b/internal/httpx/response.go index 34f910f..f2eac20 100644 --- a/internal/httpx/response.go +++ b/internal/httpx/response.go @@ -1,8 +1,14 @@ package httpx import ( + "context" "encoding/json" + "errors" + "net" "net/http" + "strings" + + "github.com/jackc/pgx/v5/pgconn" "mtusi2026-messenger/internal/dto" ) @@ -23,7 +29,18 @@ func WriteError(w http.ResponseWriter, status int, code dto.ErrorCode, message, }) } -func WriteInternalError(w http.ResponseWriter, requestID string) { +func WriteInternalError(w http.ResponseWriter, requestID string, err error) { + if isUnavailable(err) { + WriteError( + w, + http.StatusServiceUnavailable, + dto.ErrorCodeUnavailable, + "dependency unavailable", + requestID, + ) + return + } + WriteError( w, http.StatusInternalServerError, @@ -32,3 +49,19 @@ func WriteInternalError(w http.ResponseWriter, requestID string) { requestID, ) } + +func isUnavailable(err error) bool { + if errors.Is(err, context.DeadlineExceeded) { + return true + } + + if _, ok := errors.AsType[net.Error](err); ok { + return true + } + + if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok { + return strings.HasPrefix(pgErr.Code, "08") || pgErr.Code == "57P01" + } + + return false +} diff --git a/internal/middleware/auth.go b/internal/middleware/auth.go index d34071f..5ade80c 100644 --- a/internal/middleware/auth.go +++ b/internal/middleware/auth.go @@ -34,7 +34,7 @@ func Auth(auth authenticator) func(http.Handler) http.Handler { return } if err != nil { - httpx.WriteInternalError(w, requestID) + httpx.WriteInternalError(w, requestID, err) return }