Merge pull request #1819 from RixAPI/main

优化渠道测试

Merge pull request #1819 from RixAPI/main
优化渠道测试
11ce2a6d · Calcium-Ion · GitHub · 42a29e48 · fd8271b9 · 11ce2a6d
Commit 11ce2a6d authored Sep 28, 2025 by Calcium-Ion Committed by GitHub Sep 28, 2025
Show whitespace changes
Inline Side-by-side

Showing with 189 additions and 156 deletions

web/src/hooks/channels/useChannelsData.jsx
+189 -156

No files found.
--- a/web/src/hooks/channels/useChannelsData.jsx
+++ b/web/src/hooks/channels/useChannelsData.jsx
@@ -25,13 +25,9 @@ import {
  showInfo,
  showSuccess,
  loadChannelModels,
-  copy,
+  copy
 } from '../../helpers';
-import {
+import { CHANNEL_OPTIONS, ITEMS_PER_PAGE, MODEL_TABLE_PAGE_SIZE } from '../../constants';
-  CHANNEL_OPTIONS,
-  ITEMS_PER_PAGE,
-  MODEL_TABLE_PAGE_SIZE,
-} from '../../constants';
 import { useIsMobile } from '../common/useIsMobile';
 import { useTableCompactMode } from '../common/useTableCompactMode';
 import { Modal } from '@douyinfe/semi-ui';
