Browse Source

Merge remote-tracking branch 'origin/master' into webui

webui
Stian Aune 5 years ago
parent
commit
59240ce22d
  1. 5
      cmd/lucifer-server/main.go
  2. 265
      controllers/bridge-controller.go
  3. 256
      controllers/group-controller.go
  4. 195
      controllers/light-controller.go
  5. 2
      controllers/user-controller.go
  6. 4
      database/sqlite/bridge-repository.go
  7. 35
      database/sqlite/group-repository.go
  8. 5
      database/sqlite/light-repository.go
  9. 3
      internal/httperr/error.go
  10. 14
      light/driver.go
  11. 24
      light/hue/driver.go
  12. 136
      light/service.go
  13. 22
      models/light.go

5
cmd/lucifer-server/main.go

@ -44,16 +44,19 @@ func main() {
// Controllers
userController := controllers.NewUserController(sqlite.UserRepository, sqlite.SessionRepository)
groupController := controllers.NewGroupController(sqlite.GroupRepository, sqlite.UserRepository, sqlite.LightRepository)
lightController := controllers.NewLightController(lightService, sqlite.GroupRepository, sqlite.UserRepository, sqlite.LightRepository)
bridgeController := controllers.NewBridgeController(lightService, sqlite.GroupRepository)
// Router
router := mux.NewRouter()
router.Use(middlewares.Session(sqlite.SessionRepository, sqlite.UserRepository))
groupController.Mount(router, "/api/group/")
userController.Mount(router, "/api/user/")
lightController.Mount(router, "/api/light/")
bridgeController.Mount(router, "/api/bridge/")
// Background Tasks
go lightService.SyncLoop(context.TODO())
//go lightService.DiscoverLoop(context.TODO())
// TODO: Listen in another goroutine and have SIGINT/SIGTERM handlers with graceful shutdown.
http.ListenAndServe(conf.Server.Address, router)

265
controllers/bridge-controller.go

@ -0,0 +1,265 @@
package controllers
import (
"context"
"database/sql"
"encoding/json"
"errors"
"net/http"
"strconv"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
"git.aiterp.net/lucifer/lucifer/internal/respond"
"git.aiterp.net/lucifer/lucifer/light"
"git.aiterp.net/lucifer/lucifer/models"
"github.com/gorilla/mux"
)
// The BridgeController is a controller for all bridge things.
type BridgeController struct {
service *light.Service
groups models.GroupRepository
}
// getBridges (`GET /`): Get all bridges
func (c *BridgeController) getBridges(w http.ResponseWriter, r *http.Request) {
bridges, err := c.service.Bridges(r.Context())
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridges)
}
// getBridge (`GET /:bridge_id`): Get bridge by ID
func (c *BridgeController) getBridge(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["bridge_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
return
}
bridge, err := c.service.Bridge(r.Context(), int(id))
if err == sql.ErrNoRows {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// postBridge (`POST /`): Post bridge
func (c *BridgeController) postBridge(w http.ResponseWriter, r *http.Request) {
postData := struct {
Name string `json:"name"`
Driver string `json:"driver"`
Addr string `json:"addr"`
}{}
if err := json.NewDecoder(r.Body).Decode(&postData); err != nil || postData.Name == "" || postData.Driver == "" || postData.Addr == "" {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
bridge, err := c.service.DirectConnect(r.Context(), postData.Driver, postData.Addr, postData.Name)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// updateBridge (`PUT/PATCH /:bridge_id`): Update bridge by ID
func (c *BridgeController) updateBridge(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["bridge_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
return
}
putData := struct {
Name string
}{}
if err := json.NewDecoder(r.Body).Decode(&putData); err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
if putData.Name == "" {
respond.Error(w, http.StatusBadRequest, "invalid_name", "The name cannot be blank.")
return
}
bridge, err := c.service.Bridge(r.Context(), int(id))
if err == sql.ErrNoRows {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
bridge.Name = putData.Name
err = c.service.UpdateBridge(r.Context(), bridge)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// postBridgeDiscover (`POST /:bridge_id/discover`): Delete bridge by ID
func (c *BridgeController) postBridgeDiscover(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["bridge_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
return
}
bridge, err := c.service.Bridge(r.Context(), int(id))
if err == sql.ErrNoRows {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
err = c.service.DiscoverLights(r.Context(), bridge)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// deleteBridge (`DELETE /:bridge_id`): Delete bridge by ID
func (c *BridgeController) deleteBridge(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["bridge_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
return
}
bridge, err := c.service.Bridge(r.Context(), int(id))
if err == sql.ErrNoRows {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
err = c.service.DeleteBridge(r.Context(), bridge)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// deleteBridgeLight (`DELETE /:bridge_id/light/:light_id`): Delete bridge by ID
func (c *BridgeController) deleteBridgeLight(w http.ResponseWriter, r *http.Request) {
idStr := mux.Vars(r)["bridge_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
return
}
lightIDStr := mux.Vars(r)["light_id"]
lightID, err := strconv.ParseInt(lightIDStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+lightIDStr+" is not valid.")
return
}
bridge, err := c.service.Bridge(r.Context(), int(id))
if err == sql.ErrNoRows {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
light, err := c.service.Light(r.Context(), int(lightID))
if err != nil {
httperr.Respond(w, err)
return
}
if light.BridgeID != bridge.ID {
respond.Error(w, 404, "bridge_not_found", "The bridge cannot be found.")
return
}
err = c.service.DeleteBridgeLight(r.Context(), bridge, light)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, bridge)
}
// Mount mounts the controller
func (c *BridgeController) Mount(router *mux.Router, prefix string) {
sub := router.PathPrefix(prefix).Subrouter()
sub.Use(c.adminMiddleware())
sub.HandleFunc("/", c.getBridges).Methods("GET")
sub.HandleFunc("/", c.postBridge).Methods("POST")
sub.HandleFunc("/{bridge_id}", c.getBridge).Methods("GET")
sub.HandleFunc("/{bridge_id}", c.updateBridge).Methods("PUT", "PATCH")
sub.HandleFunc("/{bridge_id}", c.deleteBridge).Methods("DELETE")
sub.HandleFunc("/{bridge_id}/light/{light_id}", c.deleteBridgeLight).Methods("DELETE")
sub.HandleFunc("/{bridge_id}/discover", c.postBridgeDiscover).Methods("POST")
}
func (c *BridgeController) adminMiddleware() mux.MiddlewareFunc {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
err := c.isAdmin(r.Context())
if err != nil {
httperr.Respond(w, err)
return
}
next.ServeHTTP(w, r)
})
}
}
func (c *BridgeController) isAdmin(ctx context.Context) error {
user := models.UserFromContext(ctx)
lonelyLights, err := c.groups.FindByID(ctx, 0)
if err != nil {
return errors.New("Lonely Lights group could not be found")
}
if !lonelyLights.Permission(user.ID).Write {
return httperr.ErrAccessDenied
}
return nil
}
// NewBridgeController makes a new bridge controller
func NewBridgeController(service *light.Service, groups models.GroupRepository) *BridgeController {
return &BridgeController{
service: service,
groups: groups,
}
}

256
controllers/group-controller.go

@ -2,17 +2,20 @@ package controllers
import (
"database/sql"
"encoding/json"
"fmt"
"log"
"net/http"
"strconv"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
"git.aiterp.net/lucifer/lucifer/internal/respond"
"git.aiterp.net/lucifer/lucifer/models"
"github.com/gorilla/mux"
)
// The GroupController is a controller for all user inports.
// The GroupController is a controller for all group stuff.
type GroupController struct {
groups models.GroupRepository
users models.UserRepository
@ -21,20 +24,10 @@ type GroupController struct {
// getGroups (`GET /:id`): Get user by id
func (c *GroupController) getGroups(w http.ResponseWriter, r *http.Request) {
session := models.SessionFromContext(r.Context())
if session == nil {
respond.Error(w, http.StatusForbidden, "permission_denied", "You must log in")
return
}
user := models.UserFromContext(r.Context())
user, err := c.users.FindByID(r.Context(), session.UserID)
groups, err := c.groups.ListByUser(r.Context(), *user)
if err != nil {
respond.Error(w, http.StatusForbidden, "permission_denied", "You must log in")
return
}
groups, err := c.groups.ListByUser(r.Context(), user)
if err != nil && err != sql.ErrNoRows {
log.Printf("Getting groups for user %s (%d) failed: %s", user.Name, user.ID, err)
respond.Error(w, http.StatusInternalServerError, "internal_error", "Failed to get groups.")
return
@ -43,15 +36,11 @@ func (c *GroupController) getGroups(w http.ResponseWriter, r *http.Request) {
respond.Data(w, groups)
}
// getGroup (`GET /:id`): Get user by id
// getGroup (`GET /:group_id`): Get user by id
func (c *GroupController) getGroup(w http.ResponseWriter, r *http.Request) {
session := models.SessionFromContext(r.Context())
if session == nil {
respond.Error(w, http.StatusForbidden, "permission_denied", "You must log in")
return
}
idStr := mux.Vars(r)["id"]
idStr := mux.Vars(r)["group_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id"+idStr+"is not valid.")
@ -67,15 +56,11 @@ func (c *GroupController) getGroup(w http.ResponseWriter, r *http.Request) {
respond.Data(w, group)
}
// getGroupLights (`GET /:id/light/`): Get user by id
// getGroupLights (`GET /:group_id/light/`): Get user by id
func (c *GroupController) getGroupLights(w http.ResponseWriter, r *http.Request) {
session := models.SessionFromContext(r.Context())
if session == nil {
respond.Error(w, http.StatusForbidden, "permission_denied", "You must log in")
return
}
idStr := mux.Vars(r)["id"]
idStr := mux.Vars(r)["group_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The id "+idStr+" is not valid.")
@ -98,13 +83,9 @@ func (c *GroupController) getGroupLights(w http.ResponseWriter, r *http.Request)
respond.Data(w, lights)
}
// getGroupLight (`GET /:group_id/light/:id`): Get user by id
// getGroupLight (`GET /:group_id/light/:light_id`): Get user by id
func (c *GroupController) getGroupLight(w http.ResponseWriter, r *http.Request) {
session := models.SessionFromContext(r.Context())
if session == nil {
respond.Error(w, http.StatusForbidden, "permission_denied", "You must log in")
return
}
groupIDStr := mux.Vars(r)["group_id"]
groupID, err := strconv.ParseInt(groupIDStr, 10, 32)
@ -113,7 +94,7 @@ func (c *GroupController) getGroupLight(w http.ResponseWriter, r *http.Request)
return
}
idStr := mux.Vars(r)["id"]
idStr := mux.Vars(r)["light_id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The light id "+idStr+" is not valid.")
@ -136,14 +117,221 @@ func (c *GroupController) getGroupLight(w http.ResponseWriter, r *http.Request)
respond.Data(w, light)
}
// postGroup (`POST /`): Create a group.
func (c *GroupController) postGroup(w http.ResponseWriter, r *http.Request) {
user := models.UserFromContext(r.Context())
postData := struct {
Name string
}{}
if err := json.NewDecoder(r.Body).Decode(&postData); err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
if postData.Name == "" {
respond.Error(w, http.StatusBadRequest, "invalid_name", "The name cannot be blank.")
return
}
group, err := c.groups.Insert(r.Context(), models.Group{Name: postData.Name})
if err != nil {
httperr.Respond(w, err)
return
}
permission := models.GroupPermission{
GroupID: group.ID,
UserID: user.ID,
Read: true,
Write: true,
Delete: true,
Create: true,
Manage: true,
}
err = c.groups.UpdatePermissions(r.Context(), permission)
if err != nil {
httperr.Respond(w, err)
return
}
group.Permissions = []models.GroupPermission{permission}
respond.Data(w, group)
}
// updateGroup (`PUT/PATCH /:group_id`): Create a group.
func (c *GroupController) updateGroup(w http.ResponseWriter, r *http.Request) {
user := models.UserFromContext(r.Context())
groupIDStr := mux.Vars(r)["group_id"]
groupID, err := strconv.ParseInt(groupIDStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The group id "+groupIDStr+" is not valid.")
return
}
postData := struct {
Name string
}{}
if err := json.NewDecoder(r.Body).Decode(&postData); err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
if postData.Name == "" {
respond.Error(w, http.StatusBadRequest, "invalid_name", "The name cannot be blank.")
return
}
group, err := c.groups.FindByID(r.Context(), int(groupID))
if err != nil {
respond.Error(w, http.StatusNotFound, "group_not_found", "The group cannot be found or you are not authorized to view it.")
return
} else if !group.Permission(user.ID).Manage {
respond.Error(w, http.StatusNotFound, "permission_denied", "Your transgression will be remembered.")
return
}
group.Name = postData.Name
err = c.groups.Update(r.Context(), group)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, group)
}
// updateGroupPermission (`PUT/PATCH /:group_id/permission/:user_id`): Update a user's permission on a group.
func (c *GroupController) updateGroupPermission(w http.ResponseWriter, r *http.Request) {
user := models.UserFromContext(r.Context())
groupIDStr := mux.Vars(r)["group_id"]
groupID, err := strconv.ParseInt(groupIDStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The group id "+groupIDStr+" is not valid.")
return
}
userIDStr := mux.Vars(r)["user_id"]
userID, err := strconv.ParseInt(userIDStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The user id "+userIDStr+" is not valid.")
return
}
putData := struct {
Read *bool `json:"read"`
Write *bool `json:"write"`
Create *bool `json:"create"`
Delete *bool `json:"delete"`
Manage *bool `json:"manage"`
}{}
if err := json.NewDecoder(r.Body).Decode(&putData); err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
if putData.Manage != nil {
respond.Error(w, http.StatusBadRequest, "cannot_change_manage", "You cannot change the manage permission.")
return
}
group, err := c.groups.FindByID(r.Context(), int(groupID))
if err != nil {
respond.Error(w, http.StatusNotFound, "group_not_found", "The group could not be found.")
return
} else if !group.Permission(user.ID).Manage {
respond.Error(w, http.StatusForbidden, "permission_denied", "This transgression has been dispatched to the North Pole for review.")
return
}
user2, err := c.users.FindByID(r.Context(), int(userID))
if err == sql.ErrNoRows {
respond.Error(w, http.StatusNotFound, "user_not_Found", "The user could not be found.")
return
} else if err != nil {
httperr.Respond(w, err)
return
}
permissions := group.Permission(user2.ID)
if putData.Read != nil {
permissions.Read = *putData.Read
}
if putData.Write != nil {
permissions.Write = *putData.Write
}
if putData.Create != nil {
permissions.Create = *putData.Create
}
if putData.Delete != nil {
permissions.Delete = *putData.Delete
}
err = c.groups.UpdatePermissions(r.Context(), permissions)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, permissions)
}
// deleteGroup (`DELETE /:group_id`): Delete a group.
func (c *GroupController) deleteGroup(w http.ResponseWriter, r *http.Request) {
user := models.UserFromContext(r.Context())
groupIDStr := mux.Vars(r)["group_id"]
groupID, err := strconv.ParseInt(groupIDStr, 10, 32)
if err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_id", "The group id "+groupIDStr+" is not valid.")
return
}
group, err := c.groups.FindByID(r.Context(), int(groupID))
if err != nil {
respond.Error(w, http.StatusNotFound, "group_not_found", "The group cannot be found.")
return
} else if !group.Permission(user.ID).Manage {
respond.Error(w, http.StatusNotFound, "permission_denied", "Your transgression will be remembered.")
return
}
lights, err := c.lights.ListByGroup(r.Context(), group)
if err != nil && err != sql.ErrNoRows {
httperr.Respond(w, err)
return
}
for _, light := range lights {
light.GroupID = 0
err := c.lights.Update(r.Context(), light)
if err != nil {
httperr.Respond(w, err)
return
}
}
err = c.groups.Remove(r.Context(), group)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, group)
}
// Mount mounts the controller
func (c *GroupController) Mount(router *mux.Router, prefix string) {
sub := router.PathPrefix(prefix).Subrouter()
sub.HandleFunc("/", c.getGroups).Methods("GET")
sub.HandleFunc("/{id}", c.getGroup).Methods("GET")
sub.HandleFunc("/{id}/light/", c.getGroupLights).Methods("GET")
sub.HandleFunc("/{group_id}/light/{id}", c.getGroupLight).Methods("GET")
sub.HandleFunc("/", c.postGroup).Methods("POST")
sub.HandleFunc("/{group_id}", c.getGroup).Methods("GET")
sub.HandleFunc("/{group_id}", c.updateGroup).Methods("PUT", "PATCH")
sub.HandleFunc("/{group_id}", c.deleteGroup).Methods("DELETE")
sub.HandleFunc("/{group_id}/permission/{user_id}", c.updateGroupPermission).Methods("PUT", "PATCH")
sub.HandleFunc("/{group_id}/light/", c.getGroupLights).Methods("GET")
sub.HandleFunc("/{group_id}/light/{light_id}", c.getGroupLight).Methods("GET")
}
// NewGroupController creates a new GroupController.

195
controllers/light-controller.go

@ -0,0 +1,195 @@
package controllers
import (
"database/sql"
"encoding/json"
"net/http"
"strconv"
"git.aiterp.net/lucifer/lucifer/light"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
"git.aiterp.net/lucifer/lucifer/internal/respond"
"git.aiterp.net/lucifer/lucifer/models"
"github.com/gorilla/mux"
"golang.org/x/sync/errgroup"
)
// The LightController is a controller for light matters.
type LightController struct {
service *light.Service
groups models.GroupRepository
users models.UserRepository
lights models.LightRepository
}
// getLights (`GET /:id`): Get user by id
func (c *LightController) getLights(w http.ResponseWriter, r *http.Request) {
user := models.UserFromContext(r.Context())
groups, err := c.groups.ListByUser(r.Context(), *user)
if err != nil {
httperr.Respond(w, err)
return
}
allLights := make([]models.Light, 0, len(groups)*8)
eg, egCtx := errgroup.WithContext(r.Context())
for i := range groups {
group := groups[i]
eg.Go(func() error {
lights, err := c.lights.ListByGroup(egCtx, group)
if err != nil {
return err
}
allLights = append(allLights, lights...)
return nil
})
}
if err := eg.Wait(); err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, allLights)
}
func (c *LightController) getLight(w http.ResponseWriter, r *http.Request) {
_, light, err := c.findLight(r)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, light)
}
func (c *LightController) updateLight(w http.ResponseWriter, r *http.Request) {
patch := struct {
Color *string `json:"color,omitempty"`
Brightness *int `json:"brightness,omitempty"`
On *bool `json:"on,omitempty"`
Name *string `json:"name,omitempty"`
GroupID *int `json:"groupId,omitempty"`
}{}
if err := json.NewDecoder(r.Body).Decode(&patch); err != nil {
respond.Error(w, http.StatusBadRequest, "invalid_json", "Input is not valid JSON.")
return
}
group, light, err := c.findLight(r)
if err != nil {
httperr.Respond(w, err)
return
}
if patch.Color != nil {
err := light.SetColor(*patch.Color)
if err != nil {
httperr.Respond(w, err)
return
}
}
if patch.Name != nil {
if len(*patch.Name) == 0 {
respond.Error(w, 400, "invalid_name", "The name is empty.")
return
}
light.Name = *patch.Name
}
if patch.Brightness != nil {
if *patch.Brightness < 0 || *patch.Brightness > 255 {
respond.Error(w, 400, "invalid_brightness", "The brightness must be a value between 0-255 inclusive.")
return
}
light.Brightness = uint8(*patch.Brightness)
}
if patch.On != nil {
light.On = *patch.On
}
if patch.GroupID != nil && *patch.GroupID != light.GroupID {
user := models.UserFromContext(r.Context())
if !group.Permission(user.ID).Delete {
respond.Error(w, 403, "cannot_move_out", "You are not permitted to delete lights from group.")
return
}
// Anyone is allowed to move lights TO group 0 (Lonely Lights) as it's the closest thing there is
// to deleting lights.
if *patch.GroupID != 0 {
targetGroup, err := c.groups.FindByID(r.Context(), *patch.GroupID)
if err != nil {
respond.Error(w, 404, "group_not_found", "The group could not be found.")
return
}
if !targetGroup.Permission(user.ID).Create {
respond.Error(w, 403, "cannot_move_in", "You are not permitted to create lights in target group.")
return
}
}
light.GroupID = *patch.GroupID
}
err = c.service.UpdateLight(r.Context(), light)
if err != nil {
httperr.Respond(w, err)
return
}
respond.Data(w, light)
}
// Mount mounts the controller
func (c *LightController) Mount(router *mux.Router, prefix string) {
sub := router.PathPrefix(prefix).Subrouter()
sub.HandleFunc("/", c.getLights).Methods("GET")
sub.HandleFunc("/{id}", c.getLight).Methods("GET")
sub.HandleFunc("/{id}", c.updateLight).Methods("PATCH", "PUT")
}
func (c *LightController) findLight(r *http.Request) (models.Group, models.Light, error) {
user := models.UserFromContext(r.Context())
idStr := mux.Vars(r)["id"]
id, err := strconv.ParseInt(idStr, 10, 32)
if err != nil {
return models.Group{}, models.Light{}, &httperr.Error{Status: http.StatusForbidden, Kind: "invalid_id", Message: "The light id " + idStr + " is not valid."}
}
light, err := c.lights.FindByID(r.Context(), int(id))
if err == sql.ErrNoRows {
return models.Group{}, models.Light{}, httperr.NotFound("Light")
} else if err != nil {
return models.Group{}, models.Light{}, err
}
group, err := c.groups.FindByID(r.Context(), light.GroupID)
if err == sql.ErrNoRows {
return models.Group{}, models.Light{}, httperr.NotFound("Group")
} else if err != nil {
return models.Group{}, models.Light{}, err
}
if !group.Permission(user.ID).Read {
return models.Group{}, models.Light{}, &httperr.Error{Status: http.StatusForbidden, Kind: "permission_denied", Message: "Thou canst not see the light."}
}
return group, light, nil
}
// NewLightController creates a new LightController.
func NewLightController(service *light.Service, groups models.GroupRepository, users models.UserRepository, lights models.LightRepository) *LightController {
return &LightController{service: service, groups: groups, users: users, lights: lights}
}

2
controllers/user-controller.go

@ -12,7 +12,7 @@ import (
"github.com/gorilla/mux"
)
// The UserController is a controller for all user inports.
// The UserController is a controller for all users.
type UserController struct {
users models.UserRepository
sessions models.SessionRepository

4
database/sqlite/bridge-repository.go

@ -48,11 +48,11 @@ func (b *bridgeRepository) Insert(ctx context.Context, bridge models.Bridge) (mo
}
func (b *bridgeRepository) Update(ctx context.Context, bridge models.Bridge) error {
_, err := db.NamedExecContext(ctx, "UPDATE bridge SET name=:name AND addr=:addr AND key=:key WHERE id=:id", bridge)
_, err := db.NamedExecContext(ctx, "UPDATE bridge SET name=:name, addr=:addr, key=:key WHERE id=:id", bridge)
return err
}
func (b *bridgeRepository) Remove(ctx context.Context, bridge models.Bridge) error {
_, err := db.NamedExecContext(ctx, "DELETE FROM bridge WHERE id=:id LIMIT 1", bridge)
_, err := db.NamedExecContext(ctx, "DELETE FROM bridge WHERE id=:id", bridge)
return err
}

35
database/sqlite/group-repository.go

@ -2,6 +2,7 @@ package sqlite
import (
"context"
"database/sql"
"golang.org/x/sync/errgroup"
@ -37,16 +38,16 @@ func (r *groupRepository) FindByLight(ctx context.Context, light models.Light) (
group := models.Group{}
err := db.GetContext(ctx, &group, query, light.ID)
if err != nil {
if err != nil && err != sql.ErrNoRows {
return models.Group{}, err
}
err = db.SelectContext(ctx, &group.Permissions, "SELECT * FROM group_permission WHERE group_id=?", group.ID)
if err != nil {
if err != nil && err != sql.ErrNoRows {
return models.Group{}, err
}
return group, err
return group, nil
}
func (r *groupRepository) List(ctx context.Context) ([]models.Group, error) {
@ -66,7 +67,7 @@ func (r *groupRepository) List(ctx context.Context) ([]models.Group, error) {
}
err = eg.Wait()
if err != nil {
if err != nil && err != sql.ErrNoRows {
return nil, err
}
@ -82,7 +83,7 @@ func (r *groupRepository) ListByUser(ctx context.Context, user models.User) ([]m
groups := make([]models.Group, 0, 16)
err := db.SelectContext(ctx, &groups, query, user.ID)
if err != nil {
if err != nil && err != sql.ErrNoRows {
return nil, err
}
@ -91,7 +92,12 @@ func (r *groupRepository) ListByUser(ctx context.Context, user models.User) ([]m
group := &groups[i]
eg.Go(func() error {
return db.SelectContext(egCtx, &group.Permissions, "SELECT * FROM group_permission WHERE group_id=?", group.ID)
err := db.SelectContext(egCtx, &group.Permissions, "SELECT * FROM group_permission WHERE group_id=?", group.ID)
if err != nil && err != sql.ErrNoRows {
return err
}
return nil
})
}
@ -104,11 +110,22 @@ func (r *groupRepository) ListByUser(ctx context.Context, user models.User) ([]m
}
func (r *groupRepository) Insert(ctx context.Context, group models.Group) (models.Group, error) {
panic("not implemented")
res, err := db.NamedExecContext(ctx, "INSERT INTO `group` (name) VALUES(:name)", group)
if err != nil {
return models.Group{}, err
}
id, err := res.LastInsertId()
if err != nil {
return models.Group{}, err
}
group.ID = int(id)
return group, nil
}
func (r *groupRepository) Update(ctx context.Context, group models.Group) error {
_, err := db.NamedExecContext(ctx, "UPDATE group SET name=:name WHERE id=:id", group)
_, err := db.NamedExecContext(ctx, "UPDATE `group` SET name=:name WHERE id=:id", group)
return err
}
@ -118,7 +135,7 @@ func (r *groupRepository) UpdatePermissions(ctx context.Context, permission mode
}
func (r *groupRepository) Remove(ctx context.Context, group models.Group) error {
_, err := db.NamedExecContext(ctx, "DELETE FROM group WHERE id=:id LIMIT 1", group)
_, err := db.NamedExecContext(ctx, "DELETE FROM `group` WHERE id=:id", group)
return err
}

5
database/sqlite/light-repository.go

@ -2,6 +2,7 @@ package sqlite
import (
"context"
"database/sql"
"git.aiterp.net/lucifer/lucifer/models"
)
@ -43,6 +44,10 @@ func (r *lightRepository) ListByGroup(ctx context.Context, group models.Group) (
lights := make([]models.Light, 0, 64)
err := db.SelectContext(ctx, &lights, "SELECT * FROM light WHERE group_id=?", group.ID)
if err == sql.ErrNoRows {
err = nil
}
return lights, err
}

3
internal/httperr/error.go

@ -25,6 +25,9 @@ func (err Error) Error() string {
// ErrLoginRequired is a common error for when a session is expected, but none is found.
var ErrLoginRequired = Error{Status: 401, Kind: "login_required", Message: "You are not logged in."}
// ErrAccessDenied is a common error for when a session is expected, but none is found.
var ErrAccessDenied = Error{Status: 403, Kind: "access_denied", Message: "You cannot do that."}
// NotFound generates a 404 error.
func NotFound(model string) Error {
return Error{Status: 404, Kind: "not_found", Message: model + " not found"}

14
light/driver.go

@ -25,6 +25,9 @@ type Driver interface {
// DiscoverLights asks the bridge to start a search for new lights.
DiscoverLights(ctx context.Context, bridge models.Bridge) error
// ForgetLight removes the light from the bridge.
ForgetLight(ctx context.Context, bridge models.Bridge, light models.Light) error
// ChangedLights returns a subset of the list describing which lights to update.
ChangedLights(ctx context.Context, bridge models.Bridge, lights ...models.Light) ([]models.Light, error)
}
@ -33,3 +36,14 @@ type Driver interface {
func RegisterDriver(name string, driver Driver) {
drivers[name] = driver
}
// Drivers gets the list of drivers.
func Drivers() []string {
results := make([]string, len(drivers))
for key := range drivers {
results = append(results, key)
}
return results
}

24
light/hue/driver.go

@ -9,8 +9,8 @@ import (
"sync"
"time"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
"git.aiterp.net/lucifer/lucifer/internal/huecolor"
"git.aiterp.net/lucifer/lucifer/light"
"git.aiterp.net/lucifer/lucifer/models"
gohue "github.com/collinux/gohue"
@ -175,7 +175,7 @@ func (d *driver) Connect(ctx context.Context, bridge models.Bridge) (models.Brid
}
}
return models.Bridge{}, errors.New("Failed to create bridge")
return models.Bridge{}, errors.New("Bridge discovery timed out after 30 failed attempts")
}
func (d *driver) ChangedLights(ctx context.Context, bridge models.Bridge, lights ...models.Light) ([]models.Light, error) {
@ -212,6 +212,26 @@ func (d *driver) ChangedLights(ctx context.Context, bridge models.Bridge, lights
return subset, nil
}
func (d *driver) ForgetLight(ctx context.Context, bridge models.Bridge, light models.Light) error {
hueBridge, err := d.getBridge(bridge)
if err != nil {
return err
}
hueLights, err := hueBridge.GetAllLights()
if err != nil {
return err
}
for _, hueLight := range hueLights {
if light.InternalID == hueLight.UniqueID {
return hueLight.Delete()
}
}
return httperr.NotFound("Light")
}
func (d *driver) calcColor(light models.Light, hueLight gohue.Light) (x, y float64, bri uint8, err error) {
r, g, b, err := light.ColorRGBf()
if err != nil {

136
light/service.go

@ -2,18 +2,22 @@ package light
import (
"context"
"errors"
"log"
"net/http"
"sync"
"time"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
"git.aiterp.net/lucifer/lucifer/models"
)
// ErrUnknownDriver is returned by any function asking for a driver name if the driver specified doesn't exist.
var ErrUnknownDriver = errors.New("Unknown driver specified")
var ErrUnknownDriver = httperr.Error{Status: http.StatusNotImplemented, Kind: "unknown_driver", Message: "Unknown light driver"}
// A Service wraps the repos for lights and bridges and takes care of the business logic.
type Service struct {
mutex sync.Mutex
bridges models.BridgeRepository
lights models.LightRepository
}
@ -34,7 +38,7 @@ func (s *Service) DirectConnect(ctx context.Context, driver string, addr string,
bridge, err := d.Connect(ctx, bridge)
if err != nil {
return models.Bridge{}, err
return models.Bridge{}, httperr.Error{Status: http.StatusPreconditionFailed, Kind: "connect_failed", Message: err.Error()}
}
bridge, err = s.bridges.Insert(ctx, bridge)
@ -47,6 +51,9 @@ func (s *Service) DirectConnect(ctx context.Context, driver string, addr string,
// SyncLights syncs all lights in a bridge with the state in the database.
func (s *Service) SyncLights(ctx context.Context, bridge models.Bridge) error {
s.mutex.Lock()
defer s.mutex.Unlock()
d, ok := drivers[bridge.Driver]
if !ok {
return ErrUnknownDriver
@ -75,6 +82,9 @@ func (s *Service) SyncLights(ctx context.Context, bridge models.Bridge) error {
// Add unknown lights if it doesn't exist in the databse.
if !found {
log.Println("Adding unknown light", bridgeLight.InternalID)
bridgeLight.SetColor("FFFFFF")
bridgeLight.Brightness = 254
bridgeLight.On = true
_, err := s.lights.Insert(ctx, bridgeLight)
if err != nil {
return err
@ -97,6 +107,28 @@ func (s *Service) SyncLights(ctx context.Context, bridge models.Bridge) error {
return nil
}
// UpdateLight updates the light immediately.
func (s *Service) UpdateLight(ctx context.Context, light models.Light) error {
s.mutex.Lock()
defer s.mutex.Unlock()
err := s.lights.Update(ctx, light)
if err != nil {
return err
}
bridge, err := s.bridges.FindByID(ctx, light.BridgeID)
if err != nil {
return httperr.NotFound("Bridge")
}
d, ok := drivers[bridge.Driver]
if !ok {
return ErrUnknownDriver
}
return d.Apply(ctx, bridge, light)
}
// SyncLoop runs synclight on all bridges twice every second until the context is
// done.
func (s *Service) SyncLoop(ctx context.Context) {
@ -127,42 +159,90 @@ func (s *Service) SyncLoop(ctx context.Context) {
}
}
// DiscoverLoop discovers stuff.
func (s *Service) DiscoverLoop(ctx context.Context) {
for {
bridges, err := s.Bridges(ctx)
// Bridge gets a bridge by ID.
func (s *Service) Bridge(ctx context.Context, id int) (models.Bridge, error) {
return s.bridges.FindByID(ctx, id)
}
// Bridges gets all known bridges.
func (s *Service) Bridges(ctx context.Context) ([]models.Bridge, error) {
return s.bridges.List(ctx)
}
// Light gets all known bridges.
func (s *Service) Light(ctx context.Context, id int) (models.Light, error) {
return s.lights.FindByID(ctx, id)
}
// DeleteBridge deletes the bridge.
func (s *Service) DeleteBridge(ctx context.Context, bridge models.Bridge) error {
s.mutex.Lock()
defer s.mutex.Unlock()
err := s.bridges.Remove(ctx, bridge)
if err != nil {
return err
}
lights, err := s.lights.ListByBridge(ctx, bridge)
if err != nil {
return err
}
for _, light := range lights {
err := s.lights.Remove(ctx, light)
if err != nil {
log.Println("Failed to get bridges:", err)
continue
return err
}
}
for _, bridge := range bridges {
d, ok := drivers[bridge.Driver]
if !ok {
continue
}
return nil
}
log.Println("Searcing on bridge", bridge.Name)
// DeleteBridgeLight deletes the light in a bridge.
func (s *Service) DeleteBridgeLight(ctx context.Context, bridge models.Bridge, light models.Light) error {
s.mutex.Lock()
defer s.mutex.Unlock()
err := d.DiscoverLights(ctx, bridge)
if err != nil {
log.Println("Failed to discover lights:", err)
continue
}
d, ok := drivers[bridge.Driver]
if !ok {
return ErrUnknownDriver
}
time.Sleep(time.Second * 60)
}
err := d.ForgetLight(ctx, bridge, light)
if err != nil {
return err
}
err = s.lights.Remove(ctx, light)
if err != nil {
return err
}
return nil
}
// Bridge gets a bridge by ID.
func (s *Service) Bridge(ctx context.Context, id int) (models.Bridge, error) {
return s.bridges.FindByID(ctx, id)
// UpdateBridge updates a bridge.
func (s *Service) UpdateBridge(ctx context.Context, bridge models.Bridge) error {
s.mutex.Lock()
defer s.mutex.Unlock()
err := s.bridges.Update(ctx, bridge)
if err != nil {
return err
}
return nil
}
// Bridges gets all known bridges.
func (s *Service) Bridges(ctx context.Context) ([]models.Bridge, error) {
return s.bridges.List(ctx)
// DiscoverLights discovers new lights.
func (s *Service) DiscoverLights(ctx context.Context, bridge models.Bridge) error {
d, ok := drivers[bridge.Driver]
if !ok {
return ErrUnknownDriver
}
return d.DiscoverLights(ctx, bridge)
}
// NewService creates a new light.Service.

22
models/light.go

@ -4,6 +4,9 @@ import (
"context"
"encoding/hex"
"errors"
"strings"
"git.aiterp.net/lucifer/lucifer/internal/httperr"
)
// ErrMalformedColor is returned by light.ColorRGBf when the color value is invalid.
@ -21,6 +24,25 @@ type Light struct {
Brightness uint8 `json:"brightness" db:"brightness"`
}
// SetColor sets the color to a hex string, or returns an error if it's not valid.
func (light *Light) SetColor(hexStr string) error {
if len(hexStr) == 7 && hexStr[0] == '#' {
hexStr = hexStr[1:]
}
if len(hexStr) != 6 {
return httperr.Error{Status: 400, Kind: "invalid_color", Message: hexStr + " is not a valid color."}
}
_, err := hex.DecodeString(hexStr)
if err != nil {
return httperr.Error{Status: 400, Kind: "invalid_color", Message: hexStr + " is not a valid color."}
}
light.Color = strings.ToUpper(hexStr)
return nil
}
// SetColorRGB sets the color with an RGB value.
func (light *Light) SetColorRGB(r, g, b uint8) {
light.Color = hex.EncodeToString([]byte{r, g, b})

Loading…
Cancel
Save