pokemon/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp.git synced 2026-08-12 08:21:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1057 from ShaneMcGovernIE/shanemcgovernie-fix-index-unexpected-character

Browse Source 
Handle non-JSON update responses
This commit is contained in:
bryanthaboi
2026-08-10 17:07:43 -04:00
committed by GitHub
parent 3955721bfc f606840216
commit abf0f9e98a
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/update/Check.lua
+7 -2
View File
@@ -52,8 +52,13 @@ end
-- falls back to require.
function Check.parseRelease(jsonText, Json)
Json = Json or require("src.link.Json")
local doc = Json.decode(jsonText)
if type(doc) ~= "table" or not doc.tag_name then
local notJson = Json.describeUnexpected(jsonText)
if notJson then return nil, notJson end
local doc, decodeErr = Json.decode(jsonText)
if type(doc) ~= "table" then
return nil, decodeErr or "no tag_name in release json"
end
if not doc.tag_name then
return nil, "no tag_name in release json"
end
local version = stripV(doc.tag_name)
tests/engine/update_check_tests.lua
+14
View File
@@ -47,6 +47,20 @@ eq(bad, nil, "non-X.Y.Z tag rejected")
check(badErr ~= nil, "rejection carries an error string")
eq(Check.parseRelease(Json.encode({ foo = 1 })), nil, "missing tag_name rejected")
-- Network failures can return a plain-text or HTML body instead of JSON. The
-- launcher must describe that response rather than leaking the decoder's
-- low-level "unexpected character 'E'" assertion.
do
local release, err = Check.parseRelease("Error: API rate limit exceeded")
check(release == nil and tostring(err):find("not JSON", 1, true) ~= nil,
"plain-text update failure is reported as non-JSON")
release, err = Check.parseRelease("<!DOCTYPE html><html>502 Bad Gateway</html>")
check(release == nil and tostring(err):find("HTML", 1, true) ~= nil,
"HTML update failure is identified")
check(tostring(err):find("unexpected character", 1, true) == nil,
"decoder assertion is not exposed")
end
-- parseSums: shasum -a 256 format, tolerating the '*' binary marker, a './'
-- prefix and CRLF line endings; unrelated lines are skipped
local sums =