mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
按发布纪律回流。**注意这是内容对齐而非 merge**,理由与依据:
1. 纪律禁止 merge 回主干,因为 merge 会把发布分支的**版本号变更**带进 main。
本项目版本号**只由 `git describe --tags` 推导**(Makefile VERSION),
仓库里没有任何文件存放版本号 ⇒ 回流不存在版本污染风险。
2. 逐项核对确认 **main 是 release 的内容严格子集**:
- `main` 独有的**文件**:0 个;
- `internal/lua/plugins.go` / `internal/core/kernel_actions.go` 等内核文件
main 独有行数:0;
- `deploy.sh` 那 14 行只是 emoji 清理(release 刻意去掉了 emoji);
- `channels.lua` 那 333 行是**旧版内容**(旧 exports 表、旧模型名单)。
- main 独有的 9 个提交按 patch-id **全部已在 release 中等效存在**
(`git cherry` 逐条列出均为 `-`,即已合入)。
3. 故回流 = 把 release 的内容带到 main,等价于"只捡拾修复、不带版本号",
且不会丢任何 main 独有的修复。
本次带回 v2.0.12 的全部内容(37 个提交):
- 源串行 + 按模型节流(照 model-gate)
- 已失效模型存储 + 远端目录闸门
- 余额分档选号
- 模型能力元数据(models.dev,isFree 权威判定)
- **凭据续期修复**(此前恒报 ok:true 却一个请求都不发)
- 通用件 TTL 缓存 + 串行锁;account_test/account_adopt/account_delete 修正
- 内核级:出站授权持久化重启后不生效、`__llmsproxy_plugin_dir` ground truth
校验:`git diff release/v2.0.x` = 0 行;`go build -tags luajit ./...` 通过。
210 lines
8.1 KiB
Go
210 lines
8.1 KiB
Go
package e2e
|
||
|
||
import (
|
||
"encoding/json"
|
||
"fmt"
|
||
"net/http"
|
||
"net/http/httptest"
|
||
"os"
|
||
"path/filepath"
|
||
"strings"
|
||
"sync/atomic"
|
||
"testing"
|
||
"time"
|
||
)
|
||
|
||
// TestChannelsFlowsE2E 用真二进制补齐另外三条流程的端到端:
|
||
//
|
||
// Cline(WorkOS device-poll 两步:authenticate → register 换最终凭据)
|
||
// paste(opencode:直接 complete_login 贴 API key)
|
||
// device-poll 授权页(qoder:本地造 PKCE,把手动授权页给用户,再凭据完成)
|
||
//
|
||
// 终局证据与 TestChannelsDevicePollE2E 同一标准:/v1/models 出现该平台模型。
|
||
func TestChannelsFlowsE2E(t *testing.T) {
|
||
var authHits, regHits int32
|
||
plat := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||
w.Header().Set("Content-Type", "application/json")
|
||
switch r.URL.Path {
|
||
// ---- Cline(WorkOS)----
|
||
case "/user_management/authorize/device":
|
||
fmt.Fprint(w, `{"device_code":"CD-E2E","user_code":"CLNE-1234","verification_uri":"https://example/activate","interval":1,"expires_in":600}`)
|
||
case "/user_management/authenticate":
|
||
if atomic.AddInt32(&authHits, 1) == 1 {
|
||
w.WriteHeader(400)
|
||
fmt.Fprint(w, `{"error":"authorization_pending"}`)
|
||
return
|
||
}
|
||
fmt.Fprint(w, `{"access_token":"WO-E2E-AT","refresh_token":"WO-E2E-RT"}`)
|
||
case "/api/v1/auth/register":
|
||
atomic.AddInt32(®Hits, 1)
|
||
fmt.Fprint(w, `{"success":true,"data":{"accessToken":"CLINE-E2E-AT","refreshToken":"CLINE-E2E-RT","userInfo":{"email":"dev@example.com"}}}`)
|
||
// ---- 上游推理面(opencode/qoder/cline 的 base_url 都指到这里)----
|
||
case "/v1/models":
|
||
fmt.Fprint(w, `{"object":"list","data":[{"id":"big-pickle","object":"model"},{"id":"qmodel_38max","object":"model"},{"id":"stealth/space-bunny-alpha","object":"model"}]}`)
|
||
case "/v1/chat/completions":
|
||
fmt.Fprint(w, `{"choices":[{"message":{"content":"ok"},"finish_reason":"stop"}],"usage":{"prompt_tokens":1,"completion_tokens":1,"total_tokens":2}}`)
|
||
default:
|
||
w.WriteHeader(404)
|
||
}
|
||
}))
|
||
defer plat.Close()
|
||
|
||
dir := t.TempDir()
|
||
addr := mustAddr(t)
|
||
pluginDir := filepath.Join(dir, "plugins")
|
||
cfg := "listen: " + addr + "\n" +
|
||
"gateway_keys:\n - sk-e2e-0001\n" +
|
||
"default_model: none\n" +
|
||
"adapter_dir: " + filepath.Join(dir, "adapters") + "\n" +
|
||
"plugin_dir: " + pluginDir + "\n" +
|
||
"runtime_file: " + filepath.Join(dir, "runtime.json") + "\n" +
|
||
"sources: []\n"
|
||
cfgPath := filepath.Join(dir, "config.yaml")
|
||
if err := os.WriteFile(cfgPath, []byte(cfg), 0o644); err != nil {
|
||
t.Fatal(err)
|
||
}
|
||
bin := buildBinary(t)
|
||
g := startGatewayNoModels(t, bin, addr, cfgPath)
|
||
|
||
call := func(method, path, body string) (int, map[string]interface{}) {
|
||
resp, raw := g.do(method, path, body, true)
|
||
var m map[string]interface{}
|
||
_ = json.Unmarshal([]byte(raw), &m)
|
||
return statusOf(resp), m
|
||
}
|
||
|
||
st, m := call("PUT", "/api/plugins/channels/kernel",
|
||
`{"actions":["add_source","status","list_sources","probe_all","reset_health"],"all_read":false}`)
|
||
if st != 200 {
|
||
t.Fatalf("授权内核动作失败: status=%d body=%v", st, m)
|
||
}
|
||
|
||
// ---------- ① Cline:WorkOS 设备码两步 ----------
|
||
st, m = call("POST", "/api/plugins/channels/call/set_endpoints", fmt.Sprintf(
|
||
`{"platform":"cline","base_url":%q,"device":{"code_url":%q,"token_url":%q},"register":{"url":%q}}`,
|
||
plat.URL, plat.URL+"/user_management/authorize/device",
|
||
plat.URL+"/user_management/authenticate", plat.URL+"/api/v1/auth/register"))
|
||
if st != 200 {
|
||
t.Fatalf("set_endpoints(cline) 失败: status=%d body=%v", st, m)
|
||
}
|
||
st, m = call("POST", "/api/plugins/http/channels/login", `{"platform":"cline"}`)
|
||
if st != 200 {
|
||
t.Fatalf("cline start_login status=%d body=%v", st, m)
|
||
}
|
||
sess, _ := m["session"].(map[string]interface{})
|
||
if sess == nil || sess["user_code"] != "CLNE-1234" {
|
||
t.Fatalf("cline start_login 未透传 user_code: %v", m)
|
||
}
|
||
sid, _ := sess["id"].(string)
|
||
|
||
// 第一拍 pending(authorization_pending),第二拍 completed
|
||
atomic.StoreInt32(&authHits, 0)
|
||
st, m = call("GET", "/api/plugins/http/channels/login/status?id="+sid, "")
|
||
if m["state"] != "pending" {
|
||
t.Fatalf("cline 轮询1 应 pending, 实得 %v", m)
|
||
}
|
||
deadline := time.Now().Add(5 * time.Second)
|
||
for time.Now().Before(deadline) {
|
||
st, m = call("GET", "/api/plugins/http/channels/login/status?id="+sid, "")
|
||
if m["state"] == "completed" || m["state"] == "failed" {
|
||
break
|
||
}
|
||
time.Sleep(150 * time.Millisecond)
|
||
}
|
||
if m["state"] != "completed" {
|
||
t.Fatalf("cline 轮询2 应 completed, 实得 %v", m)
|
||
}
|
||
if m["account"] != "dev@example.com" {
|
||
t.Fatalf("cline account 应取 register userInfo.email, 实得 %v", m)
|
||
}
|
||
if atomic.LoadInt32(®Hits) != 1 {
|
||
t.Fatalf("register 应恰好调用一次, 实得 %d", regHits)
|
||
}
|
||
// 凭据必须是 register 的最终 token,不是 WorkOS token
|
||
var modelsBody string
|
||
deadline = time.Now().Add(5 * time.Second)
|
||
for time.Now().Before(deadline) {
|
||
resp, raw := g.do("GET", "/v1/models", "", true)
|
||
modelsBody = raw
|
||
if resp != nil && resp.StatusCode == 200 && strings.Contains(raw, "stealth/space-bunny-alpha") {
|
||
break
|
||
}
|
||
time.Sleep(150 * time.Millisecond)
|
||
}
|
||
if !strings.Contains(modelsBody, "stealth/space-bunny-alpha") {
|
||
t.Fatalf("cline 接入后 /v1/models 未出现其模型: %s", modelsBody)
|
||
}
|
||
|
||
// ---------- ② paste(opencode):complete 直接贴 key ----------
|
||
st, m = call("POST", "/api/plugins/channels/call/set_endpoints", fmt.Sprintf(
|
||
`{"platform":"opencode","base_url":%q}`, plat.URL))
|
||
if st != 200 {
|
||
t.Fatalf("set_endpoints(opencode) 失败: %v", m)
|
||
}
|
||
st, m = call("POST", "/api/plugins/http/channels/login", `{"platform":"opencode"}`)
|
||
if st != 200 {
|
||
t.Fatalf("opencode start_login status=%d", st)
|
||
}
|
||
if sess, _ = m["session"].(map[string]interface{}); sess == nil || sess["flow"] != "paste" {
|
||
t.Fatalf("opencode 会话 flow 应 paste: %v", m)
|
||
}
|
||
st, m = call("POST", "/api/plugins/http/channels/login/complete",
|
||
`{"platform":"opencode","credential":"OC-E2E-KEY"}`)
|
||
if st != 200 || m["ok"] != true {
|
||
t.Fatalf("opencode complete 失败: status=%d body=%v", st, m)
|
||
}
|
||
deadline = time.Now().Add(5 * time.Second)
|
||
for time.Now().Before(deadline) {
|
||
resp, raw := g.do("GET", "/v1/models", "", true)
|
||
modelsBody = raw
|
||
if resp != nil && resp.StatusCode == 200 && strings.Contains(raw, "big-pickle") {
|
||
break
|
||
}
|
||
time.Sleep(150 * time.Millisecond)
|
||
}
|
||
if !strings.Contains(modelsBody, "big-pickle") {
|
||
t.Fatalf("opencode 接入后 /v1/models 未出现 big-pickle: %s", modelsBody)
|
||
}
|
||
|
||
// ---------- ③ device-poll(qoder):给授权页 + 凭据完成 ----------
|
||
// qoder 曾走 manual(返回 manual_hint);现已改为真实的 PKCE 授权页流程
|
||
// (本地造 challenge/verifier,服务端按 nonce 找回待授权会话)。
|
||
st, m = call("POST", "/api/plugins/channels/call/set_endpoints", fmt.Sprintf(
|
||
`{"platform":"qoder","base_url":%q}`, plat.URL))
|
||
if st != 200 {
|
||
t.Fatalf("set_endpoints(qoder) 失败: %v", m)
|
||
}
|
||
st, m = call("POST", "/api/plugins/http/channels/login", `{"platform":"qoder"}`)
|
||
if st != 200 {
|
||
t.Fatalf("qoder start_login status=%d", st)
|
||
}
|
||
// 真流程必须给出授权页 URL(而不是「不支持自动登录」的 manual_hint),
|
||
// 且会话声明为 device-poll。
|
||
if hint, _ := m["manual_hint"].(string); hint != "" {
|
||
t.Fatalf("qoder 已不再走 manual,不应返回 manual_hint: %q", hint)
|
||
}
|
||
if sess, _ = m["session"].(map[string]interface{}); sess == nil || sess["flow"] != "device-poll" {
|
||
t.Fatalf("qoder 会话 flow 应 device-poll: %v", m)
|
||
}
|
||
if authURL, _ := m["url"].(string); !strings.Contains(authURL, "challenge=") {
|
||
t.Fatalf("qoder 授权页 URL 应带 PKCE challenge,实得 %q", authURL)
|
||
}
|
||
st, m = call("POST", "/api/plugins/http/channels/login/complete",
|
||
`{"platform":"qoder","credential":"QD-E2E-KEY"}`)
|
||
if st != 200 || m["ok"] != true {
|
||
t.Fatalf("qoder complete 失败: status=%d body=%v", st, m)
|
||
}
|
||
deadline = time.Now().Add(5 * time.Second)
|
||
for time.Now().Before(deadline) {
|
||
resp, raw := g.do("GET", "/v1/models", "", true)
|
||
modelsBody = raw
|
||
if resp != nil && resp.StatusCode == 200 && strings.Contains(raw, "qmodel_38max") {
|
||
break
|
||
}
|
||
time.Sleep(150 * time.Millisecond)
|
||
}
|
||
if !strings.Contains(modelsBody, "qmodel_38max") {
|
||
t.Fatalf("qoder 接入后 /v1/models 未出现 qmodel_38max: %s", modelsBody)
|
||
}
|
||
}
|