From c506db1ef42072c46e60fb4631000d7e92abf725 Mon Sep 17 00:00:00 2001
From: yusing <yusing@6uo.me>
Date: Fri, 3 Jan 2025 18:55:44 +0800
Subject: [PATCH] refactor

---
 internal/docker/client.go              |  7 +++----
 internal/docker/idlewatcher/watcher.go |  2 +-
 internal/docker/inspect.go             |  2 +-
 internal/watcher/directory_watcher.go  | 20 ++++++++++++--------
 internal/watcher/docker_watcher.go     |  4 ++--
 5 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/internal/docker/client.go b/internal/docker/client.go
index 7128740..a11cf64 100644
--- a/internal/docker/client.go
+++ b/internal/docker/client.go
@@ -16,7 +16,6 @@ import (
 )
 
 type (
-	Client       = *SharedClient
 	SharedClient struct {
 		*client.Client
 
@@ -28,7 +27,7 @@ type (
 )
 
 var (
-	clientMap   F.Map[string, Client] = F.NewMapOf[string, Client]()
+	clientMap   F.Map[string, *SharedClient] = F.NewMapOf[string, *SharedClient]()
 	clientMapMu sync.Mutex
 
 	clientOptEnvHost = []client.Opt{
@@ -39,7 +38,7 @@ var (
 
 func init() {
 	task.OnProgramExit("docker_clients_cleanup", func() {
-		clientMap.RangeAllParallel(func(_ string, c Client) {
+		clientMap.RangeAllParallel(func(_ string, c *SharedClient) {
 			if c.Connected() {
 				c.Client.Close()
 			}
@@ -68,7 +67,7 @@ func (c *SharedClient) Close() {
 // Returns:
 //   - Client: the Docker client connection.
 //   - error: an error if the connection failed.
-func ConnectClient(host string) (Client, error) {
+func ConnectClient(host string) (*SharedClient, error) {
 	clientMapMu.Lock()
 	defer clientMapMu.Unlock()
 
diff --git a/internal/docker/idlewatcher/watcher.go b/internal/docker/idlewatcher/watcher.go
index a60ba79..45c0817 100644
--- a/internal/docker/idlewatcher/watcher.go
+++ b/internal/docker/idlewatcher/watcher.go
@@ -29,7 +29,7 @@ type (
 		*idlewatcher.Config
 		*waker
 
-		client       D.Client
+		client       *D.SharedClient
 		stopByMethod StopCallback // send a docker command w.r.t. `stop_method`
 		ticker       *time.Ticker
 		task         *task.Task
diff --git a/internal/docker/inspect.go b/internal/docker/inspect.go
index 6a30d96..3932837 100644
--- a/internal/docker/inspect.go
+++ b/internal/docker/inspect.go
@@ -16,7 +16,7 @@ func Inspect(dockerHost string, containerID string) (*Container, error) {
 	return client.Inspect(containerID)
 }
 
-func (c Client) Inspect(containerID string) (*Container, error) {
+func (c *SharedClient) Inspect(containerID string) (*Container, error) {
 	ctx, cancel := context.WithTimeoutCause(context.Background(), 3*time.Second, errors.New("docker container inspect timeout"))
 	defer cancel()
 
diff --git a/internal/watcher/directory_watcher.go b/internal/watcher/directory_watcher.go
index 7408f3d..d20aa5c 100644
--- a/internal/watcher/directory_watcher.go
+++ b/internal/watcher/directory_watcher.go
@@ -10,7 +10,6 @@ import (
 	"github.com/rs/zerolog"
 	E "github.com/yusing/go-proxy/internal/error"
 	"github.com/yusing/go-proxy/internal/task"
-	F "github.com/yusing/go-proxy/internal/utils/functional"
 	"github.com/yusing/go-proxy/internal/watcher/events"
 )
 
@@ -20,7 +19,7 @@ type DirWatcher struct {
 	dir string
 	w   *fsnotify.Watcher
 
-	fwMap F.Map[string, *fileWatcher]
+	fwMap map[string]*fileWatcher
 	mu    sync.Mutex
 
 	eventCh chan Event
@@ -53,7 +52,7 @@ func NewDirectoryWatcher(parent task.Parent, dirPath string) *DirWatcher {
 			Logger(),
 		dir:     dirPath,
 		w:       w,
-		fwMap:   F.NewMapOf[string, *fileWatcher](),
+		fwMap:   make(map[string]*fileWatcher),
 		eventCh: make(chan Event),
 		errCh:   make(chan E.Error),
 		task:    parent.Subtask("dir_watcher(" + dirPath + ")"),
@@ -71,7 +70,7 @@ func (h *DirWatcher) Add(relPath string) Watcher {
 	defer h.mu.Unlock()
 
 	// check if the watcher already exists
-	s, ok := h.fwMap.Load(relPath)
+	s, ok := h.fwMap[relPath]
 	if ok {
 		return s
 	}
@@ -80,18 +79,21 @@ func (h *DirWatcher) Add(relPath string) Watcher {
 		eventCh: make(chan Event),
 		errCh:   make(chan E.Error),
 	}
-	h.fwMap.Store(relPath, s)
+	h.fwMap[relPath] = s
 	return s
 }
 
 func (h *DirWatcher) cleanup() {
+	h.mu.Lock()
+	defer h.mu.Unlock()
+
 	h.w.Close()
 	close(h.eventCh)
 	close(h.errCh)
-	h.fwMap.RangeAll(func(key string, fw *fileWatcher) {
+	for _, fw := range h.fwMap {
 		close(fw.eventCh)
 		close(fw.errCh)
-	})
+	}
 	h.task.Finish(nil)
 }
 
@@ -136,7 +138,9 @@ func (h *DirWatcher) start() {
 			}
 
 			// send event to file watcher too
-			w, ok := h.fwMap.Load(relPath)
+			h.mu.Lock()
+			w, ok := h.fwMap[relPath]
+			h.mu.Unlock()
 			if ok {
 				select {
 				case w.eventCh <- msg:
diff --git a/internal/watcher/docker_watcher.go b/internal/watcher/docker_watcher.go
index 5cb78b3..9a843e5 100644
--- a/internal/watcher/docker_watcher.go
+++ b/internal/watcher/docker_watcher.go
@@ -17,7 +17,7 @@ type (
 		zerolog.Logger
 
 		host        string
-		client      D.Client
+		client      *D.SharedClient
 		clientOwned bool
 	}
 	DockerListOptions = docker_events.ListOptions
@@ -62,7 +62,7 @@ func NewDockerWatcher(host string) DockerWatcher {
 	}
 }
 
-func NewDockerWatcherWithClient(client D.Client) DockerWatcher {
+func NewDockerWatcherWithClient(client *D.SharedClient) DockerWatcher {
 	return DockerWatcher{
 		client: client,
 		Logger: logger.With().