create-svc 0.1.9 → 0.1.10

package/templates/variants/go-chi/migrations/0000_init.sql

@@ -0,0 +1,63 @@
+create table if not exists users (
+  id text primary key,
+  username text not null unique,
+  display_name text,
+  created_at timestamptz not null default now(),
+  updated_at timestamptz not null default now()
+);
+
+create table if not exists conversations (
+  id text primary key,
+  title text,
+  created_by_user_id text not null references users(id),
+  deleted_at timestamptz,
+  created_at timestamptz not null default now(),
+  updated_at timestamptz not null default now()
+);
+
+create table if not exists conversation_participants (
+  conversation_id text not null references conversations(id),
+  user_id text not null references users(id),
+  joined_at timestamptz not null default now(),
+  primary key (conversation_id, user_id)
+);
+
+create table if not exists messages (
+  id text primary key,
+  conversation_id text not null references conversations(id),
+  user_id text not null references users(id),
+  body text not null,
+  edited_at timestamptz,
+  deleted_at timestamptz,
+  created_at timestamptz not null default now(),
+  updated_at timestamptz not null default now()
+);
+
+create table if not exists attachments (
+  id text primary key,
+  conversation_id text not null references conversations(id),
+  message_id text references messages(id),
+  uploaded_by_user_id text not null references users(id),
+  storage_bucket text not null,
+  storage_key text not null,
+  content_type text not null,
+  byte_size bigint not null,
+  filename text not null,
+  status text not null,
+  deleted_at timestamptz,
+  created_at timestamptz not null default now(),
+  updated_at timestamptz not null default now()
+);
+
+create table if not exists webhook_events (
+  id text primary key,
+  provider text not null,
+  external_event_id text not null,
+  event_type text not null,
+  signature_valid text not null,
+  status text not null,
+  payload_json text not null,
+  received_at timestamptz not null default now(),
+  processed_at timestamptz,
+  unique (provider, external_event_id)
+);

package/templates/variants/go-chi/protos/chat/v1/chat.proto

@@ -0,0 +1,219 @@
+syntax = "proto3";
+
+package chat.v1;
+
+option go_package = "{{MODULE_PATH}}/gen/chat/v1;chatv1";
+
+service ChatService {
+  rpc CreateUser(CreateUserRequest) returns (CreateUserResponse);
+  rpc GetUser(GetUserRequest) returns (GetUserResponse);
+  rpc GetUserByUsername(GetUserByUsernameRequest) returns (GetUserByUsernameResponse);
+  rpc CreateConversation(CreateConversationRequest) returns (CreateConversationResponse);
+  rpc GetConversation(GetConversationRequest) returns (GetConversationResponse);
+  rpc UpdateConversation(UpdateConversationRequest) returns (UpdateConversationResponse);
+  rpc DeleteConversation(DeleteConversationRequest) returns (DeleteConversationResponse);
+  rpc AddConversationParticipant(AddConversationParticipantRequest) returns (AddConversationParticipantResponse);
+  rpc RemoveConversationParticipant(RemoveConversationParticipantRequest) returns (RemoveConversationParticipantResponse);
+  rpc ListMessages(ListMessagesRequest) returns (ListMessagesResponse);
+  rpc CreateMessage(CreateMessageRequest) returns (CreateMessageResponse);
+  rpc UpdateMessage(UpdateMessageRequest) returns (UpdateMessageResponse);
+  rpc DeleteMessage(DeleteMessageRequest) returns (DeleteMessageResponse);
+  rpc CreateAttachmentUpload(CreateAttachmentUploadRequest) returns (CreateAttachmentUploadResponse);
+  rpc FinalizeAttachment(FinalizeAttachmentRequest) returns (FinalizeAttachmentResponse);
+  rpc GetAttachment(GetAttachmentRequest) returns (GetAttachmentResponse);
+  rpc DeleteAttachment(DeleteAttachmentRequest) returns (DeleteAttachmentResponse);
+}
+
+message User {
+  string id = 1;
+  string username = 2;
+  string display_name = 3;
+  string created_at = 4;
+  string updated_at = 5;
+}
+
+message Conversation {
+  string id = 1;
+  string title = 2;
+  string created_by_user_id = 3;
+  repeated User participants = 4;
+  string created_at = 5;
+  string updated_at = 6;
+}
+
+message Message {
+  string id = 1;
+  string conversation_id = 2;
+  string user_id = 3;
+  string body = 4;
+  string edited_at = 5;
+  string created_at = 6;
+  string updated_at = 7;
+}
+
+message Attachment {
+  string id = 1;
+  string conversation_id = 2;
+  string message_id = 3;
+  string uploaded_by_user_id = 4;
+  string storage_bucket = 5;
+  string storage_key = 6;
+  string content_type = 7;
+  int64 byte_size = 8;
+  string filename = 9;
+  string status = 10;
+  string public_url = 11;
+  string created_at = 12;
+  string updated_at = 13;
+}
+
+message UploadTarget {
+  string method = 1;
+  string url = 2;
+  map<string, string> headers = 3;
+}
+
+message CreateUserRequest {
+  string username = 1;
+  string display_name = 2;
+}
+
+message CreateUserResponse {
+  User user = 1;
+}
+
+message GetUserRequest {
+  string user_id = 1;
+}
+
+message GetUserResponse {
+  User user = 1;
+}
+
+message GetUserByUsernameRequest {
+  string username = 1;
+}
+
+message GetUserByUsernameResponse {
+  User user = 1;
+}
+
+message CreateConversationRequest {
+  string created_by_user_id = 1;
+  string title = 2;
+  repeated string participant_user_ids = 3;
+}
+
+message CreateConversationResponse {
+  Conversation conversation = 1;
+}
+
+message GetConversationRequest {
+  string conversation_id = 1;
+}
+
+message GetConversationResponse {
+  Conversation conversation = 1;
+}
+
+message UpdateConversationRequest {
+  string conversation_id = 1;
+  string title = 2;
+}
+
+message UpdateConversationResponse {
+  Conversation conversation = 1;
+}
+
+message DeleteConversationRequest {
+  string conversation_id = 1;
+}
+
+message DeleteConversationResponse {}
+
+message AddConversationParticipantRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+}
+
+message AddConversationParticipantResponse {
+  Conversation conversation = 1;
+}
+
+message RemoveConversationParticipantRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+}
+
+message RemoveConversationParticipantResponse {}
+
+message ListMessagesRequest {
+  string conversation_id = 1;
+}
+
+message ListMessagesResponse {
+  repeated Message messages = 1;
+}
+
+message CreateMessageRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+  string body = 3;
+}
+
+message CreateMessageResponse {
+  Message message = 1;
+}
+
+message UpdateMessageRequest {
+  string conversation_id = 1;
+  string message_id = 2;
+  string body = 3;
+}
+
+message UpdateMessageResponse {
+  Message message = 1;
+}
+
+message DeleteMessageRequest {
+  string conversation_id = 1;
+  string message_id = 2;
+}
+
+message DeleteMessageResponse {}
+
+message CreateAttachmentUploadRequest {
+  string conversation_id = 1;
+  string user_id = 2;
+  string filename = 3;
+  string content_type = 4;
+  int64 byte_size = 5;
+}
+
+message CreateAttachmentUploadResponse {
+  Attachment attachment = 1;
+  UploadTarget upload = 2;
+}
+
+message FinalizeAttachmentRequest {
+  string attachment_id = 1;
+  string message_id = 2;
+}
+
+message FinalizeAttachmentResponse {
+  Attachment attachment = 1;
+}
+
+message GetAttachmentRequest {
+  string attachment_id = 1;
+}
+
+message GetAttachmentResponse {
+  Attachment attachment = 1;
+}
+
+message DeleteAttachmentRequest {
+  string attachment_id = 1;
+}
+
+message DeleteAttachmentResponse {}

