remove(store): store => service

app/api/api.go

@@ -9,7 +9,6 @@ import (
 	"sb.im/gosd/app/api/middleware"
 	"sb.im/gosd/app/api/v3"
 	"sb.im/gosd/app/service"
-	"sb.im/gosd/app/store"
 
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
@@ -19,8 +18,8 @@ import (
 
 var ApiPrefix = "/gosd/api/v3"
 
-func NewApi(s *store.Store, srv *service.Service) http.Handler {
-	if !s.Cfg().Debug {
+func NewApi(srv *service.Service) http.Handler {
+	if !srv.Cfg().Debug {
 		gin.SetMode(gin.ReleaseMode)
 	}
 
@@ -35,7 +34,7 @@ func NewApi(s *store.Store, srv *service.Service) http.Handler {
 		MaxAge:           12 * time.Hour,
 	}))
 
-	if u, err := url.Parse(s.Cfg().BaseURL); err == nil {
+	if u, err := url.Parse(srv.Cfg().BaseURL); err == nil {
 		ApiPrefix = u.Path
 	}
 
@@ -46,7 +45,7 @@ func NewApi(s *store.Store, srv *service.Service) http.Handler {
 		})
 	})
 
-	handler := v3.NewHandler(s, srv)
+	handler := v3.NewHandler(srv)
 
 	// Init Auth Middleware
 	if err := v3.InitAuthMiddleware(sr, handler); err != nil {

app/api/v3/handler.go

@@ -4,7 +4,6 @@ import (
 	"sb.im/gosd/app/config"
 	"sb.im/gosd/app/service"
 	"sb.im/gosd/app/storage"
-	"sb.im/gosd/app/store"
 
 	"github.com/go-redis/redis/v8"
 	"gorm.io/gorm"
@@ -16,18 +15,14 @@ type Handler struct {
 	srv *service.Service
 	cfg *config.Config
 	ofs *storage.Storage
-
-	store *store.Store
 }
 
-func NewHandler(s *store.Store, srv *service.Service) *Handler {
+func NewHandler(srv *service.Service) *Handler {
 	return &Handler{
-		cfg: s.Cfg(),
-		orm: s.Orm(),
-		rdb: s.Rdb(),
-		ofs: s.Ofs(),
+		cfg: srv.Cfg(),
+		orm: srv.Orm(),
+		rdb: srv.Rdb(),
+		ofs: srv.Ofs(),
 		srv: srv,
-
-		store: s,
 	}
 }

app/api/v3/task.go

@@ -120,7 +120,7 @@ func (h *Handler) TaskShow(c *gin.Context) {
 // @Failure 500
 // @Router /tasks/{id} [PUT]
 func (h *Handler) TaskUpdate(c *gin.Context) {
-	if id, _ := h.store.LockTaskGet(c.Param("id")); id != "" {
+	if id, _ := h.srv.LockTaskGet(c.Param("id")); id != "" {
 		c.JSON(http.StatusConflict, gin.H{"error": "This Task is Running"})
 		return
 	}
@@ -160,7 +160,7 @@ func (h *Handler) TaskUpdate(c *gin.Context) {
 // @Failure 500
 // @Router /tasks/{id} [DELETE]
 func (h *Handler) TaskDestroy(c *gin.Context) {
-	if id, _ := h.store.LockTaskGet(c.Param("id")); id != "" {
+	if id, _ := h.srv.LockTaskGet(c.Param("id")); id != "" {
 		c.JSON(http.StatusConflict, gin.H{"error": "This Task is Running"})
 		return
 	}

app/cmd/daemon.go

@@ -11,7 +11,6 @@ import (
 	"sb.im/gosd/app/luavm"
 	"sb.im/gosd/app/service"
 	"sb.im/gosd/app/storage"
-	"sb.im/gosd/app/store"
 	"sb.im/gosd/rpc2mqtt"
 
 	"sb.im/gosd/mqttd"
@@ -45,7 +44,6 @@ func NewHandler(ctx context.Context, cfg *config.Config) http.Handler {
 	rdb.ConfigSet(context.Background(), "notify-keyspace-events", "$KEx")
 
 	ofs := storage.NewStorage(cfg.StorageURL)
-	s := store.NewStore(cfg, orm, rdb, ofs)
 
 	store := state.NewState(cfg.RedisURL)
 
@@ -58,17 +56,7 @@ func NewHandler(ctx context.Context, cfg *config.Config) http.Handler {
 	rpcServer := rpc2mqtt.NewRpc2Mqtt(chI, chO)
 	go rpcServer.Run(ctx)
 
-	luaFile, err := ioutil.ReadFile(cfg.LuaFilePath)
-	if err == nil {
-		log.Warn("Use Lua File Path:", cfg.LuaFilePath)
-	}
-	worker := luavm.NewWorker(luavm.Config{
-		Instance: cfg.Instance,
-		BaseURL:  cfg.BaseURL,
-	}, s, rpcServer, luaFile)
-	go worker.Run(ctx)
-
-	srv := service.NewService(orm, rdb)
+	srv := service.NewService(cfg, orm, rdb, ofs)
 	if cfg.Schedule {
 		go srv.RunSchedule(ctx)
 	}
@@ -81,7 +69,17 @@ func NewHandler(ctx context.Context, cfg *config.Config) http.Handler {
 		DatabaseSeed(orm)
 	}
 
-	return api.NewApi(s, srv)
+	luaFile, err := ioutil.ReadFile(cfg.LuaFilePath)
+	if err == nil {
+		log.Warn("Use Lua File Path:", cfg.LuaFilePath)
+	}
+	worker := luavm.NewWorker(luavm.Config{
+		Instance: cfg.Instance,
+		BaseURL:  cfg.BaseURL,
+	}, srv, rpcServer, luaFile)
+	go worker.Run(ctx)
+
+	return api.NewApi(srv)
 }
 
 func Daemon(ctx context.Context) {

app/luavm/wlock.go

@@ -23,25 +23,25 @@ func (w *Worker) preTaskCheck(task *model.Task) error {
 }
 
 func (w *Worker) lockTaskSet(id string) error {
-	return w.store.LockTaskSet(id)
+	return w.srv.LockTaskSet(id)
 }
 
 func (w *Worker) lockTaskGet(id string) (string, error) {
-	return w.store.LockTaskGet(id)
+	return w.srv.LockTaskGet(id)
 }
 
 func (w *Worker) lockTaskDel(id string) error {
-	return w.store.LockTaskDel(id)
+	return w.srv.LockTaskDel(id)
 }
 
 func (w *Worker) lockNodeSet(id string) error {
-	return w.store.LockNodeSet(id)
+	return w.srv.LockNodeSet(id)
 }
 
 func (w *Worker) lockNodeGet(id string) (string, error) {
-	return w.store.LockNodeGet(id)
+	return w.srv.LockNodeGet(id)
 }
 
 func (w *Worker) lockNodeDel(id string) error {
-	return w.store.LockNodeDel(id)
+	return w.srv.LockNodeDel(id)
 }

app/luavm/worker.go

@@ -15,8 +15,8 @@ import (
 	"sb.im/gosd/app/logger"
 	"sb.im/gosd/app/luavm/lib"
 	"sb.im/gosd/app/model"
+	"sb.im/gosd/app/service"
 	"sb.im/gosd/app/storage"
-	"sb.im/gosd/app/store"
 
 	"github.com/go-redis/redis/v8"
 	"gorm.io/gorm"
@@ -27,20 +27,21 @@ import (
 )
 
 type Worker struct {
-	cfg    Config
-	ctx    context.Context
-	orm    *gorm.DB
-	rdb    *redis.Client
-	ofs    *storage.Storage
-	store  *store.Store
+	cfg Config
+	ctx context.Context
+	srv *service.Service
+	orm *gorm.DB
+	rdb *redis.Client
+	ofs *storage.Storage
+
 	script []byte
 	mutex  *sync.Mutex
 
 	rpc     *rpc2mqtt.Rpc2mqtt
 	Running map[string]*Service
 }
 
-func NewWorker(cfg Config, s *store.Store, rpc *rpc2mqtt.Rpc2mqtt, script []byte) *Worker {
+func NewWorker(cfg Config, srv *service.Service, rpc *rpc2mqtt.Rpc2mqtt, script []byte) *Worker {
 	ctx := context.TODO()
 	// default LuaFile: input > default
 	if len(script) == 0 {
@@ -51,14 +52,14 @@ func NewWorker(cfg Config, s *store.Store, rpc *rpc2mqtt.Rpc2mqtt, script []byte
 		}
 	}
 
-	// redis: config set notify-keyspace-events Ex
 	return &Worker{
-		cfg:    cfg,
-		ctx:    ctx,
-		orm:    s.Orm(),
-		rdb:    s.Rdb(),
-		ofs:    s.Ofs(),
-		store:  s,
+		cfg: cfg,
+		ctx: ctx,
+		srv: srv,
+		orm: srv.Orm(),
+		rdb: srv.Rdb(),
+		ofs: srv.Ofs(),
+
 		script: script,
 		mutex:  &sync.Mutex{},
 

app/luavm/worker_test.go

@@ -8,8 +8,8 @@ import (
 	"sb.im/gosd/app/config"
 	"sb.im/gosd/app/luavm/lib"
 	"sb.im/gosd/app/model"
+	"sb.im/gosd/app/service"
 	"sb.im/gosd/app/storage"
-	"sb.im/gosd/app/store"
 
 	"github.com/go-redis/redis/v8"
 	"gorm.io/driver/postgres"
@@ -40,7 +40,7 @@ func helpTestNewWorker(t *testing.T, script []byte) *Worker {
 	return NewWorker(Config{
 		Instance: cfg.Instance,
 		BaseURL:  cfg.BaseURL,
-	}, store.NewStore(cfg, orm, rdb, storage.NewStorage(t.TempDir())), nil, script)
+	}, service.NewService(cfg, orm, rdb, storage.NewStorage(t.TempDir())), nil, script)
 }
 
 func newTestTask(t *testing.T) *model.Task {

app/store/lock.go → app/service/lock.go

@@ -1,4 +1,4 @@
-package store
+package service
 
 import (
 	"context"
@@ -12,26 +12,26 @@ const (
 	lockTimeout = 2 * time.Hour
 )
 
-func (s *Store) LockTaskSet(id string) error {
+func (s *Service) LockTaskSet(id string) error {
 	return s.rdb.Set(context.Background(), lockTaskPrefix+id, s.cfg.Instance, lockTimeout).Err()
 }
 
-func (s *Store) LockTaskGet(id string) (string, error) {
+func (s *Service) LockTaskGet(id string) (string, error) {
 	return s.rdb.Get(context.Background(), lockTaskPrefix+id).Result()
 }
 
-func (s *Store) LockTaskDel(id string) error {
+func (s *Service) LockTaskDel(id string) error {
 	return s.rdb.Del(context.Background(), lockTaskPrefix+id).Err()
 }
 
-func (s *Store) LockNodeSet(id string) error {
+func (s *Service) LockNodeSet(id string) error {
 	return s.rdb.Set(context.Background(), lockNodePrefix+id, s.cfg.Instance, lockTimeout).Err()
 }
 
-func (s *Store) LockNodeGet(id string) (string, error) {
+func (s *Service) LockNodeGet(id string) (string, error) {
 	return s.rdb.Get(context.Background(), lockNodePrefix+id).Result()
 }
 
-func (s *Store) LockNodeDel(id string) error {
+func (s *Service) LockNodeDel(id string) error {
 	return s.rdb.Del(context.Background(), lockNodePrefix+id).Err()
 }

app/service/service.go

@@ -1,18 +1,39 @@
 package service
 
 import (
+	"sb.im/gosd/app/config"
+	"sb.im/gosd/app/storage"
+
 	"github.com/go-redis/redis/v8"
 	"github.com/robfig/cron/v3"
 	"gorm.io/gorm"
 )
 
 type Service struct {
+	cfg *config.Config
 	orm *gorm.DB
 	rdb *redis.Client
+	ofs *storage.Storage
 	// https://pkg.go.dev/github.com/robfig/cron/v3#Cron.Start
 	cron *cron.Cron
 }
 
-func NewService(orm *gorm.DB, rdb *redis.Client) *Service {
-	return &Service{orm, rdb, cron.New()}
+func NewService(cfg *config.Config, orm *gorm.DB, rdb *redis.Client, ofs *storage.Storage) *Service {
+	return &Service{cfg, orm, rdb, ofs, cron.New()}
+}
+
+func (s *Service) Cfg() *config.Config {
+	return s.cfg
+}
+
+func (s *Service) Orm() *gorm.DB {
+	return s.orm
+}
+
+func (s *Service) Rdb() *redis.Client {
+	return s.rdb
+}
+
+func (s *Service) Ofs() *storage.Storage {
+	return s.ofs
 }