Merge dff7579360 into 56b94e33c7

rogueserver.go

@@ -19,11 +19,11 @@ package main
 
 import (
 	"encoding/gob"
+	"flag"
 	"log"
 	"net"
 	"net/http"
 	"os"
-	"strconv"
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/pagefaultgames/rogueserver/api"
@@ -32,56 +32,58 @@ import (
 )
 
 func main() {
-	// env stuff
+	// flag stuff
-	debug, _ := strconv.ParseBool(os.Getenv("debug"))
+	debug := flag.Bool("debug", false, "use debug mode")
 
-	proto := getEnv("proto", "tcp")
+	proto := flag.String("proto", "tcp", "protocol for api to use (tcp, unix)")
-	addr := getEnv("addr", "0.0.0.0:8001")
+	addr := flag.String("addr", "0.0.0.0:8001", "network address for api to listen on")
-	tlscert := getEnv("tlscert", "")
+	tlscert := flag.String("tlscert", "", "tls certificate path")
-	tlskey := getEnv("tlskey", "")
+	tlskey := flag.String("tlskey", "", "tls key path")
 
-	dbuser := getEnv("dbuser", "pokerogue")
+	dbuser := flag.String("dbuser", "pokerogue", "database username")
-	dbpass := getEnv("dbpass", "pokerogue")
+	dbpass := flag.String("dbpass", "pokerogue", "database password")
-	dbproto := getEnv("dbproto", "tcp")
+	dbproto := flag.String("dbproto", "tcp", "protocol for database connection")
-	dbaddr := getEnv("dbaddr", "localhost")
+	dbaddr := flag.String("dbaddr", "localhost", "database address")
-	dbname := getEnv("dbname", "pokeroguedb")
+	dbname := flag.String("dbname", "pokeroguedb", "database name")
 
-	discordclientid := getEnv("discordclientid", "")
+	discordclientid := flag.String("discordclientid", "dcid", "Discord Oauth2 Client ID")
-	discordsecretid := getEnv("discordsecretid", "")
+	discordsecretid := flag.String("discordsecretid", "dsid", "Discord Oauth2 Secret ID")
 
-	googleclientid := getEnv("googleclientid", "")
+	googleclientid := flag.String("googleclientid", "gcid", "Google Oauth2 Client ID")
-	googlesecretid := getEnv("googlesecretid", "")
+	googlesecretid := flag.String("googlesecretid", "gsid", "Google Oauth2 Secret ID")
 
-	callbackurl := getEnv("callbackurl", "http://localhost:8001/")
+	callbackurl := flag.String("callbackurl", "http://localhost:8001/", "Callback URL for Oauth2 Client")
 
-	gameurl := getEnv("gameurl", "https://pokerogue.net")
+	gameurl := flag.String("gameurl", "https://pokerogue.net", "URL for game server")
 
-	discordbottoken := getEnv("discordbottoken", "")
+	discordbottoken := flag.String("discordbottoken", "", "Discord Bot Token")
-	discordguildid := getEnv("discordguildid", "")
+	discordguildid := flag.String("discordguildid", "", "Discord Guild ID")
 
-	account.GameURL = gameurl
+	flag.Parse()
 
-	account.DiscordClientID = discordclientid
+	account.GameURL = *gameurl
-	account.DiscordClientSecret = discordsecretid
-	account.DiscordCallbackURL = callbackurl + "/auth/discord/callback"
 
-	account.GoogleClientID = googleclientid
+	account.DiscordClientID = *discordclientid
-	account.GoogleClientSecret = googlesecretid
+	account.DiscordClientSecret = *discordsecretid
-	account.GoogleCallbackURL = callbackurl + "/auth/google/callback"
+	account.DiscordCallbackURL = *callbackurl + "/auth/discord/callback"
-	account.DiscordSession, _ = discordgo.New("Bot " + discordbottoken)
+
-	account.DiscordGuildID = discordguildid
+	account.GoogleClientID = *googleclientid
+	account.GoogleClientSecret = *googlesecretid
+	account.GoogleCallbackURL = *callbackurl + "/auth/google/callback"
+	account.DiscordSession, _ = discordgo.New("Bot " + *discordbottoken)
+	account.DiscordGuildID = *discordguildid
 	// register gob types
 	gob.Register([]interface{}{})
 	gob.Register(map[string]interface{}{})
 
 	// get database connection
-	err := db.Init(dbuser, dbpass, dbproto, dbaddr, dbname)
+	err := db.Init(*dbuser, *dbpass, *dbproto, *dbaddr, *dbname)
 	if err != nil {
 		log.Fatalf("failed to initialize database: %s", err)
 	}
 
 	// create listener
-	listener, err := createListener(proto, addr)
+	listener, err := createListener(*proto, *addr)
 	if err != nil {
 		log.Fatalf("failed to create net listener: %s", err)
 	}
@@ -95,14 +97,14 @@ func main() {
 
 	// start web server
 	handler := prodHandler(mux, gameurl)
-	if debug {
+	if *debug {
 		handler = debugHandler(mux)
 	}
 
-	if tlscert == "" {
+	if *tlscert == "" {
 		err = http.Serve(listener, handler)
 	} else {
-		err = http.ServeTLS(listener, handler, tlscert, tlskey)
+		err = http.ServeTLS(listener, handler, *tlscert, *tlskey)
 	}
 	if err != nil {
 		log.Fatalf("failed to create http server or server errored: %s", err)
@@ -129,11 +131,11 @@ func createListener(proto, addr string) (net.Listener, error) {
 	return listener, nil
 }
 
-func prodHandler(router *http.ServeMux, clienturl string) http.Handler {
+func prodHandler(router *http.ServeMux, clienturl *string) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
 		w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST")
-		w.Header().Set("Access-Control-Allow-Origin", clienturl)
+		w.Header().Set("Access-Control-Allow-Origin", *clienturl)
 
 		if r.Method == "OPTIONS" {
 			w.WriteHeader(http.StatusOK)
@@ -158,11 +160,3 @@ func debugHandler(router *http.ServeMux) http.Handler {
 		router.ServeHTTP(w, r)
 	})
 }
-
-func getEnv(key string, defaultValue string) string {
-	if value, ok := os.LookupEnv(key); ok {
-		return value
-	}
-
-	return defaultValue
-}