cc-translate 0.5.1 → 0.5.2

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EACL,uBAAuB,EACvB,KAAK,EACL,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAgBjB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMvE,qBAAa,gBAAgB;IAC3B,uBAAuB;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,MAAM;IACN,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB;IACjB,eAAe,EAAE,mBAAmB,CAAC;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7B,2BAA2B;IAC3B,YAAY,EAAE,aAAa,CAAC;IAC5B,QAAQ,EAAE,MAAM,EAAE,CAAC;gBAEP,MAAM,EAAE,uBAAuB;IAY3C,IAAI,gBAAgB,kCAOnB;IAED,IAAI,UAAU,WAEb;IAED,cAAc,CAAC,IAAI,EAAE,mBAAmB;IAIxC,kBAAkB,aAOhB;IACF;;OAEG;IACH,SAAS,sBA0DP;IACF;;;;OAIG;IACH,eAAe,WAAkB,gBAAgB,mBAoD/C;IAEF;;;;;;;OAOG;IACH,aAAa,WAAY,cAAc,KAAG,OAAO,CAAC,sBAAsB,CAAC,CA2DvE;IACF;;;;;OAKG;IACH,mBAAmB,aACP,mBAAmB,YACnB,MAAM,KACf,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CA6B3B;IAEF;;;OAGG;IACH,kBAAkB,WAAkB,mBAAmB,mBAsCrD;CACH"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EACL,uBAAuB,EACvB,KAAK,EACL,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAgBjB,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMvE,qBAAa,gBAAgB;IAC3B,uBAAuB;IACvB,OAAO,CAAC,UAAU,CAAS;IAC3B,MAAM;IACN,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB;IACjB,eAAe,EAAE,mBAAmB,CAAC;IACrC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,SAAS,EAAE,mBAAmB,EAAE,CAAC;IACjC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAQ;IAC7B,2BAA2B;IAC3B,YAAY,EAAE,aAAa,CAAC;IAC5B,QAAQ,EAAE,MAAM,EAAE,CAAC;gBAEP,MAAM,EAAE,uBAAuB;IAY3C,IAAI,gBAAgB,kCAOnB;IAED,IAAI,UAAU,WAEb;IAED,cAAc,CAAC,IAAI,EAAE,mBAAmB;IAIxC,kBAAkB,aAOhB;IACF;;OAEG;IACH,SAAS,sBAoDP;IACF;;;;OAIG;IACH,eAAe,WAAkB,gBAAgB,mBAoD/C;IAEF;;;;;;;OAOG;IACH,aAAa,WAAY,cAAc,KAAG,OAAO,CAAC,sBAAsB,CAAC,CA2DvE;IACF;;;;;OAKG;IACH,mBAAmB,aACP,mBAAmB,YACnB,MAAM,KACf,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC,CA6B3B;IAEF;;;OAGG;IACH,kBAAkB,WAAkB,mBAAmB,mBAsCrD;CACH"}

package/index.js

@@ -12,7 +12,7 @@ import fs from "fs";
 import colors from "ansi-colors";
 import { OpenAI } from "openai";
 import cliProgress from "cli-progress";
-import { chunkArray, getRandomNumber, notExistsToCreateFile, readFileOfDirSync, readJsonFileSync, } from "./lib/utils.js";
+import { dequeue, getRandomNumber, notExistsToCreateFile, readFileOfDirSync, readJsonFileSync, } from "./lib/utils.js";
 import { getCacheFileSync, registerLanguageCacheFile, translateJSONDiffToJson, } from "./lib/cache/index.js";
 import { logErrorToFile } from "./lib/log/index.js";
 import { SUPPORT_LANGUAGE_MAP } from "./lib/support.js";
@@ -70,10 +70,7 @@ export class CwalletTranslate {
                     }));
                 }
             }
-            promises = chunkArray(arr, 8);
-            for (const chunk of promises) {
-                yield Promise.all(chunk.map((fn) => fn()));
-            }
+            yield dequeue(arr);
             multiBar.stop();
             console.log("🚀 翻译完毕");
         });
@@ -174,7 +171,7 @@ export class CwalletTranslate {
                             value: (_c = (_b = chatCompletion === null || chatCompletion === void 0 ? void 0 : chatCompletion.choices[0]) === null || _b === void 0 ? void 0 : _b.message.content) !== null && _c !== void 0 ? _c : value,
                             index,
                         });
