Add govulncheck to tools

Add gomajor to tools
flake.lock: Update
2025-03-20 19:19:20 +01:00 · 2025-03-20 19:16:37 +01:00 · 2025-03-20 19:12:46 +01:00 · 2025-03-20 18:57:31 +01:00 · 2025-03-20 18:53:23 +01:00 · 2025-03-20 18:40:50 +01:00
32 changed files with 5646 additions and 1019 deletions
--- a/33
+++ b/33
@@ -1,12 +1,16 @@
-FROM node:latest as frontend-builder
+FROM node:alpine as frontend-builder
-RUN mkdir -p /app/frontend
+WORKDIR /app
-COPY web/frontend/yarn.lock /app/frontend/yarn.lock
+COPY frontend/package.json /app
-COPY web/frontend/package.json /app/frontend/package.json
+COPY frontend/package-lock.json /app
-WORKDIR /app/frontend
+RUN npm install
-RUN yarn install
+COPY frontend .
-COPY web/frontend /app/frontend
+RUN npm run build
-WORKDIR /app/frontend
+
-RUN GENERATE_SOURCEMAP=false yarn build
+FROM alpine:latest as geoip-fetcher
 RUN apk add --no-cache git
 WORKDIR /app
 RUN git clone https://github.com/geoacumen/geoacumen-country.git
 RUN find .
 FROM golang:latest as builder
 WORKDIR /app
@@ -14,16 +18,15 @@ COPY go.mod /app/go.mod
 COPY go.sum /app/go.sum
 RUN go mod download
 COPY . /app
-RUN rm -rf /app/server/frontend
+COPY --from=geoip-fetcher /app/geoacumen-country/Geoacumen-Country.mmdb honeypot/ssh
-COPY --from=frontend-builder /app/frontend/dist /app/web/frontend/dist
+COPY --from=frontend-builder /app/dist /app/web/frontend/dist
-RUN CGO_ENABLED=0 INSTALL_PREFIX=/app make install
+RUN CGO_ENABLED=0 go build -tags embed cmd/apiary/apiary.go
 FROM alpine:latest
 RUN apk add --no-cache curl
 WORKDIR /app
-COPY --from=builder /app/etc/apiary/apiary.toml /app/apiary.toml
+COPY --from=builder /app/apiary.toml /app/apiary.toml
-COPY --from=builder /app/bin/apiary /app/apiary
+COPY --from=builder /app/apiary /app/apiary
 EXPOSE 8080
 EXPOSE 2222
 HEALTHCHECK --interval=1m --timeout=10s --start-period=5s --retries=3 CMD curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8080/api/health || exit 1
 CMD ["/app/apiary", "serve"]
--- a/62
+++ b/62
@@ -1,62 +0,0 @@
 NAME = apiary
 .DEFAULT_GOAL := all
 .PHONY: all clean
 INSTALL_PREFIX ?= /usr/local
 VERSION = $(shell cat version.go |grep "Version"| head -n 1 |cut -d "=" -f2| tr -d "\" ")
 ARCH = $(shell go env | grep GOHOSTARCH | cut -d"=" -f2 | tr -d "\"")
 OS = $(shell go env | grep GOHOSTOS | cut -d"=" -f2 | tr -d "\"")
 GIT_COMMIT := $(shell git rev-parse --short HEAD)
 BUILD_DIR = build/binary/current
 BUILD_OUTPUT = $(BUILD_DIR)/$(NAME)-$(VERSION)-$(OS)-$(ARCH)
 BUILD_FLAGS = -tags embed -ldflags "-X git.t-juice.club/torjus/apiary.Build=$(GIT_COMMIT)" -o $(BUILD_OUTPUT)
 GEODB_URL = https://raw.githubusercontent.com/geoacumen/geoacumen-country/master/Geoacumen-Country.mmdb
 GEODB_PATH = honeypot/Geoacumen-Country.mmdb
 FRONTEND_BUILD_DIR = web/frontend/dist
 ifeq ($(INSTALL_PREFIX), /)
 	INSTALL_BIN_DIR=/usr/bin
 	INSTALL_ETC_DIR=/etc/$(NAME)
 else
 	INSTALL_BIN_DIR=$(INSTALL_PREFIX)/bin
 	INSTALL_ETC_DIR=$(INSTALL_PREFIX)/etc/$(NAME)
 endif
 $(GEODB_PATH):
 	curl $(GEODB_URL) -o $(GEODB_PATH)
 $(BUILD_DIR):
 	mkdir -p $(BUILD_DIR)
 $(FRONTEND_BUILD_DIR):
 	cd web/frontend && yarn install && yarn build
 $(BUILD_OUTPUT): $(BUILD_DIR) $(GEODB_PATH) $(FRONTEND_BUILD_DIR)
 	CGO_ENABLED=0 go build $(BUILD_FLAGS) cmd/apiary.go
 frontend:
 	cd web/frontend && yarn install && yarn build
 clean:
 	rm -rv $(BUILD_DIR)
 	rm -rv $(FRONTEND_BUILD_DIR)
 geodb: $(GEODB_PATH)
 build: $(BUILD_OUTPUT)
 install: build
 	mkdir -p $(INSTALL_BIN_DIR)
 	mkdir -p $(INSTALL_ETC_DIR)
 	install -m 755 $(BUILD_OUTPUT) $(INSTALL_BIN_DIR)/$(NAME)
 	install -m 755 apiary.toml $(INSTALL_ETC_DIR)/apiary.toml
 uninstall:
 	rm -v $(INSTALL_ETC_DIR)/apiary.toml
 	rmdir -v $(INSTALL_ETC_DIR)
 	rm -v $(INSTALL_BIN_DIR)/$(NAME)
--- a/README.md
+++ b/README.md
@@ -2,45 +2,32 @@
 SSH honeypot with web-frontend.
-## TODO
+## Build using nix
-* Fix janky ass Makefile
+```console
 $ nix build .#
-## Requirements
+$ ./result/bin/apiary --version
-
+apiary version v0.2.1-d86bc2be079c6b18a9f941752ebad45d925366d1 (go1.23.6)
 * `go >= 1.16`
 Requires a postgres database if you want data to persist through server restart.
 ## Build
 ```text
 # make frontend
 # make build
 ```
 ## Build without nix
 See [Dockerfile](./Dockerfile) for how to build frontend and backend. Or use Dockerfile
 and copy binary from image.
 ## Install
-```text
+```console
-# Build and install
+Build or download binary
-INSTALL_PREFIX=/ sudo make install
+$ cp ./apiary /usr/local/bin/apiary
-# Edit config file
+Edit config file, should use postgres if you want persistent storage.
-vim /etc/apiary/apiary.toml
+See example config for the different options.
 $ vim /etc/apiary/apiary.toml
-# Run
+$ /usr/bin/apiary serve
-/usr/bin/apiary serve
+2021-04-10T11:27:42.783+0200    INFO   APP     Starting SSH server
-# 2021-04-10T11:27:42.783+0200    INFO   APP     Starting SSH server
+2021-04-10T11:27:42.783+0200    INFO   APP     Starting web server
 # 2021-04-10T11:27:42.783+0200    INFO   APP     Starting web server
 ```
 ## Development
 Run postgres-tests by running a postgres container:
 ```text
 podman run -d -q -e POSTGRES_PASSWORD=apiary -e POSTGRES_USER=apiary -e POSTGRES_DB=apiary --rm --name apiary-test-db -p5432:5432 postgres:latest
 export APIARY_TEST_POSTGRES_DSN="postgresql://apiary:apiary@localhost/apiary"
 go test ./...
 ```
--- a/apiary.toml
+++ b/apiary.toml
@@ -35,10 +35,13 @@ ThrottleSpeed = 10240.0
 # Must be either "DEBUG", "INFO", "WARN", "ERROR", "FATAL", "NONE"
 # Default: "INFO"
 LogLevel = "INFO"
 # Enable metrics endpoint
 # Default: false
 MetricsEnable = false
 # Enable access logging
 # Default: true
 AccessLogEnable = true
-# Disable logging of successful requests to metrics endpoint
+# Disable logging of requests to metrics endpoint
 # Default: false
 AccessLogIgnoreMetrics = false
 # Address and port to listen to
@@ -63,32 +66,3 @@ CacheDir = "/var/apiary/certs"
 # Default: true
 RedirectHTTP = true
 [Ports]
 # Enable the port listener.
 # Default: false
 Enable = false
 # Which address to listen on.
 # Default: "" (listen to all addresses)
 Addr = ""
 # Which TCP ports to listen to.
 # Default: []
 TCPPorts = ["25"]
 # Which UDP ports to listen to.
 # Default: []
 UDPPorts = ["25"]
 [SMTP]
 # Enable the port listener.
 # Default: false
 Enable = true
 # Which address and port to listen on.
 # Default: ":25"
 Addr = ":25"
 # Enable collecting prometheus metrics
 # Default: false
 EnableMetrics = true
--- a/cmd/apiary/apiary.go
+++ b/cmd/apiary/apiary.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
 	"log/slog"
 	"net/http"
 	"os"
 	"os/signal"
