The logs is fully working Working on the turning on and off status

frozendragon / minecraft-ui

Browse code The logs is fully working Working on the turning on and off status master
1 parent 5d1c4ec commit c6423b51dc2d62e6b991618e276373444beeb733 Simon Lindgren authored on 11 Mar 2018

Patch

Showing 4 changed files

Ignore Space Show notes View etc/static/index.html 0 → 100644
<!DOCTYPE html> <html> <body> <h1>Status</h1> <button type="btnStart" onclick="sendStatusChange(true)">Start</button> <button type="btnStop" onclick="sendStatusChange(false)">Stop</button> <h1>Logs</h1> <pre id="minecraft_log"> </pre> </body> </html> <script> function sendStatusChange(status) { var http = new XMLHttpRequest(); var url = "/minecraft-status"; var data = "{\"status\":"+status+"}"; http.open("POST", url, true); //Send the proper header information along with the request http.setRequestHeader('Content-Type', 'application/json; charset=UTF-8'); // send the collected data as JSON http.send(JSON.stringify(data)); } function refreshLog() { fetch("/minecraft-log") .then(res => res.json()) .then((out) => { document.getElementById('minecraft_log').innerText = out.log; }) .catch(err => { throw err }); setTimeout(refreshLog, 500); } setTimeout(refreshLog, 500); </script>

Ignore Space Show notes View

etc/static/index.html 0 → 100644

<!DOCTYPE html>
<html>
<body>

<h1>Status</h1>
<button type="btnStart" onclick="sendStatusChange(true)">Start</button>
<button type="btnStop" onclick="sendStatusChange(false)">Stop</button>

</body>
</html>

//Send the proper header information along with the request
        http.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');

// send the collected data as JSON
        http.send(JSON.stringify(data));
    }

setTimeout(refreshLog, 500);
</script>

Show notes View etc/static/ui.html 100644 → 0
<!DOCTYPE html> <html> <body> <textarea id="minecraft_log" style="width:100%;" rows="40"> </textarea> </body> </html> <script> fetch("http://localhost:8080/minecraft-log") .then(res => res.json()) .then((out) => { document.getElementById('minecraft_log').value = out.log; }) .catch(err => { throw err }); </script>

Ignore Space Show notes View internal/resource/minecraft-status/rest.go 0 → 100644
package minecraft_status import ( "go.uber.org/zap" "git.ssns.se/git/frozendragon/minecraft-ui/internal/rest" "net/http" "os/exec" "strings" ) type Resource struct { Logger zap.Logger } type Request struct { Status bool `json:"Status"` } type Response struct { Status bool `json:"Status"` } func (r Resource) Get(w http.ResponseWriter, req http.Request) { out, err := exec.Command("systemctl", "status", "minecraft").Output() if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } running := false if strings.Contains(string(out),"running") { running = true } response := &Response{ Status: running, } rest.JSON(w, req, response) } func (r Resource) Post(w http.ResponseWriter, req *http.Request) { var request Request if err := rest.DecodeJSON(req, &request); err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } status := "stop" if request.Status { status = "start" } _, err := exec.Command("systemctl", status, "minecraft").Output() if err != nil { w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(err.Error())) return } }

Ignore Space Show notes View

internal/resource/minecraft-status/rest.go 0 → 100644

package minecraft_status

import (
	"go.uber.org/zap"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/rest"
	"net/http"
	"os/exec"
	"strings"
)

type Resource struct {
	Logger *zap.Logger
}

type Request struct {
	Status bool `json:"Status"`
}

type Response struct {
	Status bool `json:"Status"`
}

func (r *Resource) Get(w http.ResponseWriter, req *http.Request) {
	out, err := exec.Command("systemctl", "status", "minecraft").Output()

if err != nil {
		w.WriteHeader(http.StatusInternalServerError)
		w.Write([]byte(err.Error()))
		return
	}

running := false

if strings.Contains(string(out),"running") {
		running = true
	}

response := &Response{
		Status: running,
	}
	rest.JSON(w, req, response)
}

func (r *Resource) Post(w http.ResponseWriter, req *http.Request) {
	var request Request
	if err := rest.DecodeJSON(req, &request); err != nil {
		w.WriteHeader(http.StatusInternalServerError)
		w.Write([]byte(err.Error()))
		return
	}
	status := "stop"
	if request.Status {
		status = "start"
	}
	_, err := exec.Command("systemctl", status, "minecraft").Output()

if err != nil {
		w.WriteHeader(http.StatusInternalServerError)
		w.Write([]byte(err.Error()))
		return
	}
}

