revert: remove _update_ts injection as it breaks ticket scanning
This commit is contained in:
@@ -340,8 +340,6 @@ local function httpRequest(method, url, body, headers)
|
||||
end
|
||||
end
|
||||
|
||||
local checkGlobalUpdate = nil
|
||||
|
||||
local function postCheck(url, payload)
|
||||
local okBody, body = pcall(textutils.serializeJSON, payload)
|
||||
if not okBody then return false end
|
||||
@@ -349,7 +347,6 @@ local function postCheck(url, payload)
|
||||
if not ok then return false, data end
|
||||
local okJ, parsed = pcall(textutils.unserializeJSON, data or "")
|
||||
if not okJ then return false, data end
|
||||
if checkGlobalUpdate then checkGlobalUpdate(parsed) end
|
||||
return true, parsed
|
||||
end
|
||||
|
||||
@@ -358,7 +355,6 @@ local function getJSON(url)
|
||||
if not ok then return false, data end
|
||||
local okJ, parsed = pcall(textutils.unserializeJSON, data or "")
|
||||
if not okJ then return false, data end
|
||||
if checkGlobalUpdate then checkGlobalUpdate(parsed) end
|
||||
return true, parsed
|
||||
end
|
||||
|
||||
@@ -919,48 +915,6 @@ end
|
||||
|
||||
drawReadyScreen()
|
||||
|
||||
checkGlobalUpdate = function(parsed)
|
||||
if type(parsed) == 'table' and parsed._update_ts then
|
||||
local remoteTs = tonumber(parsed._update_ts)
|
||||
if remoteTs and remoteTs > 0 then
|
||||
local attemptFile = ".last_update_ts"
|
||||
local tried = 0
|
||||
if fs.exists(attemptFile) then
|
||||
local f = fs.open(attemptFile, "r")
|
||||
tried = tonumber(f and f.readAll() or "0") or 0
|
||||
if f then f.close() end
|
||||
end
|
||||
if remoteTs > tried then
|
||||
isUpdating = true
|
||||
pcall(drawReadyScreen)
|
||||
sleep(0.5)
|
||||
|
||||
local f = fs.open(attemptFile, "w")
|
||||
if f then f.write(tostring(remoteTs)); f.close() end
|
||||
|
||||
local env = setmetatable({ AUTO_UPDATE_SILENT = true }, { __index = _G or getfenv() or _ENV })
|
||||
local fn, err = loadfile("update_gate.lua", env)
|
||||
if fn then
|
||||
local ok, res = pcall(fn, "--silent")
|
||||
if not ok then
|
||||
lastUpdateError = string.sub(tostring(res), 1, 30)
|
||||
end
|
||||
else
|
||||
lastUpdateError = "loadfile failed: " .. tostring(err)
|
||||
end
|
||||
|
||||
isUpdating = false
|
||||
pcall(drawReadyScreen)
|
||||
|
||||
if lastUpdateError then
|
||||
sleep(3)
|
||||
end
|
||||
os.reboot()
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function collectInspectionDevices(side, modeBySideRef)
|
||||
local sideKnown = trimSide(side) ~= nil
|
||||
local inspectionDevs = {}
|
||||
|
||||
Reference in New Issue
Block a user