changed config to yaml; removed flag support

Geprüft
Mit freundlichen Grüßen
Eichhorn

.gitignore

@@ -13,4 +13,5 @@
 *.out
 
 # Custom Blacklist
-config.json
+
+#CM

Dockerfile

@@ -0,0 +1,22 @@
+FROM golang:latest
+
+ENV TS3_IP=127.0.0.1
+ENV TS3_NAME=serveradmin
+ENV TS3_PW=<changeMe>
+ENV TS3_PORT=9987
+ENV TS3_QUERY=10011
+ENV WEB_PORT=8080
+ENV BLACKLIST_USER=USER
+
+
+RUN mkdir /app 		
+WORKDIR /app
+RUN mkdir /app/go	    
+RUN export GOPATH=/app/go
+COPY main.go .
+RUN go get; exit 0
+WORKDIR $GOPATH/src/git.cliffbreak.de/Cliffbreak/tsviewer
+COPY config.json .
+RUN go build 
+
+CMD ["./tsviewer"]  

README.md

@@ -1,30 +1,59 @@
-# go-tsviewer **[WIP]**
-## **WARNING** This API is not usable ATM
+# tsviewer **[ALPHA 1.0.1]**
 
-A REST API made for TS3 Viewer.
+A TS3 Viewer with REST API.
+## DOCKER-Config
+
+```bash
+docker build -t name/cont:ver .
+
+docker run -e TS3_IP="<SERVER-IP>" -e TS3_PW="<SERVER-ADMIN_PW>" -e WEB_PORT="8080" -d -p 8080:8080 name/cont:ver
+```
+ENV:
+```Docker
+
+ENV TS3_IP=127.0.0.1
+ENV TS3_NAME=serveradmin
+ENV TS3_PW=<changeMe>
+ENV TS3_PORT=9987
+ENV TS3_QUERY=10011
+ENV WEB_PORT=8080
+ENV BLACKLIST_USER=USER
+
+
+```
 
 # Features
+
 ## Config
+
 The config file is generated automatically on first startup.
 ```json
 {
-    "ip": "127.0.0.1",              // Server IP
-    "port": 10011,                  // Dataquery Port
     "user": {
-        "name": "serveradmin",      // Username
-        "password": ""              // Password
+        "nickname": "serveradmin",
+        "name": "serveradmin",
+        "password": ""
     },
-    "server": {
-        "port": 9987                // Port of the target server
+    "serverTS": {
+        "ip": "127.0.0.1",
+        "portServer": 9987,
+        "portQuery": 10011
+    },
+    "serverWeb": {
+        "port": 80
     }
 }
 ```
+
 ## URL-Parameter
-| Name       | Type     | Description              |
-| ---------- | -------- | ------------------------ |
-| `pretty`   | `bool`   | pretty-prints JSON       |
-| `envelope` | `bool`   | wraps JSON in data array |
+
+| Name       | Type   | Description              |
+| ---------- | ------ | ------------------------ |
+| `pretty`   | `bool` | pretty-prints JSON       |
+| `envelope` | `bool` | wraps JSON in data array |
+
 ## Channels
+
 - **`GET`** `/v1/channels/:id`
 - **`GET`** `/v1/channels`
 ```json
@@ -37,7 +66,9 @@ The config file is generated automatically on first startup.
     "awayMessage": ""
 }
 ```
+
 ## Clients
+
 - **`GET`** `/v1/clients/:id`
 - **`GET`** `/v1/clients/`
 ```json
@@ -51,7 +82,9 @@ The config file is generated automatically on first startup.
     "neededSubscribePower": 0
 }
 ```
+
 ## Server
