diff --git a/api/config/get.go b/api/config/get.go index a38758d60..4578029c8 100644 --- a/api/config/get.go +++ b/api/config/get.go @@ -10,6 +10,7 @@ import ( "github.com/sashabaranov/go-openai" "net/http" "os" + "path/filepath" ) type APIConfigResp struct { @@ -19,30 +20,30 @@ type APIConfigResp struct { } func GetConfig(c *gin.Context) { - name := c.Param("name") + relativePath := c.Param("path") - path := nginx.GetConfPath("/", name) - if !helper.IsUnderDirectory(path, nginx.GetConfPath()) { + absPath := nginx.GetConfPath(relativePath) + if !helper.IsUnderDirectory(absPath, nginx.GetConfPath()) { c.JSON(http.StatusForbidden, gin.H{ "message": "path is not under the nginx conf path", }) return } - stat, err := os.Stat(path) + stat, err := os.Stat(absPath) if err != nil { api.ErrHandler(c, err) return } - content, err := os.ReadFile(path) + content, err := os.ReadFile(absPath) if err != nil { api.ErrHandler(c, err) return } q := query.Config g := query.ChatGPTLog - chatgpt, err := g.Where(g.Name.Eq(path)).FirstOrCreate() + chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate() if err != nil { api.ErrHandler(c, err) return @@ -52,7 +53,7 @@ func GetConfig(c *gin.Context) { chatgpt.Content = make([]openai.ChatCompletionMessage, 0) } - cfg, err := q.Where(q.Filepath.Eq(path)).FirstOrInit() + cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrInit() if err != nil { api.ErrHandler(c, err) return @@ -63,8 +64,9 @@ func GetConfig(c *gin.Context) { Name: stat.Name(), Content: string(content), ChatGPTMessages: chatgpt.Content, - FilePath: path, + FilePath: absPath, ModifiedAt: stat.ModTime(), + Dir: filepath.Dir(relativePath), }, SyncNodeIds: cfg.SyncNodeIds, SyncOverwrite: cfg.SyncOverwrite, diff --git a/api/config/modify.go b/api/config/modify.go index 7c7053dcc..c232a6d64 100644 --- a/api/config/modify.go +++ b/api/config/modify.go @@ -11,6 +11,7 @@ import ( "github.com/sashabaranov/go-openai" "net/http" "os" + "path/filepath" "time" ) @@ -19,11 +20,9 @@ type EditConfigJson struct { } func EditConfig(c *gin.Context) { - name := c.Param("name") + relativePath := c.Param("path") var json struct { Name string `json:"name" binding:"required"` - Filepath string `json:"filepath" binding:"required"` - NewFilepath string `json:"new_filepath" binding:"required"` Content string `json:"content"` SyncOverwrite bool `json:"sync_overwrite"` SyncNodeIds []uint64 `json:"sync_node_ids"` @@ -32,22 +31,8 @@ func EditConfig(c *gin.Context) { return } - path := json.Filepath - if !helper.IsUnderDirectory(path, nginx.GetConfPath()) { - c.JSON(http.StatusForbidden, gin.H{ - "message": "filepath is not under the nginx conf path", - }) - return - } - - if !helper.IsUnderDirectory(json.NewFilepath, nginx.GetConfPath()) { - c.JSON(http.StatusForbidden, gin.H{ - "message": "new filepath is not under the nginx conf path", - }) - return - } - - if !helper.FileExists(path) { + absPath := nginx.GetConfPath(relativePath) + if !helper.FileExists(absPath) { c.JSON(http.StatusNotFound, gin.H{ "message": "file not found", }) @@ -55,14 +40,14 @@ func EditConfig(c *gin.Context) { } content := json.Content - origContent, err := os.ReadFile(path) + origContent, err := os.ReadFile(absPath) if err != nil { api.ErrHandler(c, err) return } if content != "" && content != string(origContent) { - err = os.WriteFile(path, []byte(content), 0644) + err = os.WriteFile(absPath, []byte(content), 0644) if err != nil { api.ErrHandler(c, err) return @@ -70,17 +55,15 @@ func EditConfig(c *gin.Context) { } q := query.Config - cfg, err := q.Where(q.Filepath.Eq(json.Filepath)).FirstOrCreate() + cfg, err := q.Where(q.Filepath.Eq(absPath)).FirstOrCreate() if err != nil { api.ErrHandler(c, err) return } - _, err = q.Where(q.Filepath.Eq(json.Filepath)). - Select(q.Name, q.Filepath, q.SyncNodeIds, q.SyncOverwrite). + _, err = q.Where(q.Filepath.Eq(absPath)). + Select(q.SyncNodeIds, q.SyncOverwrite). Updates(&model.Config{ - Name: json.Name, - Filepath: json.NewFilepath, SyncNodeIds: json.SyncNodeIds, SyncOverwrite: json.SyncOverwrite, }) @@ -89,27 +72,12 @@ func EditConfig(c *gin.Context) { return } - g := query.ChatGPTLog - // handle rename - if path != json.NewFilepath { - if helper.FileExists(json.NewFilepath) { - c.JSON(http.StatusNotAcceptable, gin.H{ - "message": "File exists", - }) - return - } - err := os.Rename(json.Filepath, json.NewFilepath) - if err != nil { - api.ErrHandler(c, err) - return - } - - // update ChatGPT record - _, _ = g.Where(g.Name.Eq(json.NewFilepath)).Delete() - _, _ = g.Where(g.Name.Eq(path)).Update(g.Name, json.NewFilepath) - } + // use the new values + cfg.SyncNodeIds = json.SyncNodeIds + cfg.SyncOverwrite = json.SyncOverwrite - err = config.SyncToRemoteServer(cfg, json.NewFilepath) + g := query.ChatGPTLog + err = config.SyncToRemoteServer(cfg, absPath) if err != nil { api.ErrHandler(c, err) return @@ -123,7 +91,7 @@ func EditConfig(c *gin.Context) { return } - chatgpt, err := g.Where(g.Name.Eq(json.NewFilepath)).FirstOrCreate() + chatgpt, err := g.Where(g.Name.Eq(absPath)).FirstOrCreate() if err != nil { api.ErrHandler(c, err) return @@ -134,10 +102,11 @@ func EditConfig(c *gin.Context) { } c.JSON(http.StatusOK, config.Config{ - Name: name, + Name: filepath.Base(absPath), Content: content, ChatGPTMessages: chatgpt.Content, - FilePath: json.NewFilepath, + FilePath: absPath, ModifiedAt: time.Now(), + Dir: filepath.Dir(relativePath), }) } diff --git a/api/config/rename.go b/api/config/rename.go index fa1facac0..4e5efb948 100644 --- a/api/config/rename.go +++ b/api/config/rename.go @@ -5,11 +5,13 @@ import ( "github.com/0xJacky/Nginx-UI/internal/config" "github.com/0xJacky/Nginx-UI/internal/helper" "github.com/0xJacky/Nginx-UI/internal/nginx" + "github.com/0xJacky/Nginx-UI/model" "github.com/0xJacky/Nginx-UI/query" "github.com/gin-gonic/gin" "github.com/uozi-tech/cosy/logger" "net/http" "os" + "strings" ) func Rename(c *gin.Context) { @@ -77,7 +79,10 @@ func Rename(c *gin.Context) { _, _ = g.Where(g.Name.Like(origFullPath+"%")).Update(g.Name, g.Name.Replace(origFullPath, newFullPath)) } - _, err = q.Where(q.Filepath.Eq(origFullPath)).Update(q.Filepath, newFullPath) + _, err = q.Where(q.Filepath.Eq(origFullPath)).Updates(&model.Config{ + Filepath: newFullPath, + Name: json.NewName, + }) if err != nil { api.ErrHandler(c, err) return @@ -92,6 +97,6 @@ func Rename(c *gin.Context) { } c.JSON(http.StatusOK, gin.H{ - "message": "ok", + "path": strings.TrimLeft(newFullPath, nginx.GetConfPath()), }) } diff --git a/api/config/router.go b/api/config/router.go index 2031a237a..2d9b9d0f5 100644 --- a/api/config/router.go +++ b/api/config/router.go @@ -9,9 +9,9 @@ func InitRouter(r *gin.RouterGroup) { r.GET("config_base_path", GetBasePath) r.GET("configs", GetConfigs) - r.GET("configs/*name", GetConfig) + r.GET("configs/*path", GetConfig) r.POST("configs", AddConfig) - r.POST("configs/*name", EditConfig) + r.POST("configs/*path", EditConfig) o := r.Group("", middleware.RequireSecureSession()) { diff --git a/api/notification/live.go b/api/notification/live.go new file mode 100644 index 000000000..4f028e66b --- /dev/null +++ b/api/notification/live.go @@ -0,0 +1,31 @@ +package notification + +import ( + "github.com/0xJacky/Nginx-UI/internal/notification" + "github.com/0xJacky/Nginx-UI/model" + "github.com/gin-gonic/gin" + "io" +) + +func Live(c *gin.Context) { + c.Header("Content-Type", "text/event-stream") + c.Header("Cache-Control", "no-cache") + c.Header("Connection", "keep-alive") + + evtChan := make(chan *model.Notification) + + notification.SetClient(c, evtChan) + + notify := c.Writer.CloseNotify() + go func() { + <-notify + notification.RemoveClient(c) + }() + + for n := range evtChan { + c.Stream(func(w io.Writer) bool { + c.SSEvent("message", n) + return false + }) + } +} diff --git a/api/notification/router.go b/api/notification/router.go index 87c3d166c..fc5caa295 100644 --- a/api/notification/router.go +++ b/api/notification/router.go @@ -7,4 +7,6 @@ func InitRouter(r *gin.RouterGroup) { r.GET("notifications/:id", Get) r.DELETE("notifications/:id", Destroy) r.DELETE("notifications", DestroyAll) + + r.GET("notifications/live", Live) } diff --git a/app/package.json b/app/package.json index c4cb7cda6..17203839b 100644 --- a/app/package.json +++ b/app/package.json @@ -38,6 +38,7 @@ "pinia-plugin-persistedstate": "^4.1.2", "reconnecting-websocket": "^4.4.0", "sortablejs": "^1.15.3", + "sse.js": "^2.5.0", "universal-cookie": "^7.2.2", "unocss": "^0.63.6", "vite-plugin-build-id": "0.5.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 6c3106c00..b703590b5 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -83,6 +83,9 @@ importers: sortablejs: specifier: ^1.15.3 version: 1.15.3 + sse.js: + specifier: ^2.5.0 + version: 2.5.0 universal-cookie: specifier: ^7.2.2 version: 7.2.2 @@ -4271,6 +4274,9 @@ packages: spdx-license-ids@3.0.20: resolution: {integrity: sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==} + sse.js@2.5.0: + resolution: {integrity: sha512-I7zYndqOOkNpz9KIdFZ8c8A7zs1YazNewBr8Nsi/tqThfJkVPuP1q7UE2h4B0RwoWZxbBYpd06uoW3NI3SaZXg==} + stable-hash@0.0.4: resolution: {integrity: sha512-LjdcbuBeLcdETCrPn9i8AYAZ1eCtu4ECAWtP7UleOiZ9LzVxRzzUZEoZ8zB24nhkQnDWyET0I+3sWokSDS3E7g==} @@ -9690,6 +9696,8 @@ snapshots: spdx-license-ids@3.0.20: {} + sse.js@2.5.0: {} + stable-hash@0.0.4: {} std-env@3.7.0: {} diff --git a/app/src/api/config.ts b/app/src/api/config.ts index b43c65ef9..f1876c7d9 100644 --- a/app/src/api/config.ts +++ b/app/src/api/config.ts @@ -10,6 +10,7 @@ export interface Config { modified_at: string sync_node_ids?: number[] sync_overwrite?: false + dir: string } class ConfigCurd extends Curd { @@ -25,7 +26,7 @@ class ConfigCurd extends Curd { return http.post('/config_mkdir', { base_path: basePath, folder_name: name }) } - rename(basePath: string, origName: string, newName: string, syncNodeIds: number[]) { + rename(basePath: string, origName: string, newName: string, syncNodeIds?: number[]) { return http.post('/config_rename', { base_path: basePath, orig_name: origName, diff --git a/app/src/components/Notification/Notification.vue b/app/src/components/Notification/Notification.vue index 49ae62d0e..c88f1045e 100644 --- a/app/src/components/Notification/Notification.vue +++ b/app/src/components/Notification/Notification.vue @@ -1,22 +1,71 @@