Merge branch 'refs/heads/master' into mf/rssInboundManager

server/Auth.js

@@ -76,6 +76,9 @@ class Auth {
       return
     }
 
+    // Custom req timeout see: https://github.com/panva/node-openid-client/blob/main/docs/README.md#customizing
+    OpenIDClient.custom.setHttpOptionsDefaults({ timeout: 10000 })
+
     const openIdIssuerClient = new OpenIDClient.Issuer({
       issuer: global.ServerSettings.authOpenIDIssuerURL,
       authorization_endpoint: global.ServerSettings.authOpenIDAuthorizationURL,
@@ -86,7 +89,8 @@ class Auth {
     }).Client
     const openIdClient = new openIdIssuerClient({
       client_id: global.ServerSettings.authOpenIDClientID,
-      client_secret: global.ServerSettings.authOpenIDClientSecret
+      client_secret: global.ServerSettings.authOpenIDClientSecret,
+      id_token_signed_response_alg: global.ServerSettings.authOpenIDTokenSigningAlgorithm
     })
     passport.use('openid-client', new OpenIDClient.Strategy({
       client: openIdClient,
@@ -95,71 +99,198 @@ class Auth {
         scope: 'openid profile email'
       }
     }, async (tokenset, userinfo, done) => {
-      Logger.debug(`[Auth] openid callback userinfo=`, userinfo)
+      try {
+        Logger.debug(`[Auth] openid callback userinfo=`, JSON.stringify(userinfo, null, 2))
 
-      let failureMessage = 'Unauthorized'
-      if (!userinfo.sub) {
-        Logger.error(`[Auth] openid callback invalid userinfo, no sub`)
-        return done(null, null, failureMessage)
+        if (!userinfo.sub) {
+          throw new Error('Invalid userinfo, no sub')
+        }
+
+        if (!this.validateGroupClaim(userinfo)) {
+          throw new Error(`Group claim ${Database.serverSettings.authOpenIDGroupClaim} not found or empty in userinfo`)
+        }
+
+        let user = await this.findOrCreateUser(userinfo)
+
+        if (!user?.isActive) {
+          throw new Error('User not active or not found')
+        }
+
+        await this.setUserGroup(user, userinfo)
+        await this.updateUserPermissions(user, userinfo)
+
+        // We also have to save the id_token for later (used for logout) because we cannot set cookies here
+        user.openid_id_token = tokenset.id_token
+
+        return done(null, user)
+      } catch (error) {
+        Logger.error(`[Auth] openid callback error: ${error?.message}\n${error?.stack}`)
+
+        return done(null, null, 'Unauthorized')
       }
+    }))
+  }
 
-      // First check for matching user by sub
-      let user = await Database.userModel.getUserByOpenIDSub(userinfo.sub)
-      if (!user) {
-        // Optionally match existing by email or username based on server setting "authOpenIDMatchExistingBy"
-        if (Database.serverSettings.authOpenIDMatchExistingBy === 'email' && userinfo.email && userinfo.email_verified) {
+  /**
+   * Finds an existing user by OpenID subject identifier, or by email/username based on server settings,
+   * or creates a new user if configured to do so.
+   */
+  async findOrCreateUser(userinfo) {
+    let user = await Database.userModel.getUserByOpenIDSub(userinfo.sub)
+
+    // Matched by sub
+    if (user) {
+      Logger.debug(`[Auth] openid: User found by sub`)
+      return user
+    }
+
+    // Match existing user by email
+    if (Database.serverSettings.authOpenIDMatchExistingBy === 'email') {
+      if (userinfo.email) {
+        // Only disallow when email_verified explicitly set to false (allow both if not set or true)
+        if (userinfo.email_verified === false) {
+          Logger.warn(`[Auth] openid: User not found and email "${userinfo.email}" is not verified`)
+          return null
+        } else {
           Logger.info(`[Auth] openid: User not found, checking existing with email "${userinfo.email}"`)
           user = await Database.userModel.getUserByEmail(userinfo.email)
-          // Check that user is not already matched
+
           if (user?.authOpenIDSub) {
             Logger.warn(`[Auth] openid: User found with email "${userinfo.email}" but is already matched with sub "${user.authOpenIDSub}"`)
-            // TODO: Message isn't actually returned to the user yet. Need to override the passport authenticated callback
-            failureMessage = 'A matching user was found but is already matched with another user from your auth provider'
-            user = null
-          }
-        } else if (Database.serverSettings.authOpenIDMatchExistingBy === 'username' && userinfo.preferred_username) {
-          Logger.info(`[Auth] openid: User not found, checking existing with username "${userinfo.preferred_username}"`)
-          user = await Database.userModel.getUserByUsername(userinfo.preferred_username)
-          // Check that user is not already matched
-          if (user?.authOpenIDSub) {
-            Logger.warn(`[Auth] openid: User found with username "${userinfo.preferred_username}" but is already matched with sub "${user.authOpenIDSub}"`)
-            // TODO: Message isn't actually returned to the user yet. Need to override the passport authenticated callback
-            failureMessage = 'A matching user was found but is already matched with another user from your auth provider'
-            user = null
+            return null // User is linked to a different OpenID subject; do not proceed.
           }
         }
+      } else {
+        Logger.warn(`[Auth] openid: User not found and no email in userinfo`)
+        // We deny login, because if the admin whishes to match email, it makes sense to require it
+        return null
+      }
+    }
+    // Match existing user by username
+    else if (Database.serverSettings.authOpenIDMatchExistingBy === 'username') {
+      let username
 
-        // If existing user was matched and isActive then save sub to user
-        if (user?.isActive) {
-          Logger.info(`[Auth] openid: New user found matching existing user "${user.username}"`)
-          user.authOpenIDSub = userinfo.sub
-          await Database.userModel.updateFromOld(user)
-        } else if (user && !user.isActive) {
-          Logger.warn(`[Auth] openid: New user found matching existing user "${user.username}" but that user is deactivated`)
-        }
+      if (userinfo.preferred_username) {
+        Logger.info(`[Auth] openid: User not found, checking existing with userinfo.preferred_username "${userinfo.preferred_username}"`)
+        username = userinfo.preferred_username
+      } else if (userinfo.username) {
+        Logger.info(`[Auth] openid: User not found, checking existing with userinfo.username "${userinfo.username}"`)
+        username = userinfo.username
+      } else {
+        Logger.warn(`[Auth] openid: User not found and neither preferred_username nor username in userinfo`)
+        return null
+      }
 
-        // Optionally auto register the user 
-        if (!user && Database.serverSettings.authOpenIDAutoRegister) {
-          Logger.info(`[Auth] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo)
-          user = await Database.userModel.createUserFromOpenIdUserInfo(userinfo, this)
+
+      user = await Database.userModel.getUserByUsername(username)
+
+      if (user?.authOpenIDSub) {
+        Logger.warn(`[Auth] openid: User found with username "${username}" but is already matched with sub "${user.authOpenIDSub}"`)
+        return null // User is linked to a different OpenID subject; do not proceed.
+      }
+    }
+
+    // Found existing user via email or username
+    if (user) {
+      if (!user.isActive) {
+        Logger.warn(`[Auth] openid: User found but is not active`)
+        return null
+      }
+
+      user.authOpenIDSub = userinfo.sub
+      await Database.userModel.updateFromOld(user)
+
+      Logger.debug(`[Auth] openid: User found by email/username`)
+      return user
+    }
+
+    // If no existing user was matched, auto-register if configured
+    if (Database.serverSettings.authOpenIDAutoRegister) {
+      Logger.info(`[Auth] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo)
+      user = await Database.userModel.createUserFromOpenIdUserInfo(userinfo, this)
+      return user
+    }
+
+    Logger.warn(`[Auth] openid: User not found and auto-register is disabled`)
+    return null
+  }
+
+  /**
+   * Validates the presence and content of the group claim in userinfo.
+   */
+  validateGroupClaim(userinfo) {
+    const groupClaimName = Database.serverSettings.authOpenIDGroupClaim
+    if (!groupClaimName) // Allow no group claim when configured like this
+      return true
+
+    // If configured it must exist in userinfo
+    if (!userinfo[groupClaimName]) {
+      return false
+    }
+    return true
+  }
+
+  /**
+   * Sets the user group based on group claim in userinfo.
+   * 
+   * @param {import('./objects/user/User')} user
+   * @param {Object} userinfo
+   */
+  async setUserGroup(user, userinfo) {
+    const groupClaimName = Database.serverSettings.authOpenIDGroupClaim
+    if (!groupClaimName) // No group claim configured, don't set anything
+      return
+
+    if (!userinfo[groupClaimName])
+      throw new Error(`Group claim ${groupClaimName} not found in userinfo`)
+
+    const groupsList = userinfo[groupClaimName].map(group => group.toLowerCase())
+    const rolesInOrderOfPriority = ['admin', 'user', 'guest']
+
+    let userType = rolesInOrderOfPriority.find(role => groupsList.includes(role))
+    if (userType) {
+      if (user.type === 'root') {
+        // Check OpenID Group
+        if (userType !== 'admin') {
+          throw new Error(`Root user "${user.username}" cannot be downgraded to ${userType}. Denying login.`)
+        } else {
+          // If root user is logging in via OpenID, we will not change the type
+          return
         }
       }
 
-      if (!user?.isActive) {
-        if (user && !user.isActive) {
-          failureMessage = 'Unauthorized'
-        }
-        // deny login
-        done(null, null, failureMessage)
-        return
+      if (user.type !== userType) {
+        Logger.info(`[Auth] openid callback: Updating user "${user.username}" type to "${userType}" from "${user.type}"`)
+        user.type = userType
+        await Database.userModel.updateFromOld(user)
       }
+    } else {
+      throw new Error(`No valid group found in userinfo: ${JSON.stringify(userinfo[groupClaimName], null, 2)}`)
+    }
+  }
 
-      // We also have to save the id_token for later (used for logout) because we cannot set cookies here
-      user.openid_id_token = tokenset.id_token
+  /**
+   * Updates user permissions based on the advanced permissions claim.
+   * 
+   * @param {import('./objects/user/User')} user
+   * @param {Object} userinfo
+   */
+  async updateUserPermissions(user, userinfo) {
+    const absPermissionsClaim = Database.serverSettings.authOpenIDAdvancedPermsClaim
+    if (!absPermissionsClaim) // No advanced permissions claim configured, don't set anything
+      return
 
-      // permit login
-      return done(null, user)
-    }))
+    if (user.type === 'admin' || user.type === 'root')
+      return
+
+    const absPermissions = userinfo[absPermissionsClaim]
+    if (!absPermissions)
+      throw new Error(`Advanced permissions claim ${absPermissionsClaim} not found in userinfo`)
+
+    if (user.updatePermissionsFromExternalJSON(absPermissions)) {
+      Logger.info(`[Auth] openid callback: Updating advanced perms for user "${user.username}" using "${JSON.stringify(absPermissions)}"`)
+      await Database.userModel.updateFromOld(user)
+    }
   }
 
   /**
@@ -331,10 +462,19 @@ class Auth {
           sso_redirect_uri: oidcStrategy._params.redirect_uri // Save the redirect_uri (for the SSO Provider) for the callback
         }
 
+        var scope = 'openid profile email'
+        if (global.ServerSettings.authOpenIDGroupClaim) {
+          scope += ' ' + global.ServerSettings.authOpenIDGroupClaim
+        }
+        if (global.ServerSettings.authOpenIDAdvancedPermsClaim) {
+          scope += ' ' + global.ServerSettings.authOpenIDAdvancedPermsClaim
+        }
+
         const authorizationUrl = client.authorizationUrl({
           ...oidcStrategy._params,
           state: state,
           response_type: 'code',
+          scope: scope,
           code_challenge,
           code_challenge_method
         })
@@ -343,7 +483,7 @@ class Auth {
 
         res.redirect(authorizationUrl)
       } catch (error) {
-        Logger.error(`[Auth] Error in /auth/openid route: ${error}`)
+        Logger.error(`[Auth] Error in /auth/openid route: ${error}\n${error?.stack}`)
         res.status(500).send('Internal Server Error')
       }
 
@@ -399,7 +539,7 @@ class Auth {
         // Redirect to the overwrite URI saved in the map
         res.redirect(redirectUri)
       } catch (error) {
-        Logger.error(`[Auth] Error in /auth/openid/mobile-redirect route: ${error}`)
+        Logger.error(`[Auth] Error in /auth/openid/mobile-redirect route: ${error}\n${error?.stack}`)
         res.status(500).send('Internal Server Error')
       }
     })
@@ -421,12 +561,12 @@ class Auth {
       }
 
       function handleAuthError(isMobile, errorCode, errorMessage, logMessage, response) {
-        Logger.error(logMessage)
+        Logger.error(JSON.stringify(logMessage, null, 2))
         if (response) {
           // Depending on the error, it can also have a body
           // We also log the request header the passport plugin sents for the URL
           const header = response.req?._header.replace(/Authorization: [^\r\n]*/i, 'Authorization: REDACTED')
-          Logger.debug(header + '\n' + response.body?.toString())
+          Logger.debug(header + '\n' + JSON.stringify(response.body, null, 2))
         }
 
         if (isMobile) {
@@ -511,7 +651,8 @@ class Auth {
           token_endpoint: data.token_endpoint,
           userinfo_endpoint: data.userinfo_endpoint,
           end_session_endpoint: data.end_session_endpoint,
-          jwks_uri: data.jwks_uri
+          jwks_uri: data.jwks_uri,
+          id_token_signing_alg_values_supported: data.id_token_signing_alg_values_supported
         })
       }).catch((error) => {
         Logger.error(`[Auth] Failed to get openid configuration at "${configUrl}"`, error)
@@ -530,42 +671,45 @@ class Auth {
 
           res.clearCookie('auth_method')
 
+          let logoutUrl = null
+
           if (authMethod === 'openid' || authMethod === 'openid-mobile') {
             // If we are using openid, we need to redirect to the logout endpoint
             // node-openid-client does not support doing it over passport
             const oidcStrategy = passport._strategy('openid-client')
             const client = oidcStrategy._client
 
-            let postLogoutRedirectUri = null
+            if (client.issuer.end_session_endpoint && client.issuer.end_session_endpoint.length > 0) {
+              let postLogoutRedirectUri = null
 
-            if (authMethod === 'openid') {
-              const protocol = (req.secure || req.get('x-forwarded-proto') === 'https') ? 'https' : 'http'
-              const host = req.get('host')
-              // TODO: ABS does currently not support subfolders for installation
-              // If we want to support it we need to include a config for the serverurl
-              postLogoutRedirectUri = `${protocol}://${host}/login`
+              if (authMethod === 'openid') {
+                const protocol = (req.secure || req.get('x-forwarded-proto') === 'https') ? 'https' : 'http'
+                const host = req.get('host')
+                // TODO: ABS does currently not support subfolders for installation
+                // If we want to support it we need to include a config for the serverurl
+                postLogoutRedirectUri = `${protocol}://${host}/login`
+              }
+              // else for openid-mobile we keep postLogoutRedirectUri on null
+              //  nice would be to redirect to the app here, but for example Authentik does not implement
+              //  the post_logout_redirect_uri parameter at all and for other providers
+              //  we would also need again to implement (and even before get to know somehow for 3rd party apps)
+              //  the correct app link like audiobookshelf://login (and maybe also provide a redirect like mobile-redirect).
+              //   Instead because its null (and this way the parameter will be omitted completly), the client/app can simply append something like
+              //  &post_logout_redirect_uri=audiobookshelf://login to the received logout url by itself which is the simplest solution
+              //   (The URL needs to be whitelisted in the config of the SSO/ID provider)
+
+              logoutUrl = client.endSessionUrl({
+                id_token_hint: req.cookies.openid_id_token,
+                post_logout_redirect_uri: postLogoutRedirectUri
+              })
             }
-            // else for openid-mobile we keep postLogoutRedirectUri on null
-            //  nice would be to redirect to the app here, but for example Authentik does not implement
-            //  the post_logout_redirect_uri parameter at all and for other providers
-            //  we would also need again to implement (and even before get to know somehow for 3rd party apps)
-            //  the correct app link like audiobookshelf://login (and maybe also provide a redirect like mobile-redirect).
-            //   Instead because its null (and this way the parameter will be omitted completly), the client/app can simply append something like
-            //  &post_logout_redirect_uri=audiobookshelf://login to the received logout url by itself which is the simplest solution
-            //   (The URL needs to be whitelisted in the config of the SSO/ID provider)
-
-            const logoutUrl = client.endSessionUrl({
-              id_token_hint: req.cookies.openid_id_token,
-              post_logout_redirect_uri: postLogoutRedirectUri
-            })
 
             res.clearCookie('openid_id_token')
-
-            // Tell the user agent (browser) to redirect to the authentification provider's logout URL
-            res.send({ redirect_url: logoutUrl })
-          } else {
-            res.sendStatus(200)
           }
+
+          // Tell the user agent (browser) to redirect to the authentification provider's logout URL
+          // (or redirect_url: null if we don't have one)
+          res.send({ redirect_url: logoutUrl })
         }
       })
     })

