Merge remote-tracking branch 'origin/master' into dev

.obsidian/app.json

@@ -0,0 +1 @@
+{}

.obsidian/appearance.json

@@ -0,0 +1 @@
+{}

.obsidian/core-plugins.json

@@ -0,0 +1,31 @@
+{
+  "file-explorer": true,
+  "global-search": true,
+  "switcher": true,
+  "graph": true,
+  "backlink": true,
+  "canvas": true,
+  "outgoing-link": true,
+  "tag-pane": true,
+  "properties": false,
+  "page-preview": true,
+  "daily-notes": true,
+  "templates": true,
+  "note-composer": true,
+  "command-palette": true,
+  "slash-command": false,
+  "editor-status": true,
+  "bookmarks": true,
+  "markdown-importer": false,
+  "zk-prefixer": false,
+  "random-note": false,
+  "outline": true,
+  "word-count": true,
+  "slides": false,
+  "audio-recorder": false,
+  "workspaces": false,
+  "file-recovery": true,
+  "publish": false,
+  "sync": true,
+  "webviewer": false
+}

.obsidian/workspace.json

@@ -0,0 +1,171 @@
+{
+  "main": {
+    "id": "cbf891568fc78c43",
+    "type": "split",
+    "children": [
+      {
+        "id": "d124d5a918f363e6",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "eccb24c47a38046a",
+            "type": "leaf",
+            "state": {
+              "type": "empty",
+              "state": {},
+              "icon": "lucide-file",
+              "title": "新标签页"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "vertical"
+  },
+  "left": {
+    "id": "a206b20e17a47143",
+    "type": "split",
+    "children": [
+      {
+        "id": "8eaf7247916eb675",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "acbe859844e3c61f",
+            "type": "leaf",
+            "state": {
+              "type": "file-explorer",
+              "state": {
+                "sortOrder": "alphabetical",
+                "autoReveal": false
+              },
+              "icon": "lucide-folder-closed",
+              "title": "文件列表"
+            }
+          },
+          {
+            "id": "a26def8dfef6d24f",
+            "type": "leaf",
+            "state": {
+              "type": "search",
+              "state": {
+                "query": "",
+                "matchingCase": false,
+                "explainSearch": false,
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical"
+              },
+              "icon": "lucide-search",
+              "title": "搜索"
+            }
+          },
+          {
+            "id": "c9eb9713b8d21b0a",
+            "type": "leaf",
+            "state": {
+              "type": "bookmarks",
+              "state": {},
+              "icon": "lucide-bookmark",
+              "title": "书签"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300
+  },
+  "right": {
+    "id": "03abd16995f706d4",
+    "type": "split",
+    "children": [
+      {
+        "id": "4fc6c366e2698f0a",
+        "type": "tabs",
+        "children": [
+          {
+            "id": "1cdf7d3b425ea21f",
+            "type": "leaf",
+            "state": {
+              "type": "backlink",
+              "state": {
+                "collapseAll": false,
+                "extraContext": false,
+                "sortOrder": "alphabetical",
+                "showSearch": false,
+                "searchQuery": "",
+                "backlinkCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-coming-in",
+              "title": "反向链接"
+            }
+          },
+          {
+            "id": "3e09334caaeb6973",
+            "type": "leaf",
+            "state": {
+              "type": "outgoing-link",
+              "state": {
+                "linksCollapsed": false,
+                "unlinkedCollapsed": true
+              },
+              "icon": "links-going-out",
+              "title": "出链"
+            }
+          },
+          {
+            "id": "672281771c8b5c6c",
+            "type": "leaf",
+            "state": {
+              "type": "tag",
+              "state": {
+                "sortOrder": "frequency",
+                "useHierarchy": true,
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-tags",
+              "title": "标签"
+            }
+          },
+          {
+            "id": "8464d879aaa3512d",
+            "type": "leaf",
+            "state": {
+              "type": "outline",
+              "state": {
+                "followCursor": false,
+                "showSearch": false,
+                "searchQuery": ""
+              },
+              "icon": "lucide-list",
+              "title": "大纲"
+            }
+          }
+        ]
+      }
+    ],
+    "direction": "horizontal",
+    "width": 300,
+    "collapsed": true
+  },
+  "left-ribbon": {
+    "hiddenItems": {
+      "switcher:打开快速切换": false,
+      "graph:查看关系图谱": false,
+      "canvas:新建白板": false,
+      "daily-notes:打开/创建今天的日记": false,
+      "templates:插入模板": false,
+      "command-palette:打开命令面板": false
+    }
+  },
+  "active": "eccb24c47a38046a",
+  "lastOpenFiles": [
+    "README.en.md",
+    "README.md",
+    "kiss-translator.webm",
+    "kiss-translator.png"
+  ]
+}

README.en.md

@@ -179,6 +179,22 @@ Example of a Response Hook function:
 
 For more custom interface examples, refer to: [custom-api.md](https://github.com/fishjar/kiss-translator/blob/master/custom-api.md)
 
+<<<<<<< HEAD
+## Future Plans 
+
+ This is a side project with no strict timeline. Community contributions are welcome. The following are preliminary feature directions:
+
+- [ ] **Batch Text Requests**: Optimize request strategy to reduce translation API calls and improve performance.
+- [ ] **Enhanced Rich Text Translation**: Support accurate translation of complex page structures and rich text content.
+- [ ] **Advanced Custom/AI Interfaces**: Add support for context memory, multi-turn conversations, and other advanced AI features.
+- [ ] **Fallback English Dictionary**: When translation services fail, fall back to a local dictionary lookup.
+- [ ] **Improved YouTube Subtitle Support**: Enhance merging and translation experience for streaming subtitles, reducing sentence fragmentation.
+- [ ] **Upgraded Rule Collaboration System**: Introduce more flexible rule sharing, version management, and community review processes.
+
+ If you're interested in any of these directions, feel free to discuss in [Issues](https://github.com/fishjar/kiss-translator/issues) or submit a PR!
+
+=======
+>>>>>>> 39b3b00117ee4f9a43c9489638bf7438db5c2101
 ## Development Guidelines
 
 ```sh

README.md

@@ -178,6 +178,22 @@ Response Hook 函数示例如下：
 
 更多的自定义接口示例，请参考： [custom-api.md](https://github.com/fishjar/kiss-translator/blob/master/custom-api.md)
 
+<<<<<<< HEAD
+## 未来规划 
+
+ 本项目为业余开发，无严格时间表，欢迎社区共建。以下为初步设想的功能方向：
+
+- [ ] **聚合发送文本**：优化请求策略，减少翻译接口调用次数，提升性能。
+- [ ] **增强富文本翻译**：支持更复杂的页面结构和富文本内容的准确翻译。
+- [ ] **强化自定义/AI 接口**：支持上下文记忆、多轮对话等高级 AI 功能。
+- [ ] **英文词典备灾机制**：当翻译服务失效时，可 fallback 到本地词典查询。
+- [ ] **优化 YouTube 字幕支持**：改进流式字幕的合并与翻译体验，减少断句。
+- [ ] **规则共建机制升级**：引入更灵活的规则分享、版本管理与社区评审流程。
+ 
+ 如果你对某个方向感兴趣，欢迎在 [Issues](https://github.com/fishjar/kiss-translator/issues) 中讨论或提交 PR！
+
+=======
+>>>>>>> 39b3b00117ee4f9a43c9489638bf7438db5c2101
 ## 开发指引
 
 ```sh

src/apis/trans.js

@@ -452,6 +452,7 @@ const genClaude = ({
     headers: {
       "Content-type": "application/json",
       "anthropic-version": "2023-06-01",
+      "anthropic-dangerous-direct-browser-access": "true",
       "x-api-key": key,
       ...customHeader,
     },

src/libs/translator.js

@@ -467,6 +467,11 @@ export class Translator {
     q.length > (this._setting.maxLength ?? TRANS_MAX_LENGTH);
 
   _render = (el) => {
+    // 检查元素是否有效
+    if (!el || typeof el.innerText === "undefined") {
+      return;
+    }
+
     let traEl = el.querySelector(APP_LCNAME);
 
     // 已翻译