feat(race): notification tiers, drift correction, and T=0 retry (#348)
## Problem Race countdown had three reliability issues: - Notified every second regardless of remaining time (noisy for hours-long waits) - Never re-fetched start times (stale if contest rescheduled) - No retry on setup failure at T=0 — if the scraper failed at the most critical moment, the entire countdown was wasted ## Solution - **Notification tiers**: >1h every 15m, >5m every 1m, >1m every 10s, ≤60s every 1s - **Drift correction**: re-fetch contest list every 10 minutes, update `start_time` if changed - **T=0 retry**: `race_try_setup` calls `scrape_contest_metadata` with the new `on_error` callback, retrying up to 15 times at 3s intervals (~45s). Caches metadata on success, then calls `setup_contest` on the fast (cached) path. Token guard invalidates stale retries after cancellation. - **`on_error` for `scrape_contest_metadata`**: optional 4th param, backward-compatible
This commit is contained in:
Barrett Ruth
GitHub
parent
bd0ae25d4b
commit
8398f3428e
2 changed files with 138 additions and 10 deletions
140
lua/cp/race.lua
140
lua/cp/race.lua
|
|
@ -5,13 +5,19 @@ local constants = require('cp.constants')
|
|||
local logger = require('cp.log')
|
||||
local scraper = require('cp.scraper')
|
||||
|
||||
local REFETCH_INTERVAL_S = 600
|
||||
local RETRY_DELAY_MS = 3000
|
||||
local MAX_RETRY_ATTEMPTS = 15
|
||||
|
||||
local race_state = {
|
||||
timer = nil,
|
||||
token = nil,
|
||||
platform = nil,
|
||||
contest_id = nil,
|
||||
contest_name = nil,
|
||||
language = nil,
|
||||
start_time = nil,
|
||||
last_refetch = nil,
|
||||
}
|
||||
|
||||
local function format_countdown(seconds)
|
||||
|
|
@ -29,6 +35,108 @@ local function format_countdown(seconds)
|
|||
return string.format('%ds', s)
|
||||
end
|
||||
|
||||
local function should_notify(remaining)
|
||||
if remaining > 3600 then
|
||||
return remaining % 900 == 0
|
||||
end
|
||||
if remaining > 300 then
|
||||
return remaining % 60 == 0
|
||||
end
|
||||
if remaining > 60 then
|
||||
return remaining % 10 == 0
|
||||
end
|
||||
return true
|
||||
end
|
||||
|
||||
local function refetch_start_time()
|
||||
local result = scraper.scrape_contest_list(race_state.platform)
|
||||
if not result or not result.contests or #result.contests == 0 then
|
||||
return
|
||||
end
|
||||
cache.set_contest_summaries(
|
||||
race_state.platform,
|
||||
result.contests,
|
||||
{ supports_countdown = result.supports_countdown }
|
||||
)
|
||||
local new_time = cache.get_contest_start_time(race_state.platform, race_state.contest_id)
|
||||
if new_time and new_time ~= race_state.start_time then
|
||||
race_state.start_time = new_time
|
||||
race_state.contest_name =
|
||||
cache.get_contest_display_name(race_state.platform, race_state.contest_id)
|
||||
or race_state.contest_id
|
||||
end
|
||||
end
|
||||
|
||||
local function race_try_setup(platform, contest_id, language, attempt, token)
|
||||
if race_state.token ~= token then
|
||||
return
|
||||
end
|
||||
|
||||
cache.load()
|
||||
local cd = cache.get_contest_data(platform, contest_id)
|
||||
if
|
||||
cd
|
||||
and type(cd.problems) == 'table'
|
||||
and #cd.problems > 0
|
||||
and type(cd.index_map) == 'table'
|
||||
and next(cd.index_map) ~= nil
|
||||
then
|
||||
require('cp.setup').setup_contest(platform, contest_id, nil, language)
|
||||
return
|
||||
end
|
||||
|
||||
local display = constants.PLATFORM_DISPLAY_NAMES[platform] or platform
|
||||
if attempt > 1 then
|
||||
logger.log(
|
||||
('Retrying %s "%s" setup (attempt %d/%d)...'):format(
|
||||
display,
|
||||
contest_id,
|
||||
attempt,
|
||||
MAX_RETRY_ATTEMPTS
|
||||
),
|
||||
{ level = vim.log.levels.WARN }
|
||||
)
|
||||
end
|
||||
|
||||
scraper.scrape_contest_metadata(
|
||||
platform,
|
||||
contest_id,
|
||||
vim.schedule_wrap(function(data)
|
||||
if race_state.token ~= token then
|
||||
return
|
||||
end
|
||||
cache.set_contest_data(
|
||||
platform,
|
||||
contest_id,
|
||||
data.problems or {},
|
||||
data.url or '',
|
||||
data.contest_url or '',
|
||||
data.standings_url or ''
|
||||
)
|
||||
require('cp.setup').setup_contest(platform, contest_id, nil, language)
|
||||
end),
|
||||
vim.schedule_wrap(function()
|
||||
if race_state.token ~= token then
|
||||
return
|
||||
end
|
||||
if attempt >= MAX_RETRY_ATTEMPTS then
|
||||
logger.log(
|
||||
('Failed to load %s contest "%s" after %d attempts'):format(
|
||||
display,
|
||||
contest_id,
|
||||
attempt
|
||||
),
|
||||
{ level = vim.log.levels.ERROR }
|
||||
)
|
||||
return
|
||||
end
|
||||
vim.defer_fn(function()
|
||||
race_try_setup(platform, contest_id, language, attempt + 1, token)
|
||||
end, RETRY_DELAY_MS)
|
||||
end)
|
||||
)
|
||||
end
|
||||
|
||||
function M.start(platform, contest_id, language)
|
||||
if not platform or not vim.tbl_contains(constants.PLATFORMS, platform) then
|
||||
logger.log('Invalid platform', { level = vim.log.levels.ERROR })
|
||||
|
|
@ -75,22 +183,21 @@ function M.start(platform, contest_id, language)
|
|||
|
||||
if not start_time then
|
||||
logger.log(
|
||||
('No start time found for %s contest "%s"'):format(
|
||||
constants.PLATFORM_DISPLAY_NAMES[platform] or platform,
|
||||
contest_id
|
||||
),
|
||||
('No start time found for %s contest "%s"'):format(display, contest_id),
|
||||
{ level = vim.log.levels.ERROR }
|
||||
)
|
||||
return
|
||||
end
|
||||
|
||||
local token = vim.uv.hrtime()
|
||||
local remaining = start_time - os.time()
|
||||
if remaining <= 0 then
|
||||
logger.log(
|
||||
'Contest has already started, setting up...',
|
||||
{ level = vim.log.levels.INFO, override = true }
|
||||
)
|
||||
require('cp.setup').setup_contest(platform, contest_id, nil, language)
|
||||
race_state.token = token
|
||||
race_try_setup(platform, contest_id, language, 1, token)
|
||||
return
|
||||
end
|
||||
|
||||
|
|
@ -99,14 +206,26 @@ function M.start(platform, contest_id, language)
|
|||
race_state.contest_name = cache.get_contest_display_name(platform, contest_id) or contest_id
|
||||
race_state.language = language
|
||||
race_state.start_time = start_time
|
||||
race_state.last_refetch = os.time()
|
||||
race_state.token = token
|
||||
|
||||
local timer = vim.uv.new_timer()
|
||||
race_state.timer = timer
|
||||
timer:start(
|
||||
1000,
|
||||
0,
|
||||
1000,
|
||||
vim.schedule_wrap(function()
|
||||
local r = race_state.start_time - os.time()
|
||||
if race_state.token ~= token then
|
||||
return
|
||||
end
|
||||
|
||||
local now = os.time()
|
||||
if now - race_state.last_refetch >= REFETCH_INTERVAL_S then
|
||||
race_state.last_refetch = now
|
||||
refetch_start_time()
|
||||
end
|
||||
|
||||
local r = race_state.start_time - now
|
||||
if r <= 0 then
|
||||
timer:stop()
|
||||
timer:close()
|
||||
|
|
@ -119,9 +238,10 @@ function M.start(platform, contest_id, language)
|
|||
race_state.contest_name = nil
|
||||
race_state.language = nil
|
||||
race_state.start_time = nil
|
||||
race_state.last_refetch = nil
|
||||
logger.log('Contest started!', { level = vim.log.levels.INFO, override = true })
|
||||
require('cp.setup').setup_contest(p, c, nil, l)
|
||||
else
|
||||
race_try_setup(p, c, l, 1, token)
|
||||
elseif should_notify(r) then
|
||||
vim.notify(
|
||||
('[cp.nvim]: %s race "%s" starts in %s'):format(
|
||||
constants.PLATFORM_DISPLAY_NAMES[race_state.platform] or race_state.platform,
|
||||
|
|
@ -146,11 +266,13 @@ function M.stop()
|
|||
timer:stop()
|
||||
timer:close()
|
||||
race_state.timer = nil
|
||||
race_state.token = nil
|
||||
race_state.platform = nil
|
||||
race_state.contest_id = nil
|
||||
race_state.contest_name = nil
|
||||
race_state.language = nil
|
||||
race_state.start_time = nil
|
||||
race_state.last_refetch = nil
|
||||
logger.log(
|
||||
('Cancelled %s race "%s"'):format(display, name),
|
||||
{ level = vim.log.levels.INFO, override = true }
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ local function run_scraper(platform, subcommand, args, opts)
|
|||
end
|
||||
end
|
||||
|
||||
function M.scrape_contest_metadata(platform, contest_id, callback)
|
||||
function M.scrape_contest_metadata(platform, contest_id, callback, on_error)
|
||||
run_scraper(platform, 'metadata', { contest_id }, {
|
||||
on_exit = function(result)
|
||||
if not result or not result.success then
|
||||
|
|
@ -227,6 +227,9 @@ function M.scrape_contest_metadata(platform, contest_id, callback)
|
|||
),
|
||||
{ level = vim.log.levels.ERROR }
|
||||
)
|
||||
if type(on_error) == 'function' then
|
||||
on_error()
|
||||
end
|
||||
return
|
||||
end
|
||||
local data = result.data or {}
|
||||
|
|
@ -238,6 +241,9 @@ function M.scrape_contest_metadata(platform, contest_id, callback)
|
|||
),
|
||||
{ level = vim.log.levels.ERROR }
|
||||
)
|
||||
if type(on_error) == 'function' then
|
||||
on_error()
|
||||
end
|
||||
return
|
||||
end
|
||||
if type(callback) == 'function' then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue