remove global config and dataView vars

main.go

···
 	"golang.org/x/crypto/acme/autocert"
 )
 
-// Global variables from config or flags
-var TestUsers map[string]string = map[string]string{
-	"d4LtgY4xDecIBBUUPVw8Vw": "DevUser",
-}
-
-var TestUsersHashMap map[string]string = map[string]string{}
-
-func init() {
-	for userId, _ := range TestUsers {
-		TestUsersHashMap[fmt.Sprintf("%x", md5.Sum([]byte(userId)))] = userId
-	}
-}
-
-func NewConnection(conn *websocket_gorilla.Conn, authToken string) {
-	c := connection.New(conn)
-	c.State.AuthTokenHash = fmt.Sprintf("%x", md5.Sum([]byte(authToken)))
-
+func initPrudpServers(c *connection.Connection, dataView view.DataPresenter) error {
+	// setup prudp authentication server
 	auth := &prudp.Port{
 		Conn: c, Port: 1, Type: 10,
 		Protocols: map[uint16]rmc.ProtocolHandler{
···
 	}
 	c.AddPort(auth.Port, auth.Type, auth)
 
-	c.State.DeployConfig = cfg
-
+	// mario maker 2 datastore protocol server
 	smm2, err := smm2Server.New(c.State, dataView)
 	if err != nil {
-		log.Fatalf("server creation error: %s\n", err)
+		return err
 	}
 
+	// setup prudp application server
 	app := &prudp.Port{
 		Conn: c, Port: 2, Type: 10,
 		Protocols: map[uint16]rmc.ProtocolHandler{
···
 	}
 	c.AddPort(app.Port, app.Type, app)
 
+	return nil
+}
+
+// Full lifecyle a websocket connection is in here
+func WebsocketConnectionHandler(conn *websocket_gorilla.Conn, config *config.Config, dataView view.DataPresenter, authToken string) {
+	c := connection.New(conn)
+	c.State.AuthTokenHash = fmt.Sprintf("%x", md5.Sum([]byte(authToken)))
+	c.State.DeployConfig = config
+
+	if err := initPrudpServers(c, dataView); err != nil {
+		log.Fatalf("prudp servers creation error: %s\n", err)
+	}
+
 	if err := c.Read(); err != nil {
 		fmt.Printf("connection error: %s\n", err)
 	}
···
 	c.Close()
 }
 
-var cfg *config.Config
-var dataView view.DataPresenter
-
-func AuthTokenCheckHandler(handler http.Handler) http.Handler {
+func AuthTokenCheckHandler(handler http.Handler, dataView view.DataPresenter) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.URL.Path == "/generate_login" {
 			handler.ServeHTTP(w, r)
···
 }
 
 func main() {
-	cfg = config.New()
+	cfg := config.New()
+	var dataView view.DataPresenter
 
 	switch cfg.DebugLevel {
 	case "none":
···
 		}
 		router.Handle("/", proxy.NewProxy(remote))
 	} else {
-		ws := websocket.Handler(NewConnection)
+		ws := websocket.Handler(WebsocketConnectionHandler, cfg, dataView)
 		router.HandleFunc("/", ws)
 	}
 
···
 
 	httpsServer := &http.Server{
 		Addr:    cfg.ListenAddressHttps,
-		Handler: AuthTokenCheckHandler(router),
+		Handler: AuthTokenCheckHandler(router, dataView),
 		//IdleTimeout: 500 * time.Millisecond, // instead of SetKeepAlivesEnabled
 	}
 	httpsServer.SetKeepAlivesEnabled(false) // otherwise get thumbnail hangs
 
 	httpServer := &http.Server{
 		Addr:    cfg.ListenAddressHttp,
-		Handler: AuthTokenCheckHandler(routerHttp),
+		Handler: AuthTokenCheckHandler(routerHttp, dataView),
 		//IdleTimeout: 500 * time.Millisecond, // instead of SetKeepAlivesEnabled
 	}
 	httpServer.SetKeepAlivesEnabled(false) // otherwise get thumbnail hangs

nex/websocket/websocket.go

···
 	"log"
 	"net/http"
 	"net/http/httputil"
+	"smm2_gameserver/config"
+	"smm2_gameserver/db/view"
 
 	"github.com/gorilla/websocket"
 )
 
-func Handler(fn func(*websocket.Conn, string)) func(http.ResponseWriter, *http.Request) {
+func Handler(fn func(*websocket.Conn, *config.Config, view.DataPresenter, string), config *config.Config, dataView view.DataPresenter) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, req *http.Request) {
 		if false {
 			requestDump, err := httputil.DumpRequest(req, true)
···
 			return
 		}
 
-		fn(conn, authToken)
+		fn(conn, config, dataView, authToken)
 	}
 }