Merge branch 'dev' into feat/appearance-updates

apps/nextjs/src/app/[locale]/manage/about/page.tsx

@@ -25,7 +25,14 @@ import {
   Title,
   UnstyledButton,
 } from "@mantine/core";
-import { IconKeyboard, IconLanguage, IconLibrary, IconPackage, IconUsers } from "@tabler/icons-react";
+import {
+  IconKeyboard,
+  IconLanguage,
+  IconLibrary,
+  IconMoneybagHeart,
+  IconPackage,
+  IconUsers,
+} from "@tabler/icons-react";
 
 import { capitalize, objectEntries } from "@homarr/common";
 import { hotkeys } from "@homarr/definitions";
@@ -37,6 +44,7 @@ import { createMetaTitle } from "~/metadata";
 import type { PackageJsonDependencies } from "~/versions/package-reader";
 import { getPackageVersion } from "~/versions/package-reader";
 import type githubContributorsJson from "../../../../../../../static-data/contributors.json";
+import type openCollectiveContributorsJson from "../../../../../../../static-data/opencollective-contributors.json";
 import type crowdinContributorsJson from "../../../../../../../static-data/translators.json";
 import classes from "./about.module.css";
 
@@ -71,6 +79,10 @@ export default async function AboutPage() {
     res.json(),
   )) as typeof crowdinContributorsJson;
 
