Merge pull request #1 from rtmelsov/develop

init

Author: rtmelsov

.gitignore

@@ -1,32 +1,24 @@
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
-# Binaries for programs and plugins
+# Go
+bin/
+dist/
+build/
 *.exe
-*.exe~
 *.dll
 *.so
 *.dylib
-
-# Test binary, built with `go test -c`
 *.test
-
-# Code coverage profiles and other test artifacts
-*.out
 coverage.*
-*.coverprofile
-profile.cov
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
+*.out
 
-# Go workspace file
-go.work
-go.work.sum
+# Генерация
+gen/
+internal/db/sqlc.yml # если приватный
+db/migrations/*.sql-journal
 
-# env file
+# Локальные конфиги
 .env
-
-# Editor/IDE
-# .idea/
-# .vscode/
+*.local.*
+/.idea/
+/.vscode/
+.DS_Store
+/var/

Makefile

@@ -0,0 +1,24 @@
+SERVER_PKG ?= ./cmd/server
+
+GRPC_ADDR ?= 127.0.0.1:8080
+DB_DSN ?= mem://
+
+.PHONY: run build tidy help
+
+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"
+
+run:
+	@echo "===> go run $(SERVER_PKG) (DB_DSN=$(GRPC_ADDR), DB_DSN=$(DB_DSN))"
+	@GRPC_ADDR=$(GRPC_ADDR) DB_DSN=$(DB_DSN) go run $(SERVER_PKG)
+
+build:
+	@mkdir -p bin
+	@echo "===> go build ./cmd/server -> ./bin/server"
+	@go build -o bin/server $(SERVER_PKG)
+
+tidy:
+	@go mod tidy

README.md

@@ -1 +0,0 @@
-# adv-keeper

api/buf.gen.yaml

@@ -0,0 +1,11 @@
+version: v2
+plugins:
+  - local: protoc-gen-go
+    out: ../gen/go
+    opt: paths=source_relative
+  - local: protoc-gen-go-grpc
+    out: ../gen/go
+    opt:
+      - paths=source_relative
+      - require_unimplemented_servers=false
+

api/proto/common/v1/common.proto

@@ -0,0 +1,36 @@
+syntax = "proto3";
+package common.v1;
+option go_package = "github.com/rtmelsov/adv-keeper/gen/go/common/v1;commonv1";
+
+message DeviceInfo {
+  string device_id = 1; // клиентский идентификатор устройства
+}
+
+service AuthService {
+  rpc Register(RegisterRequest) returns (RegisterResponse);
+  rpc Login(LoginRequest) returns (LoginResponse);
+}
+
+message RegisterRequest {
+  string email    = 1;
+  string password = 2;
+  DeviceInfo device = 3;
+}
+
+message RegisterResponse {
+  string user_id   = 1;
+  string device_id = 2; // вернём то, что прислал клиент
+  string email     = 3;
+}
+
+message LoginRequest {
+  string email    = 1;
+  string password = 2;
+  DeviceInfo device = 3;
+}
+
+message LoginResponse {
+  string user_id   = 1;
+  string device_id = 2; // вернём то, что прислал клиент
+  string email     = 3;
+}

api/proto/file/v1/file.proto

@@ -0,0 +1,32 @@
+syntax = "proto3";
+
+package file.v1;
+option go_package = "github.com/rtmelsov/adv-keeper/gen/go/file/v1;filev1";
+
+service FileService {
+  // Клиент шлёт поток кусков, сервер в конце отвечает сводкой
+  rpc Upload(stream UploadRequest) returns (UploadResponse);
+}
+
+message UploadRequest {
+  oneof payload {
+    FileInfo info = 1;   // ПЕРВОЕ сообщение — мета-инфа
+    FileChunk chunk = 2; // Далее — куски файла
+  }
+}
+
+message FileInfo {
+  string filename = 1; // исходное имя (без путей)
+  int64  size     = 2; // опционально: общий размер
+}
+
+message FileChunk {
+  bytes  content = 1;   // данные куска (< 4 MiB — лимит gRPC на сообщение)
+  int64  offset  = 2;   // сдвиг от начала файла (полезно для резюмации)
+}
+
+message UploadResponse {
+  string stored_as      = 1; // путь/имя сохранённого файла на сервере
+  int64  bytes_received = 2; // сколько байт приняли
+  string sha256         = 3; // контрольная сумма принятого
+}

cmd/server/main.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"net"
+
+	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/auth"
+	db "github.com/rtmelsov/adv-keeper/internal/db"
+	"github.com/rtmelsov/adv-keeper/internal/file"
+
+	_ "github.com/jackc/pgx/v5/stdlib"
+	"google.golang.org/grpc"
+)
+
+func main() {
+	// получаем урл бд
+	dsn := "postgres://postgres@localhost:5432/dbname?sslmode=disable"
+
+	fmt.Println("dsn", dsn)
+
+	lis, err := net.Listen("tcp", "127.0.0.1:8080")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// Подключение к Postgres
+	dbx, err := sql.Open("pgx", dsn)
+	if err != nil {
+		log.Fatal(err)
+	}
+	defer dbx.Close()
+
+	q := db.New(dbx)
+	s := grpc.NewServer()
+	commonv1.RegisterAuthServiceServer(s, auth.New(q))
+	filev1.RegisterFileServiceServer(s, file.New(q))
+
+	log.Println("gRPC listening on", lis.Addr())
+	if err := s.Serve(lis); err != nil {
+		log.Fatal(err)
+	}
+}

cmd/tui/main.go

@@ -0,0 +1,52 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"os"
+	"sort"
+
+	tea "github.com/charmbracelet/bubbletea"
+
+	"github.com/rtmelsov/adv-keeper/internal/tui"
+)
+
+var (
+	version   = "dev"
+	buildDate = "-"
+)
+
+func main() {
+
+	showVersion := flag.Bool("version", false, "print version and exit")
+	flag.Parse()
+	if *showVersion {
+		fmt.Printf("adv-keeper %s (built %s)\n", version, buildDate)
+		return
+	}
+	p := tea.NewProgram(tui.InitialModel())
+	final, err := p.Run()
+	if err != nil {
+		fmt.Printf("Alas, there's been an error: %v\n", err)
+		os.Exit(1)
+	}
+
+	// После выхода выведем список выбранных покупок
+	m := final.(tui.TuiModel)
+	if len(m.Selected) == 0 {
+		fmt.Println("Ничего не выбрано.")
+		return
+	}
+
+	// Соберём в стабильном порядке
+	idxs := make([]int, 0, len(m.Selected))
+	for i := range m.Selected {
+		idxs = append(idxs, i)
+	}
+	sort.Ints(idxs)
+
+	fmt.Println("Вы выбрали:")
+	for _, i := range idxs {
+		fmt.Printf(" • %s\n", m.Choices[i])
+	}
+}

db/queries/auth.sql

@@ -0,0 +1,16 @@
+-- name: RegisterWithDevice :one
+WITH u AS (
+  INSERT INTO users (email, pwd_phc, e2ee_pub)
+  VALUES ($1, $2, $3)
+  RETURNING id
+),
+d AS (
+  INSERT INTO devices (user_id, device_id)
+  SELECT u.id, $4
+  FROM u
+  RETURNING device_id
+)
+SELECT
+  (SELECT id FROM u)        AS user_id,
+  (SELECT device_id FROM d) AS device_id;
+