sync: dev to extern-contrib

[github-actions]

sync-branches: New code has just landed in dev, so let's bring extern-contrib up to speed!

Summary by Sourcery

Synchronize the external-contrib branch with dev by improving captcha recovery and making ended-contest fallback submissions reliable.

New Features:

• Automatically refresh unreadable captcha images up to five times when auto-solving is enabled.

Bug Fixes:

• Improve submissions for ended contests by retrying cooldown responses, reporting server errors, and refreshing the captcha after captcha failures.
• Prevent stale captcha answers from being entered while a replacement image is loading.

Enhancements:

• Centralize ended-contest fallback submission handling and user-facing submission status reporting.

Build:

• Bump the userscript and package versions to 3.7.0.

Chores:

• Update release metadata in Update.json for the synchronized versions.

---

Summary by cubic

Syncs extern-contrib with dev, delivering the 3.6.5 fallback-submission fix and the 3.6.6 captcha auto-refresh as release 3.7.0. XMOJ.user.js and package.json are bumped to 3.7.0, and Update.json marks 3.6.5 and 3.6.6 as prereleases with 3.7.0 as the release.

Bug Fixes

• Fallback submissions after a contest ends wait out 请勿重复提交 cooldowns (3 seconds apart, up to 5 attempts) instead of being silently dropped.
• Other fallback failures surface the server's .jumbotron message, and captcha errors refresh the captcha and stop retrying.
• The captcha input is locked while a new image loads so stale answers aren't sent.

New Features

• When the auto-captcha solver can't read an image, the script automatically fetches a new one (up to 5 times).

^{Written for commit fce1af6. Summary will update on new commits.}

[sourcery-ai]

Reviewer's Guide

Version 3.6.5 improves submission of problems from ended contests by extracting the fallback into a resilient, retrying workflow, centralizing status/error handling, and updating release metadata.

Sequence diagram for ended-contest problem submission

sequenceDiagram
    actor User
    participant SubmitHandler
    participant XMOJ as XMOJ
    participant ContestPage
    participant SubmitPage

    User->>SubmitHandler: click PassCheck
    SubmitHandler->>XMOJ: POST submit.php
    XMOJ-->>SubmitHandler: 没有这个比赛！
    SubmitHandler->>ContestPage: fetch contest.php?cid=ContestID
    ContestPage-->>SubmitHandler: contest HTML
    SubmitHandler->>SubmitHandler: parse RealPID
    loop up to 5 attempts
        SubmitHandler->>SubmitHandler: CaptchaIsMissing()
        SubmitHandler->>SubmitPage: POST submit.php with RealPID
        alt redirected
            SubmitPage-->>SubmitHandler: redirect response
            SubmitHandler->>XMOJ: navigate to result URL
        else 请勿重复提交
            SubmitPage-->>SubmitHandler: cooldown response
            SubmitHandler->>SubmitHandler: wait 3 seconds
        else submission result
            SubmitPage-->>SubmitHandler: result HTML
        end
    end
    SubmitHandler->>SubmitHandler: ShowSubmitStatus(Message)

Loading

Flow diagram for resilient ended-contest submission fallback

flowchart TD
    A[Initial submission fails with 没有这个比赛] --> B[Fetch contest.php using cid]
    B --> C{Contest page valid?}
    C -- No --> D[Show failure status]
    C -- Yes --> E[Parse contest problem list and resolve RealPID]
    E --> F{RealPID found?}
    F -- No --> D
    F -- Yes --> G[Check captcha]
    G --> H[POST submission to submit.php for RealPID]
    H --> I{Response}
    I -- Redirected --> J[Navigate to submission result]
    I -- 验证码错误 --> K[RefreshCaptcha and show captcha error]
    I -- 请勿重复提交 --> L{Attempts remain?}
    L -- Yes --> M[Wait 3 seconds and retry]
    M --> G
    L -- No --> D
    I -- Other failure --> D

Loading

File-Level Changes

Change	Details	Files
Extract and harden ended-contest submission into a reusable fallback workflow.	Fetch and parse the contest page to map contest positions to real problem IDs, including variable-length IDs. Handle contest-page, parsing, network, captcha, and server errors with user-visible messages. Retry rate-limited submissions with a three-second cooldown and re-check the captcha before each attempt. Preserve redirect-based success handling and report submission progress through a shared status helper.	XMOJ.user.js
Refactor normal submission failure handling to use the new fallback and shared status display.	Invoke the ended-contest fallback when submit.php reports that the contest no longer exists. Restore submit controls consistently for fallback failures and cancellation paths. Centralize error-message rendering and editor cleanup.	XMOJ.user.js
Bump the script/package release version and add update metadata.	Update the userscript and npm package versions from 3.6.4 to 3.6.5. Add the new update metadata entry.	XMOJ.user.js package.json Update.json

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[cloudflare-workers-and-pages]

Deploying xmoj-script-dev-channel with    Cloudflare Pages

Latest commit:	fce1af6
Status:	✅  Deploy successful!
Preview URL:	https://ce2b43f8.xmoj-script-dev-channel.pages.dev

View logs

[sourcery-ai]

Hey - I've found 1 issue

Prompt for AI Agents

Please address the comments from this code review:

## Individual Comments

### Comment 1
<location path="XMOJ.user.js" line_range="4639" />
<code_context>
-                                        SmartAlert("XMOJ-Script internal error!\n\n" + e + "\n\n" + "If you see this message, please report it to the developer.\nDon't forget to include console logs and a way to reproduce the error!\n\nDon't want to see this message? Disable DebugMode.");
+                                let FailMessage = "提交失败！请关闭脚本后重试！";
+                                if (text.indexOf("没有这个比赛！") !== -1 && SearchParams.get("pid") !== null) {
+                                    const FallbackResult = await SubmitToEndedContestProblem(CodeMirrorElement.getValue(), o2Switch, ShowSubmitStatus);
+                                    if (FallbackResult.Success || FallbackResult.Handled) {
+                                        return;
</code_context>
<issue_to_address>
**issue (bug_risk):** The fetch that submits the original contest request is still outside any try/catch. When this submit.php request rejects because of a network failure, the PassCheck async listener rejects before it can restore the submit button or show an error, so the button remains stuck on “正在提交...” with no visible message.

**Triggers:** When the initial contest submission request fails at the network level before returning a Response.

**Suggested fix:** Wrap the PassCheck submit fetch and response-processing chain in try/catch, and restore `Submit.disabled`/`Submit.value` while displaying a network-error message in the catch path.
</issue_to_address>

Sourcery assessment

Needs a human reviewer. 1 finding to address first, and when the contest-to-problem mapping or retry logic is wrong, this code can POST the user's source to the wrong problem or create duplicate submissions, and those external submission records are not undone by reverting the script. The impact is bounded to the affected submissions and does not involve money or access control.

Blocking findings: XMOJ.user.js:4639

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

[sourcery-ai]

issue (bug_risk): The fetch that submits the original contest request is still outside any try/catch. When this submit.php request rejects because of a network failure, the PassCheck async listener rejects before it can restore the submit button or show an error, so the button remains stuck on “正在提交...” with no visible message.

Triggers: When the initial contest submission request fails at the network level before returning a Response.

Suggested fix: Wrap the PassCheck submit fetch and response-processing chain in try/catch, and restore Submit.disabled/Submit.value while displaying a network-error message in the catch path.