-                    }), getRandomNumber(200, 300));
+                    }), getRandomNumber(120, 130));
                 }
                 catch (error) {
                     logErrorToFile({ error: error, key, fileName, language });

package/lib/cache/index.js

@@ -81,7 +81,7 @@ export const generateCache = (params) => __awaiter(void 0, void 0, void 0, funct
     languages.forEach((language) => {
         // 获取当前语言的文件数据
         const currentFileData = readAllFilesOfFolder(path.join(sourceFolderPath, language));
-        currentFileData.forEach(({ data, fileName, filePath }) => {
+        currentFileData.forEach(({ data, fileName }) => {
             const translated = {};
             // 遍历文件中的已经翻译的内容
             Object.entries(data).forEach(([key, value]) => {

package/lib/utils.d.ts

@@ -23,4 +23,5 @@ export declare const isDirectoryPath: (path: string) => boolean;
 export declare const readFileOfDirSync: (dirPath: string) => string[];
 export declare function chunkArray<T extends object>(array: T[], chunkSize: number): T[][];
 export declare function intersection<T>(arr1: T[], arr2: T[]): T[];
+export declare const dequeue: (queue: (() => Promise<void>)[]) => Promise<void>;
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAAU,MAAM,SAGjD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAgB,MAAM,iBAUlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAS3D,CAAC;AAEF,eAAO,MAAM,eAAe,QAAS,MAAM,OAAO,MAAM,WAEvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,YAG3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAa,MAAM,aAKhD,CAAC;AAEF,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,SASzE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAczD"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/lib/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAGjD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAAU,MAAM,SAGjD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,SAAgB,MAAM,iBAUlD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,WAAY,qBAAqB,SAS3D,CAAC;AAEF,eAAO,MAAM,eAAe,QAAS,MAAM,OAAO,MAAM,WAEvD,CAAC;AAEF,eAAO,MAAM,eAAe,SAAU,MAAM,YAG3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,YAAa,MAAM,aAKhD,CAAC;AAEF,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,SASzE;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAczD;AAED,eAAO,MAAM,OAAO,UAAiB,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,kBAoB3D,CAAC"}

package/lib/utils.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import path from "path";
 import fs from "fs";
+import { logErrorToFile } from "./log/index.js";
 /**
  * 不存在的文件夹则创建
  * @param {string} path
@@ -86,3 +87,25 @@ export function intersection(arr1, arr2) {
     }
     return [...intersectionSet];
 }
+export const dequeue = (queue) => __awaiter(void 0, void 0, void 0, function* () {
+    while (queue.length) {
+        const requestPromiseFactory = queue.shift(); // 出列
+        if (!requestPromiseFactory) {
+            dequeue(queue);
+            return;
+        }
+        try {
+            yield requestPromiseFactory();
+        }
+        catch (err) {
+            logErrorToFile({
+                error: err,
+                language: "ar",
+                fileName: "",
+                key: "",
+            });
+        }
+        finally {
+        }
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-translate",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "A language translation tool based on OpenAI",
   "author": "maybe",
   "packageManager": "yarn@1.22.22",

package/src/index.ts

@@ -14,7 +14,7 @@ import {
   SupportLanguageType,
 } from "./types";
 import {
-  chunkArray,
+  dequeue,
   getRandomNumber,
   notExistsToCreateFile,
   readFileOfDirSync,
@@ -139,13 +139,7 @@ export class CwalletTranslate {
         );
       }
     }
-
-    promises = chunkArray(arr, 8);
-
-    for (const chunk of promises) {
-      await Promise.all(chunk.map((fn) => fn()));
-    }
-
+    await dequeue(arr);
     multiBar.stop();
     console.log("🚀 翻译完毕");
   };
@@ -264,7 +258,7 @@ export class CwalletTranslate {
             value: chatCompletion?.choices[0]?.message.content ?? value,
             index,
           });
-        }, getRandomNumber(200, 300));
+        }, getRandomNumber(120, 130));
       } catch (error) {
         logErrorToFile({ error: error as Error, key, fileName, language });
         resolve({

package/src/lib/utils.ts

@@ -1,6 +1,7 @@
 import path from "path";
 import fs from "fs";
 import { ICreateJsonFileParams } from "../types";
+import { logErrorToFile } from "./log/index.js";
 
 /**
  * 不存在的文件夹则创建
@@ -88,3 +89,25 @@ export function intersection<T>(arr1: T[], arr2: T[]): T[] {
 
   return [...intersectionSet];
 }
+
+export const dequeue = async (queue: (() => Promise<void>)[]) => {
+  while (queue.length) {
+    const requestPromiseFactory = queue.shift(); // 出列
+    if (!requestPromiseFactory) {
+      dequeue(queue);
+      return;
+    }
+
+    try {
+      await requestPromiseFactory();
+    } catch (err) {
+      logErrorToFile({
+        error: err as Error,
+        language: "ar",
+        fileName: "",
+        key: "",
+      });
+    } finally {
+    }
+  }
+};

package/test.mjs

@@ -1,16 +1,17 @@
 import path from "path";
-import { deleteBatchCache, generateCache } from "./index.js";
+import { deleteBatchCache, generateCache, CwalletTranslate } from "./index.js";
 
-// deleteBatchCache({
-//   keys: ["10001", "10002"],
-//   cacheFolderPath: path.resolve("./src/cache"),
-//   cacheFileName: "common.json",
-//   languages: [],
+// // deleteBatchCache({
+// //   keys: ["10001", "10002"],
+// //   cacheFolderPath: path.resolve("./src/cache"),
+// //   cacheFileName: "common.json",
+// //   languages: [],
+// // });
+
+// generateCache({
+//   sourceFolderPath: path.resolve("./src/langs"),
+//   sourceLanguage: "en",
+//   exportFolderPath: path.resolve("./src/cache"),
+//   languages: ["ja", "zh-CN"],
 // });
 
-generateCache({
-  sourceFolderPath: path.resolve("./src/langs"),
-  sourceLanguage: "en",
-  exportFolderPath: path.resolve("./src/cache"),
-  languages: ["ja", "zh-CN"],
-});