chore: update @types/node to v22

This is an attempt to fix the undici errors introduced after the switch
from axios to native fetch. The decision was made as it native fetch on
node 20 seems to be "experimental" and
> since native fetch is no longer experimental since Node 21

docs/extending-jellyseerr/database-config.mdx

@@ -9,8 +9,6 @@ Jellyseerr supports SQLite and PostgreSQL. The database connection can be config
 
 ## SQLite Options
 
-If you want to use SQLite, you can simply set the `DB_TYPE` environment variable to `sqlite`. This is the default configuration so even if you don't set any other options, SQLite will be used.
-
 ```dotenv
 DB_TYPE="sqlite" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
 CONFIG_DIRECTORY="config" # (optional) The path to the config directory where the db file is stored. The default is "config".
@@ -19,35 +17,17 @@ DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging.
 
 ## PostgreSQL Options
 
-### TCP Connection
-
-If your PostgreSQL server is configured to accept TCP connections, you can specify the host and port using the `DB_HOST` and `DB_PORT` environment variables. This is useful for remote connections where the server uses a network host and port.
-
 ```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-DB_HOST="localhost" # (optional) The host (URL) of the database. The default is "localhost".
+DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite". To use postgres, this needs to be set to "postgres"
+DB_HOST="localhost" # (optional) The host (url) of the database. The default is "localhost".
 DB_PORT="5432" # (optional) The port to connect to. The default is "5432".
-DB_USER= # (required) Username used to connect to the database.
-DB_PASS= # (required) Password of the user used to connect to the database.
-DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
-DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
-```
-
-### Unix Socket Connection
-
-If your PostgreSQL server is configured to accept Unix socket connections, you can specify the path to the socket directory using the `DB_SOCKET_PATH` environment variable. This is useful for local connections where the server uses a Unix socket.
-
-```dotenv
-DB_TYPE="postgres" # Which DB engine to use, either "sqlite" or "postgres". The default is "sqlite".
-DB_SOCKET_PATH="/var/run/postgresql" # (required) The path to the PostgreSQL Unix socket directory.
-DB_USER= # (required) Username used to connect to the database.
-DB_PASS= # (optional) Password of the user used to connect to the database, depending on the server's authentication configuration.
+DB_USER= # (required) Username used to connect to the database
+DB_PASS= # (required) Password of the user used to connect to the database
 DB_NAME="jellyseerr" # (optional) The name of the database to connect to. The default is "jellyseerr".
 DB_LOG_QUERIES="false" # (optional) Whether to log the DB queries for debugging. The default is "false".
 ```
 
 ### SSL configuration
-
 The following options can be used to further configure ssl. Certificates can be provided as a string or a file path, with the string version taking precedence.
 
 ```dotenv
@@ -60,7 +40,6 @@ DB_SSL_KEY_FILE= # (optinal) Path to the private key for the connection in PEM f
 DB_SSL_CERT= # (optional) Certificate chain in pem format for the private key, provided as a string. The default is "".
 DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the private key. The default is "".
 ```
----
 
 ### Migrating from SQLite to PostgreSQL
 
@@ -69,7 +48,7 @@ DB_SSL_CERT_FILE= # (optional) Path to certificate chain in pem format for the p
 3. Stop Jellyseerr
 4. Run the following command to export the data from the SQLite database and import it into the PostgreSQL database:
 :::info
-Edit the postgres connection string to match your setup.
+Edit the postgres connection string to match your setup
 
 If you don't have or don't want to use docker, you can build the working pgloader version [in this PR](https://github.com/dimitri/pgloader/pull/1531) from source and use the same options as below.
 :::
@@ -77,6 +56,6 @@ If you don't have or don't want to use docker, you can build the working pgloade
 The most recent release of pgloader has an issue quoting the table columns. Use the version in the docker container to avoid this issue.
 :::
 ```bash
