[];
}
export function buildApiPlugin({
@@ -18,12 +20,18 @@ export function buildApiPlugin
({
checkPluginId(pluginId);
const hono = new OpenAPIHono();
+ const cronJobs: BuildPluginApiReturn["cronJobs"] = [];
modules.forEach(handler => {
hono.route(`/${handler.name}`, handler.hono);
+
+ handler.cronJobs?.forEach(cron => {
+ cronJobs.push({ ...cron, module: handler.name });
+ });
});
return {
pluginId,
hono,
+ cronJobs,
};
}
diff --git a/packages/vitnode/src/api/middlewares/cron-auth.middleware.ts b/packages/vitnode/src/api/middlewares/cron-auth.middleware.ts
new file mode 100644
index 000000000..8a098842b
--- /dev/null
+++ b/packages/vitnode/src/api/middlewares/cron-auth.middleware.ts
@@ -0,0 +1,20 @@
+import type { Context, Next } from "hono";
+import { HTTPException } from "hono/http-exception";
+
+export const cronAuthMiddleware = () => {
+ return async (c: Context, next: Next) => {
+ const cronSecret = c.get("core").cronSecret;
+ if (!cronSecret) {
+ throw new HTTPException(403, { message: "Cron access not configured" });
+ }
+
+ const authHeader = c.req.header("authorization");
+ const providedSecret = authHeader?.replace("Bearer ", "");
+
+ if (providedSecret !== cronSecret) {
+ throw new HTTPException(403, { message: "Invalid cron authorization" });
+ }
+
+ await next();
+ };
+};
diff --git a/packages/vitnode/src/api/middlewares/global.middleware.ts b/packages/vitnode/src/api/middlewares/global.middleware.ts
index ec8bf40a1..0fecf6a3e 100644
--- a/packages/vitnode/src/api/middlewares/global.middleware.ts
+++ b/packages/vitnode/src/api/middlewares/global.middleware.ts
@@ -4,7 +4,9 @@ import { HTTPException } from "hono/http-exception";
import { EmailModel, type EmailModelSendArgs } from "@/api/models/email";
import { SessionModel } from "@/api/models/session";
import { SessionAdminModel } from "@/api/models/session-admin";
+import { CONFIG } from "@/lib/config";
import type { VitNodeApiConfig, VitNodeConfig } from "@/vitnode.config";
+import type { BuildCronReturn } from "../lib/cron";
import {
type LoggerMiddlewareType,
loggerMiddleware,
@@ -46,6 +48,7 @@ export interface EnvVariablesVitNode {
ssoAdapters: SSOApiPlugin[];
};
captcha?: Pick["captcha"];
+ cronSecret?: string;
email?: VitNodeApiConfig["email"];
metadata: {
shortTitle?: string;
@@ -53,6 +56,7 @@ export interface EnvVariablesVitNode {
};
pathToMessages: (path: string) => Promise<{ default: object }>;
plugins: { id: string }[];
+ cron: ({ pluginId: string; module: string } & BuildCronReturn)[];
};
db: Pick["dbProvider"];
email: {
@@ -95,28 +99,42 @@ export const globalMiddleware = ({
| "plugins"
> &
Pick) => {
+ const pluginsMetadata = plugins.map(plugin => ({
+ id: plugin.pluginId,
+ }));
+
+ const cronMetadata = plugins.flatMap(plugin =>
+ plugin.cronJobs.map(cronJob => ({
+ pluginId: plugin.pluginId,
+ module: cronJob.module,
+ name: cronJob.name,
+ schedule: cronJob.schedule,
+ handler: cronJob.handler,
+ description: cronJob.description,
+ })),
+ );
+
+ const ipHeaderKeys = [
+ "x-forwarded-for",
+ "x-real-ip",
+ "cf-connecting-ip",
+ "x-client-ip",
+ "x-forwarded",
+ "x-cluster-client-ip",
+ "forwarded-for",
+ "forwarded",
+ "via",
+ "remote-addr",
+ "client-ip",
+ "ip",
+ "x-ip",
+ "true-client-ip",
+ "fastly-client-ip",
+ "x-fastly-client-ip",
+ ];
+
// biome-ignore lint/complexity/noExcessiveCognitiveComplexity:
return async (c: Context, next: Next) => {
- // Collect possible IP header keys in order of trust/preference
- const ipHeaderKeys = [
- "x-forwarded-for",
- "x-real-ip",
- "cf-connecting-ip",
- "x-client-ip",
- "x-forwarded",
- "x-cluster-client-ip",
- "forwarded-for",
- "forwarded",
- "via",
- "remote-addr",
- "client-ip",
- "ip",
- "x-ip",
- "true-client-ip",
- "fastly-client-ip",
- "x-fastly-client-ip",
- ];
-
let ipAddress: string | undefined;
// Try to get IP from Hono's request header method first
@@ -162,9 +180,9 @@ export const globalMiddleware = ({
cookieSecure: authorization?.cookieSecure ?? true,
},
captcha,
- plugins: plugins.map(plugin => ({
- id: plugin.pluginId,
- })),
+ cronSecret: CONFIG.cronJobSecret,
+ plugins: pluginsMetadata,
+ cron: cronMetadata,
});
const user = await new SessionModel(c).getUser();
diff --git a/packages/vitnode/src/api/modules/admin/admin.module.ts b/packages/vitnode/src/api/modules/admin/admin.module.ts
index 1593e9822..2015283b8 100644
--- a/packages/vitnode/src/api/modules/admin/admin.module.ts
+++ b/packages/vitnode/src/api/modules/admin/admin.module.ts
@@ -1,13 +1,14 @@
import { buildModule } from "@/api/lib/module";
import { CONFIG_PLUGIN } from "@/config";
-
+import { advancedAdminModule } from "./advanced/advanced.admin.module";
import { debugAdminModule } from "./debug/debug.admin.module";
import { sessionAdminRoute } from "./routes/session.route";
import { usersAdminModule } from "./users/users.admin.module";
export const adminModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "admin",
routes: [sessionAdminRoute],
- modules: [usersAdminModule, debugAdminModule],
+ modules: [usersAdminModule, debugAdminModule, advancedAdminModule],
+ cronJobs: [],
});
diff --git a/packages/vitnode/src/api/modules/admin/advanced/advanced.admin.module.ts b/packages/vitnode/src/api/modules/admin/advanced/advanced.admin.module.ts
new file mode 100644
index 000000000..90dcb5eda
--- /dev/null
+++ b/packages/vitnode/src/api/modules/admin/advanced/advanced.admin.module.ts
@@ -0,0 +1,10 @@
+import { buildModule } from "@/api/lib/module";
+import { CONFIG_PLUGIN } from "@/config";
+import { cronAdminModule } from "./cron/cron.admin.module";
+
+export const advancedAdminModule = buildModule({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ name: "advanced",
+ routes: [],
+ modules: [cronAdminModule],
+});
diff --git a/packages/vitnode/src/api/modules/admin/advanced/cron/cron.admin.module.ts b/packages/vitnode/src/api/modules/admin/advanced/cron/cron.admin.module.ts
new file mode 100644
index 000000000..b802a019c
--- /dev/null
+++ b/packages/vitnode/src/api/modules/admin/advanced/cron/cron.admin.module.ts
@@ -0,0 +1,10 @@
+import { buildModule } from "@/api/lib/module";
+import { CONFIG_PLUGIN } from "@/config";
+import { getCronsRoute } from "./routes/get.route";
+import { runCronRoute } from "./routes/run.route";
+
+export const cronAdminModule = buildModule({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ name: "cron",
+ routes: [getCronsRoute, runCronRoute],
+});
diff --git a/packages/vitnode/src/api/modules/admin/advanced/cron/routes/get.route.ts b/packages/vitnode/src/api/modules/admin/advanced/cron/routes/get.route.ts
new file mode 100644
index 000000000..29fd85010
--- /dev/null
+++ b/packages/vitnode/src/api/modules/admin/advanced/cron/routes/get.route.ts
@@ -0,0 +1,74 @@
+import z from "zod";
+import { buildRoute } from "@/api/lib/route";
+import {
+ withPagination,
+ zodPaginationPageInfo,
+ zodPaginationQuery,
+} from "@/api/lib/with-pagination";
+import { CONFIG_PLUGIN } from "@/config";
+import { core_cron } from "@/database/cron";
+
+export const getCronsRoute = buildRoute({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ route: {
+ method: "get",
+ description: "Get Admin Cron Logs",
+ path: "/",
+ request: {
+ query: zodPaginationQuery.extend({
+ order: z.enum(["asc", "desc"]).optional(),
+ orderBy: z.enum(["createdAt", "lastRun", "nextRun"]).optional(),
+ }),
+ },
+ responses: {
+ 200: {
+ content: {
+ "application/json": {
+ schema: z.object({
+ edges: z.array(
+ z.object({
+ id: z.number(),
+ createdAt: z.date(),
+ name: z.string(),
+ description: z.string().nullable(),
+ pluginId: z.string(),
+ module: z.string(),
+ lastRun: z.date().nullable(),
+ nextRun: z.date().nullable(),
+ schedule: z.string(),
+ }),
+ ),
+ pageInfo: zodPaginationPageInfo,
+ }),
+ },
+ },
+ description: "List of cron jobs",
+ },
+ },
+ },
+ handler: async c => {
+ const query = c.req.valid("query");
+ const data = await withPagination({
+ params: {
+ query,
+ },
+ c,
+ primaryCursor: core_cron.id,
+ query: async ({ limit, where, orderBy }) =>
+ await c
+ .get("db")
+ .select()
+ .from(core_cron)
+ .where(where)
+ .orderBy(orderBy)
+ .limit(limit),
+ table: core_cron,
+ orderBy: {
+ column: query.orderBy ? core_cron[query.orderBy] : core_cron.lastRun,
+ order: query.order ?? "desc",
+ },
+ });
+
+ return c.json(data);
+ },
+});
diff --git a/packages/vitnode/src/api/modules/admin/advanced/cron/routes/run.route.ts b/packages/vitnode/src/api/modules/admin/advanced/cron/routes/run.route.ts
new file mode 100644
index 000000000..4ba00453c
--- /dev/null
+++ b/packages/vitnode/src/api/modules/admin/advanced/cron/routes/run.route.ts
@@ -0,0 +1,113 @@
+import { eq } from "drizzle-orm";
+import { z } from "zod";
+import type { CronJobConfig } from "@/api/lib/cron";
+import { buildRoute } from "@/api/lib/route";
+import { CONFIG_PLUGIN } from "@/config";
+import { core_cron } from "@/database/cron";
+import { getNextCronRunDate } from "@/lib/api/get-next-cron-run-date";
+
+export const runCronRoute = buildRoute({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ route: {
+ method: "post",
+ description: "Run a specific cron job",
+ path: "/{id}",
+ request: {
+ params: z.object({
+ id: z.string(),
+ }),
+ },
+ responses: {
+ 201: {
+ content: {
+ "application/json": {
+ schema: z.object({
+ message: z.string().optional(),
+ error: z.string().optional(),
+ }),
+ },
+ },
+ description: "Cron job executed successfully",
+ },
+ 404: {
+ content: {
+ "application/json": {
+ schema: z.object({
+ message: z.string().optional(),
+ error: z.string().optional(),
+ }),
+ },
+ },
+ description: "Cron job not found",
+ },
+ 500: {
+ content: {
+ "application/json": {
+ schema: z.object({
+ message: z.string().optional(),
+ error: z.string().optional(),
+ }),
+ },
+ },
+ description: "Internal server error",
+ },
+ },
+ },
+ handler: async c => {
+ const db = c.get("db");
+ const cronJobs: CronJobConfig[] = c.get("core").cron;
+ const param = c.req.valid("param");
+
+ try {
+ const cronFromDb = await db
+ .select()
+ .from(core_cron)
+ .where(eq(core_cron.id, +param.id))
+ .limit(1);
+
+ if (cronFromDb.length === 0) {
+ return c.json({ error: "Cron job not found" }, 404);
+ }
+
+ const dbCron = cronFromDb[0];
+
+ const job: CronJobConfig | undefined = cronJobs.find(
+ j =>
+ j.name === dbCron.name &&
+ j.pluginId === dbCron.pluginId &&
+ j.module === dbCron.module,
+ );
+
+ if (!job) {
+ return c.json({ error: "Cron job configuration not found" }, 404);
+ }
+
+ const now = new Date();
+
+ try {
+ await job.handler(c);
+
+ await db
+ .update(core_cron)
+ .set({
+ lastRun: now,
+ nextRun: getNextCronRunDate(job.schedule, now),
+ })
+ .where(eq(core_cron.id, dbCron.id));
+
+ return c.json(
+ {
+ message: "Cron job executed successfully",
+ },
+ 201,
+ );
+ } catch (error) {
+ await c.get("log").error(`Error executing cron job: ${error}`);
+ return c.json({ error: "Failed to execute cron job" }, 500);
+ }
+ } catch (error) {
+ await c.get("log").error(`Error running cron job: ${error}`);
+ return c.json({ error: "Internal server error" }, 500);
+ }
+ },
+});
diff --git a/packages/vitnode/src/api/modules/admin/debug/debug.admin.module.ts b/packages/vitnode/src/api/modules/admin/debug/debug.admin.module.ts
index 8df6dbfdb..bbd6a876c 100644
--- a/packages/vitnode/src/api/modules/admin/debug/debug.admin.module.ts
+++ b/packages/vitnode/src/api/modules/admin/debug/debug.admin.module.ts
@@ -3,7 +3,7 @@ import { buildModule } from "../../../lib/module";
import { logsDebugAdminRoute } from "./routes/logs.route";
export const debugAdminModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "debug",
routes: [logsDebugAdminRoute],
});
diff --git a/packages/vitnode/src/api/modules/admin/debug/routes/logs.route.ts b/packages/vitnode/src/api/modules/admin/debug/routes/logs.route.ts
index a97843e18..e5e359a79 100644
--- a/packages/vitnode/src/api/modules/admin/debug/routes/logs.route.ts
+++ b/packages/vitnode/src/api/modules/admin/debug/routes/logs.route.ts
@@ -13,7 +13,7 @@ import {
} from "../../../../lib/with-pagination";
export const logsDebugAdminRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "Get Admin Debug Logs",
diff --git a/packages/vitnode/src/api/modules/admin/routes/session.route.ts b/packages/vitnode/src/api/modules/admin/routes/session.route.ts
index a6d861f26..0a48349d3 100644
--- a/packages/vitnode/src/api/modules/admin/routes/session.route.ts
+++ b/packages/vitnode/src/api/modules/admin/routes/session.route.ts
@@ -5,7 +5,7 @@ import { buildRoute } from "@/api/lib/route";
import { CONFIG_PLUGIN } from "@/config";
export const sessionAdminRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "Verify admin session",
diff --git a/packages/vitnode/src/api/modules/admin/users/routes/list.route.ts b/packages/vitnode/src/api/modules/admin/users/routes/list.route.ts
index 64af77bce..c431acc57 100644
--- a/packages/vitnode/src/api/modules/admin/users/routes/list.route.ts
+++ b/packages/vitnode/src/api/modules/admin/users/routes/list.route.ts
@@ -10,7 +10,7 @@ import { CONFIG_PLUGIN } from "@/config";
import { core_users } from "@/database/users";
export const listUsersAdminRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "Get list of all users",
diff --git a/packages/vitnode/src/api/modules/admin/users/routes/users.route.ts b/packages/vitnode/src/api/modules/admin/users/routes/users.route.ts
index 43472246a..a2e6fe2cc 100644
--- a/packages/vitnode/src/api/modules/admin/users/routes/users.route.ts
+++ b/packages/vitnode/src/api/modules/admin/users/routes/users.route.ts
@@ -10,7 +10,7 @@ import { CONFIG_PLUGIN } from "@/config";
import { core_users } from "@/database/users";
export const usersAdminRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "Get list of all users (Admin only)",
diff --git a/packages/vitnode/src/api/modules/admin/users/users.admin.module.ts b/packages/vitnode/src/api/modules/admin/users/users.admin.module.ts
index 3b31ce8db..60363dd34 100644
--- a/packages/vitnode/src/api/modules/admin/users/users.admin.module.ts
+++ b/packages/vitnode/src/api/modules/admin/users/users.admin.module.ts
@@ -4,7 +4,7 @@ import { CONFIG_PLUGIN } from "@/config";
import { listUsersAdminRoute } from "./routes/list.route";
export const usersAdminModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "users",
routes: [listUsersAdminRoute],
});
diff --git a/packages/vitnode/src/api/modules/cron/cron.module.ts b/packages/vitnode/src/api/modules/cron/cron.module.ts
new file mode 100644
index 000000000..c17b3b9d2
--- /dev/null
+++ b/packages/vitnode/src/api/modules/cron/cron.module.ts
@@ -0,0 +1,11 @@
+import { buildModule } from "@/api/lib/module";
+import { CONFIG_PLUGIN } from "@/config";
+import { cleanCron } from "./cron/clean.cron";
+import { runCronRoute } from "./routes/cron.route";
+
+export const cronModule = buildModule({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ name: "cron",
+ routes: [runCronRoute],
+ cronJobs: [cleanCron],
+});
diff --git a/packages/vitnode/src/api/modules/cron/cron/clean.cron.ts b/packages/vitnode/src/api/modules/cron/cron/clean.cron.ts
new file mode 100644
index 000000000..061b3b5e4
--- /dev/null
+++ b/packages/vitnode/src/api/modules/cron/cron/clean.cron.ts
@@ -0,0 +1,33 @@
+import { lt } from "drizzle-orm";
+import { buildCron } from "@/api/lib/cron";
+import { core_admin_sessions } from "@/database/admins";
+import { core_sessions } from "@/database/sessions";
+import { core_users_forgot_password } from "@/database/users";
+
+export const cleanCron = buildCron({
+ name: "clean",
+ description: "Clean up expired sessions and tokens",
+ // Run every 1 hour
+ schedule: "0 * * * *",
+ handler: async c => {
+ await c.get("db").transaction(async tx => {
+ // Delete expired sessions
+ await tx
+ .delete(core_sessions)
+ .where(lt(core_sessions.expiresAt, new Date()));
+ await tx
+ .delete(core_admin_sessions)
+ .where(lt(core_admin_sessions.expiresAt, new Date()));
+
+ // Delete expired forgot password tokens
+ await tx
+ .delete(core_users_forgot_password)
+ .where(lt(core_users_forgot_password.expiresAt, new Date()));
+
+ // // Delete expired email confirmation tokens
+ // await tx
+ // .delete(core_users_confirm_emails)
+ // .where(lt(core_users_confirm_emails.expiresAt, new Date()));
+ });
+ },
+});
diff --git a/packages/vitnode/src/api/modules/cron/helpers/process-cron-jobs.ts b/packages/vitnode/src/api/modules/cron/helpers/process-cron-jobs.ts
new file mode 100644
index 000000000..385d4bb98
--- /dev/null
+++ b/packages/vitnode/src/api/modules/cron/helpers/process-cron-jobs.ts
@@ -0,0 +1,142 @@
+import { eq, inArray } from "drizzle-orm";
+import type { PostgresJsDatabase } from "drizzle-orm/postgres-js";
+import { validate } from "node-cron";
+import type { CronJobConfig } from "@/api/lib/cron";
+import { core_cron } from "@/database/cron";
+import { shouldCronJobRun } from "@/lib/api/should-cron-job-run";
+
+interface CronJobFromDb {
+ id: number;
+ name: string;
+ description: string | null;
+ lastRun: Date | null;
+ nextRun: Date | null;
+ createdAt: Date;
+ pluginId: string;
+ module: string;
+ schedule: string;
+}
+
+function findExistingJob(
+ job: CronJobConfig,
+ cronFromDb: CronJobFromDb[],
+): CronJobFromDb | undefined {
+ return cronFromDb.find(
+ dbJob =>
+ dbJob.name === job.name &&
+ dbJob.pluginId === job.pluginId &&
+ dbJob.module === job.module,
+ );
+}
+
+function getJobChanges(
+ job: CronJobConfig,
+ existingJob: CronJobFromDb,
+): { description?: boolean; schedule?: boolean } {
+ const changes: { description?: boolean; schedule?: boolean } = {};
+ if (existingJob.description !== job.description) {
+ changes.description = true;
+ }
+ if (existingJob.schedule !== job.schedule) {
+ changes.schedule = true;
+ }
+ return changes;
+}
+
+export async function cleanupOutdatedCronJobs(
+ db: PostgresJsDatabase>,
+ cronFromDb: CronJobFromDb[],
+ currentCronJobs: CronJobConfig[],
+) {
+ if (cronFromDb.length === 0) return;
+
+ const currentCronIdentifiers = currentCronJobs.map(
+ job => `${job.pluginId}:${job.module}:${job.name}`,
+ );
+
+ const cronJobsToDelete = cronFromDb
+ .filter(
+ dbCron =>
+ !currentCronIdentifiers.includes(
+ `${dbCron.pluginId}:${dbCron.module}:${dbCron.name}`,
+ ),
+ )
+ .map(dbCron => dbCron.id);
+
+ if (cronJobsToDelete.length > 0) {
+ await db.delete(core_cron).where(inArray(core_cron.id, cronJobsToDelete));
+ }
+}
+
+export function processCronJobs(
+ cronJobs: CronJobConfig[],
+ cronFromDb: CronJobFromDb[],
+) {
+ const newJobs: CronJobConfig[] = [];
+ const jobsToExecute: CronJobConfig[] = [];
+ const jobsToUpdate: {
+ job: CronJobConfig;
+ existingJob: CronJobFromDb;
+ changes: { description?: boolean; schedule?: boolean };
+ }[] = [];
+
+ for (const job of cronJobs) {
+ if (!validate(job.schedule)) {
+ // biome-ignore lint/suspicious/noConsole: needed for cron job monitoring
+ console.warn(
+ `\x1b[34m[VitNode]\x1b[0m \x1b[33mInvalid cron schedule for job "${job.pluginId}:${job.module}:${job.name}"\x1b[0m: ${job.schedule}`,
+ );
+ continue;
+ }
+
+ const existingJob = findExistingJob(job, cronFromDb);
+
+ if (existingJob) {
+ const changes = getJobChanges(job, existingJob);
+ if (Object.keys(changes).length > 0) {
+ jobsToUpdate.push({ job, existingJob, changes });
+ }
+ } else {
+ newJobs.push(job);
+ }
+
+ if (shouldCronJobRun(job.schedule, existingJob?.lastRun || null)) {
+ jobsToExecute.push(job);
+ }
+ }
+
+ return { newJobs, jobsToExecute, jobsToUpdate };
+}
+
+export async function updateCronJobs(
+ db: PostgresJsDatabase>,
+ jobsToUpdate: {
+ job: CronJobConfig;
+ existingJob: CronJobFromDb;
+ changes: { description?: boolean; schedule?: boolean };
+ }[],
+) {
+ if (jobsToUpdate.length === 0) return;
+
+ const updatePromises = jobsToUpdate.map(({ job, existingJob, changes }) => {
+ const updateData: Partial<{
+ description: string | null;
+ schedule: string;
+ }> = {};
+
+ if (changes.description) {
+ updateData.description = job.description || null;
+ }
+
+ if (changes.schedule) {
+ updateData.schedule = job.schedule;
+ }
+
+ return db
+ .update(core_cron)
+ .set(updateData)
+ .where(eq(core_cron.id, existingJob.id));
+ });
+
+ await Promise.all(updatePromises);
+}
diff --git a/packages/vitnode/src/api/modules/cron/routes/cron.route.ts b/packages/vitnode/src/api/modules/cron/routes/cron.route.ts
new file mode 100644
index 000000000..b1a7859f0
--- /dev/null
+++ b/packages/vitnode/src/api/modules/cron/routes/cron.route.ts
@@ -0,0 +1,122 @@
+import { eq } from "drizzle-orm";
+import { z } from "zod";
+import { buildRoute } from "@/api/lib/route";
+import { cronAuthMiddleware } from "@/api/middlewares/cron-auth.middleware";
+import { CONFIG_PLUGIN } from "@/config";
+import { core_cron } from "@/database/cron";
+import { getNextCronRunDate } from "@/lib/api/get-next-cron-run-date";
+import {
+ cleanupOutdatedCronJobs,
+ processCronJobs,
+ updateCronJobs,
+} from "../helpers/process-cron-jobs";
+
+export const runCronRoute = buildRoute({
+ pluginId: CONFIG_PLUGIN.pluginId,
+ route: {
+ method: "post",
+ description: "Run cron job",
+ path: "/",
+ middleware: [cronAuthMiddleware()],
+ responses: {
+ 200: {
+ content: {
+ "text/plain": {
+ schema: z.string(),
+ },
+ },
+ description: "Cron started successfully",
+ },
+ 403: {
+ description: "Access Denied",
+ },
+ },
+ },
+ handler: async c => {
+ const db = c.get("db");
+ const cronJobs = c.get("core").cron;
+
+ try {
+ const cronFromDb = await db.select().from(core_cron);
+ await cleanupOutdatedCronJobs(db, cronFromDb, cronJobs);
+
+ const now = new Date();
+ let executedJobs = 0;
+
+ const { newJobs, jobsToExecute, jobsToUpdate } = processCronJobs(
+ cronJobs,
+ cronFromDb,
+ );
+
+ if (newJobs.length > 0) {
+ try {
+ const newJobsValues = newJobs.map(job => ({
+ name: job.name,
+ description: job.description || null,
+ lastRun: null,
+ nextRun: null,
+ pluginId: job.pluginId,
+ module: job.module,
+ schedule: job.schedule,
+ }));
+
+ await db.insert(core_cron).values(newJobsValues);
+ } catch (error) {
+ await c.get("log").error(`Error inserting new cron jobs: ${error}`);
+ }
+ }
+
+ try {
+ await updateCronJobs(db, jobsToUpdate);
+ } catch (error) {
+ await c.get("log").error(`Error updating cron jobs: ${error}`);
+ }
+
+ if (jobsToExecute.length > 0) {
+ const executionPromises = jobsToExecute.map(async job => {
+ try {
+ await job.handler(c);
+
+ const dbJob = cronFromDb.find(
+ dbJob =>
+ dbJob.name === job.name &&
+ dbJob.pluginId === job.pluginId &&
+ dbJob.module === job.module,
+ );
+
+ if (dbJob) {
+ await db
+ .update(core_cron)
+ .set({
+ lastRun: now,
+ nextRun: getNextCronRunDate(job.schedule, now),
+ })
+ .where(eq(core_cron.id, dbJob.id));
+ }
+
+ return { success: true, jobName: job.name };
+ } catch (error) {
+ await c
+ .get("log")
+ .error(
+ `Error executing cron job "${job.pluginId}:${job.module}:${job.name}": ${error}`,
+ );
+
+ return { success: false, jobName: job.name, error };
+ }
+ });
+
+ const results = await Promise.allSettled(executionPromises);
+ executedJobs = results.filter(
+ result => result.status === "fulfilled" && result.value.success,
+ ).length;
+ }
+
+ return c.text(`Cron jobs processed. Executed ${executedJobs} jobs.`, 200);
+ } catch (error) {
+ await c.get("log").error(`Error processing cron jobs: ${error}`);
+
+ return c.text("Error processing cron jobs", 500);
+ }
+ },
+});
diff --git a/packages/vitnode/src/api/modules/middleware/middleware.module.ts b/packages/vitnode/src/api/modules/middleware/middleware.module.ts
index 0158f4472..cd8240feb 100644
--- a/packages/vitnode/src/api/modules/middleware/middleware.module.ts
+++ b/packages/vitnode/src/api/modules/middleware/middleware.module.ts
@@ -4,7 +4,7 @@ import { CONFIG_PLUGIN } from "@/config";
import { routeMiddleware } from "./route";
export const middlewareModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "middleware",
routes: [routeMiddleware],
});
diff --git a/packages/vitnode/src/api/modules/middleware/route.ts b/packages/vitnode/src/api/modules/middleware/route.ts
index 202054dd2..1c47669ce 100644
--- a/packages/vitnode/src/api/modules/middleware/route.ts
+++ b/packages/vitnode/src/api/modules/middleware/route.ts
@@ -15,7 +15,7 @@ export const routeMiddlewareSchema = z.object({
});
export const routeMiddleware = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
path: "/",
method: "get",
diff --git a/packages/vitnode/src/api/modules/users/routes/change-password.route.ts b/packages/vitnode/src/api/modules/users/routes/change-password.route.ts
index 532cd0747..829d8ef80 100644
--- a/packages/vitnode/src/api/modules/users/routes/change-password.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/change-password.route.ts
@@ -16,7 +16,7 @@ export const zodChangePasswordSchema = z.object({
});
export const changePasswordRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Change user password",
diff --git a/packages/vitnode/src/api/modules/users/routes/reset-passowrd.route.ts b/packages/vitnode/src/api/modules/users/routes/reset-passowrd.route.ts
index 108b4f7ce..c23676f5a 100644
--- a/packages/vitnode/src/api/modules/users/routes/reset-passowrd.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/reset-passowrd.route.ts
@@ -10,7 +10,7 @@ import ResetPasswordEmailTemplate from "@/emails/reset-password";
import { CONFIG } from "@/lib/config";
export const resetPasswordRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Request a password reset",
diff --git a/packages/vitnode/src/api/modules/users/routes/session.route.ts b/packages/vitnode/src/api/modules/users/routes/session.route.ts
index e9d0066e2..8a6d9b706 100644
--- a/packages/vitnode/src/api/modules/users/routes/session.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/session.route.ts
@@ -5,7 +5,7 @@ import { SessionAdminModel } from "@/api/models/session-admin";
import { CONFIG_PLUGIN } from "@/config";
export const sessionRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "Verify session",
diff --git a/packages/vitnode/src/api/modules/users/routes/sign-in.route.ts b/packages/vitnode/src/api/modules/users/routes/sign-in.route.ts
index 6d3c2b681..c08080916 100644
--- a/packages/vitnode/src/api/modules/users/routes/sign-in.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/sign-in.route.ts
@@ -19,7 +19,7 @@ export const zodSignInSchema = z.object({
});
export const signInRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Sign in with email and password",
diff --git a/packages/vitnode/src/api/modules/users/routes/sign-out.route.ts b/packages/vitnode/src/api/modules/users/routes/sign-out.route.ts
index ef2b46ce4..9ab991c8b 100644
--- a/packages/vitnode/src/api/modules/users/routes/sign-out.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/sign-out.route.ts
@@ -6,7 +6,7 @@ import { SessionAdminModel } from "@/api/models/session-admin";
import { CONFIG_PLUGIN } from "@/config";
export const signOutRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "delete",
description: "Sign out the current admin",
diff --git a/packages/vitnode/src/api/modules/users/routes/sign-up.route.ts b/packages/vitnode/src/api/modules/users/routes/sign-up.route.ts
index a1b2f9f7e..165e19d69 100644
--- a/packages/vitnode/src/api/modules/users/routes/sign-up.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/sign-up.route.ts
@@ -27,7 +27,7 @@ export const zodSignUpSchema = z.object({
});
export const signUpRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Create a new user",
diff --git a/packages/vitnode/src/api/modules/users/routes/test.route.ts b/packages/vitnode/src/api/modules/users/routes/test.route.ts
index 489c74bb3..4dc0ca2a5 100644
--- a/packages/vitnode/src/api/modules/users/routes/test.route.ts
+++ b/packages/vitnode/src/api/modules/users/routes/test.route.ts
@@ -4,7 +4,7 @@ import { buildRoute } from "@/api/lib/route";
import { CONFIG_PLUGIN } from "@/config";
export const testRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Test route",
diff --git a/packages/vitnode/src/api/modules/users/sso/routes/callback.route.ts b/packages/vitnode/src/api/modules/users/sso/routes/callback.route.ts
index ab928594f..1e1c90bab 100644
--- a/packages/vitnode/src/api/modules/users/sso/routes/callback.route.ts
+++ b/packages/vitnode/src/api/modules/users/sso/routes/callback.route.ts
@@ -6,7 +6,7 @@ import { SSOModel } from "@/api/models/sso";
import { CONFIG_PLUGIN } from "@/config";
export const callbackRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "get",
description: "SSO Callback",
diff --git a/packages/vitnode/src/api/modules/users/sso/routes/create-url.route.ts b/packages/vitnode/src/api/modules/users/sso/routes/create-url.route.ts
index 32deb959a..435e7b733 100644
--- a/packages/vitnode/src/api/modules/users/sso/routes/create-url.route.ts
+++ b/packages/vitnode/src/api/modules/users/sso/routes/create-url.route.ts
@@ -5,7 +5,7 @@ import { SSOModel } from "@/api/models/sso";
import { CONFIG_PLUGIN } from "@/config";
export const createUrlRoute = buildRoute({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
route: {
method: "post",
description: "Generate SSO URL",
diff --git a/packages/vitnode/src/api/modules/users/sso/sso.module.ts b/packages/vitnode/src/api/modules/users/sso/sso.module.ts
index dd9df7e54..1329fa1f4 100644
--- a/packages/vitnode/src/api/modules/users/sso/sso.module.ts
+++ b/packages/vitnode/src/api/modules/users/sso/sso.module.ts
@@ -5,7 +5,7 @@ import { callbackRoute } from "./routes/callback.route";
import { createUrlRoute } from "./routes/create-url.route";
export const ssoUserModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "sso",
routes: [callbackRoute, createUrlRoute],
});
diff --git a/packages/vitnode/src/api/modules/users/users.module.ts b/packages/vitnode/src/api/modules/users/users.module.ts
index b3e4e0223..9c1fc6ec6 100644
--- a/packages/vitnode/src/api/modules/users/users.module.ts
+++ b/packages/vitnode/src/api/modules/users/users.module.ts
@@ -11,7 +11,7 @@ import { testRoute } from "./routes/test.route";
import { ssoUserModule } from "./sso/sso.module";
export const usersModule = buildModule({
- ...CONFIG_PLUGIN,
+ pluginId: CONFIG_PLUGIN.pluginId,
name: "users",
routes: [
sessionRoute,
diff --git a/packages/vitnode/src/api/plugin.ts b/packages/vitnode/src/api/plugin.ts
index 70f15100a..12c04d132 100644
--- a/packages/vitnode/src/api/plugin.ts
+++ b/packages/vitnode/src/api/plugin.ts
@@ -2,10 +2,11 @@ import { CONFIG_PLUGIN } from "@/config";
import { buildApiPlugin } from "./lib/plugin";
import { adminModule } from "./modules/admin/admin.module";
+import { cronModule } from "./modules/cron/cron.module";
import { middlewareModule } from "./modules/middleware/middleware.module";
import { usersModule } from "./modules/users/users.module";
export const newBuildPluginApiCore = buildApiPlugin({
- ...CONFIG_PLUGIN,
- modules: [middlewareModule, usersModule, adminModule],
+ pluginId: CONFIG_PLUGIN.pluginId,
+ modules: [middlewareModule, usersModule, adminModule, cronModule],
});
diff --git a/packages/vitnode/src/app_admin/core/advanced/cron/page.tsx b/packages/vitnode/src/app_admin/core/advanced/cron/page.tsx
new file mode 100644
index 000000000..534e333d6
--- /dev/null
+++ b/packages/vitnode/src/app_admin/core/advanced/cron/page.tsx
@@ -0,0 +1,41 @@
+import dynamic from "next/dynamic";
+import { getTranslations } from "next-intl/server";
+import React from "react";
+import { I18nProvider } from "@/components/i18n-provider";
+import { DataTableSkeleton } from "@/components/table/data-table";
+import { HeaderContent } from "@/components/ui/header-content";
+
+const CronTableView = dynamic(async () =>
+ import("@/views/admin/views/core/advanced/cron/cron-table-view").then(
+ module => ({
+ default: module.CronTableView,
+ }),
+ ),
+);
+
+export const generateMetadata = async () => {
+ const t = await getTranslations("admin.advanced.cron");
+
+ return {
+ title: t("title"),
+ description: t("desc"),
+ };
+};
+
+export default async function Page(
+ props: React.ComponentProps,
+) {
+ const t = await getTranslations("admin.advanced.cron");
+
+ return (
+
+
+
+
+ }>
+
+
+
+
+ );
+}
diff --git a/packages/vitnode/src/components/switchers/langs/language-swietcher.tsx b/packages/vitnode/src/components/switchers/langs/language-switcher.tsx
similarity index 100%
rename from packages/vitnode/src/components/switchers/langs/language-swietcher.tsx
rename to packages/vitnode/src/components/switchers/langs/language-switcher.tsx
diff --git a/packages/vitnode/src/components/ui/table.tsx b/packages/vitnode/src/components/ui/table.tsx
index 0924e53f5..0303fbfd8 100644
--- a/packages/vitnode/src/components/ui/table.tsx
+++ b/packages/vitnode/src/components/ui/table.tsx
@@ -80,7 +80,7 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {
return (
[role=checkbox]]:translate-y-[2px]",
+ "p-2 align-middle [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",
className,
)}
data-slot="table-cell"
diff --git a/packages/vitnode/src/components/ui/tooltip.tsx b/packages/vitnode/src/components/ui/tooltip.tsx
index 6a22d0947..4be9a7ae2 100644
--- a/packages/vitnode/src/components/ui/tooltip.tsx
+++ b/packages/vitnode/src/components/ui/tooltip.tsx
@@ -6,7 +6,7 @@ import type * as React from "react";
import { cn } from "@/lib/utils";
function TooltipProvider({
- delayDuration = 500,
+ delayDuration = 200,
...props
}: React.ComponentProps) {
return (
@@ -56,4 +56,28 @@ function TooltipContent({
);
}
-export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };
+function TooltipWithContent({
+ children,
+ text,
+ ...props
+}: React.ComponentProps & {
+ text: React.ReactNode;
+}) {
+ return (
+
+
+ {children}
+
+ {text}
+
+
+ );
+}
+
+export {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+ TooltipWithContent,
+};
diff --git a/packages/vitnode/src/database/cron.ts b/packages/vitnode/src/database/cron.ts
new file mode 100644
index 000000000..9f2e6cc2d
--- /dev/null
+++ b/packages/vitnode/src/database/cron.ts
@@ -0,0 +1,13 @@
+import { pgTable } from "drizzle-orm/pg-core";
+
+export const core_cron = pgTable("core_cron", t => ({
+ id: t.serial().primaryKey(),
+ name: t.varchar({ length: 255 }).notNull(),
+ description: t.varchar({ length: 255 }),
+ lastRun: t.timestamp(),
+ createdAt: t.timestamp().notNull().defaultNow(),
+ pluginId: t.varchar({ length: 100 }).notNull(),
+ module: t.varchar({ length: 100 }).notNull(),
+ nextRun: t.timestamp(),
+ schedule: t.varchar({ length: 100 }).notNull(),
+})).enableRLS();
diff --git a/packages/vitnode/src/database/users.ts b/packages/vitnode/src/database/users.ts
index 00dcb919b..6368b3c6c 100644
--- a/packages/vitnode/src/database/users.ts
+++ b/packages/vitnode/src/database/users.ts
@@ -99,7 +99,7 @@ export const core_users_confirm_emails = pgTable(
.notNull(),
token: t.varchar({ length: 100 }).notNull().unique(),
createdAt: t.timestamp().notNull().defaultNow(),
- expires: t.timestamp().notNull(),
+ expiresAt: t.timestamp().notNull(),
ipAddress: t.varchar({ length: 40 }).notNull(),
}),
).enableRLS();
diff --git a/packages/vitnode/src/lib/api/get-next-cron-run-date.test.ts b/packages/vitnode/src/lib/api/get-next-cron-run-date.test.ts
new file mode 100644
index 000000000..2036a633e
--- /dev/null
+++ b/packages/vitnode/src/lib/api/get-next-cron-run-date.test.ts
@@ -0,0 +1,72 @@
+import { describe, expect, it, vi } from "vitest";
+import { getNextCronRunDate } from "./get-next-cron-run-date";
+
+describe("getNextCronRunDate", () => {
+ it("should return the next run date for a valid cron schedule with lastRun null", () => {
+ const schedule = "0 0 * * *"; // Daily at midnight
+ const lastRun = null;
+ const result = getNextCronRunDate(schedule, lastRun);
+
+ expect(result).toBeInstanceOf(Date);
+ if (result) {
+ expect(result.getHours()).toBe(0);
+ expect(result.getMinutes()).toBe(0);
+ }
+ });
+
+ it("should return the next run date for a valid cron schedule with lastRun provided", () => {
+ const schedule = "0 0 * * *"; // Daily at midnight
+ const lastRun = new Date("2023-01-01T12:00:00Z");
+ const result = getNextCronRunDate(schedule, lastRun);
+
+ expect(result).toBeInstanceOf(Date);
+ if (result) {
+ expect(result.getHours()).toBe(0);
+ expect(result.getMinutes()).toBe(0);
+ expect(result.getTime()).toBeGreaterThan(lastRun.getTime());
+ }
+ });
+
+ it("should return null for an invalid cron schedule", () => {
+ const schedule = "invalid cron";
+ const lastRun = null;
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
+ const result = getNextCronRunDate(schedule, lastRun);
+
+ expect(result).toBeNull();
+ expect(consoleSpy).toHaveBeenCalledWith(
+ expect.stringContaining("[VitNode]"),
+ expect.any(Error),
+ );
+
+ consoleSpy.mockRestore();
+ });
+
+ it("should handle cron schedules with specific times", () => {
+ const schedule = "30 14 * * 1"; // Every Monday at 14:30
+ const lastRun = new Date("2023-01-01T10:00:00Z"); // Sunday
+ const result = getNextCronRunDate(schedule, lastRun);
+
+ expect(result).toBeInstanceOf(Date);
+ if (result) {
+ expect(result.getDay()).toBe(1); // Monday
+ expect(result.getHours()).toBe(14);
+ expect(result.getMinutes()).toBe(30);
+ }
+ });
+
+ it("should return null when cron parsing throws an error", () => {
+ // This test assumes cron-parser can throw for certain invalid inputs
+ const schedule = "99 99 99 99 99"; // Invalid cron with out-of-range values
+ const lastRun = null;
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+
+ const result = getNextCronRunDate(schedule, lastRun);
+
+ expect(result).toBeNull();
+ expect(consoleSpy).toHaveBeenCalled();
+
+ consoleSpy.mockRestore();
+ });
+});
diff --git a/packages/vitnode/src/lib/api/get-next-cron-run-date.ts b/packages/vitnode/src/lib/api/get-next-cron-run-date.ts
new file mode 100644
index 000000000..e863ac9f0
--- /dev/null
+++ b/packages/vitnode/src/lib/api/get-next-cron-run-date.ts
@@ -0,0 +1,22 @@
+import cronParser from "cron-parser";
+
+export const getNextCronRunDate = (
+ schedule: string,
+ lastRun: Date | null,
+): Date | null => {
+ try {
+ const options = {
+ currentDate: lastRun || new Date(0),
+ };
+
+ const interval = cronParser.parse(schedule, options);
+ return interval.next().toDate();
+ } catch (err) {
+ // biome-ignore lint/suspicious/noConsole: needed for cron job monitoring
+ console.error(
+ `\x1b[34m[VitNode]\x1b[0m \x1b[38;5;208mError parsing schedule for nextRun\x1b[0m: ${schedule}`,
+ err,
+ );
+ return null;
+ }
+};
diff --git a/packages/vitnode/src/lib/api/should-cron-job-run.test.ts b/packages/vitnode/src/lib/api/should-cron-job-run.test.ts
new file mode 100644
index 000000000..1fa350579
--- /dev/null
+++ b/packages/vitnode/src/lib/api/should-cron-job-run.test.ts
@@ -0,0 +1,321 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { shouldCronJobRun } from "./should-cron-job-run";
+
+describe("shouldCronJobRun", () => {
+ beforeEach(() => {
+ // Reset any mocked console methods
+ vi.clearAllMocks();
+ });
+
+ describe("valid cron schedules", () => {
+ it("should return true when job has never run (lastRun is null)", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = null;
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+ });
+
+ it("should return true when enough time has passed since last run", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date("2024-01-01T10:00:00Z");
+
+ // Mock current time to be 2 hours later
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T12:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should return false when not enough time has passed since last run", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date("2024-01-01T11:30:00Z");
+
+ // Mock current time to be 15 minutes later (not enough for hourly job)
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T11:45:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(false);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle daily job correctly", () => {
+ const schedule = "0 9 * * *"; // Every day at 9 AM
+ const lastRun = new Date("2024-01-01T09:00:00Z");
+
+ // Mock current time to be next day at 10 AM
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-02T10:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle weekly job correctly", () => {
+ const schedule = "0 9 * * 1"; // Every Monday at 9 AM
+ const lastRun = new Date("2024-01-01T09:00:00Z"); // Monday
+
+ // Mock current time to be next Monday
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-08T10:00:00Z")); // Next Monday
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle monthly job correctly", () => {
+ const schedule = "0 9 1 * *"; // First day of every month at 9 AM
+ const lastRun = new Date("2024-01-01T09:00:00Z");
+
+ // Mock current time to be next month
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-02-01T10:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle every minute job correctly", () => {
+ const schedule = "* * * * *"; // Every minute
+ const lastRun = new Date("2024-01-01T10:00:00Z");
+
+ // Mock current time to be 1 minute later
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T10:01:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle every 5 minutes job correctly", () => {
+ const schedule = "*/5 * * * *"; // Every 5 minutes
+ const lastRun = new Date("2024-01-01T10:00:00Z");
+
+ // Mock current time to be 3 minutes later (not enough)
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T10:03:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(false);
+
+ // Mock current time to be 5 minutes later (enough)
+ vi.setSystemTime(new Date("2024-01-01T10:05:00Z"));
+
+ const result2 = shouldCronJobRun(schedule, lastRun);
+
+ expect(result2).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle complex cron expressions", () => {
+ const schedule = "0 9-17 * * 1-5"; // 9 AM to 5 PM on weekdays
+ const lastRun = new Date("2024-01-01T09:00:00Z"); // Monday 9 AM
+
+ // Mock current time to be same day at 10 AM
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T10:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+ });
+
+ describe("invalid cron schedules", () => {
+ it("should return false and log error for invalid cron schedule", () => {
+ const consoleErrorSpy = vi
+ .spyOn(console, "error")
+ .mockImplementation(() => {});
+ const schedule = "invalid cron"; // Invalid schedule
+ const lastRun = null;
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(false);
+ expect(consoleErrorSpy).toHaveBeenCalledWith(
+ expect.stringContaining("[VitNode]") &&
+ expect.stringContaining("Error parsing schedule") &&
+ expect.stringContaining("invalid cron"),
+ expect.any(Error),
+ );
+
+ consoleErrorSpy.mockRestore();
+ });
+
+ it("should return false for malformed cron expression", () => {
+ const consoleErrorSpy = vi
+ .spyOn(console, "error")
+ .mockImplementation(() => {});
+ const schedule = "60 * * * *"; // Invalid minute (should be 0-59)
+ const lastRun = null;
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(false);
+ expect(consoleErrorSpy).toHaveBeenCalled();
+
+ consoleErrorSpy.mockRestore();
+ });
+
+ it("should return true for empty cron schedule (parsed as valid)", () => {
+ // Note: cron-parser actually parses empty string as a valid cron expression
+ const schedule = ""; // Empty schedule
+ const lastRun = null;
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+ });
+ });
+
+ describe("edge cases", () => {
+ it("should handle lastRun being exactly at the next scheduled time", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date("2024-01-01T10:00:00Z");
+
+ // Mock current time to be exactly at the next scheduled time
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T11:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle lastRun being in the future (clock skew)", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date("2024-01-01T12:00:00Z"); // Future time
+
+ // Mock current time to be earlier
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T11:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(false);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle lastRun being epoch (new Date(0))", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date(0); // Epoch time
+
+ // Mock current time to be much later
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T10:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle yearly cron job", () => {
+ const schedule = "0 0 1 1 *"; // January 1st at midnight
+ const lastRun = new Date("2023-01-01T00:00:00Z");
+
+ // Mock current time to be next year
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T01:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle specific day of month with month", () => {
+ const schedule = "0 12 15 6 *"; // June 15th at noon
+ const lastRun = new Date("2023-06-15T12:00:00Z");
+
+ // Mock current time to be next year same date
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-06-15T13:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+ });
+
+ describe("timezone handling", () => {
+ it("should work with different timezone dates", () => {
+ const schedule = "0 9 * * *"; // Every day at 9 AM
+ const lastRun = new Date("2024-01-01T09:00:00+05:00"); // 9 AM in +5 timezone
+
+ // Mock current time to be next day in UTC
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-02T04:00:00Z")); // 9 AM in +5 timezone
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+ });
+
+ describe("performance and boundary conditions", () => {
+ it("should handle very old lastRun dates", () => {
+ const schedule = "0 * * * *"; // Every hour
+ const lastRun = new Date("1970-01-01T00:00:00Z"); // Very old date
+
+ // Current time
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-01-01T10:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+
+ it("should handle leap year considerations", () => {
+ const schedule = "0 0 29 2 *"; // February 29th (leap day)
+ const lastRun = new Date("2020-02-29T00:00:00Z"); // Last leap year
+
+ // Mock current time to be next leap year
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date("2024-02-29T01:00:00Z"));
+
+ const result = shouldCronJobRun(schedule, lastRun);
+
+ expect(result).toBe(true);
+
+ vi.useRealTimers();
+ });
+ });
+});
diff --git a/packages/vitnode/src/lib/api/should-cron-job-run.ts b/packages/vitnode/src/lib/api/should-cron-job-run.ts
new file mode 100644
index 000000000..cc9c5abb2
--- /dev/null
+++ b/packages/vitnode/src/lib/api/should-cron-job-run.ts
@@ -0,0 +1,25 @@
+import cronParser from "cron-parser";
+
+export const shouldCronJobRun = (
+ schedule: string,
+ lastRun: Date | null,
+): boolean => {
+ try {
+ const now = new Date();
+ const options = {
+ currentDate: lastRun || new Date(0),
+ };
+
+ const interval = cronParser.parse(schedule, options);
+ const nextScheduledRun = interval.next().toDate();
+
+ return nextScheduledRun <= now;
+ } catch (err) {
+ // biome-ignore lint/suspicious/noConsole: needed for cron job monitoring
+ console.error(
+ `\x1b[34m[VitNode]\x1b[0m \x1b[38;5;208mError parsing schedule\x1b[0m: ${schedule}`,
+ err,
+ );
+ return false;
+ }
+};
diff --git a/packages/vitnode/src/lib/config.ts b/packages/vitnode/src/lib/config.ts
index d1a001cc2..6bffb9458 100644
--- a/packages/vitnode/src/lib/config.ts
+++ b/packages/vitnode/src/lib/config.ts
@@ -1,14 +1,17 @@
const ENVS = {
- api_url: process.env.NEXT_PUBLIC_API_URL,
- web_url: process.env.NEXT_PUBLIC_WEB_URL,
+ apiUrl: process.env.NEXT_PUBLIC_API_URL,
+ webUrl: process.env.NEXT_PUBLIC_WEB_URL,
+ cronConfig:
+ process.env.CRON_SECRET || "default-cron-secret-change-in-production",
};
const urls = {
- api: new URL(ENVS.api_url ?? "http://localhost:3000"),
- web: new URL(ENVS.web_url ?? "http://localhost:3000"),
+ api: new URL(ENVS.apiUrl ?? "http://localhost:3000"),
+ web: new URL(ENVS.webUrl ?? "http://localhost:3000"),
};
export const CONFIG = {
node_development: process.env.NODE_ENV === "development",
...urls,
+ cronJobSecret: ENVS.cronConfig,
};
diff --git a/packages/vitnode/src/locales/en.json b/packages/vitnode/src/locales/en.json
index cefac4fa4..8eba226a1 100644
--- a/packages/vitnode/src/locales/en.json
+++ b/packages/vitnode/src/locales/en.json
@@ -192,6 +192,36 @@
"home_page": "Home Page",
"debug": "Debug Panel",
"log_out": "Log Out"
+ },
+ "advanced": {
+ "title": "Advanced",
+ "cron": "Cron Jobs"
+ }
+ }
+ },
+ "advanced": {
+ "cron": {
+ "title": "Cron Jobs",
+ "desc": "Manage and monitor scheduled tasks.",
+ "list": {
+ "name": "Name",
+ "pluginId": "Plugin ID",
+ "module": "Module",
+ "schedule": "Schedule",
+ "lastRun": {
+ "title": "Last Run",
+ "never": "Never"
+ },
+ "nextRun": {
+ "title": "Next Run",
+ "never": "Never"
+ },
+ "actions": {
+ "runNow": {
+ "label": "Run Job Now",
+ "success": "Cron job executed successfully."
+ }
+ }
}
}
},
diff --git a/packages/vitnode/src/views/admin/layouts/admin-layout.tsx b/packages/vitnode/src/views/admin/layouts/admin-layout.tsx
index ec6384ebd..281ece0b4 100644
--- a/packages/vitnode/src/views/admin/layouts/admin-layout.tsx
+++ b/packages/vitnode/src/views/admin/layouts/admin-layout.tsx
@@ -9,7 +9,7 @@ import {
} from "@/components/ui/sidebar";
import { getSessionAdminApi } from "@/lib/api/get-session-admin-api";
import { I18nProvider } from "../../../components/i18n-provider";
-import { LanguageSwitcher } from "../../../components/switchers/langs/language-swietcher";
+import { LanguageSwitcher } from "../../../components/switchers/langs/language-switcher";
import type { VitNodeConfig } from "../../../vitnode.config";
import type { NavAdminParent } from "./sidebar/nav/nav";
import { SidebarAdmin } from "./sidebar/sidebar";
diff --git a/packages/vitnode/src/views/admin/layouts/sidebar/nav/item.tsx b/packages/vitnode/src/views/admin/layouts/sidebar/nav/item.tsx
index 17bb32229..74dfc0c53 100644
--- a/packages/vitnode/src/views/admin/layouts/sidebar/nav/item.tsx
+++ b/packages/vitnode/src/views/admin/layouts/sidebar/nav/item.tsx
@@ -67,11 +67,6 @@ export const ItemNavAdmin = ({
{
if (isMobile) {
@@ -97,11 +92,6 @@ export const ItemNavAdmin = ({
@@ -124,11 +114,6 @@ export const ItemNavAdmin = ({
{
if (isMobile) {
diff --git a/packages/vitnode/src/views/admin/layouts/sidebar/nav/nav.tsx b/packages/vitnode/src/views/admin/layouts/sidebar/nav/nav.tsx
index e35bc03d9..066555faa 100644
--- a/packages/vitnode/src/views/admin/layouts/sidebar/nav/nav.tsx
+++ b/packages/vitnode/src/views/admin/layouts/sidebar/nav/nav.tsx
@@ -1,4 +1,4 @@
-import { LayoutDashboardIcon, UsersRoundIcon } from "lucide-react";
+import { LayoutDashboardIcon, UsersRoundIcon, WrenchIcon } from "lucide-react";
import { getTranslations } from "next-intl/server";
import {
@@ -46,6 +46,17 @@ export const NavSidebarAdmin = async ({
},
],
},
+ {
+ href: "/admin/core/advanced",
+ title: t("advanced.title"),
+ icon: ,
+ items: [
+ {
+ title: t("advanced.cron"),
+ href: "/admin/core/advanced/cron",
+ },
+ ],
+ },
],
},
...pluginNav,
diff --git a/packages/vitnode/src/views/admin/views/core/advanced/cron/cron-table-view.tsx b/packages/vitnode/src/views/admin/views/core/advanced/cron/cron-table-view.tsx
new file mode 100644
index 000000000..b12f4a5e8
--- /dev/null
+++ b/packages/vitnode/src/views/admin/views/core/advanced/cron/cron-table-view.tsx
@@ -0,0 +1,93 @@
+import { getTranslations } from "next-intl/server";
+import { cronAdminModule } from "@/api/modules/admin/advanced/cron/cron.admin.module";
+import { DateFormat } from "@/components/date-format";
+import {
+ DataTable,
+ type SearchParamsDataTable,
+} from "@/components/table/data-table";
+import { fetcher } from "@/lib/fetcher";
+import { RunActionCronTable } from "./run-action/run-action";
+
+export const CronTableView = async ({
+ searchParams,
+}: {
+ searchParams: Promise;
+}) => {
+ const query = await searchParams;
+ const res = await fetcher(cronAdminModule, {
+ path: "/",
+ method: "get",
+ module: "cron",
+ prefixPath: "/admin/advanced",
+ args: {
+ query,
+ },
+ withPagination: true,
+ });
+
+ const [data, t] = await Promise.all([
+ res.json(),
+ getTranslations("admin.advanced.cron"),
+ ]);
+
+ return (
+ (
+
+ {row.name}
+ {row.description}
+ |