forked from
tangled.org/core
Mirror of @tangled.org/core. Running on a Raspberry Pi Zero 2 (Please be gentle).
appview: knot upgrade banner
Signed-off-by: Anirudh Oppiliappan <anirudh@tangled.sh>
authored by
Anirudh Oppiliappan
and committed by
oppiliappan
4e5083cd
ab2bd002
+80
-8
+28
-5
appview/knots/knots.go
+28
-5
appview/knots/knots.go
···
681
681
682
682
func (k *Knots) banner(w http.ResponseWriter, r *http.Request) {
683
683
user := k.OAuth.GetUser(r)
684
-
l := k.Logger.With("handler", "removeMember")
684
+
l := k.Logger.With("handler", "banner")
685
685
l = l.With("did", user.Did)
686
686
l = l.With("handle", user.Handle)
687
687
688
-
registrations, err := db.GetRegistrations(
688
+
allRegistrations, err := db.GetRegistrations(
689
689
k.Db,
690
690
db.FilterEq("did", user.Did),
691
-
db.FilterEq("read_only", 1),
692
691
)
693
692
if err != nil {
694
693
l.Error("non-fatal: failed to get registrations")
695
694
return
696
695
}
697
696
698
-
if registrations == nil {
697
+
httpClient := &http.Client{Timeout: 5 * time.Second}
698
+
regs404 := []db.Registration{}
699
+
for _, reg := range allRegistrations {
700
+
healthURL := fmt.Sprintf("http://%s/xrpc/_health", reg.Domain)
701
+
702
+
fmt.Println(healthURL)
703
+
704
+
req, err := http.NewRequestWithContext(r.Context(), http.MethodGet, healthURL, nil)
705
+
if err != nil {
706
+
l.Error("failed to create health check request", "domain", reg.Domain, "err", err)
707
+
continue
708
+
}
709
+
710
+
resp, err := httpClient.Do(req)
711
+
if err != nil {
712
+
l.Error("failed to make health check request", "domain", reg.Domain, "err", err)
713
+
continue
714
+
}
715
+
defer resp.Body.Close()
716
+
717
+
if resp.StatusCode == http.StatusNotFound {
718
+
regs404 = append(regs404, reg)
719
+
}
720
+
}
721
+
if len(regs404) == 0 {
699
722
return
700
723
}
701
724
702
725
k.Pages.KnotBanner(w, pages.KnotBannerParams{
703
-
Registrations: registrations,
726
+
Registrations: regs404,
704
727
})
705
728
}
+6
-1
appview/pages/pages.go
+6
-1
appview/pages/pages.go
···
356
356
}
357
357
358
358
func (p *Pages) KnotBanner(w io.Writer, params KnotBannerParams) error {
359
-
return p.executePlain("knots/fragments/banner", w, params)
359
+
return p.executePlain("knots/fragments/bannerRequiresUpgrade", w, params)
360
360
}
361
361
362
362
type KnotsParams struct {
···
616
616
VerifiedCommits commitverify.VerifiedCommits
617
617
Languages []types.RepoLanguageDetails
618
618
Pipelines map[string]db.Pipeline
619
+
NeedsKnotUpgrade bool
619
620
types.RepoIndexResponse
620
621
}
621
622
···
624
623
params.Active = "overview"
625
624
if params.IsEmpty {
626
625
return p.executeRepo("repo/empty", w, params)
626
+
}
627
+
628
+
if params.NeedsKnotUpgrade {
629
+
return p.executeRepo("repo/needsUpgrade", w, params)
627
630
}
628
631
629
632
p.rctx.RepoInfo = params.RepoInfo
+24
appview/pages/templates/repo/needsUpgrade.html
+24
appview/pages/templates/repo/needsUpgrade.html
···
1
+
{{ define "title" }}{{ .RepoInfo.FullName }}{{ end }}
2
+
3
+
{{ define "extrameta" }}
4
+
{{ template "repo/fragments/meta" . }}
5
+
{{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }}
6
+
{{ end }}
7
+
8
+
{{ define "repoContent" }}
9
+
<main>
10
+
<div class="w-full h-full flex place-content-center {{ if .LoggedInUser }} bg-yellow-100 dark:bg-yellow-900 {{ end }}">
11
+
<div class="py-6 w-fit flex flex-col gap-4 text-center">
12
+
{{ if .LoggedInUser }}
13
+
<p class=" text-yellow-800 dark:text-yellow-200 text-center">
14
+
Your knot needs an upgrade. This repository is currently unavailable to users.
15
+
</p>
16
+
{{ else }}
17
+
<p class="text-gray-400 dark:text-gray-500 py-6 text-center">
18
+
The knot hosting this repository needs an upgrade. This repository is currently unavailable.
19
+
</p>
20
+
{{ end }}
21
+
</div>
22
+
</div>
23
+
</main>
24
+
{{ end }}
+9
appview/repo/index.go
+9
appview/repo/index.go
···
1
1
package repo
2
2
3
3
import (
4
+
"errors"
4
5
"fmt"
5
6
"log"
6
7
"net/http"
···
47
46
Host: host,
48
47
}
49
48
49
+
var needsKnotUpgrade bool
50
50
// Build index response from multiple XRPC calls
51
51
result, err := rp.buildIndexResponse(r.Context(), xrpcc, f, ref)
52
52
if err != nil {
53
+
if errors.Is(err, xrpcclient.ErrXrpcUnsupported) {
54
+
log.Println("failed to call XRPC repo.index", err)
55
+
needsKnotUpgrade = true
56
+
return
57
+
}
58
+
53
59
rp.pages.Error503(w)
54
60
log.Println("failed to build index response", err)
55
61
return
···
141
133
142
134
rp.pages.RepoIndexPage(w, pages.RepoIndexParams{
143
135
LoggedInUser: user,
136
+
NeedsKnotUpgrade: needsKnotUpgrade,
144
137
RepoInfo: repoInfo,
145
138
TagMap: tagMap,
146
139
RepoIndexResponse: *result,