mirror of
https://gitcode.com/JianFeeeee/ModelRouter.git
synced 2026-11-07 09:47:23 +00:00
chore(main): 回流 release/v2.0.x(v2.0.12)—— 内容对齐,main 无独有内容
按发布纪律回流。**注意这是内容对齐而非 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 ./...` 通过。
This commit is contained in:
@ -634,6 +634,24 @@ func (ps *Plugins) LoadDir() error {
|
||||
}
|
||||
}
|
||||
ps.rebuild()
|
||||
// Persisted host grants must be folded into the allowlist HERE, not only in
|
||||
// the WebUI grant path.
|
||||
//
|
||||
// Why (live defect): LoadKernelPermissions above loads `jp.Hosts` into
|
||||
// ps.extraHosts but deliberately does NOT fold it — its comment says "the
|
||||
// caller owns that fold". On the boot path nobody did. SetOutboundHosts had
|
||||
// already run (core.New, before LoadDir), so the allowlist held the source
|
||||
// hosts and nothing else, and every approved extra host (the plugin's whole
|
||||
// declared set: zcode.z.ai, copilot.tencent.com, …) was refused after a
|
||||
// restart with "host ... is not an allowed outbound destination".
|
||||
//
|
||||
// Symptom is the classic "restart loses the operator's decision": it clears
|
||||
// the moment an operator opens the plugin page and re-saves the grants. It
|
||||
// also broke the scheduled work — refresh_models fires 5s after boot, inside
|
||||
// that window, and reported the grant as missing for every platform.
|
||||
ps.mu.Lock()
|
||||
ps.rebuildOutboundAllowlistLocked()
|
||||
ps.mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
@ -686,6 +704,8 @@ func bootPluginState(code, name string, allow *httpAllowlist, ps *Plugins) (*wor
|
||||
// the kernel.
|
||||
registerSecretBridge(L, ps, name)
|
||||
registerKernelBridge(L, ps, name)
|
||||
// The plugin's own directory, as ground truth (see pluginDirGlobal).
|
||||
registerPluginDirBridge(L, ps.dir)
|
||||
}
|
||||
if err := L.DoString(code); err != nil {
|
||||
L.Close()
|
||||
|
||||
Reference in New Issue
Block a user