mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-08 01:17:09 +08:00
* feat(i18n): translate web console messages in the frontend and AI-client errors in the backend
Chinese text was hard-coded in API messages, stored log content, emails and
server logs, so it reached users of every interface language.
Text is now translated where its reader is:
- Web console APIs return the English source text as message_key with
message_params, and the web console translates it in all seven languages.
message keeps the English text for other API callers.
- Errors returned to AI clients, emails and notifications are translated by
the backend (en, zh-CN, zh-TW) in the language saved on the account, then
the language of the request's Accept-Language header.
- A reader who states no language still gets the original Chinese text of the
messages that were Chinese before, word for word. Gateways that use another
new-api as their upstream match that text, for example to disable a channel
whose account ran out of quota.
- Usage, top-up and system log content is stored as content_parts (key and
params) and rendered in the viewer's language. Task fail reasons and refund
reasons written by the gateway are English keys. Rows written earlier are
shown as before.
- Server logs are English.
Also:
- The saved interface language zhTW, and zh-HK, zh-MO and zh-Hant, now select
Traditional Chinese in the backend instead of Simplified Chinese.
- The built-in group descriptions are translated; descriptions an
administrator saved are shown as written.
- .agents/rules/i18n.md records the conventions. Tests in i18n/ fail on a
non-English string literal, on a web console message without translations
and on a locale key without a constant.
* feat(i18n): print server logs in Chinese when LOG_LANGUAGE asks for it
Server log lines are English by default. With LOG_LANGUAGE=zh-CN, the lines
that were Chinese before print their original Chinese text.
common.LogText formats a log line from its English format, which is also the
key of its Chinese text in common/log_text.zh-CN.json. A line without an entry
prints in English. go vet checks the arguments of every call, and
TestServerLogTexts checks that each entry still matches a call and has the
same verbs as its key.
* docs: list LOG_LANGUAGE in the docker compose example
* feat(i18n): translate every server log line and add DEFAULT_LANGUAGE
Every line the gateway prints goes through common.LogText. With
DEFAULT_LANGUAGE=zh-CN, the lines that have a Chinese text in
common/log_text.zh-CN.json print it and the others print English.
DEFAULT_LANGUAGE replaces LOG_LANGUAGE. It also sets the language of
backend messages, emails and notifications for a reader who states no
language: en, zh-CN or zh-TW, English when unset. The list of messages
that stayed Chinese for such readers is removed.
Review fixes:
- Channel test logs store the token name "Model test"; the console shows
it in the interface language.
- Task fail reasons written by the gateway are fixed sentences the console
translates. The HTTP status and the upstream detail go to the server log
when a polled task is failed.
- The auto-disable reason of a slow channel is written in DEFAULT_LANGUAGE.
Also:
- Drop the repository-scanning lint tests, the i18n rules file and its
read gate. AGENTS.md keeps the conventions in four lines.
- Payment error toasts keep their previous text and only add the
translated message key.
- Remove guards and helpers that no caller needs.
* fix(i18n): address review on language lookup, notices and error responses
- Relay requests no longer load the user a second time to find the
language: the settings TokenAuth put into the request are used as they
are, also when they hold no language.
- Upstream model update notices are rendered in each recipient's saved
language, DEFAULT_LANGUAGE when none.
- /api/usage/token and /api/log/token answer with backend-translated
messages again, with the keys and status codes used before this PR.
Their callers are scripts, not the web console.
- Webhook notifications fill {{value}} placeholders like the other
senders. Running the rendered text through Sprintf appended
%!(EXTRA ...) and broke %2F in links.
- RootUserLanguage reads the setting of the root user it already loaded.
- zh_TW and zh_HK are read as Traditional Chinese.
- Add common.ApiErrorStatus for error responses under another HTTP status
and use it where those responses were built by hand.
- Remove middleware.GetLanguage, which had no callers.
126 lines
3.2 KiB
Go
126 lines
3.2 KiB
Go
package service
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/hmac"
|
|
"crypto/sha256"
|
|
"encoding/hex"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/QuantumNous/new-api/relaykit/dto"
|
|
"github.com/QuantumNous/new-api/setting/system_setting"
|
|
)
|
|
|
|
// WebhookPayload webhook 通知的负载数据
|
|
type WebhookPayload struct {
|
|
Type string `json:"type"`
|
|
Title string `json:"title"`
|
|
Content string `json:"content"`
|
|
Values []any `json:"values,omitempty"`
|
|
Timestamp int64 `json:"timestamp"`
|
|
}
|
|
|
|
// generateSignature 生成 webhook 签名
|
|
func generateSignature(secret string, payload []byte) string {
|
|
h := hmac.New(sha256.New, []byte(secret))
|
|
h.Write(payload)
|
|
return hex.EncodeToString(h.Sum(nil))
|
|
}
|
|
|
|
// SendWebhookNotify 发送 webhook 通知
|
|
func SendWebhookNotify(webhookURL string, secret string, data dto.Notify) error {
|
|
// 处理占位符
|
|
content := data.Content
|
|
for _, value := range data.Values {
|
|
content = strings.Replace(content, dto.ContentValueParam, fmt.Sprintf("%v", value), 1)
|
|
}
|
|
|
|
// 构建 webhook 负载
|
|
payload := WebhookPayload{
|
|
Type: data.Type,
|
|
Title: data.Title,
|
|
Content: content,
|
|
Values: data.Values,
|
|
Timestamp: time.Now().Unix(),
|
|
}
|
|
|
|
// 序列化负载
|
|
payloadBytes, err := common.Marshal(payload)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to marshal webhook payload: %v", err)
|
|
}
|
|
|
|
// 创建 HTTP 请求
|
|
var req *http.Request
|
|
var resp *http.Response
|
|
|
|
if system_setting.EnableWorker() {
|
|
// 构建worker请求数据
|
|
workerReq := &WorkerRequest{
|
|
URL: webhookURL,
|
|
Key: system_setting.WorkerValidKey,
|
|
Method: http.MethodPost,
|
|
Headers: map[string]string{
|
|
"Content-Type": "application/json",
|
|
},
|
|
Body: payloadBytes,
|
|
}
|
|
|
|
// 如果有secret,添加签名到headers
|
|
if secret != "" {
|
|
signature := generateSignature(secret, payloadBytes)
|
|
workerReq.Headers["X-Webhook-Signature"] = signature
|
|
workerReq.Headers["Authorization"] = "Bearer " + secret
|
|
}
|
|
|
|
resp, err = DoWorkerRequest(workerReq)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send webhook request through worker: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("webhook request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
} else {
|
|
// SSRF防护:验证Webhook URL(非Worker模式)
|
|
if err := ValidateSSRFProtectedFetchURL(webhookURL); err != nil {
|
|
return fmt.Errorf("request reject: %v", err)
|
|
}
|
|
|
|
req, err = http.NewRequest(http.MethodPost, webhookURL, bytes.NewBuffer(payloadBytes))
|
|
if err != nil {
|
|
return fmt.Errorf("failed to create webhook request: %v", err)
|
|
}
|
|
|
|
// 设置请求头
|
|
req.Header.Set("Content-Type", "application/json")
|
|
|
|
// 如果有 secret,生成签名
|
|
if secret != "" {
|
|
signature := generateSignature(secret, payloadBytes)
|
|
req.Header.Set("X-Webhook-Signature", signature)
|
|
}
|
|
|
|
// 发送请求
|
|
client := GetSSRFProtectedHTTPClient()
|
|
resp, err = client.Do(req)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to send webhook request: %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
// 检查响应状态
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
return fmt.Errorf("webhook request failed with status code: %d", resp.StatusCode)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|