session/processor.go: pass the disconnection message to ProcessDisconnection() (#28)

Author: CarsonLenze

session/processor.go

@@ -48,7 +48,7 @@ type Processor interface {
 	// ProcessCache is called before updating the session's cache.
 	ProcessCache(ctx *Context, new *[]byte)
 	// ProcessDisconnection is called when the player disconnects from the proxy.
-	ProcessDisconnection(ctx *Context)
+	ProcessDisconnection(ctx *Context, message *string)
 }
 
 // NopProcessor is a no-operation implementation of the Processor interface.
@@ -67,4 +67,4 @@ func (NopProcessor) ProcessPreTransfer(_ *Context, _ *string, _ *string)     {}
 func (NopProcessor) ProcessTransferFailure(_ *Context, _ *string, _ *string) {}
 func (NopProcessor) ProcessPostTransfer(_ *Context, _ *string, _ *string)    {}
 func (NopProcessor) ProcessCache(_ *Context, _ *[]byte)                      {}
-func (NopProcessor) ProcessDisconnection(_ *Context)                         {}
+func (NopProcessor) ProcessDisconnection(_ *Context, _ *string)              {}

session/session.go

@@ -273,9 +273,10 @@ func (s *Session) Close() (err error) {
 
 func (s *Session) CloseWithError(err error) {
 	s.once.Do(func() {
-		_ = s.client.WritePacket(&packet.Disconnect{Message: err.Error()})
+		message := err.Error()
+		s.Processor().ProcessDisconnection(NewContext(), &message)
+		_ = s.client.WritePacket(&packet.Disconnect{Message: message})
 		_ = s.client.Close()
-		s.Processor().ProcessDisconnection(NewContext())
 		s.serverMu.RLock()
 		if s.serverConn != nil {
 			s.serverConn.CloseWithError(err)