-docker run --rm -v config/db.sqlite3:/db.sqlite3:ro ghcr.io/ralgar/pgloader:pr-1531 pgloader --with "quote identifiers" --with "data only" /db.sqlite3 postgresql://{{DB_USER}}:{{DB_PASS}}@{{DB_HOST}}:{{DB_PORT}}/{{DB_NAME}}
+docker run --rm -v config/db.sqlite3:/db.sqlite3:ro -v pgloader/pgloader.load:/pgloader.load ghcr.io/ralgar/pgloader:pr-1531 pgloader --with "quote identifiers" --with "data only" /db.sqlite3 postgresql://{{DB_USER}}:{{DB_PASS}}@{{DB_HOST}}:{{DB_PORT}}/{{DB_NAME}}
    ```
 5. Start Jellyseerr

docs/getting-started/buildfromsource.mdx

@@ -6,8 +6,6 @@ sidebar_position: 2
 # Build from Source (Advanced)
 :::warning
 This method is not recommended for most users. It is intended for advanced users who are familiar with managing their own server infrastructure.
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 import Tabs from '@theme/Tabs';

docs/getting-started/docker.mdx

@@ -7,8 +7,6 @@ sidebar_position: 1
 :::info
 This is the recommended method for most users.
 Details on how to install Docker can be found on the [official Docker website](https://docs.docker.com/get-docker/).
-
-Refer to [Configuring Databases](/extending-jellyseerr/database-config#postgresql-options) for details on how to configure your database.
 :::
 
 ## Unix (Linux, macOS)

docs/getting-started/nixpkg.mdx

@@ -6,8 +6,6 @@ sidebar_position: 3
 
 import { JellyseerrVersion, NixpkgVersion } from '@site/src/components/JellyseerrVersion';
 import Admonition from '@theme/Admonition';
-import Tabs from '@theme/Tabs';
-import TabItem from '@theme/TabItem';
 
 # Nix Package Manager (Advanced)
 :::info
@@ -15,55 +13,22 @@ This method is not recommended for most users. It is intended for advanced users
 :::
 
 export const VersionMismatchWarning = () => {
-  let jellyseerrVersion = null;
-  let nixpkgVersions = null;
-  try {
-    jellyseerrVersion = JellyseerrVersion();
-    nixpkgVersions = NixpkgVersion();
-  } catch (err) {
-    return (
-      <Admonition type="error">
-        Failed to load version information. Error: {err.message || JSON.stringify(err)}
-      </Admonition>
-    );
-  }
+  const jellyseerrVersion = JellyseerrVersion();
+  const nixpkgVersion = NixpkgVersion();
 
-    if (!nixpkgVersions || nixpkgVersions.error) {
-    return (
-      <Admonition type="error">
-        Failed to fetch Nixpkg versions: {nixpkgVersions?.error || 'Unknown error'}
-      </Admonition>
-    );
-  }
-
-  const isUnstableUpToDate = jellyseerrVersion === nixpkgVersions.unstable;
-  const isStableUpToDate = jellyseerrVersion === nixpkgVersions.stable;
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
 
   return (
-     <>
-      {!isStableUpToDate ? (
-  <Admonition type="warning">
-    The{' '}
-    <a href="https://github.com/NixOS/nixpkgs/blob/nixos-24.11/pkgs/servers/jellyseerr/default.nix#L14">
-      upstream Jellyseerr Nix Package (v{nixpkgVersions.stable})
-    </a>{' '}
-    is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>,{' '}
-    {isUnstableUpToDate ? (
-      <>
-        consider using the{' '}
-        <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix">
-          unstable package
-        </a>{' '}
-        instead.
-      </>
-    ) : (
-      <>
-        you will need to{' '}
-        <a href="#overriding-the-package-derivation">override the package derivation</a>.
-      </>
-    )}
-  </Admonition>
-) : null} 
+    <>
+      {!isUpToDate ? (
+        <Admonition type="warning">
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is not <b>up-to-date</b>. If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to <a href="#overriding-the-package-derivation">override the package derivation</a>.
+        </Admonition>
+      ) : (
+        <Admonition type="success">
+          The <a href="https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/servers/jellyseerr/default.nix#L14">upstream Jellyseerr Nix Package (v{nixpkgVersion})</a> is <b>up-to-date</b> with <b>Jellyseerr v{jellyseerrVersion}</b>.
+        </Admonition>
+      )}
     </>
   );
 };
@@ -83,8 +48,6 @@ To get up and running with jellyseerr using Nix, you can add the following to yo
 
 If you want more advanced configuration options, you can use the following:
 
-<Tabs groupId="nixpkg-methods" queryString>
-  <TabItem value="default" label="Default Configurations">
 ```nix
 { config, pkgs, ... }:
 
