fix(am-relay): fix args for dbg rotation

Author: pancsta

tools/relay/relay.go

@@ -31,7 +31,7 @@ import (
 	ssam "github.com/pancsta/asyncmachine-go/pkg/states"
 	"github.com/pancsta/asyncmachine-go/pkg/telemetry/dbg"
 	"github.com/pancsta/asyncmachine-go/tools/debugger/server"
-	typesDbg "github.com/pancsta/asyncmachine-go/tools/debugger/types"
+	typesdbg "github.com/pancsta/asyncmachine-go/tools/debugger/types"
 	"github.com/pancsta/asyncmachine-go/tools/relay/states"
 	"github.com/pancsta/asyncmachine-go/tools/relay/types"
 )
@@ -139,8 +139,10 @@ func (r *Relay) StartState(e *am.Event) {
 		if cmd.OutputClients {
 			_ = r.hExportClients()
 		}
-		dbgParams := typesDbg.Params{
-			FwdData: cmd.FwdAddr,
+		dbgParams := func() *typesdbg.Params {
+			return &typesdbg.Params{
+				FwdData: cmd.FwdAddr,
+			}
 		}
 		srvMux, _, err := server.New(r.Mach, cmd.ListenAddr, dbgParams)
 		if err != nil {
@@ -498,17 +500,18 @@ var _ = ssR.ClientMsg
 // ///// HANDLERS (DBG)
 
 // ///// ///// /////
-// TODO typed args for dbg server
+
+var _ = ssR.ClientMsg
 
 func (r *Relay) ClientMsgEnter(e *am.Event) bool {
-	_, ok1 := e.Args["msgs_tx"].([]*dbg.DbgMsgTx)
-	_, ok2 := e.Args["conn_ids"].([]string)
-	return ok1 && ok2
+	args, ok := am.ParseArgsCheck[typesdbg.A](e.Args)
+	return ok && args.MsgsTx != nil && args.ConnIds != nil
 }
 
 func (r *Relay) ClientMsgState(e *am.Event) {
-	msgs := e.Args["msgs_tx"].([]*dbg.DbgMsgTx)
-	connIds := e.Args["conn_ids"].([]string)
+	args := am.ParseArgs[typesdbg.A](e.Args)
+	msgs := args.MsgsTx
+	connIds := args.ConnIds
 
 	updatedClients := make(map[string]*server.Client)
 
@@ -559,9 +562,8 @@ func (r *Relay) ClientMsgState(e *am.Event) {
 var _ = ssR.ConnectEvent
 
 func (r *Relay) ConnectEventEnter(e *am.Event) bool {
-	msg, ok1 := e.Args["msg_struct"].(*dbg.DbgMsgStruct)
-	_, ok2 := e.Args["conn_id"].(string)
-	if !ok1 || !ok2 || msg.ID == "" {
+	args, ok := am.ParseArgsCheck[typesdbg.A](e.Args)
+	if !ok || args.MsgStruct == nil || args.MsgStruct.ID == "" {
 		r.Mach.Log("Error: msg_struct malformed\n")
 		return false
 	}
@@ -571,8 +573,9 @@ func (r *Relay) ConnectEventEnter(e *am.Event) bool {
 
 func (r *Relay) ConnectEventState(e *am.Event) {
 	// initial structure data
-	msg := e.Args["msg_struct"].(*dbg.DbgMsgStruct)
-	connId := e.Args["conn_id"].(string)
+	args := am.ParseArgs[typesdbg.A](e.Args)
+	msg := args.MsgStruct
+	connId := args.ConnId
 	var c *server.Client
 
 	// update existing client
@@ -609,7 +612,7 @@ func (r *Relay) ConnectEventState(e *am.Event) {
 var _ = ssR.DisconnectEvent
 
 func (r *Relay) DisconnectEventEnter(e *am.Event) bool {
-	_, ok := e.Args["conn_id"].(string)
+	_, ok := am.ParseArgsCheck[typesdbg.A](e.Args)
 	if !ok {
 		r.Mach.Log("Error: DisconnectEvent malformed\n")
 		return false
@@ -619,7 +622,8 @@ func (r *Relay) DisconnectEventEnter(e *am.Event) bool {
 }
 
 func (r *Relay) DisconnectEventState(e *am.Event) {
-	connID := e.Args["conn_id"].(string)
+	args := am.ParseArgs[typesdbg.A](e.Args)
+	connID := args.ConnId
 	for _, c := range r.dbgClients {
 		if c.ConnId != "" && c.ConnId == connID {
 			// mark as disconnected

tools/relay/types/types_relay.go

@@ -43,6 +43,7 @@ type ArgsRotateDbg struct {
 	FwdAddr      []string      `arg:"-f,--fwd-addr,separate" help:"Address of an RPC server to forward data to (repeatable)"`
 	IntervalTx   int           `arg:"--interval-tx" default:"10000" help:"Amount of transitions to create a dump file"`
 	IntervalTime time.Duration `arg:"--interval-duration" default:"24h" help:"Amount of human time to create a dump file"`
+	// TODO max file size
 	Filename      string        `arg:"-o,--output" default:"am-dbg-dump" help:"Output file base name"`
 	Dir           string        `arg:"-d,--dir" default:"." help:"Output directory"`
 	OutputMach    bool          `arg:"--output-mach" default:"true" help:"Export serialized machines as YAML into dir/machs/id.yml and dir/machs/id.schema.yml"`