mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-12 20:27: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 ./...` 通过。
76 lines
2.6 KiB
Go
76 lines
2.6 KiB
Go
package core
|
|
|
|
import (
|
|
"encoding/json"
|
|
"llmsproxy/internal/lua"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
)
|
|
|
|
func TestLobsterExchangePreservesIdentity(t *testing.T) {
|
|
var calls int
|
|
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
calls++
|
|
var b map[string]string
|
|
if err := json.NewDecoder(r.Body).Decode(&b); err != nil {
|
|
t.Error(err)
|
|
}
|
|
if b["authCode"] != "quote\"&code" || len(b["uuid"]) != 36 || b["firstKeyfrom"] == "" || b["firstKeyfrom"] == "cli" {
|
|
t.Errorf("invalid exchange fields: %#v", b)
|
|
}
|
|
if r.Header.Get("Content-Type") != "application/json" || r.Header.Get("User-Agent") != "LobsterAI/0.1.0" {
|
|
t.Error("wrong headers")
|
|
}
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.Write([]byte(`{"code":0,"data":{"accessToken":"at-test","refreshToken":"rt-test","expiresIn":3600,"user":{"id":"uid1","userId":"account1","nickname":"test"}}}`))
|
|
}))
|
|
defer ts.Close()
|
|
c := kernelTestCore(t)
|
|
ps := c.Plugins()
|
|
src, err := readBundledChannels(t)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err = ps.LoadSource("channels", src); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// The fixture changes only the transport destination, not the upstream contract.
|
|
if _, err = ps.Call("channels", "set_endpoints", map[string]interface{}{"platform": "lobsterai", "callback": map[string]interface{}{"token_url": ts.URL}}); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
out, err := ps.InvokeHandler("channels", "start_login", &lua.HandlerRequest{Method: "POST", Body: `{"platform":"lobsterai"}`, Role: "admin"})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
nonce := out.JSON.(map[string]interface{})["session"].(map[string]interface{})["nonce"].(string)
|
|
req := &lua.HandlerRequest{Method: "GET", Query: map[string]string{"state": nonce, "authCode": "quote\"&code"}}
|
|
out, err = ps.InvokeHandler("channels", "oauth_callback", req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if out.Status != 200 {
|
|
t.Fatalf("callback: %#v", out)
|
|
}
|
|
raw, ok, err := ps.GetSecret("channels", "channels:lobsterai")
|
|
if err != nil || !ok {
|
|
t.Fatal("missing credential", err)
|
|
}
|
|
var cred map[string]interface{}
|
|
if err = json.Unmarshal([]byte(raw), &cred); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
for _, k := range []string{"access_token", "refresh_token", "uuid", "first_keyfrom", "latest_keyfrom", "expires_at", "uid", "user_id"} {
|
|
if cred[k] == nil || cred[k] == "" {
|
|
t.Errorf("missing %s", k)
|
|
}
|
|
}
|
|
out, err = ps.InvokeHandler("channels", "oauth_callback", req)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if out.Status != 409 || calls != 1 {
|
|
t.Fatalf("replay accepted: status=%d calls=%d", out.Status, calls)
|
|
}
|
|
}
|