resume active sessions

This commit is contained in:
ari committed 2026-11-01 15:52:46 -05:00
1 parent 9e94c05fb6
commit 917a361370
19 files changed
+871 -42

No files matched your search

+8 -2
View File
@@ -2,7 +2,10 @@ load("@rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "state",
srcs = ["store.go"],
srcs = [
"inflight.go",
"store.go",
],
importpath = "slackerbot/internal/state",
visibility = ["//slackerbot:__subpackages__"],
deps = ["//slackerbot/internal/model"],
@@ -10,7 +13,10 @@ go_library(
go_test(
name = "state_test",
srcs = ["store_test.go"],
srcs = [
"inflight_test.go",
"store_test.go",
],
embed = [":state"],
deps = ["//slackerbot/internal/model"],
)
+156
View File
@@ -0,0 +1,156 @@
package state
import (
"encoding/json"
"errors"
"fmt"
"log"
"os"
"path/filepath"
"regexp"
"sort"
"strings"
"slackerbot/internal/model"
)
const (
inFlightPrefix = "in-flight-"
inFlightSuffix = ".json"
)
var channelID = regexp.MustCompile(`^[A-Za-z0-9_-]+$`)
type inFlightFile struct {
Turns map[string]*model.Turn `json:"turns"`
}
func (s *Store) InFlightPath(channel string) (string, error) {
if !channelID.MatchString(channel) {
return "", fmt.Errorf("%q isn't a channel ID", channel)
}
return filepath.Join(filepath.Dir(s.path), inFlightPrefix+channel+inFlightSuffix), nil
}
// A broken file is left alone for debugging rather than stopping the bot.
func (s *Store) loadTurns() error {
paths, err := filepath.Glob(filepath.Join(filepath.Dir(s.path), inFlightPrefix+"*"+inFlightSuffix))
if err != nil {
return err
}
for _, p := range paths {
b, err := os.ReadFile(p)
if err != nil {
return err
}
var f inFlightFile
if err := json.Unmarshal(b, &f); err != nil {
log.Printf("state: skipping %s: %v", p, err)
continue
}
channel := strings.TrimSuffix(strings.TrimPrefix(filepath.Base(p), inFlightPrefix), inFlightSuffix)
for thread, t := range f.Turns {
if t == nil {
continue
}
if s.turns[channel] == nil {
s.turns[channel] = map[string]*model.Turn{}
}
s.turns[channel][thread] = t
}
}
return nil
}
func (s *Store) saveTurns(channel string) error {
p, err := s.InFlightPath(channel)
if err != nil {
return err
}
if len(s.turns[channel]) == 0 {
delete(s.turns, channel)
if err := os.Remove(p); err != nil && !errors.Is(err, os.ErrNotExist) {
return err
}
return nil
}
b, err := json.MarshalIndent(inFlightFile{Turns: s.turns[channel]}, "", " ")
if err != nil {
return err
}
tmp := p + ".tmp"
if err := os.WriteFile(tmp, b, 0o600); err != nil {
return err
}
return os.Rename(tmp, p)
}
// One turn runs per thread at a time, so the thread keys it.
func (s *Store) PutTurn(t *model.Turn) error {
s.mu.Lock()
defer s.mu.Unlock()
if _, err := s.InFlightPath(t.Channel); err != nil {
return err
}
if s.turns[t.Channel] == nil {
s.turns[t.Channel] = map[string]*model.Turn{}
}
c := *t
c.Files = append([]model.TurnFile(nil), t.Files...)
s.turns[t.Channel][t.ThreadTS] = &c
return s.saveTurns(t.Channel)
}
func (s *Store) DeleteTurn(channel, threadTS string) error {
s.mu.Lock()
defer s.mu.Unlock()
if _, ok := s.turns[channel][threadTS]; !ok {
return nil
}
delete(s.turns[channel], threadTS)
return s.saveTurns(channel)
}
// Turns lists every in-flight turn, oldest first.
func (s *Store) Turns() []model.Turn {
s.mu.Lock()
defer s.mu.Unlock()
var out []model.Turn
for _, list := range s.turns {
for _, t := range list {
c := *t
c.Files = append([]model.TurnFile(nil), t.Files...)
out = append(out, c)
}
}
sort.Slice(out, func(i, j int) bool { return out[i].StartedAt.Before(out[j].StartedAt) })
return out
}
// InFlightFiles reads the in-flight files as they are on disk, for debugging.
// An empty channel means every channel.
func (s *Store) InFlightFiles(channel string) (map[string][]byte, error) {
s.mu.Lock()
defer s.mu.Unlock()
pattern := inFlightPrefix + "*" + inFlightSuffix
if channel != "" {
p, err := s.InFlightPath(channel)
if err != nil {
return nil, err
}
pattern = filepath.Base(p)
}
paths, err := filepath.Glob(filepath.Join(filepath.Dir(s.path), pattern))
if err != nil {
return nil, err
}
out := map[string][]byte{}
for _, p := range paths {
b, err := os.ReadFile(p)
if err != nil {
return nil, err
}
out[filepath.Base(p)] = b
}
return out, nil
}
@@ -0,0 +1,83 @@
package state
import (
"encoding/json"
"errors"
"os"
"path/filepath"
"testing"
"time"
"slackerbot/internal/model"
)
func TestTurnsLiveInOneFilePerChannel(t *testing.T) {
dir := t.TempDir()
s, err := Open(filepath.Join(dir, "state.json"))
if err != nil {
t.Fatal(err)
}
now := time.Now()
_ = s.PutTurn(&model.Turn{Channel: "C1", ThreadTS: "1.0", MessageTS: "1.0", Text: "first", StartedAt: now.Add(-time.Minute),
Files: []model.TurnFile{{Name: "a.txt", URL: "https://files/a"}}})
_ = s.PutTurn(&model.Turn{Channel: "C1", ThreadTS: "2.0", MessageTS: "3.0", Text: "second", StartedAt: now})
_ = s.PutTurn(&model.Turn{Channel: "D9", ThreadTS: "4.0", MessageTS: "4.0", DM: true, StartedAt: now})
if err := s.PutTurn(&model.Turn{Channel: "../evil", ThreadTS: "1.0"}); err == nil {
t.Fatal("a channel that isn't an ID must not name a file")
}
raw, err := os.ReadFile(filepath.Join(dir, "in-flight-C1.json"))
if err != nil {
t.Fatal(err)
}
var f struct {
Turns map[string]model.Turn `json:"turns"`
}
if err := json.Unmarshal(raw, &f); err != nil || len(f.Turns) != 2 || f.Turns["2.0"].Text != "second" {
t.Fatalf("in-flight-C1.json: %s %v", raw, err)
}
if _, err := os.Stat(filepath.Join(dir, "in-flight-D9.json")); err != nil {
t.Fatal("each channel gets its own file")
}
s2, err := Open(filepath.Join(dir, "state.json"))
if err != nil {
t.Fatal(err)
}
turns := s2.Turns()
if len(turns) != 3 || turns[0].Text != "first" || len(turns[0].Files) != 1 {
t.Fatalf("turns not reloaded oldest-first: %+v", turns)
}
_ = s2.DeleteTurn("D9", "4.0")
if _, err := os.Stat(filepath.Join(dir, "in-flight-D9.json")); !errors.Is(err, os.ErrNotExist) {
t.Fatal("a channel's file goes once its last turn ends")
}
files, err := s2.InFlightFiles("")
if err != nil || len(files) != 1 || files["in-flight-C1.json"] == nil {
t.Fatalf("in-flight files: %v %v", files, err)
}
if files, _ := s2.InFlightFiles("D9"); len(files) != 0 {
t.Fatalf("no file for a channel with nothing in flight: %v", files)
}
}
func TestBrokenInFlightFileDoesNotStopStartup(t *testing.T) {
dir := t.TempDir()
if err := os.WriteFile(filepath.Join(dir, "in-flight-C1.json"), []byte("{not json"), 0o600); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(dir, "state.json"), []byte(`{"owners":{},"sessions":{}}`), 0o600); err != nil {
t.Fatal(err)
}
s, err := Open(filepath.Join(dir, "state.json"))
if err != nil {
t.Fatal(err)
}
if len(s.Turns()) != 0 {
t.Fatal("a broken file has no turns")
}
if _, err := os.Stat(filepath.Join(dir, "in-flight-C1.json")); err != nil {
t.Fatal("a broken file is kept for debugging")
}
}
+10 -6
View File
@@ -13,9 +13,10 @@ import (
)
type Store struct {
path string
mu sync.Mutex
data struct {
path string
mu sync.Mutex
turns map[string]map[string]*model.Turn // channel → thread → turn, one in-flight file per channel
data struct {
Owners map[string]*model.Owner `json:"owners"`
Sessions map[string]*model.Session `json:"sessions"`
Permissions *model.PermissionsConfig `json:"permissions,omitempty"`
@@ -24,14 +25,17 @@ type Store struct {
}
func Open(path string) (*Store, error) {
s := &Store{path: path}
s := &Store{path: path, turns: map[string]map[string]*model.Turn{}}
s.data.Owners = map[string]*model.Owner{}
s.data.Sessions = map[string]*model.Session{}
s.data.Listen = map[string]model.ListenMode{}
b, err := os.ReadFile(path)
if errors.Is(err, os.ErrNotExist) {
return s, os.MkdirAll(filepath.Dir(path), 0o700)
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
return s, err
}
return s, s.loadTurns()
}
if err != nil {
return nil, err
@@ -48,7 +52,7 @@ func Open(path string) (*Store, error) {
if s.data.Listen == nil {
s.data.Listen = map[string]model.ListenMode{}
}
return s, nil
return s, s.loadTurns()
}
func (s *Store) save() error {