Merge branch 'feature/beta'

Author: OneOhCloud

.github/workflows/beta-release.yml

@@ -35,16 +35,12 @@ jobs:
         include:
           - platform: "macos-latest"
             args: "--target aarch64-apple-darwin"
-            cache: "aarch64"
           - platform: "macos-latest"
             args: "--target x86_64-apple-darwin"
-            cache: "x86_64"
           - platform: "ubuntu-24.04"
             args: ""
-            cache: "x86_64"
           - platform: "windows-latest"
             args: ""
-            cache: "x86_64"
 
 
     runs-on: ${{ matrix.platform }}
@@ -110,16 +106,6 @@ jobs:
         with:
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Cache Rust Dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          shared-key: "global-rust-cache"
-          key: "target-${{ matrix.platform}}-${{matrix.cache || 'default'}}"
-          workspaces: src-tauri
-          cache-all-crates: true
-          cache-on-failure: true
-
-
       - name: Install Frontend Dependencies
         run: bun install
 

.github/workflows/dev-release.yml

@@ -34,16 +34,12 @@ jobs:
         include:
           - platform: "macos-latest"
             args: "--target aarch64-apple-darwin"
-            cache: "aarch64"
           - platform: "macos-latest"
             args: "--target x86_64-apple-darwin"
-            cache: "x86_64"
           - platform: "ubuntu-24.04"
             args: ""
-            cache: "x86_64"
           - platform: "windows-latest"
             args: ""
-            cache: "x86_64"
 
 
     runs-on: ${{ matrix.platform }}
@@ -109,16 +105,6 @@ jobs:
         with:
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Cache Rust Dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          shared-key: "global-rust-cache"
-          key: "target-${{ matrix.platform}}-${{matrix.cache || 'default'}}"
-          workspaces: src-tauri
-          cache-all-crates: true
-          cache-on-failure: true
-
-
       - name: Install Frontend Dependencies
         run: bun install
 

.github/workflows/manual-release.yml

@@ -30,16 +30,12 @@ jobs:
         include:
           - platform: "macos-latest"
             args: "--target aarch64-apple-darwin"
-            cache: "aarch64"
           - platform: "macos-latest"
             args: "--target x86_64-apple-darwin"
-            cache: "x86_64"
           - platform: "ubuntu-24.04"
             args: ""
-            cache: "x86_64"
           - platform: "windows-latest"
             args: ""
-            cache: "x86_64"
 
 
     runs-on: ${{ matrix.platform }}
@@ -105,16 +101,6 @@ jobs:
         with:
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Cache Rust Dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          shared-key: "global-rust-cache"
-          key: "target-${{ matrix.platform}}-${{matrix.cache || 'default'}}"
-          workspaces: src-tauri
-          cache-all-crates: true
-          cache-on-failure: true
-
-
       - name: Install Frontend Dependencies
         run: bun install
 

.github/workflows/stable-release.yml

@@ -88,12 +88,6 @@ jobs:
         with:
           targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
 
-      - name: Cache Rust Dependencies
-        uses: swatinem/rust-cache@v2
-        with:
-          workspaces: './src-tauri -> target'
-
-
       - name: Install Frontend Dependencies
         run: bun install
 

CHANGELOG.MD

@@ -4,26 +4,25 @@
 
 Use development and beta versions only if you are aware of the potential risks.
 
-## Changes since v1.1.70
+## Changes since v1.1.73
 
 All significant changes in this version are documented here.
 
 
 ### ✨ Features
 
-- Added routing rules support
-- Added custom DNS servers for direct connections
+- None
 
 
 ### ⚠ CHANGES LOG
 
-- Updated dependencies.
-- Updated sing-box core to v1.12.10.
-
+- Improved UI details
+- Updated dependencies
+- Improved translations
 
 ### 🐛 Bug Fixes
 
-- Fixed issues found in security audit.
+- Direct DNS and DHCP options are mutually exclusive
 
 
 ## 自 v1.1.70 以来的变更
@@ -32,15 +31,16 @@ All significant changes in this version are documented here.
 
 ### ✨ 新增功能
 
-- 支持自定义路由规则
-- 支持自定义直连的 DNS 服务器
-
+- 无
 
 
 ### ⚠ 变更日志
-- 更新依赖项。
-- 将 sing-box 核心更新至 v1.12.10。
+
+- 改进翻译
+- 改进UI细节
+- 更新依赖项
+
 
 ### 🐛 问题修复
 
-- 解决安全审计中发现的问题。
+- "DHCP" 与 "直连DNS" 选项互斥

README.md

