better unknown command text

cmd/strom/main.go

@@ -15,7 +15,7 @@ import (
 )
 
 var ExpectedASubcommandErr = errors.New("expected a subcommand")
-var UnknownSubcommandErr = errors.New("unknown subcommand")
+var UnknownSubcommandErr = errors.New("unknown subcommand try 'strom help' for a list of subcommands")
 
 var subcommands = map[string]func(args []string) error{
 	"offline-uuid": offline_uuid.Run,

cmd/strom/packet_inspector/main.go

@@ -93,6 +93,7 @@ func Run(args []string) (err error) {
 	slog.SetLogLoggerLevel(slog.LevelDebug)
 	slog.Info("Starting packet inspector", "listen", *ListenAddr)
 	err = server.StartServerWithOnConn(*ListenAddr, func(serveeConn *proto.Conn) (err error) {
+		serveeConn.DecodeEvenIfUnused = true
 		p := &Proxy{Servee: serveeConn, Client: nil}
 		var acc = api.NewOfflineAccount(*OfflineNameFlag)
 		if *Token != "" {
@@ -105,7 +106,17 @@ func Run(args []string) (err error) {
 		if err != nil {
 			return
 		}
-		c, err := client.Login(*TargetAddr, acc)
+
+		*TargetAddr, err = client.DoDnsSimple(*TargetAddr)
+		if err != nil {
+			return
+		}
+		c, err := client.Connect(*TargetAddr)
+		if err != nil {
+			return
+		}
+		c.DecodeEvenIfUnused = true
+		err = client.LoginRaw(c, acc, *TargetAddr)
 		if err != nil {
 			return
 		}

event/event_bus.go

@@ -212,6 +212,11 @@ func (l *Loop) ContextDoneListener() (chSending <-chan any) {
 	return ch
 }
 
+func (l *Loop) IsTypeRegistered(t reflect.Type) bool {
+	_, ok := l.HandlerFunctions[t]
+	return ok
+}
+
 func (l *Loop) StartLoop() (err error) {
 	_ = *l // exit early on nil loop
 	l.RegisterEventSource(l.ContextDoneListener())

proto/connection.go

@@ -27,6 +27,7 @@ var (
 	WrongDirectionErr                   = errors.New("wrong direction")
 	CantTranslateErr                    = errors.New("cant translate packet")
 	PacketDoesntExistInFutureVersionErr = errors.New("packet doesnt exist in future version")
+	NoHandlerRegisteredErr              = errors.New("no handler registered")
 )
 
 // LoginTick is used as a subsite for the old event system because it is very useful in login contexts
@@ -54,19 +55,18 @@ func (u *UnCodablePacket) Decode(r io.Reader) (err error) {
 type Conn struct {
 	RawConn
 	*event.Loop
-	state           proto_base.State
-	stateMutex      sync.RWMutex
-	Actor           proto_base.Actor
-	Version         string
-	ProtocolVersion int32
+	state              proto_base.State
+	stateMutex         sync.RWMutex
+	Actor              proto_base.Actor
+	Version            string
+	ProtocolVersion    int32
+	DecodeEvenIfUnused bool
 
 	sendTickAlways bool
 }
 
 func (c *Conn) StartConn() (err error) {
-	if c.State() != proto_base.Play {
-		c.sendTickAlways = true
-	}
+	c.sendTickAlways = c.State() != proto_base.Play
 
 	c.RegisterEventSource(c.ActivateReceiveRoutine())
 	c.RegisterCritical(c.OnLoginTick)
@@ -80,6 +80,7 @@ func (c *Conn) OnLoginTick(_ LoginTick) (err error) {
 	if err != nil {
 		return
 	}
+	slog.Debug("logintick recv", "actor", c.Actor, "packet", fmt.Sprintf("%#v", packet))
 	err = c.Fire(packet)
 	return
 }
@@ -135,6 +136,7 @@ func (c *Conn) ActivateReceiveRoutine() (chSending <-chan any) {
 						ch <- err
 						return
 					}
+					slog.Debug("recv", "actor", c.Actor, "packet", fmt.Sprintf("%#v", packet))
 					ch <- packet
 				}
 			}
@@ -219,6 +221,10 @@ func (c *Conn) Receive() (packet proto_base.EncodeDecodeAble, err error) {
 		packet = &UnCodablePacket{Err: BadPacketIdErr, Data: packetBytes, Direction: c.Actor.ReceiveDirection()}
 		return
 	}
+	if !c.DecodeEvenIfUnused && !c.IsTypeRegistered(reflect.TypeOf(packet)) {
+		packet = &UnCodablePacket{Err: NoHandlerRegisteredErr, Data: packetBytes, Direction: c.Actor.ReceiveDirection()}
+		return
+	}
 	err = packet.Decode(b)
 	if err != nil {
 		packet = &UnCodablePacket{Err: err, Data: packetBytes, Direction: c.Actor.ReceiveDirection()}

proto/packet_lookup.go

@@ -7,15 +7,27 @@ import (
 	"github.com/admin-else/strom/proto_generated"
 )
 
-// I know this is in-performant and i dont care until it becomes a problem for somebody it will stay like this and it is pretty easy to make caches or similar to speed this up so yeah
+type PidEtc struct {
+	Direction       proto_base.Direction
+	State           proto_base.State
+	PacketId        int32
+	ProtocolVersion int32
+}
+
+var pidMap = make(map[PidEtc]*proto_base.PacketInfo)
+
+func init() {
+	for _, pin := range proto_generated.Packets {
+		pidMap[PidEtc{pin.Direction, pin.State, pin.PacketId, pin.ProtocolVersion}] = &pin
+	}
+}
 
 func LookUpTypeByPacketInfo(direction proto_base.Direction, state proto_base.State, pid, version int32) (p proto_base.PacketInfo, ok bool) {
-	for _, pin := range proto_generated.Packets {
-		if pin.Direction != direction || pin.State != state || pin.ProtocolVersion != version || pin.PacketId != pid {
-			continue
-		}
-		return pin, true
+	pP, ok := pidMap[PidEtc{direction, state, pid, version}]
+	if !ok {
+		return
 	}
+	p = *pP
 	return
 }
 
@@ -29,6 +41,13 @@ func LookUpTypeByPacketInfoAndCopyType(direction proto_base.Direction, state pro
 }
 
 func LookupPacketInfoByType(packet proto_base.EncodeDecodeAble) (p proto_base.PacketInfo, ok bool) {
+	undecodedPacket, isUndecoable := packet.(*UnCodablePacket)
+	if isUndecoable {
+		p = proto_base.PacketInfo{Type: &UnCodablePacket{}, Name: "un_codable", Direction: undecodedPacket.Direction, State: proto_base.Handshaking, PacketId: -1, ProtocolVersion: -1}
+		ok = true
+		return
+	}
+
 	for _, p := range proto_generated.Packets {
 		if reflect.TypeOf(p.Type) == reflect.TypeOf(packet) {
 			return p, true