Update subtitle.ts

subtitle.ts

@@ -43,7 +43,7 @@ const config = {
       url: Deno.env.get("OPENAI_API_URL_3") || "https://translate.doi9.top",
       apiKey: Deno.env.get("OPENAI_API_KEY_3") || "123",
       model: Deno.env.get("OPENAI_MODEL_3") || "gpt-4.1-mini",
-      maxLinesPerRequest: 25,
+      maxLinesPerRequest: 50,
       maxWorkers: 3,
       minInterval: 300
     },
@@ -52,7 +52,7 @@ const config = {
       url: Deno.env.get("OPENAI_API_URL_2") || "https://tbai.xin",
       apiKey: Deno.env.get("OPENAI_API_KEY_2") || "sk-8Pgi3KczqqCo4Hg0XJjDelRFnRHSII6nKTJMpCjWdGVfJJVA",
       model: Deno.env.get("OPENAI_MODEL_2") || "gpt-4.1-nano",
-      maxLinesPerRequest: 25,
+      maxLinesPerRequest: 50,
       maxWorkers: 3,
       minInterval: 300
     },
@@ -121,6 +121,15 @@ interface SubtitleEntry {
     originalSubtitles?: SubtitleEntry[];
 }
 
+class ApiError extends Error {
+    constructor(message, status, isRetryable = false) {
+        super(message);
+        this.name = 'ApiError';
+        this.status = status; // 存储原始状态码
+        this.isRetryable = isRetryable; // 明确标记是否可重试
+    }
+}
+
 class AdaptiveRateLimiter {
     private queue: Array<{
         fn: () => Promise<any>,
@@ -374,7 +383,7 @@ class ChatGPT_WorkerPool {
         state.runningWorkers++;
         state.lastRunTime = now;
         const { task, resolve, reject } = state.queue.shift()!;
-        console.log(`[WorkerPool] 🚀 [${providerConfig.name}] Task start. (Running: ${state.runningWorkers}, Queue: ${state.queue.length})`);
+        console.log(`[WorkerPool] 🚀 [${providerConfig.name}] 翻译任务启动. (正在运行: ${state.runningWorkers}, 队列剩余: ${state.queue.length})`);
 
         this.singleTranslationTask(task, 0, providerIndex)
             .then(resolve)
@@ -471,13 +480,13 @@ class ChatGPT_WorkerPool {
                 console.log(`[WorkerPool-Cache] HIT for task ${task.subtitleId}`);
                 return cachedResult;
             }
-            console.log(`[WorkerPool-Cache] MISS for task ${task.subtitleId}`);
+            // console.log(`[WorkerPool-Cache] MISS for task ${task.subtitleId}`);
         } catch (cacheError) {
             console.warn(`[WorkerPool-Cache] Cache check failed: ${cacheError.message}`);
         }
 
         let systemPrompt = '';
-        if (provider.model.includes('glm-')) {
+        if (provider.model.toLowerCase().includes('glm-')) {
             systemPrompt = `You are a text translation API. Your task is to translate the user's text from ${task.sourceLanguage} to ${task.targetLanguage}.
 RULES:
 1. Translate the text inside the square brackets for each numbered item.
@@ -515,7 +524,7 @@ Output:
         task.signal.addEventListener('abort', onAbort, { once: true });
 
         try {
-            console.log(`[Worker] Attempt #${retryCount + 1} for ID: ${task.subtitleId} using [${provider.name}]`);
+            console.log(`[Worker] 第 #${retryCount + 1} 次尝试， ID: ${task.subtitleId} 使用 [${provider.name}] 翻译。`);
 
             if (task.signal.aborted) throw new Error("Aborted before fetch");
 
@@ -538,14 +547,28 @@ Output:
             task.signal.removeEventListener('abort', onAbort);
 
             if (!response.ok) {
-                if ([429, 500, 502, 503, 504].includes(response.status)) {
-                    throw new Error("RETRYABLE_PROXY_ERROR");
+                // if ([429, 500, 502, 503, 504].includes(response.status)) {
+                //     throw new Error("RETRYABLE_PROXY_ERROR");
+                // }
+                // const errorBody = await response.text();
+                // throw new Error(`API Error: ${response.status}, Body: ${errorBody.substring(0, 100)}`);
+
+                const status = response.status;
+                const retryableStatusCodes = [429, 500, 502, 503, 504];
+
+                if (retryableStatusCodes.includes(status)) {
+                    // 对于可重试错误，将 isRetryable 设为 true
+                    throw new ApiError(`Retryable API Error: ${status}`, status, true);
                 }
+
+                // 对于其他 API 错误
                 const errorBody = await response.text();
-                throw new Error(`API Error: ${response.status}, Body: ${errorBody.substring(0, 100)}`);
+                throw new ApiError(`API Error: ${status}, Body: ${errorBody.substring(0, 100)}`, status, false);
+                
             }
 
             const result = await response.json();
+            // console.log("完整响应结构:", JSON.stringify(result, null, 2));
             const translation = result.choices[0]?.message?.content?.trim();
 
             // === 缓存成功结果 ===
@@ -554,7 +577,7 @@ Output:
                     const textHash = await sha256(task.text.trim());
                     const cacheKey = `chatgpt-worker-${task.sourceLanguage}-${task.targetLanguage}-${textHash}`;
                     translationCache.set(cacheKey, translation);
-                    console.log(`[WorkerPool-Cache] STORED result for task ${task.subtitleId}`);
+                    // console.log(`[WorkerPool-Cache] STORED result for task ${task.subtitleId}`);
                 } catch (cacheError) {
                     console.warn(`[WorkerPool-Cache] Failed to cache result: ${cacheError.message}`);
                 }
@@ -569,14 +592,35 @@ Output:
                 throw error;
             }
 
-            const statusCode = parseInt(error.message.match(/API Error (\d{3})/)?.[1] || '0');
-            const isRetryableServerError = [429, 500, 502, 503, 504].includes(statusCode);
-            const isFatalApiClientError = statusCode >= 400 && statusCode < 500 && !isRetryableServerError;
-            const isNetworkOrTimeoutError = error.message.includes("timed out") || (error instanceof TypeError && error.message.includes("fetch"));
-            const isEmptyResponseError = error.message === "EMPTY_RESPONSE";
+            // const statusCode = parseInt(error.message.match(/API Error (\d{3})/)?.[1] || '0');
+            // const isRetryableServerError = [429, 500, 502, 503, 504].includes(statusCode);
+            // const isFatalApiClientError = statusCode >= 400 && statusCode < 500 && !isRetryableServerError;
+            // const isNetworkOrTimeoutError = error.message.includes("timed out") || (error instanceof TypeError && error.message.includes("fetch"));
+            // const isEmptyResponseError = error.message === "EMPTY_RESPONSE";
+
+            let statusCode = 0;
+            let isRetryableServerError = false;
+            let isFatalApiClientError = false;
+            let isNetworkOrTimeoutError = false;
+            let isEmptyResponseError = false;
+
+            // 使用 instanceof 进行清晰、可靠的错误类型判断
+            if (error instanceof ApiError) {
+                // 这是我们定义的 API 错误，直接从属性读取信息，不再解析字符串！
+                statusCode = error.status;
+                isRetryableServerError = error.isRetryable;
+                isFatalApiClientError = !isRetryableServerError && statusCode >= 400 && statusCode < 500;
+            } else {
+                // 这是其他类型的错误（网络、超时、代码bug等）
+                // 保持原有的字符串检查逻辑来分类这些非 API 错误
+                isNetworkOrTimeoutError = error.message.includes("timed out") || (error instanceof TypeError && error.message.includes("fetch"));
+                isEmptyResponseError = error.message === "EMPTY_RESPONSE";
+            }
 
             // 分支 1: 可重试错误
             if ((isRetryableServerError || isNetworkOrTimeoutError || isEmptyResponseError) && retryCount < MAX_RETRIES) {
+            // if ((error.message === "RETRYABLE_PROXY_ERROR" || error.message === "EMPTY_RESPONSE" || error.message.includes("timed out")||
+            //                  (error instanceof TypeError && error.message.includes("fetch"))) && retryCount < MAX_RETRIES) {
                 const delay = Math.pow(2, retryCount) * 1500 + Math.random() * 1000;
                 console.warn(`[Worker] Retrying on ${provider.name} for ID: ${task.subtitleId} (Attempt ${retryCount + 2}) after ${delay.toFixed(0)}ms. Reason: ${error.message}`);
                 await new Promise(r => setTimeout(r, delay));
@@ -777,11 +821,28 @@ async function processSingleBatchWithSmartFallback(
         const formatRegex = /^\s*\d+\.\s*\[.*]\s*$/;
         if (!translatedParts.every(p => formatRegex.test(p.trim()))) {
             console.warn(`[SmartFallback] Format error detected in ${batchId}.`);
+
+            console.error(`[SmartFallback-Triage] Mismatch for ${batchId} (received: , expected: ${batch.length}). Activating final fallback.`);
+            console.error(`\n\n\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
+            console.error(`[CRIME SCENE] BATCH #${batchId} FAILED: Mismatch Detected!`);
+            console.error(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
+            console.error(`  - Batch ID: ${batchId}`);
+            console.error(`  - EXPECTED LINES: ${batch.length}`);
+            console.error(`  - RECEIVED PARTS: `);
+            console.error("\n--- MERGED ORIGINAL TEXT (SENT TO API) ---");
+            console.error(mergedText);
+            console.error("\n--- RECEIVED TRANSLATED TEXT (FROM API) ---");
+            console.error(translatedMergedText);
+            console.error("\n--- SPLIT PARTS (FOR DEBUGGING) ---");
+            console.error(translatedParts);
+            console.error(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!`);
+            console.error(`[ACTION] Activating line-by-line fallback for this batch...`);
+            console.error(`!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n\n`);
             throw new Error("Format error detected.");
         }
 
         // --- 4. 如果所有检查都通过，就是成功！ ---
-        console.log(`[SmartFallback] ✅ SUCCESS for batch: ${batchId}`);
+        console.log(`[SmartFallback] ✅ 批量翻译成功: ${batchId}`);
         return batch.map((original, index) => ({
             ...original,
             translatedText: translatedParts[index].replace(/^\d+\.\s*\[?/, '').replace(/]?\s*$/, '').trim(),