@@ -1,12 +1,24 @@
-# OneBox ｜ [简体中文](./README_CN.md)
+# OneBox
+
+
 
 [![Dev Build](https://github.com/OneOhCloud/OneBox/actions/workflows/dev-release.yml/badge.svg)](https://github.com/OneOhCloud/OneBox/actions/workflows/dev-release.yml)
 [![Beta Build](https://github.com/OneOhCloud/OneBox/actions/workflows/beta-release.yml/badge.svg)](https://github.com/OneOhCloud/OneBox/actions/workflows/beta-release.yml)
 [![Stable Build](https://github.com/OneOhCloud/OneBox/actions/workflows/stable-release.yml/badge.svg)](https://github.com/OneOhCloud/OneBox/actions/workflows/stable-release.yml)
 
+[简体中文](./README_CN.md)
+ 
 A cross-platform GUI client based on sing-box kernel.
 
-## Project Objectives ✨
+
+
+## Screenshots
+
+|![Home](./docs/image/en/Home.png)|![Config](./docs/image/en/Config.png)|![Settings](./docs/image/en/Settings.png)|
+|:---:|:---:|:---:|
+
+
+## Project Objectives
 
 **Simplicity, Stability, Security. No complex configuration, ready to use out of the box.**
 
@@ -17,11 +29,6 @@ For users requiring advanced customization, the following projects are recommend
 - https://github.com/2dust/v2rayN
 
 
-## Screenshots
-
-|![Home](./docs/image/en/Home.png)|![Config](./docs/image/en/Config.png)|![Settings](./docs/image/en/Settings.png)|
-|:---:|:---:|:---:|
-
 ## Download and Installation
 
 Please visit our [releases page](https://github.com/OneOhCloud/OneBox/releases) to get the latest version.

README_CN.md

@@ -5,7 +5,13 @@
 
 基于 sing-box 内核的跨平台 GUI 客户端。
 
-## 核心宗旨 ✨
+
+## 软件截图 
+
+|![主页](./docs/image/zh/Home.png)|![配置](./docs/image/zh/Config.png)|![设置](./docs/image/zh/Settings.png)|
+|:---:|:---:|:---:|
+
+## 核心宗旨
 
 **简单，稳定，安全。无需复杂配置，开箱即用**
 
@@ -17,11 +23,6 @@
 - https://github.com/2dust/v2rayN
 
 
-## 软件截图 
-
-|![主页](./docs/image/zh/Home.png)|![配置](./docs/image/zh/Config.png)|![设置](./docs/image/zh/Settings.png)|
-|:---:|:---:|:---:|
-
 ## 下载安装 
 
 请访问我们的[发布页面](https://github.com/OneOhCloud/OneBox/releases)获取最新版本。

bun.lock

@@ -39,12 +39,12 @@
         "@types/react-dom": "^19.2.2",
         "@types/unzipper": "^0.10.11",
         "@vitejs/plugin-react": "^4.7.0",
-        "daisyui": "^5.3.2",
+        "daisyui": "^5.3.3",
         "husky": "^9.1.7",
         "tar": "^7.5.1",
         "typescript": "~5.6.3",
         "unzipper": "^0.12.3",
-        "vite": "^6.3.7",
+        "vite": "^6.4.0",
       },
     },
   },
@@ -291,7 +291,7 @@
 
     "@types/estree": ["@types/[email protected]", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
 
-    "@types/node": ["@types/[email protected].10", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-anNG/V/Efn/YZY4pRzbACnKxNKoBng2VTFydVu8RRs5hQjikP8CQfaeAV59VFSCzKNp90mXiVXW2QzV56rwMrg=="],
+    "@types/node": ["@types/[email protected].11", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-Gd33J2XIrXurb+eT2ktze3rJAfAp9ZNjlBdh4SVgyrKEOADwCbdUDaK7QgJno8Ue4kcajscsKqu6n8OBG3hhCQ=="],
 
     "@types/react": ["@types/[email protected]", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA=="],
 
@@ -319,7 +319,7 @@
 
     "csstype": ["[email protected]", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],
 
-    "daisyui": ["[email protected].3", "", {}, "sha512-led/Thra8tVIZYf/yr97uuNGFVmM2fYhTX8c7pUeFGLjYlY3j+KnjKGIqKGc8O7QNHFUxAmSWkSzq4UkX+bEJQ=="],
+    "daisyui": ["[email protected].7", "", {}, "sha512-0+8PaSGift0HlIQABCeZzWOBV5Nx/vsI2TihB9hbaEyZENPlZZz+se2JnAH5rz9gBYTyDLB7NJup8hkREr6WBw=="],
 
     "debug": ["[email protected]", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],
 

lang/en.json

@@ -50,13 +50,13 @@
     "developer_options": "Developer options",
     "developer_toggle_desc": "Enable developer options, requires app restart",
     "developer_toggle": "Developer toggle",
-    "direct_rules_info": "Direct rules: Traffic will bypass proxy",
+    "direct_dns_settings": "Direct DNS",
+    "direct_rules_info": "matched traffic will connect directly without proxy, if the domain points to an intranet address, please enable DHCP in 'Developer Options' (to correctly resolve intranet DNS).",
     "direct_rules": "Direct Rules",
     "disable": "Disable",
-    "direct_dns_settings": "Direct DNS Settings",
     "disconnected": "Disconnected",
     "dns_cannot_empty": "DNS cannot be empty",
-    "dns_hint": "Enter DNS server address for direct connections",
+    "dns_hint": "This DNS is used to resolve non-proxy traffic domains",
     "dns_save_failed": "Failed to save DNS settings",
     "dns_saved": "DNS settings saved successfully",
     "domain_rules_desc": "Match exact domain names, e.g., example.com",
@@ -121,7 +121,7 @@
     "please_add_subscription": "Please add config first",
     "please_input_valid_url": "Please input valid url",
     "please_wait_releasing_resources": "Please wait, releasing resources...",
-    "proxy_rules_info": "Proxy rules: Traffic will go through proxy",
+    "proxy_rules_info": "Traffic will go through proxy",
     "proxy_rules": "Proxy Rules",
     "reconnect_failed": "Reconnect failed, please check network",
     "release_success_stop_vpn": "Resources released, vpn service stopped",
@@ -131,7 +131,7 @@
     "rule_exists": "Rule already exists",
     "rule_info_title": "Rule Information",
     "rules_auto_save": "Rules are automatically saved when added or removed",
-    "rules_effective_info": "Rules take effect after restarting the VPN",
+    "rules_effective_info": "Adding or removing requires restarting VPN to take effect",
     "rules_tip": "Only non-mainland China websites count towards data usage",
     "rules": "Rules",
     "save_failed": "Failed to save",