mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-09 01:47:07 +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.
251 lines
5.2 KiB
Go
251 lines
5.2 KiB
Go
package wsmanager
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/QuantumNous/new-api/common"
|
|
"github.com/go-redis/redis/v8"
|
|
)
|
|
|
|
const (
|
|
KindRealtime = "realtime"
|
|
KindResponses = "responses"
|
|
|
|
defaultCloseReason = "channel disabled or deleted"
|
|
redisChannel = "new-api:wsmanager:channel-close"
|
|
)
|
|
|
|
type entry struct {
|
|
id uint64
|
|
channelID int
|
|
kind string
|
|
close func(reason string)
|
|
}
|
|
|
|
type closeEvent struct {
|
|
ChannelIDs []int `json:"channel_ids"`
|
|
Reason string `json:"reason"`
|
|
Origin string `json:"origin"`
|
|
}
|
|
|
|
var (
|
|
mu sync.Mutex
|
|
nextID uint64
|
|
registry = map[int]map[uint64]*entry{}
|
|
|
|
originOnce sync.Once
|
|
originID string
|
|
|
|
subscriberOnce sync.Once
|
|
)
|
|
|
|
func Register(channelID int, kind string, close func(reason string)) func() {
|
|
if channelID <= 0 || close == nil {
|
|
return func() {}
|
|
}
|
|
var closeOnce sync.Once
|
|
safeClose := func(reason string) {
|
|
closeOnce.Do(func() {
|
|
close(reason)
|
|
})
|
|
}
|
|
id := atomic.AddUint64(&nextID, 1)
|
|
e := &entry{
|
|
id: id,
|
|
channelID: channelID,
|
|
kind: kind,
|
|
close: safeClose,
|
|
}
|
|
|
|
mu.Lock()
|
|
if registry[channelID] == nil {
|
|
registry[channelID] = map[uint64]*entry{}
|
|
}
|
|
registry[channelID][id] = e
|
|
mu.Unlock()
|
|
|
|
var once sync.Once
|
|
return func() {
|
|
once.Do(func() {
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
entries := registry[channelID]
|
|
if entries == nil {
|
|
return
|
|
}
|
|
delete(entries, id)
|
|
if len(entries) == 0 {
|
|
delete(registry, channelID)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func CloseChannel(channelID int, reason string) int {
|
|
return CloseChannels([]int{channelID}, reason)
|
|
}
|
|
|
|
func CloseChannels(channelIDs []int, reason string) int {
|
|
reason = normalizeReason(reason)
|
|
entries := takeEntries(channelIDs)
|
|
for _, e := range entries {
|
|
e.close(reason)
|
|
}
|
|
if len(entries) > 0 {
|
|
common.SysLog(common.LogText("closed %d active websocket connection(s), channels=%v, kinds=%v, reason=%s", len(entries), entryChannelIDs(entries), entryKindCounts(entries), reason))
|
|
}
|
|
return len(entries)
|
|
}
|
|
|
|
func CloseChannelsAndBroadcast(channelIDs []int, reason string) int {
|
|
count := CloseChannels(channelIDs, reason)
|
|
if err := PublishCloseChannels(context.Background(), channelIDs, reason); err != nil {
|
|
common.SysLog(common.LogText("failed to publish websocket close event: %v", err))
|
|
}
|
|
return count
|
|
}
|
|
|
|
func StartSubscriber(ctx context.Context) {
|
|
rdb := common.RDB
|
|
if !common.RedisEnabled || rdb == nil {
|
|
return
|
|
}
|
|
if ctx == nil {
|
|
ctx = context.Background()
|
|
}
|
|
subscriberOnce.Do(func() {
|
|
go func() {
|
|
pubsub := rdb.Subscribe(ctx, channelCloseTopic(rdb.Options().DB))
|
|
defer pubsub.Close()
|
|
receiveChannelCloseEvents(ctx, pubsub.Channel(), getOriginID())
|
|
}()
|
|
})
|
|
}
|
|
|
|
func PublishCloseChannels(ctx context.Context, channelIDs []int, reason string) error {
|
|
rdb := common.RDB
|
|
if !common.RedisEnabled || rdb == nil {
|
|
return nil
|
|
}
|
|
ids := uniqueChannelIDs(channelIDs)
|
|
if len(ids) == 0 {
|
|
return nil
|
|
}
|
|
payload, err := common.Marshal(closeEvent{
|
|
ChannelIDs: ids,
|
|
Reason: normalizeReason(reason),
|
|
Origin: getOriginID(),
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return rdb.Publish(ctx, channelCloseTopic(rdb.Options().DB), payload).Err()
|
|
}
|
|
|
|
func channelCloseTopic(database int) string {
|
|
// Redis Pub/Sub crosses logical databases, unlike the cache keys. Include
|
|
// the selected database so independent deployments cannot close each other.
|
|
return fmt.Sprintf("%s:db:%d", redisChannel, database)
|
|
}
|
|
|
|
func receiveChannelCloseEvents(ctx context.Context, ch <-chan *redis.Message, origin string) {
|
|
for {
|
|
select {
|
|
case <-ctx.Done():
|
|
return
|
|
case msg, ok := <-ch:
|
|
if !ok {
|
|
return
|
|
}
|
|
var event closeEvent
|
|
if err := common.Unmarshal([]byte(msg.Payload), &event); err != nil {
|
|
common.SysLog(common.LogText("failed to unmarshal websocket close event: %v", err))
|
|
continue
|
|
}
|
|
if event.Origin == origin {
|
|
continue
|
|
}
|
|
CloseChannels(event.ChannelIDs, event.Reason)
|
|
}
|
|
}
|
|
}
|
|
|
|
func takeEntries(channelIDs []int) []*entry {
|
|
ids := uniqueChannelIDs(channelIDs)
|
|
if len(ids) == 0 {
|
|
return nil
|
|
}
|
|
|
|
mu.Lock()
|
|
defer mu.Unlock()
|
|
|
|
var entries []*entry
|
|
for _, channelID := range ids {
|
|
for _, e := range registry[channelID] {
|
|
entries = append(entries, e)
|
|
}
|
|
delete(registry, channelID)
|
|
}
|
|
return entries
|
|
}
|
|
|
|
func entryChannelIDs(entries []*entry) []int {
|
|
ids := make([]int, 0, len(entries))
|
|
for _, e := range entries {
|
|
if e != nil {
|
|
ids = append(ids, e.channelID)
|
|
}
|
|
}
|
|
return uniqueChannelIDs(ids)
|
|
}
|
|
|
|
func entryKindCounts(entries []*entry) map[string]int {
|
|
counts := make(map[string]int)
|
|
for _, e := range entries {
|
|
if e == nil {
|
|
continue
|
|
}
|
|
counts[e.kind]++
|
|
}
|
|
return counts
|
|
}
|
|
|
|
func uniqueChannelIDs(channelIDs []int) []int {
|
|
seen := make(map[int]struct{}, len(channelIDs))
|
|
ids := make([]int, 0, len(channelIDs))
|
|
for _, id := range channelIDs {
|
|
if id <= 0 {
|
|
continue
|
|
}
|
|
if _, ok := seen[id]; ok {
|
|
continue
|
|
}
|
|
seen[id] = struct{}{}
|
|
ids = append(ids, id)
|
|
}
|
|
return ids
|
|
}
|
|
|
|
func normalizeReason(reason string) string {
|
|
if reason == "" {
|
|
return defaultCloseReason
|
|
}
|
|
return reason
|
|
}
|
|
|
|
func getOriginID() string {
|
|
originOnce.Do(func() {
|
|
name := common.NodeName
|
|
if name == "" {
|
|
name = "node"
|
|
}
|
|
originID = fmt.Sprintf("%s-%d-%d", name, os.Getpid(), time.Now().UnixNano())
|
|
})
|
|
return originID
|
|
}
|