Skip to content

Commit 938c837

Browse files
committed
feat(settings): add anisette server configuration
Expose the anisette server the engine provisions against in the settings advanced section, above the per-account reset. The engine reports its server with a source suffix, so the GET route returns an empty server while the engine default is in effect; the settings UI then shows the default through the input placeholder. An empty save maps to `anisette server --reset`. A combobox of input plus dropdown offers the known public servers and a custom URL, which is validated as an absolute http(s) URL before the engine runs.
1 parent 3c54498 commit 938c837

10 files changed

Lines changed: 357 additions & 5 deletions

File tree

‎internal/manager/anisette.go‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package manager
22

33
import (
44
"errors"
5+
"net/url"
56
"strings"
67

78
"github.com/bitxeno/atvloadly/internal/exec"
@@ -26,3 +27,87 @@ func ResetAnisette(email string) error {
2627
log.Infof("Reset anisette data for %s", email)
2728
return nil
2829
}
30+
31+
// AnisetteServerState is the anisette server the engine provisions against,
32+
// with whether it is the engine default rather than a configured one.
33+
type AnisetteServerState struct {
34+
Server string `json:"server"`
35+
IsDefault bool `json:"is_default"`
36+
}
37+
38+
// AnisetteServer returns the anisette server the engine provisions against.
39+
func AnisetteServer() (*AnisetteServerState, error) {
40+
output, err := exec.NewCommand("plumesign", "anisette", "server").CombinedOutput()
41+
if err != nil {
42+
log.Err(err).Msg("Error reading anisette server")
43+
return nil, err
44+
}
45+
server, isDefault := parseAnisetteServer(string(output))
46+
return &AnisetteServerState{Server: server, IsDefault: isDefault}, nil
47+
}
48+
49+
// SetAnisetteServer points the engine at an anisette server. An empty URL
50+
// restores the engine default.
51+
func SetAnisetteServer(server string) error {
52+
server = strings.TrimSpace(server)
53+
if server == "" {
54+
return resetAnisetteServer()
55+
}
56+
if err := validateAnisetteServer(server); err != nil {
57+
return err
58+
}
59+
60+
if _, err := exec.NewCommand("plumesign", "anisette", "server", "--set", server).CombinedOutput(); err != nil {
61+
log.Err(err).Msgf("Error setting anisette server to %s", server)
62+
return err
63+
}
64+
log.Infof("Set anisette server to %s", server)
65+
return nil
66+
}
67+
68+
func resetAnisetteServer() error {
69+
if _, err := exec.NewCommand("plumesign", "anisette", "server", "--reset").CombinedOutput(); err != nil {
70+
log.Err(err).Msg("Error resetting anisette server")
71+
return err
72+
}
73+
log.Infof("Reset anisette server to default")
74+
return nil
75+
}
76+
77+
// validateAnisetteServer mirrors the engine check, so obviously wrong input is
78+
// rejected before a command runs.
79+
func validateAnisetteServer(server string) error {
80+
parsed, err := url.Parse(server)
81+
if err != nil || (parsed.Scheme != "http" && parsed.Scheme != "https") || parsed.Host == "" {
82+
return errors.New("invalid server URL; expected an absolute http:// or https:// URL")
83+
}
84+
return nil
85+
}
86+
87+
// parseAnisetteServer extracts the URL from the engine output line
88+
// "[<log prefix>] Anisette server: <URL> (source: ...)". The source suffix
89+
// tells whether the URL is the engine default or a configured one; a default
90+
// server is reported as the empty string, because an unset input means "use
91+
// the default".
92+
func parseAnisetteServer(output string) (string, bool) {
93+
const marker = "Anisette server:"
94+
for _, line := range strings.Split(output, "\n") {
95+
index := strings.Index(line, marker)
96+
if index < 0 {
97+
continue
98+
}
99+
value := strings.TrimSpace(line[index+len(marker):])
100+
source := strings.TrimSpace(value)
101+
isDefault := strings.Contains(source, "(source: default)")
102+
if cutoff := strings.Index(source, " (source:"); cutoff >= 0 {
103+
source = source[:cutoff]
104+
}
105+
if isDefault {
106+
return "", true
107+
}
108+
if server := strings.TrimSpace(source); server != "" {
109+
return server, false
110+
}
111+
}
112+
return "", false
113+
}

‎internal/manager/anisette_test.go‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,91 @@ func TestResetAnisetteReportsEngineFailure(t *testing.T) {
6060
t.Fatal("ResetAnisette() error = nil, want an error")
6161
}
6262
}
63+
64+
// The engine reports the active anisette server on stdout with a log prefix;
65+
// the manager picks the URL out of that line.
66+
func TestAnisetteServerReadsEngineOutput(t *testing.T) {
67+
dir := t.TempDir()
68+
script := "#!/bin/sh\n" +
69+
"printf '[2026-10-23 12:32:34 INFO plumesign::commands::anisette] Anisette server: https://ani.example.com (source: anisette.json)\\n'\n"
70+
if err := os.WriteFile(filepath.Join(dir, "plumesign"), []byte(script), 0o755); err != nil {
71+
t.Fatal(err)
72+
}
73+
t.Setenv("PATH", dir+string(os.PathListSeparator)+os.Getenv("PATH"))
74+
75+
state, err := AnisetteServer()
76+
if err != nil {
77+
t.Fatalf("AnisetteServer() error = %v", err)
78+
}
79+
if state.Server != "https://ani.example.com" {
80+
t.Errorf("server = %q, want the URL without the log prefix and source suffix", state.Server)
81+
}
82+
if state.IsDefault {
83+
t.Error("a configured server was reported as the default")
84+
}
85+
}
86+
87+
// A default engine server reads back as empty, because an unset input means
88+
// "use the default" in the settings UI.
89+
func TestAnisetteServerReadsDefaultAsEmpty(t *testing.T) {
90+
dir := t.TempDir()
91+
script := "#!/bin/sh\n" +
92+
"printf '[2026-10-23 12:32:34 INFO plumesign::commands::anisette] Anisette server: https://mac-ani.jkcoxson.com (source: default)\\n'\n"
93+
if err := os.WriteFile(filepath.Join(dir, "plumesign"), []byte(script), 0o755); err != nil {
94+
t.Fatal(err)
95+
}
96+
t.Setenv("PATH", dir+string(os.PathListSeparator)+os.Getenv("PATH"))
97+
98+
state, err := AnisetteServer()
99+
if err != nil {
100+
t.Fatalf("AnisetteServer() error = %v", err)
101+
}
102+
if state.Server != "" {
103+
t.Errorf("server = %q, want empty for the engine default", state.Server)
104+
}
105+
if !state.IsDefault {
106+
t.Error("the default server was not reported as default")
107+
}
108+
}
109+
110+
// A custom server reaches the engine as the value of --set.
111+
func TestSetAnisetteServerRunsEngineCommand(t *testing.T) {
112+
record := fakeAnisetteEngine(t, "0")
113+
114+
if err := SetAnisetteServer("https://ani.example.com"); err != nil {
115+
t.Fatalf("SetAnisetteServer() error = %v", err)
116+
}
117+
118+
want := "anisette server --set https://ani.example.com"
119+
if got := strings.Join(recordedArgs(t, record), " "); got != want {
120+
t.Errorf("arguments = %q, want %q", got, want)
121+
}
122+
}
123+
124+
// An empty server restores the engine default through --reset instead of
125+
// passing an empty --set value.
126+
func TestSetAnisetteServerEmptyRestoresDefault(t *testing.T) {
127+
record := fakeAnisetteEngine(t, "0")
128+
129+
if err := SetAnisetteServer(" "); err != nil {
130+
t.Fatalf("SetAnisetteServer() error = %v", err)
131+
}
132+
133+
want := "anisette server --reset"
134+
if got := strings.Join(recordedArgs(t, record), " "); got != want {
135+
t.Errorf("arguments = %q, want %q", got, want)
136+
}
137+
}
138+
139+
// A value the engine would reject is refused before a command runs.
140+
func TestSetAnisetteServerRejectsInvalidURL(t *testing.T) {
141+
record := fakeAnisetteEngine(t, "0")
142+
143+
if err := SetAnisetteServer("notaurl"); err == nil {
144+
t.Fatal("SetAnisetteServer() error = nil, want an error")
145+
}
146+
147+
if _, err := os.Stat(record); !os.IsNotExist(err) {
148+
t.Errorf("the engine was run for an invalid URL (stat err = %v)", err)
149+
}
150+
}

