Repository navigation
fix: 修复 DSH Remote 配对与连接恢复 - #206
Merged
Merged
Conversation
Merged
Assisted-by: Codex/GPT-6
IGNGserver
force-pushed
the
agent/dsh-remote-reliability
branch
from
November 16, 2026 09:50
bcc8d36 to
3c6fa9f
Compare
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.
问题与修复
DSH Remote 的扫码配对、身份续期、远端撤权和实时会话在断线、重复操作或多设备并存时可能出现状态不一致;设备管理页也可能跳到其他中枢、将旧在线状态当成实时状态,或隐藏部分失败。
影响范围
Android 应用及其共享 Kotlin Remote/DSH 代码;不修改服务器、官网或发布流程。旧身份记录保留兼容读取;未完成的配对和压缩记录使用现有设备加密存储。
验证
/Users/lvziw/.build/Lagoon/dsh-remote-reliability/source)离线运行:app:testDebugUnitTest,筛选下列 22 个测试类,182 项通过:RemotePairingRecoveryTest、RemoteDevicePairingTest、RemoteAccountManagerTest、RemoteAccountScopeRegressionTest、RemoteServerApiTest、RemoteTextAndUrlTest、RemoteCatalogTest、RemoteHubLifecycleRegressionTest、RemoteDeletionAndRevocationTest、RemoteSignOutLifecycleTest、RemoteCompactionTrackerTest、RemoteDeviceStoreTest、RemoteRelayTest、RemoteSessionFailureLifecycleTest、RemoteConnectionRegistryTest、RemoteGatewayTest、RemotePhase4ProtocolTest、DshRemoteRecoveryRegressionTest、DshRemoteCompactionRoutingTest、OverviewReconciliationTest、InformationArchitectureRegressionTest、ConnectionParentControllerTest。git diff --cached --check:通过;gitleaks protect --staged --redact=100 --no-banner --no-color:未发现凭据。BUILD_SCRATCH_ROOT=/Users/lvziw/.build GRADLE_USER_HOME=/Users/lvziw/.build/gradle-home ANDROID_HOME=/Users/lvziw/Android/Sdk ./gradlew --offline --no-daemon :app:testDebugUnitTest --tests '*RemotePairingRecoveryTest':通过。BUILD_SCRATCH_ROOT=/Users/lvziw/.build GRADLE_USER_HOME=/Users/lvziw/.build/gradle-home ANDROID_HOME=/Users/lvziw/Android/Sdk ./gradlew --offline --no-daemon :app:testDebugUnitTest --tests '*AndroidRemoteCatalogIntegrityTest' --tests '*RemoteAccountManagerTest' --tests '*RemoteAccountScopeRegressionTest' --tests '*RemoteHubLifecycleRegressionTest' --tests '*RemoteSignOutLifecycleTest':通过;追加并发用例后单独重跑--tests '*RemoteAccountScopeRegressionTest':通过。BUILD_SCRATCH_ROOT=/Users/lvziw/.build GRADLE_USER_HOME=/Users/lvziw/.build/gradle-home ANDROID_HOME=/Users/lvziw/Android/Sdk ./gradlew --offline --no-daemon :app:testDebugUnitTest --tests '*CancellationSafetyTest' --tests '*DshJobsRegressionTest' --tests '*DshWorkspaceManagementTest' --tests '*DshRemoteRecoveryRegressionTest' --tests '*OverviewReconciliationTest':通过。追加工作区并发用例后单独重跑--tests '*DshWorkspaceManagementTest' --tests '*OverviewReconciliationTest':通过。发现失败时取消了仍使用旧代码的第二次 CI,最新提交将重新运行完整 CI。ANDROID_HOME="$ANDROID_SDK_ROOT" ./gradlew :app:testDebugUnitTest :app:assembleDebug均通过;Gradle 用时 7 分 17 秒,job 用时 7 分 35 秒。定向测试的实际命令:
整合 SSH 修改后的验证
主分支合入 SSH 设备修复后,重新整合了设备发现、页面路由、DSH HTTP 与审批恢复,保留两边的并发和错误处理;补充了审批回复期间再次投递的回归用例。
git diff --check origin/main..HEAD与gitleaks git --log-opts 'origin/main..HEAD' --redact=100 --no-banner --no-color:通过,未发现凭据。./gradlew --offline --no-daemon :hub:test,Gradle 报project 'hub' not found:当前仓库已退役并删除该模块,见docs/HUB_EOL.md与当前AGENTS.md;现行仓库校验为 Android 单测和 Debug 构建。3c6fa9f通过 CI「构建与测试」:上游 Host 连接器、./gradlew :app:testDebugUnitTest :app:assembleDebug均通过;Android 步骤用时 7 分 05 秒,job 用时 7 分 28 秒。已知限制
本机没有已连接 Android 设备或可用模拟器,未实机验证摄像头扫码、生命周期恢复及远端设备操作。远端授权撤销可能因设备离线而延后;界面会展示待处理状态并在可用时重试。