From 8e0ccf59e0de018a4eae8c1b8d79274bcb1be1d3 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 12:35:14 -0400
Subject: [PATCH 01/23] added PUID and GUID Args For buildtime UID and GID
 specification, Add User and Group with those ids and set User at entrypiont
 call. there will be permission errors.

---
 Dockerfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 816bdd3c3..8239e4761 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN apk add --no-cache --update \
   unzip
 
 WORKDIR /server
-COPY index.js package* /server
+COPY index.js package* /server/
 COPY /server /server/server
 
 RUN case "$TARGETPLATFORM" in \
@@ -45,12 +45,18 @@ FROM node:20-alpine
 
 ARG NUSQLITE3_DIR
 ARG NUSQLITE3_PATH
+ARG PUID=1000
+ARG PGID=1000
 
 # Install only runtime dependencies
 RUN apk add --no-cache --update \
   tzdata \
   ffmpeg \
-  tini
+  tini \
+  shadow \
+  && addgroup -g ${PGID} audiobookshelf \
+  && adduser -u ${PUID} -G audiobookshelf -D audiobookshelf \
+  && apk del --purge shadow
 
 WORKDIR /app
 
@@ -69,5 +75,6 @@ ENV SOURCE="docker"
 ENV NUSQLITE3_DIR=${NUSQLITE3_DIR}
 ENV NUSQLITE3_PATH=${NUSQLITE3_PATH}
 
+USER audiobookshelf
 ENTRYPOINT ["tini", "--"]
 CMD ["node", "index.js"]

From 7403a0199eb7e93d4c0e224c5ae3b23ef2dd0aab Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 12:46:59 -0400
Subject: [PATCH 02/23] updated build yaml to allow builds in other repos, and
 build on dev branches

---
 .github/workflows/docker-build.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fdb57fbc5..77d71c736 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -10,7 +10,10 @@ on:
         required: true
         default: 'latest'
   push:
