add cluster status API

Author: zyxkad

api/cluster.go

@@ -21,6 +21,8 @@ package api
 
 import (
 	"context"
+
+	"github.com/LiterMC/go-openbmclapi/config"
 )
 
 type ClusterStatus int32
@@ -61,14 +63,19 @@ type Cluster interface {
 	Host() string
 	Port() uint16
 	PublicHosts() []string
+	Options() *config.ClusterOptions
 
 	Status() ClusterStatus
 	Connect(context.Context) error
 	Disconnect(context.Context) error
 	Enable(context.Context) error
-	Disable(ctx context.Context) error
+	Disable(context.Context) error
 }
 
 type ClusterManager interface {
-	//
+	GetClusters() []Cluster
+	GetCluster(name string) Cluster
+	AddCluster(name string, opts *config.ClusterOptions) error
+	UpdateCluster(name string, opts *config.ClusterOptions) error
+	RemoveCluster(name string) bool
 }

api/v0/cluster.go

@@ -20,6 +20,7 @@
 package v0
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -29,10 +30,12 @@ import (
 
 	"github.com/LiterMC/go-openbmclapi/api"
 	"github.com/LiterMC/go-openbmclapi/config"
+	"github.com/LiterMC/go-openbmclapi/log"
 )
 
 func (h *Handler) buildClusterRoute(mux *http.ServeMux) {
 	mux.Handle("GET /cluster/list", permHandleFunc(api.ClusterPerm, h.routeClusterList))
+	mux.Handle("GET /cluster/status", permHandleFunc(api.ClusterPerm, h.routeClusterStatus))
 	mux.Handle("GET /cluster/config", permHandleFunc(api.ClusterPerm, h.routeClusterConfigGET))
 	mux.Handle("PUT /cluster/config", permHandleFunc(api.ClusterPerm, h.routeClusterConfigPUT))
 	mux.Handle("DELETE /cluster/config", permHandleFunc(api.ClusterPerm, h.routeClusterConfigDELETE))
@@ -42,8 +45,6 @@ func (h *Handler) buildClusterRoute(mux *http.ServeMux) {
 	mux.Handle("POST /cluster/disable", permHandleFunc(api.ClusterPerm, h.routeClusterDisable))
 }
 
-const configClustersPath = "clusters"
-
 func (h *Handler) routeClusterList(rw http.ResponseWriter, req *http.Request) {
 	data, err := json.Marshal(h.config.GetConfig().Clusters)
 	if err != nil {
@@ -65,6 +66,21 @@ func (h *Handler) routeClusterList(rw http.ResponseWriter, req *http.Request) {
 	rw.Write(data)
 }
 
+func (h *Handler) routeClusterStatus(rw http.ResponseWriter, req *http.Request) {
+	type clusterStatus struct {
+		Status api.ClusterStatus `json:"status"`
+		Sync   bool              `json:"sync"`
+	}
+	data := make(map[string]*clusterStatus)
+	for _, cluster := range h.clusters.GetClusters() {
+		data[cluster.Name()] = &clusterStatus{
+			Status: cluster.Status(),
+			Sync:   false, // TODO
+		}
+	}
+	writeJson(rw, http.StatusOK, data)
+}
+
 func (h *Handler) routeClusterConfigGET(rw http.ResponseWriter, req *http.Request) {
 	clusterId := req.URL.Query().Get("cluster_id")
 	clusterCfg, ok := h.config.GetConfig().Clusters[clusterId]
@@ -195,7 +211,19 @@ func (h *Handler) routeClusterConfigDELETE(rw http.ResponseWriter, req *http.Req
 
 func (h *Handler) routeClusterConnect(rw http.ResponseWriter, req *http.Request) {
 	clusterId := req.URL.Query().Get("cluster_id")
-	_ = clusterId
+	cluster := h.clusters.GetCluster(clusterId)
+	if cluster == nil {
+		writeJson(rw, http.StatusNotFound, Map{
+			"error": "ClusterNotFound",
+		})
+		return
+	}
+	go func() {
+		err := cluster.Connect(context.Background())
+		if err != nil {
+			log.Errorf("API Connect Error: %v", err)
+		}
+	}()
 	rw.WriteHeader(http.StatusNoContent)
 }
 
@@ -207,12 +235,37 @@ func (h *Handler) routeClusterSync(rw http.ResponseWriter, req *http.Request) {
 
 func (h *Handler) routeClusterEnable(rw http.ResponseWriter, req *http.Request) {
 	clusterId := req.URL.Query().Get("cluster_id")
-	_ = clusterId
+	cluster := h.clusters.GetCluster(clusterId)
+	if cluster == nil {
+		writeJson(rw, http.StatusNotFound, Map{
+			"error": "ClusterNotFound",
+		})
+		return
+	}
+	go func() {
+		err := cluster.Enable(context.Background())
+		if err != nil {
+			log.Errorf("API Enable Error: %v", err)
+		}
+	}()
 	rw.WriteHeader(http.StatusNoContent)
 }
 
 func (h *Handler) routeClusterDisable(rw http.ResponseWriter, req *http.Request) {
 	clusterId := req.URL.Query().Get("cluster_id")
-	_ = clusterId
+	cluster := h.clusters.GetCluster(clusterId)
+	if cluster == nil {
+		writeJson(rw, http.StatusNotFound, Map{
+			"error": "ClusterNotFound",
+		})
+		return
+	}
+	go func() {
+		err := cluster.Disable(context.Background())
+		if err != nil {
+			log.Errorf("API Disable Error: %v", err)
+		}
+		cluster.Disconnect(context.Background())
+	}()
 	rw.WriteHeader(http.StatusNoContent)
 }

cluster/cluster.go

@@ -70,6 +70,8 @@ type Cluster struct {
 	fileListLastMod int64
 }
 
+var _ api.Cluster = (*Cluster)(nil)
+
 func NewCluster(
 	name string, opts config.ClusterOptions, gcfg config.ClusterGeneralConfig,
 	storageManager *storage.Manager,

cluster/socket.go

@@ -124,7 +124,7 @@ func (cr *Cluster) Connect(ctx context.Context) error {
 // Disconnect will not disable the cluster
 //
 // See Connect
-func (cr *Cluster) Disconnect() error {
+func (cr *Cluster) Disconnect(context.Context) error {
 	if cr.Status().Disconnected() {
 		return nil
 	}