diff --git a/.gitignore b/.gitignore index e3c23ae..3614bda 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ users.json pikabldr.db config.json apicalls/ -brunel \ No newline at end of file +brunel +gitcache/ \ No newline at end of file diff --git a/buildqueue/git.go b/buildqueue/git.go new file mode 100644 index 0000000..2ab877b --- /dev/null +++ b/buildqueue/git.go @@ -0,0 +1,131 @@ +package buildqueue + +import ( + "brunel/config" + "brunel/domain" + "fmt" + "os" + "path/filepath" + "strconv" + "strings" + "time" + + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/transport/http" +) + +const configsFolder = "pika-build-config" + +func InitGit() error { + _, err := git.PlainClone(config.Configs.GitCache, false, &git.CloneOptions{ + URL: config.Configs.Buildrepo, + SingleBranch: true, + ReferenceName: plumbing.ReferenceName(config.Configs.Buildbranch), + Depth: 1, + Auth: &http.BasicAuth{ + Password: config.Configs.GitToken, + Username: config.Configs.GitUser, + }, + }) + return err +} + +func ResetAndPull() error { + gt, err := git.PlainOpen(config.Configs.GitCache) + if err != nil { + return err + } + wk, err := gt.Worktree() + if err != nil { + return err + } + err = wk.Reset(&git.ResetOptions{ + Mode: git.HardReset, + }) + if err != nil { + return err + } + err = wk.Pull(&git.PullOptions{ + Auth: &http.BasicAuth{ + Password: config.Configs.GitToken, + Username: config.Configs.GitUser, + }, + RemoteName: "origin", + ReferenceName: plumbing.ReferenceName(config.Configs.Buildbranch), + }) + return err +} + +func UpdateBuildFile(buildItem domain.BuildQueueItem) error { + if _, err := os.Stat(config.Configs.GitCache); os.IsNotExist(err) { + err := InitGit() + if err != nil { + return err + } + } + err := ResetAndPull() + if err != nil { + return err + } + + repo, err := git.PlainOpen(config.Configs.GitCache) + if err != nil { + return err + } + + wt, err := repo.Worktree() + if err != nil { + return err + } + + content := constructFileContent(buildItem) + filePath := filepath.Join(config.Configs.GitCache, configsFolder, string(buildItem.Type)+".sh") + err = os.WriteFile(filePath, []byte(content), 0644) + if err != nil { + return err + } + + _, err = wt.Add(configsFolder + "/" + string(buildItem.Type) + ".sh") + if err != nil { + return err + } + + _, err = wt.Commit(buildItem.Source.Name+"="+buildItem.BuildVersion, &git.CommitOptions{ + Author: &object.Signature{ + Name: "Brunel", + Email: "brunel@pika-os.com", + When: time.Now(), + }, + }) + if err != nil { + return err + } + + err = repo.Push(&git.PushOptions{ + Auth: &http.BasicAuth{ + Password: config.Configs.GitToken, + Username: config.Configs.GitUser, + }, + RemoteName: "origin", + }) + if err != nil { + return err + } + + return nil +} + +func constructFileContent(buildItem domain.BuildQueueItem) string { + content := []string{ + fmt.Sprintf(`export PIKA_PACKAGE_VERSION="%s"`, buildItem.BuildVersion), + fmt.Sprintf(`export PIKA_PACKAGE_NAME="%s"`, buildItem.Source.Name), + fmt.Sprintf(`export PIKA_PACKAGE_PATCH=%t`, buildItem.Patch), + fmt.Sprintf(`export PIKA_REBUILD=%t`, buildItem.Rebuild), + fmt.Sprintf(`export PIKA_REBUILD_VERSION="%s"`, "b"+strconv.Itoa(buildItem.BuildNumber)), + fmt.Sprintf(`export PIKA_BUILD_ATTEMPT="%d"`, buildItem.BuildNumber), + } + + return strings.Join(content, "\n") +} diff --git a/buildqueue/queue.go b/buildqueue/queue.go new file mode 100644 index 0000000..3ec81f4 --- /dev/null +++ b/buildqueue/queue.go @@ -0,0 +1,86 @@ +package buildqueue + +import ( + "brunel/domain" + "brunel/fastmap" + + "errors" +) + +var queue = fastmap.New[string, domain.BuildQueueItem]() + +func Add(buildItem domain.BuildQueueItem) error { + if _, ok := queue.Get(buildItem.Source.Name); ok { + return errors.New("package already in queue") + } + + queue.Set(buildItem.Source.Name, buildItem) + return nil +} + +func Get(name string) (domain.BuildQueueItem, bool) { + item, ok := queue.Get(name) + return item, ok +} + +func Remove(name string) error { + _, ok := queue.Get(name) + if !ok { + return errors.New("package not in queue") + } + queue.Delete(name) + return nil +} + +func Update(buildItem domain.BuildQueueItem) error { + item, ok := queue.Get(buildItem.Source.Name) + if !ok { + return errors.New("package not in queue") + } + if item.Status == domain.Building { + return errors.New("package is already building") + } + queue.Set(buildItem.Source.Name, buildItem) + return nil +} + +func GetQueue() *fastmap.Fastmap[string, domain.BuildQueueItem] { + return queue +} + +func GetCounts() domain.BuildQueueCount { + count := domain.BuildQueueCount{ + Queued: 0, + Building: 0, + } + queue.Iter(func(k string, v domain.BuildQueueItem) bool { + if v.Status == domain.Queued { + count.Queued++ + } else if v.Status == domain.Building { + count.Building++ + } + return true + }) + return count +} + +func ProcessNext() error { + var item *domain.BuildQueueItem + queue.Iter(func(k string, v domain.BuildQueueItem) bool { + if v.Status == domain.Queued { + item = &v + return false + } + return true + }) + if item == nil { + return errors.New("no packages in queue") + } + err := UpdateBuildFile(*item) + if err != nil { + return err + } + item.Status = domain.Building + err = Update(*item) + return err +} diff --git a/buildqueue/worker.go b/buildqueue/worker.go new file mode 100644 index 0000000..c30351b --- /dev/null +++ b/buildqueue/worker.go @@ -0,0 +1,234 @@ +package buildqueue + +import ( + "brunel/config" + "brunel/domain" + "brunel/packages" + "context" + "fmt" + "log/slog" + "net/http" + "strings" + "time" + + "golang.org/x/net/html" +) + +func StartPackageQueueWorker(ctx context.Context) { + go func() { + for { + select { + case <-ctx.Done(): + return + default: + err := packages.ProcessPackages() + if err != nil { + slog.Error("unable to process packages: " + err.Error()) + } + packs := packages.GetPackages() + packs.Iter(func(k string, v domain.SourcePackage) bool { + needsBuild := false + buildVersion := "" + buildAttempt := 0 + errPreviously := false + v.Packages.Iter(func(k string, v domain.PackageInfo) bool { + if v.Status == domain.Current { + return true + } + if v.LastBuildStatus == domain.Error { + errPreviously = true + buildAttempt = 1 + } + if v.Status == domain.Missing { + needsBuild = true + buildVersion = v.NewVersion + return false + } + if v.Status == domain.Stale { + needsBuild = true + buildVersion = v.NewVersion + return false + } + return true + }) + if needsBuild { + typ := domain.BuildTypeNormal + if errPreviously { + typ = domain.BuildTypeLTO + } + buildItem := domain.BuildQueueItem{ + Source: v, + Status: domain.Queued, + Type: typ, + Patch: false, + Rebuild: false, + BuildNumber: buildAttempt, + BuildVersion: buildVersion, + } + err := Add(buildItem) + if err != nil { + slog.Info("unable to add package to queue: " + err.Error()) + } + } + return true + }) + time.Sleep(1 * time.Hour) + } + } + }() +} + +func StartQueueWorker(ctx context.Context) { + go processQueue(ctx) +} + +func StartStatusWorker(ctx context.Context) { + go processStatus(ctx) +} + +func processStatus(ctx context.Context) { + for { + select { + case <-ctx.Done(): + return + default: + q := GetQueue() + itemsToRemove := make([]string, 0) + q.Iter(func(k string, item domain.BuildQueueItem) bool { + if item.Status == domain.Building { + complete, err := CheckIfBuildComplete(ctx, item) + if err != nil && !complete { + slog.Error("unable to check if build is complete: " + err.Error()) + } + if complete { + if err != nil { + item.Source.Packages.Iter(func(k string, v domain.PackageInfo) bool { + v.Status = domain.Error + v.LastBuildStatus = domain.Error + item.Source.Packages.Set(k, v) + return true + }) + packages.UpdateSourcePackage(item.Source) + itemsToRemove = append(itemsToRemove, k) + return true + } + item.Source.Packages.Iter(func(k string, v domain.PackageInfo) bool { + v.Status = domain.Built + v.LastBuildStatus = domain.Built + v.Version = item.BuildVersion + v.NewVersion = "" + item.Source.Packages.Set(k, v) + return true + }) + packages.UpdateSourcePackage(item.Source) + itemsToRemove = append(itemsToRemove, k) + return true + } + } + return true + }) + for _, item := range itemsToRemove { + Remove(item) + } + time.Sleep(5 * time.Second) + } + } +} + +func processQueue(ctx context.Context) { + for { + select { + case <-ctx.Done(): + return + default: + err := ProcessNext() + if err != nil { + slog.Error("unable to process queue: " + err.Error()) + } + } + time.Sleep(30 * time.Second) + } +} + +func CheckIfBuildComplete(ctx context.Context, item domain.BuildQueueItem) (bool, error) { + resp, err := http.Get(config.Configs.ActionsUrl) + if err != nil { + return false, err + } + defer resp.Body.Close() + + doc, err := html.Parse(resp.Body) + if err != nil { + return false, err + } + + buildName := item.Source.Name + "=" + item.BuildVersion + var f func(*html.Node) (bool, error) + f = func(n *html.Node) (bool, error) { + if n.Type == html.ElementNode && n.Data == "div" { + for _, a := range n.Attr { + if a.Key == "class" && strings.Contains(a.Val, "flex-item") { + isMatch, status := checkBuildBlock(n, buildName) + if isMatch { + switch status { + case "Success": + return true, nil + case "Failure": + return true, fmt.Errorf("build failed") + default: + // Build found but status unknown, keep searching + return false, nil + } + } + } + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + isComplete, err := f(c) + if isComplete || err != nil { + return isComplete, err + } + } + return false, nil + } + + return f(doc) +} + +func checkBuildBlock(n *html.Node, buildName string) (bool, string) { + var title string + var status string + + var f func(*html.Node) + f = func(n *html.Node) { + if n.Type == html.ElementNode { + switch n.Data { + case "a": + for _, a := range n.Attr { + if a.Key == "class" && a.Val == "flex-item-title" { + for _, attr := range n.Attr { + if attr.Key == "title" { + title = attr.Val + } + } + } + } + case "span": + for _, a := range n.Attr { + if a.Key == "data-tooltip-content" { + if a.Val == "Success" || a.Val == "Failure" { + status = a.Val + } + } + } + } + } + for c := n.FirstChild; c != nil; c = c.NextSibling { + f(c) + } + } + + f(n) + + return title == buildName, status +} diff --git a/config/config.go b/config/config.go index e19886e..bc8b595 100644 --- a/config/config.go +++ b/config/config.go @@ -35,6 +35,12 @@ type Config struct { LTOBlocklist []string `json:"ltoBlocklist"` DeboutputDir string `json:"deboutputDir"` Salt string `json:"salt"` + Buildrepo string `json:"buildRepo"` + Buildbranch string `json:"buildBranch"` + GitCache string `json:"gitCache"` + GitToken string `json:"gitToken"` + GitUser string `json:"gitUser"` + ActionsUrl string `json:"actionsUrl"` } func Init() error { diff --git a/domain/buildqueue.go b/domain/buildqueue.go new file mode 100644 index 0000000..5f254b6 --- /dev/null +++ b/domain/buildqueue.go @@ -0,0 +1,35 @@ +package domain + +type BuildStatus string +type BuildType string + +const ( + // BuildType is a v3 build + BuildTypeNormal BuildType = "v3" + // BuildType is a LTO build + BuildTypeLTO BuildType = "lto" + // BuildType is an i386 build + BuildTypeI386 BuildType = "i386" +) + +const ( + // Package is queued for building + Queued BuildStatus = "Queued" + // Package is being built + Building BuildStatus = "Building" +) + +type BuildQueueItem struct { + Source SourcePackage + Status BuildStatus + Type BuildType + Patch bool + Rebuild bool + BuildNumber int + BuildVersion string +} + +type BuildQueueCount struct { + Queued int `json:"queued"` + Building int `json:"building"` +} diff --git a/domain/packages.go b/domain/packages.go index 939eb11..eb7a446 100644 --- a/domain/packages.go +++ b/domain/packages.go @@ -14,19 +14,6 @@ type PackagesCount struct { Building int `json:"building"` } -type BuildQueue *fastmap.Fastmap[string, BuildQueueItem] - -type BuildQueueItem struct { - Source SourcePackage - Status BuildStatus - Patch bool - LTO bool - Rebuild bool - BuildNumber int - BuildVersion string - I386 bool -} - type SourcePackage struct { Name string `gorm:"primarykey"` Packages *fastmap.Fastmap[string, PackageInfo] `gorm:"foreignKey:PackageInfo;references:PackageName"` @@ -49,7 +36,6 @@ type PackageInfo struct { } type PackageStatus string -type BuildStatus string const ( // Package is built @@ -62,10 +48,6 @@ const ( Missing PackageStatus = "Missing" // Package is upto date Current PackageStatus = "Current" - // Package is queued for building - Queued BuildStatus = "Queued" - // Package is being built - Building BuildStatus = "Building" ) type TimeContainer struct { diff --git a/example_config_json b/example_config_json index 965a87d..c4cbd50 100644 --- a/example_config_json +++ b/example_config_json @@ -3,6 +3,12 @@ "port": 7555, "deboutputDir": "/srv/www/canary-incoming/", "upstreamFallback": true, + "buildRepo": "https://{token}@git.pika-os.com/repo-tools/run-upstream-build.git", + "buildBranch": "main", + "gitCache": "./gitcache/buildrepo", + "gitToken": "neverGonnaGiveYouUp", + "gitUser": "Brunel", + "actionsUrl": "https://git.pika-os.com/repo-tools/run-upstream-build/actions", "ltoBlocklist": [ "biber", "publican", diff --git a/go.mod b/go.mod index 6ad8652..c64cf2d 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module brunel go 1.22.5 require ( + github.com/go-git/go-git/v5 v5.12.0 github.com/goccy/go-json v0.10.3 github.com/gofiber/fiber/v2 v2.52.5 github.com/jinzhu/now v1.1.5 @@ -10,28 +11,47 @@ require ( github.com/maypok86/otter v1.2.1 github.com/samber/slog-fiber v1.16.0 github.com/ulikunitz/xz v0.5.12 - golang.org/x/crypto v0.14.0 + golang.org/x/crypto v0.21.0 + golang.org/x/net v0.22.0 gorm.io/driver/sqlite v1.5.6 gorm.io/gorm v1.25.11 pault.ag/go/debian v0.16.0 ) require ( + dario.cat/mergo v1.0.0 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect + github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/andybalholm/brotli v1.0.5 // indirect + github.com/cloudflare/circl v1.3.7 // indirect + github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/dolthub/maphash v0.1.0 // indirect + github.com/emirpasic/gods v1.18.1 // indirect github.com/gammazero/deque v0.2.1 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/uuid v1.5.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jinzhu/inflection v1.0.0 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect github.com/mattn/go-sqlite3 v1.14.22 // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect + github.com/skeema/knownhosts v1.2.2 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.51.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect go.opentelemetry.io/otel v1.19.0 // indirect go.opentelemetry.io/otel/trace v1.19.0 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.13.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 902fe68..c8faf74 100644 --- a/go.sum +++ b/go.sum @@ -1,25 +1,70 @@ +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= +dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0kC2U78= +github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +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/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= +github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= +github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= +github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU= +github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= +github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= +github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +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= github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ= github.com/dolthub/maphash v0.1.0/go.mod h1:gkg4Ch4CdCDu5h6PMriVLawB7koZ+5ijb9puGMV50a4= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU= +github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/gammazero/deque v0.2.1 h1:qSdsbG6pgp6nL7A0+K/B7s12mcCY/5l5SIUpMOl+dC0= github.com/gammazero/deque v0.2.1/go.mod h1:LFroj8x4cMYCukHJDbxFCkT+r9AndaJnFMuZDV34tuU= +github.com/gliderlabs/ssh v0.3.7 h1:iV3Bqi942d9huXnzEF2Mt+CY9gLu8DNM4Obd+8bODRE= +github.com/gliderlabs/ssh v0.3.7/go.mod h1:zpHEXBstFnQYtGnB8k8kQLol82umzn/2/snG7alWVD8= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI= +github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic= +github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU= +github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= +github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= +github.com/go-git/go-git/v5 v5.12.0 h1:7Md+ndsjrzZxbddRDZjF14qK+NN56sy6wkqaVrjZtys= +github.com/go-git/go-git/v5 v5.12.0/go.mod h1:FTM9VKtnI2m65hNI/TenDDDnUf2Q9FHnXYjuz9i5OEY= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gofiber/fiber/v2 v2.52.5 h1:tWoP1MJQjGEe4GB5TUGOi7P2E0ZMMRx5ZTG4rT+yGMo= github.com/gofiber/fiber/v2 v2.52.5/go.mod h1:KEOE+cXMhXG0zHc9d8+E38hoX+ZN7bhOtgeF2oT6jrQ= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= +github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -31,14 +76,30 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/maypok86/otter v1.2.1 h1:xyvMW+t0vE1sKt/++GTkznLitEl7D/msqXkAbLwiC1M= github.com/maypok86/otter v1.2.1/go.mod h1:mKLfoI7v1HOmQMwFgX4QkRk23mX6ge3RDvjdHOWG4R4= +github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4= +github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.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/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/samber/slog-fiber v1.16.0 h1:7HUfFC1c4OhoU9pGhrUyIX+BK+4OVPJduuQiWM6fzzU= github.com/samber/slog-fiber v1.16.0/go.mod h1:RQr46XiBUwVNgWTiAizSGBxV9IbOpGbMMEEsth05iXg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= +github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= +github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -47,18 +108,85 @@ github.com/valyala/fasthttp v1.51.0 h1:8b30A5JlZ6C7AS81RsWjYMQmrZG6feChmgAolCl1S github.com/valyala/fasthttp v1.51.0/go.mod h1:oI2XroL+lI7vdXyYoQk03bXBThfFl2cVdIA3Xl7cH8g= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= +github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= +golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +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/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/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-20220715151400-c0bba94af5f8/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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/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.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE= diff --git a/handlers/build/count.go b/handlers/build/count.go new file mode 100644 index 0000000..2df7741 --- /dev/null +++ b/handlers/build/count.go @@ -0,0 +1,30 @@ +package handlers_build + +import ( + "brunel/buildqueue" + "brunel/domain" + "brunel/helpers" + "brunel/packages" + "time" + + "github.com/gofiber/fiber/v2" +) + +type BuildQueueCountResponse struct { + LastUpdateTime time.Time `json:"lastUpdateTime"` + Counts domain.BuildQueueCount `json:"counts"` +} + +func Counts(c *fiber.Ctx) error { + if cachedResponse, ok := helpers.Cache.Get("buildcounts"); ok { + return c.Status(fiber.StatusOK).JSON(cachedResponse) + } + + response := BuildQueueCountResponse{ + LastUpdateTime: packages.LastUpdateTime, + Counts: buildqueue.GetCounts(), + } + + helpers.Cache.Set("buildcounts", response) + return c.Status(fiber.StatusOK).JSON(response) +} diff --git a/handlers/build/queue.go b/handlers/build/queue.go new file mode 100644 index 0000000..902089d --- /dev/null +++ b/handlers/build/queue.go @@ -0,0 +1,65 @@ +package handlers_build + +import ( + "brunel/buildqueue" + "brunel/domain" + "brunel/fastmap" + "brunel/helpers" + "fmt" + "strings" + + "github.com/gofiber/fiber/v2" +) + +type QueueResponse struct { + Total int `json:"total"` + Packages *fastmap.Fastmap[string, domain.BuildQueueItem] `json:"packages"` +} + +func Queue(c *fiber.Ctx) error { + pageNum := c.QueryInt("page", 1) + pageSize := c.QueryInt("pageSize", 250) + search := strings.ToLower(c.Query("search")) + filter := c.Query("filter") + + cacheKey := fmt.Sprintf("buildqueue:%d:%d:%s:%s", pageNum, pageSize, search, filter) + if cachedResponse, ok := helpers.Cache.Get(cacheKey); ok { + return c.Status(fiber.StatusOK).JSON(cachedResponse) + } + + // Adjust pageNum to be 0-based for GetPage + adjustedPageNum := pageNum - 1 + if adjustedPageNum < 0 { + adjustedPageNum = 0 + } + + packs := buildqueue.GetQueue() + packs.StableSortByKey() + finalReturn := fastmap.New[string, domain.BuildQueueItem]() + + packs.Iter(func(k string, source domain.BuildQueueItem) bool { + matchesSearch := search == "" || strings.Contains(strings.ToLower(k), search) + matchesFilter := filter == "" || source.Status == domain.BuildStatus(filter) + source.Source.Packages.Iter(func(key string, value domain.PackageInfo) bool { + if !matchesSearch && strings.Contains(strings.ToLower(key), search) { + matchesSearch = true + } + return !(matchesSearch) + }) + + if matchesFilter && matchesSearch { + finalReturn.Set(k, source) + } + return true + }) + + result := finalReturn.GetPage(adjustedPageNum, pageSize) + + response := QueueResponse{ + Total: finalReturn.Len(), + Packages: result, + } + + helpers.Cache.Set(cacheKey, response) + return c.Status(fiber.StatusOK).JSON(response) +} diff --git a/packages/packages.go b/packages/packages.go index 5425e2a..a3d4563 100644 --- a/packages/packages.go +++ b/packages/packages.go @@ -23,7 +23,6 @@ import ( var LastUpdateTime time.Time var currentPackagesFastMap = fastmap.New[string, domain.SourcePackage]() -var buildQueue domain.BuildQueue = fastmap.New[string, domain.BuildQueueItem]() func ProcessPackages() error { var internalPackages = fastmap.New[string, domain.SourcePackage]() @@ -56,10 +55,6 @@ func ProcessPackages() error { return nil } -func GetBuildQueue() domain.BuildQueue { - return buildQueue -} - func GetPackages() *fastmap.Fastmap[string, domain.SourcePackage] { return currentPackagesFastMap } @@ -74,6 +69,11 @@ func UpdatePackage(pkg domain.PackageInfo) error { return saveSingleToDb(curr) } +func UpdateSourcePackage(pkg domain.SourcePackage) error { + currentPackagesFastMap.Set(pkg.Name, pkg) + return saveSingleToDb(pkg) +} + func IsBuilt(pkg domain.PackageInfo) bool { curr, ok := currentPackagesFastMap.Get(pkg.Source) if !ok { diff --git a/server.go b/server.go index 2041236..e6786ca 100644 --- a/server.go +++ b/server.go @@ -1,8 +1,10 @@ package main import ( + "brunel/buildqueue" "brunel/config" handlers_auth "brunel/handlers/auth" + handlers_build "brunel/handlers/build" handlers_packages "brunel/handlers/packages" "brunel/helpers" "brunel/middleware" @@ -54,21 +56,15 @@ func runServer(ctx context.Context) error { } }() - start := time.Now() err = packages.LoadFromDb() if err != nil { slog.Error("unable to load packages from db: " + err.Error()) return err } - slog.Info("packages loaded from db in " + time.Since(start).String()) - start = time.Now() - err = packages.ProcessPackages() - if err != nil { - slog.Error("unable to process packages: " + err.Error()) - return err - } - slog.Info("packages processed in " + time.Since(start).String()) + buildqueue.StartPackageQueueWorker(ctx) + buildqueue.StartQueueWorker(ctx) + buildqueue.StartStatusWorker(ctx) cfg := fiber.Config{ JSONEncoder: json.Marshal, @@ -95,6 +91,8 @@ func runServer(ctx context.Context) error { server.Get("/api/counts", handlers_packages.Counts) server.Get("/api/packages", handlers_packages.Packages) + server.Get("/api/buildqueue", handlers_build.Queue) + server.Get("/api/buildcounts", handlers_build.Counts) server.Post("/api/login", handlers_auth.Login) adminRoutes.Post("/register", handlers_auth.Register)