‎locales/en.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,10 @@
483483
"title": "Advanced",
484484
"update_coreadi": "Update CoreADI",
485485
"update_coreadi_confirm": "Are you sure you want update the CoreADI libraries?",
486+
"anisette_server": "Anisette Server",
487+
"anisette_server_default_tag": "Default",
488+
"anisette_server_tips": "Leave empty to use the default server. Changing the server invalidates existing anisette data; reset the account if requests start failing.",
489+
"save": "Save",
486490
"reset_anisette": "Reset Anisette Data",
487491
"reset_anisette_select": "Select an account",
488492
"reset_anisette_empty": "Anisette data is reset per account. Add an Apple ID account first.",
@@ -495,7 +499,9 @@
495499
"success": "Update completed",
496500
"failed": "Update failed",
497501
"reset_success": "Anisette data of {{email}} reset",
498-
"reset_failed": "Reset failed"
502+
"reset_failed": "Reset failed",
503+
"server_success": "Anisette server saved",
504+
"server_failed": "Saving anisette server failed"
499505
}
500506
}
501507
},

‎locales/sr-Latn.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@
480480
"title": "Napredno",
481481
"update_coreadi": "Ažuriraj CoreADI",
482482
"update_coreadi_confirm": "Da li ste sigurni da želite da ažurirate CoreADI biblioteke?",
483+
"anisette_server": "Anisette server",
484+
"anisette_server_default_tag": "Podrazumevani",
485+
"anisette_server_tips": "Ostavite prazno za podrazumevani server. Promena servera čini postojeće Anisette podatke nevažećim; resetujte nalog ako zahtevi počnu da otkazuju.",
486+
"save": "Sačuvaj",
483487
"reset_anisette": "Resetuj Anisette podatke",
484488
"reset_anisette_select": "Izaberite nalog",
485489
"reset_anisette_empty": "Anisette podaci se resetuju po nalogu. Prvo dodajte Apple ID nalog.",
@@ -492,7 +496,9 @@
492496
"success": "Ažuriranje je završeno",
493497
"failed": "Ažuriranje nije uspelo",
494498
"reset_success": "Anisette podaci za {{email}} su resetovani",
495-
"reset_failed": "Resetovanje nije uspelo"
499+
"reset_failed": "Resetovanje nije uspelo",
500+
"server_success": "Anisette server je sačuvan",
501+
"server_failed": "Čuvanje Anisette servera nije uspelo"
496502
}
497503
}
498504
},