package/templates/variants/go-chi/test/go.test.ts

@@ -1,7 +1,10 @@
 import { expect, test } from "bun:test";
 
 test("go test ./...", { timeout: 60_000 }, () => {
-  const result = Bun.spawnSync(["go", "test", "./..."], {
+  const go = Bun.which("go");
+  expect(go, "go must be installed and available on PATH").toBeString();
+
+  const result = Bun.spawnSync([go, "test", "./..."], {
     cwd: process.cwd(),
     stdout: "pipe",
     stderr: "pipe",

package/templates/variants/go-connectrpc/Makefile

@@ -1,9 +1,13 @@
-.PHONY: dev gen lint test bootstrap deploy cleanup
+.PHONY: dev migrate gen lint test bootstrap deploy cleanup
 
 CLOUDRUN := npx --no-install svc-cloudrun
+WITH_ENV := set -a; [ ! -f .env.local ] || . ./.env.local; set +a;
 
 dev:
-	go run ./cmd/server
+	@$(WITH_ENV) go run ./cmd/server
+
+migrate:
+	@$(WITH_ENV) go run ./cmd/migrate
 
 gen:
 	buf generate

package/templates/variants/go-connectrpc/buf.gen.yaml

@@ -4,7 +4,9 @@ plugins:
     out: gen
     opt:
       - paths=source_relative
+      - Mchat/v1/chat.proto={{MODULE_PATH}}/gen/chat/v1
   - local: protoc-gen-connect-go
     out: gen
     opt:
       - paths=source_relative
+      - Mchat/v1/chat.proto={{MODULE_PATH}}/gen/chat/v1

package/templates/variants/go-connectrpc/cmd/migrate/main.go

@@ -0,0 +1,101 @@
+package main
+
+import (
+	"context"
+	"log"
+	"os"
+	"sort"
+	"strings"
+	"time"
+
+	_ "github.com/jackc/pgx/v5/stdlib"
+	"github.com/jmoiron/sqlx"
+
+	"{{MODULE_PATH}}/internal/app"
+	"{{MODULE_PATH}}/internal/config"
+)
+
+func main() {
+	cfg, err := config.Load()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	db, err := app.OpenDatabase(context.Background(), cfg.DatabaseURL)
+	if err != nil {
+		db, err = waitForDatabase(cfg.DatabaseURL, 30*time.Second)
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
+	if _, err := db.ExecContext(context.Background(), `
+create table if not exists schema_migrations (
+  version text primary key,
+  applied_at timestamptz not null default now()
+)`); err != nil {
+		log.Fatal(err)
+	}
+
+	entries, err := os.ReadDir("migrations")
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	versions := make([]string, 0, len(entries))
+	for _, entry := range entries {
+		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".sql") {
+			continue
+		}
+		versions = append(versions, entry.Name())
+	}
+	sort.Strings(versions)
+
+	for _, version := range versions {
+		var count int
+		if err := db.GetContext(context.Background(), &count, `select count(*) from schema_migrations where version = $1`, version); err != nil {
+			log.Fatal(err)
+		}
+		if count > 0 {
+			continue
+		}
+
+		sqlBytes, err := os.ReadFile("migrations/" + version)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		tx, err := db.BeginTxx(context.Background(), nil)
+		if err != nil {
+			log.Fatal(err)
+		}
+		if _, err := tx.ExecContext(context.Background(), string(sqlBytes)); err != nil {
+			_ = tx.Rollback()
+			log.Fatal(err)
+		}
+		if _, err := tx.ExecContext(context.Background(), `insert into schema_migrations (version) values ($1)`, version); err != nil {
+			_ = tx.Rollback()
+			log.Fatal(err)
+		}
+		if err := tx.Commit(); err != nil {
+			log.Fatal(err)
+		}
+		log.Printf("applied migration %s", version)
+	}
+}
+
+func waitForDatabase(databaseURL string, timeout time.Duration) (*sqlx.DB, error) {
+	deadline := time.Now().Add(timeout)
+	var lastErr error
+
+	for time.Now().Before(deadline) {
+		db, err := app.OpenDatabase(context.Background(), databaseURL)
+		if err == nil {
+			return db, nil
+		}
+		lastErr = err
+		time.Sleep(time.Second)
+	}
+
+	return nil, lastErr
+}

package/templates/variants/go-connectrpc/cmd/server/main.go

@@ -4,12 +4,18 @@ import (
 	"context"
 	"log"
 	"net/http"
+	"os"
+	"strings"
 	"time"
 
+	"cloud.google.com/go/storage"
+	"connectrpc.com/grpcreflect"
 	"github.com/go-chi/chi/v5"
+	_ "github.com/jackc/pgx/v5/stdlib"
 	"golang.org/x/net/http2"
 	"golang.org/x/net/http2/h2c"
 
+	chatv1connect "{{MODULE_PATH}}/gen/chat/v1/chatv1connect"
 	"{{MODULE_PATH}}/internal/app"
 	"{{MODULE_PATH}}/internal/config"
 	"{{MODULE_PATH}}/internal/connectapi"
@@ -22,24 +28,34 @@ func main() {
 		log.Fatal(err)
 	}
 
-	service := app.NewDNSService()
-	if cfg.DatabaseURL != "" {
-		if _, err := service.CreateRecord(context.Background(), app.CreateRecordInput{
-			Type:    "TXT",
-			Name:    "bootstrap",
-			Content: "database-configured",
-			TTL:     60,
-			Proxied: false,
-		}); err != nil {
-			log.Fatal(err)
-		}
+	db, err := app.OpenDatabase(context.Background(), cfg.DatabaseURL)
+	if err != nil {
+		log.Fatal(err)
+	}
+	storageClient, err := storage.NewClient(context.Background())
+	if err != nil {
+		log.Fatal(err)
 	}
 
+	service := app.NewChatService(
+		db,
+		app.NewGCSStorage(cfg.AttachmentBucket, cfg.AttachmentPublicBaseURL, storageClient),
+		app.GenericWebhookAdapter{},
+	)
+
 	router := chi.NewRouter()
 	connectPath, connectHandler := connectapi.NewHandler(service)
 	router.Mount(connectPath, connectHandler)
 	httpapi.RegisterRoutes(router, service)
 
+	if localRPCIntrospectionEnabled() {
+		reflector := grpcreflect.NewStaticReflector(chatv1connect.ChatServiceName)
+		reflectionV1Path, reflectionV1Handler := grpcreflect.NewHandlerV1(reflector)
+		reflectionV1AlphaPath, reflectionV1AlphaHandler := grpcreflect.NewHandlerV1Alpha(reflector)
+		router.Mount(reflectionV1Path, reflectionV1Handler)
+		router.Mount(reflectionV1AlphaPath, reflectionV1AlphaHandler)
+	}
+
 	server := &http.Server{
 		Addr:              ":" + cfg.Port,
 		ReadHeaderTimeout: 10 * time.Second,
@@ -49,3 +65,11 @@ func main() {
 	log.Printf("listening on %s", server.Addr)
 	log.Fatal(server.ListenAndServe())
 }
+
+func localRPCIntrospectionEnabled() bool {
+	override := strings.TrimSpace(strings.ToLower(os.Getenv("ENABLE_RPC_INTROSPECTION")))
+	if override != "" {
+		return override != "0" && override != "false" && override != "no" && override != "off"
+	}
+	return os.Getenv("K_SERVICE") == ""
+}