You've already forked agentic-coding-workflow
Compare commits
2 Commits
a34566e6fa
...
eb33f534f5
| Author | SHA1 | Date | |
|---|---|---|---|
| eb33f534f5 | |||
| 9516adc810 |
@@ -1,12 +1,12 @@
|
||||
// Package httpx 内的 spa.go 提供 SPA 静态资源 + 404 fallback。
|
||||
// 命中文件直接 ServeFile;不存在但路径无后缀视为前端路由,回退 index.html;
|
||||
// 命中文件直接 ServeFile;不存在且最后一段无扩展名视为前端路由,回退 index.html;
|
||||
// /api/ 前缀始终返回 404(避免把 API 拼写错误掩盖成 HTML)。
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io/fs"
|
||||
"net/http"
|
||||
stdpath "path"
|
||||
"strings"
|
||||
)
|
||||
|
||||
@@ -18,17 +18,19 @@ func NewSPAHandler(distFS fs.FS) http.Handler {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
path := strings.TrimPrefix(r.URL.Path, "/")
|
||||
if path == "" {
|
||||
path = "index.html"
|
||||
// Trim 两侧斜杠:带尾斜杠的路径(如 /p/x/w/)对 fs.Stat 是非法 fs 路径,
|
||||
// 返回 ErrInvalid 而非 ErrNotExist,必须先归一化才能正确触发回退。
|
||||
name := strings.Trim(r.URL.Path, "/")
|
||||
if name == "" {
|
||||
name = "index.html"
|
||||
}
|
||||
if _, err := fs.Stat(distFS, path); err != nil {
|
||||
if errors.Is(err, fs.ErrNotExist) && !strings.Contains(path, ".") {
|
||||
r.URL.Path = "/index.html"
|
||||
fileServer.ServeHTTP(w, r)
|
||||
if _, err := fs.Stat(distFS, name); err != nil && stdpath.Ext(name) == "" {
|
||||
// 前端路由:直接发 index.html 内容,不能改写 r.URL.Path 再走
|
||||
// fileServer——FileServer 会把 /index.html 301 重定向到 "./",
|
||||
// 深层路由刷新会被改写成带尾斜杠的错误 URL。
|
||||
http.ServeFileFS(w, r, distFS, "index.html")
|
||||
return
|
||||
}
|
||||
}
|
||||
fileServer.ServeHTTP(w, r)
|
||||
})
|
||||
}
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
package httpx
|
||||
|
||||
import (
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
)
|
||||
|
||||
func TestSPAHandler(t *testing.T) {
|
||||
distFS := fstest.MapFS{
|
||||
"index.html": {Data: []byte("<html>app</html>")},
|
||||
"assets/app.js": {Data: []byte("console.log(1)")},
|
||||
}
|
||||
h := NewSPAHandler(distFS)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
path string
|
||||
wantStatus int
|
||||
wantBody string
|
||||
}{
|
||||
{"根路径返回 index", "/", 200, "<html>app</html>"},
|
||||
{"静态文件直接命中", "/assets/app.js", 200, "console.log(1)"},
|
||||
{"前端路由回退 index", "/p/TestProject/w/main", 200, "<html>app</html>"},
|
||||
{"带尾斜杠的前端路由也回退 index", "/p/TestProject/w/", 200, "<html>app</html>"},
|
||||
{"不存在的带扩展名文件返回 404", "/assets/missing.js", 404, ""},
|
||||
{"api 前缀不回退", "/api/v1/unknown", 404, ""},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
rec := httptest.NewRecorder()
|
||||
h.ServeHTTP(rec, httptest.NewRequest("GET", tt.path, nil))
|
||||
if rec.Code != tt.wantStatus {
|
||||
t.Fatalf("status = %d, want %d", rec.Code, tt.wantStatus)
|
||||
}
|
||||
if tt.wantBody != "" && strings.TrimSpace(rec.Body.String()) != tt.wantBody {
|
||||
t.Fatalf("body = %q, want %q", rec.Body.String(), tt.wantBody)
|
||||
}
|
||||
// 回退必须直接 200 返回内容,禁止 301 ./ 重定向(会把深层路由改写成尾斜杠 URL)
|
||||
if rec.Code == 301 || rec.Code == 302 {
|
||||
t.Fatalf("unexpected redirect to %q", rec.Header().Get("Location"))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -158,7 +158,7 @@ const routes: RouteRecordRaw[] = [
|
||||
path: '/admin/acp-sessions',
|
||||
name: 'admin-acp-sessions',
|
||||
component: () => import('@/views/acp/AcpAdminSessionsView.vue'),
|
||||
meta: { requiresAdmin: true },
|
||||
meta: { requiresAuth: true, requiresAdmin: true },
|
||||
},
|
||||
{
|
||||
path: '/admin/acp/agent-kinds',
|
||||
@@ -175,6 +175,11 @@ const routes: RouteRecordRaw[] = [
|
||||
component: () => import('@/views/admin/AgentKindEditView.vue'),
|
||||
meta: { requiresAuth: true, requiresAdmin: true },
|
||||
},
|
||||
{
|
||||
// 兜底:匹配不到的路径(如空参数的 /p/x/w/、手输错误 URL)统一回首页,避免白屏
|
||||
path: '/:pathMatch(.*)*',
|
||||
redirect: '/',
|
||||
},
|
||||
]
|
||||
|
||||
const router = createRouter({
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script setup lang="ts">
|
||||
import { onMounted } from 'vue'
|
||||
import { useAcpStore } from '@/stores/acp'
|
||||
import AppShell from '@/layouts/AppShell.vue'
|
||||
import SessionStatusBadge from '@/components/acp/SessionStatusBadge.vue'
|
||||
|
||||
const store = useAcpStore()
|
||||
@@ -21,10 +22,11 @@ async function terminate(id: string) {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="p-6 space-y-4">
|
||||
<AppShell>
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<h1 class="text-2xl font-semibold">All ACP Sessions</h1>
|
||||
<span class="text-sm text-gray-500">Global admin view (all users)</span>
|
||||
<h2 class="text-lg font-semibold">ACP 会话管理</h2>
|
||||
<span class="text-sm text-gray-500">全局管理员视图(所有用户)</span>
|
||||
</div>
|
||||
|
||||
<div v-if="store.loading" class="text-gray-500">Loading...</div>
|
||||
@@ -64,4 +66,5 @@ async function terminate(id: string) {
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</AppShell>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user