@@ -68,7 +64,7 @@ export const useChannelsData = () => {
  // Status filter
  const [statusFilter, setStatusFilter] = useState(
-    localStorage.getItem('channel-status-filter') || 'all',
+    localStorage.getItem('channel-status-filter') || 'all'
  );
  // Type tabs states
@@ -83,10 +79,11 @@ export const useChannelsData = () => {
  const [testingModels, setTestingModels] = useState(new Set());
  const [selectedModelKeys, setSelectedModelKeys] = useState([]);
  const [isBatchTesting, setIsBatchTesting] = useState(false);
-  const [testQueue, setTestQueue] = useState([]);
-  const [isProcessingQueue, setIsProcessingQueue] = useState(false);
  const [modelTablePage, setModelTablePage] = useState(1);
+  // 使用 ref 来避免闭包问题，类似旧版实现
+  const shouldStopBatchTestingRef = useRef(false);
  // Multi-key management states
  const [showMultiKeyManageModal, setShowMultiKeyManageModal] = useState(false);
  const [currentMultiKeyChannel, setCurrentMultiKeyChannel] = useState(null);
@@ -119,12 +116,9 @@ export const useChannelsData = () => {
  // Initialize from localStorage
  useEffect(() => {
    const localIdSort = localStorage.getItem('id-sort') === 'true';
-    const localPageSize =
+    const localPageSize = parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
-      parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
+    const localEnableTagMode = localStorage.getItem('enable-tag-mode') === 'true';
-    const localEnableTagMode =
+    const localEnableBatchDelete = localStorage.getItem('enable-batch-delete') === 'true';
-      localStorage.getItem('enable-tag-mode') === 'true';
-    const localEnableBatchDelete =
-      localStorage.getItem('enable-batch-delete') === 'true';
    setIdSort(localIdSort);
    setPageSize(localPageSize);
@@ -182,10 +176,7 @@ export const useChannelsData = () => {
  // Save column preferences
  useEffect(() => {
    if (Object.keys(visibleColumns).length > 0) {
-      localStorage.setItem(
+      localStorage.setItem('channels-table-columns', JSON.stringify(visibleColumns));
-        'channels-table-columns',
-        JSON.stringify(visibleColumns),
-      );
    }
  }, [visibleColumns]);
@@ -299,21 +290,14 @@ export const useChannelsData = () => {
    const { searchKeyword, searchGroup, searchModel } = getFormValues();
    if (searchKeyword !== '' || searchGroup !== '' || searchModel !== '') {
      setLoading(true);
-      await searchChannels(
+      await searchChannels(enableTagMode, typeKey, statusF, page, pageSize, idSort);
-        enableTagMode,
-        typeKey,
-        statusF,
-        page,
-        pageSize,
-        idSort,
-      );
      setLoading(false);
      return;
    }
    const reqId = ++requestCounter.current;
    setLoading(true);
-    const typeParam = typeKey !== 'all' ? `&type=${typeKey}` : '';
+    const typeParam = (typeKey !== 'all') ? `&type=${typeKey}` : '';
    const statusParam = statusF !== 'all' ? `&status=${statusF}` : '';
    const res = await API.get(
      `/api/channel/?p=${page}&page_size=${pageSize}&id_sort=${idSort}&tag_mode=${enableTagMode}${typeParam}${statusParam}`,
@@ -327,10 +311,7 @@ export const useChannelsData = () => {
    if (success) {
      const { items, total, type_counts } = data;
      if (type_counts) {
-        const sumAll = Object.values(type_counts).reduce(
+        const sumAll = Object.values(type_counts).reduce((acc, v) => acc + v, 0);
-          (acc, v) => acc + v,
-          0,
-        );
        setTypeCounts({ ...type_counts, all: sumAll });
      }
      setChannelFormat(items, enableTagMode);
@@ -354,18 +335,11 @@ export const useChannelsData = () => {
    setSearching(true);
    try {
      if (searchKeyword === '' && searchGroup === '' && searchModel === '') {
-        await loadChannels(
+        await loadChannels(page, pageSz, sortFlag, enableTagMode, typeKey, statusF);
-          page,
-          pageSz,
-          sortFlag,
-          enableTagMode,
-          typeKey,
-          statusF,
-        );
        return;
      }
-      const typeParam = typeKey !== 'all' ? `&type=${typeKey}` : '';
+      const typeParam = (typeKey !== 'all') ? `&type=${typeKey}` : '';
      const statusParam = statusF !== 'all' ? `&status=${statusF}` : '';
      const res = await API.get(
        `/api/channel/search?keyword=${searchKeyword}&group=${searchGroup}&model=${searchModel}&id_sort=${sortFlag}&tag_mode=${enableTagMode}&p=${page}&page_size=${pageSz}${typeParam}${statusParam}`,
@@ -373,10 +347,7 @@ export const useChannelsData = () => {
      const { success, message, data } = res.data;
      if (success) {
        const { items = [], total = 0, type_counts = {} } = data;
-        const sumAll = Object.values(type_counts).reduce(
+        const sumAll = Object.values(type_counts).reduce((acc, v) => acc + v, 0);
-          (acc, v) => acc + v,
-          0,
-        );
        setTypeCounts({ ...type_counts, all: sumAll });
        setChannelFormat(items, enableTagMode);
        setChannelCount(total);
@@ -395,14 +366,7 @@ export const useChannelsData = () => {
    if (searchKeyword === '' && searchGroup === '' && searchModel === '') {
      await loadChannels(page, pageSize, idSort, enableTagMode);
    } else {
-      await searchChannels(
+      await searchChannels(enableTagMode, activeTypeKey, statusFilter, page, pageSize, idSort);
-        enableTagMode,
-        activeTypeKey,
-        statusFilter,
-        page,
-        pageSize,
-        idSort,
-      );
    }
  };
@@ -488,16 +452,9 @@ export const useChannelsData = () => {
    const { searchKeyword, searchGroup, searchModel } = getFormValues();
    setActivePage(page);
    if (searchKeyword === '' && searchGroup === '' && searchModel === '') {
-      loadChannels(page, pageSize, idSort, enableTagMode).then(() => {});
+      loadChannels(page, pageSize, idSort, enableTagMode).then(() => { });
    } else {
-      searchChannels(
+      searchChannels(enableTagMode, activeTypeKey, statusFilter, page, pageSize, idSort);
-        enableTagMode,
-        activeTypeKey,
-        statusFilter,
-        page,
-        pageSize,
-        idSort,
-      );
    }
  };
@@ -513,14 +470,7 @@ export const useChannelsData = () => {
          showError(reason);
        });
    } else {
-      searchChannels(
+      searchChannels(enableTagMode, activeTypeKey, statusFilter, 1, size, idSort);
-        enableTagMode,
-        activeTypeKey,
-        statusFilter,
-        1,
-        size,
-        idSort,
-      );
    }
  };
@@ -551,10 +501,7 @@ export const useChannelsData = () => {
        showError(res?.data?.message || t('渠道复制失败'));
      }
    } catch (error) {
-      showError(
+      showError(t('渠道复制失败: ') + (error?.response?.data?.message || error?.message || error));
-        t('渠道复制失败: ') +
-          (error?.response?.data?.message || error?.message || error),
-      );
    }
  };
@@ -593,11 +540,7 @@ export const useChannelsData = () => {
        data.priority = parseInt(data.priority);
        break;
      case 'weight':
-        if (
+        if (data.weight === undefined || data.weight < 0 || data.weight === '') {
-          data.weight === undefined ||
-          data.weight < 0 ||
-          data.weight === ''
-        ) {
          showInfo('权重必须是非负整数！');
          return;
        }
@@ -740,136 +683,226 @@ export const useChannelsData = () => {
    const res = await API.post(`/api/channel/fix`);
    const { success, message, data } = res.data;
    if (success) {
-      showSuccess(
+      showSuccess(t('已修复 ${success} 个通道，失败 ${fails} 个通道。').replace('${success}', data.success).replace('${fails}', data.fails));
-        t('已修复 ${success} 个通道，失败 ${fails} 个通道。')
-          .replace('${success}', data.success)
-          .replace('${fails}', data.fails),
-      );
      await refresh();
    } else {
      showError(message);
    }
  };
-  // Test channel
+  // Test channel - 单个模型测试，参考旧版实现
  const testChannel = async (record, model) => {
-    setTestQueue((prev) => [...prev, { channel: record, model }]);
+    const testKey = `${record.id}-${model}`;
-    if (!isProcessingQueue) {
-      setIsProcessingQueue(true);
+    // 检查是否应该停止批量测试
+    if (shouldStopBatchTestingRef.current && isBatchTesting) {
+      return Promise.resolve();
    }
-  };
-  // Process test queue
+    // 添加到正在测试的模型集合
-  const processTestQueue = async () => {
+    setTestingModels(prev => new Set([...prev, model]));
-    if (!isProcessingQueue || testQueue.length === 0) return;
-    const { channel, model, indexInFiltered } = testQueue[0];
+    try {
+      const res = await API.get(`/api/channel/test/${record.id}?model=${model}`);
-    if (currentTestChannel && currentTestChannel.id === channel.id) {
+      // 检查是否在请求期间被停止
-      let pageNo;
+      if (shouldStopBatchTestingRef.current && isBatchTesting) {
-      if (indexInFiltered !== undefined) {
+        return Promise.resolve();
-        pageNo = Math.floor(indexInFiltered / MODEL_TABLE_PAGE_SIZE) + 1;
-      } else {
-        const filteredModelsList = currentTestChannel.models
-          .split(',')
-          .filter((m) =>
-            m.toLowerCase().includes(modelSearchKeyword.toLowerCase()),
-          );
-        const modelIdx = filteredModelsList.indexOf(model);
-        pageNo =
-          modelIdx !== -1
-            ? Math.floor(modelIdx / MODEL_TABLE_PAGE_SIZE) + 1
-            : 1;
-      }
-      setModelTablePage(pageNo);
      }
-    try {
-      setTestingModels((prev) => new Set([...prev, model]));
-      const res = await API.get(
-        `/api/channel/test/${channel.id}?model=${model}`,
-      );
      const { success, message, time } = res.data;
-      setModelTestResults((prev) => ({
+      // 更新测试结果
+      setModelTestResults(prev => ({
        ...prev,
-        [`${channel.id}-${model}`]: { success, time },
+        [testKey]: {
+          success,
+          message,
+          time: time || 0,
+          timestamp: Date.now()
+        }
      }));
      if (success) {
-        updateChannelProperty(channel.id, (ch) => {
+        // 更新渠道响应时间
-          ch.response_time = time * 1000;
+        updateChannelProperty(record.id, (channel) => {
-          ch.test_time = Date.now() / 1000;
+          channel.response_time = time * 1000;
+          channel.test_time = Date.now() / 1000;
        });
-        if (!model) {
+        if (!model || model === '') {
          showInfo(
            t('通道 ${name} 测试成功，耗时 ${time.toFixed(2)} 秒。')
-              .replace('${name}', channel.name)
+              .replace('${name}', record.name)
+              .replace('${time.toFixed(2)}', time.toFixed(2)),
+          );
+        } else {
+          showInfo(
+            t('通道 ${name} 测试成功，模型 ${model} 耗时 ${time.toFixed(2)} 秒。')
+              .replace('${name}', record.name)
+              .replace('${model}', model)
              .replace('${time.toFixed(2)}', time.toFixed(2)),
          );
        }
      } else {
-        showError(message);
+        showError(`${t('模型')} ${model}: ${message}`);
      }
    } catch (error) {
-      showError(error.message);
+      // 处理网络错误
+      const testKey = `${record.id}-${model}`;
+      setModelTestResults(prev => ({
+        ...prev,
+        [testKey]: {
+          success: false,
+          message: error.message || t('网络错误'),
+          time: 0,
+          timestamp: Date.now()
+        }
+      }));
+      showError(`${t('模型')} ${model}: ${error.message || t('测试失败')}`);
    } finally {
-      setTestingModels((prev) => {
+      // 从正在测试的模型集合中移除
+      setTestingModels(prev => {
        const newSet = new Set(prev);
        newSet.delete(model);
        return newSet;
      });
    }
-    setTestQueue((prev) => prev.slice(1));
  };
-  // Monitor queue changes
+  // 批量测试单个渠道的所有模型，参考旧版实现
-  useEffect(() => {
+  const batchTestModels = async () => {
-    if (testQueue.length > 0 && isProcessingQueue) {
+    if (!currentTestChannel || !currentTestChannel.models) {
-      processTestQueue();
+      showError(t('渠道模型信息不完整'));
-    } else if (testQueue.length === 0 && isProcessingQueue) {
+      return;
-      setIsProcessingQueue(false);
-      setIsBatchTesting(false);
    }
-  }, [testQueue, isProcessingQueue]);
-  // Batch test models
+    const models = currentTestChannel.models.split(',').filter(model =>
-  const batchTestModels = async () => {
+      model.toLowerCase().includes(modelSearchKeyword.toLowerCase())
-    if (!currentTestChannel) return;
+    );
+    if (models.length === 0) {
+      showError(t('没有找到匹配的模型'));
+      return;
+    }
    setIsBatchTesting(true);
-    setModelTablePage(1);
+    shouldStopBatchTestingRef.current = false; // 重置停止标志
+    // 清空该渠道之前的测试结果
+    setModelTestResults(prev => {
+      const newResults = { ...prev };
+      models.forEach(model => {
+        const testKey = `${currentTestChannel.id}-${model}`;
+        delete newResults[testKey];
+      });
+      return newResults;
+    });
+    try {
+      showInfo(t('开始批量测试 ${count} 个模型，已清空上次结果...').replace('${count}', models.length));
+      // 提高并发数量以加快测试速度，参考旧版的并发限制
+      const concurrencyLimit = 5;
+      const results = [];
+      for (let i = 0; i < models.length; i += concurrencyLimit) {
+        // 检查是否应该停止
+        if (shouldStopBatchTestingRef.current) {
+          showInfo(t('批量测试已停止'));
+          break;
+        }
-    const filteredModels = currentTestChannel.models
+        const batch = models.slice(i, i + concurrencyLimit);
-      .split(',')
+        showInfo(t('正在测试第 ${current} - ${end} 个模型 (共 ${total} 个)')
-      .filter((model) =>
+          .replace('${current}', i + 1)
-        model.toLowerCase().includes(modelSearchKeyword.toLowerCase()),
+          .replace('${end}', Math.min(i + concurrencyLimit, models.length))
+          .replace('${total}', models.length)
        );
-    setTestQueue(
+        const batchPromises = batch.map(model => testChannel(currentTestChannel, model));
-      filteredModels.map((model, idx) => ({
+        const batchResults = await Promise.allSettled(batchPromises);
-        channel: currentTestChannel,
+        results.push(...batchResults);
-        model,
-        indexInFiltered: idx,
+        // 再次检查是否应该停止
-      })),
+        if (shouldStopBatchTestingRef.current) {
+          showInfo(t('批量测试已停止'));
+          break;
+        }
+        // 短暂延迟避免过于频繁的请求
+        if (i + concurrencyLimit < models.length) {
+          await new Promise(resolve => setTimeout(resolve, 100));
+        }
+      }
+      if (!shouldStopBatchTestingRef.current) {
+        // 等待一小段时间确保所有结果都已更新
+        await new Promise(resolve => setTimeout(resolve, 300));
+        // 使用当前状态重新计算结果统计
+        setModelTestResults(currentResults => {
+          let successCount = 0;
+          let failCount = 0;
+          models.forEach(model => {
+            const testKey = `${currentTestChannel.id}-${model}`;
+            const result = currentResults[testKey];
+            if (result && result.success) {
+              successCount++;
+            } else {
+              failCount++;
+            }
+          });
+          // 显示完成消息
+          setTimeout(() => {
+            showSuccess(t('批量测试完成！成功: ${success}, 失败: ${fail}, 总计: ${total}')
+              .replace('${success}', successCount)
+              .replace('${fail}', failCount)
+              .replace('${total}', models.length)
            );
-    setIsProcessingQueue(true);
+          }, 100);
+          return currentResults; // 不修改状态，只是为了获取最新值
+        });
+      }
+    } catch (error) {
+      showError(t('批量测试过程中发生错误: ') + error.message);
+    } finally {
+      setIsBatchTesting(false);
+    }
+  };
+  // 停止批量测试
+  const stopBatchTesting = () => {
+    shouldStopBatchTestingRef.current = true;
+    setIsBatchTesting(false);
+    setTestingModels(new Set());
+    showInfo(t('已停止批量测试'));
+  };
+  // 清空测试结果
+  const clearTestResults = () => {
+    setModelTestResults({});
+    showInfo(t('已清空测试结果'));
  };
  // Handle close modal
  const handleCloseModal = () => {
+    // 如果正在批量测试，先停止测试
    if (isBatchTesting) {
-      setTestQueue([]);
+      shouldStopBatchTestingRef.current = true;
-      setIsProcessingQueue(false);
+      showInfo(t('关闭弹窗，已停止批量测试'));
-      setIsBatchTesting(false);
+    }
-      showSuccess(t('已停止测试'));
-    } else {
    setShowModelTestModal(false);
    setModelSearchKeyword('');
+    setIsBatchTesting(false);
+    setTestingModels(new Set());
    setSelectedModelKeys([]);
    setModelTablePage(1);
-    }
+    // 可选择性保留测试结果，这里不清空以便用户查看
  };
  // Type counts