scancscode 1.0.43 → 1.0.46

package/dist/src/CmdExecutor.js

@@ -123,7 +123,7 @@ class CmdExecutor {
         let toLangs = options.toLangs ?? undefined;
         let apiKey = options.apiKey;
         let appId = options.appId;
-        console.log(`slim csv cmd options: `, incsv, outcsv, fromLang, toLangs);
+        console.log(`translate csv cmd options: `, incsv, outcsv, fromLang, toLangs, apiKey, appId);
         let argv = process.argv;
         if (incsv == null) {
             console.error(`incsv missing:`, argv);
@@ -149,7 +149,7 @@ class CmdExecutor {
             console.error(`appId missing:`, argv);
             return;
         }
-        await CsvAutoTranslator_1.CsvAutoTranslator.translateCsvWithLangs(incsv, outcsv, fromLang, toLangs, apiKey, appId);
+        await CsvAutoTranslator_1.CsvAutoTranslator.translateCsvWithLangs(appId, apiKey, incsv, outcsv, fromLang, toLangs);
         console.log("translate csv with cmd options done.");
     }
 }

package/dist/src/CsvAutoTranslator.js

@@ -37,6 +37,31 @@ exports.CsvAutoTranslator = void 0;
 const crypto = __importStar(require("crypto"));
 const https = __importStar(require("https"));
 const CSVUtils_1 = require("./CSVUtils");
