From 5476b45f226c58aab817e6a771d5d1573f8b4e4c Mon Sep 17 00:00:00 2001 From: Red Adaya Date: Sun, 14 Apr 2024 22:42:00 +0800 Subject: [PATCH] save work --- src/models/model.ts | 3 +- wavesrv/cmd/main-server.go | 4 + wavesrv/pkg/configstore/configstore.go | 145 +++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 wavesrv/pkg/configstore/configstore.go diff --git a/src/models/model.ts b/src/models/model.ts index 3e917df94..3e9ffa9df 100644 --- a/src/models/model.ts +++ b/src/models/model.ts @@ -139,7 +139,7 @@ class Model { appUpdateStatus = mobx.observable.box(getApi().getAppUpdateStatus(), { name: "appUpdateStatus", }); - termThemes: OMap = mobx.observable.array([], { + termThemes: OMap> = mobx.observable.array([], { name: "terminalThemes", deep: false, }); @@ -921,6 +921,7 @@ class Model { } runUpdate_internal(genUpdate: UpdatePacket, uiContext: UIContextType, interactive: boolean) { + console.log("got here", genUpdate); if (genUpdate.type == "pty") { const ptyMsg = genUpdate.data; if (isBlank(ptyMsg.remoteid)) { diff --git a/wavesrv/cmd/main-server.go b/wavesrv/cmd/main-server.go index e139a8163..ef151f325 100644 --- a/wavesrv/cmd/main-server.go +++ b/wavesrv/cmd/main-server.go @@ -37,6 +37,7 @@ import ( "github.com/wavetermdev/waveterm/waveshell/pkg/wlog" "github.com/wavetermdev/waveterm/wavesrv/pkg/bufferedpipe" "github.com/wavetermdev/waveterm/wavesrv/pkg/cmdrunner" + "github.com/wavetermdev/waveterm/wavesrv/pkg/configstore" "github.com/wavetermdev/waveterm/wavesrv/pkg/ephemeral" "github.com/wavetermdev/waveterm/wavesrv/pkg/pcloud" "github.com/wavetermdev/waveterm/wavesrv/pkg/promptenc" @@ -156,6 +157,9 @@ func HandleWs(w http.ResponseWriter, r *http.Request) { removeWSStateAfterTimeout(clientId, stateConnectTime, WSStateReconnectTime) }() log.Printf("WebSocket opened %s %s\n", state.ClientId, shell.RemoteAddr) + + tt := configstore.MakeTermThemes(state) + tt.LoadAndWatchThemes() state.RunWSRead() } diff --git a/wavesrv/pkg/configstore/configstore.go b/wavesrv/pkg/configstore/configstore.go new file mode 100644 index 000000000..7cc73d0e6 --- /dev/null +++ b/wavesrv/pkg/configstore/configstore.go @@ -0,0 +1,145 @@ +package configstore + +import ( + "encoding/json" + "errors" + "fmt" + "log" + "os" + "path" + "path/filepath" + + "github.com/fsnotify/fsnotify" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scbus" + "github.com/wavetermdev/waveterm/wavesrv/pkg/scws" +) + +const ( + TermThemesTypeStr = "termthemes" + TermThemeDir = "config/terminal-themes/" +) + +type TermThemesType map[string]map[string]string + +func (tt TermThemesType) GetType() string { + return TermThemesTypeStr +} + +type TermThemes struct { + Themes TermThemesType + State *scws.WSState // Using WSState to manage WebSocket operations +} + +// Factory function to create a new TermThemes instance with WSState. +func MakeTermThemes(state *scws.WSState) *TermThemes { + return &TermThemes{ + Themes: make(TermThemesType), + State: state, + } +} + +// LoadAndWatchThemes initializes the file watching and loads initial data. +func (t *TermThemes) LoadAndWatchThemes() { + dirPath := path.Join(scbase.GetWaveHomeDir(), TermThemeDir) + if _, err := os.Stat(dirPath); errors.Is(err, os.ErrNotExist) { + log.Printf("directory does not exist: %s", dirPath) + return + } + + // Load existing files and handle JSON conversion + if err := t.loadInitialFiles(dirPath); err != nil { + log.Println("failed to load initial files:", err) + return + } + + update := scbus.MakeUpdatePacket() + update.AddUpdate(t.Themes) + // spew.Dump("initialData", t.Themes) + + if err := t.State.WriteUpdate(update); err != nil { + log.Printf("error sending initial file data via WebSocket: %v", err) + } + + t.setupFileWatcher(dirPath) +} + +// Reads all JSON files in the specified directory. +func (t *TermThemes) loadInitialFiles(dirPath string) error { + files, err := os.ReadDir(dirPath) + if err != nil { + return err + } + + for _, file := range files { + if filepath.Ext(file.Name()) == ".json" { + filePath := filepath.Join(dirPath, file.Name()) + data, err := os.ReadFile(filePath) + if err != nil { + log.Printf("error reading file %s: %v", filePath, err) + continue + } + + content := make(map[string]string) + if err := json.Unmarshal(data, &content); err != nil { + log.Printf("error unmarshalling JSON from file %s: %v", filePath, err) + continue + } + t.Themes[file.Name()] = content + } + } + return nil +} + +func (t *TermThemes) setupFileWatcher(dirPath string) { + watcher, err := fsnotify.NewWatcher() + if err != nil { + log.Println("error creating file watcher:", err) + return + } + + go func() { + defer func() { + watcher.Close() + log.Println("file watcher stopped.") + }() + + for { + select { + case event, ok := <-watcher.Events: + if !ok { + return + } + log.Printf("event: %s, Op: %v\n", event.Name, event.Op) + if event.Op&fsnotify.Write == fsnotify.Write && filepath.Ext(event.Name) == ".json" { + t.handleFileChange(event.Name) + } + case err, ok := <-watcher.Errors: + if !ok { + return + } + log.Println("watcher error:", err) + } + } + }() + + err = watcher.Add(dirPath) + if err != nil { + log.Println("error adding directory to watcher:", err) + } +} + +func (t *TermThemes) handleFileChange(filePath string) error { + data, err := os.ReadFile(filePath) + if err != nil { + return fmt.Errorf("error reading file %s: %v", filePath, err) + } + + var content map[string]string + if err := json.Unmarshal(data, &content); err != nil { + return fmt.Errorf("error unmarshalling JSON from file %s: %v", filePath, err) + } + + t.Themes[filepath.Base(filePath)] = content + return t.State.WriteUpdate(t.Themes) +}