* feat(proxy): 实现第一阶段数据面代理 * feat(proxy): 收敛渠道与代理协议支持 * fix(proxy): 修复环境检测与迁移验证 * fix(proxy): 回收旧代理运行时并校验地址 * fix(proxy): 补齐创建链路与前端校验 * fix(proxy): 收口订阅代理与迁移兼容 * fix(proxy): 修复环境代理与运行时回收 * fix(proxy): 为系统外部请求应用全局代理 * docs(config): 精简环境配置说明 * feat(proxy): 重构代理设置的前端交互与样式 设置页与分组设置页: - 代理设置接入页面统一的草稿态与保存栏,不再独立即时提交 - 计入页面 dirty/valid,参与未保存离开拦截与并发冲突推迟 - 新增 ProxyOverrideRow,用分段控件替代原独立编辑弹层 账号卡片与密钥行: - ProxyConfigEditor 新增 card 外观:标题在白底面板外,与相邻小节同级 - 修掉按视口宽度判断断点的问题,窄容器内不再挤压错乱 - 编辑态下拉固定宽度,不随所选模式伸缩;整体收进两行 - 新增 ProxyScopeIndicator,凭据配置了独立代理时给出标识与悬停提示 密钥行交互: - 操作列收成「更多操作」菜单与展开图标,与账号卡片同构 - 折叠区分为权重、出站代理、运行诊断三个带标题小节,设置与诊断不再混放 - 权重编辑从弹层迁入折叠区,权重列的值可点击直达 - 释放的列宽还给凭据、权重与最近调用列 文案精简为继承、直连、自定义,并清理两处无引用的死键 * refactor(proxy): 统一代理设置的覆盖交互并消除样式重复 设置页与分组设置页: - 代理行改用 RuntimeOverrideRow,与超时等设置项共用同一组件 - inherit 映射为“未覆盖”,direct/custom 映射为“显式覆盖”,因此补齐了 覆盖/恢复默认按钮、覆盖状态徽章、当前有效值与待恢复默认态 - 分段控件只保留直连与自定义,继承由外层覆盖开关表达 - 删除自造的 ProxyOverrideRow,新增只含编辑控件的 ProxyOverrideControl 已保存的自定义地址: - 输入框不做回填,统一由 placeholder 展示已存地址 - 同模式下留空或与已存地址逐字相同均视为未改动,顺带挡住掩码被当作 新密码存回;无改动时保存按钮禁用 - 重新开启覆盖时回到基线已存的覆盖模式,使恢复默认可原路撤销 代码质量: - 面板外壳(标题 + 白底面板 + 标签/值/编辑图标/操作)抽为全局 .setting-panel,代理、权重、诊断三处共用,不再各写一份 - 删除 ProxyConfigEditor 已无调用方的 row 外观及随之失效的 props、 徽章分支与始终隐藏的文案 - 占位地址推导与覆盖开关规则收敛为 proxy.ts 中的共享函数 - 移除代理输入提示文案及其失去引用的 i18n 键 密钥行折叠区诊断值字号对齐上方面板。重构以构建产物 CSS 逐条比对验证, 差异均为已论证的等价改写。 * fix(proxy): 修复代理传输与校验边界
181 lines
5.3 KiB
Go
181 lines
5.3 KiB
Go
package catalog
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
"unicode"
|
|
|
|
"gpt-load/internal/platform/httpclient"
|
|
)
|
|
|
|
const (
|
|
modelsDevEndpoint = "https://models.dev/api.json"
|
|
maxCatalogBodyBytes = int64(32 * 1024 * 1024)
|
|
)
|
|
|
|
// Client conditionally downloads and validates the fixed Models.dev catalog.
|
|
type Client struct {
|
|
httpClient *http.Client
|
|
clientManager *httpclient.HTTPClientManager
|
|
proxyProvider httpclient.OutboundProxyProvider
|
|
httpConfig httpclient.Config
|
|
endpoint string
|
|
now func() time.Time
|
|
}
|
|
|
|
// NewClient constructs the production Models.dev client from the shared HTTP
|
|
// client manager. The endpoint is intentionally not an argument.
|
|
func NewClient(
|
|
manager *httpclient.HTTPClientManager,
|
|
proxyProvider httpclient.OutboundProxyProvider,
|
|
) *Client {
|
|
if manager == nil {
|
|
manager = httpclient.NewHTTPClientManager()
|
|
}
|
|
return &Client{
|
|
clientManager: manager,
|
|
proxyProvider: proxyProvider,
|
|
httpConfig: httpclient.Config{
|
|
ConnectTimeout: 15 * time.Second,
|
|
RequestTimeout: 30 * time.Second,
|
|
IdleConnTimeout: 90 * time.Second,
|
|
MaxIdleConns: 10,
|
|
MaxIdleConnsPerHost: 2,
|
|
ResponseHeaderTimeout: 30 * time.Second,
|
|
DisableCompression: false,
|
|
ForceAttemptHTTP2: true,
|
|
TLSHandshakeTimeout: 10 * time.Second,
|
|
ExpectContinueTimeout: time.Second,
|
|
},
|
|
endpoint: modelsDevEndpoint,
|
|
now: time.Now,
|
|
}
|
|
}
|
|
|
|
func newClientForTest(httpClient *http.Client, endpoint string, now func() time.Time) *Client {
|
|
return &Client{httpClient: httpClient, endpoint: endpoint, now: now}
|
|
}
|
|
|
|
func (client *Client) httpClientForSync() (*http.Client, error) {
|
|
if client.httpClient != nil {
|
|
return client.httpClient, nil
|
|
}
|
|
if client.clientManager == nil {
|
|
return nil, fmt.Errorf("catalog HTTP client is unavailable")
|
|
}
|
|
if client.proxyProvider != nil {
|
|
httpClient, err := client.clientManager.NewClientForOutboundProxy(
|
|
&client.httpConfig,
|
|
client.proxyProvider(),
|
|
)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("initialize catalog outbound proxy: %w", err)
|
|
}
|
|
return httpClient, nil
|
|
}
|
|
return client.clientManager.GetClient(&client.httpConfig), nil
|
|
}
|
|
|
|
// Sync performs one conditional fetch. It never publishes or writes cache
|
|
// state; a 200 result is returned only after the raw document fully validates.
|
|
func (client *Client) Sync(ctx context.Context, previous Metadata) (SyncResult, error) {
|
|
if client == nil || client.endpoint == "" || client.now == nil {
|
|
return SyncResult{}, fmt.Errorf("catalog client is not initialized")
|
|
}
|
|
httpClient, err := client.httpClientForSync()
|
|
if err != nil {
|
|
return SyncResult{}, err
|
|
}
|
|
request, err := http.NewRequestWithContext(ctx, http.MethodGet, client.endpoint, nil)
|
|
if err != nil {
|
|
return SyncResult{}, fmt.Errorf("create Models.dev request: %w", err)
|
|
}
|
|
request.Header.Set("Accept", "application/json")
|
|
if previous.ETag != "" {
|
|
request.Header.Set("If-None-Match", previous.ETag)
|
|
}
|
|
if previous.LastModified != "" {
|
|
request.Header.Set("If-Modified-Since", previous.LastModified)
|
|
}
|
|
|
|
response, err := httpClient.Do(request)
|
|
if err != nil {
|
|
return SyncResult{}, fmt.Errorf("request Models.dev catalog: %w", err)
|
|
}
|
|
defer func() {
|
|
_ = response.Body.Close()
|
|
}()
|
|
|
|
checkedAt := client.now().UnixMilli()
|
|
switch response.StatusCode {
|
|
case http.StatusNotModified:
|
|
metadata := previous
|
|
metadata.CheckedAtMillis = checkedAt
|
|
return SyncResult{Metadata: metadata, NotModified: true}, nil
|
|
case http.StatusOK:
|
|
default:
|
|
return SyncResult{}, fmt.Errorf("Models.dev catalog returned HTTP %d", response.StatusCode)
|
|
}
|
|
|
|
if response.ContentLength > maxCatalogBodyBytes {
|
|
return SyncResult{}, fmt.Errorf("Models.dev catalog exceeds 32 MiB limit")
|
|
}
|
|
raw, err := io.ReadAll(io.LimitReader(response.Body, maxCatalogBodyBytes+1))
|
|
if err != nil {
|
|
return SyncResult{}, fmt.Errorf("read Models.dev catalog: %w", err)
|
|
}
|
|
if int64(len(raw)) > maxCatalogBodyBytes {
|
|
return SyncResult{}, fmt.Errorf("Models.dev catalog exceeds 32 MiB limit")
|
|
}
|
|
modelsDevSnapshot, err := Parse(bytes.NewReader(raw))
|
|
if err != nil {
|
|
return SyncResult{}, fmt.Errorf("parse Models.dev catalog: %w", err)
|
|
}
|
|
snapshot, err := MergeOfficial(modelsDevSnapshot)
|
|
if err != nil {
|
|
return SyncResult{}, err
|
|
}
|
|
metadata := Metadata{
|
|
ETag: response.Header.Get("ETag"),
|
|
LastModified: response.Header.Get("Last-Modified"),
|
|
CheckedAtMillis: checkedAt,
|
|
SuccessfulFetchAtMillis: checkedAt,
|
|
}
|
|
if err := validateMetadata(metadata, true); err != nil {
|
|
return SyncResult{}, err
|
|
}
|
|
return SyncResult{
|
|
Metadata: metadata,
|
|
RawJSON: append([]byte(nil), raw...),
|
|
Snapshot: snapshot,
|
|
}, nil
|
|
}
|
|
|
|
func validateMetadata(metadata Metadata, requireSuccessfulFetch bool) error {
|
|
if requireSuccessfulFetch && metadata.SuccessfulFetchAtMillis <= 0 {
|
|
return fmt.Errorf("successful fetch timestamp must be positive")
|
|
}
|
|
if metadata.CheckedAtMillis < 0 {
|
|
return fmt.Errorf("checked timestamp must be non-negative")
|
|
}
|
|
for name, value := range map[string]string{
|
|
"ETag": metadata.ETag,
|
|
"Last-Modified": metadata.LastModified,
|
|
} {
|
|
if len(value) > 8*1024 {
|
|
return fmt.Errorf("%s validator is too large", name)
|
|
}
|
|
for _, character := range value {
|
|
if unicode.IsControl(character) || strings.ContainsRune("\r\n", character) {
|
|
return fmt.Errorf("%s validator contains control characters", name)
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|