+class OnlineTranslateResult {
+    errorCode = "";
+    errorMsg = "";
+    isOk = false;
+    translatedTexts;
+    constructor(errorCode, errorMsg, isOk, translatedTexts) {
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+        this.isOk = isOk;
+        this.translatedTexts = translatedTexts;
+    }
+}
+class TranslateCSVResult {
+    translateCount = 0;
+    isOk = false;
+    firstErrorCode = "";
+    firstErrorMsg = "";
+    constructor(translateCount, isOk, firstErrorCode, firstErrorMsg) {
+        this.translateCount = translateCount;
+        this.isOk = isOk;
+        this.firstErrorCode = firstErrorCode;
+        this.firstErrorMsg = firstErrorMsg;
+    }
+    static Empty = new TranslateCSVResult(0, false, "", "");
+}
 class CsvAutoTranslator {
     apiKey;
     appId;
@@ -44,7 +69,7 @@ class CsvAutoTranslator {
     maxBatchSize = 5;
     MAX_BATCH_TEXT_COUNT = 50;
     MAX_BATCH_JSON_SIZE = 4900;
-    constructor(apiKey, appId) {
+    constructor(appId, apiKey) {
         this.apiKey = apiKey;
         this.appId = appId;
     }
@@ -107,9 +132,14 @@ class CsvAutoTranslator {
     async translateBatch(texts, from, to) {
         const response = await this.requestTranslate(texts, from, to);
         if (response.resultCode !== "200") {
-            throw new Error(`翻译失败: ${response.resultMsg}`);
+            let errTip = `翻译失败: ${response.errorCode}, ${response.errorMsg}, ${response.resultCode}, ${response.resultMsg}`;
+            console.error(errTip);
+            console.error("翻译失败内容:", texts);
+            let result = new OnlineTranslateResult(response.errorCode, response.errorMsg, false, new Array(texts.length).fill(""));
+            return result;
         }
-        return response.tgtList.map(item => item.tgtText || "");
+        let result = new OnlineTranslateResult(response.resultCode, response.resultMsg, true, response.tgtList.map(item => item.tgtText || ""));
+        return result;
     }
     estimateSingleTextJsonSize(text, isSingle) {
         return Buffer.byteLength(JSON.stringify(text)) + (isSingle ? 0 : 1);
@@ -159,18 +189,28 @@ class CsvAutoTranslator {
         const results = new Array(batches.length);
         const concurrencyLimit = this.maxBatchSize;
         let index = 0;
+        let isOk = true;
         let batchCount = 0;
+        let firstErrorCode = "";
+        let firstErrorMsg = "";
         const processBatch = async () => {
             while (index < batches.length) {
                 const batchIndex = index++;
                 const batch = batches[batchIndex];
                 batchCount++;
                 console.log(`batchCount++: ${batchCount}`);
-                const batchResults = await this.translateBatch(batch, from, to);
+                const batchResult = await this.translateBatch(batch, from, to);
+                if (!batchResult.isOk) {
+                    isOk = false;
+                    if (firstErrorCode === "") {
+                        firstErrorCode = batchResult.errorCode;
+                        firstErrorMsg = batchResult.errorMsg;
+                    }
+                }
                 await new Promise(resolve => setTimeout(resolve, 1000));
                 batchCount--;
                 console.log(`batchCount--: ${batchCount}`);
-                results[batchIndex] = batchResults;
+                results[batchIndex] = batchResult.translatedTexts;
             }
         };
         const workers = [];
@@ -179,7 +219,9 @@ class CsvAutoTranslator {
         }
         await Promise.all(workers);
         // await processBatch()
-        return results.flat();
+        let translatedTexts = results.flat();
+        let result = new OnlineTranslateResult(firstErrorCode, firstErrorMsg, isOk, translatedTexts);
+        return result;
     }
     langMap = new Map([
         ["zh_cn", "zh"],
@@ -189,45 +231,27 @@ class CsvAutoTranslator {
     async translateCsvRows(rows, fromLang, toLangs) {
         if (rows.length === 0) {
             console.log("CSV文件为空");
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         let header = rows[0];
         let fromLangIndex = header.indexOf(fromLang);
         if (fromLangIndex === -1) {
             console.error(`未找到 ${fromLang} 列`);
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         if (!this.langMap.has(fromLang)) {
             console.error(`未找到 ${fromLang} 的目标语言`);
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         let fromLang2 = this.langMap.get(fromLang);
         if (fromLang2 == null) {
             console.error(`未找到 ${fromLang} 的目标语言`);
-            return 0;
+            return TranslateCSVResult.Empty;
         }
-        const needTranslateIndices = [];
-        const needTranslateTexts = [];
-        for (let i = 1; i < rows.length; i++) {
-            const row = rows[i];
-            if (!row[0] || row[0].trim() === "") {
-                continue;
-            }
-            if (row[fromLangIndex] && row[fromLangIndex].trim() !== "") {
-                continue;
-            }
-            needTranslateIndices.push(i);
-            let text = row[fromLangIndex];
-            if (text == null || text == "") {
-                text = row[0];
-            }
-            needTranslateTexts.push(text);
-        }
-        if (needTranslateTexts.length === 0) {
-            console.log("没有需要翻译的内容");
-            return 0;
-        }
-        console.log(`开始翻译 ${needTranslateTexts.length} 条内容...`);
+        let isOk = true;
+        let translateCount = 0;
+        let firstErrorCode = "";
+        let firstErrorMsg = "";
         for (let curLangIndex = 0; curLangIndex < header.length; curLangIndex++) {
             let lang = header[curLangIndex];
             lang = lang.trim().toLowerCase();
@@ -237,36 +261,79 @@ class CsvAutoTranslator {
             if (toLangs != undefined && !toLangs.includes(lang)) {
                 continue;
             }
-            if (lang != fromLang && this.langMap.has(lang)) {
-                const toLang = this.langMap.get(lang);
-                if (toLang == null) {
-                    console.error(`未找到 ${lang} 的目标语言`);
+            if (!(lang != fromLang && this.langMap.has(lang))) {
+                continue;
+            }
+            const needTranslateIndices = [];
+            const needTranslateTexts = [];
+            for (let i = 1; i < rows.length; i++) {
+                const row = rows[i];
+                if (!row[0] || row[0].trim() === "") {
                     continue;
                 }
-                const translations = await this.translateAll(needTranslateTexts, fromLang2, toLang);
-                for (let j = 0; j < needTranslateIndices.length; j++) {
-                    const rowIndex = needTranslateIndices[j];
-                    while (rows[rowIndex].length < header.length) {
-                        rows[rowIndex].push("");
-                    }
-                    rows[rowIndex][curLangIndex] = translations[j];
+                if (row[curLangIndex] && row[curLangIndex].trim() !== "") {
+                    continue;
+                }
+                let text = row[fromLangIndex];
+                if (text == null || text == "") {
+                    text = row[0];
+                }
+                if (text == null || text === "") {
+                    continue;
+                }
+                needTranslateIndices.push(i);
+                needTranslateTexts.push(text);
+            }
+            if (needTranslateTexts.length === 0) {
+                console.log("没有需要翻译的内容");
+                return TranslateCSVResult.Empty;
+            }
+            console.log(`开始翻译 ${needTranslateTexts.length} 条内容...`);
+            const toLang = this.langMap.get(lang);
+            if (toLang == null) {
+                console.error(`未找到 ${lang} 的目标语言`);
+                continue;
+            }
+            const translateResult = await this.translateAll(needTranslateTexts, fromLang2, toLang);
+            isOk = isOk && translateResult.isOk;
+            if (!translateResult.isOk) {
+                if (firstErrorCode === "") {
+                    firstErrorCode = translateResult.errorCode;
+                    firstErrorMsg = translateResult.errorMsg;
+                }
+                console.error(`翻译 ${lang} 失败: ${translateResult.errorCode} ${translateResult.errorMsg}`);
+                continue;
+            }
+            let translations = translateResult.translatedTexts;
+            for (let j = 0; j < needTranslateIndices.length; j++) {
+                const rowIndex = needTranslateIndices[j];
+                while (rows[rowIndex].length < header.length) {
+                    rows[rowIndex].push("");
                 }
+                rows[rowIndex][curLangIndex] = translations[j];
             }
+            translateCount += needTranslateTexts.length;
         }
-        return needTranslateTexts.length;
+        let result = new TranslateCSVResult(translateCount, isOk, firstErrorCode, firstErrorMsg);
+        return result;
     }
     async translateCsv(filePath, outFilePath, fromLang = "auto", toLangs) {
         const csvUtils = new CSVUtils_1.CSVUtils(filePath);
         const rows = await csvUtils.parseCsv();
-        const translatedCount = await this.translateCsvRows(rows, fromLang, toLangs);
-        if (translatedCount > 0) {
+        const translatedResult = await this.translateCsvRows(rows, fromLang, toLangs);
+        if (translatedResult.isOk && translatedResult.translateCount > 0) {
             await CSVUtils_1.CSVUtils.writeCsv(outFilePath, rows);
-            console.log(`翻译完成，已更新 ${translatedCount} 条内容到 ${outFilePath}`);
+            console.log(`翻译完成，已更新 ${translatedResult.translateCount} 条内容到 ${outFilePath}`);
         }
+        else {
+            console.log(`翻译完成，未更新任何内容到 ${outFilePath}`);
+        }
+        return translatedResult;
     }
-    static async translateCsvWithLangs(filePath, outFilePath, fromLang, langs, apiKey, appId) {
-        const translator = new CsvAutoTranslator(apiKey, appId);
-        await translator.translateCsv(filePath, outFilePath, fromLang, langs);
+    static async translateCsvWithLangs(appId, apiKey, filePath, outFilePath, fromLang, langs) {
+        const translator = new CsvAutoTranslator(appId, apiKey);
+        let result = await translator.translateCsv(filePath, outFilePath, fromLang, langs);
+        return result;
     }
 }
 exports.CsvAutoTranslator = CsvAutoTranslator;

package/dist/test/CsvAutoTranslator.test.js

@@ -27,7 +27,7 @@ describe("CsvAutoTranslator", () => {
             expect(true).toBe(true);
             return;
         }
-        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(apiKey, appId);
+        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(appId, apiKey);
         const rows = JSON.parse(JSON.stringify(testRows));
         const translatedCount = await translator.translateCsvRows(rows, "zh_cn");
         expect(translatedCount).toBe(10);
@@ -45,7 +45,7 @@ describe("CsvAutoTranslator", () => {
             expect(true).toBe(true);
             return;
         }
-        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(apiKey, appId);
+        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(appId, apiKey);
         const rows = JSON.parse(JSON.stringify(testRows));
         rows[1][2] = "已有译文";
         const translatedCount = await translator.translateCsvRows(rows, "zh_cn");
@@ -53,12 +53,12 @@ describe("CsvAutoTranslator", () => {
         expect(rows[10][2]).toBe("歡迎來到中國");
     }, 120000);
     test("translateCsvRows - 空CSV测试", async () => {
-        const translator = new CsvAutoTranslator_1.CsvAutoTranslator("dummy-key", "dummy-id");
+        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(NIUTRANS_APP_ID, NIUTRANS_API_KEY);
         const translatedCount = await translator.translateCsvRows([], "zh_cn");
         expect(translatedCount).toBe(0);
     });
     test("translateCsvRows - 没有需要翻译的内容", async () => {
-        const translator = new CsvAutoTranslator_1.CsvAutoTranslator("dummy-key", "dummy-id");
+        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(NIUTRANS_APP_ID, NIUTRANS_API_KEY);
         const rows = [
             ["key", "en_us", "zh_hk"],
             ["Hello", "", "已有译文1"],
@@ -68,7 +68,7 @@ describe("CsvAutoTranslator", () => {
         expect(translatedCount).toBe(0);
     });
     describe("smartBatch - 边界回归测试", () => {
-        const translator = new CsvAutoTranslator_1.CsvAutoTranslator("dummy-key", "dummy-id");
+        const translator = new CsvAutoTranslator_1.CsvAutoTranslator(NIUTRANS_APP_ID, NIUTRANS_API_KEY);
         test("空文本数组", () => {
             const batches = translator.smartBatch([]);
             expect(batches.length).toBe(0);
@@ -157,4 +157,14 @@ describe("CsvAutoTranslator", () => {
             }
         }, 300000);
     });
+    describe("translateCSV", () => {
+        test("翻译 Auto.csv 并验证输出", async () => {
+            const incsv = "test/Auto.csv";
+            const outcsv = "temp/Auto-Out.csv";
+            const fromLang = "zh_cn";
+            let result = await CsvAutoTranslator_1.CsvAutoTranslator.translateCsvWithLangs("kDr1772519780125", "4cfb5525d3be1e45003910059cd7ea9b", incsv, outcsv, fromLang);
+            expect(result.isOk).toBe(true);
+            expect(result.translateCount).toBeGreaterThan(0);
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scancscode",
-  "version": "1.0.43",
+  "version": "1.0.46",
   "description": "",
   "main": "./dist/index.js",
   "bin": {

package/src/CmdExecutor.ts

@@ -124,7 +124,7 @@ export class CmdExecutor {
         let apiKey: string = options.apiKey;
         let appId: string = options.appId;
 
-        console.log(`slim csv cmd options: `, incsv, outcsv, fromLang, toLangs);
+        console.log(`translate csv cmd options: `, incsv, outcsv, fromLang, toLangs, apiKey, appId);
         let argv = process.argv;
         if (incsv == null) {
             console.error(`incsv missing:`, argv);
@@ -149,8 +149,8 @@ export class CmdExecutor {
         if (appId == null) {
             console.error(`appId missing:`, argv);
             return;
-        }
-        await CsvAutoTranslator.translateCsvWithLangs(incsv, outcsv, fromLang, toLangs, apiKey, appId);
+            }
+            await CsvAutoTranslator.translateCsvWithLangs(appId, apiKey, incsv, outcsv, fromLang, toLangs);
         console.log("translate csv with cmd options done.");
     }
 }

package/src/CsvAutoTranslator.ts

@@ -13,6 +13,38 @@ interface NiuTransResponse {
     }>;
     resultCode: string;
     resultMsg: string;
+    errorCode: string;
+    errorMsg: string;
+}
+
+class OnlineTranslateResult {
+    public errorCode: string = "";
+    public errorMsg: string = "";
+    public isOk: boolean = false;
+    public translatedTexts: string[];
+
+    public constructor(errorCode: string, errorMsg: string, isOk: boolean, translatedTexts: string[]) {
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+        this.isOk = isOk;
+        this.translatedTexts = translatedTexts;
+    }
+}
+
+class TranslateCSVResult {
+    public translateCount: number = 0;
+    public isOk: boolean = false;
+    public firstErrorCode: string = "";
+    public firstErrorMsg: string = "";
+
+    public constructor(translateCount: number, isOk: boolean, firstErrorCode: string, firstErrorMsg: string) {
+        this.translateCount = translateCount;
+        this.isOk = isOk;
+        this.firstErrorCode = firstErrorCode;
+        this.firstErrorMsg = firstErrorMsg;
+    }
+
+    public static Empty: TranslateCSVResult = new TranslateCSVResult(0, false, "", "");
 }
 
 export class CsvAutoTranslator {
@@ -23,7 +55,7 @@ export class CsvAutoTranslator {
     private readonly MAX_BATCH_TEXT_COUNT: number = 50;
     private readonly MAX_BATCH_JSON_SIZE: number = 4900;
 
-    constructor(apiKey: string, appId: string) {
+    constructor(appId: string, apiKey: string) {
         this.apiKey = apiKey;
         this.appId = appId;
     }
@@ -85,12 +117,17 @@ export class CsvAutoTranslator {
         });
     }
 
-    private async translateBatch(texts: string[], from: string, to: string): Promise<string[]> {
+    private async translateBatch(texts: string[], from: string, to: string): Promise<OnlineTranslateResult> {
         const response = await this.requestTranslate(texts, from, to);
         if (response.resultCode !== "200") {
-            throw new Error(`翻译失败: ${response.resultMsg}`);
+            let errTip = `翻译失败: ${response.errorCode}, ${response.errorMsg}, ${response.resultCode}, ${response.resultMsg}`;
+            console.error(errTip);
+            console.error("翻译失败内容:", texts);
+            let result = new OnlineTranslateResult(response.errorCode, response.errorMsg, false, new Array(texts.length).fill(""));
+            return result;
         }
-        return response.tgtList.map(item => item.tgtText || "");
+        let result = new OnlineTranslateResult(response.resultCode, response.resultMsg, true, response.tgtList.map(item => item.tgtText || ""));
+        return result;
     }
 
     private estimateSingleTextJsonSize(text: string, isSingle: boolean): number {
@@ -139,24 +176,33 @@ export class CsvAutoTranslator {
         return resultBatches;
     }
 
-    private async translateAll(texts: string[], from: string, to: string): Promise<string[]> {
+    private async translateAll(texts: string[], from: string, to: string): Promise<OnlineTranslateResult> {
         const batches = this.smartBatch(texts);
         const results: string[][] = new Array(batches.length);
         const concurrencyLimit = this.maxBatchSize;
         let index = 0;
-
+        let isOk = true;
         let batchCount = 0;
+        let firstErrorCode = "";
+        let firstErrorMsg = "";
         const processBatch = async (): Promise<void> => {
             while (index < batches.length) {
                 const batchIndex = index++;
                 const batch = batches[batchIndex];
                 batchCount++;
                 console.log(`batchCount++: ${batchCount}`)
-                const batchResults = await this.translateBatch(batch, from, to);
+                const batchResult = await this.translateBatch(batch, from, to);
+                if (!batchResult.isOk) {
+                    isOk = false;
+                    if (firstErrorCode === "") {
+                        firstErrorCode = batchResult.errorCode;
+                        firstErrorMsg = batchResult.errorMsg;
+                    }
+                }
                 await new Promise(resolve => setTimeout(resolve, 1000));
                 batchCount--;
                 console.log(`batchCount--: ${batchCount}`)
-                results[batchIndex] = batchResults;
+                results[batchIndex] = batchResult.translatedTexts;
             }
         };
 
@@ -167,7 +213,9 @@ export class CsvAutoTranslator {
         await Promise.all(workers);
         // await processBatch()
 
-        return results.flat();
+        let translatedTexts = results.flat();
+        let result = new OnlineTranslateResult(firstErrorCode, firstErrorMsg, isOk, translatedTexts);
+        return result;
     }
 
     langMap: Map<string, string> = new Map([
@@ -175,48 +223,30 @@ export class CsvAutoTranslator {
         ["zh_hk", "cht"],
         ["en_us", "en"],
     ])
-    async translateCsvRows(rows: string[][], fromLang: string, toLangs?: string[]): Promise<number> {
+    async translateCsvRows(rows: string[][], fromLang: string, toLangs?: string[]): Promise<TranslateCSVResult> {
         if (rows.length === 0) {
             console.log("CSV文件为空");
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         let header = rows[0];
         let fromLangIndex = header.indexOf(fromLang);
         if (fromLangIndex === -1) {
             console.error(`未找到 ${fromLang} 列`);
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         if (!this.langMap.has(fromLang)) {
             console.error(`未找到 ${fromLang} 的目标语言`);
-            return 0;
+            return TranslateCSVResult.Empty;
         }
         let fromLang2 = this.langMap.get(fromLang);
         if (fromLang2 == null) {
             console.error(`未找到 ${fromLang} 的目标语言`);
-            return 0;
-        }
-        const needTranslateIndices: number[] = [];
-        const needTranslateTexts: string[] = [];
-        for (let i = 1; i < rows.length; i++) {
-            const row = rows[i];
-            if (!row[0] || row[0].trim() === "") {
-                continue;
-            }
-            if (row[fromLangIndex] && row[fromLangIndex].trim() !== "") {
-                continue;
-            }
-            needTranslateIndices.push(i);
-            let text = row[fromLangIndex]
-            if (text == null || text == "") {
-                text = row[0];
-            }
-            needTranslateTexts.push(text);
-        }
-        if (needTranslateTexts.length === 0) {
-            console.log("没有需要翻译的内容");
-            return 0;
+            return TranslateCSVResult.Empty;
         }
-        console.log(`开始翻译 ${needTranslateTexts.length} 条内容...`);
+        let isOk = true;
+        let translateCount = 0;
+        let firstErrorCode = "";
+        let firstErrorMsg = "";
         for (let curLangIndex = 0; curLangIndex < header.length; curLangIndex++) {
             let lang = header[curLangIndex];
             lang = lang.trim().toLowerCase();
@@ -226,36 +256,78 @@ export class CsvAutoTranslator {
             if (toLangs != undefined && !toLangs.includes(lang)) {
                 continue;
             }
-            if (lang != fromLang && this.langMap.has(lang)) {
-                const toLang = this.langMap.get(lang);
-                if (toLang == null) {
-                    console.error(`未找到 ${lang} 的目标语言`);
+            if (!(lang != fromLang && this.langMap.has(lang))) {
+                continue;
+            }
+            const needTranslateIndices: number[] = [];
+            const needTranslateTexts: string[] = [];
+            for (let i = 1; i < rows.length; i++) {
+                const row = rows[i];
+                if (!row[0] || row[0].trim() === "") {
                     continue;
                 }
-                const translations = await this.translateAll(needTranslateTexts, fromLang2, toLang);
-                for (let j = 0; j < needTranslateIndices.length; j++) {
-                    const rowIndex = needTranslateIndices[j];
-                    while (rows[rowIndex].length < header.length) {
-                        rows[rowIndex].push("");
-                    }
-                    rows[rowIndex][curLangIndex] = translations[j];
+                if (row[curLangIndex] && row[curLangIndex].trim() !== "") {
+                    continue;
+                }
+                let text = row[fromLangIndex]
+                if (text == null || text == "") {
+                    text = row[0];
+                }
+                if (text == null || text === "") {
+                    continue;
+                }
+                needTranslateIndices.push(i);
+                needTranslateTexts.push(text);
+            }
+            if (needTranslateTexts.length === 0) {
+                console.log("没有需要翻译的内容");
+                return TranslateCSVResult.Empty;
+            }
+            console.log(`开始翻译 ${needTranslateTexts.length} 条内容...`);
+            const toLang = this.langMap.get(lang);
+            if (toLang == null) {
+                console.error(`未找到 ${lang} 的目标语言`);
+                continue;
+            }
+            const translateResult = await this.translateAll(needTranslateTexts, fromLang2, toLang);
+            isOk = isOk && translateResult.isOk;
+            if (!translateResult.isOk) {
+                if (firstErrorCode === "") {
+                    firstErrorCode = translateResult.errorCode;
+                    firstErrorMsg = translateResult.errorMsg;
+                }
+                console.error(`翻译 ${lang} 失败: ${translateResult.errorCode} ${translateResult.errorMsg}`);
+                continue;
+            }
+            let translations = translateResult.translatedTexts;
+            for (let j = 0; j < needTranslateIndices.length; j++) {
+                const rowIndex = needTranslateIndices[j];
+                while (rows[rowIndex].length < header.length) {
+                    rows[rowIndex].push("");
                 }
+                rows[rowIndex][curLangIndex] = translations[j];
             }
+            translateCount += needTranslateTexts.length;
         }
-        return needTranslateTexts.length;
+        let result = new TranslateCSVResult(translateCount, isOk, firstErrorCode, firstErrorMsg);
+        return result;
     }
-    async translateCsv(filePath: string, outFilePath: string, fromLang: string = "auto", toLangs?: string[]): Promise<void> {
+    async translateCsv(filePath: string, outFilePath: string, fromLang: string = "auto", toLangs?: string[]): Promise<TranslateCSVResult> {
         const csvUtils = new CSVUtils(filePath);
         const rows = await csvUtils.parseCsv();
-        const translatedCount = await this.translateCsvRows(rows, fromLang, toLangs);
-        if (translatedCount > 0) {
+        const translatedResult = await this.translateCsvRows(rows, fromLang, toLangs);
+        if (translatedResult.isOk && translatedResult.translateCount > 0) {
             await CSVUtils.writeCsv(outFilePath, rows);
-            console.log(`翻译完成，已更新 ${translatedCount} 条内容到 ${outFilePath}`);
+            console.log(`翻译完成，已更新 ${translatedResult.translateCount} 条内容到 ${outFilePath}`);
+        } else {
+            console.log(`翻译完成，未更新任何内容到 ${outFilePath}`);
         }
+        return translatedResult;
     }
 
-    public static async translateCsvWithLangs(filePath: string, outFilePath: string, fromLang: string, langs: string[], apiKey: string, appId: string) {
-        const translator = new CsvAutoTranslator(apiKey, appId);
-        await translator.translateCsv(filePath, outFilePath, fromLang, langs);
+    public static async translateCsvWithLangs(appId: string, apiKey: string, filePath: string, outFilePath: string, fromLang: string, langs?: string[]) {
+        const translator = new CsvAutoTranslator(appId, apiKey);
+        let result = await translator.translateCsv(filePath, outFilePath, fromLang, langs);
+        return result;
     }
 }