v0.0.18.4
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
madipo2611 2025-08-17 22:54:27 +03:00
parent ced1697f39
commit 65a84c6938
4 changed files with 2 additions and 19 deletions

View File

@ -3,7 +3,6 @@ package main
import (
"context"
"google.golang.org/grpc"
"google.golang.org/grpc/keepalive"
"log"
"os"
"os/signal"
@ -32,17 +31,8 @@ func main() {
}
defer db.Close()
grpcConn, err := grpc.Dial(
cfg.GRPC.MessageServiceAddress,
grpc.WithInsecure(),
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 30 * time.Second, // Отправлять keepalive-пакеты каждые 30 сек
Timeout: 10 * time.Second, // Ждать ответа 10 сек
PermitWithoutStream: true, // Отправлять keepalive даже без активных стримов
}),
grpc.WithDefaultCallOptions(
grpc.MaxCallRecvMsgSize(10*1024*1024), // Увеличить лимит размера сообщения (опционально)
))
// Подключение к gRPC серверу сообщений
grpcConn, err := grpc.Dial(cfg.GRPC.MessageServiceAddress, grpc.WithInsecure())
if err != nil {
log.Fatalf("failed to connect to messages gRPC service: %v", err)
}

View File

@ -3,7 +3,6 @@ package graph
import (
"context"
"fmt"
"log"
"tailly_back_v2/internal/domain"
"tailly_back_v2/proto"
"time"
@ -129,18 +128,15 @@ func (r *subscriptionResolver) MessageStream(ctx context.Context, userID int) (<
stream, err := r.MessageClient.StreamMessages(ctx, &proto.StreamMessagesRequest{
UserId: int32(userID),
})
log.Printf("stream messages: %v", stream)
if err != nil {
return nil, fmt.Errorf("failed to stream messages: %w", err)
}
messageChan := make(chan *domain.Message)
log.Printf("messageChan: %d", messageChan)
go func() {
defer close(messageChan)
for {
msg, err := stream.Recv()
log.Printf("recv message: %v", msg)
if err != nil {
return
}

View File

@ -2,7 +2,6 @@ package middleware
import (
"context"
"log"
"net/http"
"tailly_back_v2/pkg/auth"
)
@ -15,7 +14,6 @@ func WSAuthMiddleware(tokenAuth *auth.TokenAuth) func(http.Handler) http.Handler
if r.Header.Get("Upgrade") == "websocket" {
// Извлекаем токен из query параметров или заголовков
token := extractTokenFromRequest(r)
log.Printf("token ws: %s", token)
if token != "" {
userID, err := tokenAuth.ValidateAccessToken(token)

View File

@ -76,7 +76,6 @@ func (s *Server) configureRouter() {
Upgrader: websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
origin := r.Header.Get("Origin")
log.Printf("origin: %s", origin)
for _, allowed := range allowedOrigins {
if origin == allowed {
return true