tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-06 23:56:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cloudflare): restore group detail pages for ids other than 1

Browse Source 
Static export only generates /cloudflare/groups/1.html. Unknown ids fell
through to the dashboard index, bouncing the browser home and triggering
React hydration error #418. Serve the generated group shell and resolve
the real id from the pathname, matching the websites detail fallback.
This commit is contained in:
ryan
2026-09-17 22:00:12 +08:00
parent bbd7f72c2d
commit a2404a50ef
6 changed files with 108 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/router/root/frontend_static.go
+37 -15
View File
@@ -8,27 +8,49 @@ import (
"strings"
)
//nolint:unused // Used by frontend.go in embed_frontend builds; default lint runs without that tag.
var nextExportDynamicPrefixes = []string{"websites", "cloudflare/groups"}
//nolint:unused // Used by frontend.go in embed_frontend builds; default lint runs without that tag.
func resolveNextExportDynamicFallback(subFS fs.FS, cleanPath string) (string, bool) {
parts := strings.Split(cleanPath, "/")
if len(parts) < 2 || parts[0] != "websites" || parts[1] == "" {
templatePath, ok := nextExportDynamicTemplate(cleanPath)
if !ok {
return "", false
}
var templatePath string
switch {
case len(parts) == 2 && !strings.Contains(parts[1], "."):
templatePath = "websites/1.html"
case len(parts) == 2 && strings.HasSuffix(parts[1], ".txt"):
templatePath = "websites/1.txt"
case len(parts) == 3 && parts[2] != "" && strings.HasPrefix(parts[2], "__next.") && strings.HasSuffix(parts[2], ".txt"):
templatePath = "websites/1/" + parts[2]
default:
return "", false
}
if _, err := fs.Stat(subFS, templatePath); err != nil {
return "", false
}
return templatePath, true
}
//nolint:unused // Used by frontend.go in embed_frontend builds; default lint runs without that tag.
func nextExportDynamicTemplate(cleanPath string) (string, bool) {
for _, prefix := range nextExportDynamicPrefixes {
if path, ok := nextExportIDTemplate(cleanPath, prefix); ok {
return path, true
}
}
return "", false
}
//nolint:unused // Used by frontend.go in embed_frontend builds; default lint runs without that tag.
func nextExportIDTemplate(cleanPath, prefix string) (string, bool) {
if cleanPath == prefix || !strings.HasPrefix(cleanPath, prefix+"/") {
return "", false
}
rest := strings.TrimPrefix(cleanPath, prefix+"/")
if rest == "" {
return "", false
}
parts := strings.Split(rest, "/")
switch {
case len(parts) == 1 && !strings.Contains(parts[0], "."):
return prefix + "/1.html", true
case len(parts) == 1 && strings.HasSuffix(parts[0], ".txt"):
return prefix + "/1.txt", true
case len(parts) == 2 && parts[1] != "" && strings.HasPrefix(parts[1], "__next.") && strings.HasSuffix(parts[1], ".txt"):
return prefix + "/1/" + parts[1], true
default:
return "", false
}
}