From 70605fda7db53937fdc6f902e0a5d83aed03304a Mon Sep 17 00:00:00 2001 From: Panonim Date: Wed, 8 Jul 2026 22:48:17 +0200 Subject: [PATCH 01/53] Updated subrequests in dynawidgets --- docs/docs/contributing.md | 13 ++++++++++ internal/dynacat/widget-dynawidgets.go | 33 +++++++++++++++++++++----- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md index ad67970f..a2f729ca 100644 --- a/docs/docs/contributing.md +++ b/docs/docs/contributing.md @@ -66,6 +66,19 @@ If you want to share a custom widget with the community, follow these steps: 5. Add a `required:` section at the bottom of `template.txt` to specify default configuration values. This is optional but recommended for any API that requires a URL or other configuration. The format is YAML, with supported fields: - `url`: The default API endpoint to fetch data from + - `subrequests`: Default subrequests keyed by name, each a request with its own `url` (and optional `headers`, `method`, etc). Required if your template calls `.Subrequest "key"`, so the key is defined even when the user does not set it. Example: + + ```text +
{{ (.Subrequest "heartbeats").JSON.Int "count" }}
+ + required: | + url: https://api.example.com/stats + subrequests: + heartbeats: + url: https://api.example.com/heartbeats + ``` + + Users can override each subrequest's URL the same way they override the primary `url`. When users add your widget to their config, they can override these defaults: diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index f5b8b948..f3a98a62 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -48,7 +48,8 @@ type dynawidgetsListEntry struct { } type dynawidgetsRequired struct { - URL string `yaml:"url"` + URL string `yaml:"url"` + Subrequests map[string]*CustomAPIRequest `yaml:"subrequests"` } func (widget *dynawidgetsWidget) initialize() error { @@ -80,12 +81,32 @@ func (widget *dynawidgetsWidget) initialize() error { } // Apply required defaults if user hasn't specified them - if required != nil && required.URL != "" { - if widget.CustomAPIRequest == nil { - widget.CustomAPIRequest = &CustomAPIRequest{} + if required != nil { + if required.URL != "" { + if widget.CustomAPIRequest == nil { + widget.CustomAPIRequest = &CustomAPIRequest{} + } + if widget.CustomAPIRequest.URL == "" { + widget.CustomAPIRequest.URL = required.URL + } } - if widget.CustomAPIRequest.URL == "" { - widget.CustomAPIRequest.URL = required.URL + + // Merge subrequests declared in the template's required section. + // User config takes precedence; a template default only fills a + // subrequest the user hasn't defined, or an empty URL on one they have. + for key, req := range required.Subrequests { + if req == nil { + continue + } + if widget.Subrequests == nil { + widget.Subrequests = make(map[string]*CustomAPIRequest) + } + existing, ok := widget.Subrequests[key] + if !ok || existing == nil { + widget.Subrequests[key] = req + } else if existing.URL == "" { + existing.URL = req.URL + } } } From 51fe1541523a042be21bc273dcd42d323663e99d Mon Sep 17 00:00:00 2001 From: Panonim Date: Tue, 14 Jul 2026 11:59:53 +0200 Subject: [PATCH 02/53] Updated dynawidgets to fix a bug with subrequests --- internal/dynacat/widget-dynawidgets.go | 34 +++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index f3a98a62..8c678ee6 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -54,6 +54,7 @@ type dynawidgetsRequired struct { func (widget *dynawidgetsWidget) initialize() error { widget.withTitle("Dynawidgets").withCacheDuration(1 * time.Minute) + widget.widgetBase.WIP = true if widget.Widget == "" { return errors.New("widget (slug) is required") @@ -184,7 +185,7 @@ func dynawidgetsParseTemplate(raw string) (templateContent string, required *dyn } templateContent = strings.TrimRight(raw[:idx], "\n\r ") - requiredRaw := strings.TrimSpace(raw[idx+len(separator):]) + requiredRaw := dedentYAMLBlock(raw[idx+len(separator):]) if requiredRaw == "" { return templateContent, nil @@ -199,6 +200,37 @@ func dynawidgetsParseTemplate(raw string) (templateContent string, required *dyn return templateContent, required } +// dedentYAMLBlock strips the common leading indentation from the "required: |" +// block, keeping nested keys aligned. +func dedentYAMLBlock(raw string) string { + lines := strings.Split(raw, "\n") + + minIndent := -1 + for _, line := range lines { + if strings.TrimSpace(line) == "" { + continue + } + indent := len(line) - len(strings.TrimLeft(line, " \t")) + if minIndent == -1 || indent < minIndent { + minIndent = indent + } + } + + if minIndent <= 0 { + return strings.TrimSpace(raw) + } + + for i, line := range lines { + if len(line) >= minIndent { + lines[i] = line[minIndent:] + } else { + lines[i] = strings.TrimLeft(line, " \t") + } + } + + return strings.TrimSpace(strings.Join(lines, "\n")) +} + // dynawidgetsResolveTemplate checks for a cached template on disk, or fetches // it from the dynawidgets repository. Returns the template content, the // widget title (empty if loaded from cache), and parsed required config. From e0ed8ce2d63a659b6b38f01f49e1d6d36da5f0b6 Mon Sep 17 00:00:00 2001 From: Panonim Date: Tue, 14 Jul 2026 12:32:11 +0200 Subject: [PATCH 03/53] Dynawidget - fixed protocol handling --- internal/dynacat/widget-custom-api.go | 4 ++++ internal/dynacat/widget-dynawidgets.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/internal/dynacat/widget-custom-api.go b/internal/dynacat/widget-custom-api.go index 11255f25..d8297b2a 100644 --- a/internal/dynacat/widget-custom-api.go +++ b/internal/dynacat/widget-custom-api.go @@ -198,6 +198,10 @@ func (req *CustomAPIRequest) initialize() error { req.Method = http.MethodGet } + if !strings.Contains(req.URL, "://") { + req.URL = "https://" + req.URL + } + httpReq, err := http.NewRequest(strings.ToUpper(req.Method), req.URL, req.bodyReader) if err != nil { return err diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index 8c678ee6..41e5721c 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -191,6 +191,13 @@ func dynawidgetsParseTemplate(raw string) (templateContent string, required *dyn return templateContent, nil } + expanded, err := parseConfigVariables([]byte(requiredRaw)) + if err != nil { + slog.Error("Failed to expand variables in dynawidget required section", "error", err) + return templateContent, nil + } + requiredRaw = string(expanded) + required = &dynawidgetsRequired{} if err := yaml.Unmarshal([]byte(requiredRaw), required); err != nil { slog.Error("Failed to parse dynawidget required section", "error", err) From 6f964f6241ae11da230a32b415478028dbd0e638 Mon Sep 17 00:00:00 2001 From: Panonim Date: Sun, 19 Jul 2026 22:16:52 +0200 Subject: [PATCH 04/53] Added visual configuration --- docs/docs/changelog.md | 5 + docs/docs/configuration.md | 4 +- internal/dynacat/config-editor.go | 634 +++++++++++++++ internal/dynacat/dynacat.go | 12 +- internal/dynacat/editor-http.go | 84 ++ internal/dynacat/main.go | 2 + internal/dynacat/static/css/editor.css | 629 +++++++++++++++ internal/dynacat/static/css/main.css | 1 + internal/dynacat/static/css/widget-search.css | 2 +- .../dynacat/static/js/docker-controller.js | 2 +- internal/dynacat/static/js/editor.js | 739 ++++++++++++++++++ internal/dynacat/templates/page.html | 17 + internal/dynacat/widget-playing.go | 4 +- internal/dynacat/widget-schema.go | 357 +++++++++ pkg/sysinfo/sysinfo.go | 2 +- 15 files changed, 2484 insertions(+), 10 deletions(-) create mode 100644 internal/dynacat/config-editor.go create mode 100644 internal/dynacat/editor-http.go create mode 100644 internal/dynacat/static/css/editor.css create mode 100644 internal/dynacat/static/js/editor.js create mode 100644 internal/dynacat/widget-schema.go diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index cd5683f6..fc14f00a 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -1,3 +1,8 @@ +# Changes for 3.0.0 +- Fixed an issue where subrequests were not detected properly in `dynawidgets` +- Fixed `dynawidgets` protocol handling +- Added an option to visually edit your configuration + # Changes for 2.4.0 - Added Brave Search as an autocompletion engine and normal one - Added support for icons in the page title diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index bfc95b0f..2b6fa909 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -582,10 +582,10 @@ A keybind is one or more keys separated by spaces. Each key is a single letter o | Config value | Behavior | | ------------ | -------- | -| `h` | Automatically expanded to `d h` — press `d` then `h` | +| `h` | Automatically expanded to `d h` - press `d` then `h` | | `d h` | Press `d`, release, then press `h` within 1 second | | `d a c` | Three-key sequence: `d` → `a` → `c` | -| `1` | Automatically expanded to `d 1` — press `d` then `1` | +| `1` | Automatically expanded to `d 1` - press `d` then `1` | > [!NOTE] > diff --git a/internal/dynacat/config-editor.go b/internal/dynacat/config-editor.go new file mode 100644 index 00000000..358d765c --- /dev/null +++ b/internal/dynacat/config-editor.go @@ -0,0 +1,634 @@ +package dynacat + +import ( + "bytes" + "errors" + "fmt" + "math" + "os" + "path/filepath" + "sort" + "strconv" + "strings" + "syscall" + + "gopkg.in/yaml.v3" +) + +// The editor reads and writes the YAML source files directly using yaml.Node so +// comments, ordering and $include directives are preserved. Each page is either +// inline in the main file or pulled in via `- $include: file.yml`; edits are routed +// to the file that actually owns the page. + +type editorConfigView struct { + Pages []editorPageView `json:"pages"` +} + +type editorPageView struct { + Title string `json:"title"` + Slug string `json:"slug"` + Width string `json:"width"` + File string `json:"file"` + Writable bool `json:"writable"` + Columns []editorColumnView `json:"columns"` +} + +type editorColumnView struct { + Size string `json:"size"` + Widgets []editorWidgetView `json:"widgets"` +} + +type editorWidgetView struct { + Type string `json:"type"` + Title string `json:"title"` + Values map[string]string `json:"values"` + Widgets []editorWidgetView `json:"widgets,omitempty"` // nested children for container widgets +} + +type editorMutation struct { + Op string `json:"op"` + Page int `json:"page"` + Column int `json:"column"` // addColumn/removeColumn + Index int `json:"index"` // addColumn insert position + Path []int `json:"path"` // widget location: [column, ...nested, index] + ToPath []int `json:"toPath"` // moveWidget destination + Size string `json:"size"` + WidgetType string `json:"widgetType"` + Fields map[string]any `json:"fields"` // scalar inputs + RawFields map[string]string `json:"rawFields"` // yaml-kind inputs, parsed as YAML + Title string `json:"title"` // addPage + Layout []string `json:"layout"` // addPage column sizes +} + +type editorPermissionError struct{ path string } + +func (e *editorPermissionError) Error() string { + return fmt.Sprintf("cannot write %s: the config directory is read only or lacks write permission", filepath.Base(e.path)) +} + +// isWriteBlockedError reports errors meaning the file cannot be written: permission +// denied or a read-only filesystem (e.g. a read-only Docker bind mount). +func isWriteBlockedError(err error) bool { + return os.IsPermission(err) || errors.Is(err, syscall.EROFS) +} + +type editorValidationError struct{ err error } + +func (e *editorValidationError) Error() string { return e.err.Error() } + +// buildEditorConfigView builds the logical page/column/widget tree from the source files. +func (a *application) buildEditorConfigView() (editorConfigView, error) { + mainPath := a.configPath + mainDoc, err := loadYAMLDocument(mainPath) + if err != nil { + return editorConfigView{}, err + } + + pagesNode := getMappingValue(documentRoot(mainDoc), "pages") + if pagesNode == nil || pagesNode.Kind != yaml.SequenceNode { + return editorConfigView{}, fmt.Errorf("config has no pages") + } + + view := editorConfigView{} + for i := range pagesNode.Content { + path, _, pageNode, err := resolvePageNode(mainDoc, mainPath, i) + if err != nil { + return editorConfigView{}, err + } + pv := pageNodeToView(pageNode, path) + // Slug is derived from the name at load time and absent from the source YAML, + // so take the runtime slug/title (page order matches the source order). + if i < len(a.Config.Pages) { + pv.Slug = a.Config.Pages[i].Slug + pv.Title = a.Config.Pages[i].Title + } + view.Pages = append(view.Pages, pv) + } + + return view, nil +} + +func pageNodeToView(pageNode *yaml.Node, path string) editorPageView { + pv := editorPageView{ + Title: scalarValue(getMappingValue(pageNode, "name")), + Slug: scalarValue(getMappingValue(pageNode, "slug")), + Width: scalarValue(getMappingValue(pageNode, "width")), + File: filepath.Base(path), + Writable: pathWritable(path), + } + + columns := getMappingValue(pageNode, "columns") + if columns == nil { + return pv + } + + for _, col := range columns.Content { + cv := editorColumnView{Size: scalarValue(getMappingValue(col, "size"))} + if widgets := getMappingValue(col, "widgets"); widgets != nil { + for _, w := range widgets.Content { + cv.Widgets = append(cv.Widgets, widgetNodeToView(w)) + } + } + pv.Columns = append(pv.Columns, cv) + } + + return pv +} + +func widgetNodeToView(w *yaml.Node) editorWidgetView { + wv := editorWidgetView{Values: map[string]string{}} + for i := 0; i+1 < len(w.Content); i += 2 { + key, val := w.Content[i].Value, w.Content[i+1] + switch key { + case "type": + wv.Type = val.Value + case "widgets": + // Container children are surfaced as nested views, not a raw value. + if val.Kind == yaml.SequenceNode { + for _, child := range val.Content { + wv.Widgets = append(wv.Widgets, widgetNodeToView(child)) + } + } + case "title": + wv.Title = val.Value + wv.Values[key] = nodeToText(val) + default: + wv.Values[key] = nodeToText(val) + } + } + return wv +} + +// applyEditorMutation mutates the owning source file's node tree, then writes and +// validates. On validation failure the original bytes are restored. +func (a *application) applyEditorMutation(m editorMutation) error { + mainPath := a.configPath + mainDoc, err := loadYAMLDocument(mainPath) + if err != nil { + return err + } + + if m.Op == "addPage" { + if err := mutateAddPage(documentRoot(mainDoc), m); err != nil { + return err + } + return a.writeConfigCandidate(mainPath, marshalDocument(mainDoc)) + } + + if m.Op == "removePage" { + pages := getMappingValue(documentRoot(mainDoc), "pages") + if pages == nil || !validIndex(pages.Content, m.Page) { + return fmt.Errorf("page %d out of range", m.Page) + } + // Drops the page (or its $include line) from the main file; included files stay on disk. + pages.Content = removeNode(pages.Content, m.Page) + return a.writeConfigCandidate(mainPath, marshalDocument(mainDoc)) + } + + path, doc, pageNode, err := resolvePageNode(mainDoc, mainPath, m.Page) + if err != nil { + return err + } + + columns := getMappingValue(pageNode, "columns") + if columns == nil || columns.Kind != yaml.SequenceNode { + return fmt.Errorf("page %d has no columns", m.Page) + } + + if err := mutateColumns(columns, m); err != nil { + return err + } + + return a.writeConfigCandidate(path, marshalDocument(doc)) +} + +func mutateColumns(columns *yaml.Node, m editorMutation) error { + switch m.Op { + case "addColumn": + col := newMappingNode() + addPair(col, "size", scalarNode(orDefault(m.Size, "full"))) + addPair(col, "widgets", sequenceNode()) + columns.Content = insertNode(columns.Content, m.Index, col) + return nil + case "removeColumn": + if !validIndex(columns.Content, m.Column) { + return fmt.Errorf("column %d out of range", m.Column) + } + columns.Content = removeNode(columns.Content, m.Column) + return nil + } + + widgets, index, err := resolveWidgets(columns, m.Path) + if err != nil { + return err + } + + switch m.Op { + case "addWidget": + node, err := buildWidgetNode(m.WidgetType, m.Fields, m.RawFields) + if err != nil { + return err + } + widgets.Content = insertNode(widgets.Content, index, node) + case "editWidget": + if !validIndex(widgets.Content, index) { + return fmt.Errorf("widget index out of range") + } + if err := editWidgetNode(widgets.Content[index], m.Fields, m.RawFields); err != nil { + return err + } + case "removeWidget": + if !validIndex(widgets.Content, index) { + return fmt.Errorf("widget index out of range") + } + widgets.Content = removeNode(widgets.Content, index) + case "moveWidget": + if isIntPrefix(m.Path, m.ToPath) { + return fmt.Errorf("cannot move a container into itself") + } + if !validIndex(widgets.Content, index) { + return fmt.Errorf("widget index out of range") + } + node := widgets.Content[index] + dstWidgets, dstIndex, err := resolveWidgets(columns, m.ToPath) + if err != nil { + return err + } + widgets.Content = removeNode(widgets.Content, index) + // Same parent: the target index was computed before removal. + if dstWidgets == widgets && dstIndex > index { + dstIndex-- + } + dstWidgets.Content = insertNode(dstWidgets.Content, dstIndex, node) + default: + return fmt.Errorf("unknown op: %s", m.Op) + } + return nil +} + +// resolveWidgets walks a widget path ([column, ...nested container indices, target +// index]) to the widgets sequence that owns the target and its index within it. +func resolveWidgets(columns *yaml.Node, path []int) (*yaml.Node, int, error) { + if len(path) < 2 { + return nil, 0, fmt.Errorf("invalid widget path") + } + + widgets := columnWidgets(columns, path[0]) + if widgets == nil { + return nil, 0, fmt.Errorf("column %d out of range", path[0]) + } + + for _, wi := range path[1 : len(path)-1] { + if !validIndex(widgets.Content, wi) { + return nil, 0, fmt.Errorf("widget %d out of range", wi) + } + container := widgets.Content[wi] + inner := getMappingValue(container, "widgets") + if inner == nil { + inner = sequenceNode() + addPair(container, "widgets", inner) + } + widgets = inner + } + + return widgets, path[len(path)-1], nil +} + +// isIntPrefix reports whether prefix is a leading slice of full (used to block +// moving a container into its own subtree). +func isIntPrefix(prefix, full []int) bool { + if len(prefix) > len(full) { + return false + } + for i := range prefix { + if prefix[i] != full[i] { + return false + } + } + return true +} + +func mutateAddPage(root *yaml.Node, m editorMutation) error { + pages := getMappingValue(root, "pages") + if pages == nil { + pages = sequenceNode() + addPair(root, "pages", pages) + } + + page := newMappingNode() + addPair(page, "name", scalarNode(orDefault(m.Title, "New Page"))) + + columns := sequenceNode() + layout := m.Layout + if len(layout) == 0 { + layout = []string{"full"} + } + for _, size := range layout { + col := newMappingNode() + addPair(col, "size", scalarNode(size)) + addPair(col, "widgets", sequenceNode()) + columns.Content = append(columns.Content, col) + } + addPair(page, "columns", columns) + + pages.Content = append(pages.Content, page) + return nil +} + +func (a *application) writeConfigCandidate(path string, candidate []byte) error { + perm := os.FileMode(0o644) + if info, err := os.Stat(path); err == nil { + perm = info.Mode() + } + + original, _ := os.ReadFile(path) + + if err := os.WriteFile(path, candidate, perm); err != nil { + if isWriteBlockedError(err) { + return &editorPermissionError{path} + } + return err + } + + merged, _, err := parseYAMLIncludes(a.configPath) + if err == nil { + _, err = newConfigFromYAML(merged) + } + if err != nil { + os.WriteFile(path, original, perm) // roll back invalid edit + return &editorValidationError{err} + } + + return nil +} + +// resolvePageNode returns the file, document and page mapping node owning a page. +func resolvePageNode(mainDoc *yaml.Node, mainPath string, idx int) (string, *yaml.Node, *yaml.Node, error) { + pages := getMappingValue(documentRoot(mainDoc), "pages") + if pages == nil || pages.Kind != yaml.SequenceNode || !validIndex(pages.Content, idx) { + return "", nil, nil, fmt.Errorf("page %d out of range", idx) + } + + item := pages.Content[idx] + if inc := includeTarget(item); inc != "" { + path := inc + if !filepath.IsAbs(path) { + path = filepath.Join(filepath.Dir(mainPath), path) + } + doc, err := loadYAMLDocument(path) + if err != nil { + return "", nil, nil, err + } + return path, doc, firstMapping(documentRoot(doc)), nil + } + + return mainPath, mainDoc, item, nil +} + +// +// yaml.Node helpers +// + +func loadYAMLDocument(path string) (*yaml.Node, error) { + b, err := os.ReadFile(path) + if err != nil { + return nil, err + } + var doc yaml.Node + if err := yaml.Unmarshal(b, &doc); err != nil { + return nil, err + } + return &doc, nil +} + +func documentRoot(doc *yaml.Node) *yaml.Node { + if doc.Kind == yaml.DocumentNode && len(doc.Content) > 0 { + return doc.Content[0] + } + return doc +} + +// firstMapping returns the page mapping, whether the file root is that mapping or a +// single-item sequence (the `- name: ...` form used by included page files). +func firstMapping(root *yaml.Node) *yaml.Node { + if root.Kind == yaml.SequenceNode && len(root.Content) > 0 { + return root.Content[0] + } + return root +} + +func includeTarget(item *yaml.Node) string { + if item.Kind != yaml.MappingNode { + return "" + } + for i := 0; i+1 < len(item.Content); i += 2 { + if k := item.Content[i].Value; k == "$include" || k == "!include" { + return strings.TrimSpace(item.Content[i+1].Value) + } + } + return "" +} + +func getMappingValue(m *yaml.Node, key string) *yaml.Node { + if m == nil || m.Kind != yaml.MappingNode { + return nil + } + for i := 0; i+1 < len(m.Content); i += 2 { + if m.Content[i].Value == key { + return m.Content[i+1] + } + } + return nil +} + +func setMappingKey(m *yaml.Node, key string, value *yaml.Node) { + for i := 0; i+1 < len(m.Content); i += 2 { + if m.Content[i].Value == key { + m.Content[i+1] = value + return + } + } + addPair(m, key, value) +} + +func removeMappingKey(m *yaml.Node, key string) { + for i := 0; i+1 < len(m.Content); i += 2 { + if m.Content[i].Value == key { + m.Content = append(m.Content[:i], m.Content[i+2:]...) + return + } + } +} + +func columnWidgets(columns *yaml.Node, index int) *yaml.Node { + if !validIndex(columns.Content, index) { + return nil + } + widgets := getMappingValue(columns.Content[index], "widgets") + if widgets == nil { + widgets = sequenceNode() + addPair(columns.Content[index], "widgets", widgets) + } + return widgets +} + +func buildWidgetNode(widgetType string, fields map[string]any, rawFields map[string]string) (*yaml.Node, error) { + if widgetType == "" { + return nil, fmt.Errorf("widget type is required") + } + node := newMappingNode() + addPair(node, "type", scalarNode(widgetType)) + return node, applyFieldsToNode(node, fields, rawFields) +} + +func editWidgetNode(node *yaml.Node, fields map[string]any, rawFields map[string]string) error { + return applyFieldsToNode(node, fields, rawFields) +} + +// applyFieldsToNode upserts scalar fields and parsed yaml fields; empty values drop the key. +func applyFieldsToNode(node *yaml.Node, fields map[string]any, rawFields map[string]string) error { + for _, k := range sortedKeys(fields) { + if isEmptyValue(fields[k]) { + removeMappingKey(node, k) + continue + } + setMappingKey(node, k, valueNode(fields[k])) + } + + for _, k := range sortedStringKeys(rawFields) { + if strings.TrimSpace(rawFields[k]) == "" { + removeMappingKey(node, k) + continue + } + parsed, err := parseYAMLValue(rawFields[k]) + if err != nil { + return fmt.Errorf("field %s: %w", k, err) + } + setMappingKey(node, k, parsed) + } + + return nil +} + +func parseYAMLValue(text string) (*yaml.Node, error) { + var doc yaml.Node + if err := yaml.Unmarshal([]byte(text), &doc); err != nil { + return nil, err + } + if len(doc.Content) == 0 { + return scalarNode(""), nil + } + return doc.Content[0], nil +} + +func marshalDocument(doc *yaml.Node) []byte { + var buf bytes.Buffer + enc := yaml.NewEncoder(&buf) + enc.SetIndent(2) + enc.Encode(doc) + enc.Close() + return buf.Bytes() +} + +func nodeToText(n *yaml.Node) string { + if n.Kind == yaml.ScalarNode { + return n.Value + } + return strings.TrimRight(string(marshalDocument(n)), "\n") +} + +func scalarValue(n *yaml.Node) string { + if n == nil { + return "" + } + return n.Value +} + +func newMappingNode() *yaml.Node { return &yaml.Node{Kind: yaml.MappingNode} } + +func sequenceNode() *yaml.Node { return &yaml.Node{Kind: yaml.SequenceNode} } + +func scalarNode(v string) *yaml.Node { return &yaml.Node{Kind: yaml.ScalarNode, Value: v} } + +func addPair(m *yaml.Node, key string, value *yaml.Node) { + m.Content = append(m.Content, scalarNode(key), value) +} + +func valueNode(v any) *yaml.Node { + switch x := v.(type) { + case bool: + return &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!bool", Value: strconv.FormatBool(x)} + case float64: + if x == math.Trunc(x) { + return &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!int", Value: strconv.FormatInt(int64(x), 10)} + } + return &yaml.Node{Kind: yaml.ScalarNode, Tag: "!!float", Value: strconv.FormatFloat(x, 'f', -1, 64)} + case string: + return scalarNode(x) + default: + return scalarNode(fmt.Sprintf("%v", v)) + } +} + +func isEmptyValue(v any) bool { + switch x := v.(type) { + case nil: + return true + case string: + return strings.TrimSpace(x) == "" + default: + return false + } +} + +func insertNode(nodes []*yaml.Node, index int, node *yaml.Node) []*yaml.Node { + if index < 0 || index > len(nodes) { + return append(nodes, node) + } + nodes = append(nodes, nil) + copy(nodes[index+1:], nodes[index:]) + nodes[index] = node + return nodes +} + +func removeNode(nodes []*yaml.Node, index int) []*yaml.Node { + return append(nodes[:index], nodes[index+1:]...) +} + +func validIndex(nodes []*yaml.Node, index int) bool { + return index >= 0 && index < len(nodes) +} + +func pathWritable(path string) bool { + f, err := os.OpenFile(path, os.O_WRONLY, 0) + if err != nil { + return false + } + f.Close() + return true +} + +func orDefault(v, fallback string) string { + if strings.TrimSpace(v) == "" { + return fallback + } + return v +} + +func sortedKeys(m map[string]any) []string { + keys := make([]string, 0, len(m)) + for k := range m { + keys = append(keys, k) + } + sort.Strings(keys) + return keys +} + +func sortedStringKeys(m map[string]string) []string { + keys := make([]string, 0, len(m)) + for k := range m { + keys = append(keys, k) + } + sort.Strings(keys) + return keys +} diff --git a/internal/dynacat/dynacat.go b/internal/dynacat/dynacat.go index 369f744e..82eea4d2 100644 --- a/internal/dynacat/dynacat.go +++ b/internal/dynacat/dynacat.go @@ -40,9 +40,10 @@ type imageProxyInfo struct { } type application struct { - Version string - CreatedAt time.Time - Config config + Version string + CreatedAt time.Time + Config config + configPath string // main config file path, used by the editor to write back parsedManifest []byte @@ -932,6 +933,11 @@ func (a *application) server() (func() error, func() error) { mux.HandleFunc("PUT /api/todo/{listID}", a.handleTodoSave) } + mux.HandleFunc("GET /api/editor/schema", a.handleEditorSchema) + mux.HandleFunc("GET /api/editor/status", a.handleEditorStatus) + mux.HandleFunc("GET /api/editor/config", a.handleEditorConfigLoad) + mux.HandleFunc("POST /api/editor/config", a.handleEditorConfigSave) + mux.Handle( fmt.Sprintf("GET /static/%s/{path...}", getStaticFSHash()), http.StripPrefix( diff --git a/internal/dynacat/editor-http.go b/internal/dynacat/editor-http.go new file mode 100644 index 00000000..69a1c573 --- /dev/null +++ b/internal/dynacat/editor-http.go @@ -0,0 +1,84 @@ +package dynacat + +import ( + "encoding/json" + "io" + "log/slog" + "net/http" +) + +const editorMaxBodyBytes = 1 << 20 // 1 MiB + +func (a *application) handleEditorSchema(w http.ResponseWriter, r *http.Request) { + if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { + return + } + writeJSON(w, http.StatusOK, allWidgetSchemas()) +} + +// handleEditorStatus returns a generation that changes whenever the config hot-reloads, +// letting the editor wait for the server to pick up a page add/remove before navigating. +func (a *application) handleEditorStatus(w http.ResponseWriter, r *http.Request) { + if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { + return + } + writeJSON(w, http.StatusOK, map[string]int64{"generation": a.CreatedAt.UnixNano()}) +} + +func (a *application) handleEditorConfigLoad(w http.ResponseWriter, r *http.Request) { + if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { + return + } + + view, err := a.buildEditorConfigView() + if err != nil { + slog.Error("Editor config load failed", "error", err) + writeJSONError(w, http.StatusInternalServerError, err.Error()) + return + } + writeJSON(w, http.StatusOK, view) +} + +func (a *application) handleEditorConfigSave(w http.ResponseWriter, r *http.Request) { + if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { + return + } + + r.Body = http.MaxBytesReader(w, r.Body, editorMaxBodyBytes) + body, err := io.ReadAll(r.Body) + if err != nil { + writeJSONError(w, http.StatusBadRequest, "invalid body") + return + } + + var mutation editorMutation + if err := json.Unmarshal(body, &mutation); err != nil { + writeJSONError(w, http.StatusBadRequest, "invalid JSON") + return + } + + if err := a.applyEditorMutation(mutation); err != nil { + switch err.(type) { + case *editorPermissionError: + writeJSONError(w, http.StatusForbidden, err.Error()) + case *editorValidationError: + writeJSONError(w, http.StatusUnprocessableEntity, err.Error()) + default: + slog.Error("Editor mutation failed", "op", mutation.Op, "error", err) + writeJSONError(w, http.StatusBadRequest, err.Error()) + } + return + } + + w.WriteHeader(http.StatusNoContent) +} + +func writeJSON(w http.ResponseWriter, status int, body any) { + w.Header().Set("Content-Type", "application/json") + w.WriteHeader(status) + json.NewEncoder(w).Encode(body) +} + +func writeJSONError(w http.ResponseWriter, status int, message string) { + writeJSON(w, status, map[string]string{"error": message}) +} diff --git a/internal/dynacat/main.go b/internal/dynacat/main.go index f4c676f0..9f64c638 100644 --- a/internal/dynacat/main.go +++ b/internal/dynacat/main.go @@ -158,6 +158,7 @@ func serveApp(configPath string) error { return } + app.configPath = configPath if !hadValidConfigOnStartup { hadValidConfigOnStartup = true @@ -203,6 +204,7 @@ func serveApp(configPath string) error { if err != nil { return fmt.Errorf("creating application: %w", err) } + app.configPath = configPath startServer, _ := app.server() if err := startServer(); err != nil { diff --git a/internal/dynacat/static/css/editor.css b/internal/dynacat/static/css/editor.css new file mode 100644 index 00000000..f5a3f974 --- /dev/null +++ b/internal/dynacat/static/css/editor.css @@ -0,0 +1,629 @@ +/* Interactive page editor UI. Only active while document.body has .editing. + Kept intentionally subtle: muted borders and text, accents only on hover. */ + +/* The visual editor is desktop only */ +@media (max-width: 768px) { + #editor-toggle { + display: none; + } +} + +.editor-toggle-icon { + width: 1.8rem; + height: 1.8rem; + stroke: var(--color-text-subdue); + transition: stroke 0.2s; +} + +#editor-toggle:hover .editor-toggle-icon { + stroke: var(--color-text-highlight); +} + +.editor-toggle-active .editor-toggle-icon { + stroke: var(--color-primary); +} + +/* Palette dock */ +.editor-palette { + position: fixed; + bottom: 0; + left: 0; + right: 0; + z-index: 40; + display: flex; + gap: 6px; + overflow-x: auto; + padding: 10px 16px; + background: var(--color-popover-background); + border-top: 1px solid var(--color-separator); + scrollbar-width: thin; +} + +.editor-palette::-webkit-scrollbar { + height: 6px; +} + +.editor-palette::-webkit-scrollbar-thumb { + background: var(--color-separator); + border-radius: 3px; +} + +.editor-palette-item { + flex: 0 0 auto; + display: flex; + flex-direction: column; + align-items: center; + gap: 5px; + width: 76px; + padding: 8px 6px; + border-radius: var(--border-radius); + cursor: grab; + user-select: none; + opacity: 0.75; + transition: opacity 0.15s, background 0.15s; +} + +.editor-palette-item:hover { + opacity: 1; + background: var(--color-widget-background); +} + +.editor-palette-icon { + width: 22px; + height: 22px; + background: var(--color-text-subdue); + mask: var(--icon-url) center / contain no-repeat; + -webkit-mask: var(--icon-url) center / contain no-repeat; +} + +.editor-palette-name { + width: 100%; + font-size: 1.05rem; + line-height: 1.2; + text-align: center; + color: var(--color-text-subdue); + overflow-wrap: anywhere; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; +} + +/* Leave room for the dock so it never hides page content */ +body.editing { + padding-bottom: 92px; +} + +/* Cards are spaced by the flex gap in edit mode, not the app's inter-widget margin */ +body.editing .widget + .widget { + margin-top: 0; +} + +/* Columns become filled container areas holding cards while editing */ +body.editing .page-column { + display: flex; + flex-direction: column; + gap: 8px; + min-height: 120px; + align-self: flex-start; + position: relative; + padding: 8px; + border-radius: var(--border-radius); + background: var(--color-widget-background); +} + +body.editing .page-column:not(:has(> .widget)) { + align-items: center; + justify-content: center; +} + +body.editing .page-column:not(:has(> .widget))::after { + content: "Drop widgets here"; + color: var(--color-text-subdue); + font-size: 1.2rem; + opacity: 0.5; + pointer-events: none; +} + +/* Widget cards: a compact icon + title box, no live content */ +.editor-widget { + display: flex; + flex-direction: column; + padding: 12px 14px; + border-radius: var(--border-radius); + background: var(--color-widget-background-highlight); + border: 1px solid var(--color-separator); + cursor: grab; + transition: border-color 0.15s; +} + +.editor-widget:hover { + border-color: var(--color-text-subdue); +} + +.editor-widget-header { + display: flex; + align-items: center; + gap: 10px; +} + +/* Container widgets (group / split-column): nested drop zone for child cards */ +.editor-nested { + position: relative; + display: flex; + flex-direction: column; + gap: 6px; + margin-top: 10px; + padding: 8px; + min-height: 46px; + border-radius: var(--border-radius); + background: var(--color-widget-background); +} + +.editor-nested:not(:has(> .widget)) { + align-items: center; + justify-content: center; +} + +.editor-nested:not(:has(> .widget))::after { + content: "Drop widgets here"; + color: var(--color-text-subdue); + font-size: 1.1rem; + opacity: 0.5; + pointer-events: none; +} + +/* split-column: lay children out side by side so the split is visible */ +.editor-nested-split:has(> .widget) { + flex-direction: row; + flex-wrap: wrap; + align-items: flex-start; + align-content: flex-start; +} + +.editor-nested-split > .editor-widget { + flex: 1 1 100px; + min-width: 100px; + align-self: flex-start; +} + +.editor-widget.editor-dragging { + opacity: 0.4; +} + +.editor-widget-card { + display: flex; + align-items: center; + gap: 10px; + min-width: 0; +} + +.editor-widget-icon { + flex-shrink: 0; + width: 22px; + height: 22px; + background: var(--color-text-subdue); + mask: var(--icon-url) center / contain no-repeat; + -webkit-mask: var(--icon-url) center / contain no-repeat; +} + +.editor-widget-title { + font-size: 1.3rem; + color: var(--color-text-base); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.editor-widget-tools { + margin-left: auto; + display: flex; + gap: 2px; + opacity: 0; + transition: opacity 0.15s; +} + +.editor-widget:hover .editor-widget-tools { + opacity: 1; +} + +.editor-tool { + display: flex; + padding: 3px; + border: none; + border-radius: var(--border-radius); + background: transparent; + color: var(--color-text-subdue); + cursor: pointer; +} + +.editor-tool:hover { + color: var(--color-text-highlight); +} + +.editor-tool svg { + width: 15px; + height: 15px; +} + +/* Column remove control: sits in the column's background area, below the cards */ +.editor-column-tools { + display: flex; + justify-content: center; + padding-top: 8px; + opacity: 0.6; + transition: opacity 0.15s; +} + +.editor-column-tools:hover { + opacity: 1; +} + +.editor-column-remove { + display: flex; + align-items: center; + gap: 6px; + padding: 5px 10px; + border: none; + border-radius: var(--border-radius); + background: transparent; + color: var(--color-text-subdue); + font: inherit; + font-size: 1.1rem; + cursor: pointer; +} + +.editor-column-remove:hover { + color: var(--color-negative); +} + +.editor-icon-inline { + display: flex; +} + +.editor-icon-inline svg { + width: 14px; + height: 14px; +} + +/* Drop marker: absolute overlay so it does not reflow the widgets */ +.editor-drop-marker { + position: absolute; + left: 8px; + right: 8px; + height: 2px; + border-radius: 2px; + background: var(--color-primary); + opacity: 0.7; + pointer-events: none; +} + +/* Vertical variant for horizontal (split-column) drop zones */ +.editor-drop-marker-v { + left: auto; + right: auto; + top: 8px; + bottom: 8px; + width: 2px; + height: auto; +} + +/* Inter-column add line: hidden until hover */ +.editor-add-column { + position: relative; + flex: 0 0 14px; + align-self: stretch; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; +} + +.editor-add-column::before { + content: ""; + position: absolute; + top: 0; + bottom: 0; + width: 2px; + background: var(--color-primary); + opacity: 0; + transition: opacity 0.15s ease; +} + +.editor-add-column-plus { + display: flex; + align-items: center; + justify-content: center; + width: 22px; + height: 22px; + border-radius: 50%; + background: var(--color-primary); + color: var(--color-background); + transform: scale(0); + transition: transform 0.15s ease; +} + +.editor-add-column-plus svg { + width: 13px; + height: 13px; +} + +.editor-add-column:hover::before { + opacity: 0.5; +} + +.editor-add-column:hover .editor-add-column-plus { + transform: scale(1); +} + +/* Add / remove page buttons */ +.editor-add-page, +.editor-remove-page { + cursor: pointer; + color: var(--color-text-subdue); + opacity: 0.6; + font-size: 0.9em; + transition: opacity 0.2s, color 0.2s; +} + +.editor-add-page:hover, +.editor-remove-page:hover { + opacity: 1; +} + +.editor-add-page:hover { + color: var(--color-text-highlight); +} + +.editor-remove-page:hover { + color: var(--color-negative); +} + +/* Modal */ +.editor-modal-overlay { + position: fixed; + inset: 0; + z-index: 60; + display: flex; + align-items: center; + justify-content: center; + padding: 16px; + background: rgba(0, 0, 0, 0.5); +} + +.editor-modal { + display: flex; + flex-direction: column; + gap: 16px; + width: 100%; + max-width: 520px; + max-height: 85vh; + overflow-y: auto; + padding: 20px; + border-radius: var(--border-radius); + background: var(--color-widget-background); + border: 1px solid var(--color-separator); +} + +.editor-modal-title { + font-size: 1.6rem; + color: var(--color-text-highlight); +} + +.editor-modal-body { + display: flex; + flex-direction: column; + gap: 14px; +} + +.editor-fields { + display: flex; + flex-direction: column; + gap: 12px; +} + +.editor-field { + display: flex; + flex-direction: column; + gap: 4px; +} + +.editor-field-label { + font-size: 1.2rem; + color: var(--color-text-subdue); +} + +.editor-required { + margin-left: 3px; + color: var(--color-primary); + font-weight: bold; +} + +/* Inputs: a clearly visible raised surface, lighter than the modal. + Scoped to .editor-modal so it outweighs the app's input[type="text"] reset. */ +.editor-modal .editor-input { + width: 100%; + padding: 8px 10px; + border-radius: var(--border-radius); + border: 1px solid var(--color-separator); + background: var(--color-widget-background-highlight); + color: var(--color-text-base); + font: inherit; + color-scheme: dark; +} + +.editor-modal .editor-input:focus { + outline: none; + border-color: var(--color-primary); +} + +/* Checkbox field: input and label on one row */ +.editor-check { + flex-direction: row; + align-items: center; + gap: 10px; + cursor: pointer; +} + +.editor-check-label { + font-size: 1.3rem; + color: var(--color-text-base); +} + +.editor-modal .editor-check input[type="checkbox"] { + appearance: none; + -webkit-appearance: none; + position: relative; + flex-shrink: 0; + width: 18px; + height: 18px; + margin: 0; + border: 1.5px solid var(--color-text-subdue); + border-radius: 5px; + background: transparent; + cursor: pointer; + transition: background 0.15s, border-color 0.15s; +} + +.editor-modal .editor-check input[type="checkbox"]:hover { + border-color: var(--color-primary); +} + +.editor-modal .editor-check input[type="checkbox"]:checked { + background: var(--color-primary); + border-color: var(--color-primary); +} + +.editor-modal .editor-check input[type="checkbox"]:checked::after { + content: ""; + position: absolute; + left: 6px; + top: 2px; + width: 4px; + height: 9px; + border: solid #fff; + border-width: 0 2px 2px 0; + transform: rotate(45deg); +} + +select.editor-input { + appearance: none; + cursor: pointer; +} + +.editor-textarea { + min-height: 90px; + resize: vertical; + font-family: monospace; +} + +.editor-icon-preview { + width: 26px; + height: 26px; + margin-top: 4px; +} + +.editor-collapsible summary { + cursor: pointer; + padding: 6px 0; + color: var(--color-text-subdue); + font-size: 1.2rem; +} + +.editor-modal-actions { + display: flex; + justify-content: flex-end; + gap: 10px; +} + +.editor-btn { + padding: 8px 16px; + border: 1px solid var(--color-separator); + border-radius: var(--border-radius); + background: transparent; + color: var(--color-text-base); + cursor: pointer; + font: inherit; +} + +.editor-btn:hover { + border-color: var(--color-text-subdue); +} + +.editor-btn-primary { + background: var(--color-primary); + color: var(--color-background); + border-color: var(--color-primary); +} + +.editor-btn-danger { + display: flex; + align-items: center; + gap: 6px; + color: var(--color-negative); + border-color: var(--color-negative); +} + +.editor-btn-danger:hover { + background: var(--color-negative); + color: var(--color-background); + border-color: var(--color-negative); +} + +.editor-confirm-message { + font-size: 1.35rem; + color: var(--color-text-base); +} + +/* Layout picker */ +.editor-layout-grid { + display: grid; + grid-template-columns: repeat(3, 1fr); + gap: 10px; +} + +.editor-layout-option { + display: flex; + gap: 3px; + height: 54px; + padding: 6px; + border-radius: var(--border-radius); + border: 2px solid var(--color-separator); + cursor: pointer; +} + +.editor-layout-option.selected { + border-color: var(--color-primary); +} + +.editor-layout-cell { + background: var(--color-text-subdue); + border-radius: 2px; +} + +.editor-layout-cell-small { + flex: 0 0 20%; +} + +.editor-layout-cell-full { + flex: 1; +} + +/* Toasts */ +.editor-toasts { + position: fixed; + top: 16px; + right: 16px; + z-index: 70; + display: flex; + flex-direction: column; + gap: 8px; +} + +.editor-toast { + padding: 9px 15px; + font-size: 1.2rem; + border-radius: var(--border-radius); + background: var(--color-popover-background); + border: 1px solid var(--color-separator); +} diff --git a/internal/dynacat/static/css/main.css b/internal/dynacat/static/css/main.css index 4f79d07a..5f12880c 100644 --- a/internal/dynacat/static/css/main.css +++ b/internal/dynacat/static/css/main.css @@ -63,4 +63,5 @@ @import "widgets.css"; @import "popover.css"; @import "utils.css"; +@import "editor.css"; @import "mobile.css"; diff --git a/internal/dynacat/static/css/widget-search.css b/internal/dynacat/static/css/widget-search.css index a065e43e..afa4b54d 100644 --- a/internal/dynacat/static/css/widget-search.css +++ b/internal/dynacat/static/css/widget-search.css @@ -110,7 +110,7 @@ border-top-width: 0; } -/* Dropdown base — positioned + sized by JS */ +/* Dropdown base - positioned + sized by JS */ .search-autocomplete { position: fixed; z-index: 200; diff --git a/internal/dynacat/static/js/docker-controller.js b/internal/dynacat/static/js/docker-controller.js index 366bbab9..94374c80 100644 --- a/internal/dynacat/static/js/docker-controller.js +++ b/internal/dynacat/static/js/docker-controller.js @@ -263,7 +263,7 @@ const key = widgetId + ':' + type + ':' + id; if (confirmingItems.has(key)) { - // Second click — perform the removal + // Second click - perform the removal const state = confirmingItems.get(key); clearTimeout(state.timeoutId); confirmingItems.delete(key); diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js new file mode 100644 index 00000000..793dacbf --- /dev/null +++ b/internal/dynacat/static/js/editor.js @@ -0,0 +1,739 @@ +// Interactive page editor: palette, drag and drop, option modals and layout tools. +// Loaded lazily on demand so it adds no overhead to normal page rendering. +// +// In edit mode the page columns are re-rendered from the config as simple icon+title +// cards (not live widgets), so editing never fights expanded widget content. Each save +// re-fetches the config and re-renders in place; the page only reloads when editing ends. + +const PD = typeof pageData !== "undefined" ? pageData : window.pageData; +const API = `${PD.baseURL}/api/editor`; + +const state = { + active: false, + schemas: [], + schemaByType: {}, + config: null, + pageIndex: -1, + drag: null, // {type} for a palette item, {fromPath} for a placed card +}; + +export async function toggleEditor() { + if (state.active) return exitEditor(); + await enterEditor(); +} + +async function enterEditor() { + try { + const [schemas, config] = await Promise.all([apiGet("/schema"), apiGet("/config")]); + state.schemas = schemas; + state.schemaByType = Object.fromEntries(schemas.map((s) => [s.type, s])); + state.config = config; + state.pageIndex = config.pages.findIndex((p) => p.slug === PD.slug); + } catch (err) { + toast(err.status === 401 ? "Log in to edit this page" : "Could not load editor", "negative"); + return; + } + + if (state.pageIndex < 0) { + toast("This page is not editable here", "negative"); + return; + } + + state.active = true; + sessionStorage.setItem("dynacat-editing", "1"); + document.body.classList.add("editing"); + document.getElementById("editor-toggle")?.classList.add("editor-toggle-active"); + + buildPalette(); + buildAddPageButton(); + + // page.js injects content only once the cache finishes building (marking #page + // content-ready), and may rebuild it. Wait for ready, then guard against rebuilds. + const ready = await waitForPageReady(); + if (!ready) { + toast("Page content is still loading, try again in a moment", "negative"); + return; + } + renderCanvas(); + guardCanvas(); +} + +// waitForPageReady resolves once page.js marks the page content-ready, or null on timeout. +function waitForPageReady(timeout = 30000) { + const page = document.getElementById("page"); + if (page && page.classList.contains("content-ready")) return Promise.resolve(page); + + return new Promise((resolve) => { + const observer = new MutationObserver(() => { + if (page && page.classList.contains("content-ready")) { + observer.disconnect(); + resolve(page); + } + }); + observer.observe(page || document.body, { attributes: true, attributeFilter: ["class"], childList: !page, subtree: !page }); + setTimeout(() => { + observer.disconnect(); + resolve(page && page.classList.contains("content-ready") ? page : null); + }, timeout); + }); +} + +// guardCanvas re-renders our cards if page.js later replaces the whole content. +function guardCanvas() { + const content = document.getElementById("page-content"); + if (!content) return; + new MutationObserver(() => { + const columns = document.querySelector(".page-columns"); + if (state.active && columns && !columns.dataset.editorCanvas) renderCanvas(); + }).observe(content, { childList: true, subtree: true }); +} + +function exitEditor() { + // Reload to restore the live widgets we replaced with editor cards. + sessionStorage.removeItem("dynacat-editing"); + location.reload(); +} + +// +// API +// + +async function apiGet(path) { + const res = await fetch(API + path); + if (!res.ok) throw { status: res.status }; + return res.json(); +} + +// commit posts a mutation; returns true on success, shows an error toast otherwise. +async function commit(mutation) { + const res = await fetch(`${API}/config`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(mutation), + }); + if (res.status === 204) return true; + const body = await res.json().catch(() => ({})); + toast(body.error || "Save failed", "negative"); + return false; +} + +// save commits then re-fetches the config and re-renders the canvas in place. +async function save(mutation) { + if (!(await commit(mutation))) return; + state.config = await apiGet("/config"); + renderCanvas(); +} + +// commitAndNavigate commits a page-level change, waits for the server to hot-reload +// (so the navigation reflects it), then runs navigate(). +async function commitAndNavigate(mutation, navigate) { + const before = await serverGeneration(); + if (!(await commit(mutation))) return; + await waitForServerReload(before); + navigate(); +} + +async function serverGeneration() { + try { + return (await apiGet("/status")).generation; + } catch { + return 0; + } +} + +function waitForServerReload(before, timeout = 6000) { + const started = Date.now(); + return new Promise((resolve) => { + const tick = async () => { + if ((await serverGeneration()) !== before || Date.now() - started > timeout) return resolve(); + setTimeout(tick, 300); + }; + setTimeout(tick, 300); + }); +} + +// +// Palette dock +// + +function buildPalette() { + const dock = div("editor-ui editor-palette"); + // Let the mouse wheel scroll the horizontal list instead of needing the scrollbar. + dock.addEventListener("wheel", (e) => { + if (!e.deltaY) return; + e.preventDefault(); + dock.scrollLeft += e.deltaY; + }, { passive: false }); + for (const schema of state.schemas) { + if (schema.hidden) continue; + const item = div("editor-palette-item"); + item.draggable = true; + item.title = schema.label; + if (schema.icon) item.append(maskIcon("editor-palette-icon", schema.icon)); + item.append(div("editor-palette-name", schema.label)); + item.addEventListener("dragstart", () => (state.drag = { type: schema.type })); + dock.append(item); + } + document.body.append(dock); +} + +// +// Canvas: columns and widget cards rendered from the config +// + +// slim pages allow 2 columns, standard ones 3. +function maxColumnsFor(page) { + return page.width === "slim" ? 2 : 3; +} + +function renderCanvas() { + const container = document.querySelector(".page-columns"); + if (!container) return; + container.innerHTML = ""; + + const page = state.config.pages[state.pageIndex]; + const canAddColumn = page.columns.length < maxColumnsFor(page); + + page.columns.forEach((col, colIndex) => { + if (canAddColumn) container.append(addColumnLine(colIndex)); + const colEl = div(`page-column page-column-${col.size}`); + setupDropTarget(colEl, [colIndex]); + (col.widgets || []).forEach((w, i) => colEl.append(buildWidgetCard(w, [colIndex, i]))); + colEl.append(buildColumnTools(colIndex)); + container.append(colEl); + }); + if (canAddColumn) container.append(addColumnLine(page.columns.length)); + container.dataset.editorCanvas = "1"; // marks this as our render so the guard skips it +} + +function buildColumnTools(colIndex) { + const tools = div("editor-ui editor-column-tools"); + const btn = button("Remove column", "editor-column-remove"); + btn.prepend(iconSpan(iconTrash)); + btn.addEventListener("click", () => removeColumn(colIndex)); + tools.append(btn); + return tools; +} + +function iconSpan(svg) { + const span = document.createElement("span"); + span.className = "editor-icon-inline"; + span.innerHTML = svg; + return span; +} + +function removeColumn(colIndex) { + confirmAction("Remove this column and its widgets?", () => + save({ op: "removeColumn", page: state.pageIndex, column: colIndex }) + ); +} + +const CONTAINER_TYPES = ["group", "split-column"]; + +function buildWidgetCard(w, path) { + const schema = state.schemaByType[w.type]; + const card = div("widget editor-widget"); + card.draggable = true; + card.addEventListener("dragstart", (e) => { + e.stopPropagation(); + state.drag = { fromPath: path }; + card.classList.add("editor-dragging"); + }); + card.addEventListener("dragend", () => card.classList.remove("editor-dragging")); + + const header = div("editor-widget-header"); + const body = div("editor-widget-card"); + if (schema?.icon) body.append(maskIcon("editor-widget-icon", schema.icon)); + body.append(div("editor-widget-title", w.title || schema?.label || w.type)); + header.append(body); + + const tools = div("editor-ui editor-widget-tools"); + tools.append(toolButton("Edit", iconPencil, () => openWidgetModal(path))); + tools.append(toolButton("Delete", iconTrash, () => removeWidget(path))); + header.append(tools); + card.append(header); + + // Container widgets get a nested drop zone showing their child cards. + if (CONTAINER_TYPES.includes(w.type)) { + card.classList.add("editor-container"); + const horizontal = w.type === "split-column"; // split lays children out in columns + const nested = div(`editor-nested${horizontal ? " editor-nested-split" : ""}`); + setupDropTarget(nested, path, horizontal); + (w.widgets || []).forEach((child, j) => nested.append(buildWidgetCard(child, [...path, j]))); + card.append(nested); + } + + return card; +} + +function directWidgets(column) { + return Array.from(column.children).filter((el) => el.classList.contains("widget")); +} + +function setupDropTarget(element, basePath, horizontal = false) { + const marker = div(`editor-ui editor-drop-marker${horizontal ? " editor-drop-marker-v" : ""}`); + const pointer = (e) => (horizontal ? e.clientX : e.clientY); + + element.addEventListener("dragover", (e) => { + e.preventDefault(); + e.stopPropagation(); // nested targets take precedence over the parent column + positionMarker(element, marker, dropIndex(element, pointer(e), horizontal), horizontal); + }); + element.addEventListener("dragleave", (e) => { + if (!element.contains(e.relatedTarget)) marker.remove(); + }); + element.addEventListener("drop", (e) => { + e.preventDefault(); + e.stopPropagation(); + const index = dropIndex(element, pointer(e), horizontal); + marker.remove(); + handleDrop([...basePath, index]); + }); +} + +// positionMarker places the insertion line as an absolute overlay so it never +// reflows the widgets (which would make the drop position jitter). +function positionMarker(element, marker, index, horizontal) { + // Only one insertion line at a time (a parent's marker isn't cleared when the + // pointer moves into a nested drop zone, since dragleave doesn't fire). + document.querySelectorAll(".editor-drop-marker").forEach((m) => m !== marker && m.remove()); + + const widgets = directWidgets(element); + const edge = (el) => (horizontal ? el.offsetLeft : el.offsetTop); + const size = (el) => (horizontal ? el.offsetWidth : el.offsetHeight); + + let pos; + if (widgets.length === 0) { + pos = 8; + } else if (index < widgets.length) { + pos = edge(widgets[index]) - 4; + } else { + const last = widgets[widgets.length - 1]; + pos = edge(last) + size(last) + 3; + } + + if (horizontal) { + marker.style.left = `${pos}px`; + } else { + marker.style.top = `${pos}px`; + } + if (!marker.isConnected) element.appendChild(marker); +} + +// dropIndex returns the insertion position based on the pointer against card midpoints. +function dropIndex(element, pointer, horizontal) { + const widgets = directWidgets(element); + for (let i = 0; i < widgets.length; i++) { + const box = widgets[i].getBoundingClientRect(); + const mid = horizontal ? box.left + box.width / 2 : box.top + box.height / 2; + if (pointer < mid) return i; + } + return widgets.length; +} + +function handleDrop(path) { + const drag = state.drag; + state.drag = null; + if (!drag) return; + + if (drag.type) { + openNewWidgetModal(drag.type, path); + } else { + save({ op: "moveWidget", page: state.pageIndex, path: drag.fromPath, toPath: path }); + } +} + +function removeWidget(path) { + save({ op: "removeWidget", page: state.pageIndex, path }); +} + +// widgetAtPath walks the config tree (through nested containers) to a widget. +function widgetAtPath(path) { + const col = state.config.pages[state.pageIndex].columns[path[0]]; + let widgets = (col && col.widgets) || []; + let w = null; + for (let i = 1; i < path.length; i++) { + w = widgets[path[i]]; + if (!w) return null; + widgets = w.widgets || []; + } + return w; +} + +// +// Inter-column add lines +// + +function addColumnLine(insertIndex) { + const line = div("editor-ui editor-add-column"); + line.title = "Add column here"; + const plus = div("editor-add-column-plus"); + plus.innerHTML = iconPlus; + line.append(plus); + line.addEventListener("click", () => addColumn(insertIndex)); + return line; +} + +function addColumn(insertIndex) { + const page = state.config.pages[state.pageIndex]; + const max = maxColumnsFor(page); + if (page.columns.length >= max) { + toast(`This layout is full (max ${max} columns)`, "negative"); + return; + } + // Keep the layout valid: at most 2 full columns, so fall back to small. + const fullCount = page.columns.filter((c) => c.size === "full").length; + const size = fullCount < 2 ? "full" : "small"; + save({ op: "addColumn", page: state.pageIndex, index: insertIndex, size }); +} + +// +// Add page +// + +const PAGE_LAYOUTS = [ + ["full"], + ["small", "full"], + ["full", "small"], + ["full", "full"], + ["small", "full", "small"], + ["full", "small", "full"], +]; + +function buildAddPageButton() { + const nav = document.querySelector(".header .nav"); + if (!nav) return; + const add = div("editor-ui editor-add-page nav-item", "Add +"); + add.addEventListener("click", openLayoutModal); + nav.append(add); + + const remove = div("editor-ui editor-remove-page nav-item", "Remove page"); + remove.addEventListener("click", removeCurrentPage); + nav.append(remove); +} + +function removeCurrentPage() { + const page = state.config.pages[state.pageIndex]; + confirmAction(`Remove the page "${page.title}"? This cannot be undone.`, () => { + // Keep editing (flag stays set) and land on home once the server reloads. + commitAndNavigate({ op: "removePage", page: state.pageIndex }, () => (location.href = `${PD.baseURL}/`)); + }); +} + +function openLayoutModal() { + const body = div("editor-layout-grid"); + let chosen = PAGE_LAYOUTS[0]; + + for (const layout of PAGE_LAYOUTS) { + const option = div("editor-layout-option"); + for (const size of layout) option.append(div(`editor-layout-cell editor-layout-cell-${size}`)); + option.addEventListener("click", () => { + body.querySelectorAll(".editor-layout-option").forEach((o) => o.classList.remove("selected")); + option.classList.add("selected"); + chosen = layout; + }); + body.append(option); + } + body.firstChild.classList.add("selected"); + + const title = document.createElement("input"); + title.className = "editor-input"; + title.placeholder = "Page name"; + + openModal("New page", [labeled("Name", title), body], () => { + // Navigate onto the new page in edit mode once the server has picked it up. + const name = title.value.trim() || "New Page"; + commitAndNavigate({ op: "addPage", title: name, layout: chosen }, async () => { + const cfg = await apiGet("/config").catch(() => null); + const created = cfg?.pages.find((p) => p.title === name); + location.href = created ? `${PD.baseURL}/${created.slug}` : `${PD.baseURL}/`; + }); + }); +} + +// +// Widget option modal +// + +function openNewWidgetModal(type, path) { + // Widgets dropped inside a container default to frameless (user can uncheck it). + const initial = path.length >= 3 ? { frameless: "true" } : {}; + buildWidgetModal(type, initial, (fields, rawFields) => + save({ op: "addWidget", page: state.pageIndex, path, widgetType: type, fields, rawFields }) + ); +} + +function openWidgetModal(path) { + const widget = widgetAtPath(path); + if (!widget) return; + buildWidgetModal(widget.type, widget.values || {}, (fields, rawFields) => + save({ op: "editWidget", page: state.pageIndex, path, fields, rawFields }) + ); +} + +function buildWidgetModal(type, values, onSave) { + const schema = state.schemaByType[type]; + if (!schema) return toast(`Unknown widget: ${type}`, "negative"); + + const basic = div("editor-fields"); + const advanced = div("editor-fields"); + const controls = []; + + for (const field of schema.fields) { + if (field.name === "widgets") continue; // container children are edited via nesting + const control = renderField(field, values[field.name]); + controls.push(control); + (field.advanced ? advanced : basic).append(control.wrapper); + } + + const sections = [basic]; + if (advanced.children.length) sections.push(collapsible("Advanced", advanced)); + + openModal(schema.label, sections, () => { + const fields = {}; + const rawFields = {}; + for (const c of controls) { + const value = c.read(); + if (value === undefined) continue; + if (c.field.kind === "yaml") rawFields[c.field.name] = value; + else fields[c.field.name] = value; + } + onSave(fields, rawFields); + }); +} + +// renderField builds a labeled input for a schema field and a reader for its value. +function renderField(field, value) { + if (field.kind === "checkbox") { + const input = document.createElement("input"); + input.type = "checkbox"; + input.checked = value === "true" || value === true; + const row = document.createElement("label"); + row.className = "editor-field editor-check"; + const text = document.createElement("span"); + text.className = "editor-check-label"; + text.append(field.label); + if (field.required) text.append(requiredStar()); + row.append(input, text); + return { field, wrapper: row, read: () => input.checked }; + } + + let input; + let read; + + if (field.kind === "select") { + input = document.createElement("select"); + input.className = "editor-input"; + input.append(new Option("-", "")); // allow leaving the field unset + for (const opt of field.options || []) input.append(new Option(opt, opt)); + input.value = value || ""; + read = () => input.value || undefined; + } else if (field.kind === "yaml") { + input = document.createElement("textarea"); + input.className = "editor-input editor-textarea"; + input.value = value || ""; + read = () => input.value.trim() || undefined; + } else if (field.kind === "number") { + input = inputEl("number"); + if (value) input.value = value; + read = () => (input.value === "" ? undefined : Number(input.value)); + } else { + input = inputEl("text"); + if (value) input.value = value; + if (field.kind === "duration") input.placeholder = "e.g. 30s, 5m, 1h"; + read = () => input.value.trim() || undefined; + } + + const wrapper = labeled(field.label, input, field.required); + if (field.kind === "icon") wrapper.append(iconPreview(input)); + + return { field, wrapper, read }; +} + +function iconPreview(input) { + const preview = img("editor-icon-preview", ""); + const update = () => { + const url = resolveIconURL(input.value.trim()); + preview.src = url; + preview.style.display = url ? "" : "none"; + }; + input.addEventListener("input", update); + update(); + return preview; +} + +// resolveIconURL mirrors the server's icon shorthand (si/di/mdi/sh) for a live preview. +function resolveIconURL(value) { + if (!value) return ""; + value = value.replace(/^auto-invert /, ""); + const [prefix, name] = value.split(":"); + if (!name) return value; + const base = name.split(".")[0]; + switch (prefix) { + case "si": return `https://cdn.jsdelivr.net/npm/simple-icons@latest/icons/${base}.svg`; + case "di": return `https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/${base}.svg`; + case "mdi": return `https://cdn.jsdelivr.net/npm/@mdi/svg@latest/svg/${base}.svg`; + case "sh": return `https://cdn.jsdelivr.net/gh/selfhst/icons/svg/${base}.svg`; + default: return value; + } +} + +// +// Generic modal +// + +function openModal(title, sections, onSave) { + const overlay = div("editor-ui editor-modal-overlay"); + const modal = div("editor-modal"); + modal.append(div("editor-modal-title", title)); + + const bodyEl = div("editor-modal-body"); + for (const s of sections) bodyEl.append(s); + modal.append(bodyEl); + + const actions = div("editor-modal-actions"); + const cancel = button("Cancel", "editor-btn"); + const saveBtn = button("Save", "editor-btn editor-btn-primary"); + cancel.addEventListener("click", () => overlay.remove()); + saveBtn.addEventListener("click", () => { + overlay.remove(); + onSave(); + }); + actions.append(cancel, saveBtn); + modal.append(actions); + + overlay.append(modal); + // Only close on a real backdrop click, not when a text selection drag ends here. + let pressedOnBackdrop = false; + overlay.addEventListener("mousedown", (e) => (pressedOnBackdrop = e.target === overlay)); + overlay.addEventListener("click", (e) => { + if (e.target === overlay && pressedOnBackdrop) overlay.remove(); + }); + document.body.append(overlay); +} + +// confirmAction shows a custom confirmation, falling back to the native dialog on mobile. +function confirmAction(message, onConfirm) { + if (window.matchMedia("(max-width: 768px)").matches) { + if (confirm(message)) onConfirm(); + return; + } + + const overlay = div("editor-ui editor-modal-overlay"); + const modal = div("editor-modal editor-confirm"); + modal.append(div("editor-confirm-message", message)); + + const actions = div("editor-modal-actions"); + const cancel = button("Cancel", "editor-btn"); + const confirmBtn = button("Remove", "editor-btn editor-btn-danger"); + confirmBtn.prepend(iconSpan(iconTrash)); + cancel.addEventListener("click", () => overlay.remove()); + confirmBtn.addEventListener("click", () => { + overlay.remove(); + onConfirm(); + }); + actions.append(cancel, confirmBtn); + modal.append(actions); + + overlay.append(modal); + overlay.addEventListener("click", (e) => { + if (e.target === overlay) overlay.remove(); + }); + document.body.append(overlay); +} + +function collapsible(title, content) { + const details = document.createElement("details"); + details.className = "editor-collapsible"; + const summary = document.createElement("summary"); + summary.textContent = title; + details.append(summary, content); + return details; +} + +// +// Toast +// + +function toast(message, type) { + let container = document.querySelector(".editor-toasts"); + if (!container) { + container = div("editor-ui editor-toasts"); + document.body.append(container); + } + const el = div(`editor-toast color-${type}`, message); + container.append(el); + setTimeout(() => el.remove(), 4000); +} + +// +// Small DOM helpers +// + +function div(className, text) { + const el = document.createElement("div"); + el.className = className; + if (text) el.textContent = text; + return el; +} + +function img(className, src) { + const el = document.createElement("img"); + el.className = className; + if (src) el.src = src; + return el; +} + +// maskIcon renders a monochrome icon as a CSS mask so it tints to the theme color. +function maskIcon(className, url) { + const el = div(className); + el.style.setProperty("--icon-url", `url("${url}")`); + return el; +} + +function button(text, className) { + const el = document.createElement("button"); + el.type = "button"; + el.className = className; + el.textContent = text; + return el; +} + +function inputEl(type) { + const el = document.createElement("input"); + el.type = type; + el.className = "editor-input"; + return el; +} + +function labeled(label, control, required) { + const wrapper = div("editor-field"); + const l = document.createElement("label"); + l.className = "editor-field-label"; + l.append(label); + if (required) l.append(requiredStar()); + wrapper.append(l, control); + return wrapper; +} + +function requiredStar() { + const star = document.createElement("span"); + star.className = "editor-required"; + star.textContent = "*"; + return star; +} + +function toolButton(title, svg, onClick) { + const b = button("", "editor-tool"); + b.title = title; + b.innerHTML = svg; + b.addEventListener("click", (e) => { + e.stopPropagation(); + onClick(); + }); + return b; +} + +const iconPlus = ``; +const iconPencil = ``; +const iconTrash = ``; diff --git a/internal/dynacat/templates/page.html b/internal/dynacat/templates/page.html index e272f35c..6ea0d066 100644 --- a/internal/dynacat/templates/page.html +++ b/internal/dynacat/templates/page.html @@ -5,6 +5,16 @@ {{ define "document-head-after" }} + {{ end }} {{ define "navigation-links" }} @@ -62,6 +72,13 @@ {{ end }} + {{ if or (not .App.AnyAuthEnabled) .AuthUser }} + + {{ end }} {{- if .AuthUser }}
{{ .AuthUser.Username }} diff --git a/internal/dynacat/widget-playing.go b/internal/dynacat/widget-playing.go index 0776e190..4194c7cd 100644 --- a/internal/dynacat/widget-playing.go +++ b/internal/dynacat/widget-playing.go @@ -87,7 +87,7 @@ type playingWidget struct { Frameless bool `yaml:"frameless"` Hosts []PlayingHostConfig `yaml:"hosts"` SmallColumn bool `yaml:"small-column"` - // `compact` option removed — layouts use the default (non-compact) sizing + // `compact` option removed - layouts use the default (non-compact) sizing PlayState string `yaml:"play-state"` ShowThumbnail *bool `yaml:"show-thumbnail"` ShowPaused bool `yaml:"show-paused"` @@ -163,7 +163,7 @@ func (widget *playingWidget) initialize() error { widget.EpisodeTitleFormat = "series" } - // Boolean defaults — only applied when not explicitly set by the user + // Boolean defaults - only applied when not explicitly set by the user t := true if widget.ShowThumbnail == nil { widget.ShowThumbnail = &t diff --git a/internal/dynacat/widget-schema.go b/internal/dynacat/widget-schema.go new file mode 100644 index 00000000..7d1a3088 --- /dev/null +++ b/internal/dynacat/widget-schema.go @@ -0,0 +1,357 @@ +package dynacat + +import ( + "reflect" + "strings" +) + +// widgetFieldSchema describes one editable option of a widget for the editor UI. +type widgetFieldSchema struct { + Name string `json:"name"` + Label string `json:"label"` + Kind string `json:"kind"` // text|number|checkbox|select|duration|icon|yaml + Required bool `json:"required,omitempty"` + Advanced bool `json:"advanced,omitempty"` + Options []string `json:"options,omitempty"` +} + +type widgetTypeSchema struct { + Type string `json:"type"` + Label string `json:"label"` + Icon string `json:"icon"` + Hidden bool `json:"hidden,omitempty"` // kept editable but omitted from the palette + Fields []widgetFieldSchema `json:"fields"` +} + +// hiddenWidgetTypes are excluded from the palette (still editable if already used). +var hiddenWidgetTypes = map[string]bool{ + "html": true, +} + +type widgetTypeMeta struct { + Type string + Label string + Icon string +} + +// widgetTypeCatalog lists every user-selectable widget for the palette. +// Keep in sync with the newWidget switch in widget.go (the one manual sync point). +var widgetTypeCatalog = []widgetTypeMeta{ + {"calendar", "Calendar", "mdi:calendar"}, + {"clock", "Clock", "mdi:clock-outline"}, + {"weather", "Weather", "mdi:weather-partly-cloudy"}, + {"bookmarks", "Bookmarks", "mdi:bookmark-outline"}, + {"iframe", "IFrame", "mdi:application-brackets-outline"}, + {"html", "HTML", "mdi:language-html5"}, + {"hacker-news", "Hacker News", "mdi:newspaper-variant-outline"}, + {"releases", "Releases", "mdi:tag-outline"}, + {"videos", "Videos", "mdi:youtube"}, + {"markets", "Markets", "mdi:chart-line"}, + {"reddit", "Reddit", "mdi:reddit"}, + {"rss", "RSS", "mdi:rss"}, + {"monitor", "Monitor", "mdi:heart-pulse"}, + {"twitch-top-games", "Twitch Top Games", "mdi:twitch"}, + {"twitch-channels", "Twitch Channels", "mdi:twitch"}, + {"lobsters", "Lobsters", "mdi:message-text-outline"}, + {"change-detection", "Change Detection", "mdi:eye-outline"}, + {"repository", "Repository", "mdi:source-repository"}, + {"search", "Search", "mdi:magnify"}, + {"stopwatch", "Stopwatch", "mdi:timer-outline"}, + {"extension", "Extension", "mdi:puzzle-outline"}, + {"group", "Group", "mdi:tab"}, + {"dns-stats", "DNS Stats", "mdi:dns-outline"}, + {"split-column", "Split Column", "mdi:view-column-outline"}, + {"custom-api", "Custom API", "mdi:api"}, + {"dynawidgets", "Dynawidgets", "mdi:widgets-outline"}, + {"docker-containers", "Docker Containers", "mdi:docker"}, + {"docker-controller", "Docker Controller", "mdi:docker"}, + {"server-stats", "Server Stats", "mdi:server"}, + {"speedtest", "Speedtest", "mdi:speedometer"}, + {"to-do", "To-do", "mdi:checkbox-marked-outline"}, + {"playing", "Now Playing", "mdi:play-circle-outline"}, + {"latest-media", "Latest Media", "mdi:multimedia"}, + {"torrenting", "Torrenting", "mdi:download-network-outline"}, +} + +type fieldAnnotation struct { + Advanced bool + Kind string + Options []string + Required bool +} + +// alwaysAdvancedFields are the shared plumbing options hidden under Advanced for +// every widget. Everything else defaults to basic (shown by default). +var alwaysAdvancedFields = map[string]bool{ + "title": true, "title-icon": true, "title-url": true, "hide-header": true, + "css-class": true, "cache": true, "update-interval": true, "lazy-load": true, + "frameless": true, +} + +// fieldAnnotations overlays per-widget specifics reflection cannot know: which +// widget-specific fields are advanced (auth/network/low-level), select options and +// required flags. Fields not listed here (and not in alwaysAdvancedFields) are basic. +var fieldAnnotations = map[string]map[string]fieldAnnotation{ + "calendar": { + "first-day-of-week": {Options: []string{"monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"}}, + }, + "clock": { + "hour-format": {Options: []string{"24h", "12h"}}, + }, + "weather": { + "location": {Required: true}, + "hour-format": {Options: []string{"12h", "24h"}}, + "units": {Options: []string{"metric", "imperial"}}, + }, + "iframe": { + "source": {Required: true}, + }, + "html": { + "source": {Required: true}, + }, + "hacker-news": { + "sort-by": {Options: []string{"top", "new", "best"}}, + "extra-sort-by": {Options: []string{"engagement"}}, + "comments-url-template": {Advanced: true}, + }, + "releases": { + "repositories": {Required: true}, + "token": {Advanced: true}, + "gitlab-token": {Advanced: true}, + }, + "videos": { + "style": {Options: []string{"grid-cards", "vertical-list"}}, + "video-url-template": {Advanced: true}, + }, + "markets": { + "sort-by": {Options: []string{"absolute-change", "change"}}, + "chart-link-template": {Advanced: true}, + "symbol-link-template": {Advanced: true}, + "proxy": {Advanced: true}, + }, + "reddit": { + "subreddit": {Required: true}, + "sort-by": {Options: []string{"hot", "new", "top", "rising"}}, + "top-period": {Options: []string{"hour", "day", "week", "month", "year", "all"}}, + "style": {Options: []string{"horizontal-cards", "vertical-cards"}}, + "extra-sort-by": {Options: []string{"engagement"}}, + "proxy": {Advanced: true}, + "comments-url-template": {Advanced: true}, + "request-url-template": {Advanced: true}, + "app-auth": {Advanced: true}, + }, + "rss": { + "feeds": {Required: true}, + "style": {Options: []string{"detailed-list", "horizontal-cards", "horizontal-cards-2"}}, + }, + "monitor": { + "sites": {Required: true}, + "style": {Options: []string{"compact"}}, + }, + "twitch-channels": { + "sort-by": {Options: []string{"viewers", "live"}}, + }, + "lobsters": { + "sort-by": {Options: []string{"hot", "new"}}, + }, + "change-detection": { + "allow-insecure": {Advanced: true}, + "token": {Advanced: true}, + }, + "repository": { + "repository": {Required: true}, + "token": {Advanced: true}, + }, + "search": { + "search-engine": {Options: []string{"duckduckgo", "google", "bing", "perplexity", "kagi", "startpage", "qwant", "brave"}}, + "autocomplete-provider": {Options: []string{"duckduckgo", "brave"}}, + }, + "extension": { + "url": {Required: true}, + "fallback-content-type": {Options: []string{"html"}}, + "headers": {Advanced: true}, + "allow-potentially-dangerous-html": {Advanced: true}, + }, + "dns-stats": { + "service": {Required: true, Options: []string{"adguard", "pihole", "pihole-v6", "technitium", "blocky"}}, + "hour-format": {Options: []string{"12h", "24h"}}, + "token": {Advanced: true}, + "username": {Advanced: true}, + "password": {Advanced: true}, + "allow-insecure": {Advanced: true}, + }, + "custom-api": { + "template": {Required: true, Kind: "yaml"}, + "subrequests": {Advanced: true}, + "method": {Advanced: true}, + "body": {Advanced: true}, + "body-type": {Advanced: true, Options: []string{"json", "string"}}, + "headers": {Advanced: true}, + "allow-insecure": {Advanced: true}, + }, + "dynawidgets": { + "widget": {Required: true}, + "repo": {Advanced: true}, + "subrequests": {Advanced: true}, + "method": {Advanced: true}, + "body": {Advanced: true}, + "body-type": {Advanced: true, Options: []string{"json", "string"}}, + "headers": {Advanced: true}, + "allow-insecure": {Advanced: true}, + }, + "docker-containers": { + "sock-path": {Advanced: true}, + }, + "docker-controller": { + "show": {Options: []string{"both", "containers", "images"}}, + "sock-path": {Advanced: true}, + }, + "to-do": { + "storage": {Options: []string{"local", "server"}}, + "id": {Advanced: true}, + }, + "playing": { + "hosts": {Required: true}, + "play-state": {Options: []string{"indicator", "text"}}, + "episode-title-format": {Options: []string{"series", "episode"}}, + }, + "latest-media": { + "hosts": {Required: true}, + }, + "torrenting": { + "hosts": {Required: true}, + }, + "speedtest": { + "server": {Required: true}, + }, +} + +// widgetSchema reflects a widget struct into an editor schema, overlaying annotations. +func widgetSchema(meta widgetTypeMeta) (widgetTypeSchema, error) { + w, err := newWidget(meta.Type) + if err != nil { + return widgetTypeSchema{}, err + } + + fields := reflectWidgetFields(reflect.TypeOf(w).Elem()) + ann := fieldAnnotations[meta.Type] + + for i := range fields { + f := &fields[i] + f.Advanced = alwaysAdvancedFields[f.Name] + f.Label = humanizeFieldName(f.Name) + + a, ok := ann[f.Name] + if !ok { + continue + } + if a.Advanced { + f.Advanced = true + } + if a.Kind != "" { + f.Kind = a.Kind + } + if len(a.Options) > 0 { + f.Kind = "select" + f.Options = a.Options + } + f.Required = a.Required + } + + return widgetTypeSchema{ + Type: meta.Type, + Label: meta.Label, + Icon: string(newCustomIconField(meta.Icon).URL), + Hidden: hiddenWidgetTypes[meta.Type], + Fields: fields, + }, nil +} + +func allWidgetSchemas() []widgetTypeSchema { + schemas := make([]widgetTypeSchema, 0, len(widgetTypeCatalog)) + for _, meta := range widgetTypeCatalog { + if s, err := widgetSchema(meta); err == nil { + schemas = append(schemas, s) + } + } + return schemas +} + +// reflectWidgetFields walks yaml-tagged fields, recursing into inlined structs. +func reflectWidgetFields(t reflect.Type) []widgetFieldSchema { + var fields []widgetFieldSchema + + for i := 0; i < t.NumField(); i++ { + f := t.Field(i) + name, inline := parseYAMLTag(f.Tag.Get("yaml")) + + ft := f.Type + for ft.Kind() == reflect.Ptr { + ft = ft.Elem() + } + + if inline && ft.Kind() == reflect.Struct { + fields = append(fields, reflectWidgetFields(ft)...) + continue + } + if name == "" || name == "-" || name == "type" || !f.IsExported() { + continue + } + + fields = append(fields, widgetFieldSchema{Name: name, Kind: fieldKind(f.Type)}) + } + + return fields +} + +func parseYAMLTag(tag string) (name string, inline bool) { + parts := strings.Split(tag, ",") + name = parts[0] + for _, p := range parts[1:] { + if p == "inline" { + inline = true + } + } + return name, inline +} + +var ( + iconFieldType = reflect.TypeOf(customIconField{}) + durationFieldType = reflect.TypeOf(durationField(0)) + intervalFieldType = reflect.TypeOf(updateIntervalField(0)) +) + +func fieldKind(t reflect.Type) string { + for t.Kind() == reflect.Ptr { + t = t.Elem() + } + + switch t { + case iconFieldType: + return "icon" + case durationFieldType, intervalFieldType: + return "duration" + } + + switch t.Kind() { + case reflect.Bool: + return "checkbox" + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, + reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: + return "number" + case reflect.String: + return "text" + default: + return "yaml" // slices, maps, nested structs get a raw yaml editor + } +} + +func humanizeFieldName(name string) string { + words := strings.Split(name, "-") + for i, w := range words { + if w != "" { + words[i] = strings.ToUpper(w[:1]) + w[1:] + } + } + return strings.Join(words, " ") +} diff --git a/pkg/sysinfo/sysinfo.go b/pkg/sysinfo/sysinfo.go index 17f03a2a..5eb9f104 100644 --- a/pkg/sysinfo/sysinfo.go +++ b/pkg/sysinfo/sysinfo.go @@ -288,7 +288,7 @@ func Collect(req *SystemInfoRequest) (*SystemInfo, []error) { } // Inside containers (e.g. Docker), disk.Partitions(false) only returns - // devices starting with /dev/ — the overlay root filesystem is skipped. + // devices starting with /dev/ - the overlay root filesystem is skipped. // Fall back to "/" so disk usage is still reported without requiring a // host bind-mount. if len(addedMountpoints) == 0 { From 2fdb9a92625cb134fc5a93906e3d64319c955e7b Mon Sep 17 00:00:00 2001 From: Panonim Date: Sun, 19 Jul 2026 22:26:50 +0200 Subject: [PATCH 05/53] Go bump --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ed3199b3..5e595e38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.0-alpine3.21 AS builder +FROM golang:1.25.5-alpine3.21 AS builder WORKDIR /app diff --git a/go.mod b/go.mod index c0a1045b..95a8546c 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Panonim/dynacat -go 1.25.0 +go 1.25.5 require ( github.com/coreos/go-oidc/v3 v3.18.0 From 6f48d795e7410a4904d8ecbe2f03fccfe0dba53d Mon Sep 17 00:00:00 2001 From: Panonim Date: Sun, 19 Jul 2026 22:29:40 +0200 Subject: [PATCH 06/53] Go bump 2 --- go.mod | 39 ++++++------- go.sum | 175 ++++++++++++++++----------------------------------------- 2 files changed, 65 insertions(+), 149 deletions(-) diff --git a/go.mod b/go.mod index 95a8546c..47226706 100644 --- a/go.mod +++ b/go.mod @@ -3,46 +3,41 @@ module github.com/Panonim/dynacat go 1.25.5 require ( - github.com/coreos/go-oidc/v3 v3.18.0 + github.com/coreos/go-oidc/v3 v3.20.0 github.com/fsnotify/fsnotify v1.10.1 - github.com/mmcdole/gofeed v1.3.0 + github.com/mmcdole/gofeed v1.4.0 github.com/refraction-networking/utls v1.8.2 - github.com/shirou/gopsutil/v4 v4.26.5 + github.com/shirou/gopsutil/v4 v4.26.6 github.com/tidwall/gjson v1.19.0 - golang.org/x/crypto v0.52.0 - golang.org/x/net v0.55.0 + golang.org/x/crypto v0.54.0 + golang.org/x/net v0.57.0 golang.org/x/oauth2 v0.36.0 - golang.org/x/text v0.37.0 + golang.org/x/text v0.40.0 gopkg.in/yaml.v3 v3.0.1 - modernc.org/sqlite v1.51.0 + modernc.org/sqlite v1.54.0 ) require ( - github.com/PuerkitoBio/goquery v1.11.0 // indirect - github.com/andybalholm/brotli v1.0.6 // indirect - github.com/andybalholm/cascadia v1.3.3 // indirect + github.com/andybalholm/brotli v1.2.2 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/ebitengine/purego v0.10.0 // indirect + github.com/ebitengine/purego v0.10.1 // indirect github.com/go-jose/go-jose/v4 v4.1.4 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.4 // indirect - github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mmcdole/goxpp v1.1.1 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/klauspost/compress v1.19.0 // indirect + github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15 // indirect + github.com/mattn/go-isatty v0.0.23 // indirect + github.com/mmcdole/goxpp/v2 v2.0.0 // indirect github.com/ncruces/go-strftime v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/tidwall/match v1.2.0 // indirect github.com/tidwall/pretty v1.2.1 // indirect - github.com/tklauser/go-sysconf v0.3.16 // indirect - github.com/tklauser/numcpus v0.11.0 // indirect + github.com/tklauser/go-sysconf v0.4.0 // indirect + github.com/tklauser/numcpus v0.12.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/sys v0.45.0 // indirect - modernc.org/libc v1.72.3 // indirect + golang.org/x/sys v0.47.0 // indirect + modernc.org/libc v1.74.3 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.11.0 // indirect ) diff --git a/go.sum b/go.sum index edbf99af..870fe831 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,13 @@ -github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw= -github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= -github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= -github.com/coreos/go-oidc/v3 v3.18.0 h1:V9orjXynvu5wiC9SemFTWnG4F45v403aIcjWo0d41+A= -github.com/coreos/go-oidc/v3 v3.18.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtnceM= +github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= +github.com/coreos/go-oidc/v3 v3.20.0 h1:EtE0WIBHk03N+DqGkY4+UONzzZHk7amKt6IyNd7OsZE= +github.com/coreos/go-oidc/v3 v3.20.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/ebitengine/purego v0.10.0 h1:QIw4xfpWT6GWTzaW5XEKy3HXoqrJGx1ijYHzTF0/ISU= -github.com/ebitengine/purego v0.10.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY= +github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA= @@ -20,33 +15,24 @@ github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e h1:Q6MvJtQK/iRcRtzAscm/zF23XxJlbECiGPyRicsX+Ak= -github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mmcdole/gofeed v1.3.0 h1:5yn+HeqlcvjMeAI4gu6T+crm7d0anY85+M+v6fIFNG4= -github.com/mmcdole/gofeed v1.3.0/go.mod h1:9TGv2LcJhdXePDzxiuMnukhV2/zb6VtnZt1mS+SjkLE= -github.com/mmcdole/goxpp v1.1.1 h1:RGIX+D6iQRIunGHrKqnA2+700XMCnNv0bAOOv5MUhx8= -github.com/mmcdole/goxpp v1.1.1/go.mod h1:v+25+lT2ViuQ7mVxcncQ8ch1URund48oH+jhjiwEgS8= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/klauspost/compress v1.19.0 h1:sXLILfc9jV2QYWkzFOPWStmcUVH2RHEB1JCdY2oVvCQ= +github.com/klauspost/compress v1.19.0/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= +github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15 h1:YkjVPl/YH5XlJ+/NiwzJtPYXXKRcyjmEUhsDci6YK3c= +github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= +github.com/mattn/go-isatty v0.0.23 h1:cYwCQTQf3HB6xUC+BtyCLZNr7IzbOmoZbmssVNzSyiQ= +github.com/mattn/go-isatty v0.0.23/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mmcdole/gofeed v1.4.0 h1:+efDmI/yJXJgTfa8we5zg9GAKsU+2d7tnpt9QZwvjLQ= +github.com/mmcdole/gofeed v1.4.0/go.mod h1:ngV5MTB7UJko6fH3/fG5AkB/ABUGK1ZTePF9iRhzu/c= +github.com/mmcdole/goxpp/v2 v2.0.0 h1:HrSCflxerUEqZQNq3u7ldtmE/XkwnTx4Zpq2DW4i5rQ= +github.com/mmcdole/goxpp/v2 v2.0.0/go.mod h1:CUduYMnO9JB6Z/uqDn9Ormk/r8E9BsLQxHPWDZ961Os= github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -57,10 +43,8 @@ github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEv github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/shirou/gopsutil/v4 v4.26.5 h1:RPcBXkpz7kOj9PqGFQOlBPZHsyaPvPVQc098y9RmCNM= -github.com/shirou/gopsutil/v4 v4.26.5/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/shirou/gopsutil/v4 v4.26.6 h1:Mzr/npDtQC/xpeEuQKHZt8Zo9CmPvhTj8nkR8w5TLDs= +github.com/shirou/gopsutil/v4 v4.26.6/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU= @@ -69,114 +53,51 @@ github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM= github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tklauser/go-sysconf v0.3.16 h1:frioLaCQSsF5Cy1jgRBrzr6t502KIIwQ0MArYICU0nA= -github.com/tklauser/go-sysconf v0.3.16/go.mod h1:/qNL9xxDhc7tx3HSRsLWNnuzbVfh3e7gh/BmM179nYI= -github.com/tklauser/numcpus v0.11.0 h1:nSTwhKH5e1dMNsCdVBukSZrURJRoHbSEQjdEbY+9RXw= -github.com/tklauser/numcpus v0.11.0/go.mod h1:z+LwcLq54uWZTX0u/bGobaV34u6V7KNlTZejzM6/3MQ= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/tklauser/go-sysconf v0.4.0 h1:7H0uAN+7RkwWRaxhYXDLqa5V3LPrJeV8wmD9dRUgPQU= +github.com/tklauser/go-sysconf v0.4.0/go.mod h1:8mTNWyog7H+MpKijp4VmKJAd2bbYQ2zuUwkYRbUArPI= +github.com/tklauser/numcpus v0.12.0 h1:NR85qdvHA9pFse3x3weVZ0r0ST8R6l5RHbZrlRaqob4= +github.com/tklauser/numcpus v0.12.0/go.mod h1:ABHeXzJnr/qqwguhClkZKT1/8VABcYrsyUiUGobwWJg= +github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU= +github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM= -golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= -golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -modernc.org/cc/v4 v4.28.2 h1:3tQ0lf2ADtoby2EtSP+J7IE2SHwEJdP8ioR59wx7XpY= -modernc.org/cc/v4 v4.28.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= -modernc.org/ccgo/v4 v4.34.0 h1:yRLPFZieg532OT4rp4JFNIVcquwalMX26G95WQDqwCQ= -modernc.org/ccgo/v4 v4.34.0/go.mod h1:AS5WYMyBakQ+fhsHhtP8mWB82KTGPkNNJDGfGQCe0/A= +modernc.org/cc/v4 v4.29.1 h1:MKgdCV3WykTSPqpVrnxdEDS0HEd2FHpKZDzxzU5LyeI= +modernc.org/cc/v4 v4.29.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU= +modernc.org/ccgo/v4 v4.34.6/go.mod h1:SZ8YcN9NG7XVsQYdm6jYBvi8PQP1qi+kqB6OhjqI3Fk= modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/gc/v3 v3.1.2 h1:ZtDCnhonXSZexk/AYsegNRV1lJGgaNZJuKjJSWKyEqo= -modernc.org/gc/v3 v3.1.2/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/gc/v3 v3.1.4 h1:2g65LGVSmFQrXeITAw97x7hCRvZFcyE1uDP+7Vng7JI= +modernc.org/gc/v3 v3.1.4/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= -modernc.org/libc v1.72.3 h1:ZnDF4tXn4NBXFutMMQC4vtbTFSXhhKzR73fv0beZEAU= -modernc.org/libc v1.72.3/go.mod h1:dn0dZNnnn1clLyvRxLxYExxiKRZIRENOfqQ8XEeg4Qs= +modernc.org/libc v1.74.3 h1:a4J+Z8aVaxPyjyxRAdJzw246PqpcFGvVPnfT/AuM5Ws= +modernc.org/libc v1.74.3/go.mod h1:4H7h/MJ8wnjL8RAbp9v3OXgnk22X7MouHIhDbvP3gj4= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= @@ -185,8 +106,8 @@ modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.51.0 h1:aH/MMSoayAIhozZ7uJbVTT9QO/VhzBf0J9tymmmuC/U= -modernc.org/sqlite v1.51.0/go.mod h1:tcNzv5p84E0skkmJn038y+hWJbLQXQqEnQfeh5r2JLM= +modernc.org/sqlite v1.54.0 h1:JCxR4qwkJvOaqAoYcgDoO25Nc+ROg6EJ2LfBVzdrgog= +modernc.org/sqlite v1.54.0/go.mod h1:4ntCLuNmnH8+GNqjka1wNg7KJd5/Hi5FYp8K+XQ7GZw= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= From 68faddb747d9ab78092dec825dd64e12f395962b Mon Sep 17 00:00:00 2001 From: Panonim Date: Sun, 19 Jul 2026 22:58:56 +0200 Subject: [PATCH 07/53] Visual changes --- internal/dynacat/static/css/editor.css | 6 ++-- .../static/css/widget-docker-controller.css | 4 +-- internal/dynacat/static/js/editor.js | 28 ++++++++++++++++++- internal/dynacat/widget-schema.go | 2 +- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/internal/dynacat/static/css/editor.css b/internal/dynacat/static/css/editor.css index f5a3f974..110646e4 100644 --- a/internal/dynacat/static/css/editor.css +++ b/internal/dynacat/static/css/editor.css @@ -13,6 +13,7 @@ height: 1.8rem; stroke: var(--color-text-subdue); transition: stroke 0.2s; + transform: translateY(2px); } #editor-toggle:hover .editor-toggle-icon { @@ -429,8 +430,8 @@ body.editing .page-column:not(:has(> .widget))::after { } .editor-field-label { - font-size: 1.2rem; - color: var(--color-text-subdue); + font-size: 1.3rem; + color: var(--color-text-base); } .editor-required { @@ -467,6 +468,7 @@ body.editing .page-column:not(:has(> .widget))::after { .editor-check-label { font-size: 1.3rem; + line-height: 1; color: var(--color-text-base); } diff --git a/internal/dynacat/static/css/widget-docker-controller.css b/internal/dynacat/static/css/widget-docker-controller.css index 5410db87..4c0bb04b 100644 --- a/internal/dynacat/static/css/widget-docker-controller.css +++ b/internal/dynacat/static/css/widget-docker-controller.css @@ -1,6 +1,6 @@ .widget-type-docker-controller input { background: none; - border: 1px solid var(--color-text-subdue); + border: 1px solid var(--color-popover-border); border-radius: var(--border-radius); color: var(--color-text-highlight); font: inherit; @@ -39,7 +39,7 @@ .docker-ctrl-pull-btn { background: none; - border: 1px solid var(--color-text-subdue); + border: 1px solid var(--color-popover-border); border-radius: var(--border-radius); color: var(--color-text-base); cursor: pointer; diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index 793dacbf..3f0854bc 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -521,7 +521,9 @@ function renderField(field, value) { let input; let read; - if (field.kind === "select") { + if (field.kind === "select" && field.name === "search-engine") { + return renderSearchEngineField(field, value); + } else if (field.kind === "select") { input = document.createElement("select"); input.className = "editor-input"; input.append(new Option("-", "")); // allow leaving the field unset @@ -550,6 +552,30 @@ function renderField(field, value) { return { field, wrapper, read }; } +// renderSearchEngineField adds a custom-URL input that shows only when "custom" is picked. +function renderSearchEngineField(field, value) { + const known = (field.options || []).filter((o) => o !== "custom"); + const isCustom = value && !known.includes(value); + + const select = document.createElement("select"); + select.className = "editor-input"; + select.append(new Option("-", "")); + for (const opt of field.options || []) select.append(new Option(opt, opt)); + select.value = isCustom ? "custom" : value || ""; + + const customInput = inputEl("text"); + customInput.placeholder = "https://example.com/search?q={QUERY}"; + customInput.style.display = select.value === "custom" ? "" : "none"; + if (isCustom) customInput.value = value; + select.addEventListener("change", () => { + customInput.style.display = select.value === "custom" ? "" : "none"; + }); + + const wrapper = labeled(field.label, select, field.required); + wrapper.append(customInput); + return { field, wrapper, read: () => (select.value === "custom" ? customInput.value.trim() || undefined : select.value || undefined) }; +} + function iconPreview(input) { const preview = img("editor-icon-preview", ""); const update = () => { diff --git a/internal/dynacat/widget-schema.go b/internal/dynacat/widget-schema.go index 7d1a3088..ee22d40d 100644 --- a/internal/dynacat/widget-schema.go +++ b/internal/dynacat/widget-schema.go @@ -163,7 +163,7 @@ var fieldAnnotations = map[string]map[string]fieldAnnotation{ "token": {Advanced: true}, }, "search": { - "search-engine": {Options: []string{"duckduckgo", "google", "bing", "perplexity", "kagi", "startpage", "qwant", "brave"}}, + "search-engine": {Options: []string{"duckduckgo", "google", "bing", "perplexity", "kagi", "startpage", "qwant", "brave", "custom"}}, "autocomplete-provider": {Options: []string{"duckduckgo", "brave"}}, }, "extension": { From 13c268f53d749fe7b5978ffbc4e8ea831d163938 Mon Sep 17 00:00:00 2001 From: Panonim Date: Wed, 22 Jul 2026 16:26:19 +0200 Subject: [PATCH 08/53] Added an option to search using bookmarks --- docs/docs/configuration.md | 37 +++++- internal/dynacat/dynacat.go | 35 ++++-- internal/dynacat/sse.go | 79 ++++++++---- internal/dynacat/static/css/widget-search.css | 20 ++- internal/dynacat/static/js/editor.js | 41 +++++- internal/dynacat/static/js/page.js | 119 +++++++++++++----- internal/dynacat/templates/search.html | 10 +- internal/dynacat/widget-schema.go | 9 +- internal/dynacat/widget-search.go | 109 +++++++++++++--- 9 files changed, 374 insertions(+), 85 deletions(-) diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index 2b6fa909..fed21c99 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -2534,6 +2534,8 @@ Preview: | placeholder | string | no | Type here to search… | | autocomplete | boolean | no | true | | autocomplete-provider | string | no | duckduckgo | +| include-bookmarks | boolean | no | false | +| cross-page-bookmarks | boolean | no | false | | bangs | array | no | | ##### `search-engine` @@ -2565,12 +2567,45 @@ When set, modifies the text displayed in the input field before typing. When set to `true` (default), displays search suggestions as you type. Navigate suggestions with ↑ and ↓ arrow keys, select with Enter, or dismiss with Escape. Set to `false` to disable autocompletion. ##### `autocomplete-provider` -The provider used for search suggestions. Possible values are `duckduckgo` (default) and `brave`. +Either `duckduckgo` (default), `brave`, or a URL to a custom suggestion endpoint — works the same way as [`search-engine`](#search-engine): pick a known provider by name, or supply your own URL directly. | Value | Provider | | ----- | -------- | | duckduckgo | DuckDuckGo autocomplete | | brave | Brave Search autocomplete | +| a URL containing `{QUERY}` | Your own suggestion endpoint | + +A custom URL must return the [OpenSearch suggestions format](https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md#the-json-format) (`["query", ["suggestion 1", "suggestion 2", ...]]`), which is what most self-hosted and public search engines (SearXNG, Wikipedia, etc.) expose. Use `{QUERY}` to indicate where the typed query gets placed. The request is made server-side, so the URL is never sent to the browser. Example: + +```yaml +- type: search + search-engine: https://en.wikipedia.org/wiki/Special:Search?search={QUERY} + autocomplete-provider: https://en.wikipedia.org/w/api.php?action=opensearch&format=json&search={QUERY} +``` + +> [!NOTE] +> +> Older configs written with `autocomplete-provider: custom` alongside a separate `autocomplete-url: ` still work, but should be migrated to the single-field form above — the `autocomplete-url` property is deprecated and no longer shown in the interactive editor. + +##### `include-bookmarks` +When set to `true`, matches what you type against the titles of your [bookmarks](#bookmarks) (case-insensitive, matching from the start of the title) and shows matching bookmarks above the regular search suggestions. Clicking a bookmark match navigates straight to its URL instead of performing a search. Up to 3 matches are shown. + +By default only bookmarks on the same page as the search widget are matched. Use [`cross-page-bookmarks`](#cross-page-bookmarks) to match bookmarks from every page. + +Each match shows the bookmark's own [icon](#icons) if it has one, or a small arrow otherwise, exactly like in the bookmarks widget itself. + +```yaml +- type: search + include-bookmarks: true +``` + +##### `cross-page-bookmarks` +When set to `true`, implies [`include-bookmarks`](#include-bookmarks) and widens the search to bookmarks on every page, not just the page the search widget is on. + +```yaml +- type: search + cross-page-bookmarks: true +``` ##### `bangs` What now? [Bangs](https://duckduckgo.com/bangs). They're shortcuts that allow you to use the same search box for many different sites. Assuming you have it configured, if for example you start your search input with `!yt` you'd be able to perform a search on YouTube: diff --git a/internal/dynacat/dynacat.go b/internal/dynacat/dynacat.go index 82eea4d2..dcefa83d 100644 --- a/internal/dynacat/dynacat.go +++ b/internal/dynacat/dynacat.go @@ -74,20 +74,23 @@ type application struct { imageProxyMu sync.RWMutex imageProxyURLs map[string]imageProxyInfo + searchAutocompleteURLs map[uint64]string + imageCache *imageCache } func newApplication(c *config) (*application, error) { app := &application{ - Version: buildVersion, - CreatedAt: time.Now(), - Config: *c, - slugToPage: make(map[string]*page), - widgetByID: make(map[uint64]widget), - widgetToPage: make(map[uint64]*page), - sseClients: make(map[*sseClient]struct{}), - imageProxyURLs: make(map[string]imageProxyInfo), - todoListIDToPage: make(map[string]*page), + Version: buildVersion, + CreatedAt: time.Now(), + Config: *c, + slugToPage: make(map[string]*page), + widgetByID: make(map[uint64]widget), + widgetToPage: make(map[uint64]*page), + sseClients: make(map[*sseClient]struct{}), + imageProxyURLs: make(map[string]imageProxyInfo), + todoListIDToPage: make(map[string]*page), + searchAutocompleteURLs: make(map[uint64]string), } config := &app.Config @@ -336,6 +339,20 @@ func newApplication(c *config) (*application, error) { } } + for id, w := range app.widgetByID { + sw, ok := w.(*searchWidget) + if !ok || !sw.IncludeBookmarks { + continue + } + + var pageFilter *page + if !sw.CrossPageBookmarks { + pageFilter = app.widgetToPage[id] + } + + sw.collectBookmarks(app, pageFilter) + } + config.Theme.CustomCSSFile = app.resolveUserDefinedAssetPath(config.Theme.CustomCSSFile) config.Branding.LogoURL = app.resolveUserDefinedAssetPath(config.Branding.LogoURL) diff --git a/internal/dynacat/sse.go b/internal/dynacat/sse.go index 7df7f54c..305a2457 100644 --- a/internal/dynacat/sse.go +++ b/internal/dynacat/sse.go @@ -8,6 +8,8 @@ import ( "net" "net/http" "net/url" + "strconv" + "strings" "sync" "time" ) @@ -127,6 +129,48 @@ func (a *application) handleImageProxyRequest(w http.ResponseWriter, r *http.Req } } +// respondWithOpenSearchSuggestions fetches requestURL and writes its suggestions +// to w. Expects the OpenSearch format ["query", ["suggestion1", ...]], hence raw[1]. +func (a *application) respondWithOpenSearchSuggestions(w http.ResponseWriter, r *http.Request, requestURL string) { + req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, requestURL, nil) + if err != nil { + http.Error(w, "Failed to create request", http.StatusInternalServerError) + return + } + setBrowserUserAgentHeader(req) + + resp, err := defaultHTTPClient.Do(req) + if err != nil { + http.Error(w, "Failed to fetch suggestions", http.StatusBadGateway) + return + } + defer resp.Body.Close() + + var raw []json.RawMessage + if err := json.NewDecoder(resp.Body).Decode(&raw); err != nil || len(raw) < 2 { + w.WriteHeader(http.StatusOK) + w.Write([]byte("[]")) + return + } + + var suggestions []string + if err := json.Unmarshal(raw[1], &suggestions); err != nil { + w.WriteHeader(http.StatusOK) + w.Write([]byte("[]")) + return + } + + type phrase struct { + Phrase string `json:"phrase"` + } + result := make([]phrase, len(suggestions)) + for i, s := range suggestions { + result[i] = phrase{Phrase: s} + } + w.WriteHeader(http.StatusOK) + json.NewEncoder(w).Encode(result) +} + func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r *http.Request) { if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { return @@ -145,44 +189,33 @@ func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r * if provider == "brave" { braveURL := "https://search.brave.com/api/suggest?" + url.Values{"q": {query}, "rich": {"false"}}.Encode() - req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, braveURL, nil) - if err != nil { - http.Error(w, "Failed to create request", http.StatusInternalServerError) - return - } - setBrowserUserAgentHeader(req) + a.respondWithOpenSearchSuggestions(w, r, braveURL) + return + } - resp, err := defaultHTTPClient.Do(req) + if provider == "custom" { + widgetID, err := strconv.ParseUint(r.URL.Query().Get("widgetId"), 10, 64) if err != nil { - http.Error(w, "Failed to fetch suggestions", http.StatusBadGateway) + w.WriteHeader(http.StatusOK) + w.Write([]byte("[]")) return } - defer resp.Body.Close() - // Brave returns OpenSearch format: ["query", ["s1", "s2", ...]] - var raw []json.RawMessage - if err := json.NewDecoder(resp.Body).Decode(&raw); err != nil || len(raw) < 2 { + urlTemplate, ok := a.searchAutocompleteURLs[widgetID] + if !ok { w.WriteHeader(http.StatusOK) w.Write([]byte("[]")) return } - var suggestions []string - if err := json.Unmarshal(raw[1], &suggestions); err != nil { + customURL := strings.ReplaceAll(urlTemplate, "{QUERY}", url.QueryEscape(query)) + if err := validateImageProxyURL(customURL); err != nil { w.WriteHeader(http.StatusOK) w.Write([]byte("[]")) return } - type phrase struct { - Phrase string `json:"phrase"` - } - result := make([]phrase, len(suggestions)) - for i, s := range suggestions { - result[i] = phrase{Phrase: s} - } - w.WriteHeader(http.StatusOK) - json.NewEncoder(w).Encode(result) + a.respondWithOpenSearchSuggestions(w, r, customURL) return } diff --git a/internal/dynacat/static/css/widget-search.css b/internal/dynacat/static/css/widget-search.css index afa4b54d..449dcd00 100644 --- a/internal/dynacat/static/css/widget-search.css +++ b/internal/dynacat/static/css/widget-search.css @@ -76,6 +76,7 @@ } .search-bangs { display: none; } +.search-bookmarks { display: none; } .search-bang { border-radius: calc(var(--border-radius) * 2); @@ -130,7 +131,6 @@ transition: opacity 0.18s ease, transform 0.18s cubic-bezier(0.16, 1, 0.3, 1), border-color 0.2s; } -/* Dropdown shown above input */ .search-autocomplete.search-autocomplete-above { border-bottom-width: 0; border-top-width: 1px; @@ -168,3 +168,21 @@ background: var(--color-widget-background-highlight); color: var(--color-text-highlight); } + +.search-autocomplete-item-bookmark { + display: flex; + align-items: center; + gap: 0.7em; +} + +.search-autocomplete-item-bookmark-icon { + width: 16px; + height: 16px; + flex-shrink: 0; + opacity: 0.8; +} + +.search-autocomplete-item-bookmark-arrow { + flex-shrink: 0; + color: var(--color-primary); +} diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index 3f0854bc..516b3f9d 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -481,7 +481,12 @@ function buildWidgetModal(type, values, onSave) { for (const field of schema.fields) { if (field.name === "widgets") continue; // container children are edited via nesting - const control = renderField(field, values[field.name]); + if (field.name === "autocomplete") continue; // folded into autocomplete-provider below + + const control = field.name === "autocomplete-provider" + ? renderAutocompleteProviderField(field, values["autocomplete-provider"], values["autocomplete"]) + : renderField(field, values[field.name]); + controls.push(control); (field.advanced ? advanced : basic).append(control.wrapper); } @@ -494,6 +499,7 @@ function buildWidgetModal(type, values, onSave) { const rawFields = {}; for (const c of controls) { const value = c.read(); + if (c.extra) Object.assign(fields, c.extra()); if (value === undefined) continue; if (c.field.kind === "yaml") rawFields[c.field.name] = value; else fields[c.field.name] = value; @@ -576,6 +582,39 @@ function renderSearchEngineField(field, value) { return { field, wrapper, read: () => (select.value === "custom" ? customInput.value.trim() || undefined : select.value || undefined) }; } +// renderAutocompleteProviderField is renderSearchEngineField plus the "autocomplete" +// bool: the "Off" option disables autocomplete rather than just clearing the provider. +function renderAutocompleteProviderField(field, value, autocompleteValue) { + const known = (field.options || []).filter((o) => o !== "custom"); + const isOff = autocompleteValue === "false" || autocompleteValue === false; + const isCustom = value && !known.includes(value); + + const select = document.createElement("select"); + select.className = "editor-input"; + select.append(new Option("Off", "")); + for (const opt of known) select.append(new Option(opt, opt)); + select.append(new Option("custom", "custom")); + select.value = isOff ? "" : (isCustom ? "custom" : value || known[0] || ""); + + const customInput = inputEl("text"); + customInput.placeholder = "https://example.com/suggest?q={QUERY}"; + customInput.style.display = select.value === "custom" ? "" : "none"; + if (isCustom) customInput.value = value; + select.addEventListener("change", () => { + customInput.style.display = select.value === "custom" ? "" : "none"; + }); + + const wrapper = labeled(field.label, select, field.required); + wrapper.append(customInput); + + return { + field, + wrapper, + read: () => (select.value === "" ? undefined : (select.value === "custom" ? customInput.value.trim() || undefined : select.value)), + extra: () => ({ autocomplete: select.value !== "" }), + }; +} + function iconPreview(input) { const preview = img("editor-icon-preview", ""); const update = () => { diff --git a/internal/dynacat/static/js/page.js b/internal/dynacat/static/js/page.js index 2f7a2c60..a8162c6b 100644 --- a/internal/dynacat/static/js/page.js +++ b/internal/dynacat/static/js/page.js @@ -337,14 +337,23 @@ function setupSearchBoxes() { }); } - // Search Autocomplete - if (widget.dataset.autocomplete === "true") { + // Search Autocomplete + bookmark matching + if (widget.dataset.autocomplete === "true" || widget.dataset.bookmarksEnabled === "true") { + const autocompleteEnabled = widget.dataset.autocomplete === "true"; + const bookmarksEnabled = widget.dataset.bookmarksEnabled === "true"; const autocompleteEl = widget.querySelector(".search-autocomplete"); + const bookmarks = Array.from(widget.querySelectorAll(".search-bookmarks > input")).map((el) => ({ + type: "bookmark", + title: el.dataset.title, + url: el.dataset.url, + target: el.dataset.target || "", + icon: el.dataset.icon || "", + iconAutoInvert: el.dataset.iconAutoInvert === "true", + })); let acItems = []; let acIndex = -1; let acDebounce = null; let acVisible = false; - let acAbove = false; let acRepositioner = null; let acRepositionFrame = null; @@ -355,7 +364,6 @@ function setupSearchBoxes() { const spaceAbove = rect.top; const maxH = 280; - // Switch to above if not enough space below and more space above const goAbove = spaceBelow < 120 && spaceAbove > spaceBelow; autocompleteEl.style.left = rect.left + "px"; @@ -371,12 +379,7 @@ function setupSearchBoxes() { autocompleteEl.style.maxHeight = Math.min(maxH, spaceBelow - 4) + "px"; } - if (goAbove !== acAbove) { - acAbove = goAbove; - } - - // Keep direction classes in sync on every reposition so the initial - // below state also receives its border adjustments. + // Sync direction classes every reposition so the initial below state gets its borders too. autocompleteEl.classList.toggle("search-autocomplete-above", goAbove); widget.classList.toggle("search-suggestions-above", goAbove); widget.classList.toggle("search-suggestions-below", !goAbove); @@ -414,7 +417,6 @@ function setupSearchBoxes() { autocompleteEl.classList.remove("active", "search-autocomplete-above"); widget.classList.remove("search-suggestions-above", "search-suggestions-below"); acVisible = false; - acAbove = false; acIndex = -1; }; @@ -424,20 +426,65 @@ function setupSearchBoxes() { acIndex = i; }; - const renderAC = (suggestions) => { - acItems = suggestions; + const BOOKMARK_MATCH_LIMIT = 3; + + const matchBookmarks = (query) => { + if (!bookmarksEnabled || !query) return []; + const lowerQuery = query.toLowerCase(); + return bookmarks + .filter((b) => b.title && b.title.toLowerCase().startsWith(lowerQuery)) + .slice(0, BOOKMARK_MATCH_LIMIT); + }; + + const selectItem = (item) => { + if (item.type === "bookmark") { + hideAC(); + if (item.target === "_blank") { + window.open(item.url, item.target).focus(); + } else { + window.location.href = item.url; + } + return; + } + + inputElement.value = item.phrase; + hideAC(); + submitSearch(newTab); + }; + + const renderAC = (items) => { + acItems = items; acIndex = -1; autocompleteEl.innerHTML = ""; - if (suggestions.length === 0) { hideAC(); return; } - suggestions.forEach((phrase, idx) => { + if (items.length === 0) { hideAC(); return; } + items.forEach((acItem, idx) => { const item = document.createElement("div"); - item.className = "search-autocomplete-item"; - item.textContent = phrase; + + if (acItem.type === "bookmark") { + item.className = "search-autocomplete-item search-autocomplete-item-bookmark"; + if (acItem.icon) { + const icon = document.createElement("img"); + icon.className = "search-autocomplete-item-bookmark-icon" + (acItem.iconAutoInvert ? " flat-icon" : ""); + icon.src = acItem.icon; + icon.alt = ""; + item.appendChild(icon); + } else { + const arrow = document.createElement("span"); + arrow.className = "search-autocomplete-item-bookmark-arrow"; + arrow.textContent = "↗"; + item.appendChild(arrow); + } + const label = document.createElement("span"); + label.textContent = acItem.title; + item.appendChild(label); + } else { + item.className = "search-autocomplete-item"; + item.textContent = acItem.phrase; + } + item.addEventListener("mousedown", (e) => { e.preventDefault(); - inputElement.value = phrase; - hideAC(); - submitSearch(newTab); + selectItem(acItem); }); item.addEventListener("mousemove", () => { setACIndex(idx); @@ -447,19 +494,33 @@ function setupSearchBoxes() { showAC(); }; + const updateSuggestions = (query, phraseItems) => { + if (inputElement.value.trim() !== query) return; + renderAC([...matchBookmarks(query), ...phraseItems]); + }; + const fetchSuggestions = (query) => { - if (!query || query.length < 2 || currentBang != null) { + if (!query || currentBang != null) { hideAC(); return; } + + if (!autocompleteEnabled || query.length < 2) { + updateSuggestions(query, []); + return; + } + const provider = widget.dataset.autocompleteProvider || "duckduckgo"; - fetch("/api/search/autocomplete?q=" + encodeURIComponent(query) + "&provider=" + encodeURIComponent(provider)) + let suggestionsUrl = "/api/search/autocomplete?q=" + encodeURIComponent(query) + "&provider=" + encodeURIComponent(provider); + if (provider === "custom" && widget.dataset.autocompleteWidgetId) { + suggestionsUrl += "&widgetId=" + encodeURIComponent(widget.dataset.autocompleteWidgetId); + } + fetch(suggestionsUrl) .then((r) => r.json()) .then((data) => { - if (inputElement.value.trim() !== query) return; - renderAC(data.map((d) => d.phrase)); + updateSuggestions(query, data.map((d) => ({ type: "phrase", phrase: d.phrase }))); }) - .catch(() => hideAC()); + .catch(() => updateSuggestions(query, [])); }; inputElement.addEventListener("input", () => { @@ -479,16 +540,14 @@ function setupSearchBoxes() { setACIndex(Math.max(acIndex - 1, -1)); } else if (event.key === "Enter" && acIndex >= 0) { event.preventDefault(); - inputElement.value = acItems[acIndex]; - hideAC(); - submitSearch(newTab); + selectItem(acItems[acIndex]); } else if (event.key === "Escape") { hideAC(); } }); - // Delay hide to guard against spurious blur (e.g. Chrome scroll-on-focus - // near viewport bottom). Only close if focus genuinely left the input. + // Delay hide to survive spurious blur (Chrome scroll-on-focus); close only + // if focus really left the input. inputElement.addEventListener("blur", () => { setTimeout(() => { if (document.activeElement !== inputElement) { diff --git a/internal/dynacat/templates/search.html b/internal/dynacat/templates/search.html index c2a65aa7..8918c8aa 100644 --- a/internal/dynacat/templates/search.html +++ b/internal/dynacat/templates/search.html @@ -3,13 +3,19 @@ {{ define "widget-content-classes" }}{{ if .Frameless }}widget-content-frameless{{ end }}{{ end }} {{ define "widget-content" }} -
+
{{ range .Bangs }} {{ end }}
+
+ {{ range .BookmarkMatches }} + + {{ end }} +
+
@@ -23,6 +29,6 @@
S - {{ if .Autocomplete }}
{{ end }} + {{ if or .Autocomplete .IncludeBookmarks }}
{{ end }}
{{ end }} diff --git a/internal/dynacat/widget-schema.go b/internal/dynacat/widget-schema.go index ee22d40d..8de7635a 100644 --- a/internal/dynacat/widget-schema.go +++ b/internal/dynacat/widget-schema.go @@ -164,7 +164,7 @@ var fieldAnnotations = map[string]map[string]fieldAnnotation{ }, "search": { "search-engine": {Options: []string{"duckduckgo", "google", "bing", "perplexity", "kagi", "startpage", "qwant", "brave", "custom"}}, - "autocomplete-provider": {Options: []string{"duckduckgo", "brave"}}, + "autocomplete-provider": {Options: []string{"duckduckgo", "brave", "custom"}}, }, "extension": { "url": {Required: true}, @@ -277,6 +277,11 @@ func allWidgetSchemas() []widgetTypeSchema { return schemas } +// deprecatedSchemaFields still parse for back-compat but never appear in the editor. +var deprecatedSchemaFields = map[string]bool{ + "autocomplete-url": true, +} + // reflectWidgetFields walks yaml-tagged fields, recursing into inlined structs. func reflectWidgetFields(t reflect.Type) []widgetFieldSchema { var fields []widgetFieldSchema @@ -294,7 +299,7 @@ func reflectWidgetFields(t reflect.Type) []widgetFieldSchema { fields = append(fields, reflectWidgetFields(ft)...) continue } - if name == "" || name == "-" || name == "type" || !f.IsExported() { + if name == "" || name == "-" || name == "type" || !f.IsExported() || deprecatedSchemaFields[name] { continue } diff --git a/internal/dynacat/widget-search.go b/internal/dynacat/widget-search.go index aeb5ec5c..23db6255 100644 --- a/internal/dynacat/widget-search.go +++ b/internal/dynacat/widget-search.go @@ -3,6 +3,7 @@ package dynacat import ( "fmt" "html/template" + "sort" "strings" ) @@ -15,24 +16,36 @@ type SearchBang struct { Icon customIconField `yaml:"icon"` } +type searchBookmarkMatch struct { + Title string + URL string + Target string + Icon customIconField +} + type searchWidget struct { - widgetBase `yaml:",inline"` - cachedHTML template.HTML `yaml:"-"` - Frameless bool `yaml:"frameless"` - SearchEngine string `yaml:"search-engine"` - Bangs []SearchBang `yaml:"bangs"` - NewTab bool `yaml:"new-tab"` - Target string `yaml:"target"` - Autofocus bool `yaml:"autofocus"` - Placeholder string `yaml:"placeholder"` - AutocompleteEnabled *bool `yaml:"autocomplete"` - Autocomplete bool `yaml:"-"` - AutocompleteProvider string `yaml:"autocomplete-provider"` + widgetBase `yaml:",inline"` + cachedHTML template.HTML `yaml:"-"` + Frameless bool `yaml:"frameless"` + SearchEngine string `yaml:"search-engine"` + AutocompleteEnabled *bool `yaml:"autocomplete"` + Autocomplete bool `yaml:"-"` + AutocompleteProvider string `yaml:"autocomplete-provider"` + // Back-compat for the old autocomplete-provider: custom + autocomplete-url format. + DeprecatedAutocompleteURL string `yaml:"autocomplete-url"` + Bangs []SearchBang `yaml:"bangs"` + NewTab bool `yaml:"new-tab"` + Target string `yaml:"target"` + Autofocus bool `yaml:"autofocus"` + Placeholder string `yaml:"placeholder"` + IncludeBookmarks bool `yaml:"include-bookmarks"` + CrossPageBookmarks bool `yaml:"cross-page-bookmarks"` + BookmarkMatches []searchBookmarkMatch `yaml:"-"` } func convertSearchUrl(url string) string { - // Go's template is being stubborn and continues to escape the curlies in the - // URL regardless of what the type of the variable is so this is my way around it + // html/template escapes the {QUERY} curlies regardless of type; dodge it with + // a placeholder restored client-side. return strings.ReplaceAll(url, "{QUERY}", "!QUERY!") } @@ -51,6 +64,10 @@ func (widget *searchWidget) initialize() error { widget.withTitle("Search").withError(nil) widget.UpdateInterval = nil // search widget is static, never poll + if widget.CrossPageBookmarks { + widget.IncludeBookmarks = true + } + if widget.SearchEngine == "" { widget.SearchEngine = "duckduckgo" } @@ -65,10 +82,15 @@ func (widget *searchWidget) initialize() error { widget.Autocomplete = *widget.AutocompleteEnabled } + if widget.AutocompleteProvider == "custom" && widget.DeprecatedAutocompleteURL != "" { + widget.AutocompleteProvider = widget.DeprecatedAutocompleteURL + } + if widget.AutocompleteProvider == "" { widget.AutocompleteProvider = "duckduckgo" - } else if widget.AutocompleteProvider != "duckduckgo" && widget.AutocompleteProvider != "brave" { - return fmt.Errorf("unknown autocomplete-provider %q", widget.AutocompleteProvider) + } else if widget.AutocompleteProvider != "duckduckgo" && widget.AutocompleteProvider != "brave" && + !strings.Contains(widget.AutocompleteProvider, "{QUERY}") { + return fmt.Errorf("autocomplete-provider must be \"duckduckgo\", \"brave\", or a custom URL containing {QUERY}") } if url, ok := searchEngines[widget.SearchEngine]; ok { @@ -92,11 +114,66 @@ func (widget *searchWidget) initialize() error { return nil } +// AutocompleteProviderKind maps the provider to a kind so a custom URL is never sent to the browser. +func (widget *searchWidget) AutocompleteProviderKind() string { + if widget.AutocompleteProvider == "duckduckgo" || widget.AutocompleteProvider == "brave" { + return widget.AutocompleteProvider + } + return "custom" +} + func (widget *searchWidget) setProviders(providers *widgetProviders) { widget.widgetBase.setProviders(providers) for i := range widget.Bangs { widget.Bangs[i].Icon.prepare(providers) } + if widget.AutocompleteProviderKind() == "custom" && providers.app != nil { + providers.app.searchAutocompleteURLs[widget.GetID()] = widget.AutocompleteProvider + } + widget.cachedHTML = widget.renderTemplate(widget, searchWidgetTemplate) +} + +// collectBookmarks gathers bookmark links to surface as suggestions. Run only +// after every widget is registered, since target bookmarks widgets may not exist +// yet during setProviders. pageFilter restricts matches to one page; nil, all. +func (widget *searchWidget) collectBookmarks(app *application, pageFilter *page) { + if !widget.IncludeBookmarks { + return + } + + var matches []searchBookmarkMatch + seen := make(map[string]bool) + for id, w := range app.widgetByID { + bookmarks, ok := w.(*bookmarksWidget) + if !ok { + continue + } + + if pageFilter != nil && app.widgetToPage[id] != pageFilter { + continue + } + + for _, group := range bookmarks.Groups { + for _, link := range group.Links { + key := link.Title + "\x00" + link.URL + if seen[key] { + continue + } + seen[key] = true + + matches = append(matches, searchBookmarkMatch{ + Title: link.Title, + URL: link.URL, + Target: link.Target, + Icon: link.Icon, + }) + } + } + } + + sort.Slice(matches, func(i, j int) bool { return matches[i].Title < matches[j].Title }) + + widget.BookmarkMatches = matches widget.cachedHTML = widget.renderTemplate(widget, searchWidgetTemplate) } From 4c3bcff4d7ed0209eb21a078e66d729d36797ad6 Mon Sep 17 00:00:00 2001 From: Panonim Date: Wed, 22 Jul 2026 19:24:53 +0200 Subject: [PATCH 09/53] Fixed navidrome currently playing --- docs/docs/changelog.md | 2 + docs/docs/configuration.md | 4 + internal/dynacat/config-editor.go | 61 ++++- internal/dynacat/static/css/editor.css | 64 ++++- internal/dynacat/static/js/editor.js | 335 ++++++++++++++++++++++++ internal/dynacat/templates/playing.html | 45 +++- internal/dynacat/widget-playing.go | 39 ++- 7 files changed, 537 insertions(+), 13 deletions(-) diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index fc14f00a..6f9647e0 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -2,6 +2,8 @@ - Fixed an issue where subrequests were not detected properly in `dynawidgets` - Fixed `dynawidgets` protocol handling - Added an option to visually edit your configuration +- Fixed Navidrome in currently playing +- Added an option to see bookmarks in search widget # Changes for 2.4.0 - Added Brave Search as an autocompletion engine and normal one diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index fed21c99..8f2e6cc7 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -3332,6 +3332,7 @@ Preview: | show-progress-bar | boolean | no | true | | show-progress-info | boolean | no | true | | group-by-host | boolean | no | false | +| hide-username | boolean | no | false | | update-interval | string | no | 30s | | episode-title-format | string | no | series | @@ -3402,6 +3403,9 @@ Example: ##### `group-by-host` When `true`, groups sessions by their media server. When `false`, displays all sessions in a unified list. +##### `hide-username` +When `true`, hides the user row for each session - both the username and the play-state indicator (or `[playing]`/`[paused]` text). + #### API Access & Tokens **Plex:** diff --git a/internal/dynacat/config-editor.go b/internal/dynacat/config-editor.go index 358d765c..9c0f1510 100644 --- a/internal/dynacat/config-editor.go +++ b/internal/dynacat/config-editor.go @@ -21,7 +21,10 @@ import ( // to the file that actually owns the page. type editorConfigView struct { - Pages []editorPageView `json:"pages"` + Pages []editorPageView `json:"pages"` + Theme map[string]string `json:"theme"` + Branding map[string]string `json:"branding"` + MainWritable bool `json:"mainWritable"` } type editorPageView struct { @@ -58,6 +61,8 @@ type editorMutation struct { RawFields map[string]string `json:"rawFields"` // yaml-kind inputs, parsed as YAML Title string `json:"title"` // addPage Layout []string `json:"layout"` // addPage column sizes + Theme map[string]any `json:"theme"` // editStyling: theme section fields + Branding map[string]any `json:"branding"` // editStyling: branding section fields } type editorPermissionError struct{ path string } @@ -105,9 +110,31 @@ func (a *application) buildEditorConfigView() (editorConfigView, error) { view.Pages = append(view.Pages, pv) } + // Theme and branding live in the main config file's top-level mapping. + root := documentRoot(mainDoc) + view.Theme = sectionToStringMap(root, "theme") + view.Branding = sectionToStringMap(root, "branding") + view.MainWritable = pathWritable(mainPath) + return view, nil } +// sectionToStringMap reads the scalar children of a top-level mapping (e.g. theme +// or branding) into a flat map. Nested mappings such as theme presets are skipped. +func sectionToStringMap(root *yaml.Node, key string) map[string]string { + out := map[string]string{} + section := getMappingValue(root, key) + if section == nil || section.Kind != yaml.MappingNode { + return out + } + for i := 0; i+1 < len(section.Content); i += 2 { + if v := section.Content[i+1]; v.Kind == yaml.ScalarNode { + out[section.Content[i].Value] = v.Value + } + } + return out +} + func pageNodeToView(pageNode *yaml.Node, path string) editorPageView { pv := editorPageView{ Title: scalarValue(getMappingValue(pageNode, "name")), @@ -175,6 +202,13 @@ func (a *application) applyEditorMutation(m editorMutation) error { return a.writeConfigCandidate(mainPath, marshalDocument(mainDoc)) } + if m.Op == "editStyling" { + root := documentRoot(mainDoc) + applyStylingSection(root, "theme", m.Theme) + applyStylingSection(root, "branding", m.Branding) + return a.writeConfigCandidate(mainPath, marshalDocument(mainDoc)) + } + if m.Op == "removePage" { pages := getMappingValue(documentRoot(mainDoc), "pages") if pages == nil || !validIndex(pages.Content, m.Page) { @@ -510,6 +544,31 @@ func applyFieldsToNode(node *yaml.Node, fields map[string]any, rawFields map[str return nil } +// applyStylingSection upserts the scalar fields of a top-level section (theme or +// branding), creating it if needed. A field that is empty, false or zero drops the +// key so the YAML stays close to the defaults. An emptied section is removed. +func applyStylingSection(root *yaml.Node, key string, fields map[string]any) { + if fields == nil { + return + } + section := getMappingValue(root, key) + if section == nil { + section = newMappingNode() + setMappingKey(root, key, section) + } + for _, k := range sortedKeys(fields) { + v := fields[k] + if isEmptyValue(v) || v == false || v == float64(0) { + removeMappingKey(section, k) + continue + } + setMappingKey(section, k, valueNode(v)) + } + if len(section.Content) == 0 { + removeMappingKey(root, key) + } +} + func parseYAMLValue(text string) (*yaml.Node, error) { var doc yaml.Node if err := yaml.Unmarshal([]byte(text), &doc); err != nil { diff --git a/internal/dynacat/static/css/editor.css b/internal/dynacat/static/css/editor.css index 110646e4..9331e6a2 100644 --- a/internal/dynacat/static/css/editor.css +++ b/internal/dynacat/static/css/editor.css @@ -372,10 +372,28 @@ body.editing .page-column:not(:has(> .widget))::after { opacity: 1; } -.editor-add-page:hover { +.editor-add-page:hover, +.editor-styling-btn:hover { color: var(--color-text-highlight); } +.editor-styling-btn { + cursor: pointer; + color: var(--color-text-subdue); + opacity: 0.6; + font-size: 0.9em; + transition: opacity 0.2s, color 0.2s; +} + +.editor-styling-btn:hover { + opacity: 1; +} + +/* In edit mode the theme picker opens the styling editor on click */ +body.editing .editor-styling-trigger { + cursor: pointer; +} + .editor-remove-page:hover { color: var(--color-negative); } @@ -513,6 +531,50 @@ select.editor-input { cursor: pointer; } +/* Styling modal: section heading and color picker rows */ +.editor-section-title { + font-size: 1.35rem; + color: var(--color-text-highlight); + margin-bottom: -4px; +} + +.editor-color-row { + display: flex; + align-items: center; + gap: 10px; +} + +.editor-color-row .editor-color-text { + flex: 1; + font-family: monospace; + text-transform: uppercase; +} + +.editor-modal .editor-color-swatch { + flex-shrink: 0; + width: 46px; + height: 34px; + padding: 3px; + border: 1px solid var(--color-separator); + border-radius: var(--border-radius); + background: var(--color-widget-background-highlight); + cursor: pointer; +} + +.editor-modal .editor-color-swatch::-webkit-color-swatch { + border: none; + border-radius: 6px; +} + +.editor-modal .editor-color-swatch::-webkit-color-swatch-wrapper { + padding: 0; +} + +.editor-modal .editor-color-swatch::-moz-color-swatch { + border: none; + border-radius: 6px; +} + .editor-textarea { min-height: 90px; resize: vertical; diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index 516b3f9d..5d55f452 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -46,6 +46,7 @@ async function enterEditor() { buildPalette(); buildAddPageButton(); + setupStylingTrigger(); // page.js injects content only once the cache finishes building (marking #page // content-ready), and may rebuild it. Wait for ready, then guard against rebuilds. @@ -410,6 +411,26 @@ function buildAddPageButton() { const remove = div("editor-ui editor-remove-page nav-item", "Remove page"); remove.addEventListener("click", removeCurrentPage); nav.append(remove); + + const styling = div("editor-ui editor-styling-btn nav-item", "Styling"); + styling.title = "Edit theme colors and branding"; + styling.addEventListener("click", openStylingModal); + nav.append(styling); +} + +// In edit mode, clicking the theme picker opens the styling editor instead of +// switching the active preset. The explicit "Styling" nav button is the fallback +// (and the only entry point when the theme picker is disabled). +function setupStylingTrigger() { + const picker = document.querySelector(".header .theme-picker"); + if (!picker) return; + picker.classList.add("editor-styling-trigger"); + picker.addEventListener("click", (e) => { + if (!state.active) return; + e.preventDefault(); + e.stopPropagation(); + openStylingModal(); + }, true); } function removeCurrentPage() { @@ -643,6 +664,320 @@ function resolveIconURL(value) { } } +// +// Styling modal: theme colors and branding, written to the top-level +// theme:/branding: sections of the main config file. +// + +function openStylingModal() { + if (state.config && state.config.mainWritable === false) { + toast("The main config file is read only, styling cannot be saved", "negative"); + return; + } + const theme = (state.config && state.config.theme) || {}; + const branding = (state.config && state.config.branding) || {}; + const controls = []; + + // section = "theme" | "branding", key = yaml key. reg wires read() for save. + const reg = (section, key, ctl) => { + controls.push({ section, key, read: ctl.read }); + return ctl.wrapper; + }; + + // Colors serialize to the yaml HSL triple ("43 50 70"). When a color is not set + // in the config it falls back to the effective value resolved from the live CSS + // variables, so the pickers show the colors currently on screen. + const eff = { + "background-color": resolveCssColor("--color-background"), + "primary-color": resolveCssColor("--color-primary"), + "positive-color": resolveCssColor("--color-positive"), + "negative-color": resolveCssColor("--color-negative"), + }; + const colors = div("editor-fields"); + colors.append(reg("theme", "background-color", colorField("Background", theme["background-color"], eff["background-color"], "hsl"))); + colors.append(reg("theme", "primary-color", colorField("Primary", theme["primary-color"], eff["primary-color"], "hsl"))); + colors.append(reg("theme", "positive-color", colorField("Positive", theme["positive-color"], eff["positive-color"], "hsl"))); + colors.append(reg("theme", "negative-color", colorField("Negative", theme["negative-color"], eff["negative-color"], "hsl"))); + + const options = div("editor-fields"); + options.append(reg("theme", "light", checkField("Light scheme", theme["light"]))); + options.append(reg("theme", "contrast-multiplier", numField("Contrast multiplier", theme["contrast-multiplier"], "e.g. 1.1"))); + options.append(reg("theme", "text-saturation-multiplier", numField("Text saturation multiplier", theme["text-saturation-multiplier"], "e.g. 1"))); + + // Logo: logo-url overwrites the logo. The sync toggle mirrors it to the favicon. + const logo = div("editor-fields"); + const logoURL = textField("Logo URL (overwrites logo)", branding["logo-url"], "/assets/logo.png"); + logo.append(reg("branding", "logo-url", logoURL)); + + const favSync = document.createElement("input"); + favSync.type = "checkbox"; + logo.append(checkRow("Also use this image as the favicon", favSync)); + + const faviconURL = textField("Favicon URL", branding["favicon-url"], "/assets/logo.png"); + logo.append(reg("branding", "favicon-url", faviconURL)); + + const mirrorFavicon = () => { + if (favSync.checked) faviconURL.input.value = logoURL.input.value.trim(); + faviconURL.input.disabled = favSync.checked; + }; + if (branding["logo-url"] && branding["favicon-url"] === branding["logo-url"]) favSync.checked = true; + favSync.addEventListener("change", mirrorFavicon); + logoURL.input.addEventListener("input", mirrorFavicon); + mirrorFavicon(); + + logo.append(reg("branding", "logo-text", textField("Logo text", branding["logo-text"], "G"))); + logo.append(reg("branding", "hide-logo", checkField("Hide logo", branding["hide-logo"]))); + + // App / PWA. app-background-color is a CSS color, kept as hex rather than HSL. + const app = div("editor-fields"); + app.append(reg("branding", "app-name", textField("App name", branding["app-name"], "Dynacat"))); + app.append(reg("branding", "app-icon-url", textField("App icon URL", branding["app-icon-url"], "/assets/app-icon.svg"))); + app.append(reg("branding", "app-background-color", colorField("App background color", branding["app-background-color"], resolveCssColor("--color-background"), "hex"))); + + const misc = div("editor-fields"); + misc.append(reg("branding", "hide-footer", checkField("Hide footer", branding["hide-footer"]))); + misc.append(reg("branding", "custom-footer", areaField("Custom footer HTML", branding["custom-footer"]))); + misc.append(reg("branding", "show-desktop-navigation-on-hover", checkField("Show desktop navigation on hover", branding["show-desktop-navigation-on-hover"]))); + misc.append(reg("branding", "center-desktop-navigation", checkField("Center desktop navigation", branding["center-desktop-navigation"]))); + + const sections = [ + sectionTitle("Colors"), + colors, + sectionTitle("Theme options"), + options, + collapsible("Logo & branding", logo), + collapsible("App / PWA", app), + collapsible("Footer & navigation", misc), + ]; + + openModal("Styling", sections, () => { + const themeOut = {}; + const brandingOut = {}; + for (const c of controls) (c.section === "theme" ? themeOut : brandingOut)[c.key] = c.read(); + saveStyling(themeOut, brandingOut); + }); +} + +// saveStyling commits the styling change, then reloads once the server hot-reloads +// so the new theme CSS and branding (rendered outside the editor canvas) take effect. +// The editing flag stays set, so edit mode is re-entered after the reload. +async function saveStyling(theme, branding) { + const before = await serverGeneration(); + if (!(await commit({ op: "editStyling", theme, branding }))) return; + toast("Styling saved, reloading…", "positive"); + await waitForServerReload(before); + location.reload(); +} + +function sectionTitle(text) { + return div("editor-section-title", text); +} + +// colorField: native color picker + a text box accepting hex, rgb() or an HSL +// triple. mode "hsl" reads back the yaml triple "H S L"; mode "hex" reads a hex string. +// explicit is the value set in the config (undefined if unset); effective is the +// current on-screen value used to prefill when unset. An unset color left untouched +// reads back empty so the default is not written into the config. +function colorField(label, explicit, effective, mode) { + const normalize = (v) => (mode === "hex" ? colorToHex(v) || String(v || "").trim() : normalizeHsl(v)); + + const wrapper = div("editor-field"); + const l = document.createElement("label"); + l.className = "editor-field-label"; + l.textContent = label; + wrapper.append(l); + + const row = div("editor-color-row"); + const swatch = document.createElement("input"); + swatch.type = "color"; + swatch.className = "editor-color-swatch"; + const text = inputEl("text"); + text.classList.add("editor-color-text"); + text.placeholder = mode === "hex" ? "#151519" : "43 50 70"; + + const shown = explicit || (mode === "hex" ? colorToHex(effective) : normalizeHsl(effective)) || ""; + if (shown) text.value = shown; + swatch.value = colorToHex(shown) || "#000000"; + const initial = normalize(shown); + + swatch.addEventListener("input", () => { + text.value = mode === "hex" ? swatch.value : hexToHslString(swatch.value); + }); + text.addEventListener("input", () => { + const hex = colorToHex(text.value); + if (hex) swatch.value = hex; + }); + + row.append(swatch, text); + wrapper.append(row); + + return { + wrapper, + input: text, + read: () => { + const t = text.value.trim(); + if (!t) return ""; + const out = normalize(t); + // Unset color the user did not change: leave it out so the default stays default. + if (explicit === undefined && out === initial) return ""; + return out; + }, + }; +} + +// normalizeHsl coerces any accepted color input to the yaml "H S L" triple. +function normalizeHsl(value) { + const t = String(value == null ? "" : value).trim(); + if (!t) return ""; + if (!/^#|^rgb/i.test(t)) { + const tr = parseHslTriple(t); + if (tr) return `${Math.round(tr.h)} ${Math.round(tr.s)} ${Math.round(tr.l)}`; + } + return colorToHslString(t) || t; +} + +// resolveCssColor returns the current computed value of a CSS color variable as +// an rgb() string (colorToHex/colorToHslString both parse it). +function resolveCssColor(varName) { + const probe = document.createElement("span"); + probe.style.cssText = `color: var(${varName}); display: none`; + document.body.appendChild(probe); + const rgb = getComputedStyle(probe).color; + probe.remove(); + return rgb; +} + +function checkField(label, value) { + const input = document.createElement("input"); + input.type = "checkbox"; + input.checked = value === true || value === "true"; + return { wrapper: checkRow(label, input), input, read: () => input.checked }; +} + +function checkRow(label, input) { + const row = document.createElement("label"); + row.className = "editor-field editor-check"; + const text = document.createElement("span"); + text.className = "editor-check-label"; + text.textContent = label; + row.append(input, text); + return row; +} + +function textField(label, value, placeholder) { + const input = inputEl("text"); + if (value) input.value = value; + if (placeholder) input.placeholder = placeholder; + return { wrapper: labeled(label, input), input, read: () => input.value.trim() }; +} + +function numField(label, value, placeholder) { + const input = inputEl("number"); + input.step = "any"; + if (value) input.value = value; + if (placeholder) input.placeholder = placeholder; + return { wrapper: labeled(label, input), input, read: () => (input.value === "" ? "" : Number(input.value)) }; +} + +function areaField(label, value) { + const input = document.createElement("textarea"); + input.className = "editor-input editor-textarea"; + if (value) input.value = value; + return { wrapper: labeled(label, input), input, read: () => input.value.trim() }; +} + +// +// Color conversions (hex <-> rgb <-> hsl). HSL uses the same "H S L" triple the +// yaml theme config expects. +// + +function colorToHex(value) { + const str = String(value == null ? "" : value).trim(); + if (!str) return ""; + + let m = str.match(/^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/); + if (m) { + let h = m[1]; + if (h.length === 3) h = h.split("").map((c) => c + c).join(""); + return "#" + h.toLowerCase(); + } + + m = str.match(/^rgba?\(\s*(\d+)[\s,]+(\d+)[\s,]+(\d+)/i); + if (m) return rgbToHex(+m[1], +m[2], +m[3]); + + const hsl = parseHslTriple(str); + if (hsl) return hslToHex(hsl.h, hsl.s, hsl.l); + + return ""; +} + +function colorToHslString(value) { + const hex = colorToHex(value); + if (hex) return hexToHslString(hex); + const t = parseHslTriple(value); + return t ? `${Math.round(t.h)} ${Math.round(t.s)} ${Math.round(t.l)}` : ""; +} + +// parseHslTriple accepts "43 50 70", "43,50,70" and "hsl(43, 50%, 70%)". +function parseHslTriple(value) { + const m = String(value == null ? "" : value).trim() + .match(/^(?:hsla?\()?\s*([\d.]+)[\s,]+([\d.]+)%?[\s,]+([\d.]+)%?\s*\)?$/); + if (!m) return null; + const h = +m[1], s = +m[2], l = +m[3]; + if (h > 360 || s > 100 || l > 100) return null; + return { h, s, l }; +} + +function hexToRgb(hex) { + const h = hex.replace("#", ""); + return { r: parseInt(h.slice(0, 2), 16), g: parseInt(h.slice(2, 4), 16), b: parseInt(h.slice(4, 6), 16) }; +} + +function rgbToHex(r, g, b) { + const to = (n) => Math.max(0, Math.min(255, Math.round(n))).toString(16).padStart(2, "0"); + return "#" + to(r) + to(g) + to(b); +} + +function hexToHslString(hex) { + const { r, g, b } = hexToRgb(hex); + const { h, s, l } = rgbToHsl(r, g, b); + return `${h} ${s} ${l}`; +} + +function rgbToHsl(r, g, b) { + r /= 255; g /= 255; b /= 255; + const max = Math.max(r, g, b), min = Math.min(r, g, b); + let h = 0, s = 0; + const l = (max + min) / 2; + const d = max - min; + if (d !== 0) { + s = d / (1 - Math.abs(2 * l - 1)); + switch (max) { + case r: h = ((g - b) / d) % 6; break; + case g: h = (b - r) / d + 2; break; + default: h = (r - g) / d + 4; + } + h *= 60; + if (h < 0) h += 360; + } + return { h: Math.round(h), s: Math.round(s * 100), l: Math.round(l * 100) }; +} + +function hslToHex(h, s, l) { + s /= 100; l /= 100; + const c = (1 - Math.abs(2 * l - 1)) * s; + const x = c * (1 - Math.abs(((h / 60) % 2) - 1)); + const mm = l - c / 2; + let r = 0, g = 0, b = 0; + if (h < 60) { r = c; g = x; } + else if (h < 120) { r = x; g = c; } + else if (h < 180) { g = c; b = x; } + else if (h < 240) { g = x; b = c; } + else if (h < 300) { r = x; b = c; } + else { r = c; b = x; } + return rgbToHex((r + mm) * 255, (g + mm) * 255, (b + mm) * 255); +} + // // Generic modal // diff --git a/internal/dynacat/templates/playing.html b/internal/dynacat/templates/playing.html index 38a85259..3ae3594e 100644 --- a/internal/dynacat/templates/playing.html +++ b/internal/dynacat/templates/playing.html @@ -4,6 +4,14 @@ {{ define "widget-content" }} + + + +
+

Welcome to Dynacat

+

Create your first page

+

+ There is no config file yet. Pick a name and a starting point - every widget can be + rearranged afterwards with the built in editor. +

+ +
+ +
+ +
+ +

Start from

+ +
+ {{- range $index, $preset := .Presets }} + + {{- end }} +
+ + + + +
+ +

+ Writing to {{ .ConfigPath }} · + docs +

+
+ + + + + From ae7c5c2ef340a9cd645de13dba752a679117c337 Mon Sep 17 00:00:00 2001 From: Panonim Date: Sat, 5 Sep 2026 11:32:23 +0200 Subject: [PATCH 45/53] Updated docs --- docs/assets/app.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/assets/app.js b/docs/assets/app.js index 03a47a6a..e4e89cbf 100644 --- a/docs/assets/app.js +++ b/docs/assets/app.js @@ -1648,8 +1648,9 @@ async function renderHome() { { page: 'themes', title: 'Themes', desc: 'Browse dark and light theme options', icon: `` }, { page: 'preconfigured-pages', title: 'Preconfigured Pages', desc: 'Ready-to-use page layouts', icon: `` }, { page: 'custom-api', title: 'Custom API', desc: 'Build widgets from any HTTP JSON API', icon: `` }, - { page: 'widget-editor', title: 'Widget Editor', desc: 'Build custom-api widgets visually, no template needed', icon: `` }, - { page: 'authentication', title: 'Authentication', desc: 'Secure your dashboard with password or OIDC login', icon: `` } + { page: 'widget-editor', title: 'Widget Editor', desc: 'Build custom-api widgets visually, no template needed', icon: `` }, + { page: 'authentication', title: 'Authentication', desc: 'Secure your dashboard with password or OIDC login', icon: `` }, + { page: 'ui-editor', title: 'UI Editor', desc: 'Drag, drop and theme the dashboard from the page itself', icon: `` } ]; const featureCards = features.map((f) => ` @@ -1765,7 +1766,7 @@ async function renderHome() {
- Sponsor + Paypal
From 1479451a2e8d1d732cbf453e910c65fd97470ca6 Mon Sep 17 00:00:00 2001 From: Panonim Date: Sat, 5 Sep 2026 13:00:37 +0200 Subject: [PATCH 46/53] Updated editor and readme files --- README.md | 45 ++++++- docs/docs/changelog.md | 1 + docs/docs/faq.md | 16 +-- docs/docs/installation.md | 26 ++-- internal/dynacat/config.go | 12 ++ internal/dynacat/dynacat.go | 1 + internal/dynacat/editor-http.go | 30 +++++ internal/dynacat/static/css/editor.css | 111 +++++++++++++++ internal/dynacat/static/js/editor.js | 180 ++++++++++++++++++++++--- internal/dynacat/templates/page.html | 2 +- internal/dynacat/widget-dynawidgets.go | 111 +++++++++++---- 11 files changed, 467 insertions(+), 68 deletions(-) diff --git a/README.md b/README.md index c792a605..604d6b7b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Configuration • Discord • - Sponsor + Sponsor

Dynawidgets repo • @@ -55,8 +55,49 @@ Easily create your own theme by tweaking a few numbers or choose from one of the
+## Installation +There are currently two ways in which you can use Dynacat, the UI editorand editing yaml files manually. +If you'd like to use the UI here's the recommended configuration. + +The quickest start is to grab the ready-made directory structure: + +```bash +mkdir dynacat && cd dynacat && \ +curl -sL https://github.com/Panonim/dynacat-compose-template/releases/latest/download/dynacat.tar.gz | tar -xzf - && \ +docker compose up -d +``` + +

+Docker compose file +
+ +```yaml +services: + dynacat: + container_name: dynacat + image: panonim/dynacat + restart: unless-stopped + volumes: + - ./config:/app/config + - ./assets:/app/assets + - /etc/localtime:/etc/localtime:ro + # Optionally, also mount docker socket if you want to use the docker containers widget + # - /var/run/docker.sock:/var/run/docker.sock:ro + ports: + - 8080:8080 + env_file: .env +``` +
+ +If you'd like a more detailed instructions they can be found in [the docs](https://dynacat.artur.zone/#installation). + ## Configuration -Configuration is done through YAML files, to learn more about how the layout works, how to add more pages and how to configure widgets, visit the [configuration documentation](https://dynacat.artur.zone/configuration#configuring-dynacat). +There are two ways to configure Dynacat, and they work on the same files: + +* **UI editor** - drag widgets into columns, change their options and pick your colors from the dashboard itself. Dynacat writes the result back into your YAML. See the [UI editor documentation](https://dynacat.artur.zone/ui-editor). +* **YAML by hand** - edit the config files directly. To learn more about how the layout works, how to add more pages and how to configure widgets, visit the [configuration documentation](https://dynacat.artur.zone/configuration#configuring-dynacat). + +The editor is an addition to the config file, not a replacement, so hand written config keeps working exactly as before.
Preview example configuration file diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index 4a8e7ef6..25fb82a8 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -1,4 +1,5 @@ # Changes for 3.0.0 +- Moved the compose template to [Panonim/dynacat-compose-template](https://github.com/Panonim/dynacat-compose-template), the install command is now a single `curl | tar` with no `sed` renaming - Added support for `tcp://`/`http://` remote Docker hosts to `sock-path` in the `docker-controller` widget, matching `docker-containers` - Documented `id`/`parent` grouping for the `containers` property in `docker-containers` widget -> https://github.com/Panonim/dynacat/issues/134 - Fixed an issue where subrequests were not detected properly in `dynawidgets` diff --git a/docs/docs/faq.md b/docs/docs/faq.md index b68eed7f..1d397321 100644 --- a/docs/docs/faq.md +++ b/docs/docs/faq.md @@ -2,6 +2,10 @@ ## Does the information on the page update automatically? Yes! That's the whole point of Dynacat +## Do I have to edit YAML by hand? + +No. Click the pencil icon in the header to open the UI editor, which lets you add pages, drag widgets into columns, change their options and set your theme from the dashboard itself. It writes normal YAML back into your config files, so you can switch between the two whenever you want. + ## Can I create my own widgets? Yes, there are multiple ways to create custom widgets: @@ -35,11 +39,7 @@ If you're not make sure you copied the installation command correctly: ```bash mkdir dynacat && cd dynacat && \ -curl -sL https://github.com/glanceapp/docker-compose-template/archive/refs/heads/main.tar.gz | tar -xzf - --strip-components 2 && \ -sed -i \ - -e 's/^ glance:/ dynacat:/' \ - -e 's/^ container_name: glance/ container_name: dynacat/' \ - -e 's/^ image: glanceapp\/glance/ image: panonim\/dynacat/' \ - docker-compose.yml && \ -mv config/glance.yml config/dynacat.yml -``` \ No newline at end of file +curl -sL https://github.com/Panonim/dynacat-compose-template/releases/latest/download/dynacat.tar.gz | tar -xzf - +``` + +The archive already contains `config/dynacat.yml`, so nothing needs renaming. \ No newline at end of file diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 8d5665c5..9a965463 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -6,19 +6,23 @@ Create a new directory called `dynacat` as well as the template files within it ```bash mkdir dynacat && cd dynacat && \ -curl -sL https://github.com/glanceapp/docker-compose-template/archive/refs/heads/main.tar.gz | tar -xzf - --strip-components 2 && \ -sed -i \ - -e 's/^ glance:/ dynacat:/' \ - -e 's/^ container_name: glance/ container_name: dynacat/' \ - -e 's/^ image: glanceapp\/glance/ image: panonim\/dynacat/' \ - docker-compose.yml && \ -mv config/glance.yml config/dynacat.yml +curl -sL https://github.com/Panonim/dynacat-compose-template/releases/latest/download/dynacat.tar.gz | tar -xzf - ``` -> [!IMPORTANT] -> Remember to keep the command exactly as-is; otherwise, the image won't work. +*[click here to view the files that will be created](https://github.com/Panonim/dynacat-compose-template/tree/main/root)* -*[click here to view the files that will be created](https://github.com/glanceapp/docker-compose-template/tree/main/root)* +
+Verifying the download + +
+Every release ships a checksum next to the archive: + +```bash +curl -sLO https://github.com/Panonim/dynacat-compose-template/releases/latest/download/dynacat.tar.gz +curl -sLO https://github.com/Panonim/dynacat-compose-template/releases/latest/download/dynacat.tar.gz.sha256 +sha256sum -c dynacat.tar.gz.sha256 +``` +
Then, edit the following files as desired: * `docker-compose.yml` to configure the port, volumes and other containery things @@ -69,7 +73,7 @@ Then, create a new directories called `config` & `assets` and download the examp mkdir config && wget -O config/dynacat.yml https://raw.githubusercontent.com/Panonim/dynacat/refs/heads/main/docs/docs/dynacat.yml ``` -Feel free to edit the `dynacat.yml` file to your liking, and when ready run: +Feel free to edit the `dynacat.yml` file to your liking, or leave it as is and use the [UI editor](ui-editor.md) once the container is up. When ready run: ```bash docker compose up -d diff --git a/internal/dynacat/config.go b/internal/dynacat/config.go index 980be77d..30109d37 100644 --- a/internal/dynacat/config.go +++ b/internal/dynacat/config.go @@ -193,6 +193,15 @@ var configVariablePattern = regexp.MustCompile(`(^|.)\$\{(?:([a-zA-Z]+):)?([a-zA // TODO: don't match against commented out sections func parseConfigVariables(contents []byte) ([]byte, error) { + return expandConfigVariables(contents, true) +} + +// Expands ${ENV_VAR} only, so a remote template cannot pull a mounted secret into the URL it calls. +func parseEnvVariablesOnly(contents []byte) ([]byte, error) { + return expandConfigVariables(contents, false) +} + +func expandConfigVariables(contents []byte, allowTypedVariables bool) ([]byte, error) { var err error replaced := configVariablePattern.ReplaceAllFunc(contents, func(match []byte) []byte { @@ -215,6 +224,9 @@ func parseConfigVariables(contents []byte) ([]byte, error) { } typeAsString, variableName := string(groups[2]), string(groups[3]) + if typeAsString != "" && !allowTypedVariables { + return match + } variableType := ternary(typeAsString == "", configVarTypeEnv, typeAsString) parsedValue, returnOriginal, localErr := parseConfigVariableOfType(variableType, variableName) diff --git a/internal/dynacat/dynacat.go b/internal/dynacat/dynacat.go index ca4ee5de..1630282a 100644 --- a/internal/dynacat/dynacat.go +++ b/internal/dynacat/dynacat.go @@ -1010,6 +1010,7 @@ func (a *application) server() (func() error, func() error) { mux.HandleFunc("POST /api/editor/config", a.handleEditorConfigSave) mux.HandleFunc("POST /api/editor/convert", a.handleEditorConvert) mux.HandleFunc("POST /api/editor/custom-api/preview", a.handleEditorCustomAPIPreview) + mux.HandleFunc("GET /api/editor/dynawidgets/variables", a.handleEditorDynawidgetVariables) } mux.Handle( diff --git a/internal/dynacat/editor-http.go b/internal/dynacat/editor-http.go index 6ebcdf40..610704d9 100644 --- a/internal/dynacat/editor-http.go +++ b/internal/dynacat/editor-http.go @@ -9,6 +9,7 @@ import ( "io" "log/slog" "net/http" + "strings" ) const ( @@ -88,6 +89,35 @@ func (a *application) handleEditorConfigSave(w http.ResponseWriter, r *http.Requ w.WriteHeader(http.StatusNoContent) } +// Reports which variables a dynawidget template needs and which of them the container is missing. +func (a *application) handleEditorDynawidgetVariables(w http.ResponseWriter, r *http.Request) { + if a.handleUnauthorizedResponse(w, r, showUnauthorizedJSON) { + return + } + if !a.userCanEditAnything(a.getAuthenticatedUser(w, r)) { + writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + return + } + + slug := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("widget"))) + repo := strings.TrimSpace(r.URL.Query().Get("repo")) + if repo == "" { + repo = dynawidgetsDefaultRepo + } + if !dynawidgetsSlugPattern.MatchString(slug) || !dynawidgetsRepoPattern.MatchString(repo) { + writeJSONError(w, http.StatusBadRequest, "invalid widget or repo") + return + } + + variables, err := dynawidgetsRequiredVariables(slug, repo) + if err != nil { + writeJSONError(w, http.StatusBadGateway, err.Error()) + return + } + + writeJSON(w, http.StatusOK, map[string]any{"variables": variables}) +} + type editorConvertRequest struct { To string `json:"to"` Value json.RawMessage `json:"value"` diff --git a/internal/dynacat/static/css/editor.css b/internal/dynacat/static/css/editor.css index e2ee2a08..c9a30268 100644 --- a/internal/dynacat/static/css/editor.css +++ b/internal/dynacat/static/css/editor.css @@ -736,6 +736,117 @@ body.editing .editor-styling-trigger { overflow-x: auto; } +.editor-notice { + display: flex; + flex-direction: column; + gap: 16px; +} + +.editor-env-vars { + display: flex; + flex-wrap: wrap; + justify-content: center; + gap: 6px; +} + +.editor-env-var, +.editor-code-block { + background: var(--color-widget-background-highlight); + color: var(--color-text-base); + font-family: monospace; + font-size: 1.2rem; +} + +.editor-env-var { + max-width: 100%; + padding: 4px 9px; + border-radius: calc(var(--border-radius) * 0.75); + text-align: center; + overflow-wrap: anywhere; +} + +.editor-code-card { + position: relative; + display: flex; +} + +.editor-code-block { + flex: 1; + min-width: 0; + margin: 0; + padding: 12px 44px 12px 14px; + border-radius: var(--border-radius); + line-height: 1.6; + overflow-x: auto; +} + +.editor-code-copy { + position: absolute; + top: 7px; + right: 7px; + display: flex; + padding: 5px; + border: none; + border-radius: calc(var(--border-radius) * 0.6); + background: transparent; + color: var(--color-text-subdue); + cursor: pointer; +} + +.editor-code-copy:hover { + color: var(--color-text-highlight); + background: color-mix(in srgb, var(--color-text-subdue) 14%, transparent); +} + +.editor-code-copy svg { + width: 1.6rem; + height: 1.6rem; +} + +.editor-code-inline { + padding: 1px 5px; + white-space: nowrap; + border-radius: calc(var(--border-radius) * 0.6); + background: color-mix(in srgb, var(--color-text-subdue) 16%, transparent); + color: var(--color-text-base); + font-family: monospace; + font-size: 0.95em; +} + +.editor-notice-steps { + display: flex; + flex-direction: column; + gap: 8px; + margin: 0; + padding: 0; + list-style: none; + counter-reset: notice-step; +} + +.editor-notice-steps li { + position: relative; + padding-left: 22px; + font-size: 1.25rem; + line-height: 1.55; + color: var(--color-text-base); +} + +.editor-notice-steps li::before { + counter-increment: notice-step; + content: counter(notice-step) "."; + position: absolute; + left: 0; + color: var(--color-text-subdue); +} + +.editor-notice-note { + padding-left: 11px; + border-left: 2px solid var(--color-separator); + font-size: 1.15rem; + line-height: 1.5; + color: var(--color-text-subdue); +} + .editor-icon-preview { width: 26px; height: 26px; diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index ac96e003..19dc7eba 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -164,6 +164,16 @@ function waitForServerReload(before, timeout = 6000) { // // Palette dock // +const NAME_BREAKS = { Dynawidgets: ["Dyna", "widgets"] }; + +function paletteName(label) { + const el = div("editor-palette-name"); + (NAME_BREAKS[label] || [label]).forEach((part, i) => { + if (i) el.append(document.createElement("wbr")); + el.append(part); + }); + return el; +} function buildPalette() { const dock = div("editor-ui editor-palette-dock"); @@ -182,7 +192,7 @@ function buildPalette() { item.draggable = true; item.title = schema.label; if (schema.icon) item.append(maskIcon("editor-palette-icon", schema.icon)); - item.append(div("editor-palette-name", schema.label)); + item.append(paletteName(schema.label)); item.addEventListener("dragstart", () => (state.drag = { type: schema.type })); list.append(item); items.push({ el: item, haystack: `${schema.label} ${schema.type}`.toLowerCase() }); @@ -616,7 +626,7 @@ function buildWidgetModal(type, values, structured, onSave) { : [basic]; if (advanced.children.length) sections.push(collapsible("Advanced", advanced)); - openModal(schema.label, sections, () => { + openModal(schema.label, sections, async () => { const fields = { ...hiddenValues }; const rawFields = {}; for (const c of controls) { @@ -634,6 +644,7 @@ function buildWidgetModal(type, values, structured, onSave) { if (raw) rawFields[c.field.name] = value; else fields[c.field.name] = value; } + if (type === "dynawidgets" && !(await confirmDynawidgetVariables(fields))) return false; return onSave(fields, rawFields); }, type === "custom-api" ? customAPIEditorButton(controls, hiddenValues, cleared) : null, schema.docs); } @@ -711,6 +722,8 @@ function openPasteModal(schema, apply) { const pasted = await parsePastedWidget(textarea.value, schema); if (!pasted) return false; await apply(pasted); + // Pasting only stores the placeholder, so the values behind it still have to reach the container. + showVariableNotice(findConfigVariables(textarea.value)); return true; }); textarea.focus(); @@ -767,6 +780,121 @@ async function applyPastedWidget(controls, pasted, cleared) { else toast("Fields filled in from the pasted YAML", "positive"); } +// Mirrors configVariablePattern in config.go so the notice lists exactly what the server expands. +const configVariablePattern = /(^|.)\$\{(?:([a-zA-Z]+):)?([a-zA-Z0-9_-]+)\}/g; +const configVariableDocs = "https://dynacat.artur.zone/#configuration/environment-variables"; + +function findConfigVariables(text) { + const found = new Map(); + + for (const [, prefix, kind, name] of text.matchAll(configVariablePattern)) { + if (prefix === "\\") continue; + const token = kind ? `\${${kind}:${name}}` : `\${${name}}`; + if (!found.has(token)) found.set(token, { token, kind: kind || "env", name }); + } + + return [...found.values()]; +} + +// Blocks the save instead of letting it fail, since the config cannot load while a value is missing. +async function confirmDynawidgetVariables({ widget, repo }) { + if (!widget) return true; + + const params = new URLSearchParams({ widget }); + if (repo) params.set("repo", repo); + + let variables; + try { + ({ variables } = await apiGet(`/dynawidgets/variables?${params}`)); + } catch { + // The template may be unreachable, and the save itself still reports what went wrong. + return true; + } + + const missing = (variables || []) + .filter((v) => !v.set) + .map((v) => ({ token: `\${${v.name}}`, kind: v.type, name: v.name })); + if (!missing.length) return true; + + showVariableNotice(missing); + return false; +} + +function showVariableNotice(vars) { + if (!vars.length) return; + + const body = div("editor-notice"); + const list = div("editor-env-vars"); + for (const v of vars) list.append(div("editor-env-var", v.token)); + body.append(list); + + const envNames = vars.filter((v) => v.kind === "env").map((v) => v.name); + body.append(codeCard((envNames.length ? envNames : ["API_TOKEN"]).map((n) => `${n}=your-value-here`).join("\n"))); + + body.append(noticeSteps([ + envNames.length + ? "Add these lines to the `.env` file next to your compose file, with the real values." + : "Add every variable the widget needs to the `.env` file next to your compose file.", + "Recreate the container with `docker compose up -d` - the automatic config reload never re-reads the environment.", + ])); + + if (vars.some((v) => v.kind === "secret")) + body.append(noticeNote("`${secret:name}` is read from `/run/secrets/name`, so mount it as a Docker secret instead of putting it in `.env`.")); + if (vars.some((v) => v.kind === "readFileFromEnv")) + body.append(noticeNote("`${readFileFromEnv:NAME}` expects `NAME` to hold an absolute path, and the file behind it becomes the value.")); + + noticeModal("Values found in this widget", [body], configVariableDocs); +} + +function noticeSteps(steps) { + const list = document.createElement("ol"); + list.className = "editor-notice-steps"; + for (const step of steps) { + const item = document.createElement("li"); + item.append(...richText(step)); + list.append(item); + } + return list; +} + +function noticeNote(text) { + const note = div("editor-notice-note"); + note.append(...richText(text)); + return note; +} + +// Backtick-wrapped spans render as inline code so the notice can name variables and commands. +function richText(text) { + return text.split("`").map((part, i) => { + if (i % 2 === 0) return document.createTextNode(part); + const code = document.createElement("code"); + code.className = "editor-code-inline"; + code.textContent = part; + return code; + }); +} + +function codeCard(text) { + const card = div("editor-code-card"); + const pre = document.createElement("pre"); + pre.className = "editor-code-block"; + pre.textContent = text; + + const copy = button("", "editor-code-copy"); + copy.title = "Copy"; + copy.innerHTML = iconCopy; + copy.addEventListener("click", async () => { + try { + await navigator.clipboard.writeText(text); + toast("Copied to the clipboard", "positive"); + } catch { + toast("Could not copy, select the text instead", "negative"); + } + }); + card.append(pre, copy); + return card; +} + function dedent(text) { const lines = text.split("\n"); const indents = lines.filter((l) => l.trim()).map((l) => l.match(/^ */)[0].length); @@ -1827,30 +1955,17 @@ function modalTitle(title, docsURL) { return el; } -function openModal(title, sections, onSave, footerLeft, docsURL) { +// buildActions gets the close callback and returns the footer buttons, left to right. +function modalShell(title, sections, docsURL, buildActions) { const overlay = div("editor-ui editor-modal-overlay"); const modal = div("editor-modal"); - modal.append(modalTitle(title, docsURL)); const bodyEl = div("editor-modal-body"); for (const s of sections) bodyEl.append(s); - modal.append(bodyEl); const actions = div("editor-modal-actions"); - const cancel = button("Cancel", "editor-btn"); - const saveBtn = button("Save", "editor-btn editor-btn-primary"); - cancel.addEventListener("click", () => overlay.remove()); - saveBtn.addEventListener("click", async () => { - saveBtn.disabled = true; - try { - if (await onSave()) overlay.remove(); - } finally { - saveBtn.disabled = false; - } - }); - if (footerLeft) actions.append(footerLeft); - actions.append(cancel, saveBtn); - modal.append(actions); + actions.append(...buildActions(() => overlay.remove()).filter(Boolean)); + modal.append(modalTitle(title, docsURL), bodyEl, actions); overlay.append(modal); let pressedOnBackdrop = false; @@ -1861,6 +1976,32 @@ function openModal(title, sections, onSave, footerLeft, docsURL) { document.body.append(overlay); } +function openModal(title, sections, onSave, footerLeft, docsURL) { + modalShell(title, sections, docsURL, (close) => { + const cancel = button("Cancel", "editor-btn"); + const saveBtn = button("Save", "editor-btn editor-btn-primary"); + cancel.addEventListener("click", close); + saveBtn.addEventListener("click", async () => { + saveBtn.disabled = true; + try { + if (await onSave()) close(); + } finally { + saveBtn.disabled = false; + } + }); + return [footerLeft, cancel, saveBtn]; + }); +} + +function noticeModal(title, sections, docsURL) { + const okBtn = button("Got it", "editor-btn editor-btn-primary"); + modalShell(title, sections, docsURL, (close) => { + okBtn.addEventListener("click", close); + return [okBtn]; + }); + okBtn.focus(); +} + function confirmAction(message, onConfirm, options = {}) { if (window.matchMedia("(max-width: 768px)").matches) { if (confirm(message)) onConfirm(); @@ -2036,5 +2177,6 @@ const iconCog = ``; const iconChevron = ``; const iconPaste = ``; +const iconCopy = ``; const iconTrash = ``; const iconMedal = ``; diff --git a/internal/dynacat/templates/page.html b/internal/dynacat/templates/page.html index 2455ed8e..a5bb8833 100644 --- a/internal/dynacat/templates/page.html +++ b/internal/dynacat/templates/page.html @@ -79,7 +79,7 @@ {{ if and (or (not .App.AnyAuthEnabled) .AuthUser) (.App.UserAllowedToEdit .AuthUser) (.App.EditingAllowedForPage .AuthUser .Page) }} {{ end }} diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index c07102c9..0d8bc36e 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -171,30 +171,36 @@ func (widget *dynawidgetsWidget) Render() template.HTML { return widget.renderTemplate(widget, customAPIWidgetTemplate) } -func dynawidgetsParseTemplate(raw string) (templateContent string, required *dynawidgetsRequired) { +func dynawidgetsSplitTemplate(raw string) (templateContent string, requiredRaw string) { const separator = "required: |" idx := strings.LastIndex(raw, separator) if idx == -1 { - return raw, nil + return raw, "" } - templateContent = strings.TrimRight(raw[:idx], "\n\r ") - requiredRaw := dedentYAMLBlock(raw[idx+len(separator):]) + return strings.TrimRight(raw[:idx], "\n\r "), dedentYAMLBlock(raw[idx+len(separator):]) +} +func dynawidgetsParseTemplate(raw string) (templateContent string, required *dynawidgetsRequired, err error) { + templateContent, requiredRaw := dynawidgetsSplitTemplate(raw) if requiredRaw == "" { - return templateContent, nil + return templateContent, nil, nil + } + + // Env placeholders only, so ${secret:...} and ${readFileFromEnv:...} stay untouched. + expanded, err := parseEnvVariablesOnly([]byte(requiredRaw)) + if err != nil { + return "", nil, fmt.Errorf("required section: %w", err) } - // Deliberately not run through parseConfigVariables: this block comes from a remote - // template, and expanding ${...} there would hand it the host's env vars and secret files. required = &dynawidgetsRequired{} - if err := yaml.Unmarshal([]byte(requiredRaw), required); err != nil { + if err := yaml.Unmarshal(expanded, required); err != nil { slog.Error("Failed to parse dynawidget required section", "error", err) - return templateContent, nil + return templateContent, nil, nil } - return templateContent, required + return templateContent, required, nil } func dedentYAMLBlock(raw string) string { @@ -227,20 +233,34 @@ func dedentYAMLBlock(raw string) string { } func dynawidgetsResolveTemplate(slug string, repo string) (templateContent string, title string, required *dynawidgetsRequired, err error) { + raw, title, err := dynawidgetsRawTemplate(slug, repo) + if err != nil { + return "", "", nil, err + } + + templateContent, required, err = dynawidgetsParseTemplate(raw) + if err != nil { + return "", "", nil, err + } + + return templateContent, title, required, nil +} + +// Returns the template exactly as the repository ships it, without any variable expansion. +func dynawidgetsRawTemplate(slug string, repo string) (raw string, title string, err error) { if !dynawidgetsSlugPattern.MatchString(slug) { - return "", "", nil, fmt.Errorf("invalid slug %q", slug) + return "", "", fmt.Errorf("invalid slug %q", slug) } templatePath := filepath.Join(dynawidgetsAssetsDir, slug+".txt") if absAssets, aerr := filepath.Abs(dynawidgetsAssetsDir); aerr == nil { if absTemplate, terr := filepath.Abs(templatePath); terr != nil || !strings.HasPrefix(absTemplate, absAssets+string(filepath.Separator)) { - return "", "", nil, fmt.Errorf("refusing to resolve template outside assets dir") + return "", "", fmt.Errorf("refusing to resolve template outside assets dir") } } if data, readErr := os.ReadFile(templatePath); readErr == nil { slog.Info("Using cached dynawidget template", "slug", slug, "path", templatePath) - content, req := dynawidgetsParseTemplate(string(data)) - return content, "", req, nil + return string(data), "", nil } firstLetter := string(slug[0]) @@ -251,17 +271,17 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin resp, err := defaultHTTPClient.Get(listURL) if err != nil { - return "", "", nil, fmt.Errorf("fetching widget list: %w", err) + return "", "", fmt.Errorf("fetching widget list: %w", err) } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - return "", "", nil, fmt.Errorf("fetching widget list: %d %s", resp.StatusCode, http.StatusText(resp.StatusCode)) + return "", "", fmt.Errorf("fetching widget list: %d %s", resp.StatusCode, http.StatusText(resp.StatusCode)) } var entries []dynawidgetsListEntry if err := json.NewDecoder(resp.Body).Decode(&entries); err != nil { - return "", "", nil, fmt.Errorf("decoding widget list: %w", err) + return "", "", fmt.Errorf("decoding widget list: %w", err) } var entry *dynawidgetsListEntry @@ -273,7 +293,7 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin } if entry == nil { - return "", "", nil, fmt.Errorf("widget %q not found in dynawidgets list", slug) + return "", "", fmt.Errorf("widget %q not found in dynawidgets list", slug) } templateURL := entry.Template @@ -288,10 +308,10 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin parsedTemplateURL, err := url.Parse(templateURL) if err != nil { - return "", "", nil, fmt.Errorf("invalid template URL %q: %w", templateURL, err) + return "", "", fmt.Errorf("invalid template URL %q: %w", templateURL, err) } if parsedTemplateURL.Scheme != "https" || parsedTemplateURL.Host != dynawidgetsTemplateHost { - return "", "", nil, fmt.Errorf( + return "", "", fmt.Errorf( "refusing to fetch template from unexpected host %q (must be https://%s)", parsedTemplateURL.Host, dynawidgetsTemplateHost, ) @@ -301,21 +321,19 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin templateResp, err := defaultHTTPClient.Get(templateURL) if err != nil { - return "", "", nil, fmt.Errorf("fetching template: %w", err) + return "", "", fmt.Errorf("fetching template: %w", err) } defer templateResp.Body.Close() if templateResp.StatusCode != http.StatusOK { - return "", "", nil, fmt.Errorf("fetching template: %d %s", templateResp.StatusCode, http.StatusText(templateResp.StatusCode)) + return "", "", fmt.Errorf("fetching template: %d %s", templateResp.StatusCode, http.StatusText(templateResp.StatusCode)) } bodyBytes, err := io.ReadAll(templateResp.Body) if err != nil { - return "", "", nil, fmt.Errorf("reading template body: %w", err) + return "", "", fmt.Errorf("reading template body: %w", err) } - rawContent := string(bodyBytes) - if err := os.MkdirAll(dynawidgetsAssetsDir, 0755); err != nil { slog.Error("Failed to create dynawidgets assets directory", "error", err) } else if err := os.WriteFile(templatePath, bodyBytes, 0600); err != nil { @@ -324,6 +342,45 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin slog.Info("Cached dynawidget template", "slug", slug, "path", templatePath) } - templateContent, required = dynawidgetsParseTemplate(rawContent) - return templateContent, entry.Title, required, nil + return string(bodyBytes), entry.Title, nil +} + +type dynawidgetsVariable struct { + Name string `json:"name"` + Type string `json:"type"` + Set bool `json:"set"` +} + +// Lists the variables a widget's required block expects and whether the container has each one. +func dynawidgetsRequiredVariables(slug string, repo string) ([]dynawidgetsVariable, error) { + raw, _, err := dynawidgetsRawTemplate(slug, repo) + if err != nil { + return nil, err + } + + _, requiredRaw := dynawidgetsSplitTemplate(raw) + if requiredRaw == "" { + return nil, nil + } + + variables := make([]dynawidgetsVariable, 0) + seen := make(map[string]bool) + + for _, match := range configVariablePattern.FindAllStringSubmatch(requiredRaw, -1) { + // Typed variables are never expanded in a template, so only env ones are worth reporting. + if match[1] == `\` || match[2] != "" { + continue + } + + name := match[3] + if seen[name] { + continue + } + seen[name] = true + + _, isSet := os.LookupEnv(name) + variables = append(variables, dynawidgetsVariable{Name: name, Type: configVarTypeEnv, Set: isSet}) + } + + return variables, nil } From beed1dbc3e33cceced527738a9b28c619dd9f9b4 Mon Sep 17 00:00:00 2001 From: Panonim Date: Sat, 5 Sep 2026 14:20:48 +0200 Subject: [PATCH 47/53] Updated UI editor and allowed dynawidgets to get refetched. --- docs/docs/changelog.md | 1 + docs/docs/configuration.md | 5 +- docs/docs/contributing.md | 11 - internal/dynacat/dynawidgets-templates.go | 258 ++++++++++++++++++++++ internal/dynacat/static/js/editor.js | 36 ++- internal/dynacat/widget-dynawidgets.go | 168 +++++++++----- internal/dynacat/widget-schema.go | 4 +- 7 files changed, 407 insertions(+), 76 deletions(-) create mode 100644 internal/dynacat/dynawidgets-templates.go diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index 25fb82a8..d9a6433a 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -3,6 +3,7 @@ - Added support for `tcp://`/`http://` remote Docker hosts to `sock-path` in the `docker-controller` widget, matching `docker-containers` - Documented `id`/`parent` grouping for the `containers` property in `docker-containers` widget -> https://github.com/Panonim/dynacat/issues/134 - Fixed an issue where subrequests were not detected properly in `dynawidgets` +- Added automatic update checks for cached `dynawidgets` templates, with a notice on the widget when one changed - Fixed `dynawidgets` protocol handling - Added an option to visually edit your configuration - Fixed Navidrome in currently playing diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index b8db566e..8861d982 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -1418,15 +1418,16 @@ The slug of the widget from the dynawidgets repository. This is the only require widget: daily-chess-puzzle ``` +The cached template is update automatically, so you don't have to worry about anything. + ##### `repo` -The branch/repository to fetch the widget from. This allows you to test widgets from different branches or forks. Defaults to `main`. Example: +The branch of the dynawidgets repository to fetch the widget from. This allows you to test widgets that are not on `main` yet. ```yaml widget: daily-chess-puzzle repo: testing/main ``` -This will fetch from `https://raw.githubusercontent.com/Panonim/dynawidgets/refs/heads/testing/main/...` ##### `url`, `headers`, `method`, `body-type`, `body`, `frameless`, `allow-insecure`, `skip-json-validation` These properties work the same as in the [custom-api widget](#custom-api). They override the default values defined in the widget's template `required` section. diff --git a/docs/docs/contributing.md b/docs/docs/contributing.md index a2f729ca..bdbc8003 100644 --- a/docs/docs/contributing.md +++ b/docs/docs/contributing.md @@ -110,17 +110,6 @@ author: your-github-username ## Widget Guidelines -### Use suffixed CSS classes - -If you need custom CSS, suffix classes with the widget name so styles stay isolated: - -```css -.{class}-{widget-name} { - text-align: center; - margin-top: 1.5rem; -} -``` - ### Use environment variables for configurable values Do not hardcode local addresses or secrets. diff --git a/internal/dynacat/dynawidgets-templates.go b/internal/dynacat/dynawidgets-templates.go new file mode 100644 index 00000000..1a89c8f3 --- /dev/null +++ b/internal/dynacat/dynawidgets-templates.go @@ -0,0 +1,258 @@ +package dynacat + +import ( + "encoding/json" + "errors" + "fmt" + "log/slog" + "net/http" + "net/url" + "os" + "path/filepath" + "strings" + "sync" + "time" +) + +const ( + dynawidgetsUpdateCheckInterval = 3 * 24 * time.Hour + dynawidgetsSlowUpdateCheckInterval = 14 * 24 * time.Hour + // Consecutive checks that found nothing before the slow interval takes over. + dynawidgetsSlowUpdateAfterChecks = 2 + // How often a widget asks; the metadata interval decides whether that reaches the network. + dynawidgetsCheckPollInterval = time.Hour + dynawidgetsUpdateNoticeDuration = 7 * 24 * time.Hour +) + +type dynawidgetsTemplateMeta struct { + Repo string `json:"repo"` + URL string `json:"url"` + Title string `json:"title,omitempty"` + ETag string `json:"etag,omitempty"` + CheckedAt time.Time `json:"checked-at"` + UpdatedAt time.Time `json:"updated-at"` + UnchangedChecks int `json:"unchanged-checks,omitempty"` +} + +// Templates that keep coming back unchanged are checked far less often. +func (meta *dynawidgetsTemplateMeta) checkInterval() time.Duration { + if meta.UnchangedChecks >= dynawidgetsSlowUpdateAfterChecks { + return dynawidgetsSlowUpdateCheckInterval + } + + return dynawidgetsUpdateCheckInterval +} + +// Keeps generated paths inside the assets directory, whatever the slug looks like. +func dynawidgetsAssetPath(slug string, suffix string) (string, error) { + if !dynawidgetsSlugPattern.MatchString(slug) { + return "", fmt.Errorf("invalid slug %q", slug) + } + + path := filepath.Join(dynawidgetsAssetsDir, slug+suffix) + absAssets, err := filepath.Abs(dynawidgetsAssetsDir) + if err != nil { + return path, nil + } + absPath, err := filepath.Abs(path) + if err != nil || !strings.HasPrefix(absPath, absAssets+string(filepath.Separator)) { + return "", errors.New("refusing to resolve template outside assets dir") + } + + return path, nil +} + +func dynawidgetsTemplateModTime(slug string) time.Time { + path, err := dynawidgetsAssetPath(slug, ".txt") + if err != nil { + return time.Time{} + } + + info, err := os.Stat(path) + if err != nil { + return time.Time{} + } + + return info.ModTime() +} + +// Metadata for every cached template, keyed by slug. +var dynawidgetsMetaPath = filepath.Join(dynawidgetsAssetsDir, "templates.meta.json") + +var dynawidgetsMetaMu sync.Mutex + +func dynawidgetsReadAllMeta() map[string]dynawidgetsTemplateMeta { + data, err := os.ReadFile(dynawidgetsMetaPath) + if err != nil { + return map[string]dynawidgetsTemplateMeta{} + } + + entries := map[string]dynawidgetsTemplateMeta{} + if err := json.Unmarshal(data, &entries); err != nil { + slog.Warn("Ignoring unreadable dynawidgets metadata", "error", err, "path", dynawidgetsMetaPath) + return map[string]dynawidgetsTemplateMeta{} + } + + return entries +} + +func dynawidgetsReadMeta(slug string) *dynawidgetsTemplateMeta { + dynawidgetsMetaMu.Lock() + defer dynawidgetsMetaMu.Unlock() + + meta, ok := dynawidgetsReadAllMeta()[slug] + if !ok { + return nil + } + + return &meta +} + +func dynawidgetsWriteMeta(slug string, meta *dynawidgetsTemplateMeta) { + dynawidgetsMetaMu.Lock() + defer dynawidgetsMetaMu.Unlock() + + entries := dynawidgetsReadAllMeta() + entries[slug] = *meta + + data, err := json.MarshalIndent(entries, "", " ") + if err != nil { + return + } + + if err := os.MkdirAll(dynawidgetsAssetsDir, 0755); err != nil { + slog.Error("Failed to create dynawidgets assets directory", "error", err) + return + } + + if err := os.WriteFile(dynawidgetsMetaPath, data, 0600); err != nil { + slog.Error("Failed to write dynawidgets metadata", "error", err, "path", dynawidgetsMetaPath) + } +} + +var dynawidgetsCheckLocks = struct { + mu sync.Mutex + slugs map[string]*sync.Mutex +}{slugs: map[string]*sync.Mutex{}} + +func dynawidgetsCheckLock(slug string, repo string) *sync.Mutex { + dynawidgetsCheckLocks.mu.Lock() + defer dynawidgetsCheckLocks.mu.Unlock() + + key := repo + "/" + slug + lock, ok := dynawidgetsCheckLocks.slugs[key] + if !ok { + lock = &sync.Mutex{} + dynawidgetsCheckLocks.slugs[key] = lock + } + + return lock +} + +// Refetches the cached template once its check interval has passed and rewrites the cache file if it changed. +func dynawidgetsCheckTemplate(slug string, repo string) error { + if repo == "" { + repo = dynawidgetsDefaultRepo + } + + lock := dynawidgetsCheckLock(slug, repo) + lock.Lock() + defer lock.Unlock() + + templatePath, err := dynawidgetsAssetPath(slug, ".txt") + if err != nil { + return err + } + + cached, err := os.ReadFile(templatePath) + if err != nil { + // Nothing cached yet, so the next initialize downloads it anyway. + return nil + } + + meta := dynawidgetsReadMeta(slug) + if meta == nil || meta.Repo != repo { + meta = &dynawidgetsTemplateMeta{Repo: repo} + } + + if time.Since(meta.CheckedAt) < meta.checkInterval() { + return nil + } + + templateURL := meta.URL + if templateURL == "" { + templateURL, meta.Title, err = dynawidgetsTemplateURL(slug, repo) + if err != nil { + return err + } + meta.URL = templateURL + } + + body, notModified, etag, err := dynawidgetsDownloadTemplate(templateURL, meta.ETag) + if err != nil { + return err + } + + now := time.Now() + meta.CheckedAt = now + meta.ETag = etag + + if notModified || string(body) == string(cached) { + meta.UnchangedChecks++ + dynawidgetsWriteMeta(slug, meta) + return nil + } + + if err := os.WriteFile(templatePath, body, 0600); err != nil { + return fmt.Errorf("writing template: %w", err) + } + + meta.UpdatedAt = now + meta.UnchangedChecks = 0 + dynawidgetsWriteMeta(slug, meta) + slog.Info("Dynawidget template updated", "slug", slug, "repo", repo, "url", templateURL) + + return nil +} + +func dynawidgetsDownloadTemplate(templateURL string, etag string) (body []byte, notModified bool, newETag string, err error) { + parsedURL, err := url.Parse(templateURL) + if err != nil { + return nil, false, "", fmt.Errorf("invalid template URL %q: %w", templateURL, err) + } + if parsedURL.Scheme != "https" || parsedURL.Host != dynawidgetsTemplateHost { + return nil, false, "", fmt.Errorf( + "refusing to fetch template from unexpected host %q (must be https://%s)", + parsedURL.Host, dynawidgetsTemplateHost, + ) + } + + request, err := http.NewRequest(http.MethodGet, templateURL, nil) + if err != nil { + return nil, false, "", err + } + request.Header.Set("User-Agent", dynacatUserAgentString) + if etag != "" { + request.Header.Set("If-None-Match", etag) + } + + resp, err := defaultHTTPClient.Do(request) + if err != nil { + return nil, false, "", fmt.Errorf("fetching template: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode == http.StatusNotModified { + return nil, true, etag, nil + } + if resp.StatusCode != http.StatusOK { + return nil, false, "", fmt.Errorf("fetching template: %d %s", resp.StatusCode, http.StatusText(resp.StatusCode)) + } + + body, err = readLimited(resp.Body) + if err != nil { + return nil, false, "", fmt.Errorf("reading template body: %w", err) + } + + return body, false, resp.Header.Get("ETag"), nil +} diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index 19dc7eba..2dfe65fa 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -605,9 +605,14 @@ function buildWidgetModal(type, values, structured, onSave) { continue; } - const control = field.name === "autocomplete-provider" - ? renderAutocompleteProviderField(field, values["autocomplete-provider"], values["autocomplete"]) - : renderField(field, values[field.name], structured[field.name]); + let control; + if (field.name === "autocomplete-provider") { + control = renderAutocompleteProviderField(field, values["autocomplete-provider"], values["autocomplete"]); + } else if (type === "dynawidgets" && field.name === "repo") { + control = renderDynawidgetsRepoField(field, values[field.name]); + } else { + control = renderField(field, values[field.name], structured[field.name]); + } controls.push(control); (field.advanced ? advanced : basic).append(control.wrapper); @@ -1409,6 +1414,31 @@ function renderAutocompleteProviderField(field, value, autocompleteValue) { }; } +// The repo is a branch of the dynawidgets repository, so only existing branches are offered. +function renderDynawidgetsRepoField(field, value) { + const options = field.options || []; + const defaultRepo = options.includes("main") ? "main" : options[0] || ""; + const initial = scalarText(value); + + const select = document.createElement("select"); + select.className = "editor-input"; + for (const opt of options) select.append(new Option(opt, opt)); + if (initial && !options.includes(initial)) select.append(new Option(initial, initial)); + select.value = initial || defaultRepo; + + return { + field, + wrapper: labeled(field.label, select, field.required, field.hint), + // Leaving the default selected keeps the key out of the config. + read: () => (!initial && select.value === defaultRepo ? undefined : select.value), + write: (v) => { + const text = scalarText(v); + if (text && ![...select.options].some((o) => o.value === text)) select.append(new Option(text, text)); + select.value = text || defaultRepo; + }, + }; +} + function iconPreview(input) { const preview = img("editor-icon-preview", ""); const update = () => { diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index 0d8bc36e..4b74615a 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -6,12 +6,9 @@ import ( "errors" "fmt" "html/template" - "io" "log/slog" "net/http" - "net/url" "os" - "path/filepath" "regexp" "strings" "time" @@ -34,8 +31,13 @@ type dynawidgetsWidget struct { Subrequests map[string]*CustomAPIRequest `yaml:"subrequests"` Options customAPIOptions `yaml:"options"` Frameless bool `yaml:"frameless"` + slug string `yaml:"-"` + repo string `yaml:"-"` templateContent string `yaml:"-"` compiledTemplate *template.Template `yaml:"-"` + templateModTime time.Time `yaml:"-"` + templateCheckedAt time.Time `yaml:"-"` + templateUpdatedAt time.Time `yaml:"-"` CompiledHTML template.HTML `yaml:"-"` APIResponse json.RawMessage `yaml:"-"` } @@ -76,7 +78,10 @@ func (widget *dynawidgetsWidget) initialize() error { if err != nil { return fmt.Errorf("resolving dynawidget template: %w", err) } + widget.slug = slug + widget.repo = repo widget.templateContent = templateContent + widget.templateModTime = dynawidgetsTemplateModTime(slug) if widget.Title == "" && title != "" { widget.Title = title @@ -140,6 +145,8 @@ func (widget *dynawidgetsWidget) initialize() error { func (widget *dynawidgetsWidget) update(ctx context.Context) { widget.Hidden = false + widget.refreshTemplate() + compiledHTML, hidden, rawResponse, err := fetchAndRenderCustomAPIRequest( widget.CustomAPIRequest, widget.Subrequests, widget.Options, widget.compiledTemplate, ) @@ -150,6 +157,56 @@ func (widget *dynawidgetsWidget) update(ctx context.Context) { widget.APIResponse = rawResponse widget.Hidden = hidden widget.CompiledHTML = rewriteImgSrcs(ctx, compiledHTML, widget.Providers) + widget.noticeTemplateUpdate() +} + +// Polls for a newer template and recompiles whenever the cache file on disk changed. +func (widget *dynawidgetsWidget) refreshTemplate() { + if widget.slug == "" { + return + } + + if time.Since(widget.templateCheckedAt) >= dynawidgetsCheckPollInterval { + widget.templateCheckedAt = time.Now() + if err := dynawidgetsCheckTemplate(widget.slug, widget.repo); err != nil { + slog.Warn("Dynawidget template update check failed", "slug", widget.slug, "error", err) + } + } + + modTime := dynawidgetsTemplateModTime(widget.slug) + if modTime.IsZero() || modTime.Equal(widget.templateModTime) { + return + } + widget.templateModTime = modTime + + templateContent, _, _, err := dynawidgetsResolveTemplate(widget.slug, widget.repo) + if err != nil { + slog.Warn("Could not reload updated dynawidget template", "slug", widget.slug, "error", err) + return + } + + compiledTemplate, err := template.New("").Funcs(customAPITemplateFuncs(widget.Providers)).Parse(templateContent) + if err != nil { + slog.Error("Failed to parse updated dynawidget template", "slug", widget.slug, "error", err) + return + } + + widget.templateContent = templateContent + widget.compiledTemplate = compiledTemplate + widget.templateUpdatedAt = time.Now() + slog.Info("Reloaded updated dynawidget template", "slug", widget.slug, "repo", widget.repo) +} + +// Flags a template that changed under the user for a while after the reload. +func (widget *dynawidgetsWidget) noticeTemplateUpdate() { + if widget.templateUpdatedAt.IsZero() || time.Since(widget.templateUpdatedAt) > dynawidgetsUpdateNoticeDuration { + return + } + + widget.withNotice(fmt.Errorf( + "template updated on %s - reload the page or check the widget still looks right", + widget.templateUpdatedAt.Format("2006-01-02 15:04"), + )) } func (widget *dynawidgetsWidget) setProviders(providers *widgetProviders) { @@ -248,24 +305,60 @@ func dynawidgetsResolveTemplate(slug string, repo string) (templateContent strin // Returns the template exactly as the repository ships it, without any variable expansion. func dynawidgetsRawTemplate(slug string, repo string) (raw string, title string, err error) { - if !dynawidgetsSlugPattern.MatchString(slug) { - return "", "", fmt.Errorf("invalid slug %q", slug) + if repo == "" { + repo = dynawidgetsDefaultRepo } - templatePath := filepath.Join(dynawidgetsAssetsDir, slug+".txt") - if absAssets, aerr := filepath.Abs(dynawidgetsAssetsDir); aerr == nil { - if absTemplate, terr := filepath.Abs(templatePath); terr != nil || !strings.HasPrefix(absTemplate, absAssets+string(filepath.Separator)) { - return "", "", fmt.Errorf("refusing to resolve template outside assets dir") - } + + templatePath, err := dynawidgetsAssetPath(slug, ".txt") + if err != nil { + return "", "", err } if data, readErr := os.ReadFile(templatePath); readErr == nil { slog.Info("Using cached dynawidget template", "slug", slug, "path", templatePath) - return string(data), "", nil + if meta := dynawidgetsReadMeta(slug); meta != nil { + title = meta.Title + } + return string(data), title, nil } - firstLetter := string(slug[0]) - baseURL := fmt.Sprintf("https://raw.githubusercontent.com/Panonim/dynawidgets/refs/heads/%s", repo) - listURL := fmt.Sprintf("%s/database/list-%s.json", baseURL, firstLetter) + templateURL, title, err := dynawidgetsTemplateURL(slug, repo) + if err != nil { + return "", "", err + } + + slog.Info("Fetching dynawidget template", "slug", slug, "url", templateURL) + + bodyBytes, _, etag, err := dynawidgetsDownloadTemplate(templateURL, "") + if err != nil { + return "", "", err + } + + if err := os.MkdirAll(dynawidgetsAssetsDir, 0755); err != nil { + slog.Error("Failed to create dynawidgets assets directory", "error", err) + } else if err := os.WriteFile(templatePath, bodyBytes, 0600); err != nil { + slog.Error("Failed to cache dynawidget template", "error", err, "path", templatePath) + } else { + slog.Info("Cached dynawidget template", "slug", slug, "path", templatePath) + dynawidgetsWriteMeta(slug, &dynawidgetsTemplateMeta{ + Repo: repo, + URL: templateURL, + Title: title, + ETag: etag, + CheckedAt: time.Now(), + }) + } + + return string(bodyBytes), title, nil +} + +// Looks the widget up in the repository's per-letter list file. +func dynawidgetsTemplateURL(slug string, repo string) (templateURL string, title string, err error) { + if !dynawidgetsSlugPattern.MatchString(slug) { + return "", "", fmt.Errorf("invalid slug %q", slug) + } + + listURL := fmt.Sprintf("https://%s/Panonim/dynawidgets/refs/heads/%s/database/list-%s.json", dynawidgetsTemplateHost, repo, slug[:1]) slog.Info("Fetching dynawidgets list", "url", listURL) @@ -296,53 +389,12 @@ func dynawidgetsRawTemplate(slug string, repo string) (raw string, title string, return "", "", fmt.Errorf("widget %q not found in dynawidgets list", slug) } - templateURL := entry.Template + templateURL = entry.Template if repo != dynawidgetsDefaultRepo { - templateURL = strings.Replace( - entry.Template, - "/refs/heads/"+dynawidgetsDefaultRepo+"/", - "/refs/heads/"+repo+"/", - 1, - ) - } - - parsedTemplateURL, err := url.Parse(templateURL) - if err != nil { - return "", "", fmt.Errorf("invalid template URL %q: %w", templateURL, err) - } - if parsedTemplateURL.Scheme != "https" || parsedTemplateURL.Host != dynawidgetsTemplateHost { - return "", "", fmt.Errorf( - "refusing to fetch template from unexpected host %q (must be https://%s)", - parsedTemplateURL.Host, dynawidgetsTemplateHost, - ) - } - - slog.Info("Fetching dynawidget template", "slug", slug, "url", templateURL) - - templateResp, err := defaultHTTPClient.Get(templateURL) - if err != nil { - return "", "", fmt.Errorf("fetching template: %w", err) - } - defer templateResp.Body.Close() - - if templateResp.StatusCode != http.StatusOK { - return "", "", fmt.Errorf("fetching template: %d %s", templateResp.StatusCode, http.StatusText(templateResp.StatusCode)) - } - - bodyBytes, err := io.ReadAll(templateResp.Body) - if err != nil { - return "", "", fmt.Errorf("reading template body: %w", err) - } - - if err := os.MkdirAll(dynawidgetsAssetsDir, 0755); err != nil { - slog.Error("Failed to create dynawidgets assets directory", "error", err) - } else if err := os.WriteFile(templatePath, bodyBytes, 0600); err != nil { - slog.Error("Failed to cache dynawidget template", "error", err, "path", templatePath) - } else { - slog.Info("Cached dynawidget template", "slug", slug, "path", templatePath) + templateURL = strings.Replace(templateURL, "/refs/heads/"+dynawidgetsDefaultRepo+"/", "/refs/heads/"+repo+"/", 1) } - return string(bodyBytes), entry.Title, nil + return templateURL, entry.Title, nil } type dynawidgetsVariable struct { diff --git a/internal/dynacat/widget-schema.go b/internal/dynacat/widget-schema.go index c8e9028b..78be66da 100644 --- a/internal/dynacat/widget-schema.go +++ b/internal/dynacat/widget-schema.go @@ -237,14 +237,14 @@ var fieldAnnotations = map[string]map[string]fieldAnnotation{ "allow-insecure": {Advanced: true}, }, "dynawidgets": { - "repo": {Advanced: true, Hint: "Branch/repository to fetch the widget from, defaults to main."}, + "repo": {Advanced: true, Options: []string{"main", "testing"}, Hint: "Branch of the dynawidgets repository to fetch the widget from, defaults to main."}, "subrequests": {Advanced: true}, "method": {Advanced: true}, "body": {Advanced: true}, "body-type": {Advanced: true, Options: []string{"json", "string"}}, "headers": {Advanced: true}, "allow-insecure": {Advanced: true}, - "widget": {Hint: "Slug of the widget from the dynawidgets repository."}, + "widget": {Hint: "Widget from the dynawidgets repository."}, }, "docker-containers": { "sock-path": {Advanced: true, Hint: "Defaults to /var/run/docker.sock; can also be a tcp://host:port or http://host:port address."}, From 658336d26b00cd7e76a469a249f4914a4f0715e9 Mon Sep 17 00:00:00 2001 From: Panonim Date: Mon, 7 Sep 2026 21:52:45 +0200 Subject: [PATCH 48/53] Updated docs and added a function to search across docker and monitor widgets --- README.md | 8 + docs/docs/changelog.md | 10 +- docs/docs/configuration.md | 56 +++++- internal/dynacat/dynacat.go | 1 + internal/dynacat/static/css/widget-search.css | 24 ++- internal/dynacat/static/js/page.js | 49 +++-- internal/dynacat/templates/search.html | 10 +- internal/dynacat/widget-docker-containers.go | 12 ++ internal/dynacat/widget-monitor.go | 22 +++ internal/dynacat/widget-search.go | 176 +++++++++++++++--- 10 files changed, 310 insertions(+), 58 deletions(-) diff --git a/README.md b/README.md index 604d6b7b..377a027e 100644 --- a/README.md +++ b/README.md @@ -236,3 +236,11 @@ You can list multiple origins. Each entry must be a full origin including the sc
**If you like this project, please consider [sponsoring](https://ko-fi.com/panonim).** + + + + + + Star History Chart + + \ No newline at end of file diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index d9a6433a..085b4f45 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -1,13 +1,14 @@ # Changes for 3.0.0 - Moved the compose template to [Panonim/dynacat-compose-template](https://github.com/Panonim/dynacat-compose-template), the install command is now a single `curl | tar` with no `sed` renaming -- Added support for `tcp://`/`http://` remote Docker hosts to `sock-path` in the `docker-controller` widget, matching `docker-containers` +- Added support for `tcp://`/`http://` remote Docker hosts to `sock-path` in the `docker-controller` widget, matching `docker-containers` -> https://github.com/Panonim/dynacat/issues/137 - Documented `id`/`parent` grouping for the `containers` property in `docker-containers` widget -> https://github.com/Panonim/dynacat/issues/134 - Fixed an issue where subrequests were not detected properly in `dynawidgets` - Added automatic update checks for cached `dynawidgets` templates, with a notice on the widget when one changed - Fixed `dynawidgets` protocol handling - Added an option to visually edit your configuration +- API, so you can now easily get all your data in external apps - Fixed Navidrome in currently playing -- Added an option to see bookmarks in search widget +- Added an option to see bookmarks, docker containers and monitors in search widget -> https://github.com/Panonim/dynacat/issues/126 - Fixed issues with releases performence in `calendar` widget - Made image fetching in `currently playing` more reliable - Added a function in `calendar` widget when showing releases to also show release type @@ -22,7 +23,10 @@ - Fixed `todo` checkbox sitting too close to widget edge on mobile - Fixed a lot of smaller ui issues (I lost count at some point tbh) - Added [degoog](https://github.com/degoog-org/degoog) theme and engine -- Fixed Reddit widget and Reddit RSS feeds returning `403` again after Reddit renamed the JS challenge token field +- Fixed Reddit widget and Reddit RSS feeds returning `403` again after Reddit renamed the JS challenge token field -> https://github.com/Panonim/dynacat/issues/141 +- Updated Go packages +- Updated docs to include missing blocky information +- Server stats not showing CPU temp and wrong platform name -> https://github.com/Panonim/dynacat/issues/135 # Changes for 2.4.0 - Added Brave Search as an autocompletion engine and normal one diff --git a/docs/docs/configuration.md b/docs/docs/configuration.md index 8861d982..7d0a6fd3 100644 --- a/docs/docs/configuration.md +++ b/docs/docs/configuration.md @@ -1438,7 +1438,7 @@ These properties work the same as in the [custom-api widget](#custom-api) and al Learn more about building and contributing widgets in the [Contributing to Dynawidgets](contributing.md) guide. ### DNS Stats -Display statistics from a self-hosted ad-blocking DNS resolver such as AdGuard Home, Pi-hole, or Technitium. +Display statistics from a self-hosted ad-blocking DNS resolver such as AdGuard Home, Pi-hole, Technitium, or Blocky. Example: @@ -1456,7 +1456,7 @@ Preview: > [!NOTE] > -> When using AdGuard Home the 3rd statistic on top will be the average latency and when using Pi-hole or Technitium it will be the total number of blocked domains from all adlists. +> When using AdGuard Home or Blocky the 3rd statistic on top will be the average latency and when using Pi-hole or Technitium it will be the total number of blocked domains from all adlists. #### Properties @@ -1473,7 +1473,7 @@ Preview: | hour-format | string | no | 12h | ##### `service` -Either `adguard`, `technitium`, or `pihole` (major version 5 and below) or `pihole-v6` (major version 6 and above). +Either `adguard`, `technitium`, `blocky`, or `pihole` (major version 5 and below) or `pihole-v6` (major version 6 and above). ##### `allow-insecure` Whether to allow invalid/self-signed certificates when making the request to the service. @@ -1481,6 +1481,8 @@ Whether to allow invalid/self-signed certificates when making the request to the ##### `url` The base URL of the service. +When using Blocky this is the base URL of the **Prometheus** instance scraping Blocky, not of Blocky itself, since Blocky has no stats API of its own. The widget queries it through `/api/v1/query` and `/api/v1/query_range`. + ##### `username` Only required when using AdGuard Home. The username used to log into the admin dashboard. @@ -1503,6 +1505,38 @@ Whether to hide the list of top blocked domains. ##### `hour-format` Whether to display the relative time in the graph in `12h` or `24h` format. +#### Using Blocky + +Blocky needs its Prometheus metrics enabled and scraped before the widget has anything to read: + +`config.yml` (Blocky) +```yaml +prometheus: + enable: true + path: /metrics +``` + +`prometheus.yml` +```yaml +scrape_configs: + - job_name: blocky + static_configs: + - targets: + - blocky:4000 +``` + +Then point the widget at Prometheus: + +```yaml +- type: dns-stats + service: blocky + url: http://prometheus:9090 +``` + +Neither `username`, `password` nor `token` are used for Blocky, so the Prometheus instance has to be reachable from Dynacat without authentication. + +The statistics come from the `blocky_query_total`, `blocky_response_total`, `blocky_request_duration_seconds` and `blocky_denylist_cache_entries` metrics. Blocky exposes no per-domain counters, so the top blocked domains list is always empty regardless of `hide-top-domains`. + ### Docker Containers Display the status of your Docker containers along with an icon and an optional short description. @@ -2675,6 +2709,10 @@ Preview: | autocomplete-provider | string | no | duckduckgo | | include-bookmarks | boolean | no | false | | cross-page-bookmarks | boolean | no | false | +| include-docker | boolean | no | false | +| cross-page-docker | boolean | no | false | +| include-monitor | boolean | no | false | +| cross-page-monitor | boolean | no | false | | bangs | array | no | | ##### `search-engine` @@ -2759,6 +2797,18 @@ When set to `true`, implies [`include-bookmarks`](#include-bookmarks) and widens cross-page-bookmarks: true ``` +##### `include-docker` +When set to `true`, matches what you type against the container names from the [docker containers](#docker-containers) widgets on the same page. Only containers with a URL are matched and each match shows the container's [icon](#icons). + +##### `cross-page-docker` +When set to `true`, widens the search to containers from every page. + +##### `include-monitor` +When set to `true`, matches what you type against the site titles from the [monitor](#monitor) widgets on the same page. Each match shows the site's [icon](#icons) and points at the same URL as the widget. + +##### `cross-page-monitor` +When set to `true`, widens the search to sites from every page. + ##### `bangs` What now? [Bangs](https://duckduckgo.com/bangs). They're shortcuts that allow you to use the same search box for many different sites. Assuming you have it configured, if for example you start your search input with `!yt` you'd be able to perform a search on YouTube: diff --git a/internal/dynacat/dynacat.go b/internal/dynacat/dynacat.go index 1630282a..1f224084 100644 --- a/internal/dynacat/dynacat.go +++ b/internal/dynacat/dynacat.go @@ -52,6 +52,7 @@ type application struct { widgetByID map[uint64]widget widgetByAPIID map[string]widget widgetToPage map[uint64]*page + searchTargets searchTargetRegistry RequiresAuth bool OIDCEnabled bool diff --git a/internal/dynacat/static/css/widget-search.css b/internal/dynacat/static/css/widget-search.css index 82c070f2..2508a458 100644 --- a/internal/dynacat/static/css/widget-search.css +++ b/internal/dynacat/static/css/widget-search.css @@ -75,7 +75,7 @@ } .search-bangs { display: none; } -.search-bookmarks { display: none; } +.search-targets { display: none; } .search-bang { border-radius: calc(var(--border-radius) * 2); @@ -152,6 +152,9 @@ } .search-autocomplete-item { + --search-autocomplete-icon-size: 16px; + --search-autocomplete-icon-gap: 0.7em; + padding: 0.7rem 1.4rem; cursor: pointer; color: var(--color-text-base); @@ -159,26 +162,33 @@ transition: background 0.1s; } +/* Indent iconless items so every label in the list starts at the same x. */ +.search-autocomplete-item:not(.search-autocomplete-item-target) { + padding-left: calc(1.4rem + var(--search-autocomplete-icon-size) + var(--search-autocomplete-icon-gap)); +} + .search-autocomplete-item:hover, .search-autocomplete-item.selected { background: var(--color-widget-background-highlight); color: var(--color-text-highlight); } -.search-autocomplete-item-bookmark { +.search-autocomplete-item-target { display: flex; align-items: center; - gap: 0.7em; + gap: var(--search-autocomplete-icon-gap); } -.search-autocomplete-item-bookmark-icon { - width: 16px; - height: 16px; +.search-autocomplete-item-target-icon { + width: var(--search-autocomplete-icon-size); + height: var(--search-autocomplete-icon-size); flex-shrink: 0; opacity: 0.8; } -.search-autocomplete-item-bookmark-arrow { +.search-autocomplete-item-target-fallback { flex-shrink: 0; + width: var(--search-autocomplete-icon-size); + text-align: center; color: var(--color-primary); } diff --git a/internal/dynacat/static/js/page.js b/internal/dynacat/static/js/page.js index 8e26aeb1..f00e47fc 100644 --- a/internal/dynacat/static/js/page.js +++ b/internal/dynacat/static/js/page.js @@ -358,12 +358,13 @@ function setupSearchBoxes() { }); } - if (widget.dataset.autocomplete === "true" || widget.dataset.bookmarksEnabled === "true") { + if (widget.dataset.autocomplete === "true" || widget.dataset.targetsEnabled === "true") { const autocompleteEnabled = widget.dataset.autocomplete === "true"; - const bookmarksEnabled = widget.dataset.bookmarksEnabled === "true"; + const targetsEnabled = widget.dataset.targetsEnabled === "true"; const autocompleteEl = widget.querySelector(".search-autocomplete"); - const bookmarks = Array.from(widget.querySelectorAll(".search-bookmarks > input")).map((el) => ({ - type: "bookmark", + const targets = Array.from(widget.querySelectorAll(".search-targets > input")).map((el) => ({ + type: "target", + kind: el.dataset.kind || "bookmark", title: el.dataset.title, url: el.dataset.url, target: el.dataset.target || "", @@ -445,18 +446,24 @@ function setupSearchBoxes() { acIndex = i; }; - const BOOKMARK_MATCH_LIMIT = 3; + const TARGET_MATCH_LIMIT = 3; + const TARGET_FALLBACK_GLYPHS = { bookmark: "↗", docker: "▣", monitor: "◉" }; - const matchBookmarks = (query) => { - if (!bookmarksEnabled || !query) return []; + // Each kind gets its own limit so bookmarks can't crowd out containers or sites. + const matchTargets = (query) => { + if (!targetsEnabled || !query) return []; const lowerQuery = query.toLowerCase(); - return bookmarks - .filter((b) => b.title && b.title.toLowerCase().startsWith(lowerQuery)) - .slice(0, BOOKMARK_MATCH_LIMIT); + const countPerKind = {}; + + return targets.filter((t) => { + if (!t.title || !t.title.toLowerCase().startsWith(lowerQuery)) return false; + countPerKind[t.kind] = (countPerKind[t.kind] || 0) + 1; + return countPerKind[t.kind] <= TARGET_MATCH_LIMIT; + }); }; const selectItem = (item) => { - if (item.type === "bookmark") { + if (item.type === "target") { hideAC(); if (item.target === "_blank") { window.open(item.url, item.target).focus(); @@ -479,19 +486,19 @@ function setupSearchBoxes() { items.forEach((acItem, idx) => { const item = document.createElement("div"); - if (acItem.type === "bookmark") { - item.className = "search-autocomplete-item search-autocomplete-item-bookmark"; + if (acItem.type === "target") { + item.className = "search-autocomplete-item search-autocomplete-item-target search-autocomplete-item-" + acItem.kind; if (acItem.icon) { const icon = document.createElement("img"); - icon.className = "search-autocomplete-item-bookmark-icon" + (acItem.iconAutoInvert ? " flat-icon" : ""); + icon.className = "search-autocomplete-item-target-icon" + (acItem.iconAutoInvert ? " flat-icon" : ""); icon.src = acItem.icon; icon.alt = ""; item.appendChild(icon); } else { - const arrow = document.createElement("span"); - arrow.className = "search-autocomplete-item-bookmark-arrow"; - arrow.textContent = "↗"; - item.appendChild(arrow); + const fallback = document.createElement("span"); + fallback.className = "search-autocomplete-item-target-fallback"; + fallback.textContent = TARGET_FALLBACK_GLYPHS[acItem.kind] || TARGET_FALLBACK_GLYPHS.bookmark; + item.appendChild(fallback); } const label = document.createElement("span"); label.textContent = acItem.title; @@ -515,7 +522,7 @@ function setupSearchBoxes() { const updateSuggestions = (query, phraseItems) => { if (inputElement.value.trim() !== query) return; - renderAC([...matchBookmarks(query), ...phraseItems]); + renderAC([...matchTargets(query), ...phraseItems]); }; const fetchSuggestions = (query) => { @@ -555,10 +562,14 @@ function setupSearchBoxes() { event.preventDefault(); setACIndex(Math.min(acIndex + 1, acItems.length - 1)); } else if (event.key === "ArrowUp") { + // Stop the document handler from also restoring the last query. event.preventDefault(); + event.stopPropagation(); setACIndex(Math.max(acIndex - 1, -1)); } else if (event.key === "Enter" && acIndex >= 0) { + // Stop the document handler from also running a search for the query. event.preventDefault(); + event.stopPropagation(); selectItem(acItems[acIndex]); } else if (event.key === "Escape") { hideAC(); diff --git a/internal/dynacat/templates/search.html b/internal/dynacat/templates/search.html index 8918c8aa..cd6c79e8 100644 --- a/internal/dynacat/templates/search.html +++ b/internal/dynacat/templates/search.html @@ -3,16 +3,16 @@ {{ define "widget-content-classes" }}{{ if .Frameless }}widget-content-frameless{{ end }}{{ end }} {{ define "widget-content" }} -
+
{{ range .Bangs }} {{ end }}
-
- {{ range .BookmarkMatches }} - +
+ {{ range .TargetMatches }} + {{ end }}
@@ -29,6 +29,6 @@
S - {{ if or .Autocomplete .IncludeBookmarks }}
{{ end }} + {{ if or .Autocomplete .TargetsEnabled }}
{{ end }}
{{ end }} diff --git a/internal/dynacat/widget-docker-containers.go b/internal/dynacat/widget-docker-containers.go index 6bef200a..2b068180 100644 --- a/internal/dynacat/widget-docker-containers.go +++ b/internal/dynacat/widget-docker-containers.go @@ -63,6 +63,18 @@ func (widget *dockerContainersWidget) update(ctx context.Context) { containers.sortByStateIconThenTitle() widget.cacheContainerIcons(containers) widget.Containers = containers + widget.publishSearchTargets(containers) +} + +func (widget *dockerContainersWidget) publishSearchTargets(containers dockerContainerList) { + matches := make([]searchTargetMatch, 0, len(containers)) + + for i := range containers { + container := &containers[i] + matches = appendSearchTarget(matches, "docker", container.Name, container.URL, container.SameTab, container.Icon) + } + + publishSearchTargets(widget, widget.Providers, matches) } func (widget *dockerContainersWidget) Render() template.HTML { diff --git a/internal/dynacat/widget-monitor.go b/internal/dynacat/widget-monitor.go index 5ba1d15a..4b64fc25 100644 --- a/internal/dynacat/widget-monitor.go +++ b/internal/dynacat/widget-monitor.go @@ -94,6 +94,26 @@ func (widget *monitorWidget) setProviders(providers *widgetProviders) { for i := range widget.Sites { widget.Sites[i].Icon.prepare(widget.Providers) } + + widget.publishSearchTargets() +} + +func (widget *monitorWidget) publishSearchTargets() { + matches := make([]searchTargetMatch, 0, len(widget.Sites)) + + for i := range widget.Sites { + site := &widget.Sites[i] + + // URL is only filled in once the site has been checked at least once. + url := site.URL + if url == "" && site.SiteStatusRequest != nil { + url = site.DefaultURL + } + + matches = appendSearchTarget(matches, "monitor", site.Title, url, site.SameTab, site.Icon) + } + + publishSearchTargets(widget, widget.Providers, matches) } func (widget *monitorWidget) update(ctx context.Context) { @@ -153,6 +173,8 @@ func (widget *monitorWidget) update(ctx context.Context) { }) } } + + widget.publishSearchTargets() } // Kept outside of the widgets so that the history survives a config reload, which diff --git a/internal/dynacat/widget-search.go b/internal/dynacat/widget-search.go index ffc0e832..59e037f1 100644 --- a/internal/dynacat/widget-search.go +++ b/internal/dynacat/widget-search.go @@ -6,6 +6,7 @@ import ( "net/url" "sort" "strings" + "sync" ) var searchWidgetTemplate = mustParseTemplate("search.html", "widget-base.html") @@ -17,7 +18,8 @@ type SearchBang struct { Icon customIconField `yaml:"icon"` } -type searchBookmarkMatch struct { +type searchTargetMatch struct { + Kind string Title string URL string Target string @@ -33,23 +35,28 @@ type searchAutocompleteSource struct { type searchWidget struct { widgetBase `yaml:",inline"` - cachedHTML template.HTML `yaml:"-"` - Frameless bool `yaml:"frameless"` - SearchEngine string `yaml:"search-engine"` - DegoogURL string `yaml:"degoog-url"` - autocompleteAllowPrivate bool `yaml:"-"` - AutocompleteEnabled *bool `yaml:"autocomplete"` - Autocomplete bool `yaml:"-"` - AutocompleteProvider string `yaml:"autocomplete-provider"` - DeprecatedAutocompleteURL string `yaml:"autocomplete-url"` - Bangs []SearchBang `yaml:"bangs"` - NewTab bool `yaml:"new-tab"` - Target string `yaml:"target"` - Autofocus bool `yaml:"autofocus"` - Placeholder string `yaml:"placeholder"` - IncludeBookmarks bool `yaml:"include-bookmarks"` - CrossPageBookmarks bool `yaml:"cross-page-bookmarks"` - BookmarkMatches []searchBookmarkMatch `yaml:"-"` + cachedHTML template.HTML `yaml:"-"` + Frameless bool `yaml:"frameless"` + SearchEngine string `yaml:"search-engine"` + DegoogURL string `yaml:"degoog-url"` + autocompleteAllowPrivate bool `yaml:"-"` + AutocompleteEnabled *bool `yaml:"autocomplete"` + Autocomplete bool `yaml:"-"` + AutocompleteProvider string `yaml:"autocomplete-provider"` + DeprecatedAutocompleteURL string `yaml:"autocomplete-url"` + Bangs []SearchBang `yaml:"bangs"` + NewTab bool `yaml:"new-tab"` + Target string `yaml:"target"` + Autofocus bool `yaml:"autofocus"` + Placeholder string `yaml:"placeholder"` + IncludeBookmarks bool `yaml:"include-bookmarks"` + CrossPageBookmarks bool `yaml:"cross-page-bookmarks"` + IncludeDocker bool `yaml:"include-docker"` + CrossPageDocker bool `yaml:"cross-page-docker"` + IncludeMonitor bool `yaml:"include-monitor"` + CrossPageMonitor bool `yaml:"cross-page-monitor"` + BookmarkMatches []searchTargetMatch `yaml:"-"` + LiveMatches []searchTargetMatch `yaml:"-"` } func convertSearchUrl(url string) string { @@ -98,6 +105,14 @@ func (widget *searchWidget) initialize() error { widget.IncludeBookmarks = true } + if widget.CrossPageDocker { + widget.IncludeDocker = true + } + + if widget.CrossPageMonitor { + widget.IncludeMonitor = true + } + if widget.SearchEngine == "" { widget.SearchEngine = "duckduckgo" } @@ -179,7 +194,7 @@ func (widget *searchWidget) collectBookmarks(app *application, pageFilter *page) ownPage := app.widgetToPage[widget.GetID()] - var matches []searchBookmarkMatch + var matches []searchTargetMatch seen := make(map[string]bool) for id, w := range app.widgetByID { bookmarks, ok := w.(*bookmarksWidget) @@ -192,7 +207,7 @@ func (widget *searchWidget) collectBookmarks(app *application, pageFilter *page) continue } - if source != ownPage && source != nil && (len(source.AllowedUsers) > 0 || len(source.AllowedGroups) > 0) { + if searchSourceIsRestricted(source, ownPage) { continue } @@ -204,7 +219,8 @@ func (widget *searchWidget) collectBookmarks(app *application, pageFilter *page) } seen[key] = true - matches = append(matches, searchBookmarkMatch{ + matches = append(matches, searchTargetMatch{ + Kind: "bookmark", Title: link.Title, URL: link.URL, Target: link.Target, @@ -220,7 +236,125 @@ func (widget *searchWidget) collectBookmarks(app *application, pageFilter *page) widget.cachedHTML = widget.renderTemplate(widget, searchWidgetTemplate) } +// Containers and sites are only known once their widget has updated, so each of them +// publishes a snapshot here for search widgets on any page to read. +type searchTargetRegistry struct { + mu sync.RWMutex + byWidgetID map[uint64][]searchTargetMatch +} + +func (registry *searchTargetRegistry) publish(widgetID uint64, matches []searchTargetMatch) { + registry.mu.Lock() + defer registry.mu.Unlock() + + if registry.byWidgetID == nil { + registry.byWidgetID = make(map[uint64][]searchTargetMatch) + } + + registry.byWidgetID[widgetID] = matches +} + +// Published slices are replaced rather than modified, so handing them to fn is safe. +func (registry *searchTargetRegistry) each(fn func(widgetID uint64, matches []searchTargetMatch)) { + registry.mu.RLock() + defer registry.mu.RUnlock() + + for id, matches := range registry.byWidgetID { + fn(id, matches) + } +} + +func appendSearchTarget(matches []searchTargetMatch, kind, title, url string, sameTab bool, icon customIconField) []searchTargetMatch { + if title == "" || url == "" { + return matches + } + + return append(matches, searchTargetMatch{ + Kind: kind, + Title: title, + URL: url, + Target: ternary(sameTab, "", "_blank"), + Icon: icon, + }) +} + +func publishSearchTargets(widget widget, providers *widgetProviders, matches []searchTargetMatch) { + if providers == nil || providers.app == nil { + return + } + + providers.app.searchTargets.publish(widget.GetID(), matches) +} + +// Pages limited to certain users or groups stay hidden unless the search widget sits on them. +func searchSourceIsRestricted(source, ownPage *page) bool { + return source != ownPage && source != nil && (len(source.AllowedUsers) > 0 || len(source.AllowedGroups) > 0) +} + +// Gathered per render rather than once at startup, since the snapshots change while the app runs. +func (widget *searchWidget) collectLiveMatches() { + if widget.Providers == nil || widget.Providers.app == nil { + return + } + + app := widget.Providers.app + ownPage := app.widgetToPage[widget.GetID()] + + var matches []searchTargetMatch + seen := make(map[string]bool) + + app.searchTargets.each(func(id uint64, targets []searchTargetMatch) { + source := app.widgetToPage[id] + if searchSourceIsRestricted(source, ownPage) { + return + } + + for _, target := range targets { + var include, crossPage bool + switch target.Kind { + case "docker": + include, crossPage = widget.IncludeDocker, widget.CrossPageDocker + case "monitor": + include, crossPage = widget.IncludeMonitor, widget.CrossPageMonitor + } + + if !include || (!crossPage && source != ownPage) { + continue + } + + key := target.Kind + "\x00" + target.Title + "\x00" + target.URL + if seen[key] { + continue + } + seen[key] = true + + matches = append(matches, target) + } + }) + + sort.Slice(matches, func(i, j int) bool { + return strings.ToLower(matches[i].Title) < strings.ToLower(matches[j].Title) + }) + + widget.LiveMatches = matches +} + +func (widget *searchWidget) TargetsEnabled() bool { + return widget.IncludeBookmarks || widget.IncludeDocker || widget.IncludeMonitor +} + +func (widget *searchWidget) TargetMatches() []searchTargetMatch { + matches := make([]searchTargetMatch, 0, len(widget.BookmarkMatches)+len(widget.LiveMatches)) + matches = append(matches, widget.BookmarkMatches...) + return append(matches, widget.LiveMatches...) +} + func (widget *searchWidget) Render() template.HTML { + if widget.IncludeDocker || widget.IncludeMonitor { + widget.collectLiveMatches() + return widget.renderTemplate(widget, searchWidgetTemplate) + } + if widget.cachedHTML == "" { widget.cachedHTML = widget.renderTemplate(widget, searchWidgetTemplate) } From dabdeb58df4738f92a46829b6297bbd556cb3ba9 Mon Sep 17 00:00:00 2001 From: Panonim Date: Wed, 9 Sep 2026 20:20:13 +0200 Subject: [PATCH 49/53] Added more verbose ui editor logs --- internal/dynacat/config-editor.go | 11 +- internal/dynacat/editor-http.go | 139 ++++++++++++++---- .../dynacat/static/js/customapi-editor.js | 39 ++++- internal/dynacat/static/js/editor-log.js | 33 +++++ internal/dynacat/static/js/editor.js | 49 +++++- 5 files changed, 224 insertions(+), 47 deletions(-) create mode 100644 internal/dynacat/static/js/editor-log.js diff --git a/internal/dynacat/config-editor.go b/internal/dynacat/config-editor.go index c9ed0a29..cf18351b 100644 --- a/internal/dynacat/config-editor.go +++ b/internal/dynacat/config-editor.go @@ -205,7 +205,10 @@ func isWriteBlockedError(err error) bool { return os.IsPermission(err) || errors.Is(err, syscall.EROFS) } -type editorValidationError struct{ err error } +type editorValidationError struct { + err error + field string +} func (e *editorValidationError) Error() string { return e.err.Error() } @@ -628,7 +631,7 @@ func applyPageFields(pageNode *yaml.Node, fields map[string]any) error { // arbitrary file. func rejectIncludeDirective(key string, node *yaml.Node) error { if key == "$include" || key == "!include" || configIncludePattern.MatchString(nodeToText(node)) { - return &editorValidationError{fmt.Errorf("field %s must not contain an include directive", key)} + return &editorValidationError{err: fmt.Errorf("field %s must not contain an include directive", key), field: key} } return nil @@ -761,7 +764,7 @@ func (a *application) writeConfigCandidates(candidates map[string][]byte) error for path, candidate := range candidates { if err := checkIncludesStayInConfigDir(candidate, filepath.Dir(a.configPath)); err != nil { - return &editorValidationError{err} + return &editorValidationError{err: err, field: "$include"} } perms[path] = os.FileMode(0o644) @@ -801,7 +804,7 @@ func (a *application) writeConfigCandidates(candidates map[string][]byte) error } if err != nil { rollback() - return &editorValidationError{err} + return &editorValidationError{err: err} } return nil diff --git a/internal/dynacat/editor-http.go b/internal/dynacat/editor-http.go index 610704d9..bf892aae 100644 --- a/internal/dynacat/editor-http.go +++ b/internal/dynacat/editor-http.go @@ -37,14 +37,16 @@ func (a *application) handleEditorConfigLoad(w http.ResponseWriter, r *http.Requ } user := a.getAuthenticatedUser(w, r) if !a.userCanEditAnything(user) { - writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + writeEditorForbidden(w) return } view, err := a.buildEditorConfigView(user) if err != nil { slog.Error("Editor config load failed", "error", err) - writeJSONError(w, http.StatusInternalServerError, err.Error()) + writeEditorError(w, http.StatusInternalServerError, "editor_config_unreadable", + "the config could not be read into the editor", + "The config file is missing a pages list or failed to parse. The server log holds the parser error.") return } writeJSON(w, http.StatusOK, view) @@ -56,33 +58,46 @@ func (a *application) handleEditorConfigSave(w http.ResponseWriter, r *http.Requ } user := a.getAuthenticatedUser(w, r) if !a.userCanEditAnything(user) { - writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + writeEditorForbidden(w) return } r.Body = http.MaxBytesReader(w, r.Body, editorMaxBodyBytes) body, err := io.ReadAll(r.Body) if err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid body") + writeEditorError(w, http.StatusBadRequest, "editor_body_unreadable", "invalid body", + "The request body could not be read, most likely because it exceeded the 1 MiB editor limit.") return } var mutation editorMutation if err := json.Unmarshal(body, &mutation); err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid JSON") + writeEditorError(w, http.StatusBadRequest, "editor_body_not_json", "invalid JSON", + "The editor sent a body the server could not decode into a mutation.") return } if err := a.applyEditorMutation(user, mutation); err != nil { - switch err.(type) { - case *editorPermissionError, *editorDisabledError: - writeJSONError(w, http.StatusForbidden, err.Error()) + out := editorErrorBody{Error: err.Error(), Context: mutationContext(mutation)} + status := http.StatusBadRequest + + switch e := err.(type) { + case *editorPermissionError: + status, out.Code = http.StatusForbidden, "editor_write_blocked" + out.Hint = "The config directory is read only or owned by another user. Check the volume mount and file ownership." + case *editorDisabledError: + status, out.Code = http.StatusForbidden, "editor_page_locked" + out.Hint = "Editing is off for this page. Check server.allow-editing and the user's restrict-editing list." case *editorValidationError: - writeJSONError(w, http.StatusUnprocessableEntity, err.Error()) + status, out.Code, out.Field = http.StatusUnprocessableEntity, "editor_config_invalid", e.field + out.Hint = "The change was rolled back because the resulting config did not validate. The message is the config validation error." default: + out.Code = "editor_mutation_failed" + out.Hint = "The mutation could not be applied to the config document. The server log holds the full error." slog.Error("Editor mutation failed", "op", mutation.Op, "error", err) - writeJSONError(w, http.StatusBadRequest, err.Error()) } + + writeJSON(w, status, out) return } @@ -95,7 +110,7 @@ func (a *application) handleEditorDynawidgetVariables(w http.ResponseWriter, r * return } if !a.userCanEditAnything(a.getAuthenticatedUser(w, r)) { - writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + writeEditorForbidden(w) return } @@ -105,13 +120,23 @@ func (a *application) handleEditorDynawidgetVariables(w http.ResponseWriter, r * repo = dynawidgetsDefaultRepo } if !dynawidgetsSlugPattern.MatchString(slug) || !dynawidgetsRepoPattern.MatchString(repo) { - writeJSONError(w, http.StatusBadRequest, "invalid widget or repo") + writeJSON(w, http.StatusBadRequest, editorErrorBody{ + Error: "invalid widget or repo", + Code: "dynawidgets_bad_reference", + Hint: "A slug is lowercase letters, digits and dashes, a repo is owner/name.", + Context: map[string]any{"widget": slug, "repo": repo}, + }) return } variables, err := dynawidgetsRequiredVariables(slug, repo) if err != nil { - writeJSONError(w, http.StatusBadGateway, err.Error()) + writeJSON(w, http.StatusBadGateway, editorErrorBody{ + Error: err.Error(), + Code: "dynawidgets_upstream_failed", + Hint: "The template could not be fetched from the repo. Check the slug, network access and the GitHub rate limit.", + Context: map[string]any{"widget": slug, "repo": repo}, + }) return } @@ -131,20 +156,22 @@ func (a *application) handleEditorConvert(w http.ResponseWriter, r *http.Request return } if !a.userCanEditAnything(a.getAuthenticatedUser(w, r)) { - writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + writeEditorForbidden(w) return } r.Body = http.MaxBytesReader(w, r.Body, editorMaxBodyBytes) body, err := io.ReadAll(r.Body) if err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid body") + writeEditorError(w, http.StatusBadRequest, "editor_body_unreadable", "invalid body", + "The request body could not be read, most likely because it exceeded the 1 MiB editor limit.") return } var req editorConvertRequest if err := json.Unmarshal(body, &req); err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid JSON") + writeEditorError(w, http.StatusBadRequest, "editor_body_not_json", "invalid JSON", + "The editor sent a body the server could not decode into a conversion request.") return } @@ -153,7 +180,8 @@ func (a *application) handleEditorConvert(w http.ResponseWriter, r *http.Request var value any = []any{} if len(req.Value) > 0 { if err := json.Unmarshal(req.Value, &value); err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid value") + writeEditorError(w, http.StatusBadRequest, "convert_value_not_json", "invalid value", + "The value being converted to YAML was not valid JSON.") return } } @@ -161,22 +189,26 @@ func (a *application) handleEditorConvert(w http.ResponseWriter, r *http.Request case "value": node, err := parseYAMLValue(req.Text) if err != nil { - writeJSONError(w, http.StatusUnprocessableEntity, err.Error()) + writeEditorError(w, http.StatusUnprocessableEntity, "convert_yaml_invalid", err.Error(), + "The pasted text is not valid YAML. The message carries the line the parser stopped on.") return } var value any if err := node.Decode(&value); err != nil { - writeJSONError(w, http.StatusUnprocessableEntity, err.Error()) + writeEditorError(w, http.StatusUnprocessableEntity, "convert_yaml_undecodable", err.Error(), + "The YAML parsed but could not be decoded into a plain value. Anchors and custom tags are not supported here.") return } encoded, err := json.Marshal(value) if err != nil { - writeJSONError(w, http.StatusUnprocessableEntity, "unsupported YAML structure") + writeEditorError(w, http.StatusUnprocessableEntity, "convert_yaml_unsupported", "unsupported YAML structure", + "The YAML decoded into something JSON cannot represent, such as a map with non-string keys.") return } writeJSON(w, http.StatusOK, map[string]json.RawMessage{"value": encoded}) default: - writeJSONError(w, http.StatusBadRequest, "unknown conversion") + writeEditorError(w, http.StatusBadRequest, "convert_unknown_target", "unknown conversion", + `The "to" field has to be either "yaml" or "value".`) } } @@ -190,6 +222,38 @@ func writeJSONError(w http.ResponseWriter, status int, message string) { writeJSON(w, status, map[string]string{"error": message}) } +type editorErrorBody struct { + Error string `json:"error"` + Code string `json:"code"` + Field string `json:"field,omitempty"` + Hint string `json:"hint,omitempty"` + Context map[string]any `json:"context,omitempty"` +} + +func writeEditorError(w http.ResponseWriter, status int, code, message, hint string) { + writeJSON(w, status, editorErrorBody{Error: message, Code: code, Hint: hint}) +} + +// Which change was rejected, so the console can name the widget instead of only the config error. +func mutationContext(m editorMutation) map[string]any { + ctx := map[string]any{"op": m.Op, "page": m.Page, "column": m.Column, "index": m.Index} + if m.WidgetType != "" { + ctx["widgetType"] = m.WidgetType + } + if len(m.Path) > 0 { + ctx["path"] = m.Path + } + if m.PresetKey != "" { + ctx["presetKey"] = m.PresetKey + } + return ctx +} + +func writeEditorForbidden(w http.ResponseWriter) { + writeEditorError(w, http.StatusForbidden, "editor_forbidden", editorNotAllowedMessage, + "Your user is not listed in server.editing-users or server.editing-groups, or server.allow-editing is off.") +} + type editorPreviewRequest struct { URL string `json:"url"` AllowInsecure bool `json:"allow-insecure"` @@ -203,6 +267,17 @@ type editorPreviewResponse struct { SubrequestsJSON map[string]json.RawMessage `json:"subrequestsJson,omitempty"` HTML string `json:"html,omitempty"` Error string `json:"error,omitempty"` + // Which step failed, since all of them come back as a 200 with an error string. + Stage string `json:"stage,omitempty"` + Subrequest string `json:"subrequest,omitempty"` + Hint string `json:"hint,omitempty"` +} + +var editorPreviewHints = map[string]string{ + "request": "The primary request never produced a usable response. Check the url, the headers and whether the host needs allow-insecure.", + "subrequest": "A subrequest failed, so no data reached the template. The subrequest key is in this payload.", + "template-parse": "The template text is not valid Go template syntax. The message carries the offending action.", + "template-render": "The template parsed but blew up while rendering, usually a field that is missing or of another type than expected.", } // Fetches a custom-api request and renders its template so the editor can show errors before the widget is saved. @@ -211,26 +286,32 @@ func (a *application) handleEditorCustomAPIPreview(w http.ResponseWriter, r *htt return } if !a.userCanEditAnything(a.getAuthenticatedUser(w, r)) { - writeJSONError(w, http.StatusForbidden, editorNotAllowedMessage) + writeEditorForbidden(w) return } r.Body = http.MaxBytesReader(w, r.Body, editorMaxBodyBytes) var req editorPreviewRequest if err := json.NewDecoder(r.Body).Decode(&req); err != nil { - writeJSONError(w, http.StatusBadRequest, "invalid JSON") + writeEditorError(w, http.StatusBadRequest, "editor_body_not_json", "invalid JSON", + "The widget builder sent a body the server could not decode into a preview request.") return } // Fetch and template problems are the point of the preview, so they travel in the body instead of a status code. - fail := func(err error) { - writeJSON(w, http.StatusOK, editorPreviewResponse{Error: err.Error()}) + fail := func(stage, subrequest string, err error) { + writeJSON(w, http.StatusOK, editorPreviewResponse{ + Error: err.Error(), + Stage: stage, + Subrequest: subrequest, + Hint: editorPreviewHints[stage], + }) } primary := &CustomAPIRequest{URL: req.URL, AllowInsecure: req.AllowInsecure, Headers: req.Headers} primaryData, err := fetchEditorPreviewRequest(primary) if err != nil { - fail(err) + fail("request", "", err) return } @@ -243,7 +324,7 @@ func (a *application) handleEditorCustomAPIPreview(w http.ResponseWriter, r *htt for key, sub := range req.Subrequests { data, err := fetchEditorPreviewRequest(sub) if err != nil { - fail(fmt.Errorf("subrequest %q: %w", key, err)) + fail("subrequest", key, fmt.Errorf("subrequest %q: %w", key, err)) return } subData[key] = data @@ -260,13 +341,13 @@ func (a *application) handleEditorCustomAPIPreview(w http.ResponseWriter, r *htt tmpl, err := template.New("").Funcs(customAPITemplateFuncs(providers)).Parse(req.Template) if err != nil { - fail(err) + fail("template-parse", "", err) return } html, _, err := renderCustomAPIData(primaryData, subData, customAPIOptions{}, tmpl) if err != nil { - fail(err) + fail("template-render", "", err) return } response.HTML = string(html) diff --git a/internal/dynacat/static/js/customapi-editor.js b/internal/dynacat/static/js/customapi-editor.js index 5cb76ad8..20d97392 100644 --- a/internal/dynacat/static/js/customapi-editor.js +++ b/internal/dynacat/static/js/customapi-editor.js @@ -1,3 +1,5 @@ +import { logFailure, responseDetail } from "./editor-log.js"; + const PD = typeof pageData !== "undefined" ? pageData : window.pageData; const API = `${PD.baseURL}/api/editor`; @@ -410,14 +412,39 @@ function dropTarget(element, className, accepts, onDrop, onHover) { } async function postPreview(extra) { - const res = await fetch(`${API}/custom-api/preview`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ url: state.url, subrequests: subrequestsObject(), ...extra }), - }); + const url = `${API}/custom-api/preview`; + const sent = { url: state.url, subrequests: subrequestsObject(), ...extra }; + // Header values are the one part of a preview that tends to hold a token. + const sentSummary = { ...sent, headers: sent.headers && Object.keys(sent.headers) }; + + let res; + try { + res = await fetch(url, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(sent), + }); + } catch (err) { + logFailure("preview never reached the server", { request: `POST ${url}`, sent: sentSummary, error: err }); + throw new Error("The server did not answer"); + } const payload = await res.json().catch(() => ({})); - if (!res.ok) throw new Error(payload.error || "Request failed"); + if (!res.ok) { + logFailure("preview was rejected", { ...responseDetail("POST", url, res, payload), sent: sentSummary }); + throw new Error(payload.error || "Request failed"); + } + + if (payload.error) { + logFailure(`preview failed while handling the ${payload.stage || "request"}`, { + stage: payload.stage, + subrequest: payload.subrequest, + message: payload.error, + hint: payload.hint, + sent: sentSummary, + }); + } + return payload; } diff --git a/internal/dynacat/static/js/editor-log.js b/internal/dynacat/static/js/editor-log.js new file mode 100644 index 00000000..d03fbe3c --- /dev/null +++ b/internal/dynacat/static/js/editor-log.js @@ -0,0 +1,33 @@ +// The editor and the widget builder only have room for one short line of feedback, so the full +// picture - what was sent, what came back and which config key the server blamed - goes here. + +const BADGE = "background:#6d28d9;color:#fff;padding:1px 6px;border-radius:3px;font-weight:600"; +const LABEL = "font-weight:600"; + +function isEmpty(value) { + if (value === undefined || value === null || value === "") return true; + return typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0; +} + +// One collapsed group per failure +export function logFailure(action, detail) { + console.groupCollapsed(`%cdynacat editor%c ${action}`, BADGE, ""); + for (const [key, value] of Object.entries(detail)) { + if (!isEmpty(value)) console.log(`%c${key}:`, LABEL, value); + } + console.groupEnd(); +} + +// The parts of a rejected editor response worth printing +export function responseDetail(method, url, res, body) { + return { + request: `${method} ${url}`, + status: `${res.status} ${res.statusText}`, + message: body?.error, + code: body?.code, + field: body?.field, + hint: body?.hint, + context: body?.context, + response: body, + }; +} diff --git a/internal/dynacat/static/js/editor.js b/internal/dynacat/static/js/editor.js index 2dfe65fa..5f8a593f 100644 --- a/internal/dynacat/static/js/editor.js +++ b/internal/dynacat/static/js/editor.js @@ -1,3 +1,5 @@ +import { logFailure, responseDetail } from "./editor-log.js"; + const PD = typeof pageData !== "undefined" ? pageData : window.pageData; const API = `${PD.baseURL}/api/editor`; @@ -38,6 +40,11 @@ async function enterEditor() { state.config = config; state.pageIndex = config.pages.findIndex((p) => p.slug === PD.slug); } catch (err) { + logFailure("editor could not start", { + "loaded from": `${API}/schema and ${API}/config`, + status: err.status, + error: err, + }); toast(err.status === 401 ? "Log in to edit this page" : "Could not load editor", "negative"); return; } @@ -97,7 +104,11 @@ function exitEditor() { async function apiGet(path) { const res = await fetch(API + path); - if (!res.ok) throw { status: res.status }; + if (!res.ok) { + const body = await res.json().catch(() => ({})); + logFailure(`GET ${path} was rejected`, responseDetail("GET", API + path, res, body)); + throw { status: res.status }; + } return res.json(); } @@ -108,7 +119,10 @@ async function apiPost(path, body) { body: JSON.stringify(body), }); const data = await res.json().catch(() => ({})); - if (!res.ok) throw new Error(data.error || "Request failed"); + if (!res.ok) { + logFailure(`POST ${path} was rejected`, { ...responseDetail("POST", API + path, res, data), sent: body }); + throw new Error(data.error || "Request failed"); + } return data; } @@ -116,13 +130,26 @@ const convertToYAML = async (value) => (await apiPost("/convert", { to: "yaml", const convertToValue = async (text) => (await apiPost("/convert", { to: "value", text })).value; async function commit(mutation) { - const res = await fetch(`${API}/config`, { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify(mutation), - }); + let res; + try { + res = await fetch(`${API}/config`, { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify(mutation), + }); + } catch (err) { + logFailure("save never reached the server", { request: `POST ${API}/config`, mutation, error: err }); + toast("Save failed, the server did not answer", "negative"); + return false; + } + if (res.status === 204) return true; + const body = await res.json().catch(() => ({})); + logFailure(`save "${mutation.op}" was rejected`, { + ...responseDetail("POST", `${API}/config`, res, body), + mutation, + }); toast(body.error || "Save failed", "negative"); return false; } @@ -811,8 +838,14 @@ async function confirmDynawidgetVariables({ widget, repo }) { let variables; try { ({ variables } = await apiGet(`/dynawidgets/variables?${params}`)); - } catch { + } catch (err) { // The template may be unreachable, and the save itself still reports what went wrong. + logFailure("dynawidget variables could not be checked, saving anyway", { + widget, + repo: repo || "default repo", + status: err.status, + error: err, + }); return true; } From 943e025d124e28c5a578970e7a981d9cfdff9ce8 Mon Sep 17 00:00:00 2001 From: Panonim Date: Wed, 9 Sep 2026 22:24:15 +0200 Subject: [PATCH 50/53] Fixed security issues --- docs/docs/installation.md | 26 +++++++ internal/dynacat/auth.go | 24 ++++--- internal/dynacat/auth_oidc.go | 3 +- internal/dynacat/auth_test.go | 12 ++-- internal/dynacat/cli.go | 33 +++++---- internal/dynacat/config.go | 1 + internal/dynacat/dynacat.go | 74 ++++++++++++-------- internal/dynacat/dynawidgets-templates.go | 40 ++++++----- internal/dynacat/sse.go | 30 +++++--- internal/dynacat/widget-calendar-releases.go | 2 +- internal/dynacat/widget-calendar.go | 13 ++++ internal/dynacat/widget-dynawidgets.go | 13 ++-- internal/dynacat/widget-latest-media.go | 2 +- internal/dynacat/widget-utils.go | 21 ++++++ internal/dynacat/widget.go | 2 +- 15 files changed, 195 insertions(+), 101 deletions(-) diff --git a/docs/docs/installation.md b/docs/docs/installation.md index 9a965463..ad30308d 100644 --- a/docs/docs/installation.md +++ b/docs/docs/installation.md @@ -67,6 +67,32 @@ services: env_file: .env ``` +### Running as a non-root user + +The image runs as root by default. Nothing in Dynacat needs it, and dropping to your own UID +and GID is recommended, especially if you mount the docker socket: + +```yaml +services: + dynacat: + user: "1000:1000" +``` + +Two things have to line up for this to work: + +- `config` and `assets` have to be readable and writable by that user, otherwise the UI editor + cannot save and the dynawidgets cache cannot be written: `chown -R 1000:1000 config assets`. +- `/app` itself stays owned by root, so the image cache has to be moved onto a mounted volume + by setting `cache-dir` in your `dynacat.yml`: + +```yaml +server: + cache-dir: /app/assets/.cache +``` + +If you mount the docker socket for the docker widgets, the user also has to be in the group +that owns it, which is normally `docker`. + Then, create a new directories called `config` & `assets` and download the example starting [`dynacat.yml`](https://github.com/Panonim/dynacat/blob/main/docs/docs/dynacat.yml) file into it by running: ```bash diff --git a/internal/dynacat/auth.go b/internal/dynacat/auth.go index 5f5ed26f..27c53b7b 100644 --- a/internal/dynacat/auth.go +++ b/internal/dynacat/auth.go @@ -27,7 +27,7 @@ const AUTH_RATE_LIMIT_MAX_ATTEMPTS = 5 const AUTH_TOKEN_SECRET_LENGTH = 32 const AUTH_USERNAME_HASH_LENGTH = 32 const AUTH_SECRET_KEY_LENGTH = AUTH_TOKEN_SECRET_LENGTH + AUTH_USERNAME_HASH_LENGTH -const AUTH_TIMESTAMP_LENGTH = 4 +const AUTH_TIMESTAMP_LENGTH = 8 const AUTH_TOKEN_DATA_LENGTH = AUTH_USERNAME_HASH_LENGTH + AUTH_TIMESTAMP_LENGTH const AUTH_TOKEN_VALID_PERIOD = 14 * 24 * time.Hour @@ -53,20 +53,19 @@ type failedAuthAttempt struct { first time.Time } -func generateSessionToken(username string, secret []byte, now time.Time) (string, error) { +func generateSessionToken(usernameHash []byte, secret []byte, now time.Time) (string, error) { if len(secret) != AUTH_SECRET_KEY_LENGTH { return "", fmt.Errorf("secret key length is not %d bytes", AUTH_SECRET_KEY_LENGTH) } - usernameHash, err := computeUsernameHash(username, secret) - if err != nil { - return "", err + if len(usernameHash) != AUTH_USERNAME_HASH_LENGTH { + return "", fmt.Errorf("username hash length is not %d bytes", AUTH_USERNAME_HASH_LENGTH) } data := make([]byte, AUTH_TOKEN_DATA_LENGTH) copy(data, usernameHash) expires := now.Add(AUTH_TOKEN_VALID_PERIOD).Unix() - binary.LittleEndian.PutUint32(data[AUTH_USERNAME_HASH_LENGTH:], uint32(expires)) + binary.LittleEndian.PutUint64(data[AUTH_USERNAME_HASH_LENGTH:], uint64(expires)) h := hmac.New(sha256.New, secret[0:AUTH_TOKEN_SECRET_LENGTH]) h.Write(data) @@ -77,13 +76,16 @@ func generateSessionToken(username string, secret []byte, now time.Time) (string return encodedToken, nil } -func computeUsernameHash(username string, secret []byte) ([]byte, error) { +// Mixing in the credential invalidates old tokens whenever the password changes. +func computeUsernameHash(username string, credential string, secret []byte) ([]byte, error) { if len(secret) != AUTH_SECRET_KEY_LENGTH { return nil, fmt.Errorf("secret key length is not %d bytes", AUTH_SECRET_KEY_LENGTH) } h := hmac.New(sha256.New, secret[AUTH_TOKEN_SECRET_LENGTH:]) h.Write([]byte(username)) + h.Write([]byte{0}) + h.Write([]byte(credential)) return h.Sum(nil), nil } @@ -114,7 +116,7 @@ func verifySessionToken(token string, secretBytes []byte, now time.Time) ([]byte return nil, false, fmt.Errorf("signature does not match") } - expiresTimestamp := int64(binary.LittleEndian.Uint32(timestampBytes)) + expiresTimestamp := int64(binary.LittleEndian.Uint64(timestampBytes)) if now.Unix() > expiresTimestamp { return nil, false, fmt.Errorf("token has expired") } @@ -200,7 +202,7 @@ func (a *application) handleAuthenticationAttempt(w http.ResponseWriter, r *http return } - token, err := generateSessionToken(creds.Username, a.authSecretKey, time.Now()) + token, err := generateSessionToken(u.usernameHash, a.authSecretKey, time.Now()) if err != nil { slog.Error("Could not compute session token during login attempt", "error", err) time.Sleep(waitOnFailure) @@ -284,9 +286,9 @@ func (a *application) getAuthenticatedUser(w http.ResponseWriter, r *http.Reques if err == nil { username, exists := a.usernameHashToUsername[string(usernameHash)] if exists { - if _, exists = a.Config.Auth.Users[username]; exists { + if u, exists := a.Config.Auth.Users[username]; exists { if shouldRegenerate { - newToken, err := generateSessionToken(username, a.authSecretKey, time.Now()) + newToken, err := generateSessionToken(u.usernameHash, a.authSecretKey, time.Now()) if err != nil { slog.Error("Could not compute session token during regeneration", "error", err) } else { diff --git a/internal/dynacat/auth_oidc.go b/internal/dynacat/auth_oidc.go index bd71b2b3..12569cdc 100644 --- a/internal/dynacat/auth_oidc.go +++ b/internal/dynacat/auth_oidc.go @@ -215,13 +215,14 @@ func (a *application) handleOIDCCallback(w http.ResponseWriter, r *http.Request) CreatedAt: time.Now(), }) + // Strict would not survive the redirect back from the provider. http.SetCookie(w, &http.Cookie{ Name: OIDC_SESSION_COOKIE_NAME, Value: sessionID, Expires: time.Now().Add(OIDC_SESSION_VALID_PERIOD), Secure: a.isRequestHTTPS(r), Path: baseURL + "/", - SameSite: http.SameSiteStrictMode, + SameSite: http.SameSiteLaxMode, HttpOnly: true, }) diff --git a/internal/dynacat/auth_test.go b/internal/dynacat/auth_test.go index 6f34127e..670f94ca 100644 --- a/internal/dynacat/auth_test.go +++ b/internal/dynacat/auth_test.go @@ -25,7 +25,12 @@ func TestAuthTokenGenerationAndVerification(t *testing.T) { now := time.Now() username := "admin" - token, err := generateSessionToken(username, secretBytes, now) + computedUsernameHash, err := computeUsernameHash(username, "hunter2hunter2", secretBytes) + if err != nil { + t.Fatalf("Failed to compute username hash: %v", err) + } + + token, err := generateSessionToken(computedUsernameHash, secretBytes, now) if err != nil { t.Fatalf("Failed to generate session token: %v", err) } @@ -39,11 +44,6 @@ func TestAuthTokenGenerationAndVerification(t *testing.T) { t.Fatal("Token should not need to be regenerated immediately after generation") } - computedUsernameHash, err := computeUsernameHash(username, secretBytes) - if err != nil { - t.Fatalf("Failed to compute username hash: %v", err) - } - if !bytes.Equal(usernameHashBytes, computedUsernameHash) { t.Fatal("Username hash does not match the expected value") } diff --git a/internal/dynacat/cli.go b/internal/dynacat/cli.go index c6c1e7fb..91fa003f 100644 --- a/internal/dynacat/cli.go +++ b/internal/dynacat/cli.go @@ -69,35 +69,34 @@ func parseCliOptions() (*cliOptions, error) { args = flags.Args() unknownCommandErr := fmt.Errorf("unknown command: %s", strings.Join(args, " ")) - if len(args) == 0 { + switch len(args) { + case 0: intent = cliIntentServe - } else if len(args) == 1 { - if args[0] == "config:validate" { + case 1: + switch args[0] { + case "config:validate": intent = cliIntentConfigValidate - } else if args[0] == "config:print" { + case "config:print": intent = cliIntentConfigPrint - } else if args[0] == "sensors:print" { + case "sensors:print": intent = cliIntentSensorsPrint - } else if args[0] == "diagnose" { + case "diagnose": intent = cliIntentDiagnose - } else if args[0] == "secret:make" { + case "secret:make": intent = cliIntentSecretMake - } else { + default: return nil, unknownCommandErr } - } else if len(args) == 2 { - if args[0] == "password:hash" { + case 2: + switch args[0] { + case "password:hash": intent = cliIntentPasswordHash - } else { - return nil, unknownCommandErr - } - } else if len(args) == 2 { - if args[0] == "mountpoint:info" { + case "mountpoint:info": intent = cliIntentMountpointInfo - } else { + default: return nil, unknownCommandErr } - } else { + default: return nil, unknownCommandErr } diff --git a/internal/dynacat/config.go b/internal/dynacat/config.go index 30109d37..c0a939fc 100644 --- a/internal/dynacat/config.go +++ b/internal/dynacat/config.go @@ -110,6 +110,7 @@ type user struct { PasswordHashString string `yaml:"password-hash"` PasswordHash []byte `yaml:"-"` RestrictEditing []string `yaml:"restrict-editing"` + usernameHash []byte `yaml:"-"` } type page struct { diff --git a/internal/dynacat/dynacat.go b/internal/dynacat/dynacat.go index 1f224084..3a9dce32 100644 --- a/internal/dynacat/dynacat.go +++ b/internal/dynacat/dynacat.go @@ -131,10 +131,17 @@ func newApplication(c *config) (*application, error) { for username := range config.Auth.Users { user := config.Auth.Users[username] - usernameHash, err := computeUsernameHash(username, app.authSecretKey) + + credential := user.PasswordHashString + if credential == "" { + credential = user.Password + } + + usernameHash, err := computeUsernameHash(username, credential, app.authSecretKey) if err != nil { return nil, fmt.Errorf("computing username hash for user %s: %v", username, err) } + user.usernameHash = usernameHash app.usernameHashToUsername[string(usernameHash)] = username if user.PasswordHashString != "" { @@ -684,39 +691,39 @@ func (a *application) handlePageContentRequest(w http.ResponseWriter, r *http.Re w.Write(responseBytes.Bytes()) } -func (a *application) addressOfRequest(r *http.Request) string { - remoteAddrWithoutPort := func() string { - if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil { - return host - } - return r.RemoteAddr +func remoteAddrWithoutPort(r *http.Request) string { + if host, _, err := net.SplitHostPort(r.RemoteAddr); err == nil { + return host } + return r.RemoteAddr +} - if !a.Config.Server.Proxied { - return remoteAddrWithoutPort() +func (a *application) ipIsTrustedProxy(ipStr string) bool { + ip := net.ParseIP(strings.TrimSpace(ipStr)) + if ip == nil { + return false } + for _, n := range a.Config.Server.trustedProxyNets { + if n.Contains(ip) { + return true + } + } + return false +} - remote := remoteAddrWithoutPort() - trustedNets := a.Config.Server.trustedProxyNets +// Without trusted-proxies there is nothing to check the peer against. +func (a *application) requestCameThroughTrustedProxy(r *http.Request) bool { + return len(a.Config.Server.trustedProxyNets) == 0 || a.ipIsTrustedProxy(remoteAddrWithoutPort(r)) +} - if len(trustedNets) == 0 { - return remote - } +func (a *application) addressOfRequest(r *http.Request) string { + remote := remoteAddrWithoutPort(r) - ipIsTrusted := func(ipStr string) bool { - ip := net.ParseIP(strings.TrimSpace(ipStr)) - if ip == nil { - return false - } - for _, n := range trustedNets { - if n.Contains(ip) { - return true - } - } - return false + if !a.Config.Server.Proxied || len(a.Config.Server.trustedProxyNets) == 0 { + return remote } - if !ipIsTrusted(remote) { + if !a.ipIsTrustedProxy(remote) { return remote } @@ -731,7 +738,7 @@ func (a *application) addressOfRequest(r *http.Request) string { if candidate == "" { continue } - if ipIsTrusted(candidate) { + if a.ipIsTrustedProxy(candidate) { continue } return candidate @@ -811,6 +818,9 @@ func (a *application) handleWidgetActionRequest(w http.ResponseWriter, r *http.R return } + page.mu.Lock() + defer page.mu.Unlock() + widget.handleRequest(w, r) } @@ -925,7 +935,13 @@ func sameOriginMiddleware(next http.Handler) http.Handler { switch r.Method { case http.MethodGet, http.MethodHead, http.MethodOptions: default: - if origin != "" && originHost(origin) != r.Host { + if origin == "" { + // No Origin and no cookies means an API client, not a browser. + if len(r.Cookies()) > 0 { + http.Error(w, "cross-origin request rejected", http.StatusForbidden) + return + } + } else if originHost(origin) != r.Host { http.Error(w, "cross-origin request rejected", http.StatusForbidden) return } @@ -951,7 +967,7 @@ func (a *application) isRequestHTTPS(r *http.Request) bool { if r.TLS != nil { return true } - if a.Config.Server.Proxied { + if a.Config.Server.Proxied && a.requestCameThroughTrustedProxy(r) { return strings.EqualFold(r.Header.Get("X-Forwarded-Proto"), "https") } return false diff --git a/internal/dynacat/dynawidgets-templates.go b/internal/dynacat/dynawidgets-templates.go index 1a89c8f3..51738154 100644 --- a/internal/dynacat/dynawidgets-templates.go +++ b/internal/dynacat/dynawidgets-templates.go @@ -25,7 +25,6 @@ const ( ) type dynawidgetsTemplateMeta struct { - Repo string `json:"repo"` URL string `json:"url"` Title string `json:"title,omitempty"` ETag string `json:"etag,omitempty"` @@ -43,13 +42,22 @@ func (meta *dynawidgetsTemplateMeta) checkInterval() time.Duration { return dynawidgetsUpdateCheckInterval } +// Includes the branch so two branches cannot share a cached template. +func dynawidgetsCacheKey(slug string, repo string) string { + return slug + "@" + repo +} + // Keeps generated paths inside the assets directory, whatever the slug looks like. -func dynawidgetsAssetPath(slug string, suffix string) (string, error) { +func dynawidgetsAssetPath(slug string, repo string, suffix string) (string, error) { if !dynawidgetsSlugPattern.MatchString(slug) { return "", fmt.Errorf("invalid slug %q", slug) } - path := filepath.Join(dynawidgetsAssetsDir, slug+suffix) + if !dynawidgetsRepoPattern.MatchString(repo) { + return "", fmt.Errorf("invalid repo %q", repo) + } + + path := filepath.Join(dynawidgetsAssetsDir, dynawidgetsCacheKey(slug, repo)+suffix) absAssets, err := filepath.Abs(dynawidgetsAssetsDir) if err != nil { return path, nil @@ -62,8 +70,8 @@ func dynawidgetsAssetPath(slug string, suffix string) (string, error) { return path, nil } -func dynawidgetsTemplateModTime(slug string) time.Time { - path, err := dynawidgetsAssetPath(slug, ".txt") +func dynawidgetsTemplateModTime(slug string, repo string) time.Time { + path, err := dynawidgetsAssetPath(slug, repo, ".txt") if err != nil { return time.Time{} } @@ -76,7 +84,7 @@ func dynawidgetsTemplateModTime(slug string) time.Time { return info.ModTime() } -// Metadata for every cached template, keyed by slug. +// Metadata for every cached template, keyed by slug and branch. var dynawidgetsMetaPath = filepath.Join(dynawidgetsAssetsDir, "templates.meta.json") var dynawidgetsMetaMu sync.Mutex @@ -96,11 +104,11 @@ func dynawidgetsReadAllMeta() map[string]dynawidgetsTemplateMeta { return entries } -func dynawidgetsReadMeta(slug string) *dynawidgetsTemplateMeta { +func dynawidgetsReadMeta(slug string, repo string) *dynawidgetsTemplateMeta { dynawidgetsMetaMu.Lock() defer dynawidgetsMetaMu.Unlock() - meta, ok := dynawidgetsReadAllMeta()[slug] + meta, ok := dynawidgetsReadAllMeta()[dynawidgetsCacheKey(slug, repo)] if !ok { return nil } @@ -108,12 +116,12 @@ func dynawidgetsReadMeta(slug string) *dynawidgetsTemplateMeta { return &meta } -func dynawidgetsWriteMeta(slug string, meta *dynawidgetsTemplateMeta) { +func dynawidgetsWriteMeta(slug string, repo string, meta *dynawidgetsTemplateMeta) { dynawidgetsMetaMu.Lock() defer dynawidgetsMetaMu.Unlock() entries := dynawidgetsReadAllMeta() - entries[slug] = *meta + entries[dynawidgetsCacheKey(slug, repo)] = *meta data, err := json.MarshalIndent(entries, "", " ") if err != nil { @@ -159,7 +167,7 @@ func dynawidgetsCheckTemplate(slug string, repo string) error { lock.Lock() defer lock.Unlock() - templatePath, err := dynawidgetsAssetPath(slug, ".txt") + templatePath, err := dynawidgetsAssetPath(slug, repo, ".txt") if err != nil { return err } @@ -170,9 +178,9 @@ func dynawidgetsCheckTemplate(slug string, repo string) error { return nil } - meta := dynawidgetsReadMeta(slug) - if meta == nil || meta.Repo != repo { - meta = &dynawidgetsTemplateMeta{Repo: repo} + meta := dynawidgetsReadMeta(slug, repo) + if meta == nil { + meta = &dynawidgetsTemplateMeta{} } if time.Since(meta.CheckedAt) < meta.checkInterval() { @@ -199,7 +207,7 @@ func dynawidgetsCheckTemplate(slug string, repo string) error { if notModified || string(body) == string(cached) { meta.UnchangedChecks++ - dynawidgetsWriteMeta(slug, meta) + dynawidgetsWriteMeta(slug, repo, meta) return nil } @@ -209,7 +217,7 @@ func dynawidgetsCheckTemplate(slug string, repo string) error { meta.UpdatedAt = now meta.UnchangedChecks = 0 - dynawidgetsWriteMeta(slug, meta) + dynawidgetsWriteMeta(slug, repo, meta) slog.Info("Dynawidget template updated", "slug", slug, "repo", repo, "url", templateURL) return nil diff --git a/internal/dynacat/sse.go b/internal/dynacat/sse.go index fbee520a..6a861fc3 100644 --- a/internal/dynacat/sse.go +++ b/internal/dynacat/sse.go @@ -20,9 +20,17 @@ type sseClient struct { user *authenticatedUser } +// Dropped once full, widgets re-register their images on the next update. +const imageProxyMaxEntries = 10000 + func (a *application) registerImageProxy(hash string, url string, allowInsecure bool) { a.imageProxyMu.Lock() defer a.imageProxyMu.Unlock() + + if len(a.imageProxyURLs) >= imageProxyMaxEntries { + clear(a.imageProxyURLs) + } + a.imageProxyURLs[hash] = imageProxyInfo{URL: url, AllowInsecure: allowInsecure} } @@ -93,7 +101,7 @@ func (a *application) handleImageProxyRequest(w http.ResponseWriter, r *http.Req return } - client := ternary(info.AllowInsecure, defaultInsecureHTTPClient, defaultHTTPClient) + client := ternary(info.AllowInsecure, publicOnlyInsecureHTTPClient, publicOnlyHTTPClient) req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, info.URL, nil) if err != nil { http.Error(w, "Failed to fetch image", http.StatusInternalServerError) @@ -128,12 +136,10 @@ func (a *application) handleImageProxyRequest(w http.ResponseWriter, r *http.Req w.Header().Set("Cache-Control", "public, max-age=2592000, immutable") w.WriteHeader(http.StatusOK) - if _, err := io.Copy(w, resp.Body); err != nil { - return - } + io.Copy(w, io.LimitReader(resp.Body, maxResponseBytes)) } -func (a *application) respondWithOpenSearchSuggestions(w http.ResponseWriter, r *http.Request, requestURL string) { +func (a *application) respondWithOpenSearchSuggestions(w http.ResponseWriter, r *http.Request, requestURL string, client *http.Client) { req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, requestURL, nil) if err != nil { http.Error(w, "Failed to create request", http.StatusInternalServerError) @@ -141,7 +147,7 @@ func (a *application) respondWithOpenSearchSuggestions(w http.ResponseWriter, r } setBrowserUserAgentHeader(req) - resp, err := defaultHTTPClient.Do(req) + resp, err := client.Do(req) if err != nil { http.Error(w, "Failed to fetch suggestions", http.StatusBadGateway) return @@ -191,7 +197,7 @@ func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r * if provider == "brave" { braveURL := "https://search.brave.com/api/suggest?" + url.Values{"q": {query}, "rich": {"false"}}.Encode() - a.respondWithOpenSearchSuggestions(w, r, braveURL) + a.respondWithOpenSearchSuggestions(w, r, braveURL, publicOnlyHTTPClient) return } @@ -213,15 +219,17 @@ func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r * customURL := strings.ReplaceAll(source.URL, "{QUERY}", url.QueryEscape(query)) // Self-hosted instances named in the config are allowed to sit on a private // address, unlike URLs that could otherwise be probed through this endpoint. + client := defaultHTTPClient if !source.AllowPrivate { if err := validatePublicFetchURL(customURL); err != nil { w.WriteHeader(http.StatusOK) w.Write([]byte("[]")) return } + client = publicOnlyHTTPClient } - a.respondWithOpenSearchSuggestions(w, r, customURL) + a.respondWithOpenSearchSuggestions(w, r, customURL, client) return } @@ -233,7 +241,7 @@ func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r * } setBrowserUserAgentHeader(req) - resp, err := defaultHTTPClient.Do(req) + resp, err := publicOnlyHTTPClient.Do(req) if err != nil { http.Error(w, "Failed to fetch suggestions", http.StatusBadGateway) return @@ -241,7 +249,7 @@ func (a *application) handleSearchAutocompleteRequest(w http.ResponseWriter, r * defer resp.Body.Close() w.WriteHeader(http.StatusOK) - io.Copy(w, resp.Body) + io.Copy(w, io.LimitReader(resp.Body, maxResponseBytes)) } func (a *application) handleSSEUpdates(w http.ResponseWriter, r *http.Request) { @@ -278,7 +286,7 @@ func (a *application) handleSSEUpdates(w http.ResponseWriter, r *http.Request) { a.sseRegisterClient(client) defer a.sseUnregisterClient(client) - authRecheck := time.NewTicker(60 * time.Second) + authRecheck := time.NewTicker(15 * time.Second) defer authRecheck.Stop() for { diff --git a/internal/dynacat/widget-calendar-releases.go b/internal/dynacat/widget-calendar-releases.go index 87c3f142..3783d887 100644 --- a/internal/dynacat/widget-calendar-releases.go +++ b/internal/dynacat/widget-calendar-releases.go @@ -132,7 +132,7 @@ func (widget *calendarWidget) getReleasesForMonth(ctx context.Context, year int, if widget.Providers != nil && widget.Providers.app != nil && item.Thumbnail != "" { hash := hashString(item.Thumbnail) widget.Providers.app.registerImageProxy(hash, item.Thumbnail, service.AllowInsecure) - item.Thumbnail = "/api/image-proxy/" + hash + item.Thumbnail = widget.GetBaseURL() + "/api/image-proxy/" + hash } data[date] = append(data[date], item) diff --git a/internal/dynacat/widget-calendar.go b/internal/dynacat/widget-calendar.go index 9edcf21d..c0c72745 100644 --- a/internal/dynacat/widget-calendar.go +++ b/internal/dynacat/widget-calendar.go @@ -190,6 +190,11 @@ func (widget *calendarWidget) handleRequest(w http.ResponseWriter, r *http.Reque return } + if !withinCalendarReleaseRange(year, time.Month(month), time.Now()) { + http.Error(w, "month out of range", http.StatusBadRequest) + return + } + if len(widget.Hosts) == 0 { w.Header().Set("Content-Type", "application/json") w.Write([]byte("{}")) @@ -202,3 +207,11 @@ func (widget *calendarWidget) handleRequest(w http.ResponseWriter, r *http.Reque w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") json.NewEncoder(w).Encode(data) } + +// Bounds the release cache and the traffic a caller can aim at the configured services. +func withinCalendarReleaseRange(year int, month time.Month, now time.Time) bool { + requested := time.Date(year, month, 1, 0, 0, 0, 0, time.UTC) + current := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, time.UTC) + + return !requested.Before(current.AddDate(-2, 0, 0)) && !requested.After(current.AddDate(2, 0, 0)) +} diff --git a/internal/dynacat/widget-dynawidgets.go b/internal/dynacat/widget-dynawidgets.go index 4b74615a..6705c4e9 100644 --- a/internal/dynacat/widget-dynawidgets.go +++ b/internal/dynacat/widget-dynawidgets.go @@ -20,7 +20,7 @@ const dynawidgetsDefaultRepo = "main" const dynawidgetsAssetsDir = "/app/assets/dynawidgets" var dynawidgetsSlugPattern = regexp.MustCompile(`^[a-z0-9][a-z0-9_-]{0,63}$`) -var dynawidgetsRepoPattern = regexp.MustCompile(`^[a-zA-Z0-9._/-]{1,64}$`) +var dynawidgetsRepoPattern = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$`) var dynawidgetsTemplateHost = "raw.githubusercontent.com" type dynawidgetsWidget struct { @@ -81,7 +81,7 @@ func (widget *dynawidgetsWidget) initialize() error { widget.slug = slug widget.repo = repo widget.templateContent = templateContent - widget.templateModTime = dynawidgetsTemplateModTime(slug) + widget.templateModTime = dynawidgetsTemplateModTime(slug, repo) if widget.Title == "" && title != "" { widget.Title = title @@ -173,7 +173,7 @@ func (widget *dynawidgetsWidget) refreshTemplate() { } } - modTime := dynawidgetsTemplateModTime(widget.slug) + modTime := dynawidgetsTemplateModTime(widget.slug, widget.repo) if modTime.IsZero() || modTime.Equal(widget.templateModTime) { return } @@ -309,14 +309,14 @@ func dynawidgetsRawTemplate(slug string, repo string) (raw string, title string, repo = dynawidgetsDefaultRepo } - templatePath, err := dynawidgetsAssetPath(slug, ".txt") + templatePath, err := dynawidgetsAssetPath(slug, repo, ".txt") if err != nil { return "", "", err } if data, readErr := os.ReadFile(templatePath); readErr == nil { slog.Info("Using cached dynawidget template", "slug", slug, "path", templatePath) - if meta := dynawidgetsReadMeta(slug); meta != nil { + if meta := dynawidgetsReadMeta(slug, repo); meta != nil { title = meta.Title } return string(data), title, nil @@ -340,8 +340,7 @@ func dynawidgetsRawTemplate(slug string, repo string) (raw string, title string, slog.Error("Failed to cache dynawidget template", "error", err, "path", templatePath) } else { slog.Info("Cached dynawidget template", "slug", slug, "path", templatePath) - dynawidgetsWriteMeta(slug, &dynawidgetsTemplateMeta{ - Repo: repo, + dynawidgetsWriteMeta(slug, repo, &dynawidgetsTemplateMeta{ URL: templateURL, Title: title, ETag: etag, diff --git a/internal/dynacat/widget-latest-media.go b/internal/dynacat/widget-latest-media.go index b7f1bee4..2aa97fd3 100644 --- a/internal/dynacat/widget-latest-media.go +++ b/internal/dynacat/widget-latest-media.go @@ -596,7 +596,7 @@ func (widget *latestMediaWidget) cacheImageURLs() { func (widget *latestMediaWidget) resolveCachedImageURL(ctx context.Context, originalURL string, allowInsecure bool, kind string) string { hash := hashString(originalURL) - proxyURL := fmt.Sprintf("/api/image-proxy/%s", hash) + proxyURL := widget.GetBaseURL() + "/api/image-proxy/" + hash if widget.Providers != nil && widget.Providers.app != nil { widget.Providers.app.registerImageProxy(hash, originalURL, allowInsecure) diff --git a/internal/dynacat/widget-utils.go b/internal/dynacat/widget-utils.go index 1ac3a78d..2a8a031a 100644 --- a/internal/dynacat/widget-utils.go +++ b/internal/dynacat/widget-utils.go @@ -82,6 +82,27 @@ var defaultInsecureHTTPClient = &http.Client{ }, } +// Re-checks every hop so a public host cannot redirect the fetch to a private address. +func checkPublicRedirect(req *http.Request, via []*http.Request) error { + if len(via) >= 10 { + return errors.New("stopped after 10 redirects") + } + + return validatePublicFetchURL(req.URL.String()) +} + +func newPublicOnlyHTTPClient(base *http.Client) *http.Client { + return &http.Client{ + Transport: base.Transport, + Timeout: defaultClientTimeout, + CheckRedirect: checkPublicRedirect, + } +} + +var publicOnlyHTTPClient = newPublicOnlyHTTPClient(defaultHTTPClient) + +var publicOnlyInsecureHTTPClient = newPublicOnlyHTTPClient(defaultInsecureHTTPClient) + type requestDoer interface { Do(*http.Request) (*http.Response, error) } diff --git a/internal/dynacat/widget.go b/internal/dynacat/widget.go index 270010b2..8858c4c1 100644 --- a/internal/dynacat/widget.go +++ b/internal/dynacat/widget.go @@ -221,7 +221,7 @@ func (p *widgetProviders) SecureImageURL(ctx context.Context, imageURL string, a } } - return fmt.Sprintf("/api/image-proxy/%s", hash) + return p.baseURL + "/api/image-proxy/" + hash } func (w *widgetBase) requiresUpdate(now *time.Time) bool { From 1960f610c02fbd4d37cdfdfbc54146d84013d85d Mon Sep 17 00:00:00 2001 From: Panonim Date: Thu, 10 Sep 2026 17:16:06 +0200 Subject: [PATCH 51/53] Fixed jellyfin api issues --- README.md | 16 +++++++++------- docs/docs/changelog.md | 1 + internal/dynacat/widget-latest-media.go | 11 +++++++---- internal/dynacat/widget-playing.go | 12 ++++-------- internal/dynacat/widget-utils.go | 5 +++++ 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 377a027e..c2a4eaf2 100644 --- a/README.md +++ b/README.md @@ -237,10 +237,12 @@ You can list multiple origins. Each entry must be a full origin including the sc **If you like this project, please consider [sponsoring](https://ko-fi.com/panonim).** - - - - - Star History Chart - - \ No newline at end of file + \ No newline at end of file diff --git a/docs/docs/changelog.md b/docs/docs/changelog.md index 085b4f45..4a8c9b01 100644 --- a/docs/docs/changelog.md +++ b/docs/docs/changelog.md @@ -14,6 +14,7 @@ - Added a function in `calendar` widget when showing releases to also show release type - Added a function in `calendar` widget to also show current state of the media e.g. grabbed - Fixed issue with `search` widget highlighting +- Fixed Jellyfin issue where `playing` widget couldn't be resolved because of the api changes. - Added a read-only JSON API for accessing widget data - Added option to mark `monitor` as disabled - Added `show-history` option to `monitor` widget showing a bar of the last hour of status checks diff --git a/internal/dynacat/widget-latest-media.go b/internal/dynacat/widget-latest-media.go index 2aa97fd3..86da02e8 100644 --- a/internal/dynacat/widget-latest-media.go +++ b/internal/dynacat/widget-latest-media.go @@ -396,12 +396,13 @@ func (widget *latestMediaWidget) fetchJellyfinEmbyLatest(ctx context.Context, ho client := ternary(host.AllowInsecure, defaultInsecureHTTPClient, defaultHTTPClient) baseURL := strings.TrimRight(host.BaseURL, "/") - usersURL := fmt.Sprintf("%s/Users?api_key=%s", baseURL, host.Token) + usersURL := fmt.Sprintf("%s/Users", baseURL) req, err := http.NewRequestWithContext(ctx, "GET", usersURL, nil) if err != nil { return nil, err } req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", jellyfinAuthHeader(host.Token)) users, err := decodeJsonFromRequest[jellyfinUsersResponse](client, req) if err != nil { @@ -416,12 +417,13 @@ func (widget *latestMediaWidget) fetchJellyfinEmbyLatest(ctx context.Context, ho return widget.fetchJellyfinEmbyLatestFromParent(ctx, client, host, serverType, baseURL, userID, "") } - viewsURL := fmt.Sprintf("%s/UserViews?api_key=%s&userId=%s", baseURL, host.Token, userID) + viewsURL := fmt.Sprintf("%s/UserViews?userId=%s", baseURL, userID) req, err = http.NewRequestWithContext(ctx, "GET", viewsURL, nil) if err != nil { return nil, err } req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", jellyfinAuthHeader(host.Token)) views, err := decodeJsonFromRequest[jellyfinUserViewsResponse](client, req) if err != nil { @@ -453,8 +455,8 @@ func (widget *latestMediaWidget) fetchJellyfinEmbyLatestFromParent( userID string, parentID string, ) ([]latestMediaItem, error) { - url := fmt.Sprintf("%s/Users/%s/Items/Latest?api_key=%s&Limit=%d&Fields=DateCreated,RunTimeTicks,AlbumArtist", - baseURL, userID, host.Token, widget.ItemCount) + url := fmt.Sprintf("%s/Users/%s/Items/Latest?Limit=%d&Fields=DateCreated,RunTimeTicks,AlbumArtist", + baseURL, userID, widget.ItemCount) if parentID != "" { url += "&ParentId=" + parentID } @@ -464,6 +466,7 @@ func (widget *latestMediaWidget) fetchJellyfinEmbyLatestFromParent( return nil, err } req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", jellyfinAuthHeader(host.Token)) rawItems, err := decodeJsonFromRequest[[]jellyfinLatestItem](client, req) if err != nil { diff --git a/internal/dynacat/widget-playing.go b/internal/dynacat/widget-playing.go index e27dfb4a..985476c0 100644 --- a/internal/dynacat/widget-playing.go +++ b/internal/dynacat/widget-playing.go @@ -520,10 +520,7 @@ func (widget *playingWidget) fetchPlexSessions(ctx context.Context, host *Playin } func (widget *playingWidget) fetchJellyfinSessions(ctx context.Context, host *PlayingHostConfig) ([]mediaSession, error) { - url := fmt.Sprintf("%s/Sessions?api_key=%s&activeWithinSeconds=30", - strings.TrimRight(host.BaseURL, "/"), - host.Token, - ) + url := fmt.Sprintf("%s/Sessions?activeWithinSeconds=30", strings.TrimRight(host.BaseURL, "/")) if widget.Debug { slog.Info("Jellyfin: fetching sessions", "url", url) @@ -535,6 +532,7 @@ func (widget *playingWidget) fetchJellyfinSessions(ctx context.Context, host *Pl } req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", jellyfinAuthHeader(host.Token)) client := ternary(host.AllowInsecure, defaultInsecureHTTPClient, defaultHTTPClient) response, err := decodeJsonFromRequest[jellyfinEmbySessionsResponse](client, req) @@ -558,10 +556,7 @@ func (widget *playingWidget) fetchJellyfinSessions(ctx context.Context, host *Pl } func (widget *playingWidget) fetchEmbySessions(ctx context.Context, host *PlayingHostConfig) ([]mediaSession, error) { - url := fmt.Sprintf("%s/Sessions?api_key=%s&activeWithinSeconds=30", - strings.TrimRight(host.BaseURL, "/"), - host.Token, - ) + url := fmt.Sprintf("%s/Sessions?activeWithinSeconds=30", strings.TrimRight(host.BaseURL, "/")) req, err := http.NewRequestWithContext(ctx, "GET", url, nil) if err != nil { @@ -569,6 +564,7 @@ func (widget *playingWidget) fetchEmbySessions(ctx context.Context, host *Playin } req.Header.Set("Accept", "application/json") + req.Header.Set("Authorization", jellyfinAuthHeader(host.Token)) client := ternary(host.AllowInsecure, defaultInsecureHTTPClient, defaultHTTPClient) response, err := decodeJsonFromRequest[jellyfinEmbySessionsResponse](client, req) diff --git a/internal/dynacat/widget-utils.go b/internal/dynacat/widget-utils.go index 2a8a031a..c261c682 100644 --- a/internal/dynacat/widget-utils.go +++ b/internal/dynacat/widget-utils.go @@ -123,6 +123,11 @@ func setBrowserUserAgentHeader(request *http.Request) { request.Header.Set("User-Agent", getBrowserUserAgentHeader()) } +// Jellyfin/Emby 12+ rejects the legacy ?api_key= query param; use the header instead. +func jellyfinAuthHeader(token string) string { + return fmt.Sprintf(`MediaBrowser Token="%s"`, token) +} + func fetchRequestBody(client requestDoer, request *http.Request) (int, []byte, error) { if request.Method == "" || request.Method == http.MethodGet { status, _, body, err := globalSharedFetcher.do(client, request, sharedFetchMaxAgeForRequest(request)) From e81eac1bba6787be26c0211227463d16ff5a7313 Mon Sep 17 00:00:00 2001 From: Panonim Date: Fri, 11 Sep 2026 19:14:48 +0200 Subject: [PATCH 52/53] Added headers to the widget editor --- .../dynacat/static/css/customapi-editor.css | 92 +++++++--- .../dynacat/static/js/customapi-editor.js | 158 ++++++++++++++---- 2 files changed, 196 insertions(+), 54 deletions(-) diff --git a/internal/dynacat/static/css/customapi-editor.css b/internal/dynacat/static/css/customapi-editor.css index 419544cc..bafc0750 100644 --- a/internal/dynacat/static/css/customapi-editor.css +++ b/internal/dynacat/static/css/customapi-editor.css @@ -49,45 +49,30 @@ z-index: 66; } -/* The side columns share the leftover width evenly, so the tools column lands in the middle of the bar. */ .capi-topbar { grid-row: 1; - display: grid; - grid-template-columns: 1fr auto 1fr; + display: flex; align-items: center; - gap: 12px; padding: 9px 20px; border-bottom: 1px solid var(--color-separator); } +/* The rule keeps the data tools reading apart from the save actions they sit next to. */ .capi-topbar-tools { display: flex; align-items: center; gap: 8px; flex-shrink: 0; + padding-right: 12px; + border-right: 1px solid var(--color-separator); } .capi-topbar-actions { display: flex; align-items: center; justify-content: flex-end; - justify-self: end; - gap: 12px; - min-width: 0; - max-width: 100%; -} - -.capi-url { - display: flex; - align-items: center; - gap: 8px; - flex: 1 1 auto; - min-width: 0; - max-width: 480px; -} - -.capi-url > .editor-input { flex: 1 1 auto; + gap: 12px; min-width: 0; } @@ -195,15 +180,72 @@ border-left: 1px solid var(--color-separator); } -/* Brighter than a plain separator, so the split between sources and fields reads as deliberate. */ -.capi-sources { +.capi-net { display: flex; flex-direction: column; - gap: 8px; + gap: 10px; padding-bottom: 16px; border-bottom: 1px solid color-mix(in srgb, var(--color-text-subdue) 45%, var(--color-separator)); } +.capi-net-collapsed { + gap: 4px; +} + +.capi-net-head { + display: flex; + align-items: center; + justify-content: space-between; + gap: 10px; + cursor: pointer; + user-select: none; +} + +.capi-net-toggle svg { + transition: transform 0.15s ease; +} + +.capi-net-toggle[aria-expanded="true"] svg { + transform: rotate(90deg); +} + +.capi-net-summary { + font-size: 1.2rem; + color: var(--color-text-subdue); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.capi-net-body { + display: flex; + flex-direction: column; + gap: 12px; +} + +.capi-headers { + display: flex; + flex-direction: column; + gap: 6px; +} + +.capi-header-row { + display: grid; + grid-template-columns: 1fr auto; + align-items: center; + gap: 6px; +} + +.capi-header-row > .editor-input { + min-width: 0; + padding: 5px 8px; + font-size: 1.2rem; +} + +.capi-header-row > .editor-input:last-child { + grid-column: 1 / -1; +} + .capi-palette { display: grid; grid-template-columns: 1fr 1fr; @@ -253,12 +295,12 @@ right: 0; } -.capi-sources .capi-mini-btn { +.capi-net .capi-mini-btn { width: 100%; color: var(--color-text-subdue); } -.capi-sources .capi-mini-btn:hover { +.capi-net .capi-mini-btn:hover { color: var(--color-text-highlight); } diff --git a/internal/dynacat/static/js/customapi-editor.js b/internal/dynacat/static/js/customapi-editor.js index 20d97392..9869ba23 100644 --- a/internal/dynacat/static/js/customapi-editor.js +++ b/internal/dynacat/static/js/customapi-editor.js @@ -71,7 +71,7 @@ export async function openCustomAPIEditor(context) { ctx = context; state = await loadState(); buildUI(); - renderSubrequests(); + renderNetwork(); renderAll(); fetchData(); } @@ -165,9 +165,13 @@ async function loadState() { } } + const url = ctx.read("url") || ""; + return { - url: ctx.read("url") || "", + url, + headers: pairsFrom(await readConfig("headers")), subrequests: await readSubrequests(), + netOpen: url.trim() === "", rows, data: null, filter: "", @@ -181,22 +185,43 @@ async function loadState() { }; } -async function readSubrequests() { - const text = ctx.read("subrequests"); - if (!text) return []; +async function readConfig(name) { + const text = ctx.read(name); + if (!text) return {}; try { - const value = typeof text === "string" ? await ctx.toValue(text) : text; - return Object.entries(value || {}).map(([name, req]) => ({ name, url: (req && req.url) || "" })); + return (typeof text === "string" ? await ctx.toValue(text) : text) || {}; } catch { - return []; + return {}; + } +} + +function pairsFrom(map) { + return Object.entries(map || {}).map(([key, value]) => ({ key, value: String(value ?? "") })); +} + +function pairsObject(pairs) { + const out = {}; + for (const pair of pairs) { + if (pair.key.trim() !== "") out[pair.key.trim()] = pair.value; } + return out; +} + +async function readSubrequests() { + return Object.entries(await readConfig("subrequests")).map(([name, req]) => ({ + name, + url: (req && req.url) || "", + headers: pairsFrom(req && req.headers), + })); } function subrequestsObject() { const out = {}; for (const sub of state.subrequests) { - if (sub.name.trim() !== "") out[sub.name.trim()] = { url: sub.url }; + if (sub.name.trim() === "") continue; + const headers = pairsObject(sub.headers); + out[sub.name.trim()] = Object.keys(headers).length > 0 ? { url: sub.url, headers } : { url: sub.url }; } return out; } @@ -287,12 +312,6 @@ function buildUI() { const overlay = div("editor-ui capi-editor"); const topbar = div("capi-topbar"); - const url = input(state.url, "Request url, e.g. https://api.example.com/stats", (value) => { - state.url = value; - state.dirty = true; - }); - const urlWrapper = div("capi-url"); - urlWrapper.append(url); const previewToggle = button("Preview", "editor-btn capi-preview-toggle"); previewToggle.addEventListener("click", togglePreview); @@ -301,9 +320,8 @@ function buildUI() { refresh.addEventListener("click", fetchData); const tools = div("capi-topbar-tools"); tools.append(previewToggle, refresh); - topbar.append(urlWrapper, tools); - const subs = div("capi-sources"); + const net = div("capi-net"); const data = div("capi-pane capi-data"); const palette = div("capi-palette"); @@ -312,7 +330,7 @@ function buildUI() { renderFields(); }); const fields = div("capi-fields"); - data.append(subs, palette, labeled("Find a field", filter), fields); + data.append(net, palette, labeled("Find a field", filter), fields); const canvas = div("capi-canvas"); const inspector = div("capi-pane capi-inspector"); @@ -325,13 +343,13 @@ function buildUI() { const apply = button("Apply and save", "editor-btn editor-btn-primary"); apply.addEventListener("click", () => applyChanges(apply)); const actions = div("capi-topbar-actions"); - actions.append(status, cancel, apply); + actions.append(status, tools, cancel, apply); topbar.append(actions); overlay.append(topbar, body); document.body.append(overlay); - ui = { overlay, subs, previewToggle, palette, fields, canvas, inspector, status }; + ui = { overlay, net, previewToggle, palette, fields, canvas, inspector, status }; dropTarget(canvas, "capi-canvas-drop", (d) => d.type === "block", (d) => { state.rows.push({ blocks: [] }); @@ -413,7 +431,7 @@ function dropTarget(element, className, accepts, onDrop, onHover) { async function postPreview(extra) { const url = `${API}/custom-api/preview`; - const sent = { url: state.url, subrequests: subrequestsObject(), ...extra }; + const sent = { url: state.url, headers: pairsObject(state.headers), subrequests: subrequestsObject(), ...extra }; // Header values are the one part of a preview that tends to hold a token. const sentSummary = { ...sent, headers: sent.headers && Object.keys(sent.headers) }; @@ -1158,15 +1176,87 @@ function compare(number, rule) { return number === than; } -function renderSubrequests() { - ui.subs.replaceChildren(div("capi-pane-title", "Subrequests")); +function networkSummary() { + const parts = [state.url.trim() || "No request url"]; + if (state.headers.length > 0) parts.push(`${state.headers.length} headers`); + if (state.subrequests.length > 0) parts.push(`${state.subrequests.length} subrequests`); + return parts.join(" - "); +} + +function headersEditor(pairs) { + const wrapper = div("capi-headers"); + wrapper.append(div("capi-field-label", "Headers")); + + pairs.forEach((pair, index) => { + const row = div("capi-header-row"); + const remove = iconBtn("Remove header", iconTrash, () => { + pairs.splice(index, 1); + state.dirty = true; + renderNetwork(); + }); + + // The name and its remove button share a line, the longer value gets the next one. + row.append( + input(pair.key, "Authorization", (value) => { + pair.key = value; + state.dirty = true; + }), + remove, + input(pair.value, "Bearer ${API_KEY}", (value) => { + pair.value = value; + state.dirty = true; + }) + ); + wrapper.append(row); + }); + + const add = button("Add header", "editor-btn capi-mini-btn"); + add.addEventListener("click", () => { + pairs.push({ key: "", value: "" }); + state.dirty = true; + renderNetwork(); + }); + wrapper.append(add); + + return wrapper; +} + +function renderNetwork() { + ui.net.className = `capi-net${state.netOpen ? "" : " capi-net-collapsed"}`; + ui.net.replaceChildren(); + + const toggle = () => { + state.netOpen = !state.netOpen; + renderNetwork(); + }; + + const chevron = iconBtn(state.netOpen ? "Collapse network" : "Expand network", iconChevron, toggle); + chevron.classList.add("capi-net-toggle"); + chevron.setAttribute("aria-expanded", String(state.netOpen)); + + const head = div("capi-net-head"); + head.append(div("capi-pane-title", "Network"), chevron); + head.addEventListener("click", toggle); + ui.net.append(head); + + if (!state.netOpen) return ui.net.append(div("capi-net-summary", networkSummary())); + + const body = div("capi-net-body"); + body.append( + labeled("Request url", input(state.url, "https://api.example.com/stats", (value) => { + state.url = value; + state.dirty = true; + })), + headersEditor(state.headers), + div("capi-field-label", "Subrequests") + ); state.subrequests.forEach((sub, index) => { const card = div("capi-source"); const remove = iconBtn("Remove subrequest", iconTrash, () => { state.subrequests.splice(index, 1); state.dirty = true; - renderSubrequests(); + renderNetwork(); }); card.append(withRemove(labeled("Name", input(sub.name, "tags", (value) => { @@ -1178,18 +1268,21 @@ function renderSubrequests() { labeled("Url", input(sub.url, "https://api.example.com/other", (value) => { sub.url = value; state.dirty = true; - })) + })), + headersEditor(sub.headers) ); - ui.subs.append(card); + body.append(card); }); const add = button("Add subrequest", "editor-btn capi-mini-btn"); add.addEventListener("click", () => { - state.subrequests.push({ name: "", url: "" }); + state.subrequests.push({ name: "", url: "", headers: [] }); state.dirty = true; - renderSubrequests(); + renderNetwork(); }); - ui.subs.append(add); + body.append(add); + + ui.net.append(body); } function renderInspector() { @@ -1970,6 +2063,9 @@ function validate() { if (!sub.name.trim() || !sub.url.trim()) problems.push("Every subrequest needs a name and a url"); } + const headers = [state.headers, ...state.subrequests.map((sub) => sub.headers)].flat(); + if (headers.some((header) => !header.key.trim())) problems.push("Every header needs a name"); + return [...new Set(problems)]; } @@ -1988,6 +2084,10 @@ async function applyChanges(applyBtn) { ctx.write("url", state.url); ctx.write("template", template); + const headers = pairsObject(state.headers); + if (Object.keys(headers).length > 0) await ctx.write("headers", headers); + else ctx.clear("headers"); + if (state.subrequests.length > 0) await ctx.write("subrequests", subrequestsObject()); else ctx.clear("subrequests"); ctx.hiddenValues.builder = JSON.stringify({ v: 1, rows: compactRows(state.rows) }).replaceAll("$", "\\u0024"); From 94033e12ef8e1cba2fc1ac83bccad44bbe629519 Mon Sep 17 00:00:00 2001 From: Panonim Date: Sat, 12 Sep 2026 20:12:49 +0200 Subject: [PATCH 53/53] Bumped go packages --- Dockerfile | 2 +- go.mod | 38 ++++++++++---------- go.sum | 100 ++++++++++++++++++++++++++--------------------------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5e595e38..42547958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.5-alpine3.21 AS builder +FROM golang:1.26-alpine AS builder WORKDIR /app diff --git a/go.mod b/go.mod index 47226706..1935377a 100644 --- a/go.mod +++ b/go.mod @@ -1,43 +1,43 @@ module github.com/Panonim/dynacat -go 1.25.5 +go 1.26.0 require ( - github.com/coreos/go-oidc/v3 v3.20.0 + github.com/coreos/go-oidc/v3 v3.21.0 github.com/fsnotify/fsnotify v1.10.1 - github.com/mmcdole/gofeed v1.4.0 + github.com/mmcdole/gofeed v1.4.2 github.com/refraction-networking/utls v1.8.2 - github.com/shirou/gopsutil/v4 v4.26.6 + github.com/shirou/gopsutil/v4 v4.26.8 github.com/tidwall/gjson v1.19.0 - golang.org/x/crypto v0.54.0 - golang.org/x/net v0.57.0 - golang.org/x/oauth2 v0.36.0 - golang.org/x/text v0.40.0 + golang.org/x/crypto v0.57.0 + golang.org/x/net v0.59.0 + golang.org/x/oauth2 v0.37.0 + golang.org/x/text v0.42.0 gopkg.in/yaml.v3 v3.0.1 - modernc.org/sqlite v1.54.0 + modernc.org/sqlite v1.58.0 ) require ( - github.com/andybalholm/brotli v1.2.2 // indirect + github.com/andybalholm/brotli v1.2.4 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/ebitengine/purego v0.10.1 // indirect - github.com/go-jose/go-jose/v4 v4.1.4 // indirect + github.com/ebitengine/purego v0.11.0 // indirect + github.com/go-jose/go-jose/v4 v4.1.5 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/klauspost/compress v1.19.0 // indirect - github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15 // indirect - github.com/mattn/go-isatty v0.0.23 // indirect + github.com/klauspost/compress v1.20.0 // indirect + github.com/lufia/plan9stats v0.0.0-20260802145828-341c2f0c90b5 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/mmcdole/goxpp/v2 v2.0.0 // indirect github.com/ncruces/go-strftime v1.0.0 // indirect - github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect + github.com/power-devops/perfstat v0.0.0-20260805114148-88456608a4f6 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/tidwall/match v1.2.0 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tklauser/go-sysconf v0.4.0 // indirect github.com/tklauser/numcpus v0.12.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/sys v0.47.0 // indirect - modernc.org/libc v1.74.3 // indirect + golang.org/x/sys v0.48.0 // indirect + modernc.org/libc v1.75.7 // indirect modernc.org/mathutil v1.7.1 // indirect - modernc.org/memory v1.11.0 // indirect + modernc.org/memory v1.12.1 // indirect ) diff --git a/go.sum b/go.sum index 870fe831..75951cb7 100644 --- a/go.sum +++ b/go.sum @@ -1,50 +1,50 @@ -github.com/andybalholm/brotli v1.2.2 h1:HzTuoo2ErYQqf5qvcJInB8uvqSVxRttzkFexPWtnceM= -github.com/andybalholm/brotli v1.2.2/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= -github.com/coreos/go-oidc/v3 v3.20.0 h1:EtE0WIBHk03N+DqGkY4+UONzzZHk7amKt6IyNd7OsZE= -github.com/coreos/go-oidc/v3 v3.20.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= +github.com/andybalholm/brotli v1.2.4 h1:649LN6qF+/7JJYNN3Wdu4Dt5PS6eC/yP/Go3Bb0/AHI= +github.com/andybalholm/brotli v1.2.4/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY= +github.com/coreos/go-oidc/v3 v3.21.0 h1:wZo4Q9Pum8dYEj0eMUPrqR+kvuGkeUplbLpNCkBqoWM= +github.com/coreos/go-oidc/v3 v3.21.0/go.mod h1:DYCf24+ncYi+XkIH97GY1+dqoRlbaSI26KVTCI9SrY4= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/ebitengine/purego v0.10.1 h1:dewVBCBT2GaMu1SrNTYxQhgQBethzfhiwvZiLGP/qyY= -github.com/ebitengine/purego v0.10.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +github.com/ebitengine/purego v0.11.0 h1:jhp/D+Nyv7UUW8HAcmcjt2N2rYrYi9m3SL21k0Ua/NI= +github.com/ebitengine/purego v0.11.0/go.mod h1:DCHPP08djqhNSoTfImcnHYQRZmd0qhakvrozqaEYhGQ= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo= -github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA= -github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= +github.com/go-jose/go-jose/v4 v4.1.5 h1:RjgjO2LOtWOJKUC5wpwY9LR3B3vwVAz6JS2YHfYU6eA= +github.com/go-jose/go-jose/v4 v4.1.5/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= -github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3 h1:LMLX+LgTNWpfvCBdFebv6EsYotImrt/Ppc5cXIriCSo= +github.com/google/pprof v0.0.0-20260802141513-ef3492d7dac3/go.mod h1:jl5iWTm0/hd5PjEYEOuwAJ57L/CibdZfrqZ5XA5GrCk= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= -github.com/klauspost/compress v1.19.0 h1:sXLILfc9jV2QYWkzFOPWStmcUVH2RHEB1JCdY2oVvCQ= -github.com/klauspost/compress v1.19.0/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= -github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15 h1:YkjVPl/YH5XlJ+/NiwzJtPYXXKRcyjmEUhsDci6YK3c= -github.com/lufia/plan9stats v0.0.0-20260627054121-477a66015f15/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= -github.com/mattn/go-isatty v0.0.23 h1:cYwCQTQf3HB6xUC+BtyCLZNr7IzbOmoZbmssVNzSyiQ= -github.com/mattn/go-isatty v0.0.23/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= -github.com/mmcdole/gofeed v1.4.0 h1:+efDmI/yJXJgTfa8we5zg9GAKsU+2d7tnpt9QZwvjLQ= -github.com/mmcdole/gofeed v1.4.0/go.mod h1:ngV5MTB7UJko6fH3/fG5AkB/ABUGK1ZTePF9iRhzu/c= +github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA= +github.com/klauspost/compress v1.20.0/go.mod h1:LUdAzn7YLVvxLpc7y3V1m40wESHTgc1422pwwBSKYuI= +github.com/lufia/plan9stats v0.0.0-20260802145828-341c2f0c90b5 h1:eveIIGn4BGM3qknO74omf6HYr30/exH+eVUTuAgwjZ0= +github.com/lufia/plan9stats v0.0.0-20260802145828-341c2f0c90b5/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mmcdole/gofeed v1.4.2 h1:XFFOtsNNZg+zudjtMXb8BI0J/YdnSIGfjEpPgPnZib0= +github.com/mmcdole/gofeed v1.4.2/go.mod h1:X5x1PyeibJi152VEya0AsV+PW4daYmCD4LJaJbeFkcs= github.com/mmcdole/goxpp/v2 v2.0.0 h1:HrSCflxerUEqZQNq3u7ldtmE/XkwnTx4Zpq2DW4i5rQ= github.com/mmcdole/goxpp/v2 v2.0.0/go.mod h1:CUduYMnO9JB6Z/uqDn9Ormk/r8E9BsLQxHPWDZ961Os= github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= -github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20260805114148-88456608a4f6 h1:jL3a8soXdzuTCcRnKhOmtcsVOObdDTFf4O2B403HPRU= +github.com/power-devops/perfstat v0.0.0-20260805114148-88456608a4f6/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo= github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/shirou/gopsutil/v4 v4.26.6 h1:Mzr/npDtQC/xpeEuQKHZt8Zo9CmPvhTj8nkR8w5TLDs= -github.com/shirou/gopsutil/v4 v4.26.6/go.mod h1:LZ6ewCSkBqUpvSOf+LsTGnRinC6iaNUNMGBtDkJBaLQ= +github.com/shirou/gopsutil/v4 v4.26.8 h1:YQMTF/1J50B5+Y0vlo1eDRf5DoR7Gk69hY+8wjYkQeo= +github.com/shirou/gopsutil/v4 v4.26.8/go.mod h1:5O9FjBiXoTDFatIWjZZosqj4pV0DRtLx598xGbBehzM= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tidwall/gjson v1.19.0 h1:xwxm7n691Uf3u5OFjzngavjGTh55KX5q/9w9xHW88JU= @@ -61,53 +61,53 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= -golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= -golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= -golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= -golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= -golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= -golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= -golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= -golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= -golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/crypto v0.57.0 h1:3ZVCjf8Ggz7zneR/EHRVx68Ctf+2pmIMP2UFhh9cC6M= +golang.org/x/crypto v0.57.0/go.mod h1:Fdz0i5U6CoizGwLda9DttjSk6qlZo25zYNtR+ycvuZA= +golang.org/x/mod v0.41.0 h1:qJmnOUb4YB+FsEuM3HcWucdZASCPGhsX6uljO6pog0c= +golang.org/x/mod v0.41.0/go.mod h1:Ek9pY8RKWXwsWvd3rQiHYtMqkjSUV+s1Rj7j4H5Ur6o= +golang.org/x/net v0.59.0 h1:5zfYln+w5XCxwrnMMJPufRgNoXEaGxl0wo5GqPXyues= +golang.org/x/net v0.59.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= +golang.org/x/oauth2 v0.37.0 h1:JUlcxA8oAtauLfiH8FX2/FkAWHAdi0QtGCGc+hofE98= +golang.org/x/oauth2 v0.37.0/go.mod h1:IxwZNxUULJmpBFf9K/9NTMSIfZZuvuTy1gGxhigP/58= +golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= -golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= -golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= -golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= -golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= +golang.org/x/sys v0.48.0 h1:bbX/i/6MgT9BVLM9RT1thmxL04yeTAhbEz4SyadbXoo= +golang.org/x/sys v0.48.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= +golang.org/x/tools v0.49.0 h1:3NI7VXzL9+1WZD52Dx2ttoPwD5DWrFGpl9mFZDlmisI= +golang.org/x/tools v0.49.0/go.mod h1:SJNXV9DBKT0UbdttsQjbfJlAE/q+y36++zo3uL3N0Oo= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -modernc.org/cc/v4 v4.29.1 h1:MKgdCV3WykTSPqpVrnxdEDS0HEd2FHpKZDzxzU5LyeI= -modernc.org/cc/v4 v4.29.1/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= -modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU= -modernc.org/ccgo/v4 v4.34.6/go.mod h1:SZ8YcN9NG7XVsQYdm6jYBvi8PQP1qi+kqB6OhjqI3Fk= +modernc.org/cc/v4 v4.29.2 h1:h6+9ciCnPKutf4I03CvheAvDLX7+IHlqR6Iy6J+cgd8= +modernc.org/cc/v4 v4.29.2/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI= +modernc.org/ccgo/v4 v4.35.0 h1:F+TUsmw09QxLzmi3aeYYGxjAXarmZaKgj3mKQHNaA8w= +modernc.org/ccgo/v4 v4.35.0/go.mod h1:qrVGs9S3Sr2Ztcg9ve+kTAYMp5a3YvWjo+SoN06kJ5I= modernc.org/fileutil v1.4.0 h1:j6ZzNTftVS054gi281TyLjHPp6CPHr2KCxEXjEbD6SM= modernc.org/fileutil v1.4.0/go.mod h1:EqdKFDxiByqxLk8ozOxObDSfcVOv/54xDs/DUHdvCUU= modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI= modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito= -modernc.org/gc/v3 v3.1.4 h1:2g65LGVSmFQrXeITAw97x7hCRvZFcyE1uDP+7Vng7JI= -modernc.org/gc/v3 v3.1.4/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= +modernc.org/gc/v3 v3.1.5 h1:21ldfPfRYE31Tb7B3mwAK8gy1AxP4+dKjrOQPfqakoc= +modernc.org/gc/v3 v3.1.5/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY= modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks= modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI= -modernc.org/libc v1.74.3 h1:a4J+Z8aVaxPyjyxRAdJzw246PqpcFGvVPnfT/AuM5Ws= -modernc.org/libc v1.74.3/go.mod h1:4H7h/MJ8wnjL8RAbp9v3OXgnk22X7MouHIhDbvP3gj4= +modernc.org/libc v1.75.7 h1:o3DTP9/0p9pKmY2WCKQaySW6wIiZhNM7wc2lUoyhfew= +modernc.org/libc v1.75.7/go.mod h1:bO5o2ztHxBb2rjz0PgdHN0sSMw57CgxGFLZ3Qd/QpVQ= modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= -modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= -modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= +modernc.org/memory v1.12.1 h1:nFMiWrpStgZczNl6XI9GnIk/rWhYIyHGUaR04pGbp9g= +modernc.org/memory v1.12.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= modernc.org/opt v0.2.0 h1:tGyef5ApycA7FSEOMraay9SaTk5zmbx7Tu+cJs4QKZg= modernc.org/opt v0.2.0/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.54.0 h1:JCxR4qwkJvOaqAoYcgDoO25Nc+ROg6EJ2LfBVzdrgog= -modernc.org/sqlite v1.54.0/go.mod h1:4ntCLuNmnH8+GNqjka1wNg7KJd5/Hi5FYp8K+XQ7GZw= +modernc.org/sqlite v1.58.0 h1:38u40/bwkfM7f0Myhosl+SEMltSDxnGdQf8o6Kjmys0= +modernc.org/sqlite v1.58.0/go.mod h1:rsD2CckafgObKC4DhBlGBf+RiHxkc3hINGt1Xw32tVY= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=