@@ -16,22 +17,14 @@ import (
 	"git.t-juice.club/torjus/apiary/web"
 	"github.com/coreos/go-systemd/daemon"
 	sshlib "github.com/gliderlabs/ssh"
-	"github.com/urfave/cli/v2"
+	"github.com/urfave/cli/v3"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/crypto/acme/autocert"
 )
 func main() {
-	app := &cli.App{
+	app := &cli.Command{
 		Name:    "apiary",
 		Version: apiary.FullVersion(),
 		Authors: []*cli.Author{
 			{
 				Name:  "Torjus Håkestad",
 				Email: "torjus@usit.uio.no",
 			},
 		},
 		Commands: []*cli.Command{
 			{
 				Name:   "serve",
@@ -41,13 +34,13 @@ func main() {
 		},
 	}
-	if err := app.Run(os.Args); err != nil {
+	if err := app.Run(context.Background(), os.Args); err != nil {
 		fmt.Printf("Error: %s\n", err)
 		os.Exit(1)
 	}
 }
-func ActionServe(c *cli.Context) error {
+func ActionServe(ctx context.Context, cmd *cli.Command) error {
 	cfg, err := getConfig()
 	if err != nil {
 		return err
@@ -55,17 +48,17 @@ func ActionServe(c *cli.Context) error {
 	// Setup logging
 	loggers := setupLoggers(cfg)
-	loggers.rootLogger.Infow("Starting apiary.", "version", apiary.FullVersion())
+	loggers.rootLogger.Info("Starting apiary.", "version", apiary.FullVersion())
 	// Setup store
 	var s store.LoginAttemptStore
 	switch cfg.Store.Type {
 	case "MEMORY", "memory":
-		loggers.rootLogger.Infow("Initialized store.", "store_type", "memory")
+		loggers.rootLogger.Info("Initialized store.", "store_type", "memory")
 		s = &store.MemoryStore{}
 	case "POSTGRES", "postgres":
 		pgStartTime := time.Now()
-		loggers.rootLogger.Debugw("Initializing store.", "store_type", "postgres")
+		loggers.rootLogger.Debug("Initializing store.", "store_type", "postgres")
 		pgStore, err := store.NewPostgresStore(cfg.Store.Postgres.DSN)
 		if err != nil {
 			return err
@@ -73,36 +66,16 @@ func ActionServe(c *cli.Context) error {
 		if err := pgStore.InitDB(); err != nil {
 			return err
 		}
-		loggers.rootLogger.Infow("Initialized store.", "store_type", "postgres", "init_time", time.Since(pgStartTime))
+		loggers.rootLogger.Info("Initialized store.", "store_type", "postgres", "init_time", time.Since(pgStartTime))
 		if cfg.Store.EnableCache {
-			loggers.rootLogger.Debugw("Initializing store.", "store_type", "cache-postgres")
+			loggers.rootLogger.Debug("Initializing store.", "store_type", "cache-postgres")
 			startTime := time.Now()
 			cachingStore := store.NewCachingStore(pgStore)
 			s = cachingStore
-			loggers.rootLogger.Infow("Initialized store.", "store_type", "cache-postgres", "init_time", time.Since(startTime))
+			loggers.rootLogger.Info("Initialized store.", "store_type", "cache-postgres", "init_time", time.Since(startTime))
 		} else {
 			s = pgStore
 		}
 	case "bolt", "BOLT":
 		boltStartTime := time.Now()
 		loggers.rootLogger.Debugw("Initializing store.", "store_type", "bolt")
 		boltStore, err := store.NewBBoltStore(cfg.Store.Bolt.DBPath)
 		if err != nil {
 			return err
 		}
 		defer boltStore.Close()
 		loggers.rootLogger.Infow("Initialized store.", "store_type", "bolt", "init_time", time.Since(boltStartTime))
 		if cfg.Store.EnableCache {
 			loggers.rootLogger.Debugw("Initializing store.", "store_type", "cache-bolt")
 			startTime := time.Now()
 			cachingStore := store.NewCachingStore(boltStore)
 			s = cachingStore
 			loggers.rootLogger.Infow("Initialized store.", "store_type", "cache-bolt", "init_time", time.Since(startTime))
 		} else {
 			s = boltStore
 		}
 	default:
 		return fmt.Errorf("Invalid store configured")
 	}
@@ -111,7 +84,7 @@ func ActionServe(c *cli.Context) error {
 	interruptChan := make(chan os.Signal, 1)
 	signal.Notify(interruptChan, os.Interrupt)
-	rootCtx, rootCancel := context.WithCancel(c.Context)
+	rootCtx, rootCancel := context.WithCancel(ctx)
 	defer rootCancel()
 	serversCtx, serversCancel := context.WithCancel(rootCtx)
 	defer serversCancel()
@@ -153,18 +126,18 @@ func ActionServe(c *cli.Context) error {
 	// Start ssh server
 	go func() {
-		loggers.rootLogger.Infow("Starting SSH server.", "addr", cfg.Honeypot.ListenAddr)
+		loggers.rootLogger.Info("Starting SSH server.", "addr", cfg.Honeypot.ListenAddr)
 		if err := hs.ListenAndServe(); err != nil && err != sshlib.ErrServerClosed {
-			loggers.rootLogger.Warnw("SSH server returned error.", "error", err)
+			loggers.rootLogger.Warn("SSH server returned error.", "error", err)
 		}
-		loggers.rootLogger.Infow("SSH server stopped.")
+		loggers.rootLogger.Info("SSH server stopped.")
 	}()
 	// Start web server
 	go func() {
-		loggers.rootLogger.Infow("Starting web server.", "addr", cfg.Frontend.ListenAddr)
+		loggers.rootLogger.Info("Starting web server.", "addr", cfg.Frontend.ListenAddr)
 		if err := web.StartServe(); err != nil && err != http.ErrServerClosed {
-			loggers.rootLogger.Warnw("Web server returned error.", "error", err)
+			loggers.rootLogger.Warn("Web server returned error.", "error", err)
 		}
 	}()
@@ -184,7 +157,7 @@ func ActionServe(c *cli.Context) error {
 			return
 		}
 		if err != nil {
-			loggers.rootLogger.Warnw("Unable to connect to NOTIFY_SOCKET.", "error", err)
+			loggers.rootLogger.Warn("Unable to connect to NOTIFY_SOCKET.", "error", err)
 			return
 		}
 		loggers.rootLogger.Debug("Sent READY=1 to NOTIFY_SOCKET.")
@@ -192,11 +165,11 @@ func ActionServe(c *cli.Context) error {
 		// Setup timer
 		timeout, err := daemon.SdWatchdogEnabled(false)
 		if err != nil {
-			loggers.rootLogger.Warnw("Unable to get watchdog timeout.", "error", err)
+			loggers.rootLogger.Warn("Unable to get watchdog timeout.", "error", err)
 			return
 		}
 		if timeout == 0 {
-			loggers.rootLogger.Infow("Systemd watchdog not enabled.")
+			loggers.rootLogger.Info("Systemd watchdog not enabled.")
 			return
 		}
@@ -209,14 +182,14 @@ func ActionServe(c *cli.Context) error {
 			case <-ticker.C:
 				if healthy == nil {
 					if _, err := daemon.SdNotify(false, daemon.SdNotifyWatchdog); err != nil {
-						loggers.rootLogger.Warnw("Error notifying watchdog.", "err", err)
+						loggers.rootLogger.Warn("Error notifying watchdog.", "err", err)
 					}
 					continue
 				}
 				// TODO: If unhealthy, should we retry healthcheck immediately, otherwise service will most likely get killed by watchdog.
-				loggers.rootLogger.Errorw("Store reported not healthy, might get killed by watchdog.", "err", healthy)
+				loggers.rootLogger.Error("Store reported not healthy, might get killed by watchdog.", "err", healthy)
 			case <-notifyCtx.Done():
-				loggers.rootLogger.Debugw("Notify context cancelled.")
+				loggers.rootLogger.Debug("Notify context cancelled.")
 				return
 			}
 		}
@@ -230,7 +203,7 @@ func ActionServe(c *cli.Context) error {
 		defer sshShutdownCancel()
 		loggers.rootLogger.Info("SSH server shutdown started.")
 		if err := hs.Shutdown(sshShutdownCtx); err != nil {
-			loggers.rootLogger.Infow("Error shutting down SSH server.", "error", err)
+			loggers.rootLogger.Info("Error shutting down SSH server.", "error", err)
 		}
 		loggers.rootLogger.Info("SSH server shutdown complete.")
@@ -240,7 +213,7 @@ func ActionServe(c *cli.Context) error {
 		loggers.rootLogger.Info("Web server shutdown started.")
 		if err := web.Shutdown(webShutdownCtx); err != nil {
-			loggers.rootLogger.Infow("Error shutting down web server.", "error", err)
+			loggers.rootLogger.Info("Error shutting down web server.", "error", err)
 		}
 		loggers.rootLogger.Info("Web server shutdown complete.")
 		rootCancel()
@@ -252,49 +225,36 @@ func ActionServe(c *cli.Context) error {
 }
 type loggerCollection struct {
-	rootLogger      *zap.SugaredLogger
+	rootLogger      *slog.Logger
-	honeypotLogger  *zap.SugaredLogger
+	honeypotLogger  *slog.Logger
-	webAccessLogger *zap.SugaredLogger
+	webAccessLogger *slog.Logger
-	webServerLogger *zap.SugaredLogger
+	webServerLogger *slog.Logger
 }
 func setupLoggers(cfg config.Config) *loggerCollection {
-	logEncoderCfg := zap.NewProductionEncoderConfig()
+	opts := &slog.HandlerOptions{}
 	logEncoderCfg.EncodeCaller = func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {}
 	var level zap.AtomicLevel
 	switch strings.ToUpper(cfg.Honeypot.LogLevel) {
 	case "INFO":
-		level = zap.NewAtomicLevelAt(zap.InfoLevel)
+		opts.Level = slog.LevelInfo
 	case "DEBUG":
-		level = zap.NewAtomicLevelAt(zap.DebugLevel)
+		opts.Level = slog.LevelDebug
 		opts.AddSource = true
 	case "WARN", "WARNING":
-		level = zap.NewAtomicLevelAt(zap.WarnLevel)
+		opts.Level = slog.LevelWarn
 	case "ERR", "ERROR":
-		level = zap.NewAtomicLevelAt(zap.WarnLevel)
+		opts.Level = slog.LevelError
 	default:
-		level = zap.NewAtomicLevelAt(zap.InfoLevel)
+		opts.Level = slog.LevelInfo
 	}
 	logEncoderCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
 	logEncoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
 	logEncoderCfg.EncodeDuration = zapcore.StringDurationEncoder
 	rootLoggerCfg := &zap.Config{
 		Level:            level,
 		OutputPaths:      []string{"stdout"},
 		ErrorOutputPaths: []string{"stderr"},
 		Encoding:         "console",
 		EncoderConfig:    logEncoderCfg,
 	}
 	rootLogger, err := rootLoggerCfg.Build()
 	if err != nil {
 		panic(err)
 	}
 	handler := slog.NewTextHandler(os.Stdout, opts)
 	rootLogger := slog.New(handler)
 	return &loggerCollection{
-		rootLogger:      rootLogger.Named("APP").Sugar(),
+		rootLogger:      rootLogger.With("module", "application"),
-		honeypotLogger:  rootLogger.Named("HON").Sugar(),
+		honeypotLogger:  rootLogger.With("module", "honeypot"),
-		webAccessLogger: rootLogger.Named("ACC").Sugar(),
+		webAccessLogger: rootLogger.With("module", "web-access-log"),
-		webServerLogger: rootLogger.Named("WEB").Sugar(),
+		webServerLogger: rootLogger.With("module", "web-server"),
 	}
 }
--- a/config/config.go
+++ b/config/config.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
-	"github.com/pelletier/go-toml"
+	"github.com/pelletier/go-toml/v2"
 )
 type Config struct {
@@ -18,17 +18,12 @@ type StoreConfig struct {
 	Type        string              `toml:"Type"`
 	EnableCache bool                `toml:"EnableCache"`
 	Postgres    PostgresStoreConfig `toml:"Postgres"`
 	Bolt        BoltStoreConfig     `toml:"Bolt"`
 }
 type PostgresStoreConfig struct {
 	DSN string `toml:"DSN"`
 }
 type BoltStoreConfig struct {
 	DBPath string `toml:"DBPath"`
 }
 type HoneypotConfig struct {
 	ListenAddr    string  `toml:"ListenAddr"`
 	LogLevel      string  `toml:"LogLevel"`
@@ -39,6 +34,7 @@ type HoneypotConfig struct {
 type FrontendConfig struct {
 	ListenAddr             string                 `toml:"ListenAddr"`
 	LogLevel               string                 `toml:"LogLevel"`
 	MetricsEnable          bool                   `toml:"MetricsEnable"`
 	AccessLogEnable        bool                   `toml:"AccessLogEnable"`
 	AccessLogIgnoreMetrics bool                   `toml:"AccessLogIgnoreMetrics"`
 	Autocert               FrontendAutocertConfig `toml:"Autocert"`
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741010256,
+        "lastModified": 1742288794,
-        "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=",
+        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246",
+        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -29,7 +29,8 @@
      packages = forAllSystems (
        { pkgs }:
        {
-          default =
+          default = self.packages.${pkgs.system}.apiary;
          apiary =
            let
              src = pkgs.lib.sourceFilesBySuffices ./. [
                "go.mod"
@@ -43,6 +44,7 @@
                  )
                )) 2
              );
              rev = self.rev or "";
              geoDb = pkgs.fetchFromGitHub {
                owner = "geoacumen";
                repo = "geoacumen-country";
@@ -56,7 +58,7 @@
                src = ./frontend;
-                npmDepsHash = "sha256-hFoGepzNZjDFaHhb6tO3FUmW6AdEyOTXIQ6rDcUokLo=";
+                npmDepsHash = "sha256-7gjPEiQAMOpteLwHT4AIY9QLpDozpXb7xy0bDiOpDf4=";
                installPhase = ''
                  mkdir -p $out
@@ -73,11 +75,31 @@
                mkdir -p web/frontend/dist
                cp -r ${frontend}/* web/frontend/dist
              '';
-              vendorHash = "sha256-griWN9fQ0X2ClPDOzVXV80MpdcEFZfe/WaYm7L7fAc8=";
+              vendorHash = "sha256-t/DNKefG+UxZEfNYNUmOPSw6aqgNuz6v7qxow5JRXsE=";
              ldflags = [ "-X git.t-juice.club/torjus/apiary.Build=${rev}" ];
              tags = [
                "embed"
              ];
            };
          tarball =
            let
              version = self.packages.${pkgs.system}.apiary.version;
            in
            pkgs.stdenv.mkDerivation {
              name = "apiary-tarballs-${version}";
              phases = [ "installPhase" ];
              installPhase = ''
                mkdir -p $out
                mkdir apiary
                cp ${self.packages.${pkgs.system}.apiary}/bin/apiary apiary/apiary-${pkgs.system}-${version}
                tar cvzf $out/apiary-${pkgs.system}-${version}.tar.gz apiary
                pushd apiary
                sha256sum apiary-${pkgs.system}-${version} > apiary-${pkgs.system}-${version}.sha256sum
                popd
                cp apiary/apiary-${pkgs.system}-${version}.sha256sum $out
              '';
            };
        }
      );
      devShells = forAllSystems (
--- a/frontend/jest.config.js
+++ b/frontend/jest.config.js
@@ -0,0 +1,7 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} **/
 module.exports = {
  testEnvironment: "jsdom",
  transform: {
    "^.+\.tsx?$": ["ts-jest",{}],
  },
 };
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,24 +2,36 @@
  "name": "apiary-frontend",
  "scripts": {
    "start": "parcel src/index.html",
-    "build": "parcel build src/index.html"
+    "build": "parcel build src/index.html",
    "test": "jest"
  },
  "devDependencies": {
    "@ngneat/falso": "^7.3.0",
    "@parcel/transformer-css": "^2.13.3",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
    "@testing-library/react": "^16.2.0",
    "@testing-library/user-event": "^14.6.1",
    "@types/humanize-duration": "^3.27.4",
    "@types/jest": "^29.5.14",
    "@types/node": "^22.13.9",
    "@types/react": "^19.0.10",
    "@types/react-dom": "^19.0.4",
    "jest": "^29.7.0",
    "jest-environment-jsdom": "^29.7.0",
    "parcel": "^2.13.3",
    "process": "^0.11.10",
    "svgo": "^3.3.2",
    "ts-jest": "^29.2.6",
    "ts-loader": "^9.5.2",
    "typescript": "^5.8.2"
  },
  "dependencies": {
    "@types/node": "^22.13.9",
    "@types/react": "^19.0.10",
    "@types/react-dom": "^19.0.4",
    "chart.js": "^4.4.8",
    "humanize-duration": "^3.32.1",
    "react": "^19.0.0",
    "react-chartjs-2": "^5.3.0",
    "react-dom": "^19.0.0",
-    "react-router": "^7.2.0",
+    "react-router": "^7.2.0"
    "swr": "^2.3.2"
  }
 }
--- a/frontend/src/assets/apiary.svg
+++ b/frontend/src/assets/apiary.svg
@@ -0,0 +1,77 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
 	 viewBox="0 0 511.573 511.573" xml:space="preserve">
 <g transform="translate(1 1)">
 	<polygon style="fill:#FFE100;" points="254.787,7.107 84.12,143.64 425.453,143.64 	"/>
 	<polygon style="fill:#FFFFFF;" points="84.12,143.64 254.787,7.107 41.453,143.64 	"/>
 	<polygon style="fill:#FFA800;" points="254.787,7.107 425.453,143.64 468.12,143.64 	"/>
 	<g>
 		<polygon style="fill:#FFE100;" points="41.453,502.04 92.653,502.04 92.653,450.84 41.453,450.84 		"/>
 		<polygon style="fill:#FFE100;" points="416.92,502.04 468.12,502.04 468.12,450.84 416.92,450.84 		"/>
 		<polygon style="fill:#FFE100;" points="41.453,450.84 468.12,450.84 468.12,143.64 41.453,143.64 		"/>
 	</g>
 	<polygon style="fill:#FFA800;" points="442.52,126.573 442.52,502.04 468.12,502.04 468.12,146.2 	"/>
 	<polygon style="fill:#FFFFFF;" points="41.453,143.64 41.453,502.04 67.053,502.04 67.053,126.573 	"/>
 	<path style="fill:#63D3FD;" d="M314.52,450.84H195.053V341.613c0-15.36,12.8-27.307,27.307-27.307h64
 		c15.36,0,27.307,12.8,27.307,27.307V450.84H314.52z"/>
 	<path style="fill:#3DB9F9;" d="M287.213,314.307h-25.6c15.36,0,27.307,12.8,27.307,27.307V450.84h25.6V341.613
 		C314.52,327.107,302.573,314.307,287.213,314.307"/>
 	<path d="M468.12,459.373H41.453c-5.12,0-8.533-3.413-8.533-8.533v-307.2c0-2.56,1.707-5.973,4.267-6.827L250.52,0.28
 		c2.56-1.707,5.973-1.707,9.387,0L473.24,136.813c2.56,1.707,4.267,4.267,4.267,6.827v307.2
 		C476.653,455.96,473.24,459.373,468.12,459.373z M49.987,442.307h409.6v-294.4l-204.8-130.56l-204.8,130.56V442.307z"/>
 	<path d="M92.653,510.573h-51.2c-5.12,0-8.533-3.413-8.533-8.533v-51.2c0-5.12,3.413-8.533,8.533-8.533h51.2
 		c5.12,0,8.533,3.413,8.533,8.533v51.2C101.187,507.16,97.773,510.573,92.653,510.573z M49.987,493.507H84.12v-34.133H49.987
 		V493.507z"/>
 	<path d="M468.12,510.573h-51.2c-5.12,0-8.533-3.413-8.533-8.533v-51.2c0-5.12,3.413-8.533,8.533-8.533h51.2
 		c5.12,0,8.533,3.413,8.533,8.533v51.2C476.653,507.16,473.24,510.573,468.12,510.573z M425.453,493.507h34.133v-34.133h-34.133
 		V493.507z"/>
 	<path d="M7.32,177.773c-2.56,0-5.12-0.853-6.827-3.413c-2.56-3.413-1.707-9.387,1.707-11.947l34.133-25.6
 		c3.413-2.56,9.387-1.707,11.947,1.707c2.56,3.413,1.707,9.387-1.707,11.947l-34.133,25.6C10.733,176.92,9.027,177.773,7.32,177.773
 		z"/>
 	<path d="M502.253,177.773c-1.707,0-3.413-0.853-5.12-1.707L463,150.467c-3.413-2.56-4.267-8.533-1.707-11.947
 		c2.56-3.413,8.533-4.267,11.947-1.707l34.133,25.6c3.413,2.56,4.267,8.533,1.707,11.947
 		C507.373,176.92,504.813,177.773,502.253,177.773z"/>
 	<path d="M468.12,254.573H41.453c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533H468.12
 		c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,251.16,473.24,254.573,468.12,254.573z M49.987,237.507h409.6v-85.333h-409.6
 		V237.507z"/>
 	<path d="M314.52,459.373H195.053c-5.12,0-8.533-3.413-8.533-8.533V341.613c0-19.627,16.213-35.84,35.84-35.84h64
 		c19.627,0,35.84,16.213,35.84,35.84V450.84C323.053,455.96,319.64,459.373,314.52,459.373z M203.587,442.307h102.4V341.613
 		c0-10.24-8.533-18.773-18.773-18.773h-64c-11.093,0-19.627,8.533-19.627,18.773V442.307z"/>
 	<path d="M195.053,459.373h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533h153.6
 		c5.12,0,8.533,3.413,8.533,8.533v102.4C203.587,455.96,200.173,459.373,195.053,459.373z M49.987,442.307H186.52v-85.333H49.987
 		V442.307z"/>
 	<path d="M468.12,459.373h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533h153.6
 		c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,455.96,473.24,459.373,468.12,459.373z M323.053,442.307h136.533v-85.333H323.053
 		V442.307z"/>
 	<path d="M468.12,356.973h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-6.827c0-10.24-8.533-18.773-18.773-18.773h-64
 		c-11.093,0-19.627,8.533-19.627,18.773v6.827c0,5.12-3.413,8.533-8.533,8.533h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4
 		c0-5.12,3.413-8.533,8.533-8.533H468.12c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,353.56,473.24,356.973,468.12,356.973z
 		 M323.053,339.907h136.533v-85.333h-409.6v85.333H186.52c0.853-18.773,17.067-34.133,35.84-34.133h64
 		C305.987,305.773,322.2,321.133,323.053,339.907z"/>
 	<path d="M468.12,288.707h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533S473.24,288.707,468.12,288.707z"/>
 	<path d="M468.12,322.84h-34.133c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
 		c5.12,0,8.533,3.413,8.533,8.533C476.653,319.427,473.24,322.84,468.12,322.84z"/>
 	<path d="M101.187,288.707H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533S106.307,288.707,101.187,288.707z"/>
 	<path d="M75.587,322.84H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
 		c5.12,0,8.533,3.413,8.533,8.533C84.12,319.427,80.707,322.84,75.587,322.84z"/>
 	<path d="M468.12,186.307h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533C476.653,182.893,473.24,186.307,468.12,186.307z"/>
 	<path d="M468.12,220.44h-34.133c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
 		c5.12,0,8.533,3.413,8.533,8.533C476.653,217.027,473.24,220.44,468.12,220.44z"/>
 	<path d="M101.187,186.307H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533C109.72,182.893,106.307,186.307,101.187,186.307z"/>
 	<path d="M75.587,220.44H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
 		c5.12,0,8.533,3.413,8.533,8.533C84.12,217.027,80.707,220.44,75.587,220.44z"/>
 	<path d="M468.12,391.107h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533C476.653,387.693,473.24,391.107,468.12,391.107z"/>
 	<path d="M468.12,425.24h-34.133c-5.12,0-8.533-3.413-8.533-8.533s3.413-8.533,8.533-8.533h34.133c5.12,0,8.533,3.413,8.533,8.533
 		S473.24,425.24,468.12,425.24z"/>
 	<path d="M101.187,391.107H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
 		c5.12,0,8.533,3.413,8.533,8.533C109.72,387.693,106.307,391.107,101.187,391.107z"/>
 	<path d="M75.587,425.24H41.453c-5.12,0-8.533-3.413-8.533-8.533s3.413-8.533,8.533-8.533h34.133c5.12,0,8.533,3.413,8.533,8.533
 		S80.707,425.24,75.587,425.24z"/>
 </g>
 </svg>
--- a/frontend/src/css/style.module.css
+++ b/frontend/src/css/style.module.css
@@ -1,10 +1,35 @@
 :root {
    --main-color-bg: white;
    --main-color: black;
    /* Menu */
    --menu-color-bg: #212529;
    --menu-color-text: hsla(0,0%,100%,.5);
    --menu-color-text-hover: white;
    --menu-color-title-text: white;
-    --table-color-bg: #009879;
+
    /* Table */
    --table-color-header-bg: var(--menu-color-bg);
    --table-color-header-text: #dddddd;
    --table-row-odd: #dddddd;
    --table-row-even: #f3f3f3;
 }
 .dark_mode {
    --main-color-bg: #15141a;
    --main-color: white;
    /* Menu */
    --menu-color-bg: #35393d;
    --menu-color-text: hsla(0,0%,100%,.5);
    --menu-color-text-hover: white;
    --menu-color-title-text: white;
    /* Table */
    --table-color-header-bg: var(--menu-color-bg);
    --table-color-header-text: var(--menu-color-text);
    --table-row-odd: #302f36;
    --table-row-even: #232229;
 }
 #root {
    padding: 0;
    margin: 0;
@@ -12,6 +37,8 @@
    width: 100%;
 }
 body {
    background-color: var(--main-color-bg);
    color: var(--main-color);
    margin: 0;
    margin-top: 100px;
 }
@@ -21,13 +48,33 @@ body {
 *::after {
    padding: 0;
    margin: 0;
    border-box: box-sizing;
 }
 a {
    text-decoration: none;
 }
 canvas {
    width: 100%;
    display: block;
    padding-left: 0;
    padding-right: 0;
    margin-left: auto;
    margin-right: auto;
 }
 form {
    width: 100%;
 }
 input[type=text] {
    width: 100%;
    height: 30px;
    box-sizing: border-box;
    border: 2px solid var(--menu-color-bg);
    border-radius: 5px;
    padding-left: 5px;
 }
 .navbar {
    background-color: var(--menu-color-bg);
    display: flex;
@@ -59,12 +106,10 @@ a {
 .navbar h2 {
    line-height: 40px;
    align-items: center;
    padding-left: 10px;
    padding-right: 10px;
 }
 .navbar a {
    color: var(--menu-color-text);
    height: 1;
 }
@@ -90,75 +135,77 @@ a {
    font-size: 20px;
    font-weight: 200;
 }
-.totals-key { 
+.totals_key { 
    grid-area: 1 / 1 / 2 / 2; 
    text-align: right;
 }
-.totals-value { 
+.totals_value { 
    grid-area: 1 / 2 / 2 / 3;
    padding-left: 10px;
    text-align: left;
 }
-#menu-title {
+#menu_title {
-    color: white;
+    color: var(--menu-color-text-hover);
    font-family: "Secular One", sans-serif;
    font-size: 30px;
    font-weight: 300;
 }
-.menu-link {
+#menu_logo {
    padding: 5px;
    content: url("../assets/apiary.svg");
    width: 30px;
    height: 30px;
 }
 .menu_link {
    color: var(--menu-color-text);
 }
-.menu-link:hover {
+.menu_link:hover {
    color: var(--menu-color-text-hover);
 }
-.menu-link-active {
+.menu_link_active {
    color: var(--menu-color-text-hover);
 }
-.sub-menu-link {
+.stats_pie {
-    color: var(--menu-color-text);
+    max-height: 70vh;
-}
+    text-align: left;
-.sub-menu-link:hover {
+    color: white;
    color: var(--menu-color-text-hover);
 }
 .sub-menu-link-active {
    color: var(--menu-color-text-hover);
 }
 .stats-pie {
    height: 50vh;
    width: 50vw;
 }
-.live-table {
+.live_table {
    border-collapse: collapse;
    margin: 25px 0;
    font-size: 0.9em;
    font-family: sans-serif;
    min-width: 400px;
    width: 100%;
    box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
 }
-.live-table thead tr {
+.live_table thead tr {
-    background-color: var(--table-color-bg);
+    background-color: var(--table-color-header-bg);
-    color: #ffffff;
+    color: var(--table-color-header-text);
    text-align: left;
 }
-.live-table th,
+.live_table th,
-.live-table td {
+.live_table td {
    padding: 12px 15px;
    text-align: left;
 }
-.live-table tbody tr {
+.live_table tbody tr {
-    border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid var(--table-row-odd);
 }
-.live-table tbody tr:nth-of-type(even) {
+.live_table tbody tr:nth-of-type(even) {
-    background-color: #f3f3f3;
+    background-color: var(--table-row-even);
 }
-.live-table tbody tr:last-of-type {
+.live_table tbody tr:last-of-type {
    border-bottom: 2px solid var(--table-color-bg);
 }
-.live-table tbody tr.active-row {
+.live_table tbody tr.active-row {
    font-weight: bold;
-    color: #009879;
+    color: var(--table-color-bg);
 }
 .content {
    margin-left: 10vw;
    width: 50vw;
    text-align: center;
 }
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -3,7 +3,6 @@
  <head>
    <meta charset="utf-8">
    <title></title>
    <link rel="stylesheet" href="./css/style.css" />
    <link rel="stylesheet" href="./css/fonts.css" />
    <script type="module" src="./js/app.tsx"></script>
  </head>
--- a/frontend/src/js/api.ts
+++ b/frontend/src/js/api.ts
@@ -1,4 +1,5 @@
-import { randUserName, randPastDate, randIp, randPassword, randUuid, randNumber } from '@ngneat/falso';
+import { randUserName, randRecentDate, randIp, randPassword, randUuid, randNumber } from '@ngneat/falso';
 import { r } from 'react-router/dist/development/fog-of-war-Cm1iXIp7';
 export interface LoginAttempt {
    readonly date: string;
@@ -23,16 +24,18 @@ export interface StatsResult {
    count: number;
 }
 export type StatsType = 'password' | 'username' | 'ip' | 'country' | 'attempts';
 export interface ApiaryAPI {
    live(fn: (a: LoginAttempt) => void): void;
-    stats(statsType: string, limit: number): Promise<StatsResult[]>;
+    stats(statsType: StatsType, limit: number): Promise<StatsResult[]>;
    query(queryType: string, query: string): Promise<LoginAttempt[]>;
    totals(): Promise<TotalStats>;
 }
 function fakeLoginAttempt(): LoginAttempt {
    return {
-        date: randPastDate().toISOString(),
+        date: randRecentDate({ days: 2 }).toISOString(),
        remoteIP: randIp().toString(),
        username: randUserName().toString(),
        password: randPassword().toString(),
@@ -51,11 +54,23 @@ export class DummyApiaryAPIClient implements ApiaryAPI {
        return () => { clearInterval(interval) }
    }
-    async stats(_type: string, limit: number): Promise<StatsResult[]> {
+    async stats(_type: StatsType, limit: number): Promise<StatsResult[]> {
        const stats = Array.from({ length: limit }, () => {
            switch (_type) {
                case 'password':
                    return { name: randPassword().toString(), count: randNumber().valueOf() }
                case 'username':
                    return { name: randUserName().toString(), count: randNumber().valueOf() }
                case 'ip':
                    return { name: randIp().toString(), count: randNumber().valueOf() }
                case 'country':
                    return { name: 'NO', count: randNumber().valueOf() }
            }
            return { name: randUserName().toString(), count: randNumber().valueOf() }
        });
-        return Promise.resolve(stats);
+
        const sorted = stats.sort((a, b) => b.count - a.count)
        return Promise.resolve(sorted);
    }
    async query(_type: string, _query: string): Promise<LoginAttempt[]> {
        const attempts = Array.from({ length: 10 }, () => {
@@ -83,7 +98,7 @@ export class ApiaryAPIClient implements ApiaryAPI {
            es.close();
        }
    }
-    async stats(statsType: string, limit: number): Promise<StatsResult[]> {
+    async stats(statsType: StatsType, limit: number): Promise<StatsResult[]> {
        const resp = await fetch(`/api/stats?type=${statsType}&limit=${limit}`)
        if (!resp.ok) {
            throw new Error('Failed to fetch query')
@@ -92,7 +107,7 @@ export class ApiaryAPIClient implements ApiaryAPI {
        if (!data) {
            return []
        }
-        return data
+        return data.sort((a, b) => b.count - a.count)
    }
    async query(queryType: string, query: string): Promise<LoginAttempt[]> {
        const resp = await fetch(`/api/query?type=${queryType}&query=${query}`)
--- a/frontend/src/js/app.tsx
+++ b/frontend/src/js/app.tsx
@@ -1,12 +1,15 @@
 import React from "react";
 import { createRoot } from "react-dom/client";
 import { useState, useEffect } from 'react';
-import { ApiaryAPI, LoginAttempt, DummyApiaryAPIClient, ApiaryAPIClient, TotalStats, StatsResult } from "./api";
+import { ApiaryAPI, LoginAttempt, DummyApiaryAPIClient, ApiaryAPIClient, TotalStats, StatsResult, StatsType } from "./api";
 import { BrowserRouter, NavLink, Routes, Route } from "react-router";
-import { Chart as ChartJS, Tooltip, ArcElement, Legend } from "chart.js";
+import { Chart as ChartJS, Tooltip, ArcElement, Legend, ChartOptions } from "chart.js";
 import { Pie } from "react-chartjs-2";
 import humanizeDuration from "humanize-duration";
 import * as classes from "../css/style.module.css";
 ChartJS.register(Tooltip, ArcElement, Legend);
 console.log(classes);
 interface AppProps {
    api: ApiaryAPI
@@ -32,61 +35,91 @@ let chartColors = [
    "#d35400",
    "#c0392b",
    "#bdc3c7",
-    "#7f8c8d"
+    "#7f8c8d",
 ]
 export function App({ api }: AppProps) {
    const [mode, setMode] = useState("light");
    const headerProps: HeaderMenuProps = {
        title: "apiary.home.2rjus.net",
        items: [
            {
                name: "Totals",
                path: "/",
            },
            {
                name: "Passwords",
                path: "/stats/password",
            },
            {
                name: "Usernames",
                path: "/stats/username",
            },
            {
                name: "IPs",
                path: "/stats/ip",
            },
            {
                name: "Live",
                path: "/live",
            },
            {
                name: "Query",
                path: "/query",
            }
        ]
    }
    const onSelectMode = (mode: string) => {
        setMode(mode);
        if (mode === "dark") {
            document.body.classList.add(classes.dark_mode);
        } else {
            document.body.classList.remove(classes.dark_mode);
        }
    }
    useEffect(() => {
        window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => onSelectMode(e.matches ? "dark" : "light"));
        onSelectMode(window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
        return () => {
            window.matchMedia('(prefers-color-scheme: dark)').removeEventListener('change', (e) => onSelectMode(e.matches ? "dark" : "light"));
        }
    }, [])
    return (
        <>
            <BrowserRouter>
-                <Header />
+                <div id="app">
-                <div className="content">
+                    <HeaderMenu title={headerProps.title} items={headerProps.items} />
                    <div className={classes.content}>
                        <Routes>
                            <Route path="/" element={<Home api={api} />} />
-                        <Route path="/stats" element={<Stats api={api} />} />
+                            <Route path="/stats/password" element={<Stats api={api} type="password" />} />
                            <Route path="/stats/username" element={<Stats api={api} type="username" />} />
                            <Route path="/stats/ip" element={<Stats api={api} type="ip" />} />
                            <Route path="/live" element={<Live api={api} />} />
                            <Route path="/query" element={<Query api={api} />} />
                        </Routes>
                    </div>
                </div>
            </BrowserRouter >
        </>
    );
 }
-export function Stats({ api }: AppProps) {
+export interface StatsProps {
-    const [stats, setStats] = useState<StatsResult[]>([]);
+    api: ApiaryAPI
-    const [statsType, setStatsType] = useState<string>("password")
+    type: StatsType
 }
-    const activeMenu = (name: string): boolean => {
+export function Stats({ api, type }: StatsProps) {
-        if (statsType === name) {
+    const [stats, setStats] = useState<StatsResult[] | null>(null)
-            return true
+    const [currentType, setCurrentType] = useState(type)
        }
        return false
    }
    const subMenuItems: SubMenuProps = {
        items: [
            {
                name: "Passwords",
                active: () => { return activeMenu("password") },
                onClick: () => setStatsType("password")
            },
            {
                name: "Usernames",
                active: () => { return activeMenu("username") },
                onClick: () => setStatsType("username")
            },
            {
                name: "IPs",
                active: () => { return activeMenu("ip") },
                onClick: () => setStatsType("ip")
            },
        ]
    }
    useEffect(() => {
        async function getStats() {
            try {
-                let newStats = await api.stats(statsType, 10);
+                let newStats = await api.stats(type, 10);
                if (JSON.stringify(newStats) !== JSON.stringify(stats)) {
                    setStats(newStats)
                }
@@ -95,20 +128,27 @@ export function Stats({ api }: AppProps) {
            }
        }
        if (currentType !== type) {
            setCurrentType(type)
            getStats()
        }
        if (stats === null) {
            getStats()
        }
        const interval = setInterval(() => {
            getStats()
-        }, 5000)
+        }, 60000)
        return () => {
            clearInterval(interval);
        }
-    }, [stats, statsType])
+    }, [stats, type])
    return (
        <>
-            <SubMenu items={subMenuItems.items} />
+            {(stats != null && stats.length > 0) ? <StatsPie data={stats} /> : <p>Loading...</p>}
            {stats.length > 0 ? <StatsPie data={stats} /> : <p>Loading...</p>}
        </>
    );
 }
@@ -129,9 +169,24 @@ export function StatsPie({ data }: StatsPieProps) {
            borderWidth: 1
        }]
    };
    console.log(piedata)
    const getTextColor = () => {
        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'white' : 'black'
    }
    const options: ChartOptions<"pie"> = {
        plugins: {
            legend: {
                display: true,
                align: "start",
                labels: {
                    color: getTextColor(),
                }
            }
        }
    }
    return (
-        <div className="stats-pie">
+        <div className={classes.stats_pie}>
-            <Pie data={piedata} options={{ plugins: { legend: {} } }} />
+            <Pie data={piedata} options={options} />
        </div>
    )
 }
@@ -169,14 +224,14 @@ export interface TotalsProps {
 export function Totals({ totals }: TotalsProps) {
    return (
-        <div className="totals">
+        <div className={classes.totals}>
-            <div className="totals-key">
+            <div className={classes.totals_key}>
                <h2>Unique passwords</h2>
                <h2>Unique username</h2>
                <h2>Unique IPs</h2>
                <h2>Total attempts</h2>
            </div>
-            <div className="totals-value">
+            <div className={classes.totals_value}>
                <h2>{totals.password}</h2>
                <h2>{totals.username}</h2>
                <h2>{totals.ip}</h2>
@@ -193,7 +248,7 @@ export function Live({ api }: AppProps) {
    useEffect(() => {
        const cleanup = api.live((a) => {
            setLiveList((list) => {
-                return [...list, a];
+                return [a, ...list];
            });
        });
@@ -212,28 +267,65 @@ export interface LiveListProps {
    list: LoginAttempt[]
 };
 export interface DateTDProps {
    date: Date
    now: Date
 }
 export function DateTD({ date, now }: DateTDProps) {
    const [displayDate, setDisplayDate] = useState(date.toLocaleString());
    useEffect(() => {
        if (now.getTime() - date.getTime() < 14400000) {
            const newDate = humanizeDuration(now.getTime() - date.getTime(), { largest: 1, round: true }) + " ago";
            if (newDate !== displayDate) {
                setDisplayDate(newDate);
            }
        }
    }, [displayDate, now])
    return (
        <td className={classes.live_table_date}>{displayDate}</td>
    )
 }
 export function LiveList({ list }: LiveListProps) {
    const [now, setNow] = useState(new Date())
    let items = list.map((a) => {
        const attemptDate = new Date(a.date);
        const key = `${a.username}-${a.password}-${a.remoteIP}-${a.date}`;
        return (
            <tr key={a.date}>
-                <td>{a.date}</td>
+                <DateTD date={attemptDate} now={now} />
-                <td>{a.username}</td>
+                <td className={classes.live_table_username}>{a.username}</td>
-                <td>{a.password}</td>
+                <td className={classes.live_table_password}>{a.password}</td>
-                <td>{a.remoteIP}</td>
+                <td className={classes.live_table_ip}>{a.remoteIP}</td>
-                <td>{a.country}</td>
+                <td className={classes.live_table_country}>{a.country}</td>
            </tr>
        )
    })
    useEffect(() => {
        const interval = setInterval(() => {
            setNow(new Date())
        }, 1000)
        return () => {
            clearInterval(interval)
        }
    }, [now])
    return (
        <>
-            <table className="live-table">
+            <table className={classes.live_table}>
                <thead>
                    <tr>
-                        <th>Date</th>
+                        <th className={classes.live_table_date}>Date</th>
-                        <th>Username</th>
+                        <th className={classes.live_table_username}>Username</th>
-                        <th>Password</th>
+                        <th className={classes.live_table_password}>Password</th>
-                        <th>IP</th>
+                        <th className={classes.live_table_ip}>IP</th>
-                        <th>Country</th>
+                        <th className={classes.live_table_country}>Country</th>
                    </tr>
                </thead>
                <tbody>
@@ -269,7 +361,7 @@ export function Query({ api }: AppProps) {
    return (
        <>
            <form onSubmit={handleSubmit}>
-                <input placeholder="query" name="query" />
+                <input placeholder="Search..." name="query" type="text" />
            </form>
            {queryErr ? <ErrorBox message={queryErr.message} /> : null}
            <LiveList list={liveList} />
@@ -283,7 +375,7 @@ interface ErrorBoxProps {
 export function ErrorBox({ message }: ErrorBoxProps) {
    return (
-        <div className="error-box">
+        <div className={classes.error_box}>
            <p>Error: {message}</p>
        </div>
    )
@@ -291,33 +383,65 @@ export function ErrorBox({ message }: ErrorBoxProps) {
 export function Header() {
    return (
-        <div className="navbar">
+        <div className={classes.navbar}>
            <h2 id="menu-title">apiary.home.2rjus.net</h2>
-            <nav className="nav-flex">
+            <nav className={classes.nav_flex}>
                <ul>
-                    <li><NavLink to="/" className={({ isActive }) => isActive ? "menu-link-active" : "menu-link"}>Home</NavLink></li>
+                    <li><NavLink to="/" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Home</NavLink></li>
-                    <li><NavLink to="/stats" className={({ isActive }) => isActive ? "menu-link-active" : "menu-link"}>Stats</NavLink></li>
+                    <li><NavLink to="/stats/password" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Stats</NavLink></li>
-                    <li><NavLink to="/live" className={({ isActive }) => isActive ? "menu-link-active" : "menu-link"}>Live</NavLink></li>
+                    <li><NavLink to="/live" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Live</NavLink></li>
-                    <li><NavLink to="/query" className={({ isActive }) => isActive ? "menu-link-active" : "menu-link"}>Query</NavLink></li>
+                    <li><NavLink to="/query" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Query</NavLink></li>
                </ul>
            </nav>
        </div >
    );
 }
 interface HeaderItem {
    name: string
    path: string
 }
 interface HeaderMenuProps {
    title: string
    items: Array<HeaderItem>
 }
 export function HeaderMenu({ title, items }: HeaderMenuProps) {
    const menuItems = items.map((item) => {
        return (
            <li key={item.path}>
                <NavLink to={item.path} className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>{item.name}</NavLink>
            </li>
        )
    })
    return (
        <div className={classes.navbar}>
            <img id={classes.menu_logo}></img>
            <h2 id={classes.menu_title}>{title}</h2>
            <nav className={classes.nav_flex}>
                <ul>
                    {menuItems}
                </ul>
            </nav>
        </div>
    )
 }
 export interface SubMenuProps {
    items: Array<{ name: string, active: () => boolean, onClick: () => void }>
 }
 export function SubMenu({ items }: SubMenuProps) {
    return (
-        <nav className="submenu">
+        <nav className={classes.submenu}>
            <ul>
                {items.map((item) => {
                    return <li>
                        <a
                            href="#"
-                            className={item.active() ? "sub-menu-link-active" : "sub-menu-link"}
+                            className={item.active() ? classes.sub_menu_active : classes.sub_menu_link}
                            onClick={item.onClick}>{item.name}</a>
                    </li>
                })}
--- a/frontend/src/tests/api.test.ts
+++ b/frontend/src/tests/api.test.ts
@@ -0,0 +1,17 @@
 import { DummyApiaryAPIClient, TotalStats } from "../js/api";
 describe("DummyApiaryAPIClient", () => {
    const api = new DummyApiaryAPIClient()
    test("totals returns expeced value", async () => {
        let totals = await api.totals()
        const expected: TotalStats = {
            password: 1,
            username: 1,
            ip: 1,
            attempts: 1,
            country: 1,
        }
        expect(totals).toEqual(expected)
    })
 });
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -8,7 +8,7 @@
    "strict": true,
    "sourceMap": true,
    "target": "esnext",
-    "types": ["node"]
+    "types": ["node", "jest"]
  },
  "exclude": ["node_modules"],
  "include": ["src/**/*.ts", "src/**/*.tsx"]
--- a/go.mod
+++ b/go.mod
@@ -1,46 +1,49 @@
 module git.t-juice.club/torjus/apiary
-go 1.18
+go 1.24.0
 toolchain go1.24.1
 require (
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/fujiwara/shapeio v1.0.0
-	github.com/gliderlabs/ssh v0.3.5
+	github.com/gliderlabs/ssh v0.3.8
-	github.com/go-chi/chi/v5 v5.0.10
+	github.com/go-chi/chi/v5 v5.2.1
-	github.com/google/uuid v1.3.1
+	github.com/google/uuid v1.6.0
-	github.com/jackc/pgx/v4 v4.18.1
+	github.com/jackc/pgx/v5 v5.7.2
-	github.com/oschwald/maxminddb-golang v1.12.0
+	github.com/oschwald/maxminddb-golang v1.13.1
-	github.com/pelletier/go-toml v1.9.5
+	github.com/pelletier/go-toml/v2 v2.2.3
-	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_golang v1.21.1
-	github.com/urfave/cli/v2 v2.25.7
+	github.com/urfave/cli/v3 v3.0.0-beta1
-	go.etcd.io/bbolt v1.3.7
+	golang.org/x/crypto v0.36.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.14.0
 )
 require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/icholy/gomajor v0.14.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
-	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/procfs v0.16.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	golang.org/x/net v0.37.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/tools v0.29.0 // indirect
 	golang.org/x/vuln v1.1.4 // indirect
 	google.golang.org/protobuf v1.36.5 // indirect
 )
 tool (
 	github.com/icholy/gomajor
 	golang.org/x/vuln/cmd/govulncheck
 )
--- a/go.sum
+++ b/go.sum
@@ -1,21 +1,11 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -23,254 +13,81 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fujiwara/shapeio v1.0.0 h1:xG5D9oNqCSUUbryZ/jQV3cqe1v2suEjwPIcEg1gKM8M=
 github.com/fujiwara/shapeio v1.0.0/go.mod h1:LmEmu6L/8jetyj1oewewFb7bZCNRwE7wLCUNzDLaLVA=
-github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/google/go-cmdtest v0.4.1-0.20220921163831-55ab3332a786 h1:rcv+Ippz6RAtvaGgKxc+8FQIpxHgsF+HBzPyYL2cyVU=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/google/go-cmdtest v0.4.1-0.20220921163831-55ab3332a786/go.mod h1:apVn/GCasLZUVpAJ6oWAuyP7Ne7CEsQbTnc0plM3m+o=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/icholy/gomajor v0.14.0 h1:qr0eGSMyLcZa7lmSuiplH3kr6j4oH6ET8nkdZqpDcks=
-github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/icholy/gomajor v0.14.0/go.mod h1:oJuk5dppdmnvUQRKsUNelWZ7KmYpvYKVupt/OQ0y9UI=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
 github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
 github.com/jackc/pgconn v1.14.1 h1:smbxIaZA08n6YuxEX1sDyjV/qkbtUtkH20qLkR9MUR4=
 github.com/jackc/pgconn v1.14.1/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
 github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
-github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
-github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
-github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
-github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
 github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
 github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
 github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
 github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
 github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
-github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7 h1:FemxDzfMUcK2f3YY4H+05K9CDzbSVr2+q/JKN45pey0=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+golang.org/x/telemetry v0.0.0-20240522233618-39ace7a40ae7/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
-go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
 go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
-golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/vuln v1.1.4 h1:Ju8QsuyhX3Hk8ma3CesTbO8vfJD9EvUBgHvkxHBzj0I=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/vuln v1.1.4/go.mod h1:F+45wmU18ym/ca5PLTPLsSzr2KppzswxPP603ldA67s=
-golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
 google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
--- a/honeypot/ssh/actions.go
+++ b/honeypot/ssh/actions.go
@@ -1,11 +0,0 @@
 package ssh
 type ActionType int
 const (
 	ActionTypeLogPassword ActionType = iota
 	ActionTypeLogPasswordSlow
 	ActionTypeLogCommandAndExit
 	ActionTypeSendGarbage
 )
 const ActionTypeDefault ActionType = ActionTypeLogPassword
--- a/honeypot/ssh/geolocate.go
+++ b/honeypot/ssh/geolocate.go
@@ -13,7 +13,7 @@ var mmdb []byte
 func (s *HoneypotServer) LookupCountry(ip net.IP) string {
 	db, err := maxminddb.FromBytes(mmdb)
 	if err != nil {
-		s.Logger.Warnw("Error opening geoip database", "error", err)
+		s.Logger.Warn("Error opening geoip database", "error", err)
 		return "??"
 	}
@@ -25,7 +25,7 @@ func (s *HoneypotServer) LookupCountry(ip net.IP) string {
 	err = db.Lookup(ip, &record)
 	if err != nil {
-		s.Logger.Warnw("Error doing geoip lookup", "error", err)
+		s.Logger.Warn("Error doing geoip lookup", "error", err)
 		return "??"
 	}
 	if record.Country.ISOCode == "None" {
--- a/honeypot/ssh/server.go
+++ b/honeypot/ssh/server.go
@@ -3,6 +3,7 @@ package ssh
 import (
 	"context"
 	"io"
 	"log/slog"
 	"net"
 	"os"
 	"time"
@@ -16,11 +17,10 @@ import (
 	"git.t-juice.club/torjus/apiary/models"
 	sshlib "github.com/gliderlabs/ssh"
 	"github.com/google/uuid"
 	"go.uber.org/zap"
 )
 type HoneypotServer struct {
-	Logger *zap.SugaredLogger
+	Logger *slog.Logger
 	sshServer *sshlib.Server
@@ -33,7 +33,7 @@ type HoneypotServer struct {
 func NewHoneypotServer(cfg config.HoneypotConfig, store store.LoginAttemptStore) (*HoneypotServer, error) {
 	var hs HoneypotServer
 	hs.attemptStore = store
-	hs.Logger = zap.NewNop().Sugar()
+	hs.Logger = slog.New(slog.NewTextHandler(io.Discard, nil))
 	hs.sshServer = &sshlib.Server{
 		Addr:            cfg.ListenAddr,
@@ -94,19 +94,19 @@ func (hs *HoneypotServer) passwordHandler(ctx sshlib.Context, password string) b
 	}
 	country := hs.LookupCountry(la.RemoteIP)
 	if utf8.RuneCountInString(country) > 2 {
-		hs.Logger.Warnw("Too many characters in country", "country", country, "runecount", utf8.RuneCountInString(country))
+		hs.Logger.Warn("Too many characters in country", "country", country, "runecount", utf8.RuneCountInString(country))
 		country = "??"
 	}
 	la.Country = country
-	hs.Logger.Infow("Login attempt",
+	hs.Logger.Info("Login attempt",
 		"remote_ip", la.RemoteIP.String(),
 		"username", la.Username,
 		"password", la.Password,
 		"country", la.Country)
 	if err := hs.attemptStore.AddAttempt(&la); err != nil {
-		hs.Logger.Warnw("Error adding attempt to store", "error", err)
+		hs.Logger.Warn("Error adding attempt to store", "error", err)
 	}
 	for _, cFunc := range hs.attemptsCallbacks {
@@ -117,7 +117,7 @@ func (hs *HoneypotServer) passwordHandler(ctx sshlib.Context, password string) b
 }
 func (s *HoneypotServer) connCallback(ctx sshlib.Context, conn net.Conn) net.Conn {
-	s.Logger.Debugw("Connection received.", "remote_addr", conn.RemoteAddr())
+	s.Logger.Debug("Connection received.", "remote_addr", conn.RemoteAddr())
 	throttledConn := newThrottledConn(conn)
 	throttledConn.SetSpeed(s.throttleSpeed)
--- a/honeypot/ssh/store/bbolt.go
+++ b/honeypot/ssh/store/bbolt.go
@@ -1,235 +0,0 @@
 package store
 import (
 	"encoding/binary"
 	"encoding/json"
 	"fmt"
 	"sort"
 	"strings"
 	"git.t-juice.club/torjus/apiary/models"
 	bolt "go.etcd.io/bbolt"
 )
 // var _ LoginAttemptStore = &BBoltStore{}
 var bktKeyLogins []byte = []byte("logins")
 type BBoltStore struct {
 	db *bolt.DB
 }
 func NewBBoltStore(path string) (*BBoltStore, error) {
 	db, err := bolt.Open(path, 0o666, nil)
 	if err != nil {
 		return nil, fmt.Errorf("error opening database: %w", err)
 	}
 	var store BBoltStore
 	store.db = db
 	err = db.Update(func(tx *bolt.Tx) error {
 		_, err := tx.CreateBucketIfNotExists(bktKeyLogins)
 		return err
 	})
 	if err != nil {
 		return nil, fmt.Errorf("error creating database bucket: %w", err)
 	}
 	return &store, nil
 }
 func (s *BBoltStore) Close() error {
 	return s.db.Close()
 }
 func (s *BBoltStore) AddAttempt(l *models.LoginAttempt) error {
 	data, err := json.Marshal(l)
 	if err != nil {
 		return err
 	}
 	return s.db.Update(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(bktKeyLogins)
 		seq, err := bkt.NextSequence()
 		if err != nil {
 			return err
 		}
 		key := itob(seq)
 		return bkt.Put(key, data)
 	})
 }
 func (s *BBoltStore) All() (<-chan models.LoginAttempt, error) {
 	ch := make(chan models.LoginAttempt)
 	go func() {
 		_ = s.db.View(func(tx *bolt.Tx) error {
 			bkt := tx.Bucket(bktKeyLogins)
 			c := bkt.Cursor()
 			for k, v := c.First(); k != nil; k, v = c.Next() {
 				var l models.LoginAttempt
 				if err := json.Unmarshal(v, &l); err != nil {
 					close(ch)
 					panic(err)
 				}
 				ch <- l
 			}
 			close(ch)
 			return nil
 		})
 	}()
 	return ch, nil
 }
 func (s *BBoltStore) Stats(statType LoginStats, limit int) ([]StatsResult, error) {
 	if statType == LoginStatsTotals {
 		return s.statTotals()
 	}
 	counts := make(map[string]int)
 	err := s.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(bktKeyLogins)
 		c := bkt.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
 			var l models.LoginAttempt
 			if err := json.Unmarshal(v, &l); err != nil {
 				return err
 			}
 			switch statType {
 			case LoginStatsPasswords:
 				counts[l.Password]++
 			case LoginStatsCountry:
 				counts[l.Country]++
 			case LoginStatsIP:
 				counts[l.RemoteIP.String()]++
 			case LoginStatsUsername:
 				counts[l.Username]++
 			default:
 				return fmt.Errorf("invalid stat type")
 			}
 		}
 		return nil
 	})
 	if err != nil {
 		return nil, fmt.Errorf("error generating stats: %w", err)
 	}
 	if limit < 1 {
 		return toResults(counts), nil
 	}
 	if limit >= len(counts) {
 		return toResults(counts), nil
 	}
 	var si StatItems
 	for key := range counts {
 		si = append(si, StatItem{Key: key, Count: counts[key]})
 	}
 	sort.Sort(si)
 	output := make(map[string]int)
 	for i := len(si) - 1; i > len(si)-limit-1; i-- {
 		output[si[i].Key] = si[i].Count
 	}
 	return toResults(output), nil
 }
 func (s *BBoltStore) statTotals() ([]StatsResult, error) {
 	passwords := make(map[string]int)
 	usernames := make(map[string]int)
 	ips := make(map[string]int)
 	countries := make(map[string]int)
 	var count int
 	err := s.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(bktKeyLogins)
 		c := bkt.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
 			var l models.LoginAttempt
 			if err := json.Unmarshal(v, &l); err != nil {
 				return err
 			}
 			passwords[l.Password] += 1
 			usernames[l.Username] += 1
 			ips[l.RemoteIP.String()] += 1
 			countries[l.Country] += 1
 			count++
 		}
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 	stats := []StatsResult{
 		{Name: "UniquePasswords", Count: len(passwords)},
 		{Name: "UniqueUsernames", Count: len(usernames)},
 		{Name: "UniqueIPs", Count: len(ips)},
 		{Name: "UniqueCountries", Count: len(countries)},
 		{Name: "TotalLoginAttempts", Count: count},
 	}
 	return stats, nil
 }
 func (s *BBoltStore) Query(query AttemptQuery) ([]models.LoginAttempt, error) {
 	var results []models.LoginAttempt
 	err := s.db.View(func(tx *bolt.Tx) error {
 		bkt := tx.Bucket(bktKeyLogins)
 		c := bkt.Cursor()
 		for k, v := c.First(); k != nil; k, v = c.Next() {
 			var l models.LoginAttempt
 			if err := json.Unmarshal(v, &l); err != nil {
 				return err
 			}
 			switch query.QueryType {
 			case AttemptQueryTypeIP:
 				if l.RemoteIP.String() == query.Query {
 					results = append(results, l)
 				}
 			case AttemptQueryTypePassword:
 				if strings.Contains(l.Password, query.Query) {
 					results = append(results, l)
 				}
 			case AttemptQueryTypeUsername:
 				if strings.Contains(l.Username, query.Query) {
 					results = append(results, l)
 				}
 			}
 		}
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 	return results, nil
 }
 func (s *BBoltStore) IsHealthy() error {
 	// TODO: Do actual healthcheck
 	return nil
 }
 func itob(v uint64) []byte {
 	b := make([]byte, 8)
 	binary.BigEndian.PutUint64(b, v)
 	return b
 }
--- a/honeypot/ssh/store/bbolt_test.go
+++ b/honeypot/ssh/store/bbolt_test.go
@@ -1,38 +0,0 @@
 package store_test
 import (
 	"os"
 	"testing"
 	"git.t-juice.club/torjus/apiary/honeypot/ssh/store"
 )
 func TestBBoltStore(t *testing.T) {
 	dir := t.TempDir()
 	f, err := os.CreateTemp(dir, "apiary-test-bbolt")
 	if err != nil {
 		t.Fatal(err)
 	}
 	fname := f.Name()
 	f.Close()
 	s, err := store.NewBBoltStore(fname)
 	if err != nil {
 		t.Fatal(err)
 	}
 	testLoginAttemptStore(s, t)
 }
 func FuzzBBoltStore(f *testing.F) {
 	dir := f.TempDir()
 	file, err := os.CreateTemp(dir, "apiary-test-bbolt")
 	if err != nil {
 		f.Fatal(err)
 	}
 	fname := file.Name()
 	file.Close()
 	s, err := store.NewBBoltStore(fname)
 	if err != nil {
 		f.Fatal(err)
 	}
 	fuzzLoginAttemptStore(s, f)
 }
--- a/honeypot/ssh/store/postgres.go
+++ b/honeypot/ssh/store/postgres.go
@@ -6,7 +6,7 @@ import (
 	"net"
 	"git.t-juice.club/torjus/apiary/models"
-	_ "github.com/jackc/pgx/v4/stdlib"
+	_ "github.com/jackc/pgx/v5/stdlib"
 )
 var _ LoginAttemptStore = &PostgresStore{}
--- a/honeypot/ssh/store/postgres_test.go
+++ b/honeypot/ssh/store/postgres_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"git.t-juice.club/torjus/apiary/honeypot/ssh/store"
 	_ "github.com/jackc/pgx/v5/stdlib"
 )
 func TestPostgresStore(t *testing.T) {
--- a/models/user.go
+++ b/models/user.go
@@ -1,32 +0,0 @@
 package models
 import (
 	"fmt"
 	"golang.org/x/crypto/bcrypt"
 )
 var ErrInvalidPassword = fmt.Errorf("invalid password")
 type User struct {
 	Username     string `json:"username"`
 	PasswordHash []byte `json:"passwordHash"`
 }
 func (u *User) SetPassword(password string) error {
 	newHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
 	if err != nil {
 		return fmt.Errorf("error hashing new password: %w", err)
 	}
 	u.PasswordHash = newHash
 	return nil
 }
 func (u *User) VerifyPassword(password string) error {
 	err := bcrypt.CompareHashAndPassword([]byte(u.PasswordHash), []byte(password))
 	if err != nil {
 		return ErrInvalidPassword
 	}
 	return nil
 }
--- a/version.go
+++ b/version.go
@@ -6,7 +6,7 @@ import (
 )
 var (
-	Version = "v0.1.32"
+	Version = "v0.2.4"
 	Build   string
 )
--- a/web/frontend.go
+++ b/web/frontend.go
@@ -40,7 +40,7 @@ func (s *Server) serveIndex(frontendDir string) http.HandlerFunc {
 		defer f.Close()
 		if _, err := io.Copy(w, f); err != nil {
-			s.ServerLogger.Warnw("Error writing frontend to client.", "err", err)
+			s.ServerLogger.Warn("Error writing frontend to client.", "err", err)
 		}
 	}
 	return fn
--- a/web/middleware.go
+++ b/web/middleware.go
@@ -21,7 +21,7 @@ func (s *Server) LoggingMiddleware(next http.Handler) http.Handler {
 			if s.cfg.AccessLogIgnoreMetrics && r.URL.Path == "/metrics" && ww.Status() == http.StatusOK {
 				return
 			}
-			s.AccessLogger.Infow(r.Method,
+			s.AccessLogger.Info(r.Method,
 				"path", r.URL.Path,
 				"status", ww.Status(),
 				"written", ww.BytesWritten(),
--- a/web/server.go
+++ b/web/server.go
@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
 	"strconv"
 	"sync"
@@ -20,7 +21,6 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.uber.org/zap"
 	"golang.org/x/crypto/acme/autocert"
 )
@@ -35,8 +35,8 @@ type Server struct {
 	honeypotServer *ssh.HoneypotServer
 	store          store.LoginAttemptStore
-	ServerLogger *zap.SugaredLogger
+	ServerLogger *slog.Logger
-	AccessLogger *zap.SugaredLogger
+	AccessLogger *slog.Logger
 	attemptListenersLock sync.RWMutex
 	attemptListeners     map[string]chan models.LoginAttempt
@@ -44,9 +44,10 @@ type Server struct {
 }
 func NewServer(cfg config.FrontendConfig, hs *ssh.HoneypotServer, store store.LoginAttemptStore) *Server {
 	discardLogger := slog.New(slog.NewTextHandler(io.Discard, nil))
 	s := &Server{
-		ServerLogger: zap.NewNop().Sugar(),
+		ServerLogger: discardLogger,
-		AccessLogger: zap.NewNop().Sugar(),
+		AccessLogger: discardLogger,
 		store:        store,
 		cfg:          cfg,
 	}
@@ -85,10 +86,12 @@ func NewServer(cfg config.FrontendConfig, hs *ssh.HoneypotServer, store store.Lo
 	r.Use(middleware.RealIP)
 	r.Use(middleware.RequestID)
 	r.Use(s.LoggingMiddleware)
 	r.Use(NewMetricsMiddleware())
 	r.Use(middleware.SetHeader("Server", fmt.Sprintf("apiary/%s", apiary.FullVersion())))
 	if cfg.MetricsEnable {
 		r.Use(NewMetricsMiddleware())
 		r.Handle("/metrics", promhttp.Handler())
 	}
 	r.Route("/", func(r chi.Router) {
 		r.Get("/*", s.IndexHandler("web/vue-frontend/dist"))
 		r.Get("/stream", s.HandlerAttemptStream)
@@ -125,7 +128,7 @@ func (s *Server) StartServe() error {
 			s.ServerLogger.Debug("Starting HTTP redirect server")
 			go func() {
 				if err := s.httpRedirectServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-					s.ServerLogger.Warnw("HTTP redirect server returned error", "error", err)
+					s.ServerLogger.Warn("HTTP redirect server returned error", "error", err)
 				}
 			}()
 		}
@@ -174,7 +177,7 @@ func (s *Server) HandlerAttemptStream(w http.ResponseWriter, r *http.Request) {
 			}
 			_, err = io.WriteString(w, fmt.Sprintf("data: %s\n\n", string(data)))
 			if err != nil {
-				s.ServerLogger.Warnw("Error writing event", "error", err)
+				s.ServerLogger.Warn("Error writing event", "error", err)
 			}
 			flusher.Flush()
 			ticker.Reset(streamKeepAliveDuration)
@@ -184,7 +187,7 @@ func (s *Server) HandlerAttemptStream(w http.ResponseWriter, r *http.Request) {
 			return
 		case <-ticker.C:
 			if _, err := io.WriteString(w, ": keep-alive\n\n"); err != nil {
-				s.ServerLogger.Warnw("Error writing event", "error", err)
+				s.ServerLogger.Warn("Error writing event", "error", err)
 			}
 			flusher.Flush()
 		}
@@ -207,14 +210,14 @@ func (s *Server) HandlerStats(w http.ResponseWriter, r *http.Request) {
 	stats, err := s.store.Stats(statType, limit)
 	if err != nil {
-		s.ServerLogger.Warnw("Error fetching stats", "error", err)
+		s.ServerLogger.Warn("Error fetching stats", "error", err)
 		s.WriteAPIError(w, r, http.StatusInternalServerError, "Error fetching stats")
 		return
 	}
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(stats); err != nil {
-		s.ServerLogger.Debugf("Error encoding or writing response", "remote_ip", r.RemoteAddr, "error", err)
+		s.ServerLogger.Debug("Error encoding or writing response", "remote_ip", r.RemoteAddr, "error", err)
 	}
 }
@@ -241,13 +244,13 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 		userResults, err := s.store.Query(uq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
 		passwordResults, err := s.store.Query(pq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
@@ -263,7 +266,7 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 		queryResults, err := s.store.Query(aq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
@@ -272,7 +275,7 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(&results); err != nil {
-		s.ServerLogger.Warnw("Error writing query results", "error", err)
+		s.ServerLogger.Warn("Error writing query results", "error", err)
 	}
 }
@@ -294,6 +297,6 @@ func (s *Server) WriteAPIError(w http.ResponseWriter, r *http.Request, status in
 	apiErr := APIErrorResponse{Error: message}
 	w.WriteHeader(status)
 	if err := encoder.Encode(&apiErr); err != nil {
-		s.ServerLogger.Debugf("Error encoding or writing error response", "remote_ip", r.RemoteAddr, "error", err)
+		s.ServerLogger.Debug("Error encoding or writing error response", "remote_ip", r.RemoteAddr, "error", err)
 	}
 }
Author	SHA1	Message	Date
Torjus Håkestad	c0aa73c1bf	Add govulncheck to tools	2025-03-20 19:19:20 +01:00
Torjus Håkestad	078c5fc785	Add gomajor to tools	2025-03-20 19:16:37 +01:00
Torjus Håkestad	73c8486fc8	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d69ab0d71b22fa1ce3dbeff666e6deb4917db049?narHash=sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0%3D' (2025-03-05) → 'github:NixOS/nixpkgs/b6eaf97c6960d97350c584de1b6dcff03c9daf42?narHash=sha256-Txwa5uO%2BqpQXrNG4eumPSD%2BhHzzYi/CdaM80M9XRLCo%3D' (2025-03-18)	2025-03-20 19:12:46 +01:00
Torjus Håkestad	ed4d970723	Make metrics endpoint configurable	2025-03-20 18:57:31 +01:00
Torjus Håkestad	9b54cec29c	Update cli to v3	2025-03-20 18:53:23 +01:00
Torjus Håkestad	1230fb52d7	Update go-toml	2025-03-20 18:40:50 +01:00
Torjus Håkestad	cd0d5c469f	Update pgx	2025-03-20 18:39:18 +01:00
Torjus Håkestad	398160e6eb	Merge pull request 'Remove unused code' (#12 ) from remove-old-crust into master Reviewed-on: #12	2025-03-20 17:35:22 +00:00
Torjus Håkestad	3a5fa290e2	Remove unused code	2025-03-20 18:34:28 +01:00
Torjus Håkestad	e4327cd3a8	Fix table text alignment	2025-03-19 23:21:26 +01:00
Torjus Håkestad	cdbcf0e03b	Merge branch 'remove-zap'	2025-03-19 23:18:06 +01:00
Torjus Håkestad	46d9f4d64a	Replace zap with slog	2025-03-19 23:16:38 +01:00
Torjus Håkestad	49553fa965	Update go deps	2025-03-19 22:58:47 +01:00
Torjus Håkestad	aa5b9588d1	Remove build requirements from README	2025-03-19 22:40:10 +01:00
Torjus Håkestad	858c11b853	Minor README improvements	2025-03-19 22:39:04 +01:00
Torjus Håkestad	85fd24180a	Remove deprecated features from config example	2025-03-19 22:36:46 +01:00
Torjus Håkestad	b2e3632b56	Update README	2025-03-19 22:35:33 +01:00
Torjus Håkestad	73dce3d1f3	Update Dockerfile	2025-03-19 22:28:28 +01:00
Torjus Håkestad	d86bc2be07	Remove Makefile	2025-03-19 22:08:45 +01:00
Torjus Håkestad	39a682fd41	Merge pull request 'Add flake.nix and rewrite frontend' (#5 ) from nixify into master Reviewed-on: #5	2025-03-19 21:07:51 +00:00
Torjus Håkestad	a0e661eca3	Add tarball output to flake	2025-03-19 17:50:36 +01:00
Torjus Håkestad	db294c171d	Sort stats after retrieving from api	2025-03-19 17:07:16 +01:00
Torjus Håkestad	2c75603046	Relax stats update interval	2025-03-19 16:58:08 +01:00
Torjus Håkestad	a7b1ba584f	Update npm deps hash	2025-03-19 16:53:39 +01:00
Torjus Håkestad	89237c2b84	Improve frontend	2025-03-19 16:49:18 +01:00
Torjus Håkestad	5ade1c0593	Change frontend deps	2025-03-09 03:20:53 +01:00
Torjus Håkestad	ec6c0cc45b	Frontend fixes	2025-03-08 13:01:09 +01:00
Torjus Håkestad	9f9e0524f5	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ba487dbc9d04e0634c64e3b1f0d25839a0a68246?narHash=sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM%3D' (2025-03-03) → 'github:NixOS/nixpkgs/d69ab0d71b22fa1ce3dbeff666e6deb4917db049?narHash=sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0%3D' (2025-03-05)	2025-03-07 02:10:57 +01:00
Torjus Håkestad	13f126ccbc	Add rev to ldflags	2025-03-07 01:49:38 +01:00
Torjus Håkestad	80ac8148e7	Bump version	2025-03-07 01:34:12 +01:00