hs remote search support

Adds support to hs search using a remote HashUp API server.

Author: rubiojr

TODO

@@ -3,3 +3,5 @@
 * Cache file stats when updating the database
 * Remote search: use a remote node for file search, which means the remote node should have a copy of the file database
 * Config migrations: figure out how to migrate to newer nats and hashup config versions
+* Add config section for API
+* Advanced query support when using API (extension, host, etc)

cmd/hs/search.go

@@ -6,6 +6,9 @@ import (
 	"strings"
 
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rubiojr/hashup/cmd/hs/types"
+	"github.com/rubiojr/hashup/internal/api"
+	hsdb "github.com/rubiojr/hashup/internal/db"
 	"github.com/urfave/cli/v2"
 )
 
@@ -15,10 +18,10 @@ func commandSearch() *cli.Command {
 		Aliases: []string{"s"},
 		Usage:   "Search for files by filename",
 		Flags: []cli.Flag{
-			&cli.StringFlag{
+			&cli.IntFlag{
 				Name:     "limit",
 				Usage:    "Number of results to return",
-				Value:    "100",
+				Value:    100,
 				Required: false,
 			},
 			&cli.StringFlag{
@@ -44,20 +47,30 @@ func commandSearch() *cli.Command {
 				Value:    "",
 				Required: false,
 			},
+			&cli.StringFlag{
+				Name:     "server-url",
+				Usage:    "HashUp API server URL",
+				Required: false,
+			},
 		},
 		Action: func(c *cli.Context) error {
 			hostFilter := c.String("host")
 			extFilter := c.String("extension")
+			serverURL := c.String("server-url")
 
-			if c.String("tag") != "" {
-				return searchByTag(c)
-			}
-
+			filename := c.Args().Get(0)
 			if c.NArg() == 0 {
 				return fmt.Errorf("filename argument is required")
 			}
 
-			filename := c.Args().Get(0)
+			if serverURL != "" {
+				return searchServer(serverURL, filename)
+			}
+
+			if c.String("tag") != "" {
+				return searchByTag(c)
+			}
+
 			if hostFilter != "" {
 				return searchByHost(c, filename)
 			}
@@ -95,27 +108,19 @@ func searchByTag(c *cli.Context) error {
 
 func searchByExt(c *cli.Context, filename string) error {
 	ext := c.String("ext")
-	limit := c.String("limit")
+	limit := c.Int("limit")
 	db, err := dbConn(c.String("db"))
 	if err != nil {
 		return fmt.Errorf("failed to get database connection: %v", err)
 	}
 	defer db.Close()
 
-	query := `
-		SELECT file_path, file_size, modified_date, host, extension, file_hash
-		FROM file_info
-		WHERE (file_path LIKE ? OR file_hash LIKE ?) AND extension = ?
-		LIMIT ?
-	`
-
-	rows, err := db.Query(query, "%"+filename+"%", "%"+filename+"%", ext, limit)
-	if err != nil {
-		return fmt.Errorf("failed to query database: %v", err)
+	r, err := hsdb.Search(db, filename, []string{ext}, limit)
+	for _, result := range r {
+		printFileResult(result)
 	}
-	defer rows.Close()
 
-	return printRows(rows)
+	return nil
 }
 
 func searchByHost(c *cli.Context, filename string) error {
@@ -150,20 +155,12 @@ func searchFiles(c *cli.Context, filename string) error {
 	}
 	defer db.Close()
 
-	query := `
-		SELECT file_path, file_size, modified_date, host, extension, file_hash
-		FROM file_info
-		WHERE file_path LIKE ? OR file_hash LIKE ?
-		LIMIT 100
-	`
-
-	rows, err := db.Query(query, "%"+filename+"%", "%"+filename+"%")
-	if err != nil {
-		return fmt.Errorf("failed to query database: %v", err)
+	r, err := hsdb.Search(db, filename, []string{}, 100)
+	for _, result := range r {
+		printFileResult(result)
 	}
-	defer rows.Close()
 
-	return printRows(rows)
+	return nil
 }
 
 func printRows(rows *sql.Rows) error {
@@ -193,3 +190,27 @@ func printRows(rows *sql.Rows) error {
 
 	return nil
 }
+
+func searchServer(serverURL string, filename string) error {
+	client := api.NewClient(serverURL)
+	r, err := client.Search(filename)
+	if err != nil {
+		return fmt.Errorf("failed to search server: %v", err)
+	}
+
+	for _, result := range r {
+		printFileResult(result)
+	}
+
+	return nil
+}
+
+func printFileResult(result *types.FileResult) {
+	fmt.Printf("File Path: %s\n", result.FilePath)
+	fmt.Printf("File Size: %d bytes\n", result.FileSize)
+	fmt.Printf("Modified Date: %s\n", result.ModifiedDate)
+	fmt.Printf("Host: %s\n", result.Host)
+	fmt.Printf("Extension: %s\n", result.Extension)
+	fmt.Printf("Hash: %s\n", result.FileHash)
+	fmt.Println(strings.Repeat("-", 40))
+}

internal/api/api.go

@@ -2,16 +2,21 @@ package api
 
 import (
 	"database/sql"
+	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"net"
 	"net/http"
+	"net/url"
 	"strconv"
 	"time"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/render"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rubiojr/hashup/cmd/hs/types"
 	"github.com/rubiojr/hashup/internal/config"
 	hsdb "github.com/rubiojr/hashup/internal/db"
 )
@@ -36,6 +41,70 @@ func Serve(cfgPath string, addr string) error {
 	return nil
 }
 
+type Client struct {
+	client    *http.Client
+	serverURL string
+}
+
+func NewClient(serverURL string) *Client {
+	client := &http.Client{
+		Timeout: 10 * time.Second,
+		Transport: &http.Transport{
+			IdleConnTimeout: 90 * time.Second,
+			Dial: (&net.Dialer{
+				Timeout: 5 * time.Second,
+			}).Dial,
+			TLSHandshakeTimeout: 5 * time.Second,
+		},
+	}
+	return &Client{client: client, serverURL: serverURL}
+}
+
+func (c *Client) Search(query string) ([]*types.FileResult, error) {
+	// Build the URL with query parameters
+	urlStr := fmt.Sprintf("%s/search?q=%s", c.serverURL, url.QueryEscape(query))
+
+	// Create request
+	req, err := http.NewRequest("GET", urlStr, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request: %w", err)
+	}
+
+	// Set headers
+	req.Header.Set("Accept", "application/json")
+
+	// Execute request
+	resp, err := c.client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute request: %w", err)
+	}
+	defer resp.Body.Close()
+
+	// Check response status
+	if resp.StatusCode != http.StatusOK {
+		// Try to read error message
+		body, _ := io.ReadAll(resp.Body)
+
+		// Parse error response if possible
+		var errorResp struct {
+			Error string `json:"error"`
+		}
+		if err := json.Unmarshal(body, &errorResp); err == nil && errorResp.Error != "" {
+			return nil, fmt.Errorf("server returned error: %s (status: %d)", errorResp.Error, resp.StatusCode)
+		}
+
+		return nil, fmt.Errorf("server returned non-OK status: %d", resp.StatusCode)
+	}
+
+	// Parse response body
+	var results []*types.FileResult
+	if err := json.NewDecoder(resp.Body).Decode(&results); err != nil {
+		return nil, fmt.Errorf("failed to decode response: %w", err)
+	}
+
+	return results, nil
+}
+
 func statusJSON(code int, err error, w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(code)

internal/db/db.go

@@ -59,28 +59,26 @@ func Search(db *sql.DB, query string, extensions []string, limit int) ([]*types.
 		WHERE (file_path LIKE ? OR file_hash LIKE ?)
 	`
 
+	var args []any
+	args = append(args, "%"+query+"%", "%"+query+"%")
+
 	if len(extensions) > 0 {
 		placeholders := make([]string, len(extensions))
 		for i := range extensions {
 			placeholders[i] = "?"
 		}
 		sqlQuery += fmt.Sprintf(" AND extension IN (%s)", strings.Join(placeholders, ","))
+		for _, ext := range extensions {
+			args = append(args, strings.TrimSpace(ext))
+		}
 	}
 
 	sqlQuery += `
 		ORDER BY modified_date DESC
 	`
 
-	var args []any
-	args = append(args, "%"+query+"%", "%"+query+"%")
-
-	if len(extensions) > 0 {
-		for _, ext := range extensions {
-			args = append(args, strings.TrimSpace(ext))
-		}
-	}
-
 	sqlQuery += fmt.Sprintf("LIMIT %d", limit)
+	fmt.Println(sqlQuery)
 
 	rows, err := db.Query(sqlQuery, args...)
 	if err != nil {