Ignore Space Show notes View internal/service/service.go
package service import ( "net/http" "github.com/go-chi/chi" chimiddleware "github.com/go-chi/chi/middleware" "go.uber.org/zap" "git.ssns.se/git/frozendragon/minecraft-ui/internal/config" "git.ssns.se/git/frozendragon/minecraft-ui/internal/rest" "git.ssns.se/git/frozendragon/minecraft-ui/internal/server" "context" "git.ssns.se/git/frozendragon/minecraft-ui/internal/resource/minecraft-log" "strings" "git.ssns.se/git/frozendragon/minecraft-ui/internal/resource/minecraft-status" ) // Service defines the service instance. type Service struct { logger zap.Logger server server.Server } // New instantiates a new service instance. func New(conf config.Config) (Service, error) { logResource := minecraft_log.Resource{ Logger: conf.Logger, } statusResource := minecraft_status.Resource{ Logger: conf.Logger, } // Routes r := chi.NewRouter() //r.Get("/robots.txt", router.ServeRobots) // Simple Authenticated routes r.Group(func(r chi.Router) { r.Handle("/logger", conf.LoggerConfig.Level) }) FileServer(r, "/ui", http.Dir("etc/static")) // API routes r.Route("/", func(r chi.Router) { //r.Use(middleware.SimpleBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass)) r.Use(chimiddleware.StripSlashes) r.Get("/minecraft-log", logResource.Get) r.Get("/minecraft-status", statusResource.Get) r.Post("/minecraft-status", statusResource.Post) }) h := chi.ServerBaseContext(context.Background(), r) s := server.New(conf.Addr, h, server.WithErrorLog(conf.StdLogger)) return &Service{ logger: conf.Logger, server: s, }, nil } // Start starts the service. func (s Service) Start() error { return s.server.Start() } // Stop stops the service. func (s Service) Stop() error { return s.server.Stop() } // rootHandler is the root handler for request to `/`. func rootHandler(w http.ResponseWriter, req http.Request) { rest.JSON(w, req, struct{}{}) } func FileServer(r chi.Router, path string, root http.FileSystem) { if strings.ContainsAny(path, "{}") { panic("router: FileServer does not permit URL parameters.") } fs := http.StripPrefix(path, http.FileServer(root)) if path != "/" && !strings.HasSuffix(path, "/") { r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP) path += "/" } path += "" r.Get(path, http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { fs.ServeHTTP(w, r) })) } package service import ( "net/http" "github.com/go-chi/chi" chimiddleware "github.com/go-chi/chi/middleware" "go.uber.org/zap" "git.ssns.se/git/frozendragon/minecraft-ui/internal/config" "git.ssns.se/git/frozendragon/minecraft-ui/internal/rest" "git.ssns.se/git/frozendragon/minecraft-ui/internal/server" "context" "git.ssns.se/git/frozendragon/minecraft-ui/internal/resource/minecraft-log" "strings" ) // Service defines the service instance. type Service struct { logger zap.Logger server server.Server } // New instantiates a new service instance. func New(conf config.Config) (Service, error) { logResource := minecraft_log.Resource{ Logger: conf.Logger, } // Routes r := chi.NewRouter() //r.Get("/robots.txt", router.ServeRobots) // Simple Authenticated routes r.Group(func(r chi.Router) { r.Handle("/logger", conf.LoggerConfig.Level) }) FileServer(r, "/ui", http.Dir("/etc/static")) // API routes r.Route("/", func(r chi.Router) { //r.Use(middleware.SimpleBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass)) r.Use(chimiddleware.StripSlashes) r.Get("/minecraft-log", logResource.Get) }) h := chi.ServerBaseContext(context.Background(), r) s := server.New(conf.Addr, h, server.WithErrorLog(conf.StdLogger)) return &Service{ logger: conf.Logger, server: s, }, nil } // Start starts the service. func (s Service) Start() error { return s.server.Start() } // Stop stops the service. func (s Service) Stop() error { return s.server.Stop() } // rootHandler is the root handler for request to `/`. func rootHandler(w http.ResponseWriter, req http.Request) { rest.JSON(w, req, struct{}{}) } func FileServer(r chi.Router, path string, root http.FileSystem) { if strings.ContainsAny(path, "{}") { panic("router: FileServer does not permit URL parameters.") } fs := http.StripPrefix(path, http.FileServer(root)) //if path != "/" && !strings.HasSuffix(path, "/") { // r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP) // path += "/" //} path += "" r.Get(path, http.HandlerFunc(func(w http.ResponseWriter, r http.Request) { fs.ServeHTTP(w, r) })) }

