mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
产品名早已是 ModelRouter,但仓库标识符仍沿用旧名。这次统一,读写两侧都做兼容, 已部署的机器不会因为顺序问题立刻失效。 - go module `llmsproxy` → `modelrouter`;全仓 import 与 `cmd/modelrouter` 同步。 - `Makefile BINARY=modelrouter`;发行包名、systemd unit、/usr/share 资源、 `/usr/local/bin` 目标全部改为 modelrouter。 - 默认配置目录 `/etc/llmsproxy` → `/etc/modelrouter`。**读取侧回退**:插件与 `storeDir` 仍会检查旧路径,所以"先换二进制、后改 unit"不会立即失效。 - 环境变量 `LLMSPROXY_*`(PLUGIN_DIR / XDISPLAY_BASE / ARCH / LIVE_ZEN / BUILD_DIR)改为 `MODELROUTER_*`;`LLMS_PROXY_MASTER_KEY` → `MODELROUTER_MASTER_KEY`。旧名在读取侧继续接受。 - 桌面端内嵌核心 `bin/llmsproxy` → `bin/modelrouter`,并保留旧文件名回退, 避免升级到一半的 profile 被判成"core binary missing"。 - 新增 `packaging/migrate-to-modelrouter.sh`:**默认 dry-run**,复制而非移动、 旧目录永不删除、支持 `--rollback`;随 release tar 分发并由 core-dist 校验。 - `deploy.sh` 增加改名保护:发现旧 `/etc/llmsproxy` 而新配置不存在时**中止**, 否则会部署出一个"能启动但没有 key、没有源"的空实例。 - 临时目录前缀 `/tmp/llmsproxy-*` → `/tmp/modelrouter-*`;清理逻辑同时回收两代。 兼容别名(`__llmsproxy_*` 全局、`llmsproxy` SDK 别名、旧路径/旧 env)刻意保留, 它们是升级路径而非遗留;docs/plugins.md 已标注为废弃。 本提交未包含:`adapters/opencodezen.lua`、`adapter_opencodezen_test.go`、 `adapter_opencodezen_live_test.go`(OpenCode UA/免费池的既有改动,另批提交)。
141 lines
4.9 KiB
Go
141 lines
4.9 KiB
Go
package gateway
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// TestSnapshotUnknownKeyDoesNotPanic covers a nil-dereference that killed the
|
|
// response for any /api/stats request carrying a ?key= the statistics had no
|
|
// entry for.
|
|
//
|
|
// The maps in Snapshot are keyed by the MASKED key id (keyID(req.Key)) — that
|
|
// is what by_key reports and what the dashboard sends. An admin may pass anything
|
|
// in the query parameter, including the full key, and `s.byKey[key]` then yields
|
|
// the zero value: a nil *Stat. rows() dereferenced every value, so the handler
|
|
// panicked and the client got an empty reply plus a panic stack in the log.
|
|
//
|
|
// Reproduced against the live gateway before the fix:
|
|
//
|
|
// /api/stats?period=day&limit=1&key=sk-gw-7ffe12c5cbacec40bd39a7291df9a9ed
|
|
// → curl: (52) Empty reply from server
|
|
// → log: http: panic serving …: invalid memory address or nil pointer dereference
|
|
// modelrouter/internal/gateway.rows stats.go:771
|
|
//
|
|
// A key with no recorded traffic is a legitimate question, and zero is its
|
|
// answer — not a crash.
|
|
func TestSnapshotUnknownKeyDoesNotPanic(t *testing.T) {
|
|
s := NewStats(16)
|
|
// One recorded key, masked the way Record masks it.
|
|
s.Record(Req{Key: "***aaaaaa", Type: "chat", Model: "m", Prompt: 5, Compl: 2})
|
|
|
|
cases := []struct {
|
|
name string
|
|
key string
|
|
}{
|
|
{"masked key that exists", "***aaaaaa"},
|
|
{"masked key that does not exist", "***zzzzzz"},
|
|
{"full key rather than the mask", "sk-gw-full-key-value"},
|
|
{"arbitrary text", "not-a-key-at-all"},
|
|
}
|
|
for _, c := range cases {
|
|
t.Run(c.name, func(t *testing.T) {
|
|
// A panic here fails the subtest by unwinding through the test
|
|
// goroutine; rows() used to take the whole process with it.
|
|
out := s.Snapshot(10, c.key)
|
|
byKey, ok := out["by_key"].([]StatsRow)
|
|
if !ok {
|
|
t.Fatalf("by_key is %T, want []StatsRow", out["by_key"])
|
|
}
|
|
total, _ := out["total"].(Stat)
|
|
t.Logf("key=%q → by_key %d 条, total.reqs=%d", c.key, len(byKey), total.Reqs)
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestSnapshotUnknownKeyReportsZeroNotAbsence pins the semantics: a key with no
|
|
// traffic answers zero, and the by_key row still exists so a dashboard that keys
|
|
// off its presence renders a row of zeros rather than dropping the key.
|
|
func TestSnapshotUnknownKeyReportsZeroNotAbsence(t *testing.T) {
|
|
s := NewStats(16)
|
|
out := s.Snapshot(10, "***zzzzzz")
|
|
byKey, _ := out["by_key"].([]StatsRow)
|
|
if len(byKey) != 1 {
|
|
t.Fatalf("by_key has %d rows, want 1: the queried key must appear with zeros", len(byKey))
|
|
}
|
|
if byKey[0].Name != "***zzzzzz" {
|
|
t.Errorf("row name = %q, want ***zzzzzz", byKey[0].Name)
|
|
}
|
|
if byKey[0].Reqs != 0 {
|
|
t.Errorf("reqs = %d, want 0", byKey[0].Reqs)
|
|
}
|
|
}
|
|
|
|
// TestPeriodSnapshotUnknownKeyDoesNotPanic is the same guard on the period view,
|
|
// which builds its own buckets and calls the same flattening helpers.
|
|
func TestPeriodSnapshotUnknownKeyDoesNotPanic(t *testing.T) {
|
|
dir := t.TempDir()
|
|
audit := dir + "/audit.jsonl"
|
|
writeAuditFile(t, audit, 3, "***aaaaaa", time.Now().Add(-time.Hour).UnixMilli())
|
|
s := periodStats(t, audit)
|
|
|
|
for _, key := range []string{"***aaaaaa", "***zzzzzz", "sk-gw-full-key-value"} {
|
|
out := s.PeriodSnapshot(PeriodAll, key, time.Now())
|
|
t.Logf("key=%q → total.reqs=%d byKey=%d buckets=%d",
|
|
key, out.Total.Reqs, len(out.ByKey), len(out.Bucket))
|
|
}
|
|
}
|
|
|
|
// TestRowsSkipsNilValues pins the defensive behaviour directly, so a future
|
|
// caller that reintroduces a nil entry fails here rather than in production.
|
|
func TestRowsSkipsNilValues(t *testing.T) {
|
|
in := map[string]*Stat{
|
|
"has-traffic": {Reqs: 5},
|
|
"no-entry": nil,
|
|
}
|
|
got := rows(in)
|
|
if len(got) != 1 {
|
|
t.Fatalf("rows() returned %d rows, want 1 (the nil entry must be skipped): %+v", len(got), got)
|
|
}
|
|
if got[0].Name != "has-traffic" {
|
|
t.Errorf("kept %q, want has-traffic", got[0].Name)
|
|
}
|
|
}
|
|
|
|
// TestRowsEmptyIsEmptyNotNil keeps the JSON shape honest: an all-nil map yields
|
|
// an empty list, which encodes as [] rather than null — the frontend does
|
|
// Array.isArray checks on these fields.
|
|
func TestRowsEmptyIsEmptyNotNil(t *testing.T) {
|
|
got := rows(map[string]*Stat{"a": nil})
|
|
if got == nil {
|
|
t.Fatal("rows() returned nil; the report field must stay [] instead of null")
|
|
}
|
|
if len(got) != 0 {
|
|
t.Fatalf("got %d rows, want 0", len(got))
|
|
}
|
|
}
|
|
|
|
// TestStatsAPIUnknownKeyReturnsJSON exercises the HTTP path so the assertion
|
|
// covers the reported symptom (an empty reply), not just the helper.
|
|
func TestStatsAPIUnknownKeyReturnsJSON(t *testing.T) {
|
|
g := newTestGateway(t)
|
|
srv := httptest.NewServer(g.Handler())
|
|
defer srv.Close()
|
|
|
|
req, err := http.NewRequest("GET", srv.URL+"/api/stats?period=day&limit=1&key=sk-gw-full-key", nil)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
req.Header.Set("Authorization", "Bearer sk-test")
|
|
resp, err := srv.Client().Do(req)
|
|
if err != nil {
|
|
t.Fatalf("request failed (an empty reply is what the live gateway produced): %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusOK {
|
|
t.Fatalf("status = %d, want 200", resp.StatusCode)
|
|
}
|
|
}
|