refactor: move internal/watcher/health to internal/health

internal/autocert/setup_test.go

@@ -50,16 +50,16 @@ extra:
 	require.Equal(t, "certs/extra.crt", merged0.CertPath)
 	require.Equal(t, "certs/extra.key", merged0.KeyPath)
 	// Inherited fields from main config:
-	require.Equal(t, "test@example.com", merged0.Email)                             // inherited
-	require.Equal(t, "custom", merged0.Provider)                                    // inherited
-	require.Equal(t, []string{"example.com"}, merged0.Domains)                      // inherited
+	require.Equal(t, "test@example.com", merged0.Email)                                   // inherited
+	require.Equal(t, "custom", merged0.Provider)                                          // inherited
+	require.Equal(t, []string{"example.com"}, merged0.Domains)                            // inherited
 	require.Equal(t, "https://ca.example.com:9000/acme/acme/directory", merged0.CADirURL) // inherited
-	require.Equal(t, map[string]strutils.Redacted{"key": "value"}, merged0.Options) // inherited
-	require.Equal(t, []string{"8.8.8.8"}, merged0.Resolvers)                        // inherited
-	require.Equal(t, []string{"ca.crt"}, merged0.CACerts)                           // inherited
-	require.Equal(t, "eabKid", merged0.EABKid)                                      // inherited
-	require.Equal(t, "eabHmac", merged0.EABHmac)                                    // inherited
-	require.Equal(t, cfg.HTTPClient, merged0.HTTPClient)                            // inherited
+	require.Equal(t, map[string]strutils.Redacted{"key": "value"}, merged0.Options)       // inherited
+	require.Equal(t, []string{"8.8.8.8"}, merged0.Resolvers)                              // inherited
+	require.Equal(t, []string{"ca.crt"}, merged0.CACerts)                                 // inherited
+	require.Equal(t, "eabKid", merged0.EABKid)                                            // inherited
+	require.Equal(t, "eabHmac", merged0.EABHmac)                                          // inherited
+	require.Equal(t, cfg.HTTPClient, merged0.HTTPClient)                                  // inherited
 	require.Nil(t, merged0.Extra)
 
 	// Test: extra[1] overrides some fields, and inherits others.

internal/health/monitor/new.go

@@ -9,8 +9,8 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/yusing/godoxy/internal/agentpool"
 	"github.com/yusing/godoxy/internal/docker"
+	healthcheck "github.com/yusing/godoxy/internal/health/check"
 	"github.com/yusing/godoxy/internal/types"
-	healthcheck "github.com/yusing/godoxy/internal/watcher/health/check"
 )
 
 type Result = types.HealthCheckResult

internal/idlewatcher/watcher.go

@@ -14,13 +14,13 @@ import (
 	"github.com/yusing/ds/ordered"
 	config "github.com/yusing/godoxy/internal/config/types"
 	"github.com/yusing/godoxy/internal/docker"
+	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/idlewatcher/provider"
 	idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types"
 	nettypes "github.com/yusing/godoxy/internal/net/types"
 	"github.com/yusing/godoxy/internal/route/routes"
 	"github.com/yusing/godoxy/internal/types"
 	"github.com/yusing/godoxy/internal/watcher/events"
-	"github.com/yusing/godoxy/internal/watcher/health/monitor"
 	gperr "github.com/yusing/goutils/errs"
 	"github.com/yusing/goutils/http/reverseproxy"
 	strutils "github.com/yusing/goutils/strings"

internal/route/fileserver.go

@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 
 	config "github.com/yusing/godoxy/internal/config/types"
+	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/logging/accesslog"
 	gphttp "github.com/yusing/godoxy/internal/net/gphttp"
 	"github.com/yusing/godoxy/internal/net/gphttp/middleware"
 	"github.com/yusing/godoxy/internal/route/routes"
 	"github.com/yusing/godoxy/internal/types"
-	"github.com/yusing/godoxy/internal/watcher/health/monitor"
 	gperr "github.com/yusing/goutils/errs"
 	"github.com/yusing/goutils/task"
 )

internal/route/reverse_proxy.go

@@ -7,6 +7,7 @@ import (
 	"github.com/yusing/godoxy/agent/pkg/agent"
 	"github.com/yusing/godoxy/agent/pkg/agentproxy"
 	config "github.com/yusing/godoxy/internal/config/types"
+	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/idlewatcher"
 	"github.com/yusing/godoxy/internal/logging/accesslog"
 	gphttp "github.com/yusing/godoxy/internal/net/gphttp"
@@ -16,7 +17,6 @@ import (
 	"github.com/yusing/godoxy/internal/route/routes"
 	route "github.com/yusing/godoxy/internal/route/types"
 	"github.com/yusing/godoxy/internal/types"
-	"github.com/yusing/godoxy/internal/watcher/health/monitor"
 	gperr "github.com/yusing/goutils/errs"
 	"github.com/yusing/goutils/http/reverseproxy"
 	"github.com/yusing/goutils/task"

internal/route/route.go

@@ -18,6 +18,7 @@ import (
 	"github.com/yusing/godoxy/internal/agentpool"
 	config "github.com/yusing/godoxy/internal/config/types"
 	"github.com/yusing/godoxy/internal/docker"
+	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/homepage"
 	homepagecfg "github.com/yusing/godoxy/internal/homepage/types"
 	netutils "github.com/yusing/godoxy/internal/net"
@@ -25,7 +26,6 @@ import (
 	"github.com/yusing/godoxy/internal/proxmox"
 	"github.com/yusing/godoxy/internal/serialization"
 	"github.com/yusing/godoxy/internal/types"
-	"github.com/yusing/godoxy/internal/watcher/health/monitor"
 	gperr "github.com/yusing/goutils/errs"
 	strutils "github.com/yusing/goutils/strings"
 	"github.com/yusing/goutils/task"

internal/route/stream.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/idlewatcher"
 	nettypes "github.com/yusing/godoxy/internal/net/types"
 	"github.com/yusing/godoxy/internal/route/routes"
 	"github.com/yusing/godoxy/internal/route/stream"
 	"github.com/yusing/godoxy/internal/types"
-	"github.com/yusing/godoxy/internal/watcher/health/monitor"
 	gperr "github.com/yusing/goutils/errs"
 	"github.com/yusing/goutils/task"
 )