fix(tasks): remove trpc cron-job api on port 3002

Co-authored-by: Copilot <copilot@github.com>

.cursor/rules/codebase-context.mdc

@@ -1,191 +0,0 @@
----
-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

@@ -41,12 +41,6 @@ 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,9 +33,6 @@ body:
       options:
         # The below comment is used to insert a new version with on-release.yml
         #NEXT_VERSION#
-        - 1.61.0
-        - 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 }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-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/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
 
 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 }}
-          client-id: ${{ secrets.CROWDIN_APP_ID }}
+          app-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

@@ -1,104 +0,0 @@
-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

@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - beta
-      - next
       - dev
   workflow_dispatch:
     inputs:
@@ -35,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     env:
-      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' || github.ref_name == 'next' }}
+      SKIP_RELEASE: ${{ github.event_name == 'workflow_dispatch' || github.ref_name == 'dev' }}
     outputs:
       version: ${{ steps.read-semver.outputs.version || steps.version-fallback.outputs.version }}
       git_ref: ${{ steps.read-git-ref.outputs.ref || github.ref }}
@@ -54,8 +53,8 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
-          permission-contents: write # required to commit package.json & changelog changes, merge them to dev / next and publish the release
+          permission-contents: write # required to commit package.json & changelog changes, merge them to dev and publish the release
 
       - uses: actions/checkout@v6
         if: env.SKIP_RELEASE == 'false'
@@ -67,7 +66,7 @@ jobs:
         if: env.SKIP_RELEASE == 'false'
         with:
           node-version: 24.15.0
-          package-manager-cache: false
+          cache: "pnpm"
       - run: npm i -g pnpm
         if: env.SKIP_RELEASE == 'false'
       - name: Install dependencies
@@ -96,21 +95,20 @@ jobs:
         id: read-git-ref
         run: |
           echo "ref=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-      - name: Update dev / next branch
+      - name: Update dev branch
         if: env.SKIP_RELEASE == 'false'
         continue-on-error: true # Prevent pipeline from failing when merge fails
         env:
           GITHUB_TOKEN: ${{ steps.obtainToken.outputs.token }}
-          UPSTREAM_BRANCH: ${{ github.ref_name == 'main' && 'dev' || 'next' }}
         run: |
           git config user.name "Releases Homarr"
           git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
           git remote set-url origin https://x-access-token:${{ steps.obtainToken.outputs.token }}@github.com/${{ github.repository }}.git
-          git fetch origin ${{ env.UPSTREAM_BRANCH }}
+          git fetch origin dev
-          git checkout ${{ env.UPSTREAM_BRANCH }}
+          git checkout dev
-          git pull origin ${{ env.UPSTREAM_BRANCH }}
+          git pull origin dev
           git rebase ${{ github.ref_name }}
-          git push origin ${{ env.UPSTREAM_BRANCH }}
+          git push origin dev
   build-amd64:
     name: Build docker image for amd64
     needs: release
@@ -193,7 +191,7 @@ jobs:
     name: Extract amd64 asset from docker image
     needs: [release, build-amd64]
     runs-on: ubuntu-latest
-    timeout-minutes: 5
+    timeout-minutes: 2
     steps:
       - name: Extract amd64
         if: needs.release.outputs.skipped == 'false'
@@ -209,7 +207,7 @@ jobs:
     name: Extract arm64 asset from docker image
     needs: [release, build-arm64]
     runs-on: ubuntu-24.04-arm
-    timeout-minutes: 5
+    timeout-minutes: 2
     steps:
       - name: Extract arm64
         if: needs.release.outputs.skipped == 'false'
@@ -236,7 +234,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
           permission-contents: write # required to publish the release
 
       - name: Log in to the Container registry
@@ -276,6 +274,6 @@ jobs:
       - name: Discord notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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,15 +38,14 @@ 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.event.inputs.send-notifications }}
+        if: ${{ github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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
@@ -54,7 +53,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_APPROVE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
+          app-id: ${{ secrets.RENOVATE_APPROVE_APP_ID }}
           permission-pull-requests: write
       - name: Approve PR
         env:
@@ -66,7 +65,7 @@ jobs:
         uses: actions/create-github-app-token@v3
         with:
           private-key: ${{ secrets.RENOVATE_MERGE_PRIVATE_KEY }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-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
@@ -75,7 +74,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 main
+          MERGE_METHOD: merge # we prefer merge commits for merging to master
           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 }}"
@@ -84,23 +83,23 @@ jobs:
           MERGE_REQUIRED_APPROVALS: 0 # do not require approvals
 
       - name: Merged Discord notification
-        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.event.inputs.send-notifications }}
+        if: ${{ steps.automerge.outputs.mergeResult == 'merged' && github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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.event.inputs.send-notifications }}
+        if: ${{ steps.semver.outputs.bump == 'major' && github.events.inputs.send-notifications }}
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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.event.inputs.send-notifications
+        if: failure() && github.events.inputs.send-notifications
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-        uses: Ilshidur/action-discord@0.4.0
+        uses: Ilshidur/action-discord@master
         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 }}
-          client-id: ${{ vars.HOMARR_DOCS_RELEASE_APP_ID }}
+          app-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 }}
-          client-id: ${{ secrets.RENOVATE_MERGE_APP_ID }}
+          app-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 }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-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 }}
-          client-id: ${{ vars.HOMARR_UPDATE_CONTRIBUTORS_APP_ID }}
+          app-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

.gitignore

@@ -71,4 +71,4 @@ en.d.json.ts
 
 # personal agent config
 AGENTS.md
-.opencode
+.opencode

CODEOWNERS

@@ -3,11 +3,7 @@
 
 # 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

apps/nextjs/eslint.config.js

@@ -10,21 +10,4 @@ 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

