feat: Исправлена ошибка с отправкой файлов но без добавления на бд

RahatMelsov · RahatMelsov · commit 2814b04b1c1d · 2025-09-10T13:07:03.000+05:00
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ db/migrations/*.sql-journal
 /.vscode/
 .DS_Store
 /var/
+opt/
diff --git a/Makefile b/Makefile
@@ -2,6 +2,11 @@
 APP := tui
 PKG := ./cmd/tui
 DIST := dist
+SERVER_PKG ?= ./cmd/server
+GRPC_ADDR ?= 127.0.0.1:8080
+DB_DSN ?= mem://
+
+
 
 .PHONY: build run clean linux mac windows
 
@@ -29,3 +34,15 @@ windows:
 	mkdir -p $(DIST)
 	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o $(DIST)/$(APP)_windows_amd64.exe $(PKG)
 
+help:
+	@echo "make run  - run server via 'go run'"
+	@echo "make build  -build server binary into ./bin/server"
+	@echo "env overrides: GRPC_ADDR (default: $(GRPC_ADDR)), DB_DSN (default: $(DB_DSN))"
+	@echo "example: make run GRPC_ADDR=:9090 DB_DSN='postgres://...@localhost:5432/vault?sslmode=disable"
+buildServer:
+	@mkdir -p bin
+	@echo "===> go build ./cmd/server -> ./bin/server"
+	@go build -o bin/server $(SERVER_PKG)
+
+tidy:
+	@go mod tidy
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -2,17 +2,19 @@ package main
 
 import (
 	"database/sql"
-	"google.golang.org/grpc/reflection"
 	"log"
 	"net"
 	"time"
 
+	"google.golang.org/grpc/reflection"
+
 	commonv1 "github.com/rtmelsov/adv-keeper/gen/go/proto/common/v1"
 	filev1 "github.com/rtmelsov/adv-keeper/gen/go/proto/file/v1"
+	"github.com/rtmelsov/adv-keeper/internal/authserver"
 	db "github.com/rtmelsov/adv-keeper/internal/db"
+	"github.com/rtmelsov/adv-keeper/internal/fileserver"
 	"github.com/rtmelsov/adv-keeper/internal/helpers"
 	"github.com/rtmelsov/adv-keeper/internal/middleware"
-	"github.com/rtmelsov/adv-keeper/internal/server"
 	"google.golang.org/grpc/keepalive"
 
 	_ "github.com/jackc/pgx/v5/stdlib"
@@ -48,8 +50,8 @@ func main() {
 			Timeout:               20 * time.Second,
 		}),
 	)
-	commonv1.RegisterAuthServiceServer(s, server.New(q))
-	filev1.RegisterFileServiceServer(s, server.NewFile(q))
+	commonv1.RegisterAuthServiceServer(s, authserver.New(q))
+	filev1.RegisterFileServiceServer(s, fileserver.New(q))
 
 	reflection.Register(s)
 
diff --git a/cmd/tui/main.go b/cmd/tui/main.go
@@ -43,9 +43,4 @@ func main() {
 		idxs = append(idxs, i)
 	}
 	sort.Ints(idxs)
-
-	fmt.Println("Вы выбрали:")
-	for _, i := range idxs {
-		fmt.Printf(" • %s\n", m.Choices[i])
-	}
 }
diff --git a/go.mod b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/charmbracelet/bubbles v0.21.0
 	github.com/charmbracelet/bubbletea v1.3.6
 	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/charmbracelet/log v0.4.2
 	github.com/golang-jwt/jwt/v5 v5.3.0
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.5
@@ -25,6 +26,7 @@ require (
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
@@ -36,7 +38,6 @@ require (
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
 	golang.org/x/net v0.42.0 // indirect
diff --git a/go.sum b/go.sum
@@ -14,6 +14,8 @@ github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4p
 github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig=
+github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw=
 github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
 github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
 github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
@@ -29,6 +31,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
+github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
diff --git a/internal/akclient/upload_file.go b/internal/akclient/upload_file.go
@@ -98,7 +98,10 @@ func UploadFile(path string) (*filev1.UploadResponse, error) {
 			}
 			offset += int64(n)
 		}
-		if readErr != nil && readErr != io.EOF {
+		if readErr == io.EOF {
+			break // <— обязательно выходим!
+		}
+		if readErr != nil {
 			return nil, fmt.Errorf("read file: %w", readErr)
 		}
 	}
diff --git a/internal/authserver/login.go b/internal/authserver/login.go
@@ -1,5 +1,5 @@
-// Package server
-package server
+// Package authserver
+package authserver
 
 import (
 	"context"
diff --git a/internal/authserver/logout.go b/internal/authserver/logout.go
@@ -1,5 +1,5 @@
 // Package server
-package server
+package authserver
 
 import (
 	"context"
diff --git a/internal/authserver/register.go b/internal/authserver/register.go
@@ -1,5 +1,4 @@
-// Package server
-package server
+package authserver
 
 import (
 	"context"
diff --git a/internal/fileserver/get_files.go b/internal/fileserver/get_files.go
@@ -1,7 +1,10 @@
-package server
+package fileserver
 
 import (
 	"context"
+
+	"github.com/rtmelsov/adv-keeper/internal/db"
+	"github.com/rtmelsov/adv-keeper/internal/helpers"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
@@ -11,7 +14,18 @@ import (
 	filev1 "github.com/rtmelsov/adv-keeper/gen/go/proto/file/v1"
 )
 
-func (s *FileServer) GetFiles(ctx context.Context, GetFileRequest *filev1.GetFilesRequest) (*filev1.GetFilesResponse, error) {
+type Service struct {
+	filev1.UnimplementedFileServiceServer
+	Q         *db.Queries
+	UploadDir string
+}
+
+func New(q *db.Queries) *Service {
+	conf, _ := helpers.LoadConfig()
+	return &Service{Q: q, UploadDir: conf.FilesDir}
+}
+
+func (s *Service) GetFiles(ctx context.Context, GetFileRequest *filev1.GetFilesRequest) (*filev1.GetFilesResponse, error) {
 	// 1) найти пользователя по email
 	userIDRaw := ctx.Value("UserID")
 	userIDStr, ok := userIDRaw.(string)
diff --git a/internal/fileserver/upload_file.go b/internal/fileserver/upload_file.go
@@ -1,34 +1,22 @@
-// Package file
-package server
+// Package fileserver
+package fileserver
 
 import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
 	"io"
-	"log"
 	"os"
 	"path/filepath"
 	"time"
 
-	db "github.com/rtmelsov/adv-keeper/internal/db"
-	"github.com/rtmelsov/adv-keeper/internal/helpers"
+	"github.com/charmbracelet/log"
 
 	filev1 "github.com/rtmelsov/adv-keeper/gen/go/proto/file/v1"
 )
 
-type FileServer struct {
-	filev1.UnimplementedFileServiceServer
-	Q         *db.Queries
-	uploadDir string
-}
-
-func NewFile(q *db.Queries) *FileServer {
-	conf, _ := helpers.LoadConfig()
-	return &FileServer{Q: q, uploadDir: conf.FilesDir}
-}
-
-func (s *FileServer) Upload(stream filev1.FileService_UploadServer) error {
+func (s *Service) Upload(stream filev1.FileService_UploadServer) error {
+	log.Info("upload get request...")
 	var (
 		outFile   *os.File
 		written   int64
@@ -42,27 +30,36 @@ func (s *FileServer) Upload(stream filev1.FileService_UploadServer) error {
 	if err != nil {
 		return err
 	}
+
+	log.Info("stream recv...")
 	info := first.GetInfo()
 	if info == nil {
 		return fmt.Errorf("first message must be FileInfo")
 	}
 
+	log.Info("first get info...")
+
 	filename = filepath.Base(info.Filename)
 	if filename == "" {
 		filename = fmt.Sprintf("upload-%d.bin", time.Now().UnixNano())
 	}
 
-	tmpPath := filepath.Join(s.uploadDir, filename+".part")
-	finalPath := filepath.Join(s.uploadDir, filename)
+	log.Info("file path - file name...", "path", filename)
 
-	// гарантируем папку
-	if err := os.MkdirAll(s.uploadDir, 0o755); err != nil {
-		return err
-	}
+	tmpPath := filepath.Join(s.UploadDir, filename+".part")
+	finalPath := filepath.Join(s.UploadDir, filename)
+
+	log.Info("start: mkdir...", "file name", filename)
+
+	log.Info("mkdir all uplaod dir...", "path", s.UploadDir)
 	outFile, err = os.Create(tmpPath)
 	if err != nil {
+
+		log.Error("OS CREATE", "error: ", err.Error())
 		return err
 	}
+
+	log.Info("created dir...", s.UploadDir)
 	defer func() {
 		outFile.Close()
 		// Если контекст отменён — удалим частичный файл
@@ -71,46 +68,70 @@ func (s *FileServer) Upload(stream filev1.FileService_UploadServer) error {
 		}
 	}()
 
+	log.Info("start to get file info...")
 	// 2) принимаем куски
 	for {
+		log.Info("uploading by piece...")
 		// Проверим отмену клиента/дедлайн
 		if err := stream.Context().Err(); err != nil {
+			log.Error("stream Context", "Error", err.Error())
 			return err
 		}
 
+		log.Info("1")
+
 		msg, err := stream.Recv()
+
+		log.Info("1.2")
 		if err == io.EOF {
+			log.Error("io.EOF: stream Recv", "Error", err.Error())
 			break
 		}
+
+		log.Info("1.5")
 		if err != nil {
+			log.Error("stream Recv", "Error", err.Error())
 			return err
 		}
+
+		log.Info("2")
 		ch := msg.GetChunk()
 		if ch == nil {
+			log.Error("unexpected message type: want FileChunk")
 			return fmt.Errorf("unexpected message type: want FileChunk")
 		}
 
 		n, err := outFile.Write(ch.Content)
 		if err != nil {
+			log.Error("outFile.Write", "Error", err.Error())
 			return err
 		}
+
+		log.Info("3")
 		written += int64(n)
 		_, _ = hasher.Write(ch.Content) // считаем sha256 «на лету»
+		log.Info("end to add that piece...")
 	}
 
+	log.Info("end: getting info...")
 	// 3) закрываем и переименовываем atomic-стилем
 	if err := outFile.Sync(); err != nil {
 		return err
 	}
+
+	log.Info("out file sync...")
 	if err := outFile.Close(); err != nil {
 		return err
 	}
+
+	log.Info("out file close...")
 	if err := os.Rename(tmpPath, finalPath); err != nil {
 		return err
 	}
+	log.Info("os rename...")
 
 	sum := hex.EncodeToString(hasher.Sum(nil))
-	log.Printf("Upload done: %s, bytes=%d, sha256=%s, took=%s",
+	log.Info("Upload done: %s, bytes=%d, sha256=%s, took=%s",
 		finalPath, written, sum, time.Since(startTime))
 
 	return stream.SendAndClose(&filev1.UploadResponse{
diff --git a/internal/models/loader.go b/internal/models/loader.go
@@ -0,0 +1,6 @@
+package models
+
+type LoaderType struct {
+	FileSize  int64
+	ChankSize int64
+}
diff --git a/internal/tui/app.go b/internal/tui/app.go
@@ -7,6 +7,7 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/rtmelsov/adv-keeper/internal/akclient"
+	"github.com/rtmelsov/adv-keeper/internal/models"
 
 	filev1 "github.com/rtmelsov/adv-keeper/gen/go/proto/file/v1"
 )
@@ -19,6 +20,9 @@ type ProfileModel struct {
 }
 
 type TuiModel struct {
+	LoaderCount    models.LoaderType
+	W              int
+	H              int
 	SelectedFile   string
 	Busy           int           // >0 — идёт фоновая операция
 	Spin           spinner.Model // bubbles/spinner
diff --git a/internal/tui/screen.go b/internal/tui/screen.go
@@ -3,6 +3,7 @@ package tui
 import (
 	"github.com/charmbracelet/bubbles/spinner"
 	tea "github.com/charmbracelet/bubbletea"
+
 	"path/filepath"
 )
 
diff --git a/internal/tui/vault.go b/internal/tui/vault.go
@@ -3,6 +3,7 @@ package tui
 import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/rtmelsov/adv-keeper/internal/akclient"
+
 	"os"
 )
 
@@ -31,7 +32,7 @@ func (m TuiModel) ReturnVault(msg string) (tea.Model, tea.Cmd) {
 			m.Cursor--
 		}
 	case "down", "j":
-		if m.Cursor < len(m.Choices)-1 {
+		if m.Cursor < 1 {
 			m.Cursor++
 		}
 
diff --git a/internal/tui/view.go b/internal/tui/view.go
@@ -7,8 +7,9 @@ import (
 )
 
 func (m TuiModel) View() string {
+
 	if m.Loading {
-		return ui.StatusBar.Render(m.Spin.View()+" Загрузка…") + "\n"
+		return ui.StatusBar.Render(m.Spin.View()+" Загрузка…") + fmt.Sprintf("chunk size: %v - %v", m.LoaderCount.FileSize, m.LoaderCount.ChankSize) + "\n"
 	}
 	s := "CAN'T FIND THE PAGE"
 

Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,4 @@ func main() {`
`43`	`43`	`idxs = append(idxs, i)`
`44`	`44`	`}`
`45`	`45`	`sort.Ints(idxs)`
`46`		`-`
`47`		`- fmt.Println("Вы выбрали:")`
`48`		`- for _, i := range idxs {`
`49`		`- fmt.Printf(" • %s\n", m.Choices[i])`
`50`		`- }`
`51`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,10 @@ func UploadFile(path string) (*filev1.UploadResponse, error) {`
`98`	`98`	`}`
`99`	`99`	`offset += int64(n)`
`100`	`100`	`}`
`101`		`- if readErr != nil && readErr != io.EOF {`
	`101`	`+ if readErr == io.EOF {`
	`102`	`+ break // <— обязательно выходим!`
	`103`	`+ }`
	`104`	`+ if readErr != nil {`
`102`	`105`	`return nil, fmt.Errorf("read file: %w", readErr)`
`103`	`106`	`}`
`104`	`107`	`}`