support latest result retrieval in the storage

cmd/cli/main.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"sort"
@@ -482,7 +482,7 @@ func (m manager) normalMode(g *gocui.Gui, v *gocui.View) error {
 	helpLineHeight := 1
 	const helpLine = "HELP: type to search, UP/DOWN or CTRL+P/N to select, RIGHT to edit, ENTER to execute, CTRL+G to abort, CTRL+C/D to quit; " +
 		"FLAGS: G = this git repo, E# = exit status #"
-		// "TIP: when resh-cli is launched command line is used as initial search query"
+	// "TIP: when resh-cli is launched command line is used as initial search query"
 
 	mainViewHeight := maxY - topBoxHeight - statusLineHeight - helpLineHeight
 	m.s.displayedItemsCount = mainViewHeight
@@ -589,7 +589,7 @@ func SendCliMsg(out *output.Output, m msg.CliMsg, port string) msg.CliResponse {
 	}
 
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		out.Fatal("Failed read response", err)
 	}

cmd/control/cmd/version.go

@@ -3,7 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"strconv"
@@ -69,7 +69,7 @@ func getDaemonStatus(port int) (msg.StatusResponse, error) {
 		return mess, err
 	}
 	defer resp.Body.Close()
-	jsn, err := ioutil.ReadAll(resp.Body)
+	jsn, err := io.ReadAll(resp.Body)
 	if err != nil {
 		out.Fatal("Error while reading 'daemon /status' response", err)
 	}

cmd/daemon/run-server.go

@@ -35,7 +35,7 @@ func (s *Server) Run() {
 
 	shutdown := make(chan string)
 
-	history := histcli.New()
+	history := histcli.New(s.sugar)
 
 	// histfile
 	histfileRecords := make(chan recordint.Collect)

cmd/daemon/session-init.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/curusarn/resh/internal/recordint"
@@ -19,7 +19,7 @@ func (h *sessionInitHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	sugar.Debugw("Handling request, sending response, reading body ...")
 	w.Write([]byte("OK\n"))
 	// TODO: should we somehow check for errors here?
-	jsn, err := ioutil.ReadAll(r.Body)
+	jsn, err := io.ReadAll(r.Body)
 	// run rest of the handler as goroutine to prevent any hangups
 	go func() {
 		if err != nil {

internal/histcli/histcli.go

@@ -2,19 +2,27 @@ package histcli
 
 import (
 	"github.com/curusarn/resh/internal/recordint"
+	"go.uber.org/zap"
 	"sync"
 )
 
 // Histcli is a dump of history preprocessed for resh cli purposes
 type Histcli struct {
 	// list of records
-	list []recordint.SearchApp
+	list     []recordint.SearchApp
-	lock sync.RWMutex
+	knownIds map[string]struct{}
+	lock     sync.RWMutex
+	sugar    *zap.SugaredLogger
+	latest   map[string]float64
 }
 
 // New Histcli
-func New() *Histcli {
+func New(sugar *zap.SugaredLogger) *Histcli {
-	return &Histcli{}
+	return &Histcli{
+		sugar:    sugar.With(zap.String("component", "histCli")),
+		knownIds: map[string]struct{}{},
+		latest:   map[string]float64{},
+	}
 }
 
 // AddRecord to the histcli
@@ -23,7 +31,13 @@ func (h *Histcli) AddRecord(rec *recordint.Indexed) {
 	h.lock.Lock()
 	defer h.lock.Unlock()
 
-	h.list = append(h.list, cli)
+	if _, ok := h.knownIds[rec.Rec.RecordID]; !ok {
+		h.knownIds[rec.Rec.RecordID] = struct{}{}
+		h.list = append(h.list, cli)
+		h.updateLatestPerDevice(cli)
+	} else {
+		h.sugar.Debugw("Record is already present", "id", rec.Rec.RecordID)
+	}
 }
 
 // AddCmdLine to the histcli
@@ -41,3 +55,21 @@ func (h *Histcli) Dump() []recordint.SearchApp {
 
 	return h.list
 }
+
+// updateLatestPerDevice should be called only with write lock because it does not lock on its own.
+func (h *Histcli) updateLatestPerDevice(rec recordint.SearchApp) {
+	if l, ok := h.latest[rec.DeviceID]; ok {
+		if rec.Time > l {
+			h.latest[rec.DeviceID] = rec.Time
+		}
+	} else {
+		h.latest[rec.DeviceID] = rec.Time
+	}
+}
+
+func (h *Histcli) LatestRecordsPerDevice() map[string]float64 {
+	h.lock.RLock()
+	defer h.lock.RUnlock()
+
+	return h.latest
+}

internal/recordint/searchapp.go

@@ -43,6 +43,7 @@ func NewSearchApp(r *Indexed) SearchApp {
 	return SearchApp{
 		IsRaw:     false,
 		SessionID: r.Rec.SessionID,
+		DeviceID:  r.Rec.DeviceID,
 		CmdLine:   r.Rec.CmdLine,
 		Host:      r.Rec.Device,
 		Pwd:       r.Rec.Pwd,

internal/searchapp/test.go

@@ -17,7 +17,7 @@ func LoadHistoryFromFile(sugar *zap.SugaredLogger, historyPath string, numLines
 	if numLines != 0 && numLines < len(recs) {
 		recs = recs[:numLines]
 	}
-	cliRecords := histcli.New()
+	cliRecords := histcli.New(sugar)
 	for i := len(recs) - 1; i >= 0; i-- {
 		rec := recs[i]
 		cliRecords.AddRecord(&rec)

internal/syncconnector/reader.go

@@ -3,9 +3,9 @@ package syncconnector
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"github.com/curusarn/resh/record"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
@@ -15,15 +15,25 @@ func (sc SyncConnector) getLatestRecord(machineId *string) (map[string]string, e
 	return map[string]string{}, nil
 }
 
-func (sc SyncConnector) downloadRecords(lastRecords map[string]string) ([]record.V1, error) {
+func (sc SyncConnector) downloadRecords(lastRecords map[string]float64) ([]record.V1, error) {
 	var records []record.V1
 
 	client := http.Client{
 		Timeout: 3 * time.Second,
 	}
 
-	// TODO: create request based on the local last records
+	latestRes := map[string]string{}
-	responseBody := bytes.NewBuffer([]byte("{}"))
+	for device, t := range lastRecords {
+		sc.sugar.Debugf("Latest for %s is %f", device, t)
+		latestRes[device] = fmt.Sprintf("%.4f", t)
+	}
+
+	latestJson, err := json.Marshal(latestRes)
+	if err != nil {
+		sc.sugar.Errorw("converting latest to JSON failed", "err", err)
+		return nil, err
+	}
+	responseBody := bytes.NewBuffer(latestJson)
 
 	address := sc.getAddressWithPath(historyEndpoint)
 	resp, err := client.Post(address, "application/json", responseBody)
@@ -38,7 +48,7 @@ func (sc SyncConnector) downloadRecords(lastRecords map[string]string) ([]record
 			sc.sugar.Errorw("reader close failed", "err", err)
 		}
 	}(resp.Body)
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		log.Fatalln(err)
 	}

internal/syncconnector/syncconnector.go

@@ -43,7 +43,7 @@ func New(sugar *zap.SugaredLogger, address string, authToken string, pullPeriodS
 		for _ = range time.Tick(time.Second * time.Duration(pullPeriodSeconds)) {
 			sc.sugar.Debug("checking remote")
 
-			recs, err := sc.downloadRecords(map[string]string{})
+			recs, err := sc.downloadRecords(sc.history.LatestRecordsPerDevice())
 			if err != nil {
 				continue
 			}