fix: sessions from inactive providers can still be used (#1458)
* fix: sessions from inactive providers can still be used * fix(lint): dependency keys not sorted * chore: address pull request feedback
This commit is contained in:
@@ -49,14 +49,17 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
|
||||
* We are not using the runOnInit method as we want to run the job only once we start the cron job schedule manually.
|
||||
* This allows us to always run it once we start it. Additionally it will not run the callback if only the cron job file is imported.
|
||||
*/
|
||||
const scheduledTask = cron.schedule(cronExpression, () => void catchingCallbackAsync(), {
|
||||
scheduled: false,
|
||||
name,
|
||||
timezone: creatorOptions.timezone,
|
||||
});
|
||||
creatorOptions.logger.logDebug(
|
||||
`The cron job '${name}' was created with expression ${cronExpression} in timezone ${creatorOptions.timezone} and runOnStart ${options.runOnStart}`,
|
||||
);
|
||||
let scheduledTask: cron.ScheduledTask | null = null;
|
||||
if (cronExpression !== "never") {
|
||||
scheduledTask = cron.schedule(cronExpression, () => void catchingCallbackAsync(), {
|
||||
scheduled: false,
|
||||
name,
|
||||
timezone: creatorOptions.timezone,
|
||||
});
|
||||
creatorOptions.logger.logDebug(
|
||||
`The cron job '${name}' was created with expression ${cronExpression} in timezone ${creatorOptions.timezone} and runOnStart ${options.runOnStart}`,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
name,
|
||||
@@ -90,7 +93,7 @@ export const createCronJobCreator = <TAllowedNames extends string = string>(
|
||||
options: CreateCronJobOptions = { runOnStart: false },
|
||||
) => {
|
||||
creatorOptions.logger.logDebug(`Validating cron expression '${cronExpression}' for job: ${name}`);
|
||||
if (!cron.validate(cronExpression)) {
|
||||
if (cronExpression !== "never" && !cron.validate(cronExpression)) {
|
||||
throw new Error(`Invalid cron expression '${cronExpression}' for job '${name}'`);
|
||||
}
|
||||
creatorOptions.logger.logDebug(`Cron job expression '${cronExpression}' for job ${name} is valid`);
|
||||
@@ -102,6 +105,8 @@ export const createCronJobCreator = <TAllowedNames extends string = string>(
|
||||
// This is a type guard to check if the cron expression is valid and give the user a type hint
|
||||
return returnValue as unknown as ValidateCron<TExpression> extends true
|
||||
? typeof returnValue
|
||||
: "Invalid cron expression";
|
||||
: TExpression extends "never"
|
||||
? typeof returnValue
|
||||
: "Invalid cron expression";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -7,3 +7,4 @@ export const EVERY_10_MINUTES = checkCron("*/10 * * * *") satisfies string;
|
||||
export const EVERY_HOUR = checkCron("0 * * * *") satisfies string;
|
||||
export const EVERY_DAY = checkCron("0 0 * * */1") satisfies string;
|
||||
export const EVERY_WEEK = checkCron("0 0 * * 1") satisfies string;
|
||||
export const NEVER = "never";
|
||||
|
||||
@@ -34,13 +34,13 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
|
||||
|
||||
options.logger.logInfo(`Starting schedule cron job ${job.name}.`);
|
||||
await job.onStartAsync();
|
||||
job.scheduledTask.start();
|
||||
job.scheduledTask?.start();
|
||||
},
|
||||
startAllAsync: async () => {
|
||||
for (const job of jobRegistry.values()) {
|
||||
options.logger.logInfo(`Starting schedule of cron job ${job.name}.`);
|
||||
await job.onStartAsync();
|
||||
job.scheduledTask.start();
|
||||
job.scheduledTask?.start();
|
||||
}
|
||||
},
|
||||
runManually: (name: keyof TJobs) => {
|
||||
@@ -48,19 +48,19 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
|
||||
if (!job) return;
|
||||
|
||||
options.logger.logInfo(`Running schedule cron job ${job.name} manually.`);
|
||||
job.scheduledTask.now();
|
||||
job.scheduledTask?.now();
|
||||
},
|
||||
stop: (name: keyof TJobs) => {
|
||||
const job = jobRegistry.get(name as string);
|
||||
if (!job) return;
|
||||
|
||||
options.logger.logInfo(`Stopping schedule cron job ${job.name}.`);
|
||||
job.scheduledTask.stop();
|
||||
job.scheduledTask?.stop();
|
||||
},
|
||||
stopAll: () => {
|
||||
for (const job of jobRegistry.values()) {
|
||||
options.logger.logInfo(`Stopping schedule cron job ${job.name}.`);
|
||||
job.scheduledTask.stop();
|
||||
job.scheduledTask?.stop();
|
||||
}
|
||||
},
|
||||
getJobRegistry() {
|
||||
|
||||
Reference in New Issue
Block a user