Add ResponseHandler.CancelAllRequests and remove Client.ctx

messagix/client.go

@@ -67,7 +67,6 @@ type Client struct {
 	endpoints       map[string]string
 	taskMutex       *sync.Mutex
 	activeTasks     []int
-	ctx             context.Context
 
 	catRefreshLock         sync.Mutex
 	unnecessaryCATRequests int
@@ -218,7 +217,6 @@ func (c *Client) Connect() error {
 		return err
 	}
 	ctx, cancel := context.WithCancel(context.TODO())
-	c.ctx = ctx
 	oldCancel := c.stopCurrentConnection.Swap(&cancel)
 	if oldCancel != nil {
 		(*oldCancel)()

messagix/responsehandler.go

@@ -103,9 +103,6 @@ func (p *ResponseHandler) waitForDetails(packetId uint16, channelType ChannelTyp
 	}
 
 	select {
-	case <-p.client.ctx.Done():
-		p.deleteDetails(packetId, channelType)
-		return nil, ErrContextCancelled
 	case response := <-ch:
 		p.deleteDetails(packetId, channelType)
 		return response, nil
@@ -147,3 +144,14 @@ func (p *ResponseHandler) getChannel(packetId uint16, channelType ChannelType) (
 	p.lock.RUnlock()
 	return ch, ok
 }
+
+func (p *ResponseHandler) CancelAllRequests() {
+	p.lock.Lock()
+	defer p.lock.Unlock()
+	for packetId := range p.requestChannels {
+		p.deleteDetails(packetId, RequestChannel)
+	}
+	for packetId := range p.packetChannels {
+		p.deleteDetails(packetId, PacketChannel)
+	}
+}

messagix/socket.go

@@ -140,6 +140,7 @@ func (s *Socket) Connect() error {
 	}
 
 	err = s.readLoop(conn)
+	s.responseHandler.CancelAllRequests()
 	if err != nil {
 		return fmt.Errorf("%w: %w", ErrInReadLoop, err)
 	}