Commit Graph
2894 Commits
Author SHA1 Message Date
juewuy ed18140af6 Merge pull request #1325 from pure-white-ice-cream/dev
修复 compose 中, 删除重建容器, 开机自启功能失效
2026-08-11 17:38:52 +08:00
纯白色冰淇淋 376197c654 ~修复 Docker 仅挂载 configs 时重建容器丢失内核配置的问题:补充 yamls/jsons 卷挂载 2026-08-11 14:08:53 +08:00
纯白色冰淇淋 d37267bceb ~修复 Docker 删除重建容器后丢失开机自启状态的问题:将 s6 自启标记持久化到 configs 卷,并在启动时通过 S6_STAGE2_HOOK 同步 2026-08-11 11:54:40 +08:00
juewuy 78ad72f4e4 ~1.9.5beta3 pkg 2026-08-02 10:41:32 +08:00
juewuy 0ab3fade1b ~优化新手引导中启用IP转发的提示及实现逻辑 2026-08-02 10:39:00 +08:00
juewuy c2d9e441d2 增加.gitattributes文件以约束换行符 2026-08-02 10:26:22 +08:00
juewuy 29fe229554 ~增加UI选项的翻译文本 2026-08-02 10:25:55 +08:00
juewuy b8e5356cf9 ~所有本地配置模板统一新增interval: 120字段,以优化检查逻辑
~移除了singbox本地模板中的download_detour字段,以适配1.14+内核
2026-08-02 10:09:33 +08:00
juewuy 4da9c5a2ff ~修复下载自定义数据库时无法输入超过9的数字的bug 2026-07-30 14:45:47 +08:00
juewuy 9cf2d8dce1 ~1.9.5beta2 pkg 2026-07-29 10:53:25 +08:00
juewuy e621d37d16 ~现在对未启用IP转发的设备,启动局域网代理时默认会检查并启用IP转发 2026-07-29 10:52:12 +08:00
juewuy d8941fb202 ~增加对ss命令的兼容以替代netstat命令 2026-07-29 10:42:38 +08:00
juewuy db8ba09663 ~优化清理数据库提示并增加对.metadb文件的清理 2026-07-29 10:13:37 +08:00
juewuy b27028d9bf ~现在修改劫持范围时不再重置代理模式 2026-07-29 09:59:38 +08:00
juewuy 6cf5f02231 ~修复热更新配置失败的bug 2026-07-29 09:56:56 +08:00
juewuy ff7d454432 Merge pull request #1307 from DustinWin/dev
适配 sing-box 内核规则集新特性
2026-07-20 00:06:56 +08:00
DustinWin cc56656695 适配 sing-box 内核规则集新特性
`route.rule_set.tag` 支持了数组,修改后避免报错“cn 规则集重复”。
2026-07-18 22:47:17 +08:00
juewuy 6ed020a864 ~修复中文括号 2026-07-18 20:36:07 +08:00
juewuy a6e6907e86 ~1.9.5beta1 pkg 2026-07-18 20:19:51 +08:00
juewuy c71fcce870 ~给没有 CIDR 前缀的裸 IP 补 /32 2026-07-18 20:16:51 +08:00
juewuy 0f2a0b437c ~修复语法错误 2026-07-18 20:08:06 +08:00
juewuy 8b8d47c633 ~优化文件结构 2026-07-18 19:45:22 +08:00
juewuy 7df1d7aafa ~修复提示 2026-07-18 19:35:13 +08:00
juewuy 71c21fa26d ~修复错误链接 2026-07-14 15:11:50 +08:00
juewuy 7ba46d0d2d ~1.9.5alpha15 pkg 2026-07-14 10:47:54 +08:00
juewuy 947d93d3ea ~适配singbox1.14+版本内核
~修复debug模式提示找不到内核的bug
2026-07-14 10:47:13 +08:00
juewuy bc26306ebd ~修复文件格式 2026-07-14 09:56:54 +08:00
juewuy 021960fbe7 ~增加梅林固件启动时优化系统默认内存检测机制 2026-07-14 08:41:16 +08:00
juewuy 655c9aaa07 ~修复版本号不更新的bug 2026-07-13 18:24:14 +08:00
juewuy 34b1fc3126 ~为upx版本mihomo内核添加no_tailscale参数 2026-07-13 17:11:00 +08:00
juewuy bda31de05d ~修复在线更新订阅定时任务失效的bug 2026-07-13 17:00:50 +08:00
juewuy 2ef92f42ed ~将fakeip地址从28.0.0.0/8调整为198.18.0.0/15 2026-07-13 15:48:34 +08:00
juewuy 7603a480cd ~修复自定义DNS劫持端口界面的错误提示文本 2026-07-13 15:41:43 +08:00
juewuy 9401a48c02 ~修复安装目录末尾会包含/的bug 2026-07-13 15:30:48 +08:00
juewuy 47e50ee608 ~修复部分华硕设备提示找不到crontab的bug 2026-07-13 15:30:21 +08:00
juewuy 5cf7aba112 ~修复容器劫持开关失效的bug 2026-07-13 15:23:13 +08:00
juewuy b2d8ad9774 ~适配1.14+版本singbox内核 2026-07-13 15:10:50 +08:00
juewuy a3f2aa9b96 Merge pull request #1284 from wray-lee/patch-1
修复某些情况下引入的default字段污染变量
2026-07-13 14:24:01 +08:00
juewuy 4c1e4ab036 Merge pull request #1272 from fyzhu/patch-2
Fix welcome message formatting in install_en.sh
2026-07-13 14:23:23 +08:00
juewuy c100d0312d Merge pull request #1271 from fyzhu/patch-1
fix sed error
2026-07-13 14:22:57 +08:00
juewuy baaad12501 Merge pull request #1293 from kannakamuiuwu/dev
fix: 修复iptables放行端口添加过多导致溢出的错误
2026-07-13 14:12:27 +08:00
juewuy 3c838f2dda Merge pull request #1301 from abcfy2/fix/ecs-dns-empty-client-subnet
修复 singbox 内核 ECS 获取失败导致启动 FATAL
2026-07-13 14:09:30 +08:00
Feng Yu c4532c979f fix(ecs): 公网IP轮询加IPv4校验,新增oray源,避免错误页伪成功
原轮询 [ -n "$ip" ] 只判非空,members.3322.org 被限流返回 429 HTML
错误页时也判为成功 return,后续更可靠的源不会被尝试。