+  const openCollectiveContributors = (await fetch(`${baseServerUrl}/api/about/contributors/opencollective`).then(
+    (res) => res.json(),
+  )) as typeof openCollectiveContributorsJson;
+
   return (
     <div>
       <DynamicBreadcrumb />
@@ -136,6 +148,30 @@ export default async function AboutPage() {
             </Flex>
           </AccordionPanel>
         </AccordionItem>
+        <AccordionItem value="sponsors">
+          <AccordionControl icon={<IconMoneybagHeart size="1rem" />}>
+            <Stack gap={0}>
+              <Text>{t("accordion.sponsors.title")}</Text>
+              <Text size="sm" c="dimmed">
+                {t("accordion.sponsors.subtitle", {
+                  count: String(openCollectiveContributors.length),
+                })}
+              </Text>
+            </Stack>
+          </AccordionControl>
+          <AccordionPanel>
+            <Flex wrap="wrap" gap="xs">
+              {openCollectiveContributors.map((sponsor) => (
+                <GenericContributorLinkCard
+                  key={sponsor.slug}
+                  link={`https://opencollective.com/${sponsor.slug}`}
+                  image={sponsor.imageUrl}
+                  name={sponsor.name}
+                />
+              ))}
+            </Flex>
+          </AccordionPanel>
+        </AccordionItem>
         <AccordionItem value="libraries">
           <AccordionControl icon={<IconLibrary size="1rem" />}>
             <Stack gap={0}>

apps/nextjs/src/app/[locale]/manage/tools/api/page.tsx

@@ -2,7 +2,7 @@ import { headers } from "next/headers";
 import { notFound } from "next/navigation";
 import { Stack, Tabs, TabsList, TabsPanel, TabsTab } from "@mantine/core";
 
-import { openApiDocument } from "@homarr/api";
+import { openApiDocument } from "@homarr/api/open-api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { extractBaseUrlFromHeaders } from "@homarr/common";

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx

@@ -30,7 +30,7 @@ export const FirstDayOfWeek = ({ user }: FirstDayOfWeekProps) => {
     },
     onSuccess(_, variables) {
       form.setInitialValues({
-        firstDayOfWeek: variables.firstDayOfWeek,
+        firstDayOfWeek: variables.firstDayOfWeek as DayOfWeek,
       });
       showSuccessNotification({
         message: t("user.action.changeFirstDayOfWeek.notification.success.message"),

apps/nextjs/src/app/api/[...trpc]/route.ts

@@ -2,7 +2,8 @@ import type { NextRequest } from "next/server";
 import { userAgent } from "next/server";
 import { createOpenApiFetchHandler } from "trpc-to-openapi";
 
-import { appRouter, createTRPCContext } from "@homarr/api";
+import { createTRPCContext } from "@homarr/api";
+import { openApiRouter } from "@homarr/api/open-api";
 import { API_KEY_HEADER_NAME, getSessionFromApiKeyAsync } from "@homarr/auth/api-key";
 import { ipAddressFromHeaders } from "@homarr/common/server";
 import { createLogger } from "@homarr/core/infrastructure/logs";
@@ -30,7 +31,7 @@ const handlerAsync = async (req: NextRequest) => {
   return createOpenApiFetchHandler({
     req,
     endpoint: "/",
-    router: appRouter,
+    router: openApiRouter,
     createContext: () => createTRPCContext({ session, headers: req.headers }),
     onError({ error, path, type }) {
       logger.error(new ErrorWithMetadata("tRPC Error occured", { path, type }, { cause: error }));

apps/nextjs/src/app/api/about/contributors/opencollective/route.ts

@@ -0,0 +1,9 @@
+import { NextResponse } from "next/server";
+
+import openCollectiveContributors from "../../../../../../../../static-data/opencollective-contributors.json";
+
+export const GET = () => {
+  return NextResponse.json(openCollectiveContributors);
+};
+
+export const dynamic = "force-static";

apps/nextjs/src/app/api/openapi/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 
-import { openApiDocument } from "@homarr/api";
+import { openApiDocument } from "@homarr/api/open-api";
 import { extractBaseUrlFromHeaders } from "@homarr/common";
 
 export function GET(request: Request) {

apps/tasks/package.json

@@ -37,6 +37,7 @@
     "@homarr/server-settings": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
     "@homarr/widgets": "workspace:^0.1.0",
+    "croner": "catalog:",
     "dayjs": "catalog:",
     "dotenv": "catalog:",
     "fastify": "catalog:",

apps/tasks/src/job-manager.ts

@@ -1,4 +1,4 @@
-import { schedule, validate as validateCron } from "node-cron";
+import { Cron } from "croner";
 
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import type { IJobManager } from "@homarr/cron-job-api";
@@ -21,28 +21,31 @@ export class JobManager implements IJobManager {
   public async triggerAsync(name: JobGroupKeys): Promise<void> {
     await this.jobGroup.runManuallyAsync(name);
   }
-  public async stopAsync(name: JobGroupKeys): Promise<void> {
-    await this.jobGroup.stopAsync(name);
+  public stop(name: JobGroupKeys): void {
+    this.jobGroup.stop(name);
   }
   public async updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void> {
     logger.info("Updating cron job interval", { name, expression: cron });
     const job = this.jobGroup.getJobRegistry().get(name);
     if (!job) throw new Error(`Job ${name} not found`);
-    if (!validateCron(cron)) {
-      throw new Error(`Invalid cron expression: ${cron}`);
-    }
     if (job.preventCustomInterval && cron !== job.cronExpression) {
       throw new Error(`Custom cron expressions are not allowed for job ${name}`);
     }
 
-    await this.updateConfigurationAsync(name, { cronExpression: cron });
-    await this.jobGroup.getTask(name)?.destroy();
+    const updatedConfig = await this.updateConfigurationAsync(name, { cronExpression: cron });
+    this.jobGroup.getTask(name)?.stop();
 
     this.jobGroup.setTask(
       name,
-      schedule(cron, () => void job.executeAsync(), {
-        name,
-      }),
+      new Cron(
+        cron,
+        {
+          name,
+          timezone: job.timezone,
+          paused: !updatedConfig.isEnabled,
+        },
+        () => void job.executeAsync(),
+      ),
     );
     logger.info("Cron job interval updated", { name, expression: cron });
   }
@@ -52,7 +55,7 @@ export class JobManager implements IJobManager {
     if (!job) throw new Error(`Job ${name} not found`);
 
     await this.updateConfigurationAsync(name, { isEnabled: false });
-    await this.jobGroup.stopAsync(name);
+    this.jobGroup.stop(name);
     logger.info("Cron job disabled", { name });
   }
   public async enableAsync(name: JobGroupKeys): Promise<void> {
@@ -86,21 +89,27 @@ export class JobManager implements IJobManager {
         name,
         configuration: JSON.stringify(configuration),
       });
-      return;
+      return {
+        name,
+        cronExpression: configuration.cronExpression ?? existingConfig.cronExpression,
+        isEnabled: configuration.isEnabled ?? existingConfig.isEnabled,
+      };
     }
 
     const job = this.jobGroup.getJobRegistry().get(name);
     if (!job) throw new Error(`Job ${name} not found`);
 
-    await this.db.insert(cronJobConfigurations).values({
+    const updatedConfig = {
       name,
       cronExpression: configuration.cronExpression ?? job.cronExpression,
       isEnabled: configuration.isEnabled ?? true,
-    });
+    };
+    await this.db.insert(cronJobConfigurations).values(updatedConfig);
     logger.debug("Cron job configuration updated", {
       name,
       configuration: JSON.stringify(configuration),
     });
+    return updatedConfig;
   }
 
   public async getAllAsync(): Promise<