-    branches: [main, master]
+    branches:
+      - main
+      - master
+      - dev/*
     tags:
       - 'v*.*.*'
     # Only build when files in these directories have been changed
@@ -22,7 +25,7 @@ on:
 
 jobs:
   build:
-    if: ${{ !contains(github.event.head_commit.message, 'skip ci') && github.repository == 'advplyr/audiobookshelf' }}
+    if: ${{ !contains(github.event.head_commit.message, 'skip ci') }}
     runs-on: ubuntu-24.04
 
     steps:
@@ -33,8 +36,11 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: advplyr/audiobookshelf,ghcr.io/${{ github.repository_owner }}/audiobookshelf
+          images: |
+            name:${{ secrets.DOCKERHUB_USERNAME }}/audiobookshelf,enable=${{ github.ref == 'refs/heads/main' && secrets.DOCKER_HUB_USERNAME != '' && secrets.DOCKER_HUB_TOKEN != '' }}
+            name:ghcr.io/${{ github.repository }},enable=true
           tags: |
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=edge,branch=master
             type=semver,pattern={{version}}
 
@@ -54,6 +60,10 @@ jobs:
 
       - name: Login to Dockerhub
         uses: docker/login-action@v3
+        env: # secrets for Docker hub username and token should be in the registry settings if not docker hub push will be skipped.
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME || '' }}
+          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN || '' }}
+        if: ${{ github.ref == 'refs/heads/main' && env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}

From d4e807a86c29a5f6a8040befade4dc8666b9a27c Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:11:06 -0400
Subject: [PATCH 03/23] changed default uid and group id to 5000

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8239e4761..9dd933cc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,8 +45,8 @@ FROM node:20-alpine
 
 ARG NUSQLITE3_DIR
 ARG NUSQLITE3_PATH
-ARG PUID=1000
-ARG PGID=1000
+ARG PUID=5000
+ARG PGID=5000
 
 # Install only runtime dependencies
 RUN apk add --no-cache --update \

From aa3a0d7bff8fab241d88fd0b160aea045101785e Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:12:51 -0400
Subject: [PATCH 04/23] remove --purge from apt del

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9dd933cc5..882ebfef2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,7 @@ RUN apk add --no-cache --update \
   shadow \
   && addgroup -g ${PGID} audiobookshelf \
   && adduser -u ${PUID} -G audiobookshelf -D audiobookshelf \
-  && apk del --purge shadow
+  && apk del shadow
 
 WORKDIR /app
 

From 3d5eaa6577dceba313001397460d6a48e3b92890 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:26:31 -0400
Subject: [PATCH 05/23] changed to reuse node user, renaming and re-iding.

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 882ebfef2..624d36dbb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,8 +54,8 @@ RUN apk add --no-cache --update \
   ffmpeg \
   tini \
   shadow \
-  && addgroup -g ${PGID} audiobookshelf \
-  && adduser -u ${PUID} -G audiobookshelf -D audiobookshelf \
+  && groupmod -g ${PGID} -n audiobookshelf node\
+  && usermod -u ${PUID} -l audiobookshelf -m node \
   && apk del shadow
 
 WORKDIR /app

From 71b4f70034e8d9787a3fa6b398e1461b707cf244 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:29:05 -0400
Subject: [PATCH 06/23] added move home to user mod

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 624d36dbb..69b7d9cdc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ RUN apk add --no-cache --update \
   tini \
   shadow \
   && groupmod -g ${PGID} -n audiobookshelf node\
-  && usermod -u ${PUID} -l audiobookshelf -m node \
+  && usermod -u ${PUID} -l audiobookshelf -d audiobookshelf -m node \
   && apk del shadow
 
 WORKDIR /app

From 0eb1905d1f538d3d5d6ace7d9c8db48c74d8e636 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:30:16 -0400
Subject: [PATCH 07/23] fixed homepath

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 69b7d9cdc..94d79ca62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,7 +55,7 @@ RUN apk add --no-cache --update \
   tini \
   shadow \
   && groupmod -g ${PGID} -n audiobookshelf node\
-  && usermod -u ${PUID} -l audiobookshelf -d audiobookshelf -m node \
+  && usermod -u ${PUID} -l audiobookshelf -d /home/audiobookshelf -m node \
   && apk del shadow
 
 WORKDIR /app

From 6c79d28329274aa6e32ed458454810d4f903a843 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:36:04 -0400
Subject: [PATCH 08/23] making sure /config and /metadata and are world
 writable for --user support incase they're not bind mounted.

---
 Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 94d79ca62..02dac36b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,10 @@ RUN apk add --no-cache --update \
   shadow \
   && groupmod -g ${PGID} -n audiobookshelf node\
   && usermod -u ${PUID} -l audiobookshelf -d /home/audiobookshelf -m node \
-  && apk del shadow
+  && apk del shadow \
+  && mkdir -p /config /metadata \
+  && chown -R audiobookshelf:audiobookshelf /config /metadata \
+  && chmod u=rwx,go=rw /config /metadata
 
 WORKDIR /app
 

From ce1540e78116453574c77cf23309dd93315e7850 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 13:38:19 -0400
Subject: [PATCH 09/23] reverted default IDs to 1000 which is what the node
 user is created as. Though this default for the container was root. Figured
 1000 is a safer default then root and will fit most basic user setups.

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 02dac36b2..d55d565b3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,8 +45,8 @@ FROM node:20-alpine
 
 ARG NUSQLITE3_DIR
 ARG NUSQLITE3_PATH
-ARG PUID=5000
-ARG PGID=5000
+ARG PUID=1000
+ARG PGID=1000
 
 # Install only runtime dependencies
 RUN apk add --no-cache --update \

From d9e7db2b5c691f49e5e3d8e37b67930c6e9e6ee4 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:02:54 -0400
Subject: [PATCH 10/23] Added Global Definition of PUID and GUID for ease of
 management only.

---
 Dockerfile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d55d565b3..07e64939a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,9 @@
+# globally defining Arguments and Defaults
 ARG NUSQLITE3_DIR="/usr/local/lib/nusqlite3"
 ARG NUSQLITE3_PATH="${NUSQLITE3_DIR}/libnusqlite3.so"
+# default Process user id and group id
+ARG PUID=1000
+ARG PGID=1000
 
 ### STAGE 0: Build client ###
 FROM node:20-alpine AS build-client
@@ -45,8 +49,8 @@ FROM node:20-alpine
 
 ARG NUSQLITE3_DIR
 ARG NUSQLITE3_PATH
-ARG PUID=1000
-ARG PGID=1000
+ARG PUID
+ARG PGID
 
 # Install only runtime dependencies
 RUN apk add --no-cache --update \
@@ -59,14 +63,14 @@ RUN apk add --no-cache --update \
   && apk del shadow \
   && mkdir -p /config /metadata \
   && chown -R audiobookshelf:audiobookshelf /config /metadata \
-  && chmod u=rwx,go=rw /config /metadata
+  && chmod a=rws /config /metadata
 
 WORKDIR /app
 
 # Copy compiled frontend and server from build stages
-COPY --from=build-client /client/dist /app/client/dist
-COPY --from=build-server /server /app
-COPY --from=build-server ${NUSQLITE3_PATH} ${NUSQLITE3_PATH}
+COPY --chmod=755 --from=build-client /client/dist /app/client/dist
+COPY --chmod=755 --from=build-server /server /app
+COPY --chmod=755 --from=build-server ${NUSQLITE3_PATH} ${NUSQLITE3_PATH}
 
 EXPOSE 80
 

From df55e2f7e5c9cc429a1f35909e76df7db0696058 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:11:42 -0400
Subject: [PATCH 11/23] rwx not rws....

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 07e64939a..37f1879a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ RUN apk add --no-cache --update \
   && apk del shadow \
   && mkdir -p /config /metadata \
   && chown -R audiobookshelf:audiobookshelf /config /metadata \
-  && chmod a=rws /config /metadata
+  && chmod a=rwx /config /metadata
 
 WORKDIR /app
 

From fd20fb17b2c337cd17c8516b819b41d419b65982 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:36:13 -0400
Subject: [PATCH 12/23] Update docker-build.yml

Added Permissions Directive to control token.
Switched to Github_TOKEN for package.
---
 .github/workflows/docker-build.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 77d71c736..7d41b4a9f 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,6 +1,8 @@
 ---
 name: Build and Push Docker Image
-
+permissions:
+     contents: read
+     packages: write
 on:
   # Allows you to run workflow manually from Actions tab
   workflow_dispatch:
@@ -72,8 +74,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GHCR_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build image
         uses: docker/build-push-action@v6

From 89e8411ce50abcf09318904dc7653b8c1f86b3db Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 15:12:49 -0400
Subject: [PATCH 13/23] Update docker-build.yml

removed manual taging as it was causing issues when no dockerhub secrets are available.
---
 .github/workflows/docker-build.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7d41b4a9f..fbf237a66 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -6,11 +6,6 @@ permissions:
 on:
   # Allows you to run workflow manually from Actions tab
   workflow_dispatch:
-    inputs:
-      tags:
-        description: 'Docker Tag'
-        required: true
-        default: 'latest'
   push:
     branches:
       - main
@@ -39,7 +34,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            name:${{ secrets.DOCKERHUB_USERNAME }}/audiobookshelf,enable=${{ github.ref == 'refs/heads/main' && secrets.DOCKER_HUB_USERNAME != '' && secrets.DOCKER_HUB_TOKEN != '' }}
+            name:${{ secrets.DOCKERHUB_USERNAME }}/audiobookshelf,enable=${{ github.ref == 'refs/heads/main' && secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
             name:ghcr.io/${{ github.repository }},enable=true
           tags: |
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
@@ -80,7 +75,7 @@ jobs:
       - name: Build image
         uses: docker/build-push-action@v6
         with:
-          tags: ${{ github.event.inputs.tags || steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           context: .
           platforms: linux/amd64,linux/arm64

From b7396963726a37ee0926fe5920e94c5e874e37f9 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Wed, 1 Oct 2025 19:17:58 -0400
Subject: [PATCH 14/23] Update docker-build.yml

---
 .github/workflows/docker-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index fbf237a66..657b12a13 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -40,6 +40,9 @@ jobs:
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=edge,branch=master
             type=semver,pattern={{version}}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha
 
       - name: Setup QEMU
         uses: docker/setup-qemu-action@v3

From a164c17d38fb730e6738832a4ec9c13bcced9c20 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 2 Oct 2025 13:26:05 +0300
Subject: [PATCH 15/23] Reduce provider timout to 10 secs, Shorten error
 message

---
 server/finders/BookFinder.js        | 2 +-
 server/providers/Audible.js         | 6 +++---
 server/providers/AudiobookCovers.js | 4 ++--
 server/providers/Audnexus.js        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 2d7b57f14..6b8427c05 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -11,7 +11,7 @@ const { levenshteinDistance, levenshteinSimilarity, escapeRegExp, isValidASIN }
 const htmlSanitizer = require('../utils/htmlSanitizer')
 
 class BookFinder {
-  #providerResponseTimeout = 30000
+  #providerResponseTimeout = 10000
 
   constructor() {
     this.openLibrary = new OpenLibrary()
diff --git a/server/providers/Audible.js b/server/providers/Audible.js
index 18879e912..2c12ffc1a 100644
--- a/server/providers/Audible.js
+++ b/server/providers/Audible.js
@@ -3,7 +3,7 @@ const Logger = require('../Logger')
 const { isValidASIN } = require('../utils/index')
 
 class Audible {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {
     this.regionMap = {
@@ -106,7 +106,7 @@ class Audible {
         return res.data
       })
       .catch((error) => {
-        Logger.error('[Audible] ASIN search error', error)
+        Logger.error('[Audible] ASIN search error', error.message)
         return null
       })
   }
@@ -158,7 +158,7 @@ class Audible {
           return Promise.all(res.data.products.map((result) => this.asinSearch(result.asin, region, timeout)))
         })
         .catch((error) => {
-          Logger.error('[Audible] query search error', error)
+          Logger.error('[Audible] query search error', error.message)
           return []
         })
     }
diff --git a/server/providers/AudiobookCovers.js b/server/providers/AudiobookCovers.js
index 8e284fea2..9bd1f367c 100644
--- a/server/providers/AudiobookCovers.js
+++ b/server/providers/AudiobookCovers.js
@@ -2,7 +2,7 @@ const axios = require('axios')
 const Logger = require('../Logger')
 
 class AudiobookCovers {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {}
 
@@ -24,7 +24,7 @@ class AudiobookCovers {
       })
       .then((res) => res?.data || [])
       .catch((error) => {
-        Logger.error('[AudiobookCovers] Cover search error', error)
+        Logger.error('[AudiobookCovers] Cover search error', error.message)
         return []
       })
     return items.map((item) => ({ cover: item.versions.png.original }))
diff --git a/server/providers/Audnexus.js b/server/providers/Audnexus.js
index 4f11a2a36..9a76dc861 100644
--- a/server/providers/Audnexus.js
+++ b/server/providers/Audnexus.js
@@ -55,7 +55,7 @@ class Audnexus {
     return this._processRequest(this.limiter(() => axios.get(authorRequestUrl)))
       .then((res) => res.data || [])
       .catch((error) => {
-        Logger.error(`[Audnexus] Author ASIN request failed for ${name}`, error)
+        Logger.error(`[Audnexus] Author ASIN request failed for ${name}`, error.message)
         return []
       })
   }
@@ -82,7 +82,7 @@ class Audnexus {
     return this._processRequest(this.limiter(() => axios.get(authorRequestUrl.toString())))
       .then((res) => res.data)
       .catch((error) => {
-        Logger.error(`[Audnexus] Author request failed for ${asin}`, error)
+        Logger.error(`[Audnexus] Author request failed for ${asin}`, error.message)
         return null
       })
   }
@@ -158,7 +158,7 @@ class Audnexus {
     return this._processRequest(this.limiter(() => axios.get(chaptersRequestUrl.toString())))
       .then((res) => res.data)
       .catch((error) => {
-        Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}/${region}`, error)
+        Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}/${region}`, error.message)
         return null
       })
   }

From 7630dbdcb7c3fb3a64a5878265d435a715863795 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 2 Oct 2025 13:30:03 +0300
Subject: [PATCH 16/23] Replace cover search with streaming version

---
 client/components/modals/item/tabs/Cover.vue | 149 +++++++++--
 server/SocketAuthority.js                    | 104 ++++++++
 server/managers/CoverSearchManager.js        | 248 +++++++++++++++++++
 3 files changed, 487 insertions(+), 14 deletions(-)
 create mode 100644 server/managers/CoverSearchManager.js

diff --git a/client/components/modals/item/tabs/Cover.vue b/client/components/modals/item/tabs/Cover.vue
index 17979f708..41cac4bc3 100644
--- a/client/components/modals/item/tabs/Cover.vue
+++ b/client/components/modals/item/tabs/Cover.vue
@@ -59,11 +59,13 @@
         <div v-show="provider != 'itunes' && provider != 'audiobookcovers'" class="w-72 grow p-1">
           <ui-text-input-with-label v-model="searchAuthor" :label="$strings.LabelAuthor" />
         </div>
-        <ui-btn class="mt-5 ml-1 md:min-w-24" :padding-x="4" type="submit">{{ $strings.ButtonSearch }}</ui-btn>
+        <ui-btn v-if="!searchInProgress" class="mt-5 ml-1 md:min-w-24" :padding-x="4" type="submit">{{ $strings.ButtonSearch }}</ui-btn>
+        <ui-btn v-else class="mt-5 ml-1 md:min-w-24" :padding-x="4" type="button" color="bg-error" @click.prevent="cancelCurrentSearch">{{ $strings.ButtonCancel }}</ui-btn>
       </div>
     </form>
     <div v-if="hasSearched" class="flex items-center flex-wrap justify-center sm:max-h-80 sm:overflow-y-scroll mt-2 max-w-full">
-      <p v-if="!coversFound.length">{{ $strings.MessageNoCoversFound }}</p>
+      <p v-if="searchInProgress && !coversFound.length" class="text-gray-300">{{ $strings.MessageLoading }}</p>
+      <p v-else-if="!searchInProgress && !coversFound.length">{{ $strings.MessageNoCoversFound }}</p>
       <template v-for="cover in coversFound">
         <div :key="cover" class="m-0.5 mb-5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === coverPath ? 'border-yellow-300' : ''" @click="updateCover(cover)">
           <covers-preview-cover :src="cover" :width="80" show-open-new-tab :book-cover-aspect-ratio="bookCoverAspectRatio" />
@@ -105,7 +107,10 @@ export default {
       showLocalCovers: false,
       previewUpload: null,
       selectedFile: null,
-      provider: 'google'
+      provider: 'google',
+      currentSearchRequestId: null,
+      searchInProgress: false,
+      socketListenersActive: false
     }
   },
   watch: {
@@ -186,6 +191,9 @@ export default {
           _file.localPath = `${process.env.serverUrl}/api/items/${this.libraryItemId}/file/${file.ino}?token=${this.userToken}`
           return _file
         })
+    },
+    socket() {
+      return this.$root.socket
     }
   },
   methods: {
@@ -291,22 +299,123 @@ export default {
         console.error('PersistProvider', error)
       }
     },
+    generateRequestId() {
+      return `cover-search-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
+    },
+    addSocketListeners() {
+      if (!this.socket || this.socketListenersActive) return
+
+      this.socket.on('cover_search_result', this.handleSearchResult)
+      this.socket.on('cover_search_complete', this.handleSearchComplete)
+      this.socket.on('cover_search_error', this.handleSearchError)
+      this.socket.on('cover_search_provider_error', this.handleProviderError)
+      this.socket.on('cover_search_cancelled', this.handleSearchCancelled)
+      this.socket.on('disconnect', this.handleSocketDisconnect)
+      this.socketListenersActive = true
+    },
+    removeSocketListeners() {
+      if (!this.socket || !this.socketListenersActive) return
+
+      this.socket.off('cover_search_result', this.handleSearchResult)
+      this.socket.off('cover_search_complete', this.handleSearchComplete)
+      this.socket.off('cover_search_error', this.handleSearchError)
+      this.socket.off('cover_search_provider_error', this.handleProviderError)
+      this.socket.off('cover_search_cancelled', this.handleSearchCancelled)
+      this.socket.off('disconnect', this.handleSocketDisconnect)
+      this.socketListenersActive = false
+    },
+    handleSearchResult(data) {
+      if (data.requestId !== this.currentSearchRequestId) return
+
+      console.log(`[Cover Search] Received ${data.total} covers from ${data.provider}`)
+
+      // Add new covers to the list (avoiding duplicates)
+      const newCovers = data.covers.filter((cover) => !this.coversFound.includes(cover))
+      this.coversFound.push(...newCovers)
+    },
+    handleSearchComplete(data) {
+      if (data.requestId !== this.currentSearchRequestId) return
+
+      console.log('[Cover Search] Search completed')
+      this.searchInProgress = false
+      this.currentSearchRequestId = null
+    },
+    handleSearchError(data) {
+      if (data.requestId !== this.currentSearchRequestId) return
+
+      console.error('[Cover Search] Search error:', data.error)
+      this.$toast.error(`Search failed: ${data.error}`)
+      this.searchInProgress = false
+      this.currentSearchRequestId = null
+    },
+    handleProviderError(data) {
+      if (data.requestId !== this.currentSearchRequestId) return
+
+      console.warn(`[Cover Search] Provider ${data.provider} failed:`, data.error)
+      // Don't show toast for individual provider failures, just log them
+    },
+    handleSearchCancelled(data) {
+      if (data.requestId !== this.currentSearchRequestId) return
+
+      console.log('[Cover Search] Search cancelled')
+      this.searchInProgress = false
+      this.currentSearchRequestId = null
+    },
+    handleSocketDisconnect() {
+      console.log('[Cover Search] Socket disconnected')
+      // If we were in the middle of a search, cancel it (server can't send results anymore)
+      if (this.searchInProgress && this.currentSearchRequestId) {
+        console.log('[Cover Search] Cancelling search due to socket disconnection')
+        this.searchInProgress = false
+        this.currentSearchRequestId = null
+        this.$toast.warning('Search was interrupted by connection loss')
+      }
+    },
+    cancelCurrentSearch() {
+      if (!this.currentSearchRequestId || !this.socket) return
+
+      console.log('[Cover Search] Cancelling search:', this.currentSearchRequestId)
+      this.socket.emit('cancel_cover_search', this.currentSearchRequestId)
+      this.currentSearchRequestId = null
+      this.searchInProgress = false
+    },
     async submitSearchForm() {
+      // Cancel any existing search
+      if (this.searchInProgress) {
+        this.cancelCurrentSearch()
+      }
+
       // Store provider in local storage
       this.persistProvider()
 
-      this.isProcessing = true
-      const searchQuery = this.getSearchQuery()
-      const results = await this.$axios
-        .$get(`/api/search/covers?${searchQuery}`)
-        .then((res) => res.results)
-        .catch((error) => {
-          console.error('Failed', error)
-          return []
-        })
-      this.coversFound = results
-      this.isProcessing = false
+      if (!this.socket) {
+        console.error('[Cover Search] Socket not available')
+        this.$toast.error('Connection not available. Please refresh the page.')
+        return
+      }
+
+      // Setup socket listeners if not already done
+      this.addSocketListeners()
+
+      // Clear previous results
+      this.coversFound = []
       this.hasSearched = true
+      this.searchInProgress = true
+
+      // Generate unique request ID
+      const requestId = this.generateRequestId()
+      this.currentSearchRequestId = requestId
+
+      console.log('[Cover Search] Starting search:', requestId)
+
+      // Emit search request via WebSocket
+      this.socket.emit('search_covers', {
+        requestId,
+        title: this.searchTitle,
+        author: this.searchAuthor || '',
+        provider: this.provider,
+        podcast: this.isPodcast
+      })
     },
     setCover(coverFile) {
       this.isProcessing = true
@@ -320,6 +429,18 @@ export default {
           this.isProcessing = false
         })
     }
+  },
+  mounted() {
+    // Setup socket listeners when component is mounted
+    this.addSocketListeners()
+  },
+  beforeDestroy() {
+    // Cancel any ongoing search when component is destroyed
+    if (this.searchInProgress) {
+      this.cancelCurrentSearch()
+    }
+    // Remove socket listeners
+    this.removeSocketListeners()
   }
 }
 </script>
diff --git a/server/SocketAuthority.js b/server/SocketAuthority.js
index da31ba4a0..ad55f6605 100644
--- a/server/SocketAuthority.js
+++ b/server/SocketAuthority.js
@@ -2,6 +2,7 @@ const SocketIO = require('socket.io')
 const Logger = require('./Logger')
 const Database = require('./Database')
 const TokenManager = require('./auth/TokenManager')
+const CoverSearchManager = require('./managers/CoverSearchManager')
 
 /**
  * @typedef SocketClient
@@ -180,6 +181,10 @@ class SocketAuthority {
         // Scanning
         socket.on('cancel_scan', (libraryId) => this.cancelScan(libraryId))
 
+        // Cover search streaming
+        socket.on('search_covers', (payload) => this.handleCoverSearch(socket, payload))
+        socket.on('cancel_cover_search', (requestId) => this.handleCancelCoverSearch(socket, requestId))
+
         // Logs
         socket.on('set_log_listener', (level) => Logger.addSocketListener(socket, level))
         socket.on('remove_log_listener', () => Logger.removeSocketListener(socket.id))
@@ -200,6 +205,10 @@ class SocketAuthority {
 
             const disconnectTime = Date.now() - _client.connected_at
             Logger.info(`[SocketAuthority] Socket ${socket.id} disconnected from client "${_client.user.username}" after ${disconnectTime}ms (Reason: ${reason})`)
+
+            // Cancel any active cover searches for this socket
+            this.cancelSocketCoverSearches(socket.id)
+
             delete this.clients[socket.id]
           }
         })
@@ -300,5 +309,100 @@ class SocketAuthority {
     Logger.debug('[SocketAuthority] Cancel scan', id)
     this.Server.cancelLibraryScan(id)
   }
+
+  /**
+   * Handle cover search request via WebSocket
+   * @param {SocketIO.Socket} socket
+   * @param {Object} payload
+   */
+  async handleCoverSearch(socket, payload) {
+    const client = this.clients[socket.id]
+    if (!client?.user) {
+      Logger.error('[SocketAuthority] Unauthorized cover search request')
+      socket.emit('cover_search_error', {
+        requestId: payload.requestId,
+        error: 'Unauthorized'
+      })
+      return
+    }
+
+    const { requestId, title, author, provider, podcast } = payload
+
+    if (!requestId || !title) {
+      Logger.error('[SocketAuthority] Invalid cover search request')
+      socket.emit('cover_search_error', {
+        requestId,
+        error: 'Invalid request parameters'
+      })
+      return
+    }
+
+    Logger.info(`[SocketAuthority] User ${client.user.username} initiated cover search ${requestId}`)
+
+    // Callback for streaming results to client
+    const onResult = (result) => {
+      socket.emit('cover_search_result', {
+        requestId,
+        provider: result.provider,
+        covers: result.covers,
+        total: result.total
+      })
+    }
+
+    // Callback when search completes
+    const onComplete = () => {
+      Logger.info(`[SocketAuthority] Cover search ${requestId} completed`)
+      socket.emit('cover_search_complete', { requestId })
+    }
+
+    // Callback for provider errors
+    const onError = (provider, errorMessage) => {
+      socket.emit('cover_search_provider_error', {
+        requestId,
+        provider,
+        error: errorMessage
+      })
+    }
+
+    // Start the search
+    CoverSearchManager.startSearch(requestId, { title, author, provider, podcast }, onResult, onComplete, onError).catch((error) => {
+      Logger.error(`[SocketAuthority] Cover search ${requestId} failed:`, error)
+      socket.emit('cover_search_error', {
+        requestId,
+        error: error.message
+      })
+    })
+  }
+
+  /**
+   * Handle cancel cover search request
+   * @param {SocketIO.Socket} socket
+   * @param {string} requestId
+   */
+  handleCancelCoverSearch(socket, requestId) {
+    const client = this.clients[socket.id]
+    if (!client?.user) {
+      Logger.error('[SocketAuthority] Unauthorized cancel cover search request')
+      return
+    }
+
+    Logger.info(`[SocketAuthority] User ${client.user.username} cancelled cover search ${requestId}`)
+
+    const cancelled = CoverSearchManager.cancelSearch(requestId)
+    if (cancelled) {
+      socket.emit('cover_search_cancelled', { requestId })
+    }
+  }
+
+  /**
+   * Cancel all cover searches associated with a socket (called on disconnect)
+   * @param {string} socketId
+   */
+  cancelSocketCoverSearches(socketId) {
+    // Get all active search request IDs and cancel those that might belong to this socket
+    // Since we don't track socket-to-request mapping, we log this for debugging
+    // The client will handle reconnection gracefully
+    Logger.debug(`[SocketAuthority] Socket ${socketId} disconnected, any active searches will timeout`)
+  }
 }
 module.exports = new SocketAuthority()
