Buffer displayed packets update

Author: NamelessOne91

tui/models/bisturi_model.go

@@ -5,6 +5,7 @@ import (
 	"net"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/NamelessOne91/bisturi/sockets"
 	"github.com/NamelessOne91/bisturi/tui/styles"
@@ -26,7 +27,7 @@ const (
 
 type errMsg error
 
-type packetMsg sockets.NetworkPacket
+type readPacketsMsg []sockets.NetworkPacket
 
 type bisturiModel struct {
 	terminalHeight    int
@@ -41,6 +42,7 @@ type bisturiModel struct {
 	selectedEthType   uint16
 	rawSocket         *sockets.RawSocket
 	packetsChan       chan sockets.NetworkPacket
+	msgChan           chan tea.Msg
 	errChan           chan error
 	err               error
 }
@@ -60,8 +62,11 @@ func NewBisturiModel() *bisturiModel {
 	s.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("#00cc99"))
 
 	return &bisturiModel{
-		step:    retrieveIfaces,
-		spinner: s,
+		step:        retrieveIfaces,
+		spinner:     s,
+		packetsChan: make(chan sockets.NetworkPacket),
+		msgChan:     make(chan tea.Msg),
+		errChan:     make(chan error),
 	}
 }
 
@@ -213,16 +218,12 @@ func (m *bisturiModel) updateRowsInput(msg tea.Msg) (tea.Model, tea.Cmd) {
 			maxRows, err := strconv.Atoi(m.rowsInput.Value())
 			if err == nil && maxRows > 0 {
 				m.packetsTable = newPacketsTable(maxRows, m.terminalWidth)
-
-				m.packetsChan = make(chan sockets.NetworkPacket)
-				m.errChan = make(chan error)
-
 				m.step = receivePackets
 
-				return m, tea.Batch(func() tea.Msg {
-					go m.rawSocket.ReadToChan(m.packetsChan, m.errChan)
-					return nil
-				}, m.waitForPacket)
+				go m.rawSocket.ReadToChan(m.packetsChan, m.errChan)
+				go m.readPackets()
+
+				return m, m.pollPacketsMessages()
 			}
 		}
 	}
@@ -242,18 +243,34 @@ func (m *bisturiModel) updateReceivingPacket(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.packetsTable.resizeTable(m.terminalWidth)
 
 		return m, nil
-
-	case sockets.NetworkPacket:
-		return m, m.waitForPacket
+	case readPacketsMsg:
+		return m, m.pollPacketsMessages()
 	}
 	return m, cmd
 }
 
-func (m bisturiModel) waitForPacket() tea.Msg {
-	select {
-	case packet := <-m.packetsChan:
-		return packetMsg(packet)
-	case err := <-m.errChan:
-		return errMsg(err)
+func (m bisturiModel) readPackets() {
+	readPackets := []sockets.NetworkPacket{}
+	timer := time.NewTicker(3 * time.Second)
+	defer timer.Stop()
+
+	for {
+		select {
+		case packet := <-m.packetsChan:
+			readPackets = append(readPackets, packet)
+		case <-timer.C:
+			if len(readPackets) > 0 {
+				m.msgChan <- readPacketsMsg(readPackets)
+				readPackets = []sockets.NetworkPacket{}
+			}
+		case err := <-m.errChan:
+			m.msgChan <- errMsg(err)
+		}
+	}
+}
+
+func (m bisturiModel) pollPacketsMessages() tea.Cmd {
+	return func() tea.Msg {
+		return <-m.msgChan
 	}
 }

tui/models/packets_table.go

@@ -61,8 +61,8 @@ func (m packetsTablemodel) Init() tea.Cmd {
 
 func (m packetsTablemodel) Update(msg tea.Msg) (packetsTablemodel, tea.Cmd) {
 	switch msg := msg.(type) {
-	case packetMsg:
-		m.addRow(msg)
+	case readPacketsMsg:
+		m.addRows(msg)
 		return m, nil
 
 	case tea.KeyMsg:
@@ -81,19 +81,21 @@ func (m packetsTablemodel) View() string {
 	return fmt.Sprintf("Displaying up to the last %d rows\n\n%s", m.maxRows, m.table.View())
 }
 
-func (m *packetsTablemodel) addRow(data sockets.NetworkPacket) {
-	if len(m.cachedRows) >= m.maxRows {
-		m.cachedRows = m.cachedRows[1:]
-	}
-	m.counter += 1
+func (m *packetsTablemodel) addRows(packets []sockets.NetworkPacket) {
+	for _, np := range packets {
+		if len(m.cachedRows) >= m.maxRows {
+			m.cachedRows = m.cachedRows[1:]
+		}
+		m.counter += 1
 
-	newRow := table.NewRow(table.RowData{
-		columnKeyID:          m.counter,
-		columnKeyDate:        time.Now().Local().Format(time.Stamp),
-		columnKeySource:      data.Source(),
-		columnKeyDestination: data.Destination(),
-		columnKeyInfo:        data.Info(),
-	})
-	m.cachedRows = append(m.cachedRows, newRow)
+		newRow := table.NewRow(table.RowData{
+			columnKeyID:          m.counter,
+			columnKeyDate:        time.Now().Local().Format(time.Stamp),
+			columnKeySource:      np.Source(),
+			columnKeyDestination: np.Destination(),
+			columnKeyInfo:        np.Info(),
+		})
+		m.cachedRows = append(m.cachedRows, newRow)
+	}
 	m.table = m.table.WithRows(m.cachedRows)
 }