@yxw007/translate 0.1.3 → 0.1.5

package/dist/browser/index.cjs

@@ -1,4 +1,4 @@
-// translate v0.1.3 Copyright (c) 2024 Potter<aa4790139@gmail.com> and contributors
+// translate v0.1.5 Copyright (c) 2024 Potter<aa4790139@gmail.com> and contributors
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -40,6 +40,101 @@ const OPEN_AI_MODELS = [
     "gpt-3.5-turbo-instruct-0914",
 ];
 
+class Cache {
+    cache;
+    constructor() {
+        this.cache = new Map();
+    }
+    /**
+     * @param key
+     * @param value
+     * @param time millisecond
+     */
+    set(key, value, time) {
+        if (time <= 0) {
+            throw new Error("time must be greater than 0");
+        }
+        const oldRecord = this.cache.get(key);
+        if (oldRecord) {
+            clearTimeout(oldRecord.timeout);
+        }
+        const record = {
+            value,
+            expire: Date.now() + time,
+        };
+        if (!isNaN(record.expire)) {
+            record.timeout = setTimeout(() => this.del(key), time);
+        }
+        this.cache.set(key, record);
+    }
+    get(key) {
+        return this.cache.get(key);
+    }
+    delete(key) {
+        let canDelete = true;
+        const oldRecord = this.cache.get(key);
+        if (oldRecord) {
+            if (!isNaN(oldRecord.expire) && oldRecord.expire < Date.now()) {
+                canDelete = false;
+            }
+            else {
+                clearTimeout(oldRecord.timeout);
+            }
+        }
+        else {
+            canDelete = false;
+        }
+        if (canDelete) {
+            this.del(key);
+        }
+        return canDelete;
+    }
+    del(key) {
+        this.cache.delete(key);
+    }
+    clear() {
+        for (const [, val] of this.cache.entries()) {
+            clearTimeout(val.timeout);
+        }
+        this.cache.clear();
+    }
+}
+
+function useLogger(name = "") {
+    return {
+        log(...args) {
+            this.info(...args);
+        },
+        info(...args) {
+            console.log(`[translate ${name}]`, ...args);
+        },
+        error(...args) {
+            console.error(`[translate ${name}]`, ...args);
+        },
+        warn(...args) {
+            console.warn(`[translate ${name}]`, ...args);
+        },
+    };
+}
+
+function getGapLine() {
+    return "-".repeat(20);
+}
+function getErrorMessages(e, prefix = "Translate fail ! ") {
+    if (e instanceof TypeError) {
+        return prefix + (e.cause?.message ?? e.message);
+    }
+    return prefix + e.message;
+}
+async function throwResponseError(name, res) {
+    let bodyRes = null;
+    try {
+        bodyRes = await res.json();
+    }
+    catch (e) { }
+    return new TranslationError(name, `Translate fail ! ${res.status}: ${res.statusText} ${bodyRes?.message ?? ""}`);
+}
+
 function google(options) {
     const base = "https://translate.googleapis.com/translate_a/single";
     return {
@@ -52,6 +147,9 @@ function google(options) {
             const textStr = text.join("\n");
             const url = `${base}?client=gtx&sl=${from}&tl=${to}&dt=t&q=${encodeURI(textStr)}`;
             const res = await fetch(url);
+            if (!res.ok) {
+                throw await throwResponseError(this.name, res);
+            }
             const body = await res.json();
             if (!body || body.length === 0) {
                 throw new TranslationError(this.name, "Translate fail ! translate's result is null or empty");
@@ -100,6 +198,9 @@ function azure$1(options) {
                 },
                 body: JSON.stringify(text.map((it) => ({ Text: it }))),
             });
+            if (!res.ok) {
+                throw await throwResponseError(this.name, res);
+            }
             const bodyRes = await res.json();
             if (bodyRes.error) {
                 throw new TranslationError(this.name, `Translate fail ! code: ${bodyRes.error.code}, message: ${bodyRes.error.message}`);
@@ -1313,6 +1414,9 @@ function baidu$1(options) {
                 },
                 body: body.toString(),
             });
+            if (!res.ok) {
+                throw await throwResponseError(this.name, res);
+            }
             const data = await res.json();
             if (!data || data.error_code || !data.trans_result || data.trans_result.length === 0) {
                 throw new TranslationError(this.name, `Translate fail ! error_code:${data.error_code}, error_msg: ${data.error_msg}`);
@@ -1346,26 +1450,25 @@ function deepl$2(options) {
             if (!Array.isArray(text)) {
                 text = [text];
             }
+            const requestBody = JSON.stringify({
+                text,
+                source_lang: from === "auto" ? undefined : from,
+                target_lang: to,
+            });
             const res = await fetch(url, {
                 method: "POST",
                 headers: {
-                    "Content-Type": "application/json; charset=UTF-8",
+                    "Content-Type": "application/json; charset=UTF-8;",
                     Authorization: `DeepL-Auth-Key ${key}`,
-                    Accept: "*/*",
-                    Host: "api-free.deepl.com",
                     Connection: "keep-alive",
                 },
-                body: JSON.stringify({
-                    text: text,
-                    source_lang: from === "auto" ? undefined : from,
-                    target_lang: to,
-                }),
+                body: requestBody,
             });
-            const bodyRes = await res.json();
-            if (bodyRes.error) {
-                throw new TranslationError(this.name, `Translate fail ! code: ${bodyRes.error.code}, message: ${bodyRes.error.message}`);
+            if (!res.ok) {
+                throw await throwResponseError(this.name, res);
             }
-            const body = bodyRes.translations;
+            const bodyRes = await res.json();
+            const body = bodyRes?.translations;
             if (!body || body.length === 0) {
                 throw new TranslationError(this.name, "Translate fail ! translate's result is null or empty");
             }
@@ -1375,93 +1478,6 @@ function deepl$2(options) {
     };
 }
 
-class Cache {
-    cache;
-    constructor() {
-        this.cache = new Map();
-    }
-    /**
-     * @param key
-     * @param value
-     * @param time millisecond
-     */
-    set(key, value, time) {
-        if (time <= 0) {
-            throw new Error("time must be greater than 0");
-        }
-        const oldRecord = this.cache.get(key);
-        if (oldRecord) {
-            clearTimeout(oldRecord.timeout);
-        }
-        const record = {
-            value,
-            expire: Date.now() + time,
-        };
-        if (!isNaN(record.expire)) {
-            record.timeout = setTimeout(() => this.del(key), time);
-        }
-        this.cache.set(key, record);
-    }
-    get(key) {
-        return this.cache.get(key);
-    }
-    delete(key) {
-        let canDelete = true;
-        const oldRecord = this.cache.get(key);
-        if (oldRecord) {
-            if (!isNaN(oldRecord.expire) && oldRecord.expire < Date.now()) {
-                canDelete = false;
-            }
-            else {
-                clearTimeout(oldRecord.timeout);
-            }
-        }
-        else {
-            canDelete = false;
-        }
-        if (canDelete) {
-            this.del(key);
-        }
-        return canDelete;
-    }
-    del(key) {
-        this.cache.delete(key);
-    }
-    clear() {
-        for (const [, val] of this.cache.entries()) {
-            clearTimeout(val.timeout);
-        }
-        this.cache.clear();
-    }
-}
-
-function useLogger(name = "") {
-    return {
-        log(...args) {
-            this.info(...args);
-        },
-        info(...args) {
-            console.log(`[translate ${name}]`, ...args);
-        },
-        error(...args) {
-            console.error(`[translate ${name}]`, ...args);
-        },
-        warn(...args) {
-            console.warn(`[translate ${name}]`, ...args);
-        },
-    };
-}
-
-function getGapLine() {
-    return "-".repeat(20);
-}
-function getErrorMessages(e, prefix = "Translate fail ! ") {
-    if (e instanceof TypeError) {
-        return prefix + (e.cause?.message ?? e.message);
-    }
-    return prefix + e.message;
-}
-
 const logger$1 = useLogger("openai");
 function openai$1(options) {
     const { apiKey, model, maxTokens = 2000, outputLog = false } = options;
@@ -1488,14 +1504,13 @@ function openai$1(options) {
             const prompt = {
                 role: "user",
                 content: `
-          翻译要求：
+          满足以下4点翻译要求：
           1.将每段文本从${from}翻译为${to}
           2.文本内容以换行符\n进行段落分割，并以段落分割顺序进行翻译
-          3.仅翻译分割出的段落，其他任何不相关的内容都移除，比如：段落前后的空格、所有标点符号
+          3.仅翻译分割出的段落，其他任何不相关的内容都移除，比如：段落前后的空格、所有标点符号\n
           4.仅返回要翻译的文本内容，不要返回任何其他内容
-         
-          
-          如何提取翻译文本:
+
+          如何提取翻译文本,满足以下2点要求:
           1.翻译从-$s$-字符标记开始至-$e$-字符标记结束，提取-$s$-至-$e$-之间的内容
           2.-$s$-和-$e$-这2个标记不要返回，只是用来标记翻译的起始和结束位置
 
@@ -1504,9 +1519,6 @@ function openai$1(options) {
           -$e$-
           `,
             };
-            if (outputLog) {
-                logger$1.info("prompt:", prompt);
-            }
             const res = await fetch(url, {
                 method: "POST",
                 headers: {
@@ -1520,6 +1532,9 @@ function openai$1(options) {
                     temperature: 0,
                 }),
             });
+            if (!res.ok) {
+                throw await throwResponseError(this.name, res);
+            }
             const bodyRes = await res.json();
             if (bodyRes.error) {
                 throw new TranslationError(this.name, `Translate fail! message: ${bodyRes.error.message}`);
@@ -1536,7 +1551,8 @@ function openai$1(options) {
                 .filter(Boolean)
                 .filter((it) => !marks.includes(it));
             if (outputLog) {
-                logger$1.info("translations:", translations);
+                logger$1.info("prompt:", JSON.stringify(prompt, null, 2));
+                logger$1.info("translations:", JSON.stringify(translations, null, 2));
             }
             return translations;
         },