refactor(cli): rewrite CLI for reliability and better UX

Replace brocli framework with Node's built-in util.parseArgs and a
declarative command registry. The CLI no longer hangs after completing
because:
- DB connections are lazily created and explicitly closed
- Winston/Redis logging is excluded from the bundle entirely
- process.exit() is always called with proper exit codes

Additional improvements:
- Bundle size reduced from 5.3MB to 1.2MB (native drivers externalized)
- Proper column-aligned table output for list commands
- --json flag on list commands for scripting/automation
- Per-command --help with usage examples
- Execution timing shown on success
- Consistent exit codes (0=success, 1=error, 2=usage)
- Docker wrapper sets DISABLE_REDIS_LOGS and uses exec

.cursor/rules/codebase-context.mdc

@@ -0,0 +1,191 @@
+---
+description: Comprehensive Homarr codebase architecture and conventions reference
+alwaysApply: true
+---
+
+# Homarr Codebase Context
+
+Homarr is an open-source, self-hosted dashboard for managing homelab services. It integrates with 50+ self-hosted apps (media servers, download clients, DNS, NAS, etc.) and provides a drag-and-drop widget-based UI.
+
+## Tech Stack
+
+- **Monorepo**: pnpm workspaces + Turborepo
+- **Framework**: Next.js (App Router, `output: "standalone"`) — T3 Stack
+- **Language**: TypeScript throughout
+- **ORM**: Drizzle (supports SQLite via better-sqlite3, MySQL, PostgreSQL)
+- **API**: tRPC (HTTP + WebSocket subscriptions) with superjson + OpenAPI bridge via `trpc-to-openapi`
+- **Auth**: NextAuth v5 (database sessions, Credentials/LDAP/OIDC providers)
+- **UI**: Mantine v7 (not Tailwind) + Tabler icons
+- **State**: Jotai (atoms), TanStack Query (server state via tRPC)
+- **Realtime**: WebSocket server (`ws`) for tRPC subscriptions, backed by Redis pub/sub
+- **Cron**: `node-cron` in a standalone Fastify service (`apps/tasks`)
+- **i18n**: next-intl with `[locale]` dynamic segment (prefix mode: `"never"`, locale from cookie)
+- **Testing**: Vitest + jsdom, Playwright for E2E
+- **Package manager**: pnpm 10.33.2, Node >= 24.15.0
+
+## Repository Structure
+
+```
+homarr/
+├── apps/
+│   ├── nextjs/          # Main Next.js application (port 3000)
+│   ├── tasks/           # Cron job runner + Fastify tRPC API (port 3002)
+│   └── websocket/       # Standalone tRPC WebSocket server (port 3001)
+├── packages/
+│   ├── api/             # tRPC appRouter, procedures, OpenAPI
+│   ├── auth/            # NextAuth config, providers, session, API keys
+│   ├── db/              # Drizzle schema (3 DB drivers), migrations, queries
+│   ├── core/            # Env validation, DB/Redis driver factories, logging
+│   ├── definitions/     # Domain enums: WidgetKind, IntegrationKind, permissions
+│   ├── widgets/         # All 39 dashboard widgets (definitions + components)
+│   ├── integrations/    # Integration classes (HTTP clients to external apps)
+│   ├── redis/           # Redis pub/sub channels, caching abstractions
+│   ├── translation/     # next-intl setup, locale configs, lang JSON files
+│   ├── ui/              # Shared Mantine components, theme, hooks
+│   ├── validation/      # Shared zod schemas for API/forms
+│   ├── common/          # Shared utilities, IDs, errors
+│   ├── cron-jobs/       # Cron job implementations (25+ jobs)
+│   ├── cron-jobs-core/  # Cron scheduling primitives
+│   ├── cron-job-api/    # tRPC router for job management (start/stop/trigger)
+│   ├── cron-job-status/ # Cron status via Redis
+│   ├── boards/          # Board context, edit mode, cache updater
+│   ├── modals/          # Modal primitives on Mantine
+│   ├── modals-collection/ # Feature modals (apps, boards, docker, etc.)
+│   ├── form/            # useZodForm (Mantine + zod resolver)
+│   ├── forms-collection/# Reusable form UIs (new app, icon picker, upload)
+│   ├── spotlight/       # Command palette / search with multiple modes
+│   ├── request-handler/ # Server request handlers (feeds, integrations)
+│   ├── notifications/   # Mantine notifications wrapper
+│   ├── docker/          # Dockerode-based Docker access
+│   ├── icons/           # Icon DB/repo integration
+│   ├── image-proxy/     # Image proxy + caching
+│   ├── ping/            # Reachability / ping utilities
+│   ├── analytics/       # Server-side analytics (Umami)
+│   ├── server-settings/ # Server setting keys/types
+│   ├── settings/        # User-facing settings UI context
+│   ├── old-import/      # Legacy Homarr import
+│   ├── old-schema/      # Legacy Homarr zod schemas
+│   └── cli/             # Node CLI for ops (brocli)
+├── tooling/
+│   ├── eslint/          # Shared ESLint configs
+│   ├── prettier/        # Shared Prettier config
+│   ├── typescript/      # Base tsconfig
+│   └── github/          # CI setup action
+├── development/         # Dev docker-compose (Redis, MySQL, PostgreSQL)
+├── e2e/                 # E2E test specs
+└── Dockerfile           # Multi-stage production build
+```
+
+## Three Runtime Services
+
+| Service | Port | Role |
+|---------|------|------|
+| Next.js | 3000 | Main web app (SSR + API routes) |
+| WebSocket | 3001 | tRPC subscriptions via `ws` |
+| Tasks | 3002 | Cron job runner + management API via Fastify |
+
+In Docker, nginx listens on **7575** and proxies to all three. The tasks service authenticates via `CRON_JOB_API_KEY` header.
+
+## Package Dependency Layers
+
+1. **Foundation**: `core` (env, DB drivers, Redis client, logging) → no `@homarr` deps
+2. **Domain**: `definitions` → `common` → `core`
+3. **Data**: `db` → `core`, `definitions`, `common`
+4. **Auth**: `auth` → `db`, `definitions`, `core`, `validation`
+5. **Cross-cutting**: `translation`, `validation`, `redis`, `server-settings`
+6. **Feature backends**: `integrations`, `request-handler`, `cron-jobs`, `docker`, `ping`
+7. **API surface**: `api` → pulls in auth, db, redis, integrations, etc.
+8. **UI stack**: `ui`, `modals`, `form`, `notifications`, `boards`, `spotlight`
+9. **Composed features**: `widgets`, `modals-collection`, `forms-collection`
+
+## Key Patterns
+
+### tRPC
+
+- **Server caller** (RSC): `import { api } from "@homarr/api/server"` → cached caller with auth context
+- **Client hooks**: `import { clientApi } from "@homarr/api/client"` → React Query hooks
+- **Router structure**: `packages/api/src/root.ts` defines top-level namespaces (`user`, `board`, `widget`, `integration`, `docker`, `kubernetes`, etc.)
+- **Procedures**: `publicProcedure`, `protectedProcedure`, `permissionRequiredProcedure`, `onboardingProcedure`
+- **WebSocket subscriptions**: Client uses `wsLink` when `type === "subscription"`, connects to port 3001
+
+### Multi-Database Support
+
+Drizzle schemas exist in three parallel implementations:
+- `packages/db/schema/sqlite.ts`
+- `packages/db/schema/mysql.ts`
+- `packages/db/schema/postgresql.ts`
+
+Selected at runtime via `DB_DRIVER` env (`better-sqlite3` | `mysql2` | `node-postgres`). Migrations are per-engine in `packages/db/migrations/{sqlite,mysql,postgresql}/`.
+
+### Widget System
+
+Widgets are registered in `packages/widgets/src/index.tsx` as `widgetImports` (must satisfy `Record<WidgetKind, ...>`). Each widget:
+- Has a `definition` created via `createWidgetDefinition(kind, { icon, createOptions, supportedIntegrations? })`
+- Uses `optionsBuilder.from(factory => ({ ... }))` for typed options
+- Loads dynamically via `next/dynamic`
+- Fetches data via tRPC client hooks (backed by cron job caches)
+
+### Integration System
+
+Integrations are defined in `packages/definitions/src/integration.ts` (`integrationDefs`) and instantiated via `createIntegrationAsync` in `packages/integrations/src/base/creator.ts`. Each extends abstract `Integration` class with `testConnectionAsync` and typed methods.
+
+### Cron Job System
+
+Jobs defined in `packages/cron-jobs/src/jobs/`. Each job:
+- Uses `createCronJob` with a cron expression
+- Publishes results to Redis channels
+- Widget subscriptions consume those channels via tRPC subscriptions
+- Job management (start/stop/trigger) via `cronJobApi` HTTP client to port 3002
+
+### Modals
+
+Created with `createModal(component).withOptions({ defaultTitle })` from `@homarr/modals`. Opened via `useModalAction(SomeModal)`. Feature modals live in `packages/modals-collection/`.
+
+### Forms
+
+`useZodForm` from `@homarr/form` wraps Mantine `useForm` with zod validation. Shared form UIs in `packages/forms-collection/`.
+
+### Routing (App Router)
+
+- `apps/nextjs/src/app/[locale]/` — all UI routes under locale segment
+- Route groups: `(home)`, `(content)`, `(board)` — don't affect URLs
+- Key routes: `boards/[name]`, `manage/...` (admin), `auth/login`, `init` (onboarding), `widgets/[kind]`
+- Locale driven by cookie (no URL prefix)
+
+### Auth Providers
+
+Configured via `AUTH_PROVIDERS` env. Supports: `credentials` (local), `ldap`, `oidc`. Database sessions with httpOnly cookies. API key auth for programmatic access.
+
+## Environment Variables
+
+Key env vars (from `.env.example`):
+- `DB_DRIVER`: `better-sqlite3` | `mysql2` | `node-postgres`
+- `DB_URL`: Database connection string
+- `AUTH_SECRET`: NextAuth secret
+- `SECRET_ENCRYPTION_KEY`: AES-256-CBC for integration secrets
+- `AUTH_PROVIDERS`: Comma-separated (`credentials`, `ldap`, `oidc`)
+- `CRON_JOB_API_KEY`: Shared key between Next.js and tasks service
+- `REDIS_*`: Redis connection (host, port, password)
+- `ENABLE_KUBERNETES`: Optional Kubernetes integration
+
+## Development Commands
+
+- `pnpm dev` — runs all three services in parallel via Turborepo
+- `pnpm docker:dev` — starts Redis + MySQL + PostgreSQL containers
+- `pnpm db:push` — push schema to SQLite (dev)
+- `pnpm db:studio` — Drizzle Studio
+- `pnpm test` — Vitest unit tests
+- `pnpm test:e2e` — Playwright E2E
+- `pnpm lint` / `pnpm format` — ESLint + Prettier
+- `pnpm typecheck` — tsc --noEmit across all packages
+
+## Conventions
+
+- Workspace packages use `@homarr/` scope
+- All versions managed via pnpm `catalog:` in workspace
+- Path alias `~/*` → `./src/*` in Next.js app
+- Mantine for all UI (no Tailwind) — primary color is red, `autoContrast: true`
+- Icons from `@tabler/icons-react`
+- Drag-and-drop via `@dnd-kit/*`
+- `typescript.ignoreBuildErrors: true` in next.config (types checked separately via `typecheck`)
+- `serverExternalPackages`: `dockerode`, `isomorphic-dompurify`, `jsdom`

.env.example

@@ -12,6 +12,10 @@ AUTH_SECRET="supersecret"
 # or starting the project without any (which will show a randomly generated one).
 SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000
 
+# Cron job API key is generated every time the container starts as it is required for communication between nextjs-api and tasks-api
+# export CRON_JOB_API_KEY=$(openssl rand -base64 32)
+# CRON_JOB_API_KEY="your-generated-api-key"
+
 LOG_LEVEL='info'
 
 # This is how you can use the sqlite driver:
@@ -41,6 +45,12 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
 
 TURBO_TELEMETRY_DISABLED=1
 
+# Comma-separated paths to Docker-compatible Unix sockets.
+# Useful for connecting to multiple runtimes (Docker + Podman) simultaneously.
+# When unset and no TCP hosts configured, defaults to /var/run/docker.sock.
+# Example: DOCKER_SOCKET_PATHS=/var/run/docker.sock,/run/user/1000/podman/podman.sock
+# DOCKER_SOCKET_PATHS=
+
 # Enable kubernetes tool
 # ENABLE_KUBERNETES=true
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -33,6 +33,8 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
+        - 1.60.1-beta.1
+        - 1.60.0
         - 1.59.3
         - 1.59.2
         - 1.59.1

.github/ISSUE_TEMPLATE/integration.yml

@@ -25,16 +25,16 @@ body:
       label: Public API available?
       description: Is there a public API available, that we can consume in Homarr?
       options:
-        - Yes, available on a website
+        - "Yes, available on a website"
-        - Yes, available in the application itself
+        - "Yes, available in the application itself"
-        - No
+        - "No"
     validations:
       required: true
   - type: dropdown
     attributes:
       label: Are you willing to contribute this yourself?
       options:
-      - Yes
+        - "Yes"
-      - No
+        - "No"
     validations:
       required: true

.github/ISSUE_TEMPLATE/widget.yml

@@ -24,7 +24,7 @@ body:
     attributes:
       label: Are you willing to contribute this yourself?
       options:
-        - Yes
+        - "Yes"
-        - No
+        - "No"
     validations:
       required: true

.github/workflows/automatic-approval.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
           permission-pull-requests: write # required to approve pull request
 
       - name: Install GitHub CLI

.github/workflows/code-quality.yml

@@ -11,7 +11,7 @@ on:
 
 concurrency:
   group: "${{ github.workflow }}-${{ github.ref }}"
-  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 env:
   FORCE_COLOR: 3

.github/workflows/crowdin-schedule-download.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.CROWDIN_APP_PRIVATE_KEY }}
-          app-id: ${{ secrets.CROWDIN_APP_ID }}
+          client-id: ${{ secrets.CROWDIN_APP_ID }}
           permission-contents: write # required to commit to crowdin branch
           permission-pull-requests: write # required to create pull request
 

.github/workflows/deployment-beta-release.yml

@@ -0,0 +1,104 @@
+name: "[Deployment] Beta Release"
+
+on:
+  workflow_dispatch:
+    inputs:
+      send-notifications:
+        type: boolean
+        required: false
+        default: true
+        description: Send notifications
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  create-and-merge-pr:
+    runs-on: ubuntu-latest
+    timeout-minutes: 2
+    steps:
+      - name: Discord notification
+        if: ${{ github.event.inputs.send-notifications }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.4.0
+        with:
+          args: "Beta release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Get Next Version
+        id: semver
+        uses: ietf-tools/semver-action@v1
+        with:
+          token: ${{ github.token }}
+          branch: next
+      - name: Create pull request
+        id: create-pull-request
+        run: 'gh pr create --title "chore(release): release ${{ steps.semver.outputs.next }}-beta" --body "Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}-beta``" --base beta --head next --label automerge'
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Discord notification
+        if: ${{ github.event.inputs.send-notifications }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.4.0
+        with:
+          args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }}-beta (new behaviour: ${{ steps.semver.outputs.bump }})"
+      - name: Obtain token
+        id: obtainApprovalToken
+        uses: actions/create-github-app-token@v3
+        with:
+          private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
+          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          permission-pull-requests: write
+      - name: Approve PR
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainApprovalToken.outputs.token }}
+        run: |
+          gh pr review --approve --body "Automatically approved by GitHub Action"
+      - name: Obtain token
+        id: obtainMergeToken
+        uses: actions/create-github-app-token@v3
+        with:
+          private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
+          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          permission-contents: write # write to beta branch (due to merge)
+          permission-pull-requests: write # merge pull request
+      - id: automerge
+        if: ${{ steps.semver.outputs.bump != 'major' }}
+        name: automerge
+        uses: "pascalgn/automerge-action@v0.16.4"
+        env:
+          GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
+          MERGE_METHOD: merge # we prefer merge commits for merging to beta
+          MERGE_COMMIT_MESSAGE: "chore(release): release ${{ steps.semver.outputs.next }}-beta"
+          MERGE_DELETE_BRANCH: false # never set to true!
+          PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
+          MERGE_RETRIES: 20 # 20 retries * MERGE_RETRY_SLEEP until step fails
+          MERGE_RETRY_SLEEP: 10000 # 10 seconds * MERGE_RETRIES until step fails
+          MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
+
+      - name: Merged Discord notification
+        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.4.0
+        with:
+          args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
+      - name: Major Bump Discord notification
+        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.4.0
+        with:
+          args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}-beta"
+      - name: Discord Fail Notification
+        if: failure() && github.event.inputs.send-notifications
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@0.4.0
+        with:
+          args: "The beta release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"

.github/workflows/deployment-docker-image.yml

@@ -53,7 +53,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to commit package.json & changelog changes, merge them to dev and publish the release
 
       - uses: actions/checkout@v6
@@ -191,7 +191,7 @@ jobs:
     name: Extract amd64 asset from docker image
     needs: [release, build-amd64]
     runs-on: ubuntu-latest
-    timeout-minutes: 2
+    timeout-minutes: 5
     steps:
       - name: Extract amd64
         if: needs.release.outputs.skipped == 'false'
@@ -207,7 +207,7 @@ jobs:
     name: Extract arm64 asset from docker image
     needs: [release, build-arm64]
     runs-on: ubuntu-24.04-arm
-    timeout-minutes: 2
+    timeout-minutes: 5
     steps:
       - name: Extract arm64
         if: needs.release.outputs.skipped == 'false'
