Migrations/neko-rooms
1
0
Fork 0
mirror of https://github.com/m1k1o/neko-rooms.git synced 2026-11-03 07:01:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

add rich info for room entry.

Browse Source
This commit is contained in:
m1k1o
2021-03-07 22:57:45 +01:00
parent 668e615b2f
commit eead7520f1
4 changed files with 57 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/rooms.go
+1 -1
View File
@@ -34,7 +34,7 @@ func (manager *ApiManagerCtx) roomCreate(w http.ResponseWriter, r *http.Request)
}
w.Header().Set("Content-Type", "application/json")
json.NewEncoder(w).Encode(struct{
json.NewEncoder(w).Encode(struct {
ID string `json:"id"`
}{ID})
}
internal/config/room.go
+1 -1
View File
@@ -42,7 +42,7 @@ func (Room) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().String("traefik_certresolver", "lets-encrypt", "traefik: certificate resolver for router")
cmd.PersistentFlags().String("traefik_certresolver", "", "traefik: certificate resolver for router")
if err := viper.BindPFlag("traefik_certresolver", cmd.PersistentFlags().Lookup("traefik_certresolver")); err != nil {
return err
}
internal/room/manager.go
+39 -9
View File
@@ -3,6 +3,7 @@ package room
import (
"context"
"fmt"
"time"
dockerTypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
@@ -56,8 +57,30 @@ func (manager *RoomManagerCtx) List() ([]types.RoomEntry, error) {
result := []types.RoomEntry{}
for _, container := range containers {
roomName, ok := container.Labels["m1k1o.neko_rooms.name"]
if !ok {
return nil, fmt.Errorf("Damaged container labels: name not found.")
}
URL, ok := container.Labels["m1k1o.neko_rooms.url"]
if !ok {
return nil, fmt.Errorf("Damaged container labels: url not found.")
}
epr, err := manager.getEprFromLabels(container.Labels)
if err != nil {
return nil, err
}
result = append(result, types.RoomEntry{
ID: container.ID,
ID: container.ID,
URL: URL,
Name: roomName,
MaxConnections: epr.Max - epr.Min + 1,
Image: container.Image,
State: container.State,
Status: container.Status,
Created: time.Unix(container.Created, 0),
})
}
@@ -65,10 +88,10 @@ func (manager *RoomManagerCtx) List() ([]types.RoomEntry, error) {
}
func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, error) {
// TODO: Check if path name exists.
pathName := settings.Name
if pathName == "" {
roomName := settings.Name
if roomName == "" {
var err error
pathName, err = utils.NewUID(32)
roomName, err = utils.NewUID(32)
if err != nil {
return "", err
}
@@ -97,10 +120,17 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
exposedPorts[portKey] = struct{}{}
}
containerName := containerPrefix + pathName
containerName := containerPrefix + roomName
urlProto := "http"
if manager.config.TraefikCertresolver != "" {
urlProto = "https"
}
labels := map[string]string{
// Set internal labels
"m1k1o.neko_rooms.name": roomName,
"m1k1o.neko_rooms.url": urlProto + "://" + manager.config.TraefikDomain + "/" + roomName + "/",
"m1k1o.neko_rooms.canary": labelCanary,
"m1k1o.neko_rooms.epr.min": fmt.Sprintf("%d", epr.Min),
"m1k1o.neko_rooms.epr.max": fmt.Sprintf("%d", epr.Max),
@@ -109,10 +139,10 @@ func (manager *RoomManagerCtx) Create(settings types.RoomSettings) (string, erro
"traefik.enable": "true",
"traefik.http.services." + containerName + "-frontend.loadbalancer.server.port": fmt.Sprintf("%d", frontendPort),
"traefik.http.routers." + containerName + ".entrypoints": manager.config.TraefikEntrypoint,
"traefik.http.routers." + containerName + ".rule": "Host(`" + manager.config.TraefikDomain + "`) && PathPrefix(`/" + pathName + "`)",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": "/" + pathName + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": "/" + pathName + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": "/" + pathName + "/",
"traefik.http.routers." + containerName + ".rule": "Host(`" + manager.config.TraefikDomain + "`) && PathPrefix(`/" + roomName + "`)",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.regex": "/" + roomName + "$$",
"traefik.http.middlewares." + containerName + "-rdr.redirectregex.replacement": "/" + roomName + "/",
"traefik.http.middlewares." + containerName + "-prf.stripprefix.prefixes": "/" + roomName + "/",
"traefik.http.routers." + containerName + ".middlewares": containerName + "-rdr," + containerName + "-prf",
}
internal/types/room.go
+16 -8
View File
@@ -3,14 +3,26 @@ package types
import (
"fmt"
"strings"
"time"
)
type RoomSettings struct {
Name string `json:"name"`
type RoomEntry struct {
ID string `json:"id"`
URL string `json:"url"`
Name string `json:"name"`
MaxConnections uint16 `json:"max_connections"`
Image string `json:"image"`
State string `json:"state"`
Status string `json:"status"`
Created time.Time `json:"created"`
}
type RoomSettings struct {
Name string `json:"name"`
MaxConnections uint16 `json:"max_connections"`
UserPass string `json:"user_pass"`
AdminPass string `json:"admin_pass"`
UserPass string `json:"user_pass"`
AdminPass string `json:"admin_pass"`
BroadcastPipeline string `json:"broadcast_pipeline"`
@@ -66,10 +78,6 @@ func (settings *RoomSettings) Env(eprMin uint16, eprMax uint16, nat1to1 []string
return env
}
type RoomEntry struct {
ID string `json:"id"`
}
type RoomManager interface {
List() ([]RoomEntry, error)
Create(settings RoomSettings) (string, error)