- 每个响应用 grep -oE 提取合法 IPv4,提取失败(HTML/空)则继续下一个
- 新增 http://ddns.oray.com/checkip 放首位(响应含 'Current IP Address:'
  前缀,grep 提取末尾 IPv4),比 3322 免费 DDNS 更稳定
- 移除 http://4.ipw.cn(部分运营商 DNS 解析失败)
2026-07-11 22:42:53 +08:00
Feng Yu d4e0ec8fb0 fix(ecs): singbox 分支补齐 ecs_address 判空,失败时终端告警
singbox_modify.sh 之前 ecs_address 为空时仍写入 client_subnet:"",
导致 sing-box 启动时 netip.ParsePrefix("") 报 'no /' FATAL,
服务无法启动。根因是 get_ecsip.sh 在部分环境(如梅林 resolv.conf
无 # Interface wan 标记、members.3322.org 被限流)下拿不到公网 IP。

- singbox_modify.sh: 与 mihomo 分支对齐,加 [ -n ecs_address ] 判空,
  失败时不写字段并 logger 告警
- clash_modify.sh: logger 补颜色码 33(黄色),使告警同样打印到终端,
  原来无颜色码只写日志文件用户无感知
2026-07-11 22:42:53 +08:00
juewuy 732d17087e Merge pull request #1302 from DustinWin/new-dev
sing-box 域名嗅探相关优化
2026-07-11 16:39:32 +08:00
juewuy 19cc6b70a0 Merge pull request #1305 from ashi009/core-store-raw-on-compressed-rom
core: 压缩 rom 设备优先裸二进制、避开 upx,不解压到 tmpfs
2026-07-11 16:39:06 +08:00
Xiaoyi 433774071a core: choose core storage by weighing rom cost vs ram cost
Replaces the binary compressed-rom check with store_raw_worth_it(),
which decides per environment: store the naked binary on $BINDIR (0 RAM)
only when $TMPDIR is tmpfs AND $BINDIR can hold it with margin
(estimated ~2:1 on squashfs/ubifs, full size otherwise). Otherwise keep
a compressed copy and decompress to tmp as before. core_webget skips
the upx core when raw storage is viable, fetching tar.gz instead.

Rationale (rough budgets for a ~40M core): raw on squashfs ~15M rom /
0 RAM; gz 10M rom / ~40M RAM; upx 9M rom / ~40M RAM (memfd). Raw wins
when rom has room; compressed wins when rom is the scarce resource.

Also corrects the upx branch symlink target $TMPDIR -> $BINDIR (#1295).

For #1304
2026-07-11 16:38:49 +08:00
Xiaoyi 55cfa65875 core: prefer raw binary on compressed rom, avoid upx on tmpfs devices
Adds store_on_rom() helper (tmpfs $TMPDIR + squashfs/ubifs/overlay
$BINDIR). On such devices core_webget no longer downloads the upx core
(its stub decompresses into a memfd = RAM at runtime); it fetches the
tar.gz instead and core_check stores the naked binary as
$BINDIR/CrashCore.raw, symlinked from $TMPDIR. The binary is
transparently compressed on rom and file-backed/reclaimable at runtime
(RssShmem 0). Other filesystems and explicit upx keep prior behavior.

Also corrects the upx branch symlink target $TMPDIR -> $BINDIR (same
dangling-symlink issue as #1295).

For #1304
2026-07-11 15:59:42 +08:00
Xiaoyi edd6936903 core: store naked core on compressed rom instead of unpacking to tmpfs
On OpenWrt $TMPDIR is tmpfs (RAM) and $BINDIR sits on a
transparently-compressed fs (squashfs/ubifs). Unpacking the core to
$TMPDIR pins the whole ~40MB binary in unreclaimable Shmem, and a
compressed copy is still kept on rom - paying twice.

When $TMPDIR is tmpfs and $BINDIR is squashfs/ubifs/overlay, store the
verified naked binary as $BINDIR/CrashCore.raw and symlink
$TMPDIR/CrashCore to it, dropping the downloaded archive. The binary is
transparently compressed on rom (~2.2:1, comparable to keeping .gz) and
its text/rodata become file-backed and reclaimable at runtime
(RssShmem 0). Other filesystems keep the existing behavior.

The upx branch's symlink target is also corrected from $TMPDIR to
$BINDIR (same dangling-symlink issue as #1295).

For #1304
2026-07-11 15:41:46 +08:00
DustinWin 988c0cde34 sing-box 域名嗅探相关优化 2026-07-07 10:53:01 +08:00