Merge branch 'main' into next

packages/api/src/index.ts

@@ -1,6 +1,5 @@
 import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
 
-import { openApiDocument } from "./open-api";
 import type { AppRouter } from "./root";
 import { appRouter } from "./root";
 import { createCallerFactory, createTRPCContext } from "./trpc";
@@ -30,5 +29,5 @@ type RouterInputs = inferRouterInputs<AppRouter>;
  **/
 type RouterOutputs = inferRouterOutputs<AppRouter>;
 
-export { createTRPCContext, appRouter, createCaller, openApiDocument };
+export { createTRPCContext, appRouter, createCaller };
 export type { AppRouter, RouterInputs, RouterOutputs };

packages/api/src/open-api.ts

@@ -2,10 +2,21 @@ import { generateOpenApiDocument } from "trpc-to-openapi";
 
 import { API_KEY_HEADER_NAME } from "@homarr/auth/api-key";
 
-import { appRouter } from "./root";
+import { appRouter } from "./router/app";
+import { infoRouter } from "./router/info";
+import { inviteRouter } from "./router/invite";
+import { userRouter } from "./router/user";
+import { createTRPCRouter } from "./trpc";
+
+export const openApiRouter = createTRPCRouter({
+  appRouter,
+  infoRouter,
+  inviteRouter,
+  userRouter,
+});
 
 export const openApiDocument = (base: string) =>
-  generateOpenApiDocument(appRouter, {
+  generateOpenApiDocument(openApiRouter, {
     title: "Homarr API documentation",
     version: "1.0.0",
     baseUrl: base,

packages/api/src/router/cron-jobs.ts

@@ -4,7 +4,7 @@ import z from "zod/v4";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import type { TaskStatus } from "@homarr/cron-job-status";
 import { createCronJobStatusChannel } from "@homarr/cron-job-status";
-import { cronExpressionSchema, jobGroup } from "@homarr/cron-jobs";
+import { jobGroup } from "@homarr/cron-jobs";
 import { JobManager } from "@homarr/cron-jobs/job-manager";
 
 import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
@@ -30,15 +30,15 @@ export const cronJobsRouter = createTRPCRouter({
   stopJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
-      await new JobManager(ctx.db, jobGroup).stopAsync(input);
+    .mutation(({ input, ctx }) => {
+      new JobManager(ctx.db, jobGroup).stop(input);
     }),
   updateJobInterval: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(
       z.object({
         name: jobNameSchema,
-        cron: cronExpressionSchema,
+        cron: z.string(),
       }),
     )
     .mutation(async ({ input, ctx }) => {