‎locales/sr.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@
480480
"title": "Напредно",
481481
"update_coreadi": "Ажурирај CoreADI",
482482
"update_coreadi_confirm": "Да ли сте сигурни да желите да ажурирате CoreADI библиотеке?",
483+
"anisette_server": "Anisette сервер",
484+
"anisette_server_default_tag": "Подразумевани",
485+
"anisette_server_tips": "Оставите празно за подразумевани сервер. Промена сервера чини постојеће Anisette податке неважећим; ресетујте налог ако захтеви почну да отказују.",
486+
"save": "Сачувај",
483487
"reset_anisette": "Ресетуј Anisette податке",
484488
"reset_anisette_select": "Изаберите налог",
485489
"reset_anisette_empty": "Anisette подаци се ресетују по налогу. Прво додајте Apple ID налог.",
@@ -492,7 +496,9 @@
492496
"success": "Ажурирање је завршено",
493497
"failed": "Ажурирање није успело",
494498
"reset_success": "Anisette подаци за {{email}} су ресетовани",
495-
"reset_failed": "Ресетовање није успело"
499+
"reset_failed": "Ресетовање није успело",
500+
"server_success": "Anisette сервер је сачуван",
501+
"server_failed": "Чување Anisette сервера није успело"
496502
}
497503
}
498504
},

