e03948f25d
Backend:
- ScreenStore.Upsert(): idempotentes INSERT ON CONFLICT für Self-Registration
- POST /api/v1/screens/register: Agent registriert sich beim Start (upsert)
- manage/register.go: neuer Handler, immer unter Tenant "morz"
Agent:
- config: screen_name + screen_orientation (mit Fallback auf screen_id / landscape)
- app.go: registerScreen() — POST /api/v1/screens/register beim Start (Retry 30s)
- app.go: pollPlaylist() — GET /api/v1/screens/{slug}/playlist alle 60s
- app.go: nowFn liefert Playlist statt statischer URL; PlayerContentURL als Fallback
- playerserver: PlaylistItem-Struct in NowPlaying; JS rotiert Items per duration_seconds
- JS: Playlist-Fingerprint verhindert Reset laufender Rotation bei unverändertem Stand
Ansible:
- config.json.j2: screen_name + screen_orientation ergänzt
- host_vars/info10: screen_name + screen_orientation
- host_vars/info01-dev: screen_name + screen_orientation
Kopplung per Konvention: screen_id (config.json) = slug (DB)
Beim ersten Neustart der Agents erscheinen die Bildschirme automatisch im Admin-UI.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
109 lines
3.1 KiB
Go
109 lines
3.1 KiB
Go
package config
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"os"
|
|
)
|
|
|
|
type Config struct {
|
|
// ScreenID is the unique slug for this screen — used for self-registration and playlist fetching.
|
|
ScreenID string `json:"screen_id"`
|
|
// ScreenName is the human-readable display name shown in the admin UI. Falls back to ScreenID.
|
|
ScreenName string `json:"screen_name"`
|
|
// ScreenOrientation is "landscape" (default) or "portrait".
|
|
ScreenOrientation string `json:"screen_orientation"`
|
|
|
|
ServerBaseURL string `json:"server_base_url"`
|
|
MQTTBroker string `json:"mqtt_broker"`
|
|
MQTTUsername string `json:"mqtt_username"`
|
|
MQTTPassword string `json:"mqtt_password"`
|
|
HeartbeatEvery int `json:"heartbeat_every_seconds"`
|
|
StatusReportEvery int `json:"status_report_every_seconds"`
|
|
PlayerListenAddr string `json:"player_listen_addr"`
|
|
// PlayerContentURL is a fallback URL shown when no playlist is available from the server.
|
|
PlayerContentURL string `json:"player_content_url"`
|
|
}
|
|
|
|
const defaultConfigPath = "/etc/signage/config.json"
|
|
|
|
func Load() (Config, error) {
|
|
cfg := defaultConfig()
|
|
|
|
configPath := getenv("MORZ_INFOBOARD_CONFIG", defaultConfigPath)
|
|
if err := loadFromFile(configPath, &cfg); err != nil {
|
|
if !os.IsNotExist(err) {
|
|
return Config{}, fmt.Errorf("load config file: %w", err)
|
|
}
|
|
}
|
|
|
|
overrideFromEnv(&cfg)
|
|
|
|
if cfg.ScreenID == "" {
|
|
return Config{}, fmt.Errorf("screen id is required")
|
|
}
|
|
|
|
if cfg.ScreenName == "" {
|
|
cfg.ScreenName = cfg.ScreenID
|
|
}
|
|
|
|
if cfg.HeartbeatEvery <= 0 {
|
|
cfg.HeartbeatEvery = defaultConfig().HeartbeatEvery
|
|
}
|
|
|
|
if cfg.StatusReportEvery <= 0 {
|
|
cfg.StatusReportEvery = defaultConfig().StatusReportEvery
|
|
}
|
|
|
|
return cfg, nil
|
|
}
|
|
|
|
func defaultConfig() Config {
|
|
return Config{
|
|
ScreenID: "unset-screen",
|
|
ScreenOrientation: "landscape",
|
|
ServerBaseURL: "http://127.0.0.1:8080",
|
|
MQTTBroker: "",
|
|
HeartbeatEvery: 30,
|
|
StatusReportEvery: 60,
|
|
PlayerListenAddr: "127.0.0.1:8090",
|
|
PlayerContentURL: "",
|
|
}
|
|
}
|
|
|
|
func loadFromFile(path string, cfg *Config) error {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return json.Unmarshal(data, cfg)
|
|
}
|
|
|
|
func overrideFromEnv(cfg *Config) {
|
|
cfg.ScreenID = getenv("MORZ_INFOBOARD_SCREEN_ID", cfg.ScreenID)
|
|
cfg.ServerBaseURL = getenv("MORZ_INFOBOARD_SERVER_URL", cfg.ServerBaseURL)
|
|
cfg.MQTTBroker = getenv("MORZ_INFOBOARD_MQTT_BROKER", cfg.MQTTBroker)
|
|
cfg.MQTTUsername = getenv("MORZ_INFOBOARD_MQTT_USERNAME", cfg.MQTTUsername)
|
|
cfg.MQTTPassword = getenv("MORZ_INFOBOARD_MQTT_PASSWORD", cfg.MQTTPassword)
|
|
cfg.PlayerListenAddr = getenv("MORZ_INFOBOARD_PLAYER_ADDR", cfg.PlayerListenAddr)
|
|
cfg.ScreenName = getenv("MORZ_INFOBOARD_SCREEN_NAME", cfg.ScreenName)
|
|
cfg.ScreenOrientation = getenv("MORZ_INFOBOARD_SCREEN_ORIENTATION", cfg.ScreenOrientation)
|
|
cfg.PlayerContentURL = getenv("MORZ_INFOBOARD_PLAYER_CONTENT_URL", cfg.PlayerContentURL)
|
|
if value := getenv("MORZ_INFOBOARD_STATUS_REPORT_EVERY", ""); value != "" {
|
|
var parsed int
|
|
_, _ = fmt.Sscanf(value, "%d", &parsed)
|
|
if parsed > 0 {
|
|
cfg.StatusReportEvery = parsed
|
|
}
|
|
}
|
|
}
|
|
|
|
func getenv(key, fallback string) string {
|
|
value := os.Getenv(key)
|
|
if value == "" {
|
|
return fallback
|
|
}
|
|
|
|
return value
|
|
}
|