diff --git a/server/managers/CoverSearchManager.js b/server/managers/CoverSearchManager.js
new file mode 100644
index 000000000..1ad7ddb8e
--- /dev/null
+++ b/server/managers/CoverSearchManager.js
@@ -0,0 +1,248 @@
+const { setMaxListeners } = require('events')
+const Logger = require('../Logger')
+const BookFinder = require('../finders/BookFinder')
+const PodcastFinder = require('../finders/PodcastFinder')
+
+/**
+ * Manager for handling streaming cover search across multiple providers
+ */
+class CoverSearchManager {
+  constructor() {
+    /** @type {Map<string, AbortController>} Map of requestId to AbortController */
+    this.activeSearches = new Map()
+
+    // Default timeout for each provider search
+    this.providerTimeout = 10000 // 10 seconds
+
+    // Set to 0 to disable the max listeners limit
+    // We need one listener per provider (15+) and may have multiple concurrent searches
+    this.maxListeners = 0
+  }
+
+  /**
+   * Start a streaming cover search
+   * @param {string} requestId - Unique identifier for this search request
+   * @param {Object} searchParams - Search parameters
+   * @param {string} searchParams.title - Title to search for
+   * @param {string} searchParams.author - Author to search for (optional)
+   * @param {string} searchParams.provider - Provider to search (or 'all')
+   * @param {boolean} searchParams.podcast - Whether this is a podcast search
+   * @param {Function} onResult - Callback for each result chunk
+   * @param {Function} onComplete - Callback when search completes
+   * @param {Function} onError - Callback for errors
+   */
+  async startSearch(requestId, searchParams, onResult, onComplete, onError) {
+    if (this.activeSearches.has(requestId)) {
+      Logger.warn(`[CoverSearchManager] Search with requestId ${requestId} already exists`)
+      return
+    }
+
+    const abortController = new AbortController()
+
+    // Increase max listeners on this signal to accommodate parallel provider searches
+    // AbortSignal is an EventTarget, so we use the events module's setMaxListeners
+    setMaxListeners(this.maxListeners, abortController.signal)
+
+    this.activeSearches.set(requestId, abortController)
+
+    Logger.info(`[CoverSearchManager] Starting search ${requestId} with params:`, searchParams)
+
+    try {
+      const { title, author, provider, podcast } = searchParams
+
+      if (podcast) {
+        await this.searchPodcastCovers(requestId, title, abortController.signal, onResult, onError)
+      } else {
+        await this.searchBookCovers(requestId, provider, title, author, abortController.signal, onResult, onError)
+      }
+
+      if (!abortController.signal.aborted) {
+        onComplete()
+      }
+    } catch (error) {
+      if (error.name === 'AbortError') {
+        Logger.info(`[CoverSearchManager] Search ${requestId} was cancelled`)
+      } else {
+        Logger.error(`[CoverSearchManager] Search ${requestId} failed:`, error)
+        onError(error.message)
+      }
+    } finally {
+      this.activeSearches.delete(requestId)
+    }
+  }
+
+  /**
+   * Cancel an active search
+   * @param {string} requestId - Request ID to cancel
+   */
+  cancelSearch(requestId) {
+    const abortController = this.activeSearches.get(requestId)
+    if (abortController) {
+      Logger.info(`[CoverSearchManager] Cancelling search ${requestId}`)
+      abortController.abort()
+      this.activeSearches.delete(requestId)
+      return true
+    }
+    return false
+  }
+
+  /**
+   * Search for podcast covers
+   */
+  async searchPodcastCovers(requestId, title, signal, onResult, onError) {
+    try {
+      const results = await this.executeWithTimeout(() => PodcastFinder.findCovers(title), this.providerTimeout, signal)
+
+      if (signal.aborted) return
+
+      const covers = this.extractCoversFromResults(results)
+      if (covers.length > 0) {
+        onResult({
+          provider: 'itunes',
+          covers,
+          total: covers.length
+        })
+      }
+    } catch (error) {
+      if (error.name !== 'AbortError') {
+        Logger.error(`[CoverSearchManager] Podcast search failed:`, error)
+        onError('itunes', error.message)
+      }
+    }
+  }
+
+  /**
+   * Search for book covers across providers
+   */
+  async searchBookCovers(requestId, provider, title, author, signal, onResult, onError) {
+    let providers = []
+
+    if (provider === 'all') {
+      providers = [...BookFinder.providers]
+    } else {
+      providers = [provider]
+    }
+
+    Logger.debug(`[CoverSearchManager] Searching ${providers.length} providers in parallel`)
+
+    // Search all providers in parallel
+    const searchPromises = providers.map(async (providerName) => {
+      if (signal.aborted) return
+
+      try {
+        const searchResults = await this.executeWithTimeout(() => BookFinder.search(null, providerName, title, author || ''), this.providerTimeout, signal)
+
+        if (signal.aborted) return
+
+        const covers = this.extractCoversFromResults(searchResults)
+
+        Logger.debug(`[CoverSearchManager] Found ${covers.length} covers from ${providerName}`)
+
+        if (covers.length > 0) {
+          onResult({
+            provider: providerName,
+            covers,
+            total: covers.length
+          })
+        }
+      } catch (error) {
+        if (error.name !== 'AbortError') {
+          Logger.warn(`[CoverSearchManager] Provider ${providerName} failed:`, error.message)
+          onError(providerName, error.message)
+        }
+      }
+    })
+
+    await Promise.allSettled(searchPromises)
+  }
+
+  /**
+   * Execute a promise with timeout and abort signal
+   */
+  async executeWithTimeout(fn, timeout, signal) {
+    return new Promise(async (resolve, reject) => {
+      let abortHandler = null
+      let timeoutId = null
+
+      // Cleanup function to ensure we always remove listeners
+      const cleanup = () => {
+        if (timeoutId) {
+          clearTimeout(timeoutId)
+          timeoutId = null
+        }
+        if (abortHandler) {
+          signal.removeEventListener('abort', abortHandler)
+          abortHandler = null
+        }
+      }
+
+      // Set up timeout
+      timeoutId = setTimeout(() => {
+        cleanup()
+        const error = new Error('Provider timeout')
+        error.name = 'TimeoutError'
+        reject(error)
+      }, timeout)
+
+      // Check if already aborted
+      if (signal.aborted) {
+        cleanup()
+        const error = new Error('Search cancelled')
+        error.name = 'AbortError'
+        reject(error)
+        return
+      }
+
+      // Set up abort handler
+      abortHandler = () => {
+        cleanup()
+        const error = new Error('Search cancelled')
+        error.name = 'AbortError'
+        reject(error)
+      }
+      signal.addEventListener('abort', abortHandler)
+
+      try {
+        const result = await fn()
+        cleanup()
+        resolve(result)
+      } catch (error) {
+        cleanup()
+        reject(error)
+      }
+    })
+  }
+
+  /**
+   * Extract cover URLs from search results
+   */
+  extractCoversFromResults(results) {
+    const covers = []
+    if (!Array.isArray(results)) return covers
+
+    results.forEach((result) => {
+      if (result.covers && Array.isArray(result.covers)) {
+        covers.push(...result.covers)
+      }
+      if (result.cover) {
+        covers.push(result.cover)
+      }
+    })
+
+    // Remove duplicates
+    return [...new Set(covers)]
+  }
+
+  /**
+   * Cancel all active searches (cleanup on server shutdown)
+   */
+  cancelAllSearches() {
+    Logger.info(`[CoverSearchManager] Cancelling ${this.activeSearches.size} active searches`)
+    for (const [requestId, abortController] of this.activeSearches.entries()) {
+      abortController.abort()
+    }
+    this.activeSearches.clear()
+  }
+}
+
+module.exports = new CoverSearchManager()