‎locales/sv.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@
480480
"title": "Avancerat",
481481
"update_coreadi": "Uppdatera CoreADI",
482482
"update_coreadi_confirm": "Vill du verkligen uppdatera CoreADI-biblioteken?",
483+
"anisette_server": "Anisette-server",
484+
"anisette_server_default_tag": "Standard",
485+
"anisette_server_tips": "Lämna tomt för att använda standardservern. Byt av server gör befintlig Anisette-data ogiltig; återställ kontot om anropen börjar misslyckas.",
486+
"save": "Spara",
483487
"reset_anisette": "Återställ Anisette-data",
484488
"reset_anisette_select": "Välj ett konto",
485489
"reset_anisette_empty": "Anisette-data återställs per konto. Lägg till ett Apple ID-konto först.",
@@ -492,7 +496,9 @@
492496
"success": "Uppdateringen är klar",
493497
"failed": "Uppdateringen misslyckades",
494498
"reset_success": "Anisette-data för {{email}} har återställts",
495-
"reset_failed": "Återställningen misslyckades"
499+
"reset_failed": "Återställningen misslyckades",
500+
"server_success": "Anisette-servern har sparats",
501+
"server_failed": "Det gick inte att spara Anisette-servern"
496502
}
497503
}
498504
},

‎locales/zh_cn.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,10 @@
483483
"title": "高级",
484484
"update_coreadi": "更新 CoreADI",
485485
"update_coreadi_confirm": "确认要下载并更新 CoreADI 库文件吗?",
486+
"anisette_server": "Anisette 服务器",
487+
"anisette_server_default_tag": "默认",
488+
"anisette_server_tips": "留空使用默认服务器。更换服务器后已有的 Anisette 数据会失效;如请求开始失败,请重置对应帐号。",
489+
"save": "保存",
486490
"reset_anisette": "重置 Anisette 数据",
487491
"reset_anisette_select": "请选择帐号",
488492
"reset_anisette_empty": "Anisette 数据按帐号重置,请先添加 Apple ID 帐号。",
@@ -495,7 +499,9 @@
495499
"success": "更新完成",
496500
"failed": "更新失败",
497501
"reset_success": "已重置 {{email}} 的 Anisette 数据",
498-
"reset_failed": "重置失败"
502+
"reset_failed": "重置失败",
503+
"server_success": "Anisette 服务器已保存",
504+
"server_failed": "保存 Anisette 服务器失败"
499505
}
500506
}
501507
},

‎web/router.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,29 @@ func route(fi *fiber.App) {
865865
return c.Status(http.StatusOK).JSON(apiSuccess(true))
866866
})
867867

868+
// The anisette server the engine provisions against; the server is empty
869+
// when the engine default is in effect.
870+
api.Get("/settings/anisette/server", func(c *fiber.Ctx) error {
871+
state, err := manager.AnisetteServer()
872+
if err != nil {
873+
return c.Status(http.StatusOK).JSON(apiError(err.Error()))
874+
}
875+
return c.Status(http.StatusOK).JSON(apiSuccess(state))
876+
})
877+
878+
api.Post("/settings/anisette/server", func(c *fiber.Ctx) error {
879+
var req struct {
880+
Server string `json:"server"`
881+
}
882+
if err := c.BodyParser(&req); err != nil {
883+
return c.Status(http.StatusOK).JSON(apiError("Invalid argument"))
884+
}
885+
if err := manager.SetAnisetteServer(req.Server); err != nil {
886+
return c.Status(http.StatusOK).JSON(apiError(err.Error()))
887+
}
888+
return c.Status(http.StatusOK).JSON(apiSuccess(true))
889+
})
890+
868891
api.Get("/notify/send", func(c *fiber.Ctx) error {
869892
title := c.Query("title")
870893
desc := c.Query("desc")

‎web/static/src/api/api.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,21 @@ export default {
430430
data,
431431
});
432432
},
433+
getAnisetteServer: () => {
434+
return request({
435+
url: "/api/settings/anisette/server",
436+
method: "get",
437+
timeout: 30000,
438+
});
439+
},
440+
setAnisetteServer: (data) => {
441+
return request({
442+
url: "/api/settings/anisette/server",
443+
method: "post",
444+
timeout: 30000,
445+
data,
446+
});
447+
},
433448
importPair: (data) => {
434449
return request({
435450
url: "/api/pair/import",

0 commit comments

Comments
 (0)
⌂ 换网址