Add --data, --listen and --ports to byre serve for task previews

internal/store/blob_test.go

@@ -13,7 +13,7 @@ import (
 
 func TestQueuedTurnKeepsImages(t *testing.T) {
 	ctx := context.Background()
-	st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(api.Event) {})
+	st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(api.Event) {})
 	if err != nil {
 		t.Fatalf("open store: %v", err)
 	}

internal/store/inbox_test.go

@@ -13,7 +13,7 @@ import (
 func TestClosingTaskDismissesOpenInbox(t *testing.T) {
 	ctx := context.Background()
 	events := []api.Event{}
-	st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), func(ev api.Event) { events = append(events, ev) })
+	st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), store.DefaultPortFirst, func(ev api.Event) { events = append(events, ev) })
 	if err != nil {
 		t.Fatalf("open store: %v", err)
 	}

internal/store/merging_test.go

@@ -13,7 +13,7 @@ import (
 func TestMergingBySurvivesReopen(t *testing.T) {
 	ctx := context.Background()
 	path := filepath.Join(t.TempDir(), "byre.db")
-	st, err := store.Open(path, func(api.Event) {})
+	st, err := store.Open(path, store.DefaultPortFirst, func(api.Event) {})
 	if err != nil {
 		t.Fatalf("open store: %v", err)
 	}
@@ -38,7 +38,7 @@ func TestMergingBySurvivesReopen(t *testing.T) {
 	}
 	st.Close()
 
-	st, err = store.Open(path, func(api.Event) {})
+	st, err = store.Open(path, store.DefaultPortFirst, func(api.Event) {})
 	if err != nil {
 		t.Fatalf("reopen store: %v", err)
 	}

internal/store/ports_test.go

@@ -0,0 +1,45 @@
+package store_test
+
+import (
+	"context"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"g.fc.run/misc/byre/internal/api"
+	"g.fc.run/misc/byre/internal/store"
+)
+
+func TestPortBlocksStartAtPortFirst(t *testing.T) {
+	ctx := context.Background()
+	st, err := store.Open(filepath.Join(t.TempDir(), "byre.db"), 51000, func(api.Event) {})
+	if err != nil {
+		t.Fatalf("open store: %v", err)
+	}
+	t.Cleanup(func() { st.Close() })
+
+	now := time.Now().UTC()
+	_, err = st.EnsureUser(ctx, "alice", "Alice")
+	if err != nil {
+		t.Fatalf("ensure user: %v", err)
+	}
+	err = st.CreateProject(ctx, api.Project{Id: "p1", Name: "demo", RepoPath: "/nonexistent", DefaultBranch: "main", Remote: "none", CreatedBy: "alice", CreatedAt: now})
+	if err != nil {
+		t.Fatalf("create project: %v", err)
+	}
+
+	for i, want := range []int{51000, 51010} {
+		id := []string{"t1", "t2"}[i]
+		err = st.CreateTask(ctx, api.Task{Id: id, ProjectId: "p1", Title: id, Branch: id, WorktreePath: "/nonexistent", BaseRef: "x", Status: api.TaskStatusActive, CreatedBy: "alice", CreatedAt: now}, "alice")
+		if err != nil {
+			t.Fatalf("create task %s: %v", id, err)
+		}
+		task, err := st.GetTask(ctx, id)
+		if err != nil {
+			t.Fatalf("get task %s: %v", id, err)
+		}
+		if task.PortBase != want {
+			t.Fatalf("task %s port_base = %d, want %d", id, task.PortBase, want)
+		}
+	}
+}

internal/store/store.go

@@ -274,18 +274,19 @@ ALTER TABLE tasks ADD COLUMN merge_queued_at TEXT NOT NULL DEFAULT '';
 `}}
 
 const (
-	PortFirst = 41000
-	PortBlock = 10
+	DefaultPortFirst = 41000
+	PortBlock        = 10
 )
 
 type Store struct {
-	db      *sql.DB
-	path    string
-	writeMu sync.Mutex
-	onEvent func(api.Event)
+	db        *sql.DB
+	path      string
+	portFirst int
+	writeMu   sync.Mutex
+	onEvent   func(api.Event)
 }
 
-func Open(path string, onEvent func(api.Event)) (*Store, error) {
+func Open(path string, portFirst int, onEvent func(api.Event)) (*Store, error) {
 	dsn := "file:" + path + "?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)&_pragma=foreign_keys(1)&_txlock=immediate"
 	db, err := sql.Open("sqlite", dsn)
 	if err != nil {
@@ -298,7 +299,7 @@ func Open(path string, onEvent func(api.Event)) (*Store, error) {
 		return nil, err
 	}
 
-	return &Store{db: db, path: path, onEvent: onEvent}, nil
+	return &Store{db: db, path: path, portFirst: portFirst, onEvent: onEvent}, nil
 }
 
 func migrate(db *sql.DB, migrations []migration) error {
@@ -557,7 +558,7 @@ func (s *Store) CreateTask(ctx context.Context, t api.Task, actor string) error
 				SELECT ? AS candidate
 				UNION ALL SELECT port_base + ? FROM tasks WHERE status = ?
 			) WHERE candidate NOT IN (SELECT port_base FROM tasks WHERE status = ?)
-		`, PortFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
+		`, s.portFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
 		if err != nil {
 			return err
 		}