From f63847c583186d788bd35d624f296c47a10c4b43 Mon Sep 17 00:00:00 2001
From: Vylyne <94922829+Vylyne@users.noreply.github.com>
Date: Thu, 2 Oct 2025 14:06:32 -0400
Subject: [PATCH 17/23] Update docker-build.yml

Reverted and replaced : with =...
---
 .github/workflows/docker-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 657b12a13..0a3a7ecd7 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -34,8 +34,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            name:${{ secrets.DOCKERHUB_USERNAME }}/audiobookshelf,enable=${{ github.ref == 'refs/heads/main' && secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
-            name:ghcr.io/${{ github.repository }},enable=true
+            name=${{ secrets.DOCKERHUB_USERNAME }}/audiobookshelf,enable=${{ github.ref == 'refs/heads/main' && secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}
+            name=ghcr.io/${{ github.repository }},enable=true
           tags: |
             type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
             type=edge,branch=master

From 26f949b9bae7f8de82305d5b55db4e2f84ad2cec Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 2 Oct 2025 22:14:48 +0300
Subject: [PATCH 18/23] Remove audiobookcovers from provider list

---
 client/store/scanners.js     | 7 +------
 server/finders/BookFinder.js | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/client/store/scanners.js b/client/store/scanners.js
index 2d3d465ca..ebe3af87d 100644
--- a/client/store/scanners.js
+++ b/client/store/scanners.js
@@ -63,12 +63,7 @@ export const state = () => ({
       value: 'itunes'
     }
   ],
-  coverOnlyProviders: [
-    {
-      text: 'AudiobookCovers.com',
-      value: 'audiobookcovers'
-    }
-  ]
+  coverOnlyProviders: []
 })
 
 export const getters = {
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 6b8427c05..5bab76118 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -23,7 +23,7 @@ class BookFinder {
     this.audiobookCovers = new AudiobookCovers()
     this.customProviderAdapter = new CustomProviderAdapter()
 
-    this.providers = ['google', 'itunes', 'openlibrary', 'fantlab', 'audiobookcovers', 'audible', 'audible.ca', 'audible.uk', 'audible.au', 'audible.fr', 'audible.de', 'audible.jp', 'audible.it', 'audible.in', 'audible.es']
+    this.providers = ['google', 'itunes', 'openlibrary', 'fantlab', 'audible', 'audible.ca', 'audible.uk', 'audible.au', 'audible.fr', 'audible.de', 'audible.jp', 'audible.it', 'audible.in', 'audible.es']
 
     this.verbose = false
   }

From c6dabd262087381a127cbca1915ab9da0d04caa5 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Thu, 2 Oct 2025 22:23:12 +0300
Subject: [PATCH 19/23] Shorten timeout and error message for remaining
 providers

---
 server/providers/CustomProviderAdapter.js | 4 ++--
 server/providers/FantLab.js               | 8 ++++----
 server/providers/GoogleBooks.js           | 4 ++--
 server/providers/OpenLibrary.js           | 4 ++--
 server/providers/iTunes.js                | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/server/providers/CustomProviderAdapter.js b/server/providers/CustomProviderAdapter.js
index a5fed3939..c079a1280 100644
--- a/server/providers/CustomProviderAdapter.js
+++ b/server/providers/CustomProviderAdapter.js
@@ -4,7 +4,7 @@ const Logger = require('../Logger')
 const htmlSanitizer = require('../utils/htmlSanitizer')
 
 class CustomProviderAdapter {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {}
 
@@ -61,7 +61,7 @@ class CustomProviderAdapter {
         return res.data.matches
       })
       .catch((error) => {
-        Logger.error('[CustomMetadataProvider] Search error', error)
+        Logger.error('[CustomMetadataProvider] Search error', error.message)
         return []
       })
 
diff --git a/server/providers/FantLab.js b/server/providers/FantLab.js
index f33934ca2..d25be1c80 100644
--- a/server/providers/FantLab.js
+++ b/server/providers/FantLab.js
@@ -2,7 +2,7 @@ const axios = require('axios')
 const Logger = require('../Logger')
 
 class FantLab {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
   // 7 - other
   // 11 - essay
   // 12 - article
@@ -48,7 +48,7 @@ class FantLab {
         return res.data || []
       })
       .catch((error) => {
-        Logger.error('[FantLab] search error', error)
+        Logger.error('[FantLab] search error', error.message)
         return []
       })
 
@@ -77,7 +77,7 @@ class FantLab {
         return resp.data || null
       })
       .catch((error) => {
-        Logger.error(`[FantLab] work info request for url "${url}" error`, error)
+        Logger.error(`[FantLab] work info request for url "${url}" error`, error.message)
         return null
       })
 
@@ -193,7 +193,7 @@ class FantLab {
         return resp.data || null
       })
       .catch((error) => {
-        Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error)
+        Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error.message)
         return null
       })
 
