Repository navigation
fix(devkit/modules): pre-v0.7.15 safety, heartbeat, shared-layer, phar and reuse fixes - #253
Merged
Merged
Conversation
…r and reuse fixes
PR 安全初筛 / Safety pre-check改动 10 个文件;高 1 项、中 6 项。
「高」不等于有问题,只是这些地方一旦被动手脚,后果最重(能拿到签名钥匙、改到用户手机上的权限、或藏进看不见的内容),合并前请逐行看过。 |
greyoak111
pushed a commit
that referenced
this pull request
Nov 21, 2026
整包与 base 模块与 .1 字节相同(Termux 仓库无漂移),仅 php 模块重打 (composer 包装改绝对路径 php)、modules.json 带共享层消歧名与 lock 的 snapshot 字段变化。gw 执行链 13 库不变,仅 key 更新。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This branch was successfully deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
针对
v0.7.15+devkit-2026.11.21.1发版前排查出的 6 项问题集中修复:gateway/gw/modules.mjs,gateway/gw/components.mjs):haskell(9,117 文件 / 2.9 GB)、build+ 3 个共享层(16,470 文件)等大模块在搬移与卸载阶段原先全程同步阻塞事件循环且无看门狗心跳。components.mjs的COMP_RUN_DIR/uptimeMs/bootId/rmTreeBatched,在modMoveIn、modRemove及暂存树清理期间分批await breathe()并持续写components/.runs/mod-<id>.installing心跳(phase: "switch" | "move"),结束后自动清除;卸载期间在MOD_JOBS占槽防并发交错。tar -tzv列表检查改为spawn(..., { detached: true })并挂入job.child+markChild/unmarkChild,扫描大归档期间可取消且崩溃可回收。.go编译缓存时间戳(gateway/gw/modules.mjs):devkit-2026.11.21.1将guile拆至共享层lib-guile(firstRun: []),经扩展页安装lisp/build会跳过Installer.java:670的.gotouch。lib/guile的模块后自动刷新$PREFIX/lib/guile/**/*.go的 mtime 使其严格晚于.scm,避免gdb/guile启动陷入重编译死循环。pkg依赖(gateway/gw/modules.mjs):modRemove自动清理不再被其它模块引用的共享层(如lib-openjdk-21、lib-clang、lib-libllvm、lib-guile)前,调用modDependents(mj, l.id, ignore)检查是否仍被已装组件或pkg包依赖;若有则保留共享层并记日志。gateway/web/app/08-extensions.js,android/java/cc/codroid/Installer.java,devkit/devkit.mjs):kind === "shared"且 id 为lib-*的块按后缀消歧(如共享运行库(clang)/Shared libraries (clang)),客户端无需重打devkit-2026.11.21.1即可消除确认框里「共享运行库、共享运行库、共享运行库」的重复显示,且未来modules.json带后缀时不重复拼接。devkit.mjs与pkg.mjs可靠性修复(devkit/devkit.mjs,android/assets/bin/pkg.mjs):unxzToFile在out.finish与child.exit之间的竞态,必须等写入完成且exitCode === 0才 resolve,坏流提前退出(含EPIPE)可靠 reject。devkit.mjs的GBMB签名 phar 包装改用绝对路径exec "${R.to}files/usr/bin/php",并区分可执行 CLI phar 与库.phar(库文件原样保留、不改写字节以免破坏签名)。android/assets/bin/pkg.mjs同步补齐同口径GBMBphar 保护。GwRuntime.fetchBase保留基础模块压缩包供Updater复用(android/java/cc/codroid/GwRuntime.java):devkit-pin.json钉住版本且提取校验成功时,将刚下载核验过的devkit-base-*.tar.gz(~123 MB)换名保留到files/<file>,供紧随其后的Updater/Installer.download按 sha256 直接复用;已是同一版或提取失败时照旧立即删除。验证
node --check+ 前端合并app.js语法检查通过node scripts/test.mjs v0715-devkit-modules-safety a0610-g1-path-safety a0610-g1-mod-stage a0610-g1-mod-firstrun a0610-b1-modules-shape comp-switch-heartbeat comp-recover components pkg-lock-v062 devkit-abi-check:10 套件 66/66 全过sh scripts/java-tests.sh(含InstallerCarryTest新增共享库消歧与GwRuntime复用判断断言):ALL PASSnode scripts/pr-guard.mjs origin/main HEAD已审阅(仅预期路径提示)