feeds

Author: kdudkov

cmd/goatak_server/admin_api.go

@@ -59,6 +59,7 @@ func (h *HttpServer) NewAdminAPI(app *App, addr string, webtakRoot string) *Admi
 	api.f.Get("/points", getPointsPage())
 	api.f.Get("/devices", getDevicesPage())
 	api.f.Get("/profiles", getProfilesPage())
+	api.f.Get("/feeds", getFeedsPage())
 
 	api.f.Get("/api/config", getConfigHandler(app))
 	api.f.Get("/api/connections", getApiConnHandler(app))
@@ -86,6 +87,11 @@ func (h *HttpServer) NewAdminAPI(app *App, addr string, webtakRoot string) *Admi
 	api.f.Put("/api/profile/:login/:uid", getApiProfilePutHandler(app))
 	api.f.Delete("/api/profile/:login/:uid", getApiProfileDeleteHandler(app))
 
+	api.f.Get("/api/feed", getApiFeedsHandler(app))
+	api.f.Post("/api/feed", getApiFeedPostHandler(app))
+	api.f.Put("/api/feed/:uid", getApiFeedPutHandler(app))
+	api.f.Delete("/api/feed/:uid", getApiFeedDeleteHandler(app))
+
 	api.f.Get("/api/mission", getApiAllMissionHandler(app))
 	api.f.Get("/api/mission/:id/changes", getApiAllMissionChangesHandler(app))
 
@@ -268,6 +274,18 @@ func getProfilesPage() fiber.Handler {
 	}
 }
 
+func getFeedsPage() fiber.Handler {
+	return func(ctx *fiber.Ctx) error {
+		data := map[string]any{
+			"theme": "auto",
+			"page":  " feeds",
+			"js":    []string{"feeds.js"},
+		}
+
+		return ctx.Render("templates/feeds", data, "templates/menu", "templates/header")
+	}
+}
+
 func getConfigHandler(app *App) fiber.Handler {
 	m := make(map[string]any, 0)
 	m["lat"] = app.lat
@@ -685,6 +703,100 @@ func getApiProfileDeleteHandler(app *App) fiber.Handler {
 	}
 }
 
