Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
refactor: cleanup duplicate http client logic
Kyle Mendell8a74c1b729e6
diff --git a/backend/internal/bootstrap/bootstrap.go b/backend/internal/bootstrap/bootstrap.goindex 486cce51e..ab78cb08e 100644--- a/backend/internal/bootstrap/bootstrap.go+++ b/backend/internal/bootstrap/bootstrap.go@@ -35,6 +35,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/startup""github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+ httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx""github.com/labstack/echo/v5""go.getarcane.app/streams/logs"libcrypto "go.getarcane.app/sys/crypto"@@ -113,7 +114,7 @@ func applicationOptions(appCtx context.Context, cfg *config.Config, db *databasefx.Supply(cfg, db, cancelApp),fx.Provide(func() context.Context { return appCtx },- newConfiguredHTTPClient,+ newConfiguredHTTPClientInternal,),di.ActorOptions,di.ServiceOptions,@@ -156,11 +157,16 @@ func warnDeprecatedEnvVarsInternal(cfg *config.Config) {}}-func newConfiguredHTTPClient(cfg *config.Config) *http.Client {+func newConfiguredHTTPClientInternal(cfg *config.Config) *http.Client {+ options := httpxtypes.ClientOptions{+ Timeout: 10 * time.Second,+ TLSHandshakeTimeout: 5 * time.Second,+ }if cfg.HTTPClientTimeout > 0 {- return httpx.NewHTTPClientWithTimeout(time.Duration(cfg.HTTPClientTimeout) * time.Second)+ options.Timeout = time.Duration(cfg.HTTPClientTimeout) * time.Second+ options.TLSHandshakeTimeout = 10 * time.Second}- return httpx.NewHTTPClient()+ return httpx.NewHTTPClient(options)}type initializeStartupStateParams struct {@@ -432,7 +438,7 @@ func startEdgeTunnelClientIfConfigured(appCtx context.Context, actorRuntime *actfunc handleAgentBootstrapPairing(ctx context.Context, cfg *config.Config, httpClient *http.Client) error {slog.InfoContext(ctx, "Agent mode detected with token, attempting auto-pairing", "managerUrl", cfg.ManagerApiUrl)- pairURL := strings.TrimRight(cfg.GetManagerBaseURL(), "/") + "/api/environments/pair"+ pairURL := strings.TrimRight(httpx.ManagerBaseURL(cfg.ManagerApiUrl), "/") + "/api/environments/pair"reqCtx, cancel := context.WithTimeout(ctx, 30*time.Second)defer cancel()diff --git a/backend/internal/config/config.go b/backend/internal/config/config.goindex 8c73b7910..c5be49e0d 100644--- a/backend/internal/config/config.go+++ b/backend/internal/config/config.go@@ -4,7 +4,6 @@ import ("fmt""log/slog""net"- "net/url""os""reflect""slices"@@ -13,6 +12,7 @@ import ("time""github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx")type AppEnvironment string@@ -482,46 +482,6 @@ func (c *Config) GetLocation() *time.Location {return loc}-// GetManagerBaseURL returns the base URL of the manager application.-// It strips any trailing slashes or /api suffix from MANAGER_API_URL.-func (c *Config) GetManagerBaseURL() string {- if c.ManagerApiUrl == "" {- return ""- }- managerURL := strings.TrimRight(c.ManagerApiUrl, "/")- managerURL = strings.TrimSuffix(managerURL, "/api")- return managerURL-}--// GetManagerGRPCAddr returns the manager gRPC address in host:port form.-func (c *Config) GetManagerGRPCAddr() string {- baseURL := c.GetManagerBaseURL()- if baseURL == "" {- return ""- }-- parsed, err := url.Parse(baseURL)- if err != nil {- return ""- }-- host := parsed.Hostname()- if host == "" {- return ""- }-- port := parsed.Port()- if port == "" {- if strings.EqualFold(parsed.Scheme, "https") {- port = "443"- } else {- port = "80"- }- }-- return net.JoinHostPort(host, port)-}-// GetAppURL returns the effective application URL.// If in agent mode and APP_URL is not explicitly set, it returns the manager's URL.func (c *Config) GetAppURL() string {@@ -532,7 +492,7 @@ func (c *Config) GetAppURL() string {// If in agent mode and we have a manager URL, use the manager URLif c.AgentMode {- if managerBase := c.GetManagerBaseURL(); managerBase != "" {+ if managerBase := httpx.ManagerBaseURL(c.ManagerApiUrl); managerBase != "" {return managerBase}}diff --git a/backend/internal/config/config_test.go b/backend/internal/config/config_test.goindex 26305ff65..f874a8c09 100644--- a/backend/internal/config/config_test.go+++ b/backend/internal/config/config_test.go@@ -7,6 +7,8 @@ import ("testing""time"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/stretchr/testify/assert""github.com/stretchr/testify/require"@@ -453,42 +455,42 @@ func TestConfig_GetManagerGRPCAddr(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://manager.example.com:8443/api",}- assert.Equal(t, "manager.example.com:8443", cfg.GetManagerGRPCAddr())+ assert.Equal(t, "manager.example.com:8443", httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})t.Run("defaults to manager api https port when port is not set", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://manager.example.com/api",}- assert.Equal(t, "manager.example.com:443", cfg.GetManagerGRPCAddr())+ assert.Equal(t, "manager.example.com:443", httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})t.Run("defaults to manager api http port when port is not set", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "http://manager.example.com/api",}- assert.Equal(t, "manager.example.com:80", cfg.GetManagerGRPCAddr())+ assert.Equal(t, "manager.example.com:80", httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})t.Run("supports reverse-proxy path prefixes", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://manager.example.com/arcane/api/",}- assert.Equal(t, "manager.example.com:443", cfg.GetManagerGRPCAddr())+ assert.Equal(t, "manager.example.com:443", httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})t.Run("supports ipv6 hosts behind reverse proxies", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://[2001:db8::1]/arcane/api",}- assert.Equal(t, "[2001:db8::1]:443", cfg.GetManagerGRPCAddr())+ assert.Equal(t, "[2001:db8::1]:443", httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})t.Run("returns empty for invalid manager url", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "://bad-url",}- assert.Empty(t, cfg.GetManagerGRPCAddr())+ assert.Empty(t, httpx.ManagerGRPCAddr(cfg.ManagerApiUrl))})}@@ -497,14 +499,14 @@ func TestConfig_GetManagerBaseURL(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://manager.example.com/api/",}- assert.Equal(t, "https://manager.example.com", cfg.GetManagerBaseURL())+ assert.Equal(t, "https://manager.example.com", httpx.ManagerBaseURL(cfg.ManagerApiUrl))})t.Run("keeps reverse-proxy path prefix", func(t *testing.T) {cfg := &Config{ManagerApiUrl: "https://manager.example.com/arcane/api/",}- assert.Equal(t, "https://manager.example.com/arcane", cfg.GetManagerBaseURL())+ assert.Equal(t, "https://manager.example.com/arcane", httpx.ManagerBaseURL(cfg.ManagerApiUrl))})}diff --git a/backend/internal/docker/service.go b/backend/internal/docker/service.goindex d29b761ac..22f57042c 100644--- a/backend/internal/docker/service.go+++ b/backend/internal/docker/service.go@@ -552,19 +552,7 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) ([]network.Sumif err != nil {return nil, 0, 0, 0, err}- inUseByID := make(map[string]bool)- inUseByName := make(map[string]bool)- for _, c := range containers {- if c.NetworkSettings == nil || c.NetworkSettings.Networks == nil {- continue- }- for netName, es := range c.NetworkSettings.Networks {- if es.NetworkID != "" {- inUseByID[es.NetworkID] = true- }- inUseByName[netName] = true- }- }+ inUseByID, inUseByName := docker.BuildNetworkUsageMaps(containers)networks, err := s.listNetworksInternal(ctx)if err != nil {diff --git a/backend/internal/event/service.go b/backend/internal/event/service.goindex 439297b49..2a4a2de96 100644--- a/backend/internal/event/service.go+++ b/backend/internal/event/service.go@@ -12,6 +12,8 @@ import ("strings""time"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"emperror.dev/errors""github.com/getarcaneapp/arcane/backend/v2/internal/config"@@ -161,7 +163,7 @@ func (s *EventService) canForwardEventToManagerHTTP() bool {if strings.TrimSpace(s.cfg.AgentToken) == "" {return false}- return strings.TrimSpace(s.cfg.GetManagerBaseURL()) != ""+ return strings.TrimSpace(httpx.ManagerBaseURL(s.cfg.ManagerApiUrl)) != ""}func (s *EventService) forwardEventToManagerHTTP(ctx context.Context, eventModel *Event) error {@@ -172,7 +174,7 @@ func (s *EventService) forwardEventToManagerHTTP(ctx context.Context, eventModelreturn errors.New("agent token is required for manager event sync")}- managerEventsURL, err := managerEventEndpointURL(s.cfg.GetManagerBaseURL())+ managerEventsURL, err := managerEventEndpointURL(httpx.ManagerBaseURL(s.cfg.ManagerApiUrl))if err != nil {return errors.WrapIf(err, "manager API URL is invalid for manager event sync")}diff --git a/backend/internal/federated/service.go b/backend/internal/federated/service.goindex c37648f0d..de0f4da49 100644--- a/backend/internal/federated/service.go+++ b/backend/internal/federated/service.go@@ -27,6 +27,7 @@ import ("github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/oidcjwk"federatedtypes "github.com/getarcaneapp/arcane/types/v2/federated"+ httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx")const (@@ -58,7 +59,7 @@ func NewFederatedCredentialService(keySetManager *oidcjwk.KeySetManager,) *FederatedCredentialService {if httpClient == nil {- httpClient = httpx.NewHTTPClientWithTimeout(15 * time.Second)+ httpClient = httpx.NewHTTPClient(httpxtypes.ClientOptions{Timeout: 15 * time.Second, TLSHandshakeTimeout: 10 * time.Second})}return &FederatedCredentialService{diff --git a/backend/internal/image/image.go b/backend/internal/image/image.goindex ab32a11cd..4e367f526 100644--- a/backend/internal/image/image.go+++ b/backend/internal/image/image.go@@ -938,10 +938,7 @@ func BuildVolumeUsageMap(containers []container.Summary, projectIDByName map[strcontinue}- containerName := ""- if len(c.Names) > 0 {- containerName = strings.TrimPrefix(c.Names[0], "/")- }+ containerName := dockerutils.ContainerNameFromNames(c.Names)if containerName == "" {containerName = c.ID}diff --git a/backend/internal/network/service.go b/backend/internal/network/service.goindex 87e178cbd..16ded8789 100644--- a/backend/internal/network/service.go+++ b/backend/internal/network/service.go@@ -359,7 +359,7 @@ func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params paginreturn nil, pagination.Response{}, networktypes.UsageCounts{}, errors.WrapIf(err, "failed to list containers")}- inUseByID, inUseByName := s.buildNetworkUsageMaps(containers)+ inUseByID, inUseByName := dockerutil.BuildNetworkUsageMaps(containers)networkList, err := libarcane.NetworkListWithCompatibility(ctx, dockerClient, client.NetworkListOptions{})if err != nil {@@ -376,23 +376,6 @@ func (s *NetworkService) ListNetworksPaginated(ctx context.Context, params paginreturn result.Items, paginationResp, counts, nil}-func (s *NetworkService) buildNetworkUsageMaps(containers []container.Summary) (map[string]bool, map[string]bool) {- inUseByID := make(map[string]bool)- inUseByName := make(map[string]bool)- for _, c := range containers {- if c.NetworkSettings == nil || c.NetworkSettings.Networks == nil {- continue- }- for netName, es := range c.NetworkSettings.Networks {- if es.NetworkID != "" {- inUseByID[es.NetworkID] = true- }- inUseByName[netName] = true- }- }- return inUseByID, inUseByName-}-type topologyContainerInfo struct {Name stringImage string@@ -404,7 +387,7 @@ func buildTopologyContainerInfoInternal(containers []container.Summary) map[strifor _, rawContainer := range containers {name := rawContainer.IDif len(rawContainer.Names) > 0 {- name = strings.TrimPrefix(rawContainer.Names[0], "/")+ name = dockerutil.ContainerNameFromNames(rawContainer.Names)}infoByID[rawContainer.ID] = topologyContainerInfo{Name: name,diff --git a/backend/internal/notification/email_templates.go b/backend/internal/notification/email_templates.gonew file mode 100644index 000000000..21e48d6dc--- /dev/null+++ b/backend/internal/notification/email_templates.go@@ -0,0 +1,190 @@+package notification++import (+ "bytes"+ "fmt"+ "html/template"+ "sort"+ "time"++ "emperror.dev/errors"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications"+ "github.com/getarcaneapp/arcane/backend/v2/resources"+ "github.com/getarcaneapp/arcane/types/v2/imageupdate"+ "github.com/getarcaneapp/arcane/types/v2/system"+)++func (s *NotificationService) renderBatchContainerUpdateEmailTemplateInternal(environmentName string, entries []notifications.ContainerUpdateBatchEntry) (string, string, error) {+ type batchEntry struct {+ ContainerName string+ ImageRef string+ OldDigest string+ NewDigest string+ }++ sorted := make([]batchEntry, 0, len(entries))+ for _, entry := range entries {+ sorted = append(sorted, batchEntry{+ ContainerName: entry.ContainerName,+ ImageRef: entry.ImageRef,+ OldDigest: entry.OldDigest,+ NewDigest: entry.NewDigest,+ })+ }+ sort.Slice(sorted, func(i, j int) bool { return sorted[i].ContainerName < sorted[j].ContainerName })++ appURL := s.config.GetAppURL()+ data := map[string]any{+ "LogoURL": appURL + logoURLPath,+ "AppURL": appURL,+ "Environment": environmentName,+ "UpdateCount": len(sorted),+ "CompletedAt": time.Now().Format(time.RFC1123),+ "Entries": sorted,+ }++ return s.renderTemplatesInternal("batch-container-updates", data, true)+}++func (s *NotificationService) renderEmailTemplateInternal(environmentName, imageRef string, updateInfo *imageupdate.Response) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ "ImageRef": imageRef,+ "HasUpdate": updateInfo.HasUpdate,+ "UpdateType": updateInfo.UpdateType,+ "CurrentDigest": updateInfo.CurrentDigest,+ "LatestDigest": updateInfo.LatestDigest,+ "CheckTime": updateInfo.CheckTime.Format(time.RFC1123),+ }++ return s.renderTemplatesInternal("image-update", data, true)+}++func (s *NotificationService) renderContainerUpdateEmailTemplateInternal(environmentName, containerName, imageRef, oldDigest, newDigest string) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ "ContainerName": containerName,+ "ImageRef": imageRef,+ "OldDigest": oldDigest,+ "NewDigest": newDigest,+ "UpdateTime": time.Now().Format(time.RFC1123),+ }++ return s.renderTemplatesInternal("container-update", data, true)+}++func (s *NotificationService) renderTestEmailTemplateInternal(environmentName string) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ }++ return s.renderTemplatesInternal("test", data, true)+}++func (s *NotificationService) renderBatchEmailTemplateInternal(environmentName string, updates map[string]*imageupdate.Response) (string, string, error) {+ // Build list of image names+ imageList := make([]string, 0, len(updates))+ for imageRef := range updates {+ imageList = append(imageList, imageRef)+ }++ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ "UpdateCount": len(updates),+ "CheckTime": time.Now().Format(time.RFC1123),+ "ImageList": imageList,+ }++ return s.renderTemplatesInternal("batch-image-updates", data, true)+}++func (s *NotificationService) renderVulnerabilitySummaryEmailTemplateInternal(environmentName string, payload VulnerabilityNotificationPayload) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ "SummaryLabel": payload.CVEID,+ "Overview": payload.ImageName,+ "FixableCount": payload.FixedVersion,+ "SeverityBreakdown": payload.Severity,+ "SampleCVEs": payload.PkgName,+ }++ return s.renderTemplatesInternal("vulnerability-summary", data, true)+}++func (s *NotificationService) renderPruneReportEmailTemplateInternal(environmentName string, result *system.PruneAllResult) (string, string, error) {+ appURL := s.config.GetAppURL()+ logoURL := appURL + logoURLPath+ data := map[string]any{+ "LogoURL": logoURL,+ "AppURL": appURL,+ "Environment": environmentName,+ "TotalSpaceReclaimed": notifications.FormatBytes(result.SpaceReclaimed),+ "ContainerSpaceReclaimed": notifications.FormatBytes(result.ContainerSpaceReclaimed),+ "ImageSpaceReclaimed": notifications.FormatBytes(result.ImageSpaceReclaimed),+ "VolumeSpaceReclaimed": notifications.FormatBytes(result.VolumeSpaceReclaimed),+ "BuildCacheSpaceReclaimed": notifications.FormatBytes(result.BuildCacheSpaceReclaimed),+ "Time": time.Now().Format(time.RFC1123),+ }++ return s.renderTemplatesInternal("prune-report", data, false)+}++func (s *NotificationService) renderTemplatesInternal(name string, data any, textRequired bool) (string, string, error) {+ htmlContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_html.tmpl", name))+ if err != nil {+ return "", "", errors.WrapIf(err, "failed to read HTML template")+ }++ htmlTmpl, err := template.New("html").Parse(string(htmlContent))+ if err != nil {+ return "", "", errors.WrapIf(err, "failed to parse HTML template")+ }++ var htmlBuf bytes.Buffer+ if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {+ return "", "", errors.WrapIf(err, "failed to execute HTML template")+ }++ textContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_text.tmpl", name))+ if err != nil {+ if textRequired {+ return "", "", errors.WrapIf(err, "failed to read text template")+ }+ return htmlBuf.String(), "", nil+ }+ textTmpl, err := template.New("text").Parse(string(textContent))+ if err != nil {+ if textRequired {+ return "", "", errors.WrapIf(err, "failed to parse text template")+ }+ return htmlBuf.String(), "", nil+ }+ var textBuf bytes.Buffer+ if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {+ if textRequired {+ return "", "", errors.WrapIf(err, "failed to execute text template")+ }+ return htmlBuf.String(), "", nil+ }+ return htmlBuf.String(), textBuf.String(), nil+}diff --git a/backend/internal/notification/notification.go b/backend/internal/notification/notification.goindex 595e399c3..ff588a2c1 100644--- a/backend/internal/notification/notification.go+++ b/backend/internal/notification/notification.go@@ -6,13 +6,10 @@ import ("encoding/json/v2""fmt""html"- "html/template""io""log/slog""maps""net/http"- "net/mail"- "sort""strings""time"@@ -25,9 +22,9 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/environment""github.com/getarcaneapp/arcane/backend/v2/internal/event""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/notifications""github.com/getarcaneapp/arcane/backend/v2/pkg/utils/validation"- "github.com/getarcaneapp/arcane/backend/v2/resources""github.com/getarcaneapp/arcane/types/v2/imageupdate"notificationdto "github.com/getarcaneapp/arcane/types/v2/notification""github.com/getarcaneapp/arcane/types/v2/system"@@ -171,14 +168,14 @@ func (s *NotificationService) dispatchNotificationToManagerInternal(ctx context.// Tunnel-connected edge agents typically have neither MANAGER_API_URL nor// AGENT_TOKEN configured for HTTP; ride the agent-to-manager event channel// instead so their notifications are not silently lost (#3002).- if s.config == nil || strings.TrimSpace(s.config.GetManagerBaseURL()) == "" || strings.TrimSpace(s.config.AgentToken) == "" {+ if s.config == nil || strings.TrimSpace(httpx.ManagerBaseURL(s.config.ManagerApiUrl)) == "" || strings.TrimSpace(s.config.AgentToken) == "" {if err := publishViaTunnel(); err != nil {return notificationdto.DispatchResponse{}, errors.WrapIf(err, "notification dispatch needs either MANAGER_API_URL + AGENT_TOKEN or a connected edge tunnel")}return notificationdto.DispatchResponse{Message: "notification dispatched via edge tunnel"}, nil}- dispatchURL := strings.TrimRight(s.config.GetManagerBaseURL(), "/") + "/api/notifications/dispatch"+ dispatchURL := strings.TrimRight(httpx.ManagerBaseURL(s.config.ManagerApiUrl), "/") + "/api/notifications/dispatch"req, err := http.NewRequestWithContext(ctx, http.MethodPost, dispatchURL, bytes.NewReader(body))if err != nil {return notificationdto.DispatchResponse{}, errors.WrapIf(err, "failed to create notification dispatch request")@@ -663,7 +660,7 @@ func (s *NotificationService) imageUpdateNotificationContentInternal(environment}),Title: "Container Image Update",RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderEmailTemplate(environmentName, imageRef, updateInfo)+ htmlBody, _, err := s.renderEmailTemplateInternal(environmentName, imageRef, updateInfo)if err != nil {return "", "", errors.WrapIf(err, "failed to render email template")}@@ -682,7 +679,7 @@ func (s *NotificationService) containerUpdateNotificationContentInternal(environ}),Title: "Container Updated",RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderContainerUpdateEmailTemplate(environmentName, containerName, imageRef, oldDigest, newDigest)+ htmlBody, _, err := s.renderContainerUpdateEmailTemplateInternal(environmentName, containerName, imageRef, oldDigest, newDigest)if err != nil {return "", "", errors.WrapIf(err, "failed to render email template")}@@ -711,7 +708,7 @@ func (s *NotificationService) vulnerabilityNotificationContentInternal(environmeTitle: defaultTitle,DefaultTitle: defaultTitle,RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderVulnerabilitySummaryEmailTemplate(environmentName, payload)+ htmlBody, _, err := s.renderVulnerabilitySummaryEmailTemplateInternal(environmentName, payload)if err != nil {return "", "", errors.WrapIf(err, "failed to render summary email template")}@@ -730,7 +727,7 @@ func (s *NotificationService) batchImageUpdateNotificationContentInternal(enviro}),Title: "Container Image Updates Available",RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderBatchEmailTemplate(environmentName, updates)+ htmlBody, _, err := s.renderBatchEmailTemplateInternal(environmentName, updates)if err != nil {return "", "", errors.WrapIf(err, "failed to render email template")}@@ -804,7 +801,7 @@ func (s *NotificationService) batchContainerUpdateNotificationContentInternal(en}),Title: "Containers Updated",RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderBatchContainerUpdateEmailTemplate(environmentName, entries)+ htmlBody, _, err := s.renderBatchContainerUpdateEmailTemplateInternal(environmentName, entries)if err != nil {return "", "", errors.WrapIf(err, "failed to render email template")}@@ -821,68 +818,6 @@ func (s *NotificationService) batchContainerUpdateNotificationContentInternal(en}}-func (s *NotificationService) renderBatchContainerUpdateEmailTemplate(environmentName string, entries []notifications.ContainerUpdateBatchEntry) (string, string, error) {- type batchEntry struct {- ContainerName string- ImageRef string- OldDigest string- NewDigest string- }-- sorted := make([]batchEntry, 0, len(entries))- for _, entry := range entries {- sorted = append(sorted, batchEntry{- ContainerName: entry.ContainerName,- ImageRef: entry.ImageRef,- OldDigest: entry.OldDigest,- NewDigest: entry.NewDigest,- })- }- sort.Slice(sorted, func(i, j int) bool { return sorted[i].ContainerName < sorted[j].ContainerName })-- appURL := s.config.GetAppURL()- data := map[string]any{- "LogoURL": appURL + logoURLPath,- "AppURL": appURL,- "Environment": environmentName,- "UpdateCount": len(sorted),- "CompletedAt": time.Now().Format(time.RFC1123),- "Entries": sorted,- }-- htmlContent, err := resources.FS.ReadFile("email-templates/batch-container-updates_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/batch-container-updates_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }-- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }-- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }-- return htmlBuf.String(), textBuf.String(), nil-}-func (s *NotificationService) pruneReportNotificationContentInternal(environmentName string, result *system.PruneAllResult) notifications.Content {defaultTitle := notifications.BuildEmailSubject(environmentName, "System Prune Report")return notifications.Content{@@ -892,7 +827,7 @@ func (s *NotificationService) pruneReportNotificationContentInternal(environmentTitle: defaultTitle,DefaultTitle: defaultTitle,RenderEmail: func() (string, string, error) {- htmlBody, _, err := s.renderPruneReportEmailTemplate(environmentName, result)+ htmlBody, _, err := s.renderPruneReportEmailTemplateInternal(environmentName, result)if err != nil {return "", "", errors.WrapIf(err, "failed to render email template")}@@ -1348,7 +1283,7 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentI}if provider == notifications.NotificationProviderEmail && testType == notificationTestTypeSimple {- return warning, s.sendTestEmail(ctx, target.EnvironmentName, setting.Config)+ return warning, s.sendTestEmailInternal(ctx, target.EnvironmentName, setting.Config)}content := s.testNotificationContentInternal(target.EnvironmentName, testType)@@ -1369,323 +1304,15 @@ func (s *NotificationService) TestNotification(ctx context.Context, environmentIconst logoURLPath = "/api/app-images/logo-email"-func (s *NotificationService) renderEmailTemplate(environmentName, imageRef string, updateInfo *imageupdate.Response) (string, string, error) {- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- "ImageRef": imageRef,- "HasUpdate": updateInfo.HasUpdate,- "UpdateType": updateInfo.UpdateType,- "CurrentDigest": updateInfo.CurrentDigest,- "LatestDigest": updateInfo.LatestDigest,- "CheckTime": updateInfo.CheckTime.Format(time.RFC1123),- }-- htmlContent, err := resources.FS.ReadFile("email-templates/image-update_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/image-update_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }-- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }-- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }-- return htmlBuf.String(), textBuf.String(), nil-}--func (s *NotificationService) renderContainerUpdateEmailTemplate(environmentName, containerName, imageRef, oldDigest, newDigest string) (string, string, error) {- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- "ContainerName": containerName,- "ImageRef": imageRef,- "OldDigest": oldDigest,- "NewDigest": newDigest,- "UpdateTime": time.Now().Format(time.RFC1123),- }-- htmlContent, err := resources.FS.ReadFile("email-templates/container-update_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/container-update_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }-- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }-- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }-- return htmlBuf.String(), textBuf.String(), nil-}--func (s *NotificationService) sendTestEmail(ctx context.Context, environmentName string, config database.JSON) error {- var emailConfig notifications.EmailConfig- configBytes, err := json.Marshal(config)- if err != nil {- return errors.WrapIf(err, "failed to marshal email config")- }- if err := json.Unmarshal(configBytes, &emailConfig); err != nil {- return errors.WrapIf(err, "failed to unmarshal email config")- }-- if emailConfig.SMTPHost == "" || emailConfig.SMTPPort == 0 {- return errors.New("SMTP host or port not configured")- }- if len(emailConfig.ToAddresses) == 0 {- return errors.New("no recipient email addresses configured")- }-- if _, err := mail.ParseAddress(emailConfig.FromAddress); err != nil {- return errors.WrapIf(err, "invalid from address")- }- for _, addr := range emailConfig.ToAddresses {- if _, err := mail.ParseAddress(addr); err != nil {- return errors.WrapIff(err, "invalid to address %s", addr)- }- }-- if err := notifications.DecryptStringCredential(&emailConfig.SMTPPassword); err != nil {- return err- }-- htmlBody, _, err := s.renderTestEmailTemplate(environmentName)- if err != nil {- return errors.WrapIf(err, "failed to render test email template")- }-- subject := notifications.BuildEmailSubject(environmentName, "Test Email from Arcane")- if err := notifications.SendEmail(ctx, emailConfig, subject, htmlBody); err != nil {- return errors.WrapIf(err, "failed to send email")- }-- return nil-}--func (s *NotificationService) renderTestEmailTemplate(environmentName string) (string, string, error) {- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- }-- htmlContent, err := resources.FS.ReadFile("email-templates/test_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/test_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }-- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }-- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }-- return htmlBuf.String(), textBuf.String(), nil-}--func (s *NotificationService) renderBatchEmailTemplate(environmentName string, updates map[string]*imageupdate.Response) (string, string, error) {- // Build list of image names- imageList := make([]string, 0, len(updates))- for imageRef := range updates {- imageList = append(imageList, imageRef)- }-- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- "UpdateCount": len(updates),- "CheckTime": time.Now().Format(time.RFC1123),- "ImageList": imageList,- }-- htmlContent, err := resources.FS.ReadFile("email-templates/batch-image-updates_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/batch-image-updates_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }-- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }-- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }-- return htmlBuf.String(), textBuf.String(), nil-}--func (s *NotificationService) renderVulnerabilitySummaryEmailTemplate(environmentName string, payload VulnerabilityNotificationPayload) (string, string, error) {- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- "SummaryLabel": payload.CVEID,- "Overview": payload.ImageName,- "FixableCount": payload.FixedVersion,- "SeverityBreakdown": payload.Severity,- "SampleCVEs": payload.PkgName,- }-- htmlContent, err := resources.FS.ReadFile("email-templates/vulnerability-summary_html.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile("email-templates/vulnerability-summary_text.tmpl")- if err != nil {- return "", "", errors.WrapIf(err, "failed to read text template")- }- textTmpl, err := template.New("text").Parse(string(textContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse text template")- }- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute text template")- }- return htmlBuf.String(), textBuf.String(), nil-}--func (s *NotificationService) renderPruneReportEmailTemplate(environmentName string, result *system.PruneAllResult) (string, string, error) {- appURL := s.config.GetAppURL()- logoURL := appURL + logoURLPath- data := map[string]any{- "LogoURL": logoURL,- "AppURL": appURL,- "Environment": environmentName,- "TotalSpaceReclaimed": notifications.FormatBytes(result.SpaceReclaimed),- "ContainerSpaceReclaimed": notifications.FormatBytes(result.ContainerSpaceReclaimed),- "ImageSpaceReclaimed": notifications.FormatBytes(result.ImageSpaceReclaimed),- "VolumeSpaceReclaimed": notifications.FormatBytes(result.VolumeSpaceReclaimed),- "BuildCacheSpaceReclaimed": notifications.FormatBytes(result.BuildCacheSpaceReclaimed),- "Time": time.Now().Format(time.RFC1123),- }-- return s.renderTemplatesInternal("prune-report", data)-}--func (s *NotificationService) renderTemplatesInternal(name string, data any) (string, string, error) {- htmlContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_html.tmpl", name))- if err != nil {- return "", "", errors.WrapIf(err, "failed to read HTML template")- }-- htmlTmpl, err := template.New("html").Parse(string(htmlContent))- if err != nil {- return "", "", errors.WrapIf(err, "failed to parse HTML template")- }-- var htmlBuf bytes.Buffer- if err := htmlTmpl.ExecuteTemplate(&htmlBuf, "root", data); err != nil {- return "", "", errors.WrapIf(err, "failed to execute HTML template")- }-- textContent, err := resources.FS.ReadFile(fmt.Sprintf("email-templates/%s_text.tmpl", name))- if err == nil {- textTmpl, err := template.New("text").Parse(string(textContent))- if err == nil {- var textBuf bytes.Buffer- if err := textTmpl.ExecuteTemplate(&textBuf, "root", data); err == nil {- return htmlBuf.String(), textBuf.String(), nil+func (s *NotificationService) sendTestEmailInternal(ctx context.Context, environmentName string, config database.JSON) error {+ _, err := notifications.Deliver(ctx, notifications.NotificationProviderEmail, config, notifications.Content{+ RenderEmail: func() (string, string, error) {+ htmlBody, _, err := s.renderTestEmailTemplateInternal(environmentName)+ if err != nil {+ return "", "", errors.WrapIf(err, "failed to render test email template")}- }- }-- return htmlBuf.String(), "", nil+ return notifications.BuildEmailSubject(environmentName, "Test Email from Arcane"), htmlBody, nil+ },+ })+ return err}diff --git a/backend/internal/notification/service_test.go b/backend/internal/notification/service_test.goindex 5caa1572b..9f92dbd95 100644--- a/backend/internal/notification/service_test.go+++ b/backend/internal/notification/service_test.go@@ -367,7 +367,7 @@ func TestNotificationService_SendBatchImageUpdateNotification_AgentModeSkipsNoOpfunc TestNotificationService_RenderEmailTemplate_IncludesEnvironment(t *testing.T) {_, _, svc := setupNotificationTestServiceInternal(t)- htmlBody, textBody, err := svc.renderEmailTemplate("Homelab Prod", "nginx:latest", newNotificationTestUpdateInfoInternal())+ htmlBody, textBody, err := svc.renderEmailTemplateInternal("Homelab Prod", "nginx:latest", newNotificationTestUpdateInfoInternal())require.NoError(t, err)require.Contains(t, htmlBody, "Homelab Prod")require.Contains(t, textBody, "Homelab Prod")@@ -379,7 +379,7 @@ func TestNotificationService_RenderEmailTemplate_IncludesEnvironment(t *testing.func TestNotificationService_RenderContainerUpdateEmailTemplate_IncludesEnvironment(t *testing.T) {_, _, svc := setupNotificationTestServiceInternal(t)- htmlBody, textBody, err := svc.renderContainerUpdateEmailTemplate("Lab Remote", "nginx", "nginx:latest", "sha256:old", "sha256:new")+ htmlBody, textBody, err := svc.renderContainerUpdateEmailTemplateInternal("Lab Remote", "nginx", "nginx:latest", "sha256:old", "sha256:new")require.NoError(t, err)require.Contains(t, htmlBody, "Lab Remote")require.Contains(t, textBody, "Lab Remote")@@ -402,7 +402,7 @@ func TestNotificationService_RenderBatchEmailTemplate_IncludesEnvironment(t *tes},}- htmlBody, textBody, err := svc.renderBatchEmailTemplate("Edge Cluster A", updates)+ htmlBody, textBody, err := svc.renderBatchEmailTemplateInternal("Edge Cluster A", updates)require.NoError(t, err)require.Contains(t, htmlBody, "Edge Cluster A")require.Contains(t, textBody, "Edge Cluster A")@@ -414,7 +414,7 @@ func TestNotificationService_RenderBatchEmailTemplate_IncludesEnvironment(t *tesfunc TestNotificationService_RenderVulnerabilitySummaryEmailTemplate_IncludesEnvironment(t *testing.T) {_, _, svc := setupNotificationTestServiceInternal(t)- htmlBody, textBody, err := svc.renderVulnerabilitySummaryEmailTemplate("Remote Alpha", VulnerabilityNotificationPayload{+ htmlBody, textBody, err := svc.renderVulnerabilitySummaryEmailTemplateInternal("Remote Alpha", VulnerabilityNotificationPayload{CVEID: "Daily Summary - 2026-01-09",ImageName: "5 image(s) scanned, 2 with fixable vulnerabilities",FixedVersion: "7 fixable vulnerability record(s)",@@ -429,7 +429,7 @@ func TestNotificationService_RenderVulnerabilitySummaryEmailTemplate_IncludesEnvfunc TestNotificationService_RenderPruneReportEmailTemplate_IncludesEnvironment(t *testing.T) {_, _, svc := setupNotificationTestServiceInternal(t)- htmlBody, textBody, err := svc.renderPruneReportEmailTemplate("Cluster West", &system.PruneAllResult{+ htmlBody, textBody, err := svc.renderPruneReportEmailTemplateInternal("Cluster West", &system.PruneAllResult{SpaceReclaimed: 3825205248,ContainerSpaceReclaimed: 503316480,ImageSpaceReclaimed: 2449473536,diff --git a/backend/internal/port/service.go b/backend/internal/port/service.goindex a30bc1a5b..ee2c195d9 100644--- a/backend/internal/port/service.go+++ b/backend/internal/port/service.go@@ -8,6 +8,7 @@ import ("emperror.dev/errors""github.com/getarcaneapp/arcane/backend/v2/internal/docker"+ dockerutil "github.com/getarcaneapp/arcane/backend/v2/pkg/dockerutil""github.com/getarcaneapp/arcane/backend/v2/pkg/pagination"containertypes "github.com/getarcaneapp/arcane/types/v2/container"porttypes "github.com/getarcaneapp/arcane/types/v2/port"@@ -132,7 +133,7 @@ func (s *PortService) buildPortSortBindings() []pagination.SortBinding[porttypesfunc primaryContainerNameInternal(names []string, id string) string {if len(names) > 0 && names[0] != "" {- return strings.TrimPrefix(names[0], "/")+ return dockerutil.ContainerNameFromNames(names)}if len(id) >= 12 {return id[:12]diff --git a/backend/internal/project/workspace_handler.go b/backend/internal/project/workspace_handler.goindex 623f51978..dd003b50f 100644--- a/backend/internal/project/workspace_handler.go+++ b/backend/internal/project/workspace_handler.go@@ -4,10 +4,8 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""context"- "io""mime/multipart""net/http"- "strconv""strings"activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"@@ -92,13 +90,7 @@ func (h *ProjectHandler) DownloadProjectWorkspaceFile(ctx context.Context, inputif err != nil {return nil, projectWorkspaceHTTPErrorInternal(err)}- return &huma.StreamResponse{Body: func(humaCtx huma.Context) {- defer func() { _ = reader.Close() }()- humaCtx.SetHeader("Content-Type", "application/octet-stream")- humaCtx.SetHeader("Content-Disposition", "attachment; filename="+name)- humaCtx.SetHeader("Content-Length", strconv.FormatInt(size, 10))- _, _ = io.Copy(humaCtx.BodyWriter(), reader)- }}, nil+ return handlerutil.DownloadResponse(reader, size, name), nil}func (h *ProjectHandler) UpdateProjectWorkspace(ctx context.Context, input *UpdateProjectWorkspaceInput) (*handlerutil.Out[workspacetypes.Workspace], error) {diff --git a/backend/internal/search/customize_handler.go b/backend/internal/search/customize_handler.goindex 2851ddaa8..9b42f7d37 100644--- a/backend/internal/search/customize_handler.go+++ b/backend/internal/search/customize_handler.go@@ -81,7 +81,7 @@ func (h *CustomizeHandler) Search(ctx context.Context, input *SearchCustomizeInp}ps, _ := middleware.PermissionsFromContext(ctx)- results := h.customizeSearchService.Search(input.Body.Query)+ results := Search(h.customizeSearchService.GetCustomizeCategories(), input.Body.Query, searchtypes.CustomizeProfile)results.Results = filterCustomizeCategoriesInternal(ps, results.Results)results.Count = len(results.Results)diff --git a/backend/internal/search/customize_service.go b/backend/internal/search/customize_service.goindex b4e579580..56fa81cf2 100644--- a/backend/internal/search/customize_service.go+++ b/backend/internal/search/customize_service.go@@ -1,237 +1,19 @@package searchimport (- "reflect"- "slices"- "sort"- "strings"- "sync"-- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils""github.com/getarcaneapp/arcane/types/v2/category"- "github.com/getarcaneapp/arcane/types/v2/meta"searchtypes "github.com/getarcaneapp/arcane/types/v2/search")type CustomizeSearchService struct {categories []category.Category- once sync.Once}func NewCustomizeSearchService() *CustomizeSearchService {- s := &CustomizeSearchService{}- s.initCategories()- return s-}--func (s *CustomizeSearchService) initCategories() {- s.once.Do(func() {- s.categories = s.buildCategoriesFromModel()- })+ return &CustomizeSearchService{categories: BuildCategories[CustomizeItem](searchtypes.CustomizeProfile)}}-// GetCustomizeCategories returns all available customization categories with their metadata+// GetCustomizeCategories returns the category index initialized by the service.func (s *CustomizeSearchService) GetCustomizeCategories() []category.Category {return s.categories}--func (s *CustomizeSearchService) buildCategoriesFromModel() []category.Category {- // Extract category metadata from struct tags (catmeta)- catMetaMap := utils.ExtractCategoryMetadata[CustomizeItem]()-- // map category id -> list of customizations- categories := map[string][]meta.Metadata{}- var categoryOrder []string // Track order from first appearance in struct-- rt := reflect.TypeFor[CustomizeItem]()- for field := range rt.Fields() {- keyTag := field.Tag.Get("key")- key, _, _ := strings.Cut(keyTag, ",")- if key == "" {- continue- }-- metaTag := utils.ParseMetaTag(field.Tag.Get("meta"))- label := metaTag["label"]- if label == "" {- label = key- }- typ := metaTag["type"]- if typ == "" {- typ = "text"- }- desc := metaTag["description"]- keywords := utils.ParseKeywords(metaTag["keywords"])- categoryID := metaTag["category"]- if categoryID == "" {- categoryID = "defaults"- }-- // Track category order from first appearance- if len(categories[categoryID]) == 0 && !slices.Contains(categoryOrder, categoryID) {- categoryOrder = append(categoryOrder, categoryID)- }-- cm := meta.Metadata{- Key: key,- Label: label,- Type: typ,- Description: desc,- Keywords: keywords,- }-- categories[categoryID] = append(categories[categoryID], cm)- }-- // Build final category list in struct order- result := []category.Category{}- for _, catID := range categoryOrder {- catMeta := catMetaMap[catID]- if catMeta == nil {- continue- }-- // Parse keywords from catmeta- keywords := utils.ParseKeywords(catMeta["keywords"])- if keywords == nil {- keywords = []string{}- }-- result = append(result, category.Category{- ID: catMeta["id"],- Title: catMeta["title"],- Description: catMeta["description"],- Icon: catMeta["icon"],- URL: catMeta["url"],- Keywords: keywords,- Settings: categories[catID],- })- }-- return result-}--// Search performs a relevance-scored search across all customization categories and items-func (s *CustomizeSearchService) Search(query string) searchtypes.Response {- query = strings.ToLower(strings.TrimSpace(query))- if query == "" {- return searchtypes.Response{- Results: []category.Category{},- Query: query,- Count: 0,- }- }-- categories := s.GetCustomizeCategories()- results := []category.Category{}-- for _, cat := range categories {- // Check if category matches- categoryMatch := strings.Contains(strings.ToLower(cat.Title), query) ||- strings.Contains(strings.ToLower(cat.Description), query) ||- containsKeyword(cat.Keywords, query)-- // Check individual settings- matchingSettings := []meta.Metadata{}- for _, setting := range cat.Settings {- if matchesSetting(setting, query) {- matchingSettings = append(matchingSettings, setting)- }- }-- if categoryMatch || len(matchingSettings) > 0 {- relevanceScore := calculateCustomizeRelevance(cat, matchingSettings, query)-- resultCategory := cat- if len(matchingSettings) > 0 {- resultCategory.MatchingSettings = matchingSettings- }- resultCategory.RelevanceScore = relevanceScore-- results = append(results, resultCategory)- }- }-- // Sort by relevance (highest first)- sort.Slice(results, func(i, j int) bool {- return results[i].RelevanceScore > results[j].RelevanceScore- })-- return searchtypes.Response{- Results: results,- Query: query,- Count: len(results),- }-}--func matchesSetting(setting meta.Metadata, query string) bool {- return strings.Contains(strings.ToLower(setting.Key), query) ||- strings.Contains(strings.ToLower(setting.Label), query) ||- strings.Contains(strings.ToLower(setting.Description), query) ||- containsKeyword(setting.Keywords, query)-}--func calculateCustomizeRelevance(cat category.Category, matchingSettings []meta.Metadata, query string) int {- score := 0-- // Category-level scoring- if strings.ToLower(cat.Title) == query {- score += 30- } else if strings.Contains(strings.ToLower(cat.Title), query) {- score += 20- }-- if strings.Contains(strings.ToLower(cat.Description), query) {- score += 15- }-- // Exact keyword match- for _, keyword := range cat.Keywords {- if strings.ToLower(keyword) == query {- score += 25- break- } else if strings.Contains(strings.ToLower(keyword), query) {- score += 10- break- }- }-- // Setting-level scoring- for _, setting := range matchingSettings {- if strings.ToLower(setting.Key) == query {- score += 30- } else if strings.Contains(strings.ToLower(setting.Key), query) {- score += 15- }-- if strings.Contains(strings.ToLower(setting.Label), query) {- score += 12- }-- if strings.Contains(strings.ToLower(setting.Description), query) {- score += 8- }-- // Exact keyword match- for _, keyword := range setting.Keywords {- if strings.ToLower(keyword) == query {- score += 20- break- } else if strings.Contains(strings.ToLower(keyword), query) {- score += 5- break- }- }- }-- return score-}--func containsKeyword(keywords []string, query string) bool {- for _, keyword := range keywords {- if strings.Contains(strings.ToLower(keyword), query) {- return true- }- }- return false-}diff --git a/backend/internal/search/metadata.go b/backend/internal/search/metadata.gonew file mode 100644index 000000000..501e1f4a2--- /dev/null+++ b/backend/internal/search/metadata.go@@ -0,0 +1,262 @@+package search++import (+ "reflect"+ "slices"+ "sort"+ "strings"++ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/types/v2/category"+ "github.com/getarcaneapp/arcane/types/v2/meta"+ searchtypes "github.com/getarcaneapp/arcane/types/v2/search"+)++// BuildCategories extracts searchable metadata in model field order.+func BuildCategories[T any](profile searchtypes.Profile) []category.Category {+ catMetaMap := utils.ExtractCategoryMetadata[T]()++ categories := map[string][]meta.Metadata{}+ var categoryOrder []string++ rt := reflect.TypeFor[T]()+ for field := range rt.Fields() {+ keyTag := field.Tag.Get("key")+ key, _, _ := strings.Cut(keyTag, ",")+ if key == "" {+ continue+ }++ metaTag := utils.ParseMetaTag(field.Tag.Get("meta"))+ label := metaTag["label"]+ if label == "" {+ label = key+ }+ typ := metaTag["type"]+ if typ == "" {+ typ = "text"+ }+ desc := metaTag["description"]+ keywords := utils.ParseKeywords(metaTag["keywords"])+ categoryID := metaTag["category"]+ if categoryID == "" && profile == searchtypes.SettingsProfile {+ catMeta := utils.ParseMetaTag(field.Tag.Get("catmeta"))+ categoryID = catMeta["id"]+ }+ if categoryID == "" {+ categoryID = "defaults"+ if profile == searchtypes.SettingsProfile {+ categoryID = "jobs"+ }+ }++ if categoryID == "internal" && profile == searchtypes.SettingsProfile {+ continue+ }++ if len(categories[categoryID]) == 0 && !slices.Contains(categoryOrder, categoryID) {+ categoryOrder = append(categoryOrder, categoryID)+ }++ sm := meta.Metadata{+ Key: key,+ Label: label,+ Type: typ,+ Description: desc,+ Keywords: keywords,+ }++ categories[categoryID] = append(categories[categoryID], sm)+ }++ results := []category.Category{}+ for _, catID := range categoryOrder {+ catMeta := catMetaMap[catID]+ if catMeta == nil {+ continue+ }++ keywords := utils.ParseKeywords(catMeta["keywords"])+ if keywords == nil {+ keywords = []string{}+ }++ results = append(results, category.Category{+ ID: catMeta["id"],+ Title: catMeta["title"],+ Description: catMeta["description"],+ Icon: catMeta["icon"],+ URL: catMeta["url"],+ Keywords: keywords,+ Settings: categories[catID],+ })+ }++ return results+}++// Search matches category metadata using the selected ranking profile.+func Search(categories []category.Category, query string, profile searchtypes.Profile) searchtypes.Response {+ query = strings.ToLower(strings.TrimSpace(query))+ if query == "" {+ return searchtypes.Response{+ Results: []category.Category{},+ Query: query,+ Count: 0,+ }+ }++ var results []category.Category+ if profile == searchtypes.CustomizeProfile {+ results = []category.Category{}+ }++ for _, cat := range categories {+ categoryMatch := categoryMatchesInternal(cat, query)++ matchingSettings := findMatchingSettingsInternal(cat.Settings, query)++ if categoryMatch || len(matchingSettings) > 0 {+ relevanceScore := calculateRelevanceInternal(cat, matchingSettings, query, profile)++ categoryResult := category.Category{+ ID: cat.ID,+ Title: cat.Title,+ Description: cat.Description,+ Icon: cat.Icon,+ URL: cat.URL,+ Keywords: cat.Keywords,+ Settings: cat.Settings,+ RelevanceScore: relevanceScore,+ }++ if profile == searchtypes.CustomizeProfile {+ categoryResult.MatchingSettings = cat.MatchingSettings+ }++ if len(matchingSettings) > 0 {+ categoryResult.MatchingSettings = matchingSettings+ }++ results = append(results, categoryResult)+ }+ }++ sort.Slice(results, func(i, j int) bool {+ return results[i].RelevanceScore > results[j].RelevanceScore+ })++ return searchtypes.Response{+ Results: results,+ Query: query,+ Count: len(results),+ }+}++func categoryMatchesInternal(cat category.Category, query string) bool {+ if strings.Contains(strings.ToLower(cat.Title), query) {+ return true+ }+ if strings.Contains(strings.ToLower(cat.Description), query) {+ return true+ }+ for _, keyword := range cat.Keywords {+ if strings.Contains(strings.ToLower(keyword), query) {+ return true+ }+ }+ return false+}++func findMatchingSettingsInternal(settings []meta.Metadata, query string) []meta.Metadata {+ var matching []meta.Metadata+ for _, setting := range settings {+ if settingMatchesInternal(setting, query) {+ matching = append(matching, setting)+ }+ }+ return matching+}++func settingMatchesInternal(setting meta.Metadata, query string) bool {+ if strings.Contains(strings.ToLower(setting.Key), query) {+ return true+ }+ if strings.Contains(strings.ToLower(setting.Label), query) {+ return true+ }+ if strings.Contains(strings.ToLower(setting.Description), query) {+ return true+ }+ for _, keyword := range setting.Keywords {+ if strings.Contains(strings.ToLower(keyword), query) {+ return true+ }+ }+ return false+}++func calculateRelevanceInternal(cat category.Category, matchingSettings []meta.Metadata, query string, profile searchtypes.Profile) int {+ score := 0++ if profile == searchtypes.CustomizeProfile && strings.ToLower(cat.Title) == query {+ score += 30+ } else if strings.Contains(strings.ToLower(cat.Title), query) {+ score += 20+ }+ if strings.Contains(strings.ToLower(cat.Description), query) {+ score += 15+ }++ for _, keyword := range cat.Keywords {+ if strings.ToLower(keyword) == query {+ score += 25+ if profile == searchtypes.CustomizeProfile {+ break+ }+ } else if strings.Contains(strings.ToLower(keyword), query) {+ score += 10+ if profile == searchtypes.CustomizeProfile {+ break+ }+ }+ }++ for _, setting := range matchingSettings {+ score += calculateSettingRelevanceInternal(setting, query, profile)+ }++ return score+}++func calculateSettingRelevanceInternal(setting meta.Metadata, query string, profile searchtypes.Profile) int {+ score := 0+ if strings.ToLower(setting.Key) == query {+ score += 30+ } else if strings.Contains(strings.ToLower(setting.Key), query) {+ score += 15+ }++ if strings.Contains(strings.ToLower(setting.Label), query) {+ score += 12+ }+ if strings.Contains(strings.ToLower(setting.Description), query) {+ score += 8+ }++ for _, keyword := range setting.Keywords {+ if strings.ToLower(keyword) == query {+ score += 20+ if profile == searchtypes.CustomizeProfile {+ break+ }+ } else if strings.Contains(strings.ToLower(keyword), query) {+ score += 5+ if profile == searchtypes.CustomizeProfile {+ break+ }+ }+ }++ return score+}diff --git a/backend/internal/settings/handler.go b/backend/internal/settings/handler.goindex d73374969..37ceb53b2 100644--- a/backend/internal/settings/handler.go+++ b/backend/internal/settings/handler.go@@ -15,6 +15,7 @@ import ("github.com/danielgtaylor/huma/v2""github.com/getarcaneapp/arcane/backend/v2/internal/config""github.com/getarcaneapp/arcane/backend/v2/internal/middleware"+ "github.com/getarcaneapp/arcane/backend/v2/internal/search""github.com/getarcaneapp/arcane/backend/v2/pkg/authz""github.com/getarcaneapp/arcane/backend/v2/pkg/libarcane/edge""github.com/getarcaneapp/arcane/backend/v2/pkg/projects"@@ -455,7 +456,7 @@ func (h *SettingsHandler) Search(ctx context.Context, input *SearchSettingsInput}ps, _ := middleware.PermissionsFromContext(ctx)- results := h.settingsSearchService.Search(input.Body.Query)+ results := search.Search(h.settingsSearchService.GetSettingsCategories(), input.Body.Query, searchtypes.SettingsProfile)results.Results = filterSettingsCategoriesInternal(ps, results.Results)results.Count = len(results.Results)return &SearchSettingsOutput{Body: results}, nildiff --git a/backend/internal/settings/settings_search.go b/backend/internal/settings/settings_search.goindex 62685edd8..6ec2ce127 100644--- a/backend/internal/settings/settings_search.go+++ b/backend/internal/settings/settings_search.go@@ -1,271 +1,20 @@package settingsimport (- "reflect"- "slices"- "sort"- "strings"- "sync"-- "github.com/getarcaneapp/arcane/backend/v2/pkg/utils"+ "github.com/getarcaneapp/arcane/backend/v2/internal/search""github.com/getarcaneapp/arcane/types/v2/category"- "github.com/getarcaneapp/arcane/types/v2/meta"searchtypes "github.com/getarcaneapp/arcane/types/v2/search")type SettingsSearchService struct {categories []category.Category- once sync.Once}func NewSettingsSearchService() *SettingsSearchService {- s := &SettingsSearchService{}- s.initCategories()- return s-}--func (s *SettingsSearchService) initCategories() {- s.once.Do(func() {- s.categories = s.buildCategoriesFromModel()- })+ return &SettingsSearchService{categories: search.BuildCategories[Settings](searchtypes.SettingsProfile)}}-// GetSettingsCategories returns all available settings categories with their metadata+// GetSettingsCategories returns the category index initialized by the service.func (s *SettingsSearchService) GetSettingsCategories() []category.Category {return s.categories}--func (s *SettingsSearchService) buildCategoriesFromModel() []category.Category {- // Extract category metadata from struct tags (catmeta)- catMetaMap := utils.ExtractCategoryMetadata[Settings]()-- // map category id -> list of settings- categories := map[string][]meta.Metadata{}- var categoryOrder []string // Track order from first appearance in struct-- rt := reflect.TypeFor[Settings]()- for field := range rt.Fields() {- keyTag := field.Tag.Get("key")- key, _, _ := strings.Cut(keyTag, ",")- if key == "" {- continue- }-- metaTag := utils.ParseMetaTag(field.Tag.Get("meta"))- label := metaTag["label"]- if label == "" {- label = key- }- typ := metaTag["type"]- if typ == "" {- typ = "text"- }- desc := metaTag["description"]- keywords := utils.ParseKeywords(metaTag["keywords"])- categoryID := metaTag["category"]- if categoryID == "" {- catMeta := utils.ParseMetaTag(field.Tag.Get("catmeta"))- categoryID = catMeta["id"]- }- if categoryID == "" {- categoryID = "jobs"- }-- // Skip internal category- if categoryID == "internal" {- continue- }-- // Track category order from first appearance- if len(categories[categoryID]) == 0 && !slices.Contains(categoryOrder, categoryID) {- categoryOrder = append(categoryOrder, categoryID)- }-- sm := meta.Metadata{- Key: key,- Label: label,- Type: typ,- Description: desc,- Keywords: keywords,- }-- categories[categoryID] = append(categories[categoryID], sm)- }-- // Build final category list in struct order- results := []category.Category{}- for _, catID := range categoryOrder {- catMeta := catMetaMap[catID]- if catMeta == nil {- continue- }-- // Parse keywords from catmeta- keywords := utils.ParseKeywords(catMeta["keywords"])- if keywords == nil {- keywords = []string{}- }-- results = append(results, category.Category{- ID: catMeta["id"],- Title: catMeta["title"],- Description: catMeta["description"],- Icon: catMeta["icon"],- URL: catMeta["url"],- Keywords: keywords,- Settings: categories[catID],- })- }-- return results-}--// Search performs a relevance-scored search across settings categories and individual settings-func (s *SettingsSearchService) Search(query string) searchtypes.Response {- query = strings.ToLower(strings.TrimSpace(query))- if query == "" {- return searchtypes.Response{- Results: []category.Category{},- Query: query,- Count: 0,- }- }-- categories := s.GetSettingsCategories()- var results []category.Category-- for _, cat := range categories {- // Check if category matches- categoryMatch := s.categoryMatches(cat, query)-- // Check individual settings with enhanced matching- matchingSettings := s.findMatchingSettings(cat.Settings, query)-- if categoryMatch || len(matchingSettings) > 0 {- // Calculate relevance score based on match quality- relevanceScore := s.calculateRelevance(cat, matchingSettings, query)-- categoryResult := category.Category{- ID: cat.ID,- Title: cat.Title,- Description: cat.Description,- Icon: cat.Icon,- URL: cat.URL,- Keywords: cat.Keywords,- Settings: cat.Settings,- RelevanceScore: relevanceScore,- }-- if len(matchingSettings) > 0 {- categoryResult.MatchingSettings = matchingSettings- }-- results = append(results, categoryResult)- }- }-- // Sort by relevance (highest first)- s.sortByRelevance(results)-- return searchtypes.Response{- Results: results,- Query: query,- Count: len(results),- }-}--func (s *SettingsSearchService) categoryMatches(cat category.Category, query string) bool {- if strings.Contains(strings.ToLower(cat.Title), query) {- return true- }- if strings.Contains(strings.ToLower(cat.Description), query) {- return true- }- for _, keyword := range cat.Keywords {- if strings.Contains(strings.ToLower(keyword), query) {- return true- }- }- return false-}--func (s *SettingsSearchService) findMatchingSettings(settings []meta.Metadata, query string) []meta.Metadata {- var matching []meta.Metadata- for _, setting := range settings {- if s.settingMatches(setting, query) {- matching = append(matching, setting)- }- }- return matching-}--func (s *SettingsSearchService) settingMatches(setting meta.Metadata, query string) bool {- if strings.Contains(strings.ToLower(setting.Key), query) {- return true- }- if strings.Contains(strings.ToLower(setting.Label), query) {- return true- }- if strings.Contains(strings.ToLower(setting.Description), query) {- return true- }- for _, keyword := range setting.Keywords {- if strings.Contains(strings.ToLower(keyword), query) {- return true- }- }- return false-}--func (s *SettingsSearchService) calculateRelevance(cat category.Category, matchingSettings []meta.Metadata, query string) int {- score := 0-- // Category title/description match gets high score- if strings.Contains(strings.ToLower(cat.Title), query) {- score += 20- }- if strings.Contains(strings.ToLower(cat.Description), query) {- score += 15- }-- // Exact keyword match- for _, keyword := range cat.Keywords {- if strings.ToLower(keyword) == query {- score += 25- } else if strings.Contains(strings.ToLower(keyword), query) {- score += 10- }- }-- // Add score for individual setting matches- for _, setting := range matchingSettings {- if strings.ToLower(setting.Key) == query {- score += 30- } else if strings.Contains(strings.ToLower(setting.Key), query) {- score += 15- }-- if strings.Contains(strings.ToLower(setting.Label), query) {- score += 12- }- if strings.Contains(strings.ToLower(setting.Description), query) {- score += 8- }-- for _, keyword := range setting.Keywords {- if strings.ToLower(keyword) == query {- score += 20- } else if strings.Contains(strings.ToLower(keyword), query) {- score += 5- }- }- }-- return score-}--func (s *SettingsSearchService) sortByRelevance(results []category.Category) {- sort.Slice(results, func(i, j int) bool {- return results[i].RelevanceScore > results[j].RelevanceScore- })-}diff --git a/backend/internal/volume/workspace_handler.go b/backend/internal/volume/workspace_handler.goindex 89fb9c511..7d9699a3e 100644--- a/backend/internal/volume/workspace_handler.go+++ b/backend/internal/volume/workspace_handler.go@@ -4,11 +4,9 @@ import ("github.com/getarcaneapp/arcane/backend/v2/internal/database""context"- "io""mime/multipart""net/http""path"- "strconv""strings"activitytypes "github.com/getarcaneapp/arcane/types/v2/activity"@@ -92,13 +90,7 @@ func (h *VolumeHandler) DownloadVolumeWorkspaceFile(ctx context.Context, input *if err != nil {return nil, volumeWorkspaceHTTPErrorInternal(err)}- return &huma.StreamResponse{Body: func(humaCtx huma.Context) {- defer func() { _ = reader.Close() }()- humaCtx.SetHeader("Content-Type", "application/octet-stream")- humaCtx.SetHeader("Content-Disposition", "attachment; filename="+path.Base(input.RelativePath))- humaCtx.SetHeader("Content-Length", strconv.FormatInt(size, 10))- _, _ = io.Copy(humaCtx.BodyWriter(), reader)- }}, nil+ return handlerutil.DownloadResponse(reader, size, path.Base(input.RelativePath)), nil}func requireVolumeWorkspacePermissionsInternal(ctx context.Context, environmentID string, changes []volumetypes.WorkspaceFileChange) error {diff --git a/backend/pkg/dockerutil/network_utils.go b/backend/pkg/dockerutil/network_utils.goindex df3c82ada..94464ee64 100644--- a/backend/pkg/dockerutil/network_utils.go+++ b/backend/pkg/dockerutil/network_utils.go@@ -136,3 +136,21 @@ func containerAnswersToHostnameInternal(c *container.Summary, host string) bool}return false}++// BuildNetworkUsageMaps indexes container network attachments by ID and name.+func BuildNetworkUsageMaps(containers []container.Summary) (map[string]bool, map[string]bool) {+ inUseByID := make(map[string]bool)+ inUseByName := make(map[string]bool)+ for _, c := range containers {+ if c.NetworkSettings == nil || c.NetworkSettings.Networks == nil {+ continue+ }+ for netName, es := range c.NetworkSettings.Networks {+ if es.NetworkID != "" {+ inUseByID[es.NetworkID] = true+ }+ inUseByName[netName] = true+ }+ }+ return inUseByID, inUseByName+}diff --git a/backend/pkg/libarcane/edge/client.go b/backend/pkg/libarcane/edge/client.goindex 0b86d134b..948d7518b 100644--- a/backend/pkg/libarcane/edge/client.go+++ b/backend/pkg/libarcane/edge/client.go@@ -13,6 +13,8 @@ import ("time""uuid"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"emperror.dev/errors""github.com/cenkalti/backoff/v5"@@ -81,11 +83,11 @@ func NewTunnelClient(cfg *Config, handler http.Handler) *TunnelClient {}managerURL := ""- if managerBaseURL := strings.TrimRight(cfg.GetManagerBaseURL(), "/"); managerBaseURL != "" {+ if managerBaseURL := strings.TrimRight(httpx.ManagerBaseURL(cfg.ManagerApiUrl), "/"); managerBaseURL != "" {// Convert HTTP to WebSocket URLmanagerURL = HTTPToWebSocketURL(managerBaseURL) + "/api/tunnel/connect"}- managerGRPCAddr := cfg.GetManagerGRPCAddr()+ managerGRPCAddr := httpx.ManagerGRPCAddr(cfg.ManagerApiUrl)// Get local port for WebSocket dialinglocalPort := cfg.Port@@ -174,10 +176,10 @@ func StartupLogAttrs(cfg *Config) []any {}managedSessionTransports := make([]string, 0, 2)- if UseGRPCEdgeTransport(cfg) || (UsePollEdgeTransport(cfg) && strings.TrimSpace(cfg.GetManagerGRPCAddr()) != "") {+ if UseGRPCEdgeTransport(cfg) || (UsePollEdgeTransport(cfg) && strings.TrimSpace(httpx.ManagerGRPCAddr(cfg.ManagerApiUrl)) != "") {managedSessionTransports = append(managedSessionTransports, EdgeTransportGRPC)}- if UseWebSocketEdgeTransport(cfg) || (UsePollEdgeTransport(cfg) && strings.TrimSpace(cfg.GetManagerBaseURL()) != "") {+ if UseWebSocketEdgeTransport(cfg) || (UsePollEdgeTransport(cfg) && strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl)) != "") {managedSessionTransports = append(managedSessionTransports, EdgeTransportWebSocket)}@@ -190,10 +192,10 @@ func StartupLogAttrs(cfg *Config) []any {if managerAPIURL := strings.TrimSpace(cfg.ManagerApiUrl); managerAPIURL != "" {attrs = append(attrs, "manager_api_url", managerAPIURL)}- if managerGRPCAddr := strings.TrimSpace(cfg.GetManagerGRPCAddr()); managerGRPCAddr != "" {+ if managerGRPCAddr := strings.TrimSpace(httpx.ManagerGRPCAddr(cfg.ManagerApiUrl)); managerGRPCAddr != "" {attrs = append(attrs, "manager_grpc_addr", managerGRPCAddr)}- if managerBaseURL := strings.TrimSpace(cfg.GetManagerBaseURL()); managerBaseURL != "" {+ if managerBaseURL := strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl)); managerBaseURL != "" {attrs = append(attrs, "manager_base_url", managerBaseURL)}@@ -298,7 +300,7 @@ func (c *TunnelClient) managerWebSocketURLInternal() string {if c.cfg == nil {return ""}- managerBaseURL := strings.TrimRight(strings.TrimSpace(c.cfg.GetManagerBaseURL()), "/")+ managerBaseURL := strings.TrimRight(strings.TrimSpace(httpx.ManagerBaseURL(c.cfg.ManagerApiUrl)), "/")if managerBaseURL == "" {return ""}@@ -1453,16 +1455,16 @@ func StartTunnelClient(ctx context.Context, runtime *actors.Runtime, cfg *Config}if UseGRPCEdgeTransport(cfg) {- if cfg.GetManagerGRPCAddr() == "" {+ if httpx.ManagerGRPCAddr(cfg.ManagerApiUrl) == "" {return nil, errors.New("MANAGER_API_URL with a valid host is required for gRPC transport")}}- if UseWebSocketEdgeTransport(cfg) && strings.TrimSpace(cfg.GetManagerBaseURL()) == "" {+ if UseWebSocketEdgeTransport(cfg) && strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl)) == "" {return nil, errors.New("MANAGER_API_URL is required for websocket transport")}- if UsePollEdgeTransport(cfg) && strings.TrimSpace(cfg.GetManagerBaseURL()) == "" {+ if UsePollEdgeTransport(cfg) && strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl)) == "" {return nil, errors.New("MANAGER_API_URL is required for poll transport")}diff --git a/backend/pkg/libarcane/edge/client_transport_grpc.go b/backend/pkg/libarcane/edge/client_transport_grpc.goindex 32b1b0713..cddebde14 100644--- a/backend/pkg/libarcane/edge/client_transport_grpc.go+++ b/backend/pkg/libarcane/edge/client_transport_grpc.go@@ -8,6 +8,8 @@ import ("strings""time"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"emperror.dev/errors"tunnelpb "github.com/getarcaneapp/arcane/backend/v2/proto/tunnel/v1"@@ -141,7 +143,10 @@ func (c *TunnelClient) grpcConnectMethodInternal() string {}func (c *TunnelClient) useTLSForManagerGRPC() bool {- baseURL := strings.TrimSpace(c.cfg.GetManagerBaseURL())+ if c.cfg == nil {+ return false+ }+ baseURL := strings.TrimSpace(httpx.ManagerBaseURL(c.cfg.ManagerApiUrl))if baseURL == "" {return false}diff --git a/backend/pkg/libarcane/edge/client_transport_poll.go b/backend/pkg/libarcane/edge/client_transport_poll.goindex e79ebcb20..da532f9e3 100644--- a/backend/pkg/libarcane/edge/client_transport_poll.go+++ b/backend/pkg/libarcane/edge/client_transport_poll.go@@ -10,6 +10,8 @@ import ("strings""time"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"emperror.dev/errors""github.com/cenkalti/backoff/v5"@@ -22,7 +24,10 @@ var defaultPollManagedSessionStopTimeout = 5 * time.Secondvar errPollManagedSessionStopTimeout = errors.Sentinel("timed out waiting for poll-managed websocket session to stop")func (c *TunnelClient) connectAndServePoll(ctx context.Context) error {- managerBaseURL := strings.TrimRight(strings.TrimSpace(c.cfg.GetManagerBaseURL()), "/")+ if c.cfg == nil {+ return errors.New("manager base URL is empty")+ }+ managerBaseURL := strings.TrimRight(strings.TrimSpace(httpx.ManagerBaseURL(c.cfg.ManagerApiUrl)), "/")if managerBaseURL == "" {return errors.New("manager base URL is empty")}diff --git a/backend/pkg/libarcane/edge/tls.go b/backend/pkg/libarcane/edge/tls.goindex 81a617c90..61f9025dc 100644--- a/backend/pkg/libarcane/edge/tls.go+++ b/backend/pkg/libarcane/edge/tls.go@@ -27,6 +27,8 @@ import ("syscall""time"+ "github.com/getarcaneapp/arcane/backend/v2/pkg/utils/httpx"+"emperror.dev/errors""github.com/getarcaneapp/arcane/backend/v2/pkg/utils"@@ -341,7 +343,10 @@ func EnsureAgentMTLSAssets(ctx context.Context, cfg *Config) error {}func enrollAgentMTLSAssetsInternal(ctx context.Context, cfg *Config, assetsDir, certPath, keyPath string) error {- managerBaseURL := strings.TrimRight(strings.TrimSpace(cfg.GetManagerBaseURL()), "/")+ if cfg == nil {+ return errors.New("MANAGER_API_URL is required to enroll edge mTLS assets")+ }+ managerBaseURL := strings.TrimRight(strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl)), "/")if managerBaseURL == "" {return errors.New("MANAGER_API_URL is required to enroll edge mTLS assets")}@@ -561,7 +566,7 @@ func managerUsesTLSInternal(cfg *Config) bool {return false}- baseURL := strings.TrimSpace(cfg.GetManagerBaseURL())+ baseURL := strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl))return strings.HasPrefix(strings.ToLower(baseURL), "https://")}@@ -675,7 +680,7 @@ func edgeMTLSAppURLInternal(cfg *Config) string {if appURL := strings.TrimSpace(cfg.AppURL); appURL != "" {return appURL}- return strings.TrimSpace(cfg.GetManagerBaseURL())+ return strings.TrimSpace(httpx.ManagerBaseURL(cfg.ManagerApiUrl))}func expectedEdgeMTLSURIPathInternal(envID string) string {diff --git a/backend/pkg/libarcane/edge/transport.go b/backend/pkg/libarcane/edge/transport.goindex ce1e76c71..268f206f8 100644--- a/backend/pkg/libarcane/edge/transport.go+++ b/backend/pkg/libarcane/edge/transport.go@@ -3,50 +3,9 @@ package edgeimport ("github.com/samber/mo"- "net/url""strings")-// GetManagerBaseURL returns the base URL of the manager application.-// It strips any trailing slashes or /api suffix from MANAGER_API_URL.-func (c *Config) GetManagerBaseURL() string {- if c == nil || c.ManagerApiUrl == "" {- return ""- }- managerURL := strings.TrimRight(c.ManagerApiUrl, "/")- managerURL = strings.TrimSuffix(managerURL, "/api")- return managerURL-}--// GetManagerGRPCAddr returns the manager gRPC address in host:port form.-func (c *Config) GetManagerGRPCAddr() string {- baseURL := c.GetManagerBaseURL()- if baseURL == "" {- return ""- }-- parsed, err := url.Parse(baseURL)- if err != nil {- return ""- }-- host := parsed.Hostname()- if host == "" {- return ""- }-- port := parsed.Port()- if port == "" {- if strings.EqualFold(parsed.Scheme, "https") {- port = "443"- } else {- port = "80"- }- }-- return host + ":" + port-}-const (// EdgeTransportAuto prefers gRPC and falls back to WebSocket automatically.EdgeTransportAuto = "auto"diff --git a/backend/pkg/utils/handlerutil/download.go b/backend/pkg/utils/handlerutil/download.gonew file mode 100644index 000000000..625aad2ab--- /dev/null+++ b/backend/pkg/utils/handlerutil/download.go@@ -0,0 +1,19 @@+package handlerutil++import (+ "io"+ "strconv"++ "github.com/danielgtaylor/huma/v2"+)++// DownloadResponse streams an attachment and closes its reader when streaming ends.+func DownloadResponse(reader io.ReadCloser, size int64, filename string) *huma.StreamResponse {+ return &huma.StreamResponse{Body: func(ctx huma.Context) {+ defer func() { _ = reader.Close() }()+ ctx.SetHeader("Content-Type", "application/octet-stream")+ ctx.SetHeader("Content-Disposition", "attachment; filename="+filename)+ ctx.SetHeader("Content-Length", strconv.FormatInt(size, 10))+ _, _ = io.Copy(ctx.BodyWriter(), reader)+ }}+}diff --git a/backend/pkg/utils/httpx/base_url.go b/backend/pkg/utils/httpx/base_url.goindex 3aa967d15..5353090ca 100644--- a/backend/pkg/utils/httpx/base_url.go+++ b/backend/pkg/utils/httpx/base_url.go@@ -1,6 +1,10 @@package httpx-import "strings"+import (+ "net"+ "net/url"+ "strings"+)// NormalizeBaseURL validates an outbound HTTP URL and strips endpoint-specific components.func NormalizeBaseURL(rawURL string) (string, error) {@@ -14,3 +18,43 @@ func NormalizeBaseURL(rawURL string) (string, error) {parsed.Path = strings.TrimRight(parsed.Path, "/")return parsed.String(), nil}++// ManagerBaseURL returns the base URL of the manager application.+// It strips any trailing slashes or /api suffix from MANAGER_API_URL.+func ManagerBaseURL(rawURL string) string {+ if rawURL == "" {+ return ""+ }+ managerURL := strings.TrimRight(rawURL, "/")+ managerURL = strings.TrimSuffix(managerURL, "/api")+ return managerURL+}++// ManagerGRPCAddr returns the manager gRPC address in host:port form.+func ManagerGRPCAddr(rawURL string) string {+ baseURL := ManagerBaseURL(rawURL)+ if baseURL == "" {+ return ""+ }++ parsed, err := url.Parse(baseURL)+ if err != nil {+ return ""+ }++ host := parsed.Hostname()+ if host == "" {+ return ""+ }++ port := parsed.Port()+ if port == "" {+ if strings.EqualFold(parsed.Scheme, "https") {+ port = "443"+ } else {+ port = "80"+ }+ }++ return net.JoinHostPort(host, port)+}diff --git a/backend/pkg/utils/httpx/client.go b/backend/pkg/utils/httpx/client.goindex d290b9501..e531a3caf 100644--- a/backend/pkg/utils/httpx/client.go+++ b/backend/pkg/utils/httpx/client.go@@ -3,34 +3,22 @@ package httpximport ("net/http""time"-)-func NewHTTPClient() *http.Client {- transport := &http.Transport{- Proxy: http.ProxyFromEnvironment,- MaxIdleConns: 100,- IdleConnTimeout: 90 * time.Second,- TLSHandshakeTimeout: 5 * time.Second,- ExpectContinueTimeout: 1 * time.Second,- ForceAttemptHTTP2: true,- }- return &http.Client{- Transport: transport,- Timeout: 10 * time.Second,- }-}+ httpxtypes "github.com/getarcaneapp/arcane/types/v2/httpx"+)-func NewHTTPClientWithTimeout(timeout time.Duration) *http.Client {+// NewHTTPClient builds a client with its own transport and the supplied timeouts.+func NewHTTPClient(options httpxtypes.ClientOptions) *http.Client {transport := &http.Transport{Proxy: http.ProxyFromEnvironment,MaxIdleConns: 100,IdleConnTimeout: 90 * time.Second,- TLSHandshakeTimeout: 10 * time.Second,+ TLSHandshakeTimeout: options.TLSHandshakeTimeout,ExpectContinueTimeout: 1 * time.Second,ForceAttemptHTTP2: true,}return &http.Client{Transport: transport,- Timeout: timeout,+ Timeout: options.Timeout,}}diff --git a/cli/go.sum b/cli/go.sumindex 183fd52b7..b7419f90e 100644--- a/cli/go.sum+++ b/cli/go.sum@@ -168,8 +168,6 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMgithub.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=go.getarcane.app/acfs v0.5.1 h1:Rkrzpz8Qh9SVzP2VwpHtLA0clEjBpTA+xmrVuoZ+mMM=go.getarcane.app/acfs v0.5.1/go.mod h1:Z+0Gs4LGNjvGMLq+TKv/oGKh29FRbAH6mcVPwY5KhFI=-go.getarcane.app/sys/bytes v0.2.0 h1:gTaweUhtS0d9KkDwl7KRz57Je7CXluzbVFVX7CtsKbA=-go.getarcane.app/sys/bytes v0.2.0/go.mod h1:fcMYM7dknLk+KDXYAg6XOfRF22POYxcTnQeypFEjDbE=go.getarcane.app/sys/bytes v0.2.1 h1:Mm/VV1FAde3bVvzmSBxB7HVGkj7ZUw2Gbl1DPcUhlEo=go.getarcane.app/sys/bytes v0.2.1/go.mod h1:fcMYM7dknLk+KDXYAg6XOfRF22POYxcTnQeypFEjDbE=go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=diff --git a/go.work.sum b/go.work.sumindex 804e21afb..9fcf82064 100644--- a/go.work.sum+++ b/go.work.sum@@ -1150,6 +1150,8 @@ github.com/docker/docker v28.5.2+incompatible h1:DBX0Y0zAjZbSrm1uzOkdr1onVghKaftgithub.com/docker/docker v28.5.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0=github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=+github.com/docker/docker-credential-helpers v0.9.8 h1:bIREROb7So6PRlq6KTtdS9MPEjC29OQRkFNlvK2OX8Q=+github.com/docker/docker-credential-helpers v0.9.8/go.mod h1:v1S+hepowrQXITkEfw6o4+BMbGot02wiKpzWhGUZK6c=github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=@@ -1167,6 +1169,8 @@ github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9Tzqvgithub.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a h1:UwSIFv5g5lIvbGgtf3tVwC7Ky9rmMFBp0RMs+6f6YqE=github.com/dylibso/observe-sdk/go v0.0.0-20240819160327-2d926c5d788a/go.mod h1:C8DzXehI4zAbrdlbtOByKX6pfivJTBiV9Jjqv56Yd9Q=+github.com/ebitengine/purego v0.10.2 h1:W809HbnvzAxgdm+aOvlSekrM16wGCdT/e76+9tS7gzE=+github.com/ebitengine/purego v0.10.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712 h1:aaQcKT9WumO6JEJcRyTqFVq4XUZiUcKR2/GI31TOcz8=github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=github.com/eggsampler/acme/v3 v3.6.2 h1:gvyZbQ92wNQLDASVftGpHEdFwPSfg0+17P0lLt09Tp8=@@ -1861,6 +1865,7 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422 h1:XvRuyDDRvi+UDxHN/M4MW4HxjmNVMmUKQj/+AbgsYgk=github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422/go.mod h1:JLgfq4XMVbvfNlAXla/41lZnp21O72a/wWHGJefAvgQ=github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=+github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40 h1:EnfXoSqDfSNJv0VBNqY/88RNnhSGYkrHaO0mmFGbVsc=github.com/lunixbochs/struc v0.0.0-20200707160740-784aaebc1d40/go.mod h1:vy1vK6wD6j7xX6O6hXe621WabdtNkou2h7uRtTfRMyg=github.com/lyft/protoc-gen-star/v2 v2.0.4 h1:JDlNKttNIRd68AAIychs0AqEpO8/I/WYi01OQ7Raw6Q=@@ -2168,6 +2173,7 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEgithub.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA=github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo=github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=@@ -2183,10 +2189,12 @@ github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jgithub.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw=+github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc=github.com/prometheus/otlptranslator v0.0.2 h1:+1CdeLVrRQ6Psmhnobldo0kTp96Rj80DRXRd5OSnMEQ=github.com/prometheus/otlptranslator v0.0.2/go.mod h1:P8AwMgdD7XEr6QRUJ2QWLpiAZTgTE2UYgjlu3svompI=github.com/prometheus/otlptranslator v1.0.0 h1:s0LJW/iN9dkIH+EnhiD3BlkkP5QVIUVEoIwkU+A6qos=@@ -2268,6 +2276,8 @@ github.com/samber/slog-gin v1.21.1/go.mod h1:7R4VMQGENllRLLnwGyoB5nUSB+qzxThpGe5github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=+github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=github.com/sasha-s/go-deadlock v0.3.5 h1:tNCOEEDG6tBqrNDOX35j/7hL5FcFViG6awUGROb2NsU=github.com/sasha-s/go-deadlock v0.3.5/go.mod h1:bugP6EGbdGYObIlx7pUZtWqlvo8k9H6vCBBsiChJQ5U=github.com/sassoftware/go-rpmutils v0.4.0 h1:ojND82NYBxgwrV+mX1CWsd5QJvvEZTKddtCdFLPWhpg=@@ -2278,6 +2288,8 @@ github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQgithub.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=github.com/seccomp/libseccomp-golang v0.10.0 h1:aA4bp+/Zzi0BnWZ2F1wgNBs5gTpm+na2rWM6M9YjLpY=github.com/seccomp/libseccomp-golang v0.10.0/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=+github.com/secure-systems-lab/go-securesystemslib v0.11.0 h1:iuCR9kcMFD4QurdKrGvPLoKZLv9YvwPYVr0473BdtFs=+github.com/secure-systems-lab/go-securesystemslib v0.11.0/go.mod h1:+PMOTjUGwHj2vcZ+TFKlb1tXRbrdWE1LYDT5i9JC80Q=github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=@@ -2627,21 +2639,34 @@ go.getarcane.app/acfs v0.2.0 h1:m7yXsLIB4MfsAE/AFP54RgtMXUr+AFEVCNiF5784XYI=go.getarcane.app/acfs v0.2.0/go.mod h1:sU3t21KctTsQM3OW10+RNB0Z6lR+YfaSr5Nxubq3cpI=go.getarcane.app/acfs v0.4.1/go.mod h1:sU3t21KctTsQM3OW10+RNB0Z6lR+YfaSr5Nxubq3cpI=go.getarcane.app/acfs v0.4.2/go.mod h1:58JU/5d9TIawZrRvtND1jBmcDy6DrUP0FLhXklmrRjY=+go.getarcane.app/acfs v0.5.0/go.mod h1:Z+0Gs4LGNjvGMLq+TKv/oGKh29FRbAH6mcVPwY5KhFI=go.getarcane.app/builds v0.3.1 h1:jymgkbcJ98o+XM9P0Ympn7m3WowWhG3vbiVwxIhhwns=go.getarcane.app/builds v0.3.1/go.mod h1:MJXC3VNSspckX6NBu+l7kBaCckuNsXIw4B8WAuxXo94=+go.getarcane.app/builds v0.4.0 h1:i6qHFy1/xuGkKYYXPeNtS7Y/pyNb9ITVr4rnP04a2Kg=+go.getarcane.app/builds v0.4.0/go.mod h1:E+t7XCQo0b2lK1yMGMlKEgTIyd4c9IMvVx8tPX6AYBo=go.getarcane.app/docker/convert v0.1.0 h1:prlIOs6dMx6CdnetsJFZ6ak0vcistM3DcH5lrZiFHBU=go.getarcane.app/docker/convert v0.1.0/go.mod h1:o9y4z/vah8HiHFtI+jJVFHbs8nLrkARYt88OaUlvGig=go.getarcane.app/docker/convert v0.2.0 h1:Mj72F0SkgPxrlDujjHZTnSdzqwyx7PqZwskiIwm1qts=go.getarcane.app/docker/convert v0.2.0/go.mod h1:RtKwdUxye+Ildzzc577qngIfhBeKuOM+XUfV9O1yyyg=+go.getarcane.app/docker/convert v0.3.0 h1:yKsepx7UVQTXccZpMzxoySLrv0kE2qv7p7wfMPzp69Q=+go.getarcane.app/docker/convert v0.3.0/go.mod h1:RtKwdUxye+Ildzzc577qngIfhBeKuOM+XUfV9O1yyyg=+go.getarcane.app/kit v0.1.0 h1:82oO/i1fS4xbzAG4Xc8ALOWOwW4kwQYDdBpVHE19QkI=+go.getarcane.app/kit v0.1.0/go.mod h1:oiH4hLowxfQYFtmldyk/y79XYBHYfzgd86MrSQS9UEg=go.getarcane.app/streams v0.4.0 h1:MtBX1SVgt3nrcRNr5SYAvckGp9a5qeSjMTw/LAGwlzk=go.getarcane.app/streams v0.4.0/go.mod h1:LHMKblQvsL1nqKh/Y+KgQbwFSMI2I7bs9u8ZwZqzjnQ=+go.getarcane.app/streams v0.4.2 h1:+xrRHiOt25cLbFTDpPLzv7eFkk7biwDz5YjBXkbWUPw=+go.getarcane.app/streams v0.4.2/go.mod h1:wwQ5HIYYBZzktUNmSI3Q/VJ6A6KgGiYWk5q/UzID+oY=go.getarcane.app/sys/atomic v0.1.0 h1:0HhUeGXYdKAmMW24O+OaqcjDZx6twAuYPBu9T91zKsk=go.getarcane.app/sys/atomic v0.1.0/go.mod h1:QPb5eUXYKYG5acp9jJBAZ/PTbHbByDAQG6eDNAsZZ2w=go.getarcane.app/sys/bytes v0.1.0/go.mod h1:R2mujqg+MmC2tr+97IPqaxzvBC8+ykng+5r+XNxwY+8=go.getarcane.app/sys/cgroup v0.1.1 h1:c39W8FDqMXlKOZrpH+itaY+t8oC0tva0+6ztTrKvVIg=go.getarcane.app/sys/cgroup v0.1.1/go.mod h1:2dUDhWV8qe9LRnLIqa5VQDhdWbTQ04EepttdIAe9dcM=+go.getarcane.app/sys/cgroup v0.2.0 h1:JGkz23FoNNgLjq0y4k2uUPtKhlh4StpnmS4STyICq6E=+go.getarcane.app/sys/cgroup v0.2.0/go.mod h1:y+FJhJrzEjzATNmVDPZCNrtzkPy4FXKvN1V0BSxi20M=go.getarcane.app/sys/crypto v0.1.0 h1:HDQ2CKHkm+wZe5xb/qR7MzW5fKi0Wq8Jcyr7qDVgRWg=go.getarcane.app/sys/crypto v0.1.0/go.mod h1:YtoRB0TENwfdNl0ZUTWkeas/8rT7NhCbI8ENsZzCCdU=+go.getarcane.app/sys/crypto v0.2.0 h1:qX1WjxMRRtoeKDK07sfhqEQh79VtUnAWfp82ukkDo9k=+go.getarcane.app/sys/crypto v0.2.0/go.mod h1:FdTsyxaTF8lC3Nt9lkI/cYCs2o0ikhTSpDBRmX1YZho=go.getarcane.app/updater v0.3.6 h1:+BqoycaRsHj+cLVSzcYQuqbHxUKbtmaozMNblz5bVSw=go.getarcane.app/updater v0.3.6/go.mod h1:2ENitZR/lA5MuBn60OZYR5wvU3ZCE+pAgfrebfOlRDA=go.getarcane.app/updater v0.3.7 h1:WqHsxudvt8gvCR7iSHdxdzwH0+hM0FAh64bSypBX9Mo=@@ -2652,8 +2677,8 @@ go.getarcane.app/updater v0.7.2 h1:kJUBUgc7DLgyMD0ZKbGa2FafsTiI+hjJpIFzlI93VUc=go.getarcane.app/updater v0.7.2/go.mod h1:0zMnkBlRjcKTugKJE03c4ZAx/1HtwgHayFVroHrQcrg=go.getarcane.app/updater v0.7.3 h1:0RMN1ossGtsHY6QaycYEI+7piX58cm0i3AbCzcn0qj8=go.getarcane.app/updater v0.7.3/go.mod h1:lve1Gq09kl0GSubVWG+QChLKktTR7x2UkHvJ+T2yP78=-go.getarcane.app/updater v0.8.1 h1:KFI5xcC7e7Iug+hgCcWjj0pk4+u3gND3QluKVtEehzs=-go.getarcane.app/updater v0.8.1/go.mod h1:UGkeFc6Ev1eGDxB6P+/IA7twbzKPcbtbca8xdRLL3hs=+go.getarcane.app/updater v0.8.0 h1:8R79Pxj9jiH9NBRwvGJAeiG1DFcdwATKM8MN/V6Sz2Q=+go.getarcane.app/updater v0.8.0/go.mod h1:Hci6Hziz1tublccxm48pKvhxmmg0n3GC6tPMu4bYl3c=go.lsp.dev/jsonrpc2 v0.10.0 h1:Pr/YcXJoEOTMc/b6OTmcR1DPJ3mSWl/SWiU1Cct6VmI=go.lsp.dev/jsonrpc2 v0.10.0/go.mod h1:fmEzIdXPi/rf6d4uFcayi8HpFP1nBF99ERP1htC72Ac=go.lsp.dev/pkg v0.0.0-20210717090340-384b27a52fb2 h1:hCzQgh6UcwbKgNSRurYWSqh8MufqRRPODRBblutn4TE=@@ -3114,6 +3139,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20260316180232-0b37fe3546d5/go.google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=google.golang.org/genproto/googleapis/api v0.0.0-20260401001100-f93e5f3e9f0f/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478/go.mod h1:C6ADNqOxbgdUUeRTU+LCHDPB9ttAMCTff6auwCVa4uc=+google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5 h1:izFU9hz7aeLI/Mi1J0991ae+xcwRLr7hTqWnB/9aIIU=+google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5/go.mod h1:3LhxRw4YYkf+ylAfgaY9JlVLFKhokkCV8duhLLe7+t0=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260511170946-3700d4141b60 h1:d6u4PP57tPS8aHP9OdAMdFvuOCDaK1IbK31tQUdPa1Q=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260511170946-3700d4141b60/go.mod h1:6TABGosqSqU2l1+fJ3jdvOYPPVryeKybxYF0cCZkTBE=google.golang.org/genproto/googleapis/bytestream v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:6TABGosqSqU2l1+fJ3jdvOYPPVryeKybxYF0cCZkTBE=@@ -3139,6 +3166,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=+google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a h1:3Dnd1cDaZlB68lziofO+bJXpjOy8UfRv8Unt+yH8tQ4=+google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a/go.mod h1:DjtHYE8FKJLivXcBEjGwndXfIC23G0VpXiXKqG179uA=google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=diff --git a/types/httpx/client.go b/types/httpx/client.gonew file mode 100644index 000000000..fdb0428bf--- /dev/null+++ b/types/httpx/client.go@@ -0,0 +1,10 @@+package httpx++import "time"++// ClientOptions configures timeouts for an outbound HTTP client.+// Durations are used as provided; a zero Timeout disables the request timeout.+type ClientOptions struct {+ Timeout time.Duration+ TLSHandshakeTimeout time.Duration+}diff --git a/types/search/profile.go b/types/search/profile.gonew file mode 100644index 000000000..4c9e68057--- /dev/null+++ b/types/search/profile.go@@ -0,0 +1,9 @@+package search++// Profile selects the metadata defaults and ranking rules for a search surface.+type Profile uint8++const (+ SettingsProfile Profile = iota + 1+ CustomizeProfile+)