+
 - **`GET`** `/v1/server/info`
 ```json
 {

config.json

@@ -0,0 +1,15 @@
+{
+    "user": {
+        "nickname": "serveradmin",
+        "name": "serveradmin",
+        "password": "HNxkefVx"
+    },
+    "serverTS": {
+        "ip": "127.0.0.1",
+        "portServer": 9987,
+        "portQuery": 10011
+    },
+    "serverWeb": {
+        "port": 80
+    }
+}

config/config.go

@@ -1,69 +1,84 @@
 package config
 
 import (
-	"encoding/json"
-	"io/ioutil"
-	"log"
 	"os"
+	"strconv"
+
+	"github.com/spf13/viper"
 )
 
 type Config struct {
-	IP     string `json:"ip"`
-	Port   uint16 `json:"port"`
-	User   User   `json:"user"`
-	Server Server `json:"server"`
-}
-
-type User struct {
-	Name     string `json:"name"`
-	Password string `json:"password"`
-}
-
-type Server struct {
-	Port uint16 `json:"port"`
+	User struct {
+		Nickname string
+		Name     string
+		Password string
+	}
+	ServerTS struct {
+		IP         string
+		PortServer uint16
+		PortQuery  uint16
+	}
+	ServerWeb struct {
+		Port uint16
+	}
 }
 
 const FileName = "config.json"
 
 func New() (*Config, error) {
-	config := defaults()
-
-	configFile, err := os.Open(FileName)
-	if err != nil {
-		if err := config.createFile(); err != nil {
-			return nil, err
-		}
-
-		log.Println(config)
-		return &config, nil
-	}
-	defer configFile.Close()
-
-	jsonParser := json.NewDecoder(configFile)
-	jsonParser.Decode(&config)
-
-	return &config, nil
-}
-
-func (config Config) createFile() error {
-	configJSON, err := json.MarshalIndent(config, "", "    ")
-	if err != nil {
-		return err
+	viper.SetConfigName("config")
+	viper.SetConfigFile("yaml")
+	viper.AddConfigPath(".")
+	if err := viper.ReadInConfig(); err != nil {
+		return nil, err
 	}
 
-	return ioutil.WriteFile(FileName, configJSON, 0644)
+	setDefaults()
+
+	var config Config
+	err := viper.Unmarshal(&config)
+
+	config.overrideWithEnvironmentVars()
+
+	return &config, err
 }
 
-func defaults() Config {
-	return Config{
-		IP:   "127.0.0.1",
-		Port: 10011,
-		User: User{
-			Name:     "serveradmin",
-			Password: "",
-		},
-		Server: Server{
-			Port: 9987,
-		},
+func setDefaults() {
+	viper.SetDefault("User.Nickname", "serveradmin")
+	viper.SetDefault("User.Name", "serveradmin")
+	viper.SetDefault("User.Password", "<changeMe>")
+	viper.SetDefault("ServerTS.IP", "127.0.0.1")
+	viper.SetDefault("ServerTS.PortServer", "9987")
+	viper.SetDefault("ServerTS.PortQuery", "10011")
+	viper.SetDefault("ServerWeb.Port", "80")
+}
+
+func (config *Config) overrideWithEnvironmentVars() {
+	if nickname := os.Getenv("TS3_NICKNAME"); nickname != "" {
+		config.User.Nickname = nickname
+	}
+
+	if username := os.Getenv("TS3_NAME"); username != "" {
+		config.User.Name = username
+	}
+
+	if password := os.Getenv("TS3_PW"); password != "" {
+		config.User.Password = password
+	}
+
+	if tsIP := os.Getenv("TS3_IP"); tsIP != "" {
+		config.ServerTS.IP = tsIP
+	}
+
+	if tsPort, err := strconv.Atoi(os.Getenv("TS3_PORT")); tsPort <= 65535 && tsPort >= 0 && err == nil {
+		config.ServerTS.PortServer = uint16(tsPort)
+	}
+
+	if tsQuery, err := strconv.Atoi(os.Getenv("TS3_QUERY")); tsQuery <= 65535 && tsQuery >= 0 && err == nil {
+		config.ServerTS.PortQuery = uint16(tsQuery)
+	}
+
+	if webPort, err := strconv.Atoi(os.Getenv("WEB_PORT")); webPort <= 65535 && webPort >= 0 && err == nil {
+		config.ServerWeb.Port = uint16(webPort)
 	}
 }

features/api/channel/channel.go

@@ -7,8 +7,8 @@ type Service interface {
 
 type Channel struct {
 	ID                   int       `json:"id"`
-	Subchannels          []Channel `json:"subchannels,omitempty"`
 	Name                 string    `json:"name"`
+	Subchannels          []Channel `json:"subchannels,omitempty"`
 	TotalClients         int       `json:"totalClients"`
 	NeededSubscribePower int       `json:"neededSubscribePower"`
 }

features/api/channel/handler.go

@@ -4,13 +4,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/response"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/response"
 	"github.com/go-chi/chi"
 )
 
 func ChannelAPIHandler(s Service) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response.Handler(w, response.HandlerFunc(func() (int, error) {
+		response.Handler(w, r, response.HandlerFunc(func() (int, error) {
 			id, err := strconv.ParseUint(chi.URLParam(r, "id"), 10, 64)
 			if err != nil {
 				return http.StatusBadRequest, err
@@ -28,7 +28,7 @@ func ChannelAPIHandler(s Service) http.HandlerFunc {
 
 func ChannelsAPIHandler(s Service) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response.Handler(w, response.HandlerFunc(func() (int, error) {
+		response.Handler(w, r, response.HandlerFunc(func() (int, error) {
 			cc, err := s.Channels()
 			if err != nil {
 				return http.StatusBadRequest, err

features/api/client/handler.go

@@ -4,13 +4,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/response"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/response"
 	"github.com/go-chi/chi"
 )
 
 func ClientAPIHandler(s Service) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response.Handler(w, response.HandlerFunc(func() (int, error) {
+		response.Handler(w, r, response.HandlerFunc(func() (int, error) {
 			id, err := strconv.ParseUint(chi.URLParam(r, "id"), 10, 64)
 			if err != nil {
 				return http.StatusBadRequest, err
@@ -28,7 +28,7 @@ func ClientAPIHandler(s Service) http.HandlerFunc {
 
 func ClientsAPIHandler(s Service) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response.Handler(w, response.HandlerFunc(func() (int, error) {
+		response.Handler(w, r, response.HandlerFunc(func() (int, error) {
 			cc, err := s.Clients()
 			if err != nil {
 				return http.StatusBadRequest, err

features/api/server/handler.go

@@ -3,13 +3,13 @@ package server
 import (
 	"net/http"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/response"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/response"
 )
 
 func InfoAPIHandler(s Service) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		response.Handler(w, response.HandlerFunc(func() (int, error) {
-			s, err := s.Info()
+		response.Handler(w, r, response.HandlerFunc(func() (int, error) {
+			s, err := s.ServerInfo()
 			if err != nil {
 				return http.StatusNotFound, err
 			}

features/api/server/server.go

@@ -3,7 +3,7 @@ package server
 import "time"
 
 type Service interface {
-	Info() (*Server, error)
+	ServerInfo() (*Server, error)
 }
 
 type Server struct {

features/web/index/handler.go

@@ -0,0 +1,32 @@
+package index
+
+import (
+	"html/template"
+	"net/http"
+
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/web/weberror"
+)
+
+func IndexGUIHandler(s Service, t template.Template) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		server, err := s.ServerInfo()
+		if err != nil {
+			weberror.NewPage(err, http.StatusNotFound).Send(w, t)
+			return
+		}
+
+		channels, err := s.ChannelsRaw()
+		if err != nil {
+			weberror.NewPage(err, http.StatusNotFound).Send(w, t)
+			return
+		}
+
+		clients, err := s.Clients()
+		if err != nil {
+			weberror.NewPage(err, http.StatusNotFound).Send(w, t)
+			return
+		}
+
+		NewPage(*server, channels, clients).Send(w, t)
+	})
+}

features/web/index/page.go

@@ -0,0 +1,35 @@
+package index
+
+import (
+	"html/template"
+	"io"
+
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/channel"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/client"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/server"
+)
+
+type Service interface {
+	ServerInfo() (*server.Server, error)
+	Clients() ([]*client.Client, error)
+	Channels() ([]*channel.Channel, error)
+	ChannelsRaw() ([]*channel.Channel, error)
+}
+
+type IndexPage struct {
+	Server   server.Server
+	Channels []*channel.Channel
+	Clients  []*client.Client
+}
+
+func NewPage(server server.Server, channels []*channel.Channel, clients []*client.Client) *IndexPage {
+	return &IndexPage{
+		Server:   server,
+		Channels: channels,
+		Clients:  clients,
+	}
+}
+
+func (page IndexPage) Send(w io.Writer, t template.Template) {
+	t.Lookup("index.html").Execute(w, page)
+}

features/web/index/routes.go

@@ -0,0 +1,15 @@
+package index
+
+import (
+	"html/template"
+
+	"github.com/go-chi/chi"
+)
+
+func GUIRoutes(s Service, t template.Template) *chi.Mux {
+	router := chi.NewRouter()
+
+	router.Get("/", IndexGUIHandler(s, t))
+
+	return router
+}

features/web/weberror/page.go

@@ -0,0 +1,22 @@
+package weberror
+
+import (
+	"html/template"
+	"io"
+)
+
+type ErrorPage struct {
+	Error      error
+	StatusCode int
+}
+
+func NewPage(err error, statusCode int) *ErrorPage {
+	return &ErrorPage{
+		Error:      err,
+		StatusCode: statusCode,
+	}
+}
+
+func (page ErrorPage) Send(w io.Writer, t template.Template) {
+	t.Lookup("error.html").Execute(w, page)
+}

gui/template.go

@@ -0,0 +1,35 @@
+package gui
+
+import (
+	"fmt"
+	"html/template"
+	"io/ioutil"
+	"strings"
+)
+
+func LoadTemplates() (*template.Template, error) {
+	return loadTemplates("templates/")
+}
+
+func loadTemplates(path string) (*template.Template, error) {
+	dir, err := ioutil.ReadDir(path)
+	if err != nil {
+		return nil, err
+	}
+
+	var ff []string
+
+	for _, file := range dir {
+		filename := file.Name()
+		if strings.HasSuffix(filename, ".html") {
+			ff = append(ff, fmt.Sprintf("%s%s", path, filename))
+		}
+	}
+
+	templates, err := template.ParseFiles(ff...)
+	if err != nil {
+		return nil, err
+	}
+
+	return templates, nil
+}

main.go

@@ -1,27 +1,38 @@
 package main
 
 import (
+	"fmt"
+	"html/template"
 	"log"
 	"net/http"
 	"time"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/config"
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/channel"
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/client"
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/server"
-	"git.cliffbreak.de/haveachin/go-tsviewer/service"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/config"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/channel"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/client"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/server"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/web/index"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/gui"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/service"
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"
+	"github.com/go-chi/cors"
 )
 
-func Routes(s service.Service) *chi.Mux {
+func Routes(s service.Service, t template.Template) *chi.Mux {
 	router := chi.NewRouter()
+	cors := cors.New(cors.Options{
+		AllowedOrigins: []string{"*"},
+		AllowedMethods: []string{"Get"},
+	})
 	router.Use(
 		middleware.Logger,
 		middleware.Timeout(5*time.Second),
 		middleware.DefaultCompress,
 		middleware.RedirectSlashes,
 		middleware.Recoverer,
+
+		cors.Handler,
 	)
 
 	router.Route("/v1", func(r chi.Router) {
@@ -30,22 +41,41 @@ func Routes(s service.Service) *chi.Mux {
 		r.Mount("/server", server.APIRoutes(s))
 	})
 
+	router.Route("/", func(r chi.Router) {
+		r.Mount("/", index.GUIRoutes(s, t))
+	})
+
 	return router
 }
 
 func main() {
+	log.Println("Loading configurations...")
 	config, err := config.New()
 	if err != nil {
 		log.Fatal(err)
 	}
+	log.Println("Configurations loaded!")
 
+	log.Println("Starting query service...")
 	service, err := service.New(*config)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer service.TSClient.Close()
+	log.Println("Query service connected to", fmt.Sprintf("%s:%d!", config.ServerTS.IP, config.ServerTS.PortQuery))
 
-	router := Routes(*service)
+	log.Println("Loading templates...")
+	templates, err := gui.LoadTemplates()
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Println("All templates loaded!")
 
-	log.Fatal("Handler: ", http.ListenAndServe(":8080", router))
+	router := Routes(*service, *templates)
+	router.Get("/static/*", func(w http.ResponseWriter, r *http.Request) {
+		http.StripPrefix("/static", http.FileServer(http.Dir("./static"))).ServeHTTP(w, r)
+	})
+
+	log.Println("Starting the web server locally on port", config.ServerWeb.Port)
+	log.Fatal("Handler: ", http.ListenAndServe(fmt.Sprintf(":%d", config.ServerWeb.Port), router))
 }

response/error.go

@@ -10,12 +10,10 @@ type Error struct {
 }
 
 // NewError creates a new Response fill with an error
-func NewError(status int, err error) *Response {
-	return &Response{
-		Content: Error{
-			Status:    status,
-			Error:     err.Error(),
-			Timestamp: time.Now().Format("2006-01-02T15:04:05Z"), //.Format("02 Jan 2006, 15:04:05 MST"),
-		},
+func NewError(status int, err error) *Error {
+	return &Error{
+		Status:    status,
+		Error:     err.Error(),
+		Timestamp: time.Now().Format("2006-01-02T15:04:05Z"), //.Format("02 Jan 2006, 15:04:05 MST"),
 	}
 }

response/response.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/request/meta"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/request/meta"
 )
 
 type HandlerFunc func() (int, error)
@@ -74,14 +74,14 @@ func (resp Response) Send(w http.ResponseWriter, status int) (int, error) {
 	return status, nil
 }
 
-func Handler(w http.ResponseWriter, hf HandlerFunc) {
+func Handler(w http.ResponseWriter, r *http.Request, hf HandlerFunc) {
 	status, err := hf()
 	if err == nil {
 		return
 	}
 
 	log.Printf("HTTP %d: %q", status, err)
-	if status, err = NewError(status, err).Send(w, status); err != nil {
+	if status, err = New(NewError(status, err), r).Send(w, status); err != nil {
 		http.Error(w, http.StatusText(status), status)
 	}
 }

service/channel.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/channel"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/channel"
 	"github.com/multiplay/go-ts3"
 )
 
@@ -37,28 +37,64 @@ func (s Service) Channels() ([]*channel.Channel, error) {
 
 	var cc []*channel.Channel
 
-	for _, channel := range channels {
-		if channel.ParentID == 0 {
-			cc = append(cc, convertChannel(channel))
+	for i, channel := range channels {
+		if channel == nil {
 			continue
 		}
 
-		for _, c := range cc {
-			if c.ID == channel.ParentID {
-				c.Subchannels = append(c.Subchannels, *convertChannel(channel))
-			}
+		if channel.ParentID == 0 {
+			channels[i] = nil
+			cc = append(cc, convertChannel(channel))
 		}
 	}
 
+	for _, c := range cc {
+		addSubChannels(c, channels)
+	}
+
+	return cc, nil
+}
+
+func (s Service) ChannelsRaw() ([]*channel.Channel, error) {
+	channels, err := s.TSClient.Server.ChannelList()
+	if err != nil {
+		return nil, err
+	}
+
+	var cc []*channel.Channel
+
+	for _, channel := range channels {
+		if channel == nil {
+			continue
+		}
+
+		cc = append(cc, convertChannel(channel))
+	}
+
 	return cc, nil
 }
 
 func convertChannel(c *ts3.Channel) *channel.Channel {
 	return &channel.Channel{
 		ID:                   c.ID,
-		Subchannels:          []channel.Channel{},
 		Name:                 c.ChannelName,
+		Subchannels:          []channel.Channel{},
 		TotalClients:         c.TotalClients,
 		NeededSubscribePower: c.NeededSubscribePower,
 	}
 }
+
+func addSubChannels(c *channel.Channel, channels []*ts3.Channel) {
+	for i, channel := range channels {
+		if channel == nil {
+			continue
+		}
+
+		if c.ID == channel.ParentID {
+			channels[i] = nil
+			subChannel := convertChannel(channel)
+			addSubChannels(subChannel, channels)
+			c.Subchannels = append(c.Subchannels, *subChannel)
+		}
+	}
+}

service/client.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/client"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/client"
 	"github.com/multiplay/go-ts3"
 )
 
@@ -26,10 +26,6 @@ func (s Service) Client(id int) (*client.Client, error) {
 		return nil, errors.New("client does not exist")
 	}
 
-	/* 	if _, err := s.TSClient.Server.ExecCmd(ts3.NewCmd(fmt.Sprintf("clientinfo clid=%d", c.ID)).WithResponse(&c)); err != nil {
-		return nil, err
-	} */
-
 	return c, nil
 }
 

service/server.go

@@ -3,10 +3,10 @@ package service
 import (
 	"time"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/features/server"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/features/api/server"
 )
 
-func (s Service) Info() (*server.Server, error) {
+func (s Service) ServerInfo() (*server.Server, error) {
 	serverInfo, err := s.TSClient.Server.Info()
 	if err != nil {
 		return nil, err

service/service.go

@@ -1,10 +1,11 @@
 package service
 
 import (
-	"strconv"
+	"fmt"
+	"log"
+	"time"
 
-	"git.cliffbreak.de/haveachin/go-tsviewer/config"
-	"git.cliffbreak.de/haveachin/go-tsviewer/stringer"
+	"git.cliffbreak.de/Cliffbreak/tsviewer/config"
 	ts3 "github.com/multiplay/go-ts3"
 )
 
@@ -13,12 +14,7 @@ type Service struct {
 }
 
 func New(config config.Config) (*Service, error) {
-	addr, err := stringer.Build(config.IP, ":", strconv.Itoa(int(config.Port)))
-	if err != nil {
-		return nil, err
-	}
-
-	client, err := ts3.NewClient(addr)
+	client, err := ts3.NewClient(fmt.Sprintf("%s:%d", config.ServerTS.IP, config.ServerTS.PortQuery))
 	if err != nil {
 		return nil, err
 	}
@@ -27,10 +23,22 @@ func New(config config.Config) (*Service, error) {
 		return nil, err
 	}
 
-	if err := client.UsePort(int(config.Server.Port)); err != nil {
+	if err := client.UsePort(int(config.ServerTS.PortServer)); err != nil {
 		return nil, err
 	}
 
+	if err := client.SetNick(config.User.Nickname); err != nil {
+		return nil, err
+	}
+
+	go func() {
+		for true {
+			time.Sleep(time.Second * 150)
+			client.Server.Version()
+			log.Println("keep alive")
+		}
+	}()
+
 	return &Service{
 		TSClient: client,
 	}, nil

static/styles.css

@@ -0,0 +1,22 @@
+*{
+    padding: 0;
+    margin: 0;
+    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+
+}
+.content {
+    max-width: 500px;
+    margin: auto;
+}
+
+h2{
+    padding-top: 20px;
+}
+
+small{
+    margin-left: 10px;
+}
+
+p.client{
+    margin-left: 10px;
+}

stringer/stringer.go

@@ -1,49 +0,0 @@
-package stringer
-
-import (
-	"fmt"
-	"strings"
-	"unicode"
-)
-
-func Build(ss ...string) (string, error) {
-	var builder strings.Builder
-
-	for _, s := range ss {
-		if _, err := builder.WriteString(s); err != nil {
-			return "", err
-		}
-	}
-
-	return builder.String(), nil
-}
-
-func ToCamel(str string) string {
-	if len(str) < 1 {
-		return str
-	}
-
-	for i, c := range str[1:] {
-		if c >= 'A' && c <= 'Z' {
-			str = fmt.Sprintf("%s_%c%s", str[:i+1], unicode.ToLower(c), str[i+2:])
-			return ToCamel(str)
-		}
-	}
-
-	return str
-}
-
-func ToSnake(str string) string {
-	if len(str) < 1 {
-		return str
-	}
-
-	for i, c := range str[1:] {
-		if c == '_' {
-			str = fmt.Sprintf("%s%c%s", str[:i+1], unicode.ToUpper(rune(str[i+2])), str[i+3:])
-			return ToSnake(str)
-		}
-	}
-
-	return str
-}

templates/error.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Error</title>
+    </head>
+    <body>
+        <h1>Oops, an error occurred!</h1>
+        <p1>Error {{.StatusCode}}</p1>
+        <p1>{{.Error}}</p1>
+    </body>
+</html>

templates/index.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>TS3 Viewer</title>
+
+    <link rel="stylesheet" href="static/styles.css">
+</head>
+
+<body>
+        <div class="content">
+    <h2>Online Members</h2>
+    <ul>
+        {{range .Clients}}
+        <li>{{.Nickname}}</li>
+        {{end}}
+    </ul>
+    <h2>{{.Server.Name}}</h2>
+    <!-- <small>{{.Server.Version}}</small> -->
+    {{$clients := .Clients}}
+    {{range .Channels}}
+        <p class="channel">{{.Name}}</p>
+        {{$channelId := .ID}}
+        {{range $clients}}
+            {{if eq $channelId .ChannelID}}
+                <p class="client">{{.Nickname}}</p>
+            {{end}}
+        {{end}}
+    {{end}}
+</div>
+</body>
+
+</html>