Defensive code to make sure we don't have multiple kick Chat Handlers

Author: xaionaro

pkg/streamcontrol/kick/chat_handler_obsolete.go

@@ -28,13 +28,13 @@ type ChatHandlerOBSOLETE struct {
 	client          ChatClientOBSOLETE
 	cancelFunc      context.CancelFunc
 	messagesOutChan chan streamcontrol.ChatMessage
-	onClose         func(context.Context)
+	onClose         func(context.Context, *ChatHandlerOBSOLETE)
 }
 
 func (k *Kick) newChatHandlerOBSOLETE(
 	ctx context.Context,
 	channelSlug string,
-	onClose func(context.Context),
+	onClose func(context.Context, *ChatHandlerOBSOLETE),
 ) (*ChatHandlerOBSOLETE, error) {
 	reverseEngClient, err := kickcom.New()
 	if err != nil {
@@ -51,7 +51,7 @@ func NewChatHandlerOBSOLETE(
 	ctx context.Context,
 	chatClient ChatClientOBSOLETE,
 	channelID uint64,
-	onClose func(context.Context),
+	onClose func(context.Context, *ChatHandlerOBSOLETE),
 ) (_ret *ChatHandlerOBSOLETE, _err error) {
 	logger.Debugf(ctx, "NewChatHandlerOBSOLETE(ctx, client, %d, %p)", channelID, onClose)
 	defer func() {
@@ -71,7 +71,7 @@ func NewChatHandlerOBSOLETE(
 	observability.Go(ctx, func(ctx context.Context) {
 		if onClose != nil {
 			defer func() {
-				onClose(ctx)
+				onClose(ctx, h)
 			}()
 		}
 		defer func() {

pkg/streamcontrol/kick/kick.go

@@ -188,11 +188,16 @@ func (k *Kick) initChatHandler(
 
 func (k *Kick) onChatHandlerClose(
 	ctx context.Context,
+	h *ChatHandlerOBSOLETE,
 ) {
 	if !k.ChatHandlerLocker.Lock(ctx) {
 		return
 	}
 	defer k.ChatHandlerLocker.Unlock()
+	if h != k.ChatHandler {
+		logger.Errorf(ctx, "chat handler was already replaced")
+		return
+	}
 	select {
 	case <-ctx.Done():
 		return