@@ -93,20 +56,53 @@ If you want more advanced configuration options, you can use the following:
     enable = true;
     port = 5055;
     openFirewall = true;
-    package = pkgs.jellyseerr; # Use the unstable package if stable is not up-to-date
   };
 }
 ```
-  </TabItem>
-  <TabItem value="custom" label="Database Configurations">
-In order to use postgres, you will need to add override the default module of jellyseerr with the following as the current default module is not compatible with postgres:
-```nix
+
+After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
+
+```bash
+nixos-rebuild switch
+```
+After rebuild is complete jellyseerr should be running, verify that it is with the following command.
+```bash
+systemctl status jellyseerr
+```
+
+:::info
+You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
+:::
+
+
+
+import CodeBlock from '@theme/CodeBlock';
+
+## Overriding the package derivation
+export const VersionMatch = () => {
+  const jellyseerrVersion = JellyseerrVersion();
+  const nixpkgVersion = NixpkgVersion();
+
+  const code = `{ config, pkgs, ... }:
 {
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+  nixpkgs.config.packageOverrides = pkgs: {
+    jellyseerr = pkgs.jellyseerr.overrideAttrs (oldAttrs: rec {
+      version = "${jellyseerrVersion}";
+
+      src = pkgs.fetchFromGitHub {
+        rev = "v\${version}";
+        sha256 = pkgs.lib.fakeSha256;
+      };
+
+      offlineCache = pkgs.fetchYarnDeps {
+        sha256 = pkgs.lib.fakeSha256;
+      };
+    });
+  };
+}`;
+
+  const module = `{ config, pkgs, lib, ... }:
+
 with lib;
 let
   cfg = config.services.jellyseerr;
@@ -117,65 +113,28 @@ in
   disabledModules = [ "services/misc/jellyseerr.nix" ];
 
   options.services.jellyseerr = {
-    enable = mkEnableOption ''Jellyseerr, a requests manager for Jellyfin'';
+    enable = mkEnableOption (mdDoc ''Jellyseerr, a requests manager for Jellyfin'');
 
     openFirewall = mkOption {
       type = types.bool;
       default = false;
-      description = ''Open port in the firewall for the Jellyseerr web interface.'';
+      description = mdDoc ''Open port in the firewall for the Jellyseerr web interface.'';
     };
 
     port = mkOption {
       type = types.port;
       default = 5055;
-      description = ''The port which the Jellyseerr web UI should listen to.'';
+      description = mdDoc ''The port which the Jellyseerr web UI should listen to.'';
     };
 
     package = mkOption {
-      type = types.package;
-      default = pkgs.jellyseerr;
-      defaultText = literalExpression "pkgs.jellyseerr";
-      description = ''
-        Jellyseerr package to use.
-      '';
-    };
-
-    databaseConfig = mkOption {
-      type = types.attrsOf types.str;
-      default = {
-        type = "sqlite";
-        configDirectory = "config";
-        logQueries = "false";
+        type = types.package;
+        default = pkgs.jellyseerr;
+        defaultText = literalExpression "pkgs.jellyseerr";
+        description = lib.mdDoc ''
+          Jellyseerr package to use.
+        '';
       };
-      description = ''
-        Database configuration. For "sqlite", only "type", "configDirectory", and "logQueries" are relevant.
-        For "postgres", include host, port, user, pass, name, and optionally socket.
-        Example:
-        {
-          type = "postgres";
-          socket = "/run/postgresql";
-          user = "jellyseerr";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "postgres";
-          host = "localhost";
-          port = "5432";
-          user = "dbuser";
-          pass = "password";
-          name = "jellyseerr";
-          logQueries = "false";
-        }
-        or
-        {
-          type = "sqlite";
-          configDirectory = "config";
-          logQueries = "false";
-        }
-      '';
-    };
   };
 
   config = mkIf cfg.enable {
@@ -183,29 +142,14 @@ in
       description = "Jellyseerr, a requests manager for Jellyfin";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment =
-        let
-          dbConfig = cfg.databaseConfig;
-        in
-        {
-          PORT = toString cfg.port;
-          DB_TYPE = toString dbConfig.type;
-          CONFIG_DIRECTORY = toString dbConfig.configDirectory or "";
-          DB_LOG_QUERIES = toString dbConfig.logQueries;
-          DB_HOST = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.host or "" else "";
-          DB_PORT = if dbConfig.type == "postgres" && !(hasAttr "socket" dbConfig) then toString dbConfig.port or "" else "";
-          DB_SOCKET_PATH = if dbConfig.type == "postgres" && hasAttr "socket" dbConfig then toString dbConfig.socket or "" else "";
-          DB_USER = if dbConfig.type == "postgres" then toString dbConfig.user or "" else "";
-          DB_PASS = if dbConfig.type == "postgres" then toString dbConfig.pass or "" else "";
-          DB_NAME = if dbConfig.type == "postgres" then toString dbConfig.name or "" else "";
-        };
+      environment.PORT = toString cfg.port;
       serviceConfig = {
         Type = "exec";
         StateDirectory = "jellyseerr";
-        WorkingDirectory = "${cfg.package}/libexec/jellyseerr";
+        WorkingDirectory = "\${cfg.package}/libexec/jellyseerr/deps/jellyseerr";
         DynamicUser = true;
-        ExecStart = "${cfg.package}/bin/jellyseerr";
-        BindPaths = [ "/var/lib/jellyseerr/:${cfg.package}/libexec/jellyseerr/config/" ];
+        ExecStart = "\${cfg.package}/bin/jellyseerr";
+        BindPaths = [ "/var/lib/jellyseerr/:\${cfg.package}/libexec/jellyseerr/deps/jellyseerr/config/" ];
         Restart = "on-failure";
         ProtectHome = true;
         ProtectSystem = "strict";
@@ -225,47 +169,57 @@ in
       };
     };
 
-    networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; };
-  };
-}
-```
-Then, import the module into your `configuration.nix`:
-```nix
-{ config, pkgs, ... }:
-{
-  imports = [ ./modules/jellyseerr.nix ];
-
-  services.jellyseerr = {
-    enable = true;
-    port = 5055;
-    openFirewall = true;
-    package = pkgs.unstable.jellyseerr; # use the unstable package if stable is not up-to-date
-    databaseConfig = {
-      type = "postgres";
-      host = "localhost"; # or socket: "/run/postgresql"
-      port = "5432"; # if using socket, this is not needed
-      user = "jellyseerr";
-      pass = "jellyseerr";
-      name = "jellyseerr";
-      logQueries = "false";
+    networking.firewall = mkIf cfg.openFirewall {
+      allowedTCPPorts = [ cfg.port ];
     };
-  }
-}
-```
-  </TabItem>
-</Tabs>
+  };
+}`;
 
-After adding the configuration to your `configuration.nix`, you can run the following command to install jellyseerr:
+  const configuration = `{ config, pkgs, ... }:
+{
+    imports = [ ./jellyseerr-module.nix ]
 
-```bash
-nixos-rebuild switch
-```
-After rebuild is complete jellyseerr should be running, verify that it is with the following command.
-```bash
-systemctl status jellyseerr
-```
+    services.jellyseerr = {
+        enable = true;
+        port = 5055;
+        openFirewall = true;
+        package = (pkgs.callPackage (import ../../../pkgs/jellyseerr) { });
+    };
+}`;
 
-:::info
-You can now access Jellyseerr by visiting `http://localhost:5055` in your web browser.
-:::
+  const isUpToDate = jellyseerrVersion === nixpkgVersion;
+
+  return (
+    <>
+      {isUpToDate ? (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg package version <strong>({nixpkgVersion})</strong> is <strong>up-to-date</strong>.</p>
+          <p>There is no need to override the package derivation.</p>
+        </>
+      ) : (
+        <>
+          <p>The latest version of Jellyseerr <strong>({jellyseerrVersion})</strong> and the Jellyseerr nixpkg version <strong>(v{nixpkgVersion})</strong> is <strong>out-of-date</strong>.
+          If you want to use <b>Jellyseerr v{jellyseerrVersion}</b>, you will need to override the package derivation.</p>
+          <p>In order to override the package derivation:</p>
+          <ol>
+            <li style={{ marginBottom: '1rem' }}>Grab the <a href="https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix">latest nixpkg derivation for Jellyseerr</a></li>
+            <li style={{ marginBottom: '1rem' }}>Grab the latest <a href="https://raw.githubusercontent.com/Fallenbagel/jellyseerr/main/package.json">package.json</a> for Jellyseerr</li>
+            <li style={{ marginBottom: '1rem' }}>Add it to the same directory as the nixpkg derivation</li>
+            <li style={{ marginBottom: '1rem' }}>Update the `src` and `offlineCache` attributes in the nixpkg derivation:</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{code}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>You can replace the <b>sha256</b> with the actual hash that <b>nixos-rebuild</b> outputs when you run the command.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Grab this module and import it in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{module}</CodeBlock>
+            <Admonition type="tip" style={{ marginBottom: '1rem' }}>We are using a custom module because the upstream module does not have a package option.</Admonition>
+            <li style={{ marginBottom: '1rem' }}>Call the new package in your `configuration.nix`</li>
+            <CodeBlock className="language-nix" style={{ marginBottom: '1rem' }}>{configuration}</CodeBlock>
+          </ol>
+        </>
+      )}
+    </>
+  );
+
+};
+
+<VersionMatch />
 