@@ -234,7 +234,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to publish the release
 
       - name: Log in to the Container registry
@@ -274,6 +274,6 @@ jobs:
       - name: Discord notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "Successfully deployed images for branch **${{ github.ref_name }}**. Tagged as **${{env.NEXT_VERSION}}**."

.github/workflows/deployment-weekly-release.yml

@@ -21,10 +21,10 @@ jobs:
     timeout-minutes: 2
     steps:
       - name: Discord notification
-        if: ${{ github.events.inputs.send-notifications }}
+        if: ${{ github.event.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "Automatic release has been triggered: [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})"
       - name: Checkout repository
@@ -38,14 +38,15 @@ jobs:
           token: ${{ github.token }}
           branch: dev
       - name: Create pull request
+        id: create-pull-request
         run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base main --head dev --label automerge'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Discord notification
-        if: ${{ github.events.inputs.send-notifications }}
+        if: ${{ github.event.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "Created a release PR ${{ steps.create-pull-request.outputs.url }} for version ${{ steps.semver.outputs.next }} (new behaviour: ${{ steps.semver.outputs.bump }})"
       - name: Obtain token
@@ -53,7 +54,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
           permission-pull-requests: write
       - name: Approve PR
         env:
@@ -65,7 +66,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # write to main branch (due to merge)
           permission-pull-requests: write # merge pull request
       - id: automerge
@@ -74,7 +75,7 @@ jobs:
         uses: "pascalgn/automerge-action@v0.16.4"
         env:
           GITHUB_TOKEN: ${{ steps.obtainMergeToken.outputs.token }}
-          MERGE_METHOD: merge # we prefer merge commits for merging to master
+          MERGE_METHOD: merge # we prefer merge commits for merging to main
           MERGE_COMMIT_MESSAGE: "chore(release): automatic release ${{ steps.semver.outputs.next }}"
           MERGE_DELETE_BRANCH: false # never set to true!
           PULL_REQUEST: "${{ steps.create-pull-request.outputs.pr_number }}"
@@ -83,23 +84,23 @@ jobs:
           MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
 
       - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.events.inputs.send-notifications }}
+        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "Merged PR ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
       - name: Major Bump Discord notification
-        if: ${{ steps.semver.outputs.bump == 'major' && github.events.inputs.send-notifications }}
+        if: ${{ steps.semver.outputs.bump == 'major' && github.event.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "The release PR must be manually merged because the next version is a major version: ${{ steps.create-pull-request.outputs.url }} for release ${{ steps.semver.outputs.next }}"
       - name: Discord Fail Notification
-        if: failure() && github.events.inputs.send-notifications
+        if: failure() && github.event.inputs.send-notifications
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
+        uses: Ilshidur/action-discord@0.4.0
         with:
           args: "The automatic release workflow [run ${{ github.run_number }}](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) has failed"

.github/workflows/on-release.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.HOMARR_DOCS_RELEASE_APP_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
+          client-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
           owner: homarr-labs
           repositories: |
             documentation
@@ -48,7 +48,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
       - name: Checkout code

.github/workflows/update-contributors.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
 

.github/workflows/update-integration-list.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.HOMARR_UPDATE_CONTRIBUTORS_PRIVATE_KEY }}
-          app-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
           permission-contents: write # required to commit to branch
           permission-pull-requests: write # required to create pr & enable automerge
       - name: Checkout code

CHANGELOG.md

@@ -1,3 +1,64 @@
+## [1.61.1](https://github.com/homarr-labs/homarr/compare/v1.61.0...v1.61.1) (2026-05-18)
+
+### Bug Fixes
+
+* **downloads-widget:** increase name column default width ratio ([e9142c0](https://github.com/homarr-labs/homarr/commit/e9142c0dbcaca6cd9215b5292a2d139d96919b51))
+
+## [1.61.0](https://github.com/homarr-labs/homarr/compare/v1.60.0...v1.61.0) (2026-05-08)
+
+### Features
+
+* add auto/system appearance mode + fix dark mode system resources charts ([#5492](https://github.com/homarr-labs/homarr/issues/5492)) ([831b622](https://github.com/homarr-labs/homarr/commit/831b6221fdf21fe4913b0f165ef551afeada4f33))
+* add pwa support ([#5530](https://github.com/homarr-labs/homarr/issues/5530)) ([277a509](https://github.com/homarr-labs/homarr/commit/277a509f490d57bb6547c86c417c29c0e7af7e40))
+* add Umami Analytics integration and widget ([#5362](https://github.com/homarr-labs/homarr/issues/5362)) ([43cc68b](https://github.com/homarr-labs/homarr/commit/43cc68bdd49c4877012e39e23355f6506aea7f4e))
+* **docker:** Podman compatibility, multi-socket support, per-host error isolation ([#5425](https://github.com/homarr-labs/homarr/issues/5425)) ([56af6bc](https://github.com/homarr-labs/homarr/commit/56af6bcaf00e980e4c7a40d8e912901cd1395f5a))
+* **entity-state:** add data attributes for custom-css styling ([#5655](https://github.com/homarr-labs/homarr/issues/5655)) ([0937555](https://github.com/homarr-labs/homarr/commit/0937555d49c29455bc33307ae5e50bf5b812c7c7))
+* **installations:** support secrets file for all environment variables ([#5125](https://github.com/homarr-labs/homarr/issues/5125)) ([4d30a2e](https://github.com/homarr-labs/homarr/commit/4d30a2e8c48f818bb4947a651b0fec5f64cbf569))
+* **qbittorrent:** add api-key support ([#5677](https://github.com/homarr-labs/homarr/issues/5677)) ([756e8d1](https://github.com/homarr-labs/homarr/commit/756e8d172455f91e40cd8fb5faff6953cc9778c5))
+* **spotlight:** rework !bang search UX ([#4813](https://github.com/homarr-labs/homarr/issues/4813)) ([b5c316b](https://github.com/homarr-labs/homarr/commit/b5c316b825bdffa267fd173a3c39a12269142665))
+
+### Bug Fixes
+
+* **apps:** creation on the fly broken ([#5605](https://github.com/homarr-labs/homarr/issues/5605)) ([3183914](https://github.com/homarr-labs/homarr/commit/3183914a1502555681b73975062ed6ca8a48cb75))
+* **calendar:** keep working integrations when one fails ([#5629](https://github.com/homarr-labs/homarr/issues/5629)) ([44bd16d](https://github.com/homarr-labs/homarr/commit/44bd16d6770d289054df6c7c93adff42d2243252))
+* **lang:** portuguese is linked to brazilian portuguese on crowdin ([#5622](https://github.com/homarr-labs/homarr/issues/5622)) ([62be81e](https://github.com/homarr-labs/homarr/commit/62be81ea607a609a816157686700c54540e1568b))
+* **qbittorrent:** support version 5.2 ([#5672](https://github.com/homarr-labs/homarr/issues/5672)) ([00a0552](https://github.com/homarr-labs/homarr/commit/00a055283e8848542b67d88a656a99fdd0bcb444))
+* **update-checker:** hide prereleases on non-prerelease versions ([#5645](https://github.com/homarr-labs/homarr/issues/5645)) ([b07a4a0](https://github.com/homarr-labs/homarr/commit/b07a4a0f3e3af384ec477bf5c505a705b003de47))
+
+### Reverts
+
+* **deps:** downgrade pnpm to v10 ([#5673](https://github.com/homarr-labs/homarr/issues/5673)) ([44a2973](https://github.com/homarr-labs/homarr/commit/44a2973b1aba1e2c6bd818be022205f3cdb7c943))
+
+## [1.60.0](https://github.com/homarr-labs/homarr/compare/v1.59.3...v1.60.0) (2026-05-01)
+
+### Features
+
+* **about:** add opencollective contributors ([#5481](https://github.com/homarr-labs/homarr/issues/5481)) ([3d202d4](https://github.com/homarr-labs/homarr/commit/3d202d409febf33d0218b589c979744c84f87407))
+
+### Bug Fixes
+
+* migrate from node-cron to croner ([#5407](https://github.com/homarr-labs/homarr/issues/5407)) ([e8edc20](https://github.com/homarr-labs/homarr/commit/e8edc203b6c862141668b043ef4232c22b8fae24))
+* **openapi:** openapi document empty ([#5579](https://github.com/homarr-labs/homarr/issues/5579)) ([ce8e330](https://github.com/homarr-labs/homarr/commit/ce8e330c82bc0be9f299f3071a1e80daafc5f789))
+
+### Performance Improvements
+
+* **icons:** updater takes 10 seconds to run with high cpu usage ([#5608](https://github.com/homarr-labs/homarr/issues/5608)) ([ed6680b](https://github.com/homarr-labs/homarr/commit/ed6680ba6a42864185818eb8d90b2303846c1761))
+
+## [1.60.0](https://github.com/homarr-labs/homarr/compare/v1.59.3...v1.60.0) (2026-05-01)
+
+### Features
+
+* **about:** add opencollective contributors ([#5481](https://github.com/homarr-labs/homarr/issues/5481)) ([3d202d4](https://github.com/homarr-labs/homarr/commit/3d202d409febf33d0218b589c979744c84f87407))
+
+### Bug Fixes
+
+* migrate from node-cron to croner ([#5407](https://github.com/homarr-labs/homarr/issues/5407)) ([e8edc20](https://github.com/homarr-labs/homarr/commit/e8edc203b6c862141668b043ef4232c22b8fae24))
+* **openapi:** openapi document empty ([#5579](https://github.com/homarr-labs/homarr/issues/5579)) ([ce8e330](https://github.com/homarr-labs/homarr/commit/ce8e330c82bc0be9f299f3071a1e80daafc5f789))
+
+### Performance Improvements
+
+* **icons:** updater takes 10 seconds to run with high cpu usage ([#5608](https://github.com/homarr-labs/homarr/issues/5608)) ([ed6680b](https://github.com/homarr-labs/homarr/commit/ed6680ba6a42864185818eb8d90b2303846c1761))
+
 ## [1.59.3](https://github.com/homarr-labs/homarr/compare/v1.59.2...v1.59.3) (2026-04-24)
 
 ### Bug Fixes

CODEOWNERS

@@ -3,7 +3,11 @@
 
 # Exempt Renovate‑managed files (no owners)
 package.json
+**/package.json
 package-lock.json
+**/package-lock.json
 pnpm-lock.yaml
+**/pnpm-lock.yaml
+pnpm-workspace.yaml
 Dockerfile
 docker-compose.yml

Dockerfile

@@ -30,7 +30,7 @@ VOLUME /appdata
 
 # Enable homarr cli
 COPY --from=builder /app/packages/cli/cli.cjs /app/apps/cli/cli.cjs
-RUN echo $'#!/bin/bash\ncd /app/apps/cli && node ./cli.cjs "$@"' > /usr/bin/homarr
+RUN echo $'#!/bin/bash\nexport DISABLE_REDIS_LOGS=true\ncd /app/apps/cli && exec node ./cli.cjs "$@"' > /usr/bin/homarr
 RUN chmod +x /usr/bin/homarr
 
 # Don't run production as root
@@ -43,6 +43,8 @@ RUN mkdir -p /var/cache/nginx && \
 COPY --from=builder /app/apps/nextjs/next.config.ts .
 COPY --from=builder /app/apps/nextjs/package.json .
 
+COPY --from=builder /app/apps/tasks/tasks.cjs ./apps/tasks/tasks.cjs
+COPY --from=builder /app/apps/websocket/wssServer.cjs ./apps/websocket/wssServer.cjs
 COPY --from=builder /app/node_modules/better-sqlite3/build/Release/better_sqlite3.node /app/build/better_sqlite3.node
 
 COPY --from=builder /app/packages/db/migrations ./db/migrations

apps/nextjs/eslint.config.js

@@ -10,4 +10,21 @@ export default [
   ...baseConfig,
   ...reactConfig,
   ...nextjsConfig,
+  {
+    files: ["public/sw.js"],
+    languageOptions: {
+      globals: {
+        self: "readonly",
+        clients: "readonly",
+        skipWaiting: "readonly",
+        importScripts: "readonly",
+        caches: "readonly",
+        fetch: "readonly",
+      },
+    },
+    rules: {
+      "@typescript-eslint/no-unsafe-call": "off",
+      "@typescript-eslint/no-unsafe-member-access": "off",
+    },
+  },
 ];

apps/nextjs/next.config.ts

@@ -42,9 +42,18 @@ const nextConfig: NextConfig = {
       },
     ],
   },
+  // skipcq: JS-0116
   // eslint-disable-next-line @typescript-eslint/require-await,no-restricted-syntax
   async headers() {
     return [
+      {
+        source: "/sw.js",
+        headers: [
+          { key: "Content-Type", value: "application/javascript; charset=utf-8" },
+          { key: "Cache-Control", value: "no-cache, no-store, must-revalidate" },
+          { key: "Content-Security-Policy", value: "default-src 'self'; script-src 'self'" },
+        ],
+      },
       {
         source: "/(.*)", // Apply CSP to all routes
         headers: [

apps/nextjs/package.json

@@ -44,11 +44,9 @@
     "@homarr/server-settings": "workspace:^0.1.0",
     "@homarr/settings": "workspace:^0.1.0",
     "@homarr/spotlight": "workspace:^0.1.0",
-    "@homarr/tasks": "workspace:^0.1.0",
     "@homarr/translation": "workspace:^0.1.0",
     "@homarr/ui": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
-    "@homarr/websocket": "workspace:^0.1.0",
     "@homarr/widgets": "workspace:^0.1.0",
     "@mantine/colors-generator": "catalog:",
     "@mantine/core": "catalog:",

apps/nextjs/public/sw.js

@@ -0,0 +1,7 @@
+self.addEventListener("install", () => {
+  self.skipWaiting();
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(self.clients.claim());
+});

apps/nextjs/src/app/[locale]/_client-providers/mantine.tsx

@@ -8,13 +8,12 @@ import dayjs from "dayjs";
 import { clientApi } from "@homarr/api/client";
 import { useSession } from "@homarr/auth/client";
 import { parseCookies, setClientCookie } from "@homarr/common";
-import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemeCookieKey } from "@homarr/definitions";
 
 export const CustomMantineProvider = ({
   children,
   defaultColorScheme,
-}: PropsWithChildren<{ defaultColorScheme: ColorScheme }>) => {
+}: PropsWithChildren<{ defaultColorScheme: MantineColorScheme }>) => {
   const manager = useColorSchemeManager();
   return (
     <DirectionProvider>
@@ -35,7 +34,7 @@ export const CustomMantineProvider = ({
 export function useColorSchemeManager(): MantineColorSchemeManager {
   const { data: session } = useSession();
 
-  const updateCookieValue = (value: Exclude<MantineColorScheme, "auto">) => {
+  const updateCookieValue = (value: MantineColorScheme) => {
     setClientCookie(colorSchemeCookieKey, value, { expires: dayjs().add(1, "year").toDate(), path: "/" });
   };
 
@@ -60,7 +59,6 @@ export function useColorSchemeManager(): MantineColorSchemeManager {
     },
 
     set: (value) => {
-      if (value === "auto") return;
       try {
         if (session) {
           mutateColorScheme({ colorScheme: value });

apps/nextjs/src/app/[locale]/layout.tsx

@@ -4,6 +4,7 @@ import { Inter } from "next/font/google";
 import "@homarr/notifications/styles.css";
 import "@homarr/spotlight/styles.css";
 import "@homarr/ui/styles.css";
+import "~/styles/color-scheme.scss";
 import "~/styles/scroll-area.scss";
 
 import { notFound } from "next/navigation";
@@ -25,6 +26,7 @@ import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
 import { Analytics } from "~/components/layout/analytics";
 import { CrowdinLiveTranslation } from "~/components/layout/crowdin-live-translation";
 import { SearchEngineOptimization } from "~/components/layout/search-engine-optimization";
+import { ServiceWorkerRegistration } from "~/components/layout/service-worker-registration";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import { DayJsLoader } from "./_client-providers/dayjs-loader";
 import { JotaiProvider } from "./_client-providers/jotai";
@@ -129,7 +131,7 @@ export default async function Layout(props: {
       dir={direction}
       data-mantine-color-scheme={colorScheme}
       style={{
-        backgroundColor: colorScheme === "dark" ? "#242424" : "#fff",
+        backgroundColor: colorScheme === "dark" ? "#242424" : colorScheme === "auto" ? undefined : "#fff",
       }}
       suppressHydrationWarning
     >
@@ -141,6 +143,7 @@ export default async function Layout(props: {
       <body className={["font-sans", fontSans.variable].join(" ")}>
         <StackedProvider>
           <Notifications />
+          <ServiceWorkerRegistration />
           {props.children}
         </StackedProvider>
       </body>

apps/nextjs/src/app/[locale]/manage/settings/_components/appearance-settings-form.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { Group, Text } from "@mantine/core";
-import { IconMoon, IconSun } from "@tabler/icons-react";
+import { IconDeviceDesktop, IconMoon, IconSun } from "@tabler/icons-react";
 
 import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemes } from "@homarr/definitions";
@@ -34,6 +34,7 @@ export const AppearanceSettingsForm = ({ defaultValues }: { defaultValues: Serve
 };
 
 const appearanceIcons = {
+  auto: IconDeviceDesktop,
   light: IconSun,
   dark: IconMoon,
 };

apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx

@@ -58,6 +58,18 @@ const createColumns = (
       return <ContainerStateBadge state={cell.row.original.state} />;
     },
   },
+  {
+    accessorKey: "host",
+    header: t("docker.field.host.label"),
+    size: 140,
+    Cell({ row }) {
+      return (
+        <Text truncate="end" title={row.original.host}>
+          {row.original.host}
+        </Text>
+      );
+    },
+  },
   {
     accessorKey: "image",
     header: t("docker.field.containerImage.label"),

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-search-preferences.tsx

@@ -26,6 +26,7 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
       form.setInitialValues({
         defaultSearchEngineId: variables.defaultSearchEngineId,
         openInNewTab: variables.openInNewTab,
+        ddgBangsEnabled: variables.ddgBangsEnabled,
       });
       showSuccessNotification({
         message: t("user.action.changeSearchPreferences.notification.success.message"),
@@ -41,6 +42,7 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
     initialValues: {
       defaultSearchEngineId: user.defaultSearchEngineId,
       openInNewTab: user.openSearchInNewTab,
+      ddgBangsEnabled: user.ddgBangs,
     },
   });
 
@@ -64,6 +66,10 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
           label={t("user.field.openSearchInNewTab.label")}
           {...form.getInputProps("openInNewTab", { type: "checkbox" })}
         />
+        <Switch
+          label={t("user.field.ddgBangs.label")}
+          {...form.getInputProps("ddgBangsEnabled", { type: "checkbox" })}
+        />
 
         <Group justify="end">
           <Button type="submit" loading={isPending}>

apps/nextjs/src/components/color-scheme/color-scheme-combobox.tsx

@@ -0,0 +1,94 @@
+"use client";
+
+import React from "react";
+import { Combobox, Group, InputBase, Text, useCombobox } from "@mantine/core";
+import { IconCheck, IconDeviceDesktop, IconMoon, IconSun } from "@tabler/icons-react";
+
+import type { ColorScheme } from "@homarr/definitions";
+import { colorSchemes } from "@homarr/definitions";
+import { useScopedI18n } from "@homarr/translation/client";
+
+const schemeIcons: Record<ColorScheme, React.ElementType> = {
+  auto: IconDeviceDesktop,
+  light: IconSun,
+  dark: IconMoon,
+};
+
+interface ColorSchemeComboboxProps {
+  value: ColorScheme;
+  onChange: (value: ColorScheme) => void;
+  width?: string;
+}
+
+export const ColorSchemeCombobox = ({ value, onChange, width }: ColorSchemeComboboxProps) => {
+  const tOptions = useScopedI18n("common.colorScheme.options");
+
+  const combobox = useCombobox({
+    onDropdownClose: () => combobox.resetSelectedOption(),
+  });
+
+  const handleOnOptionSubmit = React.useCallback(
+    (val: string) => {
+      if (!val) return;
+      onChange(val as ColorScheme);
+      combobox.closeDropdown();
+    },
+    [onChange, combobox],
+  );
+
+  const handleOnClick = React.useCallback(() => {
+    combobox.toggleDropdown();
+  }, [combobox]);
+
+  return (
+    <Combobox store={combobox} onOptionSubmit={handleOnOptionSubmit}>
+      <Combobox.Target>
+        <InputBase
+          component="button"
+          type="button"
+          pointer
+          rightSection={<Combobox.Chevron />}
+          rightSectionPointerEvents="none"
+          onClick={handleOnClick}
+          variant="filled"
+          w={width}
+        >
+          <OptionItem scheme={value} currentScheme={value} tOptions={tOptions} />
+        </InputBase>
+      </Combobox.Target>
+      <Combobox.Dropdown>
+        <Combobox.Options>
+          {colorSchemes.map((scheme) => (
+            <Combobox.Option value={scheme} key={scheme}>
+              <OptionItem scheme={scheme} currentScheme={value} tOptions={tOptions} showCheck />
+            </Combobox.Option>
+          ))}
+        </Combobox.Options>
+      </Combobox.Dropdown>
+    </Combobox>
+  );
+};
+
+const OptionItem = ({
+  scheme,
+  currentScheme,
+  tOptions,
+  showCheck,
+}: {
+  scheme: ColorScheme;
+  currentScheme: ColorScheme;
+  tOptions: (key: ColorScheme) => string;
+  showCheck?: boolean;
+}) => {
+  const Icon = schemeIcons[scheme];
+
+  return (
+    <Group wrap="nowrap" justify="space-between">
+      <Group wrap="nowrap">
+        <Icon size={16} stroke={1.5} />
+        <Text>{tOptions(scheme)}</Text>
+      </Group>
+      {showCheck && scheme === currentScheme && <IconCheck color="currentColor" size={16} />}
+    </Group>
+  );
+};

apps/nextjs/src/components/color-scheme/current-color-scheme-combobox.tsx

@@ -1,49 +1,17 @@
 "use client";
 
-import { Group, Text, useMantineColorScheme } from "@mantine/core";
+import { useMantineColorScheme } from "@mantine/core";
-import { IconMoon, IconSun } from "@tabler/icons-react";
 
 import type { ColorScheme } from "@homarr/definitions";
-import { colorSchemes } from "@homarr/definitions";
+
-import { useScopedI18n } from "@homarr/translation/client";
+import { ColorSchemeCombobox } from "./color-scheme-combobox";
-import { SelectWithCustomItems } from "@homarr/ui";
 
 interface CurrentColorSchemeComboboxProps {
   w?: string;
 }
 
 export const CurrentColorSchemeCombobox = ({ w }: CurrentColorSchemeComboboxProps) => {
-  const tOptions = useScopedI18n("common.colorScheme.options");
   const { colorScheme, setColorScheme } = useMantineColorScheme();
 
-  return (
+  return <ColorSchemeCombobox value={colorScheme as ColorScheme} onChange={setColorScheme} width={w} />;
-    <SelectWithCustomItems
-      value={colorScheme}
-      onChange={(value) => setColorScheme((value as ColorScheme | null) ?? "light")}
-      data={colorSchemes.map((scheme) => ({
-        value: scheme,
-        label: tOptions(scheme),
-      }))}
-      SelectOption={ColorSchemeCustomOption}
-      w={w}
-    />
-  );
-};
-
-const appearanceIcons = {
-  light: IconSun,
-  dark: IconMoon,
-};
-
-const ColorSchemeCustomOption = ({ value, label }: { value: ColorScheme; label: string }) => {
-  const Icon = appearanceIcons[value];
-
-  return (
-    <Group>
-      <Icon size={16} stroke={1.5} />
-      <Text fz="sm" fw={500}>
-        {label}
-      </Text>
-    </Group>
-  );
 };

apps/nextjs/src/components/layout/service-worker-registration.tsx

@@ -0,0 +1,14 @@
+"use client";
+
+import { useEffect } from "react";
+
+export const ServiceWorkerRegistration = () => {
+  useEffect(() => {
+    if (!("serviceWorker" in navigator)) return;
+    navigator.serviceWorker.register("/sw.js", { scope: "/", updateViaCache: "none" }).catch((error) => {
+      console.error("Service worker registration failed", error);
+    });
+  }, []);
+
+  return null;
+};

apps/nextjs/src/components/user-avatar-menu.tsx

@@ -5,16 +5,7 @@ import { useCallback, useEffect } from "react";
 import { useRouter } from "next/navigation";
 import { Center, Menu, Stack, Text, useMantineColorScheme } from "@mantine/core";
 import { useHotkeys, useTimeout } from "@mantine/hooks";
-import {
+import { IconCheck, IconHome, IconLogin, IconLogout, IconSettings, IconTool } from "@tabler/icons-react";
-  IconCheck,
-  IconHome,
-  IconLogin,
-  IconLogout,
-  IconMoon,
-  IconSettings,
-  IconSun,
-  IconTool,
-} from "@tabler/icons-react";
 
 import type { RouterOutputs } from "@homarr/api";
 import { signOut, useSession } from "@homarr/auth/client";
@@ -24,6 +15,7 @@ import { useScopedI18n } from "@homarr/translation/client";
 import { Link } from "@homarr/ui";
 
 import { useAuthContext } from "~/app/[locale]/_client-providers/session";
+import { CurrentColorSchemeCombobox } from "./color-scheme/current-color-scheme-combobox";
 import { CurrentLanguageCombobox } from "./language/current-language-combobox";
 import { AvailableUpdatesMenuItem } from "./layout/header/update";
 
@@ -34,13 +26,9 @@ interface UserAvatarMenuProps {
 
 export const UserAvatarMenu = ({ children, availableUpdatesPromise }: UserAvatarMenuProps) => {
   const t = useScopedI18n("common.userAvatar.menu");
-  const { colorScheme, toggleColorScheme } = useMantineColorScheme();
+  const { toggleColorScheme } = useMantineColorScheme();
   useHotkeys([[hotkeys.toggleColorScheme, toggleColorScheme]]);
 
-  const ColorSchemeIcon = colorScheme === "dark" ? IconSun : IconMoon;
-
-  const colorSchemeText = colorScheme === "dark" ? t("switchToLightMode") : t("switchToDarkMode");
-
   const session = useSession();
   const router = useRouter();
 
@@ -67,14 +55,14 @@ export const UserAvatarMenu = ({ children, availableUpdatesPromise }: UserAvatar
     <Menu width={300} withArrow withinPortal keepMounted>
       <Menu.Dropdown>
         <AvailableUpdatesMenuItem availableUpdatesPromise={availableUpdatesPromise} />
-        <Menu.Item onClick={toggleColorScheme} leftSection={<ColorSchemeIcon size="1rem" />}>
-          {colorSchemeText}
-        </Menu.Item>
         <Menu.Item component={Link} href="/boards" leftSection={<IconHome size="1rem" />}>
           {t("homeBoard")}
         </Menu.Item>
         <Menu.Divider />
 
+        <Menu.Item p={0} closeMenuOnClick={false} component="div">
+          <CurrentColorSchemeCombobox />
+        </Menu.Item>
         <Menu.Item p={0} closeMenuOnClick={false} component="div">
           <CurrentLanguageCombobox />
         </Menu.Item>

apps/nextjs/src/instrumentation.ts

@@ -1,6 +0,0 @@
-export async function register() {
-  if (process.env.NEXT_RUNTIME === "nodejs") {
-    await import("@homarr/tasks");
-    await import("@homarr/websocket");
-  }
-}

apps/nextjs/src/styles/color-scheme.scss

@@ -0,0 +1,12 @@
+// Prevent flash of white background when color scheme is "auto" and OS prefers dark.
+// CSS media queries are evaluated synchronously during the browser's initial paint,
+// before any JavaScript executes, so this eliminates the white→dark flicker.
+html[data-mantine-color-scheme="auto"] {
+  background-color: #fff;
+}
+
+@media (prefers-color-scheme: dark) {
+  html[data-mantine-color-scheme="auto"] {
+    background-color: #242424;
+  }
+}

apps/tasks/package.json

@@ -5,11 +5,12 @@
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
-    ".": "./src/main.ts"
+    ".": "./src/index.ts"
   },
   "main": "./src/main.ts",
   "types": "./src/main.ts",
   "scripts": {
+    "build": "esbuild src/main.ts --bundle --platform=node --loader:.scss=text --external:*.node --external:@opentelemetry/api --external:deasync --external:bcrypt --outfile=tasks.cjs",
     "clean": "rm -rf .turbo node_modules",
     "dev": "pnpm with-env tsx ./src/main.ts",
     "format": "prettier --check . --ignore-path ../../.gitignore",
@@ -23,6 +24,7 @@
     "@homarr/auth": "workspace:^0.1.0",
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^",
+    "@homarr/cron-job-api": "workspace:^0.1.0",
     "@homarr/cron-jobs": "workspace:^0.1.0",
     "@homarr/cron-jobs-core": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
@@ -35,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,6 +1,7 @@
-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";
 import type { jobGroup as cronJobGroup, JobGroupKeys } from "@homarr/cron-jobs";
 import type { Database, InferInsertModel } from "@homarr/db";
 import { eq } from "@homarr/db";
@@ -8,7 +9,7 @@ import { cronJobConfigurations } from "@homarr/db/schema";
 
 const logger = createLogger({ module: "jobManager" });
 
-export class JobManager {
+export class JobManager implements IJobManager {
   constructor(
     private db: Database,
     private jobGroup: typeof cronJobGroup,
@@ -20,28 +21,31 @@ export class JobManager {
   public async triggerAsync(name: JobGroupKeys): Promise<void> {
     await this.jobGroup.runManuallyAsync(name);
   }
-  public async stopAsync(name: JobGroupKeys): Promise<void> {
+  public stop(name: JobGroupKeys): void {
-    await this.jobGroup.stopAsync(name);
+    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 });
+    const updatedConfig = await this.updateConfigurationAsync(name, { cronExpression: cron });
-    await this.jobGroup.getTask(name)?.destroy();
+    this.jobGroup.getTask(name)?.stop();
 
     this.jobGroup.setTask(
       name,
-      schedule(cron, () => void job.executeAsync(), {
+      new Cron(
-        name,
+        cron,
-      }),
+        {
+          name,
+          timezone: job.timezone,
+          paused: !updatedConfig.isEnabled,
+        },
+        () => void job.executeAsync(),
+      ),
     );
     logger.info("Cron job interval updated", { name, expression: cron });
   }
@@ -51,7 +55,7 @@ export class JobManager {
     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> {
@@ -85,21 +89,27 @@ export class JobManager {
         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<

apps/tasks/src/main.ts

@@ -1,12 +1,52 @@
 // This import has to be the first import in the file so that the agent is overridden before any other modules are imported.
 import "./overrides";
 
-import { jobGroup } from "@homarr/cron-jobs";
+import type { FastifyTRPCPluginOptions } from "@trpc/server/adapters/fastify";
+import { fastifyTRPCPlugin } from "@trpc/server/adapters/fastify";
+import fastify from "fastify";
 
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
+import type { JobRouter } from "@homarr/cron-job-api";
+import { jobRouter } from "@homarr/cron-job-api";
+import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "@homarr/cron-job-api/constants";
+import { jobGroup } from "@homarr/cron-jobs";
+import { db } from "@homarr/db";
+
+import { JobManager } from "./job-manager";
 import { onStartAsync } from "./on-start";
 
+const logger = createLogger({ module: "tasksMain" });
+
+const server = fastify({
+  maxParamLength: 5000,
+});
+server.register(fastifyTRPCPlugin, {
+  prefix: CRON_JOB_API_PATH,
+  trpcOptions: {
+    router: jobRouter,
+    createContext: ({ req }) => ({
+      manager: new JobManager(db, jobGroup),
+      apiKey: req.headers[CRON_JOB_API_KEY_HEADER] as string | undefined,
+    }),
+    onError({ path, error }) {
+      logger.error(new ErrorWithMetadata("Error in tasks tRPC handler", { path }, { cause: error }));
+    },
+  } satisfies FastifyTRPCPluginOptions<JobRouter>["trpcOptions"],
+});
+
 void (async () => {
   await onStartAsync();
   await jobGroup.initializeAsync();
   await jobGroup.startAllAsync();
+
+  try {
+    await server.listen({ port: CRON_JOB_API_PORT });
+    logger.info("Tasks web server started successfully", { port: CRON_JOB_API_PORT });
+  } catch (err) {
+    logger.error(
+      new ErrorWithMetadata("Failed to start tasks web server", { port: CRON_JOB_API_PORT }, { cause: err }),
+    );
+    process.exit(1);
+  }
 })();

apps/websocket/package.json

@@ -4,12 +4,10 @@
   "private": true,
   "license": "Apache-2.0",
   "type": "module",
-  "exports": {
-    ".": "./src/main.ts"
-  },
   "main": "./src/main.ts",
   "types": "./src/main.ts",
   "scripts": {
+    "build": "esbuild src/main.ts --bundle --platform=node --outfile=wssServer.cjs --external:bcrypt --external:@opentelemetry/api --external:deasync --external:cpu-features --loader:.html=text --loader:.scss=text --loader:.node=text",
     "clean": "rm -rf .turbo node_modules",
     "dev": "pnpm with-env tsx ./src/main.ts",
     "format": "prettier --check . --ignore-path ../../.gitignore",

docs/README.md

@@ -372,6 +372,13 @@
 </a>
 </td>
 <td align="center">
+<a href="https://homarr.dev/docs/integrations/umami" target="_blank" rel="noreferrer noopener">
+  <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/umami.svg" alt="Umami" width="90" height="90" />
+  <br/>  
+  <p align="center">Umami</p>
+</a>
+</td>
+<td align="center">
 <a href="https://homarr.dev/docs/integrations/unifi-controller" target="_blank" rel="noreferrer noopener">
   <img src="https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/png/unifi.png" alt="Unifi Controller" width="90" height="90" />
   <br/>  

package.json

@@ -1,6 +1,6 @@
 {
   "name": "homarr",
-  "version": "1.59.3",
+  "version": "1.61.1",
   "private": true,
   "scripts": {
     "build": "cross-env CI=true turbo build",
@@ -15,7 +15,7 @@
     "db:migration:sqlite:run": "pnpm -F db migration:sqlite:run",
     "db:push": "pnpm -F db push:sqlite",
     "db:studio": "pnpm -F db studio",
-    "dev": "pnpm -F nextjs dev",
+    "dev": "turbo dev --parallel",
     "docker:dev": "docker compose -f ./development/development.docker-compose.yml up",
     "format": "turbo format --continue -- --cache --cache-location node_modules/.cache/.prettiercache",
     "format:fix": "turbo format --continue -- --write --cache --cache-location node_modules/.cache/.prettiercache",
@@ -79,14 +79,14 @@
     "overrides": {
       "@babel/helpers@<7.26.10": ">=7.29.2",
       "@babel/runtime@<7.26.10": ">=7.29.2",
-      "axios@>=1.0.0 <1.8.2": ">=1.15.2",
+      "axios@>=1.0.0 <1.8.2": ">=1.16.0",
       "brace-expansion@>=2.0.0 <=2.0.1": ">=5.0.5",
       "brace-expansion@>=1.0.0 <=1.1.11": ">=5.0.5",
       "esbuild@<=0.24.2": ">=0.28.0",
       "form-data@>=4.0.0 <4.0.4": ">=4.0.5",
-      "hono@<4.6.5": ">=4.12.15",
+      "hono@<4.6.5": ">=4.12.16",
       "linkifyjs@<4.3.2": ">=4.3.2",
-      "nanoid@>=4.0.0 <5.0.9": ">=5.1.9",
+      "nanoid@>=4.0.0 <5.0.9": ">=5.1.11",
       "prismjs@<1.30.0": ">=1.30.0",
       "proxmox-api>undici": "7.24.6",
       "react-is": "^19.2.5",

packages/api/package.json

@@ -25,6 +25,7 @@
     "@homarr/auth": "workspace:^0.1.0",
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^0.1.0",
+    "@homarr/cron-job-api": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
     "@homarr/cron-jobs": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",

packages/api/src/root.ts

@@ -26,6 +26,7 @@ export const appRouter = createTRPCRouter({
   media: lazy(() => import("./router/medias/media-router").then((mod) => mod.mediaRouter)),
   updateChecker: lazy(() => import("./router/update-checker").then((mod) => mod.updateCheckerRouter)),
   certificates: lazy(() => import("./router/certificates/certificate-router").then((mod) => mod.certificateRouter)),
+  bangs: lazy(() => import("./router/bangs/bangs-router").then((mod) => mod.bangsRouter)),
   info: lazy(() => import("./router/info").then((mod) => mod.infoRouter)),
 });
 

packages/api/src/router/bangs/bangs-router.ts

@@ -0,0 +1,17 @@
+import { z } from "zod/v4";
+
+import { searchDuckDuckGoBangsAsync } from "../../services/duckduckgo-bangs";
+import { createTRPCRouter, publicProcedure } from "../../trpc";
+
+export const bangsRouter = createTRPCRouter({
+  search: publicProcedure
+    .input(
+      z.object({
+        query: z.string(),
+        limit: z.number().int().min(1).max(50).default(20),
+      }),
+    )
+    .query(async ({ input }) => {
+      return await searchDuckDuckGoBangsAsync({ query: input.query, limit: input.limit });
+    }),
+});

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

@@ -2,62 +2,59 @@ import { observable } from "@trpc/server/observable";
 import z from "zod/v4";
 
 import { createLogger } from "@homarr/core/infrastructure/logs";
+import { jobGroupKeys, jobNameSchema } from "@homarr/cron-job-api";
+import { cronJobApi } from "@homarr/cron-job-api/client";
 import type { TaskStatus } from "@homarr/cron-job-status";
 import { createCronJobStatusChannel } from "@homarr/cron-job-status";
-import { cronExpressionSchema, jobGroup } from "@homarr/cron-jobs";
-import { JobManager } from "@homarr/cron-jobs/job-manager";
 
 import { createTRPCRouter, permissionRequiredProcedure } from "../trpc";
 
-const jobGroupKeys = jobGroup.getKeys();
-const jobNameSchema = z.enum(jobGroup.getKeys());
-
 const logger = createLogger({ module: "cronJobsRouter" });
 
 export const cronJobsRouter = createTRPCRouter({
   triggerJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).triggerAsync(input);
+      await cronJobApi.trigger.mutate(input);
     }),
   startJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).startAsync(input);
+      await cronJobApi.start.mutate(input);
     }),
   stopJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).stopAsync(input);
+      await cronJobApi.stop.mutate(input);
     }),
   updateJobInterval: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(
       z.object({
         name: jobNameSchema,
-        cron: cronExpressionSchema,
+        cron: z.string(),
       }),
     )
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).updateIntervalAsync(input.name, input.cron);
+      await cronJobApi.updateInterval.mutate(input);
     }),
   disableJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).disableAsync(input);
+      await cronJobApi.disable.mutate(input);
     }),
   enableJob: permissionRequiredProcedure
     .requiresPermission("admin")
     .input(jobNameSchema)
-    .mutation(async ({ input, ctx }) => {
+    .mutation(async ({ input }) => {
-      await new JobManager(ctx.db, jobGroup).enableAsync(input);
+      await cronJobApi.enable.mutate(input);
     }),
-  getJobs: permissionRequiredProcedure.requiresPermission("admin").query(async ({ ctx }) => {
+  getJobs: permissionRequiredProcedure.requiresPermission("admin").query(async () => {
-    return await new JobManager(ctx.db, jobGroup).getAllAsync();
+    return await cronJobApi.getAll.query();
   }),
   subscribeToStatusUpdates: permissionRequiredProcedure.requiresPermission("admin").subscription(() => {
     return observable<TaskStatus>((emit) => {

packages/api/src/router/docker/docker-router.ts

@@ -138,6 +138,7 @@ const getContainerOrThrowAsync = async (id: string) => {
 interface DockerContainer {
   name: string;
   id: string;
+  host: string;
   state: ContainerState;
   image: string;
   ports: Port[] | undefined;

packages/api/src/router/user.ts

@@ -21,6 +21,7 @@ import {
   userChangePasswordApiSchema,
   userChangeSearchPreferencesSchema,
   userCreateSchema,
+  userDdgBangsSchema,
   userEditProfileSchema,
   userFirstDayOfWeekSchema,
   userInitSchema,
@@ -110,7 +111,7 @@ export const userRouter = createTRPCRouter({
             const queryResult = (await trx.delete(schema.invites).where(inviteWhere)) as
               | QueryResult
               | MySqlRawQueryResult;
-            let count = 0;
+            let count: number;
             if (Array.isArray(queryResult)) {
               count = queryResult[0].affectedRows;
             } else {
@@ -276,6 +277,7 @@ export const userRouter = createTRPCRouter({
         pingIconsEnabled: true,
         defaultSearchEngineId: true,
         openSearchInNewTab: true,
+        ddgBangs: true,
       }),
     )
     .meta({ openapi: { method: "GET", path: "/api/users/{userId}", tags: ["users"], protect: true } })
@@ -301,6 +303,7 @@ export const userRouter = createTRPCRouter({
           pingIconsEnabled: true,
           defaultSearchEngineId: true,
           openSearchInNewTab: true,
+          ddgBangs: true,
         },
         where: eq(users.id, input.userId),
       });
@@ -541,6 +544,33 @@ export const userRouter = createTRPCRouter({
         })
         .where(eq(users.id, ctx.session.user.id));
     }),
+  changeDdgBangs: protectedProcedure
+    .input(convertIntersectionToZodObject(userDdgBangsSchema.and(byIdSchema)))
+    .output(z.void())
+    .meta({
+      openapi: {
+        method: "PATCH",
+        path: "/api/users/ddg-bangs",
+        tags: ["users"],
+        protect: true,
+        deprecated: true,
+      },
+    })
+    .mutation(async ({ input, ctx }) => {
+      if (!ctx.session.user.permissions.includes("admin") && ctx.session.user.id !== input.id) {
+        throw new TRPCError({
+          code: "NOT_FOUND",
+          message: "User not found",
+        });
+      }
+
+      await ctx.db
+        .update(users)
+        .set({
+          ddgBangs: input.ddgBangs,
+        })
+        .where(eq(users.id, input.id));
+    }),
   changeFirstDayOfWeek: protectedProcedure
     .input(convertIntersectionToZodObject(userFirstDayOfWeekSchema.and(byIdSchema)))
     .output(z.void())

packages/api/src/router/user/change-search-preferences.ts

@@ -15,10 +15,13 @@ export const changeSearchPreferencesInputSchema = userChangeSearchPreferencesSch
 export const changeSearchPreferencesAsync = async (
   db: Database,
   session: Session,
-  input: Modify<z.infer<typeof changeSearchPreferencesInputSchema>, { openInNewTab: boolean | undefined }>,
+  input: Modify<
+    z.infer<typeof changeSearchPreferencesInputSchema>,
+    { openInNewTab: boolean | undefined; ddgBangsEnabled: boolean | undefined }
+  >,
 ) => {
   const user = session.user;
-  // Only admins can change other users passwords
+  // Only admins can change other users search preferences
   if (!user.permissions.includes("admin") && user.id !== input.userId) {
     throw new TRPCError({
       code: "NOT_FOUND",
@@ -45,6 +48,7 @@ export const changeSearchPreferencesAsync = async (
     .set({
       defaultSearchEngineId: input.defaultSearchEngineId,
       openSearchInNewTab: input.openInNewTab,
+      ddgBangs: input.ddgBangsEnabled,
     })
     .where(eq(users.id, input.userId));
 };

packages/api/src/router/widgets/calendar.ts

@@ -2,6 +2,8 @@ import { observable } from "@trpc/server/observable";
 import { z } from "zod/v4";
 
 import type { Modify } from "@homarr/common/types";
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
 import type { Integration } from "@homarr/db/schema";
 import type { IntegrationKindByCategory } from "@homarr/definitions";
 import { getIntegrationKindsByCategory } from "@homarr/definitions";
@@ -12,6 +14,8 @@ import { calendarMonthRequestHandler } from "@homarr/request-handler/calendar";
 import { createManyIntegrationMiddleware } from "../../middlewares/integration";
 import { createTRPCRouter, publicProcedure } from "../../trpc";
 
+const logger = createLogger({ module: "calendarRouter" });
+
 export const calendarRouter = createTRPCRouter({
   findAllEvents: publicProcedure
     .input(
@@ -24,7 +28,7 @@ export const calendarRouter = createTRPCRouter({
     )
     .concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("calendar")))
     .query(async ({ ctx, input }) => {
-      return await Promise.all(
+      const settled = await Promise.allSettled(
         ctx.integrations.map(async (integration) => {
           const { integrationIds: _integrationIds, ...handlerInput } = input;
           const innerHandler = calendarMonthRequestHandler.handler(integration, handlerInput);
@@ -40,6 +44,24 @@ export const calendarRouter = createTRPCRouter({
           };
         }),
       );
+
+      return settled.flatMap((result, index) => {
+        if (result.status === "fulfilled") {
+          return [result.value];
+        }
+        const integration = ctx.integrations[index];
+        logger.warn(
+          new ErrorWithMetadata(
+            "Calendar integration request failed; skipping events for this integration",
+            {
+              integrationId: integration?.id,
+              integrationKind: integration?.kind,
+            },
+            { cause: result.reason },
+          ),
+        );
+        return [];
+      });
     }),
   subscribeToEvents: publicProcedure
     .input(

packages/api/src/router/widgets/index.ts

@@ -30,4 +30,5 @@ export const widgetRouter = createTRPCRouter({
   timetable: lazy(() => import("./timetable").then((mod) => mod.timetableRouter)),
   tracearr: lazy(() => import("./tracearr").then((mod) => mod.tracearrRouter)),
   speedtestTracker: lazy(() => import("./speedtest-tracker").then((mod) => mod.speedtestTrackerRouter)),
+  umami: lazy(() => import("./umami").then((mod) => mod.umamiRouter)),
 });

packages/api/src/router/widgets/umami.ts

@@ -0,0 +1,205 @@
+import { observable } from "@trpc/server/observable";
+import { z } from "zod/v4";
+
+import { createLogger } from "@homarr/core/infrastructure/logs";
+import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
+import { createIntegrationAsync } from "@homarr/integrations";
+import {
+  umamiActiveVisitorsRequestHandler,
+  umamiEventNamesRequestHandler,
+  umamiMultiEventRequestHandler,
+  umamiRequestHandler,
+  umamiTopPagesRequestHandler,
+  umamiTopReferrersRequestHandler,
+} from "@homarr/request-handler/umami";
+
+import { createManyIntegrationMiddleware, createOneIntegrationMiddleware } from "../../middlewares/integration";
+import { createTRPCRouter, publicProcedure } from "../../trpc";
+
+const logger = createLogger({ module: "umami-router" });
+
+export const umamiRouter = createTRPCRouter({
+  getWebsites: publicProcedure.concat(createOneIntegrationMiddleware("query", "umami")).query(async ({ ctx }) => {
+    try {
+      const instance = await createIntegrationAsync(ctx.integration);
+      return await instance.getWebsitesAsync();
+    } catch (error) {
+      logger.warn(new Error("Failed to load websites", { cause: error }));
+      return [];
+    }
+  }),
+
+  getVisitorStats: publicProcedure
+    .input(
+      z.object({
+        websiteId: z.string(),
+        timeFrame: z.string(),
+        eventName: z.string().optional(),
+      }),
+    )
+    .concat(createManyIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      const results = await Promise.all(
+        ctx.integrations.map(async (integration) => {
+          const innerHandler = umamiRequestHandler.handler(integration, {
+            websiteId: input.websiteId,
+            timeFrame: input.timeFrame,
+            eventName: input.eventName,
+          });
+          const { data, timestamp } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+
+          return {
+            integrationId: integration.id,
+            integrationName: integration.name,
+            integrationUrl: integration.url,
+            visitorStats: data,
+            updatedAt: timestamp,
+          };
+        }),
+      );
+
+      return results;
+    }),
+
+  getEventNames: publicProcedure
+    .input(z.object({ websiteId: z.string() }))
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      try {
+        const innerHandler = umamiEventNamesRequestHandler.handler(ctx.integration, { websiteId: input.websiteId });
+        const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+        return data;
+      } catch (error) {
+        logger.warn(
+          new ErrorWithMetadata("Failed to load event names", { websiteId: input.websiteId }, { cause: error }),
+        );
+        return [];
+      }
+    }),
+
+  getTopPages: publicProcedure
+    .input(
+      z.object({
+        websiteId: z.string(),
+        timeFrame: z.string(),
+        limit: z.number().int().min(1).max(500),
+      }),
+    )
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      try {
+        const innerHandler = umamiTopPagesRequestHandler.handler(ctx.integration, {
+          websiteId: input.websiteId,
+          timeFrame: input.timeFrame,
+          limit: input.limit,
+        });
+        const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+        return data;
+      } catch (error) {
+        logger.warn(
+          new ErrorWithMetadata(
+            "Failed to load top pages",
+            { websiteId: input.websiteId, timeFrame: input.timeFrame, limit: input.limit },
+            { cause: error },
+          ),
+        );
+        return [];
+      }
+    }),
+
+  getTopReferrers: publicProcedure
+    .input(
+      z.object({
+        websiteId: z.string(),
+        timeFrame: z.string(),
+        limit: z.number().int().min(1).max(500),
+      }),
+    )
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      try {
+        const innerHandler = umamiTopReferrersRequestHandler.handler(ctx.integration, {
+          websiteId: input.websiteId,
+          timeFrame: input.timeFrame,
+          limit: input.limit,
+        });
+        const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+        return data;
+      } catch (error) {
+        logger.warn(
+          new ErrorWithMetadata(
+            "Failed to load top referrers",
+            { websiteId: input.websiteId, timeFrame: input.timeFrame, limit: input.limit },
+            { cause: error },
+          ),
+        );
+        return [];
+      }
+    }),
+
+  getMultiEventTimeSeries: publicProcedure
+    .input(
+      z.object({
+        websiteId: z.string(),
+        timeFrame: z.string(),
+        eventNames: z.array(z.string()),
+      }),
+    )
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      try {
+        const sortedNames = [...input.eventNames].sort();
+        const innerHandler = umamiMultiEventRequestHandler.handler(ctx.integration, {
+          websiteId: input.websiteId,
+          timeFrame: input.timeFrame,
+          eventNames: sortedNames,
+        });
+        const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+        return data;
+      } catch (error) {
+        logger.warn(
+          new ErrorWithMetadata(
+            "Failed to load multi-event time series",
+            { websiteId: input.websiteId, timeFrame: input.timeFrame, eventNames: JSON.stringify(input.eventNames) },
+            { cause: error },
+          ),
+        );
+        return [];
+      }
+    }),
+
+  getActiveVisitors: publicProcedure
+    .input(z.object({ websiteId: z.string() }))
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .query(async ({ ctx, input }) => {
+      try {
+        const innerHandler = umamiActiveVisitorsRequestHandler.handler(ctx.integration, {
+          websiteId: input.websiteId,
+        });
+        const { data } = await innerHandler.getCachedOrUpdatedDataAsync({ forceUpdate: false });
+        return data;
+      } catch (error) {
+        logger.warn(
+          new ErrorWithMetadata("Failed to load active visitors", { websiteId: input.websiteId }, { cause: error }),
+        );
+        return 0;
+      }
+    }),
+
+  subscribeActiveVisitors: publicProcedure
+    .input(z.object({ websiteId: z.string() }))
+    .concat(createOneIntegrationMiddleware("query", "umami"))
+    .subscription(({ ctx, input }) => {
+      return observable<number>((emit) => {
+        const innerHandler = umamiActiveVisitorsRequestHandler.handler(ctx.integration, {
+          websiteId: input.websiteId,
+        });
+        const unsubscribe = innerHandler.subscribe((count) => {
+          emit.next(count);
+        });
+        return () => {
+          unsubscribe();
+        };
+      });
+    }),
+});

packages/api/src/services/duckduckgo-bangs.ts

@@ -0,0 +1,55 @@
+import { duckDuckGoBangsRequestHandler } from "@homarr/request-handler/duckduckgo-bangs";
+import type { DuckDuckGoBang } from "@homarr/request-handler/duckduckgo-bangs";
+
+// DuckDuckGo bang keys are intentionally short:
+// - `t`: token (e.g. "yt"), `s`: display name, `u`: URL template (contains `{{{s}}}`)
+// - `d`: domain, `c`: category, `sc`: subcategory, `r`: rank (optional)
+
+const normalizeBangToken = (token: string) => token.toLowerCase().trim();
+
+/**
+ * Binary search to find the first index where bang.t >= tokenPrefix.
+ * This is O(log n) vs O(n) for findIndex, which matters because DuckDuckGo
+ * has ~13,000+ bangs. Combined with the pre-sorted data, this allows
+ * efficient prefix matching by finding the start position and iterating
+ * only through consecutive matches.
+ */
+const lowerBound = (arr: DuckDuckGoBang[], tokenPrefix: string) => {
+  let low = 0;
+  let high = arr.length;
+  while (low < high) {
+    const mid = (low + high) >> 1;
+    const midBang = arr[mid];
+    // Must use the same ordering as the source list sort (localeCompare),
+    // otherwise binary search can miss tokens with symbols like "&" or "_".
+    if (!midBang || midBang.t.localeCompare(tokenPrefix) >= 0) {
+      high = mid;
+      continue;
+    }
+
+    low = mid + 1;
+  }
+  return low;
+};
+
+export const searchDuckDuckGoBangsAsync = async (input: {
+  query: string;
+  limit: number;
+}): Promise<DuckDuckGoBang[]> => {
+  const queryTokenPrefix = normalizeBangToken(input.query);
+  if (!queryTokenPrefix) return [];
+
+  const { data: allBangs } = await duckDuckGoBangsRequestHandler.handler({}).getCachedOrUpdatedDataAsync({});
+  const startIndex = lowerBound(allBangs, queryTokenPrefix);
+  const matches: DuckDuckGoBang[] = [];
+
+  for (let index = startIndex; index < allBangs.length; index++) {
+    const bang = allBangs[index];
+    if (!bang) break;
+    if (!bang.t.startsWith(queryTokenPrefix)) break;
+    matches.push(bang);
+    if (matches.length >= input.limit) break;
+  }
+
+  return matches;
+};

packages/auth/callbacks.ts

@@ -36,7 +36,7 @@ export const createSessionAsync = async (
       ...user,
       email: user.email ?? "",
       permissions: await getCurrentUserPermissionsAsync(db, user.id),
-      colorScheme: "dark",
+      colorScheme: "auto",
     },
   } as Session;
 };

packages/cli/package.json

@@ -15,7 +15,7 @@
     }
   },
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --platform=node --outfile=cli.cjs --external:bcrypt --external:cpu-features --loader:.html=text --loader:.node=text",
+    "build": "esbuild src/index.ts --bundle --platform=node --outfile=cli.cjs --external:bcrypt --external:cpu-features --external:better-sqlite3 --external:mysql2 --external:pg --loader:.html=text --loader:.node=text",
     "clean": "rm -rf .turbo node_modules",
     "format": "prettier --check . --ignore-path ../../.gitignore",
     "lint": "eslint",
@@ -25,12 +25,16 @@
   },
   "prettier": "@homarr/prettier-config",
   "dependencies": {
-    "@drizzle-team/brocli": "catalog:",
     "@homarr/auth": "workspace:^0.1.0",
     "@homarr/common": "workspace:^0.1.0",
+    "@homarr/core": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
-    "dotenv": "catalog:"
+    "better-sqlite3": "catalog:",
+    "dotenv": "catalog:",
+    "drizzle-orm": "catalog:",
+    "mysql2": "catalog:",
+    "pg": "catalog:"
   },
   "devDependencies": {
     "@homarr/eslint-config": "workspace:^0.2.0",

packages/cli/src/cli-db.ts

@@ -0,0 +1,127 @@
+import Database from "better-sqlite3";
+import { drizzle as drizzleSqlite } from "drizzle-orm/better-sqlite3";
+import { drizzle as drizzleMysql } from "drizzle-orm/mysql2";
+import { drizzle as drizzlePostgres } from "drizzle-orm/node-postgres";
+import mysql from "mysql2";
+import type { Pool as MysqlPool } from "mysql2";
+import { Pool as PostgresPool } from "pg";
+
+import { DB_CASING } from "@homarr/core/infrastructure/db/constants";
+import { dbEnv } from "@homarr/core/infrastructure/db/env";
+import { schema } from "@homarr/db/schema";
+
+const CONNECT_TIMEOUT_MS = 10_000;
+
+const dbConfig = {
+  schema,
+  casing: DB_CASING,
+};
+
+export type CliDatabase = ReturnType<typeof drizzleSqlite<typeof schema>>;
+
+type CliConnection =
+  | { driver: "better-sqlite3"; raw: Database.Database; db: CliDatabase }
+  | { driver: "mysql2"; raw: MysqlPool; db: CliDatabase }
+  | { driver: "node-postgres"; raw: PostgresPool; db: CliDatabase };
+
+let connection: CliConnection | null = null;
+
+const createMysqlPool = () => {
+  const poolOptions = {
+    maxIdle: 0,
+    idleTimeout: 60000,
+    enableKeepAlive: true,
+    connectTimeout: CONNECT_TIMEOUT_MS,
+  };
+
+  if (!dbEnv.HOST) {
+    return mysql.createPool({ ...poolOptions, uri: dbEnv.URL });
+  }
+
+  return mysql.createPool({
+    ...poolOptions,
+    host: dbEnv.HOST,
+    port: dbEnv.PORT,
+    database: dbEnv.NAME,
+    user: dbEnv.USER,
+    password: dbEnv.PASSWORD,
+  });
+};
+
+const createPostgresPool = () => {
+  const poolOptions = {
+    max: 1,
+    idleTimeoutMillis: 60000,
+    connectionTimeoutMillis: CONNECT_TIMEOUT_MS,
+    allowExitOnIdle: true,
+  };
+
+  if (!dbEnv.HOST) {
+    return new PostgresPool({
+      ...poolOptions,
+      connectionString: dbEnv.URL,
+    });
+  }
+
+  return new PostgresPool({
+    ...poolOptions,
+    host: dbEnv.HOST,
+    port: dbEnv.PORT,
+    database: dbEnv.NAME,
+    user: dbEnv.USER,
+    password: dbEnv.PASSWORD,
+  });
+};
+
+const connectionFactories = {
+  "better-sqlite3": (): CliConnection => {
+    const raw = new Database(dbEnv.URL);
+    const db = drizzleSqlite(raw, dbConfig);
+    return { driver: "better-sqlite3", raw, db };
+  },
+  mysql2: (): CliConnection => {
+    const raw = createMysqlPool();
+    const db = drizzleMysql(raw, { ...dbConfig, mode: "default" }) as unknown as CliDatabase;
+    return { driver: "mysql2", raw, db };
+  },
+  "node-postgres": (): CliConnection => {
+    const raw = createPostgresPool();
+    const db = drizzlePostgres({ ...dbConfig, client: raw }) as unknown as CliDatabase;
+    return { driver: "node-postgres", raw, db };
+  },
+};
+
+const closeHandlers: Record<CliConnection["driver"], (entry: CliConnection) => Promise<void>> = {
+  "better-sqlite3": async (entry) => {
+    (entry as Extract<CliConnection, { driver: "better-sqlite3" }>).raw.close();
+  },
+  mysql2: (entry) => {
+    const pool = (entry as Extract<CliConnection, { driver: "mysql2" }>).raw;
+    return new Promise<void>((resolve, reject) => {
+      pool.end((err) => (err ? reject(err) : resolve()));
+    });
+  },
+  "node-postgres": async (entry) => {
+    await (entry as Extract<CliConnection, { driver: "node-postgres" }>).raw.end();
+  },
+};
+
+export const getCliDb = (): CliDatabase => {
+  if (connection) {
+    return connection.db;
+  }
+
+  const driver = dbEnv.DRIVER ?? "better-sqlite3";
+  connection = connectionFactories[driver]();
+  return connection.db;
+};
+
+export const closeCliDbAsync = async (): Promise<void> => {
+  if (!connection) {
+    return;
+  }
+
+  const current = connection;
+  connection = null;
+  await closeHandlers[current.driver](current);
+};

packages/cli/src/commands/fix-usernames.ts

@@ -1,36 +1,35 @@
-import { command } from "@drizzle-team/brocli";
+import { eq } from "drizzle-orm";
 
-import { db, eq } from "@homarr/db";
+import { getCliDb } from "../cli-db";
+import { requireCredentialsProvider } from "../errors";
 import { users } from "@homarr/db/schema";
 
-export const fixUsernames = command({
+export async function fixUsernamesHandler(): Promise<number> {
-  name: "fix-usernames",
+  requireCredentialsProvider();
-  desc: "Changes all credentials usernames to lowercase",
+
-  // eslint-disable-next-line no-restricted-syntax
+  const db = getCliDb();
-  handler: async () => {
+  const credentialUsers = await db.query.users.findMany({
-    if (!process.env.AUTH_PROVIDERS?.toLowerCase().includes("credentials")) {
+    where: eq(users.provider, "credentials"),
-      console.error("Credentials provider is not enabled");
+  });
-      return;
+
+  for (const user of credentialUsers) {
+    if (!user.name) {
+      continue;
+    }
+    if (user.name === user.name.toLowerCase()) {
+      continue;
     }
 
-    const credentialUsers = await db.query.users.findMany({
+    await db
-      where: eq(users.provider, "credentials"),
+      .update(users)
-    });
+      .set({
+        name: user.name.toLowerCase(),
+      })
+      .where(eq(users.id, user.id));
 
-    for (const user of credentialUsers) {
+    console.log(`Changed username from ${user.name} to ${user.name.toLowerCase()}`);
-      if (!user.name) continue;
+  }
-      if (user.name === user.name.toLowerCase()) continue;
 
-      await db
+  console.log("All usernames have been fixed");
-        .update(users)
+  return 0;
-        .set({
+}
-          name: user.name.toLowerCase(),
-        })
-        .where(eq(users.id, user.id));
-
-      console.log(`Changed username from ${user.name} to ${user.name.toLowerCase()}`);
-    }
-
-    console.log("All usernames have been fixed");
-  },
-});

packages/cli/src/commands/integrations-delete.ts

@@ -1,39 +1,50 @@
-import { command, string } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { db, eq } from "@homarr/db";
+import { eq } from "drizzle-orm";
+
+import type { CliDatabase } from "../cli-db";
+import { getCliDb } from "../cli-db";
+import { CliError } from "../errors";
 import { integrations } from "@homarr/db/schema";
 
-export const integrationsDelete = command({
+const integrationLookup: Record<
-  name: "delete",
+  "id" | "name",
-  desc: "Delete an integration by id or name",
+  (db: CliDatabase, value: string) => Promise<{ id: string; name: string } | undefined>
-  options: {
+> = {
-    id: string("id").alias("i").desc("ID of the integration"),
+  id: (db, value) =>
-    name: string("name").alias("n").desc("Name of the integration"),
+    db.query.integrations.findFirst({
-  },
+      where: eq(integrations.id, value),
-  // eslint-disable-next-line no-restricted-syntax
+    }),
-  handler: async (options) => {
+  name: (db, value) =>
-    if (!options.id && !options.name) {
+    db.query.integrations.findFirst({
-      console.error("Either --id or --name must be provided");
+      where: eq(integrations.name, value),
-      return;
+    }),
-    }
+};
 
-    let entry;
+export async function integrationsDeleteHandler(args: string[]): Promise<number> {
-    if (options.id) {
+  const { values } = parseArgs({
-      entry = await db.query.integrations.findFirst({
+    args,
-        where: eq(integrations.id, options.id),
+    options: {
-      });
+      id: { type: "string", short: "i" },
-    } else if (options.name) {
+      name: { type: "string", short: "n" },
-      entry = await db.query.integrations.findFirst({
+    },
-        where: eq(integrations.name, options.name),
+  });
-      });
-    }
 
-    if (!entry) {
+  const lookupKey = values.id ? "id" : values.name ? "name" : null;
-      console.error("Integration not found");
+  const lookupValue = values.id ?? values.name;
-      return;
-    }
 
-    await db.delete(integrations).where(eq(integrations.id, entry.id));
+  if (!lookupKey || !lookupValue) {
-    console.log(`Integration ${entry.name} (${entry.id}) deleted`);
+    throw new CliError("Either --id or --name must be provided", 2);
-  },
+  }
-});
+
+  const db = getCliDb();
+  const entry = await integrationLookup[lookupKey](db, lookupValue);
+
+  if (!entry) {
+    throw new CliError("Integration not found");
+  }
+
+  await db.delete(integrations).where(eq(integrations.id, entry.id));
+  console.log(`Integration ${entry.name} (${entry.id}) deleted`);
+  return 0;
+}

packages/cli/src/commands/integrations-list.ts

@@ -1,21 +1,35 @@
-import { command } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { db } from "@homarr/db";
+import { getCliDb } from "../cli-db";
+import { printTable } from "../utils";
 
-export const integrationsList = command({
+export async function integrationsListHandler(args: string[] = []): Promise<number> {
-  name: "list",
+  const { values } = parseArgs({
-  desc: "List all integrations (id and name)",
+    args,
-  // eslint-disable-next-line no-restricted-syntax
+    options: {
-  handler: async () => {
+      json: { type: "boolean", default: false },
-    const all = await db.query.integrations.findMany();
+    },
-    if (all.length === 0) {
+    strict: false,
-      console.log("No integrations found");
+  });
-      return;
-    }
 
-    console.log("ID\t\t\t\tName");
+  const db = getCliDb();
-    for (const i of all) {
+  const all = await db.query.integrations.findMany();
-      console.log(`${i.id}\t${i.name}`);
+
-    }
+  if (values.json) {
-  },
+    const output = all.map((i) => ({ id: i.id, name: i.name, kind: i.kind, url: i.url }));
-});
+    console.log(JSON.stringify(output, null, 2));
+    return 0;
+  }
+
+  if (all.length === 0) {
+    console.log("No integrations found");
+    return 0;
+  }
+
+  printTable(
+    ["ID", "Name", "Kind", "URL"],
+    all.map((i) => [i.id, i.name, i.kind, i.url]),
+  );
+  console.log(`\n${all.length} integration(s) total`);
+  return 0;
+}

packages/cli/src/commands/integrations.ts

@@ -1,10 +0,0 @@
-import { command } from "@drizzle-team/brocli";
-
-import { integrationsDelete } from "./integrations-delete";
-import { integrationsList } from "./integrations-list";
-
-export const integrationsRoot = command({
-  name: "integrations",
-  desc: "Group of commands to manage integrations",
-  subcommands: [integrationsList, integrationsDelete],
-});

packages/cli/src/commands/recreate-admin.ts

@@ -1,94 +1,98 @@
-import { command, string } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { hashPasswordAsync } from "@homarr/auth";
+import { hashPasswordAsync } from "@homarr/auth/security";
 import { createId } from "@homarr/common";
-import { generateSecureRandomToken } from "@homarr/common/server";
+import { generateSecureRandomToken } from "../utils";
-import { and, count, db, eq } from "@homarr/db";
+import { and, count, eq, max } from "drizzle-orm";
-import { getMaxGroupPositionAsync } from "@homarr/db/queries";
+
+import { getCliDb } from "../cli-db";
+import { CliError, requireCredentialsProvider } from "../errors";
 import { groupMembers, groupPermissions, groups, users } from "@homarr/db/schema";
 import { usernameSchema } from "@homarr/validation/user";
 
-export const recreateAdmin = command({
+export async function recreateAdminHandler(args: string[]): Promise<number> {
-  name: "recreate-admin",
+  requireCredentialsProvider();
-  desc: "Recreate credentials admin user if none exists anymore",
-  options: {
-    username: string("username").required().alias("u").desc("Name of the admin"),
-  },
-  // eslint-disable-next-line no-restricted-syntax
-  handler: async (options) => {
-    if (!process.env.AUTH_PROVIDERS?.toLowerCase().includes("credentials")) {
-      console.error("Credentials provider is not enabled");
-      return;
-    }
 
-    const result = await usernameSchema.safeParseAsync(options.username);
+  const { values } = parseArgs({
+    args,
+    options: {
+      username: { type: "string", short: "u" },
+    },
+  });
 
-    if (!result.success) {
+  if (!values.username) {
-      console.error("Invalid username:");
+    throw new CliError("Missing required option: --username / -u", 2);
-      console.error(result.error.issues.map((error) => `- ${error.message}`).join("\n"));
+  }
-      return;
-    }
 
-    const totalCount = await db
+  const result = await usernameSchema.safeParseAsync(values.username);
-      .select({
+  if (!result.success) {
-        count: count(),
+    const messages = result.error.issues.map((issue) => `- ${issue.message}`).join("\n");
-      })
+    throw new CliError(`Invalid username:\n${messages}`, 2);
-      .from(groupPermissions)
+  }
-      .leftJoin(groupMembers, eq(groupMembers.groupId, groupPermissions.groupId))
-      .leftJoin(users, eq(users.id, groupMembers.userId))
-      .where(and(eq(groupPermissions.permission, "admin"), eq(users.provider, "credentials")))
-      .then((rows) => rows.at(0)?.count ?? 0);
 
-    if (totalCount > 0) {
+  const db = getCliDb();
-      console.error("Credentials admin user exists");
-      return;
-    }
 
-    const existingUser = await db.query.users.findFirst({
+  const totalCount = await db
-      where: eq(users.name, result.data),
+    .select({
-    });
+      count: count(),
+    })
+    .from(groupPermissions)
+    .leftJoin(groupMembers, eq(groupMembers.groupId, groupPermissions.groupId))
+    .leftJoin(users, eq(users.id, groupMembers.userId))
+    .where(and(eq(groupPermissions.permission, "admin"), eq(users.provider, "credentials")))
+    .then((rows: { count: number }[]) => rows.at(0)?.count ?? 0);
 
-    if (existingUser) {
+  if (totalCount > 0) {
-      console.error("User with this name already exists");
+    throw new CliError("Credentials admin user exists");
-      return;
+  }
-    }
 
-    const temporaryGroupId = createId();
+  const existingUser = await db.query.users.findFirst({
+    where: eq(users.name, result.data),
+  });
 
-    const maxPosition = await getMaxGroupPositionAsync(db);
+  if (existingUser) {
-    await db.insert(groups).values({
+    throw new CliError("User with this name already exists");
-      id: temporaryGroupId,
+  }
-      name: temporaryGroupId,
-      position: maxPosition + 1,
-    });
 
-    await db.insert(groupPermissions).values({
+  const temporaryGroupId = createId();
-      groupId: temporaryGroupId,
+  const maxPosition = await db
-      permission: "admin",
+    .select({ value: max(groups.position) })
-    });
+    .from(groups)
+    .then((result: { value: number | null }[]) => result[0]?.value ?? 1);
 
-    const password = generateSecureRandomToken(24);
+  await db.insert(groups).values({
-    const hashedPassword = await hashPasswordAsync(password);
+    id: temporaryGroupId,
+    name: temporaryGroupId,
+    position: maxPosition + 1,
+  });
 
-    const userId = createId();
+  await db.insert(groupPermissions).values({
-    await db.insert(users).values({
+    groupId: temporaryGroupId,
-      id: userId,
+    permission: "admin",
-      name: result.data,
+  });
-      provider: "credentials",
-      password: hashedPassword,
-    });
 
-    await db.insert(groupMembers).values({
+  const password = generateSecureRandomToken(24);
-      groupId: temporaryGroupId,
+  const hashedPassword = await hashPasswordAsync(password);
-      userId,
+  const userId = createId();
-    });
 
-    console.log(
+  await db.insert(users).values({
-      "We created a new admin user for you. Please keep in mind, that the admin group of it has a temporary name. You should change it to something more meaningful.",
+    id: userId,
-    );
+    name: result.data,
-    console.log(`\tUsername: ${result.data}`);
+    provider: "credentials",
-    console.log(`\tPassword: ${password}`);
+    password: hashedPassword,
-    console.log(`\tGroup: ${temporaryGroupId}`);
+  });
-    console.log(""); // Empty line for better readability
+
-  },
+  await db.insert(groupMembers).values({
-});
+    groupId: temporaryGroupId,
+    userId,
+  });
+
+  console.log(
+    "We created a new admin user for you. Please keep in mind, that the admin group of it has a temporary name. You should change it to something more meaningful.",
+  );
+  console.log(`\tUsername: ${result.data}`);
+  console.log(`\tPassword: ${password}`);
+  console.log(`\tGroup: ${temporaryGroupId}`);
+  console.log("");
+  return 0;
+}

packages/cli/src/commands/reset-password.ts

@@ -1,46 +1,48 @@
-import { command, string } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { hashPasswordAsync } from "@homarr/auth";
+import { hashPasswordAsync } from "@homarr/auth/security";
-import { generateSecureRandomToken } from "@homarr/common/server";
+import { generateSecureRandomToken } from "../utils";
-import { and, db, eq } from "@homarr/db";
+import { and, eq } from "drizzle-orm";
+
+import { getCliDb } from "../cli-db";
+import { CliError, requireCredentialsProvider } from "../errors";
 import { sessions, users } from "@homarr/db/schema";
 
-export const resetPassword = command({
+export async function resetPasswordHandler(args: string[]): Promise<number> {
-  name: "reset-password",
+  requireCredentialsProvider();
-  desc: "Reset password for a user",
-  options: {
-    username: string("username").required().alias("u").desc("Name of the user"),
-  },
-  // eslint-disable-next-line no-restricted-syntax
-  handler: async (options) => {
-    if (!process.env.AUTH_PROVIDERS?.toLowerCase().includes("credentials")) {
-      console.error("Credentials provider is not enabled");
-      return;
-    }
 
-    const user = await db.query.users.findFirst({
+  const { values } = parseArgs({
-      where: and(eq(users.name, options.username), eq(users.provider, "credentials")),
+    args,
-    });
+    options: {
+      username: { type: "string", short: "u" },
+    },
+  });
 
-    if (!user?.password) {
+  if (!values.username) {
-      console.error(`User ${options.username} not found`);
+    throw new CliError("Missing required option: --username / -u", 2);
-      return;
+  }
-    }
 
-    // Generates a new password with 48 characters
+  const db = getCliDb();
-    const newPassword = generateSecureRandomToken(24);
+  const user = await db.query.users.findFirst({
+    where: and(eq(users.name, values.username), eq(users.provider, "credentials")),
+  });
 
-    await db
+  if (!user?.password) {
-      .update(users)
+    throw new CliError(`User ${values.username} not found`);
-      .set({
+  }
-        password: await hashPasswordAsync(newPassword),
-      })
-      .where(eq(users.id, user.id));
 
-    await db.delete(sessions).where(eq(sessions.userId, user.id));
+  const newPassword = generateSecureRandomToken(24);
-    console.log(`All sessions for user ${options.username} have been deleted`);
 
-    console.log("You can now login with the new password");
+  await db
-    console.log(`New password for user ${options.username}: ${newPassword}`);
+    .update(users)
-  },
+    .set({
-});
+      password: await hashPasswordAsync(newPassword),
+    })
+    .where(eq(users.id, user.id));
+
+  await db.delete(sessions).where(eq(sessions.userId, user.id));
+  console.log(`All sessions for user ${values.username} have been deleted`);
+  console.log("You can now login with the new password");
+  console.log(`New password for user ${values.username}: ${newPassword}`);
+  return 0;
+}

packages/cli/src/commands/users-delete.ts

@@ -1,39 +1,47 @@
-import { command, string } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { db, eq } from "@homarr/db";
+import { eq } from "drizzle-orm";
+
+import type { CliDatabase } from "../cli-db";
+import { getCliDb } from "../cli-db";
+import { CliError } from "../errors";
 import { users } from "@homarr/db/schema";
 
-export const usersDelete = command({
+const userLookup: Record<"id" | "username", (db: CliDatabase, value: string) => Promise<{ id: string; name: string | null } | undefined>> = {
-  name: "delete",
+  id: (db, value) =>
-  desc: "Delete a user by id or username",
+    db.query.users.findFirst({
-  options: {
+      where: eq(users.id, value),
-    id: string("id").alias("i").desc("ID of the user"),
+    }),
-    username: string("username").alias("u").desc("Name of the user"),
+  username: (db, value) =>
-  },
+    db.query.users.findFirst({
-  // eslint-disable-next-line no-restricted-syntax
+      where: eq(users.name, value),
-  handler: async (options) => {
+    }),
-    if (!options.id && !options.username) {
+};
-      console.error("Either --id or --username must be provided");
-      return;
-    }
 
-    let user;
+export async function usersDeleteHandler(args: string[]): Promise<number> {
-    if (options.id) {
+  const { values } = parseArgs({
-      user = await db.query.users.findFirst({
+    args,
-        where: eq(users.id, options.id),
+    options: {
-      });
+      id: { type: "string", short: "i" },
-    } else if (options.username) {
+      username: { type: "string", short: "u" },
-      user = await db.query.users.findFirst({
+    },
-        where: eq(users.name, options.username),
+  });
-      });
-    }
 
-    if (!user) {
+  const lookupKey = values.id ? "id" : values.username ? "username" : null;
-      console.error("User not found");
+  const lookupValue = values.id ?? values.username;
-      return;
-    }
 
-    await db.delete(users).where(eq(users.id, user.id));
+  if (!lookupKey || !lookupValue) {
-    console.log(`User ${user.name ?? user.id} (${user.id}) deleted`);
+    throw new CliError("Either --id or --username must be provided", 2);
-  },
+  }
-});
+
+  const db = getCliDb();
+  const user = await userLookup[lookupKey](db, lookupValue);
+
+  if (!user) {
+    throw new CliError("User not found");
+  }
+
+  await db.delete(users).where(eq(users.id, user.id));
+  console.log(`User ${user.name ?? user.id} (${user.id}) deleted`);
+  return 0;
+}

packages/cli/src/commands/users-list.ts

@@ -1,22 +1,35 @@
-import { command } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { db } from "@homarr/db";
+import { getCliDb } from "../cli-db";
+import { printTable } from "../utils";
 
-export const usersList = command({
+export async function usersListHandler(args: string[] = []): Promise<number> {
-  name: "list",
+  const { values } = parseArgs({
-  desc: "List all users (id, username, email)",
+    args,
-  // eslint-disable-next-line no-restricted-syntax
+    options: {
-  handler: async () => {
+      json: { type: "boolean", default: false },
-    const allUsers = await db.query.users.findMany();
+    },
+    strict: false,
+  });
 
-    if (allUsers.length === 0) {
+  const db = getCliDb();
-      console.log("No users found");
+  const allUsers = await db.query.users.findMany();
-      return;
-    }
 
-    console.log("ID\t\t\t\tUsername\tEmail");
+  if (values.json) {
-    for (const user of allUsers) {
+    const output = allUsers.map((u) => ({ id: u.id, name: u.name, email: u.email, provider: u.provider }));
-      console.log(`${user.id}\t${user.name ?? ""}\t${user.email ?? ""}`);
+    console.log(JSON.stringify(output, null, 2));
-    }
+    return 0;
-  },
+  }
-});
+
+  if (allUsers.length === 0) {
+    console.log("No users found");
+    return 0;
+  }
+
+  printTable(
+    ["ID", "Username", "Email", "Provider"],
+    allUsers.map((u) => [u.id, u.name ?? "", u.email ?? "", u.provider]),
+  );
+  console.log(`\n${allUsers.length} user(s) total`);
+  return 0;
+}

packages/cli/src/commands/users-update-password.ts

@@ -1,50 +1,66 @@
-import { command, string } from "@drizzle-team/brocli";
+import { parseArgs } from "node:util";
 
-import { hashPasswordAsync } from "@homarr/auth";
+import { hashPasswordAsync } from "@homarr/auth/security";
-import { db, eq } from "@homarr/db";
+import { eq } from "drizzle-orm";
+
+import type { CliDatabase } from "../cli-db";
+import { getCliDb } from "../cli-db";
+import { CliError, requireCredentialsProvider } from "../errors";
 import { sessions, users } from "@homarr/db/schema";
 
-export const usersUpdatePassword = command({
+const userLookup: Record<
-  name: "update-password",
+  "id" | "username",
-  desc: "Update the password for a user (credentials provider only)",
+  (db: CliDatabase, value: string) => Promise<{ id: string; name: string | null; password: string | null } | undefined>
-  options: {
+> = {
-    id: string("id").alias("i").desc("ID of the user"),
+  id: (db, value) =>
-    username: string("username").alias("u").desc("Name of the user"),
+    db.query.users.findFirst({
-    password: string("password").alias("p").required().desc("New password"),
+      where: eq(users.id, value),
-  },
+    }),
-  // eslint-disable-next-line no-restricted-syntax
+  username: (db, value) =>
-  handler: async (options) => {
+    db.query.users.findFirst({
-    if (!process.env.AUTH_PROVIDERS?.toLowerCase().includes("credentials")) {
+      where: eq(users.name, value),
-      console.error("Credentials provider is not enabled");
+    }),
-      return;
+};
-    }
 
-    if (!options.id && !options.username) {
+export async function usersUpdatePasswordHandler(args: string[]): Promise<number> {
-      console.error("Either --id or --username must be provided");
+  requireCredentialsProvider();
-      return;
-    }
 
-    const user = await db.query.users.findFirst({
+  const { values } = parseArgs({
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    args,
-      where: options.id ? eq(users.id, options.id) : eq(users.name, options.username!),
+    options: {
-    });
+      id: { type: "string", short: "i" },
+      username: { type: "string", short: "u" },
+      password: { type: "string", short: "p" },
+    },
+  });
 
-    if (!user?.password) {
+  const lookupKey = values.id ? "id" : values.username ? "username" : null;
-      console.error("User not found or has no credentials record");
+  const lookupValue = values.id ?? values.username;
-      return;
-    }
 
-    await db
+  if (!lookupKey || !lookupValue) {
-      .update(users)
+    throw new CliError("Either --id or --username must be provided", 2);
-      .set({
+  }
-        password: await hashPasswordAsync(options.password),
-      })
-      .where(eq(users.id, user.id));
 
-    // invalidate existing sessions
+  if (!values.password) {
-    await db.delete(sessions).where(eq(sessions.userId, user.id));
+    throw new CliError("Missing required option: --password / -p", 2);
-    console.log(`All sessions for user ${user.name ?? user.id} have been deleted`);
+  }
 
-    console.log("Password updated successfully");
+  const db = getCliDb();
-  },
+  const user = await userLookup[lookupKey](db, lookupValue);
-});
+
+  if (!user?.password) {
+    throw new CliError("User not found or has no credentials record");
+  }
+
+  await db
+    .update(users)
+    .set({
+      password: await hashPasswordAsync(values.password),
+    })
+    .where(eq(users.id, user.id));
+
+  await db.delete(sessions).where(eq(sessions.userId, user.id));
+  console.log(`All sessions for user ${user.name ?? user.id} have been deleted`);
+  console.log("Password updated successfully");
+  return 0;
+}

packages/cli/src/commands/users.ts

@@ -1,11 +0,0 @@
-import { command } from "@drizzle-team/brocli";
-
-import { usersDelete } from "./users-delete";
-import { usersList } from "./users-list";
-import { usersUpdatePassword } from "./users-update-password";
-
-export const usersRoot = command({
-  name: "users",
-  desc: "Group of commands to manage users",
-  subcommands: [usersList, usersDelete, usersUpdatePassword],
-});

packages/cli/src/errors.ts

@@ -0,0 +1,16 @@
+export class CliError extends Error {
+  constructor(
+    message: string,
+    readonly exitCode: 1 | 2 = 1,
+  ) {
+    super(message);
+    this.name = "CliError";
+  }
+}
+
+export const requireCredentialsProvider = () => {
+  const enabled = process.env.AUTH_PROVIDERS?.toLowerCase().includes("credentials") ?? false;
+  if (!enabled) {
+    throw new CliError("Credentials provider is not enabled");
+  }
+};

packages/cli/src/index.ts

@@ -1,14 +1,41 @@
-import { run } from "@drizzle-team/brocli";
+import { closeCliDbAsync } from "./cli-db";
+import { CliError } from "./errors";
+import { runCliAsync } from "./router";
 
-import { fixUsernames } from "./commands/fix-usernames";
+const mainAsync = async (): Promise<number> => {
-import { integrationsRoot } from "./commands/integrations";
+  const argv = process.argv.slice(2);
-import { recreateAdmin } from "./commands/recreate-admin";
+  const start = performance.now();
-import { resetPassword } from "./commands/reset-password";
-import { usersRoot } from "./commands/users";
 
-const commands = [usersRoot, integrationsRoot, resetPassword, fixUsernames, recreateAdmin];
+  try {
+    const code = await runCliAsync(argv);
+    if (code === 0) {
+      const elapsed = Math.round(performance.now() - start);
+      console.error(`\nDone in ${elapsed}ms`);
+    }
+    return code;
+  } catch (error) {
+    if (error instanceof CliError) {
+      console.error(error.message);
+      return error.exitCode;
+    }
 
-void run(commands, {
+    if (error instanceof TypeError && error.message.startsWith("Unknown option")) {
-  name: "homarr-cli",
+      console.error(error.message);
-  version: "1.0.0",
+      return 2;
-});
+    }
+
+    console.error(error instanceof Error ? error.message : error);
+    return 1;
+  }
+};
+
+mainAsync()
+  .then(async (code) => {
+    await closeCliDbAsync();
+    process.exit(code);
+  })
+  .catch(async (error) => {
+    console.error(error instanceof Error ? error.message : error);
+    await closeCliDbAsync();
+    process.exit(1);
+  });

packages/cli/src/router.ts

@@ -0,0 +1,167 @@
+import { fixUsernamesHandler } from "./commands/fix-usernames";
+import { integrationsDeleteHandler } from "./commands/integrations-delete";
+import { integrationsListHandler } from "./commands/integrations-list";
+import { recreateAdminHandler } from "./commands/recreate-admin";
+import { resetPasswordHandler } from "./commands/reset-password";
+import { usersDeleteHandler } from "./commands/users-delete";
+import { usersListHandler } from "./commands/users-list";
+import { usersUpdatePasswordHandler } from "./commands/users-update-password";
+import { CliError } from "./errors";
+
+const VERSION = "1.0.0";
+
+type CommandHandler = (args: string[]) => Promise<number>;
+
+interface CommandDef {
+  handler: CommandHandler;
+  desc: string;
+  usage: string;
+}
+
+type CommandGroup = Record<string, CommandDef>;
+
+const topLevelCommands: Record<string, CommandDef> = {
+  "reset-password": {
+    handler: resetPasswordHandler,
+    desc: "Reset password for a credentials user",
+    usage: "homarr reset-password -u <username>",
+  },
+  "fix-usernames": {
+    handler: (args) => fixUsernamesHandler(),
+    desc: "Lowercase all credentials usernames",
+    usage: "homarr fix-usernames",
+  },
+  "recreate-admin": {
+    handler: recreateAdminHandler,
+    desc: "Create credentials admin if none exists",
+    usage: "homarr recreate-admin -u <username>",
+  },
+};
+
+const commandGroups: Record<string, CommandGroup> = {
+  users: {
+    list: {
+      handler: (args) => usersListHandler(args),
+      desc: "List all users",
+      usage: "homarr users list [--json]",
+    },
+    delete: {
+      handler: usersDeleteHandler,
+      desc: "Delete a user by id or username",
+      usage: "homarr users delete --id <id> | --username <name>",
+    },
+    "update-password": {
+      handler: usersUpdatePasswordHandler,
+      desc: "Set password for a credentials user",
+      usage: "homarr users update-password (--id <id> | --username <name>) --password <pw>",
+    },
+  },
+  integrations: {
+    list: {
+      handler: (args) => integrationsListHandler(args),
+      desc: "List all integrations",
+      usage: "homarr integrations list [--json]",
+    },
+    delete: {
+      handler: integrationsDeleteHandler,
+      desc: "Delete an integration by id or name",
+      usage: "homarr integrations delete --id <id> | --name <name>",
+    },
+  },
+};
+
+const HELP_TEXT = `homarr-cli ${VERSION}
+
+Usage:
+  homarr <command> [options]
+
+Commands:
+  reset-password         Reset password for a credentials user
+  recreate-admin         Create credentials admin if none exists
+  fix-usernames          Lowercase all credentials usernames
+  users list             List all users
+  users delete           Delete a user by id or username
+  users update-password  Set password for a credentials user
+  integrations list      List all integrations
+  integrations delete    Delete an integration by id or name
+
+Global Options:
+  -h, --help             Show help (use after a command for command-specific help)
+  -v, --version          Show CLI version
+`;
+
+const printHelp = () => {
+  console.log(HELP_TEXT);
+};
+
+const printCommandHelp = (def: CommandDef) => {
+  console.log(`${def.desc}\n`);
+  console.log(`Usage:\n  ${def.usage}\n`);
+};
+
+const resolveHandler = (argv: string[]): { handler: CommandHandler; args: string[] } => {
+  const [command, subcommand, ...rest] = argv;
+
+  if (!command) {
+    throw new CliError("Missing command", 2);
+  }
+
+  const group = commandGroups[command];
+  if (group) {
+    if (!subcommand || subcommand === "--help" || subcommand === "-h") {
+      const subcommands = Object.entries(group)
+        .map(([name, def]) => `  ${name.padEnd(18)} ${def.desc}`)
+        .join("\n");
+      console.log(`Usage:\n  homarr ${command} <subcommand> [options]\n\nSubcommands:\n${subcommands}\n`);
+      return { handler: async () => subcommand ? 0 : 2, args: [] };
+    }
+
+    const def = group[subcommand];
+    if (!def) {
+      throw new CliError(`Unknown subcommand "${subcommand}" for "${command}"`, 2);
+    }
+
+    if (hasFlag(rest, "--help", "-h")) {
+      printCommandHelp(def);
+      return { handler: async () => 0, args: [] };
+    }
+
+    return { handler: def.handler, args: rest };
+  }
+
+  const def = topLevelCommands[command];
+  if (!def) {
+    throw new CliError(`Unknown command "${command}"`, 2);
+  }
+
+  const args = argv.slice(1);
+  if (hasFlag(args, "--help", "-h")) {
+    printCommandHelp(def);
+    return { handler: async () => 0, args: [] };
+  }
+
+  return { handler: def.handler, args };
+};
+
+const hasFlag = (argv: string[], flag: string, short: string) =>
+  argv.some((arg) => arg === flag || arg === short);
+
+export const runCliAsync = async (argv: string[]): Promise<number> => {
+  if (hasFlag(argv, "--help", "-h") && argv.length === 1) {
+    printHelp();
+    return 0;
+  }
+
+  if (hasFlag(argv, "--version", "-v")) {
+    console.log(VERSION);
+    return 0;
+  }
+
+  if (argv.length === 0) {
+    printHelp();
+    return 2;
+  }
+
+  const { handler, args } = resolveHandler(argv);
+  return handler(args);
+};

packages/cli/src/utils.ts

@@ -0,0 +1,18 @@
+import { randomBytes } from "node:crypto";
+
+export const generateSecureRandomToken = (size: number) => randomBytes(size).toString("hex");
+
+export const printTable = (headers: string[], rows: string[][]) => {
+  const widths = headers.map((h, i) =>
+    Math.max(h.length, ...rows.map((r) => (r[i] ?? "").length)),
+  );
+
+  const formatRow = (cells: string[]) =>
+    cells.map((cell, i) => cell.padEnd(widths[i]!)).join("  ");
+
+  console.log(formatRow(headers));
+  console.log(widths.map((w) => "─".repeat(w)).join("  "));
+  for (const row of rows) {
+    console.log(formatRow(row));
+  }
+};

packages/common/src/stopwatch.ts

@@ -41,6 +41,10 @@ export class Stopwatch {
     return dayjs().millisecond(this.startTime).fromNow(true);
   }
 
+  getElapsedInFormattedMilliseconds() {
+    return `${this.getElapsedInMilliseconds().toFixed(0)}ms`;
+  }
+
   getElapsedInMilliseconds() {
     return performance.now() - this.startTime;
   }

packages/core/package.json

@@ -14,6 +14,7 @@
     "./infrastructure/db": "./src/infrastructure/db/index.ts",
     "./infrastructure/db/env": "./src/infrastructure/db/env.ts",
     "./infrastructure/db/constants": "./src/infrastructure/db/constants.ts",
+    "./infrastructure/db/mapping": "./src/infrastructure/db/mapping.ts",
     "./infrastructure/certificates": "./src/infrastructure/certificates/index.ts",
     "./infrastructure/certificates/hostnames/db/sqlite": "./src/infrastructure/certificates/hostnames/db/sqlite.ts",
     "./infrastructure/certificates/hostnames/db/mysql": "./src/infrastructure/certificates/hostnames/db/mysql.ts",

packages/cron-job-api/eslint.config.js

@@ -0,0 +1,9 @@
+import baseConfig from "@homarr/eslint-config/base";
+
+/** @type {import('typescript-eslint').Config} */
+export default [
+  {
+    ignores: [],
+  },
+  ...baseConfig,
+];

packages/cron-job-api/package.json

@@ -0,0 +1,46 @@
+{
+  "name": "@homarr/cron-job-api",
+  "version": "0.1.0",
+  "private": true,
+  "license": "Apache-2.0",
+  "type": "module",
+  "exports": {
+    ".": "./src/index.ts",
+    "./env": "./src/env.ts",
+    "./constants": "./src/constants.ts",
+    "./client": "./src/client.ts"
+  },
+  "typesVersions": {
+    "*": {
+      "*": [
+        "src/*"
+      ]
+    }
+  },
+  "scripts": {
+    "clean": "rm -rf .turbo node_modules",
+    "format": "prettier --check . --ignore-path ../../.gitignore",
+    "lint": "eslint",
+    "typecheck": "tsc --noEmit"
+  },
+  "prettier": "@homarr/prettier-config",
+  "dependencies": {
+    "@homarr/common": "workspace:^0.1.0",
+    "@homarr/core": "workspace:^0.1.0",
+    "@homarr/cron-jobs": "workspace:^0.1.0",
+    "@tanstack/react-query": "catalog:",
+    "@trpc/client": "catalog:",
+    "@trpc/server": "catalog:",
+    "@trpc/tanstack-react-query": "catalog:",
+    "react": "catalog:",
+    "zod": "catalog:"
+  },
+  "devDependencies": {
+    "@homarr/eslint-config": "workspace:^0.2.0",
+    "@homarr/prettier-config": "workspace:^0.1.0",
+    "@homarr/tsconfig": "workspace:^0.1.0",
+    "@types/react": "catalog:",
+    "eslint": "catalog:",
+    "typescript": "catalog:"
+  }
+}

packages/cron-job-api/src/client.ts

@@ -0,0 +1,20 @@
+import { createTRPCClient, httpLink } from "@trpc/client";
+
+import type { JobRouter } from ".";
+import { CRON_JOB_API_KEY_HEADER, CRON_JOB_API_PATH, CRON_JOB_API_PORT } from "./constants";
+import { env } from "./env";
+
+export const cronJobApi = createTRPCClient<JobRouter>({
+  links: [
+    httpLink({
+      url: `${getBaseUrl()}${CRON_JOB_API_PATH}`,
+      headers: {
+        [CRON_JOB_API_KEY_HEADER]: env.CRON_JOB_API_KEY,
+      },
+    }),
+  ],
+});
+
+function getBaseUrl() {
+  return `http://localhost:${CRON_JOB_API_PORT}`;
+}

packages/cron-job-api/src/constants.ts

@@ -0,0 +1,3 @@
+export const CRON_JOB_API_PORT = 3002;
+export const CRON_JOB_API_PATH = "/trpc";
+export const CRON_JOB_API_KEY_HEADER = "cron-job-api-key";

packages/cron-job-api/src/env.ts

@@ -0,0 +1,11 @@
+import { z } from "zod/v4";
+
+import { env as commonEnv } from "@homarr/common/env";
+import { createEnv } from "@homarr/core/infrastructure/env";
+
+export const env = createEnv({
+  server: {
+    CRON_JOB_API_KEY: commonEnv.NODE_ENV === "development" ? z.string().default("test") : z.string(),
+  },
+  experimental__runtimeEnv: process.env,
+});

packages/cron-job-api/src/index.ts

@@ -0,0 +1,85 @@
+import { initTRPC, TRPCError } from "@trpc/server";
+import { z } from "zod/v4";
+
+import type { JobGroupKeys } from "@homarr/cron-jobs";
+import { jobGroup } from "@homarr/cron-jobs";
+
+import { env } from "./env";
+
+export const jobGroupKeys = jobGroup.getKeys();
+export const jobNameSchema = z.enum(jobGroup.getKeys());
+
+export interface IJobManager {
+  startAsync(name: JobGroupKeys): Promise<void>;
+  triggerAsync(name: JobGroupKeys): Promise<void>;
+  stop(name: JobGroupKeys): void;
+  updateIntervalAsync(name: JobGroupKeys, cron: string): Promise<void>;
+  disableAsync(name: JobGroupKeys): Promise<void>;
+  enableAsync(name: JobGroupKeys): Promise<void>;
+  getAllAsync(): Promise<
+    {
+      name: JobGroupKeys;
+      cron: string;
+      preventManualExecution: boolean;
+      preventCustomInterval: boolean;
+      isEnabled: boolean;
+    }[]
+  >;
+}
+
+const t = initTRPC
+  .context<{
+    manager: IJobManager;
+    apiKey?: string;
+  }>()
+  .create();
+
+const createTrpcRouter = t.router;
+const apiKeyProcedure = t.procedure.use(({ ctx, next }) => {
+  if (ctx.apiKey !== env.CRON_JOB_API_KEY) {
+    throw new TRPCError({
+      code: "FORBIDDEN",
+      message: "Missing or invalid API key",
+    });
+  }
+
+  return next({
+    ctx: {
+      ...ctx,
+      apiKey: undefined, // Clear the API key after checking
+    },
+  });
+});
+
+export const jobRouter = createTrpcRouter({
+  start: apiKeyProcedure.input(jobNameSchema).mutation(async ({ input, ctx }) => {
+    await ctx.manager.startAsync(input);
+  }),
+  trigger: apiKeyProcedure.input(jobNameSchema).mutation(async ({ input, ctx }) => {
+    await ctx.manager.triggerAsync(input);
+  }),
+  stop: apiKeyProcedure.input(jobNameSchema).mutation(({ input, ctx }) => {
+    ctx.manager.stop(input);
+  }),
+  updateInterval: apiKeyProcedure
+    .input(
+      z.object({
+        name: jobNameSchema,
+        cron: z.string(),
+      }),
+    )
+    .mutation(async ({ input, ctx }) => {
+      await ctx.manager.updateIntervalAsync(input.name, input.cron);
+    }),
+  disable: apiKeyProcedure.input(jobNameSchema).mutation(async ({ input, ctx }) => {
+    await ctx.manager.disableAsync(input);
+  }),
+  enable: apiKeyProcedure.input(jobNameSchema).mutation(async ({ input, ctx }) => {
+    await ctx.manager.enableAsync(input);
+  }),
+  getAll: apiKeyProcedure.query(({ ctx }) => {
+    return ctx.manager.getAllAsync();
+  }),
+});
+
+export type JobRouter = typeof jobRouter;

packages/cron-job-api/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "@homarr/tsconfig/base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "node_modules/.cache/tsbuildinfo.json"
+  },
+  "include": ["*.ts", "src"],
+  "exclude": ["node_modules"]
+}

packages/cron-jobs-core/package.json

@@ -27,13 +27,12 @@
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^",
     "@homarr/db": "workspace:^0.1.0",
-    "node-cron": "catalog:"
+    "croner": "catalog:"
   },
   "devDependencies": {
     "@homarr/eslint-config": "workspace:^0.2.0",
     "@homarr/prettier-config": "workspace:^0.1.0",
     "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/node-cron": "catalog:",
     "eslint": "catalog:",
     "typescript": "catalog:"
   }

packages/cron-jobs-core/src/creator.ts

@@ -1,4 +1,4 @@
-import { createTask, validate } from "node-cron";
+import { Cron } from "croner";
 
 import { Stopwatch } from "@homarr/common";
 import type { MaybePromise } from "@homarr/common/types";
@@ -83,10 +83,15 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
           ? defaultCronExpression
           : (configuration?.cronExpression ?? defaultCronExpression);
 
-        const scheduledTask = createTask(cronExpression, () => void catchingCallbackAsync(), {
+        const scheduledTask = new Cron(
-          name,
+          cronExpression,
-          timezone: creatorOptions.timezone,
+          {
-        });
+            name,
+            timezone: creatorOptions.timezone,
+            paused: true,
+          },
+          () => void catchingCallbackAsync(),
+        );
         creatorOptions.logger.logDebug("The scheduled task for cron job was created", {
           name,
           cronExpression: defaultCronExpression,
@@ -116,6 +121,7 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
       },
       preventManualExecution: options.preventManualExecution ?? false,
       preventCustomInterval: options.preventCustomInterval ?? false,
+      timezone: creatorOptions.timezone,
     };
   };
 };
@@ -132,13 +138,6 @@ export const createCronJobCreator = <TAllowedNames extends string = string>(
     defaultCronExpression: TExpression,
     options: CreateCronJobOptions = { runOnStart: false },
   ) => {
-    creatorOptions.logger.logDebug("Validating cron expression for cron job", {
-      name,
-      cronExpression: defaultCronExpression,
-    });
-    if (!validate(defaultCronExpression)) {
-      throw new Error(`Invalid cron expression '${defaultCronExpression}' for job '${name}'`);
-    }
     creatorOptions.logger.logDebug("Cron job expression for cron job is valid", {
       name,
       cronExpression: defaultCronExpression,

packages/cron-jobs-core/src/group.ts

@@ -1,4 +1,4 @@
-import type { ScheduledTask } from "node-cron";
+import type { Cron } from "croner";
 
 import { objectEntries, objectKeys } from "@homarr/common";
 import { db } from "@homarr/db";
@@ -34,7 +34,7 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
       });
     }
 
-    const tasks = new Map<string, ScheduledTask>();
+    const tasks = new Map<string, Cron>();
 
     return {
       initializeAsync: async () => {
@@ -62,7 +62,7 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
           name: job.name,
         });
         await job.onStartAsync();
-        await tasks.get(name as string)?.start();
+        tasks.get(name as string)?.resume();
       },
       startAllAsync: async () => {
         for (const job of jobRegistry.values()) {
@@ -74,7 +74,7 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
             name: job.name,
           });
           await job.onStartAsync();
-          await tasks.get(job.name)?.start();
+          tasks.get(job.name)?.resume();
         }
       },
       runManuallyAsync: async (name: keyof TJobs) => {
@@ -87,23 +87,23 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
         options.logger.logInfo("Running schedule cron job manually.", {
           name: job.name,
         });
-        await tasks.get(name as string)?.execute();
+        await tasks.get(name as string)?.trigger();
       },
-      stopAsync: async (name: keyof TJobs) => {
+      stop: (name: keyof TJobs) => {
         const job = jobRegistry.get(name as string);
         if (!job) return;
 
         options.logger.logInfo("Stopping schedule of cron job.", {
           name: job.name,
         });
-        await tasks.get(name as string)?.stop();
+        tasks.get(name as string)?.pause();
       },
-      stopAllAsync: async () => {
+      stopAll: () => {
         for (const job of jobRegistry.values()) {
           options.logger.logInfo("Stopping schedule of cron job.", {
             name: job.name,
           });
-          await tasks.get(job.name)?.stop();
+          tasks.get(job.name)?.pause();
         }
       },
       getJobRegistry() {
@@ -112,8 +112,8 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
       getTask(name: keyof TJobs) {
         return tasks.get(name as string) ?? null;
       },
-      setTask(name: keyof TJobs, task: ScheduledTask) {
+      setTask(name: keyof TJobs, cron: Cron) {
-        tasks.set(name as string, task);
+        tasks.set(name as string, cron);
       },
       getKeys() {
         return objectKeys(jobs);

packages/cron-jobs/package.json

@@ -5,8 +5,7 @@
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
-    ".": "./index.ts",
+    ".": "./index.ts"
-    "./job-manager": "./src/job-manager.ts"
   },
   "typesVersions": {
     "*": {
@@ -39,15 +38,12 @@
     "@homarr/server-settings": "workspace:^0.1.0",
     "@homarr/translation": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
-    "node-cron": "catalog:",
+    "semver-parser": "catalog:"
-    "semver-parser": "catalog:",
-    "zod": "catalog:"
   },
   "devDependencies": {
     "@homarr/eslint-config": "workspace:^0.2.0",
     "@homarr/prettier-config": "workspace:^0.1.0",
     "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/node-cron": "catalog:",
     "eslint": "catalog:",
     "typescript": "catalog:"
   }

packages/cron-jobs/src/index.ts

@@ -20,6 +20,7 @@ import { networkControllerJob } from "./jobs/integrations/network-controller";
 import { refreshNotificationsJob } from "./jobs/integrations/notifications";
 import { timetableJob } from "./jobs/integrations/timetable";
 import { tracearrJob } from "./jobs/integrations/tracearr";
+import { umamiActiveVisitorsJob } from "./jobs/integrations/umami";
 import { minecraftServerStatusJob } from "./jobs/minecraft-server-status";
 import { pingJob } from "./jobs/ping";
 import { rssFeedsJob } from "./jobs/rss-feeds";
@@ -27,45 +28,34 @@ import { updateCheckerJob } from "./jobs/update-checker";
 import { weatherJob } from "./jobs/weather";
 import { createCronJobGroup } from "./lib";
 
-const getJobGroup = () => {
+export const jobGroup = createCronJobGroup({
-  return createCronJobGroup({
+  analytics: analyticsJob,
-    analytics: analyticsJob,
+  iconsUpdater: iconsUpdaterJob,
-    iconsUpdater: iconsUpdaterJob,
+  ping: pingJob,
-    ping: pingJob,
+  smartHomeEntityState: smartHomeEntityStateJob,
-    smartHomeEntityState: smartHomeEntityStateJob,
+  mediaServer: mediaServerJob,
-    mediaServer: mediaServerJob,
+  mediaOrganizer: mediaOrganizerJob,
-    mediaOrganizer: mediaOrganizerJob,
+  downloads: downloadsJob,
-    downloads: downloadsJob,
+  dnsHole: dnsHoleJob,
-    dnsHole: dnsHoleJob,
+  mediaRequestStats: mediaRequestStatsJob,
-    mediaRequestStats: mediaRequestStatsJob,
+  mediaRequestList: mediaRequestListJob,
-    mediaRequestList: mediaRequestListJob,
+  rssFeeds: rssFeedsJob,
-    rssFeeds: rssFeedsJob,
+  indexerManager: indexerManagerJob,
-    indexerManager: indexerManagerJob,
+  healthMonitoring: healthMonitoringJob,
-    healthMonitoring: healthMonitoringJob,
+  updateChecker: updateCheckerJob,
-    updateChecker: updateCheckerJob,
+  mediaTranscoding: mediaTranscodingJob,
-    mediaTranscoding: mediaTranscodingJob,
+  minecraftServerStatus: minecraftServerStatusJob,
-    minecraftServerStatus: minecraftServerStatusJob,
+  dockerContainers: dockerContainersJob,
-    dockerContainers: dockerContainersJob,
+  networkController: networkControllerJob,
-    networkController: networkControllerJob,
+  firewallCpu: firewallCpuJob,
-    firewallCpu: firewallCpuJob,
+  firewallMemory: firewallMemoryJob,
-    firewallMemory: firewallMemoryJob,
+  firewallVersion: firewallVersionJob,
-    firewallVersion: firewallVersionJob,
+  firewallInterfaces: firewallInterfacesJob,
-    firewallInterfaces: firewallInterfacesJob,
+  refreshNotifications: refreshNotificationsJob,
-    refreshNotifications: refreshNotificationsJob,
+  weather: weatherJob,
-    weather: weatherJob,
+  timetable: timetableJob,
-    timetable: timetableJob,
+  tracearr: tracearrJob,
-    tracearr: tracearrJob,
+  umamiActiveVisitors: umamiActiveVisitorsJob,
-  });
+});
-};
-
-// Add global type augmentation for homarr
-declare global {
-  var cronJobs: ReturnType<typeof getJobGroup> | undefined;
-}
-
-global.cronJobs ??= getJobGroup();
-
-export const jobGroup = global.cronJobs;
 
 export type JobGroupKeys = ReturnType<(typeof jobGroup)["getKeys"]>[number];
-export * from "./schemas";

packages/cron-jobs/src/jobs/icons-updater.ts

@@ -1,9 +1,12 @@
+import type { MySqlRawQueryResult } from "drizzle-orm/mysql2";
+import type { QueryResult } from "pg";
+
 import { createId, splitToNChunks, Stopwatch } from "@homarr/common";
 import { env } from "@homarr/common/env";
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import { EVERY_WEEK } from "@homarr/cron-jobs-core/expressions";
 import type { InferInsertModel } from "@homarr/db";
-import { db, handleTransactionsAsync, inArray, sql } from "@homarr/db";
+import { and, db, eq, handleTransactionsAsync, inArray, notInArray, or } from "@homarr/db";
 import { iconRepositories, icons } from "@homarr/db/schema";
 import { fetchIconsAsync } from "@homarr/icons";
 
@@ -26,7 +29,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
   logger.info("Fetched icons from repositories", {
     repositoryCount: repositoryIconGroups.length,
     iconCount: countIcons,
-    duration: stopWatch.getElapsedInHumanWords(),
+    duration: stopWatch.getElapsedInFormattedMilliseconds(),
   });
 
   const databaseIconRepositories = await db.query.iconRepositories.findMany({
@@ -35,7 +38,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
     },
   });
 
-  const skippedChecksums: `${string}.${string}`[] = [];
+  const skippedChecksums = new Map<string, string[]>();
   let countDeleted = 0;
   let countInserted = 0;
 
@@ -50,6 +53,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
     if (!repositoryIconGroup.success) {
       continue;
     }
+    const localSkippedChecksums: string[] = [];
 
     const repositoryInDb = databaseIconRepositories.find(
       (dbIconGroup) => dbIconGroup.slug === repositoryIconGroup.slug,
@@ -66,7 +70,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
 
     for (const icon of repositoryIconGroup.icons) {
       if (dbIconsInRepository.some((dbIcon) => dbIcon.checksum === icon.checksum)) {
-        skippedChecksums.push(`${iconRepositoryId}.${icon.checksum}`);
+        localSkippedChecksums.push(icon.checksum);
         continue;
       }
 
@@ -79,38 +83,28 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
       });
       countInserted++;
     }
-  }
 
-  const deadIcons = allDbIcons.filter(
+    skippedChecksums.set(iconRepositoryId, localSkippedChecksums);
-    (icon) => !skippedChecksums.includes(`${icon.iconRepositoryId}.${icon.checksum}`),
+  }
-  );
 
   const deadIconRepositories = databaseIconRepositories.filter(
     (iconRepository) => !repositoryIconGroups.some((group) => group.slug === iconRepository.slug),
   );
 
+  const deadIconsFilter = or(
+    ...[...skippedChecksums.entries()].map(([iconRepositoryId, checksums]) =>
+      and(eq(icons.iconRepositoryId, iconRepositoryId), notInArray(icons.checksum, checksums)),
+    ),
+  );
+
   await handleTransactionsAsync(db, {
     async handleAsync(db, schema) {
       await db.transaction(async (transaction) => {
-        if (newIconRepositories.length >= 1) {
+        const result = (await transaction.delete(schema.icons).where(deadIconsFilter)) as
-          await transaction.insert(schema.iconRepositories).values(newIconRepositories);
+          | MySqlRawQueryResult
-        }
+          | QueryResult;
 
-        if (newIcons.length >= 1) {
+        countDeleted += Array.isArray(result) ? result[0].affectedRows : (result.rowCount ?? 0);
-          // We only insert 5000 icons at a time to avoid SQLite limitations
-          for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
-            await transaction.insert(schema.icons).values(chunck);
-          }
-        }
-        if (deadIcons.length >= 1) {
-          await transaction.delete(schema.icons).where(
-            inArray(
-              // Combine iconRepositoryId and checksum to allow same icons on different repositories
-              sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
-              deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
-            ),
-          );
-        }
 
         if (deadIconRepositories.length >= 1) {
           await transaction.delete(schema.iconRepositories).where(
@@ -121,33 +115,22 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
           );
         }
 
-        countDeleted += deadIcons.length;
-      });
-    },
-    handleSync() {
-      db.transaction((transaction) => {
         if (newIconRepositories.length >= 1) {
-          transaction.insert(iconRepositories).values(newIconRepositories).run();
+          await transaction.insert(schema.iconRepositories).values(newIconRepositories);
         }
 
         if (newIcons.length >= 1) {
           // We only insert 5000 icons at a time to avoid SQLite limitations
           for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
-            transaction.insert(icons).values(chunck).run();
+            await transaction.insert(schema.icons).values(chunck);
           }
         }
-        if (deadIcons.length >= 1) {
+      });
-          transaction
+    },
-            .delete(icons)
+    handleSync() {
-            .where(
+      db.transaction((transaction) => {
-              inArray(
+        const result = transaction.delete(icons).where(deadIconsFilter).run();
-                // Combine iconRepositoryId and checksum to allow same icons on different repositories
+        countDeleted += result.changes;
-                sql`concat(${icons.iconRepositoryId}, '.', ${icons.checksum})`,
-                deadIcons.map((icon) => `${icon.iconRepositoryId}.${icon.checksum}`),
-              ),
-            )
-            .run();
-        }
 
         if (deadIconRepositories.length >= 1) {
           transaction
@@ -161,13 +144,22 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
             .run();
         }
 
-        countDeleted += deadIcons.length;
+        if (newIconRepositories.length >= 1) {
+          transaction.insert(iconRepositories).values(newIconRepositories).run();
+        }
+
+        if (newIcons.length >= 1) {
+          // We only insert 5000 icons at a time to avoid SQLite limitations
+          for (const chunck of splitToNChunks(newIcons, Math.ceil(newIcons.length / 5000))) {
+            transaction.insert(icons).values(chunck).run();
+          }
+        }
       });
     },
   });
 
   logger.info("Updated icons in database", {
-    duration: stopWatch.getElapsedInHumanWords(),
+    duration: stopWatch.getElapsedInFormattedMilliseconds(),
     added: countInserted,
     deleted: countDeleted,
   });

packages/cron-jobs/src/jobs/integrations/umami.ts

@@ -0,0 +1,14 @@
+import { EVERY_30_SECONDS } from "@homarr/cron-jobs-core/expressions";
+import { createRequestIntegrationJobHandler } from "@homarr/request-handler/lib/cached-request-integration-job-handler";
+import { umamiActiveVisitorsRequestHandler } from "@homarr/request-handler/umami";
+
+import { createCronJob } from "../../lib";
+
+export const umamiActiveVisitorsJob = createCronJob("umamiActiveVisitors", EVERY_30_SECONDS).withCallback(
+  createRequestIntegrationJobHandler(umamiActiveVisitorsRequestHandler.handler, {
+    widgetKinds: ["umami"],
+    getInput: {
+      umami: (options) => (options.websiteId ? { websiteId: options.websiteId } : []),
+    },
+  }),
+);

packages/cron-jobs/src/schemas.ts

@@ -1,6 +0,0 @@
-import { validate } from "node-cron";
-import z from "zod";
-
-export const cronExpressionSchema = z.string().refine((expression) => validate(expression), {
-  error: "Invalid cron expression",
-});

packages/db/migrations/mysql/0038_add_user_ddg_bangs.sql

@@ -0,0 +1 @@
+ALTER TABLE `user` ADD `ddg_bangs` boolean DEFAULT true NOT NULL;

packages/db/migrations/mysql/meta/_journal.json

@@ -267,6 +267,13 @@
       "when": 1775399941430,
       "tag": "0037_remove_salt",
       "breakpoints": true
+    },
+    {
+      "idx": 38,
+      "version": "5",
+      "when": 1775400000000,
+      "tag": "0038_add_user_ddg_bangs",
+      "breakpoints": true
     }
   ]
 }

packages/db/migrations/postgresql/0004_add_user_ddg_bangs.sql

@@ -0,0 +1 @@
+ALTER TABLE "user" ADD COLUMN "ddg_bangs" boolean DEFAULT true NOT NULL;

packages/db/migrations/postgresql/meta/_journal.json

@@ -29,6 +29,13 @@
       "when": 1775399963041,
       "tag": "0003_remove_salt",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "7",
+      "when": 1775400000000,
+      "tag": "0004_add_user_ddg_bangs",
+      "breakpoints": true
     }
   ]
 }

packages/db/migrations/seed.ts

@@ -4,6 +4,7 @@ import {
   everyoneGroup,
   getIntegrationDefaultUrl,
   getIntegrationName,
+  integrationDefs,
   integrationKinds,
 } from "@homarr/definitions";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
@@ -143,8 +144,9 @@ const seedDefaultIntegrationsAsync = async (db: Database) => {
   const defaultIntegrations = integrationKinds.reduce<Integration[]>((acc, kind) => {
     const name = getIntegrationName(kind);
     const defaultUrl = getIntegrationDefaultUrl(kind);
+    const hasNoAuthOption = integrationDefs[kind].secretKinds.some((kinds) => kinds.length === 0);
 
-    if (defaultUrl !== undefined) {
+    if (defaultUrl !== undefined && hasNoAuthOption) {
       acc.push({
         id: "new",
         name: `${name} Default`,

packages/db/migrations/sqlite/0036_add_user_ddg_bangs.sql

@@ -0,0 +1 @@
+ALTER TABLE `user` ADD `ddg_bangs` integer DEFAULT true NOT NULL;

packages/db/migrations/sqlite/meta/_journal.json

@@ -253,6 +253,13 @@
       "when": 1775399918831,
       "tag": "0035_remove_salt",
       "breakpoints": true
+    },
+    {
+      "idx": 36,
+      "version": "6",
+      "when": 1775400000000,
+      "tag": "0036_add_user_ddg_bangs",
+      "breakpoints": true
     }
   ]
 }

packages/db/package.json

@@ -37,6 +37,8 @@
     "push:sqlite": "pnpm with-env drizzle-kit push --config ./configs/sqlite.config.ts",
     "seed": "pnpm with-env tsx ./migrations/run-seed.ts",
     "studio": "pnpm with-env drizzle-kit studio --config ./configs/sqlite.config.ts",
+    "studio:mysql": "pnpm with-env drizzle-kit studio --config ./configs/mysql.config.ts",
+    "studio:postgresql": "pnpm with-env drizzle-kit studio --config ./configs/postgresql.config.ts",
     "typecheck": "tsc --noEmit",
     "with-env": "dotenv -e ../../.env --"
   },

packages/db/schema/index.ts

@@ -1,6 +1,6 @@
 import type { InferSelectModel } from "drizzle-orm";
 
-import { createSchema } from "@homarr/core/infrastructure/db";
+import { createDbMapping as createSchema } from "@homarr/core/infrastructure/db/mapping";
 
 import * as mysqlSchema from "./mysql";
 import * as pgSchema from "./postgresql";

packages/db/schema/mysql.ts

@@ -76,6 +76,7 @@ export const users = mysqlTable("user", {
     onDelete: "set null",
   }),
   openSearchInNewTab: boolean().default(false).notNull(),
+  ddgBangs: boolean().default(true).notNull(),
   colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
   firstDayOfWeek: tinyint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
   pingIconsEnabled: boolean().default(false).notNull(),

packages/db/schema/postgresql.ts

@@ -75,6 +75,7 @@ export const users = pgTable("user", {
     onDelete: "set null",
   }),
   openSearchInNewTab: boolean().default(false).notNull(),
+  ddgBangs: boolean().default(true).notNull(),
   colorScheme: varchar({ length: 5 }).$type<ColorScheme>().default("dark").notNull(),
   firstDayOfWeek: smallint().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
   pingIconsEnabled: boolean().default(false).notNull(),

packages/db/schema/sqlite.ts

@@ -58,6 +58,7 @@ export const users = sqliteTable("user", {
     onDelete: "set null",
   }),
   openSearchInNewTab: int({ mode: "boolean" }).default(true).notNull(),
+  ddgBangs: int({ mode: "boolean" }).default(true).notNull(),
   colorScheme: text().$type<ColorScheme>().default("dark").notNull(),
   firstDayOfWeek: int().$type<DayOfWeek>().default(1).notNull(), // Defaults to Monday
   pingIconsEnabled: int({ mode: "boolean" }).default(false).notNull(),

packages/definitions/src/integration.ts

@@ -61,7 +61,7 @@ export const integrationDefs = {
   },
   qBittorrent: {
     name: "qBittorrent",
-    secretKinds: [["username", "password"]],
+    secretKinds: [["apiKey"], ["username", "password"]],
     iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/qbittorrent.svg",
     category: ["downloadClient", "torrent"],
     documentationUrl: createDocumentationLink("/docs/integrations/q-bittorent"),
@@ -370,6 +370,15 @@ export const integrationDefs = {
     category: ["speedtest"],
     documentationUrl: createDocumentationLink("/docs/integrations/speedtest-tracker"),
   },
+  umami: {
+    name: "Umami",
+    secretKinds: [["username", "password"], ["apiKey"]],
+    iconUrl: "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons@master/svg/umami.svg",
+    category: ["analytics"],
+    defaultUrl: "https://api.umami.is/v1",
+    // @ts-expect-error - docs page will be created when integration is merged
+    documentationUrl: createDocumentationLink("/docs/integrations/umami"),
+  },
   // This integration only returns mock data, it is used during development (but can also be used in production by directly going to the create page)
   mock: {
     name: "Mock",
@@ -461,6 +470,7 @@ export const integrationCategories = [
   "notes",
   "mediaMonitoring",
   "speedtest",
+  "analytics",
 ] as const;
 
 export type IntegrationCategory = (typeof integrationCategories)[number];

packages/definitions/src/user.ts

@@ -1,2 +1,2 @@
-export const colorSchemes = ["light", "dark"] as const;
+export const colorSchemes = ["auto", "light", "dark"] as const;
 export type ColorScheme = (typeof colorSchemes)[number];