diff --git a/Update.json b/Update.json index 65786d44..3bc3bf70 100644 --- a/Update.json +++ b/Update.json @@ -3683,6 +3683,103 @@ } ], "Notes": "本次发布将 3.5.0 之后的四个预发布版本合并为正式版 3.5.4：\n\n- **#986** 修复 Violentmonkey 下因顶层 `await` 导致的 `SyntaxError`（将异步初始化包进 IIFE）。\n- **#989** 提交代码页面（submitpage.php）改用 Monaco Editor，并支持编辑时保存代码。\n- **#992** 修复 MonochromeUI / NewBootstrap 新界面在深色模式下加载时的白色闪烁（FOUC/CLS）问题。\n- **#997** 将 Monaco 固定到 0.52.2，修复编辑器有时无法加载、退化为纯文本框的问题（0.53.0 上游 bug）。" + }, + "3.6.1": { + "UpdateDate": 1785987881994, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1006, + "Description": "Fix #1004" + } + ], + "Notes": "No release notes were provided for this release." + }, + "3.6.2": { + "UpdateDate": 1787290584604, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1013, + "Description": "fix: handle PID 0 submission rows" + } + ], + "Notes": "修复提交记录中题目 ID 为 0 时的排版错误。" + }, + "3.6.3": { + "UpdateDate": 1787357957636, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1015, + "Description": "feat: compress ApplyData payloads with gzip and Base93" + } + ], + "Notes": "优化“获取数据”功能：页面缺少数据申请区域时会自动创建控件；默认使用 gzip + Base93 精确保留任意输入；新增约 310 MB/s 的 NSC3 高速数值模式，同时压缩 long long 数值与行结构并对混合内容原样回退；新增“保留换行”选项，默认精确保留，使用 cin >> 等空白不敏感读取时可关闭，从而避免大量随机行长占用输出；生成程序现在先向 stderr 输出并刷新数据，再通过 abort() 可靠触发 RE，同时兼容读取旧版异常包装的结果。" + }, + "3.6.4": { + "UpdateDate": 1787460024276, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1019, + "Description": "fix: 在提交界面显示并提交验证码" + } + ], + "Notes": "### 修复提交界面不显示验证码\n\n评测队列繁忙时 XMOJ 会启用图片验证码，但提交界面是脚本自行渲染的，服务端的验证码字段被丢弃，导致提交静默失败。现在提交界面会显示验证码图片与输入框（点击图片可更换），并在提交时携带验证码。\n\n另新增 `AutoCaptcha` 开关（默认开启）：在浏览器本地用模板匹配识别 4 位数字验证码，不联网、不调用任何 AI 服务。把握不大时会留空由您填写，不会填错。" + }, + "3.6.5": { + "UpdateDate": 1789778010947, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1021, + "Description": "fix: 比赛结束后回退提交不再被静默丢弃" + } + ], + "Notes": "修复比赛结束后自动向原题提交的回退功能。此前回退提交的响应被丢弃，遇到提交冷却时会静默失败并显示\"提交失败\"，状态页里也没有任何提交记录。" + }, + "3.6.6": { + "UpdateDate": 1789779349314, + "Prerelease": true, + "UpdateContents": [ + { + "PR": 1023, + "Description": "feat: 验证码识别不出时自动换一张" + } + ], + "Notes": "自动识别验证码时，若当前这张看不准，脚本会自动换一张重试（最多 5 张），无需手动点击图片。" + }, + "3.7.0": { + "UpdateDate": 1789780064668, + "Prerelease": false, + "UpdateContents": [ + { + "PR": 1006, + "Description": "Fix #1004" + }, + { + "PR": 1013, + "Description": "fix: handle PID 0 submission rows" + }, + { + "PR": 1015, + "Description": "feat: compress ApplyData payloads with gzip and Base93" + }, + { + "PR": 1019, + "Description": "fix: 在提交界面显示并提交验证码" + }, + { + "PR": 1021, + "Description": "fix: 比赛结束后回退提交不再被静默丢弃" + }, + { + "PR": 1023, + "Description": "feat: 验证码识别不出时自动换一张" + } + ], + "Notes": "

3.7.0 — 自上一正式版 3.6.0 以来的完整更新

\n

本次正式版整合 3.6.1、3.6.2、3.6.3、3.6.4、3.6.5 和 3.6.6 的全部功能更新与修复。

\n

3.6.1：代码对比显示修复（#1006，修复 #1004）

\n\n

3.6.2：提交记录布局修复（#1013）

\n\n

3.6.3：获取数据功能升级（#1015）

\n\n

3.6.4：提交验证码支持（#1019）

\n\n

3.6.5：比赛结束后回退提交修复（#1021）

\n\n

3.6.6：验证码自动更换与重试（#1023）

\n" } } } \ No newline at end of file diff --git a/XMOJ.user.js b/XMOJ.user.js index 69d0d77d..494f9a4e 100644 --- a/XMOJ.user.js +++ b/XMOJ.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name XMOJ -// @version 3.6.0 +// @version 3.7.0 // @description XMOJ增强脚本 // @author @XMOJ-Script-dev, @langningchen and the community // @namespace https://github/langningchen @@ -551,6 +551,36 @@ let _earlyObs = null; })(); const CaptchaSiteKey = "0x4AAAAAAALBT58IhyDViNmv"; +// XMOJ turns on its own image captcha (vcode.php) whenever the judge queue is busy. submitpage.php +// renders the field at >10 pending solutions but submit.php only enforces it at >50, so the two can +// disagree; see GetCaptchaParameter below for how that gap is handled. +// vcode.php draws 4 digits with imagettftext(size 15, Vera.ttf) at a fixed origin, so every glyph is +// pixel identical between challenges and template matching reads them exactly. That beats sending the +// image to a vision model: llava-1.5-7b, llama-4-scout and mistral-small-3.1 were all measured at 0/7 +// on real captchas even after preprocessing, and a confidently wrong guess is worse than an empty box +// because it burns the attempt and trips vfail. Glyphs below are Vera.ttf rendered at 20px, which is +// the 15px cap height GD produces; '#' would be ink, stored as 1 bits row by row. +const CaptchaGlyphs = { + "0": "001111000|011111110|011000110|111000111|110000011|110000011|110011011|110011011|110000011|110000011|110000011|111000111|011000110|011111110|001111000", + "1": "00111000|11111000|11011000|00011000|00011000|00011000|00011000|00011000|00011000|00011000|00011000|00011000|00011000|11111111|11111111", + "2": "011111100|111111110|100000111|000000011|000000011|000000011|000000111|000000110|000001100|000011000|000110000|001100000|011000000|111111111|111111111", + "3": "011111100|111111110|100000111|000000011|000000011|000000111|000111110|000111100|000000110|000000011|000000011|000000011|100000111|111111110|011111100", + "4": "0000011100|0000011100|0000111100|0000101100|0001101100|0001001100|0011001100|0110001100|0110001100|1100001100|1111111111|1111111111|0000001100|0000001100|0000001100", + "5": "011111110|011111110|011000000|011000000|011000000|011111100|011111110|010000111|000000011|000000011|000000011|000000011|100000110|111111110|011111000", + "6": "000111100|001111110|011100010|011000000|110000000|110000000|110111100|111111110|111000111|110000011|110000011|110000011|011000111|011111110|001111100", + "7": "111111111|111111111|000000110|000000110|000000110|000001100|000001100|000001100|000011000|000011000|000011000|000110000|000110000|000110000|001100000", + "8": "001111100|011111110|111000111|110000011|110000011|011000110|001111100|011111110|011000110|110000011|110000011|110000011|111000111|011111110|001111100", + "9": "001111100|011111110|111000110|110000011|110000011|110000011|111000111|011111111|001111011|000000011|000000011|000000110|010001110|011111100|001111000" +}; +// How far ahead the best matching glyph has to score before its digit is trusted. Measured over 300 +// generated and 40 live captchas, 4 is the point where every wrong answer turns into a decline: it +// still fills in about three quarters of them and never once guessed wrong. +const CaptchaMinMargin = 4; +// With about three quarters of challenges read, five images leave well under a 1% chance of giving up. +const CaptchaMaxAttempts = 5; +// Settings that start off rather than on. Both UtilityEnabled and the settings list seed missing +// values, so they have to agree or whichever runs first decides the default. +const DefaultOffSettings = ["DebugMode", "SuperDebug", "ReplaceXM"]; // 0.53.0 leaks its minified helper variables (m, r, o, ...) into the global scope from every // chunk file, so whichever chunk happens to be evaluated last clobbers the others and the // editor randomly fails to load (microsoft/monaco-editor#5015). 0.52.2 ships a single bundle @@ -1491,8 +1521,7 @@ let TidyTable = (Table) => { let UtilityEnabled = (Name) => { try { if (localStorage.getItem("UserScript-Setting-" + Name) == null) { - const defaultOffItems = ["DebugMode", "SuperDebug", "ReplaceXM"]; - localStorage.setItem("UserScript-Setting-" + Name, defaultOffItems.includes(Name) ? "false" : "true"); + localStorage.setItem("UserScript-Setting-" + Name, DefaultOffSettings.includes(Name) ? "false" : "true"); } return localStorage.getItem("UserScript-Setting-" + Name) == "true"; } catch (e) { @@ -2807,7 +2836,7 @@ async function main() { CheckBox.type = "checkbox"; CheckBox.id = Data[i].ID; if (localStorage.getItem("UserScript-Setting-" + Data[i].ID) == null) { - localStorage.setItem("UserScript-Setting-" + Data[i].ID, "true"); + localStorage.setItem("UserScript-Setting-" + Data[i].ID, DefaultOffSettings.includes(Data[i].ID) ? "false" : "true"); } if (localStorage.getItem("UserScript-Setting-" + Data[i].ID) == "false") { CheckBox.checked = false; @@ -2855,6 +2884,8 @@ async function main() { }, {"ID": "DownloadPlayback", "Type": "A", "Name": "回放视频增加下载功能"}, { "ID": "ImproveACRate", "Type": "A", "Name": "自动提交已AC题目以提高AC率" }, {"ID": "AutoO2", "Type": "F", "Name": "代码提交界面自动选择O2优化"}, { + "ID": "AutoCaptcha", "Type": "A", "Name": "自动识别提交界面的验证码（本地识别，把握不大时留空由您填写）" + }, { "ID": "Beautify", "Type": "F", "Name": "美化界面", "Children": [{ "ID": "NewTopBar", "Type": "F", "Name": "使用新的顶部导航栏" }, { @@ -3502,7 +3533,20 @@ async function main() { SolutionIDs.push(SID); if (UtilityEnabled("ResetType")) { Temp[i].childNodes[0].remove(); - Temp[i].childNodes[0].innerHTML = "" + SID + " " + "重交"; + let resubmitLink = Temp[i].childNodes[6].children[1] ?? null; + let sourceCell = Temp[i].childNodes[0]; + let sourceLink = document.createElement("a"); + sourceLink.href = "https://www.xmoj.tech/showsource.php?id=" + SID; + sourceLink.innerText = SID; + sourceCell.replaceChildren(sourceLink); + // Submissions with PID 0 do not have a resubmit link. + if (resubmitLink != null) { + let newResubmitLink = document.createElement("a"); + newResubmitLink.href = resubmitLink.href; + newResubmitLink.innerText = "重交"; + sourceCell.appendChild(document.createTextNode(" ")); + sourceCell.appendChild(newResubmitLink); + } Temp[i].childNodes[1].remove(); Temp[i].childNodes[1].children[0].removeAttribute("class"); Temp[i].childNodes[3].childNodes[0].innerText = SizeToStringSize(Temp[i].childNodes[3].childNodes[0].innerText); @@ -4071,6 +4115,13 @@ async function main() { } } else if (location.pathname == "/submitpage.php") { document.title = "提交代码: " + (SearchParams.get("id") != null ? "题目" + Number(SearchParams.get("id")) : "比赛" + Number(SearchParams.get("cid"))); + // submitpage.php only renders the vcode field while the judge queue is busy, and the + // custom page below throws the server markup away, so read it before that happens. + // The queue is idle almost all of the time, so the only other way to reach this state + // is to flood the judge; localStorage UserScript-ForceCaptcha=true forces it instead. + const NativeCaptchaShown = document.querySelector("input[name='vcode']") != null || + document.querySelector("img#vcode") != null || + localStorage.getItem("UserScript-ForceCaptcha") === "true"; document.querySelector("body > div > div.mt-3").innerHTML = `

Loading...

@@ -4079,6 +4130,12 @@ async function main() {

+
`; + let compareElementStyle = document.createElement("style"); + compareElementStyle.textContent = `#CompareElement .monaco-merge-host { height: 95%; }`; + document.head.appendChild(compareElementStyle); + let LeftCode = ""; await fetch("https://www.xmoj.tech/getsource.php?id=" + SearchParams.get("left")) .then((Response) => { @@ -5157,10 +5543,437 @@ async function main() { let Temp = CurrentElement.innerText.substring(0, CurrentElement.innerText.length - 2).split("/"); CurrentElement.innerText = TimeToStringTime(Temp[0]) + "/" + SizeToStringSize(Temp[1]); } - if (document.getElementById("apply_data")) { - let ApplyDiv = document.getElementById("apply_data").parentElement; + { + let ApplyDataElement = document.getElementById("apply_data"); + let ApplyDiv = ApplyDataElement ? ApplyDataElement.parentElement : document.getElementById("results").parentElement; console.log("启动！！！"); if (UtilityEnabled("ApplyData")) { + let base93Alphabet = (() => { + let result = ""; + for (let code = 32; code < 127; code++) { + if (code !== 91 && code !== 93) { + result += String.fromCharCode(code); + } + } + return result; + })(); + let base93Map = Object.fromEntries([...base93Alphabet].map((character, index) => [character, index])); + + function Base93Decode(input) { + let output = []; + let bitBuffer = 0; + let bitCount = 0; + let value = -1; + for (let character of input) { + let decoded = base93Map[character]; + if (decoded === undefined) { + throw new Error("Invalid Base93 payload"); + } + if (value < 0) { + value = decoded; + continue; + } + value += decoded * 93; + bitBuffer |= value << bitCount; + bitCount += (value & 8191) > 456 ? 13 : 14; + while (bitCount >= 8) { + output.push(bitBuffer & 255); + bitBuffer >>>= 8; + bitCount -= 8; + } + value = -1; + } + if (value >= 0) { + output.push((bitBuffer | value << bitCount) & 255); + } + return new Uint8Array(output); + } + + function DecodeBytesForDisplay(input) { + try { + // Keep a leading UTF-8 BOM instead of silently discarding it. + return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(input); + } catch { + // Invalid UTF-8 is shown reversibly: every original byte becomes one \xNN escape. + let output = ""; + for (let byte of input) { + output += "\\x" + byte.toString(16).padStart(2, "0"); + } + return output; + } + } + + function NumberStreamDecodeV1(input) { + let position = 4; + if (input.length < 5 || input[0] !== 78 || input[1] !== 83 || input[2] !== 67 || input[3] !== 49) { + throw new Error("Invalid number-stream payload"); + } + function ReadByte() { + if (position >= input.length) { + throw new Error("Truncated number-stream payload"); + } + return input[position++]; + } + function ReadVarint() { + let value = 0n; + let shift = 0n; + while (true) { + let byte = ReadByte(); + value |= BigInt(byte & 127) << shift; + if (!(byte & 128)) { + return value; + } + shift += 7n; + if (shift > 63n) { + throw new Error("Invalid number-stream varint"); + } + } + } + function ReadSize() { + let value = ReadVarint(); + if (value > BigInt(Number.MAX_SAFE_INTEGER)) { + throw new Error("Number-stream payload is too large"); + } + return Number(value); + } + function Unzig(value) { + return (value >> 1n) ^ -(value & 1n); + } + let flags = ReadByte(); + if (flags & 1) { + let length = ReadSize(); + if (position + length > input.length) { + throw new Error("Truncated number-stream payload"); + } + return DecodeBytesForDisplay(input.subarray(position, position + length)); + } + let numberCount = ReadSize(); + let lineCount = ReadSize(); + let lineLengths = []; + let mode = ReadByte(); + if (mode === 1) { + let length = ReadSize(); + let lastLength = ReadSize(); + for (let i = 0; i + 1 < lineCount; i++) { + lineLengths.push(length); + } + if (lineCount) { + lineLengths.push(lastLength); + } + } else if (mode === 2) { + for (let i = 0; i < lineCount; i++) { + lineLengths.push(ReadSize()); + } + } else { + throw new Error("Invalid number-stream line mode"); + } + let values = []; + let previous = 0n; + while (values.length < numberCount) { + let count = Math.min(128, numberCount - values.length); + let useDelta = ReadByte() !== 0; + let width = ReadByte(); + if (width > 64) { + throw new Error("Invalid number-stream bit width"); + } + if (width === 0) { + for (let i = 0; i < count; i++) { + let value = useDelta ? previous : 0n; + values.push(value); + previous = value; + } + continue; + } + let byteCount = Math.ceil(count * width / 8); + if (position + byteCount > input.length) { + throw new Error("Truncated number-stream payload"); + } + let end = position + byteCount; + let buffer = 0n; + let bitCount = 0; + function ReadBits(bits) { + while (bitCount < bits) { + buffer |= BigInt(input[position++]) << BigInt(bitCount); + bitCount += 8; + } + let value = buffer & ((1n << BigInt(bits)) - 1n); + buffer >>= BigInt(bits); + bitCount -= bits; + return value; + } + for (let i = 0; i < count; i++) { + let decoded = Unzig(ReadBits(width)); + let value = useDelta ? BigInt.asIntN(64, previous + decoded) : decoded; + values.push(value); + previous = value; + } + position = end; + } + if (lineLengths.reduce((sum, length) => sum + length, 0) !== numberCount) { + throw new Error("Invalid number-stream structure"); + } + let output = ""; + let valueIndex = 0; + for (let i = 0; i < lineLengths.length; i++) { + if (i) { + output += "\n"; + } + let line = []; + for (let j = 0; j < lineLengths[i]; j++) { + line.push(values[valueIndex++].toString()); + } + output += line.join(" "); + } + if (flags & 2) { + output += "\n"; + } + return output; + } + + function NumberStreamDecode(input) { + if (input[3] === 49) { + return NumberStreamDecodeV1(input); + } + let position = 4; + if (input.length < 5 || input[0] !== 78 || input[1] !== 83 || input[2] !== 67 || input[3] !== 51) { + throw new Error("Invalid number-stream payload"); + } + function ReadByte() { + if (position >= input.length) { + throw new Error("Truncated number-stream payload"); + } + return input[position++]; + } + function ReadVarint() { + let value = 0n; + let shift = 0n; + while (true) { + let byte = ReadByte(); + value |= BigInt(byte & 127) << shift; + if (!(byte & 128)) { + return value; + } + shift += 7n; + if (shift > 63n) { + throw new Error("Invalid number-stream varint"); + } + } + } + function ReadSize() { + let value = ReadVarint(); + if (value > 4294967296n) { + throw new Error("Number-stream payload is too large"); + } + return Number(value); + } + function Unzig(value) { + return (value >> 1n) ^ -(value & 1n); + } + function DecodeStream(length) { + let output = []; + let definitions = []; + let sequence = []; + let previousDefinition = -1; + let previous = 0n; + function Emit(definition, count) { + if (definition.count !== count) { + throw new Error("Invalid number-stream block size"); + } + let buffer = 0n; + let bitCount = 0; + let payloadPosition = 0; + function ReadBits(bits) { + while (bitCount < bits) { + buffer |= BigInt(definition.payload[payloadPosition++]) << BigInt(bitCount); + bitCount += 8; + } + let value = buffer & ((1n << BigInt(bits)) - 1n); + buffer >>= BigInt(bits); + bitCount -= bits; + return value; + } + for (let i = 0; i < count; i++) { + let packed = definition.width ? ReadBits(definition.width) : 0n; + let value; + if (definition.mode === 4) { + value = BigInt.asIntN(64, definition.base + packed); + } else if (definition.mode === 1) { + value = BigInt.asIntN(64, previous + Unzig(packed)); + } else { + value = Unzig(packed); + } + output.push(value); + previous = value; + } + } + while (output.length < length) { + let count = Math.min(128, length - output.length); + let operation = ReadByte(); + if (operation === 3) { + let repeats = ReadSize(); + if (previousDefinition < 0 || repeats === 0) { + throw new Error("Invalid number-stream run"); + } + for (let i = 0; i < repeats; i++) { + if (output.length >= length) { + throw new Error("Number-stream run is too long"); + } + count = Math.min(128, length - output.length); + Emit(definitions[previousDefinition], count); + sequence.push(previousDefinition); + } + continue; + } + if (operation === 2) { + let distance = ReadSize(); + if (!distance || distance > sequence.length) { + throw new Error("Invalid number-stream back-reference"); + } + previousDefinition = sequence[sequence.length - distance]; + Emit(definitions[previousDefinition], count); + sequence.push(previousDefinition); + continue; + } + if (operation !== 0 && operation !== 1 && operation !== 4) { + throw new Error("Invalid number-stream opcode"); + } + let width = ReadByte(); + if (width > 64) { + throw new Error("Invalid number-stream bit width"); + } + let base = operation === 4 ? Unzig(ReadVarint()) : 0n; + let byteCount = Math.ceil(count * width / 8); + if (position + byteCount > input.length) { + throw new Error("Truncated number-stream payload"); + } + let definition = { + mode: operation, + width, + count, + base, + payload: input.subarray(position, position + byteCount) + }; + position += byteCount; + Emit(definition, count); + definitions.push(definition); + previousDefinition = definitions.length - 1; + sequence.push(previousDefinition); + } + return output; + } + let flags = ReadByte(); + if (flags & 1) { + let length = ReadSize(); + if (position + length > input.length) { + throw new Error("Truncated number-stream payload"); + } + return DecodeBytesForDisplay(input.subarray(position, position + length)); + } + let numberCount = ReadSize(); + let lineCount = ReadSize(); + let lineValues = DecodeStream(lineCount); + let values = DecodeStream(numberCount); + let lineLengths = lineValues.map((value) => { + if (value < 0n || value > BigInt(Number.MAX_SAFE_INTEGER)) { + throw new Error("Invalid number-stream line length"); + } + return Number(value); + }); + if (lineLengths.reduce((sum, length) => sum + length, 0) !== numberCount) { + throw new Error("Invalid number-stream structure"); + } + let output = ""; + let valueIndex = 0; + for (let i = 0; i < lineLengths.length; i++) { + if (i) { + output += "\n"; + } + let line = []; + for (let j = 0; j < lineLengths[i]; j++) { + line.push(values[valueIndex++].toString()); + } + output += line.join(" "); + } + if (flags & 2) { + output += "\n"; + } + return output; + } + + async function GzipDecode(input) { + let stream = new Blob([input]).stream().pipeThrough(new DecompressionStream("gzip")); + return new Uint8Array(await new Response(stream).arrayBuffer()); + } + + async function DecodePayload(payload) { + let rawData = Base93Decode(payload); + if (rawData.length >= 4 && rawData[0] === 78 && rawData[1] === 83 && rawData[2] === 67 && (rawData[3] === 49 || rawData[3] === 51)) { + return NumberStreamDecode(rawData); + } + return DecodeBytesForDisplay(await GzipDecode(rawData)); + } + + async function ExtractData(text) { + let result = []; + let pattern = /^(?:what\(\): )?\[([^\]\r\n]*)\]\r?$/gm; + let match; + while ((match = pattern.exec(text))) { + try { + result.push(await DecodePayload(match[1])); + } catch { + } + } + return result; + } + let NumberStreamEnabled = false; + let NumberStreamButton = document.createElement("button"); + NumberStreamButton.className = "ms-2 btn btn-outline-secondary"; + NumberStreamButton.title = "适合大型、主要由数值组成的输入；基准压缩速度约 310 MB/s（数值范围以 long long 为限，其他内容会原样回退）"; + function UpdateNumberStreamButton() { + NumberStreamButton.innerText = "高速数值模式：" + (NumberStreamEnabled ? "开启" : "关闭"); + NumberStreamButton.classList.toggle("btn-outline-secondary", !NumberStreamEnabled); + NumberStreamButton.classList.toggle("btn-outline-success", NumberStreamEnabled); + NumberStreamButton.setAttribute("aria-pressed", String(NumberStreamEnabled)); + } + NumberStreamButton.addEventListener("click", () => { + NumberStreamEnabled = !NumberStreamEnabled; + UpdateNumberStreamButton(); + UpdateLineBreakButton(); + UpdateModeDescription(); + }); + ApplyDiv.appendChild(NumberStreamButton); + let PreserveLineBreaks = true; + let LineBreakButton = document.createElement("button"); + LineBreakButton.className = "ms-2 btn btn-outline-secondary"; + LineBreakButton.title = "使用 cin >> 等空白不敏感的读取方式时可关闭；关闭后不保留原输入换行，可避免大量随机行长超过评测输出限制"; + function UpdateLineBreakButton() { + LineBreakButton.innerText = "保留换行：" + (PreserveLineBreaks ? "是" : "否"); + LineBreakButton.disabled = !NumberStreamEnabled; + LineBreakButton.classList.toggle("btn-outline-secondary", PreserveLineBreaks || !NumberStreamEnabled); + LineBreakButton.classList.toggle("btn-outline-warning", !PreserveLineBreaks && NumberStreamEnabled); + LineBreakButton.setAttribute("aria-pressed", String(PreserveLineBreaks)); + } + LineBreakButton.addEventListener("click", () => { + PreserveLineBreaks = !PreserveLineBreaks; + UpdateLineBreakButton(); + UpdateModeDescription(); + }); + ApplyDiv.appendChild(LineBreakButton); + let ModeDescription = document.createElement("div"); + ModeDescription.className = "small text-secondary mt-2"; + function UpdateModeDescription() { + if (!NumberStreamEnabled) { + ModeDescription.innerText = "默认模式（gzip + Base93）：逐字节压缩并精确保留任意输入，适合文本、Unicode、混合内容，以及使用 getline 或按字符读取的程序。无效 UTF-8 会以可逆的逐字节 \\xNN 形式显示。"; + } else if (PreserveLineBreaks) { + ModeDescription.innerText = "高速数值模式（保留换行）：NSC3 同时压缩 long long 数值和每行数值个数，精确恢复规范数值输入的空格、空行、换行和末尾换行；非规范或混合内容会原样回退。大量随机行长仍可能超过评测输出限制。"; + } else { + ModeDescription.innerText = "高速数值模式（不保留换行）：丢弃规范数值输入的行边界，恢复为单行空格分隔的数据，可避开随机行长开销。仅适合 cin >> 或 scanf 等空白不敏感读取；不要用于 getline、按行解析或依赖末尾换行的程序。非规范或混合内容仍会原样回退。"; + } + } + UpdateNumberStreamButton(); + UpdateLineBreakButton(); + UpdateModeDescription(); + ApplyDiv.appendChild(ModeDescription); let GetDataButton = document.createElement("button"); GetDataButton.className = "ms-2 btn btn-outline-secondary"; GetDataButton.innerText = "获取数据"; @@ -5183,39 +5996,66 @@ async function main() { if (localStorage.getItem(`UserScript-Problem-${PID}-IOFilename`) !== null) { Code = `#define IOFile "${localStorage.getItem(`UserScript-Problem-${PID}-IOFilename`)}"\n`; } - Code += `//XMOJ-Script 获取数据代码 - #include + if (NumberStreamEnabled && !PreserveLineBreaks) { + Code += "#define NSC_IGNORE_LINES\n"; + } + let NumberStreamCode = String.raw`// XMOJ-Script 获取数值数据代码 (NSC3) +#include using namespace std; -string Base64Encode(string Input) -{ - const string Base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - string Output; - for (int i = 0; i < Input.length(); i += 3) - { - Output.push_back(i + 0 > Input.length() ? '=' : Base64Chars[(Input[i + 0] & 0xfc) >> 2]); - Output.push_back(i + 1 > Input.length() ? '=' : Base64Chars[((Input[i + 0] & 0x03) << 4) + ((Input[i + 1] & 0xf0) >> 4)]); - Output.push_back(i + 2 > Input.length() ? '=' : Base64Chars[((Input[i + 1] & 0x0f) << 2) + ((Input[i + 2] & 0xc0) >> 6)]); - Output.push_back(i + 3 > Input.length() ? '=' : Base64Chars[Input[i + 2] & 0x3f]); - } - return Output; -} -int main() -{ +typedef uint8_t U8;typedef uint64_t U64;typedef int64_t I64;const size_t NB=128,DC=1u<<16; +U64 zz(I64 v){return(U64(v)<<1)^U64(v>>63);}int bf(U64 v){int n=0;while(v)n++,v>>=1;return n;}void pv(vector&o,U64 v){while(v>=128)o.push_back(U8(v)|128),v>>=7;o.push_back(U8(v));} +struct NP{vectorv,l;bool nl,ok;NP():nl(0),ok(1){}}; +NP pn(const string&s){NP r;size_t n=s.size();if(!n)return r;r.nl=s[n-1]=='\n';size_t e=r.nl?n-1:n;const char*p=s.data();r.v.reserve(e/3+8);size_t i=0;I64 z=0;bool a=1;while(i=e||p[i]==' '||p[i]=='\n'){r.ok=0;return r;}c=p[i];}bool neg=0;if(c=='-'){neg=1;if(++i>=e){r.ok=0;return r;}c=p[i];}if(c<'0'||c>'9'){r.ok=0;return r;}if(c=='0'&&(neg||(i+1='0'&&p[i+1]<='9'))){r.ok=0;return r;}U64 m=0;size_t b=i;while(i9)break;m=m*10+d;i++;}if(i-b>19){r.ok=0;return r;}if(i-b==19){U64 q=0;for(size_t j=b;j(~U64(0)-d)/10){r.ok=0;return r;}q=q*10+d;}m=q;}U64 lim=neg?U64(1)<<63:(U64(1)<<63)-1;if(m>lim){r.ok=0;return r;}r.v.push_back(neg?I64(~m+1):I64(m));z++;a=0;}r.l.push_back(z);return r;} +struct BW{vector&o;U64 a;int n;BW(vector&O):o(O),a(0),n(0){}void p(U64 v,int k){while(k){int t=min(k,64-n);U64 m=t==64?~U64(0):(U64(1)<>t;k-=t;if(n==64){for(int i=0;i<8;i++)o.push_back(U8(a>>(8*i)));a=0;n=0;}}}void f(){if(n)for(int i=0;i<(n+7)/8;i++)o.push_back(U8(a>>(8*i)));}}; +void bp(vector&q,U8&m,U8&k,I64&base,const I64*v,size_t n,I64 prev){U64 mr=0,md=0;I64 lo=v[0],hi=v[0],p=prev;for(size_t i=0;i>8);for(int b=0;b<8;b++)d+=char(U8(U64(base)>>(8*b)));} +void es(vector&o,const vector&v){unordered_mapdict;vectordefs;vectorseq;string cur;vectorq;q.reserve(NB*8+8);size_t pending=0,prevDef=size_t(-1);I64 prev=0;for(size_t i=0;i::iterator it=dict.find(cur);if(it!=dict.end()){size_t at=it->second;o.push_back(2);pv(o,seq.size()-at);prevDef=seq[at];seq.push_back(prevDef);it->second=seq.size()-1;continue;}o.push_back(m);o.push_back(k);if(m==4)pv(o,zz(base));o.insert(o.end(),q.begin(),q.end());defs.push_back(cur);prevDef=defs.size()-1;seq.push_back(prevDef);if(dict.size()o;o.push_back('N');o.push_back('S');o.push_back('C');o.push_back('3');NP p=pn(s);bool raw=!p.ok; +#ifdef NSC_IGNORE_LINES +if(!raw){p.nl=0;p.l.clear();if(!p.v.empty())p.l.push_back(I64(p.v.size()));} +#endif +o.push_back(U8(raw|(p.nl?2:0)));if(raw){pv(o,s.size());o.insert(o.end(),s.begin(),s.end());return string((char*)&o[0],o.size());}pv(o,p.v.size());pv(o,p.l.size());es(o,p.l);es(o,p.v);return string((char*)&o[0],o.size());} +string b93(const string&s){static string A=[](){string a;for(int c=32;c<127;c++)if(c!=91&&c!=93)a+=char(c);return a;}();string o="[";o.reserve(s.size()*5/4+3);uint32_t b=0;int n=0;for(size_t i=0;i13){uint32_t v=b&8191;if(v>456)b>>=13,n-=13;else v=b&16383,b>>=14,n-=14;o+=A[v%93];o+=A[v/93];}}if(n){o+=A[b%93];if(n>7||b>92)o+=A[b/93];}o+=']';return o;} +string rd(){string s; #ifdef IOFile - freopen(IOFile ".in", "r", stdin); - freopen(IOFile ".out", "w", stdout); +if(!fseek(stdin,0,SEEK_END)){long n=ftell(stdin);rewind(stdin);if(n>=0){s.resize((size_t)n);if(n){size_t q=fread(&s[0],1,(size_t)n,stdin);s.resize(q);}return s;}} #endif - string Input; - while (1) - { - char Data = getchar(); - if (Data == EOF) - break; - Input.push_back(Data); - } - throw logic_error("[" + Base64Encode(Input.c_str()) + "]"); - return 0; -}`; +char b[65536];size_t q;while((q=fread(b,1,sizeof b,stdin))!=0)s.append(b,q);return s;} +int main(){ +#ifdef IOFile +if(!freopen(IOFile ".in","rb",stdin))return 0; +#endif +cerr< +using namespace std; +struct W{string o;uint64_t b;int n;W():b(0),n(0){}void p(uint32_t v,int k){b|=(uint64_t)v<=8)o+=char(b),b>>=8,n-=8;}void a(){if(n)o+=char(b),b=0,n=0;}string f(){a();return o;}};uint32_t R(uint32_t x,int n){uint32_t y=0;while(n--)y=y*2+(x&1),x>>=1;return y;}struct T{uint16_t l,d;T(int L=0,int D=0):l(L),d(D){}}; +int Lb[]={3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258},Le[]={0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0},Db[]={1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577},De[]={0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; +int li(int x){int i=0;while(i<28&&x>=Lb[i+1])i++;return i;}int di(int x){int i=0;while(i<29&&x>=Db[i+1])i++;return i;} +vector tk(const string&s){int N=s.size(),Z=1<<16;vectorh(Z,-1),p(1<<15,-1);vectorv;v.reserve(N/5+1);auto H=[&](int i){return ((uint32_t)(uint8_t)s[i]*63001u+(uint32_t)(uint8_t)s[i+1]*251u+(uint8_t)s[i+2])&(Z-1);};auto I=[&](int i){if(i+2=N)return make_pair(0,0);int c=h[H(i)],m=min(258,N-i),q=0;const char*a=s.data()+i;while(c>=0&&i-c<=32768){int lim=l>=8?64:128;if(q++>=lim)break;const char*b=s.data()+c;if(b[0]!=a[0]||b[1]!=a[1]||b[2]!=a[2]){c=p[c&32767];continue;}if(l>=3&&(b[l]!=a[l]||memcmp(a,b,l))){c=p[c&32767];continue;}int z=l>=3?l+1:3;while(z+8<=m){uint64_t x,y;memcpy(&x,a+z,8);memcpy(&y,b+z,8);if(x!=y)break;z+=8;}while(zl)l=z,d=i-c;if(z>=128||z==m)break;c=p[c&32767];}return make_pair(l,d);};for(int i=0;iu=M(i);int l=u.first,d=u.second;I(i);if(l>=3&&l<16&&i+1q=M(i+1);if(q.first>l){v.push_back(T((uint8_t)s[i++],0));continue;}}if(l>=3){v.push_back(T(l,d));for(int j=1;jf,int M,vector&L){int n=f.size();L.assign(n,0);priority_queue,vector >,greater > >q;vectora(2*n,-1),b(2*n,-1);for(int i=0;i1){pairx=q.top();q.pop();pairy=q.top();q.pop();a[z]=x.second;b[z]=y.second;q.push(make_pair(x.first+y.first,z++));}functionF=[&](int x,int d){if(x cd(const vector&L,int M){vectorc(M+1),n(M+1);for(size_t i=0;ir(L.size());for(size_t i=0;i&L,const vector&C){w.p(C[s],L[s]);} +void pm(W&w,int l,int d,const vector&L,const vector&C,const vector&D,const vector&E){int a=li(l),q=di(d);sy(w,257+a,L,C);if(Le[a])w.p(l-Lb[a],Le[a]);sy(w,q,D,E);if(De[q])w.p(d-Db[q],De[q]);} +string fx(const vector&v){vectorL(288),D(32,5);for(int i=0;i<144;i++)L[i]=8;for(int i=144;i<256;i++)L[i]=9;for(int i=256;i<280;i++)L[i]=7;for(int i=280;i<288;i++)L[i]=8;vectorC=cd(L,15),E=cd(D,15);W w;w.o.reserve(v.size());w.p(1,1);w.p(1,2);for(size_t i=0;i rl(const vector&x){vectorr;for(int i=0,n=x.size();i=11){int q=min(k,138);r.push_back(Q(18,7,q-11));k-=q;}if(k>=3){int q=min(k,10);r.push_back(Q(17,3,q-3));k-=q;}while(k--)r.push_back(Q(0,0,0));}else{r.push_back(Q(z,0,0));k--;while(k>=3){int q=min(k,6);r.push_back(Q(16,2,q-3));k-=q;}while(k--)r.push_back(Q(z,0,0));}i=j;}return r;} +string dy(const vector&v){vectorf(286),g(30);f[256]=1;for(size_t i=0;iL,D;if(!ln(f,15,L)||!ln(g,15,D))return string();int nl=286,nd=30;while(nl>257&&!L[nl-1])nl--;while(nd>1&&!D[nd-1])nd--;vectorx(L.begin(),L.begin()+nl);x.insert(x.end(),D.begin(),D.begin()+nd);vectorr=rl(x);vectorf2(19);for(size_t i=0;iK;if(!ln(f2,7,K))return string();static int O[]={16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};int nk=19;while(nk>4&&!K[O[nk-1]])nk--;vectorC=cd(L,15),E=cd(D,15),J=cd(K,7);W w;w.o.reserve(v.size());w.p(1,1);w.p(2,2);w.p(nl-257,5);w.p(nd-1,5);w.p(nk-4,4);for(int i=0;i>8);w.o+=char(q);w.o+=char(q>>8);w.o.append(s.data()+p,k);p+=k;}return w.o;} +uint32_t cr(const string&s){static uint32_t t[256];static int z=0;if(!z){for(int i=0;i<256;i++){uint32_t c=i;for(int j=0;j<8;j++)c=c>>1^(0xedb88320u&-(int)(c&1));t[i]=c;}z=1;}uint32_t c=~0u;for(size_t i=0;i>8);return ~c;} +string gz(const string&s){vectorv=tk(s);string b=fx(v),c=dy(v),d;c.size()&&c.size()(1,(s.size()+65534)/65535);if(z>8*i);for(int i=0;i<4;i++)o+=char(n>>8*i);return o;} +string b93(const string&s){static string A=[](){string a;for(int c=32;c<127;c++)if(c!=91&&c!=93)a+=char(c);return a;}();string o="[";o.reserve(s.size()*5/4+3);uint32_t b=0;int n=0;for(size_t i=0;i13){uint32_t v=b&8191;if(v>456)b>>=13,n-=13;else v=b&16383,b>>=14,n-=14;o+=A[v%93];o+=A[v/93];}}if(n){o+=A[b%93];if(n>7||b>92)o+=A[b/93];}o+=']';return o;} +string rd(){string s; +#ifdef IOFile +if(!fseek(stdin,0,SEEK_END)){long n=ftell(stdin);rewind(stdin);if(n>=0){s.resize((size_t)n);if(n){size_t q=fread(&s[0],1,(size_t)n,stdin);s.resize(q);}return s;}} +#endif +char b[65536];size_t q;while((q=fread(b,1,sizeof b,stdin))!=0)s.append(b,q);return s;} +int main(){ +#ifdef IOFile +if(!freopen(IOFile ".in","rb",stdin))return 0; +#endif +cerr< { return Response.text(); - }).then((Response) => { + }).then(async (Response) => { let ParsedDocument = new DOMParser().parseFromString(Response, "text/html"); let ErrorData = ParsedDocument.getElementById("errtxt").innerText; - let MatchResult = ErrorData.match(/\what\(\): \[([A-Za-z0-9+\/=]+)\]/g); - if (MatchResult === null) { + let dataList = await ExtractData(ErrorData); + if (dataList.length === 0) { GetDataButton.innerText = "获取数据失败"; GetDataButton.disabled = false; return; } - for (let i = 0; i < MatchResult.length; i++) { - let Data = CryptoJS.enc.Base64.parse(MatchResult[i].substring(10, MatchResult[i].length - 1)).toString(CryptoJS.enc.Utf8); + for (let i = 0; i < dataList.length; i++) { + let Data = dataList[i]; ApplyDiv.appendChild(document.createElement("hr")); ApplyDiv.appendChild(document.createTextNode("数据" + (i + 1) + "：")); let CodeElement = document.createElement("div"); @@ -5275,12 +6115,14 @@ int main() }); }); } - document.getElementById("apply_data").addEventListener("click", () => { - let ApplyElements = document.getElementsByClassName("data"); - for (let i = 0; i < ApplyElements.length; i++) { - ApplyElements[i].style.display = (ApplyElements[i].style.display == "block" ? "" : "block"); - } - }); + if (ApplyDataElement) { + ApplyDataElement.addEventListener("click", () => { + let ApplyElements = document.getElementsByClassName("data"); + for (let i = 0; i < ApplyElements.length; i++) { + ApplyElements[i].style.display = (ApplyElements[i].style.display == "block" ? "" : "block"); + } + }); + } } let ApplyElements = document.getElementsByClassName("data"); for (let i = 0; i < ApplyElements.length; i++) { @@ -7110,3 +7952,4 @@ console.log("XMOJ-Script loaded successfully!"); })().catch(e => { console.error("[XMOJ-Script] Initialization error:", e); }); + diff --git a/package.json b/package.json index c257181d..454e50c9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xmoj-script", - "version": "3.6.0", + "version": "3.7.0", "description": "an improvement script for xmoj.tech", "main": "AddonScript.js", "scripts": {