gen-docs/package.json

@@ -47,6 +47,6 @@
     ]
   },
   "engines": {
-    "node": ">=22.0"
+    "node": ">=18.0"
   }
 }

gen-docs/src/components/JellyseerrVersion/index.tsx

@@ -26,37 +26,25 @@ export const JellyseerrVersion = () => {
 };
 
 export const NixpkgVersion = () => {
-  const [versions, setVersions] = useState(null);
+  const [version, setVersion] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
   useEffect(() => {
     const fetchVersion = async () => {
       try {
-        const unstableUrl =
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-unstable/pkgs/by-name/je/jellyseerr/package.nix';
-        const stableUrl =
-          'https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/nixos-24.11/pkgs/servers/jellyseerr/default.nix';
-
-        const [unstableResponse, stableResponse] = await Promise.all([
-          fetch(unstableUrl),
-          fetch(stableUrl),
-        ]);
-
-        const unstableData = await unstableResponse.text();
-        const stableData = await stableResponse.text();
+        const url =
+          'https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/servers/jellyseerr/default.nix';
+        const response = await fetch(url);
+        const data = await response.text();
 
         const versionRegex = /version\s*=\s*"([^"]+)"/;
-
-        const unstableMatch = unstableData.match(versionRegex);
-        const stableMatch = stableData.match(versionRegex);
-
-        const unstableVersion =
-          unstableMatch && unstableMatch[1] ? unstableMatch[1] : '0.0.0';
-        const stableVersion =
-          stableMatch && stableMatch[1] ? stableMatch[1] : '0.0.0';
-
-        setVersions({ unstable: unstableVersion, stable: stableVersion });
+        const match = data.match(versionRegex);
+        if (match && match[1]) {
+          setVersion(match[1]);
+        } else {
+          setError('0.0.0');
+        }
         setLoading(false);
       } catch (err) {
         setError(err.message);
@@ -75,5 +63,5 @@ export const NixpkgVersion = () => {
     return { error };
   }
 
-  return versions;
+  return version;
 };

overseerr-api.yml

@@ -7018,12 +7018,6 @@ paths:
       description: Updates an Override Rule from the request body.
       tags:
         - overriderule
-      parameters:
-        - in: path
-          name: ruleId
-          required: true
-          schema:
-            type: number
       responses:
         '200':
           description: 'Values were successfully updated'

server/api/externalapi.ts

@@ -69,13 +69,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -84,7 +81,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -111,13 +111,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
-      headers,
       data,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -127,7 +124,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'POST',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: data ? JSON.stringify(data) : undefined,
     });
     if (!response.ok) {
@@ -155,13 +155,10 @@ class ExternalAPI {
     ttl?: number,
     config?: RequestInit
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       config: { ...this.params, ...params },
       data,
-      headers,
     });
