Skip to content

Open-source AI browser agent for Chrome and Firefox (monorepo) 🧠

companion: publish settings only after successful save

Barack Sokullu7f285a855af0
diff --git a/webbrain-systray/internal/settings/settings.go b/webbrain-systray/internal/settings/settings.go
index ec6dde88a..d0a3208ed 100644
--- a/webbrain-systray/internal/settings/settings.go
+++ b/webbrain-systray/internal/settings/settings.go
@@ -124,7 +124,7 @@ func Open() (*Store, error) {
changed = true
}
if changed {
- if err := st.saveLocked(); err != nil {
+ if err := st.saveLocked(st.s); err != nil {
return nil, err
}
}
@@ -142,12 +142,17 @@ func (st *Store) Get() Settings {
func (st *Store) Update(fn func(*Settings)) (Settings, error) {
st.mu.Lock()
defer st.mu.Unlock()
- fn(&st.s)
- return st.s, st.saveLocked()
+ next := st.s
+ fn(&next)
+ if err := st.saveLocked(next); err != nil {
+ return st.s, err
+ }
+ st.s = next
+ return next, nil
}
-func (st *Store) saveLocked() error {
- data, err := json.MarshalIndent(st.s, "", " ")
+func (st *Store) saveLocked(s Settings) error {
+ data, err := json.MarshalIndent(s, "", " ")
if err != nil {
return err
}
diff --git a/webbrain-systray/internal/settings/settings_test.go b/webbrain-systray/internal/settings/settings_test.go
index 300f404a0..c897898b2 100644
--- a/webbrain-systray/internal/settings/settings_test.go
+++ b/webbrain-systray/internal/settings/settings_test.go
@@ -33,3 +33,24 @@ func TestPortMigration(t *testing.T) {
}
}
}
+
+func TestFailedUpdateKeepsPublishedSettings(t *testing.T) {
+ t.Setenv("WBC_HOME", t.TempDir())
+ st, err := Open()
+ if err != nil {
+ t.Fatal(err)
+ }
+ before := st.Get()
+ blocker := filepath.Join(t.TempDir(), "not-a-directory")
+ if err := os.WriteFile(blocker, []byte("block"), 0o600); err != nil {
+ t.Fatal(err)
+ }
+ st.path = filepath.Join(blocker, "settings.json")
+ returned, err := st.Update(func(s *Settings) { s.APIKey = NewAPIKey() })
+ if err == nil {
+ t.Fatal("update unexpectedly persisted through a regular file")
+ }
+ if returned.APIKey != before.APIKey || st.Get().APIKey != before.APIKey {
+ t.Fatal("failed update published an unpersisted API key")
+ }
+}