server/Database.js

@@ -217,7 +217,6 @@ class Database {
   async disconnect() {
     Logger.info(`[Database] Disconnecting sqlite db`)
     await this.sequelize.close()
-    this.sequelize = null
   }
 
   /**
@@ -689,6 +688,34 @@ class Database {
     return this.libraryFilterData[libraryId].series.some(se => se.id === seriesId)
   }
 
+  /**
+   * Get author id for library by name. Uses library filter data if available
+   * 
+   * @param {string} libraryId 
+   * @param {string} authorName 
+   * @returns {Promise<string>} author id or null if not found 
+   */
+  async getAuthorIdByName(libraryId, authorName) {
+    if (!this.libraryFilterData[libraryId]) {
+      return (await this.authorModel.getOldByNameAndLibrary(authorName, libraryId))?.id || null
+    }
+    return this.libraryFilterData[libraryId].authors.find(au => au.name === authorName)?.id || null
+  }
+
+  /**
+   * Get series id for library by name. Uses library filter data if available
+   * 
+   * @param {string} libraryId 
+   * @param {string} seriesName 
+   * @returns {Promise<string>} series id or null if not found
+   */
+  async getSeriesIdByName(libraryId, seriesName) {
+    if (!this.libraryFilterData[libraryId]) {
+      return (await this.seriesModel.getOldByNameAndLibrary(seriesName, libraryId))?.id || null
+    }
+    return this.libraryFilterData[libraryId].series.find(se => se.name === seriesName)?.id || null
+  }
+
   /**
    * Reset numIssues for library
    * @param {string} libraryId 

server/Logger.js

@@ -70,14 +70,15 @@ class Logger {
   }
 
   /**
-   * 
-   * @param {number} level 
-   * @param {string[]} args 
+   *
+   * @param {number} level
+   * @param {string[]} args
+   * @param {string} src
    */
-  async handleLog(level, args) {
+  async handleLog(level, args, src) {
     const logObj = {
       timestamp: this.timestamp,
-      source: this.source,
+      source: src,
       message: args.join(' '),
       levelName: this.getLogLevelString(level),
       level
@@ -92,7 +93,7 @@ class Logger {
 
     // Save log to file
     if (level >= this.logLevel) {
-      await this.logManager.logToFile(logObj)
+      await this.logManager?.logToFile(logObj)
     }
   }
 
@@ -104,31 +105,31 @@ class Logger {
   trace(...args) {
     if (this.logLevel > LogLevel.TRACE) return
     console.trace(`[${this.timestamp}] TRACE:`, ...args)
-    this.handleLog(LogLevel.TRACE, args)
+    this.handleLog(LogLevel.TRACE, args, this.source)
   }
 
   debug(...args) {
     if (this.logLevel > LogLevel.DEBUG) return
     console.debug(`[${this.timestamp}] DEBUG:`, ...args, `(${this.source})`)
-    this.handleLog(LogLevel.DEBUG, args)
+    this.handleLog(LogLevel.DEBUG, args, this.source)
   }
 
   info(...args) {
     if (this.logLevel > LogLevel.INFO) return
     console.info(`[${this.timestamp}] INFO:`, ...args)
-    this.handleLog(LogLevel.INFO, args)
+    this.handleLog(LogLevel.INFO, args, this.source)
   }
 
   warn(...args) {
     if (this.logLevel > LogLevel.WARN) return
     console.warn(`[${this.timestamp}] WARN:`, ...args, `(${this.source})`)
-    this.handleLog(LogLevel.WARN, args)
+    this.handleLog(LogLevel.WARN, args, this.source)
   }
 
   error(...args) {
     if (this.logLevel > LogLevel.ERROR) return
     console.error(`[${this.timestamp}] ERROR:`, ...args, `(${this.source})`)
-    this.handleLog(LogLevel.ERROR, args)
+    this.handleLog(LogLevel.ERROR, args, this.source)
   }
 
   /**
@@ -139,12 +140,12 @@ class Logger {
    */
   fatal(...args) {
     console.error(`[${this.timestamp}] FATAL:`, ...args, `(${this.source})`)
-    return this.handleLog(LogLevel.FATAL, args)
+    return this.handleLog(LogLevel.FATAL, args, this.source)
   }
 
   note(...args) {
     console.log(`[${this.timestamp}] NOTE:`, ...args)
-    this.handleLog(LogLevel.NOTE, args)
+    this.handleLog(LogLevel.NOTE, args, this.source)
   }
 }
 module.exports = new Logger()

server/Server.js

@@ -5,7 +5,7 @@ const http = require('http')
 const util = require('util')
 const fs = require('./libs/fsExtra')
 const fileUpload = require('./libs/expressFileupload')
-const cookieParser = require("cookie-parser")
+const cookieParser = require('cookie-parser')
 
 const { version } = require('../package.json')
 
@@ -41,13 +41,11 @@ const passport = require('passport')
 const expressSession = require('express-session')
 
 class Server {
-  constructor(SOURCE, PORT, HOST, UID, GID, CONFIG_PATH, METADATA_PATH, ROUTER_BASE_PATH) {
+  constructor(SOURCE, PORT, HOST, CONFIG_PATH, METADATA_PATH, ROUTER_BASE_PATH) {
     this.Port = PORT
     this.Host = HOST
     global.Source = SOURCE
     global.isWin = process.platform === 'win32'
-    global.Uid = isNaN(UID) ? undefined : Number(UID)
-    global.Gid = isNaN(GID) ? undefined : Number(GID)
     global.ConfigPath = fileUtils.filePathToPOSIX(Path.normalize(CONFIG_PATH))
     global.MetadataPath = fileUtils.filePathToPOSIX(Path.normalize(METADATA_PATH))
     global.RouterBasePath = ROUTER_BASE_PATH
@@ -182,15 +180,15 @@ class Server {
      * so we have to allow cors for specific origins to the /api/items/:id/ebook endpoint
      * The cover image is fetched with XMLHttpRequest in the mobile apps to load into a canvas and extract colors
      * @see https://ionicframework.com/docs/troubleshooting/cors
-     * 
-     * Running in development allows cors to allow testing the mobile apps in the browser 
+     *
+     * Running in development allows cors to allow testing the mobile apps in the browser
      */
     app.use((req, res, next) => {
       if (Logger.isDev || req.path.match(/\/api\/items\/([a-z0-9-]{36})\/(ebook|cover)(\/[0-9]+)?/)) {
         const allowedOrigins = ['capacitor://localhost', 'http://localhost']
-        if (Logger.isDev || allowedOrigins.some(o => o === req.get('origin'))) {
+        if (Logger.isDev || allowedOrigins.some((o) => o === req.get('origin'))) {
           res.header('Access-Control-Allow-Origin', req.get('origin'))
-          res.header("Access-Control-Allow-Methods", 'GET, POST, PATCH, PUT, DELETE, OPTIONS')
+          res.header('Access-Control-Allow-Methods', 'GET, POST, PATCH, PUT, DELETE, OPTIONS')
           res.header('Access-Control-Allow-Headers', '*')
           res.header('Access-Control-Allow-Credentials', true)
           if (req.method === 'OPTIONS') {
@@ -205,15 +203,17 @@ class Server {
     // parse cookies in requests
     app.use(cookieParser())
     // enable express-session
-    app.use(expressSession({
-      secret: global.ServerSettings.tokenSecret,
-      resave: false,
-      saveUninitialized: false,
-      cookie: {
-        // also send the cookie if were are not on https (not every use has https)
-        secure: false
-      },
-    }))
+    app.use(
+      expressSession({
+        secret: global.ServerSettings.tokenSecret,
+        resave: false,
+        saveUninitialized: false,
+        cookie: {
+          // also send the cookie if were are not on https (not every use has https)
+          secure: false
+        }
+      })
+    )
     // init passport.js
     app.use(passport.initialize())
     // register passport in express-session
@@ -227,14 +227,16 @@ class Server {
 
     this.server = http.createServer(app)
 
-    router.use(fileUpload({
-      defCharset: 'utf8',
-      defParamCharset: 'utf8',
-      useTempFiles: true,
-      tempFileDir: Path.join(global.MetadataPath, 'tmp')
-    }))
-    router.use(express.urlencoded({ extended: true, limit: "5mb" }))
-    router.use(express.json({ limit: "5mb" }))
+    router.use(
+      fileUpload({
+        defCharset: 'utf8',
+        defParamCharset: 'utf8',
+        useTempFiles: true,
+        tempFileDir: Path.join(global.MetadataPath, 'tmp')
+      })
+    )
+    router.use(express.urlencoded({ extended: true, limit: '5mb' }))
+    router.use(express.json({ limit: '5mb' }))
 
     // Static path to generated nuxt
     const distPath = Path.join(global.appRoot, '/client/dist')
@@ -363,7 +365,7 @@ class Server {
       const mediaProgressRemoved = await Database.mediaProgressModel.destroy({
         where: {
           id: {
-            [Sequelize.Op.in]: mediaProgressToRemove.map(mp => mp.id)
+            [Sequelize.Op.in]: mediaProgressToRemove.map((mp) => mp.id)
           }
         }
       })
@@ -377,15 +379,18 @@ class Server {
     for (const _user of users) {
       let hasUpdated = false
       if (_user.seriesHideFromContinueListening.length) {
-        const seriesHiding = (await Database.seriesModel.findAll({
-          where: {
-            id: _user.seriesHideFromContinueListening
-          },
-          attributes: ['id'],
-          raw: true
-        })).map(se => se.id)
-        _user.seriesHideFromContinueListening = _user.seriesHideFromContinueListening.filter(seriesId => {
-          if (!seriesHiding.includes(seriesId)) { // Series removed
+        const seriesHiding = (
+          await Database.seriesModel.findAll({
+            where: {
+              id: _user.seriesHideFromContinueListening
+            },
+            attributes: ['id'],
+            raw: true
+          })
+        ).map((se) => se.id)
+        _user.seriesHideFromContinueListening = _user.seriesHideFromContinueListening.filter((seriesId) => {
+          if (!seriesHiding.includes(seriesId)) {
+            // Series removed
             hasUpdated = true
             return false
           }

server/Watcher.js

@@ -103,15 +103,28 @@ class FolderWatcher extends EventEmitter {
     this.buildLibraryWatcher(library)
   }
 
+  /**
+   * 
+   * @param {import('./objects/Library')} library 
+   */
   updateLibrary(library) {
-    if (this.disabled || library.settings.disableWatcher) return
-    var libwatcher = this.libraryWatchers.find(lib => lib.id === library.id)
+    if (this.disabled) return
+
+    const libwatcher = this.libraryWatchers.find(lib => lib.id === library.id)
     if (libwatcher) {
+      // Library watcher was disabled
+      if (library.settings.disableWatcher) {
+        Logger.info(`[Watcher] updateLibrary: Library "${library.name}" watcher disabled`)
+        libwatcher.watcher.close()
+        this.libraryWatchers = this.libraryWatchers.filter(lw => lw.id !== libwatcher.id)
+        return
+      }
+
       libwatcher.name = library.name
 
       // If any folder paths were added or removed then re-init watcher
-      var pathsToAdd = library.folderPaths.filter(path => !libwatcher.paths.includes(path))
-      var pathsRemoved = libwatcher.paths.filter(path => !library.folderPaths.includes(path))
+      const pathsToAdd = library.folderPaths.filter(path => !libwatcher.paths.includes(path))
+      const pathsRemoved = libwatcher.paths.filter(path => !library.folderPaths.includes(path))
       if (pathsToAdd.length || pathsRemoved.length) {
         Logger.info(`[Watcher] Re-Initializing watcher for "${library.name}".`)
 
@@ -119,6 +132,10 @@ class FolderWatcher extends EventEmitter {
         this.libraryWatchers = this.libraryWatchers.filter(lw => lw.id !== libwatcher.id)
         this.buildLibraryWatcher(library)
       }
+    } else if (!library.settings.disableWatcher) {
+      // Library watcher was enabled
+      Logger.info(`[Watcher] updateLibrary: Library "${library.name}" watcher enabled - initializing`)
+      this.buildLibraryWatcher(library)
     }
   }
 

server/controllers/AuthorController.js

@@ -15,7 +15,7 @@ const naturalSort = createNewSortInstance({
   comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
 })
 class AuthorController {
-  constructor() { }
+  constructor() {}
 
   async findOne(req, res) {
     const include = (req.query.include || '').split(',')
@@ -32,7 +32,6 @@ class AuthorController {
         authorJson.libraryItems.forEach((li) => {
           if (li.media.metadata.series) {
             li.media.metadata.series.forEach((series) => {
-
               const itemWithSeries = li.toJSONMinified()
               itemWithSeries.media.metadata.series = series
 
@@ -50,14 +49,14 @@ class AuthorController {
         })
         // Sort series items
         for (const key in seriesMap) {
-          seriesMap[key].items = naturalSort(seriesMap[key].items).asc(li => li.media.metadata.series.sequence)
+          seriesMap[key].items = naturalSort(seriesMap[key].items).asc((li) => li.media.metadata.series.sequence)
         }
 
         authorJson.series = Object.values(seriesMap)
       }
 
       // Minify library items
-      authorJson.libraryItems = authorJson.libraryItems.map(li => li.toJSONMinified())
+      authorJson.libraryItems = authorJson.libraryItems.map((li) => li.toJSONMinified())
     }
 
     return res.json(authorJson)
@@ -91,7 +90,8 @@ class AuthorController {
     if (existingAuthor) {
       const bookAuthorsToCreate = []
       const itemsWithAuthor = await Database.libraryItemModel.getForAuthor(req.author)
-      itemsWithAuthor.forEach(libraryItem => { // Replace old author with merging author for each book
+      itemsWithAuthor.forEach((libraryItem) => {
+        // Replace old author with merging author for each book
         libraryItem.media.metadata.replaceAuthor(req.author, existingAuthor)
         bookAuthorsToCreate.push({
           bookId: libraryItem.media.id,
@@ -101,7 +101,10 @@ class AuthorController {
       if (itemsWithAuthor.length) {
         await Database.removeBulkBookAuthors(req.author.id) // Remove all old BookAuthor
         await Database.createBulkBookAuthors(bookAuthorsToCreate) // Create all new BookAuthor
-        SocketAuthority.emitter('items_updated', itemsWithAuthor.map(li => li.toJSONExpanded()))
+        SocketAuthority.emitter(
+          'items_updated',
+          itemsWithAuthor.map((li) => li.toJSONExpanded())
+        )
       }
 
       // Remove old author
@@ -118,7 +121,8 @@ class AuthorController {
         author: existingAuthor.toJSON(),
         merged: true
       })
-    } else { // Regular author update
+    } else {
+      // Regular author update
       if (req.author.update(payload)) {
         hasUpdated = true
       }
@@ -127,12 +131,16 @@ class AuthorController {
         req.author.updatedAt = Date.now()
 
         const itemsWithAuthor = await Database.libraryItemModel.getForAuthor(req.author)
-        if (authorNameUpdate) { // Update author name on all books
-          itemsWithAuthor.forEach(libraryItem => {
+        if (authorNameUpdate) {
+          // Update author name on all books
+          itemsWithAuthor.forEach((libraryItem) => {
             libraryItem.media.metadata.updateAuthor(req.author)
           })
           if (itemsWithAuthor.length) {
-            SocketAuthority.emitter('items_updated', itemsWithAuthor.map(li => li.toJSONExpanded()))
+            SocketAuthority.emitter(
+              'items_updated',
+              itemsWithAuthor.map((li) => li.toJSONExpanded())
+            )
           }
         }
 
@@ -150,9 +158,9 @@ class AuthorController {
   /**
    * DELETE: /api/authors/:id
    * Remove author from all books and delete
-   * 
-   * @param {import('express').Request} req 
-   * @param {import('express').Response} res 
+   *
+   * @param {import('express').Request} req
+   * @param {import('express').Response} res
    */
   async delete(req, res) {
     Logger.info(`[AuthorController] Removing author "${req.author.name}"`)
@@ -174,9 +182,9 @@ class AuthorController {
   /**
    * POST: /api/authors/:id/image
    * Upload author image from web URL
-   * 
-   * @param {import('express').Request} req 
-   * @param {import('express').Response} res 
+   *
+   * @param {import('express').Request} req
+   * @param {import('express').Response} res
    */
   async uploadImage(req, res) {
     if (!req.user.canUpload) {
@@ -206,6 +214,7 @@ class AuthorController {
     }
 
     req.author.imagePath = result.path
+    req.author.updatedAt = Date.now()
     await Database.authorModel.updateFromOld(req.author)
 
     const numBooks = (await Database.libraryItemModel.getForAuthor(req.author)).length
@@ -218,9 +227,9 @@ class AuthorController {
   /**
    * DELETE: /api/authors/:id/image
    * Remove author image & delete image file
-   * 
-   * @param {import('express').Request} req 
-   * @param {import('express').Response} res 
+   *
+   * @param {import('express').Request} req
+   * @param {import('express').Response} res
    */
   async deleteImage(req, res) {
     if (!req.author.imagePath) {
@@ -292,10 +301,14 @@ class AuthorController {
 
   // GET api/authors/:id/image
   async getImage(req, res) {
-    const { query: { width, height, format, raw }, author } = req
+    const {
+      query: { width, height, format, raw },
+      author
+    } = req
 
-    if (raw) { // any value
-      if (!author.imagePath || !await fs.pathExists(author.imagePath)) {
+    if (raw) {
+      // any value
+      if (!author.imagePath || !(await fs.pathExists(author.imagePath))) {
         return res.sendStatus(404)
       }
 
@@ -326,4 +339,4 @@ class AuthorController {
     next()
   }
 }
-module.exports = new AuthorController()
+module.exports = new AuthorController()

server/controllers/BackupController.js

@@ -49,8 +49,13 @@ class BackupController {
     res.sendFile(req.backup.fullPath)
   }
 
+  /**
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   apply(req, res) {
-    this.backupManager.requestApplyBackup(req.backup, res)
+    this.backupManager.requestApplyBackup(this.apiCacheManager, req.backup, res)
   }
 
   middleware(req, res, next) {

server/controllers/LibraryController.js

@@ -128,7 +128,14 @@ class LibraryController {
     res.json(libraryDownloadQueueDetails)
   }
 
+  /**
+   * PATCH: /api/libraries/:id
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async update(req, res) {
+    /** @type {import('../objects/Library')} */
     const library = req.library
 
     // Validate that the custom provider exists if given any
@@ -598,12 +605,12 @@ class LibraryController {
     }
 
     if (req.library.isBook) {
-      const authors = await authorFilters.getAuthorsWithCount(req.library.id)
+      const authors = await authorFilters.getAuthorsWithCount(req.library.id, 10)
       const genres = await libraryItemsBookFilters.getGenresWithCount(req.library.id)
       const bookStats = await libraryItemsBookFilters.getBookLibraryStats(req.library.id)
       const longestBooks = await libraryItemsBookFilters.getLongestBooks(req.library.id, 10)
 
-      stats.totalAuthors = authors.length
+      stats.totalAuthors = await authorFilters.getAuthorsTotalCount(req.library.id)
       stats.authorsWithCount = authors
       stats.totalGenres = genres.length
       stats.genresWithCount = genres
@@ -660,6 +667,7 @@ class LibraryController {
     for (const author of authors) {
       const oldAuthor = author.getOldAuthor().toJSON()
       oldAuthor.numBooks = author.books.length
+      oldAuthor.lastFirst = author.lastFirst
       oldAuthors.push(oldAuthor)
     }
 

server/controllers/LibraryItemController.js

@@ -117,13 +117,22 @@ class LibraryItemController {
     zipHelpers.zipDirectoryPipe(libraryItemPath, filename, res)
   }
 
-  //
-  // PATCH: will create new authors & series if in payload
-  //
+  /**
+   * PATCH: /items/:id/media
+   * Update media for a library item. Will create new authors & series when necessary
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async updateMedia(req, res) {
     const libraryItem = req.libraryItem
     const mediaPayload = req.body
 
+    if (mediaPayload.url) {
+      await LibraryItemController.prototype.uploadCover.bind(this)(req, res, false)
+      if (res.writableEnded || res.headersSent) return
+    }
+
     // Book specific
     if (libraryItem.isBook) {
       await this.createAuthorsAndSeriesForItemUpdate(mediaPayload, libraryItem.libraryId)
@@ -146,7 +155,7 @@ class LibraryItemController {
       seriesRemoved = libraryItem.media.metadata.series.filter(se => !seriesIdsInUpdate.includes(se.id))
     }
 
-    const hasUpdates = libraryItem.media.update(mediaPayload)
+    const hasUpdates = libraryItem.media.update(mediaPayload) || mediaPayload.url
     if (hasUpdates) {
       libraryItem.updatedAt = Date.now()
 
@@ -171,7 +180,7 @@ class LibraryItemController {
   }
 
   // POST: api/items/:id/cover
-  async uploadCover(req, res) {
+  async uploadCover(req, res, updateAndReturnJson = true) {
     if (!req.user.canUpload) {
       Logger.warn('User attempted to upload a cover without permission', req.user)
       return res.sendStatus(403)
@@ -196,12 +205,14 @@ class LibraryItemController {
       return res.status(500).send('Unknown error occurred')
     }
 
-    await Database.updateLibraryItem(libraryItem)
-    SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
-    res.json({
-      success: true,
-      cover: result.cover
-    })
+    if (updateAndReturnJson) {
+      await Database.updateLibraryItem(libraryItem)
+      SocketAuthority.emitter('item_updated', libraryItem.toJSONExpanded())
+      res.json({
+        success: true,
+        cover: result.cover
+      })
+    }
   }
 
   // PATCH: api/items/:id/cover
@@ -276,6 +287,9 @@ class LibraryItemController {
       return res.sendStatus(404)
     }
 
+    if (req.query.ts)
+      res.set('Cache-Control', 'private, max-age=86400')
+
     if (raw) { // any value
       if (global.XAccel) {
         const encodedURI = encodeUriPath(global.XAccel + libraryItem.media.coverPath)

server/controllers/MiscController.js

@@ -284,7 +284,7 @@ class MiscController {
     }
 
     res.json({
-      tags: tags
+      tags: tags.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
     })
   }
 
@@ -329,6 +329,7 @@ class MiscController {
         await libraryItem.media.update({
           tags: libraryItem.media.tags
         })
+        await libraryItem.saveMetadataFile()
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
         SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
         numItemsUpdated++
@@ -370,6 +371,7 @@ class MiscController {
       await libraryItem.media.update({
         tags: libraryItem.media.tags
       })
+      await libraryItem.saveMetadataFile()
       const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
       SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
       numItemsUpdated++
@@ -462,6 +464,7 @@ class MiscController {
         await libraryItem.media.update({
           genres: libraryItem.media.genres
         })
+        await libraryItem.saveMetadataFile()
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
         SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
         numItemsUpdated++
@@ -503,6 +506,7 @@ class MiscController {
       await libraryItem.media.update({
         genres: libraryItem.media.genres
       })
+      await libraryItem.saveMetadataFile()
       const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(libraryItem)
       SocketAuthority.emitter('item_updated', oldLibraryItem.toJSONExpanded())
       numItemsUpdated++

server/finders/BookFinder.js

@@ -152,12 +152,13 @@ class BookFinder {
   /**
    * 
    * @param {string} title 
-   * @param {string} author 
+   * @param {string} author
+   * @param {string} isbn 
    * @param {string} providerSlug 
    * @returns {Promise<Object[]>}
    */
-  async getCustomProviderResults(title, author, providerSlug) {
-    const books = await this.customProviderAdapter.search(title, author, providerSlug, 'book')
+  async getCustomProviderResults(title, author, isbn, providerSlug) {
+    const books = await this.customProviderAdapter.search(title, author, isbn, providerSlug, 'book')
     if (this.verbose) Logger.debug(`Custom provider '${providerSlug}' Search Results: ${books.length || 0}`)
 
     return books
@@ -333,7 +334,7 @@ class BookFinder {
 
     // Custom providers are assumed to be correct
     if (provider.startsWith('custom-')) {
-      return this.getCustomProviderResults(title, author, provider)
+      return this.getCustomProviderResults(title, author, isbn, provider)
     }
 
     if (!title)

server/managers/ApiCacheManager.js

@@ -22,6 +22,16 @@ class ApiCacheManager {
     this.cache.clear()
   }
 
+  /**
+   * Reset hooks and clear cache. Used when applying backups
+   */
+  reset() {
+    Logger.info(`[ApiCacheManager] Resetting cache`)
+
+    this.init()
+    this.cache.clear()
+  }
+
   get middleware() {
     return (req, res, next) => {
       const key = { user: req.user.username, url: req.url }

server/managers/BackupManager.js

@@ -146,23 +146,73 @@ class BackupManager {
     }
   }
 
-  async requestApplyBackup(backup, res) {
+  /**
+   * 
+   * @param {import('./ApiCacheManager')} apiCacheManager 
+   * @param {Backup} backup 
+   * @param {import('express').Response} res 
+   */
+  async requestApplyBackup(apiCacheManager, backup, res) {
+    Logger.info(`[BackupManager] Applying backup at "${backup.fullPath}"`)
+
     const zip = new StreamZip.async({ file: backup.fullPath })
 
     const entries = await zip.entries()
+
+    // Ensure backup has an absdatabase.sqlite file
     if (!Object.keys(entries).includes('absdatabase.sqlite')) {
       Logger.error(`[BackupManager] Cannot apply old backup ${backup.fullPath}`)
+      await zip.close()
       return res.status(500).send('Invalid backup file. Does not include absdatabase.sqlite. This might be from an older Audiobookshelf server.')
     }
 
     await Database.disconnect()
 
-    await zip.extract('absdatabase.sqlite', global.ConfigPath)
+    const dbPath = Path.join(global.ConfigPath, 'absdatabase.sqlite')
+    const tempDbPath = Path.join(global.ConfigPath, 'absdatabase-temp.sqlite')
+
+    // Extract backup sqlite file to temporary path
+    await zip.extract('absdatabase.sqlite', tempDbPath)
+    Logger.info(`[BackupManager] Extracted backup sqlite db to temp path ${tempDbPath}`)
+
+    // Verify extract - Abandon backup if sqlite file did not extract
+    if (!await fs.pathExists(tempDbPath)) {
+      Logger.error(`[BackupManager] Sqlite file not found after extract - abandon backup apply and reconnect db`)
+      await zip.close()
+      await Database.reconnect()
+      return res.status(500).send('Failed to extract sqlite db from backup')
+    }
+
+    // Attempt to remove existing db file
+    try {
+      await fs.remove(dbPath)
+    } catch (error) {
+      // Abandon backup and remove extracted sqlite file if unable to remove existing db file
+      Logger.error(`[BackupManager] Unable to overwrite existing db file - abandon backup apply and reconnect db`, error)
+      await fs.remove(tempDbPath)
+      await zip.close()
+      await Database.reconnect()
+      return res.status(500).send(`Failed to overwrite sqlite db: ${error?.message || 'Unknown Error'}`)
+    }
+
+    // Rename temp db
+    await fs.move(tempDbPath, dbPath)
+    Logger.info(`[BackupManager] Saved backup sqlite file at "${dbPath}"`)
+
+    // Extract /metadata/items and /metadata/authors folders
     await zip.extract('metadata-items/', this.ItemsMetadataPath)
     await zip.extract('metadata-authors/', this.AuthorsMetadataPath)
+    await zip.close()
 
+    // Reconnect db
     await Database.reconnect()
 
+    // Reset api cache, set hooks again
+    await apiCacheManager.reset()
+
+    res.sendStatus(200)
+
+    // Triggers browser refresh for all clients
     SocketAuthority.emitter('backup_applied')
   }
 

server/managers/BinaryManager.js

@@ -11,8 +11,8 @@ const fileUtils = require('../utils/fileUtils')
 class BinaryManager {
 
   defaultRequiredBinaries = [
-    { name: 'ffmpeg', envVariable: 'FFMPEG_PATH', validVersions: ['5.1', '6'] },
-    { name: 'ffprobe', envVariable: 'FFPROBE_PATH', validVersions: ['5.1', '6'] }
+    { name: 'ffmpeg', envVariable: 'FFMPEG_PATH', validVersions: ['5.1'] },
+    { name: 'ffprobe', envVariable: 'FFPROBE_PATH', validVersions: ['5.1'] }
   ]
 
   constructor(requiredBinaries = this.defaultRequiredBinaries) {
@@ -24,7 +24,14 @@ class BinaryManager {
   }
 
   async init() {
+    // Optional skip binaries check
+    if (process.env.SKIP_BINARIES_CHECK === '1') {
+      Logger.info('[BinaryManager] Skipping check for binaries')
+      return
+    }
+
     if (this.initialized) return
+
     const missingBinaries = await this.findRequiredBinaries()
     if (missingBinaries.length == 0) return
     await this.removeOldBinaries(missingBinaries)
@@ -135,7 +142,7 @@ class BinaryManager {
     if (!binaries.length) return
     Logger.info(`[BinaryManager] Installing binaries: ${binaries.join(', ')}`)
     let destination = await fileUtils.isWritable(this.mainInstallPath) ? this.mainInstallPath : this.altInstallPath
-    await ffbinaries.downloadBinaries(binaries, { destination, version: '6.1', force: true })
+    await ffbinaries.downloadBinaries(binaries, { destination, version: '5.1', force: true })
     Logger.info(`[BinaryManager] Binaries installed to ${destination}`)
   }
 

server/managers/PlaybackSessionManager.js

@@ -144,8 +144,13 @@ class PlaybackSessionManager {
       session.currentTime = sessionJson.currentTime
       session.timeListening = sessionJson.timeListening
       session.updatedAt = sessionJson.updatedAt
-      session.date = date.format(new Date(), 'YYYY-MM-DD')
-      session.dayOfWeek = date.format(new Date(), 'dddd')
+
+      let jsDate = new Date(sessionJson.updatedAt)
+      if (isNaN(jsDate)) {
+        jsDate = new Date()
+      }
+      session.date = date.format(jsDate, 'YYYY-MM-DD')
+      session.dayOfWeek = date.format(jsDate, 'dddd')
 
       Logger.debug(`[PlaybackSessionManager] Updated session for "${session.displayTitle}" (${session.id})`)
       await Database.updatePlaybackSession(session)

server/models/Book.js

@@ -7,7 +7,7 @@ const Logger = require('../Logger')
  * @property {string} ebookFormat
  * @property {number} addedAt
  * @property {number} updatedAt
- * @property {{filename:string, ext:string, path:string, relPath:string, size:number, mtimeMs:number, ctimeMs:number, birthtimeMs:number}} metadata
+ * @property {{filename:string, ext:string, path:string, relPath:strFing, size:number, mtimeMs:number, ctimeMs:number, birthtimeMs:number}} metadata
  */
 
 /**

server/models/Library.js

@@ -11,6 +11,7 @@ const oldLibrary = require('../objects/Library')
  * @property {string} autoScanCronExpression
  * @property {boolean} audiobooksOnly
  * @property {boolean} hideSingleBookSeries Do not show series that only have 1 book 
+ * @property {boolean} onlyShowLaterBooksInContinueSeries Skip showing books that are earlier than the max sequence read
  * @property {string[]} metadataPrecedence
  */
 

server/models/LibraryItem.js

@@ -1,8 +1,12 @@
-const { DataTypes, Model, WhereOptions } = require('sequelize')
+const Path = require('path')
+const { DataTypes, Model } = require('sequelize')
+const fsExtra = require('../libs/fsExtra')
 const Logger = require('../Logger')
 const oldLibraryItem = require('../objects/LibraryItem')
 const libraryFilters = require('../utils/queries/libraryFilters')
 const { areEquivalent } = require('../utils/index')
+const { filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
+const LibraryFile = require('../objects/files/LibraryFile')
 const Book = require('./Book')
 const Podcast = require('./Podcast')
 
@@ -116,7 +120,7 @@ class LibraryItem extends Model {
 
   /**
    * Currently unused because this is too slow and uses too much mem
-   * @param {[WhereOptions]} where
+   * @param {import('sequelize').WhereOptions} [where]
    * @returns {Array<objects.LibraryItem>} old library items
    */
   static async getAllOldLibraryItems(where = null) {
@@ -312,17 +316,18 @@ class LibraryItem extends Model {
         const existingAuthors = libraryItemExpanded.media.authors || []
         const existingSeriesAll = libraryItemExpanded.media.series || []
         const updatedAuthors = oldLibraryItem.media.metadata.authors || []
+        const uniqueUpdatedAuthors = updatedAuthors.filter((au, idx) => updatedAuthors.findIndex(a => a.id === au.id) === idx)
         const updatedSeriesAll = oldLibraryItem.media.metadata.series || []
 
         for (const existingAuthor of existingAuthors) {
           // Author was removed from Book
-          if (!updatedAuthors.some(au => au.id === existingAuthor.id)) {
+          if (!uniqueUpdatedAuthors.some(au => au.id === existingAuthor.id)) {
             Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" author "${existingAuthor.name}" was removed`)
             await this.sequelize.models.bookAuthor.removeByIds(existingAuthor.id, libraryItemExpanded.media.id)
             hasUpdates = true
           }
         }
-        for (const updatedAuthor of updatedAuthors) {
+        for (const updatedAuthor of uniqueUpdatedAuthors) {
           // Author was added
           if (!existingAuthors.some(au => au.id === updatedAuthor.id)) {
             Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" author "${updatedAuthor.name}" was added`)
@@ -378,6 +383,9 @@ class LibraryItem extends Model {
       if (!areEquivalent(updatedLibraryItem[key], existingValue, true)) {
         Logger.debug(`[LibraryItem] "${libraryItemExpanded.media.title}" ${key} updated from ${existingValue} to ${updatedLibraryItem[key]}`)
         hasLibraryItemUpdates = true
+        if (key === 'updatedAt') {
+          libraryItemExpanded.changed('updatedAt', true)
+        }
       }
     }
     if (hasLibraryItemUpdates) {
@@ -405,6 +413,7 @@ class LibraryItem extends Model {
       isInvalid: !!oldLibraryItem.isInvalid,
       mtime: oldLibraryItem.mtimeMs,
       ctime: oldLibraryItem.ctimeMs,
+      updatedAt: oldLibraryItem.updatedAt,
       birthtime: oldLibraryItem.birthtimeMs,
       size: oldLibraryItem.size,
       lastScan: oldLibraryItem.lastScan,
@@ -768,12 +777,14 @@ class LibraryItem extends Model {
 
   /**
    * 
-   * @param {WhereOptions} where 
+   * @param {import('sequelize').WhereOptions} where 
+   * @param {import('sequelize').BindOrReplacements} replacements
    * @returns {Object} oldLibraryItem
    */
-  static async findOneOld(where) {
+  static async findOneOld(where, replacements = {}) {
     const libraryItem = await this.findOne({
       where,
+      replacements,
       include: [
         {
           model: this.sequelize.models.book,
@@ -821,6 +832,147 @@ class LibraryItem extends Model {
     return this[mixinMethodName](options)
   }
 
+  /**
+   * 
+   * @returns {Promise<Book|Podcast>}
+   */
+  getMediaExpanded() {
+    if (this.mediaType === 'podcast') {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.podcastEpisode
+          }
+        ]
+      })
+    } else {
+      return this.getMedia({
+        include: [
+          {
+            model: this.sequelize.models.author,
+            through: {
+              attributes: []
+            }
+          },
+          {
+            model: this.sequelize.models.series,
+            through: {
+              attributes: ['sequence']
+            }
+          }
+        ],
+        order: [
+          [this.sequelize.models.author, this.sequelize.models.bookAuthor, 'createdAt', 'ASC'],
+          [this.sequelize.models.series, 'bookSeries', 'createdAt', 'ASC']
+        ]
+      })
+    }
+  }
+
+  /**
+   * 
+   * @returns {Promise}
+   */
+  async saveMetadataFile() {
+    let metadataPath = Path.join(global.MetadataPath, 'items', this.id)
+    let storeMetadataWithItem = global.ServerSettings.storeMetadataWithItem
+    if (storeMetadataWithItem && !this.isFile) {
+      metadataPath = this.path
+    } else {
+      // Make sure metadata book dir exists
+      storeMetadataWithItem = false
+      await fsExtra.ensureDir(metadataPath)
+    }
+
+    const metadataFilePath = Path.join(metadataPath, `metadata.${global.ServerSettings.metadataFileFormat}`)
+
+    // Expanded with series, authors, podcastEpisodes
+    const mediaExpanded = this.media || await this.getMediaExpanded()
+
+    let jsonObject = {}
+    if (this.mediaType === 'book') {
+      jsonObject = {
+        tags: mediaExpanded.tags || [],
+        chapters: mediaExpanded.chapters?.map(c => ({ ...c })) || [],
+        title: mediaExpanded.title,
+        subtitle: mediaExpanded.subtitle,
+        authors: mediaExpanded.authors.map(a => a.name),
+        narrators: mediaExpanded.narrators,
+        series: mediaExpanded.series.map(se => {
+          const sequence = se.bookSeries?.sequence || ''
+          if (!sequence) return se.name
+          return `${se.name} #${sequence}`
+        }),
+        genres: mediaExpanded.genres || [],
+        publishedYear: mediaExpanded.publishedYear,
+        publishedDate: mediaExpanded.publishedDate,
+        publisher: mediaExpanded.publisher,
+        description: mediaExpanded.description,
+        isbn: mediaExpanded.isbn,
+        asin: mediaExpanded.asin,
+        language: mediaExpanded.language,
+        explicit: !!mediaExpanded.explicit,
+        abridged: !!mediaExpanded.abridged
+      }
+    } else {
+      jsonObject = {
+        tags: mediaExpanded.tags || [],
+        title: mediaExpanded.title,
+        author: mediaExpanded.author,
+        description: mediaExpanded.description,
+        releaseDate: mediaExpanded.releaseDate,
+        genres: mediaExpanded.genres || [],
+        feedURL: mediaExpanded.feedURL,
+        imageURL: mediaExpanded.imageURL,
+        itunesPageURL: mediaExpanded.itunesPageURL,
+        itunesId: mediaExpanded.itunesId,
+        itunesArtistId: mediaExpanded.itunesArtistId,
+        asin: mediaExpanded.asin,
+        language: mediaExpanded.language,
+        explicit: !!mediaExpanded.explicit,
+        podcastType: mediaExpanded.podcastType
+      }
+    }
+
+
+    return fsExtra.writeFile(metadataFilePath, JSON.stringify(jsonObject, null, 2)).then(async () => {
+      // Add metadata.json to libraryFiles array if it is new
+      let metadataLibraryFile = this.libraryFiles.find(lf => lf.metadata.path === filePathToPOSIX(metadataFilePath))
+      if (storeMetadataWithItem) {
+        if (!metadataLibraryFile) {
+          const newLibraryFile = new LibraryFile()
+          await newLibraryFile.setDataFromPath(metadataFilePath, `metadata.json`)
+          metadataLibraryFile = newLibraryFile.toJSON()
+          this.libraryFiles.push(metadataLibraryFile)
+        } else {
+          const fileTimestamps = await getFileTimestampsWithIno(metadataFilePath)
+          if (fileTimestamps) {
+            metadataLibraryFile.metadata.mtimeMs = fileTimestamps.mtimeMs
+            metadataLibraryFile.metadata.ctimeMs = fileTimestamps.ctimeMs
+            metadataLibraryFile.metadata.size = fileTimestamps.size
+            metadataLibraryFile.ino = fileTimestamps.ino
+          }
+        }
+        const libraryItemDirTimestamps = await getFileTimestampsWithIno(this.path)
+        if (libraryItemDirTimestamps) {
+          this.mtime = libraryItemDirTimestamps.mtimeMs
+          this.ctime = libraryItemDirTimestamps.ctimeMs
+          let size = 0
+          this.libraryFiles.forEach((lf) => size += (!isNaN(lf.metadata.size) ? Number(lf.metadata.size) : 0))
+          this.size = size
+          await this.save()
+        }
+      }
+
+      Logger.debug(`Success saving abmetadata to "${metadataFilePath}"`)
+
+      return metadataLibraryFile
+    }).catch((error) => {
+      Logger.error(`Failed to save json file at "${metadataFilePath}"`, error)
+      return null
+    })
+  }
+
   /**
    * Initialize model
    * @param {import('../Database').sequelize} sequelize 

server/objects/Stream.js

@@ -195,7 +195,7 @@ class Stream extends EventEmitter {
       var current_chunk = []
       var last_seg_in_chunk = -1
 
-      var segments = Array.from(this.segmentsCreated).sort((a, b) => a - b);
+      var segments = Array.from(this.segmentsCreated).sort((a, b) => a - b)
       var lastSegment = segments[segments.length - 1]
       if (lastSegment > this.furthestSegmentCreated) {
         this.furthestSegmentCreated = lastSegment
@@ -254,8 +254,14 @@ class Stream extends EventEmitter {
     this.ffmpeg = Ffmpeg()
     this.furthestSegmentCreated = 0
 
-    var adjustedStartTime = Math.max(this.startTime - this.maxSeekBackTime, 0)
-    var trackStartTime = await writeConcatFile(this.tracks, this.concatFilesPath, adjustedStartTime)
+    const adjustedStartTime = Math.max(this.startTime - this.maxSeekBackTime, 0)
+    const trackStartTime = await writeConcatFile(this.tracks, this.concatFilesPath, adjustedStartTime)
+    if (trackStartTime == null) {
+      // Close stream show error
+      this.ffmpeg = null
+      this.close('Failed to write stream concat file')
+      return
+    }
 
     this.ffmpeg.addInput(this.concatFilesPath)
     // seek_timestamp : https://ffmpeg.org/ffmpeg.html
@@ -342,8 +348,9 @@ class Stream extends EventEmitter {
         Logger.error('Ffmpeg Err', '"' + err.message + '"')
 
         // Temporary workaround for https://github.com/advplyr/audiobookshelf/issues/172 and https://github.com/advplyr/audiobookshelf/issues/2157
-        const aacErrorMsg = 'ffmpeg exited with code 1:'
-        if (audioCodec === 'copy' && this.isAACEncodable && err.message?.startsWith(aacErrorMsg)) {
+        const aacErrorMsg = 'ffmpeg exited with code 1'
+        const errorMessageSuggestsReEncode = err.message?.startsWith(aacErrorMsg) && !err.message?.includes('No such file or directory')
+        if (audioCodec === 'copy' && this.isAACEncodable && errorMessageSuggestsReEncode) {
           Logger.info(`[Stream] Re-attempting stream with AAC encode`)
           this.transcodeOptions.forceAAC = true
           this.reset(this.startTime)

server/objects/files/AudioFile.js

@@ -32,7 +32,6 @@ class AudioFile {
     this.metaTags = null
 
     this.manuallyVerified = false
-    this.invalid = false
     this.exclude = false
     this.error = null
 
@@ -53,7 +52,6 @@ class AudioFile {
       trackNumFromFilename: this.trackNumFromFilename,
       discNumFromFilename: this.discNumFromFilename,
       manuallyVerified: !!this.manuallyVerified,
-      invalid: !!this.invalid,
       exclude: !!this.exclude,
       error: this.error || null,
       format: this.format,
@@ -78,7 +76,6 @@ class AudioFile {
     this.addedAt = data.addedAt
     this.updatedAt = data.updatedAt
     this.manuallyVerified = !!data.manuallyVerified
-    this.invalid = !!data.invalid
     this.exclude = !!data.exclude
     this.error = data.error || null
 
@@ -112,10 +109,6 @@ class AudioFile {
     }
   }
 
-  get isValidTrack() {
-    return !this.invalid && !this.exclude
-  }
-
   // New scanner creates AudioFile from AudioFileScanner
   setDataFromProbe(libraryFile, probeData) {
     this.ino = libraryFile.ino || null

server/objects/mediaTypes/Book.js

@@ -17,7 +17,6 @@ class Book {
 
     this.audioFiles = []
     this.chapters = []
-    this.missingParts = []
     this.ebookFile = null
 
     this.lastCoverSearch = null
@@ -36,7 +35,6 @@ class Book {
     this.tags = [...book.tags]
     this.audioFiles = book.audioFiles.map(f => new AudioFile(f))
     this.chapters = book.chapters.map(c => ({ ...c }))
-    this.missingParts = book.missingParts ? [...book.missingParts] : []
     this.ebookFile = book.ebookFile ? new EBookFile(book.ebookFile) : null
     this.lastCoverSearch = book.lastCoverSearch || null
     this.lastCoverSearchQuery = book.lastCoverSearchQuery || null
@@ -51,7 +49,6 @@ class Book {
       tags: [...this.tags],
       audioFiles: this.audioFiles.map(f => f.toJSON()),
       chapters: this.chapters.map(c => ({ ...c })),
-      missingParts: [...this.missingParts],
       ebookFile: this.ebookFile ? this.ebookFile.toJSON() : null
     }
   }
@@ -65,8 +62,6 @@ class Book {
       numTracks: this.tracks.length,
       numAudioFiles: this.audioFiles.length,
       numChapters: this.chapters.length,
-      numMissingParts: this.missingParts.length,
-      numInvalidAudioFiles: this.invalidAudioFiles.length,
       duration: this.duration,
       size: this.size,
       ebookFormat: this.ebookFile?.ebookFormat
@@ -85,7 +80,6 @@ class Book {
       duration: this.duration,
       size: this.size,
       tracks: this.tracks.map(t => t.toJSON()),
-      missingParts: [...this.missingParts],
       ebookFile: this.ebookFile?.toJSON() || null
     }
   }
@@ -109,11 +103,8 @@ class Book {
   get hasMediaEntities() {
     return !!this.tracks.length || this.ebookFile
   }
-  get invalidAudioFiles() {
-    return this.audioFiles.filter(af => af.invalid)
-  }
   get includedAudioFiles() {
-    return this.audioFiles.filter(af => !af.exclude && !af.invalid)
+    return this.audioFiles.filter(af => !af.exclude)
   }
   get tracks() {
     let startOffset = 0
@@ -238,7 +229,6 @@ class Book {
     this.audioFiles = orderedFileData.map((fileData) => {
       const audioFile = this.audioFiles.find(af => af.ino === fileData.ino)
       audioFile.manuallyVerified = true
-      audioFile.invalid = false
       audioFile.error = null
       if (fileData.exclude !== undefined) {
         audioFile.exclude = !!fileData.exclude
@@ -257,7 +247,6 @@ class Book {
   rebuildTracks() {
     Logger.debug(`[Book] Tracks being rebuilt...!`)
     this.audioFiles.sort((a, b) => a.index - b.index)
-    this.missingParts = []
   }
 
   // Only checks container format

server/objects/mediaTypes/Podcast.js

@@ -42,7 +42,13 @@ class Podcast {
     this.autoDownloadSchedule = podcast.autoDownloadSchedule || '0 * * * *' // Added in 2.1.3 so default to hourly
     this.lastEpisodeCheck = podcast.lastEpisodeCheck || 0
     this.maxEpisodesToKeep = podcast.maxEpisodesToKeep || 0
-    this.maxNewEpisodesToDownload = podcast.maxNewEpisodesToDownload || 3
+
+    // Default is 3 but 0 is allowed
+    if (typeof podcast.maxNewEpisodesToDownload !== 'number') {
+      this.maxNewEpisodesToDownload = 3
+    } else {
+      this.maxNewEpisodesToDownload = podcast.maxNewEpisodesToDownload
+    }
   }
 
   toJSON() {

server/objects/settings/EmailSettings.js

@@ -105,6 +105,10 @@ class EmailSettings {
       host: this.host,
       secure: this.secure
     }
+    // Only set to true for port 465 (https://nodemailer.com/smtp/#tls-options)
+    if (this.port !== 465) {
+      payload.secure = false
+    }
     if (this.port) payload.port = this.port
     if (this.user && this.pass !== undefined) {
       payload.auth = {

server/objects/settings/LibrarySettings.js

@@ -8,7 +8,8 @@ class LibrarySettings {
     this.skipMatchingMediaWithIsbn = false
     this.autoScanCronExpression = null
     this.audiobooksOnly = false
-    this.hideSingleBookSeries = false // Do not show series that only have 1 book 
+    this.hideSingleBookSeries = false // Do not show series that only have 1 book
+    this.onlyShowLaterBooksInContinueSeries = false // Skip showing books that are earlier than the max sequence read
     this.metadataPrecedence = ['folderStructure', 'audioMetatags', 'nfoFile', 'txtFiles', 'opfFile', 'absMetadata']
     this.podcastSearchRegion = 'us'
 
@@ -25,6 +26,7 @@ class LibrarySettings {
     this.autoScanCronExpression = settings.autoScanCronExpression || null
     this.audiobooksOnly = !!settings.audiobooksOnly
     this.hideSingleBookSeries = !!settings.hideSingleBookSeries
+    this.onlyShowLaterBooksInContinueSeries = !!settings.onlyShowLaterBooksInContinueSeries
     if (settings.metadataPrecedence) {
       this.metadataPrecedence = [...settings.metadataPrecedence]
     } else {
@@ -43,6 +45,7 @@ class LibrarySettings {
       autoScanCronExpression: this.autoScanCronExpression,
       audiobooksOnly: this.audiobooksOnly,
       hideSingleBookSeries: this.hideSingleBookSeries,
+      onlyShowLaterBooksInContinueSeries: this.onlyShowLaterBooksInContinueSeries,
       metadataPrecedence: [...this.metadataPrecedence],
       podcastSearchRegion: this.podcastSearchRegion
     }

server/objects/settings/ServerSettings.js

@@ -1,6 +1,7 @@
 const packageJson = require('../../../package.json')
 const { BookshelfView } = require('../../utils/constants')
 const Logger = require('../../Logger')
+const User = require('../user/User')
 
 class ServerSettings {
   constructor(settings) {
@@ -67,11 +68,14 @@ class ServerSettings {
     this.authOpenIDLogoutURL = null
     this.authOpenIDClientID = null
     this.authOpenIDClientSecret = null
+    this.authOpenIDTokenSigningAlgorithm = 'RS256'
     this.authOpenIDButtonText = 'Login with OpenId'
     this.authOpenIDAutoLaunch = false
     this.authOpenIDAutoRegister = false
     this.authOpenIDMatchExistingBy = null
     this.authOpenIDMobileRedirectURIs = ['audiobookshelf://oauth']
+    this.authOpenIDGroupClaim = ''
+    this.authOpenIDAdvancedPermsClaim = ''
 
     if (settings) {
       this.construct(settings)
@@ -124,11 +128,14 @@ class ServerSettings {
     this.authOpenIDLogoutURL = settings.authOpenIDLogoutURL || null
     this.authOpenIDClientID = settings.authOpenIDClientID || null
     this.authOpenIDClientSecret = settings.authOpenIDClientSecret || null
+    this.authOpenIDTokenSigningAlgorithm = settings.authOpenIDTokenSigningAlgorithm || 'RS256'
     this.authOpenIDButtonText = settings.authOpenIDButtonText || 'Login with OpenId'
     this.authOpenIDAutoLaunch = !!settings.authOpenIDAutoLaunch
     this.authOpenIDAutoRegister = !!settings.authOpenIDAutoRegister
     this.authOpenIDMatchExistingBy = settings.authOpenIDMatchExistingBy || null
     this.authOpenIDMobileRedirectURIs = settings.authOpenIDMobileRedirectURIs || ['audiobookshelf://oauth']
+    this.authOpenIDGroupClaim = settings.authOpenIDGroupClaim || ''
+    this.authOpenIDAdvancedPermsClaim = settings.authOpenIDAdvancedPermsClaim || ''
 
     if (!Array.isArray(this.authActiveAuthMethods)) {
       this.authActiveAuthMethods = ['local']
@@ -212,11 +219,14 @@ class ServerSettings {
       authOpenIDLogoutURL: this.authOpenIDLogoutURL,
       authOpenIDClientID: this.authOpenIDClientID, // Do not return to client
       authOpenIDClientSecret: this.authOpenIDClientSecret, // Do not return to client
+      authOpenIDTokenSigningAlgorithm: this.authOpenIDTokenSigningAlgorithm,
       authOpenIDButtonText: this.authOpenIDButtonText,
       authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
       authOpenIDAutoRegister: this.authOpenIDAutoRegister,
       authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy,
-      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs // Do not return to client
+      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs, // Do not return to client
+      authOpenIDGroupClaim: this.authOpenIDGroupClaim, // Do not return to client
+      authOpenIDAdvancedPermsClaim: this.authOpenIDAdvancedPermsClaim // Do not return to client
     }
   }
 
@@ -226,6 +236,8 @@ class ServerSettings {
     delete json.authOpenIDClientID
     delete json.authOpenIDClientSecret
     delete json.authOpenIDMobileRedirectURIs
+    delete json.authOpenIDGroupClaim
+    delete json.authOpenIDAdvancedPermsClaim
     return json
   }
 
@@ -243,7 +255,8 @@ class ServerSettings {
       this.authOpenIDUserInfoURL &&
       this.authOpenIDJwksURL &&
       this.authOpenIDClientID &&
-      this.authOpenIDClientSecret
+      this.authOpenIDClientSecret &&
+      this.authOpenIDTokenSigningAlgorithm
   }
 
   get authenticationSettings() {
@@ -258,11 +271,16 @@ class ServerSettings {
       authOpenIDLogoutURL: this.authOpenIDLogoutURL,
       authOpenIDClientID: this.authOpenIDClientID, // Do not return to client
       authOpenIDClientSecret: this.authOpenIDClientSecret, // Do not return to client
+      authOpenIDTokenSigningAlgorithm: this.authOpenIDTokenSigningAlgorithm,
       authOpenIDButtonText: this.authOpenIDButtonText,
       authOpenIDAutoLaunch: this.authOpenIDAutoLaunch,
       authOpenIDAutoRegister: this.authOpenIDAutoRegister,
       authOpenIDMatchExistingBy: this.authOpenIDMatchExistingBy,
-      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs // Do not return to client
+      authOpenIDMobileRedirectURIs: this.authOpenIDMobileRedirectURIs, // Do not return to client
+      authOpenIDGroupClaim: this.authOpenIDGroupClaim, // Do not return to client
+      authOpenIDAdvancedPermsClaim: this.authOpenIDAdvancedPermsClaim, // Do not return to client
+
+      authOpenIDSamplePermissions: User.getSampleAbsPermissions()
     }
   }
 

server/objects/user/User.js

@@ -268,6 +268,111 @@ class User {
     return hasUpdates
   }
 
+  // List of expected permission properties from the client
+  static permissionMapping = {
+    canDownload: 'download',
+    canUpload: 'upload',
+    canDelete: 'delete',
+    canUpdate: 'update',
+    canAccessExplicitContent: 'accessExplicitContent',
+    canAccessAllLibraries: 'accessAllLibraries',
+    canAccessAllTags: 'accessAllTags',
+    tagsAreDenylist: 'selectedTagsNotAccessible',
+    // Direct mapping for array-based permissions
+    allowedLibraries: 'librariesAccessible',
+    allowedTags: 'itemTagsSelected'
+  }
+
+  /**
+   * Update user permissions from external JSON
+   * 
+   * @param {Object} absPermissions JSON containing user permissions
+   * @returns {boolean} true if updates were made
+   */
+  updatePermissionsFromExternalJSON(absPermissions) {
+    let hasUpdates = false
+    let updatedUserPermissions = {}
+
+    // Initialize all permissions to false first
+    Object.keys(User.permissionMapping).forEach(mappingKey => {
+      const userPermKey = User.permissionMapping[mappingKey]
+      if (typeof this.permissions[userPermKey] === 'boolean') {
+        updatedUserPermissions[userPermKey] = false // Default to false for boolean permissions
+      }
+    })
+
+    // Map the boolean permissions from absPermissions
+    Object.keys(absPermissions).forEach(absKey => {
+      const userPermKey = User.permissionMapping[absKey]
+      if (!userPermKey) {
+        throw new Error(`Unexpected permission property: ${absKey}`)
+      }
+
+      if (updatedUserPermissions[userPermKey] !== undefined) {
+        updatedUserPermissions[userPermKey] = !!absPermissions[absKey]
+      }
+    })
+
+    // Update user permissions if changes were made
+    if (JSON.stringify(this.permissions) !== JSON.stringify(updatedUserPermissions)) {
+      this.permissions = updatedUserPermissions
+      hasUpdates = true
+    }
+
+    // Handle allowedLibraries
+    if (this.permissions.accessAllLibraries) {
+      if (this.librariesAccessible.length) {
+        this.librariesAccessible = []
+        hasUpdates = true
+      }
+    } else if (absPermissions.allowedLibraries?.length && absPermissions.allowedLibraries.join(',') !== this.librariesAccessible.join(',')) {
+      if (absPermissions.allowedLibraries.some(lid => typeof lid !== 'string')) {
+        throw new Error('Invalid permission property "allowedLibraries", expecting array of strings')
+      }
+      this.librariesAccessible = absPermissions.allowedLibraries
+      hasUpdates = true
+    }
+
+    // Handle allowedTags
+    if (this.permissions.accessAllTags) {
+      if (this.itemTagsSelected.length) {
+        this.itemTagsSelected = []
+        hasUpdates = true
+      }
+    } else if (absPermissions.allowedTags?.length && absPermissions.allowedTags.join(',') !== this.itemTagsSelected.join(',')) {
+      if (absPermissions.allowedTags.some(tag => typeof tag !== 'string')) {
+        throw new Error('Invalid permission property "allowedTags", expecting array of strings')
+      }
+      this.itemTagsSelected = absPermissions.allowedTags
+      hasUpdates = true
+    }
+
+    return hasUpdates
+  }
+
+
+  /**
+   * Get a sample to show how a JSON for updatePermissionsFromExternalJSON should look like 
+   * 
+   * @returns {string} JSON string
+   */
+  static getSampleAbsPermissions() {
+    // Start with a template object where all permissions are false for simplicity
+    const samplePermissions = Object.keys(User.permissionMapping).reduce((acc, key) => {
+      // For array-based permissions, provide a sample array
+      if (key === 'allowedLibraries') {
+        acc[key] = [`5406ba8a-16e1-451d-96d7-4931b0a0d966`, `918fd848-7c1d-4a02-818a-847435a879ca`]
+      } else if (key === 'allowedTags') {
+        acc[key] = [`ExampleTag`, `AnotherTag`, `ThirdTag`]
+      } else {
+        acc[key] = false
+      }
+      return acc
+    }, {})
+
+    return JSON.stringify(samplePermissions, null, 2) // Pretty print the JSON
+  }
+
   /**
    * Get first available library id for user
    * 

server/providers/Audible.js

@@ -29,10 +29,9 @@ class Audible {
      */
     cleanSeriesSequence(seriesName, sequence) {
         if (!sequence) return ''
-        let updatedSequence = sequence.replace(/Book /, '').trim()
-        if (updatedSequence.includes(' ')) {
-            updatedSequence = updatedSequence.split(' ').shift().replace(/,$/, '')
-        }
+        // match any number with optional decimal (e.g, 1 or 1.5 or .5)
+        let numberFound = sequence.match(/\.\d+|\d+(?:\.\d+)?/)
+        let updatedSequence = numberFound ? numberFound[0] : sequence
         if (sequence !== updatedSequence) {
             Logger.debug(`[Audible] Series "${seriesName}" sequence was cleaned from "${sequence}" to "${updatedSequence}"`)
         }
@@ -80,12 +79,19 @@ class Audible {
         }
     }
 
+    /**
+     * Test if a search title matches an ASIN. Supports lowercase letters
+     * 
+     * @param {string} title 
+     * @returns {boolean}
+     */
     isProbablyAsin(title) {
-        return /^[0-9A-Z]{10}$/.test(title)
+        return /^[0-9A-Za-z]{10}$/.test(title)
     }
 
     asinSearch(asin, region) {
-        asin = encodeURIComponent(asin)
+        if (!asin) return []
+        asin = encodeURIComponent(asin.toUpperCase())
         var regionQuery = region ? `?region=${region}` : ''
         var url = `https://api.audnex.us/books/${asin}${regionQuery}`
         Logger.debug(`[Audible] ASIN url: ${url}`)
@@ -125,7 +131,7 @@ class Audible {
             const url = `https://api.audible${tld}/1.0/catalog/products?${queryString}`
             Logger.debug(`[Audible] Search url: ${url}`)
             items = await axios.get(url).then((res) => {
-                if (!res || !res.data || !res.data.products) return null
+                if (!res?.data?.products) return null
                 return Promise.all(res.data.products.map(result => this.asinSearch(result.asin, region)))
             }).catch(error => {
                 Logger.error('[Audible] query search error', error)

server/providers/CustomProviderAdapter.js

@@ -9,11 +9,12 @@ class CustomProviderAdapter {
      * 
      * @param {string} title 
      * @param {string} author 
+     * @param {string} isbn 
      * @param {string} providerSlug 
      * @param {string} mediaType
      * @returns {Promise<Object[]>}
      */
-    async search(title, author, providerSlug, mediaType) {
+    async search(title, author, isbn, providerSlug, mediaType) {
         const providerId = providerSlug.split('custom-')[1]
         const provider = await Database.customMetadataProviderModel.findByPk(providerId)
 
@@ -29,6 +30,9 @@ class CustomProviderAdapter {
         if (author) {
             queryObj.author = author
         }
+        if (isbn) {
+            queryObj.isbn = isbn
+        }
         const queryString = (new URLSearchParams(queryObj)).toString()
 
         // Setup headers
@@ -39,7 +43,7 @@ class CustomProviderAdapter {
             }
         }
 
-        const matches = await axios.get(`${provider.url}/search?${queryString}}`, axiosOptions).then((res) => {
+        const matches = await axios.get(`${provider.url}/search?${queryString}`, axiosOptions).then((res) => {
             if (!res?.data || !Array.isArray(res.data.matches)) return null
             return res.data.matches
         }).catch(error => {

server/routers/ApiRouter.js

@@ -534,6 +534,7 @@ class ApiRouter {
           const authorName = (mediaMetadata.authors[i].name || '').trim()
           if (!authorName) {
             Logger.error(`[ApiRouter] Invalid author object, no name`, mediaMetadata.authors[i])
+            mediaMetadata.authors[i].id = null
             continue
           }
 
@@ -562,6 +563,8 @@ class ApiRouter {
             mediaMetadata.authors[i].id = author.id
           }
         }
+        // Remove authors without an id
+        mediaMetadata.authors = mediaMetadata.authors.filter(au => !!au.id)
         if (newAuthors.length) {
           await Database.createBulkAuthors(newAuthors)
           SocketAuthority.emitter('authors_added', newAuthors.map(au => au.toJSON()))
@@ -575,6 +578,7 @@ class ApiRouter {
           const seriesName = (mediaMetadata.series[i].name || '').trim()
           if (!seriesName) {
             Logger.error(`[ApiRouter] Invalid series object, no name`, mediaMetadata.series[i])
+            mediaMetadata.series[i].id = null
             continue
           }
 
@@ -603,6 +607,8 @@ class ApiRouter {
             mediaMetadata.series[i].id = seriesItem.id
           }
         }
+        // Remove series without an id
+        mediaMetadata.series = mediaMetadata.series.filter(se => se.id)
         if (newSeries.length) {
           await Database.createBulkSeries(newSeries)
           SocketAuthority.emitter('multiple_series_added', newSeries.map(se => se.toJSON()))

server/scanner/AudioFileScanner.js

@@ -378,7 +378,7 @@ class AudioFileScanner {
     const MetadataMapArray = [
       {
         tag: 'tagComment',
-        altTag: 'tagSubtitle',
+        altTag: 'tagDescription',
         key: 'description'
       },
       {

server/scanner/BookScanner.js

@@ -20,6 +20,7 @@ const LibraryScan = require("./LibraryScan")
 const OpfFileScanner = require('./OpfFileScanner')
 const NfoFileScanner = require('./NfoFileScanner')
 const AbsMetadataFileScanner = require('./AbsMetadataFileScanner')
+const EBookFile = require("../objects/files/EBookFile")
 
 /**
  * Metadata for books pulled from files
@@ -84,7 +85,7 @@ class BookScanner {
 
       // Update audio files that were modified
       if (libraryItemData.audioLibraryFilesModified.length) {
-        let scannedAudioFiles = await AudioFileScanner.executeMediaFileScans(existingLibraryItem.mediaType, libraryItemData, libraryItemData.audioLibraryFilesModified)
+        let scannedAudioFiles = await AudioFileScanner.executeMediaFileScans(existingLibraryItem.mediaType, libraryItemData, libraryItemData.audioLibraryFilesModified.map(lf => lf.new))
         media.audioFiles = media.audioFiles.map((audioFileObj) => {
           let matchedScannedAudioFile = scannedAudioFiles.find(saf => saf.metadata.path === audioFileObj.metadata.path)
           if (!matchedScannedAudioFile) {
@@ -138,11 +139,25 @@ class BookScanner {
     }
 
     // Check if cover was removed
-    if (media.coverPath && !libraryItemData.imageLibraryFiles.some(lf => lf.metadata.path === media.coverPath) && !(await fsExtra.pathExists(media.coverPath))) {
+    if (media.coverPath && libraryItemData.imageLibraryFilesRemoved.some(lf => lf.metadata.path === media.coverPath) && !(await fsExtra.pathExists(media.coverPath))) {
       media.coverPath = null
       hasMediaChanges = true
     }
 
+    // Update cover if it was modified
+    if (media.coverPath && libraryItemData.imageLibraryFilesModified.length) {
+      let coverMatch = libraryItemData.imageLibraryFilesModified.find(iFile => iFile.old.metadata.path === media.coverPath)
+      if (coverMatch) {
+        const coverPath = coverMatch.new.metadata.path
+        if (coverPath !== media.coverPath) {
+          libraryScan.addLog(LogLevel.DEBUG, `Updating book cover "${media.coverPath}" => "${coverPath}" for book "${media.title}"`)
+          media.coverPath = coverPath
+          media.changed('coverPath', true)
+          hasMediaChanges = true
+        }
+      }
+    }
+
     // Check if cover is not set and image files were found
     if (!media.coverPath && libraryItemData.imageLibraryFiles.length) {
       // Prefer using a cover image with the name "cover" otherwise use the first image
@@ -157,6 +172,19 @@ class BookScanner {
       hasMediaChanges = true
     }
 
+    // Update ebook if it was modified
+    if (media.ebookFile && libraryItemData.ebookLibraryFilesModified.length) {
+      let ebookMatch = libraryItemData.ebookLibraryFilesModified.find(eFile => eFile.old.metadata.path === media.ebookFile.metadata.path)
+      if (ebookMatch) {
+        const ebookFile = new EBookFile(ebookMatch.new)
+        ebookFile.ebookFormat = ebookFile.metadata.ext.slice(1).toLowerCase()
+        libraryScan.addLog(LogLevel.DEBUG, `Updating book ebook file "${media.ebookFile.metadata.path}" => "${ebookFile.metadata.path}" for book "${media.title}"`)
+        media.ebookFile = ebookFile.toJSON()
+        media.changed('ebookFile', true)
+        hasMediaChanges = true
+      }
+    }
+
     // Check if ebook is not set and ebooks were found
     if (!media.ebookFile && !librarySettings.audiobooksOnly && libraryItemData.ebookLibraryFiles.length) {
       // Prefer to use an epub ebook then fallback to the first ebook found
@@ -186,11 +214,11 @@ class BookScanner {
         // Check for authors added
         for (const authorName of bookMetadata.authors) {
           if (!media.authors.some(au => au.name === authorName)) {
-            const existingAuthor = Database.libraryFilterData[libraryItemData.libraryId].authors.find(au => au.name === authorName)
-            if (existingAuthor) {
+            const existingAuthorId = await Database.getAuthorIdByName(libraryItemData.libraryId, authorName)
+            if (existingAuthorId) {
               await Database.bookAuthorModel.create({
                 bookId: media.id,
-                authorId: existingAuthor.id
+                authorId: existingAuthorId
               })
               libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" added author "${authorName}"`)
               authorsUpdated = true
@@ -221,11 +249,11 @@ class BookScanner {
         for (const seriesObj of bookMetadata.series) {
           const existingBookSeries = media.series.find(se => se.name === seriesObj.name)
           if (!existingBookSeries) {
-            const existingSeries = Database.libraryFilterData[libraryItemData.libraryId].series.find(se => se.name === seriesObj.name)
-            if (existingSeries) {
+            const existingSeriesId = await Database.getSeriesIdByName(libraryItemData.libraryId, seriesObj.name)
+            if (existingSeriesId) {
               await Database.bookSeriesModel.create({
                 bookId: media.id,
-                seriesId: existingSeries.id,
+                seriesId: existingSeriesId,
                 sequence: seriesObj.sequence
               })
               libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" added series "${seriesObj.name}"${seriesObj.sequence ? ` with sequence "${seriesObj.sequence}"` : ''}`)
@@ -443,10 +471,10 @@ class BookScanner {
     }
     if (bookMetadata.authors.length) {
       for (const authorName of bookMetadata.authors) {
-        const matchingAuthor = Database.libraryFilterData[libraryItemData.libraryId].authors.find(au => au.name === authorName)
-        if (matchingAuthor) {
+        const matchingAuthorId = await Database.getAuthorIdByName(libraryItemData.libraryId, authorName)
+        if (matchingAuthorId) {
           bookObject.bookAuthors.push({
-            authorId: matchingAuthor.id
+            authorId: matchingAuthorId
           })
         } else {
           // New author
@@ -463,10 +491,10 @@ class BookScanner {
     if (bookMetadata.series.length) {
       for (const seriesObj of bookMetadata.series) {
         if (!seriesObj.name) continue
-        const matchingSeries = Database.libraryFilterData[libraryItemData.libraryId].series.find(se => se.name === seriesObj.name)
-        if (matchingSeries) {
+        const matchingSeriesId = await Database.getSeriesIdByName(libraryItemData.libraryId, seriesObj.name)
+        if (matchingSeriesId) {
           bookObject.bookSeries.push({
-            seriesId: matchingSeries.id,
+            seriesId: matchingSeriesId,
             sequence: seriesObj.sequence
           })
         } else {

server/scanner/LibraryItemScanData.js

@@ -4,6 +4,12 @@ const LibraryItem = require('../models/LibraryItem')
 const globals = require('../utils/globals')
 
 class LibraryItemScanData {
+  /**
+   * @typedef LibraryFileModifiedObject
+   * @property {LibraryItem.LibraryFileObject} old
+   * @property {LibraryItem.LibraryFileObject} new
+   */
+
   constructor(data) {
     /** @type {string} */
     this.libraryFolderId = data.libraryFolderId
@@ -39,7 +45,7 @@ class LibraryItemScanData {
     this.libraryFilesRemoved = []
     /** @type {LibraryItem.LibraryFileObject[]} */
     this.libraryFilesAdded = []
-    /** @type {LibraryItem.LibraryFileObject[]} */
+    /** @type {LibraryFileModifiedObject[]} */
     this.libraryFilesModified = []
   }
 
@@ -77,9 +83,9 @@ class LibraryItemScanData {
     return (this.audioLibraryFilesRemoved.length + this.audioLibraryFilesAdded.length + this.audioLibraryFilesModified.length) > 0
   }
 
-  /** @type {LibraryItem.LibraryFileObject[]} */
+  /** @type {LibraryFileModifiedObject[]} */
   get audioLibraryFilesModified() {
-    return this.libraryFilesModified.filter(lf => globals.SupportedAudioTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
+    return this.libraryFilesModified.filter(lf => globals.SupportedAudioTypes.includes(lf.old.metadata.ext?.slice(1).toLowerCase() || ''))
   }
 
   /** @type {LibraryItem.LibraryFileObject[]} */
@@ -97,12 +103,42 @@ class LibraryItemScanData {
     return this.libraryFiles.filter(lf => globals.SupportedAudioTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
   }
 
+  /** @type {LibraryFileModifiedObject[]} */
+  get imageLibraryFilesModified() {
+    return this.libraryFilesModified.filter(lf => globals.SupportedImageTypes.includes(lf.old.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
+  /** @type {LibraryItem.LibraryFileObject[]} */
+  get imageLibraryFilesRemoved() {
+    return this.libraryFilesRemoved.filter(lf => globals.SupportedImageTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
+  /** @type {LibraryItem.LibraryFileObject[]} */
+  get imageLibraryFilesAdded() {
+    return this.libraryFilesAdded.filter(lf => globals.SupportedImageTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
   /** @type {LibraryItem.LibraryFileObject[]} */
   get imageLibraryFiles() {
     return this.libraryFiles.filter(lf => globals.SupportedImageTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
   }
 
-  /** @type {import('../objects/files/LibraryFile')[]} */
+  /** @type {LibraryFileModifiedObject[]} */
+  get ebookLibraryFilesModified() {
+    return this.libraryFilesModified.filter(lf => globals.SupportedEbookTypes.includes(lf.old.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
+  /** @type {LibraryItem.LibraryFileObject[]} */
+  get ebookLibraryFilesRemoved() {
+    return this.libraryFilesRemoved.filter(lf => globals.SupportedEbookTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
+  /** @type {LibraryItem.LibraryFileObject[]} */
+  get ebookLibraryFilesAdded() {
+    return this.libraryFilesAdded.filter(lf => globals.SupportedEbookTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
+  }
+
+  /** @type {LibraryItem.LibraryFileObject[]} */
   get ebookLibraryFiles() {
     return this.libraryFiles.filter(lf => globals.SupportedEbookTypes.includes(lf.metadata.ext?.slice(1).toLowerCase() || ''))
   }
@@ -153,7 +189,7 @@ class LibraryItemScanData {
         existingLibraryItem[key] = this[key]
         this.hasChanges = true
 
-        if (key === 'relPath') {
+        if (key === 'relPath' || key === 'path') {
           this.hasPathChange = true
         }
       }
@@ -202,8 +238,9 @@ class LibraryItemScanData {
         this.hasChanges = true
       } else {
         libraryFilesAdded = libraryFilesAdded.filter(lf => lf !== matchingLibraryFile)
+        let existingLibraryFileBefore = structuredClone(existingLibraryFile)
         if (this.compareUpdateLibraryFile(existingLibraryItem.path, existingLibraryFile, matchingLibraryFile, libraryScan)) {
-          this.libraryFilesModified.push(existingLibraryFile)
+          this.libraryFilesModified.push({old: existingLibraryFileBefore, new: existingLibraryFile})
           this.hasChanges = true
         }
       }

server/scanner/LibraryItemScanner.js

@@ -21,10 +21,10 @@ class LibraryItemScanner {
    * Scan single library item
    * 
    * @param {string} libraryItemId 
-   * @param {{relPath:string, path:string}} [renamedPaths] used by watcher when item folder was renamed
+   * @param {{relPath:string, path:string}} [updateLibraryItemDetails] used by watcher when item folder was renamed
    * @returns {number} ScanResult
    */
-  async scanLibraryItem(libraryItemId, renamedPaths = null) {
+  async scanLibraryItem(libraryItemId, updateLibraryItemDetails = null) {
     // TODO: Add task manager
     const libraryItem = await Database.libraryItemModel.findByPk(libraryItemId)
     if (!libraryItem) {
@@ -32,11 +32,12 @@ class LibraryItemScanner {
       return ScanResult.NOTHING
     }
 
+    const libraryFolderId = updateLibraryItemDetails?.libraryFolderId || libraryItem.libraryFolderId
     const library = await Database.libraryModel.findByPk(libraryItem.libraryId, {
       include: {
         model: Database.libraryFolderModel,
         where: {
-          id: libraryItem.libraryFolderId
+          id: libraryFolderId
         }
       }
     })
@@ -51,11 +52,11 @@ class LibraryItemScanner {
 
     const scanLogger = new ScanLogger()
     scanLogger.verbose = true
-    scanLogger.setData('libraryItem', renamedPaths?.relPath || libraryItem.relPath)
+    scanLogger.setData('libraryItem', updateLibraryItemDetails?.relPath || libraryItem.relPath)
 
-    const libraryItemPath = renamedPaths?.path || fileUtils.filePathToPOSIX(libraryItem.path)
+    const libraryItemPath = updateLibraryItemDetails?.path || fileUtils.filePathToPOSIX(libraryItem.path)
     const folder = library.libraryFolders[0]
-    const libraryItemScanData = await this.getLibraryItemScanData(libraryItemPath, library, folder, false)
+    const libraryItemScanData = await this.getLibraryItemScanData(libraryItemPath, library, folder, updateLibraryItemDetails?.isFile || false)
 
     let libraryItemDataUpdated = await libraryItemScanData.checkLibraryItemData(libraryItem, scanLogger)
 

server/scanner/LibraryScanner.js

@@ -154,7 +154,11 @@ class LibraryScanner {
       let libraryItemData = libraryItemDataFound.find(lid => lid.path === existingLibraryItem.path)
       if (!libraryItemData) {
         // Fallback to finding matching library item with matching inode value
-        libraryItemData = libraryItemDataFound.find(lid => lid.ino === existingLibraryItem.ino)
+        libraryItemData = libraryItemDataFound.find(lid =>
+          ItemToItemInoMatch(lid, existingLibraryItem) ||
+          ItemToFileInoMatch(lid, existingLibraryItem) ||
+          ItemToFileInoMatch(existingLibraryItem, lid)
+        )
         if (libraryItemData) {
           libraryScan.addLog(LogLevel.INFO, `Library item with path "${existingLibraryItem.path}" was not found, but library item inode "${existingLibraryItem.ino}" was found at path "${libraryItemData.path}"`)
         }
@@ -522,22 +526,25 @@ class LibraryScanner {
 
       // Check if book dir group is already an item
       let existingLibraryItem = await Database.libraryItemModel.findOneOld({
+        libraryId: library.id,
         path: potentialChildDirs
       })
 
-      let renamedPaths = {}
+      let updatedLibraryItemDetails = {}
       if (!existingLibraryItem) {
-        const dirIno = await fileUtils.getIno(fullPath)
-        existingLibraryItem = await Database.libraryItemModel.findOneOld({
-          ino: dirIno
-        })
+        const isSingleMedia = isSingleMediaFile(fileUpdateGroup, itemDir)
+        existingLibraryItem =
+          await findLibraryItemByItemToItemInoMatch(library.id, fullPath) ||
+          await findLibraryItemByItemToFileInoMatch(library.id, fullPath, isSingleMedia) ||
+          await findLibraryItemByFileToItemInoMatch(library.id, fullPath, isSingleMedia, fileUpdateGroup[itemDir])
         if (existingLibraryItem) {
-          Logger.debug(`[LibraryScanner] scanFolderUpdates: Library item found by inode value=${dirIno}. "${existingLibraryItem.relPath} => ${itemDir}"`)
           // Update library item paths for scan
           existingLibraryItem.path = fullPath
           existingLibraryItem.relPath = itemDir
-          renamedPaths.path = fullPath
-          renamedPaths.relPath = itemDir
+          updatedLibraryItemDetails.path = fullPath
+          updatedLibraryItemDetails.relPath = itemDir
+          updatedLibraryItemDetails.libraryFolderId = folder.id
+          updatedLibraryItemDetails.isFile = isSingleMedia
         }
       }
       if (existingLibraryItem) {
@@ -554,10 +561,9 @@ class LibraryScanner {
             continue
           }
         }
-
         // Scan library item for updates
         Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" is in library item "${existingLibraryItem.media.metadata.title}" - scan for updates`)
-        itemGroupingResults[itemDir] = await LibraryItemScanner.scanLibraryItem(existingLibraryItem.id, renamedPaths)
+        itemGroupingResults[itemDir] = await LibraryItemScanner.scanLibraryItem(existingLibraryItem.id, updatedLibraryItemDetails)
         continue
       } else if (library.settings.audiobooksOnly && !hasAudioFiles(fileUpdateGroup, itemDir)) {
         Logger.debug(`[LibraryScanner] Folder update for relative path "${itemDir}" has no audio files`)
@@ -594,6 +600,14 @@ class LibraryScanner {
 }
 module.exports = new LibraryScanner()
 
+function ItemToFileInoMatch(libraryItem1, libraryItem2) {
+  return libraryItem1.isFile && libraryItem2.libraryFiles.some(lf => lf.ino === libraryItem1.ino)
+}
+
+function ItemToItemInoMatch(libraryItem1, libraryItem2) {
+  return libraryItem1.ino === libraryItem2.ino
+}
+
 function hasAudioFiles(fileUpdateGroup, itemDir) {
   return isSingleMediaFile(fileUpdateGroup, itemDir) ?
     scanUtils.checkFilepathIsAudioFile(fileUpdateGroup[itemDir]) :
@@ -603,3 +617,55 @@ function hasAudioFiles(fileUpdateGroup, itemDir) {
 function isSingleMediaFile(fileUpdateGroup, itemDir) {
   return itemDir === fileUpdateGroup[itemDir]
 }
+
+async function findLibraryItemByItemToItemInoMatch(libraryId, fullPath) {
+  const ino = await fileUtils.getIno(fullPath)
+  if (!ino) return null
+  const existingLibraryItem = await Database.libraryItemModel.findOneOld({
+    libraryId: libraryId,
+    ino: ino
+  })
+  if (existingLibraryItem)
+    Logger.debug(`[LibraryScanner] Found library item with matching inode "${ino}" at path "${existingLibraryItem.path}"`)
+  return existingLibraryItem
+}
+
+async function findLibraryItemByItemToFileInoMatch(libraryId, fullPath, isSingleMedia) {
+  if (!isSingleMedia) return null
+  // check if it was moved from another folder by comparing the ino to the library files
+  const ino = await fileUtils.getIno(fullPath)
+  if (!ino) return null
+  const existingLibraryItem = await Database.libraryItemModel.findOneOld([
+    {
+      libraryId: libraryId
+    },
+    sequelize.where(sequelize.literal('(SELECT count(*) FROM json_each(libraryFiles) WHERE json_valid(json_each.value) AND json_each.value->>"$.ino" = :inode)'), {
+      [sequelize.Op.gt]: 0
+    })
+  ], {
+    inode: ino
+  })
+  if (existingLibraryItem)
+    Logger.debug(`[LibraryScanner] Found library item with a library file matching inode "${ino}" at path "${existingLibraryItem.path}"`)
+  return existingLibraryItem
+}
+
+async function findLibraryItemByFileToItemInoMatch(libraryId, fullPath, isSingleMedia, itemFiles) {
+  if (isSingleMedia) return null
+  // check if it was moved from the root folder by comparing the ino to the ino of the scanned files
+  let itemFileInos = []
+  for (const itemFile of itemFiles) {
+    const ino = await fileUtils.getIno(Path.posix.join(fullPath, itemFile))
+    if (ino) itemFileInos.push(ino)
+  }
+  if (!itemFileInos.length) return null
+  const existingLibraryItem = await Database.libraryItemModel.findOneOld({
+    libraryId: libraryId,
+    ino: {
+      [sequelize.Op.in]: itemFileInos
+    }
+  })
+  if (existingLibraryItem)
+    Logger.debug(`[LibraryScanner] Found library item with inode matching one of "${itemFileInos.join(',')}" at path "${existingLibraryItem.path}"`)
+  return existingLibraryItem
+}

server/scanner/PodcastScanner.js

@@ -71,7 +71,7 @@ class PodcastScanner {
 
       // Update audio files that were modified
       if (libraryItemData.audioLibraryFilesModified.length) {
-        let scannedAudioFiles = await AudioFileScanner.executeMediaFileScans(existingLibraryItem.mediaType, libraryItemData, libraryItemData.audioLibraryFilesModified)
+        let scannedAudioFiles = await AudioFileScanner.executeMediaFileScans(existingLibraryItem.mediaType, libraryItemData, libraryItemData.audioLibraryFilesModified.map(lf => lf.new))
 
         for (const podcastEpisode of existingPodcastEpisodes) {
           let matchedScannedAudioFile = scannedAudioFiles.find(saf => saf.metadata.path === podcastEpisode.audioFile.metadata.path)
@@ -132,11 +132,25 @@ class PodcastScanner {
     let hasMediaChanges = false
 
     // Check if cover was removed
-    if (media.coverPath && !libraryItemData.imageLibraryFiles.some(lf => lf.metadata.path === media.coverPath)) {
+    if (media.coverPath && libraryItemData.imageLibraryFilesRemoved.some(lf => lf.metadata.path === media.coverPath)) {
       media.coverPath = null
       hasMediaChanges = true
     }
 
+    // Update cover if it was modified
+    if (media.coverPath && libraryItemData.imageLibraryFilesModified.length) {
+      let coverMatch = libraryItemData.imageLibraryFilesModified.find(iFile => iFile.old.metadata.path === media.coverPath)
+      if (coverMatch) {
+        const coverPath = coverMatch.new.metadata.path
+        if (coverPath !== media.coverPath) {
+          libraryScan.addLog(LogLevel.DEBUG, `Updating podcast cover "${media.coverPath}" => "${coverPath}" for podcast "${media.title}"`)
+          media.coverPath = coverPath
+          media.changed('coverPath', true)
+          hasMediaChanges = true
+        }
+      }
+    }
+
     // Check if cover is not set and image files were found
     if (!media.coverPath && libraryItemData.imageLibraryFiles.length) {
       // Prefer using a cover image with the name "cover" otherwise use the first image

server/scanner/Scanner.js

@@ -359,7 +359,7 @@ class Scanner {
       }
 
       offset += limit
-      hasMoreChunks = libraryItems.length < limit
+      hasMoreChunks = libraryItems.length === limit
       let oldLibraryItems = libraryItems.map(li => Database.libraryItemModel.getOldLibraryItem(li))
 
       const shouldContinue = await this.matchLibraryItemsChunk(library, oldLibraryItems, libraryScan)

server/utils/ffmpegHelpers.js

@@ -35,9 +35,14 @@ async function writeConcatFile(tracks, outputPath, startTime = 0) {
     return line
   })
   var inputstr = trackPaths.join('\n\n')
-  await fs.writeFile(outputPath, inputstr)
 
-  return firstTrackStartTime
+  try {
+    await fs.writeFile(outputPath, inputstr)
+    return firstTrackStartTime
+  } catch (error) {
+    Logger.error(`[ffmpegHelpers] Failed to write stream concat file at "${outputPath}"`, error)
+    return null
+  }
 }
 module.exports.writeConcatFile = writeConcatFile
 
@@ -104,7 +109,8 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
     const ffmpeg = Ffmpeg(response.data)
     ffmpeg.addOption('-loglevel debug') // Debug logs printed on error
     ffmpeg.outputOptions(
-      '-c', 'copy',
+      '-c:a', 'copy',
+      '-map', '0:a',
       '-metadata', 'podcast=1'
     )
 

server/utils/fileUtils.js

@@ -59,7 +59,7 @@ async function getFileTimestampsWithIno(path) {
       ino: String(stat.ino)
     }
   } catch (err) {
-    Logger.error('[fileUtils] Failed to getFileTimestampsWithIno', err)
+    Logger.error(`[fileUtils] Failed to getFileTimestampsWithIno for path "${path}"`, err)
     return false
   }
 }
@@ -357,7 +357,10 @@ module.exports.removeFile = (path) => {
 }
 
 module.exports.encodeUriPath = (path) => {
-  const uri = new URL(path, "file://")
+  const uri = new URL('/', "file://")
+  // we assign the path here to assure that URL control characters like # are
+  // actually interpreted as part of the URL path
+  uri.pathname = path
   return uri.pathname
 }
 

server/utils/index.js

@@ -114,7 +114,9 @@ module.exports.reqSupportsWebp = (req) => {
 module.exports.areEquivalent = areEquivalent
 
 module.exports.copyValue = (val) => {
-  if (!val) return val === false ? false : null
+  if (val === undefined || val === '') return null
+  else if (!val) return val
+
   if (!this.isObject(val)) return val
 
   if (Array.isArray(val)) {

server/utils/parsers/parseEpubMetadata.js

@@ -18,7 +18,10 @@ async function extractFileFromEpub(epubPath, filepath) {
     Logger.error(`[parseEpubMetadata] Failed to extract ${filepath} from epub at "${epubPath}"`, error)
   })
   const filedata = data?.toString('utf8')
-  await zip.close()
+  await zip.close().catch((error) => {
+    Logger.error(`[parseEpubMetadata] Failed to close zip`, error)
+  })
+
   return filedata
 }
 
@@ -68,6 +71,9 @@ async function parse(ebookFile) {
   Logger.debug(`Parsing metadata from epub at "${epubPath}"`)
   // Entrypoint of the epub that contains the filepath to the package document (opf file)
   const containerJson = await extractXmlToJson(epubPath, 'META-INF/container.xml')
+  if (!containerJson) {
+    return null
+  }
 
   // Get package document opf filepath from container.xml
   const packageDocPath = containerJson.container?.rootfiles?.[0]?.rootfile?.[0]?.$?.['full-path']

server/utils/queries/authorFilters.js

@@ -3,45 +3,61 @@ const Database = require('../../Database')
 
 module.exports = {
   /**
-   * Get authors with count of num books
-   * @param {string} libraryId 
-   * @returns {{id:string, name:string, count:number}}
+   * Get authors total count
+   *
+   * @param {string} libraryId
+   * @returns {Promise<number>} count
    */
-  async getAuthorsWithCount(libraryId) {
-    const authors = await Database.authorModel.findAll({
-      where: [
-        {
-          libraryId
-        },
-        Sequelize.where(Sequelize.literal('count'), {
-          [Sequelize.Op.gt]: 0
-        })
-      ],
-      attributes: [
-        'id',
-        'name',
-        [Sequelize.literal('(SELECT count(*) FROM bookAuthors ba WHERE ba.authorId = author.id)'), 'count']
-      ],
-      order: [
-        ['count', 'DESC']
-      ]
+  async getAuthorsTotalCount(libraryId) {
+    const authorsCount = await Database.authorModel.count({
+      where: {
+        libraryId: libraryId
+      }
     })
-    return authors.map(au => {
+    return authorsCount
+  },
+
+  /**
+   * Get authors with count of num books
+   *
+   * @param {string} libraryId
+   * @param {number} limit
+   * @returns {Promise<{id:string, name:string, count:number}>}
+   */
+  async getAuthorsWithCount(libraryId, limit) {
+    const authors = await Database.bookAuthorModel.findAll({
+      include: [
+        {
+          model: Database.authorModel,
+          as: 'author', // Use the correct alias as defined in your associations
+          attributes: ['name'],
+          where: {
+            libraryId: libraryId
+          }
+        }
+      ],
+      attributes: ['authorId', [Sequelize.fn('COUNT', Sequelize.col('authorId')), 'count']],
+      group: ['authorId', 'author.id'], // Include 'author.id' to satisfy GROUP BY with JOIN
+      order: [[Sequelize.literal('count'), 'DESC']],
+      limit: limit
+    })
+    return authors.map((au) => {
       return {
-        id: au.id,
-        name: au.name,
-        count: au.dataValues.count
+        id: au.authorId,
+        name: au.author.name,
+        count: au.get('count') // Use get method to access aliased attributes
       }
     })
   },
 
   /**
    * Search authors
-   * @param {string} libraryId 
-   * @param {string} query 
+   *
+   * @param {string} libraryId
+   * @param {string} query
    * @param {number} limit
    * @param {number} offset
-   * @returns {object[]} oldAuthor with numBooks
+   * @returns {Promise<Object[]>} oldAuthor with numBooks
    */
   async search(libraryId, query, limit, offset) {
     const authors = await Database.authorModel.findAll({
@@ -52,9 +68,7 @@ module.exports = {
         libraryId
       },
       attributes: {
-        include: [
-          [Sequelize.literal('(SELECT count(*) FROM bookAuthors ba WHERE ba.authorId = author.id)'), 'numBooks']
-        ]
+        include: [[Sequelize.literal('(SELECT count(*) FROM bookAuthors ba WHERE ba.authorId = author.id)'), 'numBooks']]
       },
       limit,
       offset

server/utils/queries/libraryFilters.js

@@ -75,7 +75,7 @@ module.exports = {
 
   /**
    * Get library items for most recently added shelf
-   * @param {oldLibrary} library 
+   * @param {import('../../objects/Library')} library 
    * @param {oldUser} user 
    * @param {string[]} include 
    * @param {number} limit 
@@ -120,14 +120,14 @@ module.exports = {
 
   /**
    * Get library items for continue series shelf
-   * @param {string} library 
+   * @param {import('../../objects/Library')} library 
    * @param {oldUser} user 
    * @param {string[]} include 
    * @param {number} limit 
    * @returns {object} { libraryItems:LibraryItem[], count:number }
    */
   async getLibraryItemsContinueSeries(library, user, include, limit) {
-    const { libraryItems, count } = await libraryItemsBookFilters.getContinueSeriesLibraryItems(library.id, user, include, limit, 0)
+    const { libraryItems, count } = await libraryItemsBookFilters.getContinueSeriesLibraryItems(library, user, include, limit, 0)
     return {
       libraryItems: libraryItems.map(li => {
         const oldLibraryItem = Database.libraryItemModel.getOldLibraryItem(li).toJSONMinified()
@@ -145,7 +145,7 @@ module.exports = {
 
   /**
    * Get library items or podcast episodes for the "Listen Again" and "Read Again" shelf
-   * @param {oldLibrary} library 
+   * @param {import('../../objects/Library')} library 
    * @param {oldUser} user 
    * @param {string[]} include 
    * @param {number} limit 
@@ -451,7 +451,7 @@ module.exports = {
             libraryId: libraryId
           }
         },
-        attributes: ['tags', 'genres']
+        attributes: ['tags', 'genres', 'language']
       })
       for (const podcast of podcasts) {
         if (podcast.tags?.length) {
@@ -460,6 +460,9 @@ module.exports = {
         if (podcast.genres?.length) {
           podcast.genres.forEach((genre) => data.genres.add(genre))
         }
+        if (podcast.language) {
+          data.languages.add(podcast.language)
+        }
       }
     } else {
       const books = await Database.bookModel.findAll({

server/utils/queries/libraryItemFilters.js

@@ -34,6 +34,10 @@ module.exports = {
             attributes: ['sequence']
           }
         }
+      ],
+      order: [
+        [Database.authorModel, Database.bookAuthorModel, 'createdAt', 'ASC'],
+        [Database.seriesModel, 'bookSeries', 'createdAt', 'ASC']
       ]
     })
     for (const book of booksWithTag) {
@@ -68,7 +72,7 @@ module.exports = {
   /**
    * Get all library items that have genres
    * @param {string[]} genres 
-   * @returns {Promise<LibraryItem[]>}
+   * @returns {Promise<import('../../models/LibraryItem')[]>}
    */
   async getAllLibraryItemsWithGenres(genres) {
     const libraryItems = []

server/utils/queries/libraryItemsBookFilters.js

@@ -204,6 +204,10 @@ module.exports = {
         mediaWhere['ebookFile'] = {
           [Sequelize.Op.not]: null
         }
+      } else if (value == 'no-ebook') {
+        mediaWhere['ebookFile'] = {
+          [Sequelize.Op.eq]: null
+        }
       }
     } else if (group === 'missing') {
       if (['asin', 'isbn', 'subtitle', 'publishedYear', 'description', 'publisher', 'language', 'cover'].includes(value)) {
@@ -421,6 +425,10 @@ module.exports = {
       libraryItemWhere['libraryFiles'] = {
         [Sequelize.Op.substring]: `"isSupplementary":true`
       }
+    } else if (filterGroup === 'ebooks' && filterValue === 'no-supplementary') {
+      libraryItemWhere['libraryFiles'] = {
+        [Sequelize.Op.notLike]: Sequelize.literal(`\'%"isSupplementary":true%\'`),
+      }
     } else if (filterGroup === 'missing' && filterValue === 'authors') {
       authorInclude = {
         model: Database.authorModel,
@@ -625,14 +633,15 @@ module.exports = {
    * 2. Has no books in progress
    * 3. Has at least 1 unfinished book
    * TODO: Reduce queries
-   * @param {string} libraryId 
-   * @param {oldUser} user 
+   * @param {import('../../objects/Library')} library 
+   * @param {import('../../objects/user/User')} user 
    * @param {string[]} include 
    * @param {number} limit 
    * @param {number} offset 
-   * @returns {object} { libraryItems:LibraryItem[], count:number }
+   * @returns {{ libraryItems:import('../../models/LibraryItem')[], count:number }}
    */
-  async getContinueSeriesLibraryItems(libraryId, user, include, limit, offset) {
+  async getContinueSeriesLibraryItems(library, user, include, limit, offset) {
+    const libraryId = library.id
     const libraryItemIncludes = []
     if (include.includes('rssfeed')) {
       libraryItemIncludes.push({
@@ -646,6 +655,18 @@ module.exports = {
     const userPermissionBookWhere = this.getUserPermissionBookWhereQuery(user)
     bookWhere.push(...userPermissionBookWhere.bookWhere)
 
+    let includeAttributes = [
+      [Sequelize.literal('(SELECT max(mp.updatedAt) FROM bookSeries bs, mediaProgresses mp WHERE mp.mediaItemId = bs.bookId AND mp.userId = :userId AND bs.seriesId = series.id)'), 'recent_progress'],
+    ]
+    let booksNotFinishedQuery = `SELECT count(*) FROM bookSeries bs LEFT OUTER JOIN mediaProgresses mp ON mp.mediaItemId = bs.bookId AND mp.userId = :userId WHERE bs.seriesId = series.id AND (mp.isFinished = 0 OR mp.isFinished IS NULL)`
+
+    if (library.settings.onlyShowLaterBooksInContinueSeries) {
+      const maxSequenceQuery = `(SELECT CAST(max(bs.sequence) as FLOAT) FROM bookSeries bs, mediaProgresses mp WHERE mp.mediaItemId = bs.bookId AND mp.isFinished = 1 AND mp.userId = :userId AND bs.seriesId = series.id)`
+      includeAttributes.push([Sequelize.literal(`${maxSequenceQuery}`), 'maxSequence'])
+  
+      booksNotFinishedQuery = booksNotFinishedQuery + ` AND CAST(bs.sequence as FLOAT) > ${maxSequenceQuery}`
+    }
+
     const { rows: series, count } = await Database.seriesModel.findAndCountAll({
       where: [
         {
@@ -659,17 +680,15 @@ module.exports = {
         Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM mediaProgresses mp, bookSeries bs WHERE bs.seriesId = series.id AND mp.mediaItemId = bs.bookId AND mp.userId = :userId AND mp.isFinished = 1)`), {
           [Sequelize.Op.gte]: 1
         }),
-        // Has at least 1 book not finished
-        Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM bookSeries bs LEFT OUTER JOIN mediaProgresses mp ON mp.mediaItemId = bs.bookId AND mp.userId = :userId WHERE bs.seriesId = series.id AND (mp.isFinished = 0 OR mp.isFinished IS NULL))`), {
+        // Has at least 1 book not finished (that has a sequence number higher than the highest already read, if library config is toggled)
+        Sequelize.where(Sequelize.literal(`(${booksNotFinishedQuery})`), {
           [Sequelize.Op.gte]: 1
         }),
         // Has no books in progress
         Sequelize.where(Sequelize.literal(`(SELECT count(*) FROM mediaProgresses mp, bookSeries bs WHERE mp.mediaItemId = bs.bookId AND mp.userId = :userId AND bs.seriesId = series.id AND mp.isFinished = 0 AND mp.currentTime > 0)`), 0)
       ],
       attributes: {
-        include: [
-          [Sequelize.literal('(SELECT max(mp.updatedAt) FROM bookSeries bs, mediaProgresses mp WHERE mp.mediaItemId = bs.bookId AND mp.userId = :userId AND bs.seriesId = series.id)'), 'recent_progress']
-        ]
+        include: includeAttributes
       },
       replacements: {
         userId: user.id,
@@ -723,13 +742,26 @@ module.exports = {
 
     const libraryItems = series.map(s => {
       if (!s.bookSeries.length) return null // this is only possible if user has restricted books in series
-      const libraryItem = s.bookSeries[0].book.libraryItem.toJSON()
-      const book = s.bookSeries[0].book.toJSON()
+
+      let bookIndex = 0
+      // if the library setting is toggled, only show later entries in series, otherwise skip
+      if (library.settings.onlyShowLaterBooksInContinueSeries) {
+        bookIndex = s.bookSeries.findIndex(function (b) {
+          return parseFloat(b.dataValues.sequence) > s.dataValues.maxSequence
+        })
+        if (bookIndex === -1) {
+          // no later books than maxSequence
+          return null
+        }
+      }
+
+      const libraryItem = s.bookSeries[bookIndex].book.libraryItem.toJSON()
+      const book = s.bookSeries[bookIndex].book.toJSON()
       delete book.libraryItem
       libraryItem.series = {
         id: s.id,
         name: s.name,
-        sequence: s.bookSeries[0].sequence
+        sequence: s.bookSeries[bookIndex].sequence
       }
       if (libraryItem.feeds?.length) {
         libraryItem.rssFeed = libraryItem.feeds[0]

server/utils/queries/libraryItemsPodcastFilters.js

@@ -51,6 +51,8 @@ module.exports = {
         [Sequelize.Op.gte]: 1
       })
       replacements.filterValue = value
+    } else if (group === 'languages') {
+      mediaWhere['language'] = value
     }
 
     return {