@@ -32,8 +32,6 @@ const nextConfig: NextConfig = {
   experimental: {
     optimizePackageImports: ["@mantine/core", "@mantine/hooks", "@tabler/icons-react"],
     turbopackFileSystemCacheForDev: true,
-    preloadEntriesOnStart: false,
-    webpackMemoryOptimizations: true,
   },
   transpilePackages: ["@homarr/ui", "@homarr/notifications", "@homarr/modals", "@homarr/spotlight", "@homarr/widgets"],
   images: {
@@ -44,18 +42,9 @@ 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/public/sw.js

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

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

@@ -8,12 +8,13 @@ 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: MantineColorScheme }>) => {
+}: PropsWithChildren<{ defaultColorScheme: ColorScheme }>) => {
   const manager = useColorSchemeManager();
   return (
     <DirectionProvider>
@@ -34,7 +35,7 @@ export const CustomMantineProvider = ({
 export function useColorSchemeManager(): MantineColorSchemeManager {
   const { data: session } = useSession();
 
-  const updateCookieValue = (value: MantineColorScheme) => {
+  const updateCookieValue = (value: Exclude<MantineColorScheme, "auto">) => {
     setClientCookie(colorSchemeCookieKey, value, { expires: dayjs().add(1, "year").toDate(), path: "/" });
   };
 
@@ -59,6 +60,7 @@ export function useColorSchemeManager(): MantineColorSchemeManager {
     },
 
     set: (value) => {
+      if (value === "auto") return;
       try {
         if (session) {
           mutateColorScheme({ colorScheme: value });

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

@@ -4,7 +4,6 @@ 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";
@@ -26,7 +25,6 @@ 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";
@@ -131,7 +129,7 @@ export default async function Layout(props: {
       dir={direction}
       data-mantine-color-scheme={colorScheme}
       style={{
-        backgroundColor: colorScheme === "dark" ? "#242424" : colorScheme === "auto" ? undefined : "#fff",
+        backgroundColor: colorScheme === "dark" ? "#242424" : "#fff",
       }}
       suppressHydrationWarning
     >
@@ -143,7 +141,6 @@ 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 { IconDeviceDesktop, IconMoon, IconSun } from "@tabler/icons-react";
+import { IconMoon, IconSun } from "@tabler/icons-react";
 
 import type { ColorScheme } from "@homarr/definitions";
 import { colorSchemes } from "@homarr/definitions";
@@ -34,7 +34,6 @@ 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,18 +58,6 @@ 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,7 +26,6 @@ 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"),
@@ -42,7 +41,6 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
     initialValues: {
       defaultSearchEngineId: user.defaultSearchEngineId,
       openInNewTab: user.openSearchInNewTab,
-      ddgBangsEnabled: user.ddgBangs,
     },
   });
 
@@ -66,10 +64,6 @@ 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

@@ -1,94 +0,0 @@
-"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,17 +1,49 @@
 "use client";
 
-import { useMantineColorScheme } from "@mantine/core";
+import { Group, Text, useMantineColorScheme } from "@mantine/core";
+import { IconMoon, IconSun } from "@tabler/icons-react";
 
 import type { ColorScheme } from "@homarr/definitions";
-
+import { colorSchemes } from "@homarr/definitions";
-import { ColorSchemeCombobox } from "./color-scheme-combobox";
+import { useScopedI18n } from "@homarr/translation/client";
+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 <ColorSchemeCombobox value={colorScheme as ColorScheme} onChange={setColorScheme} width={w} />;
+  return (
+    <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

@@ -1,14 +0,0 @@
-"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,7 +5,16 @@ 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 { IconCheck, IconHome, IconLogin, IconLogout, IconSettings, IconTool } from "@tabler/icons-react";
+import {
+  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";
@@ -15,7 +24,6 @@ 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";
 
@@ -26,9 +34,13 @@ interface UserAvatarMenuProps {
 
 export const UserAvatarMenu = ({ children, availableUpdatesPromise }: UserAvatarMenuProps) => {
   const t = useScopedI18n("common.userAvatar.menu");
-  const { toggleColorScheme } = useMantineColorScheme();
+  const { colorScheme, 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();
 
@@ -55,14 +67,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/styles/color-scheme.scss

@@ -1,12 +0,0 @@
-// 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

@@ -35,7 +35,6 @@
     "@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:",

deployments/prebuilt-debian/package.json

@@ -4,10 +4,10 @@
   "dependencies": {
     "better-sqlite3": "^12.9.0"
   },
-  "packageManager": "pnpm@10.33.4",
+  "packageManager": "pnpm@10.33.2",
   "engines": {
     "node": ">=24.15.0",
-    "pnpm": ">=10.33.4"
+    "pnpm": ">=10.33.2"
   },
   "pnpm": {
     "onlyBuiltDependencies": [

docs/README.md

@@ -372,13 +372,6 @@
 </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.61.1-beta.1",
+  "version": "1.59.3",
   "private": true,
   "scripts": {
     "build": "cross-env CI=true turbo build",
@@ -59,10 +59,10 @@
     "vite-tsconfig-paths": "catalog:",
     "vitest": "catalog:"
   },
-  "packageManager": "pnpm@10.33.4",
+  "packageManager": "pnpm@10.33.2",
   "engines": {
     "node": ">=24.15.0",
-    "pnpm": ">=10.33.4"
+    "pnpm": ">=10.33.2"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -79,23 +79,23 @@
     "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.16.0",
+      "axios@>=1.0.0 <1.8.2": ">=1.15.2",
-      "brace-expansion@>=2.0.0 <=2.0.1": ">=5.0.6",
+      "brace-expansion@>=2.0.0 <=2.0.1": ">=5.0.5",
-      "brace-expansion@>=1.0.0 <=1.1.11": ">=5.0.6",
+      "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.16",
+      "hono@<4.6.5": ">=4.12.15",
       "linkifyjs@<4.3.2": ">=4.3.2",
-      "nanoid@>=4.0.0 <5.0.9": ">=5.1.11",
+      "nanoid@>=4.0.0 <5.0.9": ">=5.1.9",
       "prismjs@<1.30.0": ">=1.30.0",
       "proxmox-api>undici": "7.24.6",
-      "react-is": "^19.2.6",
+      "react-is": "^19.2.5",
-      "rollup@>=4.0.0 <4.22.4": ">=4.60.3",
+      "rollup@>=4.0.0 <4.22.4": ">=4.60.2",
       "sha.js@<=2.4.11": ">=2.4.12",
       "tar-fs@>=3.0.0 <3.0.9": ">=3.1.2",
       "tar-fs@>=2.0.0 <2.1.3": ">=3.1.2",
       "tmp@<=0.2.3": ">=0.2.5",
-      "vite@>=5.0.0 <=5.4.18": ">=8.0.11"
+      "vite@>=5.0.0 <=5.4.18": ">=8.0.10"
     },
     "patchedDependencies": {
       "@types/node-unifi": "patches/@types__node-unifi.patch",

packages/api/src/root.ts

@@ -26,7 +26,6 @@ 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

@@ -1,17 +0,0 @@
-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

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

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

@@ -138,7 +138,6 @@ 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,7 +21,6 @@ import {
   userChangePasswordApiSchema,
   userChangeSearchPreferencesSchema,
   userCreateSchema,
-  userDdgBangsSchema,
   userEditProfileSchema,
   userFirstDayOfWeekSchema,
   userInitSchema,
@@ -111,7 +110,7 @@ export const userRouter = createTRPCRouter({
             const queryResult = (await trx.delete(schema.invites).where(inviteWhere)) as
               | QueryResult
               | MySqlRawQueryResult;
-            let count: number;
+            let count = 0;
             if (Array.isArray(queryResult)) {
               count = queryResult[0].affectedRows;
             } else {
@@ -277,7 +276,6 @@ export const userRouter = createTRPCRouter({
         pingIconsEnabled: true,
         defaultSearchEngineId: true,
         openSearchInNewTab: true,
-        ddgBangs: true,
       }),
     )
     .meta({ openapi: { method: "GET", path: "/api/users/{userId}", tags: ["users"], protect: true } })
@@ -303,7 +301,6 @@ export const userRouter = createTRPCRouter({
           pingIconsEnabled: true,
           defaultSearchEngineId: true,
           openSearchInNewTab: true,
-          ddgBangs: true,
         },
         where: eq(users.id, input.userId),
       });
@@ -544,33 +541,6 @@ 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,13 +15,10 @@ export const changeSearchPreferencesInputSchema = userChangeSearchPreferencesSch
 export const changeSearchPreferencesAsync = async (
   db: Database,
   session: Session,
-  input: Modify<
+  input: Modify<z.infer<typeof changeSearchPreferencesInputSchema>, { openInNewTab: boolean | undefined }>,
-    z.infer<typeof changeSearchPreferencesInputSchema>,
-    { openInNewTab: boolean | undefined; ddgBangsEnabled: boolean | undefined }
-  >,
 ) => {
   const user = session.user;
-  // Only admins can change other users search preferences
+  // Only admins can change other users passwords
   if (!user.permissions.includes("admin") && user.id !== input.userId) {
     throw new TRPCError({
       code: "NOT_FOUND",
@@ -48,7 +45,6 @@ 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,8 +2,6 @@ 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";
@@ -14,8 +12,6 @@ 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(
@@ -28,7 +24,7 @@ export const calendarRouter = createTRPCRouter({
     )
     .concat(createManyIntegrationMiddleware("query", ...getIntegrationKindsByCategory("calendar")))
     .query(async ({ ctx, input }) => {
-      const settled = await Promise.allSettled(
+      return await Promise.all(
         ctx.integrations.map(async (integration) => {
           const { integrationIds: _integrationIds, ...handlerInput } = input;
           const innerHandler = calendarMonthRequestHandler.handler(integration, handlerInput);
@@ -44,24 +40,6 @@ 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,5 +30,4 @@ 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

@@ -1,205 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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: "auto",
+      colorScheme: "dark",
     },
   } as Session;
 };

packages/common/src/stopwatch.ts

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

packages/cron-jobs-core/package.json

@@ -27,12 +27,13 @@
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/core": "workspace:^",
     "@homarr/db": "workspace:^0.1.0",
-    "croner": "catalog:"
+    "node-cron": "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 { Cron } from "croner";
+import { createTask, validate } from "node-cron";
 
 import { Stopwatch } from "@homarr/common";
 import type { MaybePromise } from "@homarr/common/types";
@@ -83,15 +83,10 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
           ? defaultCronExpression
           : (configuration?.cronExpression ?? defaultCronExpression);
 
-        const scheduledTask = new Cron(
+        const scheduledTask = createTask(cronExpression, () => void catchingCallbackAsync(), {
-          cronExpression,
+          name,
-          {
+          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,
@@ -121,7 +116,6 @@ const createCallback = <TAllowedNames extends string, TName extends TAllowedName
       },
       preventManualExecution: options.preventManualExecution ?? false,
       preventCustomInterval: options.preventCustomInterval ?? false,
-      timezone: creatorOptions.timezone,
     };
   };
 };
@@ -138,6 +132,13 @@ 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 { Cron } from "croner";
+import type { ScheduledTask } from "node-cron";
 
 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, Cron>();
+    const tasks = new Map<string, ScheduledTask>();
 
     return {
       initializeAsync: async () => {
@@ -62,7 +62,7 @@ export const createJobGroupCreator = <TAllowedNames extends string = string>(
           name: job.name,
         });
         await job.onStartAsync();
-        tasks.get(name as string)?.resume();
+        await tasks.get(name as string)?.start();
       },
       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();
-          tasks.get(job.name)?.resume();
+          await tasks.get(job.name)?.start();
         }
       },
       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)?.trigger();
+        await tasks.get(name as string)?.execute();
       },
-      stop: (name: keyof TJobs) => {
+      stopAsync: async (name: keyof TJobs) => {
         const job = jobRegistry.get(name as string);
         if (!job) return;
 
         options.logger.logInfo("Stopping schedule of cron job.", {
           name: job.name,
         });
-        tasks.get(name as string)?.pause();
+        await tasks.get(name as string)?.stop();
       },
-      stopAll: () => {
+      stopAllAsync: async () => {
         for (const job of jobRegistry.values()) {
           options.logger.logInfo("Stopping schedule of cron job.", {
             name: job.name,
           });
-          tasks.get(job.name)?.pause();
+          await tasks.get(job.name)?.stop();
         }
       },
       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, cron: Cron) {
+      setTask(name: keyof TJobs, task: ScheduledTask) {
-        tasks.set(name as string, cron);
+        tasks.set(name as string, task);
       },
       getKeys() {
         return objectKeys(jobs);

packages/cron-jobs/package.json

@@ -39,6 +39,7 @@
     "@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:",
     "zod": "catalog:"
   },
@@ -46,6 +47,7 @@
     "@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,7 +20,6 @@ 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";
@@ -56,7 +55,6 @@ const getJobGroup = () => {
     weather: weatherJob,
     timetable: timetableJob,
     tracearr: tracearrJob,
-    umamiActiveVisitors: umamiActiveVisitorsJob,
   });
 };
 
@@ -70,3 +68,4 @@ global.cronJobs ??= getJobGroup();
 export const jobGroup = global.cronJobs;
 
 export type JobGroupKeys = ReturnType<(typeof jobGroup)["getKeys"]>[number];
+export * from "./schemas";

packages/cron-jobs/src/job-manager.ts

@@ -1,4 +1,4 @@
-import { Cron } from "croner";
+import { schedule, validate as validateCron } from "node-cron";
 
 import { createLogger } from "@homarr/core/infrastructure/logs";
 import type { jobGroup as cronJobGroup, JobGroupKeys } from "@homarr/cron-jobs";
@@ -20,31 +20,28 @@ export class JobManager {
   public async triggerAsync(name: JobGroupKeys): Promise<void> {
     await this.jobGroup.runManuallyAsync(name);
   }
-  public stop(name: JobGroupKeys): void {
+  public async stopAsync(name: JobGroupKeys): Promise<void> {
-    this.jobGroup.stop(name);
+    await this.jobGroup.stopAsync(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}`);
     }
 
-    const updatedConfig = await this.updateConfigurationAsync(name, { cronExpression: cron });
+    await this.updateConfigurationAsync(name, { cronExpression: cron });
-    this.jobGroup.getTask(name)?.stop();
+    await this.jobGroup.getTask(name)?.destroy();
 
     this.jobGroup.setTask(
       name,
-      new Cron(
+      schedule(cron, () => void job.executeAsync(), {
-        cron,
+        name,
-        {
+      }),
-          name,
-          timezone: job.timezone,
-          paused: !updatedConfig.isEnabled,
-        },
-        () => void job.executeAsync(),
-      ),
     );
     logger.info("Cron job interval updated", { name, expression: cron });
   }
@@ -54,7 +51,7 @@ export class JobManager {
     if (!job) throw new Error(`Job ${name} not found`);
 
     await this.updateConfigurationAsync(name, { isEnabled: false });
-    this.jobGroup.stop(name);
+    await this.jobGroup.stopAsync(name);
     logger.info("Cron job disabled", { name });
   }
   public async enableAsync(name: JobGroupKeys): Promise<void> {
@@ -88,27 +85,21 @@ 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`);
 
-    const updatedConfig = {
+    await this.db.insert(cronJobConfigurations).values({
       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<

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

@@ -1,12 +1,9 @@
-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 { and, db, eq, handleTransactionsAsync, inArray, notInArray, or } from "@homarr/db";
+import { db, handleTransactionsAsync, inArray, sql } from "@homarr/db";
 import { iconRepositories, icons } from "@homarr/db/schema";
 import { fetchIconsAsync } from "@homarr/icons";
 
@@ -29,7 +26,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
   logger.info("Fetched icons from repositories", {
     repositoryCount: repositoryIconGroups.length,
     iconCount: countIcons,
-    duration: stopWatch.getElapsedInFormattedMilliseconds(),
+    duration: stopWatch.getElapsedInHumanWords(),
   });
 
   const databaseIconRepositories = await db.query.iconRepositories.findMany({
@@ -38,7 +35,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
     },
   });
 
-  const skippedChecksums = new Map<string, string[]>();
+  const skippedChecksums: `${string}.${string}`[] = [];
   let countDeleted = 0;
   let countInserted = 0;
 
@@ -53,7 +50,6 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
     if (!repositoryIconGroup.success) {
       continue;
     }
-    const localSkippedChecksums: string[] = [];
 
     const repositoryInDb = databaseIconRepositories.find(
       (dbIconGroup) => dbIconGroup.slug === repositoryIconGroup.slug,
@@ -70,7 +66,7 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
 
     for (const icon of repositoryIconGroup.icons) {
       if (dbIconsInRepository.some((dbIcon) => dbIcon.checksum === icon.checksum)) {
-        localSkippedChecksums.push(icon.checksum);
+        skippedChecksums.push(`${iconRepositoryId}.${icon.checksum}`);
         continue;
       }
 
@@ -83,38 +79,19 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
       });
       countInserted++;
     }
-
-    skippedChecksums.set(iconRepositoryId, localSkippedChecksums);
   }
 
+  const deadIcons = allDbIcons.filter(
+    (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) => {
-        const result = (await transaction.delete(schema.icons).where(deadIconsFilter)) as
-          | MySqlRawQueryResult
-          | QueryResult;
-
-        countDeleted += Array.isArray(result) ? result[0].affectedRows : (result.rowCount ?? 0);
-
-        if (deadIconRepositories.length >= 1) {
-          await transaction.delete(schema.iconRepositories).where(
-            inArray(
-              iconRepositories.id,
-              deadIconRepositories.map((iconRepository) => iconRepository.id),
-            ),
-          );
-        }
-
         if (newIconRepositories.length >= 1) {
           await transaction.insert(schema.iconRepositories).values(newIconRepositories);
         }
@@ -125,12 +102,52 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
             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(
+            inArray(
+              iconRepositories.id,
+              deadIconRepositories.map((iconRepository) => iconRepository.id),
+            ),
+          );
+        }
+
+        countDeleted += deadIcons.length;
       });
     },
     handleSync() {
       db.transaction((transaction) => {
-        const result = transaction.delete(icons).where(deadIconsFilter).run();
+        if (newIconRepositories.length >= 1) {
-        countDeleted += result.changes;
+          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();
+          }
+        }
+        if (deadIcons.length >= 1) {
+          transaction
+            .delete(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}`),
+              ),
+            )
+            .run();
+        }
 
         if (deadIconRepositories.length >= 1) {
           transaction
@@ -144,22 +161,13 @@ export const iconsUpdaterJob = createCronJob("iconsUpdater", EVERY_WEEK, {
             .run();
         }
 
-        if (newIconRepositories.length >= 1) {
+        countDeleted += deadIcons.length;
-          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.getElapsedInFormattedMilliseconds(),
+    duration: stopWatch.getElapsedInHumanWords(),
     added: countInserted,
     deleted: countDeleted,
   });

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

@@ -1,14 +0,0 @@
-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

@@ -0,0 +1,6 @@
+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

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

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

@@ -267,13 +267,6 @@
       "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

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

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

@@ -29,13 +29,6 @@
       "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,7 +4,6 @@ import {
   everyoneGroup,
   getIntegrationDefaultUrl,
   getIntegrationName,
-  integrationDefs,
   integrationKinds,
 } from "@homarr/definitions";
 import { defaultServerSettings, defaultServerSettingsKeys } from "@homarr/server-settings";
@@ -144,9 +143,8 @@ 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 && hasNoAuthOption) {
+    if (defaultUrl !== undefined) {
       acc.push({
         id: "new",
         name: `${name} Default`,

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

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

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

@@ -253,13 +253,6 @@
       "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,8 +37,6 @@
     "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/mysql.ts

@@ -76,7 +76,6 @@ 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,7 +75,6 @@ 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,7 +58,6 @@ 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/docs/homarr-docs-sitemap.ts

@@ -93,7 +93,6 @@ export type HomarrDocumentationPath =
   | "/docs/tags/roles"
   | "/docs/tags/search"
   | "/docs/tags/search-engines"
-  | "/docs/tags/secrets"
   | "/docs/tags/security"
   | "/docs/tags/self-signed"
   | "/docs/tags/seo"
@@ -199,7 +198,6 @@ export type HomarrDocumentationPath =
   | "/docs/integrations/tracearr"
   | "/docs/integrations/transmission"
   | "/docs/integrations/truenas"
-  | "/docs/integrations/umami"
   | "/docs/integrations/unifi-controller"
   | "/docs/integrations/unraid"
   | "/docs/management/api"
@@ -246,7 +244,6 @@ export type HomarrDocumentationPath =
   | "/docs/widgets/system-resources"
   | "/docs/widgets/timetable"
   | "/docs/widgets/tracearr"
-  | "/docs/widgets/umami"
   | "/docs/widgets/video"
   | "/docs/widgets/weather"
   | ""

packages/definitions/src/integration.ts

@@ -61,7 +61,7 @@ export const integrationDefs = {
   },
   qBittorrent: {
     name: "qBittorrent",
-    secretKinds: [["apiKey"], ["username", "password"]],
+    secretKinds: [["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,14 +370,6 @@ 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",
-    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",
@@ -469,7 +461,6 @@ 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 = ["auto", "light", "dark"] as const;
+export const colorSchemes = ["light", "dark"] as const;
 export type ColorScheme = (typeof colorSchemes)[number];

packages/definitions/src/widget.ts

@@ -37,6 +37,5 @@ export const widgetKinds = [
   "immich-albumCarousel",
   "tracearr",
   "speedtestTracker",
-  "umami",
 ] as const;
 export type WidgetKind = (typeof widgetKinds)[number];

packages/docker/src/env.ts

@@ -4,11 +4,9 @@ import { createBooleanSchema, createEnv } from "@homarr/core/infrastructure/env"
 
 export const env = createEnv({
   server: {
-    // Comma separated list of docker hostnames that can be used to connect to query the docker endpoints (localhost,host.docker.internal, ...)
+    // Comma separated list of docker hostnames that can be used to connect to query the docker endpoints (localhost:2375,host.docker.internal:2375, ...)
     DOCKER_HOSTNAMES: z.string().optional(),
     DOCKER_PORTS: z.string().optional(),
-    // Comma separated paths to Docker-compatible Unix sockets (e.g., /var/run/docker.sock,/run/user/1000/podman/podman.sock)
-    DOCKER_SOCKET_PATHS: z.string().optional(),
     ENABLE_DOCKER: createBooleanSchema(true),
     ENABLE_KUBERNETES: createBooleanSchema(false),
   },

packages/docker/src/singleton.ts

@@ -11,43 +11,31 @@ export class DockerSingleton {
   private static instances: DockerInstance[] | null = null;
 
   private createInstances() {
-    const socketPaths = env.DOCKER_SOCKET_PATHS;
     const hostVariable = env.DOCKER_HOSTNAMES;
     const portVariable = env.DOCKER_PORTS;
-
+    if (hostVariable === undefined || portVariable === undefined) {
-    // Socket instances from DOCKER_SOCKET_PATHS
-    const socketInstances: DockerInstance[] = socketPaths
-      ? socketPaths.split(",").map((socketPath) => ({
-          host: socketPath,
-          instance: new Docker({ socketPath }),
-        }))
-      : [];
-
-    // TCP instances from existing DOCKER_HOSTNAMES/DOCKER_PORTS
-    let tcpInstances: DockerInstance[] = [];
-    if (hostVariable !== undefined && portVariable !== undefined) {
-      const hostnames = hostVariable.split(",");
-      const ports = portVariable.split(",");
-
-      if (hostnames.length !== ports.length) {
-        throw new Error("The number of hosts and ports must match");
-      }
-
-      tcpInstances = hostnames.map((host, i) => ({
-        host: `${host}:${ports[i]}`,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        instance: new Docker({ host, port: parseInt(ports[i]!, 10) }),
-      }));
-    }
-
-    const instances = [...socketInstances, ...tcpInstances];
-
-    // Default: local socket if nothing else configured
-    if (instances.length === 0) {
       return [{ host: "socket", instance: new Docker() }];
     }
+    const hostnames = hostVariable.split(",");
+    const ports = portVariable.split(",");
 
-    return instances;
+    if (hostnames.length !== ports.length) {
+      throw new Error("The number of hosts and ports must match");
+    }
+
+    return hostnames.map((host, i) => {
+      // Check above ensures that ports[i] is not undefined
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const port = ports[i]!;
+
+      return {
+        host: `${host}:${port}`,
+        instance: new Docker({
+          host,
+          port: parseInt(port, 10),
+        }),
+      };
+    });
   }
 
   public static findInstance(host: string): DockerInstance | undefined {

packages/docker/src/test/singleton.spec.ts

@@ -1,110 +0,0 @@
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-import { DockerSingleton } from "../singleton";
-
-const mockEnv = vi.hoisted(() => ({
-  DOCKER_SOCKET_PATHS: undefined as string | undefined,
-  DOCKER_HOSTNAMES: undefined as string | undefined,
-  DOCKER_PORTS: undefined as string | undefined,
-  ENABLE_DOCKER: true,
-  ENABLE_KUBERNETES: false,
-}));
-
-vi.mock("dockerode", () => {
-  return {
-    default: class MockDocker {
-      constructor(public opts?: Record<string, unknown>) {}
-    },
-  };
-});
-
-vi.mock("../env", () => ({
-  env: mockEnv,
-}));
-
-describe("DockerSingleton", () => {
-  beforeEach(() => {
-    // Reset singleton cache between tests
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
-    (DockerSingleton as any).instances = null;
-
-    // Reset env to defaults
-    mockEnv.DOCKER_SOCKET_PATHS = undefined;
-    mockEnv.DOCKER_HOSTNAMES = undefined;
-    mockEnv.DOCKER_PORTS = undefined;
-  });
-
-  test("should return default socket when no env vars set", () => {
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(1);
-    expect(instances[0]?.host).toBe("socket");
-  });
-
-  test("should return TCP instances only when DOCKER_HOSTNAMES and DOCKER_PORTS set", () => {
-    mockEnv.DOCKER_HOSTNAMES = "remote-host";
-    mockEnv.DOCKER_PORTS = "2375";
-
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(1);
-    expect(instances[0]?.host).toBe("remote-host:2375");
-  });
-
-  test("should return multiple TCP instances", () => {
-    mockEnv.DOCKER_HOSTNAMES = "host1,host2";
-    mockEnv.DOCKER_PORTS = "2375,2376";
-
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(2);
-    expect(instances[0]?.host).toBe("host1:2375");
-    expect(instances[1]?.host).toBe("host2:2376");
-  });
-
-  test("should throw when hostname and port counts do not match", () => {
-    mockEnv.DOCKER_HOSTNAMES = "host1,host2";
-    mockEnv.DOCKER_PORTS = "2375";
-
-    expect(() => DockerSingleton.getInstances()).toThrow("The number of hosts and ports must match");
-  });
-
-  test("should return socket instances when DOCKER_SOCKET_PATHS set", () => {
-    mockEnv.DOCKER_SOCKET_PATHS = "/var/run/docker.sock";
-
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(1);
-    expect(instances[0]?.host).toBe("/var/run/docker.sock");
-  });
-
-  test("should return multiple socket instances", () => {
-    mockEnv.DOCKER_SOCKET_PATHS = "/var/run/docker.sock,/run/user/1000/podman/podman.sock";
-
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(2);
-    expect(instances[0]?.host).toBe("/var/run/docker.sock");
-    expect(instances[1]?.host).toBe("/run/user/1000/podman/podman.sock");
-  });
-
-  test("should combine socket and TCP instances", () => {
-    mockEnv.DOCKER_SOCKET_PATHS = "/var/run/docker.sock,/run/user/1000/podman/podman.sock";
-    mockEnv.DOCKER_HOSTNAMES = "remote-host";
-    mockEnv.DOCKER_PORTS = "2375";
-
-    const instances = DockerSingleton.getInstances();
-
-    expect(instances).toHaveLength(3);
-    expect(instances[0]?.host).toBe("/var/run/docker.sock");
-    expect(instances[1]?.host).toBe("/run/user/1000/podman/podman.sock");
-    expect(instances[2]?.host).toBe("remote-host:2375");
-  });
-
-  test("should cache instances on subsequent calls", () => {
-    const first = DockerSingleton.getInstances();
-    const second = DockerSingleton.getInstances();
-
-    expect(first).toBe(second);
-  });
-});

packages/integrations/src/anchor/anchor-integration.ts

@@ -77,7 +77,7 @@ export class AnchorIntegration extends Integration {
     });
 
     if (!response.ok) {
-      let errorBody: string | null;
+      let errorBody: string | null = null;
       try {
         errorBody = await response.text();
       } catch {

packages/integrations/src/base/creator.ts

@@ -46,7 +46,6 @@ import { SeerrIntegration } from "../seerr/seerr-integration";
 import { SpeedtestTrackerIntegration } from "../speedtest-tracker/speedtest-tracker-integration";
 import { TracearrIntegration } from "../tracearr/tracearr-integration";
 import { TrueNasIntegration } from "../truenas/truenas-integration";
-import { UmamiIntegration } from "../umami/umami-integration";
 import { UnifiControllerIntegration } from "../unifi-controller/unifi-controller-integration";
 import { UnraidIntegration } from "../unraid/unraid-integration";
 import type { Integration, IntegrationInput } from "./integration";
@@ -122,7 +121,6 @@ export const integrationCreators = {
   searchCh: SearchChIntegration,
   immich: ImmichIntegration,
   speedtestTracker: SpeedtestTrackerIntegration,
-  umami: UmamiIntegration,
 } satisfies Record<IntegrationKind, IntegrationInstance | [(input: IntegrationInput) => Promise<Integration>]>;
 
 type IntegrationInstanceOfKind<TKind extends keyof typeof integrationCreators> = {

packages/integrations/src/download-client/qbittorrent/qbittorrent-integration.ts

@@ -90,18 +90,10 @@ export class QBitTorrentIntegration extends Integration implements IDownloadClie
   }
 
   private async getClientAsync(dispatcher?: Dispatcher) {
-    const credentials = this.hasSecretValue("apiKey")
-      ? {
-          apiKey: this.getSecretValue("apiKey"),
-        }
-      : {
-          username: this.getSecretValue("username"),
-          password: this.getSecretValue("password"),
-        };
-
     return new QBittorrent({
-      ...credentials,
       baseUrl: this.url("/").toString(),
+      username: this.getSecretValue("username"),
+      password: this.getSecretValue("password"),
       dispatcher: dispatcher ?? (await createCertificateAgentAsync()),
     });
   }

packages/integrations/src/index.ts

@@ -33,7 +33,6 @@ export { CoolifyIntegration } from "./coolify/coolify-integration";
 export { ImmichIntegration } from "./immich/immich-integration";
 export { TracearrIntegration } from "./tracearr/tracearr-integration";
 export { SpeedtestTrackerIntegration } from "./speedtest-tracker/speedtest-tracker-integration";
-export { UmamiIntegration } from "./umami/umami-integration";
 
 // Types
 export type { IntegrationInput } from "./base/integration";
@@ -69,7 +68,6 @@ export type {
 } from "./anchor/anchor-types";
 export type { TracearrDashboardData } from "./tracearr/tracearr-types";
 export type { SpeedtestTrackerDashboardData } from "./speedtest-tracker/speedtest-tracker-types";
-export type { UmamiVisitorStats } from "./umami/umami-types";
 
 // Schemas
 export { anchorNotesListInputSchema } from "./anchor/anchor-types";

packages/integrations/src/types.ts

@@ -16,4 +16,3 @@ export * from "./anchor/anchor-types";
 export * from "./interfaces/timetable/timetable-types";
 export * from "./tracearr/tracearr-types";
 export * from "./speedtest-tracker/speedtest-tracker-types";
-export * from "./umami/umami-types";

packages/integrations/src/umami/umami-integration.ts

@@ -1,450 +0,0 @@
-import dayjs from "dayjs";
-
-import { ResponseError } from "@homarr/common/server";
-import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
-import { createLogger } from "@homarr/core/infrastructure/logs";
-
-import type { IntegrationTestingInput } from "../base/integration";
-import { Integration } from "../base/integration";
-import { TestConnectionError } from "../base/test-connection/test-connection-error";
-import type { TestingResult } from "../base/test-connection/test-connection-service";
-import type {
-  UmamiEventSeries,
-  UmamiMetricItem,
-  UmamiPageviewDataPoint,
-  UmamiPageviews,
-  UmamiStats,
-  UmamiVisitorStats,
-  UmamiWebsite,
-} from "./umami-types";
-import {
-  umamiActiveVisitorsSchema,
-  umamiAuthResponseSchema,
-  umamiMetricItemSchema,
-  umamiPageviewDataPointSchema,
-  umamiPageviewsSchema,
-  umamiStatsSchema,
-  umamiWebsiteSchema,
-} from "./umami-types";
-
-// Umami event type ID for custom events (type 1 = page view, type 2 = custom event)
-const UMAMI_CUSTOM_EVENT_TYPE = 2;
-
-const logger = createLogger({ module: "umami-integration" });
-
-export class UmamiIntegration extends Integration {
-  protected async testingAsync(input: IntegrationTestingInput): Promise<TestingResult> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const url = this.url("/websites");
-    const response = await input.fetchAsync(url, {
-      headers: authHeaders,
-    });
-
-    if (!response.ok) {
-      return TestConnectionError.StatusResult(response);
-    }
-
-    return { success: true };
-  }
-
-  public async getWebsitesAsync(): Promise<UmamiWebsite[]> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const url = this.url("/websites");
-    const response = await fetchWithTrustedCertificatesAsync(url, { headers: authHeaders });
-    if (!response.ok) throw new ResponseError(response);
-    const json = await response.json();
-    // Response envelope differs by hosting:
-    //   - Umami self-hosted returns the array directly: [website, ...]
-    //   - Umami Cloud wraps it: { data: [website, ...] }
-    // Same divergence applies to the /events list responses below.
-    return Array.isArray(json)
-      ? umamiWebsiteSchema.array().parse(json)
-      : umamiWebsiteSchema.array().parse((json as { data: unknown }).data);
-  }
-
-  // Server-side timeFrame resolution is intentional. Keeping `timeFrame` (a
-  // stable string like "7d") in the cache key means all users viewing the same
-  // dashboard share one Redis cache entry per (integration, website, timeFrame)
-  // for the 5-minute TTL. Client-supplied startAt/endAt would include a
-  // per-second `now` and fragment the cache one-per-user-per-second.
-  //
-  // Window bounds mirror Umami UI preset semantics, verified against the
-  // Umami Cloud dashboard for the same site and timeFrame: each "Last N"
-  // preset includes the in-progress period as one of N + 1 buckets, snapped
-  // to bucket boundaries.
-  //   - "24h":  current hour  + 24 prior hours (25-bucket hour grid)
-  //   - "7d":   current day   +  7 prior days  ( 8-bucket day grid)
-  //   - "30d":  current day   + 30 prior days  (31-bucket day grid)
-  //   - "today" / "month" / "lastMonth": calendar-aligned windows.
-  //
-  // Caveat: dayjs() uses the server's local timezone. Callers needing user-local
-  // boundaries (e.g. "today") may see off-by-one behaviour when the server
-  // runs in UTC but the user is in a different timezone.
-  private computeTimeRange(timeFrame: string): { startAt: number; endAt: number; unit: string } {
-    const startOfToday = dayjs().startOf("day");
-    const endOfToday = dayjs().endOf("day");
-
-    switch (timeFrame) {
-      case "today":
-        return { startAt: startOfToday.valueOf(), endAt: endOfToday.valueOf(), unit: "hour" };
-      case "7d":
-        return {
-          startAt: startOfToday.subtract(7, "day").valueOf(),
-          endAt: endOfToday.valueOf(),
-          unit: "day",
-        };
-      case "30d":
-        return {
-          startAt: startOfToday.subtract(30, "day").valueOf(),
-          endAt: endOfToday.valueOf(),
-          unit: "day",
-        };
-      case "month":
-        return {
-          startAt: dayjs().startOf("month").valueOf(),
-          endAt: dayjs().endOf("month").valueOf(),
-          unit: "day",
-        };
-      case "lastMonth": {
-        const lastMonth = dayjs().subtract(1, "month");
-        return {
-          startAt: lastMonth.startOf("month").valueOf(),
-          endAt: lastMonth.endOf("month").valueOf(),
-          unit: "day",
-        };
-      }
-      case "24h":
-      default:
-        return {
-          startAt: dayjs().subtract(24, "hour").startOf("hour").valueOf(),
-          endAt: dayjs().endOf("hour").valueOf(),
-          unit: "hour",
-        };
-    }
-  }
-
-  public async getVisitorStatsAsync(
-    websiteId: string,
-    timeFrame = "24h",
-    eventName?: string,
-  ): Promise<UmamiVisitorStats> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const website = await this.getWebsiteByIdAsync(websiteId, authHeaders);
-
-    const { startAt, endAt, unit } = this.computeTimeRange(timeFrame);
-
-    const [stats, pageviews, eventMetrics, eventTimeSeries] = await Promise.all([
-      this.getWebsiteStatsAsync(website.id, startAt, endAt, authHeaders),
-      this.getWebsitePageviewsAsync(website.id, startAt, endAt, authHeaders, unit),
-      eventName ? this.getWebsiteEventMetricsAsync(website.id, startAt, endAt, authHeaders) : Promise.resolve(null),
-      eventName
-        ? this.getWebsiteEventTimeSeriesAsync(website.id, startAt, endAt, unit, eventName, authHeaders)
-        : Promise.resolve(null),
-    ]);
-
-    const eventCount = eventName && eventMetrics ? (eventMetrics.find(({ x }) => x === eventName)?.y ?? 0) : undefined;
-
-    const eventByTimestamp = new Map<number, number>(
-      (eventTimeSeries ?? []).map(({ x, y }) => [this.parseUmamiDate(x), y]),
-    );
-    const dataPoints = pageviews.sessions.map((point) => ({
-      timestamp: point.x,
-      visitors: point.y,
-      ...(eventTimeSeries ? { events: eventByTimestamp.get(this.parseUmamiDate(point.x)) ?? 0 } : {}),
-    }));
-
-    return {
-      domain: website.domain,
-      websiteName: website.name,
-      websiteId: website.id,
-      totalVisitors: stats.visitors,
-      totalPageviews: stats.pageviews,
-      totalVisits: stats.visits,
-      bounceRate: stats.visits > 0 ? Math.round((stats.bounces / stats.visits) * 100) : 0,
-      avgDuration: stats.visits > 0 ? Math.round(stats.totaltime / stats.visits) : 0,
-      dataPoints,
-      timeFrame,
-      eventCount,
-    };
-  }
-
-  public async getEventNamesAsync(websiteId: string): Promise<string[]> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const now = Date.now();
-    const startAt = dayjs().subtract(30, "day").valueOf();
-    const url = this.url(`/websites/${websiteId}/events`, {
-      startAt: startAt.toString(),
-      endAt: now.toString(),
-      pageSize: "100000",
-    });
-    const response = await fetchWithTrustedCertificatesAsync(url, { headers: authHeaders });
-    if (!response.ok) {
-      logger.warn("Failed to load event names", { status: response.status, websiteId });
-      return [];
-    }
-    const json = await response.json();
-    const rawArray: unknown[] = Array.isArray(json)
-      ? json
-      : json && typeof json === "object" && "data" in json && Array.isArray((json as { data: unknown }).data)
-        ? (json as { data: unknown[] }).data
-        : [];
-    const names = new Set<string>();
-    for (const item of rawArray) {
-      const record = item as Record<string, unknown>;
-      if (typeof record.eventName === "string" && record.eventName) {
-        names.add(record.eventName);
-      }
-    }
-    return [...names].sort();
-  }
-
-  public async getActiveVisitorsAsync(websiteId: string): Promise<number> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const url = this.url(`/websites/${websiteId}/active`);
-    const response = await fetchWithTrustedCertificatesAsync(url, { headers: authHeaders });
-    if (!response.ok) {
-      logger.warn("Failed to load active visitors", { status: response.status, websiteId });
-      return 0;
-    }
-    return umamiActiveVisitorsSchema.parse(await response.json()).visitors;
-  }
-
-  /**
-   * Umami self-hosted returns "YYYY-MM-DD HH:MM:SS"; Umami Cloud returns ISO 8601.
-   * Normalise both to epoch ms so timestamps from /pageviews and /events join.
-   */
-  private parseUmamiDate(dateString: string): number {
-    return new Date(dateString.includes("T") ? dateString : `${dateString.replace(" ", "T")}Z`).getTime();
-  }
-
-  private async getWebsiteByIdAsync(websiteId: string, authHeaders: Record<string, string>): Promise<UmamiWebsite> {
-    const url = this.url(`/websites/${websiteId}`);
-    const response = await fetchWithTrustedCertificatesAsync(url, { headers: authHeaders });
-    if (!response.ok) throw new ResponseError(response);
-    return umamiWebsiteSchema.parse(await response.json());
-  }
-
-  public async getTopPagesAsync(websiteId: string, timeFrame: string, limit: number): Promise<UmamiMetricItem[]> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const { startAt, endAt } = this.computeTimeRange(timeFrame);
-    return this.getWebsiteMetricsAsync(websiteId, startAt, endAt, "path", authHeaders, limit);
-  }
-
-  public async getTopReferrersAsync(websiteId: string, timeFrame: string, limit: number): Promise<UmamiMetricItem[]> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const { startAt, endAt } = this.computeTimeRange(timeFrame);
-    return this.getWebsiteMetricsAsync(websiteId, startAt, endAt, "referrer", authHeaders, limit);
-  }
-
-  public async getMultiEventTimeSeriesAsync(
-    websiteId: string,
-    timeFrame: string,
-    eventNames: string[],
-  ): Promise<UmamiEventSeries[]> {
-    const authHeaders = await this.getAuthHeadersAsync();
-    const { startAt, endAt, unit } = this.computeTimeRange(timeFrame);
-    const results = await Promise.all(
-      eventNames.map(async (eventName) => {
-        const dataPoints = await this.getWebsiteEventTimeSeriesAsync(
-          websiteId,
-          startAt,
-          endAt,
-          unit,
-          eventName,
-          authHeaders,
-        );
-        return { eventName, dataPoints: dataPoints ?? [] };
-      }),
-    );
-    return results;
-  }
-
-  private async getWebsiteEventMetricsAsync(
-    websiteId: string,
-    startAt: number,
-    endAt: number,
-    authHeaders: Record<string, string>,
-  ): Promise<UmamiMetricItem[]> {
-    return await this.getWebsiteMetricsAsync(websiteId, startAt, endAt, "event", authHeaders);
-  }
-
-  private async getWebsiteMetricsAsync(
-    websiteId: string,
-    startAt: number,
-    endAt: number,
-    type: "event" | "path" | "referrer",
-    authHeaders: Record<string, string>,
-    limit?: number,
-  ): Promise<UmamiMetricItem[]> {
-    const params: Record<string, string> = {
-      startAt: startAt.toString(),
-      endAt: endAt.toString(),
-      type,
-    };
-    if (limit !== undefined) params.limit = limit.toString();
-    const url = this.url(`/websites/${websiteId}/metrics`, params);
-    const response = await fetchWithTrustedCertificatesAsync(url, {
-      headers: authHeaders,
-    });
-
-    if (!response.ok) {
-      logger.warn("Failed to load website metrics", { status: response.status, websiteId, type });
-      return [];
-    }
-
-    const json = await response.json();
-    if (Array.isArray(json)) return umamiMetricItemSchema.array().parse(json);
-    logger.warn("Unexpected metrics response shape", { websiteId, type });
-    return [];
-  }
-
-  private async getWebsiteEventTimeSeriesAsync(
-    websiteId: string,
-    startAt: number,
-    endAt: number,
-    unit: string,
-    eventName: string,
-    authHeaders: Record<string, string>,
-  ): Promise<UmamiPageviewDataPoint[] | undefined> {
-    const url = this.url(`/websites/${websiteId}/events`, {
-      startAt: startAt.toString(),
-      endAt: endAt.toString(),
-      unit,
-      timezone: "UTC",
-      eventName,
-      pageSize: "100000",
-    });
-    const response = await fetchWithTrustedCertificatesAsync(url, {
-      headers: authHeaders,
-    });
-
-    if (!response.ok) {
-      logger.warn("Failed to load event time series", { status: response.status, websiteId, eventName });
-      return undefined;
-    }
-
-    const json = await response.json();
-    const rawArray: unknown[] = Array.isArray(json)
-      ? json
-      : json && typeof json === "object" && "data" in json && Array.isArray((json as { data: unknown }).data)
-        ? (json as { data: unknown[] }).data
-        : [];
-
-    if (rawArray.length === 0) return undefined;
-
-    const firstItem = rawArray[0] as Record<string, unknown>;
-
-    // Two response shapes coexist:
-    //   - Umami self-hosted returns aggregated buckets: { x: timestamp, y: count }
-    //   - Umami Cloud returns raw event records: { createdAt, eventName, eventType }
-    // We aggregate the raw Cloud records ourselves into the same bucket grid so
-    // the result joins cleanly with /pageviews timestamps.
-
-    // Aggregated { x, y } format — parse directly (self-hosted instances)
-    if ("x" in firstItem && "y" in firstItem) {
-      const points = umamiPageviewDataPointSchema.array().parse(rawArray);
-      return points.length === 0 ? undefined : points;
-    }
-
-    // Raw event records — aggregate by time bucket (Umami Cloud)
-    if ("createdAt" in firstItem) {
-      const pad = (number: number) => String(number).padStart(2, "0");
-      // Format must match Umami's pageview x-axis timestamps: "YYYY-MM-DD HH:MM:SS"
-      const truncate = (isoDate: string): string => {
-        const date = new Date(isoDate);
-        const dateString = `${date.getUTCFullYear()}-${pad(date.getUTCMonth() + 1)}-${pad(date.getUTCDate())}`;
-        if (unit === "hour") {
-          return `${dateString} ${pad(date.getUTCHours())}:00:00`;
-        }
-        if (unit === "month") {
-          return `${date.getUTCFullYear()}-${pad(date.getUTCMonth() + 1)}-01 00:00:00`;
-        }
-        return `${dateString} 00:00:00`;
-      };
-
-      const buckets = new Map<string, number>();
-      for (const item of rawArray) {
-        const event = item as { eventType?: number; eventName?: string; createdAt: string };
-        if (event.eventType !== UMAMI_CUSTOM_EVENT_TYPE || event.eventName !== eventName) continue;
-        const bucket = truncate(event.createdAt);
-        buckets.set(bucket, (buckets.get(bucket) ?? 0) + 1);
-      }
-      if (buckets.size === 0) return undefined;
-      return (
-        Array.from(buckets.entries())
-          .sort(([itemA], [itemB]) => itemA.localeCompare(itemB))
-          // eslint-disable-next-line id-length
-          .map(([x, y]) => ({ x, y }))
-      );
-    }
-
-    return undefined;
-  }
-
-  private async getWebsiteStatsAsync(
-    websiteId: string,
-    startAt: number,
-    endAt: number,
-    authHeaders: Record<string, string>,
-  ): Promise<UmamiStats> {
-    const url = this.url(`/websites/${websiteId}/stats`, {
-      startAt: startAt.toString(),
-      endAt: endAt.toString(),
-    });
-    const response = await fetchWithTrustedCertificatesAsync(url, {
-      headers: authHeaders,
-    });
-
-    if (!response.ok) {
-      throw new ResponseError(response);
-    }
-
-    return umamiStatsSchema.parse(await response.json());
-  }
-
-  private async getWebsitePageviewsAsync(
-    websiteId: string,
-    startAt: number,
-    endAt: number,
-    authHeaders: Record<string, string>,
-    unit = "hour",
-  ): Promise<UmamiPageviews> {
-    const url = this.url(`/websites/${websiteId}/pageviews`, {
-      startAt: startAt.toString(),
-      endAt: endAt.toString(),
-      unit,
-      timezone: "UTC",
-    });
-    const response = await fetchWithTrustedCertificatesAsync(url, {
-      headers: authHeaders,
-    });
-
-    if (!response.ok) {
-      throw new ResponseError(response);
-    }
-
-    return umamiPageviewsSchema.parse(await response.json());
-  }
-
-  private async getAuthHeadersAsync(): Promise<Record<string, string>> {
-    if (this.hasSecretValue("apiKey")) {
-      return { "x-umami-api-key": this.getSecretValue("apiKey") };
-    }
-    const token = await this.getJwtTokenAsync();
-    return { Authorization: `Bearer ${token}` };
-  }
-
-  private async getJwtTokenAsync(): Promise<string> {
-    const url = this.url("/auth/login");
-    const response = await fetchWithTrustedCertificatesAsync(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        username: this.getSecretValue("username"),
-        password: this.getSecretValue("password"),
-      }),
-    });
-    if (!response.ok) throw new ResponseError(response);
-    return umamiAuthResponseSchema.parse(await response.json()).token;
-  }
-}

packages/integrations/src/umami/umami-types.ts

@@ -1,84 +0,0 @@
-import { z } from "zod/v4";
-
-export const umamiWebsiteSchema = z.object({
-  id: z.string(),
-  name: z.string(),
-  domain: z.string(),
-});
-
-export type UmamiWebsite = z.infer<typeof umamiWebsiteSchema>;
-
-export const umamiAuthResponseSchema = z.object({
-  token: z.string(),
-});
-
-export type UmamiAuthResponse = z.infer<typeof umamiAuthResponseSchema>;
-
-export const umamiStatsSchema = z.object({
-  pageviews: z.number(),
-  visitors: z.number(),
-  visits: z.number(),
-  bounces: z.number(),
-  totaltime: z.number(),
-});
-
-export type UmamiStats = z.infer<typeof umamiStatsSchema>;
-
-export const umamiPageviewDataPointSchema = z.object({
-  x: z.string(),
-  y: z.number(),
-});
-
-export type UmamiPageviewDataPoint = z.infer<typeof umamiPageviewDataPointSchema>;
-
-export const umamiPageviewsSchema = z.object({
-  pageviews: z.array(umamiPageviewDataPointSchema),
-  sessions: z.array(umamiPageviewDataPointSchema),
-});
-
-export type UmamiPageviews = z.infer<typeof umamiPageviewsSchema>;
-
-export const umamiMetricItemSchema = z.object({
-  // x can be null for direct traffic (no referrer) in the referrers endpoint
-  x: z
-    .string()
-    .nullable()
-    .transform((value) => value ?? ""),
-  y: z.number(),
-});
-
-export type UmamiMetricItem = z.infer<typeof umamiMetricItemSchema>;
-
-export const umamiEventRecordSchema = z.object({
-  id: z.string(),
-  eventName: z.string(),
-  createdAt: z.string(),
-});
-
-export type UmamiEventRecord = z.infer<typeof umamiEventRecordSchema>;
-
-export const umamiActiveVisitorsSchema = z.object({
-  visitors: z.number(),
-});
-
-export type UmamiActiveVisitors = z.infer<typeof umamiActiveVisitorsSchema>;
-
-// Internal aggregated type returned by the integration — not a direct API response
-export interface UmamiEventSeries {
-  eventName: string;
-  dataPoints: UmamiPageviewDataPoint[];
-}
-
-export interface UmamiVisitorStats {
-  domain: string;
-  websiteId: string;
-  websiteName: string;
-  totalVisitors: number;
-  totalPageviews: number;
-  totalVisits: number;
-  bounceRate: number;
-  avgDuration: number;
-  dataPoints: { timestamp: string; visitors: number; events?: number }[];
-  timeFrame: string;
-  eventCount?: number;
-}

packages/old-import/src/mappers/map-user.ts

@@ -24,7 +24,7 @@ export const mapAndDecryptUsers = (importUsers: OldmarrImportUser[], encryptionT
       oldId: id,
       id: createId(),
       name: user.name.toLowerCase(),
-      colorScheme: settings?.colorScheme === "environment" ? "auto" : settings?.colorScheme,
+      colorScheme: settings?.colorScheme === "environment" ? undefined : settings?.colorScheme,
       firstDayOfWeek: settings?.firstDayOfWeek === "sunday" ? 0 : settings?.firstDayOfWeek === "monday" ? 1 : 6,
       provider: "credentials",
       pingIconsEnabled: settings?.replacePingWithIcons,

packages/request-handler/src/docker.ts

@@ -2,8 +2,6 @@ import dayjs from "dayjs";
 import type { ContainerInfo, ContainerStats } from "dockerode";
 import type Dockerode from "dockerode";
 
-import { createLogger } from "@homarr/core/infrastructure/logs";
-import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
 import { db, like, or } from "@homarr/db";
 import { icons } from "@homarr/db/schema";
 import type { ContainerState } from "@homarr/docker";
@@ -11,8 +9,6 @@ import { dockerLabels, DockerSingleton } from "@homarr/docker";
 
 import { createCachedWidgetRequestHandler } from "./lib/cached-widget-request-handler";
 
-const logger = createLogger({ module: "dockerRequestHandler" });
-
 export const dockerContainersRequestHandler = createCachedWidgetRequestHandler({
   queryKey: "dockerContainersResult",
   widgetKind: "dockerContainers",
@@ -22,34 +18,19 @@ export const dockerContainersRequestHandler = createCachedWidgetRequestHandler({
   cacheDuration: dayjs.duration(20, "seconds"),
 });
 
+const dockerInstances = DockerSingleton.getInstances();
+
 const extractImage = (container: ContainerInfo) => container.Image.split("/").at(-1)?.split(":").at(0) ?? "";
 
 async function getContainersWithStatsAsync() {
-  const dockerInstances = DockerSingleton.getInstances();
+  const containers = await Promise.all(
-  const results = await Promise.allSettled(
     dockerInstances.map(async ({ instance, host }) => {
       const instanceContainers = await instance.listContainers({ all: true });
       return instanceContainers
         .filter((container) => !(dockerLabels.hide in container.Labels))
         .map((container) => ({ ...container, instance: host }));
     }),
-  );
+  ).then((res) => res.flat());
-
-  const containers = results.flatMap((result, index) => {
-    if (result.status === "fulfilled") return result.value;
-    logger.warn(
-      new ErrorWithMetadata(
-        "Failed to list containers from Docker host",
-        {
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          host: dockerInstances[index]!.host,
-        },
-        { cause: result.reason },
-      ),
-    );
-
-    return [];
-  });
   const likeQueries = containers.map((container) => like(icons.name, `%${extractImage(container)}%`));
 
   const dbIcons =
@@ -63,6 +44,8 @@ async function getContainersWithStatsAsync() {
     const instance = dockerInstances.find(({ host }) => host === container.instance)?.instance;
     if (!instance) return null;
 
+    // Get stats, falling back to an empty stats object if fetch fails
+    // calculateCpuUsage and calculateMemoryUsage will return 0 for invalid/missing stats
     const stats = await instance
       .getContainer(container.Id)
       .stats({ stream: false, "one-shot": true })
@@ -80,7 +63,6 @@ async function getContainersWithStatsAsync() {
     return {
       id: container.Id,
       name: container.Names[0]?.split("/")[1] ?? "Unknown",
-      host: container.instance,
       state: container.State as ContainerState,
       iconUrl:
         dbIcons.find((icon) => {
@@ -98,10 +80,9 @@ async function getContainersWithStatsAsync() {
   return (await Promise.all(containerStatsPromises)).filter((container) => container !== null);
 }
 
-export function calculateCpuUsage(stats: ContainerStats): number {
+function calculateCpuUsage(stats: ContainerStats): number {
-  // Handle containers with missing or invalid stats (e.g., exited, dead containers, Podman responses)
+  // Handle containers with missing or invalid stats (e.g., exited, dead containers)
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (!stats.cpu_stats.online_cpus || stats.cpu_stats.online_cpus === 0 || !stats.cpu_stats.cpu_usage.total_usage) {
-  if (!stats.cpu_stats?.online_cpus || stats.cpu_stats.online_cpus === 0 || !stats.cpu_stats.cpu_usage?.total_usage) {
     return 0;
   }
 
@@ -114,10 +95,9 @@ export function calculateCpuUsage(stats: ContainerStats): number {
   return (stats.cpu_stats.cpu_usage.total_usage / usage) * numberOfCpus * 100;
 }
 
-export function calculateMemoryUsage(stats: ContainerStats): number {
+function calculateMemoryUsage(stats: ContainerStats): number {
-  // Handle containers with missing or invalid stats (e.g., exited, dead containers, Podman responses)
+  // Handle containers with missing or invalid stats (e.g., exited, dead containers)
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (!stats.memory_stats.usage) {
-  if (!stats.memory_stats?.usage) {
     return 0;
   }
 

packages/request-handler/src/duckduckgo-bangs.ts

@@ -1,79 +0,0 @@
-import dayjs from "dayjs";
-import { z } from "zod";
-
-import { env } from "@homarr/common/env";
-import { ResponseError } from "@homarr/common/server";
-import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
-import { withTimeoutAsync } from "@homarr/core/infrastructure/http/timeout";
-import { createChannelWithLatestAndEvents } from "@homarr/redis";
-import { createCachedRequestHandler } from "@homarr/request-handler/lib/cached-request-handler";
-
-export type DuckDuckGoBang = z.infer<typeof duckDuckGoBangSchema>;
-
-const DUCKDUCKGO_BANGS_URL = "https://duckduckgo.com/bang.js";
-
-/**
- * DuckDuckGo `bang.js` uses short keys (to reduce the payload size):
- * - `t`: bang token (e.g. `"yt"`)
- * - `s`: display name
- * - `d`: domain (optional)
- * - `u`: URL template (contains `{{{s}}}`)
- * - `c`: category (optional)
- * - `sc`: subcategory (optional)
- * - `r`: rank (optional)
- */
-export const duckDuckGoBangSchema = z.object({
-  t: z.string(),
-  s: z.string(),
-  d: z.string().optional(),
-  u: z.string(),
-  c: z.string().optional(),
-  sc: z.string().optional(),
-  r: z.number().optional(),
-});
-
-const duckDuckGoBangsResponseSchema = z.array(duckDuckGoBangSchema);
-
-const normalizeBangToken = (token: string) => token.toLowerCase().trim();
-
-const compareBangTokenAsc = (left: DuckDuckGoBang, right: DuckDuckGoBang) => left.t.localeCompare(right.t);
-
-export const duckDuckGoBangsRequestHandler = createCachedRequestHandler({
-  queryKey: "duckduckgo-bangs",
-  cacheDuration: dayjs.duration(1, "day"),
-  async requestAsync(_) {
-    if (env.NO_EXTERNAL_CONNECTION) {
-      return [];
-    }
-
-    const res = await withTimeoutAsync(async (signal) => {
-      return await fetchWithTrustedCertificatesAsync(DUCKDUCKGO_BANGS_URL, {
-        signal,
-        headers: {
-          accept: "application/json,text/plain,*/*",
-        },
-      });
-    });
-
-    if (!res.ok) {
-      throw new ResponseError(res);
-    }
-
-    const json: unknown = await res.json();
-    const bangs = await duckDuckGoBangsResponseSchema.parseAsync(json);
-
-    const normalized = bangs
-      .map((bang) => ({
-        ...bang,
-        t: normalizeBangToken(bang.t),
-      }))
-      .filter((bang) => bang.t.length > 0);
-
-    normalized.sort(compareBangTokenAsc);
-
-    return normalized;
-  },
-  createRedisChannel() {
-    return createChannelWithLatestAndEvents<DuckDuckGoBang[]>("homarr:duckduckgo-bangs");
-  },
-});

packages/request-handler/src/test/docker.spec.ts

@@ -1,121 +0,0 @@
-import type { ContainerStats } from "dockerode";
-import { describe, expect, test, vi } from "vitest";
-
-import { createDb } from "@homarr/db/test";
-
-import { calculateCpuUsage, calculateMemoryUsage } from "../docker";
-
-vi.mock("@homarr/db", async (importActual) => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-  const actual = await importActual<typeof import("@homarr/db")>();
-  return {
-    ...actual,
-    db: createDb(),
-  };
-});
-
-// Helper to create a partial stats object, cast to ContainerStats.
-// This mirrors what Podman and other Docker-compatible runtimes may return
-// at runtime, even though @types/dockerode declares all fields as required.
-const createStats = (overrides: Record<string, unknown> = {}) => overrides as unknown as ContainerStats;
-
-describe("calculateCpuUsage", () => {
-  test("should return 0 when cpu_stats is undefined (Podman)", () => {
-    const stats = createStats({ cpu_stats: undefined });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when online_cpus is 0", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 0, cpu_usage: { total_usage: 1000 }, system_cpu_usage: 5000 },
-    });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when online_cpus is undefined", () => {
-    const stats = createStats({
-      cpu_stats: { cpu_usage: { total_usage: 1000 }, system_cpu_usage: 5000 },
-    });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when cpu_usage is undefined", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 4, system_cpu_usage: 5000 },
-    });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when total_usage is 0", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 4, cpu_usage: { total_usage: 0 }, system_cpu_usage: 5000 },
-    });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when system_cpu_usage is 0", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 4, cpu_usage: { total_usage: 1000 }, system_cpu_usage: 0 },
-    });
-    expect(calculateCpuUsage(stats)).toBe(0);
-  });
-
-  test("should calculate correct CPU percentage for valid stats", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 4, cpu_usage: { total_usage: 2000 }, system_cpu_usage: 10000 },
-    });
-    // (2000 / 10000) * 4 * 100 = 80
-    expect(calculateCpuUsage(stats)).toBe(80);
-  });
-
-  test("should handle fractional CPU usage", () => {
-    const stats = createStats({
-      cpu_stats: { online_cpus: 2, cpu_usage: { total_usage: 500 }, system_cpu_usage: 100000 },
-    });
-    // (500 / 100000) * 2 * 100 = 1
-    expect(calculateCpuUsage(stats)).toBe(1);
-  });
-});
-
-describe("calculateMemoryUsage", () => {
-  test("should return 0 when memory_stats is undefined (Podman)", () => {
-    const stats = createStats({ memory_stats: undefined });
-    expect(calculateMemoryUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when memory_stats.usage is 0", () => {
-    const stats = createStats({ memory_stats: { usage: 0 } });
-    expect(calculateMemoryUsage(stats)).toBe(0);
-  });
-
-  test("should return 0 when memory_stats.usage is undefined", () => {
-    const stats = createStats({ memory_stats: {} });
-    expect(calculateMemoryUsage(stats)).toBe(0);
-  });
-
-  test("should subtract cache from usage", () => {
-    const stats = createStats({
-      memory_stats: { usage: 1000, stats: { cache: 200 } },
-    });
-    expect(calculateMemoryUsage(stats)).toBe(800);
-  });
-
-  test("should use total_inactive_file when cache is absent", () => {
-    const stats = createStats({
-      memory_stats: { usage: 1000, stats: { total_inactive_file: 300 } },
-    });
-    expect(calculateMemoryUsage(stats)).toBe(700);
-  });
-
-  test("should use inactive_file as last fallback", () => {
-    const stats = createStats({
-      memory_stats: { usage: 1000, stats: { inactive_file: 150 } },
-    });
-    expect(calculateMemoryUsage(stats)).toBe(850);
-  });
-
-  test("should return raw usage when memory_stats.stats is undefined", () => {
-    const stats = createStats({ memory_stats: { usage: 512 } });
-    expect(calculateMemoryUsage(stats)).toBe(512);
-  });
-});

packages/request-handler/src/test/update-checker.spec.ts

@@ -1,138 +0,0 @@
-import type { RestEndpointMethodTypes } from "@octokit/plugin-rest-endpoint-methods";
-import { Octokit } from "octokit";
-import { beforeEach, describe, expect, test, vi } from "vitest";
-
-import { getAvailableUpdatesAsync } from "../update-checker";
-
-const mockEnv = vi.hoisted(() => ({
-  NO_EXTERNAL_CONNECTION: false,
-}));
-
-vi.mock("@homarr/common/env", () => ({
-  env: mockEnv,
-}));
-
-vi.mock("octokit", () => {
-  const mockOctokit = {
-    rest: {
-      repos: {
-        listReleases: vi.fn(),
-      },
-    },
-  };
-  return {
-    Octokit: class {
-      rest = mockOctokit.rest;
-    },
-  };
-});
-
-describe("getAvailableUpdatesAsync", () => {
-  beforeEach(() => {
-    mockEnv.NO_EXTERNAL_CONNECTION = false;
-  });
-
-  test("should return available non pre-release updates", async () => {
-    // Arrange
-    const currentVersion = "v1.2.3";
-    const releases = fakeReleasesWithPrereleases();
-    const listReleasesSpy = vi.spyOn(new Octokit().rest.repos, "listReleases");
-    listReleasesSpy.mockReturnValue(Promise.resolve({ data: releases, status: 200, headers: {}, url: "" }));
-
-    // Act
-    const result = await getAvailableUpdatesAsync(currentVersion);
-
-    // Assert
-    expect(result.map((update) => update.tagName)).toEqual(["v1.3.0", "v1.2.4"]);
-    expect(listReleasesSpy).toHaveBeenCalledWith({
-      owner: "homarr-labs",
-      repo: "homarr",
-    });
-  });
-
-  test("should return all available updates", async () => {
-    // Arrange
-    const currentVersion = "v1.2.4-beta.2";
-    const releases = fakeReleasesWithPrereleases();
-    const listReleasesSpy = vi.spyOn(new Octokit().rest.repos, "listReleases");
-    listReleasesSpy.mockReturnValue(Promise.resolve({ data: releases, status: 200, headers: {}, url: "" }));
-
-    // Act
-    const result = await getAvailableUpdatesAsync(currentVersion);
-
-    // Assert
-    expect(result.map((update) => update.tagName)).toEqual([
-      "v1.3.1-beta.1",
-      "v1.3.0",
-      "v1.3.0-beta.1",
-      "v1.2.4",
-      "v1.2.4-beta.3",
-    ]);
-    expect(listReleasesSpy).toHaveBeenCalledWith({
-      owner: "homarr-labs",
-      repo: "homarr",
-      query: undefined,
-    });
-  });
-
-  test("should skip releases with invalid semver tags", async () => {
-    // Arrange
-    const currentVersion = "v1.2.3";
-    const releases = fakeReleases(["v1.2.4", false], ["invalid-tag", false], ["v1.3.0", false]);
-    const listReleasesSpy = vi.spyOn(new Octokit().rest.repos, "listReleases");
-    listReleasesSpy.mockReturnValue(Promise.resolve({ data: releases, status: 200, headers: {}, url: "" }));
-
-    // Act
-    const result = await getAvailableUpdatesAsync(currentVersion);
-
-    // Assert
-    expect(result.map((update) => update.tagName)).toEqual(["v1.3.0", "v1.2.4"]);
-  });
-
-  test("should throw error for invalid current version", async () => {
-    // Arrange
-    const currentVersion = "invalid-version";
-
-    // Act
-    const act = () => getAvailableUpdatesAsync(currentVersion);
-
-    // Assert
-    await expect(act()).rejects.toThrow("non semantic current version");
-  });
-
-  test("should return empty array when NO_EXTERNAL_CONNECTION=true", async () => {
-    // Arrange
-    mockEnv.NO_EXTERNAL_CONNECTION = true;
-    const currentVersion = "v1.0.0";
-
-    // Act
-    const result = await getAvailableUpdatesAsync(currentVersion);
-
-    // Assert
-    expect(result).toEqual([]);
-  });
-});
-
-const fakeReleases = (...inputs: [string, boolean][]) => inputs.map(fakeRelease);
-const fakeRelease = ([tagName, isPrerelease]: [string, boolean]) =>
-  ({
-    tag_name: tagName,
-    html_url: `https://github.com/homarr-labs/homarr/releases/tag/${tagName}`,
-    name: tagName,
-    body_html: undefined,
-    prerelease: isPrerelease,
-  }) as RestEndpointMethodTypes["repos"]["listReleases"]["response"]["data"][number];
-
-const fakeReleasesWithPrereleases = () =>
-  fakeReleases(
-    ["v1.1.0", false],
-    ["v1.2.2", false],
-    ["v1.2.3", false],
-    ["v1.2.4-beta.1", true],
-    ["v1.2.4-beta.2", true],
-    ["v1.2.4-beta.3", true],
-    ["v1.2.4", false],
-    ["v1.3.0-beta.1", true],
-    ["v1.3.0", false],
-    ["v1.3.1-beta.1", true],
-  );

packages/request-handler/src/umami.ts

@@ -1,84 +0,0 @@
-import dayjs from "dayjs";
-
-import { createIntegrationAsync } from "@homarr/integrations";
-import type { UmamiEventSeries, UmamiMetricItem, UmamiVisitorStats } from "@homarr/integrations/types";
-
-import { createCachedIntegrationRequestHandler } from "./lib/cached-integration-request-handler";
-
-export const umamiRequestHandler = createCachedIntegrationRequestHandler<
-  UmamiVisitorStats,
-  "umami",
-  { websiteId: string; timeFrame: string; eventName?: string }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getVisitorStatsAsync(input.websiteId, input.timeFrame, input.eventName);
-  },
-  cacheDuration: dayjs.duration(5, "minutes"),
-  queryKey: "umamiVisitorStats",
-});
-
-export const umamiEventNamesRequestHandler = createCachedIntegrationRequestHandler<
-  string[],
-  "umami",
-  { websiteId: string }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getEventNamesAsync(input.websiteId);
-  },
-  cacheDuration: dayjs.duration(5, "minutes"),
-  queryKey: "umamiEventNames",
-});
-
-export const umamiTopPagesRequestHandler = createCachedIntegrationRequestHandler<
-  UmamiMetricItem[],
-  "umami",
-  { websiteId: string; timeFrame: string; limit: number }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getTopPagesAsync(input.websiteId, input.timeFrame, input.limit);
-  },
-  cacheDuration: dayjs.duration(5, "minutes"),
-  queryKey: "umamiTopPages",
-});
-
-export const umamiTopReferrersRequestHandler = createCachedIntegrationRequestHandler<
-  UmamiMetricItem[],
-  "umami",
-  { websiteId: string; timeFrame: string; limit: number }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getTopReferrersAsync(input.websiteId, input.timeFrame, input.limit);
-  },
-  cacheDuration: dayjs.duration(5, "minutes"),
-  queryKey: "umamiTopReferrers",
-});
-
-export const umamiMultiEventRequestHandler = createCachedIntegrationRequestHandler<
-  UmamiEventSeries[],
-  "umami",
-  { websiteId: string; timeFrame: string; eventNames: string[] }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getMultiEventTimeSeriesAsync(input.websiteId, input.timeFrame, input.eventNames);
-  },
-  cacheDuration: dayjs.duration(5, "minutes"),
-  queryKey: "umamiMultiEvent",
-});
-
-export const umamiActiveVisitorsRequestHandler = createCachedIntegrationRequestHandler<
-  number,
-  "umami",
-  { websiteId: string }
->({
-  async requestAsync(integration, input) {
-    const integrationInstance = await createIntegrationAsync(integration);
-    return await integrationInstance.getActiveVisitorsAsync(input.websiteId);
-  },
-  cacheDuration: dayjs.duration(30, "seconds"),
-  queryKey: "umamiActiveVisitors",
-});

packages/request-handler/src/update-checker.ts

@@ -1,11 +1,10 @@
 import dayjs from "dayjs";
 import { Octokit } from "octokit";
-import { compareSemVer, isValidSemVer, parseSemVer } from "semver-parser";
+import { compareSemVer, isValidSemVer } from "semver-parser";
 
 import { env } from "@homarr/common/env";
 import { fetchWithTrustedCertificatesAsync } from "@homarr/core/infrastructure/http";
 import { createLogger } from "@homarr/core/infrastructure/logs";
-import { ErrorWithMetadata } from "@homarr/core/infrastructure/logs/error";
 import { createChannelWithLatestAndEvents } from "@homarr/redis";
 import { createCachedRequestHandler } from "@homarr/request-handler/lib/cached-request-handler";
 
@@ -17,101 +16,58 @@ export const updateCheckerRequestHandler = createCachedRequestHandler({
   queryKey: "homarr-update-checker",
   cacheDuration: dayjs.duration(1, "hour"),
   async requestAsync(_) {
+    if (env.NO_EXTERNAL_CONNECTION)
+      return {
+        availableUpdates: [],
+      };
+
+    const octokit = new Octokit({
+      request: {
+        fetch: fetchWithTrustedCertificatesAsync,
+      },
+    });
+    const releases = await octokit.rest.repos.listReleases({
+      owner: "homarr-labs",
+      repo: "homarr",
+    });
+
+    const currentVersion = (packageJson as { version: string }).version;
+    const availableReleases = [];
+
+    for (const release of releases.data) {
+      if (!isValidSemVer(release.tag_name)) {
+        logger.warn("Unable to parse semantic tag. Update check might not work.", { tagName: release.tag_name });
+        continue;
+      }
+
+      availableReleases.push(release);
+    }
+
+    const availableNewerReleases = availableReleases
+      .filter((release) => compareSemVer(release.tag_name, currentVersion) > 0)
+      .sort((releaseA, releaseB) => compareSemVer(releaseB.tag_name, releaseA.tag_name));
+    if (availableNewerReleases.length > 0) {
+      logger.info(
+        "Update checker found a new available version",
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        { version: availableReleases[0]!.tag_name, currentVersion },
+      );
+    } else {
+      logger.debug("Update checker did not find any available updates", { currentVersion });
+    }
+
     return {
-      availableUpdates: await getAvailableUpdatesAsync(packageJson.version),
+      availableUpdates: availableNewerReleases.map((release) => ({
+        name: release.name,
+        contentHtml: release.body_html,
+        url: release.html_url,
+        tagName: release.tag_name,
+      })),
     };
   },
   createRedisChannel() {
     return createChannelWithLatestAndEvents<{
-      availableUpdates: Update[];
+      availableUpdates: { name: string | null; contentHtml?: string; url: string; tagName: string }[];
     }>("homarr:update");
   },
 });
-
-interface Update {
-  name: string | null;
-  contentHtml?: string;
-  url: string;
-  tagName: string;
-  isPrerelease: boolean;
-}
-
-const isPrereleaseTag = (tagName: string) => {
-  try {
-    const parsed = parseSemVer(tagName);
-    return Boolean(parsed.pre?.length);
-  } catch {
-    return false;
-  }
-};
-
-export const getAvailableUpdatesAsync = async (currentVersion: string) => {
-  if (env.NO_EXTERNAL_CONNECTION) return [];
-
-  if (!isValidSemVer(currentVersion)) {
-    throw new ErrorWithMetadata("Unable to check for updates due to non semantic current version", {
-      currentVersion,
-    });
-  }
-
-  const octokit = new Octokit({
-    request: {
-      fetch: fetchWithTrustedCertificatesAsync,
-    },
-  });
-
-  const isCurrentPrerelease = isPrereleaseTag(currentVersion);
-
-  const releases = await octokit.rest.repos.listReleases({
-    owner: "homarr-labs",
-    repo: "homarr",
-  });
-
-  const { skippedTags, semanticReleases } = releases.data
-    .map((release) => ({
-      name: release.name,
-      contentHtml: release.body_html,
-      url: release.html_url,
-      tagName: release.tag_name,
-      isPrerelease: release.prerelease,
-    }))
-    .reduce(
-      (prev, curr) => {
-        if (!isValidSemVer(curr.tagName)) {
-          prev.skippedTags.push(curr.tagName);
-          return prev;
-        }
-
-        prev.semanticReleases.push(curr);
-        return prev;
-      },
-      { semanticReleases: [] as Update[], skippedTags: [] as string[] },
-    );
-
-  if (skippedTags.length > 0) {
-    logger.warn(
-      "Some releases were skipped during the update check because their tag name is not a valid semantic version",
-      {
-        skippedTags: skippedTags.join(","),
-      },
-    );
-  }
-
-  const availableUpdates = semanticReleases
-    .filter((release) => isCurrentPrerelease || !release.isPrerelease)
-    .filter((release) => compareSemVer(release.tagName, currentVersion) > 0)
-    .sort((releaseA, releaseB) => compareSemVer(releaseB.tagName, releaseA.tagName));
-
-  if (availableUpdates.length === 0) {
-    logger.debug("No available updates found", { currentVersion });
-    return [];
-  }
-
-  logger.info("Found available updates", {
-    version: availableUpdates[0]?.tagName,
-    count: availableUpdates.length,
-    currentVersion,
-  });
-
-  return availableUpdates;
-};

packages/server-settings/src/index.ts

@@ -36,7 +36,7 @@ export const defaultServerSettings = {
     enableGravatar: true,
   },
   appearance: {
-    defaultColorScheme: "auto" as ColorScheme,
+    defaultColorScheme: "light" as ColorScheme,
   },
   culture: {
     defaultLocale: "en" as SupportedLanguage,

packages/settings/src/creator.ts

@@ -8,7 +8,6 @@ export type SettingsContextProps = Pick<
   | "homeBoardId"
   | "mobileHomeBoardId"
   | "openSearchInNewTab"
-  | "ddgBangs"
   | "pingIconsEnabled"
 > &
   Pick<ServerSettings["board"], "enableStatusByDefault" | "forceDisableStatus"> &
@@ -30,7 +29,6 @@ export type UserSettings = Pick<
   | "homeBoardId"
   | "mobileHomeBoardId"
   | "openSearchInNewTab"
-  | "ddgBangs"
   | "pingIconsEnabled"
 >;
 
@@ -43,7 +41,6 @@ export const createSettings = ({
 }) => ({
   defaultSearchEngineId: user?.defaultSearchEngineId ?? serverSettings.search.defaultSearchEngineId,
   openSearchInNewTab: user?.openSearchInNewTab ?? true,
-  ddgBangs: user?.ddgBangs ?? true,
   firstDayOfWeek: user?.firstDayOfWeek ?? (1 as const),
   homeBoardId: user?.homeBoardId ?? serverSettings.board.homeBoardId,
   mobileHomeBoardId: user?.mobileHomeBoardId ?? serverSettings.board.mobileHomeBoardId,

packages/spotlight/src/components/actions/group-actions.tsx

@@ -12,7 +12,6 @@ import { SpotlightGroupActionItem } from "./items/group-action-item";
 interface GroupActionsProps<TOption extends Record<string, unknown>> {
   group: SearchGroup<TOption>;
   query: string;
-  setQuery: (query: string) => void;
   setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
   setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
 }
@@ -20,7 +19,6 @@ interface GroupActionsProps<TOption extends Record<string, unknown>> {
 export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
   group,
   query,
-  setQuery,
   setMode,
   setChildrenOptions,
 }: GroupActionsProps<TOption>) => {
@@ -60,7 +58,6 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
         option={option}
         group={group}
         query={query}
-        setQuery={setQuery}
         setMode={setMode}
         setChildrenOptions={setChildrenOptions}
       />
@@ -93,7 +90,6 @@ export const SpotlightGroupActions = <TOption extends Record<string, unknown>>({
       option={option}
       group={group}
       query={query}
-      setQuery={setQuery}
       setMode={setMode}
       setChildrenOptions={setChildrenOptions}
     />

packages/spotlight/src/components/actions/groups/action-group.tsx

@@ -11,7 +11,6 @@ import { SpotlightGroupActions } from "../group-actions";
 interface SpotlightActionGroupsProps {
   groups: SearchGroup[];
   query: string;
-  setQuery: (query: string) => void;
   setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
   setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
 }
@@ -20,10 +19,7 @@ export const SpotlightActionGroups = ({ groups, ...others }: SpotlightActionGrou
   const t = useI18n();
 
   return groups.map((group) => (
-    <Spotlight.ActionsGroup
+    <Spotlight.ActionsGroup key={translateIfNecessary(t, group.title)} label={translateIfNecessary(t, group.title)}>
-      key={`${translateIfNecessary(t, group.title)}::${String(group.keyPath)}`}
-      label={translateIfNecessary(t, group.title)}
-    >
       {/*eslint-disable-next-line @typescript-eslint/no-explicit-any */}
       <SpotlightGroupActions<any> group={group} {...others} />
     </Spotlight.ActionsGroup>

packages/spotlight/src/components/actions/items/group-action-item.tsx

@@ -5,13 +5,11 @@ import { Link } from "@homarr/ui";
 
 import type { SearchGroup } from "../../../lib/group";
 import type { inferSearchInteractionOptions } from "../../../lib/interaction";
-import { selectAction, spotlightStore } from "../../../spotlight-store";
 import classes from "./action-item.module.css";
 
 interface SpotlightGroupActionItemProps<TOption extends Record<string, unknown>> {
   option: TOption;
   query: string;
-  setQuery: (query: string) => void;
   setMode: (mode: keyof TranslationObject["search"]["mode"]) => void;
   setChildrenOptions: (options: inferSearchInteractionOptions<"children">) => void;
   group: SearchGroup<TOption>;
@@ -20,15 +18,11 @@ interface SpotlightGroupActionItemProps<TOption extends Record<string, unknown>>
 export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>>({
   group,
   query,
-  setQuery,
   setMode,
   setChildrenOptions,
   option,
 }: SpotlightGroupActionItemProps<TOption>) => {
   const interaction = group.useInteraction(option, query);
-  // Avoid passing React's special `key` prop via spread
-
-  const { key: _reactKey, ...optionProps } = option as unknown as { key?: unknown } & Record<string, unknown>;
 
   const renderRoot =
     interaction.type === "link"
@@ -40,9 +34,6 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
   const handleClickAsync = async () => {
     if (interaction.type === "javaScript") {
       await interaction.onSelect();
-    } else if (interaction.type === "setQuery") {
-      setQuery(interaction.query);
-      setTimeout(() => selectAction(0, spotlightStore));
     } else if (interaction.type === "mode") {
       setMode(interaction.mode);
     } else if (interaction.type === "children") {
@@ -55,14 +46,11 @@ export const SpotlightGroupActionItem = <TOption extends Record<string, unknown>
       renderRoot={renderRoot}
       onClick={handleClickAsync}
       closeSpotlightOnTrigger={
-        interaction.type !== "mode" &&
+        interaction.type !== "mode" && interaction.type !== "children" && interaction.type !== "none"
-        interaction.type !== "children" &&
-        interaction.type !== "none" &&
-        interaction.type !== "setQuery"
       }
       className={classes.spotlightAction}
     >
-      <group.Component {...(optionProps as TOption)} />
+      <group.Component {...option} />
     </Spotlight.Action>
   );
 };

packages/spotlight/src/components/spotlight.tsx

@@ -4,7 +4,7 @@ import type { Dispatch, SetStateAction } from "react";
 import { useMemo, useRef, useState } from "react";
 import { ActionIcon, Center, Group, Kbd } from "@mantine/core";
 import { Spotlight as MantineSpotlight } from "@mantine/spotlight";
-import { IconSearch, IconX } from "@tabler/icons-react";
+import { IconQuestionMark, IconSearch, IconX } from "@tabler/icons-react";
 
 import { hotkeys } from "@homarr/definitions";
 import type { TranslationObject } from "@homarr/translation";
@@ -13,7 +13,6 @@ import { useI18n } from "@homarr/translation/client";
 import type { inferSearchInteractionOptions } from "../lib/interaction";
 import type { SearchMode } from "../lib/mode";
 import { searchModes } from "../modes";
-import { useHomeEmptyGroups } from "../modes/help/home-empty-groups";
 import { selectAction, spotlightStore } from "../spotlight-store";
 import { SpotlightChildrenActions } from "./actions/children-actions";
 import { SpotlightActionGroups } from "./actions/groups/action-group";
@@ -23,7 +22,6 @@ type SearchModeKey = keyof TranslationObject["search"]["mode"];
 const defaultMode = "home";
 export const Spotlight = () => {
   const searchModeState = useState<SearchModeKey>(defaultMode);
-  const queryState = useState("");
   const mode = searchModeState[0];
   const activeMode = useMemo(() => searchModes.find((searchMode) => searchMode.modeKey === mode), [mode]);
 
@@ -32,19 +30,16 @@ export const Spotlight = () => {
   }
 
   // We use the "key" below to prevent the 'Different amounts of hooks' error
-  return (
+  return <SpotlightWithActiveMode key={mode} modeState={searchModeState} activeMode={activeMode} />;
-    <SpotlightWithActiveMode key={mode} modeState={searchModeState} queryState={queryState} activeMode={activeMode} />
-  );
 };
 
 interface SpotlightWithActiveModeProps {
   modeState: [SearchModeKey, Dispatch<SetStateAction<SearchModeKey>>];
-  queryState: [string, Dispatch<SetStateAction<string>>];
   activeMode: SearchMode;
 }
 
-const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: SpotlightWithActiveModeProps) => {
+const SpotlightWithActiveMode = ({ modeState, activeMode }: SpotlightWithActiveModeProps) => {
-  const [query, setQuery] = queryState;
+  const [query, setQuery] = useState("");
   const [mode, setMode] = modeState;
   const [childrenOptions, setChildrenOptions] = useState<inferSearchInteractionOptions<"children"> | null>(null);
   const t = useI18n();
@@ -52,34 +47,28 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
   // Works as always the same amount of hooks are executed
   const useGroups = "groups" in activeMode ? () => activeMode.groups : activeMode.useGroups;
   const groups = useGroups();
-  const homeEmptyGroups = useHomeEmptyGroups();
 
   return (
     <MantineSpotlight.Root
       shortcut={hotkeys.openSpotlight}
       yOffset={8}
-      overlayProps={{ blur: 2, backgroundOpacity: 0.2 }}
       onSpotlightClose={() => {
         setMode(defaultMode);
         setChildrenOptions(null);
-        setQuery("");
       }}
       query={query}
-      onQueryChange={(nextQuery) => {
+      onQueryChange={(query) => {
-        const sanitizedQuery = mode === "external" && nextQuery.startsWith("!") ? nextQuery.slice(1) : nextQuery;
+        if (mode !== "help" || query.length !== 1) {
-        setQuery(sanitizedQuery);
+          setQuery(query);
+        }
 
-        // Only switch modes when a single trigger character is typed
+        const modeToActivate = searchModes.find((mode) => mode.character === query);
-        if (sanitizedQuery.length !== 1) return;
+        if (!modeToActivate) {
-
+          return;
-        const modeToActivate = searchModes.find((mode) => mode.character === sanitizedQuery);
+        }
-        if (!modeToActivate) return;
 
         setMode(modeToActivate.modeKey);
-        setChildrenOptions(null);
-
         setQuery("");
-
         setTimeout(() => selectAction(0, spotlightStore));
       }}
       store={spotlightStore}
@@ -102,7 +91,17 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
           },
         }}
         rightSection={
-          mode === defaultMode ? null : (
+          mode === defaultMode ? (
+            <ActionIcon
+              onClick={() => {
+                setMode("help");
+                inputRef.current?.focus();
+              }}
+              variant="subtle"
+            >
+              <IconQuestionMark stroke={1.5} />
+            </ActionIcon>
+          ) : (
             <ActionIcon
               onClick={() => {
                 setMode(defaultMode);
@@ -139,7 +138,6 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
           />
         ) : (
           <SpotlightActionGroups
-            setQuery={setQuery}
             setMode={(mode) => {
               setMode(mode);
               setChildrenOptions(null);
@@ -154,7 +152,7 @@ const SpotlightWithActiveMode = ({ modeState, queryState, activeMode }: Spotligh
               });
             }}
             query={query}
-            groups={mode === defaultMode && query.length === 0 ? [...homeEmptyGroups] : groups}
+            groups={groups}
           />
         )}
       </MantineSpotlight.ActionsList>

packages/spotlight/src/lib/interaction.ts

@@ -11,7 +11,6 @@ const createSearchInteraction = <TType extends string>(type: TType) => ({
 const searchInteractions = [
   createSearchInteraction("link").optionsType<{ href: string; newTab?: boolean }>(),
   createSearchInteraction("javaScript").optionsType<{ onSelect: () => MaybePromise<void> }>(),
-  createSearchInteraction("setQuery").optionsType<{ query: string }>(),
   createSearchInteraction("mode").optionsType<{ mode: keyof TranslationObject["search"]["mode"] }>(),
   createSearchInteraction("children").optionsType<{
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

packages/spotlight/src/modes/command/global-group.tsx

@@ -1,8 +1,7 @@
-import { Group, Text, useComputedColorScheme, useMantineColorScheme } from "@mantine/core";
+import { Group, Text, useMantineColorScheme } from "@mantine/core";
 import {
   IconBox,
   IconCategoryPlus,
-  IconDeviceDesktop,
   IconFileImport,
   IconLanguage,
   IconMailForward,
@@ -53,17 +52,13 @@ export const globalCommandGroup = createGroup<Command>({
   useOptions() {
     const tOption = useScopedI18n("search.mode.command.group.globalCommand.option");
     const { colorScheme } = useMantineColorScheme();
-    const computedColorScheme = useComputedColorScheme("light");
     const { data: session } = useSession();
 
     const commands: (Command & { hidden?: boolean })[] = [
       {
         commandKey: "colorScheme",
-        icon: colorScheme === "auto" ? IconDeviceDesktop : computedColorScheme === "dark" ? IconSun : IconMoon,
+        icon: colorScheme === "dark" ? IconSun : IconMoon,
-        name:
+        name: tOption(`colorScheme.${colorScheme === "dark" ? "light" : "dark"}`),
-          colorScheme === "auto"
-            ? tOption("colorScheme.auto")
-            : tOption(`colorScheme.${computedColorScheme === "dark" ? "light" : "dark"}`),
         useInteraction: () => {
           const { toggleColorScheme } = useMantineColorScheme();
 

packages/spotlight/src/modes/external/search-engines-search-group.tsx

@@ -1,7 +1,5 @@
 import { Group, Image, Kbd, Stack, Text } from "@mantine/core";
-import { useDebouncedValue } from "@mantine/hooks";
 import { IconDownload, IconSearch } from "@tabler/icons-react";
-import { keepPreviousData } from "@tanstack/react-query";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -19,35 +17,6 @@ import { interaction } from "../../lib/interaction";
 
 type SearchEngine = RouterOutputs["searchEngine"]["search"][number];
 type FromIntegrationSearchResult = RouterOutputs["integration"]["searchInIntegration"][number];
-type DuckDuckGoBang = RouterOutputs["bangs"]["search"][number];
-
-type ExternalOption =
-  | {
-      key: string;
-      kind: "hint";
-      label: string;
-      description?: string;
-    }
-  | {
-      key: string;
-      kind: "search";
-      label: string;
-      description?: string;
-      iconUrl?: string;
-      bang: string;
-      urlTemplate: string;
-      searchText: string;
-    }
-  | {
-      key: string;
-      kind: "engine";
-      engine: SearchEngine;
-    }
-  | {
-      key: string;
-      kind: "ddg";
-      bang: DuckDuckGoBang;
-    };
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type MediaRequestChildrenProps = {
@@ -266,217 +235,57 @@ export const searchEnginesChildrenOptions = createChildrenOptions<SearchEngine>(
   },
 });
 
-const parseBangQuery = (query: string) => {
+export const searchEnginesSearchGroups = createGroup<SearchEngine>({
-  const withBangPrefix = query.startsWith("!") ? query.slice(1) : query;
+  keyPath: "short",
-  const bangIdx = withBangPrefix.indexOf(" ");
-  const bangToken = (bangIdx === -1 ? withBangPrefix : withBangPrefix.slice(0, bangIdx)).toLowerCase().trim();
-  const searchText = bangIdx === -1 ? "" : withBangPrefix.slice(bangIdx + 1);
-  const locked = bangIdx !== -1;
-  return { bangToken, searchText, locked };
-};
-
-const buildSearchUrl = (template: string, query: string) => {
-  const encoded = encodeURIComponent(query);
-  if (template.includes("{{{s}}}")) {
-    return template.replaceAll("{{{s}}}", encoded);
-  }
-
-  return template.replaceAll("%s", encoded);
-};
-
-export const searchEnginesSearchGroups = createGroup<ExternalOption>({
-  keyPath: "key",
   title: (t) => t("search.mode.external.group.searchEngine.title"),
-  Component: (option) => {
+  Component: ({ iconUrl, name, short, description }) => {
-    if (option.kind === "hint") {
-      return (
-        <Group w="100%" wrap="nowrap" align="center" px="md" py="xs">
-          <IconSearch stroke={1.5} />
-          <Stack gap={0}>
-            <Text size="sm">{option.label}</Text>
-            {option.description ? (
-              <Text size="xs" c="gray.6">
-                {option.description}
-              </Text>
-            ) : null}
-          </Stack>
-        </Group>
-      );
-    }
-
-    if (option.kind === "search") {
-      return (
-        <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
-          <Group wrap="nowrap">
-            {option.iconUrl ? (
-              <img height={24} width={24} src={option.iconUrl} alt={option.label} />
-            ) : (
-              <IconSearch stroke={1.5} />
-            )}
-            <Stack gap={0} justify="center">
-              <Text size="sm">{option.label}</Text>
-              {option.description ? (
-                <Text size="xs" c="gray.6">
-                  {option.description}
-                </Text>
-              ) : null}
-            </Stack>
-          </Group>
-
-          <Kbd size="sm">!{option.bang}</Kbd>
-        </Group>
-      );
-    }
-
-    if (option.kind === "engine") {
-      const { iconUrl, name, short, description } = option.engine;
-      return (
-        <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
-          <Group wrap="nowrap">
-            <img height={24} width={24} src={iconUrl} alt={name} />
-            <Stack gap={0} justify="center">
-              <Text size="sm">{name}</Text>
-              <Text size="xs" c="gray.6">
-                {description}
-              </Text>
-            </Stack>
-          </Group>
-
-          <Kbd size="sm">!{short}</Kbd>
-        </Group>
-      );
-    }
-
-    const { s: name, t: short, d: domain } = option.bang;
     return (
       <Group w="100%" wrap="nowrap" justify="space-between" align="center" px="md" py="xs">
         <Group wrap="nowrap">
-          <IconSearch stroke={1.5} />
+          <img height={24} width={24} src={iconUrl} alt={name} />
           <Stack gap={0} justify="center">
             <Text size="sm">{name}</Text>
             <Text size="xs" c="gray.6">
-              {domain ?? "DuckDuckGo bang"}
+              {description}
             </Text>
           </Stack>
         </Group>
 
-        <Kbd size="sm">!{short}</Kbd>
+        <Kbd size="sm">{short}</Kbd>
       </Group>
     );
   },
-  useInteraction(option, query) {
+  onKeyDown(event, options, query, { setChildrenOptions }) {
-    const { openSearchInNewTab } = useSettings();
+    if (event.code !== "Space") return;
-    const { bangToken, searchText } = parseBangQuery(query);
 
-    if (option.kind === "search") {
+    const engine = options.find((option) => option.short === query);
+    if (!engine) return;
+
+    setChildrenOptions(searchEnginesChildrenOptions(engine));
+  },
+  useInteraction: (searchEngine, query) => {
+    const { openSearchInNewTab } = useSettings();
+    if (searchEngine.type === "generic" && searchEngine.urlTemplate) {
       return {
-        type: "link",
+        type: "link" as const,
-        href: buildSearchUrl(option.urlTemplate, option.searchText),
+        href: searchEngine.urlTemplate.replace("%s", query),
         newTab: openSearchInNewTab,
       };
     }
 
-    if (option.kind === "engine") {
+    if (searchEngine.type === "fromIntegration" && searchEngine.integrationId !== null) {
-      const nextBang = option.engine.short;
+      return {
-      const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
+        type: "children",
-      return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
+        ...searchEnginesChildrenOptions(searchEngine),
+      };
     }
 
-    if (option.kind === "ddg") {
+    throw new Error(`Unable to process search engine with type ${searchEngine.type}`);
-      const nextBang = option.bang.t;
-      const nextQuery = `${`${nextBang} ${searchText}`.trimEnd()} `;
-      return { type: "setQuery", query: bangToken === nextBang && query.endsWith(" ") ? query : nextQuery };
-    }
-
-    return { type: "none" };
   },
   useQueryOptions(query) {
-    const tExternal = useScopedI18n("search.mode.external.group.searchEngine");
+    return clientApi.searchEngine.search.useQuery({
-    const { ddgBangs } = useSettings();
+      query: query.trim(),
-    const { bangToken, searchText, locked } = parseBangQuery(query);
+      limit: 5,
-    const [debouncedBangToken] = useDebouncedValue(bangToken, 150);
+    });
-
-    const enginesQuery = clientApi.searchEngine.search.useQuery(
-      { query: debouncedBangToken, limit: 10 },
-      { placeholderData: keepPreviousData },
-    );
-
-    const ddgQuery = clientApi.bangs.search.useQuery(
-      { query: debouncedBangToken, limit: 10 },
-      {
-        enabled: ddgBangs && debouncedBangToken.length >= 1,
-        placeholderData: keepPreviousData,
-      },
-    );
-
-    const isLoading = enginesQuery.isLoading || ddgQuery.isLoading;
-    const isError = enginesQuery.isError || ddgQuery.isError;
-
-    const engineOptions = (enginesQuery.data ?? []).map(
-      (engine): ExternalOption => ({
-        key: `engine-${engine.short}`,
-        kind: "engine",
-        engine,
-      }),
-    );
-
-    const ddgOptions = (ddgQuery.data ?? [])
-      .filter((bang) => !engineOptions.some((option) => option.kind === "engine" && option.engine.short === bang.t))
-      .map(
-        (bang): ExternalOption => ({
-          key: `ddg-${bang.t}`,
-          kind: "ddg",
-          bang,
-        }),
-      );
-
-    const searchActions: ExternalOption[] = [];
-    if (locked && bangToken.length > 0) {
-      const matchedEngine = (enginesQuery.data ?? []).find((engine) => engine.short === bangToken);
-      const matchedDdg = (ddgQuery.data ?? []).find((bang) => bang.t === bangToken);
-
-      const label = matchedEngine?.name ?? matchedDdg?.s;
-      const iconUrl = matchedEngine?.iconUrl;
-      const urlTemplate = matchedEngine?.type === "generic" ? matchedEngine.urlTemplate : matchedDdg?.u;
-
-      if (label && urlTemplate) {
-        if (searchText.trim().length > 0) {
-          searchActions.push({
-            key: "search-action",
-            kind: "search",
-            label: tExternal("bang.searchWithQuery", {
-              query: searchText.trim(),
-              label,
-            }),
-            description: tExternal("bang.pressEnterToOpen"),
-            bang: bangToken,
-            iconUrl,
-            urlTemplate,
-            searchText: searchText.trim(),
-          });
-        } else {
-          searchActions.push({
-            key: "search-hint",
-            kind: "hint",
-            label: tExternal("bang.engineSelected", { label, bang: bangToken }),
-            description: tExternal("bang.typeQueryToContinue"),
-          });
-        }
-      }
-    }
-    if (query.length === 0) {
-      searchActions.push({
-        key: "hint",
-        kind: "hint",
-        label: tExternal("bang.emptyBangHint"),
-        description: ddgBangs ? tExternal("tipDdgBangs") : undefined,
-      });
-    }
-
-    return {
-      isLoading,
-      isError,
-      data: [...searchActions, ...engineOptions, ...ddgOptions].slice(0, 10),
-    };
   },
 });

packages/spotlight/src/modes/help/home-empty-groups.tsx

@@ -1,140 +0,0 @@
-import { Group, Kbd, Text } from "@mantine/core";
-import {
-  IconBook2,
-  IconBrandDiscord,
-  IconBrandGithub,
-  IconLayoutDashboard,
-  IconSearch,
-  IconSettings,
-} from "@tabler/icons-react";
-
-import { useSession } from "@homarr/auth/client";
-import { createDocumentationLink } from "@homarr/definitions";
-import { useScopedI18n } from "@homarr/translation/client";
-import type { TablerIcon } from "@homarr/ui";
-
-import { createGroup } from "../../lib/group";
-import { interaction } from "../../lib/interaction";
-import type { SearchMode } from "../../lib/mode";
-import { appIntegrationBoardMode } from "../app-integration-board";
-import { commandMode } from "../command";
-import { externalMode } from "../external";
-import { pageMode } from "../page";
-import { userGroupMode } from "../user-group";
-
-// We need type to allow it as generic type for Record<string, unknown>
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type QuickLinkOption = {
-  icon: TablerIcon;
-  name: string;
-  path: string;
-};
-
-export const useHomeEmptyGroups = () => {
-  const { data: session } = useSession();
-  const tPages = useScopedI18n("search.mode.page.group.page.option");
-  const visibleSearchModes: SearchMode[] = [appIntegrationBoardMode, externalMode, commandMode, pageMode];
-
-  if (session?.user.permissions.includes("admin")) {
-    visibleSearchModes.unshift(userGroupMode);
-  }
-
-  return [
-    createGroup({
-      keyPath: "path",
-      title: () => "Quick links",
-      options: (() => {
-        const quickLinks: QuickLinkOption[] = [];
-        if (session?.user) {
-          quickLinks.push({
-            icon: IconSettings,
-            path: `/manage/users/${session.user.id}/general`,
-            name: tPages("preferences.label"),
-          });
-        }
-
-        quickLinks.push({
-          icon: IconLayoutDashboard,
-          path: "/manage/boards",
-          name: tPages("manageBoard.label"),
-        });
-
-        if (session?.user.permissions.includes("admin")) {
-          quickLinks.push({
-            icon: IconSettings,
-            path: "/manage/settings",
-            name: tPages("manageSettings.label"),
-          });
-        }
-
-        if (session) {
-          quickLinks.push({
-            icon: IconSearch,
-            path: "/manage/search-engines",
-            name: tPages("manageSearchEngine.label"),
-          });
-        }
-
-        return quickLinks;
-      })(),
-      Component: ({ name, icon: Icon }) => (
-        <Group px="md" py="xs" w="100%" wrap="nowrap" align="center">
-          <Icon stroke={1.5} />
-          <Text>{name}</Text>
-        </Group>
-      ),
-      filter: () => true,
-      useInteraction: interaction.link(({ path }) => ({ href: path })),
-    }),
-    createGroup({
-      keyPath: "character",
-      title: (t) => t("search.mode.help.group.mode.title"),
-      options: visibleSearchModes.map(({ character, modeKey }) => ({ character, modeKey })),
-      Component: ({ modeKey, character }) => {
-        const t = useScopedI18n(`search.mode.${modeKey}`);
-
-        return (
-          <Group px="md" py="xs" w="100%" wrap="nowrap" align="center" justify="space-between">
-            <Text>{t("help")}</Text>
-            <Kbd size="sm">{character}</Kbd>
-          </Group>
-        );
-      },
-      filter: () => true,
-      useInteraction: interaction.mode(({ modeKey }) => ({ mode: modeKey })),
-    }),
-    createGroup({
-      keyPath: "href",
-      title: (t) => t("search.mode.help.group.help.title"),
-      useOptions() {
-        const t = useScopedI18n("search.mode.help.group.help.option");
-
-        return [
-          {
-            href: createDocumentationLink("/docs/getting-started"),
-            icon: IconBook2,
-            label: t("documentation.label"),
-          },
-          {
-            href: "https://github.com/homarr-labs/homarr/issues/new/choose",
-            icon: IconBrandGithub,
-            label: t("submitIssue.label"),
-          },
-          {
-            href: "https://discord.com/invite/aCsmEV5RgA",
-            icon: IconBrandDiscord,
-            label: t("discord.label"),
-          },
-        ];
-      },
-      Component: (props) => (
-        <Group px="md" py="xs" w="100%" wrap="nowrap" align="center">
-          <props.icon stroke={1.5} />
-          <Text>{props.label}</Text>
-        </Group>
-      ),
-      filter: () => true,
-      useInteraction: interaction.link(({ href }) => ({ href, newTab: true })),
-    }),
-  ] as const;
-};