Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cron): validate arguments in RunAt and improve timestamp handling #1498

Closed
wants to merge 4 commits into from
Closed

fix(cron): validate arguments in RunAt and improve timestamp handling #1498

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ca21fc
fix(cron): validate arguments in RunAt and improve timestamp handling
roadtosixx Nov 21, 2024
b28d553
fix(cron): validate arguments in RunAt and improve timestamp handling
roadtosixx Nov 23, 2024
13552ff
Merge branch 'dev' into main
Kenshiin13 Nov 24, 2024
d97dbc8
fix typo during merge
Kenshiin13 Nov 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions [core]/cron/server/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ local lastTimestamp = false
---@param m number
---@param cb function|table
function RunAt(h, m, cb)
if type(h) ~= "number" or type(m) ~= "number" or (type(cb) ~= "function" and type(cb) ~= "table") then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Type validation is already being handled in the cron:runAt event. Please remove the redundant code.

print("[cron] Invalid arguments to RunAt. Expected (number, number, function/table).")
return
end

cronJobs[#cronJobs + 1] = {
h = h,
m = m,
Expand All @@ -26,14 +31,18 @@ end

---@param timestamp number
function OnTime(timestamp)
local currentDay = os.date("*t", timestamp).day
local currentMonth = os.date("*t", timestamp).month
local currentYear = os.date("*t", timestamp).year

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor to call os.date("*t", timestamp) once, store the result in a local table, and extract the required fields (day, month, year) from that table. This improves efficiency by avoiding repeated parsing and enhances code readability and maintainability.

for i = 1, #cronJobs, 1 do
local scheduledTimestamp = os.time({
hour = cronJobs[i].h,
min = cronJobs[i].m,
sec = 0, -- Assuming tasks run at the start of the minute
day = os.date("%d", timestamp),
month = os.date("%m", timestamp),
year = os.date("%Y", timestamp),
day = currentDay,
month = currentMonth,
year = currentYear
})

if timestamp >= scheduledTimestamp and (not lastTimestamp or lastTimestamp < scheduledTimestamp) then
Expand Down
Loading