diff --git a/server/providers/GoogleBooks.js b/server/providers/GoogleBooks.js
index 76a3dceaa..3aec4c849 100644
--- a/server/providers/GoogleBooks.js
+++ b/server/providers/GoogleBooks.js
@@ -2,7 +2,7 @@ const axios = require('axios')
 const Logger = require('../Logger')
 
 class GoogleBooks {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {}
 
@@ -67,7 +67,7 @@ class GoogleBooks {
         return res.data.items
       })
       .catch((error) => {
-        Logger.error('[GoogleBooks] Volume search error', error)
+        Logger.error('[GoogleBooks] Volume search error', error.message)
         return []
       })
     return items.map((item) => this.cleanResult(item))
diff --git a/server/providers/OpenLibrary.js b/server/providers/OpenLibrary.js
index 10d033786..fb73dc294 100644
--- a/server/providers/OpenLibrary.js
+++ b/server/providers/OpenLibrary.js
@@ -1,7 +1,7 @@
 const axios = require('axios').default
 
 class OpenLibrary {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {
     this.baseUrl = 'https://openlibrary.org'
@@ -23,7 +23,7 @@ class OpenLibrary {
         return res.data
       })
       .catch((error) => {
-        console.error('Failed', error)
+        console.error('Failed', error.message)
         return null
       })
   }