+func getApiFeedsHandler(app *App) fiber.Handler {
+	return func(ctx *fiber.Ctx) error {
+		data := app.dbm.FeedQuery().All(true).Get()
+
+		feeds := make([]*model.FeedDTO, len(data))
+
+		for i, f := range data {
+			feeds[i] = f.DTO(true)
+		}
+
+		return ctx.JSON(feeds)
+	}
+}
+
+func getApiFeedPostHandler(app *App) fiber.Handler {
+	return func(ctx *fiber.Ctx) error {
+		var m *model.FeedPostDTO
+
+		if err := ctx.BodyParser(&m); err != nil {
+			return err
+		}
+
+		if m.UID == "" {
+			m.UID = uuid.NewString()
+		}
+
+		f := &model.Feed2{
+			UID:       m.UID,
+			Active:    m.Active,
+			Alias:     m.Alias,
+			URL:       m.URL,
+			Latitude:  m.Latitude,
+			Longitude: m.Longitude,
+			Fov:       m.Fov,
+			Heading:   m.Heading,
+			Range:     m.Range,
+			User:      Username(ctx),
+			Scope:     m.Scope,
+		}
+
+		if err := app.dbm.Create(f); err != nil {
+			return SendError(ctx, err.Error())
+		}
+
+		return ctx.JSON(f.DTO(true))
+	}
+}
+
+func getApiFeedPutHandler(app *App) fiber.Handler {
+	return func(ctx *fiber.Ctx) error {
+		uid := ctx.Params("uid")
+
+		f := app.dbm.FeedQuery().UID(uid).All(true).One()
+
+		if f == nil {
+			return ctx.SendStatus(fiber.StatusNotFound)
+		}
+
+		var m *model.FeedPutDTO
+
+		if err := ctx.BodyParser(&m); err != nil {
+			return err
+		}
+
+		f.Active = m.Active
+		f.Alias = m.Alias
+		f.URL = m.URL
+		f.Latitude = m.Latitude
+		f.Longitude = m.Longitude
+		f.Fov = m.Fov
+		f.Heading = m.Heading
+		f.Range = m.Range
+		f.Scope = m.Scope
+
+		if err := app.dbm.Save(f); err != nil {
+			return SendError(ctx, err.Error())
+		}
+
+		return ctx.JSON(f.DTO(true))
+	}
+}
+
+func getApiFeedDeleteHandler(app *App) fiber.Handler {
+	return func(ctx *fiber.Ctx) error {
+		uid := ctx.Params("uid")
+
+		if err := app.dbm.FeedQuery().UID(uid).Delete(); err != nil {
+			return SendError(ctx, err.Error())
+		}
+
+		return ctx.JSON(fiber.Map{"status": "ok"})
+	}
+}
+
 func getPluginsManifestHandler(_ *App) fiber.Handler {
 	return func(ctx *fiber.Ctx) error {
 		return ctx.JSON(fiber.Map{"plugins": []string{}, "iconSets": []string{}})

cmd/goatak_server/main.go

@@ -42,7 +42,6 @@ type App struct {
 
 	items    repository.ItemsRepository
 	messages []*model.ChatMessage
-	feeds    repository.FeedsRepository
 	dbm      *database.DatabaseManager
 	users    repository.DeviceRepository
 
@@ -59,7 +58,6 @@ func NewApp(config *config.AppConfig) *App {
 		ch:              make(chan *cot.CotMessage, 100),
 		handlers:        sync.Map{},
 		items:           repository.NewItemsMemoryRepo(),
-		feeds:           repository.NewFeedsFileRepo(filepath.Join(config.DataDir(), "feeds")),
 		uid:             uuid.NewString(),
 		eventProcessors: make([]*EventProcessor, 0),
 	}
@@ -93,12 +91,6 @@ func (app *App) Run() {
 		log.Fatal(err)
 	}
 
-	if app.feeds != nil {
-		if err := app.feeds.Start(); err != nil {
-			log.Fatal(err)
-		}
-	}
-
 	ctx, cancel := context.WithCancel(context.Background())
 
 	if addr := app.config.String("udp_addr"); addr != "" {

cmd/goatak_server/marti_api.go

@@ -557,35 +557,26 @@ func getVideoListHandler(app *App) fiber.Handler {
 		r := new(model.VideoConnections)
 		user := app.users.Get(Username(ctx))
 
-		app.feeds.ForEach(func(f *model.Feed2) bool {
-			if user.CanSeeScope(f.Scope) {
-				r.Feeds = append(r.Feeds, f.ToFeed())
-			}
-
-			return true
-		})
+		for _, f := range app.dbm.FeedQuery().Scope(user.Scope).ReadScope(user.ReadScope).Get() {
+			r.Feeds = append(r.Feeds, f.ToFeed())
+		}
 
 		return ctx.XML(r)
 	}
 }
 
 func getVideo2ListHandler(app *App) fiber.Handler {
 	return func(ctx *fiber.Ctx) error {
-		conn := make([]*model.VideoConnections2, 0)
 		user := app.users.Get(Username(ctx))
 
-		app.feeds.ForEach(func(f *model.Feed2) bool {
-			if user.CanSeeScope(f.Scope) {
-				conn = append(conn, &model.VideoConnections2{Feeds: []*model.Feed2{f}})
-			}
-
-			return true
-		})
-
-		r := make(map[string]any)
-		r["videoConnections"] = conn
+		feeds := app.dbm.FeedQuery().Scope(user.Scope).ReadScope(user.ReadScope).Get()
+		conn := make([]*model.VideoConnections2, len(feeds))
+		
+		for i, f := range feeds {
+				conn[i] = &model.VideoConnections2{Feeds: []*model.FeedDTO{f.DTO(false)}}
+		}
 
-		return ctx.JSON(r)
+		return ctx.JSON(fiber.Map{"videoConnections": conn})
 	}
 }
 
@@ -601,7 +592,13 @@ func getVideoPostHandler(app *App) fiber.Handler {
 		}
 
 		for _, f := range r.Feeds {
-			app.feeds.Store(f.ToFeed2().WithUser(username).WithScope(user.Scope))
+			f2 := f.ToFeed2()
+			f2.User = username
+			f2.Scope = user.GetScope()
+			
+			if err := app.dbm.Save(f2); err != nil {
+				app.logger.Error("error save feed", slog.Any("error", err))
+			}
 		}
 
 		return nil

cmd/goatak_server/mission_api.go

@@ -353,7 +353,13 @@ func getMissionCotHandler(app *App) fiber.Handler {
 		enc := xml.NewEncoder(fb)
 
 		for _, item := range mission.Points {
-			if err := enc.Encode(cot.CotToEvent(item.GetEvent())); err != nil {
+			evt := cot.CotToEvent(item.GetEvent())
+			
+			if evt == nil {
+				continue
+			}
+			
+			if err := enc.Encode(evt); err != nil {
 				app.logger.Error("xml encode error", slog.Any("error", err))
 			}
 		}