Merge upstream/main (2026-06-27): 4 commits

jahnli · jahnli · commit a578ec925aab · 2026-06-27T02:09:53.000+08:00
Upstream changes: - fix(task): attribute async task usage log to the initiating node (QuantumNous#5684) - fix(theme): redirect to home after switching frontend theme to avoid 404 (QuantumNous#5612) - chore(deps): sync bun.lock for dompurify 3.4.11 (QuantumNous#5738) - fix(model-pricing): refresh tiered expression editor when switching models (QuantumNous#5752)
diff --git a/controller/relay.go b/controller/relay.go
@@ -583,6 +583,7 @@ func RelayTask(c *gin.Context) {
 		task.PrivateData.BillingSource = relayInfo.BillingSource
 		task.PrivateData.SubscriptionId = relayInfo.SubscriptionId
 		task.PrivateData.TokenId = relayInfo.TokenId
+		task.PrivateData.NodeName = common.NodeName
 		task.PrivateData.BillingContext = &model.TaskBillingContext{
 			ModelPrice:      relayInfo.PriceData.ModelPrice,
 			GroupRatio:      relayInfo.PriceData.GroupRatioInfo.GroupRatio,
diff --git a/model/log.go b/model/log.go
@@ -390,6 +390,7 @@ type RecordTaskBillingLogParams struct {
 	TokenId   int
 	Group     string
 	Other     map[string]interface{}
+	NodeName  string // 任务发起节点；为空时回退当前节点
 }
 
 func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
@@ -423,6 +424,10 @@ func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
 		common.SysLog("failed to record task billing log: " + err.Error())
 	}
 	if params.LogType == LogTypeConsume && common.DataExportEnabled {
+		nodeName := params.NodeName
+		if nodeName == "" {
+			nodeName = common.NodeName
+		}
 		gopool.Go(func() {
 			LogQuotaData(QuotaDataLogParams{
 				UserID:    params.UserId,
@@ -433,7 +438,7 @@ func RecordTaskBillingLog(params RecordTaskBillingLogParams) {
 				UseGroup:  params.Group,
 				TokenID:   params.TokenId,
 				ChannelID: params.ChannelId,
-				NodeName:  common.NodeName,
+				NodeName:  nodeName,
 			})
 		})
 	}
diff --git a/model/task.go b/model/task.go
@@ -104,6 +104,7 @@ type TaskPrivateData struct {
 	BillingSource  string              `json:"billing_source,omitempty"`  // "wallet" 或 "subscription"
 	SubscriptionId int                 `json:"subscription_id,omitempty"` // 订阅 ID，用于订阅退款
 	TokenId        int                 `json:"token_id,omitempty"`        // 令牌 ID，用于令牌额度退款
+	NodeName       string              `json:"node_name,omitempty"`       // 发起任务的节点名，轮询结算阶段据此归属日志而非最后查询节点
 	BillingContext *TaskBillingContext `json:"billing_context,omitempty"` // 计费参数快照（用于轮询阶段重新计算）
 }
 
diff --git a/service/task_billing.go b/service/task_billing.go
@@ -241,6 +241,7 @@ func RecalculateTaskQuota(ctx context.Context, task *model.Task, actualQuota int
 		TokenId:   task.PrivateData.TokenId,
 		Group:     task.Group,
 		Other:     other,
+		NodeName:  task.PrivateData.NodeName,
 	})
 }
 
diff --git a/web/classic/src/components/settings/OtherSetting.jsx b/web/classic/src/components/settings/OtherSetting.jsx
@@ -301,9 +301,12 @@ const OtherSetting = () => {
             showError(message);
             return;
           }
-          showSuccess(t('已切换到新版前端，正在刷新页面'));
+          showSuccess(t('已切换到新版前端，正在跳转首页'));
           setTimeout(() => {
-            window.location.reload();
+            // 新版前端的路由与经典前端不同，原地刷新当前路径会 404，
+            // 因此切换后重置到首页，由后端按新主题返回对应前端。
+            // 使用 replace 避免在历史中留下已失效的路由，防止返回时再次 404。
+            window.location.replace('/');
           }, 600);
         } catch (error) {
           console.error('切换新版前端失败', error);
diff --git a/web/classic/src/i18n/locales/en.json b/web/classic/src/i18n/locales/en.json
@@ -1361,7 +1361,7 @@
     "已发起支付": "Payment initiated",
     "已发送到 Fluent": "Sent to Fluent",
     "已取消 Passkey 注册": "Passkey registration cancelled",
-    "已切换到新版前端，正在刷新页面": "Switched to the new frontend, refreshing page",
+    "已切换到新版前端，正在跳转首页": "Switched to the new frontend, redirecting to home",
     "已同步到渠道": "Synced to Channel",
     "已启用": "Enabled",
     "已启用 Passkey，无需密码即可登录": "Passkey enabled, login without password",
diff --git a/web/classic/src/i18n/locales/fr.json b/web/classic/src/i18n/locales/fr.json
@@ -1362,7 +1362,7 @@
     "已发起支付": "Paiement initié",
     "已发送到 Fluent": "Envoyé à Fluent",
     "已取消 Passkey 注册": "Enregistrement du Passkey annulé",
-    "已切换到新版前端，正在刷新页面": "Passage au nouveau frontend effectué, actualisation de la page",
+    "已切换到新版前端，正在跳转首页": "Passage au nouveau frontend effectué, redirection vers l'accueil",
     "已同步到渠道": "Synced to Channel",
     "已启用": "Activé",
     "已启用 Passkey，无需密码即可登录": "Passkey activé. Connexion sans mot de passe disponible.",
diff --git a/web/classic/src/i18n/locales/ja.json b/web/classic/src/i18n/locales/ja.json
@@ -1341,7 +1341,7 @@
     "已发起支付": "支払いを開始しました",
     "已发送到 Fluent": "Fluentに送信されました",
     "已取消 Passkey 注册": "Passkeyの登録がキャンセルされました",
-    "已切换到新版前端，正在刷新页面": "新しいフロントエンドに切り替えました。ページを更新しています",
+    "已切换到新版前端，正在跳转首页": "新しいフロントエンドに切り替えました。ホームに移動しています",
     "已同步到渠道": "Synced to Channel",
     "已启用": "有効",
     "已启用 Passkey，无需密码即可登录": "Passkeyが有効になり、パスワードなしでログインできます",
diff --git a/web/classic/src/i18n/locales/ru.json b/web/classic/src/i18n/locales/ru.json
@@ -1375,7 +1375,7 @@
     "已发起支付": "Оплата инициирована",
     "已发送到 Fluent": "Отправлено в Fluent",
     "已取消 Passkey 注册": "Регистрация Passkey отменена",
-    "已切换到新版前端，正在刷新页面": "Переключено на новый интерфейс, страница обновляется",
+    "已切换到新版前端，正在跳转首页": "Переключено на новый интерфейс, переход на главную",
     "已同步到渠道": "Synced to Channel",
     "已启用": "Включено",
     "已启用 Passkey，无需密码即可登录": "Passkey включен, вход без пароля",
diff --git a/web/classic/src/i18n/locales/vi.json b/web/classic/src/i18n/locales/vi.json
@@ -1342,7 +1342,7 @@
     "已发起支付": "Đã khởi tạo thanh toán",
     "已发送到 Fluent": "Đã gửi đến Fluent",
     "已取消 Passkey 注册": "Đã hủy đăng ký Passkey",
-    "已切换到新版前端，正在刷新页面": "Đã chuyển sang frontend mới, đang làm mới trang",
+    "已切换到新版前端，正在跳转首页": "Đã chuyển sang frontend mới, đang chuyển đến trang chủ",
     "已同步到渠道": "Synced to Channel",
     "已启用": "Đã bật",
     "已启用 Passkey，无需密码即可登录": "Đã bật Passkey, đăng nhập không cần mật khẩu",
diff --git a/web/classic/src/i18n/locales/zh-CN.json b/web/classic/src/i18n/locales/zh-CN.json
@@ -1311,7 +1311,7 @@
     "已停止批量测试": "已停止批量测试",
     "已关闭后续提醒": "已关闭后续提醒",
     "已分配内存": "已分配内存",
-    "已切换到新版前端，正在刷新页面": "已切换到新版前端，正在刷新页面",
+    "已切换到新版前端，正在跳转首页": "已切换到新版前端，正在跳转首页",
     "已切换为Assistant角色": "已切换为Assistant角色",
     "已切换为System角色": "已切换为System角色",
     "已切换至最优倍率视图，每个模型使用其最低倍率分组": "已切换至最优倍率视图，每个模型使用其最低倍率分组",
diff --git a/web/classic/src/i18n/locales/zh-TW.json b/web/classic/src/i18n/locales/zh-TW.json
@@ -1338,7 +1338,7 @@
     "已发起支付": "已發起支付",
     "已发送到 Fluent": "已發送到 Fluent",
     "已取消 Passkey 注册": "已取消 Passkey 註冊",
-    "已切换到新版前端，正在刷新页面": "已切換到新版前端，正在重新整理頁面",
+    "已切换到新版前端，正在跳转首页": "已切換到新版前端，正在跳轉首頁",
     "已同步到渠道": "已同步到管道",
     "已启用": "已啟用",
     "已启用 Passkey，无需密码即可登录": "已啟用 Passkey，無需密碼即可登錄",
diff --git a/web/classic/src/i18n/locales/zh.json b/web/classic/src/i18n/locales/zh.json
@@ -909,7 +909,7 @@
     "已删除消息及其回复": "已删除消息及其回复",
     "已发送到 Fluent": "已发送到 Fluent",
     "已取消 Passkey 注册": "已取消 Passkey 注册",
-    "已切换到新版前端，正在刷新页面": "已切换到新版前端，正在刷新页面",
+    "已切换到新版前端，正在跳转首页": "已切换到新版前端，正在跳转首页",
     "已同步到渠道": "已同步到渠道",
     "已启用": "已启用",
     "已启用 Passkey，无需密码即可登录": "已启用 Passkey，无需密码即可登录",
diff --git a/web/default/src/features/system-settings/general/system-info-section.tsx b/web/default/src/features/system-settings/general/system-info-section.tsx
@@ -123,15 +123,48 @@ export function SystemInfoSection({ defaultValues }: SystemInfoSectionProps) {
       >,
       defaultValues: normalizedDefaults,
       onSubmit: async (_data, changedFields) => {
-        for (const [key, value] of Object.entries(changedFields)) {
+        // 主题切换会改变后端返回的前端产物，需放到最后处理：先更新其余设置项，
+        // 仅当它们全部成功后才提交主题切换，避免其它设置失败时就切换了主题，
+        // 导致用户停留或刷新到另一套前端不存在的路由而 404。
+        const entries = Object.entries(changedFields)
+        const themeEntry = entries.find(([key]) => key === 'theme.frontend')
+        const otherEntries = entries.filter(([key]) => key !== 'theme.frontend')
+
+        let allSucceeded = true
+        for (const [key, value] of otherEntries) {
           let v = normalizeValue(value)
           if (key === 'ServerAddress') {
             v = v.replace(/\/+$/, '')
           }
-          await updateOption.mutateAsync({
+          const res = await updateOption.mutateAsync({
             key,
             value: v,
           })
+          if (!res.success) {
+            allSucceeded = false
+          }
+        }
+        if (themeEntry && !allSucceeded) {
+          // Theme was not submitted; keep form state consistent with backend.
+          _data.theme.frontend = normalizedDefaults.theme.frontend
+          return
+        }
+        if (themeEntry && allSucceeded) {
+          const res = await updateOption.mutateAsync({
+            key: themeEntry[0],
+            value: normalizeValue(themeEntry[1]),
+          })
+          if (res.success) {
+            // 当前路由在另一套前端中并不存在，主题切换成功后重置到首页以避免 404。
+            // 延时用于让表单脏状态先清除（移除 beforeunload 拦截）并展示成功提示后再刷新；
+            // 使用 replace 让已失效的路由不进入历史，防止返回按钮再次触发 404。
+            setTimeout(() => {
+              window.location.replace('/')
+            }, 600)
+          } else {
+            // Theme update failed; revert to the last saved value.
+            _data.theme.frontend = normalizedDefaults.theme.frontend
+          }
         }
       },
     })
diff --git a/web/default/src/features/system-settings/models/model-pricing-sheet.tsx b/web/default/src/features/system-settings/models/model-pricing-sheet.tsx
@@ -153,6 +153,7 @@ export const ModelPricingEditorPanel = forwardRef<
   })
   const [billingExpr, setBillingExpr] = useState('')
   const [requestRuleExpr, setRequestRuleExpr] = useState('')
+  const [editorReloadToken, setEditorReloadToken] = useState(0)
   const isEditMode = !!editData
 
   const form = useForm<ModelPricingFormValues>({
@@ -214,6 +215,7 @@ export const ModelPricingEditorPanel = forwardRef<
     setPromptPrice(nextLaneState.promptPrice)
     setLanePrices(nextLaneState.prices)
     setLaneEnabled(nextLaneState.enabled)
+    setEditorReloadToken((token) => token + 1)
   }, [editData, form])
 
   const setFormValue = (field: keyof ModelPricingFormValues, value: string) => {
@@ -638,6 +640,7 @@ export const ModelPricingEditorPanel = forwardRef<
                   <TabsContent value='tiered_expr' className='pt-0'>
                     <FieldGroup className='gap-5'>
                       <TieredPricingEditor
+                        key={editorReloadToken}
                         modelName={watchedValues.name}
                         billingExpr={billingExpr}
                         requestRuleExpr={requestRuleExpr}

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ type TaskPrivateData struct {`
`104`	`104`	BillingSource string `json:"billing_source,omitempty"` // "wallet" 或 "subscription"
`105`	`105`	SubscriptionId int `json:"subscription_id,omitempty"` // 订阅 ID，用于订阅退款
`106`	`106`	TokenId int `json:"token_id,omitempty"` // 令牌 ID，用于令牌额度退款
	`107`	+ NodeName string `json:"node_name,omitempty"` // 发起任务的节点名，轮询结算阶段据此归属日志而非最后查询节点
`107`	`108`	BillingContext *TaskBillingContext `json:"billing_context,omitempty"` // 计费参数快照（用于轮询阶段重新计算）
`108`	`109`	`}`
`109`	`110`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ func RecalculateTaskQuota(ctx context.Context, task *model.Task, actualQuota int`
`241`	`241`	`TokenId: task.PrivateData.TokenId,`
`242`	`242`	`Group: task.Group,`
`243`	`243`	`Other: other,`
	`244`	`+ NodeName: task.PrivateData.NodeName,`
`244`	`245`	`})`
`245`	`246`	`}`
`246`	`247`