Compare commits

..

59 Commits

Author SHA1 Message Date
Gabe Yuan
58e745d967 v1.8.10 2024-05-17 10:38:11 +08:00
Gabe Yuan
377e347d68 feat: support translate hooks 2024-05-15 11:07:13 +08:00
Gabe Yuan
bac0704d3d feat: download and upload settings 2024-05-12 20:24:40 +08:00
Gabe Yuan
d2ff46edf6 fix: show full gemini url 2024-05-12 16:25:20 +08:00
Gabe Yuan
f908372b4e feat: support hook for custom api 2024-05-12 16:10:11 +08:00
Gabe Yuan
5d44ff4913 v1.8.9 2024-04-28 22:23:53 +08:00
Gabe Yuan
4c9aa66048 feat: support ollama api 2024-04-28 21:45:20 +08:00
Gabe Yuan
b6a09b99ab feat: support ollama api 2024-04-28 21:43:20 +08:00
Gabe Yuan
3a0dcb1a52 feat: add more openai translator 2024-04-28 16:58:09 +08:00
Gabe Yuan
5015503b4c feat: hide transbox header when mouseleave 2024-04-28 14:56:49 +08:00
Gabe Yuan
16423feea4 fix: update readme 2024-04-21 22:21:29 +08:00
Gabe Yuan
9703514698 v1.8.8 2024-04-21 19:25:00 +08:00
Gabe Yuan
de7a97fb76 feat: tranbox offset 2024-04-21 19:19:06 +08:00
Gabe Yuan
319aaf8132 fix: move taskpool from background to content 2024-04-21 13:16:44 +08:00
Gabe Yuan
74bc58ba91 feat: transbox follow selection 2024-04-20 18:07:16 +08:00
Gabe Yuan
d622db0d7c fix: i18n menu command for userscript 2024-04-20 15:54:41 +08:00
Gabe Yuan
de1ddf2362 fix: stopPropagation when close tranbox 2024-04-20 15:12:25 +08:00
Gabe Yuan
32c0fc860b fix: update readme 2024-04-20 14:11:32 +08:00
Gabe Yuan
1938f432dd feat: support multi url for DEEPLX 2024-04-20 14:01:34 +08:00
Gabe Yuan
a5cfb0ca1d fix: fetch pool retry 2024-04-20 11:52:16 +08:00
Gabe Yuan
a172234fb0 fix: niutrans i18n text 2024-04-18 12:31:16 +08:00
Gabe Yuan
63f989b31a v1.8.7 2024-04-18 10:07:53 +08:00
Gabe Yuan
2ae5d01d5c fix: custom option 2024-04-18 09:48:07 +08:00
Gabe Yuan
130f1deed1 fix: remove encodeURIComponent 2024-04-18 00:31:36 +08:00
Gabe Yuan
5880d85b48 fix: encodeURIComponent text 2024-04-17 23:44:53 +08:00
Gabe Yuan
9455670e80 feat: custom request 2024-04-17 22:35:12 +08:00
Gabe Yuan
e369321c66 feat: custom request 2024-04-17 17:38:54 +08:00
Gabe Yuan
efc51b0d46 feat: extend styles for transbox 2024-04-17 15:35:44 +08:00
Gabe Yuan
d6f3b23b88 fix: tranbox ui 2024-04-17 10:31:37 +08:00
Gabe Yuan
0a4fa7b9f8 fix: tranbox ui 2024-04-17 10:03:56 +08:00
Gabe Yuan
2b3e4a8d25 fix: reaplce loading button 2024-04-16 16:39:11 +08:00
Gabe Yuan
bf3a16f96d feat: export word & translation 2024-04-16 16:29:59 +08:00
Gabe Yuan
b416e72820 fix: transbox ui 2024-04-16 15:22:27 +08:00
Gabe Yuan
ca84bdb227 feat: tranbox hover trigger 2024-04-16 12:47:55 +08:00
Gabe Yuan
148a4e97a6 fix: tranbox ui 2024-04-16 11:25:04 +08:00
Gabe Yuan
a13493ebc2 feat: simple style tranbox 2024-04-16 00:54:37 +08:00
Gabe Yuan
ce4ac79e5f fix: optimization tranbox 2024-04-15 18:04:35 +08:00
Gabe Yuan
8f76ea49e7 fix: loading icon 2024-04-13 21:23:58 +08:00
Gabe Yuan
923d3293cd fix: limit selection btn in window & click to hide 2024-04-12 22:28:40 +08:00
Gabe Yuan
7379ff8d15 v1.8.6 2024-04-12 14:39:17 +08:00
Gabe Yuan
18ebec350d fix: clean env 2024-04-12 14:33:29 +08:00
Gabe Yuan
3b0cbc53aa fix: response err data: url 2024-04-12 11:47:22 +08:00
Gabe Yuan
f00e8ffa4d feat: add niutrans api 2024-04-12 11:31:01 +08:00
Gabe Yuan
d6f7aad1c3 fix: utils func 2024-04-11 10:44:25 +08:00
Gabe Yuan
092ea6e836 fix: custom api 2024-04-10 13:37:16 +08:00
Gabe Yuan
d565e2464a feat: tranbox: mobile support 2024-04-07 16:55:54 +08:00
Gabe Yuan
2f5d875c47 v1.8.5 2024-04-02 17:01:34 +08:00
Gabe Yuan
fdb2ddc5f7 fix: rules 2024-04-01 12:35:54 +08:00
Gabe Yuan
7a12c5315a feat: close tranbox when click away 2024-04-01 12:25:59 +08:00
Gabe Yuan
60d788288d feat: add more custom apis 2024-04-01 11:50:29 +08:00
Gabe Yuan
dc3c510d57 fix: update observer callback 2024-03-27 14:24:41 +08:00
Gabe Yuan
ec6a49f01e fix: update readme 2024-03-26 17:50:56 +08:00
Gabe Yuan
2b9bfbc20d feat: csp list 2024-03-26 12:42:39 +08:00
Gabe Yuan
06a51df834 feat: csp list 2024-03-26 12:05:35 +08:00
Gabe Yuan
6fa183dc56 feat: csp list 2024-03-26 12:00:09 +08:00
Gabe Yuan
b3cb4049ed fix: tranbox input onfocus 2024-03-25 22:46:02 +08:00
Gabe Yuan
602b51b1f5 fix: dict audio 2024-03-25 21:00:39 +08:00
Gabe Yuan
a83039577c feat: word pronunciation supported 2024-03-25 18:14:12 +08:00
Gabe Yuan
1c77a289a6 fix: upgrade dependencies 2024-03-21 23:19:15 +08:00
48 changed files with 2343 additions and 1270 deletions

10
.env
View File

@@ -2,26 +2,18 @@ GENERATE_SOURCEMAP=false
REACT_APP_NAME=KISS Translator REACT_APP_NAME=KISS Translator
REACT_APP_NAME_CN=简约翻译 REACT_APP_NAME_CN=简约翻译
REACT_APP_VERSION=1.8.4 REACT_APP_VERSION=1.8.10
REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator
REACT_APP_OPTIONSPAGE=https://fishjar.github.io/kiss-translator/options.html REACT_APP_OPTIONSPAGE=https://fishjar.github.io/kiss-translator/options.html
REACT_APP_OPTIONSPAGE2=https://kiss-translator.rayjar.com/options
REACT_APP_OPTIONSPAGE_DEV=http://localhost:3000/options.html REACT_APP_OPTIONSPAGE_DEV=http://localhost:3000/options.html
REACT_APP_LOGOURL=https://fishjar.github.io/kiss-translator/images/logo192.png REACT_APP_LOGOURL=https://fishjar.github.io/kiss-translator/images/logo192.png
REACT_APP_LOGOURL2=https://kiss-translator.rayjar.com/images/logo192.png
REACT_APP_RULESURL=https://fishjar.github.io/kiss-rules/kiss-rules.json REACT_APP_RULESURL=https://fishjar.github.io/kiss-rules/kiss-rules.json
REACT_APP_RULESURL_ON=https://fishjar.github.io/kiss-rules/kiss-rules-on.json REACT_APP_RULESURL_ON=https://fishjar.github.io/kiss-rules/kiss-rules-on.json
REACT_APP_RULESURL_OFF=https://fishjar.github.io/kiss-rules/kiss-rules-off.json REACT_APP_RULESURL_OFF=https://fishjar.github.io/kiss-rules/kiss-rules-off.json
REACT_APP_VERSIONFILE=https://fishjar.github.io/kiss-translator/version.txt
REACT_APP_VERSIONFILE2=https://kiss-translator.rayjar.com/version.txt
REACT_APP_USERSCRIPT_DOWNLOADURL=https://fishjar.github.io/kiss-translator/kiss-translator.user.js REACT_APP_USERSCRIPT_DOWNLOADURL=https://fishjar.github.io/kiss-translator/kiss-translator.user.js
REACT_APP_USERSCRIPT_DOWNLOADURL2=https://kiss-translator.rayjar.com/kiss-translator.user.js
REACT_APP_USERSCRIPT_IOS_DOWNLOADURL=https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js REACT_APP_USERSCRIPT_IOS_DOWNLOADURL=https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js
REACT_APP_USERSCRIPT_IOS_DOWNLOADURL2=https://kiss-translator.rayjar.com/kiss-translator-ios-safari.user.js

View File

