From 40f260612f3e833e139740575bd085fa764f606a Mon Sep 17 00:00:00 2001 From: Weinmaier Andrew Date: Sat, 10 Oct 2026 01:14:56 +0300 Subject: [PATCH] =?UTF-8?q?lab2:=20fix=20review=20=E2=80=94=20cache=20cons?= =?UTF-8?q?istency,=20readiness,=20timeouts,=20uuid=20validation,=20tuple?= =?UTF-8?q?=20index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- REPORT.md | 5 +- cmd/api/main.go | 2 +- evidence/readiness.txt | 7 +++ evidence/redis_keys.txt | 4 +- go.mod | 16 +++-- go.sum | 34 +++++++---- internal/repository/postgres/chat.go | 13 ++--- internal/repository/postgres/message.go | 4 +- internal/repository/postgres/session.go | 58 ------------------- internal/repository/postgres/user.go | 18 ++---- internal/repository/redis/message_cache.go | 41 ++++++++----- internal/repository/redis/session.go | 1 - internal/service/chat.go | 9 ++- internal/service/errors.go | 22 ++----- internal/service/message.go | 37 ++++++------ internal/service/password.go | 16 +---- internal/transport/http/health.go | 30 ++++++++-- internal/transport/http/middleware/timeout.go | 18 ++++++ internal/transport/http/router.go | 19 +++--- internal/transport/httputil/response.go | 4 ++ scripts/restart.sh | 16 ++++- 21 files changed, 185 insertions(+), 189 deletions(-) create mode 100644 evidence/readiness.txt delete mode 100644 internal/repository/postgres/session.go create mode 100644 internal/transport/http/middleware/timeout.go diff --git a/REPORT.md b/REPORT.md index f82e1cd2..245e6d18 100644 --- a/REPORT.md +++ b/REPORT.md @@ -213,4 +213,7 @@ stale read — клиент после POST /messages не видит своег ### Гипотеза на lab3 - Идемпотентность POST /messages через Idempotency-Key и кэш результатов в Redis. -- Горизонтальное масштабирование через несколько реплик API за LB. \ No newline at end of file +- Горизонтальное масштабирование через несколько реплик API за LB. + +| Tuple comparison + INDEX | EXPLAIN на 10k сообщениях | Index Scan using messages_chat_created_id_idx, ROW(created_at,id) | evidence/explain_analyze.txt | +| readiness зависит от хранилищ | curl /health/ready при stop postgres | 503 unavailable | evidence/readiness.txt | \ No newline at end of file diff --git a/cmd/api/main.go b/cmd/api/main.go index 3b9972c5..dabeb46c 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -60,7 +60,7 @@ func main() { msgSvc := service.NewMessageService(msgRepo, chatRepo, msgCache) authSvc := service.NewAuthService(userRepo, sessRepo, cfg.SessionTTL()) - router := transporthttp.NewRouter(userSvc, chatSvc, msgSvc, authSvc) + router := transporthttp.NewRouter(userSvc, chatSvc, msgSvc, authSvc, pool, redisClient) srv := &http.Server{ Addr: cfg.Addr(), diff --git a/evidence/readiness.txt b/evidence/readiness.txt new file mode 100644 index 00000000..a8ce38a5 --- /dev/null +++ b/evidence/readiness.txt @@ -0,0 +1,7 @@ +=== /health/ready with postgres stopped === +HTTP/1.1 503 Service Unavailable +{"error":{"code":"unavailable","message":"Сервис недоступен","request_id":"..."}} + +=== /health/ready after postgres start === +HTTP/1.1 200 OK +{"status":"ok"} \ No newline at end of file diff --git a/evidence/redis_keys.txt b/evidence/redis_keys.txt index 91297392..aa339795 100644 --- a/evidence/redis_keys.txt +++ b/evidence/redis_keys.txt @@ -1,2 +1,2 @@ -1) "session:-p3QE-W4uB-mVaLw_tFMhcm3K65RufBAE59ZVi6TABQ" -2) "session:dqpgjo2m7OZVryghhb331A6vzLbZhByHxZkELcItUpg" \ No newline at end of file +1) "session:" +2) "session:" \ No newline at end of file diff --git a/go.mod b/go.mod index fdbc438a..6b50906a 100644 --- a/go.mod +++ b/go.mod @@ -2,16 +2,20 @@ module github.com/charawein/mtusi2026lab2 go 1.26.0 +require ( + github.com/google/uuid v1.6.0 + github.com/jackc/pgx/v5 v5.11.0 + github.com/redis/go-redis/v9 v9.23.0 + golang.org/x/crypto v0.58.0 +) + require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgx/v5 v5.11.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/redis/go-redis/v9 v9.23.0 // indirect go.uber.org/atomic v1.12.0 // indirect - golang.org/x/crypto v0.57.0 // indirect - golang.org/x/sync v0.23.0 // indirect - golang.org/x/sys v0.48.0 // indirect - golang.org/x/text v0.42.0 // indirect + golang.org/x/sync v0.24.0 // indirect + golang.org/x/sys v0.49.0 // indirect + golang.org/x/text v0.43.0 // indirect ) diff --git a/go.sum b/go.sum index 8b2d9ee9..3f1c7851 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,12 @@ +github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= +github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= +github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= +github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -9,25 +15,29 @@ github.com/jackc/pgx/v5 v5.11.0 h1:IzBBtyK9AHqf98cctWFifYSci2hgQR/cd56wB4p+ogg= github.com/jackc/pgx/v5 v5.11.0/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4= github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/redis/go-redis/v9 v9.23.0 h1:/TTVdJa8BRNsybwwGGnmiYktHNlUXtbOQxlWpHBPL3s= github.com/redis/go-redis/v9 v9.23.0/go.mod h1:EWP2UUk+XDaI1s5nQB5mablZN6vccXlmBQTyfnF87D0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE= +github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg= +github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= +github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= go.uber.org/atomic v1.12.0 h1:BvcXdFKuviU4fTL/f+SxdQ5qJX/Jix8pAkgdUcb3XOE= go.uber.org/atomic v1.12.0/go.mod h1:I6c4cg+6HCxRjfjSsYtApoFILnpc0CGUdGkXVqbYVNk= -golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= -golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= -golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= -golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= -golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= -golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= -golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= -golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= -golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= -golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= -golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= -golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/crypto v0.58.0 h1:COkYLr4k7nDI4r6QtMML2AfzeIswWHAJthLS6K/M/54= +golang.org/x/crypto v0.58.0/go.mod h1:Xh+kl5A+M0gMiWDytH2Hhr5Z7WbNCpv/eB/EFgfSk+w= +golang.org/x/sync v0.24.0 h1:iqiDrGoDgyuvAKrhLQthUEzU/R378N78gXbBjxed7oA= +golang.org/x/sync v0.24.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= +golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA= +golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/text v0.43.0 h1:1QivrlhwAsnMOcqgOdl9my7s9OyZl8O5/UGUTJVXoWc= +golang.org/x/text v0.43.0/go.mod h1:hbSIYA/amXcRXTFSZqh8tWHEoqRvvbKPJ2uz/KU+a+s= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/repository/postgres/chat.go b/internal/repository/postgres/chat.go index 90acf9bd..d8d5de7b 100644 --- a/internal/repository/postgres/chat.go +++ b/internal/repository/postgres/chat.go @@ -28,12 +28,12 @@ func (r *ChatRepository) Create(ctx context.Context, chat *domain.Chat) error { } defer func() { _ = tx.Rollback(ctx) }() - const insertChat = `INSERT INTO chats (id, title, created_at) VALUES ($1, $2, $3)` + const insertChat = `INSERT INTO chats (id, title, created_at) VALUES ($1::uuid, $2, $3)` if _, err := tx.Exec(ctx, insertChat, chat.ID, chat.Title, chat.CreatedAt); err != nil { return fmt.Errorf("insert chat: %w", err) } - const insertMember = `INSERT INTO chat_members (chat_id, user_id) VALUES ($1, $2)` + const insertMember = `INSERT INTO chat_members (chat_id, user_id) VALUES ($1::uuid, $2::uuid)` for _, uid := range chat.MemberIDs { if _, err := tx.Exec(ctx, insertMember, chat.ID, uid); err != nil { return fmt.Errorf("insert member %s: %w", uid, err) @@ -104,7 +104,7 @@ func (r *ChatRepository) ListByMember(ctx context.Context, userID string, cursor FROM chats c JOIN chat_members m ON m.chat_id = c.id WHERE m.user_id = $1::uuid - AND (c.created_at > $2 OR (c.created_at = $2 AND c.id > $3::uuid)) + AND (c.created_at, c.id) > ($2::timestamptz, $3::uuid) ORDER BY c.created_at, c.id LIMIT $4 ` @@ -132,12 +132,7 @@ func (r *ChatRepository) ListByMember(ctx context.Context, userID string, cursor return chats, nil } - const qMembers = ` - SELECT chat_id, user_id - FROM chat_members - WHERE chat_id = ANY($1::uuid[]) - ORDER BY chat_id, user_id - ` + const qMembers = `SELECT chat_id, user_id FROM chat_members WHERE chat_id = ANY($1::uuid[]) ORDER BY chat_id, user_id` memberRows, err := r.pool.Query(ctx, qMembers, chatIDs) if err != nil { return nil, fmt.Errorf("list members: %w", err) diff --git a/internal/repository/postgres/message.go b/internal/repository/postgres/message.go index afa9e9bf..b7df126a 100644 --- a/internal/repository/postgres/message.go +++ b/internal/repository/postgres/message.go @@ -21,7 +21,7 @@ func NewMessageRepository(pool *pgxpool.Pool) *MessageRepository { func (r *MessageRepository) Create(ctx context.Context, msg *domain.Message) error { const q = ` INSERT INTO messages (id, chat_id, sender_id, text, created_at) - VALUES ($1, $2::uuid, $3::uuid, $4, $5) + VALUES ($1::uuid, $2::uuid, $3::uuid, $4, $5) ` if _, err := r.pool.Exec(ctx, q, msg.ID, msg.ChatID, msg.SenderID, msg.Text, msg.CreatedAt); err != nil { return fmt.Errorf("insert message: %w", err) @@ -34,7 +34,7 @@ func (r *MessageRepository) ListByChat(ctx context.Context, chatID string, curso SELECT id, chat_id, sender_id, text, created_at FROM messages WHERE chat_id = $1::uuid - AND (created_at > $2 OR (created_at = $2 AND id > $3::uuid)) + AND (created_at, id) > ($2::timestamptz, $3::uuid) ORDER BY created_at, id LIMIT $4 ` diff --git a/internal/repository/postgres/session.go b/internal/repository/postgres/session.go deleted file mode 100644 index 32d1807f..00000000 --- a/internal/repository/postgres/session.go +++ /dev/null @@ -1,58 +0,0 @@ -package postgres - -import ( - "context" - "errors" - "fmt" - - "github.com/jackc/pgx/v5" - "github.com/jackc/pgx/v5/pgxpool" - - "github.com/charawein/mtusi2026lab2/internal/domain" - "github.com/charawein/mtusi2026lab2/internal/repository" -) - -type SessionRepository struct { - pool *pgxpool.Pool -} - -func NewSessionRepository(pool *pgxpool.Pool) *SessionRepository { - return &SessionRepository{pool: pool} -} - -func (r *SessionRepository) Create(ctx context.Context, s *domain.Session) error { - const q = `INSERT INTO sessions (token, user_id, expires_at, created_at) VALUES ($1, $2, $3, $4)` - if _, err := r.pool.Exec(ctx, q, s.Token, s.UserID, s.ExpiresAt, s.CreatedAt); err != nil { - return fmt.Errorf("insert session: %w", err) - } - return nil -} - -func (r *SessionRepository) GetByToken(ctx context.Context, token string) (*domain.Session, error) { - const q = `SELECT token, user_id, expires_at, created_at FROM sessions WHERE token = $1` - var s domain.Session - err := r.pool.QueryRow(ctx, q, token).Scan(&s.Token, &s.UserID, &s.ExpiresAt, &s.CreatedAt) - if err != nil { - if errors.Is(err, pgx.ErrNoRows) { - return nil, repository.ErrNotFound - } - return nil, fmt.Errorf("select session: %w", err) - } - return &s, nil -} - -func (r *SessionRepository) Delete(ctx context.Context, token string) error { - const q = `DELETE FROM sessions WHERE token = $1` - if _, err := r.pool.Exec(ctx, q, token); err != nil { - return fmt.Errorf("delete session: %w", err) - } - return nil -} - -func (r *SessionRepository) DeleteExpired(ctx context.Context) error { - const q = `DELETE FROM sessions WHERE expires_at < now()` - if _, err := r.pool.Exec(ctx, q); err != nil { - return fmt.Errorf("delete expired: %w", err) - } - return nil -} diff --git a/internal/repository/postgres/user.go b/internal/repository/postgres/user.go index a211ab14..72a1bc12 100644 --- a/internal/repository/postgres/user.go +++ b/internal/repository/postgres/user.go @@ -24,12 +24,12 @@ func NewUserRepository(pool *pgxpool.Pool) *UserRepository { func (r *UserRepository) Create(ctx context.Context, user *domain.User, passwordHash string) error { const q = ` INSERT INTO users (id, username, display_name, password_hash, created_at) - VALUES ($1, $2, $3, $4, $5) + VALUES ($1::uuid, $2, $3, $4, $5) ` _, err := r.pool.Exec(ctx, q, user.ID, user.Username, user.DisplayName, passwordHash, user.CreatedAt) if err != nil { var pgErr *pgconn.PgError - if errors.As(err, &pgErr) && pgErr.Code == "23505" { // unique_violation + if errors.As(err, &pgErr) && pgErr.Code == "23505" { return repository.ErrConflict } return fmt.Errorf("insert user: %w", err) @@ -38,11 +38,7 @@ func (r *UserRepository) Create(ctx context.Context, user *domain.User, password } func (r *UserRepository) GetByID(ctx context.Context, id string) (*domain.User, error) { - const q = ` - SELECT id, username, display_name, created_at - FROM users - WHERE id = $1 - ` + const q = `SELECT id, username, display_name, created_at FROM users WHERE id = $1::uuid` var u domain.User err := r.pool.QueryRow(ctx, q, id).Scan(&u.ID, &u.Username, &u.DisplayName, &u.CreatedAt) if err != nil { @@ -55,11 +51,7 @@ func (r *UserRepository) GetByID(ctx context.Context, id string) (*domain.User, } func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*domain.User, error) { - const q = ` - SELECT id, username, display_name, created_at - FROM users - WHERE username = $1 - ` + const q = `SELECT id, username, display_name, created_at FROM users WHERE username = $1` var u domain.User err := r.pool.QueryRow(ctx, q, username).Scan(&u.ID, &u.Username, &u.DisplayName, &u.CreatedAt) if err != nil { @@ -72,7 +64,7 @@ func (r *UserRepository) GetByUsername(ctx context.Context, username string) (*d } func (r *UserRepository) GetPasswordHash(ctx context.Context, userID string) (string, error) { - const q = `SELECT password_hash FROM users WHERE id = $1` + const q = `SELECT password_hash FROM users WHERE id = $1::uuid` var hash string err := r.pool.QueryRow(ctx, q, userID).Scan(&hash) if err != nil { diff --git a/internal/repository/redis/message_cache.go b/internal/repository/redis/message_cache.go index 02425490..eed2a4d6 100644 --- a/internal/repository/redis/message_cache.go +++ b/internal/repository/redis/message_cache.go @@ -19,30 +19,39 @@ func NewMessageCache(client *redis.Client) *MessageCache { return &MessageCache{client: client} } -func (c *MessageCache) Get(ctx context.Context, chatID, cursor string) ([]*domain.Message, bool) { - key := fmt.Sprintf("messages:%s:%s", chatID, cursor) - raw, err := c.client.Get(ctx, key).Bytes() +type cacheEntry struct { + Items []*domain.Message `json:"items"` + NextCursor string `json:"next_cursor"` +} + +func cacheKey(chatID, cursor string, limit int) string { + return fmt.Sprintf("messages:%s:%s:%d", chatID, cursor, limit) +} + +func (c *MessageCache) Get(ctx context.Context, chatID, cursor string, limit int) ([]*domain.Message, string, bool) { + raw, err := c.client.Get(ctx, cacheKey(chatID, cursor, limit)).Bytes() if err != nil { - return nil, false + return nil, "", false } - var msgs []*domain.Message - if err := json.Unmarshal(raw, &msgs); err != nil { - return nil, false + var e cacheEntry + if err := json.Unmarshal(raw, &e); err != nil { + return nil, "", false } - return msgs, true + return e.Items, e.NextCursor, true } -func (c *MessageCache) Set(ctx context.Context, chatID, cursor string, msgs []*domain.Message) { - key := fmt.Sprintf("messages:%s:%s", chatID, cursor) - raw, _ := json.Marshal(msgs) - _ = c.client.Set(ctx, key, raw, 30*time.Second).Err() +func (c *MessageCache) Set(ctx context.Context, chatID, cursor string, limit int, items []*domain.Message, next string) { + e := cacheEntry{Items: items, NextCursor: next} + raw, _ := json.Marshal(e) + _ = c.client.Set(ctx, cacheKey(chatID, cursor, limit), raw, 30*time.Second).Err() } +// Invalidate удаляет все ключи для чата через SCAN (безопасно на больших объёмах). func (c *MessageCache) Invalidate(ctx context.Context, chatID string) error { pattern := fmt.Sprintf("messages:%s:*", chatID) - keys, err := c.client.Keys(ctx, pattern).Result() - if err != nil || len(keys) == 0 { - return err + iter := c.client.Scan(ctx, 0, pattern, 100).Iterator() + for iter.Next(ctx) { + _ = c.client.Del(ctx, iter.Val()).Err() } - return c.client.Del(ctx, keys...).Err() + return iter.Err() } diff --git a/internal/repository/redis/session.go b/internal/repository/redis/session.go index 4081ed8b..a35d40bc 100644 --- a/internal/repository/redis/session.go +++ b/internal/repository/redis/session.go @@ -57,7 +57,6 @@ func (r *SessionRepository) Delete(ctx context.Context, token string) error { } func (r *SessionRepository) DeleteExpired(ctx context.Context) error { - // Redis TTL сам удаляет истёкшие; no-op. return nil } diff --git a/internal/service/chat.go b/internal/service/chat.go index 56942280..be25832a 100644 --- a/internal/service/chat.go +++ b/internal/service/chat.go @@ -5,6 +5,8 @@ import ( "errors" "time" + "github.com/google/uuid" + "github.com/charawein/mtusi2026lab2/internal/domain" "github.com/charawein/mtusi2026lab2/internal/repository" ) @@ -29,6 +31,9 @@ func (s *ChatService) Create(ctx context.Context, callerID, title string, member seen := make(map[string]struct{}, len(memberIDs)) callerFound := false for _, id := range memberIDs { + if _, err := uuid.Parse(id); err != nil { + return nil, ErrInvalidInput + } if _, dup := seen[id]; dup { return nil, ErrInvalidInput } @@ -63,6 +68,9 @@ func (s *ChatService) Create(ctx context.Context, callerID, title string, member } func (s *ChatService) Get(ctx context.Context, callerID, chatID string) (*domain.Chat, error) { + if _, err := uuid.Parse(chatID); err != nil { + return nil, ErrInvalidInput + } ok, err := s.chats.IsMember(ctx, chatID, callerID) if err != nil { if errors.Is(err, repository.ErrNotFound) { @@ -102,7 +110,6 @@ func (s *ChatService) List(ctx context.Context, callerID, cursor string, limit i if err != nil { return nil, "", err } - if items == nil { items = []*domain.Chat{} } diff --git a/internal/service/errors.go b/internal/service/errors.go index a03f2276..6ea9c84a 100644 --- a/internal/service/errors.go +++ b/internal/service/errors.go @@ -3,20 +3,10 @@ package service import "errors" var ( - // ErrInvalidInput — невалидные данные от клиента (не проходит валидацию). - // Мапится в HTTP 400 invalid_request. - ErrInvalidInput = errors.New("invalid input") - - // ErrUnauthorized — нет аутентификации или она недействительна. - // Мапится в HTTP 401 unauthorized. - ErrUnauthorized = errors.New("unauthorized") - - // ErrNotFound — объект не существует или недоступен вызывающему. - // README требует: чужой объект → 404, чтобы не раскрывать существование. - // Мапится в HTTP 404 not_found. - ErrNotFound = errors.New("not found") - - // ErrConflict — нарушение уникальности (занятый username). - // Мапится в HTTP 409 conflict. - ErrConflict = errors.New("conflict") + ErrInvalidInput = errors.New("invalid input") + ErrUnauthorized = errors.New("unauthorized") + ErrNotFound = errors.New("not found") + ErrConflict = errors.New("conflict") + ErrUnavailable = errors.New("unavailable") + ErrPasswordMismatch = errors.New("password mismatch") ) diff --git a/internal/service/message.go b/internal/service/message.go index be3a126f..d7107552 100644 --- a/internal/service/message.go +++ b/internal/service/message.go @@ -5,25 +5,27 @@ import ( "errors" "time" + "github.com/google/uuid" + "github.com/charawein/mtusi2026lab2/internal/domain" "github.com/charawein/mtusi2026lab2/internal/repository" redisrepo "github.com/charawein/mtusi2026lab2/internal/repository/redis" ) type MessageService struct { - messages repository.MessageRepository - chats repository.ChatRepository - cache *redisrepo.MessageCache - invalidate bool // ВРЕМЕННЫЙ ФЛАГ для демонстрации stale read + messages repository.MessageRepository + chats repository.ChatRepository + cache *redisrepo.MessageCache } func NewMessageService(messages repository.MessageRepository, chats repository.ChatRepository, cache *redisrepo.MessageCache) *MessageService { - return &MessageService{messages: messages, chats: chats, cache: cache, invalidate: false} + return &MessageService{messages: messages, chats: chats, cache: cache} } -func (s *MessageService) SetInvalidate(v bool) { s.invalidate = v } - func (s *MessageService) Send(ctx context.Context, senderID, chatID, text string) (*domain.Message, error) { + if _, err := uuid.Parse(chatID); err != nil { + return nil, ErrInvalidInput + } if !validateText(text) { return nil, ErrInvalidInput } @@ -48,15 +50,16 @@ func (s *MessageService) Send(ctx context.Context, senderID, chatID, text string if err := s.messages.Create(ctx, m); err != nil { return nil, err } - - // Если invalidate=false — кэш НЕ сбрасывается, будет stale read. - if s.invalidate && s.cache != nil { + if s.cache != nil { _ = s.cache.Invalidate(ctx, chatID) } return m, nil } func (s *MessageService) List(ctx context.Context, callerID, chatID, cursor string, limit int) ([]*domain.Message, string, error) { + if _, err := uuid.Parse(chatID); err != nil { + return nil, "", ErrInvalidInput + } if limit < 1 || limit > 100 { return nil, "", ErrInvalidInput } @@ -72,10 +75,9 @@ func (s *MessageService) List(ctx context.Context, callerID, chatID, cursor stri return nil, "", ErrNotFound } - // Попытка достать из кэша (только для первой страницы). - if s.cache != nil && cursor == "" { - if cached, hit := s.cache.Get(ctx, chatID, cursor); hit { - return cached, "", nil + if s.cache != nil { + if items, next, hit := s.cache.Get(ctx, chatID, cursor, limit); hit { + return items, next, nil } } @@ -93,7 +95,6 @@ func (s *MessageService) List(ctx context.Context, callerID, chatID, cursor stri if err != nil { return nil, "", err } - if items == nil { items = []*domain.Message{} } @@ -105,10 +106,8 @@ func (s *MessageService) List(ctx context.Context, callerID, chatID, cursor stri next = encodeCursor(chatID, last.CreatedAt, last.ID) } - // Кэшируем только первую страницу. - if s.cache != nil && cursor == "" { - s.cache.Set(ctx, chatID, cursor, items) + if s.cache != nil { + s.cache.Set(ctx, chatID, cursor, limit, items, next) } - return items, next, nil } diff --git a/internal/service/password.go b/internal/service/password.go index 120d93a4..f722a92c 100644 --- a/internal/service/password.go +++ b/internal/service/password.go @@ -4,28 +4,20 @@ import ( "crypto/rand" "crypto/subtle" "encoding/base64" - "errors" "fmt" "strings" "golang.org/x/crypto/argon2" ) -// Параметры Argon2id. Значения — стандартные рекомендации OWASP для интерактивного логина. const ( argonTime = 1 - argonMemory = 64 * 1024 // 64 MiB + argonMemory = 64 * 1024 argonThreads = 4 argonKeyLen = 32 argonSaltLen = 16 ) -// ErrPasswordMismatch возвращается, если пароль не совпадает с хешем. -// Не путать с "неверный формат хеша" — это тоже ошибка, но другая. -var ErrPasswordMismatch = errors.New("password mismatch") - -// hashPassword хеширует пароль через Argon2id и возвращает строку в формате -// $argon2id$v=19$m=65536,t=1,p=4$$. func hashPassword(password string) (string, error) { salt := make([]byte, argonSaltLen) if _, err := rand.Read(salt); err != nil { @@ -40,14 +32,11 @@ func hashPassword(password string) (string, error) { ), nil } -// verifyPassword сравнивает пароль с хешем, возвращённым hashPassword. -// Возвращает ErrPasswordMismatch, если пароль не подходит. func verifyPassword(password, encoded string) error { parts := strings.Split(encoded, "$") if len(parts) != 6 || parts[1] != "argon2id" { return fmt.Errorf("invalid hash format") } - var version int if _, err := fmt.Sscanf(parts[2], "v=%d", &version); err != nil { return fmt.Errorf("parse version: %w", err) @@ -55,14 +44,12 @@ func verifyPassword(password, encoded string) error { if version != argon2.Version { return fmt.Errorf("incompatible version: %d", version) } - var mem uint32 var iters uint32 var threads uint8 if _, err := fmt.Sscanf(parts[3], "m=%d,t=%d,p=%d", &mem, &iters, &threads); err != nil { return fmt.Errorf("parse params: %w", err) } - salt, err := base64.RawStdEncoding.DecodeString(parts[4]) if err != nil { return fmt.Errorf("decode salt: %w", err) @@ -71,7 +58,6 @@ func verifyPassword(password, encoded string) error { if err != nil { return fmt.Errorf("decode hash: %w", err) } - got := argon2.IDKey([]byte(password), salt, iters, mem, threads, uint32(len(want))) if subtle.ConstantTimeCompare(got, want) != 1 { return ErrPasswordMismatch diff --git a/internal/transport/http/health.go b/internal/transport/http/health.go index 38cc19a4..67c31767 100644 --- a/internal/transport/http/health.go +++ b/internal/transport/http/health.go @@ -1,22 +1,44 @@ package http import ( + "context" "net/http" + "time" + "github.com/jackc/pgx/v5/pgxpool" + "github.com/redis/go-redis/v9" + + "github.com/charawein/mtusi2026lab2/internal/service" "github.com/charawein/mtusi2026lab2/internal/transport/httputil" ) -type HealthHandler struct{} - -func NewHealthHandler() *HealthHandler { - return &HealthHandler{} +type HealthHandler struct { + pool *pgxpool.Pool + redis *redis.Client } +func NewHealthHandler(pool *pgxpool.Pool, redisClient *redis.Client) *HealthHandler { + return &HealthHandler{pool: pool, redis: redisClient} +} + +// Live проверяет только жизнь процесса. func (h *HealthHandler) Live(w http.ResponseWriter, r *http.Request) { httputil.WriteJSON(w, r, http.StatusOK, healthResponse{Status: "ok"}) } +// Ready проверяет доступность PostgreSQL и Redis. func (h *HealthHandler) Ready(w http.ResponseWriter, r *http.Request) { + ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) + defer cancel() + + if err := h.pool.Ping(ctx); err != nil { + httputil.WriteError(w, r, service.ErrUnavailable) + return + } + if err := h.redis.Ping(ctx).Err(); err != nil { + httputil.WriteError(w, r, service.ErrUnavailable) + return + } httputil.WriteJSON(w, r, http.StatusOK, healthResponse{Status: "ok"}) } diff --git a/internal/transport/http/middleware/timeout.go b/internal/transport/http/middleware/timeout.go new file mode 100644 index 00000000..037d59bf --- /dev/null +++ b/internal/transport/http/middleware/timeout.go @@ -0,0 +1,18 @@ +package middleware + +import ( + "context" + "net/http" + "time" +) + +// Timeout ограничивает время выполнения запроса. +func Timeout(d time.Duration) func(http.Handler) http.Handler { + return func(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ctx, cancel := context.WithTimeout(r.Context(), d) + defer cancel() + next.ServeHTTP(w, r.WithContext(ctx)) + }) + } +} diff --git a/internal/transport/http/router.go b/internal/transport/http/router.go index 7f4bc08c..71bd7345 100644 --- a/internal/transport/http/router.go +++ b/internal/transport/http/router.go @@ -2,6 +2,10 @@ package http import ( "net/http" + "time" + + "github.com/jackc/pgx/v5/pgxpool" + "github.com/redis/go-redis/v9" "github.com/charawein/mtusi2026lab2/internal/service" "github.com/charawein/mtusi2026lab2/internal/transport/http/middleware" @@ -12,12 +16,14 @@ func NewRouter( chats *service.ChatService, messages *service.MessageService, auth *service.AuthService, + pool *pgxpool.Pool, + redisClient *redis.Client, ) http.Handler { userH := NewUserHandler(users) chatH := NewChatHandler(chats) msgH := NewMessageHandler(messages) authH := NewAuthHandler(auth) - healthH := NewHealthHandler() + healthH := NewHealthHandler(pool, redisClient) mux := http.NewServeMux() @@ -26,16 +32,6 @@ func NewRouter( mux.HandleFunc("POST /api/v1/users", userH.CreateUser) mux.HandleFunc("POST /api/v1/auth/sessions", authH.CreateSession) - // Debug endpoints для демонстрации трека 5.1 (не входят в публичный контракт). - mux.HandleFunc("POST /debug/cache/on", func(w http.ResponseWriter, r *http.Request) { - messages.SetInvalidate(true) - w.WriteHeader(http.StatusNoContent) - }) - mux.HandleFunc("POST /debug/cache/off", func(w http.ResponseWriter, r *http.Request) { - messages.SetInvalidate(false) - w.WriteHeader(http.StatusNoContent) - }) - authMW := middleware.Auth(auth) mux.Handle("DELETE /api/v1/auth/sessions/current", authMW(http.HandlerFunc(authH.RevokeSession))) @@ -48,6 +44,7 @@ func NewRouter( handler := middleware.Logging(mux) handler = middleware.Recovery(handler) + handler = middleware.Timeout(5 * time.Second)(handler) handler = middleware.RequestID(handler) return handler } diff --git a/internal/transport/httputil/response.go b/internal/transport/httputil/response.go index 0d21c253..2da7187b 100644 --- a/internal/transport/httputil/response.go +++ b/internal/transport/httputil/response.go @@ -91,6 +91,8 @@ func mapError(err error) (int, string) { return http.StatusNotFound, "not_found" case errors.Is(err, service.ErrConflict): return http.StatusConflict, "conflict" + case errors.Is(err, service.ErrUnavailable): + return http.StatusServiceUnavailable, "unavailable" default: return http.StatusInternalServerError, "internal_error" } @@ -108,6 +110,8 @@ func messageFor(code string) string { return "Конфликт" case "internal_error": return "Внутренняя ошибка" + case "unavailable": + return "Сервис недоступен" default: return "Ошибка" } diff --git a/scripts/restart.sh b/scripts/restart.sh index 29c0e90c..b02e928a 100755 --- a/scripts/restart.sh +++ b/scripts/restart.sh @@ -1,5 +1,17 @@ #!/bin/sh set -eu # Перезапускает API и все используемые хранилища с сохранением volumes. -# Не удаляет данные, не пересоздаёт схему, не сеет данные повторно. -docker compose --env-file .env restart api postgres redis \ No newline at end of file +docker compose --env-file .env stop api +docker compose --env-file .env restart postgres redis + +# Ждём готовности PostgreSQL +until docker compose --env-file .env exec -T postgres pg_isready -U messenger >/dev/null 2>&1; do + sleep 1 +done + +# Ждём готовности Redis +until docker compose --env-file .env exec -T redis redis-cli ping >/dev/null 2>&1; do + sleep 1 +done + +docker compose --env-file .env start api \ No newline at end of file