* test(relayconvert): add golden snapshot matrix and relaykit boundary guard Phase 0 of the relaykit extraction plan: pin byte-level output of every registered (from,to) request/response/stream conversion route, and forbid kit-bound packages from growing host-only imports. * wip(relayconvert): drop gin.Context from converter signatures; add convmeta draft Phase 1 in progress: relayconvert now takes context.Context; host media resolver adapts gin.Context back at the service boundary. * refactor(relayconvert): decouple converters from RelayInfo, gin, and settings Phase 1 of the relaykit extraction plan: - converters now depend on convmeta.Meta (implemented by RelayInfo) instead of *relaycommon.RelayInfo; ClaudeConvertInfo and the format guesser move to convmeta with aliases left behind - host settings reach converters via a convmeta.Options snapshot built in RelayInfo.ConvOptions; no more model_setting/reasoning global reads inside the conversion layer - effort-suffix helpers move to service/relayconvert/reasoning (old package forwards); chat-to-responses upgrade policy moves to service (host routing logic, not conversion) - golden conversion matrix unchanged * test(relayconvert): tighten boundary — kit packages now free of gin/setting imports * refactor(dto): drop gin and logger dependencies Phase 2 (part 1): dto.Request.IsStream now takes *http.Request instead of *gin.Context (Gemini's impl reads query/path off the std request); dto's three logger calls become common.SysError. Boundary test allowlist is now empty — kit-bound packages import no gin/setting/logger/model. * refactor(kit): extract dependency-free kitutil; dto/types/relayconvert stop importing common Phase 2 of the relaykit extraction plan: - new service/relayconvert/kitutil holds the pure helpers the kit needs (JSON wrappers, pointer/string/uuid/timestamp utils, MaskSensitiveInfo, pluggable LogInfo/LogError hooks, Debug flag) - dto, types, and all relayconvert packages now use kitutil; their only remaining internal deps are dto/types/constant - common keeps every original symbol (MaskSensitiveInfo delegates to kitutil) so host code is untouched; main.go routes kit logging into common.SysLog/SysError and mirrors DebugEnabled - golden conversion matrix unchanged * refactor(kit): move EndpointType/FinishReason to types; OpenRouter dialect via Options Kit packages (dto/types/relayconvert/reasonmap) no longer import constant: - EndpointType and finish-reason values live in types; constant re-exports - the OpenRouter special-case in claude->openai request conversion reads Options.OpenRouterDialect, set by the host from the channel type; InitChannelMeta invalidates the cached snapshot on channel switch * refactor: extract relaykit submodule (dto/types/relayconvert/reasonmap) Phase 3 of the relaykit extraction plan: - new go module github.com/QuantumNous/new-api/relaykit containing dto (minus task family), types, relayconvert (with convmeta/kitutil/reasoning), and reasonmap; host consumes it via require + replace, go.work for dev - task-family dto (task/suno/midjourney/video) stays in the host dto package; dual-consumer host files alias it as taskdto - relaykit builds and tests standalone (GOWORK=off): no host imports, no gin, no DB, no settings - golden conversion matrix unchanged * build(docker): copy relaykit/go.mod before go mod download The local-replace submodule's go.mod must exist inside the build context for the main module graph to resolve. * fix: address relaykit extraction regressions * fix: address relaykit review regressions * docs: document Meta nil receiver contract * fix(relaykit): fail OpenAI→Claude conversion without max_tokens; reject negative default_max_tokens The Claude Messages API requires max_tokens (omitting it is a 400 "Field required"), but with a nil Options.Claude.DefaultMaxTokens hook the converters silently emitted a request the upstream is guaranteed to reject. Both OpenAI Chat and Responses → Claude conversions now return sharedclaude.ErrMissingMaxTokens when no path (client value, default hook, thinking-adapter floor) supplied one. Unreachable in the host, which always configures the hook. Host side, claude.default_max_tokens now rejects negative values at the option API before persisting — they would wrap into huge unsigned values during conversion. Zero stays allowed: the current API treats max_tokens: 0 as cache pre-warming. * fix: make Gemini safety settings read path race-free
279 lines
8.1 KiB
Go
279 lines
8.1 KiB
Go
package service
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/model"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
|
)
|
|
|
|
func NotifyRootUser(t string, subject string, content string) {
|
|
user := model.GetRootUser().ToBaseUser()
|
|
err := NotifyUser(user.Id, user.Email, user.GetSetting(), dto.NewNotify(t, subject, content, nil))
|
|
if err != nil {
|
|
common.SysLog(fmt.Sprintf("failed to notify root user: %s", err.Error()))
|
|
}
|
|
}
|
|
|
|
func NotifyUpstreamModelUpdateWatchers(subject string, content string) {
|
|
var users []model.User
|
|
if err := model.DB.
|
|
Select("id", "email", "role", "status", "setting").
|
|
Where("status = ? AND role >= ?", common.UserStatusEnabled, common.RoleAdminUser).
|
|
Find(&users).Error; err != nil {
|
|
common.SysLog(fmt.Sprintf("failed to query upstream update notification users: %s", err.Error()))
|
|
return
|
|
}
|
|
|
|
notification := dto.NewNotify(dto.NotifyTypeChannelUpdate, subject, content, nil)
|
|
sentCount := 0
|
|
for _, user := range users {
|
|
userSetting := user.GetSetting()
|
|
if !userSetting.UpstreamModelUpdateNotifyEnabled {
|
|
continue
|
|
}
|
|
if err := NotifyUser(user.Id, user.Email, userSetting, notification); err != nil {
|
|
common.SysLog(fmt.Sprintf("failed to notify user %d for upstream model update: %s", user.Id, err.Error()))
|
|
continue
|
|
}
|
|
sentCount++
|
|
}
|
|
common.SysLog(fmt.Sprintf("upstream model update notifications sent: %d", sentCount))
|
|
}
|
|
|
|
func NotifyUser(userId int, userEmail string, userSetting dto.UserSetting, data dto.Notify) error {
|
|
notifyType := userSetting.NotifyType
|
|
if notifyType == "" {
|
|
notifyType = dto.NotifyTypeEmail
|
|
}
|
|
|
|
// Check notification limit
|
|
canSend, err := CheckNotificationLimit(userId, data.Type)
|
|
if err != nil {
|
|
common.SysLog(fmt.Sprintf("failed to check notification limit: %s", err.Error()))
|
|
return err
|
|
}
|
|
if !canSend {
|
|
return fmt.Errorf("notification limit exceeded for user %d with type %s", userId, notifyType)
|
|
}
|
|
|
|
switch notifyType {
|
|
case dto.NotifyTypeEmail:
|
|
// 优先使用设置中的通知邮箱,如果为空则使用用户的默认邮箱
|
|
emailToUse := userSetting.NotificationEmail
|
|
if emailToUse == "" {
|
|
emailToUse = userEmail
|
|
}
|
|
if emailToUse == "" {
|
|
common.SysLog(fmt.Sprintf("user %d has no email, skip sending email", userId))
|
|
return nil
|
|
}
|
|
return sendEmailNotify(emailToUse, data)
|
|
case dto.NotifyTypeWebhook:
|
|
webhookURLStr := userSetting.WebhookUrl
|
|
if webhookURLStr == "" {
|
|
common.SysLog(fmt.Sprintf("user %d has no webhook url, skip sending webhook", userId))
|
|
return nil
|
|
}
|
|
|
|
// 获取 webhook secret
|
|
webhookSecret := userSetting.WebhookSecret
|
|
return SendWebhookNotify(webhookURLStr, webhookSecret, data)
|
|
case dto.NotifyTypeBark:
|
|
barkURL := userSetting.BarkUrl
|
|
if barkURL == "" {
|
|
common.SysLog(fmt.Sprintf("user %d has no bark url, skip sending bark", userId))
|
|
return nil
|
|
}
|
|
return sendBarkNotify(barkURL, data)
|
|
case dto.NotifyTypeGotify:
|
|
gotifyUrl := userSetting.GotifyUrl
|
|
gotifyToken := userSetting.GotifyToken
|
|
if gotifyUrl == "" || gotifyToken == "" {
|
|
common.SysLog(fmt.Sprintf("user %d has no gotify url or token, skip sending gotify", userId))
|
|
return nil
|
|
}
|
|
return sendGotifyNotify(gotifyUrl, gotifyToken, userSetting.GotifyPriority, data)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func sendEmailNotify(userEmail string, data dto.Notify) error {
|
|
// make email content
|
|
content := data.Content
|
|
// 处理占位符
|
|
for _, value := range data.Values {
|
|
content = strings.Replace(content, dto.ContentValueParam, fmt.Sprintf("%v", value), 1)
|
|
}
|
|
return common.SendEmail(data.Title, userEmail, content)
|
|
}
|
|
|
|
func sendBarkNotify(barkURL string, data dto.Notify) error {
|
|
// 处理占位符
|
|
content := data.Content
|
|
for _, value := range data.Values {
|
|
content = strings.Replace(content, dto.ContentValueParam, fmt.Sprintf("%v", value), 1)
|
|
}
|
|
|
|
// 替换模板变量
|
|
finalURL := strings.ReplaceAll(barkURL, "{{title}}", url.QueryEscape(data.Title))
|
|
finalURL = strings.ReplaceAll(finalURL, "{{content}}", url.QueryEscape(content))
|
|
|
|
// 发送GET请求到Bark
|
|
var req *http.Request
|
|
var resp *http.Response
|
|
var err error
|
|
|
|
if system_setting.EnableWorker() {
|
|
// 使用worker发送请求
|
|
workerReq := &WorkerRequest{
|
|
URL: finalURL,
|
|
Key: system_setting.WorkerValidKey,
|
|
Method: http.MethodGet,
|
|
Headers: map[string]string{
|
|
"User-Agent": "OneAPI-Bark-Notify/1.0",
|
|
},
|
|
}
|
|
|
|
resp, err = DoWorkerRequest(workerReq)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send bark request through worker: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("bark request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
} else {
|
|
// SSRF防护:验证Bark URL(非Worker模式)
|
|
if err := ValidateSSRFProtectedFetchURL(finalURL); err != nil {
|
|
return fmt.Errorf("request reject: %v", err)
|
|
}
|
|
|
|
// 直接发送请求
|
|
req, err = http.NewRequest(http.MethodGet, finalURL, nil)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create bark request: %v", err)
|
|
}
|
|
|
|
// 设置User-Agent
|
|
req.Header.Set("User-Agent", "OneAPI-Bark-Notify/1.0")
|
|
|
|
// 发送请求
|
|
client := GetSSRFProtectedHTTPClient()
|
|
resp, err = client.Do(req)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send bark request: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("bark request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func sendGotifyNotify(gotifyUrl string, gotifyToken string, priority int, data dto.Notify) error {
|
|
// 处理占位符
|
|
content := data.Content
|
|
for _, value := range data.Values {
|
|
content = strings.Replace(content, dto.ContentValueParam, fmt.Sprintf("%v", value), 1)
|
|
}
|
|
|
|
// 构建完整的 Gotify API URL
|
|
// 确保 URL 以 /message 结尾
|
|
finalURL := strings.TrimSuffix(gotifyUrl, "/") + "/message?token=" + url.QueryEscape(gotifyToken)
|
|
|
|
// Gotify优先级范围0-10,如果超出范围则使用默认值5
|
|
if priority < 0 || priority > 10 {
|
|
priority = 5
|
|
}
|
|
|
|
// 构建 JSON payload
|
|
type GotifyMessage struct {
|
|
Title string `json:"title"`
|
|
Message string `json:"message"`
|
|
Priority int `json:"priority"`
|
|
}
|
|
|
|
payload := GotifyMessage{
|
|
Title: data.Title,
|
|
Message: content,
|
|
Priority: priority,
|
|
}
|
|
|
|
// 序列化为 JSON
|
|
payloadBytes, err := common.Marshal(payload)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal gotify payload: %v", err)
|
|
}
|
|
|
|
var req *http.Request
|
|
var resp *http.Response
|
|
|
|
if system_setting.EnableWorker() {
|
|
// 使用worker发送请求
|
|
workerReq := &WorkerRequest{
|
|
URL: finalURL,
|
|
Key: system_setting.WorkerValidKey,
|
|
Method: http.MethodPost,
|
|
Headers: map[string]string{
|
|
"Content-Type": "application/json; charset=utf-8",
|
|
"User-Agent": "OneAPI-Gotify-Notify/1.0",
|
|
},
|
|
Body: payloadBytes,
|
|
}
|
|
|
|
resp, err = DoWorkerRequest(workerReq)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send gotify request through worker: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("gotify request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
} else {
|
|
// SSRF防护:验证Gotify URL(非Worker模式)
|
|
if err := ValidateSSRFProtectedFetchURL(finalURL); err != nil {
|
|
return fmt.Errorf("request reject: %v", err)
|
|
}
|
|
|
|
// 直接发送请求
|
|
req, err = http.NewRequest(http.MethodPost, finalURL, bytes.NewBuffer(payloadBytes))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create gotify request: %v", err)
|
|
}
|
|
|
|
// 设置请求头
|
|
req.Header.Set("Content-Type", "application/json; charset=utf-8")
|
|
req.Header.Set("User-Agent", "NewAPI-Gotify-Notify/1.0")
|
|
|
|
// 发送请求
|
|
client := GetSSRFProtectedHTTPClient()
|
|
resp, err = client.Do(req)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send gotify request: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("gotify request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|