Ignore Space Show notes View

internal/service/service.go

package service

import (
	"net/http"

"github.com/go-chi/chi"
	chimiddleware "github.com/go-chi/chi/middleware"
	"go.uber.org/zap"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/config"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/rest"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/server"
	"context"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/resource/minecraft-log"
	"strings"
	"git.ssns.se/git/frozendragon/minecraft-ui/internal/resource/minecraft-status"
)

// Service defines the service instance.
type Service struct {
	logger *zap.Logger
	server *server.Server
}

// New instantiates a new service instance.
func New(conf *config.Config) (*Service, error) {
	logResource := minecraft_log.Resource{
		Logger: conf.Logger,
	}
	statusResource := minecraft_status.Resource{
		Logger: conf.Logger,
	}

// Routes

r := chi.NewRouter()

//r.Get("/robots.txt", router.ServeRobots)

// Simple Authenticated routes
	r.Group(func(r chi.Router) {
		r.Handle("/logger", conf.LoggerConfig.Level)
	})

FileServer(r, "/ui", http.Dir("etc/static"))

// API routes
	r.Route("/", func(r chi.Router) {
		//r.Use(middleware.SimpleBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass))
		r.Use(chimiddleware.StripSlashes)

r.Get("/minecraft-log", logResource.Get)
		r.Get("/minecraft-status", statusResource.Get)
		r.Post("/minecraft-status", statusResource.Post)
	})

h := chi.ServerBaseContext(context.Background(), r)
	s := server.New(conf.Addr, h, server.WithErrorLog(conf.StdLogger))

return &Service{
		logger: conf.Logger,
		server: s,
	}, nil
}

// Start starts the service.
func (s *Service) Start() error {
	return s.server.Start()
}

// Stop stops the service.
func (s *Service) Stop() error {
	return s.server.Stop()
}

// rootHandler is the root handler for request to `/`.
func rootHandler(w http.ResponseWriter, req *http.Request) {
	rest.JSON(w, req, struct{}{})
}

func FileServer(r chi.Router, path string, root http.FileSystem) {
	if strings.ContainsAny(path, "{}*") {
		panic("router: FileServer does not permit URL parameters.")
	}

fs := http.StripPrefix(path, http.FileServer(root))

if path != "/" && !strings.HasSuffix(path, "/") {
		r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP)
		path += "/"
	}
	path += "*"

r.Get(path, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
		fs.ServeHTTP(w, r)
	}))
}

package service

import (
	"net/http"

// Service defines the service instance.
type Service struct {
	logger *zap.Logger
	server *server.Server
}

// New instantiates a new service instance.
func New(conf *config.Config) (*Service, error) {
	logResource := minecraft_log.Resource{
		Logger: conf.Logger,
	}

// Routes

r := chi.NewRouter()

//r.Get("/robots.txt", router.ServeRobots)

// Simple Authenticated routes
	r.Group(func(r chi.Router) {
		r.Handle("/logger", conf.LoggerConfig.Level)
	})

FileServer(r, "/ui", http.Dir("/etc/static"))

// API routes
	r.Route("/", func(r chi.Router) {
		//r.Use(middleware.SimpleBasicAuth(conf.BasicAuthUser, conf.BasicAuthPass))
		r.Use(chimiddleware.StripSlashes)

r.Get("/minecraft-log", logResource.Get)
	})

h := chi.ServerBaseContext(context.Background(), r)
	s := server.New(conf.Addr, h, server.WithErrorLog(conf.StdLogger))

return &Service{
		logger: conf.Logger,
		server: s,
	}, nil
}

// Start starts the service.
func (s *Service) Start() error {
	return s.server.Start()
}

// Stop stops the service.
func (s *Service) Stop() error {
	return s.server.Stop()
}

// rootHandler is the root handler for request to `/`.
func rootHandler(w http.ResponseWriter, req *http.Request) {
	rest.JSON(w, req, struct{}{})
}

func FileServer(r chi.Router, path string, root http.FileSystem) {
	if strings.ContainsAny(path, "{}*") {
		panic("router: FileServer does not permit URL parameters.")
	}

fs := http.StripPrefix(path, http.FileServer(root))

//if path != "/" && !strings.HasSuffix(path, "/") {
	//	r.Get(path, http.RedirectHandler(path+"/", 301).ServeHTTP)
	//	path += "/"
	//}
	path += "*"

r.Get(path, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
		fs.ServeHTTP(w, r)
	}))
}

Show line notes below