fix: use GitHub HEAD when repository branch is unspecified - #10080
Open
iona-s wants to merge 2 commits into
Open
fix: use GitHub HEAD when repository branch is unspecified#10080iona-s wants to merge 2 commits into
iona-s wants to merge 2 commits into
Conversation
Contributor
There was a problem hiding this comment.
Hey - I've reviewed your changes and they look great!
Sourcery assessment
Needs a human reviewer. If the HEAD archive or raw-file reference resolves to the wrong repository content, the updater could install or inspect incorrect plugin code, and reverting this change would not remove an already-downloaded update. The impact is bounded and can be repaired by reinstalling or rerunning the update with the correct reference.
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.
Fixes #10068.
AstrBot currently queries the unauthenticated GitHub repository API to resolve the default branch of a plugin repository. If this request is rate-limited or otherwise fails, the updater falls back to
main, which prevents repositories using another default branch, such asmaster, from being installed or updated.GitHub's
HEADreference already resolves to the repository's default branch, so the API request and hard-coded fallback are unnecessary.The download path also needs safer cleanup when a transfer fails or is cancelled. Previously, asyncio.CancelledError bypassed the existing exception handler, potentially leaving a partial archive behind. In addition, an OSError raised while deleting a partial file could mask the original download error.
This PR uses the same cleanup path for regular download failures and cancellation, logs cleanup failures, and always re-raises the original exception.
Modifications / 改动点
Use
HEADfor GitHub archive and raw metadata URLs when no branch is explicitly specified.Remove the GitHub repository API lookup and hard-coded
mainfallback.Remove the obsolete asynchronous repository source resolver.
Preserve explicit
/tree/<branch>and proxy behavior.Apply the same default-reference behavior to CLI plugin downloads.
Remove partial archive files after download failures or cancellation.
Preserve the original download or cancellation exception if cleanup fails.
Add regression tests for default references, explicit branches, proxy handling, cancellation, and cleanup failures.
This is NOT a breaking change. / 这不是一个破坏性变更。
Screenshots or Test Results / 运行截图或测试结果
This is a backend-only change, so screenshots are not applicable.
Verification command:
Result:
The warning is an existing Python deprecation warning for
audioopand is unrelated to this change.The modified files were also verified with Ruff and
git diff --check:Checklist / 检查清单
😊 If there are new features added in the PR, I have discussed it with the authors through issues/emails, etc.
/ 如果 PR 中有新加入的功能,已经通过 Issue / 邮件等方式和作者讨论过。
No new features are introduced by this PR.
👀 My changes have been well-tested, and "Verification Steps" and "Screenshots" have been provided above.
/ 我的更改经过了良好的测试,并已在上方提供了“验证步骤”和“运行截图”。
🤓 I have ensured that no new dependencies are introduced, OR if new dependencies are introduced, they have been added to the appropriate locations in
requirements.txtandpyproject.toml./ 我确保没有引入新依赖库,或者引入了新依赖库的同时将其添加到
requirements.txt和pyproject.toml文件相应位置。😮 My changes do not introduce malicious code.
/ 我的更改没有引入恶意代码。
Related to #10073.
Summary by Sourcery
Use GitHub HEAD for unspecified repository branches and make failed-download cleanup safe for errors and cancellation.
Bug Fixes:
Enhancements:
Tests: