fix #4 invalid data path (#5)

cfc4n · web-flow · commit a550ffb81531 · 2025-03-28T23:32:04.000+08:00
* feat: enhance browser and command execution with improved configuration and data path handling

Signed-off-by: cfc4n &lt;cfc4n.cs@gmail.com&gt;

* refactor: streamline directory creation and improve configuration access in CommandServer

Signed-off-by: cfc4n &lt;cfc4n.cs@gmail.com&gt;

---------

Signed-off-by: cfc4n &lt;cfc4n.cs@gmail.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-/services/command_mt.go
+/services/mo*
+
diff --git a/cli/cmd/moling_test.go b/cli/cmd/moling_test.go
@@ -26,7 +26,7 @@ func TestNewMLServer(t *testing.T) {
 	if err != nil {
 		t.Errorf("Failed to create base directory: %v", err)
 	}
-	for _, dirName := range []string{"logs", "config", "browser"} {
+	for _, dirName := range mlDirectories {
 		err = CreateDirectory(filepath.Join(mlConfig.BasePath, dirName))
 		if err != nil {
 			t.Errorf("Failed to create directory %s: %v", dirName, err)
diff --git a/cli/cmd/root.go b/cli/cmd/root.go
@@ -71,10 +71,10 @@ var (
 
 	// mlDirectories is a list of directories to be created in the base path
 	mlDirectories = []string{
-		"logs",
-		"config",
-		"browser",
-		"data",
+		"logs",    // log file
+		"config",  // config file
+		"browser", // browser cache
+		"data",    // data
 		"cache",
 	}
 )
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.1
 
 require (
 	github.com/chromedp/chromedp v0.13.3
-	github.com/mark3labs/mcp-go v0.15.0
+	github.com/mark3labs/mcp-go v0.17.0
 	github.com/rs/zerolog v1.34.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
@@ -13,14 +13,14 @@ require (
 require (
 	github.com/chromedp/cdproto v0.0.0-20250319231242-a755498943c8 // indirect
 	github.com/chromedp/sysutil v1.1.0 // indirect
-	github.com/go-json-experiment/json v0.0.0-20250211171154-1ae217ad3535 // indirect
+	github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 // indirect
 	github.com/gobwas/httphead v0.1.0 // indirect
 	github.com/gobwas/pool v0.2.1 // indirect
 	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
-	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -10,6 +10,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-json-experiment/json v0.0.0-20250211171154-1ae217ad3535 h1:yE7argOs92u+sSCRgqqe6eF+cDaVhSPlioy1UkA0p/w=
 github.com/go-json-experiment/json v0.0.0-20250211171154-1ae217ad3535/go.mod h1:BWmvoE1Xia34f3l/ibJweyhrT+aROb/FQ6d+37F0e2s=
+github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874 h1:F8d1AJ6M9UQCavhwmO6ZsrYLfG8zVFWfEfMS2MXPkSY=
+github.com/go-json-experiment/json v0.0.0-20250223041408-d3c622f1b874/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
 github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
@@ -25,11 +27,17 @@ github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kUL
 github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/mark3labs/mcp-go v0.15.0 h1:lViiC4dk6chJHZccezaTzZLMOQVUXJDGNQPtzExr5NQ=
 github.com/mark3labs/mcp-go v0.15.0/go.mod h1:xBB350hekQsJAK7gJAii8bcEoWemboLm2mRm5/+KBaU=
+github.com/mark3labs/mcp-go v0.17.0 h1:5Ps6T7qXr7De/2QTqs9h6BKeZ/qdeUeGrgM5lPzi930=
+github.com/mark3labs/mcp-go v0.17.0/go.mod h1:KmJndYv7GIgcPVwEKJjNcbhVQ+hJGJhrCCB/9xITzpE=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
 github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -52,6 +60,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/services/browser.go b/services/browser.go
@@ -46,6 +46,10 @@ type BrowserServer struct {
 func NewBrowserServer(ctx context.Context, args []string) (Service, error) {
 
 	bc := NewBrowserConfig()
+	globalConf := ctx.Value(MoLingConfigKey).(*MoLingConfig)
+	userDataDir := filepath.Join(globalConf.BasePath, DataPath)
+
+	bc.DataPath = filepath.Join(globalConf.BasePath, "data")
 	logger, ok := ctx.Value(MoLingLoggerKey).(zerolog.Logger)
 	if !ok {
 		return nil, fmt.Errorf("BrowserServer: invalid logger type: %T", ctx.Value(MoLingLoggerKey))
@@ -59,8 +63,7 @@ func NewBrowserServer(ctx context.Context, args []string) (Service, error) {
 		config: bc,
 	}
 	bs.logger = logger.Hook(loggerNameHook)
-	globalConf := ctx.Value(MoLingConfigKey).(*MoLingConfig)
-	userDataDir := filepath.Join(globalConf.BasePath, DataPath)
+
 	err := bs.initBrowser(userDataDir)
 	if err != nil {
 		return nil, fmt.Errorf("failed to initialize browser: %v", err)
diff --git a/services/browser_config.go b/services/browser_config.go
@@ -19,6 +19,8 @@ package services
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 )
 
 type BrowserConfig struct {
@@ -55,6 +57,6 @@ func NewBrowserConfig() *BrowserConfig {
 		CSSTimeout:      10,
 		UserAgent:       "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3 (GoJue MoLing)",
 		DefaultLanguage: "en-US",
-		DataPath:        "/Users/cfc4n/Downloads/moling_data",
+		DataPath:        filepath.Join(os.TempDir(), ".moling", "data"),
 	}
 }
diff --git a/services/command.go b/services/command.go
@@ -37,10 +37,9 @@ var (
 // CommandServer implements the Service interface and provides methods to execute named commands.
 type CommandServer struct {
 	MLService
-	config       *CommandConfig
-	globalConfig *MoLingConfig
-	osName       string
-	osVersion    string
+	config    *CommandConfig
+	osName    string
+	osVersion string
 }
 
 // NewCommandServer creates a new CommandServer with the given allowed commands.
@@ -63,11 +62,11 @@ func NewCommandServer(ctx context.Context, args []string) (Service, error) {
 
 	cs := &CommandServer{
 		MLService: MLService{
-			ctx:    ctx,
-			logger: lger.Hook(loggerNameHook),
+			ctx:      ctx,
+			logger:   lger.Hook(loggerNameHook),
+			mlConfig: gConf,
 		},
-		config:       cc,
-		globalConfig: gConf,
+		config: cc,
 	}
 
 	err = cs.init()
@@ -104,7 +103,7 @@ func (cs *CommandServer) handlePrompt(ctx context.Context, request mcp.GetPrompt
 				Role: mcp.RoleUser,
 				Content: mcp.TextContent{
 					Type: "text",
-					Text: "This is a simple prompt without arguments.",
+					Text: fmt.Sprintf("You are a command-line tool assistant, using %s system commands to help users troubleshoot network issues, system performance, among other things.", cs.MlConfig().SystemInfo),
 				},
 			},
 		},
@@ -120,7 +119,7 @@ func (cs *CommandServer) handleExecuteCommand(ctx context.Context, request mcp.C
 
 	// Check if the command is allowed
 	if !cs.isAllowedCommand(command) {
-		cs.logger.Err(ErrCommandNotAllowed).Str("command", command).Msgf("If you want to allow this command, add it to %s", filepath.Join(cs.globalConfig.BasePath, "config", cs.globalConfig.ConfigFile))
+		cs.logger.Err(ErrCommandNotAllowed).Str("command", command).Msgf("If you want to allow this command, add it to %s", filepath.Join(cs.MlConfig().BasePath, "config", cs.MlConfig().ConfigFile))
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{
 				mcp.TextContent{
@@ -133,7 +132,7 @@ func (cs *CommandServer) handleExecuteCommand(ctx context.Context, request mcp.C
 	}
 
 	// Execute the command
-	output, err := cs.executeCommand(command)
+	output, err := ExecCommand(command)
 	if err != nil {
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{
diff --git a/services/command_config.go b/services/command_config.go
@@ -34,6 +34,7 @@ var (
 		"iostat", "mpstat", "sar", "uptime", "cut", "sort", "uniq", "wc", "awk", "sed",
 		"diff", "cmp", "comm", "file", "basename", "dirname", "chmod", "chown", "curl",
 		"nslookup", "dig", "host", "ssh", "scp", "sftp", "ftp", "wget", "tar", "gzip",
+		"scutil", "networksetup",
 	}
 )
 
diff --git a/services/command_exec.go b/services/command_exec.go
@@ -25,10 +25,10 @@ import (
 	"time"
 )
 
-// executeCommand executes a command and returns its output.
-func (cs *CommandServer) executeCommand(command string) (string, error) {
+// ExecCommand executes a command and returns its output.
+func ExecCommand(command string) (string, error) {
 	var cmd *exec.Cmd
-	ctx, cfunc := context.WithTimeout(context.Background(), time.Second*3)
+	ctx, cfunc := context.WithTimeout(context.Background(), time.Second*10)
 	defer cfunc()
 	cmd = exec.CommandContext(ctx, "sh", "-c", command)
 	output, err := cmd.CombinedOutput()
diff --git a/services/command_exec_test.go b/services/command_exec_test.go
@@ -29,16 +29,11 @@ type MockCommandServer struct {
 	CommandServer
 }
 
-// TestExecuteCommand tests the executeCommand function.
+// TestExecuteCommand tests the ExecCommand function.
 func TestExecuteCommand(t *testing.T) {
-	cs := &MockCommandServer{
-		CommandServer{
-			config: NewCommandConfig([]string{}),
-		},
-	}
 	execCmd := "echo 'Hello, World!'"
 	// Test a simple command
-	output, err := cs.executeCommand(execCmd)
+	output, err := ExecCommand(execCmd)
 	if err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}
@@ -52,7 +47,7 @@ func TestExecuteCommand(t *testing.T) {
 	defer cancel()
 
 	execCmd = "curl ifconfig.me|grep Time"
-	output, err = cs.executeCommand(execCmd)
+	output, err = ExecCommand(execCmd)
 	if err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}
diff --git a/services/command_exec_windows.go b/services/command_exec_windows.go
@@ -23,8 +23,8 @@ import (
 	"os/exec"
 )
 
-// executeCommand executes a command and returns its output.
-func (cs *CommandServer) executeCommand(command string) (string, error) {
+// ExecCommand executes a command and returns its output.
+func ExecCommand(command string) (string, error) {
 	var cmd *exec.Cmd
 	cmd = exec.Command("cmd", "/C", command)
 	output, err := cmd.CombinedOutput()
diff --git a/services/config.go b/services/config.go
@@ -27,11 +27,14 @@ type Config interface {
 // MoLingConfig is a struct that holds the configuration for the MoLing server.
 type MoLingConfig struct {
 	ConfigFile string `json:"config_file"` // The path to the configuration file.
-	BasePath   string `json:"base_path"`   // The base path for the server, used for storing files. automatically created if not exists.
+	BasePath   string `json:"base_path"`   // The base path for the server, used for storing files. automatically created if not exists. eg: /Users/user1/.moling
 	//AllowDir   []string `json:"allow_dir"`   // The directories that are allowed to be accessed by the server.
 	Version    string `json:"version"`     // The version of the MoLing server.
 	ListenAddr string `json:"listen_addr"` // The address to listen on for SSE mode.
 	Debug      bool   `json:"debug"`       // Debug mode, if true, the server will run in debug mode.
+	Username   string // The username of the user running the server.
+	HomeDir    string // The home directory of the user running the server. macOS: /Users/user1, Linux: /home/user1
+	SystemInfo string // The system information of the user running the server. macOS: Darwin 15.3.3, Linux: Ubuntu 20.04.1 LTS
 	logger     zerolog.Logger
 }
 
diff --git a/services/file_system.go b/services/file_system.go
@@ -56,7 +56,10 @@ type FilesystemServer struct {
 func NewFilesystemServer(ctx context.Context, args []string) (Service, error) {
 	// Validate the config
 	var err error
-	fc := NewFileSystemConfig(args)
+	globalConf := ctx.Value(MoLingConfigKey).(*MoLingConfig)
+	userDataDir := filepath.Join(globalConf.BasePath, "data")
+
+	fc := NewFileSystemConfig([]string{userDataDir})
 
 	if err = fc.Check(); err != nil {
 		return nil, fmt.Errorf("FilesystemServer: invalid config: %v", err)
diff --git a/services/file_system_config.go b/services/file_system_config.go
@@ -25,7 +25,7 @@ import (
 var (
 	// TODO : read from config file
 	allowedDirsDefault = []string{
-		"/Users/cfc4n/Downloads/moling_data",
+		os.TempDir(),
 	}
 )
 
diff --git a/services/service.go b/services/service.go
@@ -49,6 +49,8 @@ type Service interface {
 	// Config returns the configuration of the service as a string.
 	Config() string
 
+	MlConfig() *MoLingConfig
+
 	// Name returns the name of the service.
 	Name() string
 
@@ -80,6 +82,7 @@ type MLService struct {
 	tools                []server.ServerTool
 	notificationHandlers map[string]server.NotificationHandlerFunc
 	logger               zerolog.Logger // The logger for the service
+	mlConfig             *MoLingConfig  // The configuration for the service
 }
 
 // init initializes the MLService with empty maps and a mutex.
@@ -168,11 +171,28 @@ func (mls *MLService) NotificationHandlers() map[string]server.NotificationHandl
 	return mls.notificationHandlers
 }
 
-//// Config returns the configuration of the service as a string.
-//func (mls *MLService) Config() string {
-//	panic("not implemented yet") // TODO: Implement
-//}
-//
-//func (mls *MLService) Name() string {
-//	panic("not implemented yet") // TODO: Implement
-//}
+// CallToolResult return a CallToolResult with the given message and error status.
+func (mls *MLService) CallToolResult(isError bool, msg string) *mcp.CallToolResult {
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: msg,
+			},
+		},
+		IsError: isError,
+	}
+}
+
+func (mls *MLService) MlConfig() *MoLingConfig {
+	return mls.mlConfig
+}
+
+// Config returns the configuration of the service as a string.
+func (mls *MLService) Config() string {
+	panic("not implemented yet") // TODO: Implement
+}
+
+func (mls *MLService) Name() string {
+	panic("not implemented yet") // TODO: Implement
+}
diff --git a/variables.mk b/variables.mk
@@ -56,5 +56,5 @@ OS_NAME ?= $(shell uname -s|tr 'A-Z' 'a-z')
 OS_ARCH ?= $(shell uname -m)
 OS_VERSION_SHORT := $(shell uname -r | cut -d'-' -f 1)
 TARGET_OS ?= $(OS_NAME)
-TARGET_ARCH ?= $(OS_ARCH)
+TARGET_ARCH ?= $(if $(filter x86_64,$(OS_ARCH)),amd64,arm64)
 OUT_BIN := bin/moling

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-/services/command_mt.go`
	`1`	`+/services/mo*`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func TestNewMLServer(t *testing.T) {`
`26`	`26`	`if err != nil {`
`27`	`27`	`t.Errorf("Failed to create base directory: %v", err)`
`28`	`28`	`}`
`29`		`- for _, dirName := range []string{"logs", "config", "browser"} {`
	`29`	`+ for _, dirName := range mlDirectories {`
`30`	`30`	`err = CreateDirectory(filepath.Join(mlConfig.BasePath, dirName))`
`31`	`31`	`if err != nil {`
`32`	`32`	`t.Errorf("Failed to create directory %s: %v", dirName, err)`
Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,10 @@ var (`
`71`	`71`
`72`	`72`	`// mlDirectories is a list of directories to be created in the base path`
`73`	`73`	`mlDirectories = []string{`
`74`		`- "logs",`
`75`		`- "config",`
`76`		`- "browser",`
`77`		`- "data",`
	`74`	`+ "logs", // log file`
	`75`	`+ "config", // config file`
	`76`	`+ "browser", // browser cache`
	`77`	`+ "data", // data`
`78`	`78`	`"cache",`
`79`	`79`	`}`
`80`	`80`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ package services`
`19`	`19`
`20`	`20`	`import (`
`21`	`21`	`"fmt"`
	`22`	`+ "os"`
	`23`	`+ "path/filepath"`
`22`	`24`	`)`
`23`	`25`
`24`	`26`	`type BrowserConfig struct {`
`@@ -55,6 +57,6 @@ func NewBrowserConfig() *BrowserConfig {`
`55`	`57`	`CSSTimeout: 10,`
`56`	`58`	`UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3 (GoJue MoLing)",`
`57`	`59`	`DefaultLanguage: "en-US",`
`58`		`- DataPath: "/Users/cfc4n/Downloads/moling_data",`
	`60`	`+ DataPath: filepath.Join(os.TempDir(), ".moling", "data"),`
`59`	`61`	`}`
`60`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ var (`
`34`	`34`	`"iostat", "mpstat", "sar", "uptime", "cut", "sort", "uniq", "wc", "awk", "sed",`
`35`	`35`	`"diff", "cmp", "comm", "file", "basename", "dirname", "chmod", "chown", "curl",`
`36`	`36`	`"nslookup", "dig", "host", "ssh", "scp", "sftp", "ftp", "wget", "tar", "gzip",`
	`37`	`+ "scutil", "networksetup",`
`37`	`38`	`}`
`38`	`39`	`)`
`39`	`40`