-
     const cachedItem = this.cache?.get<T>(cacheKey);
     if (cachedItem) {
       return cachedItem;
@@ -171,7 +168,10 @@ class ExternalAPI {
     const response = await this.fetch(url, {
       method: 'PUT',
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
       body: JSON.stringify(data),
     });
     if (!response.ok) {
@@ -227,11 +227,9 @@ class ExternalAPI {
     config?: RequestInit,
     overwriteBaseUrl?: string
   ): Promise<T> {
-    const headers = { ...this.defaultHeaders, ...config?.headers };
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
       ...params,
-      headers,
     });
     const cachedItem = this.cache?.get<T>(cacheKey);
 
@@ -246,7 +244,10 @@ class ExternalAPI {
         const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
         this.fetch(url, {
           ...config,
-          headers,
+          headers: {
+            ...this.defaultHeaders,
+            ...config?.headers,
+          },
         }).then(async (response) => {
           if (!response.ok) {
             const text = await response.text();
@@ -269,7 +270,10 @@ class ExternalAPI {
     const url = this.formatUrl(endpoint, params, overwriteBaseUrl);
     const response = await this.fetch(url, {
       ...config,
-      headers,
+      headers: {
+        ...this.defaultHeaders,
+        ...config?.headers,
+      },
     });
     if (!response.ok) {
       const text = await response.text();
@@ -289,10 +293,10 @@ class ExternalAPI {
     return data;
   }
 
-  protected removeCache(endpoint: string, options?: Record<string, string>) {
+  protected removeCache(endpoint: string, params?: Record<string, string>) {
     const cacheKey = this.serializeCacheKey(endpoint, {
       ...this.params,
-      ...options,
+      ...params,
     });
     this.cache?.del(cacheKey);
   }
@@ -321,13 +325,13 @@ class ExternalAPI {
 
   private serializeCacheKey(
     endpoint: string,
-    options?: Record<string, unknown>
+    params?: Record<string, unknown>
   ) {
-    if (!options) {
+    if (!params) {
       return `${this.baseUrl}${endpoint}`;
     }
 
-    return `${this.baseUrl}${endpoint}${JSON.stringify(options)}`;
+    return `${this.baseUrl}${endpoint}${JSON.stringify(params)}`;
   }
 
   private async getDataFromResponse(response: Response) {

server/datasource.ts

@@ -68,10 +68,8 @@ const prodConfig: DataSourceOptions = {
 
 const postgresDevConfig: DataSourceOptions = {
   type: 'postgres',
-  host: process.env.DB_SOCKET_PATH || process.env.DB_HOST,
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : parseInt(process.env.DB_PORT ?? '5432'),
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
   username: process.env.DB_USER,
   password: process.env.DB_PASS,
   database: process.env.DB_NAME ?? 'jellyseerr',
@@ -86,10 +84,8 @@ const postgresDevConfig: DataSourceOptions = {
 
 const postgresProdConfig: DataSourceOptions = {
   type: 'postgres',
-  host: process.env.DB_SOCKET_PATH || process.env.DB_HOST,
-  port: process.env.DB_SOCKET_PATH
-    ? undefined
-    : parseInt(process.env.DB_PORT ?? '5432'),
+  host: process.env.DB_HOST,
+  port: parseInt(process.env.DB_PORT ?? '5432'),
   username: process.env.DB_USER,
   password: process.env.DB_PASS,
   database: process.env.DB_NAME ?? 'jellyseerr',

src/components/MovieDetails/index.tsx

@@ -1063,26 +1063,14 @@ const MovieDetails = ({ movie }: MovieDetailsProps) => {
               </div>
             )}
             {!!streamingProviders.length && (
-              <div className="media-fact flex-col gap-1">
+              <div className="media-fact">
                 <span>{intl.formatMessage(messages.streamingproviders)}</span>
-                <span className="media-fact-value flex flex-row flex-wrap gap-5">
+                <span className="media-fact-value">
                   {streamingProviders.map((p) => {
                     return (
-                      <Tooltip content={p.name}>
-                        <span
-                          className="opacity-50 transition duration-300 hover:opacity-100"
-                          key={`provider-${p.id}`}
-                        >
-                          <CachedImage
-                            type="tmdb"
-                            src={'https://image.tmdb.org/t/p/w45/' + p.logoPath}
-                            alt={p.name}
-                            width={32}
-                            height={32}
-                            className="rounded-md"
-                          />
-                        </span>
-                      </Tooltip>
+                      <span className="block" key={`provider-${p.id}`}>
+                        {p.name}
+                      </span>
                     );
                   })}
                 </span>

src/components/Settings/RadarrModal/index.tsx

@@ -776,7 +776,7 @@ const RadarrModal = ({
               <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
                 {intl.formatMessage(messages.overrideRules)}
               </h3>
-              <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
+              <ul className="grid grid-cols-2 gap-6">
                 {rules && (
                   <OverrideRuleTile
                     rules={rules}

src/components/Settings/SettingsLogs/index.tsx

@@ -245,9 +245,7 @@ const SettingsLogs = () => {
         <p className="description">
           {intl.formatMessage(messages.logsDescription, {
             code: (msg: React.ReactNode) => (
-              <code className="whitespace-normal break-words bg-opacity-50">
-                {msg}
-              </code>
+              <code className="bg-opacity-50">{msg}</code>
             ),
             appDataPath: appData ? appData.appDataPath : '/app/config',
           })}

src/components/Settings/SettingsPlex.tsx

@@ -350,10 +350,6 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
       );
       if (!res.ok) throw new Error();
     }
-
-    if (onComplete) {
-      onComplete();
-    }
     setIsSyncing(false);
     revalidate();
   };
@@ -439,6 +435,10 @@ const SettingsPlex = ({ onComplete }: SettingsPlexProps) => {
               autoDismiss: true,
               appearance: 'success',
             });
+
+            if (onComplete) {
+              onComplete();
+            }
           } catch (e) {
             if (toastId) {
               removeToast(toastId);

src/components/Settings/SonarrModal/index.tsx

@@ -1073,7 +1073,7 @@ const SonarrModal = ({
               <h3 className="mb-4 text-xl font-bold leading-8 text-gray-100">
                 {intl.formatMessage(messages.overrideRules)}
               </h3>
-              <ul className="grid gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 sm:gap-y-6 lg:grid-cols-2">
+              <ul className="grid grid-cols-2 gap-6">
                 {rules && (
                   <OverrideRuleTile
                     rules={rules}

src/components/Setup/index.tsx

@@ -17,7 +17,7 @@ import { MediaServerType } from '@server/constants/server';
 import type { Library } from '@server/lib/settings';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
 import { useToasts } from 'react-toast-notifications';
 import useSWR, { mutate } from 'swr';
@@ -82,37 +82,6 @@ const Setup = () => {
     }
   };
 
-  const validateLibraries = useCallback(async () => {
-    try {
-      const endpointMap: Record<MediaServerType, string> = {
-        [MediaServerType.JELLYFIN]: '/api/v1/settings/jellyfin',
-        [MediaServerType.EMBY]: '/api/v1/settings/jellyfin',
-        [MediaServerType.PLEX]: '/api/v1/settings/plex',
-        [MediaServerType.NOT_CONFIGURED]: '',
-      };
-
-      const endpoint = endpointMap[mediaServerType];
-      if (!endpoint) return;
-
-      const res = await fetch(endpoint);
-      if (!res.ok) throw new Error('Fetch failed');
-      const data = await res.json();
-
-      const hasEnabledLibraries = data?.libraries?.some(
-        (library: Library) => library.enabled
-      );
-
-      setMediaServerSettingsComplete(hasEnabledLibraries);
-    } catch (e) {
-      toasts.addToast(intl.formatMessage(messages.librarieserror), {
-        autoDismiss: true,
-        appearance: 'error',
-      });
-
-      setMediaServerSettingsComplete(false);
-    }
-  }, [intl, mediaServerType, toasts]);
-
   const { data: backdrops } = useSWR<string[]>('/api/v1/backdrops', {
     refreshInterval: 0,
     refreshWhenHidden: false,
@@ -128,28 +97,63 @@ const Setup = () => {
       settings.currentSettings.mediaServerType !==
       MediaServerType.NOT_CONFIGURED
     ) {
+      setCurrentStep(3);
       setMediaServerType(settings.currentSettings.mediaServerType);
-      if (currentStep < 3) {
-        setCurrentStep(3);
-      }
     }
 
     if (currentStep === 3) {
+      const validateLibraries = async () => {
+        try {
+          const endpoint =
+            settings.currentSettings.mediaServerType ===
+              MediaServerType.JELLYFIN || MediaServerType.EMBY
+              ? '/api/v1/settings/jellyfin'
+              : '/api/v1/settings/plex';
+
+          const res = await fetch(endpoint);
+          if (!res.ok) throw new Error('Fetch failed');
+          const data = await res.json();
+
+          const hasEnabledLibraries = data?.libraries?.some(
+            (library: Library) => library.enabled
+          );
+
+          setMediaServerSettingsComplete(hasEnabledLibraries);
+          if (hasEnabledLibraries) {
+            localStorage.setItem('mediaServerSettingsComplete', 'true');
+          } else {
+            localStorage.removeItem('mediaServerSettingsComplete');
+          }
+        } catch (e) {
+          toasts.addToast(intl.formatMessage(messages.librarieserror), {
+            autoDismiss: true,
+            appearance: 'error',
+          });
+
+          setMediaServerSettingsComplete(false);
+          localStorage.removeItem('mediaServerSettingsComplete');
+        }
+      };
+
       validateLibraries();
+    } else {
+      // Initialize from localStorage on mount
+      const storedState =
+        localStorage.getItem('mediaServerSettingsComplete') === 'true';
+      setMediaServerSettingsComplete(storedState);
     }
   }, [
     settings.currentSettings.mediaServerType,
     settings.currentSettings.initialized,
     router,
+    currentStep,
     toasts,
     intl,
-    currentStep,
-    mediaServerType,
-    validateLibraries,
   ]);
 
   const handleComplete = () => {
-    validateLibraries();
+    setMediaServerSettingsComplete(true);
+    localStorage.setItem('mediaServerSettingsComplete', 'true');
   };
 
   if (settings.currentSettings.initialized) return <></>;

src/components/TvDetails/index.tsx

@@ -1243,26 +1243,14 @@ const TvDetails = ({ tv }: TvDetailsProps) => {
               </div>
             )}
             {!!streamingProviders.length && (
-              <div className="media-fact flex-col gap-1">
+              <div className="media-fact">
                 <span>{intl.formatMessage(messages.streamingproviders)}</span>
-                <span className="media-fact-value flex flex-row flex-wrap gap-5">
+                <span className="media-fact-value">
                   {streamingProviders.map((p) => {
                     return (
-                      <Tooltip content={p.name}>
-                        <span
-                          className="opacity-50 transition duration-300 hover:opacity-100"
-                          key={`provider-${p.id}`}
-                        >
-                          <CachedImage
-                            type="tmdb"
-                            src={'https://image.tmdb.org/t/p/w45/' + p.logoPath}
-                            alt={p.name}
-                            width={32}
-                            height={32}
-                            className="rounded-md"
-                          />
-                        </span>
-                      </Tooltip>
+                      <span className="block" key={`provider-${p.id}`}>
+                        {p.name}
+                      </span>
                     );
                   })}
                 </span>