cmd: Added 'verbose' flag that will print all logs to a file

The client always prints to a file but with verbose it'll also print all log lvls to it.

The server always prints to stdout and with verbose prints to a file with all the log lvls

client/action.go

@@ -7,7 +7,9 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"time"
 
+	"github.com/sagikazarmark/slog-shim"
 	"github.com/xescugc/go-flux"
 	"github.com/xescugc/maze-wars/action"
 	"github.com/xescugc/maze-wars/store"
@@ -22,64 +24,72 @@ type ActionDispatcher struct {
 	dispatcher *flux.Dispatcher
 	opt        Options
 	store      *store.Store
+	logger     *slog.Logger
 }
 
 // NewActionDispatcher initializes the action dispatcher
 // with the give dispatcher
-func NewActionDispatcher(d *flux.Dispatcher, s *store.Store, opt Options) *ActionDispatcher {
+func NewActionDispatcher(d *flux.Dispatcher, s *store.Store, l *slog.Logger, opt Options) *ActionDispatcher {
 	return &ActionDispatcher{
 		dispatcher: d,
 		opt:        opt,
 		store:      s,
+		logger:     l,
 	}
 }
 
 // Dispatch is a helper to access to the internal dispatch directly with an action.
 // This should only be used from the WS Handler to forward server actions directly
 func (ac *ActionDispatcher) Dispatch(a *action.Action) {
+	b := time.Now()
 	ac.dispatcher.Dispatch(a)
+	d := time.Now().Sub(b)
+	if d > time.Millisecond {
+		ac.logger.Info("action dispatched", "type", a.Type, "time", d)
+	}
+	ac.logger.Debug("action dispatched", "type", a.Type, "time", d)
 }
 
 // CursorMove dispatches an action of moving the Cursor
 // to the new x,y coordinates
 func (ac *ActionDispatcher) CursorMove(x, y int) {
 	cma := action.NewCursorMove(x, y)
-	ac.dispatcher.Dispatch(cma)
+	ac.Dispatch(cma)
 }
 
 // SummonUnit summons the 'unit' from the player id 'pid' to the line
 // 'plid' and with the current line id 'clid'
 func (ac *ActionDispatcher) SummonUnit(unit, pid string, plid, clid int) {
 	sua := action.NewSummonUnit(unit, pid, plid, clid)
 	wsSend(sua)
-	//ac.dispatcher.Dispatch(sua)
+	//ac.Dispatch(sua)
 }
 
 // TPS is the call for every TPS event
 func (ac *ActionDispatcher) TPS() {
 	tpsa := action.NewTPS()
-	ac.dispatcher.Dispatch(tpsa)
+	ac.Dispatch(tpsa)
 }
 
 // RemoveUnit removes the unit with the id 'uid'
 func (ac *ActionDispatcher) RemoveUnit(uid string) {
 	rua := action.NewRemoveUnit(uid)
 	wsSend(rua)
-	ac.dispatcher.Dispatch(rua)
+	ac.Dispatch(rua)
 }
 
 // StealLive removes one live from the player with id 'fpid' and
 // adds it to the player with id 'tpid'
 func (ac *ActionDispatcher) StealLive(fpid, tpid string) {
 	sla := action.NewStealLive(fpid, tpid)
 	wsSend(sla)
-	ac.dispatcher.Dispatch(sla)
+	ac.Dispatch(sla)
 }
 
 // CameraZoom zooms the camera the direction 'd'
 func (ac *ActionDispatcher) CameraZoom(d int) {
 	cza := action.NewCameraZoom(d)
-	ac.dispatcher.Dispatch(cza)
+	ac.Dispatch(cza)
 }
 
 // PlaceTower places the tower 't' on the position X and Y of the player pid
@@ -97,111 +107,111 @@ func (ac *ActionDispatcher) PlaceTower(t, pid string, x, y int) {
 		pta := action.NewPlaceTower(t, pid, x, y)
 		wsSend(pta)
 	}
-	//ac.dispatcher.Dispatch(pta)
+	//ac.Dispatch(pta)
 }
 
 // RemoveTower removes the tower tid
 func (ac *ActionDispatcher) RemoveTower(pid, tid, tt string) {
 	rta := action.NewRemoveTower(pid, tid, tt)
 	wsSend(rta)
-	//ac.dispatcher.Dispatch(rta)
+	//ac.Dispatch(rta)
 }
 
 // SelectTower selects the tower 't' on the position x, y
 func (ac *ActionDispatcher) SelectTower(t string, x, y int) {
 	sta := action.NewSelectTower(t, x, y)
-	ac.dispatcher.Dispatch(sta)
+	ac.Dispatch(sta)
 }
 
 // SelectTower selects the tower 't' on the position x, y
 func (ac *ActionDispatcher) SelectedTowerInvalid(i bool) {
 	sta := action.NewSelectedTowerInvalid(i)
-	ac.dispatcher.Dispatch(sta)
+	ac.Dispatch(sta)
 }
 
 // DeelectTower cleans the current selected tower
 func (ac *ActionDispatcher) DeselectTower(t string) {
 	dsta := action.NewDeselectTower(t)
-	ac.dispatcher.Dispatch(dsta)
+	ac.Dispatch(dsta)
 }
 
 // IncomeTick a new tick for the income
 func (ac *ActionDispatcher) IncomeTick() {
 	it := action.NewIncomeTick()
-	ac.dispatcher.Dispatch(it)
+	ac.Dispatch(it)
 }
 
 // TowerAttack issues a attack to the Unit with uid
 func (ac *ActionDispatcher) TowerAttack(uid, tt string) {
 	ta := action.NewTowerAttack(uid, tt)
 	wsSend(ta)
-	ac.dispatcher.Dispatch(ta)
+	ac.Dispatch(ta)
 }
 
 // UnitKilled adds gold to the user
 func (ac *ActionDispatcher) UnitKilled(pid, ut string) {
 	uk := action.NewUnitKilled(pid, ut)
 	wsSend(uk)
-	ac.dispatcher.Dispatch(uk)
+	ac.Dispatch(uk)
 }
 
 func (ac *ActionDispatcher) RemovePlayer(pid string) {
 	rpa := action.NewRemovePlayer(pid)
 	wsSend(rpa)
-	ac.dispatcher.Dispatch(rpa)
-	ac.dispatcher.Dispatch(action.NewNavigateTo(LobbyRoute))
+	ac.Dispatch(rpa)
+	ac.Dispatch(action.NewNavigateTo(LobbyRoute))
 }
 
 // WindowResizing new sizes of the window
 func (ac *ActionDispatcher) WindowResizing(w, h int) {
 	wr := action.NewWindowResizing(w, h)
-	ac.dispatcher.Dispatch(wr)
+	ac.Dispatch(wr)
 }
 
 // NavigateTo navigates to the given route
 func (ac *ActionDispatcher) NavigateTo(route string) {
 	nt := action.NewNavigateTo(route)
-	ac.dispatcher.Dispatch(nt)
+	ac.Dispatch(nt)
 }
 
 // OpenTowerMenu when a tower is clicked and the menu of
 // the tower is displayed
 func (ac *ActionDispatcher) OpenTowerMenu(tid string) {
 	otm := action.NewOpenTowerMenu(tid)
-	ac.dispatcher.Dispatch(otm)
+	ac.Dispatch(otm)
 }
 
 // CloseTowerMenu when a tower menu needs to be closed
 func (ac *ActionDispatcher) CloseTowerMenu() {
 	ctm := action.NewCloseTowerMenu()
-	ac.dispatcher.Dispatch(ctm)
+	ac.Dispatch(ctm)
 }
 
 // GoHome will move the camera to the current player home line
 func (ac *ActionDispatcher) GoHome() {
 	gha := action.NewGoHome()
-	ac.dispatcher.Dispatch(gha)
+	ac.Dispatch(gha)
 }
 
 // CheckedPath will set the value of the path checked
 func (ac *ActionDispatcher) CheckedPath(cp bool) {
 	cpa := action.NewCheckedPath(cp)
-	ac.dispatcher.Dispatch(cpa)
+	ac.Dispatch(cpa)
 }
 
 // ChangeUnitLine will move the unit to the next line
 func (ac *ActionDispatcher) ChangeUnitLine(uid string) {
 	cula := action.NewChangeUnitLine(uid)
 	wsSend(cula)
-	ac.dispatcher.Dispatch(cula)
+	ac.Dispatch(cula)
 }
 
 func (ac *ActionDispatcher) SignUpSubmit(un string) {
 	httpu, _ := url.Parse(ac.opt.HostURL)
 	httpu.Path = "/users"
 	resp, err := http.Post(httpu.String(), "application/json", bytes.NewBuffer([]byte(fmt.Sprintf(`{"username":"%s"}`, un))))
 	if err != nil {
-		ac.dispatcher.Dispatch(action.NewSignUpError(err.Error()))
+		ac.Dispatch(action.NewSignUpError(err.Error()))
 		return
 	}
 	body := struct {
@@ -210,14 +220,14 @@ func (ac *ActionDispatcher) SignUpSubmit(un string) {
 	if resp.StatusCode != http.StatusCreated {
 		err = json.NewDecoder(resp.Body).Decode(&body)
 		if err != nil {
-			ac.dispatcher.Dispatch(action.NewSignUpError(err.Error()))
+			ac.Dispatch(action.NewSignUpError(err.Error()))
 			return
 		}
-		ac.dispatcher.Dispatch(action.NewSignUpError(body.Error))
+		ac.Dispatch(action.NewSignUpError(body.Error))
 		return
 	}
 
-	ac.dispatcher.Dispatch(action.NewSignUpError(""))
+	ac.Dispatch(action.NewSignUpError(""))
 
 	ctx := context.Background()
 
@@ -243,29 +253,29 @@ func (ac *ActionDispatcher) SignUpSubmit(un string) {
 		panic(fmt.Errorf("failed to write JSON: %w", err))
 	}
 
-	ac.dispatcher.Dispatch(usia)
+	ac.Dispatch(usia)
 
 	go wsHandler(ctx)
 
-	ac.dispatcher.Dispatch(action.NewNavigateTo(LobbyRoute))
+	ac.Dispatch(action.NewNavigateTo(LobbyRoute))
 }
 
 func (ac *ActionDispatcher) JoinWaitingRoom(un string) {
 	jwra := action.NewJoinWaitingRoom(un)
 	wsSend(jwra)
 
-	ac.dispatcher.Dispatch(action.NewNavigateTo(WaitingRoomRoute))
+	ac.Dispatch(action.NewNavigateTo(WaitingRoomRoute))
 }
 
 func (ac *ActionDispatcher) ExitWaitingRoom(un string) {
 	ewra := action.NewExitWaitingRoom(un)
 	wsSend(ewra)
 
-	ac.dispatcher.Dispatch(action.NewNavigateTo(LobbyRoute))
+	ac.Dispatch(action.NewNavigateTo(LobbyRoute))
 }
 
 func (ac *ActionDispatcher) ToggleStats() {
 	tsa := action.NewToggleStats()
 
-	ac.dispatcher.Dispatch(tsa)
+	ac.Dispatch(tsa)
 }

client/wasm/main.go

@@ -5,9 +5,11 @@ package main
 import (
 	"context"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"syscall/js"
 
+	"github.com/sagikazarmark/slog-shim"
 	"github.com/xescugc/go-flux"
 	"github.com/xescugc/maze-wars/client"
 	"github.com/xescugc/maze-wars/store"
@@ -38,7 +40,8 @@ func NewClient() js.Func {
 		d := flux.NewDispatcher()
 		s := store.NewStore(d)
 
-		ad := client.NewActionDispatcher(d, s, opt)
+		l := slog.New(slog.NewTextHandler(ioutil.Discard, nil))
+		ad := client.NewActionDispatcher(d, s, l, opt)
 
 		g := &client.Game{
 			Store: s,
@@ -67,7 +70,7 @@ func NewClient() js.Func {
 		us := client.NewUserStore(d)
 		cls := client.NewStore(s, us)
 
-		l, err := client.NewLobbyStore(d, cls)
+		ls, err := client.NewLobbyStore(d, cls)
 		if err != nil {
 			return fmt.Errorf("failed to initialize LobbyStore: %w", err)
 		}
@@ -79,7 +82,7 @@ func NewClient() js.Func {
 
 		wr := client.NewWaitingRoomStore(d, cls)
 
-		rs := client.NewRouterStore(d, u, l, wr, g)
+		rs := client.NewRouterStore(d, u, ls, wr, g)
 
 		ctx := context.Background()
 		// We need to run this in a goroutine so when it's compiled to WASM