Repository navigation
fix: 全仓修复并发 502、事件循环阻塞、宿主竞态、前端轮询致死及中转桥换工具包死锁(65 项) - #255
Open
greyoak111 wants to merge 1 commit into
Open
greyoak111 wants to merge 1 commit into
greyoak111 wants to merge 1 commit into
Conversation
PR 安全初筛 / Safety pre-check改动 57 个文件;高 0 项、中 24 项。
「高」不等于有问题,只是这些地方一旦被动手脚,后果最重(能拿到签名钥匙、改到用户手机上的权限、或藏进看不见的内容),合并前请逐行看过。 |
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.
背景
继 #254 定位并发下载触发 WebView 502 与事件循环阻塞后,对全仓(Gateway / Android 宿主 / WebUI)做了同类问题深度排查,并同步修复了新工具包切换后
openai-bridge中转桥触发RUNTIME_CONFLICT · COMPONENT死锁与误报「本地桥已停用」的 2 项真机问题,共 65 项修复。修复总览
一、Gateway 事件循环阻塞、并发竞态与中转桥生命周期(20 项)
usage.mjs:恢复execFile导入,修复ccMem内存查询路径的ReferenceError;scanSubs改为 2 MB 分片与异步可重入锁。components.mjs:对大组件记录(> 4 KB)增加基于dev:ino:mtimeNs:ctimeNs:size的COMP_REC_CACHE,compList()单趟构造recMap传入compUsers(),消除 1s 轮询下的compHealSkills();compStart()在await rmTreeBatched前先占位COMP_JOBS。modules.mjs:modStart()/modRemove()增加modStarting互斥锁覆盖异步删暂存窗口。archiver.mjs:extractOne补齐ws.write暂停/恢复背压与超限即杀子进程;previewEntry增加PREV_INFLIGHT单飞去重与异步清理;archiveList外壳进程try/finally兜底回收;sanitizeTree/collectSecretExcludes异步分片让出事件循环。storage.mjs/files.mjs/projects.mjs/bigfile.mjs/fonts.mjs:大目录删除改用异步rmCheckedAsync/fs.promises.rm(保留同步rmChecked导出兼容单测);projects.mjs加CLONING_DIRS/DELETING_PROJS互斥锁;zipToFile改异步写入;字体读取改流式与异步解析。claudeseal.mjs/integrity.mjs/run.mjs:sha256、sessionAnchor、sealSession、checkSession补齐异步分片版并接入run.mjs;claudeseal加单飞去重。sessions.mjs/run.mjs:REWIND_BUSY覆盖完整异步回退流程,并导出isSessionRewinding()在run.mjs阻止并发运行/删除。login.mjs/devside.mjs/models.mjs/custom.mjs/extensions.mjs/seal.mjs/sched.mjs/work-island.mjs/goal.mjs:补齐单飞/重入锁、单次操作隔离目录、非阻塞execFile/pipeline/ 异步巡检。openai-bridge中转桥生命周期修复(2 项真机日志问题)managed-bridge.mjs&components.mjs:升级新工具包替换$PREFIX后component.cjs随旧工具包消失,若用户此时点卸载,旧retireManagedBridge会走retire-binding降级单方面删掉~/.cccodroid/services/openai-bridge.json却留下~/.local/share/ccr-bridge-kit/,导致重装后永久RUNTIME_CONFLICT · COMPONENT死锁。现改为:若服务注册格式合法、运行目录仍在且仅组件入口缺失,则保留注册与 App 映射待重装无缝复接。managed-bridge.mjs&components.mjs:新增clearComponentRemovedRecoveryLock(),openai-bridge重装完成后仅当recovery.failed精确为watchdog.sh写入的component removed or disabled\n且无disabled标记时改名.prev-*留证并清掉预算、触发预热,修复重装后仍永久误报「本地桥已停用」的问题(不动真实崩溃锁与用户手动停用)。二、Android 宿主代理、生命周期与并发竞态(19 项)
Env.java:ProofFlight绑定bootEpoch+keySnap+ 4.5s 单调截止时间,防止跨代单飞污染;fetchStatic增设 1s 连接 / 5s 读取超时、16 MB 上限及 404/403/304/204 空响应透传。MainActivity.java:shouldInterceptRequest仅放行主文档 200;myOnBoot异步 Cookie 同步 +bootSeenWhileLoading兜底;DEVKIT_APPLYINGCAS、IK_LOCK双检锁、waitGateway60s 单调上限。GatewayService.java:PAUSE_LOCK+pauseCount引用计数与lifeGen代次递增;killGateway原子置空与killGatewayAsync/shutdownAsync防主线程阻塞;watchFreeze快照startSeq后调用shutdownIfIdle。Updater.java/Notify.java/SchedAlarm.java/Consent.java/A11y.java/DeviceTools.java/Priv.java/Installer.java/ShizukuSetup.java/Share.java/GwRuntime.java/BrowserPane.java:锁外网络/签名计算后原子提交、取消阻塞连接、广播 8s 预算封顶、密钥生成移出 UI 线程、进程超时回收、分段下载联动取消、独立暂存文件名与资源释放。三、WebUI 轮询抗 502、竞态与防双击(26 项)
08-extensions.js/06-files.js/18-terminal.js/10-settings-device.js/10b-storage.js/18b-lineage.js:模块/组件/LLM 下载/GH 登录/压缩任务/特权/更新/存储扫描/脉络补档遇瞬时 502 保留已渲染卡片与进度并退避重试;终端 SSECLOSED先探测/api/term/list确认存活再判定退出。09-settings.js/11-usage.js/12-model-caps.js/14-projects-sched.js/15-pages.js/16-viewer-git.js/18d-bookmarks.js/18e-lineage-merge.js/03-perm-status.js/01-core.js/07-sessions.js/13-nav-menus.js:补齐latest()过时响应丢弃、按钮防双击与按仓库互斥锁、watchLogin链式setTimeout+pauseSetReads清理、wiLater定时器统一回收、openModelPickerloadSeq保护。验证结果
node scripts/appjs.mjs:✓ 29 段,19578 行,语法通过node i18n/scan.mjs --all:9 种语言全部 3021/3023 同步,0 新增未译键sh scripts/java-tests.sh:ALL PASSnode scripts/test.mjs(含新增 race-502-nest.test.mjs 11 项回归测试):4 池全绿(1,932 tests,0 fail)node scripts/pr-guard.mjs origin/main HEAD:高 0 项(exit 0)