diff --git a/server/providers/iTunes.js b/server/providers/iTunes.js
index 57a47d0d1..87695c58c 100644
--- a/server/providers/iTunes.js
+++ b/server/providers/iTunes.js
@@ -28,7 +28,7 @@ const htmlSanitizer = require('../utils/htmlSanitizer')
  */
 
 class iTunes {
-  #responseTimeout = 30000
+  #responseTimeout = 10000
 
   constructor() {}
 
@@ -63,7 +63,7 @@ class iTunes {
         return response.data.results || []
       })
       .catch((error) => {
-        Logger.error(`[iTunes] search request error`, error)
+        Logger.error(`[iTunes] search request error`, error.message)
         return []
       })
   }

From dbb5ee79acc1bdf680bc8cf1dbd24c2d9d24dbc5 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Fri, 3 Oct 2025 08:20:56 +0300
Subject: [PATCH 20/23] Revert removal of audiobookcovers provider

---
 client/store/scanners.js     | 7 ++++++-
 server/finders/BookFinder.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/store/scanners.js b/client/store/scanners.js
index ebe3af87d..2d3d465ca 100644
--- a/client/store/scanners.js
+++ b/client/store/scanners.js
@@ -63,7 +63,12 @@ export const state = () => ({
       value: 'itunes'
     }
   ],
