Merge pull request #10 from rtmelsov/fix/file-stream

Fix/file stream

Author: rtmelsov

.gitignore

@@ -21,3 +21,4 @@ db/migrations/*.sql-journal
 /.vscode/
 .DS_Store
 /var/
+opt/

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

api/proto/common/v1/common.proto

@@ -3,16 +3,17 @@ package common.v1;
 option go_package = "github.com/rtmelsov/adv-keeper/gen/go/common/v1;commonv1";
 
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
 
 service AuthService {
-  rpc Logout(TokenPair) returns (TokenPair);
+  rpc Logout(google.protobuf.Empty) returns (TokenPair);
+  rpc GetProfile(google.protobuf.Empty) returns (GetProfileResponse);
   rpc Register(RegisterRequest) returns (RegisterResponse);
   rpc Login(LoginRequest) returns (LoginResponse);
 }
 
 message TokenPair {
   string access_token = 1;   // JWT (HS256)
-  //google.protobuf.Timestamp
   google.protobuf.Timestamp expires_at = 3;     // RFC3339 серверное время истечения refresh
 }
 
@@ -21,9 +22,13 @@ message LoginRequest {
   string password = 2;
 }
 
+message GetProfileResponse {
+  string user_id   = 1;
+  string email     = 3;
+}
+
 message LoginResponse {
   string user_id   = 1;
-  string device_id = 2;
   string email     = 3;
   TokenPair tokens = 4; // ← добавили
 }
@@ -35,7 +40,6 @@ message RegisterRequest {
 
 message RegisterResponse {
   string user_id   = 1;
-  string device_id = 2; // вернём то, что прислал клиент
   string email    = 3;
   TokenPair tokens = 4; // ← добавили
 }

api/proto/file/v1/file.proto

@@ -1,11 +1,35 @@
+
 syntax = "proto3";
 
 package file.v1;
 option go_package = "github.com/rtmelsov/adv-keeper/gen/go/file/v1;filev1";
 
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/empty.proto";
+
 service FileService {
   // Клиент шлёт поток кусков, сервер в конце отвечает сводкой
   rpc Upload(stream UploadRequest) returns (UploadResponse);
+  rpc DownloadFile(DownloadFileRequest) returns (stream DownloadFileResponse);
+  rpc DeleteFile(DeleteFileRequest) returns (google.protobuf.Empty);
+  // Список файлов текущего пользователя (берём user_id из контекста)
+  rpc GetFiles(GetFilesRequest) returns (GetFilesResponse);
+}
+
+message GetFilesRequest {
+  int32 limit  = 1; // по умолчанию 50
+  int32 offset = 2; // по умолчанию 0
+}
+
+message FileItem {
+  string fileid = 1;
+  string filename = 2;
+  int64  size     = 3;
+  google.protobuf.Timestamp created_at = 4;
+}
+
+message GetFilesResponse {
+  repeated FileItem files = 1;
 }
 
 message UploadRequest {
@@ -21,12 +45,32 @@ message FileInfo {
 }
 
 message FileChunk {
-  bytes  content = 1;   // данные куска (< 4 MiB — лимит gRPC на сообщение)
-  int64  offset  = 2;   // сдвиг от начала файла (полезно для резюмации)
+  bytes content = 1;  // данные куска (< 4 MiB — лимит gRPC на сообщение)
+  int64 offset  = 2;  // сдвиг от начала файла (полезно для резюмации)
 }
 
 message UploadResponse {
   string stored_as      = 1; // путь/имя сохранённого файла на сервере
   int64  bytes_received = 2; // сколько байт приняли
   string sha256         = 3; // контрольная сумма принятого
 }
+
+
+message DownloadFileResponse {
+  oneof payload {
+    FileInfo info = 1;   // ПЕРВОЕ сообщение — мета-инфа
+    FileChunk chunk = 2; // Далее — куски файла
+  }
+}
+
+message DownloadFileRequest {
+  string fileid = 1;
+}
+
+message DeleteFileRequest {
+  string fileid = 1;
+}
+
+message DeleteFileResponse {
+  string fileid = 1;
+}

cmd/server/main.go

@@ -2,18 +2,20 @@ package main
 
 import (
 	"database/sql"
-	"google.golang.org/grpc/reflection"
-	"log"
+	"fmt"
 	"net"
 	"time"
 
+	"github.com/charmbracelet/log"
+	"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/file"
+	"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"
@@ -30,7 +32,9 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-
+	path := fmt.Sprintf("file:/%s", envs.MigrationsFilesDir)
+	log.Info("path", "path", path)
+	helpers.RunMigrations(envs.DBDSN, path)
 	// Подключение к Postgres
 	dbx, err := sql.Open("pgx", envs.DBDSN)
 	if err != nil {
@@ -41,6 +45,7 @@ func main() {
 	q := db.New(dbx)
 	s := grpc.NewServer(
 		grpc.UnaryInterceptor(middleware.ServerInterceptor),
+		grpc.StreamInterceptor(middleware.StreamInterceptor), // вот тут
 		grpc.KeepaliveParams(keepalive.ServerParameters{
 			MaxConnectionIdle:     0,
 			MaxConnectionAge:      0,
@@ -49,12 +54,12 @@ func main() {
 			Timeout:               20 * time.Second,
 		}),
 	)
-	commonv1.RegisterAuthServiceServer(s, server.New(q))
-	filev1.RegisterFileServiceServer(s, file.New(q))
+	commonv1.RegisterAuthServiceServer(s, authserver.New(q))
+	filev1.RegisterFileServiceServer(s, fileserver.New(q))
 
 	reflection.Register(s)
 
-	log.Println("gRPC listening on", lis.Addr())
+	log.Info("gRPC listening on", "add", lis.Addr())
 	if err := s.Serve(lis); err != nil {
 		log.Fatal(err)
 	}

cmd/tui/main.go

@@ -32,20 +32,15 @@ func main() {
 
 	// После выхода выведем список выбранных покупок
 	m := final.(tui.TuiModel)
-	if len(m.Selected) == 0 {
+	if len(m.SelectedPage) == 0 {
 		fmt.Println("Ничего не выбрано.")
 		return
 	}
 
 	// Соберём в стабильном порядке
-	idxs := make([]int, 0, len(m.Selected))
-	for i := range m.Selected {
+	idxs := make([]int, 0, len(m.SelectedPage))
+	for i := range m.SelectedPage {
 		idxs = append(idxs, i)
 	}
 	sort.Ints(idxs)
-
-	fmt.Println("Вы выбрали:")
-	for _, i := range idxs {
-		fmt.Printf(" • %s\n", m.Choices[i])
-	}
 }

db/queries/auth.sql

@@ -1,4 +1,4 @@
--- name: RegisterWithDevice :one
+-- name: Register :one
 INSERT INTO users (email, pwd_phc, e2ee_pub)
 VALUES ($1, $2, $3)
 RETURNING id;
@@ -9,16 +9,27 @@ FROM users
 WHERE email = $1;
 
 -- name: AddFile :one
-INSERT INTO files (user_id, name, path)
-VALUES ($1, $2, $3)
-RETURNING id, user_id, name, path, created_at;
+INSERT INTO files (user_id, filename, path, size_bytes)
+VALUES ($1, $2, $3, $4)
+RETURNING id, user_id, filename, path, size_bytes, created_at;
 
 -- name: ListFilesByUser :many
-SELECT id, name, path, created_at
+SELECT id, filename, path, size_bytes, created_at
 FROM files
 WHERE user_id = $1
 ORDER BY created_at DESC;
 
--- name: DeleteFile :exec
+-- name: DeleteFile :one
 DELETE FROM files
+WHERE id = $1 AND user_id = $2
+RETURNING id;-- name: GetUserByID :one
+
+-- name: GetUserByID :one
+SELECT id, email, created_at
+FROM users
+WHERE id = $1;
+
+-- name: GetFileForUser :one
+SELECT id, user_id, filename, path, size_bytes, created_at
+FROM files
 WHERE id = $1 AND user_id = $2;