@@ -1,5 +1,7 @@
# KISS Translator # KISS Translator
English | [简体中文](README.md)
A simple, open source [bilingual translation extension & Greasemonkey script](https://github.com/fishjar/kiss-translator). A simple, open source [bilingual translation extension & Greasemonkey script](https://github.com/fishjar/kiss-translator).
[kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f) [kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f)
@@ -9,10 +11,10 @@ A simple, open source [bilingual translation extension & Greasemonkey script](ht
- [x] Keep it simple, smart - [x] Keep it simple, smart
- [x] Open source - [x] Open source
- [x] Adapt to common browsers - [x] Adapt to common browsers
- [x] Chrome/Edge/Firefox/Kiwi - [x] Chrome/Edge/Firefox/Kiwi/Orion
- [ ] Safari - [ ] Safari
- [x] Supports multiple translation services - [x] Supports multiple translation services
- [x] Google/Microsoft/DeepL/OpenAI/Gemini/CloudflareAI/Baidu/Tencent - [x] Google/Microsoft/DeepL/NiuTrans/OpenAI/Gemini/CloudflareAI/Baidu/Tencent
- [x] Custom translation interface - [x] Custom translation interface
- [x] Covers common translation scenarios - [x] Covers common translation scenarios
- [x] Web bilingual translation - [x] Web bilingual translation
@@ -44,13 +46,15 @@ A simple, open source [bilingual translation extension & Greasemonkey script](ht
> - Grease Monkey script will encounter more usage problems (cross domain issues, script conflicts, etc.) > - Grease Monkey script will encounter more usage problems (cross domain issues, script conflicts, etc.)
- [x] Browser extension - [x] Browser extension
- [x] Chrome/Kiwi [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN) - [x] Chrome [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
- [x] Kiwi (Android)
- [x] Orion (iOS)
- [x] Edge [Installation address](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN) - [x] Edge [Installation address](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN)
- [x] Firefox [Installation address](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/) - [x] Firefox [Installation address](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
- [ ] Safari - [ ] Safari
- [x] GreaseMonkey Script - [x] GreaseMonkey Script
- [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator.user.js) - [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)
- Greasy Fork [Installation address](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator) - [Greasy Fork](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator)
- [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js) - [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [Installation link](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)
## Associated Projects ## Associated Projects

View File

@@ -1,5 +1,7 @@
# 简约翻译 # 简约翻译
[English](README.en.md) | 简体中文
一个简约、开源的 [双语对照翻译扩展 & 油猴脚本](https://github.com/fishjar/kiss-translator)。 一个简约、开源的 [双语对照翻译扩展 & 油猴脚本](https://github.com/fishjar/kiss-translator)。
[kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f) [kiss-translator.webm](https://github.com/fishjar/kiss-translator/assets/1157624/f7ba8a5c-e4a8-4d5a-823a-5c5c67a0a47f)
@@ -9,10 +11,10 @@
- [x] 保持简约 - [x] 保持简约
- [x] 开放源代码 - [x] 开放源代码
- [x] 适配常见浏览器 - [x] 适配常见浏览器
- [x] Chrome/Edge/Firefox/Kiwi - [x] Chrome/Edge/Firefox/Kiwi/Orion
- [ ] Safari - [ ] Safari
- [x] 支持多种翻译服务 - [x] 支持多种翻译服务
- [x] Google/Microsoft/DeepL/OpenAI/Gemini/CloudflareAI/Baidu/Tencent - [x] Google/Microsoft/DeepL/NiuTrans/OpenAI/Gemini/CloudflareAI/Baidu/Tencent
- [x] 自定义翻译接口 - [x] 自定义翻译接口
- [x] 覆盖常见翻译场景 - [x] 覆盖常见翻译场景
- [x] 网页双语对照翻译 - [x] 网页双语对照翻译
@@ -44,13 +46,15 @@
> - 油猴脚本会遇到更多使用上的问题(跨域问题、脚本冲突等) > - 油猴脚本会遇到更多使用上的问题(跨域问题、脚本冲突等)
- [x] 浏览器扩展 - [x] 浏览器扩展
- [x] Chrome/Kiwi [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN) - [x] Chrome [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
- [x] Kiwi (Android)
- [x] Orion (iOS)
- [x] Edge [安装地址](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN) - [x] Edge [安装地址](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN)
- [x] Firefox [安装地址](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/) - [x] Firefox [安装地址](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
- [ ] Safari - [ ] Safari
- [x] 油猴脚本 - [x] 油猴脚本
- [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator.user.js) - [x] Chrome/Edge/Firefox ([Tampermonkey](https://www.tampermonkey.net/)/[Violentmonkey](https://violentmonkey.github.io/)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator.user.js)
- Greasy Fork [安装地址](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator) - [Greasy Fork](https://greasyfork.org/zh-CN/scripts/472840-kiss-translator)
- [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js) - [x] iOS Safari ([Userscripts Safari](https://github.com/quoid/userscripts)) [安装链接](https://fishjar.github.io/kiss-translator/kiss-translator-ios-safari.user.js)
## 关联项目 ## 关联项目

View File

@@ -112,6 +112,8 @@ const userscriptWebpack = (config, env) => {
// @connect 127.0.0.1:3000 // @connect 127.0.0.1:3000
// @connect localhost:1188 // @connect localhost:1188
// @connect 127.0.0.1:1188 // @connect 127.0.0.1:1188
// @connect localhost:11434
// @connect 127.0.0.1:11434
// @run-at document-end // @run-at document-end
// ==/UserScript== // ==/UserScript==

View File

@@ -1,21 +1,23 @@
{ {
"name": "kiss-translator", "name": "kiss-translator",
"description": "A minimalist bilingual translation Extension & Greasemonkey Script", "description": "A minimalist bilingual translation Extension & Greasemonkey Script",
"version": "1.8.4", "version": "1.8.10",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"private": true, "private": true,
"dependencies": { "dependencies": {
"@emotion/cache": "^11.11.0", "@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.10.8", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.11.11", "@mui/icons-material": "^5.15.15",
"@mui/material": "^5.11.12", "@mui/lab": "5.0.0-alpha.170",
"@mui/material": "^5.15.15",
"query-string": "^8.1.0", "query-string": "^8.1.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-markdown": "^8.0.7", "react-markdown": "^8.0.7",
"react-router-dom": "^6.10.0", "react-router-dom": "^6.16.0",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"sval": "^0.5.2",
"webdav": "^5.3.0", "webdav": "^5.3.0",
"webextension-polyfill": "^0.10.0" "webextension-polyfill": "^0.10.0"
}, },
@@ -30,7 +32,7 @@
"build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/*.user.js build/userscript/", "build:userscript": "rm -rf build/userscript && mkdir build/userscript && cp build/web/*.user.js build/userscript/",
"build:rules": "babel-node src/rules.js", "build:rules": "babel-node src/rules.js",
"build": "pnpm build:chrome && pnpm build:edge && pnpm build:firefox && pnpm build:web && pnpm build:userscript-ios && pnpm build:userscript && pnpm build:rules", "build": "pnpm build:chrome && pnpm build:edge && pnpm build:firefox && pnpm build:web && pnpm build:userscript-ios && pnpm build:userscript && pnpm build:rules",
"pack": "cd build && zip -r chrome.zip chrome && zip -r edge.zip edge && cd firefox && zip -r ../firefox.zip .", "zip": "cd build && zip -r chrome.zip chrome && zip -r edge.zip edge && cd firefox && zip -r ../firefox.zip .",
"test": "react-app-rewired test", "test": "react-app-rewired test",
"eject": "react-scripts eject" "eject": "react-scripts eject"
}, },
@@ -58,10 +60,10 @@
] ]
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.22.10", "@babel/core": "^7.22.20",
"@babel/node": "^7.22.10", "@babel/node": "^7.22.19",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11", "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/preset-env": "^7.22.10", "@babel/preset-env": "^7.22.20",
"react-app-rewired": "^2.2.1" "react-app-rewired": "^2.2.1"
} }
} }

684
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
"manifest_version": 2, "manifest_version": 2,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.8.4", "version": "1.8.10",
"default_locale": "en", "default_locale": "en",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -44,7 +44,13 @@
"description": "__MSG_open_options__" "description": "__MSG_open_options__"
} }
}, },
"permissions": ["<all_urls>", "storage", "contextMenus", "scripting"], "permissions": [
"<all_urls>",
"storage",
"contextMenus",
"scripting",
"declarativeNetRequest"
],
"icons": { "icons": {
"16": "images/logo16.png", "16": "images/logo16.png",
"32": "images/logo32.png", "32": "images/logo32.png",

View File

@@ -2,7 +2,7 @@
"manifest_version": 3, "manifest_version": 3,
"name": "__MSG_app_name__", "name": "__MSG_app_name__",
"description": "__MSG_app_description__", "description": "__MSG_app_description__",
"version": "1.8.4", "version": "1.8.10",
"default_locale": "en", "default_locale": "en",
"author": "Gabe<yugang2002@gmail.com>", "author": "Gabe<yugang2002@gmail.com>",
"homepage_url": "https://github.com/fishjar/kiss-translator", "homepage_url": "https://github.com/fishjar/kiss-translator",
@@ -45,7 +45,12 @@
"description": "__MSG_open_options__" "description": "__MSG_open_options__"
} }
}, },
"permissions": ["storage", "contextMenus", "scripting"], "permissions": [
"storage",
"contextMenus",
"scripting",
"declarativeNetRequest"
],
"host_permissions": ["<all_urls>"], "host_permissions": ["<all_urls>"],
"icons": { "icons": {
"16": "images/logo16.png", "16": "images/logo16.png",

View File

@@ -1,242 +1,5 @@
import queryString from "query-string"; import queryString from "query-string";
import { getBdauth, setBdauth } from "../libs/storage"; import { URL_BAIDU_TRANSAPI, DEFAULT_USER_AGENT } from "../config";
import {
URL_BAIDU_WEB,
URL_BAIDU_TRANSAPI_V2,
URL_BAIDU_TRANSAPI,
} from "../config";
import { fetchApi } from "../libs/fetch";
/* eslint-disable */
function n(t, e) {
for (var n = 0; n < e.length - 2; n += 3) {
var r = e.charAt(n + 2);
(r = "a" <= r ? r.charCodeAt(0) - 87 : Number(r)),
(r = "+" === e.charAt(n + 1) ? t >>> r : t << r),
(t = "+" === e.charAt(n) ? (t + r) & 4294967295 : t ^ r);
}
return t;
}
function e(t, e) {
(null == e || e > t.length) && (e = t.length);
for (var n = 0, r = new Array(e); n < e; n++) r[n] = t[n];
return r;
}
/* eslint-disable */
function getSign(t, gtk, r = null) {
var o,
i = t.match(/[\uD800-\uDBFF][\uDC00-\uDFFF]/g);
if (null === i) {
var a = t.length;
a > 30 &&
(t = ""
.concat(t.substr(0, 10))
.concat(t.substr(Math.floor(a / 2) - 5, 10))
.concat(t.substr(-10, 10)));
} else {
for (
var s = t.split(/[\uD800-\uDBFF][\uDC00-\uDFFF]/),
c = 0,
u = s.length,
l = [];
c < u;
c++
)
"" !== s[c] &&
l.push.apply(
l,
(function (t) {
if (Array.isArray(t)) return e(t);
})((o = s[c].split(""))) ||
(function (t) {
if (
("undefined" != typeof Symbol && null != t[Symbol.iterator]) ||
null != t["@@iterator"]
)
return Array.from(t);
})(o) ||
(function (t, n) {
if (t) {
if ("string" == typeof t) return e(t, n);
var r = Object.prototype.toString.call(t).slice(8, -1);
return (
"Object" === r && t.constructor && (r = t.constructor.name),
"Map" === r || "Set" === r
? Array.from(t)
: "Arguments" === r ||
/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)
? e(t, n)
: void 0
);
}
})(o) ||
(function () {
throw new TypeError(
"Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."
);
})()
),
c !== u - 1 && l.push(i[c]);
var p = l.length;
p > 30 &&
(t =
l.slice(0, 10).join("") +
l.slice(Math.floor(p / 2) - 5, Math.floor(p / 2) + 5).join("") +
l.slice(-10).join(""));
}
for (
var d = ""
.concat(String.fromCharCode(103))
.concat(String.fromCharCode(116))
.concat(String.fromCharCode(107)),
h = (null !== r ? r : (r = gtk || "") || "").split("."),
f = Number(h[0]) || 0,
m = Number(h[1]) || 0,
g = [],
y = 0,
v = 0;
v < t.length;
v++
) {
var _ = t.charCodeAt(v);
_ < 128
? (g[y++] = _)
: (_ < 2048
? (g[y++] = (_ >> 6) | 192)
: (55296 == (64512 & _) &&
v + 1 < t.length &&
56320 == (64512 & t.charCodeAt(v + 1))
? ((_ = 65536 + ((1023 & _) << 10) + (1023 & t.charCodeAt(++v))),
(g[y++] = (_ >> 18) | 240),
(g[y++] = ((_ >> 12) & 63) | 128))
: (g[y++] = (_ >> 12) | 224),
(g[y++] = ((_ >> 6) & 63) | 128)),
(g[y++] = (63 & _) | 128));
}
for (
var b = f,
w =
""
.concat(String.fromCharCode(43))
.concat(String.fromCharCode(45))
.concat(String.fromCharCode(97)) +
""
.concat(String.fromCharCode(94))
.concat(String.fromCharCode(43))
.concat(String.fromCharCode(54)),
k =
""
.concat(String.fromCharCode(43))
.concat(String.fromCharCode(45))
.concat(String.fromCharCode(51)) +
""
.concat(String.fromCharCode(94))
.concat(String.fromCharCode(43))
.concat(String.fromCharCode(98)) +
""
.concat(String.fromCharCode(43))
.concat(String.fromCharCode(45))
.concat(String.fromCharCode(102)),
x = 0;
x < g.length;
x++
)
b = n((b += g[x]), w);
return (
(b = n(b, k)),
(b ^= m) < 0 && (b = 2147483648 + (2147483647 & b)),
"".concat((b %= 1e6).toString(), ".").concat(b ^ f)
);
}
const getToken = async () => {
const res = await fetchApi({
input: URL_BAIDU_WEB,
init: {
headers: {
"Content-type": "text/html; charset=utf-8",
},
},
});
if (!res.ok) {
throw new Error(res.statusText);
}
const text = await res.text();
const token = text.match(/token: '(.*)',/)[1];
const gtk = text.match(/gtk = "(.*)";/)[1];
const exp = Date.now() + 8 * 60 * 60 * 1000;
if (!token || !gtk) {
throw new Error("[baidu] get token error");
}
return { token, gtk, exp };
};
/**
* 闭包缓存token减少对storage查询
* @returns
*/
const _bdAuth = () => {
let store;
return async () => {
const now = Date.now();
// 查询内存缓存
if (store && store.exp > now) {
return store;
}
// 查询storage缓存
store = await getBdauth();
if (store && store.exp > now) {
return store;
}
// 缓存没有或失效,查询接口
store = await getToken();
await setBdauth(store);
return store;
};
};
const bdAuth = _bdAuth();
/**
* 失效作废
* @param {*} param0
* @returns
*/
export const genBaiduV2 = async ({ text, from, to }) => {
const { token, gtk } = await bdAuth();
const sign = getSign(text, gtk);
const data = {
from,
to,
query: text,
simple_means_flag: 3,
sign,
token,
domain: "common",
ts: Date.now(),
};
const input = `${URL_BAIDU_TRANSAPI_V2}?from=${from}&to=${to}`;
const init = {
headers: {
"content-type": "application/x-www-form-urlencoded; charset=UTF-8",
},
method: "POST",
body: queryString.stringify(data),
};
return [input, init];
};
export const genBaidu = async ({ text, from, to }) => { export const genBaidu = async ({ text, from, to }) => {
const data = { const data = {
@@ -248,7 +11,9 @@ export const genBaidu = async ({ text, from, to }) => {
const init = { const init = {
headers: { headers: {
// Origin: "https://fanyi.baidu.com",
"content-type": "application/x-www-form-urlencoded; charset=UTF-8", "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
"User-Agent": DEFAULT_USER_AGENT,
}, },
method: "POST", method: "POST",
body: queryString.stringify(data), body: queryString.stringify(data),

View File

@@ -1,27 +1,39 @@
import queryString from "query-string"; import queryString from "query-string";
import { fetchPolyfill } from "../libs/fetch"; import { fetchData } from "../libs/fetch";
import { import {
OPT_TRANS_GOOGLE, OPT_TRANS_GOOGLE,
OPT_TRANS_MICROSOFT, OPT_TRANS_MICROSOFT,
OPT_TRANS_DEEPL, OPT_TRANS_DEEPL,
OPT_TRANS_DEEPLFREE, OPT_TRANS_DEEPLFREE,
OPT_TRANS_DEEPLX, OPT_TRANS_DEEPLX,
OPT_TRANS_NIUTRANS,
OPT_TRANS_BAIDU, OPT_TRANS_BAIDU,
OPT_TRANS_TENCENT, OPT_TRANS_TENCENT,
OPT_TRANS_OPENAI, OPT_TRANS_OPENAI,
OPT_TRANS_OPENAI_2,
OPT_TRANS_OPENAI_3,
OPT_TRANS_GEMINI, OPT_TRANS_GEMINI,
OPT_TRANS_CLOUDFLAREAI, OPT_TRANS_CLOUDFLAREAI,
OPT_TRANS_OLLAMA,
OPT_TRANS_OLLAMA_2,
OPT_TRANS_OLLAMA_3,
OPT_TRANS_CUSTOMIZE, OPT_TRANS_CUSTOMIZE,
OPT_TRANS_CUSTOMIZE_2,
OPT_TRANS_CUSTOMIZE_3,
OPT_TRANS_CUSTOMIZE_4,
OPT_TRANS_CUSTOMIZE_5,
URL_CACHE_TRAN, URL_CACHE_TRAN,
KV_SALT_SYNC, KV_SALT_SYNC,
URL_BAIDU_LANGDETECT, URL_BAIDU_LANGDETECT,
URL_BAIDU_SUGGEST, URL_BAIDU_SUGGEST,
URL_BAIDU_TTS,
OPT_LANGS_BAIDU, OPT_LANGS_BAIDU,
URL_TENCENT_TRANSMART, URL_TENCENT_TRANSMART,
OPT_LANGS_TENCENT, OPT_LANGS_TENCENT,
OPT_LANGS_SPECIAL, OPT_LANGS_SPECIAL,
} from "../config"; } from "../config";
import { sha256 } from "../libs/utils"; import { sha256 } from "../libs/utils";
import interpreter from "../libs/interpreter";
/** /**
* 同步数据 * 同步数据
@@ -31,7 +43,7 @@ import { sha256 } from "../libs/utils";
* @returns * @returns
*/ */
export const apiSyncData = async (url, key, data) => export const apiSyncData = async (url, key, data) =>
fetchPolyfill(url, { fetchData(url, {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
Authorization: `Bearer ${await sha256(key, KV_SALT_SYNC)}`, Authorization: `Bearer ${await sha256(key, KV_SALT_SYNC)}`,
@@ -45,7 +57,7 @@ export const apiSyncData = async (url, key, data) =>
* @param {*} url * @param {*} url
* @returns * @returns
*/ */
export const apiFetch = (url) => fetchPolyfill(url); export const apiFetch = (url) => fetchData(url);
/** /**
* 百度语言识别 * 百度语言识别
@@ -53,7 +65,7 @@ export const apiFetch = (url) => fetchPolyfill(url);
* @returns * @returns
*/ */
export const apiBaiduLangdetect = async (text) => { export const apiBaiduLangdetect = async (text) => {
const res = await fetchPolyfill(URL_BAIDU_LANGDETECT, { const res = await fetchData(URL_BAIDU_LANGDETECT, {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
}, },
@@ -77,7 +89,7 @@ export const apiBaiduLangdetect = async (text) => {
* @returns * @returns
*/ */
export const apiBaiduSuggest = async (text) => { export const apiBaiduSuggest = async (text) => {
const res = await fetchPolyfill(URL_BAIDU_SUGGEST, { const res = await fetchData(URL_BAIDU_SUGGEST, {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
}, },
@@ -95,6 +107,20 @@ export const apiBaiduSuggest = async (text) => {
return []; return [];
}; };
/**
* 百度语音
* @param {*} text
* @param {*} lan
* @param {*} spd
* @returns
*/
export const apiBaiduTTS = (text, lan = "uk", spd = 3) => {
const url = `${URL_BAIDU_TTS}?${queryString.stringify({ lan, text, spd })}`;
return fetchData(url, {
useCache: false, // 为避免缓存过快增长,禁用缓存语音数据
});
};
/** /**
* 腾讯语言识别 * 腾讯语言识别
* @param {*} text * @param {*} text
@@ -108,7 +134,7 @@ export const apiTencentLangdetect = async (text) => {
text, text,
}); });
const res = await fetchPolyfill(URL_TENCENT_TRANSMART, { const res = await fetchData(URL_TENCENT_TRANSMART, {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
}, },
@@ -167,7 +193,7 @@ export const apiTranslate = async ({
to, to,
}; };
const res = await fetchPolyfill( const res = await fetchData(
`${URL_CACHE_TRAN}?${queryString.stringify(cacheOpts)}`, `${URL_CACHE_TRAN}?${queryString.stringify(cacheOpts)}`,
{ {
useCache, useCache,
@@ -200,6 +226,14 @@ export const apiTranslate = async ({
trText = res.data; trText = res.data;
isSame = to === res.source_lang; isSame = to === res.source_lang;
break; break;
case OPT_TRANS_NIUTRANS:
const json = JSON.parse(res);
if (json.error_msg) {
throw new Error(json.error_msg);
}
trText = json.tgt_text;
isSame = to === json.from;
break;
case OPT_TRANS_BAIDU: case OPT_TRANS_BAIDU:
// trText = res.trans_result?.data.map((item) => item.dst).join(" "); // trText = res.trans_result?.data.map((item) => item.dst).join(" ");
// isSame = res.trans_result?.to === res.trans_result?.from; // isSame = res.trans_result?.to === res.trans_result?.from;
@@ -216,6 +250,8 @@ export const apiTranslate = async ({
isSame = text === trText; isSame = text === trText;
break; break;
case OPT_TRANS_OPENAI: case OPT_TRANS_OPENAI:
case OPT_TRANS_OPENAI_2:
case OPT_TRANS_OPENAI_3:
trText = res?.choices?.map((item) => item.message.content).join(" "); trText = res?.choices?.map((item) => item.message.content).join(" ");
isSame = text === trText; isSame = text === trText;
break; break;
@@ -229,9 +265,25 @@ export const apiTranslate = async ({
trText = res?.result?.translated_text; trText = res?.result?.translated_text;
isSame = text === trText; isSame = text === trText;
break; break;
case OPT_TRANS_OLLAMA:
case OPT_TRANS_OLLAMA_2:
case OPT_TRANS_OLLAMA_3:
trText = res?.response;
isSame = text === trText;
break;
case OPT_TRANS_CUSTOMIZE: case OPT_TRANS_CUSTOMIZE:
trText = res.text; case OPT_TRANS_CUSTOMIZE_2:
isSame = to === res.from; case OPT_TRANS_CUSTOMIZE_3:
case OPT_TRANS_CUSTOMIZE_4:
case OPT_TRANS_CUSTOMIZE_5:
const { resHook } = apiSetting;
if (resHook?.trim()) {
interpreter.run(`exports.resHook = ${resHook}`);
[trText, isSame] = interpreter.exports.resHook(res, text, from, to);
} else {
trText = res.text;
isSame = to === res.from;
}
break; break;
default: default:
} }

View File

@@ -5,26 +5,41 @@ import {
OPT_TRANS_DEEPL, OPT_TRANS_DEEPL,
OPT_TRANS_DEEPLFREE, OPT_TRANS_DEEPLFREE,
OPT_TRANS_DEEPLX, OPT_TRANS_DEEPLX,
OPT_TRANS_NIUTRANS,
OPT_TRANS_BAIDU, OPT_TRANS_BAIDU,
OPT_TRANS_TENCENT, OPT_TRANS_TENCENT,
OPT_TRANS_OPENAI, OPT_TRANS_OPENAI,
OPT_TRANS_OPENAI_2,
OPT_TRANS_OPENAI_3,
OPT_TRANS_GEMINI, OPT_TRANS_GEMINI,
OPT_TRANS_CLOUDFLAREAI, OPT_TRANS_CLOUDFLAREAI,
OPT_TRANS_OLLAMA,
OPT_TRANS_OLLAMA_2,
OPT_TRANS_OLLAMA_3,
OPT_TRANS_CUSTOMIZE, OPT_TRANS_CUSTOMIZE,
OPT_TRANS_CUSTOMIZE_2,
OPT_TRANS_CUSTOMIZE_3,
OPT_TRANS_CUSTOMIZE_4,
OPT_TRANS_CUSTOMIZE_5,
URL_MICROSOFT_TRAN, URL_MICROSOFT_TRAN,
URL_TENCENT_TRANSMART, URL_TENCENT_TRANSMART,
PROMPT_PLACE_FROM, INPUT_PLACE_URL,
PROMPT_PLACE_TO, INPUT_PLACE_FROM,
PROMPT_PLACE_TEXT, INPUT_PLACE_TO,
INPUT_PLACE_TEXT,
INPUT_PLACE_KEY,
INPUT_PLACE_MODEL,
} from "../config"; } from "../config";
import { msAuth } from "./auth"; import { msAuth } from "../libs/auth";
import { genDeeplFree } from "../apis/deepl"; import { genDeeplFree } from "./deepl";
import { genBaidu } from "../apis/baidu"; import { genBaidu } from "./baidu";
import interpreter from "../libs/interpreter";
const keyMap = new Map(); const keyMap = new Map();
const urlMap = new Map();
// 轮询key // 轮询key/url
const keyPick = (translator, key = "") => { const keyPick = (translator, key = "", cacheMap) => {
const keys = key const keys = key
.split(/\n|,/) .split(/\n|,/)
.map((item) => item.trim()) .map((item) => item.trim())
@@ -34,30 +49,13 @@ const keyPick = (translator, key = "") => {
return ""; return "";
} }
const preIndex = keyMap.get(translator) ?? -1; const preIndex = cacheMap.get(translator) ?? -1;
const curIndex = (preIndex + 1) % keys.length; const curIndex = (preIndex + 1) % keys.length;
keyMap.set(translator, curIndex); cacheMap.set(translator, curIndex);
return keys[curIndex]; return keys[curIndex];
}; };
/**
* 构造缓存 request
* @param {*} request
* @returns
*/
export const newCacheReq = async (input, init) => {
let request = new Request(input, init);
if (request.method !== "GET") {
const body = await request.text();
const cacheUrl = new URL(request.url);
cacheUrl.pathname += body;
request = new Request(cacheUrl.toString(), { method: "GET" });
}
return request;
};
const genGoogle = ({ text, from, to, url, key }) => { const genGoogle = ({ text, from, to, url, key }) => {
const params = { const params = {
client: "gtx", client: "gtx",
@@ -141,6 +139,27 @@ const genDeeplX = ({ text, from, to, url, key }) => {
return [url, init]; return [url, init];
}; };
const genNiuTrans = ({ text, from, to, url, key, dictNo, memoryNo }) => {
const data = {
from,
to,
apikey: key,
src_text: text,
dictNo,
memoryNo,
};
const init = {
headers: {
"Content-type": "application/json",
},
method: "POST",
body: JSON.stringify(data),
};
return [url, init];
};
const genTencent = ({ text, from, to }) => { const genTencent = ({ text, from, to }) => {
const data = { const data = {
header: { header: {
@@ -168,8 +187,8 @@ const genTencent = ({ text, from, to }) => {
const genOpenAI = ({ text, from, to, url, key, prompt, model }) => { const genOpenAI = ({ text, from, to, url, key, prompt, model }) => {
prompt = prompt prompt = prompt
.replaceAll(PROMPT_PLACE_FROM, from) .replaceAll(INPUT_PLACE_FROM, from)
.replaceAll(PROMPT_PLACE_TO, to); .replaceAll(INPUT_PLACE_TO, to);
const data = { const data = {
model, model,
@@ -201,10 +220,13 @@ const genOpenAI = ({ text, from, to, url, key, prompt, model }) => {
}; };
const genGemini = ({ text, from, to, url, key, prompt, model }) => { const genGemini = ({ text, from, to, url, key, prompt, model }) => {
url = url
.replaceAll(INPUT_PLACE_MODEL, model)
.replaceAll(INPUT_PLACE_KEY, key);
prompt = prompt prompt = prompt
.replaceAll(PROMPT_PLACE_FROM, from) .replaceAll(INPUT_PLACE_FROM, from)
.replaceAll(PROMPT_PLACE_TO, to) .replaceAll(INPUT_PLACE_TO, to)
.replaceAll(PROMPT_PLACE_TEXT, text); .replaceAll(INPUT_PLACE_TEXT, text);
const data = { const data = {
contents: [ contents: [
@@ -219,7 +241,6 @@ const genGemini = ({ text, from, to, url, key, prompt, model }) => {
], ],
}; };
const input = `${url}/${model}:generateContent?key=${key}`;
const init = { const init = {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
@@ -228,7 +249,33 @@ const genGemini = ({ text, from, to, url, key, prompt, model }) => {
body: JSON.stringify(data), body: JSON.stringify(data),
}; };
return [input, init]; return [url, init];
};
const genOllama = ({ text, from, to, url, key, prompt, model }) => {
prompt = prompt
.replaceAll(INPUT_PLACE_FROM, from)
.replaceAll(INPUT_PLACE_TO, to)
.replaceAll(INPUT_PLACE_TEXT, text);
const data = {
model,
prompt,
stream: false,
};
const init = {
headers: {
"Content-type": "application/json",
},
method: "POST",
body: JSON.stringify(data),
};
if (key) {
init.headers.Authorization = `Bearer ${key}`;
}
return [url, init];
}; };
const genCloudflareAI = ({ text, from, to, url, key }) => { const genCloudflareAI = ({ text, from, to, url, key }) => {
@@ -250,13 +297,27 @@ const genCloudflareAI = ({ text, from, to, url, key }) => {
return [url, init]; return [url, init];
}; };
const genCustom = ({ text, from, to, url, key }) => { const genCustom = ({ text, from, to, url, key, reqHook }) => {
url = url
.replaceAll(INPUT_PLACE_URL, url)
.replaceAll(INPUT_PLACE_FROM, from)
.replaceAll(INPUT_PLACE_TO, to)
.replaceAll(INPUT_PLACE_TEXT, text)
.replaceAll(INPUT_PLACE_KEY, key);
let init = {};
if (reqHook?.trim()) {
interpreter.run(`exports.reqHook = ${reqHook}`);
[url, init] = interpreter.exports.reqHook(text, from, to, url, key);
return [url, init];
}
const data = { const data = {
text, text,
from, from,
to, to,
}; };
const init = { init = {
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
}, },
@@ -271,19 +332,28 @@ const genCustom = ({ text, from, to, url, key }) => {
}; };
/** /**
* 构造翻译接口 request * 构造翻译接口请求参数
* @param {*} * @param {*}
* @returns * @returns
*/ */
export const newTransReq = ({ translator, text, from, to }, apiSetting) => { export const genTransReq = ({ translator, text, from, to }, apiSetting) => {
const args = { text, from, to, ...apiSetting }; const args = { text, from, to, ...apiSetting };
switch (translator) { switch (translator) {
case OPT_TRANS_DEEPL: case OPT_TRANS_DEEPL:
case OPT_TRANS_OPENAI: case OPT_TRANS_OPENAI:
case OPT_TRANS_OPENAI_2:
case OPT_TRANS_OPENAI_3:
case OPT_TRANS_GEMINI: case OPT_TRANS_GEMINI:
case OPT_TRANS_CLOUDFLAREAI: case OPT_TRANS_CLOUDFLAREAI:
args.key = keyPick(translator, args.key); case OPT_TRANS_OLLAMA:
case OPT_TRANS_OLLAMA_2:
case OPT_TRANS_OLLAMA_3:
case OPT_TRANS_NIUTRANS:
args.key = keyPick(translator, args.key, keyMap);
break;
case OPT_TRANS_DEEPLX:
args.url = keyPick(translator, args.url, urlMap);
break; break;
default: default:
} }
@@ -299,17 +369,29 @@ export const newTransReq = ({ translator, text, from, to }, apiSetting) => {
return genDeeplFree(args); return genDeeplFree(args);
case OPT_TRANS_DEEPLX: case OPT_TRANS_DEEPLX:
return genDeeplX(args); return genDeeplX(args);
case OPT_TRANS_NIUTRANS:
return genNiuTrans(args);
case OPT_TRANS_BAIDU: case OPT_TRANS_BAIDU:
return genBaidu(args); return genBaidu(args);
case OPT_TRANS_TENCENT: case OPT_TRANS_TENCENT:
return genTencent(args); return genTencent(args);
case OPT_TRANS_OPENAI: case OPT_TRANS_OPENAI:
case OPT_TRANS_OPENAI_2:
case OPT_TRANS_OPENAI_3:
return genOpenAI(args); return genOpenAI(args);
case OPT_TRANS_GEMINI: case OPT_TRANS_GEMINI:
return genGemini(args); return genGemini(args);
case OPT_TRANS_CLOUDFLAREAI: case OPT_TRANS_CLOUDFLAREAI:
return genCloudflareAI(args); return genCloudflareAI(args);
case OPT_TRANS_OLLAMA:
case OPT_TRANS_OLLAMA_2:
case OPT_TRANS_OLLAMA_3:
return genOllama(args);
case OPT_TRANS_CUSTOMIZE: case OPT_TRANS_CUSTOMIZE:
case OPT_TRANS_CUSTOMIZE_2:
case OPT_TRANS_CUSTOMIZE_3:
case OPT_TRANS_CUSTOMIZE_4:
case OPT_TRANS_CUSTOMIZE_5:
return genCustom(args); return genCustom(args);
default: default:
throw new Error(`[trans] translator: ${translator} not support`); throw new Error(`[trans] translator: ${translator} not support`);

View File

@@ -1,8 +1,7 @@
import browser from "webextension-polyfill"; import browser from "webextension-polyfill";
import { import {
MSG_FETCH, MSG_FETCH,
MSG_FETCH_LIMIT, MSG_GET_HTTPCACHE,
MSG_FETCH_CLEAR,
MSG_TRANS_TOGGLE, MSG_TRANS_TOGGLE,
MSG_OPEN_OPTIONS, MSG_OPEN_OPTIONS,
MSG_SAVE_RULE, MSG_SAVE_RULE,
@@ -12,6 +11,8 @@ import {
MSG_COMMAND_SHORTCUTS, MSG_COMMAND_SHORTCUTS,
MSG_INJECT_JS, MSG_INJECT_JS,
MSG_INJECT_CSS, MSG_INJECT_CSS,
MSG_UPDATE_CSP,
DEFAULT_CSPLIST,
CMD_TOGGLE_TRANSLATE, CMD_TOGGLE_TRANSLATE,
CMD_TOGGLE_STYLE, CMD_TOGGLE_STYLE,
CMD_OPEN_OPTIONS, CMD_OPEN_OPTIONS,
@@ -19,16 +20,24 @@ import {
} from "./config"; } from "./config";
import { getSettingWithDefault, tryInitDefaultData } from "./libs/storage"; import { getSettingWithDefault, tryInitDefaultData } from "./libs/storage";
import { trySyncSettingAndRules } from "./libs/sync"; import { trySyncSettingAndRules } from "./libs/sync";
import { fetchData, fetchPool } from "./libs/fetch"; import { fetchHandle, getHttpCache } from "./libs/fetch";
import { sendTabMsg } from "./libs/msg"; import { sendTabMsg } from "./libs/msg";
import { trySyncAllSubRules } from "./libs/subRules"; import { trySyncAllSubRules } from "./libs/subRules";
import { tryClearCaches } from "./libs"; import { tryClearCaches } from "./libs";
import { saveRule } from "./libs/rules"; import { saveRule } from "./libs/rules";
import { getCurTabId } from "./libs/msg"; import { getCurTabId } from "./libs/msg";
import { injectInlineJs, injectInternalCss } from "./libs/injector"; import { injectInlineJs, injectInternalCss } from "./libs/injector";
import { kissLog } from "./libs/log";
globalThis.ContextType = "BACKGROUND"; globalThis.ContextType = "BACKGROUND";
const REMOVE_HEADERS = [
`content-security-policy`,
`content-security-policy-report-only`,
`x-webkit-csp`,
`x-content-security-policy`,
];
/** /**
* 添加右键菜单 * 添加右键菜单
*/ */
@@ -79,6 +88,41 @@ async function addContextMenus(contextMenuType = 1) {
} }
} }
/**
* 更新CSP策略
* @param {*} csplist
*/
async function updateCspRules(csplist = DEFAULT_CSPLIST.join(",\n")) {
try {
const newRules = csplist
.split(/\n|,/)
.map((url) => url.trim())
.filter(Boolean)
.map((url, idx) => ({
id: idx + 1,
action: {
type: "modifyHeaders",
responseHeaders: REMOVE_HEADERS.map((header) => ({
operation: "remove",
header,
})),
},
condition: {
urlFilter: url,
resourceTypes: ["main_frame", "sub_frame"],
},
}));
const oldRules = await browser.declarativeNetRequest.getDynamicRules();
const oldRuleIds = oldRules.map((rule) => rule.id);
await browser.declarativeNetRequest.updateDynamicRules({
removeRuleIds: oldRuleIds,
addRules: newRules,
});
} catch (err) {
kissLog(err, "update csp rules");
}
}
/** /**
* 插件安装 * 插件安装
*/ */
@@ -87,6 +131,9 @@ browser.runtime.onInstalled.addListener(() => {
// 右键菜单 // 右键菜单
addContextMenus(); addContextMenus();
// 禁用CSP
updateCspRules();
}); });
/** /**
@@ -96,7 +143,7 @@ browser.runtime.onStartup.addListener(async () => {
// 同步数据 // 同步数据
await trySyncSettingAndRules(); await trySyncSettingAndRules();
const { clearCache, contextMenuType, subrulesList } = const { clearCache, contextMenuType, subrulesList, csplist } =
await getSettingWithDefault(); await getSettingWithDefault();
// 清除缓存 // 清除缓存
@@ -108,6 +155,9 @@ browser.runtime.onStartup.addListener(async () => {
// firefox重启后菜单会消失,故重复添加 // firefox重启后菜单会消失,故重复添加
addContextMenus(contextMenuType); addContextMenus(contextMenuType);
// 禁用CSP
updateCspRules(csplist);
// 同步订阅规则 // 同步订阅规则
trySyncAllSubRules({ subrulesList }); trySyncAllSubRules({ subrulesList });
}); });
@@ -118,13 +168,10 @@ browser.runtime.onStartup.addListener(async () => {
browser.runtime.onMessage.addListener(async ({ action, args }) => { browser.runtime.onMessage.addListener(async ({ action, args }) => {
switch (action) { switch (action) {
case MSG_FETCH: case MSG_FETCH:
const { input, opts } = args; return await fetchHandle(args);
return await fetchData(input, opts); case MSG_GET_HTTPCACHE:
case MSG_FETCH_LIMIT: const { input, init } = args;
const { interval, limit } = args; return await getHttpCache(input, init);
return fetchPool.update(interval, limit);
case MSG_FETCH_CLEAR:
return fetchPool.clear();
case MSG_OPEN_OPTIONS: case MSG_OPEN_OPTIONS:
return await browser.runtime.openOptionsPage(); return await browser.runtime.openOptionsPage();
case MSG_SAVE_RULE: case MSG_SAVE_RULE:
@@ -143,8 +190,10 @@ browser.runtime.onMessage.addListener(async ({ action, args }) => {
args: [args], args: [args],
world: "MAIN", world: "MAIN",
}); });
case MSG_UPDATE_CSP:
return await updateCspRules(args);
case MSG_CONTEXT_MENUS: case MSG_CONTEXT_MENUS:
return await addContextMenus(args.contextMenuType); return await addContextMenus(args);
case MSG_COMMAND_SHORTCUTS: case MSG_COMMAND_SHORTCUTS:
return await browser.commands.getAll(); return await browser.commands.getAll();
default: default:

View File

@@ -139,6 +139,8 @@ function showTransbox({
contextMenuType, contextMenuType,
tranboxSetting = DEFAULT_TRANBOX_SETTING, tranboxSetting = DEFAULT_TRANBOX_SETTING,
transApis, transApis,
darkMode,
uiLang,
}) { }) {
if (!tranboxSetting?.transOpen) { if (!tranboxSetting?.transOpen) {
return; return;
@@ -153,6 +155,8 @@ function showTransbox({
const shadowContainer = $tranbox.attachShadow({ mode: "closed" }); const shadowContainer = $tranbox.attachShadow({ mode: "closed" });
const emotionRoot = document.createElement("style"); const emotionRoot = document.createElement("style");
const shadowRootElement = document.createElement("div"); const shadowRootElement = document.createElement("div");
shadowRootElement.classList.add(`KT-transbox`);
shadowRootElement.classList.add(`KT-transbox_${darkMode ? "dark" : "light"}`);
shadowContainer.appendChild(emotionRoot); shadowContainer.appendChild(emotionRoot);
shadowContainer.appendChild(shadowRootElement); shadowContainer.appendChild(shadowRootElement);
const cache = createCache({ const cache = createCache({
@@ -167,6 +171,7 @@ function showTransbox({
contextMenuType={contextMenuType} contextMenuType={contextMenuType}
tranboxSetting={tranboxSetting} tranboxSetting={tranboxSetting}
transApis={transApis} transApis={transApis}
uiLang={uiLang}
/> />
</CacheProvider> </CacheProvider>
</React.StrictMode> </React.StrictMode>
@@ -213,8 +218,7 @@ export async function run(isUserscript = false) {
if ( if (
isUserscript && isUserscript &&
(href.includes(process.env.REACT_APP_OPTIONSPAGE_DEV) || (href.includes(process.env.REACT_APP_OPTIONSPAGE_DEV) ||
href.includes(process.env.REACT_APP_OPTIONSPAGE) || href.includes(process.env.REACT_APP_OPTIONSPAGE))
href.includes(process.env.REACT_APP_OPTIONSPAGE2))
) { ) {
runSettingPage(); runSettingPage();
return; return;

View File

@@ -42,58 +42,81 @@ const customApiLangs = `["en", "English - English"],
["vi", "Vietnamese - Tiếng Việt"], ["vi", "Vietnamese - Tiếng Việt"],
`; `;
const customApiHelpZH = `/// 自定义翻译源接口说明 const hookExample = `// URL
https://translate.googleapis.com/translate_a/single?client=gtx&dj=1&dt=t&ie=UTF-8&q={{text}}&sl=en&tl=zh-CN
// 请求(Request)数据将按下面规范发送 // Request Hook
{ (text, from, to, url, key) => [url, {
url: {{YOUR_URL}},
method: "POST",
headers: { headers: {
"Content-type": "application/json", "Content-type": "application/json",
"Authorization": "Bearer {{YOUR_KEY}}", },
method: "GET",
body: null,
}]
// Response Hook
(res, text, from, to) => [res.sentences.map((item) => item.trans).join(" "), to === res.src]`;
const customApiHelpZH = `// 请求数据默认格式
{
"url": "{{url}}",
"method": "POST",
"headers": {
"Content-type": "application/json",
"Authorization": "Bearer {{key}}"
},
"body": {
"text": "{{text}}", // 待翻译文字
"from": "{{from}}", // 文字的语言(可能为空)
"to": "{{to}}", // 目标语言
}, },
body: {
text: "", // 需要翻译的文字
from: "", // 源语言,可能为空,表示需要接口自动识别语言
to: "", // 目标语言
}
} }
// 返回Response数据需符合下面的JSON规范
// 返回数据默认格式
{ {
text: "", // 翻译后的文字 text: "", // 翻译后的文字
from: "", // 识别的源语言 from: "", // 识别的源语言
to: "", // 目标语言(可选) to: "", // 目标语言(可选)
} }
// Hook 范例
${hookExample}
// 支持的语言代码如下 // 支持的语言代码如下
${customApiLangs} ${customApiLangs}
`; `;
const customApiHelpEN = `/// Custom translation source interface description const customApiHelpEN = `// Default request
// Request data will be sent according to the following specifications
{ {
url: {{YOUR_URL}}, "url": "{{url}}",
method: "POST", "method": "POST",
headers: { "headers": {
"Content-type": "application/json", "Content-type": "application/json",
"Authorization": "Bearer {{YOUR_KEY}}", "Authorization": "Bearer {{key}}"
},
"body": {
"text": "{{text}}", // Text to be translated
"from": "{{from}}", // The language of the text (may be empty)
"to": "{{to}}", // Target language
}, },
body: {
text: "", // text to be translated
from: "", // Source language, may be empty
to: "", // Target language
}
} }
// The returned data must conform to the following JSON specification
// Default response
{ {
text: "", // translated text text: "", // translated text
from: "", // Recognized source language from: "", // Recognized source language
to: "", // Target language (optional) to: "", // Target language (optional)
} }
/// Hook Example
${hookExample}
// The supported language codes are as follows // The supported language codes are as follows
${customApiLangs} ${customApiLangs}
`; `;
@@ -463,6 +486,10 @@ export const I18N = {
zh: `导出`, zh: `导出`,
en: `Export`, en: `Export`,
}, },
export_translation: {
zh: `导出释义`,
en: `Export Translation`,
},
error_cant_be_blank: { error_cant_be_blank: {
zh: `不能为空`, zh: `不能为空`,
en: `Can not be blank`, en: `Can not be blank`,
@@ -623,6 +650,14 @@ export const I18N = {
zh: `隐藏翻译按钮`, zh: `隐藏翻译按钮`,
en: `Hide Translate Button`, en: `Hide Translate Button`,
}, },
hide_click_away: {
zh: `点击外部关闭弹窗`,
en: `Click outside to close the pop-up window`,
},
use_simple_style: {
zh: `使用简洁界面`,
en: `Click outside to close the pop-up window`,
},
show: { show: {
zh: `显示`, zh: `显示`,
en: `Show`, en: `Show`,
@@ -708,12 +743,20 @@ export const I18N = {
en: `Open Translate Popup/Translate Selected Shortcut`, en: `Open Translate Popup/Translate Selected Shortcut`,
}, },
tranbtn_offset_x: { tranbtn_offset_x: {
zh: `翻译按钮偏移X0-100`, zh: `翻译按钮偏移X±200`,
en: `Translate Button Offset X (0-100)`, en: `Translate Button Offset X (±200)`,
}, },
tranbtn_offset_y: { tranbtn_offset_y: {
zh: `翻译按钮偏移Y0-100`, zh: `翻译按钮偏移Y±200`,
en: `Translate Button Offset Y (0-100)`, en: `Translate Button Offset Y (±200)`,
},
tranbox_offset_x: {
zh: `翻译框偏移X±200`,
en: `Translate Box Offset X (±200)`,
},
tranbox_offset_y: {
zh: `翻译框偏移Y±200`,
en: `Translate Box Offset Y (±200)`,
}, },
translated_text: { translated_text: {
zh: `译文`, zh: `译文`,
@@ -755,6 +798,14 @@ export const I18N = {
zh: `禁用翻译名单`, zh: `禁用翻译名单`,
en: `Translate Blacklist`, en: `Translate Blacklist`,
}, },
disabled_csplist: {
zh: `禁用CSP名单`,
en: `Disabled CSP List`,
},
disabled_csplist_helper: {
zh: `3、通过调整CSP策略使得某些页面能够注入JS/CSS/Media请谨慎使用除非您已知晓相关风险。`,
en: `3. By adjusting the CSP policy, some pages can inject JS/CSS/Media. Please use it with caution unless you are aware of the related risks.`,
},
skip_langs: { skip_langs: {
zh: `不翻译的语言`, zh: `不翻译的语言`,
en: `Disable Languages`, en: `Disable Languages`,
@@ -780,8 +831,8 @@ export const I18N = {
en: `Secondary Context Menus`, en: `Secondary Context Menus`,
}, },
mulkeys_help: { mulkeys_help: {
zh: `支持用换行或英文逗号“,”分隔多个KEY轮询调用。`, zh: `支持用换行或英文逗号“,”分隔轮询调用。`,
en: `Supports multiple KEY polling calls separated by newlines or English commas ",".`, en: `Supports polling calls separated by newlines or English commas ",".`,
}, },
translation_element_tag: { translation_element_tag: {
zh: `译文元素标签`, zh: `译文元素标签`,
@@ -807,4 +858,76 @@ export const I18N = {
zh: `网页修复选择器`, zh: `网页修复选择器`,
en: `Fixer Selector`, en: `Fixer Selector`,
}, },
reg_niutrans: {
zh: `获取小牛翻译密钥【简约翻译专属新用户注册赠送300万字符】`,
en: `Get NiuTrans APIKey [KISS Translator Exclusive New User Registration Free 3 Million Characters]`,
},
trigger_mode: {
zh: `触发方式`,
en: `Trigger Mode`,
},
trigger_click: {
zh: `点击触发`,
en: `Click Trigger`,
},
trigger_hover: {
zh: `鼠标悬停触发`,
en: `Hover Trigger`,
},
trigger_select: {
zh: `选中触发`,
en: `Select Trigger`,
},
extend_styles: {
zh: `附加样式`,
en: `Extend Styles`,
},
custom_option: {
zh: `自定义选项`,
en: `Custom Option`,
},
translate_selected_text: {
zh: `翻译选中文字`,
en: `Translate Selected Text`,
},
toggle_style: {
zh: `切换样式`,
en: `Toggle Style`,
},
open_menu: {
zh: `打开弹窗菜单`,
en: `Open Popup Menu`,
},
open_setting: {
zh: `打开设置`,
en: `Open Setting`,
},
follow_selection: {
zh: `翻译框跟随选中文本`,
en: `Transbox Follow Selection`,
},
translate_start_hook: {
zh: `翻译开始钩子函数`,
en: `Translate Start Hook`,
},
translate_start_hook_helper: {
zh: `翻译开始时运行,入参为: 翻译节点,原文文本。`,
en: `Run when translation starts, the input parameters are: translation node, original text.`,
},
translate_end_hook: {
zh: `翻译完成钩子函数`,
en: `Translate End Hook`,
},
translate_end_hook_helper: {
zh: `翻译完成时运行,入参为: 翻译节点,原文文本,译文文本,保留元素。`,
en: `Run when the translation is completed, the input parameters are: translation node, original text, translation text, retained elements.`,
},
translate_remove_hook: {
zh: `翻译移除钩子函数`,
en: `Translate Removed Hook`,
},
translate_remove_hook_helper: {
zh: `翻译移除时运行,入参为: 翻译节点。`,
en: `Run when translation is removed, the input parameters are: translation node.`,
},
}; };

View File

@@ -51,8 +51,7 @@ export const KV_SALT_SHARE = "KISS-Translator-SHARE";
export const CACHE_NAME = `${APP_NAME}_cache`; export const CACHE_NAME = `${APP_NAME}_cache`;
export const MSG_FETCH = "fetch"; export const MSG_FETCH = "fetch";
export const MSG_FETCH_LIMIT = "fetch_limit"; export const MSG_GET_HTTPCACHE = "get_httpcache";
export const MSG_FETCH_CLEAR = "fetch_clear";
export const MSG_OPEN_OPTIONS = "open_options"; export const MSG_OPEN_OPTIONS = "open_options";
export const MSG_SAVE_RULE = "save_rule"; export const MSG_SAVE_RULE = "save_rule";
export const MSG_TRANS_TOGGLE = "trans_toggle"; export const MSG_TRANS_TOGGLE = "trans_toggle";
@@ -65,6 +64,7 @@ export const MSG_CONTEXT_MENUS = "context_menus";
export const MSG_COMMAND_SHORTCUTS = "command_shortcuts"; export const MSG_COMMAND_SHORTCUTS = "command_shortcuts";
export const MSG_INJECT_JS = "inject_js"; export const MSG_INJECT_JS = "inject_js";
export const MSG_INJECT_CSS = "inject_css"; export const MSG_INJECT_CSS = "inject_css";
export const MSG_UPDATE_CSP = "update_csp";
export const THEME_LIGHT = "light"; export const THEME_LIGHT = "light";
export const THEME_DARK = "dark"; export const THEME_DARK = "dark";
@@ -83,23 +83,39 @@ export const URL_MICROSOFT_TRAN =
export const URL_MICROSOFT_AUTH = "https://edge.microsoft.com/translate/auth"; export const URL_MICROSOFT_AUTH = "https://edge.microsoft.com/translate/auth";
export const URL_BAIDU_LANGDETECT = "https://fanyi.baidu.com/langdetect"; export const URL_BAIDU_LANGDETECT = "https://fanyi.baidu.com/langdetect";
export const URL_BAIDU_SUGGEST = "https://fanyi.baidu.com/sug"; export const URL_BAIDU_SUGGEST = "https://fanyi.baidu.com/sug";
export const URL_BAIDU_TTS = "https://fanyi.baidu.com/gettts";
export const URL_BAIDU_WEB = "https://fanyi.baidu.com/"; export const URL_BAIDU_WEB = "https://fanyi.baidu.com/";
export const URL_BAIDU_TRANSAPI = "https://fanyi.baidu.com/transapi"; export const URL_BAIDU_TRANSAPI = "https://fanyi.baidu.com/transapi";
export const URL_BAIDU_TRANSAPI_V2 = "https://fanyi.baidu.com/v2transapi"; export const URL_BAIDU_TRANSAPI_V2 = "https://fanyi.baidu.com/v2transapi";
export const URL_DEEPLFREE_TRAN = "https://www2.deepl.com/jsonrpc"; export const URL_DEEPLFREE_TRAN = "https://www2.deepl.com/jsonrpc";
export const URL_TENCENT_TRANSMART = "https://transmart.qq.com/api/imt"; export const URL_TENCENT_TRANSMART = "https://transmart.qq.com/api/imt";
export const URL_NIUTRANS_REG =
"https://niutrans.com/login?active=3&userSource=kiss-translator";
export const DEFAULT_USER_AGENT =
"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36";
export const OPT_TRANS_GOOGLE = "Google"; export const OPT_TRANS_GOOGLE = "Google";
export const OPT_TRANS_MICROSOFT = "Microsoft"; export const OPT_TRANS_MICROSOFT = "Microsoft";
export const OPT_TRANS_DEEPL = "DeepL"; export const OPT_TRANS_DEEPL = "DeepL";
export const OPT_TRANS_DEEPLX = "DeepLX"; export const OPT_TRANS_DEEPLX = "DeepLX";
export const OPT_TRANS_DEEPLFREE = "DeepLFree"; export const OPT_TRANS_DEEPLFREE = "DeepLFree";
export const OPT_TRANS_NIUTRANS = "NiuTrans";
export const OPT_TRANS_BAIDU = "Baidu"; export const OPT_TRANS_BAIDU = "Baidu";
export const OPT_TRANS_TENCENT = "Tencent"; export const OPT_TRANS_TENCENT = "Tencent";
export const OPT_TRANS_OPENAI = "OpenAI"; export const OPT_TRANS_OPENAI = "OpenAI";
export const OPT_TRANS_OPENAI_2 = "OpenAI2";
export const OPT_TRANS_OPENAI_3 = "OpenAI3";
export const OPT_TRANS_GEMINI = "Gemini"; export const OPT_TRANS_GEMINI = "Gemini";
export const OPT_TRANS_CLOUDFLAREAI = "CloudflareAI"; export const OPT_TRANS_CLOUDFLAREAI = "CloudflareAI";
export const OPT_TRANS_OLLAMA = "Ollama";
export const OPT_TRANS_OLLAMA_2 = "Ollama2";
export const OPT_TRANS_OLLAMA_3 = "Ollama3";
export const OPT_TRANS_CUSTOMIZE = "Custom"; export const OPT_TRANS_CUSTOMIZE = "Custom";
export const OPT_TRANS_CUSTOMIZE_2 = "Custom2";
export const OPT_TRANS_CUSTOMIZE_3 = "Custom3";
export const OPT_TRANS_CUSTOMIZE_4 = "Custom4";
export const OPT_TRANS_CUSTOMIZE_5 = "Custom5";
export const OPT_TRANS_ALL = [ export const OPT_TRANS_ALL = [
OPT_TRANS_GOOGLE, OPT_TRANS_GOOGLE,
OPT_TRANS_MICROSOFT, OPT_TRANS_MICROSOFT,
@@ -108,10 +124,20 @@ export const OPT_TRANS_ALL = [
OPT_TRANS_DEEPL, OPT_TRANS_DEEPL,
OPT_TRANS_DEEPLFREE, OPT_TRANS_DEEPLFREE,
OPT_TRANS_DEEPLX, OPT_TRANS_DEEPLX,
OPT_TRANS_NIUTRANS,
OPT_TRANS_OPENAI, OPT_TRANS_OPENAI,
OPT_TRANS_OPENAI_2,
OPT_TRANS_OPENAI_3,
OPT_TRANS_GEMINI, OPT_TRANS_GEMINI,
OPT_TRANS_CLOUDFLAREAI, OPT_TRANS_CLOUDFLAREAI,
OPT_TRANS_OLLAMA,
OPT_TRANS_OLLAMA_2,
OPT_TRANS_OLLAMA_3,
OPT_TRANS_CUSTOMIZE, OPT_TRANS_CUSTOMIZE,
OPT_TRANS_CUSTOMIZE_2,
OPT_TRANS_CUSTOMIZE_3,
OPT_TRANS_CUSTOMIZE_4,
OPT_TRANS_CUSTOMIZE_5,
]; ];
export const OPT_LANGS_TO = [ export const OPT_LANGS_TO = [
@@ -180,6 +206,12 @@ export const OPT_LANGS_SPECIAL = {
["zh-CN", "ZH"], ["zh-CN", "ZH"],
["zh-TW", "ZH"], ["zh-TW", "ZH"],
]), ]),
[OPT_TRANS_NIUTRANS]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", "auto"],
["zh-CN", "zh"],
["zh-TW", "cht"],
]),
[OPT_TRANS_BAIDU]: new Map([ [OPT_TRANS_BAIDU]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]), ...OPT_LANGS_FROM.map(([key]) => [key, key]),
["zh-CN", "zh"], ["zh-CN", "zh"],
@@ -232,9 +264,24 @@ export const OPT_LANGS_SPECIAL = {
[OPT_TRANS_OPENAI]: new Map( [OPT_TRANS_OPENAI]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]]) OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
), ),
[OPT_TRANS_OPENAI_2]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
),
[OPT_TRANS_OPENAI_3]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
),
[OPT_TRANS_GEMINI]: new Map( [OPT_TRANS_GEMINI]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]]) OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
), ),
[OPT_TRANS_OLLAMA]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
),
[OPT_TRANS_OLLAMA_2]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
),
[OPT_TRANS_OLLAMA_3]: new Map(
OPT_LANGS_FROM.map(([key, val]) => [key, val.split(" - ")[0]])
),
[OPT_TRANS_CLOUDFLAREAI]: new Map([ [OPT_TRANS_CLOUDFLAREAI]: new Map([
["auto", ""], ["auto", ""],
["zh-CN", "chinese"], ["zh-CN", "chinese"],
@@ -253,6 +300,22 @@ export const OPT_LANGS_SPECIAL = {
...OPT_LANGS_FROM.map(([key]) => [key, key]), ...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", ""], ["auto", ""],
]), ]),
[OPT_TRANS_CUSTOMIZE_2]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", ""],
]),
[OPT_TRANS_CUSTOMIZE_3]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", ""],
]),
[OPT_TRANS_CUSTOMIZE_4]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", ""],
]),
[OPT_TRANS_CUSTOMIZE_5]: new Map([
...OPT_LANGS_FROM.map(([key]) => [key, key]),
["auto", ""],
]),
}; };
export const OPT_LANGS_LIST = OPT_LANGS_TO.map(([lang]) => lang); export const OPT_LANGS_LIST = OPT_LANGS_TO.map(([lang]) => lang);
export const OPT_LANGS_BAIDU = new Map( export const OPT_LANGS_BAIDU = new Map(
@@ -316,9 +379,12 @@ export const OPT_TIMING_ALL = [
export const DEFAULT_FETCH_LIMIT = 10; // 默认最大任务数量 export const DEFAULT_FETCH_LIMIT = 10; // 默认最大任务数量
export const DEFAULT_FETCH_INTERVAL = 100; // 默认任务间隔时间 export const DEFAULT_FETCH_INTERVAL = 100; // 默认任务间隔时间
export const PROMPT_PLACE_FROM = "{{from}}"; // 占位符 export const INPUT_PLACE_URL = "{{url}}"; // 占位符
export const PROMPT_PLACE_TO = "{{to}}"; // 占位符 export const INPUT_PLACE_FROM = "{{from}}"; // 占位符
export const PROMPT_PLACE_TEXT = "{{text}}"; // 占位符 export const INPUT_PLACE_TO = "{{to}}"; // 占位符
export const INPUT_PLACE_TEXT = "{{text}}"; // 占位符
export const INPUT_PLACE_KEY = "{{key}}"; // 占位符
export const INPUT_PLACE_MODEL = "{{model}}"; // 占位符
export const DEFAULT_COLOR = "#209CEE"; // 默认高亮背景色/线条颜色 export const DEFAULT_COLOR = "#209CEE"; // 默认高亮背景色/线条颜色
@@ -351,6 +417,9 @@ export const GLOBLA_RULE = {
skipLangs: [], // 不翻译的语言 skipLangs: [], // 不翻译的语言
fixerSelector: "", // 修复函数选择器 fixerSelector: "", // 修复函数选择器
fixerFunc: "-", // 修复函数 fixerFunc: "-", // 修复函数
transStartHook: "", // 钩子函数
transEndHook: "", // 钩子函数
transRemoveHook: "", // 钩子函数
}; };
// 输入框翻译 // 输入框翻译
@@ -368,6 +437,18 @@ export const DEFAULT_INPUT_RULE = {
}; };
// 划词翻译 // 划词翻译
export const PHONIC_MAP = {
en_phonic: ["英", "uk"],
us_phonic: ["美", "en"],
};
export const OPT_TRANBOX_TRIGGER_CLICK = "click";
export const OPT_TRANBOX_TRIGGER_HOVER = "hover";
export const OPT_TRANBOX_TRIGGER_SELECT = "select";
export const OPT_TRANBOX_TRIGGER_ALL = [
OPT_TRANBOX_TRIGGER_CLICK,
OPT_TRANBOX_TRIGGER_HOVER,
OPT_TRANBOX_TRIGGER_SELECT,
];
export const DEFAULT_TRANBOX_SHORTCUT = ["AltLeft", "KeyS"]; export const DEFAULT_TRANBOX_SHORTCUT = ["AltLeft", "KeyS"];
export const DEFAULT_TRANBOX_SETTING = { export const DEFAULT_TRANBOX_SETTING = {
transOpen: true, transOpen: true,
@@ -378,7 +459,14 @@ export const DEFAULT_TRANBOX_SETTING = {
tranboxShortcut: DEFAULT_TRANBOX_SHORTCUT, tranboxShortcut: DEFAULT_TRANBOX_SHORTCUT,
btnOffsetX: 10, btnOffsetX: 10,
btnOffsetY: 10, btnOffsetY: 10,
hideTranBtn: false, boxOffsetX: 0,
boxOffsetY: 10,
hideTranBtn: false, // 是否隐藏翻译按钮
hideClickAway: false, // 是否点击外部关闭弹窗
simpleStyle: false, // 是否简洁界面
followSelection: false, // 翻译框是否跟随选中文本
triggerMode: OPT_TRANBOX_TRIGGER_CLICK, // 触发翻译方式
extStyles: "", // 附加样式
}; };
// 订阅列表 // 订阅列表
@@ -398,6 +486,31 @@ export const DEFAULT_SUBRULES_LIST = [
]; ];
// 翻译接口 // 翻译接口
const defaultCustomApi = {
url: "",
key: "",
customOption: "", // (作废)
reqHook: "", // request 钩子函数
resHook: "", // response 钩子函数
fetchLimit: DEFAULT_FETCH_LIMIT,
fetchInterval: DEFAULT_FETCH_INTERVAL,
};
const defaultOpenaiApi = {
url: "https://api.openai.com/v1/chat/completions",
key: "",
model: "gpt-4",
prompt: `You will be provided with a sentence in ${INPUT_PLACE_FROM}, and your task is to translate it into ${INPUT_PLACE_TO}.`,
fetchLimit: 1,
fetchInterval: 500,
};
const defaultOllamaApi = {
url: "http://localhost:11434/api/generate",
key: "",
model: "llama3",
prompt: `Translate the following text from ${INPUT_PLACE_FROM} to ${INPUT_PLACE_TO}:\n\n${INPUT_PLACE_TEXT}`,
fetchLimit: 1,
fetchInterval: 500,
};
export const DEFAULT_TRANS_APIS = { export const DEFAULT_TRANS_APIS = {
[OPT_TRANS_GOOGLE]: { [OPT_TRANS_GOOGLE]: {
url: "https://translate.googleapis.com/translate_a/single", url: "https://translate.googleapis.com/translate_a/single",
@@ -433,34 +546,39 @@ export const DEFAULT_TRANS_APIS = {
fetchLimit: 1, fetchLimit: 1,
fetchInterval: 500, fetchInterval: 500,
}, },
[OPT_TRANS_OPENAI]: { [OPT_TRANS_NIUTRANS]: {
url: "https://api.openai.com/v1/chat/completions", url: "https://api.niutrans.com/NiuTransServer/translation",
key: "", key: "",
model: "gpt-4", dictNo: "",
prompt: `You will be provided with a sentence in ${PROMPT_PLACE_FROM}, and your task is to translate it into ${PROMPT_PLACE_TO}.`, memoryNo: "",
fetchLimit: 1, fetchLimit: DEFAULT_FETCH_LIMIT,
fetchInterval: 500, fetchInterval: DEFAULT_FETCH_INTERVAL,
}, },
[OPT_TRANS_OPENAI]: defaultOpenaiApi,
[OPT_TRANS_OPENAI_2]: defaultOpenaiApi,
[OPT_TRANS_OPENAI_3]: defaultOpenaiApi,
[OPT_TRANS_GEMINI]: { [OPT_TRANS_GEMINI]: {
url: "https://generativelanguage.googleapis.com/v1/models", url: `https://generativelanguage.googleapis.com/v1/models/${INPUT_PLACE_MODEL}:generateContent?key=${INPUT_PLACE_KEY}`,
key: "", key: "",
model: "gemini-pro", model: "gemini-pro",
prompt: `Translate the following text from ${PROMPT_PLACE_FROM} to ${PROMPT_PLACE_TO}:\n\n${PROMPT_PLACE_TEXT}`, prompt: `Translate the following text from ${INPUT_PLACE_FROM} to ${INPUT_PLACE_TO}:\n\n${INPUT_PLACE_TEXT}`,
fetchLimit: 1, fetchLimit: 1,
fetchInterval: 500, fetchInterval: 500,
}, },
[OPT_TRANS_CLOUDFLAREAI]: { [OPT_TRANS_CLOUDFLAREAI]: {
url: "https://api.cloudflare.com/client/v4/accounts/{ACCOUNT_ID}/ai/run/@cf/meta/m2m100-1.2b", url: "https://api.cloudflare.com/client/v4/accounts/{{ACCOUNT_ID}}/ai/run/@cf/meta/m2m100-1.2b",
key: "", key: "",
fetchLimit: 1, fetchLimit: 1,
fetchInterval: 500, fetchInterval: 500,
}, },
[OPT_TRANS_CUSTOMIZE]: { [OPT_TRANS_OLLAMA]: defaultOllamaApi,
url: "", [OPT_TRANS_OLLAMA_2]: defaultOllamaApi,
key: "", [OPT_TRANS_OLLAMA_3]: defaultOllamaApi,
fetchLimit: DEFAULT_FETCH_LIMIT, [OPT_TRANS_CUSTOMIZE]: defaultCustomApi,
fetchInterval: DEFAULT_FETCH_INTERVAL, [OPT_TRANS_CUSTOMIZE_2]: defaultCustomApi,
}, [OPT_TRANS_CUSTOMIZE_3]: defaultCustomApi,
[OPT_TRANS_CUSTOMIZE_4]: defaultCustomApi,
[OPT_TRANS_CUSTOMIZE_5]: defaultCustomApi,
}; };
// 默认快捷键 // 默认快捷键
@@ -485,6 +603,7 @@ export const DEFAULT_BLACKLIST = [
"oapi.dingtalk.com", "oapi.dingtalk.com",
"login.dingtalk.com", "login.dingtalk.com",
]; // 禁用翻译名单 ]; // 禁用翻译名单
export const DEFAULT_CSPLIST = ["https://github.com"]; // 禁用CSP名单
export const DEFAULT_SETTING = { export const DEFAULT_SETTING = {
darkMode: false, // 深色模式 darkMode: false, // 深色模式
@@ -512,6 +631,7 @@ export const DEFAULT_SETTING = {
tranboxSetting: DEFAULT_TRANBOX_SETTING, // 划词翻译设置 tranboxSetting: DEFAULT_TRANBOX_SETTING, // 划词翻译设置
touchTranslate: 2, // 触屏翻译 touchTranslate: 2, // 触屏翻译
blacklist: DEFAULT_BLACKLIST.join(",\n"), // 禁用翻译名单 blacklist: DEFAULT_BLACKLIST.join(",\n"), // 禁用翻译名单
csplist: DEFAULT_CSPLIST.join(",\n"), // 禁用CSP名单
// disableLangs: [], // 不翻译的语言(移至rule作废) // disableLangs: [], // 不翻译的语言(移至rule作废)
transInterval: 500, // 翻译间隔时间 transInterval: 500, // 翻译间隔时间
}; };

View File

@@ -4,8 +4,8 @@ export const GLOBAL_KEY = "*";
export const REMAIN_KEY = "-"; export const REMAIN_KEY = "-";
export const SHADOW_KEY = ">>>"; export const SHADOW_KEY = ">>>";
export const DEFAULT_SELECTOR = `:is(li, p, h1, h2, h3, h4, h5, h6, dd, blockquote)`; export const DEFAULT_SELECTOR = `:is(li, p, h1, h2, h3, h4, h5, h6, dd, blockquote, .kiss-p)`;
export const DEFAULT_KEEP_SELECTOR = `code, img, svg`; export const DEFAULT_KEEP_SELECTOR = `code, img, svg, pre`;
export const DEFAULT_RULE = { export const DEFAULT_RULE = {
pattern: "", // 匹配网址 pattern: "", // 匹配网址
selector: "", // 选择器 selector: "", // 选择器
@@ -30,6 +30,9 @@ export const DEFAULT_RULE = {
skipLangs: [], // 不翻译的语言 skipLangs: [], // 不翻译的语言
fixerSelector: "", // 修复函数选择器 fixerSelector: "", // 修复函数选择器
fixerFunc: GLOBAL_KEY, // 修复函数 fixerFunc: GLOBAL_KEY, // 修复函数
transStartHook: "", // 钩子函数
transEndHook: "", // 钩子函数
transRemoveHook: "", // 钩子函数
}; };
const DEFAULT_DIY_STYLE = `color: #666; const DEFAULT_DIY_STYLE = `color: #666;

View File

@@ -8,7 +8,10 @@ export function useApi(translator) {
const updateApi = useCallback( const updateApi = useCallback(
async (obj) => { async (obj) => {
const api = transApis[translator] || {}; const api = {
...DEFAULT_TRANS_APIS[translator],
...(transApis[translator] || {}),
};
Object.assign(transApis, { [translator]: { ...api, ...obj } }); Object.assign(transApis, { [translator]: { ...api, ...obj } });
await updateSetting({ transApis }); await updateSetting({ transApis });
}, },
@@ -20,5 +23,12 @@ export function useApi(translator) {
await updateSetting({ transApis }); await updateSetting({ transApis });
}, [translator, transApis, updateSetting]); }, [translator, transApis, updateSetting]);
return { api: transApis[translator] || {}, updateApi, resetApi }; return {
api: {
...DEFAULT_TRANS_APIS[translator],
...(transApis[translator] || {}),
},
updateApi,
resetApi,
};
} }

61
src/hooks/Audio.js Normal file
View File

@@ -0,0 +1,61 @@
import { useCallback, useEffect, useRef, useState } from "react";
import { apiBaiduTTS } from "../apis";
import { kissLog } from "../libs/log";
/**
* 声音播放hook
* @param {*} src
* @returns
*/
export function useAudio(src) {
const audioRef = useRef(null);
const [error, setError] = useState(null);
const [ready, setReady] = useState(false);
const [playing, setPlaying] = useState(false);
const onPlay = useCallback(() => {
audioRef.current?.play();
}, []);
useEffect(() => {
if (!src) {
return;
}
const audio = new Audio(src);
audio.addEventListener("error", (err) => setError(err));
audio.addEventListener("canplaythrough", () => setReady(true));
audio.addEventListener("play", () => setPlaying(true));
audio.addEventListener("ended", () => setPlaying(false));
audioRef.current = audio;
}, [src]);
return {
error,
ready,
playing,
onPlay,
};
}
/**
* 获取语音hook
* @param {*} text
* @param {*} lan
* @param {*} spd
* @returns
*/
export function useTextAudio(text, lan = "uk", spd = 3) {
const [src, setSrc] = useState("");
useEffect(() => {
(async () => {
try {
setSrc(await apiBaiduTTS(text, lan, spd));
} catch (err) {
kissLog(err, "baidu tts");
}
})();
}, [text, lan, spd]);
return useAudio(src);
}

View File

@@ -2,6 +2,14 @@ import { useSetting } from "./Setting";
import { I18N, URL_RAW_PREFIX } from "../config"; import { I18N, URL_RAW_PREFIX } from "../config";
import { useFetch } from "./Fetch"; import { useFetch } from "./Fetch";
export const getI18n = (uiLang, key, defaultText = "") => {
return I18N?.[key]?.[uiLang] ?? defaultText;
};
export const useLangMap = (uiLang) => {
return (key, defaultText = "") => getI18n(uiLang, key, defaultText);
};
/** /**
* 多语言 hook * 多语言 hook
* @returns * @returns
@@ -10,7 +18,7 @@ export const useI18n = () => {
const { const {
setting: { uiLang }, setting: { uiLang },
} = useSetting(); } = useSetting();
return (key, defaultText = "") => I18N?.[key]?.[uiLang] ?? defaultText; return useLangMap(uiLang);
}; };
export const useI18nMd = (key) => { export const useI18nMd = (key) => {

View File

@@ -1,6 +1,6 @@
import { useMemo } from "react"; import { useMemo } from "react";
import { ThemeProvider, createTheme } from "@mui/material/styles"; import { ThemeProvider, createTheme } from "@mui/material/styles";
import CssBaseline from "@mui/material/CssBaseline"; import { CssBaseline, GlobalStyles } from "@mui/material";
import { useDarkMode } from "./ColorMode"; import { useDarkMode } from "./ColorMode";
import { THEME_DARK, THEME_LIGHT } from "../config"; import { THEME_DARK, THEME_LIGHT } from "../config";
@@ -9,7 +9,7 @@ import { THEME_DARK, THEME_LIGHT } from "../config";
* @param {*} param0 * @param {*} param0
* @returns * @returns
*/ */
export default function Theme({ children, options }) { export default function Theme({ children, options, styles }) {
const { darkMode } = useDarkMode(); const { darkMode } = useDarkMode();
const theme = useMemo(() => { const theme = useMemo(() => {
let htmlFontSize = 16; let htmlFontSize = 16;
@@ -38,6 +38,7 @@ export default function Theme({ children, options }) {
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
{/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */} {/* CssBaseline kickstart an elegant, consistent, and simple baseline to build upon. */}
<CssBaseline /> <CssBaseline />
<GlobalStyles styles={styles} />
{children} {children}
</ThemeProvider> </ThemeProvider>
); );

View File

@@ -39,8 +39,10 @@ export function useTranslate(q, rule, setting) {
text: q, text: q,
fromLang, fromLang,
toLang, toLang,
apiSetting: apiSetting: {
setting.transApis?.[translator] || DEFAULT_TRANS_APIS[translator], ...DEFAULT_TRANS_APIS[translator],
...(setting.transApis[translator] || {}),
},
}); });
setText(trText); setText(trText);
setSamelang(isSame); setSamelang(isSame);

View File

@@ -36,19 +36,10 @@ function App() {
<Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}> <Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}>
Install/Update Userscript for Tampermonkey/Violentmonkey Install/Update Userscript for Tampermonkey/Violentmonkey
</Link> </Link>
{/* <Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL2}>
Install/Update Userscript for Tampermonkey/Violentmonkey 2
</Link> */}
<Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL}> <Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL}>
Install/Update Userscript for iOS Safari Install/Update Userscript for iOS Safari
</Link> </Link>
{/* <Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL2}>
Install/Update Userscript for iOS Safari 2
</Link> */}
<Link href={process.env.REACT_APP_OPTIONSPAGE}>Open Options Page</Link> <Link href={process.env.REACT_APP_OPTIONSPAGE}>Open Options Page</Link>
{/* <Link href={process.env.REACT_APP_OPTIONSPAGE2}>
Open Options Page 2
</Link> */}
</Stack> </Stack>
{loading ? ( {loading ? (

View File

@@ -1,6 +1,6 @@
import { getMsauth, setMsauth } from "./storage"; import { getMsauth, setMsauth } from "./storage";
import { URL_MICROSOFT_AUTH } from "../config"; import { URL_MICROSOFT_AUTH } from "../config";
import { fetchData } from "./fetch"; import { fetchHandle } from "./fetch";
import { kissLog } from "./log"; import { kissLog } from "./log";
const parseMSToken = (token) => { const parseMSToken = (token) => {
@@ -35,7 +35,7 @@ const _msAuth = () => {
} }
// 缓存没有或失效,查询接口 // 缓存没有或失效,查询接口
token = await fetchData(URL_MICROSOFT_AUTH); token = await fetchHandle({ input: URL_MICROSOFT_AUTH });
exp = parseMSToken(token); exp = parseMSToken(token);
await setMsauth({ token, exp }); await setMsauth({ token, exp });
return [token, exp]; return [token, exp];

View File

@@ -3,18 +3,36 @@ import { sendBgMsg } from "./msg";
import { taskPool } from "./pool"; import { taskPool } from "./pool";
import { import {
MSG_FETCH, MSG_FETCH,
MSG_FETCH_LIMIT, MSG_GET_HTTPCACHE,
MSG_FETCH_CLEAR,
CACHE_NAME, CACHE_NAME,
DEFAULT_FETCH_INTERVAL, DEFAULT_FETCH_INTERVAL,
DEFAULT_FETCH_LIMIT, DEFAULT_FETCH_LIMIT,
} from "../config"; } from "../config";
import { isBg } from "./browser"; import { isBg } from "./browser";
import { newCacheReq, newTransReq } from "./req"; import { genTransReq } from "../apis/trans";
import { kissLog } from "./log"; import { kissLog } from "./log";
import { blobToBase64 } from "./utils";
const TIMEOUT = 5000; const TIMEOUT = 5000;
/**
* 构造缓存 request
* @param {*} input
* @param {*} init
* @returns
*/
const newCacheReq = async (input, init) => {
let request = new Request(input, init);
if (request.method !== "GET") {
const body = await request.text();
const cacheUrl = new URL(request.url);
cacheUrl.pathname += body;
request = new Request(cacheUrl.toString(), { method: "GET" });
}
return request;
};
/** /**
* 油猴脚本的请求封装 * 油猴脚本的请求封装
* @param {*} input * @param {*} input
@@ -30,7 +48,7 @@ export const fetchGM = async (input, { method = "GET", headers, body } = {}) =>
data: body, data: body,
// withCredentials: true, // withCredentials: true,
timeout: TIMEOUT, timeout: TIMEOUT,
onload: ({ response, responseHeaders, status, statusText, ...opts }) => { onload: ({ response, responseHeaders, status, statusText }) => {
const headers = {}; const headers = {};
responseHeaders.split("\n").forEach((line) => { responseHeaders.split("\n").forEach((line) => {
const [name, value] = line.split(":").map((item) => item.trim()); const [name, value] = line.split(":").map((item) => item.trim());
@@ -54,9 +72,9 @@ export const fetchGM = async (input, { method = "GET", headers, body } = {}) =>
* @param {*} param0 * @param {*} param0
* @returns * @returns
*/ */
export const fetchApi = async ({ input, init, transOpts, apiSetting }) => { export const fetchPatcher = async (input, init, transOpts, apiSetting) => {
if (transOpts?.translator) { if (transOpts?.translator) {
[input, init] = await newTransReq(transOpts, apiSetting); [input, init] = await genTransReq(transOpts, apiSetting);
} }
if (!input) { if (!input) {
@@ -97,94 +115,162 @@ export const fetchApi = async ({ input, init, transOpts, apiSetting }) => {
return fetch(input, init); return fetch(input, init);
}; };
/**
* 解析 response
* @param {*} res
* @returns
*/
const parseResponse = async (res) => {
if (!res) {
return null;
}
const contentType = res.headers.get("Content-Type");
if (contentType?.includes("json")) {
return await res.json();
} else if (contentType?.includes("audio")) {
const blob = await res.blob();
return await blobToBase64(blob);
}
return await res.text();
};
/**
* 查询 caches
* @param {*} input
* @param {*} param1
* @returns
*/
export const getHttpCache = async (input, { method, headers, body }) => {
try {
const req = await newCacheReq(input, { method, headers, body });
const cache = await caches.open(CACHE_NAME);
const res = await cache.match(req);
return parseResponse(res);
} catch (err) {
kissLog(err, "get cache");
}
return null;
};
/**
* 插入 caches
* @param {*} input
* @param {*} param1
* @param {*} res
*/
export const putHttpCache = async (input, { method, headers, body }, res) => {
try {
const req = await newCacheReq(input, { method, headers, body });
const cache = await caches.open(CACHE_NAME);
await cache.put(req, res);
} catch (err) {
kissLog(err, "put cache");
}
};
/**
* 处理请求
* @param {*} param0
* @returns
*/
export const fetchHandle = async ({
input,
useCache,
transOpts,
apiSetting,
...init
}) => {
// 发送请求
const res = await fetchPatcher(input, init, transOpts, apiSetting);
if (!res) {
throw new Error("Unknow error");
} else if (!res.ok) {
const msg = {
url: res.url,
status: res.status,
};
if (res.headers.get("Content-Type")?.includes("json")) {
msg.response = await res.json();
}
throw new Error(JSON.stringify(msg));
}
// 插入缓存
if (useCache) {
await putHttpCache(input, init, res.clone());
}
return parseResponse(res);
};
/**
* fetch 兼容性封装
* @param {*} args
* @returns
*/
export const fetchPolyfill = (args) => {
// 插件
if (isExt && !isBg()) {
return sendBgMsg(MSG_FETCH, args);
}
// 油猴/网页/BackgroundPage
return fetchHandle(args);
};
/**
* getHttpCache 兼容性封装
* @param {*} input
* @param {*} init
* @returns
*/
export const getHttpCachePolyfill = (input, init) => {
// 插件
if (isExt && !isBg()) {
return sendBgMsg(MSG_GET_HTTPCACHE, { input, init });
}
// 油猴/网页/BackgroundPage
return getHttpCache(input, init);
};
/** /**
* 请求池实例 * 请求池实例
*/ */
export const fetchPool = taskPool( export const fetchPool = taskPool(
fetchApi, fetchPolyfill,
null, null,
DEFAULT_FETCH_INTERVAL, DEFAULT_FETCH_INTERVAL,
DEFAULT_FETCH_LIMIT DEFAULT_FETCH_LIMIT
); );
/** /**
* 请求数据统一接口 * 数据请求
* @param {*} input * @param {*} input
* @param {*} opts * @param {*} param1
* @returns * @returns
*/ */
export const fetchData = async ( export const fetchData = async (input, { useCache, usePool, ...args } = {}) => {
input,
{ useCache, usePool, transOpts, apiSetting, ...init } = {}
) => {
const cacheReq = await newCacheReq(input, init);
let res;
// 查询缓存
if (useCache) {
try {
const cache = await caches.open(CACHE_NAME);
res = await cache.match(cacheReq);
} catch (err) {
kissLog(err, "cache match");
}
}
if (!res) {
// 发送请求
if (usePool) {
res = await fetchPool.push({ input, init, transOpts, apiSetting });
} else {
res = await fetchApi({ input, init, transOpts, apiSetting });
}
if (!res?.ok) {
const msg = {
url: input,
status: res.status,
};
if (res.headers.get("Content-Type")?.includes("json")) {
msg.response = await res.json();
}
throw new Error(JSON.stringify(msg));
}
// 插入缓存
if (useCache) {
try {
const cache = await caches.open(CACHE_NAME);
await cache.put(cacheReq, res.clone());
} catch (err) {
kissLog(err, "cache put");
}
}
}
const contentType = res.headers.get("Content-Type");
if (contentType?.includes("json")) {
return await res.json();
}
return await res.text();
};
/**
* fetch 兼容性封装
* @param {*} input
* @param {*} opts
* @returns
*/
export const fetchPolyfill = async (input, opts) => {
if (!input?.trim()) { if (!input?.trim()) {
throw new Error("URL is empty"); throw new Error("URL is empty");
} }
// 插件 // 查询缓存
if (isExt && !isBg()) { if (useCache) {
return await sendBgMsg(MSG_FETCH, { input, opts }); const cache = await getHttpCachePolyfill(input, args);
if (cache) {
return cache;
}
} }
// 油猴/网页/BackgroundPage // 通过任务池发送请求
return await fetchData(input, opts); if (usePool) {
return fetchPool.push({ input, useCache, ...args });
}
// 直接请求
return fetchPolyfill({ input, useCache, ...args });
}; };
/** /**
@@ -192,21 +278,13 @@ export const fetchPolyfill = async (input, opts) => {
* @param {*} interval * @param {*} interval
* @param {*} limit * @param {*} limit
*/ */
export const updateFetchPool = async (interval, limit) => { export const updateFetchPool = (interval, limit) => {
if (isExt) { fetchPool.update(interval, limit);
await sendBgMsg(MSG_FETCH_LIMIT, { interval, limit });
} else {
fetchPool.update(interval, limit);
}
}; };
/** /**
* 清空任务池 * 清空任务池
*/ */
export const clearFetchPool = async () => { export const clearFetchPool = () => {
if (isExt) { fetchPool.clear();
await sendBgMsg(MSG_FETCH_CLEAR);
} else {
fetchPool.clear();
}
}; };

16
src/libs/interpreter.js Normal file
View File

@@ -0,0 +1,16 @@
import Sval from "sval";
const interpreter = new Sval({
// ECMA Version of the code
// 3 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15
// or 2015 | 2016 | 2017 | 2018 | 2019 | 2020 | 2021 | 2022 | 2023 | 2024
// or "latest"
ecmaVer: "latest",
// Code source type
// "script" or "module"
sourceType: "script",
// Whether the code runs in a sandbox
sandBox: true,
});
export default interpreter;

View File

@@ -74,6 +74,9 @@ export const matchRule = async (
"injectJs", "injectJs",
"injectCss", "injectCss",
"fixerSelector", "fixerSelector",
"transStartHook",
"transEndHook",
"transRemoveHook",
].forEach((key) => { ].forEach((key) => {
if (!rule[key]?.trim()) { if (!rule[key]?.trim()) {
rule[key] = globalRule[key]; rule[key] = globalRule[key];
@@ -162,6 +165,9 @@ export const checkRules = (rules) => {
skipLangs, skipLangs,
fixerSelector, fixerSelector,
fixerFunc, fixerFunc,
transStartHook,
transEndHook,
transRemoveHook,
}) => ({ }) => ({
pattern: pattern.trim(), pattern: pattern.trim(),
selector: type(selector) === "string" ? selector : "", selector: type(selector) === "string" ? selector : "",
@@ -185,6 +191,10 @@ export const checkRules = (rules) => {
detectRemote: matchValue([GLOBAL_KEY, "true", "false"], detectRemote), detectRemote: matchValue([GLOBAL_KEY, "true", "false"], detectRemote),
skipLangs: type(skipLangs) === "array" ? skipLangs : [], skipLangs: type(skipLangs) === "array" ? skipLangs : [],
fixerSelector: type(fixerSelector) === "string" ? fixerSelector : "", fixerSelector: type(fixerSelector) === "string" ? fixerSelector : "",
transStartHook: type(transStartHook) === "string" ? transStartHook : "",
transEndHook: type(transEndHook) === "string" ? transEndHook : "",
transRemoveHook:
type(transRemoveHook) === "string" ? transRemoveHook : "",
fixerFunc: matchValue([GLOBAL_KEY, ...FIXER_ALL], fixerFunc), fixerFunc: matchValue([GLOBAL_KEY, ...FIXER_ALL], fixerFunc),
}) })
); );

View File

@@ -20,13 +20,14 @@ import {
import { apiSyncData } from "../apis"; import { apiSyncData } from "../apis";
import { sha256, removeEndchar } from "./utils"; import { sha256, removeEndchar } from "./utils";
import { createClient, getPatcher } from "webdav"; import { createClient, getPatcher } from "webdav";
import { fetchApi } from "./fetch"; import { fetchPatcher } from "./fetch";
import { kissLog } from "./log"; import { kissLog } from "./log";
getPatcher().patch("request", (opts) => { getPatcher().patch("request", (opts) => {
return fetchApi({ return fetchPatcher(opts.url, {
input: opts.url, method: opts.method,
init: { method: opts.method, headers: opts.headers, body: opts.data }, headers: opts.headers,
body: opts.data,
}); });
}); });

View File

@@ -25,6 +25,7 @@ import { sendBgMsg } from "./msg";
import { isExt } from "./client"; import { isExt } from "./client";
import { injectInlineJs, injectInternalCss } from "./injector"; import { injectInlineJs, injectInternalCss } from "./injector";
import { kissLog } from "./log"; import { kissLog } from "./log";
import interpreter from "./interpreter";
/** /**
* 翻译类 * 翻译类
@@ -58,11 +59,11 @@ export class Translator {
// 显示 // 显示
_interseObserver = new IntersectionObserver( _interseObserver = new IntersectionObserver(
(intersections) => { (entries, observer) => {
intersections.forEach((intersection) => { entries.forEach((entry) => {
if (intersection.isIntersecting) { if (entry.isIntersecting) {
this._render(intersection.target); observer.unobserve(entry.target);
this._interseObserver.unobserve(intersection.target); this._render(entry.target);
} }
}); });
}, },
@@ -405,6 +406,7 @@ export class Translator {
// 移除键盘监听 // 移除键盘监听
window.removeEventListener("keydown", this._handleKeydown); window.removeEventListener("keydown", this._handleKeydown);
const { transRemoveHook } = this._rule;
this._tranNodes.forEach((innerHTML, node) => { this._tranNodes.forEach((innerHTML, node) => {
if ( if (
!this._rule.transTiming || !this._rule.transTiming ||
@@ -420,10 +422,17 @@ export class Translator {
} }
// 移除/恢复元素 // 移除/恢复元素
if (innerHTML && this._rule.transOnly === "true") { if (innerHTML) {
node.innerHTML = innerHTML; if (this._rule.transOnly === "true") {
} else { node.innerHTML = innerHTML;
node.querySelector(APP_LCNAME)?.remove(); } else {
node.querySelector(APP_LCNAME)?.remove();
}
// 钩子函数
if (transRemoveHook?.trim()) {
interpreter.run(`exports.transRemoveHook = ${transRemoveHook}`);
interpreter.exports.transRemoveHook(node);
}
} }
}); });
@@ -490,6 +499,13 @@ export class Translator {
} }
const keeps = []; const keeps = [];
// 翻译开始钩子函数
const { transStartHook } = this._rule;
if (transStartHook?.trim()) {
interpreter.run(`exports.transStartHook = ${transStartHook}`);
interpreter.exports.transStartHook(el, q);
}
// 保留元素 // 保留元素
const [matchSelector, subSelector] = this._keepSelector; const [matchSelector, subSelector] = this._keepSelector;
if (matchSelector || subSelector) { if (matchSelector || subSelector) {
@@ -538,18 +554,22 @@ export class Translator {
} }
} }
traEl = document.createElement(APP_LCNAME); // 附加样式
traEl.style.visibility = "visible";
// if (this._rule.transOnly === "true") {
// el.innerHTML = "";
// }
const { selectStyle, parentStyle } = this._rule; const { selectStyle, parentStyle } = this._rule;
el.appendChild(traEl);
el.style.cssText += selectStyle; el.style.cssText += selectStyle;
if (el.parentElement) { if (el.parentElement) {
el.parentElement.style.cssText += parentStyle; el.parentElement.style.cssText += parentStyle;
} }
// 插入译文节点
traEl = document.createElement(APP_LCNAME);
traEl.style.visibility = "visible";
// if (this._rule.transOnly === "true") {
// el.innerHTML = "";
// }
el.appendChild(traEl);
// 渲染译文节点
const root = createRoot(traEl); const root = createRoot(traEl);
root.render(<Content q={q} keeps={keeps} translator={this} $el={el} />); root.render(<Content q={q} keeps={keeps} translator={this} $el={el} />);
}; };

View File

@@ -202,26 +202,20 @@ export const removeEndchar = (s, c, count = 1) => {
* @returns * @returns
*/ */
export const matchInputStr = (str, sign) => { export const matchInputStr = (str, sign) => {
let reg = /\/([\w-]+)\s+([^]+)/;
switch (sign) { switch (sign) {
case "//": case "//":
reg = /\/\/([\w-]+)\s+([^]+)/; return str.match(/\/\/([\w-]+)\s+([^]+)/);
break;
case "\\": case "\\":
reg = /\\([\w-]+)\s+([^]+)/; return str.match(/\\([\w-]+)\s+([^]+)/);
break;
case "\\\\": case "\\\\":
reg = /\\\\([\w-]+)\s+([^]+)/; return str.match(/\\\\([\w-]+)\s+([^]+)/);
break;
case ">": case ">":
reg = />([\w-]+)\s+([^]+)/; return str.match(/>([\w-]+)\s+([^]+)/);
break;
case ">>": case ">>":
reg = />>([\w-]+)\s+([^]+)/; return str.match(/>>([\w-]+)\s+([^]+)/);
break;
default: default:
} }
return str.match(reg); return str.match(/\/([\w-]+)\s+([^]+)/);
}; };
/** /**
@@ -233,3 +227,16 @@ export const isValidWord = (str) => {
const regex = /^[a-zA-Z-]+$/; const regex = /^[a-zA-Z-]+$/;
return regex.test(str); return regex.test(str);
}; };
/**
* blob转为base64
* @param {*} blob
* @returns
*/
export const blobToBase64 = (blob) => {
return new Promise((resolve) => {
const reader = new FileReader();
reader.onloadend = () => resolve(reader.result);
reader.readAsDataURL(blob);
});
};

View File

@@ -22,6 +22,7 @@ import {
import { shortcutRegister } from "../../libs/shortcut"; import { shortcutRegister } from "../../libs/shortcut";
import { sendIframeMsg } from "../../libs/iframe"; import { sendIframeMsg } from "../../libs/iframe";
import { kissLog } from "../../libs/log"; import { kissLog } from "../../libs/log";
import { getI18n } from "../../hooks/I18n";
export default function Action({ translator, fab }) { export default function Action({ translator, fab }) {
const fabWidth = 40; const fabWidth = 40;
@@ -96,11 +97,11 @@ export default function Action({ translator, fab }) {
// 注册菜单 // 注册菜单
try { try {
const menuCommandIds = []; const menuCommandIds = [];
const { contextMenuType } = translator.setting; const { contextMenuType, uiLang } = translator.setting;
contextMenuType !== 0 && contextMenuType !== 0 &&
menuCommandIds.push( menuCommandIds.push(
GM.registerMenuCommand( GM.registerMenuCommand(
"Toggle Translate", getI18n(uiLang, "translate_switch"),
(event) => { (event) => {
translator.toggle(); translator.toggle();
sendIframeMsg(MSG_TRANS_TOGGLE); sendIframeMsg(MSG_TRANS_TOGGLE);
@@ -109,7 +110,7 @@ export default function Action({ translator, fab }) {
"Q" "Q"
), ),
GM.registerMenuCommand( GM.registerMenuCommand(
"Toggle Style", getI18n(uiLang, "toggle_style"),
(event) => { (event) => {
translator.toggleStyle(); translator.toggleStyle();
sendIframeMsg(MSG_TRANS_TOGGLE_STYLE); sendIframeMsg(MSG_TRANS_TOGGLE_STYLE);
@@ -118,14 +119,14 @@ export default function Action({ translator, fab }) {
"C" "C"
), ),
GM.registerMenuCommand( GM.registerMenuCommand(
"Open Menu", getI18n(uiLang, "open_menu"),
(event) => { (event) => {
setShowPopup((pre) => !pre); setShowPopup((pre) => !pre);
}, },
"K" "K"
), ),
GM.registerMenuCommand( GM.registerMenuCommand(
"Open Setting", getI18n(uiLang, "open_setting"),
(event) => { (event) => {
window.open(process.env.REACT_APP_OPTIONSPAGE, "_blank"); window.open(process.env.REACT_APP_OPTIONSPAGE, "_blank");
}, },

View File

@@ -15,6 +15,7 @@ import {
import { useTranslate } from "../../hooks/Translate"; import { useTranslate } from "../../hooks/Translate";
import { styled, css } from "@mui/material/styles"; import { styled, css } from "@mui/material/styles";
import { APP_LCNAME } from "../../config"; import { APP_LCNAME } from "../../config";
import interpreter from "../../libs/interpreter";
const LINE_STYLES = { const LINE_STYLES = {
[OPT_STYLE_LINE]: "solid", [OPT_STYLE_LINE]: "solid",
@@ -85,8 +86,15 @@ const StyledSpan = styled("span")`
export default function Content({ q, keeps, translator, $el }) { export default function Content({ q, keeps, translator, $el }) {
const [rule, setRule] = useState(translator.rule); const [rule, setRule] = useState(translator.rule);
const { text, sameLang, loading } = useTranslate(q, rule, translator.setting); const { text, sameLang, loading } = useTranslate(q, rule, translator.setting);
const { transOpen, textStyle, bgColor, textDiyStyle, transOnly, transTag } = const {
rule; transOpen,
textStyle,
bgColor,
textDiyStyle,
transOnly,
transTag,
transEndHook,
} = rule;
const { newlineLength } = translator.setting; const { newlineLength } = translator.setting;
@@ -107,6 +115,14 @@ export default function Content({ q, keeps, translator, $el }) {
}; };
}, [translator.eventName]); }, [translator.eventName]);
useEffect(() => {
// 运行钩子函数
if (text && transEndHook?.trim()) {
interpreter.run(`exports.transEndHook = ${transEndHook}`);
interpreter.exports.transEndHook($el, q, text, keeps);
}
}, [$el, q, text, keeps, transEndHook]);
const gap = useMemo(() => { const gap = useMemo(() => {
if (transOnly === "true") { if (transOnly === "true") {
return ""; return "";

View File

@@ -1,19 +1,27 @@
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import CircularProgress from "@mui/material/CircularProgress"; import LoadingButton from "@mui/lab/LoadingButton";
import { import {
OPT_TRANS_ALL, OPT_TRANS_ALL,
OPT_TRANS_MICROSOFT, OPT_TRANS_MICROSOFT,
OPT_TRANS_DEEPL, OPT_TRANS_DEEPL,
OPT_TRANS_DEEPLX,
OPT_TRANS_DEEPLFREE, OPT_TRANS_DEEPLFREE,
OPT_TRANS_BAIDU, OPT_TRANS_BAIDU,
OPT_TRANS_TENCENT, OPT_TRANS_TENCENT,
OPT_TRANS_OPENAI, OPT_TRANS_OPENAI,
OPT_TRANS_OPENAI_2,
OPT_TRANS_OPENAI_3,
OPT_TRANS_GEMINI, OPT_TRANS_GEMINI,
OPT_TRANS_CLOUDFLAREAI, OPT_TRANS_CLOUDFLAREAI,
OPT_TRANS_OLLAMA,
OPT_TRANS_OLLAMA_2,
OPT_TRANS_OLLAMA_3,
OPT_TRANS_CUSTOMIZE, OPT_TRANS_CUSTOMIZE,
OPT_TRANS_NIUTRANS,
URL_KISS_PROXY, URL_KISS_PROXY,
URL_NIUTRANS_REG,
DEFAULT_FETCH_LIMIT, DEFAULT_FETCH_LIMIT,
DEFAULT_FETCH_INTERVAL, DEFAULT_FETCH_INTERVAL,
} from "../../config"; } from "../../config";
@@ -62,14 +70,24 @@ function TestButton({ translator, api }) {
alert.error( alert.error(
<> <>
<div>{i18n("test_failed")}</div> <div>{i18n("test_failed")}</div>
<pre {msg === err.message ? (
style={{ <div
maxWidth: 400, style={{
overflow: "auto", maxWidth: 400,
}} }}
> >
{msg} {msg}
</pre> </div>
) : (
<pre
style={{
maxWidth: 400,
overflow: "auto",
}}
>
{msg}
</pre>
)}
</> </>
); );
} finally { } finally {
@@ -77,14 +95,15 @@ function TestButton({ translator, api }) {
} }
}; };
if (loading) {
return <CircularProgress size={16} />;
}
return ( return (
<Button size="small" variant="contained" onClick={handleApiTest}> <LoadingButton
size="small"
variant="contained"
onClick={handleApiTest}
loading={loading}
>
{i18n("click_test")} {i18n("click_test")}
</Button> </LoadingButton>
); );
} }
@@ -98,6 +117,10 @@ function ApiFields({ translator }) {
prompt = "", prompt = "",
fetchLimit = DEFAULT_FETCH_LIMIT, fetchLimit = DEFAULT_FETCH_LIMIT,
fetchInterval = DEFAULT_FETCH_INTERVAL, fetchInterval = DEFAULT_FETCH_INTERVAL,
dictNo = "",
memoryNo = "",
reqHook = "",
resHook = "",
} = api; } = api;
const handleChange = (e) => { const handleChange = (e) => {
@@ -116,7 +139,7 @@ function ApiFields({ translator }) {
}); });
}; };
const buildinTranslators = [ const builtinTranslators = [
OPT_TRANS_MICROSOFT, OPT_TRANS_MICROSOFT,
OPT_TRANS_DEEPLFREE, OPT_TRANS_DEEPLFREE,
OPT_TRANS_BAIDU, OPT_TRANS_BAIDU,
@@ -126,13 +149,33 @@ function ApiFields({ translator }) {
const mulkeysTranslators = [ const mulkeysTranslators = [
OPT_TRANS_DEEPL, OPT_TRANS_DEEPL,
OPT_TRANS_OPENAI, OPT_TRANS_OPENAI,
OPT_TRANS_OPENAI_2,
OPT_TRANS_OPENAI_3,
OPT_TRANS_GEMINI, OPT_TRANS_GEMINI,
OPT_TRANS_CLOUDFLAREAI, OPT_TRANS_CLOUDFLAREAI,
OPT_TRANS_OLLAMA,
OPT_TRANS_OLLAMA_2,
OPT_TRANS_OLLAMA_3,
OPT_TRANS_NIUTRANS,
]; ];
const keyHelper =
translator === OPT_TRANS_NIUTRANS ? (
<>
{i18n("mulkeys_help")}
<Link href={URL_NIUTRANS_REG} target="_blank">
{i18n("reg_niutrans")}
</Link>
</>
) : mulkeysTranslators.includes(translator) ? (
i18n("mulkeys_help")
) : (
""
);
return ( return (
<Stack spacing={3}> <Stack spacing={3}>
{!buildinTranslators.includes(translator) && ( {!builtinTranslators.includes(translator) && (
<> <>
<TextField <TextField
size="small" size="small"
@@ -140,6 +183,11 @@ function ApiFields({ translator }) {
name="url" name="url"
value={url} value={url}
onChange={handleChange} onChange={handleChange}
multiline={translator === OPT_TRANS_DEEPLX}
maxRows={10}
helperText={
translator === OPT_TRANS_DEEPLX ? i18n("mulkeys_help") : ""
}
/> />
<TextField <TextField
size="small" size="small"
@@ -148,16 +196,15 @@ function ApiFields({ translator }) {
value={key} value={key}
onChange={handleChange} onChange={handleChange}
multiline={mulkeysTranslators.includes(translator)} multiline={mulkeysTranslators.includes(translator)}
helperText={ maxRows={10}
mulkeysTranslators.includes(translator) helperText={keyHelper}
? i18n("mulkeys_help")
: ""
}
/> />
</> </>
)} )}
{(translator === OPT_TRANS_OPENAI || translator === OPT_TRANS_GEMINI) && ( {(translator.startsWith(OPT_TRANS_OPENAI) ||
translator.startsWith(OPT_TRANS_OLLAMA) ||
translator === OPT_TRANS_GEMINI) && (
<> <>
<TextField <TextField
size="small" size="small"
@@ -173,6 +220,49 @@ function ApiFields({ translator }) {
value={prompt} value={prompt}
onChange={handleChange} onChange={handleChange}
multiline multiline
maxRows={10}
/>
</>
)}
{translator === OPT_TRANS_NIUTRANS && (
<>
<TextField
size="small"
label={"DictNo"}
name="dictNo"
value={dictNo}
onChange={handleChange}
/>
<TextField
size="small"
label={"MemoryNo"}
name="memoryNo"
value={memoryNo}
onChange={handleChange}
/>
</>
)}
{translator.startsWith(OPT_TRANS_CUSTOMIZE) && (
<>
<TextField
size="small"
label={"Request Hook"}
name="reqHook"
value={reqHook}
onChange={handleChange}
multiline
maxRows={10}
/>
<TextField
size="small"
label={"Response Hook"}
name="resHook"
value={resHook}
onChange={handleChange}
multiline
maxRows={10}
/> />
</> </>
)} )}
@@ -208,7 +298,7 @@ function ApiFields({ translator }) {
</Button> </Button>
</Stack> </Stack>
{translator === OPT_TRANS_CUSTOMIZE && ( {translator.startsWith(OPT_TRANS_CUSTOMIZE) && (
<pre>{i18n("custom_api_help")}</pre> <pre>{i18n("custom_api_help")}</pre>
)} )}
</Stack> </Stack>

View File

@@ -1,10 +1,15 @@
import FileDownloadIcon from "@mui/icons-material/FileDownload"; import FileDownloadIcon from "@mui/icons-material/FileDownload";
import Button from "@mui/material/Button"; import LoadingButton from "@mui/lab/LoadingButton";
import { useState } from "react";
import { kissLog } from "../../libs/log";
export default function DownloadButton({ data, text, fileName }) { export default function DownloadButton({ handleData, text, fileName }) {
const handleClick = (e) => { const [loading, setLoading] = useState(false);
const handleClick = async (e) => {
e.preventDefault(); e.preventDefault();
if (data) { try {
setLoading(true);
const data = await handleData();
const url = window.URL.createObjectURL(new Blob([data])); const url = window.URL.createObjectURL(new Blob([data]));
const link = document.createElement("a"); const link = document.createElement("a");
link.href = url; link.href = url;
@@ -12,16 +17,21 @@ export default function DownloadButton({ data, text, fileName }) {
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
link.remove(); link.remove();
} catch (err) {
kissLog(err, "download");
} finally {
setLoading(false);
} }
}; };
return ( return (
<Button <LoadingButton
size="small" size="small"
variant="outlined" variant="outlined"
onClick={handleClick} onClick={handleClick}
loading={loading}
startIcon={<FileDownloadIcon />} startIcon={<FileDownloadIcon />}
> >
{text} {text}
</Button> </LoadingButton>
); );
} }

View File

@@ -1,6 +1,5 @@
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import { OPT_TRANS_BAIDU } from "../../config"; import { useState } from "react";
import { useEffect, useState } from "react";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import Accordion from "@mui/material/Accordion"; import Accordion from "@mui/material/Accordion";
import AccordionSummary from "@mui/material/AccordionSummary"; import AccordionSummary from "@mui/material/AccordionSummary";
@@ -8,53 +7,18 @@ import AccordionDetails from "@mui/material/AccordionDetails";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import Alert from "@mui/material/Alert";
import { apiTranslate } from "../../apis";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import { useFavWords } from "../../hooks/FavWords"; import { useFavWords } from "../../hooks/FavWords";
import DictCont from "../Selection/DictCont"; import DictCont from "../Selection/DictCont";
import SugCont from "../Selection/SugCont";
import DownloadButton from "./DownloadButton"; import DownloadButton from "./DownloadButton";
import UploadButton from "./UploadButton"; import UploadButton from "./UploadButton";
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import ClearAllIcon from "@mui/icons-material/ClearAll"; import ClearAllIcon from "@mui/icons-material/ClearAll";
import { isValidWord } from "../../libs/utils"; import { isValidWord } from "../../libs/utils";
import { kissLog } from "../../libs/log"; import { kissLog } from "../../libs/log";
import { apiTranslate } from "../../apis";
function DictField({ word }) { import { OPT_TRANS_BAIDU, PHONIC_MAP } from "../../config";
const [dictResult, setDictResult] = useState(null);
const [loading, setLoading] = useState(false);
const [error, setError] = useState("");
useEffect(() => {
(async () => {
try {
setLoading(true);
setError("");
const dictRes = await apiTranslate({
text: word,
translator: OPT_TRANS_BAIDU,
fromLang: "en",
toLang: "zh-CN",
});
dictRes[2].type === 1 && setDictResult(JSON.parse(dictRes[2].result));
} catch (err) {
setError(err.message);
} finally {
setLoading(false);
}
})();
}, [word]);
if (loading) {
return <CircularProgress size={24} />;
}
if (error) {
return <Alert severity="error">{error}</Alert>;
}
return <DictCont dictResult={dictResult} />;
}
function FavAccordion({ word, index }) { function FavAccordion({ word, index }) {
const [expanded, setExpanded] = useState(false); const [expanded, setExpanded] = useState(false);
@@ -72,7 +36,12 @@ function FavAccordion({ word, index }) {
<Typography>{`${index + 1}. ${word}`}</Typography> <Typography>{`${index + 1}. ${word}`}</Typography>
</AccordionSummary> </AccordionSummary>
<AccordionDetails> <AccordionDetails>
{expanded && <DictField word={word} />} {expanded && (
<Stack spacing={2}>
<DictCont text={word} />
<SugCont text={word} />
</Stack>
)}
</AccordionDetails> </AccordionDetails>
</Accordion> </Accordion>
); );
@@ -98,6 +67,45 @@ export default function FavWords() {
} }
}; };
const handleTranslation = async () => {
const tranList = [];
for (const text of downloadList) {
try {
const dictRes = await apiTranslate({
text,
translator: OPT_TRANS_BAIDU,
fromLang: "en",
toLang: "zh-CN",
});
if (dictRes[2]?.type === 1) {
tranList.push(JSON.parse(dictRes[2].result));
}
} catch (err) {
// skip
}
}
return tranList
.map((dictResult) =>
[
`## ${dictResult.src}`,
dictResult.voice
?.map(Object.entries)
.map((item) => item[0])
.map(([key, val]) => `${PHONIC_MAP[key]?.[0] || key} ${val}`)
.join(" "),
dictResult.content[0].mean
.map(({ pre, cont }) => {
return ` - ${pre ? `[${pre}] ` : ""}${Object.keys(cont).join(
"; "
)}`;
})
.join("\n"),
].join("\n\n")
)
.join("\n\n");
};
return ( return (
<Box> <Box>
<Stack spacing={3}> <Stack spacing={3}>
@@ -115,10 +123,15 @@ export default function FavWords() {
fileExts={[".txt", ".csv"]} fileExts={[".txt", ".csv"]}
/> />
<DownloadButton <DownloadButton
data={downloadList.join("\n")} handleData={() => downloadList.join("\n")}
text={i18n("export")} text={i18n("export")}
fileName={`kiss-words_${Date.now()}.txt`} fileName={`kiss-words_${Date.now()}.txt`}
/> />
<DownloadButton
handleData={handleTranslation}
text={i18n("export_translation")}
fileName={`kiss-words_${Date.now()}.md`}
/>
<Button <Button
size="small" size="small"
variant="outlined" variant="outlined"

View File

@@ -97,6 +97,9 @@ function RuleFields({ rule, rules, setShow, setKeyword }) {
skipLangs = [], skipLangs = [],
fixerSelector = "", fixerSelector = "",
fixerFunc = "-", fixerFunc = "-",
transStartHook = "",
transEndHook = "",
transRemoveHook = "",
} = formValues; } = formValues;
const hasSamePattern = (str) => { const hasSamePattern = (str) => {
@@ -366,7 +369,7 @@ function RuleFields({ rule, rules, setShow, setKeyword }) {
fullWidth fullWidth
name="transTiming" name="transTiming"
value={transTiming} value={transTiming}
label={i18n("translate_timing")} label={i18n("trigger_mode")}
disabled={disabled} disabled={disabled}
onChange={handleChange} onChange={handleChange}
> >
@@ -458,6 +461,7 @@ function RuleFields({ rule, rules, setShow, setKeyword }) {
disabled={disabled} disabled={disabled}
onChange={handleChange} onChange={handleChange}
multiline multiline
maxRows={10}
/> />
<TextField <TextField
@@ -468,6 +472,7 @@ function RuleFields({ rule, rules, setShow, setKeyword }) {
disabled={disabled} disabled={disabled}
onChange={handleChange} onChange={handleChange}
multiline multiline
maxRows={10}
/> />
<TextField <TextField
select select
@@ -487,6 +492,40 @@ function RuleFields({ rule, rules, setShow, setKeyword }) {
))} ))}
</TextField> </TextField>
<TextField
size="small"
label={i18n("translate_start_hook")}
helperText={i18n("translate_start_hook_helper")}
name="transStartHook"
value={transStartHook}
disabled={disabled}
onChange={handleChange}
multiline
maxRows={10}
/>
<TextField
size="small"
label={i18n("translate_end_hook")}
helperText={i18n("translate_end_hook_helper")}
name="transEndHook"
value={transEndHook}
disabled={disabled}
onChange={handleChange}
multiline
maxRows={10}
/>
<TextField
size="small"
label={i18n("translate_remove_hook")}
helperText={i18n("translate_remove_hook_helper")}
name="transRemoveHook"
value={transRemoveHook}
disabled={disabled}
onChange={handleChange}
multiline
maxRows={10}
/>
<TextField <TextField
size="small" size="small"
label={i18n("selector_style")} label={i18n("selector_style")}
@@ -776,7 +815,7 @@ function UserRules({ subRules }) {
<UploadButton text={i18n("import")} handleImport={handleImport} /> <UploadButton text={i18n("import")} handleImport={handleImport} />
<DownloadButton <DownloadButton
data={JSON.stringify([...rules.list].reverse(), null, 2)} handleData={() => JSON.stringify([...rules.list].reverse(), null, 2)}
text={i18n("export")} text={i18n("export")}
fileName={`kiss-rules_${Date.now()}.json`} fileName={`kiss-rules_${Date.now()}.json`}
/> />

View File

@@ -22,13 +22,17 @@ import {
OPT_SHORTCUT_POPUP, OPT_SHORTCUT_POPUP,
OPT_SHORTCUT_SETTING, OPT_SHORTCUT_SETTING,
DEFAULT_BLACKLIST, DEFAULT_BLACKLIST,
DEFAULT_CSPLIST,
MSG_CONTEXT_MENUS, MSG_CONTEXT_MENUS,
MSG_UPDATE_CSP,
} from "../../config"; } from "../../config";
import { useShortcut } from "../../hooks/Shortcut"; import { useShortcut } from "../../hooks/Shortcut";
import ShortcutInput from "./ShortcutInput"; import ShortcutInput from "./ShortcutInput";
import { useFab } from "../../hooks/Fab"; import { useFab } from "../../hooks/Fab";
import { sendBgMsg } from "../../libs/msg"; import { sendBgMsg } from "../../libs/msg";
import { kissLog } from "../../libs/log"; import { kissLog } from "../../libs/log";
import UploadButton from "./UploadButton";
import DownloadButton from "./DownloadButton";
function ShortcutItem({ action, label }) { function ShortcutItem({ action, label }) {
const { shortcut, setShortcut } = useShortcut(action); const { shortcut, setShortcut } = useShortcut(action);
@@ -69,7 +73,10 @@ export default function Settings() {
value = limitNumber(value, 0, 4); value = limitNumber(value, 0, 4);
break; break;
case "contextMenuType": case "contextMenuType":
isExt && sendBgMsg(MSG_CONTEXT_MENUS, { contextMenuType: value }); isExt && sendBgMsg(MSG_CONTEXT_MENUS, value);
break;
case "csplist":
isExt && sendBgMsg(MSG_UPDATE_CSP, value);
break; break;
default: default:
} }
@@ -87,6 +94,14 @@ export default function Settings() {
} }
}; };
const handleImport = async (data) => {
try {
await updateSetting(JSON.parse(data));
} catch (err) {
kissLog(err, "import setting");
}
};
const { const {
uiLang, uiLang,
minLength, minLength,
@@ -96,6 +111,7 @@ export default function Settings() {
contextMenuType = 1, contextMenuType = 1,
touchTranslate = 2, touchTranslate = 2,
blacklist = DEFAULT_BLACKLIST.join(",\n"), blacklist = DEFAULT_BLACKLIST.join(",\n"),
csplist = DEFAULT_CSPLIST.join(",\n"),
transInterval = 500, transInterval = 500,
} = setting; } = setting;
const { isHide = false } = fab || {}; const { isHide = false } = fab || {};
@@ -103,6 +119,21 @@ export default function Settings() {
return ( return (
<Box> <Box>
<Stack spacing={3}> <Stack spacing={3}>
<Stack
direction="row"
alignItems="center"
spacing={2}
useFlexGap
flexWrap="wrap"
>
<UploadButton text={i18n("import")} handleImport={handleImport} />
<DownloadButton
handleData={() => JSON.stringify(setting, null, 2)}
text={i18n("export")}
fileName={`kiss-setting_${Date.now()}.json`}
/>
</Stack>
<FormControl size="small"> <FormControl size="small">
<InputLabel>{i18n("ui_lang")}</InputLabel> <InputLabel>{i18n("ui_lang")}</InputLabel>
<Select <Select
@@ -219,6 +250,18 @@ export default function Settings() {
</Link> </Link>
</FormHelperText> </FormHelperText>
</FormControl> </FormControl>
<TextField
size="small"
label={i18n("disabled_csplist")}
helperText={
i18n("pattern_helper") + " " + i18n("disabled_csplist_helper")
}
name="csplist"
defaultValue={csplist}
onChange={handleChange}
multiline
/>
</> </>
) : ( ) : (
<> <>
@@ -260,6 +303,7 @@ export default function Settings() {
name="blacklist" name="blacklist"
defaultValue={blacklist} defaultValue={blacklist}
onChange={handleChange} onChange={handleChange}
maxRows={10}
multiline multiline
/> />
</Stack> </Stack>

View File

@@ -6,6 +6,7 @@ import { useSync } from "../../hooks/Sync";
import Alert from "@mui/material/Alert"; import Alert from "@mui/material/Alert";
import Link from "@mui/material/Link"; import Link from "@mui/material/Link";
import MenuItem from "@mui/material/MenuItem"; import MenuItem from "@mui/material/MenuItem";
import LoadingButton from "@mui/lab/LoadingButton";
import { import {
URL_KISS_WORKER, URL_KISS_WORKER,
OPT_SYNCTYPE_ALL, OPT_SYNCTYPE_ALL,
@@ -14,10 +15,8 @@ import {
} from "../../config"; } from "../../config";
import { useState } from "react"; import { useState } from "react";
import { syncSettingAndRules } from "../../libs/sync"; import { syncSettingAndRules } from "../../libs/sync";
import Button from "@mui/material/Button";
import { useAlert } from "../../hooks/Alert"; import { useAlert } from "../../hooks/Alert";
import SyncIcon from "@mui/icons-material/Sync"; import SyncIcon from "@mui/icons-material/Sync";
import CircularProgress from "@mui/material/CircularProgress";
import { useSetting } from "../../hooks/Setting"; import { useSetting } from "../../hooks/Setting";
import { kissLog } from "../../libs/log"; import { kissLog } from "../../libs/log";
@@ -123,16 +122,16 @@ export default function SyncSetting() {
useFlexGap useFlexGap
flexWrap="wrap" flexWrap="wrap"
> >
<Button <LoadingButton
size="small" size="small"
variant="contained" variant="contained"
disabled={!syncUrl || !syncKey || loading} disabled={!syncUrl || !syncKey || loading}
onClick={handleSyncTest} onClick={handleSyncTest}
startIcon={<SyncIcon />} startIcon={<SyncIcon />}
loading={loading}
> >
{i18n("sync_now")} {i18n("sync_now")}
</Button> </LoadingButton>
{loading && <CircularProgress size={16} />}
</Stack> </Stack>
</Stack> </Stack>
</Box> </Box>

View File

@@ -3,7 +3,13 @@ import Stack from "@mui/material/Stack";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import MenuItem from "@mui/material/MenuItem"; import MenuItem from "@mui/material/MenuItem";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import { OPT_TRANS_ALL, OPT_LANGS_FROM, OPT_LANGS_TO } from "../../config"; import {
OPT_TRANS_ALL,
OPT_LANGS_FROM,
OPT_LANGS_TO,
OPT_TRANBOX_TRIGGER_CLICK,
OPT_TRANBOX_TRIGGER_ALL,
} from "../../config";
import ShortcutInput from "./ShortcutInput"; import ShortcutInput from "./ShortcutInput";
import FormControlLabel from "@mui/material/FormControlLabel"; import FormControlLabel from "@mui/material/FormControlLabel";
import Switch from "@mui/material/Switch"; import Switch from "@mui/material/Switch";
@@ -21,10 +27,10 @@ export default function Tranbox() {
let { name, value } = e.target; let { name, value } = e.target;
switch (name) { switch (name) {
case "btnOffsetX": case "btnOffsetX":
value = limitNumber(value, 0, 100);
break;
case "btnOffsetY": case "btnOffsetY":
value = limitNumber(value, 0, 100); case "boxOffsetX":
case "boxOffsetY":
value = limitNumber(value, -200, 200);
break; break;
default: default:
} }
@@ -49,7 +55,14 @@ export default function Tranbox() {
tranboxShortcut, tranboxShortcut,
btnOffsetX, btnOffsetX,
btnOffsetY, btnOffsetY,
boxOffsetX = 0,
boxOffsetY = 10,
hideTranBtn = false, hideTranBtn = false,
hideClickAway = false,
simpleStyle = false,
followSelection = false,
triggerMode = OPT_TRANBOX_TRIGGER_CLICK,
extStyles = "",
} = tranboxSetting; } = tranboxSetting;
return ( return (
@@ -148,6 +161,24 @@ export default function Tranbox() {
onChange={handleChange} onChange={handleChange}
/> />
<TextField
size="small"
label={i18n("tranbox_offset_x")}
type="number"
name="boxOffsetX"
defaultValue={boxOffsetX}
onChange={handleChange}
/>
<TextField
size="small"
label={i18n("tranbox_offset_y")}
type="number"
name="boxOffsetY"
defaultValue={boxOffsetY}
onChange={handleChange}
/>
<TextField <TextField
select select
size="small" size="small"
@@ -160,6 +191,67 @@ export default function Tranbox() {
<MenuItem value={true}>{i18n("hide")}</MenuItem> <MenuItem value={true}>{i18n("hide")}</MenuItem>
</TextField> </TextField>
<TextField
select
size="small"
name="hideClickAway"
value={hideClickAway}
label={i18n("hide_click_away")}
onChange={handleChange}
>
<MenuItem value={false}>{i18n("disable")}</MenuItem>
<MenuItem value={true}>{i18n("enable")}</MenuItem>
</TextField>
<TextField
select
size="small"
name="simpleStyle"
value={simpleStyle}
label={i18n("use_simple_style")}
onChange={handleChange}
>
<MenuItem value={false}>{i18n("disable")}</MenuItem>
<MenuItem value={true}>{i18n("enable")}</MenuItem>
</TextField>
<TextField
select
size="small"
name="followSelection"
value={followSelection}
label={i18n("follow_selection")}
onChange={handleChange}
>
<MenuItem value={false}>{i18n("disable")}</MenuItem>
<MenuItem value={true}>{i18n("enable")}</MenuItem>
</TextField>
<TextField
select
size="small"
name="triggerMode"
value={triggerMode}
label={i18n("trigger_mode")}
onChange={handleChange}
>
{OPT_TRANBOX_TRIGGER_ALL.map((item) => (
<MenuItem key={item} value={item}>
{i18n(`trigger_${item}`)}
</MenuItem>
))}
</TextField>
<TextField
size="small"
label={i18n("extend_styles")}
name="extStyles"
defaultValue={extStyles}
onChange={handleChange}
maxRows={10}
multiline
/>
{!isExt && ( {!isExt && (
<ShortcutInput <ShortcutInput
value={tranboxShortcut} value={tranboxShortcut}

View File

@@ -81,15 +81,9 @@ export default function Options() {
<Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}> <Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL}>
Install/Update Userscript for Tampermonkey/Violentmonkey Install/Update Userscript for Tampermonkey/Violentmonkey
</Link> </Link>
{/* <Link href={process.env.REACT_APP_USERSCRIPT_DOWNLOADURL2}>
Install/Update Userscript for Tampermonkey/Violentmonkey 2
</Link> */}
<Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL}> <Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL}>
Install/Update Userscript for iOS Safari Install/Update Userscript for iOS Safari
</Link> </Link>
{/* <Link href={process.env.REACT_APP_USERSCRIPT_IOS_DOWNLOADURL2}>
Install/Update Userscript for iOS Safari 2
</Link> */}
</Stack> </Stack>
</center> </center>
); );

View File

@@ -0,0 +1,29 @@
import IconButton from "@mui/material/IconButton";
import VolumeUpIcon from "@mui/icons-material/VolumeUp";
import { useTextAudio } from "../../hooks/Audio";
export default function AudioBtn({ text, lan = "uk" }) {
const { error, ready, playing, onPlay } = useTextAudio(text, lan);
if (error || !ready) {
return (
<IconButton disabled size="small">
<VolumeUpIcon fontSize="inherit" />
</IconButton>
);
}
if (playing) {
return (
<IconButton color="primary" size="small">
<VolumeUpIcon fontSize="inherit" />
</IconButton>
);
}
return (
<IconButton onClick={onPlay} size="small">
<VolumeUpIcon fontSize="inherit" />
</IconButton>
);
}

View File

@@ -1,48 +1,115 @@
import Box from "@mui/material/Box"; import { useState, useEffect } from "react";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import FavBtn from "./FavBtn"; import FavBtn from "./FavBtn";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import AudioBtn from "./AudioBtn";
import CircularProgress from "@mui/material/CircularProgress";
import Alert from "@mui/material/Alert";
import { OPT_TRANS_BAIDU, PHONIC_MAP } from "../../config";
import { apiTranslate } from "../../apis";
import { isValidWord } from "../../libs/utils";
import CopyBtn from "./CopyBtn";
const phonicMap = { export default function DictCont({ text }) {
en_phonic: "英", const [loading, setLoading] = useState(true);
us_phonic: "", const [error, setError] = useState("");
}; const [dictResult, setDictResult] = useState(null);
export default function DictCont({ dictResult }) { useEffect(() => {
if (!dictResult) { (async () => {
try {
setLoading(true);
setError("");
setDictResult(null);
if (!isValidWord(text)) {
return;
}
const dictRes = await apiTranslate({
text,
translator: OPT_TRANS_BAIDU,
fromLang: "en",
toLang: "zh-CN",
});
if (dictRes[2]?.type === 1) {
setDictResult(JSON.parse(dictRes[2].result));
}
} catch (err) {
setError(err.message);
} finally {
setLoading(false);
}
})();
}, [text]);
if (error) {
return <Alert severity="error">{error}</Alert>;
}
if (loading) {
return <CircularProgress size={16} />;
}
if (!text || !dictResult) {
return; return;
} }
const copyText = [
dictResult.src,
dictResult.voice
?.map(Object.entries)
.map((item) => item[0])
.map(([key, val]) => `${PHONIC_MAP[key]?.[0] || key} ${val}`)
.join(" "),
dictResult.content[0].mean
.map(({ pre, cont }) => {
return `${pre ? `[${pre}] ` : ""}${Object.keys(cont).join("; ")}`;
})
.join("\n"),
].join("\n");
return ( return (
<Box> <Stack className="KT-transbox-dict" spacing={1}>
<Stack <Stack direction="row" justifyContent="space-between">
direction="row"
justifyContent="space-between"
alignItems="flex-start"
>
<Typography variant="subtitle1" style={{ fontWeight: "bold" }}> <Typography variant="subtitle1" style={{ fontWeight: "bold" }}>
{dictResult.src} {dictResult.src}
</Typography> </Typography>
<FavBtn word={dictResult.src} /> <Stack direction="row" justifyContent="space-between">
<CopyBtn text={copyText} />
<FavBtn word={dictResult.src} />
</Stack>
</Stack> </Stack>
<Typography component="div"> <Typography component="div">
<Typography> <Typography component="div">
{dictResult.voice {dictResult.voice
?.map(Object.entries) ?.map(Object.entries)
.map((item) => item[0]) .map((item) => item[0])
.map(([key, val]) => `${phonicMap[key] || key} ${val}`) .map(([key, val]) => (
.join(" ")} <Typography
component="div"
key={key}
style={{ display: "inline-block" }}
>
<Typography component="span">{`${
PHONIC_MAP[key]?.[0] || key
} ${val}`}</Typography>
<AudioBtn text={dictResult.src} lan={PHONIC_MAP[key]?.[1]} />
</Typography>
))}
</Typography> </Typography>
<ul style={{ margin: "0.5em 0" }}>
<Typography component="ul">
{dictResult.content[0].mean.map(({ pre, cont }, idx) => ( {dictResult.content[0].mean.map(({ pre, cont }, idx) => (
<li key={idx}> <Typography component="li" key={idx}>
{pre && `[${pre}] `} {pre && `[${pre}] `}
{Object.keys(cont).join("; ")} {Object.keys(cont).join("; ")}
</li> </Typography>
))} ))}
</ul> </Typography>
</Typography> </Typography>
</Box> </Stack>
); );
} }

View File

@@ -1,65 +0,0 @@
import Box from "@mui/material/Box";
import Chip from "@mui/material/Chip";
import Stack from "@mui/material/Stack";
import FavBtn from "./FavBtn";
import Typography from "@mui/material/Typography";
const exchangeMap = {
word_third: "第三人称单数",
word_ing: "现在分词",
word_done: "过去式",
word_past: "过去分词",
word_pl: "复数",
word_proto: "词源",
};
export default function DictCont({ dictResult }) {
if (!dictResult) {
return;
}
return (
<Box>
<Stack
direction="row"
justifyContent="space-between"
alignItems="flex-start"
>
<Typography variant="subtitle1" style={{ fontWeight: "bold" }}>
{dictResult.simple_means?.word_name}
</Typography>
<FavBtn word={dictResult.simple_means?.word_name} />
</Stack>
{dictResult.simple_means?.symbols?.map(({ ph_en, ph_am, parts }, idx) => (
<Typography key={idx} component="div">
{(ph_en || ph_am) && (
<Typography>{`英 /${ph_en || ""}/ 美 /${ph_am || ""}/`}</Typography>
)}
<ul style={{ margin: "0.5em 0" }}>
{parts.map(({ part, means }, idx) => (
<li key={idx}>
{part ? `[${part}] ${means.join("; ")}` : means.join("; ")}
</li>
))}
</ul>
</Typography>
))}
<Typography>
{Object.entries(dictResult.simple_means?.exchange || {})
.map(([key, val]) => `${exchangeMap[key] || key}: ${val.join(", ")}`)
.join("; ")}
</Typography>
<Stack direction="row" spacing={1} flexWrap="wrap" useFlexGap>
{Object.values(dictResult.simple_means?.tags || {})
.flat()
.filter((item) => item)
.map((item) => (
<Chip label={item} size="small" />
))}
</Stack>
</Box>
);
}

View File

@@ -1,4 +1,4 @@
import { useEffect, useState } from "react"; import { useState } from "react";
import Paper from "@mui/material/Paper"; import Paper from "@mui/material/Paper";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import { isMobile } from "../../libs/mobile"; import { isMobile } from "../../libs/mobile";
@@ -130,11 +130,11 @@ function Pointer({
export default function DraggableResizable({ export default function DraggableResizable({
header, header,
children, children,
defaultPosition = { position = {
x: 0, x: 0,
y: 0, y: 0,
}, },
defaultSize = { size = {
w: 600, w: 600,
h: 400, h: 400,
}, },
@@ -146,13 +146,13 @@ export default function DraggableResizable({
w: 1200, w: 1200,
h: 1200, h: 1200,
}, },
setSize,
setPosition,
onChangeSize, onChangeSize,
onChangePosition, onChangePosition,
...props
}) { }) {
const lineWidth = 4; const lineWidth = 4;
const [position, setPosition] = useState(defaultPosition);
const [size, setSize] = useState(defaultSize);
const opts = { const opts = {
size, size,
setSize, setSize,
@@ -162,16 +162,9 @@ export default function DraggableResizable({
maxSize, maxSize,
}; };
useEffect(() => {
onChangeSize && onChangeSize(size);
}, [size, onChangeSize]);
useEffect(() => {
onChangePosition && onChangePosition(position);
}, [position, onChangePosition]);
return ( return (
<Box <Box
className="KT-draggable"
style={{ style={{
touchAction: "none", touchAction: "none",
position: "fixed", position: "fixed",
@@ -182,6 +175,7 @@ export default function DraggableResizable({
gridTemplateRows: `${lineWidth * 2}px auto ${lineWidth * 2}px`, gridTemplateRows: `${lineWidth * 2}px auto ${lineWidth * 2}px`,
zIndex: 2147483647, zIndex: 2147483647,
}} }}
{...props}
> >
<Pointer <Pointer
direction="TopLeft" direction="TopLeft"
@@ -217,11 +211,17 @@ export default function DraggableResizable({
}} }}
{...opts} {...opts}
/> />
<Paper elevation={4}> <Paper className="KT-draggable-body" elevation={4}>
<Pointer direction="Header" style={{ cursor: "move" }} {...opts}> <Pointer
className="KT-draggable-header"
direction="Header"
style={{ cursor: "move" }}
{...opts}
>
{header} {header}
</Pointer> </Pointer>
<div <Box
className="KT-draggable-container"
style={{ style={{
width: size.w, width: size.w,
height: size.h, height: size.h,
@@ -229,7 +229,7 @@ export default function DraggableResizable({
}} }}
> >
{children} {children}
</div> </Box>
</Paper> </Paper>
<Pointer <Pointer
direction="Right" direction="Right"

View File

@@ -1,17 +1,35 @@
import Box from "@mui/material/Box"; import { useState, useEffect } from "react";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import { apiBaiduSuggest } from "../../apis";
import Stack from "@mui/material/Stack";
export default function SugCont({ text }) {
const [sugs, setSugs] = useState([]);
useEffect(() => {
(async () => {
try {
setSugs(await apiBaiduSuggest(text));
} catch (err) {
// skip
}
})();
}, [text]);
if (sugs.length === 0) {
return;
}
export default function SugCont({ sugs }) {
return ( return (
<Box> <Stack className="KT-transbox-sug" spacing={1}>
{sugs.map(({ k, v }) => ( {sugs.map(({ k, v }) => (
<Typography component="div" key={k}> <Typography component="div" key={k}>
<Typography>{k}</Typography> <Typography>{k}</Typography>
<ul style={{ margin: "0" }}> <Typography component="ul" style={{ margin: "0" }}>
<li>{v}</li> <Typography component="li">{v}</Typography>
</ul> </Typography>
</Typography> </Typography>
))} ))}
</Box> </Stack>
); );
} }

View File

@@ -1,7 +1,6 @@
import { SettingProvider } from "../../hooks/Setting"; import { SettingProvider } from "../../hooks/Setting";
import ThemeProvider from "../../hooks/Theme"; import ThemeProvider from "../../hooks/Theme";
import DraggableResizable from "./DraggableResizable"; import DraggableResizable from "./DraggableResizable";
import Header from "../Popup/Header";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import MenuItem from "@mui/material/MenuItem"; import MenuItem from "@mui/material/MenuItem";
@@ -10,13 +9,99 @@ import Box from "@mui/material/Box";
import Divider from "@mui/material/Divider"; import Divider from "@mui/material/Divider";
import IconButton from "@mui/material/IconButton"; import IconButton from "@mui/material/IconButton";
import DoneIcon from "@mui/icons-material/Done"; import DoneIcon from "@mui/icons-material/Done";
import DragIndicatorIcon from "@mui/icons-material/DragIndicator";
import UnfoldLessIcon from "@mui/icons-material/UnfoldLess";
import UnfoldMoreIcon from "@mui/icons-material/UnfoldMore";
import PushPinIcon from "@mui/icons-material/PushPin";
import PushPinOutlinedIcon from "@mui/icons-material/PushPinOutlined";
import LockIcon from "@mui/icons-material/Lock";
import LockOpenIcon from "@mui/icons-material/LockOpen";
import CloseIcon from "@mui/icons-material/Close";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import { OPT_TRANS_ALL, OPT_LANGS_FROM, OPT_LANGS_TO } from "../../config"; import { OPT_TRANS_ALL, OPT_LANGS_FROM, OPT_LANGS_TO } from "../../config";
import { useState, useRef } from "react"; import { useState, useRef } from "react";
import TranCont from "./TranCont"; import TranCont from "./TranCont";
import DictCont from "./DictCont";
import SugCont from "./SugCont";
import CopyBtn from "./CopyBtn"; import CopyBtn from "./CopyBtn";
import { isValidWord } from "../../libs/utils";
import { isMobile } from "../../libs/mobile";
function TranForm({ text, setText, tranboxSetting, transApis }) { function Header({
setShowPopup,
simpleStyle,
setSimpleStyle,
hideClickAway,
setHideClickAway,
followSelection,
setFollowSelection,
mouseHover,
}) {
if (!isMobile && simpleStyle && !mouseHover) {
return;
}
return (
<Box
className="KT-transbox-header"
onMouseUp={(e) => e.stopPropagation()}
onTouchEnd={(e) => e.stopPropagation()}
>
<Stack direction="row" justifyContent="space-between" alignItems="center">
<DragIndicatorIcon fontSize="small" />
<Stack direction="row" alignItems="center">
<IconButton
size="small"
onClick={() => {
setHideClickAway((pre) => !pre);
}}
>
{hideClickAway ? (
<LockOpenIcon fontSize="small" />
) : (
<LockIcon fontSize="small" />
)}
</IconButton>
<IconButton
size="small"
onClick={() => {
setFollowSelection((pre) => !pre);
}}
>
{followSelection ? (
<PushPinOutlinedIcon fontSize="small" />
) : (
<PushPinIcon fontSize="small" />
)}
</IconButton>
<IconButton
size="small"
onClick={() => {
setSimpleStyle((pre) => !pre);
}}
>
{simpleStyle ? (
<UnfoldMoreIcon fontSize="small" />
) : (
<UnfoldLessIcon fontSize="small" />
)}
</IconButton>
<IconButton
size="small"
onClick={() => {
setShowPopup(false);
}}
>
<CloseIcon fontSize="small" />
</IconButton>
</Stack>
</Stack>
<Divider />
</Box>
);
}
function TranForm({ text, setText, tranboxSetting, transApis, simpleStyle }) {
const i18n = useI18n(); const i18n = useI18n();
const [editMode, setEditMode] = useState(false); const [editMode, setEditMode] = useState(false);
@@ -24,138 +109,144 @@ function TranForm({ text, setText, tranboxSetting, transApis }) {
const [translator, setTranslator] = useState(tranboxSetting.translator); const [translator, setTranslator] = useState(tranboxSetting.translator);
const [fromLang, setFromLang] = useState(tranboxSetting.fromLang); const [fromLang, setFromLang] = useState(tranboxSetting.fromLang);
const [toLang, setToLang] = useState(tranboxSetting.toLang); const [toLang, setToLang] = useState(tranboxSetting.toLang);
const [toLang2, setToLang2] = useState(tranboxSetting.toLang2);
const inputRef = useRef(null); const inputRef = useRef(null);
return ( return (
<Stack sx={{ p: 2 }} spacing={2}> <Stack
<Box> className="KT-transbox-container"
<Grid container spacing={2} columns={12}> sx={{ p: simpleStyle ? 1 : 2 }}
<Grid item xs={4} sm={4} md={4} lg={4}> spacing={simpleStyle ? 1 : 2}
<TextField >
select {!simpleStyle && (
SelectProps={{ MenuProps: { disablePortal: true } }} <>
fullWidth <Box className="KT-transbox-select">
size="small" <Grid container spacing={simpleStyle ? 1 : 2} columns={12}>
name="fromLang" <Grid item xs={4} sm={4} md={4} lg={4}>
value={fromLang} <TextField
label={i18n("from_lang")} select
onChange={(e) => { SelectProps={{ MenuProps: { disablePortal: true } }}
setFromLang(e.target.value); fullWidth
}} size="small"
> name="fromLang"
{OPT_LANGS_FROM.map(([lang, name]) => ( value={fromLang}
<MenuItem key={lang} value={lang}> label={i18n("from_lang")}
{name} onChange={(e) => {
</MenuItem> setFromLang(e.target.value);
))} }}
</TextField> >
</Grid> {OPT_LANGS_FROM.map(([lang, name]) => (
<Grid item xs={4} sm={4} md={4} lg={4}> <MenuItem key={lang} value={lang}>
<TextField {name}
select </MenuItem>
SelectProps={{ MenuProps: { disablePortal: true } }} ))}
fullWidth </TextField>
size="small" </Grid>
name="toLang" <Grid item xs={4} sm={4} md={4} lg={4}>
value={toLang} <TextField
label={i18n("to_lang")} select
onChange={(e) => { SelectProps={{ MenuProps: { disablePortal: true } }}
setToLang(e.target.value); fullWidth
}} size="small"
> name="toLang"
{OPT_LANGS_TO.map(([lang, name]) => ( value={toLang}
<MenuItem key={lang} value={lang}> label={i18n("to_lang")}
{name} onChange={(e) => {
</MenuItem> setToLang(e.target.value);
))} }}
</TextField> >
</Grid> {OPT_LANGS_TO.map(([lang, name]) => (
<Grid item xs={4} sm={4} md={4} lg={4}> <MenuItem key={lang} value={lang}>
<TextField {name}
select </MenuItem>
SelectProps={{ MenuProps: { disablePortal: true } }} ))}
fullWidth </TextField>
size="small" </Grid>
value={translator} <Grid item xs={4} sm={4} md={4} lg={4}>
name="translator" <TextField
label={i18n("translate_service")} select
onChange={(e) => { SelectProps={{ MenuProps: { disablePortal: true } }}
setTranslator(e.target.value); fullWidth
}} size="small"
> value={translator}
{OPT_TRANS_ALL.map((item) => ( name="translator"
<MenuItem key={item} value={item}> label={i18n("translate_service")}
{item} onChange={(e) => {
</MenuItem> setTranslator(e.target.value);
))} }}
</TextField> >
</Grid> {OPT_TRANS_ALL.map((item) => (
</Grid> <MenuItem key={item} value={item}>
</Box> {item}
</MenuItem>
))}
</TextField>
</Grid>
</Grid>
</Box>
<Box> <Box className="KT-transbox-origin">
<TextField <TextField
size="small" size="small"
label={i18n("original_text")} label={i18n("original_text")}
inputRef={inputRef} inputRef={inputRef}
fullWidth fullWidth
multiline multiline
value={editMode ? editText : text} value={editMode ? editText : text}
disabled={!editMode} onChange={(e) => {
onChange={(e) => { setEditText(e.target.value);
setEditText(e.target.value); }}
}} onFocus={() => {
onClick={() => { setEditMode(true);
setEditMode(true); setEditText(text);
setEditText(text); }}
const timer = setTimeout(() => { onBlur={() => {
clearTimeout(timer); setEditMode(false);
inputRef.current?.focus(); setText(editText.trim());
}, 100); }}
}} InputProps={{
onBlur={() => { endAdornment: (
setEditMode(false); <Stack
setText(editText.trim()); direction="row"
}} sx={{
InputProps={{ position: "absolute",
endAdornment: ( right: 0,
<Stack top: 0,
direction="row"
sx={{
position: "absolute",
right: 0,
top: 0,
}}
>
{editMode ? (
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
}} }}
> >
<DoneIcon fontSize="inherit" /> {editMode ? (
</IconButton> <IconButton
) : ( size="small"
<CopyBtn text={text} /> onClick={(e) => {
)} e.stopPropagation();
</Stack> }}
), >
}} <DoneIcon fontSize="inherit" />
/> </IconButton>
</Box> ) : (
<CopyBtn text={text} />
)}
</Stack>
),
}}
/>
</Box>
</>
)}
<TranCont {(!simpleStyle || !isValidWord(text) || !toLang.startsWith("zh")) && (
text={text} <TranCont
translator={translator} text={text}
fromLang={fromLang} translator={translator}
toLang={toLang} fromLang={fromLang}
toLang2={toLang2} toLang={toLang}
setToLang={setToLang} toLang2={tranboxSetting.toLang2}
setToLang2={setToLang2} transApis={transApis}
transApis={transApis} simpleStyle={simpleStyle}
/> />
)}
<DictCont text={text} />
<SugCont text={text} />
</Stack> </Stack>
); );
} }
@@ -170,23 +261,45 @@ export default function TranBox({
setBoxSize, setBoxSize,
boxPosition, boxPosition,
setBoxPosition, setBoxPosition,
simpleStyle,
setSimpleStyle,
hideClickAway,
setHideClickAway,
followSelection,
setFollowSelection,
extStyles,
}) { }) {
const [mouseHover, setMouseHover] = useState(false);
return ( return (
<SettingProvider> <SettingProvider>
<ThemeProvider> <ThemeProvider styles={extStyles}>
<DraggableResizable <DraggableResizable
defaultPosition={boxPosition} position={boxPosition}
defaultSize={boxSize} size={boxSize}
header={<Header setShowPopup={setShowBox} />} setSize={setBoxSize}
onChangeSize={setBoxSize} setPosition={setBoxPosition}
onChangePosition={setBoxPosition} header={
<Header
setShowPopup={setShowBox}
simpleStyle={simpleStyle}
setSimpleStyle={setSimpleStyle}
hideClickAway={hideClickAway}
setHideClickAway={setHideClickAway}
followSelection={followSelection}
setFollowSelection={setFollowSelection}
mouseHover={mouseHover}
/>
}
onClick={(e) => e.stopPropagation()}
onMouseEnter={() => setMouseHover(true)}
onMouseLeave={() => setMouseHover(false)}
> >
<Divider />
<TranForm <TranForm
text={text} text={text}
setText={setText} setText={setText}
tranboxSetting={tranboxSetting} tranboxSetting={tranboxSetting}
transApis={transApis} transApis={transApis}
simpleStyle={simpleStyle}
/> />
</DraggableResizable> </DraggableResizable>
</ThemeProvider> </ThemeProvider>

View File

@@ -1,32 +1,33 @@
import { isMobile } from "../../libs/mobile"; import { isMobile } from "../../libs/mobile";
import { limitNumber } from "../../libs/utils";
export default function TranBtn({ onClick, position, tranboxSetting }) { export default function TranBtn({
const left = position.x + tranboxSetting.btnOffsetX; onTrigger,
const top = position.y + tranboxSetting.btnOffsetY; btnEvent,
position,
const touchProps = isMobile btnOffsetX,
? { btnOffsetY,
onTouchEnd: onClick, }) {
} const left = limitNumber(position.x + btnOffsetX, 0, window.innerWidth - 32);
: { const top = limitNumber(position.y + btnOffsetY, 0, window.innerHeight - 32);
onMouseUp: onClick,
};
return ( return (
<div <div
className="KT-tranbtn"
style={{ style={{
cursor: "pointer", cursor: "pointer",
position: "absolute", // position: "absolute",
position: "fixed",
left, left,
top, top,
zIndex: 2147483647, zIndex: 2147483647,
}} }}
{...touchProps} {...{ [btnEvent]: onTrigger }}
> >
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="20" width={isMobile ? "32" : "20"}
height="20" height={isMobile ? "32" : "20"}
viewBox="0 0 32 32" viewBox="0 0 32 32"
version="1.1" version="1.1"
> >

View File

@@ -1,16 +1,14 @@
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import Alert from "@mui/material/Alert";
import CircularProgress from "@mui/material/CircularProgress"; import CircularProgress from "@mui/material/CircularProgress";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import { useI18n } from "../../hooks/I18n"; import { useI18n } from "../../hooks/I18n";
import { DEFAULT_TRANS_APIS, OPT_TRANS_BAIDU } from "../../config"; import { DEFAULT_TRANS_APIS } from "../../config";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { apiTranslate, apiBaiduLangdetect, apiBaiduSuggest } from "../../apis"; import { apiTranslate, apiBaiduLangdetect } from "../../apis";
import { isValidWord } from "../../libs/utils";
import CopyBtn from "./CopyBtn"; import CopyBtn from "./CopyBtn";
import DictCont from "./DictCont"; import Typography from "@mui/material/Typography";
import SugCont from "./SugCont"; import Alert from "@mui/material/Alert";
export default function TranCont({ export default function TranCont({
text, text,
@@ -18,16 +16,13 @@ export default function TranCont({
fromLang, fromLang,
toLang, toLang,
toLang2 = "en", toLang2 = "en",
setToLang,
setToLang2,
transApis, transApis,
simpleStyle,
}) { }) {
const i18n = useI18n(); const i18n = useI18n();
const [trText, setTrText] = useState(""); const [trText, setTrText] = useState("");
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(true);
const [error, setError] = useState(""); const [error, setError] = useState("");
const [dictResult, setDictResult] = useState(null);
const [sugs, setSugs] = useState([]);
useEffect(() => { useEffect(() => {
(async () => { (async () => {
@@ -35,100 +30,73 @@ export default function TranCont({
setLoading(true); setLoading(true);
setTrText(""); setTrText("");
setError(""); setError("");
setDictResult(null);
setSugs([]);
// 互译 let to = toLang;
if (toLang !== toLang2 && toLang2 !== "none") { if (toLang !== toLang2 && toLang2 !== "none") {
const detectLang = await apiBaiduLangdetect(text); const detectLang = await apiBaiduLangdetect(text);
if (detectLang === toLang) { if (detectLang === toLang) {
setToLang(toLang2); to = toLang2;
setToLang2(toLang);
return;
} }
} }
// 翻译
const apiSetting = const apiSetting =
transApis[translator] || DEFAULT_TRANS_APIS[translator]; transApis[translator] || DEFAULT_TRANS_APIS[translator];
const tranRes = await apiTranslate({ const tranRes = await apiTranslate({
text, text,
translator, translator,
fromLang, fromLang,
toLang, toLang: to,
apiSetting, apiSetting,
}); });
setTrText(tranRes[0]); setTrText(tranRes[0]);
// 词典
if (isValidWord(text) && toLang.startsWith("zh")) {
if (fromLang === "en" && translator === OPT_TRANS_BAIDU) {
tranRes[2].type === 1 &&
setDictResult(JSON.parse(tranRes[2].result));
} else {
const dictRes = await apiTranslate({
text,
translator: OPT_TRANS_BAIDU,
fromLang: "en",
toLang: "zh-CN",
});
dictRes[2].type === 1 &&
setDictResult(JSON.parse(dictRes[2].result));
}
}
// 建议
if (text.length < 20) {
setSugs(await apiBaiduSuggest(text));
}
} catch (err) { } catch (err) {
setError(err.message); setError(err.message);
} finally { } finally {
setLoading(false); setLoading(false);
} }
})(); })();
}, [ }, [text, translator, fromLang, toLang, toLang2, transApis]);
text,
translator, if (simpleStyle) {
fromLang, return (
toLang, <Box className="KT-transbox-target KT-transbox-target_simple">
toLang2, {error ? (
setToLang, <Alert severity="error">{error}</Alert>
setToLang2, ) : loading ? (
transApis, <CircularProgress size={16} />
]); ) : (
<Typography style={{ whiteSpace: "pre-line" }}>{trText}</Typography>
)}
</Box>
);
}
return ( return (
<> <Box className="KT-transbox-target KT-transbox-target_default">
<Box> <TextField
<TextField size="small"
size="small" label={i18n("translated_text")}
label={i18n("translated_text")} // disabled
// disabled fullWidth
fullWidth multiline
multiline value={trText}
value={trText} helperText={error}
InputProps={{ InputProps={{
endAdornment: ( startAdornment: loading ? <CircularProgress size={16} /> : null,
<Stack endAdornment: (
direction="row" <Stack
sx={{ direction="row"
position: "absolute", sx={{
right: 0, position: "absolute",
top: 0, right: 0,
}} top: 0,
> }}
<CopyBtn text={trText} /> >
</Stack> <CopyBtn text={trText} />
), </Stack>
}} ),
/> }}
</Box> />
</Box>
{loading && <CircularProgress size={24} />}
{error && <Alert severity="error">{error}</Alert>}
{dictResult && <DictCont dictResult={dictResult} />}
{sugs.length > 0 && <SugCont sugs={sugs} />}
</>
); );
} }

View File

@@ -1,21 +1,50 @@
import { useState, useEffect, useCallback } from "react"; import { useState, useEffect, useCallback, useMemo } from "react";
import TranBtn from "./TranBtn"; import TranBtn from "./TranBtn";
import TranBox from "./TranBox"; import TranBox from "./TranBox";
import { shortcutRegister } from "../../libs/shortcut"; import { shortcutRegister } from "../../libs/shortcut";
import { sleep, limitNumber } from "../../libs/utils"; import { sleep, limitNumber } from "../../libs/utils";
import { isGm, isExt } from "../../libs/client"; import { isGm, isExt } from "../../libs/client";
import { MSG_OPEN_TRANBOX, DEFAULT_TRANBOX_SHORTCUT } from "../../config"; import {
MSG_OPEN_TRANBOX,
DEFAULT_TRANBOX_SHORTCUT,
OPT_TRANBOX_TRIGGER_CLICK,
OPT_TRANBOX_TRIGGER_HOVER,
OPT_TRANBOX_TRIGGER_SELECT,
} from "../../config";
import { isMobile } from "../../libs/mobile"; import { isMobile } from "../../libs/mobile";
import { kissLog } from "../../libs/log"; import { kissLog } from "../../libs/log";
import { useLangMap } from "../../hooks/I18n";
export default function Slection({ export default function Slection({
contextMenuType, contextMenuType,
tranboxSetting, tranboxSetting,
transApis, transApis,
uiLang,
}) { }) {
const boxWidth = limitNumber(window.innerWidth, 300, 600); const {
const boxHeight = limitNumber(window.innerHeight, 200, 400); hideTranBtn = false,
simpleStyle: initSimpleStyle = false,
hideClickAway: initHideClickAway = false,
followSelection: initFollowMouse = false,
tranboxShortcut = DEFAULT_TRANBOX_SHORTCUT,
triggerMode = OPT_TRANBOX_TRIGGER_CLICK,
extStyles,
btnOffsetX,
btnOffsetY,
boxOffsetX = 0,
boxOffsetY = 10,
} = tranboxSetting;
const boxWidth =
isMobile || initSimpleStyle
? 300
: limitNumber(window.innerWidth, 300, 600);
const boxHeight =
isMobile || initSimpleStyle
? 200
: limitNumber(window.innerHeight, 200, 400);
const langMap = useLangMap(uiLang);
const [showBox, setShowBox] = useState(false); const [showBox, setShowBox] = useState(false);
const [showBtn, setShowBtn] = useState(false); const [showBtn, setShowBtn] = useState(false);
const [selectedText, setSelText] = useState(""); const [selectedText, setSelText] = useState("");
@@ -29,72 +58,113 @@ export default function Slection({
x: (window.innerWidth - boxWidth) / 2, x: (window.innerWidth - boxWidth) / 2,
y: (window.innerHeight - boxHeight) / 2, y: (window.innerHeight - boxHeight) / 2,
}); });
const [simpleStyle, setSimpleStyle] = useState(initSimpleStyle);
const [hideClickAway, setHideClickAway] = useState(initHideClickAway);
const [followSelection, setFollowSelection] = useState(initFollowMouse);
const handleClick = (e) => { const handleTrigger = useCallback(
e.stopPropagation(); (text) => {
setShowBtn(false);
setShowBtn(false); setText(text || selectedText);
setText(selectedText); setShowBox(true);
setShowBox(true); },
}; [selectedText]
);
const handleTranbox = useCallback(() => { const handleTranbox = useCallback(() => {
setShowBtn(false); setShowBtn(false);
const selectedText = window.getSelection()?.toString()?.trim() || ""; const selection = window.getSelection();
const selectedText = selection?.toString()?.trim() || "";
if (!selectedText) { if (!selectedText) {
setShowBox((pre) => !pre); setShowBox((pre) => !pre);
return; return;
} }
const rect = selection?.getRangeAt(0)?.getBoundingClientRect();
if (rect && followSelection) {
const x = (rect.left + rect.right) / 2 + boxOffsetX;
const y = rect.bottom + boxOffsetY;
setBoxPosition({
x: limitNumber(x, 0, window.innerWidth - 300),
y: limitNumber(y, 0, window.innerHeight - 200),
});
}
setSelText(selectedText); setSelText(selectedText);
setText(selectedText); setText(selectedText);
setShowBox(true); setShowBox(true);
}, []); }, [followSelection, boxOffsetX, boxOffsetY]);
const btnEvent = useMemo(() => {
if (isMobile) {
return "onTouchEnd";
} else if (triggerMode === OPT_TRANBOX_TRIGGER_HOVER) {
return "onMouseOver";
}
return "onMouseUp";
}, [triggerMode]);
useEffect(() => { useEffect(() => {
async function handleMouseup(e) { async function handleMouseup(e) {
e.stopPropagation(); e.stopPropagation();
await sleep(10); await sleep(200);
const selectedText = window.getSelection()?.toString()?.trim() || ""; const selection = window.getSelection();
const selectedText = selection?.toString()?.trim() || "";
setSelText(selectedText); setSelText(selectedText);
if (!selectedText) { if (!selectedText) {
setShowBtn(false); setShowBtn(false);
return; return;
} }
const { pageX, pageY } = isMobile ? e.changedTouches[0] : e; const rect = selection?.getRangeAt(0)?.getBoundingClientRect();
!tranboxSetting.hideTranBtn && setShowBtn(true); if (rect && followSelection) {
// setPosition({ x: e.clientX, y: e.clientY }); const x = (rect.left + rect.right) / 2 + boxOffsetX;
setPosition({ x: pageX, y: pageY }); const y = rect.bottom + boxOffsetY;
setBoxPosition({
x: limitNumber(x, 0, window.innerWidth - 300),
y: limitNumber(y, 0, window.innerHeight - 200),
});
}
if (triggerMode === OPT_TRANBOX_TRIGGER_SELECT) {
handleTrigger(selectedText);
return;
}
const { clientX, clientY } = isMobile ? e.changedTouches[0] : e;
setShowBtn(!hideTranBtn);
setPosition({ x: clientX, y: clientY });
} }
// todo: mobile support // todo: mobile support
window.addEventListener("mouseup", handleMouseup); // window.addEventListener("mouseup", handleMouseup);
// window.addEventListener(isMobile ? "touchend" : "mouseup", handleMouseup); window.addEventListener(isMobile ? "touchend" : "mouseup", handleMouseup);
return () => { return () => {
window.removeEventListener( window.removeEventListener(
isMobile ? "touchend" : "mouseup", isMobile ? "touchend" : "mouseup",
handleMouseup handleMouseup
); );
}; };
}, [tranboxSetting.hideTranBtn]); }, [
hideTranBtn,
triggerMode,
followSelection,
boxOffsetX,
boxOffsetY,
handleTrigger,
]);
useEffect(() => { useEffect(() => {
if (isExt) { if (isExt) {
return; return;
} }
const clearShortcut = shortcutRegister(tranboxShortcut, handleTranbox);
const clearShortcut = shortcutRegister(
tranboxSetting.tranboxShortcut || DEFAULT_TRANBOX_SHORTCUT,
handleTranbox
);
return () => { return () => {
clearShortcut(); clearShortcut();
}; };
}, [tranboxSetting.tranboxShortcut, handleTranbox]); }, [tranboxShortcut, handleTranbox]);
useEffect(() => { useEffect(() => {
window.addEventListener(MSG_OPEN_TRANBOX, handleTranbox); window.addEventListener(MSG_OPEN_TRANBOX, handleTranbox);
@@ -114,7 +184,7 @@ export default function Slection({
contextMenuType !== 0 && contextMenuType !== 0 &&
menuCommandIds.push( menuCommandIds.push(
GM.registerMenuCommand( GM.registerMenuCommand(
"Translate Selected Text", langMap("translate_selected_text"),
(event) => { (event) => {
handleTranbox(); handleTranbox();
}, },
@@ -130,7 +200,19 @@ export default function Slection({
} catch (err) { } catch (err) {
kissLog(err, "registerMenuCommand"); kissLog(err, "registerMenuCommand");
} }
}, [handleTranbox, contextMenuType]); }, [handleTranbox, contextMenuType, langMap]);
useEffect(() => {
if (hideClickAway) {
const handleHideBox = () => {
setShowBox(false);
};
window.addEventListener("click", handleHideBox);
return () => {
window.removeEventListener("click", handleHideBox);
};
}
}, [hideClickAway]);
return ( return (
<> <>
@@ -145,14 +227,26 @@ export default function Slection({
tranboxSetting={tranboxSetting} tranboxSetting={tranboxSetting}
transApis={transApis} transApis={transApis}
setShowBox={setShowBox} setShowBox={setShowBox}
simpleStyle={simpleStyle}
setSimpleStyle={setSimpleStyle}
hideClickAway={hideClickAway}
setHideClickAway={setHideClickAway}
followSelection={followSelection}
setFollowSelection={setFollowSelection}
extStyles={extStyles}
/> />
)} )}
{showBtn && ( {showBtn && (
<TranBtn <TranBtn
position={position} position={position}
tranboxSetting={tranboxSetting} btnOffsetX={btnOffsetX}
onClick={handleClick} btnOffsetY={btnOffsetY}
btnEvent={btnEvent}
onTrigger={(e) => {
e.stopPropagation();
handleTrigger();
}}
/> />
)} )}
</> </>