-  coverOnlyProviders: []
+  coverOnlyProviders: [
+    {
+      text: 'AudiobookCovers.com',
+      value: 'audiobookcovers'
+    }
+  ]
 })
 
 export const getters = {
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 5bab76118..6b8427c05 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -23,7 +23,7 @@ class BookFinder {
     this.audiobookCovers = new AudiobookCovers()
     this.customProviderAdapter = new CustomProviderAdapter()
 
-    this.providers = ['google', 'itunes', 'openlibrary', 'fantlab', 'audible', 'audible.ca', 'audible.uk', 'audible.au', 'audible.fr', 'audible.de', 'audible.jp', 'audible.it', 'audible.in', 'audible.es']
+    this.providers = ['google', 'itunes', 'openlibrary', 'fantlab', 'audiobookcovers', 'audible', 'audible.ca', 'audible.uk', 'audible.au', 'audible.fr', 'audible.de', 'audible.jp', 'audible.it', 'audible.in', 'audible.es']
 
     this.verbose = false
   }

From 20de2ea388a09f99ef2ace9829406be1d5a934e8 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Fri, 3 Oct 2025 08:23:53 +0300
Subject: [PATCH 21/23] Add "Best" option to book cover search

---
 client/components/modals/item/tabs/Cover.vue | 16 ++++++++++++++--
 server/finders/BookFinder.js                 |  8 ++++++++
 server/managers/CoverSearchManager.js        |  3 +++
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/client/components/modals/item/tabs/Cover.vue b/client/components/modals/item/tabs/Cover.vue
index 41cac4bc3..4b47a0903 100644
--- a/client/components/modals/item/tabs/Cover.vue
+++ b/client/components/modals/item/tabs/Cover.vue
@@ -134,7 +134,7 @@ export default {
     },
     providers() {
       if (this.isPodcast) return this.$store.state.scanners.podcastProviders
-      return [{ text: 'All', value: 'all' }, ...this.$store.state.scanners.providers, ...this.$store.state.scanners.coverOnlyProviders]
+      return [{ text: 'Best', value: 'best' }, ...this.$store.state.scanners.providers, ...this.$store.state.scanners.coverOnlyProviders, { text: 'All', value: 'all' }]
     },
     searchTitleLabel() {
       if (this.provider.startsWith('audible')) return this.$strings.LabelSearchTitleOrASIN
@@ -243,7 +243,19 @@ export default {
       this.searchTitle = this.mediaMetadata.title || ''
       this.searchAuthor = this.mediaMetadata.authorName || ''
       if (this.isPodcast) this.provider = 'itunes'
-      else this.provider = localStorage.getItem('book-cover-provider') || localStorage.getItem('book-provider') || 'google'
+      else {
+        // Migrate from 'all' to 'best' (only once)
+        const migrationKey = 'book-cover-provider-migrated'
+        const currentProvider = localStorage.getItem('book-cover-provider') || localStorage.getItem('book-provider') || 'google'
+
+        if (!localStorage.getItem(migrationKey) && currentProvider === 'all') {
+          localStorage.setItem('book-cover-provider', 'best')
+          localStorage.setItem(migrationKey, 'true')
+          this.provider = 'best'
+        } else {
+          this.provider = currentProvider
+        }
+      }
     },
     removeCover() {
       if (!this.coverPath) {
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 6b8427c05..a6a6b07e6 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -608,6 +608,14 @@ class BookFinder {
         Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
         searchResults.push(...providerResults)
       }
+    } else if (provider === 'best') {
+      // Best providers: google, fantlab, and audible.com
+      const bestProviders = ['google', 'fantlab', 'audible']
+      for (const providerString of bestProviders) {
+        const providerResults = await this.search(null, providerString, title, author, options)
+        Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
+        searchResults.push(...providerResults)
+      }
     } else {
       searchResults = await this.search(null, provider, title, author, options)
     }
diff --git a/server/managers/CoverSearchManager.js b/server/managers/CoverSearchManager.js
index 1ad7ddb8e..ddcaa23db 100644
--- a/server/managers/CoverSearchManager.js
+++ b/server/managers/CoverSearchManager.js
@@ -119,6 +119,9 @@ class CoverSearchManager {
 
     if (provider === 'all') {
       providers = [...BookFinder.providers]
+    } else if (provider === 'best') {
+      // Best providers: google, fantlab, and audible.com
+      providers = ['google', 'fantlab', 'audible']
     } else {
       providers = [provider]
     }

From 7e89b97a6d0e5f95f239368bf626543620005d07 Mon Sep 17 00:00:00 2001
From: mikiher <mikiher@gmail.com>
Date: Fri, 3 Oct 2025 09:08:17 +0300
Subject: [PATCH 22/23] Tidy up cover search console logging and error toasts

---
 client/components/modals/item/tabs/Cover.vue | 31 ++++++++------------
 client/strings/en-us.json                    |  2 ++
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/client/components/modals/item/tabs/Cover.vue b/client/components/modals/item/tabs/Cover.vue
index 4b47a0903..0a8dab728 100644
--- a/client/components/modals/item/tabs/Cover.vue
+++ b/client/components/modals/item/tabs/Cover.vue
@@ -339,8 +339,6 @@ export default {
     handleSearchResult(data) {
       if (data.requestId !== this.currentSearchRequestId) return
 
-      console.log(`[Cover Search] Received ${data.total} covers from ${data.provider}`)
-
       // Add new covers to the list (avoiding duplicates)
       const newCovers = data.covers.filter((cover) => !this.coversFound.includes(cover))
       this.coversFound.push(...newCovers)
@@ -348,7 +346,6 @@ export default {
     handleSearchComplete(data) {
       if (data.requestId !== this.currentSearchRequestId) return
 
-      console.log('[Cover Search] Search completed')
       this.searchInProgress = false
       this.currentSearchRequestId = null
     },
@@ -356,7 +353,7 @@ export default {
       if (data.requestId !== this.currentSearchRequestId) return
 
       console.error('[Cover Search] Search error:', data.error)
-      this.$toast.error(`Search failed: ${data.error}`)
+      this.$toast.error(this.$strings.ToastCoverSearchFailed)
       this.searchInProgress = false
       this.currentSearchRequestId = null
     },
@@ -364,34 +361,38 @@ export default {
       if (data.requestId !== this.currentSearchRequestId) return
 
       console.warn(`[Cover Search] Provider ${data.provider} failed:`, data.error)
-      // Don't show toast for individual provider failures, just log them
     },
     handleSearchCancelled(data) {
       if (data.requestId !== this.currentSearchRequestId) return
 
-      console.log('[Cover Search] Search cancelled')
       this.searchInProgress = false
       this.currentSearchRequestId = null
     },
     handleSocketDisconnect() {
-      console.log('[Cover Search] Socket disconnected')
       // If we were in the middle of a search, cancel it (server can't send results anymore)
       if (this.searchInProgress && this.currentSearchRequestId) {
-        console.log('[Cover Search] Cancelling search due to socket disconnection')
         this.searchInProgress = false
         this.currentSearchRequestId = null
-        this.$toast.warning('Search was interrupted by connection loss')
       }
     },
     cancelCurrentSearch() {
-      if (!this.currentSearchRequestId || !this.socket) return
+      if (!this.currentSearchRequestId || !this.socket?.connected) {
+        console.error('[Cover Search] Socket not connected')
+        this.$toast.error(this.$strings.ToastConnectionNotAvailable)
+        return
+      }
 
-      console.log('[Cover Search] Cancelling search:', this.currentSearchRequestId)
       this.socket.emit('cancel_cover_search', this.currentSearchRequestId)
       this.currentSearchRequestId = null
       this.searchInProgress = false
     },
     async submitSearchForm() {
+      if (!this.socket?.connected) {
+        console.error('[Cover Search] Socket not connected')
+        this.$toast.error(this.$strings.ToastConnectionNotAvailable)
+        return
+      }
+
       // Cancel any existing search
       if (this.searchInProgress) {
         this.cancelCurrentSearch()
@@ -400,12 +401,6 @@ export default {
       // Store provider in local storage
       this.persistProvider()
 
-      if (!this.socket) {
-        console.error('[Cover Search] Socket not available')
-        this.$toast.error('Connection not available. Please refresh the page.')
-        return
-      }
-
       // Setup socket listeners if not already done
       this.addSocketListeners()
 
@@ -418,8 +413,6 @@ export default {
       const requestId = this.generateRequestId()
       this.currentSearchRequestId = requestId
 
-      console.log('[Cover Search] Starting search:', requestId)
-
       // Emit search request via WebSocket
       this.socket.emit('search_covers', {
         requestId,
diff --git a/client/strings/en-us.json b/client/strings/en-us.json
index 42832e37a..83acb5a69 100644
--- a/client/strings/en-us.json
+++ b/client/strings/en-us.json
@@ -1026,6 +1026,8 @@
   "ToastCollectionItemsAddFailed": "Item(s) added to collection failed",
   "ToastCollectionRemoveSuccess": "Collection removed",
   "ToastCollectionUpdateSuccess": "Collection updated",
+  "ToastConnectionNotAvailable": "Connection not available. Please try again later",
+  "ToastCoverSearchFailed": "Cover search failed",
   "ToastCoverUpdateFailed": "Cover update failed",
   "ToastDateTimeInvalidOrIncomplete": "Date and time is invalid or incomplete",
   "ToastDeleteFileFailed": "Failed to delete file",

From 1280ddfe7420e34ed922ee3851a8fd081ffba42b Mon Sep 17 00:00:00 2001
From: advplyr <advplyr@protonmail.com>
Date: Fri, 3 Oct 2025 16:39:36 -0500
Subject: [PATCH 23/23] ui/ux disable inputs while cover search in progress,
 add padding on empty state texts

---
 client/components/modals/item/tabs/Cover.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/components/modals/item/tabs/Cover.vue b/client/components/modals/item/tabs/Cover.vue
index 0a8dab728..b404a9abb 100644
--- a/client/components/modals/item/tabs/Cover.vue
+++ b/client/components/modals/item/tabs/Cover.vue
@@ -51,21 +51,21 @@
     <form @submit.prevent="submitSearchForm">
       <div class="flex flex-wrap sm:flex-nowrap items-center justify-start -mx-1">
         <div class="w-48 grow p-1">
-          <ui-dropdown v-model="provider" :items="providers" :label="$strings.LabelProvider" small />
+          <ui-dropdown v-model="provider" :items="providers" :disabled="searchInProgress" :label="$strings.LabelProvider" small />
         </div>
         <div class="w-72 grow p-1">
-          <ui-text-input-with-label v-model="searchTitle" :label="searchTitleLabel" :placeholder="$strings.PlaceholderSearch" />
+          <ui-text-input-with-label v-model="searchTitle" :disabled="searchInProgress" :label="searchTitleLabel" :placeholder="$strings.PlaceholderSearch" />
         </div>
         <div v-show="provider != 'itunes' && provider != 'audiobookcovers'" class="w-72 grow p-1">
-          <ui-text-input-with-label v-model="searchAuthor" :label="$strings.LabelAuthor" />
+          <ui-text-input-with-label v-model="searchAuthor" :disabled="searchInProgress" :label="$strings.LabelAuthor" />
         </div>
         <ui-btn v-if="!searchInProgress" class="mt-5 ml-1 md:min-w-24" :padding-x="4" type="submit">{{ $strings.ButtonSearch }}</ui-btn>
         <ui-btn v-else class="mt-5 ml-1 md:min-w-24" :padding-x="4" type="button" color="bg-error" @click.prevent="cancelCurrentSearch">{{ $strings.ButtonCancel }}</ui-btn>
       </div>
     </form>
     <div v-if="hasSearched" class="flex items-center flex-wrap justify-center sm:max-h-80 sm:overflow-y-scroll mt-2 max-w-full">
-      <p v-if="searchInProgress && !coversFound.length" class="text-gray-300">{{ $strings.MessageLoading }}</p>
-      <p v-else-if="!searchInProgress && !coversFound.length">{{ $strings.MessageNoCoversFound }}</p>
+      <p v-if="searchInProgress && !coversFound.length" class="text-gray-300 py-4">{{ $strings.MessageLoading }}</p>
+      <p v-else-if="!searchInProgress && !coversFound.length" class="text-gray-300 py-4">{{ $strings.MessageNoCoversFound }}</p>
       <template v-for="cover in coversFound">
         <div :key="cover" class="m-0.5 mb-5 border-2 border-transparent hover:border-yellow-300 cursor-pointer" :class="cover === coverPath ? 'border-yellow-300' : ''" @click="updateCover(cover)">
           <covers-preview-cover :src="cover" :width="80" show-open-new-tab :book-cover-aspect-ratio="bookCoverAspectRatio" />