@@ -134,11 +128,7 @@
{{ getPlayMethodName(session.playMethod) }}
-
-
-
{{ line }}
-
-
+
|
{{ $elapsedPretty(session.timeListening) }}
@@ -180,11 +170,7 @@
{{ getPlayMethodName(session.playMethod) }}
|
-
-
-
{{ line }}
-
-
+
|
{{ $secondsToTimestamp(session.currentTime) }}
@@ -445,16 +431,16 @@ export default {
this.selectedSession = session
this.showSessionModal = true
},
- getDeviceInfoLines(deviceInfo) {
- if (!deviceInfo) return []
- const lines = []
+ getDeviceInfoString(deviceInfo) {
+ if (!deviceInfo) return ''
+ var lines = []
if (deviceInfo.clientName) lines.push(`${deviceInfo.clientName} ${deviceInfo.clientVersion || ''}`)
if (deviceInfo.osName) lines.push(`${deviceInfo.osName} ${deviceInfo.osVersion}`)
if (deviceInfo.browserName) lines.push(deviceInfo.browserName)
if (deviceInfo.manufacturer && deviceInfo.model) lines.push(`${deviceInfo.manufacturer} ${deviceInfo.model}`)
if (deviceInfo.sdkVersion) lines.push(`SDK Version: ${deviceInfo.sdkVersion}`)
- return lines
+ return lines.join('
')
},
getPlayMethodName(playMethod) {
if (playMethod === this.$constants.PlayMethod.DIRECTPLAY) return 'Direct Play'
diff --git a/client/pages/config/users/_id/sessions.vue b/client/pages/config/users/_id/sessions.vue
index cb18f5ee3..9b2d3418f 100644
--- a/client/pages/config/users/_id/sessions.vue
+++ b/client/pages/config/users/_id/sessions.vue
@@ -19,45 +19,39 @@
{{ $strings.HeaderListeningSessions }}
-
-
-
- | {{ $strings.LabelItem }} |
- {{ $strings.LabelPlayMethod }} |
- {{ $strings.LabelDeviceInfo }} |
- {{ $strings.LabelTimeListened }} |
- {{ $strings.LabelLastTime }} |
- {{ $strings.LabelLastUpdate }} |
-
-
- |
- {{ session.displayTitle }}
- {{ session.displayAuthor }}
- |
-
- {{ getPlayMethodName(session.playMethod) }}
- |
-
-
-
-
{{ line }}
-
-
+
+
+ | {{ $strings.LabelItem }} |
+ {{ $strings.LabelPlayMethod }} |
+ {{ $strings.LabelDeviceInfo }} |
+ {{ $strings.LabelTimeListened }} |
+ {{ $strings.LabelLastTime }} |
+ {{ $strings.LabelLastUpdate }} |
+
+
+ |
+ {{ session.displayTitle }}
+ {{ session.displayAuthor }}
|
-
- {{ $elapsedPrettyLocalized(session.timeListening) }}
- |
-
- {{ $secondsToTimestamp(session.currentTime) }}
- |
-
-
- {{ $dateDistanceFromNow(session.updatedAt) }}
-
- |
-
-
-
+ |
+ {{ getPlayMethodName(session.playMethod) }}
+ |
+
+
+ |
+
+ {{ $elapsedPrettyLocalized(session.timeListening) }}
+ |
+
+ {{ $secondsToTimestamp(session.currentTime) }}
+ |
+
+
+ {{ $dateDistanceFromNow(session.updatedAt) }}
+
+ |
+
+
{{ $getString('LabelPaginationPageXOfY', [currentPage + 1, numPages]) }}
@@ -197,16 +191,16 @@ export default {
this.selectedSession = session
this.showSessionModal = true
},
- getDeviceInfoLines(deviceInfo) {
- if (!deviceInfo) return []
- const lines = []
+ getDeviceInfoString(deviceInfo) {
+ if (!deviceInfo) return ''
+ var lines = []
if (deviceInfo.clientName) lines.push(`${deviceInfo.clientName} ${deviceInfo.clientVersion || ''}`)
if (deviceInfo.osName) lines.push(`${deviceInfo.osName} ${deviceInfo.osVersion}`)
if (deviceInfo.browserName) lines.push(deviceInfo.browserName)
if (deviceInfo.manufacturer && deviceInfo.model) lines.push(`${deviceInfo.manufacturer} ${deviceInfo.model}`)
if (deviceInfo.sdkVersion) lines.push(`SDK Version: ${deviceInfo.sdkVersion}`)
- return lines
+ return lines.join(' ')
},
getPlayMethodName(playMethod) {
if (playMethod === this.$constants.PlayMethod.DIRECTPLAY) return 'Direct Play'
diff --git a/client/pages/config/users/index.vue b/client/pages/config/users/index.vue
index ff9d049c0..5bd53e0e5 100644
--- a/client/pages/config/users/index.vue
+++ b/client/pages/config/users/index.vue
@@ -7,7 +7,7 @@
-
+
help_outline
diff --git a/client/pages/login.vue b/client/pages/login.vue
index cec150e71..b6235845a 100644
--- a/client/pages/login.vue
+++ b/client/pages/login.vue
@@ -17,9 +17,9 @@
-## â ī¸ Frontend pull requests are not being reviewed or merged for the existing Vue frontend. The frontend is currently being rewritten and migrated to React and should be available soon.
-
# About
Audiobookshelf is a self-hosted audiobook and podcast server.
@@ -59,23 +57,27 @@ Try it out on the [Google Play Store](https://play.google.com/store/apps/details
Using Test Flight: https://testflight.apple.com/join/wiic7QIW **_(beta is full)_**
+### Build your own tools & clients
+
+Check out the [API documentation](https://api.audiobookshelf.org/)
+
-# Organizing your media
+# Organizing your audiobooks
#### Directory structure and folder names are important to Audiobookshelf!
-See [library docs](https://audiobookshelf.org/docs/category/libraries) for supported directory structures, folder naming conventions, and audio file metadata usage.
+See [documentation](https://audiobookshelf.org/docs#book-directory-structure) for supported directory structure, folder naming conventions, and audio file metadata usage.
# Installation
-See [install docs](https://audiobookshelf.org/docs/category/installation)
+See [install docs](https://www.audiobookshelf.org/docs)
@@ -85,24 +87,276 @@ See [install docs](https://audiobookshelf.org/docs/category/installation)
#### Note: Using a subfolder is supported with no additional changes but the path must be `/audiobookshelf` (this is not changeable). See [discussion](https://github.com/advplyr/audiobookshelf/discussions/3535)
-See [reverse proxy docs](https://audiobookshelf.org/docs/category/reverse-proxy)
+### NGINX Proxy Manager
-
+Toggle websockets support.
-# Contributing
+ 
-See [contributing docs](https://audiobookshelf.org/docs/contributing/general/)
+### NGINX Reverse Proxy
-### Localization
+Add this to the site config file on your nginx server after you have changed the relevant parts in the <> brackets, and inserted your certificate paths.
-Thank you to [Weblate](https://hosted.weblate.org/engage/audiobookshelf/) for hosting our localization infrastructure pro-bono. If you want to see Audiobookshelf in your language, please help us localize. Additional information on helping with the translations [here](https://www.audiobookshelf.org/faq#how-do-i-help-with-translations). 
+```bash
+server {
+ listen 443 ssl;
+ server_name ..;
-
+ access_log /var/log/nginx/audiobookshelf.access.log;
+ error_log /var/log/nginx/audiobookshelf.error.log;
+
+ ssl_certificate /path/to/certificate;
+ ssl_certificate_key /path/to/key;
+
+ location / {
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header Host $http_host;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+
+ proxy_http_version 1.1;
+
+ proxy_pass http://;
+ proxy_redirect http:// https://;
+
+ # Prevent 413 Request Entity Too Large error
+ # by increasing the maximum allowed size of the client request body
+ # For example, set it to 10 GiB
+ client_max_body_size 10240M;
+ }
+}
+```
+
+### Apache Reverse Proxy
+
+Add this to the site config file on your Apache server after you have changed the relevant parts in the <> brackets, and inserted your certificate paths.
+
+For this to work you must enable at least the following mods using `a2enmod`:
+
+- `ssl`
+- `proxy`
+- `proxy_http`
+- `proxy_balancer`
+- `proxy_wstunnel`
+- `rewrite`
+
+```bash
+
+
+ ServerName ..
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+
+ ProxyPreserveHost On
+ ProxyPass / http://localhost:/
+ RewriteEngine on
+ RewriteCond %{HTTP:Upgrade} websocket [NC]
+ RewriteCond %{HTTP:Connection} upgrade [NC]
+ RewriteRule ^/?(.*) "ws://localhost:/$1" [P,L]
+
+ # unless you're doing something special this should be generated by a
+ # tool like certbot by let's encrypt
+ SSLCertificateFile /path/to/cert/file
+ SSLCertificateKeyFile /path/to/key/file
+
+
+```
+
+If using Apache >= 2.4.47 you can use the following, without having to use any of the `RewriteEngine`, `RewriteCond`, or `RewriteRule` directives. For example:
+
+```xml
+
+ ProxyPreserveHost on
+ ProxyPass http://localhost:/audiobookshelf upgrade=websocket
+ ProxyPassReverse http://localhost:/audiobookshelf
+
+```
+
+Some SSL certificates like those signed by Let's Encrypt require ACME validation. To allow Let's Encrypt to write and confirm the ACME challenge, edit your VirtualHost definition to prevent proxying traffic that queries `/.well-known` and instead serve that directly:
+
+```bash
+
+ # ...
+
+ # create the directory structure /.well-known/acme-challenges
+ # within DocumentRoot and give the HTTP user recursive write
+ # access to it.
+ DocumentRoot /path/to/local/directory
+
+ ProxyPreserveHost On
+ ProxyPass /.well-known !
+ ProxyPass / http://localhost:/
+
+ # ...
+
+```
+
+### SWAG Reverse Proxy
+
+[See LinuxServer.io config sample](https://github.com/linuxserver/reverse-proxy-confs/blob/master/audiobookshelf.subdomain.conf.sample)
+
+### Synology NAS Reverse Proxy Setup (DSM 7+/Quickconnect)
+
+1. **Open Control Panel**
+
+ - Navigate to `Login Portal > Advanced`.
+
+2. **General Tab**
+
+ - Click `Reverse Proxy` > `Create`.
+
+ | Setting | Value |
+ | ------------------ | -------------- |
+ | Reverse Proxy Name | audiobookshelf |
+
+3. **Source Configuration**
+
+ | Setting | Value |
+ | ---------------------- | ---------------------------------------- |
+ | Protocol | HTTPS |
+ | Hostname | `..synology.me` |
+ | Port | 443 |
+ | Access Control Profile | Leave as is |
+
+ - Example Hostname: `audiobookshelf.mydomain.synology.me`
+
+4. **Destination Configuration**
+
+ | Setting | Value |
+ | -------- | ----------- |
+ | Protocol | HTTP |
+ | Hostname | Your NAS IP |
+ | Port | 13378 |
+
+5. **Custom Header Tab**
+
+ - Go to `Create > Websocket`.
+ - Configure Headers (leave as is):
+
+ | Header Name | Value |
+ | ----------- | --------------------- |
+ | Upgrade | `$http_upgrade` |
+ | Connection | `$connection_upgrade` |
+
+6. **Advanced Settings Tab**
+ - Leave as is.
+
+### [Traefik Reverse Proxy](https://doc.traefik.io/traefik/)
+
+Middleware relating to CORS will cause the app to report Unknown Error when logging in. To prevent this don't apply any of the following headers to the router for this site:
+
+
+ - accessControlAllowMethods
+ - accessControlAllowOriginList
+ - accessControlMaxAge
+
+
+From [@Dondochaka](https://discord.com/channels/942908292873723984/942914154254176257/945074590374318170) and [@BeastleeUK](https://discord.com/channels/942908292873723984/942914154254176257/970366039294611506)
+
+### Example Caddyfile - [Caddy Reverse Proxy](https://caddyserver.com/docs/caddyfile/directives/reverse_proxy)
+
+```
+subdomain.domain.com {
+ encode gzip zstd
+ reverse_proxy :
+}
+```
+
+### HAProxy
+
+Below is a generic HAProxy config, using `audiobookshelf.YOUR_DOMAIN.COM`.
+
+To use `http2`, `ssl` is needed.
+
+```make
+global
+ # ... (your global settings go here)
+
+defaults
+ mode http
+ # ... (your default settings go here)
+
+frontend my_frontend
+ # Bind to port 443, enable SSL, and specify the certificate list file
+ bind :443 name :443 ssl crt-list /path/to/cert.crt_list alpn h2,http/1.1
+ mode http
+
+ # Define an ACL for subdomains starting with "audiobookshelf"
+ acl is_audiobookshelf hdr_beg(host) -i audiobookshelf
+
+ # Use the ACL to route traffic to audiobookshelf_backend if the condition is met,
+ # otherwise, use the default_backend
+ use_backend audiobookshelf_backend if is_audiobookshelf
+ default_backend default_backend
+
+backend audiobookshelf_backend
+ mode http
+ # ... (backend settings for audiobookshelf go here)
+
+ # Define the server for the audiobookshelf backend
+ server audiobookshelf_server 127.0.0.99:13378
+
+backend default_backend
+ mode http
+ # ... (default backend settings go here)
+
+ # Define the server for the default backend
+ server default_server 127.0.0.123:8081
+
+```
+
+### pfSense and HAProxy
+
+For pfSense the inputs are graphical, and `Health checking` is enabled.
+
+#### Frontend, Default backend, access control lists and actions
+
+##### Access Control lists
+
+| Name | Expression | CS | Not | Value |
+| :------------: | :---------------: | :-: | :-: | :-------------: |
+| audiobookshelf | Host starts with: | | | audiobookshelf. |
+
+##### Actions
+
+The `condition acl names` needs to match the name above `audiobookshelf`.
+
+| Action | Parameters | Condition acl names |
+| :-----------: | :------------: | :-----------------: |
+| `Use Backend` | audiobookshelf | audiobookshelf |
+
+#### Backend
+
+The `Name` needs to match the `Parameters` above `audiobookshelf`.
+
+| Name | audiobookshelf |
+| ---- | -------------- |
+
+##### Server list:
+
+| Name | Expression | CS | Not | Value |
+| :------------: | :---------------: | :-: | :-: | :-------------: |
+| audiobookshelf | Host starts with: | | | audiobookshelf. |
+
+##### Health checking:
+
+Health checking is enabled by default. `Http check method` of `OPTIONS` is not supported on Audiobookshelf. If Health check fails, data will not be forwared. Need to do one of following:
+
+- To disable: Change `Health check method` to `none`.
+- To make Health checking function: Change `Http check method` to `HEAD` or `GET`.
# Run from source
+# Contributing
+
This application is built using [NodeJs](https://nodejs.org/).
+### Localization
+
+Thank you to [Weblate](https://hosted.weblate.org/engage/audiobookshelf/) for hosting our localization infrastructure pro-bono. If you want to see Audiobookshelf in your language, please help us localize. Additional information on helping with the translations [here](https://www.audiobookshelf.org/faq#how-do-i-help-with-translations). 
+
### Dev Container Setup
The easiest way to begin developing this project is to use a dev container. An introduction to dev containers in VSCode can be found [here](https://code.visualstudio.com/docs/devcontainers/containers).
@@ -192,3 +446,7 @@ If you are using VSCode, this project includes a couple of pre-defined targets t
- `Debug server`âRun the server.
- `Debug client (nuxt)`âRun the client with live reload.
- `Debug server and client (nuxt)`âRuns both the preceding two debug targets.
+
+# How to Support
+
+[See the incomplete "How to Support" page](https://www.audiobookshelf.org/support)
diff --git a/server/Auth.js b/server/Auth.js
index 17bd1160f..9c0e2fdb0 100644
--- a/server/Auth.js
+++ b/server/Auth.js
@@ -81,7 +81,7 @@ class Auth {
* @param {import('./models/User')} user
* @param {Request} req
* @param {Response} res
- * @returns {Promise<{ accessToken:string, refreshToken:string }|null>} new tokens for the current session if kept alive
+ * @returns {Promise} accessToken only if user is current user and refresh token is valid
*/
async invalidateJwtSessionsForUser(user, req, res) {
return this.tokenManager.invalidateJwtSessionsForUser(user, req, res)
@@ -213,7 +213,6 @@ class Auth {
* @param {Request} req
* @param {Response} res
* @param {string} authMethod - The authentication method, default is 'local'.
- * @returns {Object|null} - Returns error object if validation fails, null if successful
*/
paramsToCookies(req, res, authMethod = 'local') {
const TWO_MINUTES = 120000 // 2 minutes in milliseconds
@@ -228,24 +227,13 @@ class Auth {
// Validate and store the callback URL
if (!callback) {
- res.status(400).send({ message: 'No callback parameter' })
- return { error: 'No callback parameter' }
+ return res.status(400).send({ message: 'No callback parameter' })
}
-
- // Security: Validate callback URL is same-origin only
- if (!this.oidcAuthStrategy.isValidWebCallbackUrl(callback, req)) {
- Logger.warn(`[Auth] Rejected invalid callback URL: ${callback}`)
- res.status(400).send({ message: 'Invalid callback URL - must be same-origin' })
- return { error: 'Invalid callback URL - must be same-origin' }
- }
-
res.cookie('auth_cb', callback, { maxAge: TWO_MINUTES, httpOnly: true })
}
// Store the authentication method for long
- Logger.debug(`[Auth] paramsToCookies: setting auth_method cookie to ${authMethod}`)
res.cookie('auth_method', authMethod, { maxAge: 1000 * 60 * 60 * 24 * 365 * 10, httpOnly: true })
- return null
}
/**
@@ -259,7 +247,6 @@ class Auth {
// Handle token generation and get userResponse object
// For API based auth (e.g. mobile), we will return the refresh token in the response
const isApiBased = this.isAuthMethodAPIBased(req.cookies.auth_method)
- Logger.debug(`[Auth] handleLoginSuccessBasedOnCookie: isApiBased: ${isApiBased}, auth_method: ${req.cookies.auth_method}`)
const userResponse = await this.handleLoginSuccess(req, res, isApiBased)
if (isApiBased) {
@@ -267,6 +254,7 @@ class Auth {
res.json(userResponse)
} else {
// UI request -> check if we have a callback url
+ // TODO: do we want to somehow limit the values for auth_cb?
if (req.cookies.auth_cb) {
let stateQuery = req.cookies.auth_state ? `&state=${req.cookies.auth_state}` : ''
// UI request -> redirect to auth_cb url and send the jwt token as parameter
@@ -300,8 +288,6 @@ class Auth {
userResponse.user.refreshToken = returnTokens ? refreshToken : null
userResponse.user.accessToken = accessToken
- Logger.debug(`[Auth] handleLoginSuccess: returnTokens: ${returnTokens}, isRefreshTokenInResponse: ${!!userResponse.user.refreshToken}`)
-
if (!returnTokens) {
this.tokenManager.setRefreshTokenCookie(req, res, refreshToken)
}
@@ -364,11 +350,7 @@ class Auth {
return res.status(authorizationUrlResponse.status).send(authorizationUrlResponse.error)
}
- // Check if paramsToCookies sent a response (e.g., due to invalid callback URL)
- const cookieResult = this.paramsToCookies(req, res, authorizationUrlResponse.isMobileFlow ? 'openid-mobile' : 'openid')
- if (cookieResult && cookieResult.error) {
- return // Response already sent by paramsToCookies
- }
+ this.paramsToCookies(req, res, authorizationUrlResponse.isMobileFlow ? 'openid-mobile' : 'openid')
res.redirect(authorizationUrlResponse.authorizationUrl)
})
@@ -471,23 +453,18 @@ class Auth {
res.json(openIdIssuerConfig)
})
- /**
- * Logout route
- * Use ?allDevices=1 to destroy every session for this user instead of just the current one
- */
+ // Logout route
router.post('/logout', async (req, res) => {
// Refresh token be alternatively be sent in the header
const refreshToken = req.cookies.refresh_token || req.headers['x-refresh-token']
- const allDevices = req.query.allDevices === '1'
// Clear refresh token cookie
res.clearCookie('refresh_token', {
path: '/'
})
- if (allDevices) {
- await this.tokenManager.invalidateAllSessionsForRefreshToken(refreshToken)
- } else if (refreshToken) {
+ // Invalidate the session in database using refresh token
+ if (refreshToken) {
await this.tokenManager.invalidateRefreshToken(refreshToken)
} else {
Logger.info(`[Auth] logout: No refresh token on request`)
diff --git a/server/Server.js b/server/Server.js
index c1657ff1e..1a8db4063 100644
--- a/server/Server.js
+++ b/server/Server.js
@@ -11,10 +11,8 @@ const axios = require('axios')
const { version } = require('../package.json')
// Utils
-const is = require('./libs/requestIp/isJs')
const fileUtils = require('./utils/fileUtils')
const { toNumber } = require('./utils/index')
-const { getRequestOrigin } = require('./utils/requestUtils')
const Logger = require('./Logger')
const Auth = require('./Auth')
@@ -231,10 +229,6 @@ class Server {
res.setHeader('Content-Security-Policy', "frame-ancestors 'self'")
}
- // Security: Prevent referrer leakage to protect against token exposure
- // Using 'no-referrer' to completely prevent token leakage in referer headers
- res.setHeader('Referrer-Policy', 'no-referrer')
-
/**
* @temporary
* This is necessary for the ebook & cover API endpoint in the mobile apps
@@ -246,8 +240,8 @@ class Server {
* Running in development allows cors to allow testing the mobile apps in the browser
* or env variable ALLOW_CORS = '1'
*/
- if (global.AllowCors || Logger.isDev || req.path.match(/\/api\/items\/([a-z0-9-]{36})\/(ebook|cover)(\/[0-9]+)?/) || global.ServerSettings.allowedOrigins?.length) {
- const allowedOrigins = ['capacitor://localhost', 'http://localhost', ...(global.ServerSettings.allowedOrigins ? global.ServerSettings.allowedOrigins : [])]
+ if (global.AllowCors || Logger.isDev || req.path.match(/\/api\/items\/([a-z0-9-]{36})\/(ebook|cover)(\/[0-9]+)?/)) {
+ const allowedOrigins = ['capacitor://localhost', 'http://localhost']
if (global.AllowCors || 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')
@@ -289,9 +283,10 @@ class Server {
// if RouterBasePath is set, modify all requests to include the base path
app.use((req, res, next) => {
const urlStartsWithRouterBasePath = req.url.startsWith(global.RouterBasePath)
- const { origin } = getRequestOrigin(req)
+ const host = req.get('host')
+ const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http'
const prefix = urlStartsWithRouterBasePath ? global.RouterBasePath : ''
- req.originalHostPrefix = `${origin}${prefix}`
+ req.originalHostPrefix = `${protocol}://${host}${prefix}`
if (!urlStartsWithRouterBasePath) {
req.url = `${global.RouterBasePath}${req.url}`
}
@@ -302,9 +297,7 @@ class Server {
this.server = http.createServer(app)
- // Skip file upload parsing for internal-api routes (Next.js proxies read multipart bodies).
router.use(
- /^(?!\/internal-api).*/,
fileUpload({
defCharset: 'utf8',
defParamCharset: 'utf8',
@@ -409,7 +402,8 @@ class Server {
const nextApp = next({ dev: Logger.isDev, dir: ReactClientPath })
const handle = nextApp.getRequestHandler()
await nextApp.prepare()
- router.all('*', (req, res) => handle(req, res))
+ router.get('*', (req, res) => handle(req, res))
+ router.post('/internal-api/*', (req, res) => handle(req, res))
}
const unixSocketPrefix = 'unix/'
@@ -421,7 +415,7 @@ class Server {
})
} else {
this.server.listen(this.Port, this.Host, () => {
- if (this.Host) Logger.info(`Listening on http://${is.ipv6(this.Host) ? `[${this.Host}]` : this.Host}:${this.Port}`)
+ if (this.Host) Logger.info(`Listening on http://${this.Host}:${this.Port}`)
else Logger.info(`Listening on port :${this.Port}`)
})
}
diff --git a/server/SocketAuthority.js b/server/SocketAuthority.js
index a54231d75..da31ba4a0 100644
--- a/server/SocketAuthority.js
+++ b/server/SocketAuthority.js
@@ -2,8 +2,6 @@ const SocketIO = require('socket.io')
const Logger = require('./Logger')
const Database = require('./Database')
const TokenManager = require('./auth/TokenManager')
-const CoverSearchManager = require('./managers/CoverSearchManager')
-const { LogLevel } = require('./utils/constants')
/**
* @typedef SocketClient
@@ -86,14 +84,6 @@ class SocketAuthority {
}
}
- requireAdminSocket(socket, eventName) {
- const client = this.clients[socket.id]
- if (client?.user?.isAdminOrUp) return true
-
- Logger.warn(`[SocketAuthority] Unauthorized ${eventName} socket event from socket ${socket.id}`)
- return false
- }
-
/**
* Emits event with library item to all clients that can access the library item
* Note: Emits toOldJSONExpanded()
@@ -188,25 +178,10 @@ class SocketAuthority {
socket.on('auth', (token) => this.authenticateSocket(socket, token))
// Scanning
- socket.on('cancel_scan', (libraryId) => {
- if (!this.requireAdminSocket(socket, 'cancel_scan')) return
- this.cancelScan(libraryId)
- })
-
- // Cover search streaming
- socket.on('search_covers', (payload) => this.handleCoverSearch(socket, payload))
- socket.on('cancel_cover_search', (requestId) => this.handleCancelCoverSearch(socket, requestId))
+ socket.on('cancel_scan', (libraryId) => this.cancelScan(libraryId))
// Logs
- socket.on('set_log_listener', (level) => {
- if (!this.requireAdminSocket(socket, 'set_log_listener')) return
-
- if (!Number.isInteger(level) || !Object.values(LogLevel).includes(level)) {
- Logger.warn(`[SocketAuthority] Invalid set_log_listener level from socket ${socket.id}`)
- return
- }
- Logger.addSocketListener(socket, level)
- })
+ socket.on('set_log_listener', (level) => Logger.addSocketListener(socket, level))
socket.on('remove_log_listener', () => Logger.removeSocketListener(socket.id))
// Sent automatically from socket.io clients
@@ -225,10 +200,6 @@ class SocketAuthority {
const disconnectTime = Date.now() - _client.connected_at
Logger.info(`[SocketAuthority] Socket ${socket.id} disconnected from client "${_client.user.username}" after ${disconnectTime}ms (Reason: ${reason})`)
-
- // Cancel any active cover searches for this socket
- this.cancelSocketCoverSearches(socket.id)
-
delete this.clients[socket.id]
}
})
@@ -329,100 +300,5 @@ class SocketAuthority {
Logger.debug('[SocketAuthority] Cancel scan', id)
this.Server.cancelLibraryScan(id)
}
-
- /**
- * Handle cover search request via WebSocket
- * @param {SocketIO.Socket} socket
- * @param {Object} payload
- */
- async handleCoverSearch(socket, payload) {
- const client = this.clients[socket.id]
- if (!client?.user) {
- Logger.error('[SocketAuthority] Unauthorized cover search request')
- socket.emit('cover_search_error', {
- requestId: payload.requestId,
- error: 'Unauthorized'
- })
- return
- }
-
- const { requestId, title, author, provider, podcast } = payload
-
- if (!requestId || !title) {
- Logger.error('[SocketAuthority] Invalid cover search request')
- socket.emit('cover_search_error', {
- requestId,
- error: 'Invalid request parameters'
- })
- return
- }
-
- Logger.info(`[SocketAuthority] User ${client.user.username} initiated cover search ${requestId}`)
-
- // Callback for streaming results to client
- const onResult = (result) => {
- socket.emit('cover_search_result', {
- requestId,
- provider: result.provider,
- covers: result.covers,
- total: result.total
- })
- }
-
- // Callback when search completes
- const onComplete = () => {
- Logger.info(`[SocketAuthority] Cover search ${requestId} completed`)
- socket.emit('cover_search_complete', { requestId })
- }
-
- // Callback for provider errors
- const onError = (provider, errorMessage) => {
- socket.emit('cover_search_provider_error', {
- requestId,
- provider,
- error: errorMessage
- })
- }
-
- // Start the search
- CoverSearchManager.startSearch(requestId, { title, author, provider, podcast }, onResult, onComplete, onError).catch((error) => {
- Logger.error(`[SocketAuthority] Cover search ${requestId} failed:`, error)
- socket.emit('cover_search_error', {
- requestId,
- error: error.message
- })
- })
- }
-
- /**
- * Handle cancel cover search request
- * @param {SocketIO.Socket} socket
- * @param {string} requestId
- */
- handleCancelCoverSearch(socket, requestId) {
- const client = this.clients[socket.id]
- if (!client?.user) {
- Logger.error('[SocketAuthority] Unauthorized cancel cover search request')
- return
- }
-
- Logger.info(`[SocketAuthority] User ${client.user.username} cancelled cover search ${requestId}`)
-
- const cancelled = CoverSearchManager.cancelSearch(requestId)
- if (cancelled) {
- socket.emit('cover_search_cancelled', { requestId })
- }
- }
-
- /**
- * Cancel all cover searches associated with a socket (called on disconnect)
- * @param {string} socketId
- */
- cancelSocketCoverSearches(socketId) {
- // Get all active search request IDs and cancel those that might belong to this socket
- // Since we don't track socket-to-request mapping, we log this for debugging
- // The client will handle reconnection gracefully
- Logger.debug(`[SocketAuthority] Socket ${socketId} disconnected, any active searches will timeout`)
- }
}
module.exports = new SocketAuthority()
diff --git a/server/auth/OidcAuthStrategy.js b/server/auth/OidcAuthStrategy.js
index 0997b7cf3..9a515c1a2 100644
--- a/server/auth/OidcAuthStrategy.js
+++ b/server/auth/OidcAuthStrategy.js
@@ -4,7 +4,6 @@ const OpenIDClient = require('openid-client')
const axios = require('axios')
const Database = require('../Database')
const Logger = require('../Logger')
-const { getRequestOrigin } = require('../utils/requestUtils')
/**
* OpenID Connect authentication strategy
@@ -111,8 +110,6 @@ class OidcAuthStrategy {
* @param {Function} done - Passport callback
*/
async verifyCallback(tokenset, userinfo, done) {
- let isNewUser = false
- let user = null
try {
Logger.debug(`[OidcAuth] openid callback userinfo=`, JSON.stringify(userinfo, null, 2))
@@ -124,24 +121,9 @@ class OidcAuthStrategy {
throw new Error(`Group claim ${Database.serverSettings.authOpenIDGroupClaim} not found or empty in userinfo`)
}
- user = await Database.userModel.findUserFromOpenIdUserInfo(userinfo)
+ let user = await Database.userModel.findOrCreateUserFromOpenIdUserInfo(userinfo)
- if (user?.error) {
- throw new Error('Invalid userinfo or already linked')
- }
-
- if (!user) {
- // If no existing user was matched, auto-register if configured
- if (global.ServerSettings.authOpenIDAutoRegister) {
- Logger.info(`[User] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo)
- user = await Database.userModel.createUserFromOpenIdUserInfo(userinfo)
- isNewUser = true
- } else {
- Logger.warn(`[User] openid: User not found and auto-register is disabled`)
- }
- }
-
- if (!user.isActive) {
+ if (!user?.isActive) {
throw new Error('User not active or not found')
}
@@ -154,10 +136,6 @@ class OidcAuthStrategy {
return done(null, user)
} catch (error) {
Logger.error(`[OidcAuth] openid callback error: ${error?.message}\n${error?.stack}`)
- // Remove new user if an error occurs
- if (isNewUser && user) {
- await user.destroy()
- }
return done(null, null, 'Unauthorized')
}
}
@@ -290,8 +268,8 @@ class OidcAuthStrategy {
const sessionKey = strategy._key
try {
- const { origin } = getRequestOrigin(req)
- const hostUrl = new URL(origin)
+ const protocol = req.secure || req.get('x-forwarded-proto') === 'https' ? 'https' : 'http'
+ const hostUrl = new URL(`${protocol}://${req.get('host')}`)
const isMobileFlow = req.query.response_type === 'code' || req.query.redirect_uri || req.query.code_challenge
// Only allow code flow (for mobile clients)
@@ -395,10 +373,11 @@ class OidcAuthStrategy {
let postLogoutRedirectUri = null
if (authMethod === 'openid') {
- const { origin } = getRequestOrigin(req)
+ 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 = `${origin}${global.RouterBasePath}/login`
+ postLogoutRedirectUri = `${protocol}://${host}${global.RouterBasePath}/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
@@ -504,49 +483,6 @@ class OidcAuthStrategy {
res.status(500).send('Internal Server Error')
}
}
-
- /**
- * Validates if a callback URL is safe for redirect (same-origin only)
- * @param {string} callbackUrl - The callback URL to validate
- * @param {Request} req - Express request object to get current host
- * @returns {boolean} - True if the URL is safe (same-origin), false otherwise
- */
- isValidWebCallbackUrl(callbackUrl, req) {
- if (!callbackUrl) return false
-
- try {
- // Reject protocol-relative (//host) and backslash-prefixed (/\host) values,
- // which browsers resolve to a cross-origin absolute URL.
- if (callbackUrl.startsWith('//') || callbackUrl.startsWith('/\\')) {
- Logger.warn(`[OidcAuth] Rejected protocol-relative callback URL: ${callbackUrl}`)
- return false
- }
-
- const { origin: serverOrigin } = getRequestOrigin(req)
- const resolvedUrl = callbackUrl.startsWith('/') ? new URL(callbackUrl, serverOrigin) : new URL(callbackUrl)
-
- if (resolvedUrl.origin !== serverOrigin) {
- Logger.warn(`[OidcAuth] Rejected callback URL to different origin: ${callbackUrl} (expected ${serverOrigin})`)
- return false
- }
-
- const pathname = decodeURIComponent(resolvedUrl.pathname)
- if (pathname.startsWith('//') || pathname.startsWith('/\\')) {
- Logger.warn(`[OidcAuth] Rejected protocol-relative callback URL path: ${callbackUrl}`)
- return false
- }
-
- if (!resolvedUrl.pathname.startsWith(global.RouterBasePath + '/')) {
- Logger.warn(`[OidcAuth] Rejected callback URL outside router base path: ${callbackUrl}`)
- return false
- }
-
- return true
- } catch (error) {
- Logger.error(`[OidcAuth] Invalid callback URL format: ${callbackUrl}`, error)
- return false
- }
- }
}
module.exports = OidcAuthStrategy
diff --git a/server/auth/TokenManager.js b/server/auth/TokenManager.js
index 1f0417622..d972b5345 100644
--- a/server/auth/TokenManager.js
+++ b/server/auth/TokenManager.js
@@ -1,12 +1,10 @@
const { Op } = require('sequelize')
-const uuid = require('uuid')
const Database = require('../Database')
const Logger = require('../Logger')
const requestIp = require('../libs/requestIp')
const jwt = require('../libs/jsonwebtoken')
-const { isRequestSecure } = require('../utils/requestUtils')
class TokenManager {
/** @type {string} JWT secret key */
@@ -14,11 +12,9 @@ class TokenManager {
constructor() {
/** @type {number} Refresh token expiry in seconds */
- this.RefreshTokenExpiry = parseInt(process.env.REFRESH_TOKEN_EXPIRY) || 30 * 24 * 60 * 60 // 30 days
+ this.RefreshTokenExpiry = parseInt(process.env.REFRESH_TOKEN_EXPIRY) || 7 * 24 * 60 * 60 // 7 days
/** @type {number} Access token expiry in seconds */
- this.AccessTokenExpiry = parseInt(process.env.ACCESS_TOKEN_EXPIRY) || 1 * 60 * 60 // 1 hour
- /** @type {number} Grace period in seconds during which a rotated (old) refresh token is still accepted */
- this.RefreshTokenGracePeriod = parseInt(process.env.REFRESH_TOKEN_GRACE_PERIOD) || 10 * 60 // 10 minutes
+ this.AccessTokenExpiry = parseInt(process.env.ACCESS_TOKEN_EXPIRY) || 12 * 60 * 60 // 12 hours
if (parseInt(process.env.REFRESH_TOKEN_EXPIRY) > 0) {
Logger.info(`[TokenManager] Refresh token expiry set from ENV variable to ${this.RefreshTokenExpiry} seconds`)
@@ -26,9 +22,6 @@ class TokenManager {
if (parseInt(process.env.ACCESS_TOKEN_EXPIRY) > 0) {
Logger.info(`[TokenManager] Access token expiry set from ENV variable to ${this.AccessTokenExpiry} seconds`)
}
- if (parseInt(process.env.REFRESH_TOKEN_GRACE_PERIOD) > 0) {
- Logger.info(`[TokenManager] Refresh token grace period set from ENV variable to ${this.RefreshTokenGracePeriod} seconds`)
- }
}
get TokenSecret() {
@@ -65,25 +58,13 @@ class TokenManager {
setRefreshTokenCookie(req, res, refreshToken) {
res.cookie('refresh_token', refreshToken, {
httpOnly: true,
- secure: isRequestSecure(req),
+ secure: req.secure || req.get('x-forwarded-proto') === 'https',
sameSite: 'lax',
maxAge: this.RefreshTokenExpiry * 1000,
path: '/'
})
}
- /**
- * Whether a decoded JWT payload may authenticate API/socket requests (not refresh-only credentials).
- *
- * @param {Object} decoded
- * @returns {boolean}
- */
- static isBearerAccessTokenPayload(decoded) {
- if (!decoded?.userId) return false
- if (decoded.type === 'refresh') return false
- return true
- }
-
/**
* Function to validate a jwt token for a given user
* Used to authenticate socket connections
@@ -94,9 +75,7 @@ class TokenManager {
*/
static validateAccessToken(token) {
try {
- const decoded = jwt.verify(token, TokenManager.TokenSecret)
- if (!TokenManager.isBearerAccessTokenPayload(decoded)) return null
- return decoded
+ return jwt.verify(token, TokenManager.TokenSecret)
} catch (err) {
return null
}
@@ -136,7 +115,6 @@ class TokenManager {
const payload = {
userId: user.id,
username: user.username,
- jti: uuid.v4(),
type: 'access'
}
const options = {
@@ -160,7 +138,6 @@ class TokenManager {
const payload = {
userId: user.id,
username: user.username,
- jti: uuid.v4(),
type: 'refresh'
}
const options = {
@@ -206,60 +183,20 @@ class TokenManager {
* @param {import('../models/User')} user
* @param {import('express').Request} req
* @param {import('express').Response} res
- * @param {boolean} gracePeriod - whether to use the grace period
* @returns {Promise<{ accessToken:string, refreshToken:string }>}
*/
- async rotateTokensForSession(session, user, req, res, gracePeriod = true) {
- const previousRefreshToken = session.refreshToken
+ async rotateTokensForSession(session, user, req, res) {
+ // Generate new tokens
const newAccessToken = this.generateTempAccessToken(user)
- let newRefreshToken = this.generateRefreshToken(user)
+ const newRefreshToken = this.generateRefreshToken(user)
+
+ // Calculate new expiration time
const newExpiresAt = new Date(Date.now() + this.RefreshTokenExpiry * 1000)
- let lastRefreshToken = null
- let lastRefreshTokenExpiresAt = null
- if (gracePeriod) {
- // Set grace period of old refresh token in case of race condition in token rotation.
- // During this window a retry with the old refresh token returns the already-rotated
- // current token instead of failing, so a client that never received the rotation
- // response (e.g. dropped/suspended mobile request) can still recover the session.
- // Configurable via REFRESH_TOKEN_GRACE_PERIOD; may need to be longer if fetching the
- // user data takes longer due to large progress objects.
- lastRefreshToken = previousRefreshToken
- lastRefreshTokenExpiresAt = new Date(Date.now() + this.RefreshTokenGracePeriod * 1000)
- }
-
- // Only update if this session row still has the refresh token we read
- const [numUpdated] = await Database.sessionModel.update(
- {
- refreshToken: newRefreshToken,
- expiresAt: newExpiresAt,
- lastRefreshToken,
- lastRefreshTokenExpiresAt
- },
- {
- where: {
- id: session.id,
- refreshToken: previousRefreshToken
- }
- }
- )
-
- if (numUpdated === 0) {
- Logger.debug(`[TokenManager] Race condition in rotateTokensForSession for user ${user.id}, getting new token`)
-
- const updatedSession = await Database.sessionModel.findOne({ where: { id: session.id } })
-
- newRefreshToken = updatedSession.refreshToken
- session.refreshToken = updatedSession.refreshToken
- session.expiresAt = updatedSession.expiresAt
- session.lastRefreshToken = updatedSession.lastRefreshToken
- session.lastRefreshTokenExpiresAt = updatedSession.lastRefreshTokenExpiresAt
- } else {
- session.refreshToken = newRefreshToken
- session.expiresAt = newExpiresAt
- session.lastRefreshToken = lastRefreshToken
- session.lastRefreshTokenExpiresAt = lastRefreshTokenExpiresAt
- }
+ // Update the session with the new refresh token and expiration
+ session.refreshToken = newRefreshToken
+ session.expiresAt = newExpiresAt
+ await session.save()
// Set new refresh token cookie
this.setRefreshTokenCookie(req, res, newRefreshToken)
@@ -297,20 +234,9 @@ class TokenManager {
}
const user = await Database.userModel.getUserById(apiKey.userId)
-
- if (!user?.isActive) {
- // deny login
- done(null, null)
- return
- }
-
done(null, user)
} else {
- // JWT based authentication â refresh tokens are only valid at POST /auth/refresh
- if (!TokenManager.isBearerAccessTokenPayload(jwt_payload)) {
- done(null, null)
- return
- }
+ // JWT based authentication
// Check if the jwt is expired
if (jwt_payload.exp && jwt_payload.exp < Date.now() / 1000) {
@@ -361,40 +287,23 @@ class TokenManager {
}
}
- let session = await Database.sessionModel.findOne({
- where: {
- [Op.or]: [{ refreshToken: refreshToken }, { lastRefreshToken: refreshToken }]
- }
+ const session = await Database.sessionModel.findOne({
+ where: { refreshToken: refreshToken }
})
if (!session) {
- Logger.error(`[TokenManager] Failed to refresh token. Session not found`)
+ Logger.error(`[TokenManager] Failed to refresh token. Session not found for refresh token: ${refreshToken}`)
return {
error: 'Invalid refresh token'
}
}
- let isGracePeriod = false
- if (session.refreshToken !== refreshToken) {
- // Token matched lastRefreshToken
- if (session.lastRefreshTokenExpiresAt && session.lastRefreshTokenExpiresAt > new Date()) {
- isGracePeriod = true
- Logger.debug(`[TokenManager] Grace period hit for user ${session.userId}`)
- } else {
- Logger.debug(`[TokenManager] Grace period expired for user ${session.userId}`)
- return {
- error: 'Invalid refresh token'
- }
- }
- } else {
- // Token matched current refreshToken
- // Check if session is expired in database
- if (session.expiresAt < new Date()) {
- Logger.info(`[TokenManager] Session expired in database, cleaning up`)
- await session.destroy()
- return {
- error: 'Refresh token expired'
- }
+ // Check if session is expired in database
+ if (session.expiresAt < new Date()) {
+ Logger.info(`[TokenManager] Session expired in database, cleaning up`)
+ await session.destroy()
+ return {
+ error: 'Refresh token expired'
}
}
@@ -406,20 +315,6 @@ class TokenManager {
}
}
- if (isGracePeriod) {
- // Return the already rotated refresh token store in the database,
- // and generate a new access token without changing the refresh token
- // again
- const accessToken = this.generateTempAccessToken(user)
- this.setRefreshTokenCookie(req, res, session.refreshToken)
-
- return {
- accessToken,
- refreshToken: session.refreshToken,
- user
- }
- }
-
const newTokens = await this.rotateTokensForSession(session, user, req, res)
return {
accessToken: newTokens.accessToken,
@@ -464,21 +359,16 @@ class TokenManager {
* @param {import('../models/User')} user
* @param {import('express').Request} req
* @param {import('express').Response} res
- * @returns {Promise<{ accessToken:string, refreshToken:string }|null>} new tokens for the current session if kept alive
+ * @returns {Promise} accessToken only if user is current user and refresh token is valid
*/
async invalidateJwtSessionsForUser(user, req, res) {
- const currentRefreshToken = req.cookies.refresh_token || req.headers['x-refresh-token']
+ const currentRefreshToken = req.cookies.refresh_token
if (req.user.id === user.id && currentRefreshToken) {
// Current user is the same as the user to invalidate sessions for
// So rotate token for current session
- const currentSession = await Database.sessionModel.findOne({
- where: {
- userId: user.id,
- [Op.or]: [{ refreshToken: currentRefreshToken }, { lastRefreshToken: currentRefreshToken }]
- }
- })
+ const currentSession = await Database.sessionModel.findOne({ where: { refreshToken: currentRefreshToken } })
if (currentSession) {
- const newTokens = await this.rotateTokensForSession(currentSession, user, req, res, false)
+ const newTokens = await this.rotateTokensForSession(currentSession, user, req, res)
// Invalidate all sessions for the user except the current one
await Database.sessionModel.destroy({
@@ -490,12 +380,9 @@ class TokenManager {
}
})
- return {
- accessToken: newTokens.accessToken,
- refreshToken: newTokens.refreshToken
- }
+ return newTokens.accessToken
} else {
- Logger.error(`[TokenManager] No session found to rotate tokens`)
+ Logger.error(`[TokenManager] No session found to rotate tokens for refresh token ${currentRefreshToken}`)
}
}
@@ -505,25 +392,6 @@ class TokenManager {
return null
}
- /**
- * Destroy all JWT sessions for the user that owns this refresh token
- *
- * @param {string} refreshToken
- */
- async invalidateAllSessionsForRefreshToken(refreshToken) {
- if (!refreshToken) return
-
- const session = await Database.sessionModel.findOne({
- where: {
- [Op.or]: [{ refreshToken: refreshToken }, { lastRefreshToken: refreshToken }]
- }
- })
- if (!session) return
-
- const numDeleted = await Database.sessionModel.destroy({ where: { userId: session.userId } })
- Logger.info(`[TokenManager] Invalidated all JWT sessions for user ${session.userId}, ${numDeleted} deleted`)
- }
-
/**
* Invalidate a refresh token - used for logout
*
@@ -538,7 +406,7 @@ class TokenManager {
try {
const numDeleted = await Database.sessionModel.destroy({ where: { refreshToken: refreshToken } })
- Logger.info(`[TokenManager] Refresh token invalidated, ${numDeleted} sessions deleted`)
+ Logger.info(`[TokenManager] Refresh token ${refreshToken} invalidated, ${numDeleted} sessions deleted`)
return true
} catch (error) {
Logger.error(`[TokenManager] Error invalidating refresh token: ${error.message}`)
diff --git a/server/controllers/AuthorController.js b/server/controllers/AuthorController.js
index 8c2e80aec..50eeda31a 100644
--- a/server/controllers/AuthorController.js
+++ b/server/controllers/AuthorController.js
@@ -10,7 +10,7 @@ const CacheManager = require('../managers/CacheManager')
const CoverManager = require('../managers/CoverManager')
const AuthorFinder = require('../finders/AuthorFinder')
-const { reqSupportsWebp, isValidASIN, clampPositiveInt } = require('../utils/index')
+const { reqSupportsWebp, isValidASIN } = require('../utils/index')
const naturalSort = createNewSortInstance({
comparer: new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' }).compare
@@ -113,7 +113,7 @@ class AuthorController {
payload.lastFirst = Database.authorModel.getLastFirst(payload.name)
}
- // Check if author name matches another author in the same library and merge the authors
+ // Check if author name matches another author and merge the authors
let existingAuthor = null
if (authorNameUpdate) {
existingAuthor = await Database.authorModel.findOne({
@@ -121,8 +121,7 @@ class AuthorController {
id: {
[sequelize.Op.not]: req.author.id
},
- name: payload.name,
- libraryId: req.author.libraryId
+ name: payload.name
}
})
}
@@ -149,7 +148,7 @@ class AuthorController {
})
if (libraryItems.length) {
await Database.bookAuthorModel.removeByIds(req.author.id) // Remove all old BookAuthor
- await Database.bookAuthorModel.bulkCreate(bookAuthorsToCreate, { ignoreDuplicates: true }) // Create all new unique BookAuthor
+ await Database.bookAuthorModel.bulkCreate(bookAuthorsToCreate) // Create all new BookAuthor
for (const libraryItem of libraryItems) {
await libraryItem.saveMetadataFile()
}
@@ -412,8 +411,8 @@ class AuthorController {
const options = {
format: format || (reqSupportsWebp(req) ? 'webp' : 'jpeg'),
- height: clampPositiveInt(height ? parseInt(height) : null, 4096),
- width: clampPositiveInt(width ? parseInt(width) : null, 4096)
+ height: height ? parseInt(height) : null,
+ width: width ? parseInt(width) : null
}
return CacheManager.handleAuthorCache(res, authorId, options)
}
diff --git a/server/controllers/CollectionController.js b/server/controllers/CollectionController.js
index bb00ea346..475adfe0f 100644
--- a/server/controllers/CollectionController.js
+++ b/server/controllers/CollectionController.js
@@ -3,7 +3,6 @@ const Sequelize = require('sequelize')
const Logger = require('../Logger')
const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
-const htmlSanitizer = require('../utils/htmlSanitizer')
const RssFeedManager = require('../managers/RssFeedManager')
@@ -32,19 +31,13 @@ class CollectionController {
async create(req, res) {
const reqBody = req.body || {}
- const nameCleaned = htmlSanitizer.stripAllTags(reqBody.name)
-
// Validation
- if (!nameCleaned || !reqBody.libraryId) {
+ if (!reqBody.name || !reqBody.libraryId) {
return res.status(400).send('Invalid collection data')
}
if (reqBody.description && typeof reqBody.description !== 'string') {
return res.status(400).send('Invalid collection description')
}
- if (!req.user.checkCanAccessLibrary(reqBody.libraryId)) {
- Logger.warn(`[CollectionController] User "${req.user.username}" attempted to create collection in inaccessible library ${reqBody.libraryId}`)
- return res.sendStatus(403)
- }
const libraryItemIds = (reqBody.books || []).filter((b) => !!b && typeof b == 'string')
if (!libraryItemIds.length) {
return res.status(400).send('Invalid collection data. No books')
@@ -72,7 +65,7 @@ class CollectionController {
newCollection = await Database.collectionModel.create(
{
libraryId: reqBody.libraryId,
- name: nameCleaned,
+ name: reqBody.name,
description: reqBody.description || null
},
{ transaction }
@@ -113,9 +106,8 @@ class CollectionController {
*/
async findAll(req, res) {
const collectionsExpanded = await Database.collectionModel.getOldCollectionsJsonExpanded(req.user)
- const accessibleCollections = collectionsExpanded.filter((c) => req.user.checkCanAccessLibrary(c.libraryId))
res.json({
- collections: accessibleCollections
+ collections: collectionsExpanded
})
}
@@ -153,12 +145,9 @@ class CollectionController {
collectionUpdatePayload.description = req.body.description
wasUpdated = true
}
- if (req.body.name !== undefined && typeof req.body.name === 'string') {
- const nameCleaned = htmlSanitizer.stripAllTags(req.body.name)
- if (nameCleaned !== req.collection.name) {
- collectionUpdatePayload.name = nameCleaned
- wasUpdated = true
- }
+ if (req.body.name !== undefined && req.body.name !== req.collection.name) {
+ collectionUpdatePayload.name = req.body.name
+ wasUpdated = true
}
if (wasUpdated) {
@@ -436,10 +425,6 @@ class CollectionController {
if (!collection) {
return res.status(404).send('Collection not found')
}
- if (!req.user.checkCanAccessLibrary(collection.libraryId)) {
- Logger.warn(`[CollectionController] User "${req.user.username}" attempted to access collection ${collection.id} in inaccessible library ${collection.libraryId}`)
- return res.status(404).send('Collection not found')
- }
req.collection = collection
}
diff --git a/server/controllers/FileSystemController.js b/server/controllers/FileSystemController.js
index 41e082fd4..4b0a94b39 100644
--- a/server/controllers/FileSystemController.js
+++ b/server/controllers/FileSystemController.js
@@ -117,7 +117,7 @@ class FileSystemController {
filepath = fileUtils.filePathToPOSIX(filepath)
// Ensure filepath is inside library folder (prevents directory traversal)
- if (!fileUtils.isSameOrSubPath(libraryFolder.path, filepath)) {
+ if (!filepath.startsWith(libraryFolder.path)) {
Logger.error(`[FileSystemController] Filepath is not inside library folder: ${filepath}`)
return res.sendStatus(400)
}
diff --git a/server/controllers/LibraryController.js b/server/controllers/LibraryController.js
index 71f210106..e63441f0b 100644
--- a/server/controllers/LibraryController.js
+++ b/server/controllers/LibraryController.js
@@ -221,11 +221,13 @@ class LibraryController {
const includeArray = (req.query.include || '').split(',')
if (includeArray.includes('filterdata')) {
const filterdata = await libraryFilters.getFilterData(req.library.mediaType, req.library.id)
+ const customMetadataProviders = await Database.customMetadataProviderModel.getForClientByMediaType(req.library.mediaType)
return res.json({
filterdata,
issues: filterdata.numIssues,
numUserPlaylists: await Database.playlistModel.getNumPlaylistsForUserAndLibrary(req.user.id, req.library.id),
+ customMetadataProviders,
library: req.library.toOldJSON()
})
}
@@ -462,7 +464,7 @@ class LibraryController {
}
}
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from folder "${folder.path}"`)
- await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id)
+ await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
}
if (authorIds.length) {
@@ -563,7 +565,7 @@ class LibraryController {
mediaItemIds.push(libraryItem.mediaId)
}
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" from library "${req.library.name}"`)
- await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id)
+ await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
}
// Set PlaybackSessions libraryId to null
@@ -714,7 +716,7 @@ class LibraryController {
}
}
Logger.info(`[LibraryController] Removing library item "${libraryItem.id}" with issue`)
- await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, req.library.id)
+ await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
}
if (authorIds.length) {
@@ -1432,20 +1434,12 @@ class LibraryController {
const itemIds = req.query.ids.split(',')
- const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({
- id: itemIds,
- libraryId: req.library.id
- })
-
- for (const libraryItem of libraryItems) {
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- return res.sendStatus(403)
+ const libraryItems = await Database.libraryItemModel.findAll({
+ attributes: ['id', 'libraryId', 'path', 'isFile'],
+ where: {
+ id: itemIds
}
- }
-
- if (libraryItems.length < itemIds.length) {
- Logger.warn(`[LibraryController] User "${req.user.username}" requested ${itemIds.length} items but only ${libraryItems.length} are in library "${req.library.id}"`)
- }
+ })
Logger.info(`[LibraryController] User "${req.user.username}" requested download for items "${itemIds}"`)
diff --git a/server/controllers/LibraryItemController.js b/server/controllers/LibraryItemController.js
index 07b4ee67f..5247dbb06 100644
--- a/server/controllers/LibraryItemController.js
+++ b/server/controllers/LibraryItemController.js
@@ -1,14 +1,13 @@
const { Request, Response, NextFunction } = require('express')
const Path = require('path')
const fs = require('../libs/fsExtra')
-const cron = require('../libs/nodeCron')
const uaParserJs = require('../libs/uaParser')
const Logger = require('../Logger')
const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
const zipHelpers = require('../utils/zipHelpers')
-const { reqSupportsWebp, clampPositiveInt } = require('../utils/index')
+const { reqSupportsWebp } = require('../utils/index')
const { ScanResult, AudioMimeType } = require('../utils/constants')
const { getAudioMimeTypeFromExtname, encodeUriPath } = require('../utils/fileUtils')
const LibraryItemScanner = require('../scanner/LibraryItemScanner')
@@ -37,24 +36,6 @@ const ShareManager = require('../managers/ShareManager')
* @typedef {RequestWithUser & RequestEntityObject & RequestLibraryFileObject} LibraryItemControllerRequestWithFile
*/
-/**
- * Enforce per-item access for batch item routes
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- * @param {import('../models/LibraryItem')[]} libraryItems
- * @returns {boolean} true if the user may access every item; false if 403 was sent
- */
-function ensureUserCanAccessLibraryItemsForBatch(req, res, libraryItems) {
- for (const libraryItem of libraryItems) {
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- res.sendStatus(403)
- return false
- }
- }
- return true
-}
-
class LibraryItemController {
constructor() {}
@@ -130,7 +111,7 @@ class LibraryItemController {
}
}
- await this.handleDeleteLibraryItem(req.libraryItem.id, mediaItemIds, req.libraryItem.libraryId)
+ await this.handleDeleteLibraryItem(req.libraryItem.id, mediaItemIds)
if (hardDelete) {
Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`)
await fs.remove(libraryItemPath).catch((error) => {
@@ -221,11 +202,6 @@ class LibraryItemController {
} else if (mediaPayload.autoDownloadSchedule !== undefined && req.libraryItem.media.autoDownloadSchedule !== mediaPayload.autoDownloadSchedule) {
isPodcastAutoDownloadUpdated = true
}
-
- if (mediaPayload.autoDownloadSchedule && !cron.validate(mediaPayload.autoDownloadSchedule)) {
- Logger.error(`[LibraryItemController] Invalid auto download schedule cron expression "${mediaPayload.autoDownloadSchedule}" for library item "${req.libraryItem.media.title}"`)
- return res.status(400).send('Invalid auto download schedule cron expression')
- }
}
let hasUpdates = (await req.libraryItem.media.updateFromRequest(mediaPayload)) || mediaPayload.url
@@ -422,8 +398,8 @@ class LibraryItemController {
const options = {
format: format || (reqSupportsWebp(req) ? 'webp' : 'jpeg'),
- height: clampPositiveInt(height ? parseInt(height) : null, 4096),
- width: clampPositiveInt(width ? parseInt(width) : null, 4096)
+ height: height ? parseInt(height) : null,
+ width: width ? parseInt(width) : null
}
return CacheManager.handleCoverCache(res, libraryItemId, options)
}
@@ -571,13 +547,7 @@ class LibraryItemController {
return res.sendStatus(404)
}
- // Ensure user has permission to delete these library items
- if (!ensureUserCanAccessLibraryItemsForBatch(req, res, itemsToDelete)) {
- return
- }
-
const libraryId = itemsToDelete[0].libraryId
-
for (const libraryItem of itemsToDelete) {
const libraryItemPath = libraryItem.path
Logger.info(`[LibraryItemController] (${hardDelete ? 'Hard' : 'Soft'}) deleting Library Item "${libraryItem.media.title}" with id "${libraryItem.id}"`)
@@ -595,7 +565,7 @@ class LibraryItemController {
authorIds.push(...libraryItem.media.authors.map((au) => au.id))
}
}
- await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds, libraryItem.libraryId)
+ await this.handleDeleteLibraryItem(libraryItem.id, mediaItemIds)
if (hardDelete) {
Logger.info(`[LibraryItemController] Deleting library item from file system at "${libraryItemPath}"`)
await fs.remove(libraryItemPath).catch((error) => {
@@ -611,7 +581,6 @@ class LibraryItemController {
}
await Database.resetLibraryIssuesFilterData(libraryId)
-
res.sendStatus(200)
}
@@ -624,11 +593,6 @@ class LibraryItemController {
* @param {Response} res
*/
async batchUpdate(req, res) {
- if (!req.user.canUpdate) {
- Logger.warn(`[LibraryItemController] User "${req.user.username}" attempted to batch update without permission`)
- return res.sendStatus(403)
- }
-
const updatePayloads = req.body
if (!Array.isArray(updatePayloads) || !updatePayloads.length) {
Logger.error(`[LibraryItemController] Batch update failed. Invalid payload`)
@@ -651,11 +615,6 @@ class LibraryItemController {
return res.sendStatus(404)
}
- // Ensure user has permission to update these library items
- if (!ensureUserCanAccessLibraryItemsForBatch(req, res, libraryItems)) {
- return
- }
-
let itemsUpdated = 0
const seriesIdsRemoved = []
@@ -665,11 +624,6 @@ class LibraryItemController {
const mediaPayload = updatePayload.mediaPayload
const libraryItem = libraryItems.find((li) => li.id === updatePayload.id)
- if (libraryItem.isPodcast && mediaPayload.autoDownloadSchedule && !cron.validate(mediaPayload.autoDownloadSchedule)) {
- Logger.warn(`[LibraryItemController] Invalid auto download schedule cron expression "${mediaPayload.autoDownloadSchedule}" for library item "${libraryItem.media.title}" - skipping update`)
- continue
- }
-
let hasUpdates = await libraryItem.media.updateFromRequest(mediaPayload)
if (libraryItem.isBook && Array.isArray(mediaPayload.metadata?.series)) {
@@ -741,10 +695,6 @@ class LibraryItemController {
const libraryItems = await Database.libraryItemModel.findAllExpandedWhere({
id: libraryItemIds
})
- // Ensure user has permission to access these library items
- if (!ensureUserCanAccessLibraryItemsForBatch(req, res, libraryItems)) {
- return
- }
res.json({
libraryItems: libraryItems.map((li) => li.toOldJSONExpanded())
})
diff --git a/server/controllers/MeController.js b/server/controllers/MeController.js
index ca600d373..9451a7654 100644
--- a/server/controllers/MeController.js
+++ b/server/controllers/MeController.js
@@ -1,12 +1,10 @@
const { Request, Response } = require('express')
-const { Op } = require('sequelize')
const Logger = require('../Logger')
const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
const { sort } = require('../libs/fastSort')
-const { toNumber, isNullOrNaN, isUUID } = require('../utils/index')
+const { toNumber, isNullOrNaN } = require('../utils/index')
const userStats = require('../utils/queries/userStats')
-const parseUserAgent = require('../utils/parsers/parseUserAgent')
/**
* @typedef RequestUserObject
@@ -28,124 +26,6 @@ class MeController {
res.json(req.user.toOldJSONForBrowser())
}
- /**
- * GET: /api/me/sessions
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- async getSessions(req, res) {
- const page = Math.max(0, toNumber(req.query.page, 0))
- const itemsPerPage = Math.max(1, toNumber(req.query.itemsPerPage, 10))
-
- if (req.user.isGuest) {
- return res.json({ sessions: [], total: 0, numPages: 0, page, itemsPerPage })
- }
-
- const refreshToken = req.cookies.refresh_token || req.headers['x-refresh-token']
- const { rows, count } = await Database.sessionModel.findAndCountAll({
- where: {
- userId: req.user.id,
- expiresAt: { [Op.gt]: new Date() }
- },
- order: [['updatedAt', 'DESC']],
- limit: itemsPerPage,
- offset: itemsPerPage * page
- })
-
- res.json({
- total: count,
- numPages: Math.ceil(count / itemsPerPage),
- page,
- itemsPerPage,
- sessions: rows.map((session) => ({
- id: session.id,
- ipAddress: session.ipAddress,
- userAgent: session.userAgent,
- // For display convenience
- deviceInfo: parseUserAgent(session.userAgent),
- createdAt: session.createdAt?.valueOf() ?? null,
- updatedAt: session.updatedAt?.valueOf() ?? null,
- current: !!refreshToken && (session.refreshToken === refreshToken || session.lastRefreshToken === refreshToken)
- }))
- })
- }
-
- /**
- * DELETE: /api/me/sessions/:id
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- async deleteSession(req, res) {
- if (req.user.isGuest) {
- return res.sendStatus(403)
- }
-
- if (!isUUID(req.params.id)) {
- return res.sendStatus(400)
- }
-
- const session = await Database.sessionModel.findOne({
- where: {
- id: req.params.id,
- userId: req.user.id
- }
- })
-
- if (!session) {
- return res.sendStatus(404)
- }
-
- await Database.sessionModel.destroy({ where: { id: session.id } })
- Logger.info(`[MeController] User ${req.user.username} deleted auth session ${session.id}`)
-
- res.sendStatus(200)
- }
-
- /**
- * GET: /api/me/progress
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- getAllMediaProgress(req, res) {
- const mediaProgress = req.user.mediaProgresses?.map((mp) => mp.getOldMediaProgress()) || []
- res.json({ mediaProgress })
- }
-
- /**
- * GET: /api/me/bookmarks
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- getAllBookmarks(req, res) {
- const bookmarks = req.user.bookmarks?.map((bookmark) => ({ ...bookmark })) || []
- res.json({ bookmarks })
- }
-
- /**
- * GET: /api/me/bookmarks/:libraryItemId
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- async getBookmarksForLibraryItem(req, res) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.libraryItemId)
- if (!libraryItem) {
- return res.sendStatus(404)
- }
-
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- Logger.error(`[MeController] User "${req.user.username}" attempted to access bookmarks for library item "${req.params.libraryItemId}" without access`)
- return res.sendStatus(403)
- }
-
- const bookmarks = req.user.bookmarks?.filter((bookmark) => bookmark.libraryItemId === libraryItem.id).map((bookmark) => ({ ...bookmark })) || []
- res.json({ bookmarks })
- }
-
/**
* GET: /api/me/listening-sessions
*
@@ -183,7 +63,7 @@ class MeController {
* @param {Response} res
*/
async getItemListeningSessions(req, res) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.libraryItemId)
+ const libraryItem = await Database.libraryItemModel.findByPk(req.params.libraryItemId)
const episode = await Database.podcastEpisodeModel.findByPk(req.params.episodeId)
if (!libraryItem || (libraryItem.isPodcast && !episode)) {
@@ -191,12 +71,6 @@ class MeController {
return res.sendStatus(404)
}
- // Check if user has access to this library item
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- Logger.error(`[MeController] User "${req.user.username}" attempted to access listening sessions for library item "${req.params.libraryItemId}" without access`)
- return res.sendStatus(403)
- }
-
const mediaItemId = episode?.id || libraryItem.mediaId
let listeningSessions = await this.getUserItemListeningSessionsHelper(req.user.id, mediaItemId)
@@ -251,13 +125,6 @@ class MeController {
* @param {Response} res
*/
async removeMediaProgress(req, res) {
- // Verify the media progress belongs to the current user
- const mediaProgress = req.user.mediaProgresses.find((mp) => mp.id === req.params.id)
- if (!mediaProgress) {
- Logger.error(`[MeController] Media progress not found or does not belong to user "${req.user.username}"`)
- return res.sendStatus(404)
- }
-
await Database.mediaProgressModel.removeById(req.params.id)
req.user.mediaProgresses = req.user.mediaProgresses.filter((mp) => mp.id !== req.params.id)
@@ -325,16 +192,7 @@ class MeController {
* @param {Response} res
*/
async createBookmark(req, res) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
- if (!libraryItem) {
- return res.sendStatus(404)
- }
-
- // Check if user has access to this library item
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- Logger.error(`[MeController] User "${req.user.username}" attempted to create bookmark for library item "${req.params.id}" without access`)
- return res.sendStatus(403)
- }
+ if (!(await Database.libraryItemModel.checkExistsById(req.params.id))) return res.sendStatus(404)
const { time, title } = req.body
if (isNullOrNaN(time)) {
@@ -358,16 +216,7 @@ class MeController {
* @param {Response} res
*/
async updateBookmark(req, res) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
- if (!libraryItem) {
- return res.sendStatus(404)
- }
-
- // Check if user has access to this library item
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- Logger.error(`[MeController] User "${req.user.username}" attempted to update bookmark for library item "${req.params.id}" without access`)
- return res.sendStatus(403)
- }
+ if (!(await Database.libraryItemModel.checkExistsById(req.params.id))) return res.sendStatus(404)
const { time, title } = req.body
if (isNullOrNaN(time)) {
@@ -396,16 +245,7 @@ class MeController {
* @param {Response} res
*/
async removeBookmark(req, res) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(req.params.id)
- if (!libraryItem) {
- return res.sendStatus(404)
- }
-
- // Check if user has access to this library item
- if (!req.user.checkCanAccessLibraryItem(libraryItem)) {
- Logger.error(`[MeController] User "${req.user.username}" attempted to remove bookmark for library item "${req.params.id}" without access`)
- return res.sendStatus(403)
- }
+ if (!(await Database.libraryItemModel.checkExistsById(req.params.id))) return res.sendStatus(404)
const time = Number(req.params.time)
if (isNaN(time)) {
@@ -428,8 +268,6 @@ class MeController {
* User change password. Requires current password.
* Guest users cannot change password.
*
- * Invalidates all other JWT sessions for the user. If using x-refresh-token, returns new tokens for the current session.
- *
* @this import('../routers/ApiRouter')
*
* @param {RequestWithUser} req
@@ -442,7 +280,7 @@ class MeController {
}
const { password, newPassword } = req.body
- if ((typeof password !== 'string' && password !== null) || (typeof newPassword !== 'string' && newPassword !== null)) {
+ if (!password || !newPassword || typeof password !== 'string' || typeof newPassword !== 'string') {
return res.status(400).send('Missing or invalid password or new password')
}
@@ -452,24 +290,6 @@ class MeController {
return res.status(400).send(result.error)
}
- const shouldReturnTokens = !!req.headers['x-refresh-token']
- const newTokens = await this.auth.invalidateJwtSessionsForUser(req.user, req, res)
-
- if (newTokens?.accessToken) {
- Logger.info(`[MeController] Invalidated other JWT sessions for user ${req.user.username} after password change`)
- if (shouldReturnTokens) {
- return res.json({
- success: true,
- user: {
- accessToken: newTokens.accessToken,
- refreshToken: newTokens.refreshToken
- }
- })
- }
- } else {
- Logger.info(`[MeController] Invalidated all JWT sessions for user ${req.user.username} after password change`)
- }
-
res.sendStatus(200)
}
@@ -630,7 +450,7 @@ class MeController {
if (updated) {
await Database.updateSetting(Database.emailSettings)
SocketAuthority.clientEmitter(req.user.id, 'ereader-devices-updated', {
- ereaderDevices: Database.emailSettings.getEReaderDevices(req.user)
+ ereaderDevices: Database.emailSettings.ereaderDevices
})
}
res.json({
diff --git a/server/controllers/MiscController.js b/server/controllers/MiscController.js
index 591f8ccf2..c779bdd63 100644
--- a/server/controllers/MiscController.js
+++ b/server/controllers/MiscController.js
@@ -8,7 +8,7 @@ const Database = require('../Database')
const Watcher = require('../Watcher')
const libraryItemFilters = require('../utils/queries/libraryItemFilters')
-const cron = require('../libs/nodeCron')
+const patternValidation = require('../libs/nodeCron/pattern-validation')
const { isObject, getTitleIgnorePrefix } = require('../utils/index')
const { sanitizeFilename } = require('../utils/fileUtils')
@@ -142,9 +142,6 @@ class MiscController {
Logger.warn('Cannot disable iframe when ALLOW_IFRAME is enabled in environment')
return res.status(400).send('Cannot disable iframe when ALLOW_IFRAME is enabled in environment')
}
- if (settingsUpdate.allowedOrigins && !Array.isArray(settingsUpdate.allowedOrigins)) {
- return res.status(400).send('allowedOrigins must be an array')
- }
const madeUpdates = Database.serverSettings.update(settingsUpdate)
if (madeUpdates) {
@@ -605,11 +602,13 @@ class MiscController {
return res.sendStatus(400)
}
- if (!cron.validate(expression)) {
- Logger.warn(`[MiscController] Invalid cron expression ${expression}`)
- return res.status(400).send('Invalid cron expression')
+ try {
+ patternValidation(expression)
+ res.sendStatus(200)
+ } catch (error) {
+ Logger.warn(`[MiscController] Invalid cron expression ${expression}`, error.message)
+ res.status(400).send(error.message)
}
- res.sendStatus(200)
}
/**
diff --git a/server/controllers/PlaylistController.js b/server/controllers/PlaylistController.js
index 6ad7cff9e..972c352a4 100644
--- a/server/controllers/PlaylistController.js
+++ b/server/controllers/PlaylistController.js
@@ -2,7 +2,6 @@ const { Request, Response, NextFunction } = require('express')
const Logger = require('../Logger')
const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
-const htmlSanitizer = require('../utils/htmlSanitizer')
/**
* @typedef RequestUserObject
@@ -30,17 +29,12 @@ class PlaylistController {
const reqBody = req.body || {}
// Validation
- const nameCleaned = htmlSanitizer.stripAllTags(reqBody.name)
- if (!nameCleaned || !reqBody.libraryId) {
+ if (!reqBody.name || !reqBody.libraryId) {
return res.status(400).send('Invalid playlist data')
}
if (reqBody.description && typeof reqBody.description !== 'string') {
return res.status(400).send('Invalid playlist description')
}
- if (!req.user.checkCanAccessLibrary(reqBody.libraryId)) {
- Logger.warn(`[PlaylistController] User "${req.user.username}" attempted to create playlist in inaccessible library ${reqBody.libraryId}`)
- return res.sendStatus(403)
- }
const items = reqBody.items || []
const isPodcast = items.some((i) => i.episodeId)
const libraryItemIds = new Set()
@@ -90,7 +84,7 @@ class PlaylistController {
{
libraryId: reqBody.libraryId,
userId: req.user.id,
- name: nameCleaned,
+ name: reqBody.name,
description: reqBody.description || null
},
{ transaction }
@@ -137,9 +131,8 @@ class PlaylistController {
*/
async findAllForUser(req, res) {
const playlistsForUser = await Database.playlistModel.getOldPlaylistsForUserAndLibrary(req.user.id)
- const accessiblePlaylists = playlistsForUser.filter((p) => req.user.checkCanAccessLibrary(p.libraryId))
res.json({
- playlists: accessiblePlaylists
+ playlists: playlistsForUser
})
}
@@ -181,11 +174,7 @@ class PlaylistController {
}
const playlistUpdatePayload = {}
-
- const nameCleaned = htmlSanitizer.stripAllTags(reqBody.name)
- if (nameCleaned) {
- playlistUpdatePayload.name = nameCleaned
- }
+ if (reqBody.name) playlistUpdatePayload.name = reqBody.name
if (reqBody.description) playlistUpdatePayload.description = reqBody.description
// Update name and description
@@ -513,10 +502,6 @@ class PlaylistController {
if (!collection) {
return res.status(404).send('Collection not found')
}
- if (!req.user.checkCanAccessLibrary(collection.libraryId)) {
- Logger.warn(`[PlaylistController] User "${req.user.username}" attempted to create playlist from collection ${collection.id} in inaccessible library ${collection.libraryId}`)
- return res.status(404).send('Collection not found')
- }
// Expand collection to get library items
const collectionExpanded = await collection.getOldJsonExpanded(req.user)
if (!collectionExpanded) {
@@ -582,10 +567,6 @@ class PlaylistController {
Logger.warn(`[PlaylistController] Playlist ${req.params.id} requested by user ${req.user.id} that is not the owner`)
return res.sendStatus(403)
}
- if (!req.user.checkCanAccessLibrary(playlist.libraryId)) {
- Logger.warn(`[PlaylistController] User "${req.user.username}" attempted to access playlist ${playlist.id} in inaccessible library ${playlist.libraryId}`)
- return res.status(404).send('Playlist not found')
- }
req.playlist = playlist
}
diff --git a/server/controllers/PodcastController.js b/server/controllers/PodcastController.js
index 5eaa2a64a..1ebe1d110 100644
--- a/server/controllers/PodcastController.js
+++ b/server/controllers/PodcastController.js
@@ -5,10 +5,9 @@ const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
const fs = require('../libs/fsExtra')
-const cron = require('../libs/nodeCron')
const { getPodcastFeed, findMatchingEpisodes } = require('../utils/podcastUtils')
-const { getFileTimestampsWithIno, filePathToPOSIX, isSameOrSubPath } = require('../utils/fileUtils')
+const { getFileTimestampsWithIno, filePathToPOSIX } = require('../utils/fileUtils')
const { validateUrl } = require('../utils/index')
const htmlSanitizer = require('../utils/htmlSanitizer')
@@ -47,11 +46,6 @@ class PodcastController {
return res.status(400).send('Invalid request body. "media" and "media.metadata" are required')
}
- if (payload.media.autoDownloadSchedule && !cron.validate(payload.media.autoDownloadSchedule)) {
- Logger.error(`[PodcastController] Invalid auto download schedule cron expression "${payload.media.autoDownloadSchedule}"`)
- return res.status(400).send('Invalid auto download schedule cron expression')
- }
-
const library = await Database.libraryModel.findByIdWithFolders(payload.libraryId)
if (!library) {
Logger.error(`[PodcastController] Create: Library not found "${payload.libraryId}"`)
@@ -64,18 +58,8 @@ class PodcastController {
return res.status(404).send('Folder not found')
}
- if (typeof payload.path !== 'string' || !payload.path.trim()) {
- return res.status(400).send('Invalid request body. "path" must be a non-empty string')
- }
-
- const libraryFolderPath = filePathToPOSIX(folder.path)
const podcastPath = filePathToPOSIX(payload.path)
- if (!isSameOrSubPath(libraryFolderPath, podcastPath)) {
- Logger.error(`[PodcastController] Create: Podcast path is outside library folder "${libraryFolderPath}": "${podcastPath}"`)
- return res.status(400).send('Podcast path must be inside the selected library folder')
- }
-
// Check if a library item with this podcast folder exists already
const existingLibraryItem =
(await Database.libraryItemModel.count({
@@ -99,7 +83,7 @@ class PodcastController {
const libraryItemFolderStats = await getFileTimestampsWithIno(podcastPath)
- let relPath = podcastPath.replace(libraryFolderPath, '')
+ let relPath = payload.path.replace(folder.fullPath, '')
if (relPath.startsWith('/')) relPath = relPath.slice(1)
let newLibraryItem = null
@@ -428,26 +412,9 @@ class PodcastController {
Logger.debug(`[PodcastController] Sanitized description from "${req.body[key]}" to "${sanitizedDescription}"`)
req.body[key] = sanitizedDescription
}
- } else if (key === 'subtitle' && req.body[key]) {
- const sanitizedSubtitle = htmlSanitizer.sanitize(req.body[key])
- if (sanitizedSubtitle !== req.body[key]) {
- Logger.debug(`[PodcastController] Sanitized subtitle from "${req.body[key]}" to "${sanitizedSubtitle}"`)
- req.body[key] = sanitizedSubtitle
- }
}
updatePayload[key] = req.body[key]
- } else if (key === 'enclosure') {
- const enclosure = req.body.enclosure
- if (enclosure === null) {
- updatePayload.enclosureURL = null
- updatePayload.enclosureSize = null
- updatePayload.enclosureType = null
- } else if (typeof enclosure === 'object' && typeof enclosure.url === 'string') {
- updatePayload.enclosureURL = enclosure.url
- updatePayload.enclosureType = typeof enclosure.type === 'string' ? enclosure.type : null
- updatePayload.enclosureSize = enclosure.length !== undefined && enclosure.length !== null ? enclosure.length : null
- }
} else if (key === 'chapters' && Array.isArray(req.body[key]) && req.body[key].every((ch) => typeof ch === 'object' && ch.title && ch.start)) {
updatePayload[key] = req.body[key]
} else if (key === 'publishedAt' && typeof req.body[key] === 'number') {
diff --git a/server/controllers/SearchController.js b/server/controllers/SearchController.js
index ecd9a41c0..bb3382f71 100644
--- a/server/controllers/SearchController.js
+++ b/server/controllers/SearchController.js
@@ -4,29 +4,7 @@ const BookFinder = require('../finders/BookFinder')
const PodcastFinder = require('../finders/PodcastFinder')
const AuthorFinder = require('../finders/AuthorFinder')
const Database = require('../Database')
-const { isValidASIN, getQueryParamAsString, ValidationError, NotFoundError } = require('../utils')
-
-// Provider name mappings for display purposes
-const providerMap = {
- all: 'All',
- best: 'Best',
- google: 'Google Books',
- itunes: 'iTunes',
- openlibrary: 'Open Library',
- fantlab: 'FantLab.ru',
- audiobookcovers: 'AudiobookCovers.com',
- audible: 'Audible.com',
- 'audible.ca': 'Audible.ca',
- 'audible.uk': 'Audible.co.uk',
- 'audible.au': 'Audible.com.au',
- 'audible.fr': 'Audible.fr',
- 'audible.de': 'Audible.de',
- 'audible.jp': 'Audible.co.jp',
- 'audible.it': 'Audible.it',
- 'audible.in': 'Audible.in',
- 'audible.es': 'Audible.es',
- audnexus: 'Audnexus'
-}
+const { isValidASIN } = require('../utils')
/**
* @typedef RequestUserObject
@@ -38,44 +16,6 @@ const providerMap = {
class SearchController {
constructor() {}
- /**
- * Fetches a library item by ID
- * @param {string} id - Library item ID
- * @param {string} methodName - Name of the calling method for logging
- * @returns {Promise}
- */
- static async fetchLibraryItem(id) {
- const libraryItem = await Database.libraryItemModel.getExpandedById(id)
- if (!libraryItem) {
- throw new NotFoundError(`library item "${id}" not found`)
- }
- return libraryItem
- }
-
- /**
- * Maps custom metadata providers to standardized format
- * @param {Array} providers - Array of custom provider objects
- * @returns {Array<{value: string, text: string}>}
- */
- static mapCustomProviders(providers) {
- return providers.map((provider) => ({
- value: provider.getSlug(),
- text: provider.name
- }))
- }
-
- /**
- * Static helper method to format provider for client (for use in array methods)
- * @param {string} providerValue - Provider identifier
- * @returns {{value: string, text: string}}
- */
- static formatProvider(providerValue) {
- return {
- value: providerValue,
- text: providerMap[providerValue] || providerValue
- }
- }
-
/**
* GET: /api/search/books
*
@@ -83,25 +23,19 @@ class SearchController {
* @param {Response} res
*/
async findBooks(req, res) {
- try {
- const query = req.query
- const provider = getQueryParamAsString(query, 'provider', 'google')
- const title = getQueryParamAsString(query, 'title', '')
- const author = getQueryParamAsString(query, 'author', '')
- const id = getQueryParamAsString(query, 'id', undefined)
+ const id = req.query.id
+ const libraryItem = await Database.libraryItemModel.getExpandedById(id)
+ const provider = req.query.provider || 'google'
+ const title = req.query.title || ''
+ const author = req.query.author || ''
- // Fetch library item
- const libraryItem = id ? await SearchController.fetchLibraryItem(id) : null
-
- const results = await BookFinder.search(libraryItem, provider, title, author)
- res.json(results)
- } catch (error) {
- Logger.error(`[SearchController] findBooks: ${error.message}`)
- if (error instanceof ValidationError || error instanceof NotFoundError) {
- return res.status(error.status).json({ error: error.message })
- }
- return res.status(500).json({ error: 'Internal server error' })
+ if (typeof provider !== 'string' || typeof title !== 'string' || typeof author !== 'string') {
+ Logger.error(`[SearchController] findBooks: Invalid request query params`)
+ return res.status(400).send('Invalid request query params')
}
+
+ const results = await BookFinder.search(libraryItem, provider, title, author)
+ res.json(results)
}
/**
@@ -111,24 +45,20 @@ class SearchController {
* @param {Response} res
*/
async findCovers(req, res) {
- try {
- const query = req.query
- const podcast = query.podcast === '1' || query.podcast === 1
- const title = getQueryParamAsString(query, 'title', '', true)
- const author = getQueryParamAsString(query, 'author', '')
- const provider = getQueryParamAsString(query, 'provider', 'google')
+ const query = req.query
+ const podcast = query.podcast == 1
- let results = null
- if (podcast) results = await PodcastFinder.findCovers(title)
- else results = await BookFinder.findCovers(provider, title, author)
- res.json({ results })
- } catch (error) {
- Logger.error(`[SearchController] findCovers: ${error.message}`)
- if (error instanceof ValidationError) {
- return res.status(error.status).json({ error: error.message })
- }
- return res.status(500).json({ error: 'Internal server error' })
+ if (!query.title || typeof query.title !== 'string') {
+ Logger.error(`[SearchController] findCovers: Invalid title sent in query`)
+ return res.sendStatus(400)
}
+
+ let results = null
+ if (podcast) results = await PodcastFinder.findCovers(query.title)
+ else results = await BookFinder.findCovers(query.provider || 'google', query.title, query.author || '')
+ res.json({
+ results
+ })
}
/**
@@ -139,42 +69,34 @@ class SearchController {
* @param {Response} res
*/
async findPodcasts(req, res) {
- try {
- const query = req.query
- const term = getQueryParamAsString(query, 'term', '', true)
- const country = getQueryParamAsString(query, 'country', 'us')
-
- const results = await PodcastFinder.search(term, { country })
- res.json(results)
- } catch (error) {
- Logger.error(`[SearchController] findPodcasts: ${error.message}`)
- if (error instanceof ValidationError) {
- return res.status(error.status).json({ error: error.message })
- }
- return res.status(500).json({ error: 'Internal server error' })
+ const term = req.query.term
+ const country = req.query.country || 'us'
+ if (!term) {
+ Logger.error('[SearchController] Invalid request query param "term" is required')
+ return res.status(400).send('Invalid request query param "term" is required')
}
+
+ const results = await PodcastFinder.search(term, {
+ country
+ })
+ res.json(results)
}
/**
* GET: /api/search/authors
- * Note: This endpoint is not currently used in the web client.
*
* @param {RequestWithUser} req
* @param {Response} res
*/
async findAuthor(req, res) {
- try {
- const query = getQueryParamAsString(req.query, 'q', '', true)
-
- const author = await AuthorFinder.findAuthorByName(query)
- res.json(author)
- } catch (error) {
- Logger.error(`[SearchController] findAuthor: ${error.message}`)
- if (error instanceof ValidationError) {
- return res.status(error.status).json({ error: error.message })
- }
- return res.status(500).json({ error: 'Internal server error' })
+ const query = req.query.q
+ if (!query || typeof query !== 'string') {
+ Logger.error(`[SearchController] findAuthor: Invalid query param`)
+ return res.status(400).send('Invalid query param')
}
+
+ const author = await AuthorFinder.findAuthorByName(query)
+ res.json(author)
}
/**
@@ -184,55 +106,16 @@ class SearchController {
* @param {Response} res
*/
async findChapters(req, res) {
- try {
- const query = req.query
- const asin = getQueryParamAsString(query, 'asin', '', true)
- const region = getQueryParamAsString(query, 'region', 'us').toLowerCase()
-
- if (!isValidASIN(asin.toUpperCase())) throw new ValidationError('asin', 'is invalid')
-
- const chapterData = await BookFinder.findChapters(asin, region)
- if (!chapterData) {
- return res.json({ error: 'Chapters not found', stringKey: 'MessageChaptersNotFound' })
- }
- res.json(chapterData)
- } catch (error) {
- Logger.error(`[SearchController] findChapters: ${error.message}`)
- if (error instanceof ValidationError) {
- if (error.paramName === 'asin') {
- return res.json({ error: 'Invalid ASIN', stringKey: 'MessageInvalidAsin' })
- }
- if (error.paramName === 'region') {
- return res.json({ error: 'Invalid region', stringKey: 'MessageInvalidRegion' })
- }
- }
- return res.status(500).json({ error: 'Internal server error' })
+ const asin = req.query.asin
+ if (!isValidASIN(asin.toUpperCase())) {
+ return res.json({ error: 'Invalid ASIN', stringKey: 'MessageInvalidAsin' })
}
- }
-
- /**
- * GET: /api/search/providers
- * Get all available metadata providers
- *
- * @param {RequestWithUser} req
- * @param {Response} res
- */
- async getAllProviders(req, res) {
- const customProviders = await Database.customMetadataProviderModel.findAll()
-
- const customBookProviders = customProviders.filter((p) => p.mediaType === 'book')
- const customPodcastProviders = customProviders.filter((p) => p.mediaType === 'podcast')
-
- const bookProviders = BookFinder.providers.filter((p) => p !== 'audiobookcovers')
-
- // Build minimized payload with custom providers merged in
- const providers = {
- books: [...bookProviders.map((p) => SearchController.formatProvider(p)), ...SearchController.mapCustomProviders(customBookProviders)],
- booksCovers: [SearchController.formatProvider('best'), ...BookFinder.providers.map((p) => SearchController.formatProvider(p)), ...SearchController.mapCustomProviders(customBookProviders), SearchController.formatProvider('all')],
- podcasts: [SearchController.formatProvider('itunes'), ...SearchController.mapCustomProviders(customPodcastProviders)]
+ const region = (req.query.region || 'us').toLowerCase()
+ const chapterData = await BookFinder.findChapters(asin, region)
+ if (!chapterData) {
+ return res.json({ error: 'Chapters not found', stringKey: 'MessageChaptersNotFound' })
}
-
- res.json({ providers })
+ res.json(chapterData)
}
}
module.exports = new SearchController()
diff --git a/server/controllers/SessionController.js b/server/controllers/SessionController.js
index 7cc8d35e2..7160eace1 100644
--- a/server/controllers/SessionController.js
+++ b/server/controllers/SessionController.js
@@ -4,7 +4,6 @@ const Logger = require('../Logger')
const Database = require('../Database')
const { toNumber, isUUID } = require('../utils/index')
const { getAudioMimeTypeFromExtname, encodeUriPath } = require('../utils/fileUtils')
-const { PlayMethod } = require('../utils/constants')
const ShareManager = require('../managers/ShareManager')
@@ -289,29 +288,12 @@ class SessionController {
return res.sendStatus(404)
}
- let audioTrack = playbackSession.audioTracks.find((t) => toNumber(t.index, 1) === audioTrackIndex)
-
- // Support clients passing 0 or 1 for podcast episode audio track index (handles old episodes pre-v2.21.0 having null index)
- if (!audioTrack && playbackSession.mediaType === 'podcast' && audioTrackIndex === 0) {
- audioTrack = playbackSession.audioTracks[0]
- }
+ const audioTrack = playbackSession.audioTracks.find((t) => t.index === audioTrackIndex)
if (!audioTrack) {
Logger.error(`[SessionController] Unable to find audio track with index=${audioTrackIndex}`)
return res.sendStatus(404)
}
- // Redirect transcode requests to the HLS router
- // Handles bug introduced in android v0.10.0-beta where transcode requests are made to this endpoint
- if (playbackSession.playMethod === PlayMethod.TRANSCODE && audioTrack.contentUrl) {
- Logger.debug(`[SessionController] Redirecting transcode request to "${audioTrack.contentUrl}"`)
- return res.redirect(audioTrack.contentUrl)
- }
-
- if (!audioTrack.metadata?.path) {
- Logger.error(`[SessionController] Invalid audio track "${audioTrack.index}" for session "${req.params.id}"`)
- return res.sendStatus(500)
- }
-
const user = await Database.userModel.getUserById(playbackSession.userId)
Logger.debug(`[SessionController] Serving audio track ${audioTrack.index} for session "${req.params.id}" belonging to user "${user.username}"`)
@@ -339,9 +321,9 @@ class SessionController {
var playbackSession = this.playbackSessionManager.getSession(req.params.id)
if (!playbackSession) return res.sendStatus(404)
- if (playbackSession.userId !== req.user.id && !req.user.isAdminOrUp) {
- Logger.error(`[SessionController] Non-admin user "${req.user.username}" attempting to access session belonging to another user "${req.params.id}"`)
- return res.sendStatus(403)
+ if (playbackSession.userId !== req.user.id) {
+ Logger.error(`[SessionController] User "${req.user.username}" attempting to access session belonging to another user "${req.params.id}"`)
+ return res.sendStatus(404)
}
req.playbackSession = playbackSession
diff --git a/server/controllers/ShareController.js b/server/controllers/ShareController.js
index 73da84a8a..3e7ea1deb 100644
--- a/server/controllers/ShareController.js
+++ b/server/controllers/ShareController.js
@@ -53,10 +53,6 @@ class ShareController {
if (playbackSession) {
if (mediaItemShare.id === playbackSession.mediaItemShareId) {
Logger.debug(`[ShareController] Found share playback session ${req.cookies.share_session_id}`)
- // If ?t was provided, override the cached currentTime
- if (startTime > 0 && startTime < playbackSession.duration) {
- playbackSession.currentTime = startTime
- }
mediaItemShare.playbackSession = playbackSession.toJSONForClient()
return res.json(mediaItemShare)
} else {
diff --git a/server/controllers/UserController.js b/server/controllers/UserController.js
index 0a476a9d6..3ec10539e 100644
--- a/server/controllers/UserController.js
+++ b/server/controllers/UserController.js
@@ -253,7 +253,6 @@ class UserController {
// Updating password
if (updatePayload.password) {
user.pash = await this.auth.localAuthStrategy.hashPassword(updatePayload.password)
- shouldInvalidateJwtSessions = true
hasUpdates = true
}
@@ -332,11 +331,14 @@ class UserController {
Logger.info(`[UserController] User ${user.username} has generated a new api token`)
}
- // Handle JWT session invalidation for username/password changes
+ // Handle JWT session invalidation for username changes
if (shouldInvalidateJwtSessions) {
- const newTokens = await this.auth.invalidateJwtSessionsForUser(user, req, res)
- if (newTokens) {
- // Note: for admin users changing their own password they should use MeController.updatePassword instead. This endpoint does not return tokens
+ const newAccessToken = await this.auth.invalidateJwtSessionsForUser(user, req, res)
+ if (newAccessToken) {
+ user.accessToken = newAccessToken
+ // Refresh tokens are only returned for mobile clients
+ // Mobile apps currently do not use this API endpoint so always set to null
+ user.refreshToken = null
Logger.info(`[UserController] Invalidated JWT sessions for user ${user.username} and rotated tokens for current session`)
} else {
Logger.info(`[UserController] Invalidated JWT sessions for user ${user.username}`)
@@ -361,16 +363,15 @@ class UserController {
* @param {Response} res
*/
async delete(req, res) {
- const user = req.reqUser
-
+ if (req.params.id === 'root') {
+ Logger.error('[UserController] Attempt to delete root user. Root user cannot be deleted')
+ return res.sendStatus(400)
+ }
if (req.user.id === req.params.id) {
Logger.error(`[UserController] User ${req.user.username} is attempting to delete self`)
return res.sendStatus(400)
}
- if (user.isRoot) {
- Logger.error(`[UserController] Admin user "${req.user.username}" attempted to delete root user`)
- return res.sendStatus(403)
- }
+ const user = req.reqUser
// Todo: check if user is logged in and cancel streams
diff --git a/server/finders/BookFinder.js b/server/finders/BookFinder.js
index 90fed951f..2d7b57f14 100644
--- a/server/finders/BookFinder.js
+++ b/server/finders/BookFinder.js
@@ -11,7 +11,7 @@ const { levenshteinDistance, levenshteinSimilarity, escapeRegExp, isValidASIN }
const htmlSanitizer = require('../utils/htmlSanitizer')
class BookFinder {
- #providerResponseTimeout = 10000
+ #providerResponseTimeout = 30000
constructor() {
this.openLibrary = new OpenLibrary()
@@ -227,7 +227,7 @@ class BookFinder {
title = this.#removeAuthorFromTitle(title)
const titleTransformers = [
- [/(: |[,;_]| by ).*/g, ''], // Remove subtitle
+ [/([,:;_]| by ).*/g, ''], // Remove subtitle
[/(^| )\d+k(bps)?( |$)/, ' '], // Remove bitrate
[/ (2nd|3rd|\d+th)\s+ed(\.|ition)?/g, ''], // Remove edition
[/(^| |\.)(m4b|m4a|mp3)( |$)/g, ''], // Remove file-type
@@ -385,11 +385,6 @@ class BookFinder {
if (!title) return books
- // Truncate excessively long inputs to prevent ReDoS attacks
- const MAX_INPUT_LENGTH = 500
- title = title.substring(0, MAX_INPUT_LENGTH)
- author = author?.substring(0, MAX_INPUT_LENGTH) || author
-
const isTitleAsin = isValidASIN(title.toUpperCase())
let actualTitleQuery = title
@@ -407,8 +402,7 @@ class BookFinder {
let authorCandidates = new BookFinder.AuthorCandidates(cleanAuthor, this.audnexus)
// Remove underscores and parentheses with their contents, and replace with a separator
- // Use negated character classes to prevent ReDoS vulnerability (input length validated at entry point)
- const cleanTitle = title.replace(/\[[^\]]*\]|\([^)]*\)|{[^}]*}|_/g, ' - ')
+ const cleanTitle = title.replace(/\[.*?\]|\(.*?\)|{.*?}|_/g, ' - ')
// Split title into hypen-separated parts
const titleParts = cleanTitle.split(/ - | -|- /)
for (const titlePart of titleParts) authorCandidates.add(titlePart)
@@ -428,7 +422,7 @@ class BookFinder {
}
}
- if (books.length && libraryItem) {
+ if (books.length) {
const isAudibleProvider = provider.startsWith('audible')
const libraryItemDurationMinutes = libraryItem?.media?.duration ? libraryItem.media.duration / 60 : null
@@ -614,14 +608,6 @@ class BookFinder {
Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
searchResults.push(...providerResults)
}
- } else if (provider === 'best') {
- // Best providers: google, fantlab, and audible.com
- const bestProviders = ['google', 'fantlab', 'audible']
- for (const providerString of bestProviders) {
- const providerResults = await this.search(null, providerString, title, author, options)
- Logger.debug(`[BookFinder] Found ${providerResults.length} covers from ${providerString}`)
- searchResults.push(...providerResults)
- }
} else {
searchResults = await this.search(null, provider, title, author, options)
}
@@ -646,11 +632,11 @@ class BookFinder {
module.exports = new BookFinder()
function hasSubtitle(title) {
- return title.includes(': ') || title.includes(' - ')
+ return title.includes(':') || title.includes(' - ')
}
function stripSubtitle(title) {
- if (title.includes(': ')) {
- return title.split(': ')[0].trim()
+ if (title.includes(':')) {
+ return title.split(':')[0].trim()
} else if (title.includes(' - ')) {
return title.split(' - ')[0].trim()
}
@@ -674,9 +660,7 @@ function cleanTitleForCompares(title, keepSubtitle = false) {
let stripped = keepSubtitle ? title : stripSubtitle(title)
// Remove text in paranthesis (i.e. "Ender's Game (Ender's Saga)" becomes "Ender's Game")
- // Use negated character class to prevent ReDoS vulnerability (input length validated at entry point)
- let cleaned = stripped.replace(/\([^)]*\)/g, '') // Remove parenthetical content
- cleaned = cleaned.replace(/\s+/g, ' ').trim() // Clean up any resulting multiple spaces
+ let cleaned = stripped.replace(/ *\([^)]*\) */g, '')
// Remove single quotes (i.e. "Ender's Game" becomes "Enders Game")
cleaned = cleaned.replace(/'/g, '')
diff --git a/server/finders/PodcastFinder.js b/server/finders/PodcastFinder.js
index 40d6a5a00..abaf02ac6 100644
--- a/server/finders/PodcastFinder.js
+++ b/server/finders/PodcastFinder.js
@@ -7,9 +7,9 @@ class PodcastFinder {
}
/**
- *
- * @param {string} term
- * @param {{country:string}} options
+ *
+ * @param {string} term
+ * @param {{country:string}} options
* @returns {Promise}
*/
async search(term, options = {}) {
@@ -20,16 +20,12 @@ class PodcastFinder {
return results
}
- /**
- * @param {string} term
- * @returns {Promise}
- */
async findCovers(term) {
if (!term) return null
Logger.debug(`[iTunes] Searching for podcast covers with term "${term}"`)
- const results = await this.iTunesApi.searchPodcasts(term)
+ var results = await this.iTunesApi.searchPodcasts(term)
if (!results) return []
- return results.map((r) => r.cover).filter((r) => r)
+ return results.map(r => r.cover).filter(r => r)
}
}
-module.exports = new PodcastFinder()
+module.exports = new PodcastFinder()
\ No newline at end of file
diff --git a/server/managers/ApiCacheManager.js b/server/managers/ApiCacheManager.js
index e34e4c055..2d8eece85 100644
--- a/server/managers/ApiCacheManager.js
+++ b/server/managers/ApiCacheManager.js
@@ -5,9 +5,6 @@ const Database = require('../Database')
class ApiCacheManager {
defaultCacheOptions = { max: 1000, maxSize: 10 * 1000 * 1000, sizeCalculation: (item) => item.body.length + JSON.stringify(item.headers).length }
defaultTtlOptions = { ttl: 30 * 60 * 1000 }
- highChurnModels = new Set(['session', 'mediaProgress', 'playbackSession', 'device'])
- modelsInvalidatingPersonalized = new Set(['mediaProgress'])
- modelsInvalidatingMe = new Set(['session', 'mediaProgress', 'playbackSession', 'device'])
constructor(cache = new LRUCache(this.defaultCacheOptions), ttlOptions = this.defaultTtlOptions) {
this.cache = cache
@@ -19,47 +16,8 @@ class ApiCacheManager {
hooks.forEach((hook) => database.sequelize.addHook(hook, (model) => this.clear(model, hook)))
}
- getModelName(model) {
- if (typeof model?.name === 'string') return model.name
- if (typeof model?.model?.name === 'string') return model.model.name
- if (typeof model?.constructor?.name === 'string' && model.constructor.name !== 'Object') return model.constructor.name
- return 'unknown'
- }
-
- clearByUrlPattern(urlPattern) {
- let removed = 0
- for (const key of this.cache.keys()) {
- try {
- const parsed = JSON.parse(key)
- if (typeof parsed?.url === 'string' && urlPattern.test(parsed.url)) {
- if (this.cache.delete(key)) removed++
- }
- } catch {
- if (this.cache.delete(key)) removed++
- }
- }
- return removed
- }
-
- clearUserProgressSlices(modelName, hook) {
- let removedPersonalized = 0
- let removedRecentEpisodes = 0
- if (this.modelsInvalidatingPersonalized.has(modelName)) {
- removedPersonalized = this.clearByUrlPattern(/^\/libraries\/[^/]+\/personalized/)
- removedRecentEpisodes = this.clearByUrlPattern(/^\/libraries\/[^/]+\/recent-episodes/)
- }
- const removedMe = this.modelsInvalidatingMe.has(modelName) ? this.clearByUrlPattern(/^\/me(\/|\?|$)/) : 0
- Logger.debug(`[ApiCacheManager] ${modelName}.${hook}: cleared user-progress cache slices (personalized=${removedPersonalized}, recentEpisodes=${removedRecentEpisodes}, me=${removedMe})`)
- }
-
clear(model, hook) {
- const modelName = this.getModelName(model)
- if (this.highChurnModels.has(modelName)) {
- this.clearUserProgressSlices(modelName, hook)
- return
- }
-
- Logger.debug(`[ApiCacheManager] ${modelName}.${hook}: Clearing cache`)
+ Logger.debug(`[ApiCacheManager] ${model.constructor.name}.${hook}: Clearing cache`)
this.cache.clear()
}
diff --git a/server/managers/BackupManager.js b/server/managers/BackupManager.js
index a7b531e62..102521b71 100644
--- a/server/managers/BackupManager.js
+++ b/server/managers/BackupManager.js
@@ -48,14 +48,9 @@ class BackupManager {
}
async init() {
- try {
- const backupsDirExists = await fs.pathExists(this.backupPath)
- if (!backupsDirExists) {
- await fs.ensureDir(this.backupPath)
- }
- } catch (error) {
- Logger.error(`[BackupManager] Failed to ensure backup directory at "${this.backupPath}": ${error.message}`)
- throw new Error(`[BackupManager] Failed to ensure backup directory at "${this.backupPath}"`, { cause: error })
+ const backupsDirExists = await fs.pathExists(this.backupPath)
+ if (!backupsDirExists) {
+ await fs.ensureDir(this.backupPath)
}
await this.loadBackups()
@@ -126,31 +121,13 @@ class BackupManager {
} catch (error) {
// Not a valid zip file
Logger.error('[BackupManager] Failed to read backup file - backup might not be a valid .zip file', tempPath, error)
- await zip.close().catch(() => {})
- await fs.remove(tempPath).catch((err) => Logger.error(`[BackupManager] Failed to remove rejected backup file "${tempPath}"`, err))
return res.status(400).send('Failed to read backup file - backup might not be a valid .zip file')
}
- if (!entries['absdatabase.sqlite']) {
+ if (!Object.keys(entries).includes('absdatabase.sqlite')) {
Logger.error(`[BackupManager] Invalid backup with no absdatabase.sqlite file - might be a backup created on an old Audiobookshelf server.`)
- await zip.close().catch(() => {})
- await fs.remove(tempPath).catch((err) => Logger.error(`[BackupManager] Failed to remove rejected backup file "${tempPath}"`, err))
return res.status(500).send('Invalid backup with no absdatabase.sqlite file - might be a backup created on an old Audiobookshelf server.')
}
- const detailsEntry = entries['details']
- if (!detailsEntry) {
- Logger.error('[BackupManager] Invalid backup - missing details entry')
- await zip.close().catch(() => {})
- await fs.remove(tempPath).catch((err) => Logger.error(`[BackupManager] Failed to remove rejected backup file "${tempPath}"`, err))
- return res.status(400).send('Invalid backup file - missing details entry')
- }
- if (detailsEntry.size > 1024 * 1024) {
- Logger.error(`[BackupManager] Backup details entry too large: ${detailsEntry.size} bytes`)
- await zip.close().catch(() => {})
- await fs.remove(tempPath).catch((err) => Logger.error(`[BackupManager] Failed to remove rejected backup file "${tempPath}"`, err))
- return res.status(400).send('Invalid backup file - details entry too large')
- }
-
const data = await zip.entryData('details')
const details = data.toString('utf8').split('\n')
@@ -158,13 +135,9 @@ class BackupManager {
if (!backup.serverVersion) {
Logger.error(`[BackupManager] Invalid backup with no server version - might be a backup created before version 2.0.0`)
- await zip.close().catch(() => {})
- await fs.remove(tempPath).catch((err) => Logger.error(`[BackupManager] Failed to remove rejected backup file "${tempPath}"`, err))
return res.status(500).send('Invalid backup. Might be a backup created before version 2.0.0.')
}
- await zip.close().catch(() => {})
-
backup.fileSize = await getFileSize(backup.fullPath)
const existingBackupIndex = this.backups.findIndex((b) => b.id === backup.id)
@@ -279,24 +252,9 @@ class BackupManager {
let data = null
try {
zip = new StreamZip.async({ file: fullFilePath })
- const entries = await zip.entries()
-
- const detailsEntry = entries['details']
- if (!detailsEntry) {
- Logger.error(`[BackupManager] Backup "${fullFilePath}" missing details entry - skipping`)
- await zip.close().catch(() => {})
- continue
- }
- if (detailsEntry.size > 1024 * 1024) {
- Logger.error(`[BackupManager] Backup "${fullFilePath}" details entry too large (${detailsEntry.size} bytes) - skipping`)
- await zip.close().catch(() => {})
- continue
- }
-
data = await zip.entryData('details')
} catch (error) {
Logger.error(`[BackupManager] Failed to unzip backup "${fullFilePath}"`, error)
- if (zip) await zip.close().catch(() => {})
continue
}
diff --git a/server/managers/CacheManager.js b/server/managers/CacheManager.js
index 38c0415e9..b44b65de3 100644
--- a/server/managers/CacheManager.js
+++ b/server/managers/CacheManager.js
@@ -24,15 +24,10 @@ class CacheManager {
this.ImageCachePath = Path.join(this.CachePath, 'images')
this.ItemCachePath = Path.join(this.CachePath, 'items')
- try {
- await fs.ensureDir(this.CachePath)
- await fs.ensureDir(this.CoverCachePath)
- await fs.ensureDir(this.ImageCachePath)
- await fs.ensureDir(this.ItemCachePath)
- } catch (error) {
- Logger.error(`[CacheManager] Failed to create cache directories at "${this.CachePath}": ${error.message}`)
- throw new Error(`[CacheManager] Failed to create cache directories at "${this.CachePath}"`, { cause: error })
- }
+ await fs.ensureDir(this.CachePath)
+ await fs.ensureDir(this.CoverCachePath)
+ await fs.ensureDir(this.ImageCachePath)
+ await fs.ensureDir(this.ItemCachePath)
}
async handleCoverCache(res, libraryItemId, options = {}) {
diff --git a/server/managers/CoverSearchManager.js b/server/managers/CoverSearchManager.js
deleted file mode 100644
index 193176766..000000000
--- a/server/managers/CoverSearchManager.js
+++ /dev/null
@@ -1,254 +0,0 @@
-const { setMaxListeners } = require('events')
-const Logger = require('../Logger')
-const BookFinder = require('../finders/BookFinder')
-const PodcastFinder = require('../finders/PodcastFinder')
-
-/**
- * Manager for handling streaming cover search across multiple providers
- */
-class CoverSearchManager {
- constructor() {
- /** @type {Map} Map of requestId to AbortController */
- this.activeSearches = new Map()
-
- // Default timeout for each provider search
- this.providerTimeout = 10000 // 10 seconds
-
- // Set to 0 to disable the max listeners limit
- // We need one listener per provider (15+) and may have multiple concurrent searches
- this.maxListeners = 0
- }
-
- /**
- * Start a streaming cover search
- * @param {string} requestId - Unique identifier for this search request
- * @param {Object} searchParams - Search parameters
- * @param {string} searchParams.title - Title to search for
- * @param {string} searchParams.author - Author to search for (optional)
- * @param {string} searchParams.provider - Provider to search (or 'all')
- * @param {boolean} searchParams.podcast - Whether this is a podcast search
- * @param {Function} onResult - Callback for each result chunk
- * @param {Function} onComplete - Callback when search completes
- * @param {Function} onError - Callback for errors
- */
- async startSearch(requestId, searchParams, onResult, onComplete, onError) {
- if (this.activeSearches.has(requestId)) {
- Logger.warn(`[CoverSearchManager] Search with requestId ${requestId} already exists`)
- return
- }
-
- const abortController = new AbortController()
-
- // Increase max listeners on this signal to accommodate parallel provider searches
- // AbortSignal is an EventTarget, so we use the events module's setMaxListeners
- setMaxListeners(this.maxListeners, abortController.signal)
-
- this.activeSearches.set(requestId, abortController)
-
- Logger.info(`[CoverSearchManager] Starting search ${requestId} with params:`, searchParams)
-
- try {
- const { title, author, provider, podcast } = searchParams
-
- if (podcast) {
- await this.searchPodcastCovers(requestId, title, abortController.signal, onResult, onError)
- } else {
- await this.searchBookCovers(requestId, provider, title, author, abortController.signal, onResult, onError)
- }
-
- if (!abortController.signal.aborted) {
- onComplete()
- }
- } catch (error) {
- if (error.name === 'AbortError') {
- Logger.info(`[CoverSearchManager] Search ${requestId} was cancelled`)
- } else {
- Logger.error(`[CoverSearchManager] Search ${requestId} failed:`, error)
- onError(error.message)
- }
- } finally {
- this.activeSearches.delete(requestId)
- }
- }
-
- /**
- * Cancel an active search
- * @param {string} requestId - Request ID to cancel
- */
- cancelSearch(requestId) {
- const abortController = this.activeSearches.get(requestId)
- if (abortController) {
- Logger.info(`[CoverSearchManager] Cancelling search ${requestId}`)
- abortController.abort()
- this.activeSearches.delete(requestId)
- return true
- }
- return false
- }
-
- /**
- * Search for podcast covers
- */
- async searchPodcastCovers(requestId, title, signal, onResult, onError) {
- try {
- const results = await this.executeWithTimeout(() => PodcastFinder.findCovers(title), this.providerTimeout, signal)
-
- if (signal.aborted) return
-
- const covers = this.extractCoversFromResults(results)
- if (covers.length > 0) {
- onResult({
- provider: 'itunes',
- covers,
- total: covers.length
- })
- }
- } catch (error) {
- if (error.name !== 'AbortError') {
- Logger.error(`[CoverSearchManager] Podcast search failed:`, error)
- onError('itunes', error.message)
- }
- }
- }
-
- /**
- * Search for book covers across providers
- */
- async searchBookCovers(requestId, provider, title, author, signal, onResult, onError) {
- let providers = []
-
- if (provider === 'all') {
- providers = [...BookFinder.providers]
- } else if (provider === 'best') {
- // Best providers: google, fantlab, and audible.com
- providers = ['google', 'fantlab', 'audible']
- } else {
- providers = [provider]
- }
-
- Logger.debug(`[CoverSearchManager] Searching ${providers.length} providers in parallel`)
-
- // Search all providers in parallel
- const searchPromises = providers.map(async (providerName) => {
- if (signal.aborted) return
-
- try {
- const searchResults = await this.executeWithTimeout(() => BookFinder.search(null, providerName, title, author || ''), this.providerTimeout, signal)
-
- if (signal.aborted) return
-
- const covers = this.extractCoversFromResults(searchResults)
-
- Logger.debug(`[CoverSearchManager] Found ${covers.length} covers from ${providerName}`)
-
- if (covers.length > 0) {
- onResult({
- provider: providerName,
- covers,
- total: covers.length
- })
- }
- } catch (error) {
- if (error.name !== 'AbortError') {
- Logger.warn(`[CoverSearchManager] Provider ${providerName} failed:`, error.message)
- onError(providerName, error.message)
- }
- }
- })
-
- await Promise.allSettled(searchPromises)
- }
-
- /**
- * Execute a promise with timeout and abort signal
- */
- async executeWithTimeout(fn, timeout, signal) {
- return new Promise(async (resolve, reject) => {
- let abortHandler = null
- let timeoutId = null
-
- // Cleanup function to ensure we always remove listeners
- const cleanup = () => {
- if (timeoutId) {
- clearTimeout(timeoutId)
- timeoutId = null
- }
- if (abortHandler) {
- signal.removeEventListener('abort', abortHandler)
- abortHandler = null
- }
- }
-
- // Set up timeout
- timeoutId = setTimeout(() => {
- cleanup()
- const error = new Error('Provider timeout')
- error.name = 'TimeoutError'
- reject(error)
- }, timeout)
-
- // Check if already aborted
- if (signal.aborted) {
- cleanup()
- const error = new Error('Search cancelled')
- error.name = 'AbortError'
- reject(error)
- return
- }
-
- // Set up abort handler
- abortHandler = () => {
- cleanup()
- const error = new Error('Search cancelled')
- error.name = 'AbortError'
- reject(error)
- }
- signal.addEventListener('abort', abortHandler)
-
- try {
- const result = await fn()
- cleanup()
- resolve(result)
- } catch (error) {
- cleanup()
- reject(error)
- }
- })
- }
-
- /**
- * Extract cover URLs from search results
- */
- extractCoversFromResults(results) {
- const covers = []
- if (!Array.isArray(results)) return covers
-
- results.forEach((result) => {
- if (typeof result === 'string') {
- covers.push(result)
- }
- if (result.covers && Array.isArray(result.covers)) {
- covers.push(...result.covers)
- }
- if (result.cover) {
- covers.push(result.cover)
- }
- })
-
- // Remove duplicates
- return [...new Set(covers)]
- }
-
- /**
- * Cancel all active searches (cleanup on server shutdown)
- */
- cancelAllSearches() {
- Logger.info(`[CoverSearchManager] Cancelling ${this.activeSearches.size} active searches`)
- for (const [requestId, abortController] of this.activeSearches.entries()) {
- abortController.abort()
- }
- this.activeSearches.clear()
- }
-}
-
-module.exports = new CoverSearchManager()
diff --git a/server/managers/CronManager.js b/server/managers/CronManager.js
index 7138d26a8..d3e652129 100644
--- a/server/managers/CronManager.js
+++ b/server/managers/CronManager.js
@@ -153,11 +153,6 @@ class CronManager {
startPodcastCron(expression, libraryItemIds) {
try {
- if (!cron.validate(expression)) {
- Logger.error(`[CronManager] Invalid auto download schedule cron expression "${expression}" - not starting podcast episode check cron`)
- return
- }
-
Logger.debug(`[CronManager] Scheduling podcast episode check cron "${expression}" for ${libraryItemIds.length} item(s)`)
const task = cron.schedule(expression, () => {
if (this.podcastCronExpressionsExecuting.includes(expression)) {
@@ -172,7 +167,7 @@ class CronManager {
task
})
} catch (error) {
- Logger.error(`[PodcastManager] Failed to schedule podcast cron ${expression}`, error)
+ Logger.error(`[PodcastManager] Failed to schedule podcast cron ${this.serverSettings.podcastEpisodeSchedule}`, error)
}
}
diff --git a/server/managers/LogManager.js b/server/managers/LogManager.js
index 07bb7d401..731dfe70a 100644
--- a/server/managers/LogManager.js
+++ b/server/managers/LogManager.js
@@ -37,13 +37,8 @@ class LogManager {
}
async ensureLogDirs() {
- try {
- await fs.ensureDir(this.DailyLogPath)
- await fs.ensureDir(this.ScanLogPath)
- } catch (error) {
- console.error(`[LogManager] Failed to create log directories at "${this.DailyLogPath}": ${error.message}`)
- throw new Error(`[LogManager] Failed to create log directories at "${this.DailyLogPath}"`, { cause: error })
- }
+ await fs.ensureDir(this.DailyLogPath)
+ await fs.ensureDir(this.ScanLogPath)
}
/**
@@ -107,20 +102,20 @@ class LogManager {
}
/**
- *
- * @param {string} filename
+ *
+ * @param {string} filename
*/
async removeLogFile(filename) {
const fullPath = Path.join(this.DailyLogPath, filename)
const exists = await fs.pathExists(fullPath)
if (!exists) {
Logger.error(TAG, 'Invalid log dne ' + fullPath)
- this.dailyLogFiles = this.dailyLogFiles.filter((dlf) => dlf !== filename)
+ this.dailyLogFiles = this.dailyLogFiles.filter(dlf => dlf !== filename)
} else {
try {
await fs.unlink(fullPath)
Logger.info(TAG, 'Removed daily log: ' + filename)
- this.dailyLogFiles = this.dailyLogFiles.filter((dlf) => dlf !== filename)
+ this.dailyLogFiles = this.dailyLogFiles.filter(dlf => dlf !== filename)
} catch (error) {
Logger.error(TAG, 'Failed to unlink log file ' + fullPath)
}
@@ -128,8 +123,8 @@ class LogManager {
}
/**
- *
- * @param {LogObject} logObj
+ *
+ * @param {LogObject} logObj
*/
async logToFile(logObj) {
// Fatal crashes get logged to a separate file
@@ -157,8 +152,8 @@ class LogManager {
}
/**
- *
- * @param {LogObject} logObj
+ *
+ * @param {LogObject} logObj
*/
async logCrashToFile(logObj) {
const line = JSON.stringify(logObj) + '\n'
@@ -166,18 +161,18 @@ class LogManager {
const logsDir = Path.join(global.MetadataPath, 'logs')
await fs.ensureDir(logsDir)
const crashLogPath = Path.join(logsDir, 'crash_logs.txt')
- return fs.writeFile(crashLogPath, line, { flag: 'a+' }).catch((error) => {
+ return fs.writeFile(crashLogPath, line, { flag: "a+" }).catch((error) => {
console.log('[LogManager] Appended crash log', error)
})
}
/**
* Most recent 5000 daily logs
- *
+ *
* @returns {string}
*/
getMostRecentCurrentDailyLogs() {
return this.currentDailyLog?.logs.slice(-5000) || ''
}
}
-module.exports = LogManager
+module.exports = LogManager
\ No newline at end of file
diff --git a/server/managers/MigrationManager.js b/server/managers/MigrationManager.js
index e302038ff..8635def10 100644
--- a/server/managers/MigrationManager.js
+++ b/server/managers/MigrationManager.js
@@ -38,12 +38,7 @@ class MigrationManager {
if (!(await fs.pathExists(this.configPath))) throw new Error(`Config path does not exist: ${this.configPath}`)
this.migrationsDir = path.join(this.configPath, 'migrations')
- try {
- await fs.ensureDir(this.migrationsDir)
- } catch (error) {
- Logger.error(`[MigrationManager] Failed to create migrations directory at "${this.migrationsDir}": ${error.message}`)
- throw new Error(`[MigrationManager] Failed to create migrations directory at "${this.migrationsDir}"`, { cause: error })
- }
+ await fs.ensureDir(this.migrationsDir)
this.serverVersion = this.extractVersionFromTag(serverVersion)
if (!this.serverVersion) throw new Error(`Invalid server version: ${serverVersion}. Expected a version tag like v1.2.3.`)
diff --git a/server/managers/PlaybackSessionManager.js b/server/managers/PlaybackSessionManager.js
index 1e95727f1..fb12fedaa 100644
--- a/server/managers/PlaybackSessionManager.js
+++ b/server/managers/PlaybackSessionManager.js
@@ -459,12 +459,7 @@ class PlaybackSessionManager {
* Remove all stream folders in `/metadata/streams`
*/
async removeOrphanStreams() {
- try {
- await fs.ensureDir(this.StreamsPath)
- } catch (error) {
- Logger.error(`[PlaybackSessionManager] Failed to create streams directory at "${this.StreamsPath}": ${error.message}`)
- throw new Error(`[PlaybackSessionManager] Failed to create streams directory at "${this.StreamsPath}"`, { cause: error })
- }
+ await fs.ensureDir(this.StreamsPath)
try {
const streamsInPath = await fs.readdir(this.StreamsPath)
for (const streamId of streamsInPath) {
diff --git a/server/managers/PodcastManager.js b/server/managers/PodcastManager.js
index bdf6fc764..1b6617ac7 100644
--- a/server/managers/PodcastManager.js
+++ b/server/managers/PodcastManager.js
@@ -121,27 +121,28 @@ class PodcastManager {
await fs.mkdir(this.currentDownload.libraryItem.path)
}
- // Download episode and tag it
- const ffmpegDownloadResponse = await ffmpegHelpers.downloadPodcastEpisode(this.currentDownload).catch((error) => {
- Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
- })
- let success = !!ffmpegDownloadResponse?.success
+ let success = false
+ if (this.currentDownload.isMp3) {
+ // Download episode and tag it
+ const ffmpegDownloadResponse = await ffmpegHelpers.downloadPodcastEpisode(this.currentDownload).catch((error) => {
+ Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
+ })
+ success = !!ffmpegDownloadResponse?.success
- if (success) {
- // Attempt to ffprobe and add podcast episode audio file
- success = await this.scanAddPodcastEpisodeAudioFile()
- if (!success) {
- Logger.error(`[PodcastManager] Failed to scan and add podcast episode audio file - removing file`)
- await fs.remove(this.currentDownload.targetPath)
+ // If failed due to ffmpeg error, retry without tagging
+ // e.g. RSS feed may have incorrect file extension and file type
+ // See https://github.com/advplyr/audiobookshelf/issues/3837
+ if (!success && ffmpegDownloadResponse?.isFfmpegError) {
+ Logger.info(`[PodcastManager] Retrying episode download without tagging`)
+ // Download episode only
+ success = await downloadFile(this.currentDownload.url, this.currentDownload.targetPath)
+ .then(() => true)
+ .catch((error) => {
+ Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
+ return false
+ })
}
- }
-
- // If failed due to ffmpeg or ffprobe error, retry without tagging
- // e.g. RSS feed may have incorrect file extension and file type
- // See https://github.com/advplyr/audiobookshelf/issues/3837
- // e.g. Ffmpeg may be download the file without streams causing the ffprobe to fail
- if (!success && !ffmpegDownloadResponse?.isRequestError) {
- Logger.info(`[PodcastManager] Retrying episode download without tagging`)
+ } else {
// Download episode only
success = await downloadFile(this.currentDownload.url, this.currentDownload.targetPath)
.then(() => true)
@@ -149,20 +150,23 @@ class PodcastManager {
Logger.error(`[PodcastManager] Podcast Episode download failed`, error)
return false
})
-
- if (success) {
- success = await this.scanAddPodcastEpisodeAudioFile()
- if (!success) {
- Logger.error(`[PodcastManager] Failed to scan and add podcast episode audio file - removing file`)
- await fs.remove(this.currentDownload.targetPath)
- }
- }
}
if (success) {
- Logger.info(`[PodcastManager] Successfully downloaded podcast episode "${this.currentDownload.episodeTitle}"`)
- this.currentDownload.setFinished(true)
- task.setFinished()
+ success = await this.scanAddPodcastEpisodeAudioFile()
+ if (!success) {
+ await fs.remove(this.currentDownload.targetPath)
+ this.currentDownload.setFinished(false)
+ const taskFailedString = {
+ text: 'Failed',
+ key: 'MessageTaskFailed'
+ }
+ task.setFailed(taskFailedString)
+ } else {
+ Logger.info(`[PodcastManager] Successfully downloaded podcast episode "${this.currentDownload.episodeTitle}"`)
+ this.currentDownload.setFinished(true)
+ task.setFinished()
+ }
} else {
const taskFailedString = {
text: 'Failed',
diff --git a/server/managers/RssFeedManager.js b/server/managers/RssFeedManager.js
index a066a0d32..c4681bdc2 100644
--- a/server/managers/RssFeedManager.js
+++ b/server/managers/RssFeedManager.js
@@ -2,7 +2,6 @@ const { Request, Response } = require('express')
const Path = require('path')
const Logger = require('../Logger')
-const { getAudioMimeTypeFromExtname } = require('../utils/fileUtils')
const SocketAuthority = require('../SocketAuthority')
const Database = require('../Database')
@@ -217,11 +216,6 @@ class RssFeedManager {
res.sendStatus(404)
return
}
- // Express does not set the correct mimetype for m4b files so use our defined mimetypes if available
- const audioMimeType = getAudioMimeTypeFromExtname(Path.extname(episodePath))
- if (audioMimeType) {
- res.setHeader('Content-Type', audioMimeType)
- }
res.sendFile(episodePath)
}
diff --git a/server/migrations/v2.33.0-add-discover-query-indexes.js b/server/migrations/v2.33.0-add-discover-query-indexes.js
deleted file mode 100644
index ebd92bbaa..000000000
--- a/server/migrations/v2.33.0-add-discover-query-indexes.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @typedef MigrationContext
- * @property {import('sequelize').QueryInterface} queryInterface
- * @property {import('../Logger')} logger
- *
- * @typedef MigrationOptions
- * @property {MigrationContext} context
- */
-
-const migrationVersion = '2.33.0'
-const migrationName = `${migrationVersion}-add-discover-query-indexes`
-const loggerPrefix = `[${migrationVersion} migration]`
-
-const indexes = [
- {
- table: 'mediaProgresses',
- name: 'media_progresses_user_item_finished_time',
- fields: ['userId', 'mediaItemId', 'isFinished', 'currentTime']
- },
- {
- table: 'bookSeries',
- name: 'book_series_series_book',
- fields: ['seriesId', 'bookId']
- }
-]
-
-async function up({ context: { queryInterface, logger } }) {
- logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
-
- for (const index of indexes) {
- await addIndexIfMissing(queryInterface, logger, index)
- }
-
- logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
-}
-
-async function down({ context: { queryInterface, logger } }) {
- logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
-
- for (const index of indexes) {
- await removeIndexIfExists(queryInterface, logger, index)
- }
-
- logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
-}
-
-async function addIndexIfMissing(queryInterface, logger, index) {
- const existing = await queryInterface.showIndex(index.table)
- if (existing.some((i) => i.name === index.name)) {
- logger.info(`${loggerPrefix} index ${index.name} already exists on ${index.table}`)
- return
- }
-
- logger.info(`${loggerPrefix} adding index ${index.name} on ${index.table}(${index.fields.join(', ')})`)
- await queryInterface.addIndex(index.table, {
- name: index.name,
- fields: index.fields
- })
- logger.info(`${loggerPrefix} added index ${index.name}`)
-}
-
-async function removeIndexIfExists(queryInterface, logger, index) {
- const existing = await queryInterface.showIndex(index.table)
- if (!existing.some((i) => i.name === index.name)) {
- logger.info(`${loggerPrefix} index ${index.name} does not exist on ${index.table}`)
- return
- }
-
- logger.info(`${loggerPrefix} removing index ${index.name}`)
- await queryInterface.removeIndex(index.table, index.name)
- logger.info(`${loggerPrefix} removed index ${index.name}`)
-}
-
-module.exports = { up, down }
diff --git a/server/migrations/v2.35.0-add-last-refresh-token.js b/server/migrations/v2.35.0-add-last-refresh-token.js
deleted file mode 100644
index 0ad190e9a..000000000
--- a/server/migrations/v2.35.0-add-last-refresh-token.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * @typedef MigrationContext
- * @property {import('sequelize').QueryInterface} queryInterface - a Sequelize QueryInterface object.
- * @property {import('../Logger')} logger - a Logger object.
- *
- * @typedef MigrationOptions
- * @property {MigrationContext} context - an object containing the migration context.
- */
-
-const migrationVersion = '2.35.0'
-const migrationName = `${migrationVersion}-add-last-refresh-token`
-const loggerPrefix = `[${migrationVersion} migration]`
-
-/**
- * This migration script adds lastRefreshToken and lastRefreshTokenExpiresAt columns to the sessions table.
- *
- * @param {MigrationOptions} options - an object containing the migration context.
- * @returns {Promise} - A promise that resolves when the migration is complete.
- */
-async function up({ context: { queryInterface, logger } }) {
- logger.info(`${loggerPrefix} UPGRADE BEGIN: ${migrationName}`)
-
- if (await queryInterface.tableExists('sessions')) {
- const tableDescription = await queryInterface.describeTable('sessions')
-
- if (!tableDescription.lastRefreshToken) {
- logger.info(`${loggerPrefix} Adding lastRefreshToken column to sessions table`)
- await queryInterface.addColumn('sessions', 'lastRefreshToken', {
- type: queryInterface.sequelize.Sequelize.DataTypes.STRING,
- allowNull: true
- })
- } else {
- logger.info(`${loggerPrefix} lastRefreshToken column already exists in sessions table`)
- }
-
- if (!tableDescription.lastRefreshTokenExpiresAt) {
- logger.info(`${loggerPrefix} Adding lastRefreshTokenExpiresAt column to sessions table`)
- await queryInterface.addColumn('sessions', 'lastRefreshTokenExpiresAt', {
- type: queryInterface.sequelize.Sequelize.DataTypes.DATE,
- allowNull: true
- })
- } else {
- logger.info(`${loggerPrefix} lastRefreshTokenExpiresAt column already exists in sessions table`)
- }
- } else {
- logger.info(`${loggerPrefix} sessions table does not exist`)
- }
-
- logger.info(`${loggerPrefix} UPGRADE END: ${migrationName}`)
-}
-
-/**
- * This migration script removes the lastRefreshToken and lastRefreshTokenExpiresAt columns from the sessions table.
- *
- * @param {MigrationOptions} options - an object containing the migration context.
- * @returns {Promise} - A promise that resolves when the migration is complete.
- */
-async function down({ context: { queryInterface, logger } }) {
- logger.info(`${loggerPrefix} DOWNGRADE BEGIN: ${migrationName}`)
-
- if (await queryInterface.tableExists('sessions')) {
- const tableDescription = await queryInterface.describeTable('sessions')
-
- if (tableDescription.lastRefreshToken) {
- logger.info(`${loggerPrefix} Removing lastRefreshToken column from sessions table`)
- await queryInterface.removeColumn('sessions', 'lastRefreshToken')
- } else {
- logger.info(`${loggerPrefix} lastRefreshToken column does not exist in sessions table`)
- }
-
- if (tableDescription.lastRefreshTokenExpiresAt) {
- logger.info(`${loggerPrefix} Removing lastRefreshTokenExpiresAt column from sessions table`)
- await queryInterface.removeColumn('sessions', 'lastRefreshTokenExpiresAt')
- } else {
- logger.info(`${loggerPrefix} lastRefreshTokenExpiresAt column does not exist in sessions table`)
- }
- } else {
- logger.info(`${loggerPrefix} sessions table does not exist`)
- }
-
- logger.info(`${loggerPrefix} DOWNGRADE END: ${migrationName}`)
-}
-
-module.exports = { up, down }
diff --git a/server/models/Author.js b/server/models/Author.js
index 65561e211..287b66976 100644
--- a/server/models/Author.js
+++ b/server/models/Author.js
@@ -111,17 +111,16 @@ class Author extends Model {
*
* @param {string} name
* @param {string} libraryId
- * @returns {Promise<{ author: Author, created: boolean }>}
+ * @returns {Promise}
*/
static async findOrCreateByNameAndLibrary(name, libraryId) {
const author = await this.getByNameAndLibrary(name, libraryId)
- if (author) return { author, created: false }
- const newAuthor = await this.create({
+ if (author) return author
+ return this.create({
name,
lastFirst: this.getLastFirst(name),
libraryId
})
- return { author: newAuthor, created: true }
}
/**
diff --git a/server/models/Book.js b/server/models/Book.js
index 7e1a2e30c..96371f3a2 100644
--- a/server/models/Book.js
+++ b/server/models/Book.js
@@ -4,7 +4,6 @@ const { getTitlePrefixAtEnd, getTitleIgnorePrefix } = require('../utils')
const parseNameString = require('../utils/parsers/parseNameString')
const htmlSanitizer = require('../utils/htmlSanitizer')
const libraryItemsBookFilters = require('../utils/queries/libraryItemsBookFilters')
-const SocketAuthority = require('../SocketAuthority')
/**
* @typedef EBookFileObject
@@ -471,23 +470,13 @@ class Book extends Model {
for (const author of authorsRemoved) {
await bookAuthorModel.removeByIds(author.id, this.id)
- const numBooks = await bookAuthorModel.getCountForAuthor(author.id)
- if (numBooks > 0) {
- SocketAuthority.emitter('author_updated', author.toOldJSONExpanded(numBooks))
- }
Logger.debug(`[Book] "${this.title}" Removed author "${author.name}"`)
this.authors = this.authors.filter((au) => au.id !== author.id)
}
const authorsAdded = []
for (const authorName of newAuthorNames) {
- const { author, created } = await authorModel.findOrCreateByNameAndLibrary(authorName, libraryId)
+ const author = await authorModel.findOrCreateByNameAndLibrary(authorName, libraryId)
await bookAuthorModel.create({ bookId: this.id, authorId: author.id })
- if (created) {
- SocketAuthority.emitter('author_added', author.toOldJSON())
- } else {
- const numBooks = await bookAuthorModel.getCountForAuthor(author.id)
- SocketAuthority.emitter('author_updated', author.toOldJSONExpanded(numBooks))
- }
Logger.debug(`[Book] "${this.title}" Added author "${author.name}"`)
this.authors.push(author)
authorsAdded.push(author)
@@ -647,11 +636,6 @@ class Book extends Model {
}
}
- /**
- * Minified book JSON for list/shelf endpoints.
- * `toOldJSONExpanded()` must be a strict superset: every key here must exist in expanded
- * with the same value semantics. Only additive changes to expanded; never remove or rename keys.
- */
toOldJSONMinified() {
if (!this.authors) {
throw new Error(`[Book] Cannot convert to old JSON because authors are not loaded`)
@@ -674,12 +658,6 @@ class Book extends Model {
}
}
- /**
- * Expanded book JSON for item detail and socket events.
- * Must be a strict superset of `toOldJSONMinified()` â built by spreading minified, then adding expanded-only fields.
- *
- * @param {string} libraryItemId
- */
toOldJSONExpanded(libraryItemId) {
if (!libraryItemId) {
throw new Error(`[Book] Cannot convert to old JSON because libraryItemId is not provided`)
@@ -692,12 +670,16 @@ class Book extends Model {
}
return {
- ...this.toOldJSONMinified(),
- libraryItemId,
+ id: this.id,
+ libraryItemId: libraryItemId,
metadata: this.oldMetadataToJSONExpanded(),
+ coverPath: this.coverPath,
+ tags: [...(this.tags || [])],
audioFiles: structuredClone(this.audioFiles),
chapters: structuredClone(this.chapters),
ebookFile: structuredClone(this.ebookFile),
+ duration: this.duration,
+ size: this.size,
tracks: this.getTracklist(libraryItemId)
}
}
diff --git a/server/models/BookAuthor.js b/server/models/BookAuthor.js
index f2cbf60f0..d7d65728e 100644
--- a/server/models/BookAuthor.js
+++ b/server/models/BookAuthor.js
@@ -1,4 +1,4 @@
-const { DataTypes, Model, fn, col } = require('sequelize')
+const { DataTypes, Model } = require('sequelize')
class BookAuthor extends Model {
constructor(values, options) {
@@ -37,32 +37,6 @@ class BookAuthor extends Model {
})
}
- /**
- * Get number of books for each author
- *
- * @param {string[]} authorIds
- * @returns {Promise>}
- */
- static async getCountsForAuthors(authorIds) {
- if (!authorIds.length) return {}
-
- const rows = await this.findAll({
- attributes: ['authorId', [fn('COUNT', col('id')), 'count']],
- where: {
- authorId: authorIds
- },
- group: ['authorId'],
- raw: true
- })
-
- /** @type {Record} */
- const counts = {}
- for (const row of rows) {
- counts[row.authorId] = Number(row.count)
- }
- return counts
- }
-
/**
* Initialize model
* @param {import('../Database').sequelize} sequelize
diff --git a/server/models/BookSeries.js b/server/models/BookSeries.js
index e71f28a8e..31eccb9fa 100644
--- a/server/models/BookSeries.js
+++ b/server/models/BookSeries.js
@@ -48,10 +48,6 @@ class BookSeries extends Model {
{
name: 'bookSeries_seriesId',
fields: ['seriesId']
- },
- {
- name: 'book_series_series_book',
- fields: ['seriesId', 'bookId']
}
]
}
diff --git a/server/models/LibraryItem.js b/server/models/LibraryItem.js
index c03667efc..16a521615 100644
--- a/server/models/LibraryItem.js
+++ b/server/models/LibraryItem.js
@@ -340,15 +340,6 @@ class LibraryItem extends Model {
const shelves = []
- const timed = async (loader) => {
- const start = Date.now()
- const payload = await loader()
- return {
- payload,
- elapsedSeconds: ((Date.now() - start) / 1000).toFixed(2)
- }
- }
-
// "Continue Listening" shelf
const itemsInProgressPayload = await libraryFilters.getMediaItemsInProgress(library, user, include, limit, false)
if (itemsInProgressPayload.items.length) {
@@ -380,18 +371,11 @@ class LibraryItem extends Model {
}
Logger.debug(`Loaded ${itemsInProgressPayload.items.length} of ${itemsInProgressPayload.count} items for "Continue Listening/Reading" in ${((Date.now() - fullStart) / 1000).toFixed(2)}s`)
+ let start = Date.now()
if (library.isBook) {
- const [continueSeriesResult, mostRecentResult, seriesMostRecentResult, discoverResult, mediaFinishedResult, newestAuthorsResult] = await Promise.all([
- timed(() => libraryFilters.getLibraryItemsContinueSeries(library, user, include, limit)),
- timed(() => libraryFilters.getLibraryItemsMostRecentlyAdded(library, user, include, limit)),
- timed(() => libraryFilters.getSeriesMostRecentlyAdded(library, user, include, 5)),
- timed(() => libraryFilters.getLibraryItemsToDiscover(library, user, include, limit)),
- timed(() => libraryFilters.getMediaFinished(library, user, include, limit)),
- timed(() => libraryFilters.getNewestAuthors(library, user, limit))
- ])
-
- const continueSeriesPayload = continueSeriesResult.payload
+ start = Date.now()
// "Continue Series" shelf
+ const continueSeriesPayload = await libraryFilters.getLibraryItemsContinueSeries(library, user, include, limit)
if (continueSeriesPayload.libraryItems.length) {
shelves.push({
id: 'continue-series',
@@ -402,103 +386,10 @@ class LibraryItem extends Model {
total: continueSeriesPayload.count
})
}
- Logger.debug(`Loaded ${continueSeriesPayload.libraryItems.length} of ${continueSeriesPayload.count} items for "Continue Series" in ${continueSeriesResult.elapsedSeconds}s`)
-
- const mostRecentPayload = mostRecentResult.payload
- // "Recently Added" shelf
- if (mostRecentPayload.libraryItems.length) {
- shelves.push({
- id: 'recently-added',
- label: 'Recently Added',
- labelStringKey: 'LabelRecentlyAdded',
- type: library.mediaType,
- entities: mostRecentPayload.libraryItems,
- total: mostRecentPayload.count
- })
- }
- Logger.debug(`Loaded ${mostRecentPayload.libraryItems.length} of ${mostRecentPayload.count} items for "Recently Added" in ${mostRecentResult.elapsedSeconds}s`)
-
- const seriesMostRecentPayload = seriesMostRecentResult.payload
- // "Recent Series" shelf
- if (seriesMostRecentPayload.series.length) {
- shelves.push({
- id: 'recent-series',
- label: 'Recent Series',
- labelStringKey: 'LabelRecentSeries',
- type: 'series',
- entities: seriesMostRecentPayload.series,
- total: seriesMostRecentPayload.count
- })
- }
- Logger.debug(`Loaded ${seriesMostRecentPayload.series.length} of ${seriesMostRecentPayload.count} series for "Recent Series" in ${seriesMostRecentResult.elapsedSeconds}s`)
-
- const discoverLibraryItemsPayload = discoverResult.payload
- // "Discover" shelf
- if (discoverLibraryItemsPayload.libraryItems.length) {
- shelves.push({
- id: 'discover',
- label: 'Discover',
- labelStringKey: 'LabelDiscover',
- type: library.mediaType,
- entities: discoverLibraryItemsPayload.libraryItems,
- total: discoverLibraryItemsPayload.count
- })
- }
- Logger.debug(`Loaded ${discoverLibraryItemsPayload.libraryItems.length} of ${discoverLibraryItemsPayload.count} items for "Discover" in ${discoverResult.elapsedSeconds}s`)
-
- const mediaFinishedPayload = mediaFinishedResult.payload
- // "Listen Again" shelf
- if (mediaFinishedPayload.items.length) {
- const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
- const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks || li.mediaType === 'podcast')
-
- if (audioItemsInProgress.length) {
- shelves.push({
- id: 'listen-again',
- label: 'Listen Again',
- labelStringKey: 'LabelListenAgain',
- type: library.isPodcast ? 'episode' : 'book',
- entities: audioItemsInProgress,
- total: mediaFinishedPayload.count
- })
- }
-
- if (ebookOnlyItemsInProgress.length) {
- // "Read Again" shelf
- shelves.push({
- id: 'read-again',
- label: 'Read Again',
- labelStringKey: 'LabelReadAgain',
- type: 'book',
- entities: ebookOnlyItemsInProgress,
- total: mediaFinishedPayload.count
- })
- }
- }
- Logger.debug(`Loaded ${mediaFinishedPayload.items.length} of ${mediaFinishedPayload.count} items for "Listen/Read Again" in ${mediaFinishedResult.elapsedSeconds}s`)
-
- const newestAuthorsPayload = newestAuthorsResult.payload
- // "Newest Authors" shelf
- if (newestAuthorsPayload.authors.length) {
- shelves.push({
- id: 'newest-authors',
- label: 'Newest Authors',
- labelStringKey: 'LabelNewestAuthors',
- type: 'authors',
- entities: newestAuthorsPayload.authors,
- total: newestAuthorsPayload.count
- })
- }
- Logger.debug(`Loaded ${newestAuthorsPayload.authors.length} of ${newestAuthorsPayload.count} authors for "Newest Authors" in ${newestAuthorsResult.elapsedSeconds}s`)
+ Logger.debug(`Loaded ${continueSeriesPayload.libraryItems.length} of ${continueSeriesPayload.count} items for "Continue Series" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
} else if (library.isPodcast) {
- const [newestEpisodesResult, mostRecentResult, mediaFinishedResult] = await Promise.all([
- timed(() => libraryFilters.getNewestPodcastEpisodes(library, user, limit)),
- timed(() => libraryFilters.getLibraryItemsMostRecentlyAdded(library, user, include, limit)),
- timed(() => libraryFilters.getMediaFinished(library, user, include, limit))
- ])
-
- const newestEpisodesPayload = newestEpisodesResult.payload
// "Newest Episodes" shelf
+ const newestEpisodesPayload = await libraryFilters.getNewestPodcastEpisodes(library, user, limit)
if (newestEpisodesPayload.libraryItems.length) {
shelves.push({
id: 'newest-episodes',
@@ -509,52 +400,103 @@ class LibraryItem extends Model {
total: newestEpisodesPayload.count
})
}
- Logger.debug(`Loaded ${newestEpisodesPayload.libraryItems.length} of ${newestEpisodesPayload.count} episodes for "Newest Episodes" in ${newestEpisodesResult.elapsedSeconds}s`)
+ Logger.debug(`Loaded ${newestEpisodesPayload.libraryItems.length} of ${newestEpisodesPayload.count} episodes for "Newest Episodes" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
+ }
- const mostRecentPayload = mostRecentResult.payload
- // "Recently Added" shelf
- if (mostRecentPayload.libraryItems.length) {
+ start = Date.now()
+ // "Recently Added" shelf
+ const mostRecentPayload = await libraryFilters.getLibraryItemsMostRecentlyAdded(library, user, include, limit)
+ if (mostRecentPayload.libraryItems.length) {
+ shelves.push({
+ id: 'recently-added',
+ label: 'Recently Added',
+ labelStringKey: 'LabelRecentlyAdded',
+ type: library.mediaType,
+ entities: mostRecentPayload.libraryItems,
+ total: mostRecentPayload.count
+ })
+ }
+ Logger.debug(`Loaded ${mostRecentPayload.libraryItems.length} of ${mostRecentPayload.count} items for "Recently Added" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
+
+ if (library.isBook) {
+ start = Date.now()
+ // "Recent Series" shelf
+ const seriesMostRecentPayload = await libraryFilters.getSeriesMostRecentlyAdded(library, user, include, 5)
+ if (seriesMostRecentPayload.series.length) {
shelves.push({
- id: 'recently-added',
- label: 'Recently Added',
- labelStringKey: 'LabelRecentlyAdded',
- type: library.mediaType,
- entities: mostRecentPayload.libraryItems,
- total: mostRecentPayload.count
+ id: 'recent-series',
+ label: 'Recent Series',
+ labelStringKey: 'LabelRecentSeries',
+ type: 'series',
+ entities: seriesMostRecentPayload.series,
+ total: seriesMostRecentPayload.count
})
}
- Logger.debug(`Loaded ${mostRecentPayload.libraryItems.length} of ${mostRecentPayload.count} items for "Recently Added" in ${mostRecentResult.elapsedSeconds}s`)
+ Logger.debug(`Loaded ${seriesMostRecentPayload.series.length} of ${seriesMostRecentPayload.count} series for "Recent Series" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
- const mediaFinishedPayload = mediaFinishedResult.payload
- // "Listen Again" shelf
- if (mediaFinishedPayload.items.length) {
- const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
- const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks || li.mediaType === 'podcast')
-
- if (audioItemsInProgress.length) {
- shelves.push({
- id: 'listen-again',
- label: 'Listen Again',
- labelStringKey: 'LabelListenAgain',
- type: 'episode',
- entities: audioItemsInProgress,
- total: mediaFinishedPayload.count
- })
- }
-
- if (ebookOnlyItemsInProgress.length) {
- // "Read Again" shelf
- shelves.push({
- id: 'read-again',
- label: 'Read Again',
- labelStringKey: 'LabelReadAgain',
- type: 'book',
- entities: ebookOnlyItemsInProgress,
- total: mediaFinishedPayload.count
- })
- }
+ start = Date.now()
+ // "Discover" shelf
+ const discoverLibraryItemsPayload = await libraryFilters.getLibraryItemsToDiscover(library, user, include, limit)
+ if (discoverLibraryItemsPayload.libraryItems.length) {
+ shelves.push({
+ id: 'discover',
+ label: 'Discover',
+ labelStringKey: 'LabelDiscover',
+ type: library.mediaType,
+ entities: discoverLibraryItemsPayload.libraryItems,
+ total: discoverLibraryItemsPayload.count
+ })
}
- Logger.debug(`Loaded ${mediaFinishedPayload.items.length} of ${mediaFinishedPayload.count} items for "Listen/Read Again" in ${mediaFinishedResult.elapsedSeconds}s`)
+ Logger.debug(`Loaded ${discoverLibraryItemsPayload.libraryItems.length} of ${discoverLibraryItemsPayload.count} items for "Discover" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
+ }
+
+ start = Date.now()
+ // "Listen Again" shelf
+ const mediaFinishedPayload = await libraryFilters.getMediaFinished(library, user, include, limit)
+ if (mediaFinishedPayload.items.length) {
+ const ebookOnlyItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.ebookFormat && !li.media.numTracks)
+ const audioItemsInProgress = mediaFinishedPayload.items.filter((li) => li.media.numTracks || li.mediaType === 'podcast')
+
+ if (audioItemsInProgress.length) {
+ shelves.push({
+ id: 'listen-again',
+ label: 'Listen Again',
+ labelStringKey: 'LabelListenAgain',
+ type: library.isPodcast ? 'episode' : 'book',
+ entities: audioItemsInProgress,
+ total: mediaFinishedPayload.count
+ })
+ }
+
+ // "Read Again" shelf
+ if (ebookOnlyItemsInProgress.length) {
+ shelves.push({
+ id: 'read-again',
+ label: 'Read Again',
+ labelStringKey: 'LabelReadAgain',
+ type: 'book',
+ entities: ebookOnlyItemsInProgress,
+ total: mediaFinishedPayload.count
+ })
+ }
+ }
+ Logger.debug(`Loaded ${mediaFinishedPayload.items.length} of ${mediaFinishedPayload.count} items for "Listen/Read Again" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
+
+ if (library.isBook) {
+ start = Date.now()
+ // "Newest Authors" shelf
+ const newestAuthorsPayload = await libraryFilters.getNewestAuthors(library, user, limit)
+ if (newestAuthorsPayload.authors.length) {
+ shelves.push({
+ id: 'newest-authors',
+ label: 'Newest Authors',
+ labelStringKey: 'LabelNewestAuthors',
+ type: 'authors',
+ entities: newestAuthorsPayload.authors,
+ total: newestAuthorsPayload.count
+ })
+ }
+ Logger.debug(`Loaded ${newestAuthorsPayload.authors.length} of ${newestAuthorsPayload.count} authors for "Newest Authors" in ${((Date.now() - start) / 1000).toFixed(2)}s`)
}
Logger.debug(`Loaded ${shelves.length} personalized shelves in ${((Date.now() - fullStart) / 1000).toFixed(2)}s`)
@@ -1004,11 +946,6 @@ class LibraryItem extends Model {
}
}
- /**
- * Minified library item JSON for list/shelf endpoints.
- * `toOldJSONExpanded()` must be a strict superset: every key here must exist in expanded
- * with the same value semantics. Only additive changes to expanded; never remove or rename keys.
- */
toOldJSONMinified() {
if (!this.media) {
throw new Error(`[LibraryItem] Cannot convert to old JSON without media for library item "${this.id}"`)
@@ -1037,18 +974,30 @@ class LibraryItem extends Model {
}
}
- /**
- * Expanded library item JSON for item detail and socket events.
- * Must be a strict superset of `toOldJSONMinified()` â built by spreading minified, then adding expanded-only fields.
- */
toOldJSONExpanded() {
return {
- ...this.toOldJSONMinified(),
+ id: this.id,
+ ino: this.ino,
+ oldLibraryItemId: this.extraData?.oldLibraryItemId || null,
+ libraryId: this.libraryId,
+ folderId: this.libraryFolderId,
+ path: this.path,
+ relPath: this.relPath,
+ isFile: this.isFile,
+ mtimeMs: this.mtime?.valueOf(),
+ ctimeMs: this.ctime?.valueOf(),
+ birthtimeMs: this.birthtime?.valueOf(),
+ addedAt: this.createdAt.valueOf(),
+ updatedAt: this.updatedAt.valueOf(),
lastScan: this.lastScan?.valueOf(),
scanVersion: this.lastScanVersion,
+ isMissing: !!this.isMissing,
+ isInvalid: !!this.isInvalid,
+ mediaType: this.mediaType,
media: this.media.toOldJSONExpanded(this.id),
// LibraryFile JSON includes a fileType property that may not be saved in libraryFiles column in the database
- libraryFiles: this.getLibraryFilesJson()
+ libraryFiles: this.getLibraryFilesJson(),
+ size: this.size
}
}
}
diff --git a/server/models/MediaProgress.js b/server/models/MediaProgress.js
index 9c0269a9e..0ebe2f598 100644
--- a/server/models/MediaProgress.js
+++ b/server/models/MediaProgress.js
@@ -80,10 +80,6 @@ class MediaProgress extends Model {
indexes: [
{
fields: ['updatedAt']
- },
- {
- name: 'media_progresses_user_item_finished_time',
- fields: ['userId', 'mediaItemId', 'isFinished', 'currentTime']
}
]
}
diff --git a/server/models/Podcast.js b/server/models/Podcast.js
index 9c222e48a..d99a66df4 100644
--- a/server/models/Podcast.js
+++ b/server/models/Podcast.js
@@ -78,21 +78,10 @@ class Podcast extends Model {
*/
static async createFromRequest(payload, transaction) {
const title = typeof payload.metadata.title === 'string' ? payload.metadata.title : null
- // cron expression validated in controller
const autoDownloadSchedule = typeof payload.autoDownloadSchedule === 'string' ? payload.autoDownloadSchedule : null
const genres = Array.isArray(payload.metadata.genres) && payload.metadata.genres.every((g) => typeof g === 'string' && g.length) ? payload.metadata.genres : []
const tags = Array.isArray(payload.tags) && payload.tags.every((t) => typeof t === 'string' && t.length) ? payload.tags : []
- const stringKeys = ['title', 'author', 'releaseDate', 'feedUrl', 'imageUrl', 'description', 'itunesPageUrl', 'itunesId', 'itunesArtistId', 'language', 'type']
- stringKeys.forEach((key) => {
- if (typeof payload.metadata[key] === 'number') {
- payload.metadata[key] = String(payload.metadata[key])
- }
- })
-
- const rawDescription = typeof payload.metadata.description === 'string' ? payload.metadata.description : null
- const description = rawDescription ? htmlSanitizer.sanitize(rawDescription) : null
-
return this.create(
{
title,
@@ -101,7 +90,7 @@ class Podcast extends Model {
releaseDate: typeof payload.metadata.releaseDate === 'string' ? payload.metadata.releaseDate : null,
feedURL: typeof payload.metadata.feedUrl === 'string' ? payload.metadata.feedUrl : null,
imageURL: typeof payload.metadata.imageUrl === 'string' ? payload.metadata.imageUrl : null,
- description,
+ description: typeof payload.metadata.description === 'string' ? payload.metadata.description : null,
itunesPageURL: typeof payload.metadata.itunesPageUrl === 'string' ? payload.metadata.itunesPageUrl : null,
itunesId: typeof payload.metadata.itunesId === 'string' ? payload.metadata.itunesId : null,
itunesArtistId: typeof payload.metadata.itunesArtistId === 'string' ? payload.metadata.itunesArtistId : null,
@@ -216,11 +205,6 @@ class Podcast extends Model {
if (payload.metadata) {
const stringKeys = ['title', 'author', 'releaseDate', 'feedUrl', 'imageUrl', 'description', 'itunesPageUrl', 'itunesId', 'itunesArtistId', 'language', 'type']
stringKeys.forEach((key) => {
- // Convert numbers to strings
- if (typeof payload.metadata[key] === 'number') {
- payload.metadata[key] = String(payload.metadata[key])
- }
-
let newKey = key
if (key === 'type') {
newKey = 'podcastType'
@@ -274,7 +258,6 @@ class Podcast extends Model {
hasUpdates = true
}
if (typeof payload.autoDownloadSchedule === 'string' && payload.autoDownloadSchedule !== this.autoDownloadSchedule) {
- // cron expression validated in controller
this.autoDownloadSchedule = payload.autoDownloadSchedule
hasUpdates = true
}
@@ -451,11 +434,6 @@ class Podcast extends Model {
}
}
- /**
- * Minified podcast JSON for list/shelf endpoints.
- * `toOldJSONExpanded()` must be a strict superset: every key here must exist in expanded
- * with the same value semantics. Only additive changes to expanded; never remove or rename keys.
- */
toOldJSONMinified() {
return {
id: this.id,
@@ -473,12 +451,6 @@ class Podcast extends Model {
}
}
- /**
- * Expanded podcast JSON for item detail and socket events.
- * Must be a strict superset of `toOldJSONMinified()` â built by spreading minified, then adding expanded-only fields.
- *
- * @param {string} libraryItemId
- */
toOldJSONExpanded(libraryItemId) {
if (!libraryItemId) {
throw new Error(`[Podcast] Cannot convert to old JSON because libraryItemId is not provided`)
@@ -488,9 +460,18 @@ class Podcast extends Model {
}
return {
- ...this.toOldJSONMinified(),
- libraryItemId,
- episodes: this.podcastEpisodes.map((e) => e.toOldJSONExpanded(libraryItemId))
+ id: this.id,
+ libraryItemId: libraryItemId,
+ metadata: this.oldMetadataToJSONExpanded(),
+ coverPath: this.coverPath,
+ tags: [...(this.tags || [])],
+ episodes: this.podcastEpisodes.map((e) => e.toOldJSONExpanded(libraryItemId)),
+ autoDownloadEpisodes: this.autoDownloadEpisodes,
+ autoDownloadSchedule: this.autoDownloadSchedule,
+ lastEpisodeCheck: this.lastEpisodeCheck?.valueOf() || null,
+ maxEpisodesToKeep: this.maxEpisodesToKeep,
+ maxNewEpisodesToDownload: this.maxNewEpisodesToDownload,
+ size: this.size
}
}
}
diff --git a/server/models/PodcastEpisode.js b/server/models/PodcastEpisode.js
index 996f55f58..27e702a10 100644
--- a/server/models/PodcastEpisode.js
+++ b/server/models/PodcastEpisode.js
@@ -185,7 +185,6 @@ class PodcastEpisode extends Model {
const track = structuredClone(this.audioFile)
track.startOffset = 0
track.title = this.audioFile.metadata.filename
- track.index = 1 // Podcast episodes only have one track
track.contentUrl = `/api/items/${libraryItemId}/file/${track.ino}`
return track
}
diff --git a/server/models/Session.js b/server/models/Session.js
index 3b85bd46a..fe9dd5425 100644
--- a/server/models/Session.js
+++ b/server/models/Session.js
@@ -18,10 +18,6 @@ class Session extends Model {
this.userId
/** @type {Date} */
this.expiresAt
- /** @type {string} */
- this.lastRefreshToken
- /** @type {Date} */
- this.lastRefreshTokenExpiresAt
// Expanded properties
@@ -70,14 +66,6 @@ class Session extends Model {
expiresAt: {
type: DataTypes.DATE,
allowNull: false
- },
- lastRefreshToken: {
- type: DataTypes.STRING,
- allowNull: true
- },
- lastRefreshTokenExpiresAt: {
- type: DataTypes.DATE,
- allowNull: true
}
},
{
diff --git a/server/models/User.js b/server/models/User.js
index 0b9d49438..bc8a9f6a1 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -211,18 +211,18 @@ class User extends Model {
}
/**
- * Finds an existing user by OpenID subject identifier, or by email/username based on server settings
- * Returns null if no user is found
+ * 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.
*
* @param {Object} userinfo
- * @returns {Promise}
+ * @returns {Promise}
*/
- static async findUserFromOpenIdUserInfo(userinfo) {
+ static async findOrCreateUserFromOpenIdUserInfo(userinfo) {
let user = await this.getUserByOpenIDSub(userinfo.sub)
// Matched by sub
if (user) {
- Logger.debug(`[User] openid: User found by sub "${userinfo.sub}"`)
+ Logger.debug(`[User] openid: User found by sub`)
return user
}
@@ -232,27 +232,20 @@ class User extends Model {
// Only disallow when email_verified explicitly set to false (allow both if not set or true)
if (userinfo.email_verified === false) {
Logger.warn(`[User] openid: User not found and email "${userinfo.email}" is not verified`)
- return {
- error: 'Email not verified'
- }
+ return null
} else {
Logger.info(`[User] openid: User not found, checking existing with email "${userinfo.email}"`)
user = await this.getUserByEmail(userinfo.email)
if (user?.authOpenIDSub) {
Logger.warn(`[User] openid: User found with email "${userinfo.email}" but is already matched with sub "${user.authOpenIDSub}"`)
- // User is linked to a different OpenID subject; do not proceed.
- return {
- error: 'User already linked to a different OpenID subject'
- }
+ return null // User is linked to a different OpenID subject; do not proceed.
}
}
} else {
Logger.warn(`[User] 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 {
- error: 'No email in userinfo'
- }
+ return null
}
}
// Match existing user by username
@@ -267,40 +260,43 @@ class User extends Model {
username = userinfo.username
} else {
Logger.warn(`[User] openid: User not found and neither preferred_username nor username in userinfo`)
- return {
- error: 'No username in userinfo'
- }
+ return null
}
user = await this.getUserByUsername(username)
if (user?.authOpenIDSub) {
Logger.warn(`[User] openid: User found with username "${username}" but is already matched with sub "${user.authOpenIDSub}"`)
- // User is linked to a different OpenID subject; do not proceed.
- return {
- error: 'User already linked to a different OpenID subject'
- }
+ return null // User is linked to a different OpenID subject; do not proceed.
}
}
- if (!user) {
- return null
- }
-
// Found existing user via email or username
- if (!user.isActive) {
- Logger.warn(`[User] openid: User found but is not active`)
+ if (user) {
+ if (!user.isActive) {
+ Logger.warn(`[User] openid: User found but is not active`)
+ return null
+ }
+
+ // Update user with OpenID sub
+ if (!user.extraData) user.extraData = {}
+ user.extraData.authOpenIDSub = userinfo.sub
+ user.changed('extraData', true)
+ await user.save()
+
+ Logger.debug(`[User] openid: User found by email/username`)
return user
}
- // Update user with OpenID sub
- if (!user.extraData) user.extraData = {}
- user.extraData.authOpenIDSub = userinfo.sub
- user.changed('extraData', true)
- await user.save()
+ // If no existing user was matched, auto-register if configured
+ if (global.ServerSettings.authOpenIDAutoRegister) {
+ Logger.info(`[User] openid: Auto-registering user with sub "${userinfo.sub}"`, userinfo)
+ user = await this.createUserFromOpenIdUserInfo(userinfo)
+ return user
+ }
- Logger.debug(`[User] openid: User found by email/username`)
- return user
+ Logger.warn(`[User] openid: User not found and auto-register is disabled`)
+ return null
}
/**
@@ -352,7 +348,11 @@ class User extends Model {
if (cachedUser) return cachedUser
const user = await this.findOne({
- where: sequelize.where(sequelize.fn('lower', sequelize.col('username')), username.toLowerCase()),
+ where: {
+ username: {
+ [sequelize.Op.like]: username
+ }
+ },
include: this.sequelize.models.mediaProgress
})
@@ -373,7 +373,11 @@ class User extends Model {
if (cachedUser) return cachedUser
const user = await this.findOne({
- where: sequelize.where(sequelize.fn('lower', sequelize.col('email')), email.toLowerCase()),
+ where: {
+ email: {
+ [sequelize.Op.like]: email
+ }
+ },
include: this.sequelize.models.mediaProgress
})
@@ -530,14 +534,7 @@ class User extends Model {
},
{
sequelize,
- modelName: 'user',
- hooks: {
- beforeDestroy(user) {
- if (user.type === 'root') {
- throw new Error('Root user cannot be deleted')
- }
- }
- }
+ modelName: 'user'
}
)
}
@@ -781,14 +778,7 @@ class User extends Model {
error: 'Library item not found',
statusCode: 404
}
- } else if (libraryItem.mediaType !== 'book') {
- Logger.error(`[User] createUpdateMediaProgress: library item ${progressPayload.libraryItemId} is not a book`)
- return {
- error: 'Library item is not a book',
- statusCode: 400
- }
}
-
mediaItemId = libraryItem.media.id
mediaProgress = libraryItem.media.mediaProgresses?.[0]
}
diff --git a/server/objects/DeviceInfo.js b/server/objects/DeviceInfo.js
index 68237f0fb..ceff6c32e 100644
--- a/server/objects/DeviceInfo.js
+++ b/server/objects/DeviceInfo.js
@@ -1,10 +1,6 @@
-const uuidv4 = require('uuid').v4
-const { stripAllTags } = require('../utils/htmlSanitizer')
+const uuidv4 = require("uuid").v4
class DeviceInfo {
- /** @type {string[]} Fields to sanitize when loading from stored data */
- static stringFields = ['deviceId', 'clientVersion', 'manufacturer', 'model', 'sdkVersion', 'clientName', 'deviceName']
-
constructor(deviceInfo = null) {
this.id = null
this.userId = null
@@ -35,7 +31,7 @@ class DeviceInfo {
construct(deviceInfo) {
for (const key in deviceInfo) {
if (deviceInfo[key] !== undefined && this[key] !== undefined) {
- this[key] = DeviceInfo.stringFields.includes(key) ? stripAllTags(deviceInfo[key]) : deviceInfo[key]
+ this[key] = deviceInfo[key]
}
}
}
@@ -67,8 +63,7 @@ class DeviceInfo {
}
get deviceDescription() {
- if (this.model) {
- // Set from mobile apps
+ if (this.model) { // Set from mobile apps
if (this.sdkVersion) return `${this.model} SDK ${this.sdkVersion} / v${this.clientVersion}`
return `${this.model} / v${this.clientVersion}`
}
@@ -77,7 +72,18 @@ class DeviceInfo {
// When client doesn't send a device id
getTempDeviceId() {
- const keys = [this.userId, this.browserName, this.browserVersion, this.osName, this.osVersion, this.clientVersion, this.manufacturer, this.model, this.sdkVersion, this.ipAddress].map((k) => k || '')
+ const keys = [
+ this.userId,
+ this.browserName,
+ this.browserVersion,
+ this.osName,
+ this.osVersion,
+ this.clientVersion,
+ this.manufacturer,
+ this.model,
+ this.sdkVersion,
+ this.ipAddress
+ ].map(k => k || '')
return 'temp-' + Buffer.from(keys.join('-'), 'utf-8').toString('base64')
}
@@ -93,17 +99,12 @@ class DeviceInfo {
this.osVersion = ua?.os.version || null
this.deviceType = ua?.device.type || null
- this.clientVersion = stripAllTags(clientDeviceInfo?.clientVersion) || serverVersion
- this.manufacturer = stripAllTags(clientDeviceInfo?.manufacturer) || null
- this.model = stripAllTags(clientDeviceInfo?.model) || null
+ this.clientVersion = clientDeviceInfo?.clientVersion || serverVersion
+ this.manufacturer = clientDeviceInfo?.manufacturer || null
+ this.model = clientDeviceInfo?.model || null
+ this.sdkVersion = clientDeviceInfo?.sdkVersion || null
- if (typeof clientDeviceInfo?.sdkVersion === 'number') {
- this.sdkVersion = clientDeviceInfo.sdkVersion.toString()
- } else {
- this.sdkVersion = stripAllTags(clientDeviceInfo?.sdkVersion) || null
- }
-
- this.clientName = stripAllTags(clientDeviceInfo?.clientName) || null
+ this.clientName = clientDeviceInfo?.clientName || null
if (this.sdkVersion) {
if (!this.clientName) this.clientName = 'Abs Android'
this.deviceName = `${this.manufacturer || 'Unknown'} ${this.model || ''}`
@@ -148,4 +149,4 @@ class DeviceInfo {
return hasUpdates
}
}
-module.exports = DeviceInfo
+module.exports = DeviceInfo
\ No newline at end of file
diff --git a/server/objects/PlaybackSession.js b/server/objects/PlaybackSession.js
index ace0256e8..ba031b665 100644
--- a/server/objects/PlaybackSession.js
+++ b/server/objects/PlaybackSession.js
@@ -110,8 +110,7 @@ class PlaybackSession {
startedAt: this.startedAt,
updatedAt: this.updatedAt,
audioTracks: this.audioTracks.map((at) => at.toJSON?.() || { ...at }),
- libraryItem: libraryItem?.toOldJSONExpanded() || null,
- coverAspectRatio: this.coverAspectRatio !== null ? this.coverAspectRatio : undefined // Used for share sessions
+ libraryItem: libraryItem?.toOldJSONExpanded() || null
}
}
diff --git a/server/objects/PodcastEpisodeDownload.js b/server/objects/PodcastEpisodeDownload.js
index cce9f66fa..3c1d82ac9 100644
--- a/server/objects/PodcastEpisodeDownload.js
+++ b/server/objects/PodcastEpisodeDownload.js
@@ -63,6 +63,16 @@ class PodcastEpisodeDownload {
const enclosureType = this.rssPodcastEpisode.enclosure.type
return typeof enclosureType === 'string' ? enclosureType : null
}
+ /**
+ * RSS feed may have an episode with file extension of mp3 but the specified enclosure type is not mpeg.
+ * @see https://github.com/advplyr/audiobookshelf/issues/3711
+ *
+ * @returns {boolean}
+ */
+ get isMp3() {
+ if (this.enclosureType && !this.enclosureType.includes('mpeg')) return false
+ return this.fileExtension === 'mp3'
+ }
get episodeTitle() {
return this.rssPodcastEpisode.title
}
diff --git a/server/objects/Stream.js b/server/objects/Stream.js
index 70361463f..813ecf146 100644
--- a/server/objects/Stream.js
+++ b/server/objects/Stream.js
@@ -73,7 +73,7 @@ class Stream extends EventEmitter {
return [AudioMimeType.FLAC, AudioMimeType.OPUS, AudioMimeType.WMA, AudioMimeType.AIFF, AudioMimeType.WEBM, AudioMimeType.WEBMA, AudioMimeType.AWB, AudioMimeType.CAF]
}
get codecsToForceAAC() {
- return ['alac', 'ac3', 'eac3', 'opus']
+ return ['alac']
}
get userToken() {
return this.user.token
@@ -146,7 +146,7 @@ class Stream extends EventEmitter {
async generatePlaylist() {
await fs.ensureDir(this.streamPath)
- await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType)
+ await hlsPlaylistGenerator(this.playlistPath, 'output', this.totalDuration, this.segmentLength, this.hlsSegmentType, this.userToken)
return this.clientPlaylistUri
}
@@ -273,16 +273,7 @@ class Stream extends EventEmitter {
audioCodec = 'aac'
}
- const codecOptions = [`-loglevel ${logLevel}`, '-map 0:a']
-
- if (['ac3', 'eac3'].includes(this.tracksCodec) && this.tracks.length > 0 && this.tracks[0].bitRate && this.tracks[0].channels) {
- // In case for ac3/eac3 it needs to be passed the bitrate and channels to avoid ffmpeg errors
- codecOptions.push(`-c:a ${audioCodec}`, `-b:a ${this.tracks[0].bitRate}`, `-ac ${this.tracks[0].channels}`)
- } else {
- codecOptions.push(`-c:a ${audioCodec}`)
- }
-
- this.ffmpeg.addOption(codecOptions)
+ this.ffmpeg.addOption([`-loglevel ${logLevel}`, '-map 0:a', `-c:a ${audioCodec}`])
const hlsOptions = ['-f hls', '-copyts', '-avoid_negative_ts make_non_negative', '-max_delay 5000000', '-max_muxing_queue_size 2048', `-hls_time 6`, `-hls_segment_type ${this.hlsSegmentType}`, `-start_number ${this.segmentStartNumber}`, '-hls_playlist_type vod', '-hls_list_size 0', '-hls_allow_cache 0']
this.ffmpeg.addOption(hlsOptions)
if (this.hlsSegmentType === 'fmp4') {
diff --git a/server/objects/settings/ServerSettings.js b/server/objects/settings/ServerSettings.js
index f0bb4b201..4f0aa97bc 100644
--- a/server/objects/settings/ServerSettings.js
+++ b/server/objects/settings/ServerSettings.js
@@ -3,7 +3,6 @@ const packageJson = require('../../../package.json')
const { BookshelfView } = require('../../utils/constants')
const Logger = require('../../Logger')
const User = require('../../models/User')
-const { sanitize } = require('../../utils/htmlSanitizer')
class ServerSettings {
constructor(settings) {
@@ -54,7 +53,6 @@ class ServerSettings {
this.dateFormat = 'MM/dd/yyyy'
this.timeFormat = 'HH:mm'
this.language = 'en-us'
- this.allowedOrigins = []
this.logLevel = Logger.logLevel
@@ -122,12 +120,11 @@ class ServerSettings {
this.dateFormat = settings.dateFormat || 'MM/dd/yyyy'
this.timeFormat = settings.timeFormat || 'HH:mm'
this.language = settings.language || 'en-us'
- this.allowedOrigins = settings.allowedOrigins || []
this.logLevel = settings.logLevel || Logger.logLevel
this.version = settings.version || null
this.buildNumber = settings.buildNumber || 0 // Added v2.4.5
- this.authLoginCustomMessage = sanitize(settings.authLoginCustomMessage) || null // Added v2.8.0
+ this.authLoginCustomMessage = settings.authLoginCustomMessage || null // Added v2.8.0
this.authActiveAuthMethods = settings.authActiveAuthMethods || ['local']
this.authOpenIDIssuerURL = settings.authOpenIDIssuerURL || null
@@ -234,7 +231,6 @@ class ServerSettings {
dateFormat: this.dateFormat,
timeFormat: this.timeFormat,
language: this.language,
- allowedOrigins: this.allowedOrigins,
logLevel: this.logLevel,
version: this.version,
buildNumber: this.buildNumber,
@@ -260,18 +256,6 @@ class ServerSettings {
}
}
- /**
- * Host timezone used by cron schedulers (not persisted in settings)
- * @returns {string} IANA timezone name, e.g. "America/New_York"
- */
- static getHostTimeZone() {
- try {
- return Intl.DateTimeFormat().resolvedOptions().timeZone || 'UTC'
- } catch {
- return 'UTC'
- }
- }
-
toJSONForBrowser() {
const json = this.toJSON()
delete json.tokenSecret
@@ -280,7 +264,6 @@ class ServerSettings {
delete json.authOpenIDMobileRedirectURIs
delete json.authOpenIDGroupClaim
delete json.authOpenIDAdvancedPermsClaim
- json.timeZone = ServerSettings.getHostTimeZone()
return json
}
@@ -323,7 +306,7 @@ class ServerSettings {
get authFormData() {
const clientFormData = {
- authLoginCustomMessage: sanitize(this.authLoginCustomMessage)
+ authLoginCustomMessage: this.authLoginCustomMessage
}
if (this.authActiveAuthMethods.includes('openid')) {
clientFormData.authOpenIDButtonText = this.authOpenIDButtonText
@@ -341,9 +324,6 @@ class ServerSettings {
update(payload) {
let hasUpdates = false
for (const key in payload) {
- if (key === 'authLoginCustomMessage') {
- payload[key] = sanitize(payload[key])
- }
if (key === 'sortingPrefixes') {
// Sorting prefixes are updated with the /api/sorting-prefixes endpoint
continue
diff --git a/server/providers/Audible.js b/server/providers/Audible.js
index 133d3c0d8..18879e912 100644
--- a/server/providers/Audible.js
+++ b/server/providers/Audible.js
@@ -3,7 +3,7 @@ const Logger = require('../Logger')
const { isValidASIN } = require('../utils/index')
class Audible {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {
this.regionMap = {
@@ -57,13 +57,8 @@ class Audible {
})
}
- let genresCleaned = []
- let tagsCleaned = []
-
- if (genres && Array.isArray(genres)) {
- genresCleaned = [...new Set(genres.filter((g) => g.type == 'genre').map((g) => g.name))]
- tagsCleaned = [...new Set(genres.filter((g) => g.type == 'tag').map((g) => g.name))]
- }
+ const genresFiltered = genres ? genres.filter((g) => g.type == 'genre').map((g) => g.name) : []
+ const tagsFiltered = genres ? genres.filter((g) => g.type == 'tag').map((g) => g.name) : []
return {
title,
@@ -76,8 +71,8 @@ class Audible {
cover: image,
asin,
isbn,
- genres: genresCleaned.length ? genresCleaned : null,
- tags: tagsCleaned.length ? tagsCleaned : null,
+ genres: genresFiltered.length ? genresFiltered : null,
+ tags: tagsFiltered.length ? tagsFiltered.join(', ') : null,
series: series.length ? series : null,
language: language ? language.charAt(0).toUpperCase() + language.slice(1) : null,
duration: runtimeLengthMin && !isNaN(runtimeLengthMin) ? Number(runtimeLengthMin) : 0,
@@ -111,7 +106,7 @@ class Audible {
return res.data
})
.catch((error) => {
- Logger.error('[Audible] ASIN search error', error.message)
+ Logger.error('[Audible] ASIN search error', error)
return null
})
}
@@ -163,7 +158,7 @@ class Audible {
return Promise.all(res.data.products.map((result) => this.asinSearch(result.asin, region, timeout)))
})
.catch((error) => {
- Logger.error('[Audible] query search error', error.message)
+ Logger.error('[Audible] query search error', error)
return []
})
}
diff --git a/server/providers/AudiobookCovers.js b/server/providers/AudiobookCovers.js
index 9bd1f367c..8e284fea2 100644
--- a/server/providers/AudiobookCovers.js
+++ b/server/providers/AudiobookCovers.js
@@ -2,7 +2,7 @@ const axios = require('axios')
const Logger = require('../Logger')
class AudiobookCovers {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {}
@@ -24,7 +24,7 @@ class AudiobookCovers {
})
.then((res) => res?.data || [])
.catch((error) => {
- Logger.error('[AudiobookCovers] Cover search error', error.message)
+ Logger.error('[AudiobookCovers] Cover search error', error)
return []
})
return items.map((item) => ({ cover: item.versions.png.original }))
diff --git a/server/providers/Audnexus.js b/server/providers/Audnexus.js
index 9a76dc861..4f11a2a36 100644
--- a/server/providers/Audnexus.js
+++ b/server/providers/Audnexus.js
@@ -55,7 +55,7 @@ class Audnexus {
return this._processRequest(this.limiter(() => axios.get(authorRequestUrl)))
.then((res) => res.data || [])
.catch((error) => {
- Logger.error(`[Audnexus] Author ASIN request failed for ${name}`, error.message)
+ Logger.error(`[Audnexus] Author ASIN request failed for ${name}`, error)
return []
})
}
@@ -82,7 +82,7 @@ class Audnexus {
return this._processRequest(this.limiter(() => axios.get(authorRequestUrl.toString())))
.then((res) => res.data)
.catch((error) => {
- Logger.error(`[Audnexus] Author request failed for ${asin}`, error.message)
+ Logger.error(`[Audnexus] Author request failed for ${asin}`, error)
return null
})
}
@@ -158,7 +158,7 @@ class Audnexus {
return this._processRequest(this.limiter(() => axios.get(chaptersRequestUrl.toString())))
.then((res) => res.data)
.catch((error) => {
- Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}/${region}`, error.message)
+ Logger.error(`[Audnexus] Chapter ASIN request failed for ${asin}/${region}`, error)
return null
})
}
diff --git a/server/providers/CustomProviderAdapter.js b/server/providers/CustomProviderAdapter.js
index 5c8cad75a..a5fed3939 100644
--- a/server/providers/CustomProviderAdapter.js
+++ b/server/providers/CustomProviderAdapter.js
@@ -4,7 +4,7 @@ const Logger = require('../Logger')
const htmlSanitizer = require('../utils/htmlSanitizer')
class CustomProviderAdapter {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {}
@@ -61,7 +61,7 @@ class CustomProviderAdapter {
return res.data.matches
})
.catch((error) => {
- Logger.error('[CustomMetadataProvider] Search error', error.message)
+ Logger.error('[CustomMetadataProvider] Search error', error)
return []
})
@@ -89,27 +89,6 @@ class CustomProviderAdapter {
})
.filter((s) => s !== undefined)
}
- /**
- * Validates and dedupes tags/genres array
- * Can be comma separated string or array of strings
- * @param {string|string[]} tagsGenres
- * @returns {string[]}
- */
- const validateTagsGenresArray = (tagsGenres) => {
- if (!tagsGenres || (typeof tagsGenres !== 'string' && !Array.isArray(tagsGenres))) return undefined
-
- // If string, split by comma and trim each item
- if (typeof tagsGenres === 'string') tagsGenres = tagsGenres.split(',')
- // If array, ensure all items are strings
- else if (!tagsGenres.every((t) => typeof t === 'string')) return undefined
-
- // Trim and filter out empty strings
- tagsGenres = tagsGenres.map((t) => t.trim()).filter(Boolean)
- if (!tagsGenres.length) return undefined
-
- // Dedup
- return [...new Set(tagsGenres)]
- }
// re-map keys to throw out
return matches.map((match) => {
@@ -126,8 +105,8 @@ class CustomProviderAdapter {
cover: toStringOrUndefined(cover),
isbn: toStringOrUndefined(isbn),
asin: toStringOrUndefined(asin),
- genres: validateTagsGenresArray(genres),
- tags: validateTagsGenresArray(tags),
+ genres: Array.isArray(genres) && genres.every((g) => typeof g === 'string') ? genres : undefined,
+ tags: toStringOrUndefined(tags),
series: validateSeriesArray(series),
language: toStringOrUndefined(language),
duration: !isNaN(duration) && duration !== null ? Number(duration) : undefined
diff --git a/server/providers/FantLab.js b/server/providers/FantLab.js
index d25be1c80..f33934ca2 100644
--- a/server/providers/FantLab.js
+++ b/server/providers/FantLab.js
@@ -2,7 +2,7 @@ const axios = require('axios')
const Logger = require('../Logger')
class FantLab {
- #responseTimeout = 10000
+ #responseTimeout = 30000
// 7 - other
// 11 - essay
// 12 - article
@@ -48,7 +48,7 @@ class FantLab {
return res.data || []
})
.catch((error) => {
- Logger.error('[FantLab] search error', error.message)
+ Logger.error('[FantLab] search error', error)
return []
})
@@ -77,7 +77,7 @@ class FantLab {
return resp.data || null
})
.catch((error) => {
- Logger.error(`[FantLab] work info request for url "${url}" error`, error.message)
+ Logger.error(`[FantLab] work info request for url "${url}" error`, error)
return null
})
@@ -193,7 +193,7 @@ class FantLab {
return resp.data || null
})
.catch((error) => {
- Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error.message)
+ Logger.error(`[FantLab] search cover from edition with url "${url}" error`, error)
return null
})
diff --git a/server/providers/GoogleBooks.js b/server/providers/GoogleBooks.js
index 3aec4c849..76a3dceaa 100644
--- a/server/providers/GoogleBooks.js
+++ b/server/providers/GoogleBooks.js
@@ -2,7 +2,7 @@ const axios = require('axios')
const Logger = require('../Logger')
class GoogleBooks {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {}
@@ -67,7 +67,7 @@ class GoogleBooks {
return res.data.items
})
.catch((error) => {
- Logger.error('[GoogleBooks] Volume search error', error.message)
+ Logger.error('[GoogleBooks] Volume search error', error)
return []
})
return items.map((item) => this.cleanResult(item))
diff --git a/server/providers/OpenLibrary.js b/server/providers/OpenLibrary.js
index fb73dc294..10d033786 100644
--- a/server/providers/OpenLibrary.js
+++ b/server/providers/OpenLibrary.js
@@ -1,7 +1,7 @@
const axios = require('axios').default
class OpenLibrary {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {
this.baseUrl = 'https://openlibrary.org'
@@ -23,7 +23,7 @@ class OpenLibrary {
return res.data
})
.catch((error) => {
- console.error('Failed', error.message)
+ console.error('Failed', error)
return null
})
}
diff --git a/server/providers/iTunes.js b/server/providers/iTunes.js
index 87695c58c..57a47d0d1 100644
--- a/server/providers/iTunes.js
+++ b/server/providers/iTunes.js
@@ -28,7 +28,7 @@ const htmlSanitizer = require('../utils/htmlSanitizer')
*/
class iTunes {
- #responseTimeout = 10000
+ #responseTimeout = 30000
constructor() {}
@@ -63,7 +63,7 @@ class iTunes {
return response.data.results || []
})
.catch((error) => {
- Logger.error(`[iTunes] search request error`, error.message)
+ Logger.error(`[iTunes] search request error`, error)
return []
})
}
diff --git a/server/routers/ApiRouter.js b/server/routers/ApiRouter.js
index 7c89126b2..6446ecc80 100644
--- a/server/routers/ApiRouter.js
+++ b/server/routers/ApiRouter.js
@@ -171,11 +171,6 @@ class ApiRouter {
// Current User Routes (Me)
//
this.router.get('/me', MeController.getCurrentUser.bind(this))
- this.router.get('/me/sessions', MeController.getSessions.bind(this))
- this.router.delete('/me/sessions/:id', MeController.deleteSession.bind(this))
- this.router.get('/me/progress', MeController.getAllMediaProgress.bind(this))
- this.router.get('/me/bookmarks', MeController.getAllBookmarks.bind(this))
- this.router.get('/me/bookmarks/:libraryItemId', MeController.getBookmarksForLibraryItem.bind(this))
this.router.get('/me/listening-sessions', MeController.getListeningSessions.bind(this))
this.router.get('/me/item/listening-sessions/:libraryItemId/:episodeId?', MeController.getItemListeningSessions.bind(this))
this.router.get('/me/listening-stats', MeController.getListeningStats.bind(this))
@@ -288,7 +283,6 @@ class ApiRouter {
this.router.get('/search/podcast', SearchController.findPodcasts.bind(this))
this.router.get('/search/authors', SearchController.findAuthor.bind(this))
this.router.get('/search/chapters', SearchController.findChapters.bind(this))
- this.router.get('/search/providers', SearchController.getAllProviders.bind(this))
//
// Cache Routes (Admin and up)
@@ -368,9 +362,8 @@ class ApiRouter {
* Remove library item and associated entities
* @param {string} libraryItemId
* @param {string[]} mediaItemIds array of bookId or podcastEpisodeId
- * @param {string} libraryId
*/
- async handleDeleteLibraryItem(libraryItemId, mediaItemIds, libraryId) {
+ async handleDeleteLibraryItem(libraryItemId, mediaItemIds) {
const numProgressRemoved = await Database.mediaProgressModel.destroy({
where: {
mediaItemId: mediaItemIds
@@ -401,8 +394,7 @@ class ApiRouter {
await Database.libraryItemModel.removeById(libraryItemId)
SocketAuthority.emitter('item_removed', {
- id: libraryItemId,
- libraryId
+ id: libraryItemId
})
}
diff --git a/server/scanner/AbsMetadataFileScanner.js b/server/scanner/AbsMetadataFileScanner.js
index 0ea34b1bb..e554dfb44 100644
--- a/server/scanner/AbsMetadataFileScanner.js
+++ b/server/scanner/AbsMetadataFileScanner.js
@@ -5,15 +5,15 @@ const { LogLevel } = require('../utils/constants')
const abmetadataGenerator = require('../utils/generators/abmetadataGenerator')
class AbsMetadataFileScanner {
- constructor() {}
+ constructor() { }
/**
* Check for metadata.json file and set book metadata
- *
- * @param {import('./LibraryScan')} libraryScan
- * @param {import('./LibraryItemScanData')} libraryItemData
- * @param {Object} bookMetadata
- * @param {string} [existingLibraryItemId]
+ *
+ * @param {import('./LibraryScan')} libraryScan
+ * @param {import('./LibraryItemScanData')} libraryItemData
+ * @param {Object} bookMetadata
+ * @param {string} [existingLibraryItemId]
*/
async scanBookMetadataFile(libraryScan, libraryItemData, bookMetadata, existingLibraryItemId = null) {
const metadataLibraryFile = libraryItemData.metadataJsonLibraryFile
@@ -32,8 +32,7 @@ class AbsMetadataFileScanner {
if (metadataText) {
libraryScan.addLog(LogLevel.INFO, `Found metadata file "${metadataFilePath}"`)
- const abMetadata = abmetadataGenerator.parseJson(metadataText, 'book') || {}
-
+ const abMetadata = abmetadataGenerator.parseJson(metadataText) || {}
for (const key in abMetadata) {
// TODO: When to override with null or empty arrays?
if (abMetadata[key] === undefined || abMetadata[key] === null) continue
@@ -49,11 +48,11 @@ class AbsMetadataFileScanner {
/**
* Check for metadata.json file and set podcast metadata
- *
- * @param {import('./LibraryScan')} libraryScan
- * @param {import('./LibraryItemScanData')} libraryItemData
- * @param {Object} podcastMetadata
- * @param {string} [existingLibraryItemId]
+ *
+ * @param {import('./LibraryScan')} libraryScan
+ * @param {import('./LibraryItemScanData')} libraryItemData
+ * @param {Object} podcastMetadata
+ * @param {string} [existingLibraryItemId]
*/
async scanPodcastMetadataFile(libraryScan, libraryItemData, podcastMetadata, existingLibraryItemId = null) {
const metadataLibraryFile = libraryItemData.metadataJsonLibraryFile
@@ -72,7 +71,7 @@ class AbsMetadataFileScanner {
if (metadataText) {
libraryScan.addLog(LogLevel.INFO, `Found metadata file "${metadataFilePath}"`)
- const abMetadata = abmetadataGenerator.parseJson(metadataText, 'podcast') || {}
+ const abMetadata = abmetadataGenerator.parseJson(metadataText) || {}
for (const key in abMetadata) {
if (abMetadata[key] === undefined || abMetadata[key] === null) continue
if (key === 'tags' && !abMetadata.tags?.length) continue
@@ -82,4 +81,4 @@ class AbsMetadataFileScanner {
}
}
}
-module.exports = new AbsMetadataFileScanner()
+module.exports = new AbsMetadataFileScanner()
\ No newline at end of file
diff --git a/server/scanner/BookScanner.js b/server/scanner/BookScanner.js
index 2b106cdc8..a1e7ff507 100644
--- a/server/scanner/BookScanner.js
+++ b/server/scanner/BookScanner.js
@@ -7,7 +7,6 @@ const parseNameString = require('../utils/parsers/parseNameString')
const parseEbookMetadata = require('../utils/parsers/parseEbookMetadata')
const globals = require('../utils/globals')
const { readTextFile, filePathToPOSIX, getFileTimestampsWithIno } = require('../utils/fileUtils')
-const htmlSanitizer = require('../utils/htmlSanitizer')
const AudioFileScanner = require('./AudioFileScanner')
const Database = require('../Database')
@@ -228,7 +227,6 @@ class BookScanner {
bookId: media.id,
authorId: existingAuthorId
})
- libraryScan.authorsNumBooksChangedIds.add(existingAuthorId)
libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" added author "${authorName}"`)
authorsUpdated = true
} else {
@@ -239,7 +237,6 @@ class BookScanner {
})
await media.addAuthor(newAuthor)
Database.addAuthorToFilterData(libraryItemData.libraryId, newAuthor.name, newAuthor.id)
- SocketAuthority.emitter('author_added', newAuthor.toOldJSON())
libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" added new author "${authorName}"`)
authorsUpdated = true
}
@@ -249,7 +246,6 @@ class BookScanner {
for (const author of media.authors) {
if (!bookMetadata.authors.includes(author.name)) {
await author.bookAuthor.destroy()
- libraryScan.authorsNumBooksChangedIds.add(author.id)
libraryScan.addLog(LogLevel.DEBUG, `Updating book "${bookMetadata.title}" removed author "${author.name}"`)
authorsUpdated = true
bookAuthorsRemoved.push(author.id)
@@ -481,7 +477,6 @@ class BookScanner {
}
const createdAtTimestamp = new Date().getTime()
- const newAuthorNames = new Set()
if (bookMetadata.authors.length) {
for (const authorName of bookMetadata.authors) {
const matchingAuthorId = await Database.getAuthorIdByName(libraryItemData.libraryId, authorName)
@@ -489,8 +484,6 @@ class BookScanner {
bookObject.bookAuthors.push({
authorId: matchingAuthorId
})
- // Existing author â only numBooks changes; batch emit at scan end
- libraryScan.authorsNumBooksChangedIds.add(matchingAuthorId)
} else {
// New author
bookObject.bookAuthors.push({
@@ -502,7 +495,6 @@ class BookScanner {
lastFirst: Database.authorModel.getLastFirst(authorName)
}
})
- newAuthorNames.add(authorName)
}
}
}
@@ -600,9 +592,6 @@ class BookScanner {
for (const ba of libraryItem.book.bookAuthors) {
if (ba.author) {
Database.addAuthorToFilterData(libraryItemData.libraryId, ba.author.name, ba.author.id)
- if (newAuthorNames.has(ba.author.name)) {
- SocketAuthority.emitter('author_added', ba.author.toOldJSON())
- }
}
}
}
@@ -699,10 +688,6 @@ class BookScanner {
bookMetadata.titleIgnorePrefix = getTitleIgnorePrefix(bookMetadata.title)
- if (typeof bookMetadata.description === 'string' && bookMetadata.description) {
- bookMetadata.description = htmlSanitizer.sanitize(bookMetadata.description)
- }
-
return bookMetadata
}
@@ -835,9 +820,6 @@ class BookScanner {
const metadataFilePath = Path.join(metadataPath, `metadata.${global.ServerSettings.metadataFileFormat}`)
- /**
- * Keys must match abmetadataGenerator.js
- */
const jsonObject = {
tags: libraryItem.media.tags || [],
chapters: libraryItem.media.chapters?.map((c) => ({ ...c })) || [],
@@ -901,34 +883,6 @@ class BookScanner {
})
}
- /**
- * Emit authors_num_books_updated for authors whose book count changed during a scan (linked or unlinked).
- * Authors with no book links are omitted â orphans are handled by author_removed.
- * @param {string} libraryId
- * @param {import('./LibraryScan')|import('./ScanLogger')} scanLogger
- * @returns {Promise}
- */
- async emitAuthorsNumBooksUpdated(libraryId, scanLogger) {
- if (!scanLogger.authorsNumBooksChangedIds?.size) return
-
- const authorIds = [...scanLogger.authorsNumBooksChangedIds]
- scanLogger.authorsNumBooksChangedIds.clear()
-
- const countsByAuthorId = await Database.bookAuthorModel.getCountsForAuthors(authorIds)
-
- const authors = Object.entries(countsByAuthorId).map(([id, numBooks]) => ({
- id,
- numBooks
- }))
-
- if (!authors.length) return
-
- SocketAuthority.emitter('authors_num_books_updated', {
- libraryId,
- authors
- })
- }
-
/**
* Check authors that were removed from a book and remove them if they no longer have any books
* keep authors without books that have a asin, description or imagePath
diff --git a/server/scanner/LibraryItemScanner.js b/server/scanner/LibraryItemScanner.js
index de95c9a09..501df4274 100644
--- a/server/scanner/LibraryItemScanner.js
+++ b/server/scanner/LibraryItemScanner.js
@@ -66,7 +66,7 @@ class LibraryItemScanner {
if (libraryItemDataUpdated || wasUpdated) {
SocketAuthority.libraryItemEmitter('item_updated', expandedLibraryItem)
- await this.finalizeAuthorsAndSeriesFromScan(library.id, scanLogger)
+ await this.checkAuthorsAndSeriesRemovedFromBooks(library.id, scanLogger)
return ScanResult.UPDATED
}
@@ -76,13 +76,12 @@ class LibraryItemScanner {
}
/**
- * Emit author book count updates, then remove empty authors/series left after the scan
+ * Remove empty authors and series
* @param {string} libraryId
* @param {ScanLogger} scanLogger
* @returns {Promise}
*/
- async finalizeAuthorsAndSeriesFromScan(libraryId, scanLogger) {
- await BookScanner.emitAuthorsNumBooksUpdated(libraryId, scanLogger)
+ async checkAuthorsAndSeriesRemovedFromBooks(libraryId, scanLogger) {
if (scanLogger.authorsRemovedFromBooks.length) {
await BookScanner.checkAuthorsRemovedFromBooks(libraryId, scanLogger)
}
@@ -216,10 +215,7 @@ class LibraryItemScanner {
scanLogger.verbose = true
scanLogger.setData('libraryItem', libraryItemScanData.relPath)
- const newLibraryItem = await this.scanNewLibraryItem(libraryItemScanData, library.settings, scanLogger)
- // Watcher path does not go through full-library scan cleanup â emit author book count updates here
- await BookScanner.emitAuthorsNumBooksUpdated(library.id, scanLogger)
- return newLibraryItem
+ return this.scanNewLibraryItem(libraryItemScanData, library.settings, scanLogger)
}
}
module.exports = new LibraryItemScanner()
diff --git a/server/scanner/LibraryScan.js b/server/scanner/LibraryScan.js
index 0366addba..e77f30ba6 100644
--- a/server/scanner/LibraryScan.js
+++ b/server/scanner/LibraryScan.js
@@ -24,8 +24,6 @@ class LibraryScan {
/** @type {string[]} */
this.authorsRemovedFromBooks = []
- /** @type {Set} */
- this.authorsNumBooksChangedIds = new Set()
/** @type {string[]} */
this.seriesRemovedFromBooks = []
diff --git a/server/scanner/LibraryScanner.js b/server/scanner/LibraryScanner.js
index 73cb51553..640c82d76 100644
--- a/server/scanner/LibraryScanner.js
+++ b/server/scanner/LibraryScanner.js
@@ -234,7 +234,8 @@ class LibraryScanner {
SocketAuthority.libraryItemsEmitter('items_updated', libraryItemsUpdated)
}
- if (this.shouldCancelScan(libraryScan)) return true
+ // Authors and series that were removed from books should be removed if they are now empty
+ await LibraryItemScanner.checkAuthorsAndSeriesRemovedFromBooks(libraryScan.libraryId, libraryScan)
// Update missing library items
if (libraryItemIdsMissing.length) {
@@ -280,9 +281,6 @@ class LibraryScanner {
}
}
- // Author book count updates and empty authors/series cleanup after all items are processed
- await LibraryItemScanner.finalizeAuthorsAndSeriesFromScan(libraryScan.libraryId, libraryScan)
-
libraryScan.addLog(LogLevel.INFO, `Scan completed. ${libraryScan.resultStats}`)
return false
}
diff --git a/server/scanner/PodcastScanner.js b/server/scanner/PodcastScanner.js
index b403a3c9d..c9569c3ad 100644
--- a/server/scanner/PodcastScanner.js
+++ b/server/scanner/PodcastScanner.js
@@ -11,7 +11,6 @@ const LibraryFile = require('../objects/files/LibraryFile')
const fsExtra = require('../libs/fsExtra')
const PodcastEpisode = require('../models/PodcastEpisode')
const AbsMetadataFileScanner = require('./AbsMetadataFileScanner')
-const htmlSanitizer = require('../utils/htmlSanitizer')
/**
* Metadata for podcasts pulled from files
@@ -58,12 +57,8 @@ class PodcastScanner {
/** @type {AudioFile[]} */
let newAudioFiles = []
- // Track episode add/remove/update so item_updated includes the current episode list
- let hasEpisodeChanges = false
-
if (libraryItemData.hasAudioFileChanges || libraryItemData.audioLibraryFiles.length !== existingPodcastEpisodes.length) {
- // Filter out and destroy episodes that were removed.
- // filter() returns a new array â reassign to media.podcastEpisodes before emit.
+ // Filter out and destroy episodes that were removed
const episodesToRemove = []
existingPodcastEpisodes = existingPodcastEpisodes.filter((ep) => {
if (libraryItemData.checkAudioFileRemoved(ep.audioFile)) {
@@ -74,7 +69,6 @@ class PodcastScanner {
})
if (episodesToRemove.length) {
- hasEpisodeChanges = true
// Remove episodes from playlists and media progress
const episodeIds = episodesToRemove.map((ep) => ep.id)
await Database.playlistModel.removeMediaItemsFromPlaylists(episodeIds)
@@ -121,7 +115,6 @@ class PodcastScanner {
AudioFileScanner.setPodcastEpisodeMetadataFromAudioMetaTags(podcastEpisode, libraryScan)
libraryScan.addLog(LogLevel.INFO, `Podcast episode "${podcastEpisode.title}" keys changed [${podcastEpisode.changed()?.join(', ')}]`)
await podcastEpisode.save()
- hasEpisodeChanges = true
}
}
@@ -161,13 +154,9 @@ class PodcastScanner {
libraryScan.addLog(LogLevel.INFO, `New Podcast episode "${newPodcastEpisode.title}" added`)
await newPodcastEpisode.save()
existingPodcastEpisodes.push(newPodcastEpisode)
- hasEpisodeChanges = true
}
}
- // Keep association in sync for toOldJSONExpanded() / item_updated socket payload
- media.podcastEpisodes = existingPodcastEpisodes
-
let hasMediaChanges = false
if (existingPodcastEpisodes.length !== media.numEpisodes) {
media.numEpisodes = existingPodcastEpisodes.length
@@ -260,7 +249,7 @@ class PodcastScanner {
return {
libraryItem: existingLibraryItem,
- wasUpdated: hasMediaChanges || libraryItemUpdated || hasEpisodeChanges
+ wasUpdated: hasMediaChanges || libraryItemUpdated
}
}
@@ -409,10 +398,6 @@ class PodcastScanner {
podcastMetadata.titleIgnorePrefix = getTitleIgnorePrefix(podcastMetadata.title)
- if (typeof podcastMetadata.description === 'string' && podcastMetadata.description) {
- podcastMetadata.description = htmlSanitizer.sanitize(podcastMetadata.description)
- }
-
return podcastMetadata
}
@@ -435,9 +420,6 @@ class PodcastScanner {
const metadataFilePath = Path.join(metadataPath, `metadata.${global.ServerSettings.metadataFileFormat}`)
- /**
- * Keys must match abmetadataGenerator.js
- */
const jsonObject = {
tags: libraryItem.media.tags || [],
title: libraryItem.media.title,
diff --git a/server/scanner/ScanLogger.js b/server/scanner/ScanLogger.js
index 2748f1f3b..7aed21f13 100644
--- a/server/scanner/ScanLogger.js
+++ b/server/scanner/ScanLogger.js
@@ -14,8 +14,6 @@ class ScanLogger {
/** @type {string[]} */
this.authorsRemovedFromBooks = []
- /** @type {Set} */
- this.authorsNumBooksChangedIds = new Set()
/** @type {string[]} */
this.seriesRemovedFromBooks = []
diff --git a/server/scanner/Scanner.js b/server/scanner/Scanner.js
index af4405987..206068cc4 100644
--- a/server/scanner/Scanner.js
+++ b/server/scanner/Scanner.js
@@ -259,17 +259,18 @@ class Scanner {
SocketAuthority.emitter('author_added', author.toOldJSON())
// Update filter data
Database.addAuthorToFilterData(libraryItem.libraryId, author.name, author.id)
+
+ await Database.bookAuthorModel
+ .create({
+ authorId: author.id,
+ bookId: libraryItem.media.id
+ })
+ .then(() => {
+ Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added author "${author.name}" to "${libraryItem.media.title}"`)
+ libraryItem.media.authors.push(author)
+ hasAuthorUpdates = true
+ })
}
- await Database.bookAuthorModel
- .create({
- authorId: author.id,
- bookId: libraryItem.media.id
- })
- .then(() => {
- Logger.info(`[Scanner] quickMatchBookBuildUpdatePayload: Added author "${author.name}" to "${libraryItem.media.title}"`)
- libraryItem.media.authors.push(author)
- hasAuthorUpdates = true
- })
}
const authorsRemoved = libraryItem.media.authors.filter((a) => !matchData.author.find((ma) => ma.toLowerCase() === a.name.toLowerCase()))
if (authorsRemoved.length) {
diff --git a/server/utils/constants.js b/server/utils/constants.js
index 925035e17..cc5217f41 100644
--- a/server/utils/constants.js
+++ b/server/utils/constants.js
@@ -48,8 +48,6 @@ module.exports.AudioMimeType = {
AIF: 'audio/x-aiff',
WEBM: 'audio/webm',
WEBMA: 'audio/webm',
- // TODO: Switch to `audio/matroska`? marked as deprecated in IANA registry
- // ref: https://datatracker.ietf.org/doc/html/rfc9559
MKA: 'audio/x-matroska',
AWB: 'audio/amr-wb',
CAF: 'audio/x-caf',
diff --git a/server/utils/ffmpegHelpers.js b/server/utils/ffmpegHelpers.js
index 7ad2a3aee..357a20845 100644
--- a/server/utils/ffmpegHelpers.js
+++ b/server/utils/ffmpegHelpers.js
@@ -1,5 +1,4 @@
const axios = require('axios')
-const ssrfFilter = require('ssrf-req-filter')
const Ffmpeg = require('../libs/fluentFfmpeg')
const ffmpgegUtils = require('../libs/fluentFfmpeg/utils')
const fs = require('../libs/fsExtra')
@@ -98,11 +97,9 @@ async function resizeImage(filePath, outputPath, width, height) {
module.exports.resizeImage = resizeImage
/**
- * Download podcast episode
- * Uses SSRF filter to prevent internal URLs
*
* @param {import('../objects/PodcastEpisodeDownload')} podcastEpisodeDownload
- * @returns {Promise<{success: boolean, isRequestError?: boolean}>}
+ * @returns {Promise<{success: boolean, isFfmpegError?: boolean}>}
*/
module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
return new Promise(async (resolve) => {
@@ -121,12 +118,9 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
method: 'GET',
responseType: 'stream',
headers: {
- Accept: '*/*',
'User-Agent': userAgent
},
- timeout: global.PodcastDownloadTimeout,
- httpAgent: global.DisableSsrfRequestFilter?.(podcastEpisodeDownload.url) ? null : ssrfFilter(podcastEpisodeDownload.url),
- httpsAgent: global.DisableSsrfRequestFilter?.(podcastEpisodeDownload.url) ? null : ssrfFilter(podcastEpisodeDownload.url)
+ timeout: global.PodcastDownloadTimeout
})
Logger.debug(`[ffmpegHelpers] Successfully connected with User-Agent: ${userAgent}`)
@@ -144,8 +138,7 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
if (!response) {
return resolve({
- success: false,
- isRequestError: true
+ success: false
})
}
@@ -210,7 +203,8 @@ module.exports.downloadPodcastEpisode = (podcastEpisodeDownload) => {
Logger.error(`Full stderr dump for episode url "${podcastEpisodeDownload.url}": ${stderrLines.join('\n')}`)
}
resolve({
- success: false
+ success: false,
+ isFfmpegError: true
})
})
ffmpeg.on('progress', (progress) => {
diff --git a/server/utils/fileUtils.js b/server/utils/fileUtils.js
index 9a349bd54..2da6b4c91 100644
--- a/server/utils/fileUtils.js
+++ b/server/utils/fileUtils.js
@@ -476,7 +476,7 @@ module.exports.getWindowsDrives = async () => {
return []
}
return new Promise((resolve, reject) => {
- exec('powershell -Command "(Get-PSDrive -PSProvider FileSystem).Name"', async (error, stdout, stderr) => {
+ exec('wmic logicaldisk get name', async (error, stdout, stderr) => {
if (error) {
reject(error)
return
@@ -485,9 +485,10 @@ module.exports.getWindowsDrives = async () => {
?.split(/\r?\n/)
.map((line) => line.trim())
.filter((line) => line)
+ .slice(1)
const validDrives = []
for (const drive of drives) {
- let drivepath = drive + ':/'
+ let drivepath = drive + '/'
if (await fs.pathExists(drivepath)) {
validDrives.push(drivepath)
} else {
diff --git a/server/utils/generators/abmetadataGenerator.js b/server/utils/generators/abmetadataGenerator.js
index d0d278752..01f853288 100644
--- a/server/utils/generators/abmetadataGenerator.js
+++ b/server/utils/generators/abmetadataGenerator.js
@@ -1,51 +1,7 @@
const Logger = require('../../Logger')
const parseSeriesString = require('../parsers/parseSeriesString')
-const mediaTypeKeys = {
- book: {
- tags: 'stringArray',
- title: 'string',
- subtitle: 'string',
- authors: 'stringArray',
- narrators: 'stringArray',
- series: 'stringArray',
- genres: 'stringArray',
- publishedYear: 'string',
- publishedDate: 'string',
- publisher: 'string',
- description: 'string',
- isbn: 'string',
- asin: 'string',
- language: 'string',
- explicit: 'boolean',
- abridged: 'boolean'
- },
- podcast: {
- tags: 'stringArray',
- title: 'string',
- author: 'string',
- description: 'string',
- releaseDate: 'string',
- genres: 'stringArray',
- feedURL: 'string',
- imageURL: 'string',
- itunesPageURL: 'string',
- itunesId: 'string',
- itunesArtistId: 'string',
- asin: 'string',
- language: 'string',
- explicit: 'boolean',
- podcastType: 'string'
- }
-}
-
-/**
- *
- * @param {string} text
- * @param {"book" | "podcast"} mediaType
- * @returns {Object}
- */
-function parseJsonMetadataText(text, mediaType) {
+function parseJsonMetadataText(text) {
try {
const abmetadataData = JSON.parse(text)
@@ -63,41 +19,28 @@ function parseJsonMetadataText(text, mediaType) {
}
delete abmetadataData.metadata
- const expectedKeys = mediaTypeKeys[mediaType]
- if (!expectedKeys) {
- Logger.error(`[abmetadataGenerator] Invalid media type "${mediaType}"`)
- return null
+ if (abmetadataData.series?.length) {
+ abmetadataData.series = [...new Set(abmetadataData.series.map((t) => t?.trim()).filter((t) => t))]
+ abmetadataData.series = abmetadataData.series.map((series) => parseSeriesString.parse(series))
}
-
- const validated = {}
- for (const key in expectedKeys) {
- const expectedType = expectedKeys[key]
- if (!(key in abmetadataData)) continue
-
- const validatedValue = validateMetadataValue(key, abmetadataData[key], expectedType)
- if (validatedValue !== undefined) {
- validated[key] = validatedValue
- }
+ // clean tags & remove dupes
+ if (abmetadataData.tags?.length) {
+ abmetadataData.tags = [...new Set(abmetadataData.tags.map((t) => t?.trim()).filter((t) => t))]
}
-
- if (validated.series?.length) {
- validated.series = validated.series.map((series) => parseSeriesString.parse(series)).filter(Boolean)
+ if (abmetadataData.chapters?.length) {
+ abmetadataData.chapters = cleanChaptersArray(abmetadataData.chapters, abmetadataData.title)
}
-
- if (mediaType === 'book' && 'chapters' in abmetadataData) {
- if (abmetadataData.chapters === null) {
- validated.chapters = []
- } else if (Array.isArray(abmetadataData.chapters)) {
- const cleanedChapters = cleanChaptersArray(abmetadataData.chapters, validated.title ?? abmetadataData.title)
- if (cleanedChapters) {
- validated.chapters = cleanedChapters
- }
- } else {
- Logger.warn(`[abmetadataGenerator] Invalid metadata key "chapters" expected array, got ${typeof abmetadataData.chapters}`)
- }
+ // clean remove dupes
+ if (abmetadataData.authors?.length) {
+ abmetadataData.authors = [...new Set(abmetadataData.authors.map((t) => t?.trim()).filter((t) => t))]
}
-
- return validated
+ if (abmetadataData.narrators?.length) {
+ abmetadataData.narrators = [...new Set(abmetadataData.narrators.map((t) => t?.trim()).filter((t) => t))]
+ }
+ if (abmetadataData.genres?.length) {
+ abmetadataData.genres = [...new Set(abmetadataData.genres.map((t) => t?.trim()).filter((t) => t))]
+ }
+ return abmetadataData
} catch (error) {
Logger.error(`[abmetadataGenerator] Invalid metadata.json JSON`, error)
return null
@@ -105,54 +48,6 @@ function parseJsonMetadataText(text, mediaType) {
}
module.exports.parseJson = parseJsonMetadataText
-/**
- * @param {string} key
- * @param {*} value
- * @param {string} expectedType
- * @returns {*|undefined} undefined excludes the key
- */
-function validateMetadataValue(key, value, expectedType) {
- if (expectedType === 'string') {
- if (value === null) return null
- if (typeof value === 'number') return String(value)
- if (typeof value === 'string') return value
- Logger.warn(`[abmetadataGenerator] Invalid metadata key "${key}" expected string, got ${typeof value}`)
- return undefined
- }
-
- if (expectedType === 'boolean') {
- if (value === null) return null
- if (typeof value === 'boolean') return value
- if (typeof value === 'string') {
- const lower = value.toLowerCase()
- if (lower === 'true') return true
- if (lower === 'false') return false
- }
- Logger.warn(`[abmetadataGenerator] Invalid metadata key "${key}" expected boolean, got ${typeof value}`)
- return undefined
- }
-
- // Filter empty strings and deduplicate
- if (expectedType === 'stringArray') {
- if (value === null) return []
- if (!Array.isArray(value)) {
- Logger.warn(`[abmetadataGenerator] Invalid metadata key "${key}" expected string array, got ${typeof value}`)
- return undefined
- }
-
- const cleanedArray = value.filter((t) => typeof t === 'string')
- return [...new Set(cleanedArray.map((t) => t.trim()).filter((t) => t))]
- }
-
- Logger.warn(`[abmetadataGenerator] Unknown expected type "${expectedType}" for key "${key}"`)
- return undefined
-}
-
-/**
- * @param {Object[]} chaptersArray
- * @param {string} mediaTitle
- * @returns {Object[]}
- */
function cleanChaptersArray(chaptersArray, mediaTitle) {
const chapters = []
let index = 0
diff --git a/server/utils/generators/hlsPlaylistGenerator.js b/server/utils/generators/hlsPlaylistGenerator.js
index 369c1456d..58c1d69ae 100644
--- a/server/utils/generators/hlsPlaylistGenerator.js
+++ b/server/utils/generators/hlsPlaylistGenerator.js
@@ -1,6 +1,6 @@
const fs = require('../../libs/fsExtra')
-function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType) {
+function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token) {
var ext = hlsSegmentType === 'fmp4' ? 'm4s' : 'ts'
var lines = [
@@ -18,18 +18,18 @@ function getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType) {
var lastSegment = duration - (numSegments * segmentLength)
for (let i = 0; i < numSegments; i++) {
lines.push(`#EXTINF:6,`)
- lines.push(`${segmentName}-${i}.${ext}`)
+ lines.push(`${segmentName}-${i}.${ext}?token=${token}`)
}
if (lastSegment > 0) {
lines.push(`#EXTINF:${lastSegment},`)
- lines.push(`${segmentName}-${numSegments}.${ext}`)
+ lines.push(`${segmentName}-${numSegments}.${ext}?token=${token}`)
}
lines.push('#EXT-X-ENDLIST')
return lines.join('\n')
}
-function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType) {
- var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType)
+function generatePlaylist(outputPath, segmentName, duration, segmentLength, hlsSegmentType, token) {
+ var playlistStr = getPlaylistStr(segmentName, duration, segmentLength, hlsSegmentType, token)
return fs.writeFile(outputPath, playlistStr)
}
module.exports = generatePlaylist
\ No newline at end of file
diff --git a/server/utils/htmlSanitizer.js b/server/utils/htmlSanitizer.js
index be839b7c2..4ed30e727 100644
--- a/server/utils/htmlSanitizer.js
+++ b/server/utils/htmlSanitizer.js
@@ -5,10 +5,11 @@ const { entities } = require('./htmlEntities')
*
* @param {string} html
* @returns {string}
+ * @throws {Error} if input is not a string
*/
function sanitize(html) {
if (typeof html !== 'string') {
- return ''
+ throw new Error('sanitizeHtml: input must be a string')
}
const sanitizerOptions = {
@@ -26,8 +27,6 @@ function sanitize(html) {
module.exports.sanitize = sanitize
function stripAllTags(html, shouldDecodeEntities = true) {
- if (typeof html !== 'string') return ''
-
const sanitizerOptions = {
allowedTags: [],
disallowedTagsMode: 'discard'
diff --git a/server/utils/index.js b/server/utils/index.js
index 49a7c8e67..369620276 100644
--- a/server/utils/index.js
+++ b/server/utils/index.js
@@ -54,16 +54,6 @@ module.exports.isNullOrNaN = (num) => {
return num === null || isNaN(num)
}
-/**
- * @param {number|null|undefined} value
- * @param {number} max
- * @returns {number|null}
- */
-module.exports.clampPositiveInt = (value, max) => {
- if (value == null || !Number.isFinite(value) || value <= 0) return null
- return Math.min(Math.floor(value), max)
-}
-
const xmlToJSON = (xml) => {
return new Promise((resolve, reject) => {
parseString(xml, (err, results) => {
@@ -287,57 +277,3 @@ module.exports.timestampToSeconds = (timestamp) => {
}
return null
}
-
-class ValidationError extends Error {
- constructor(paramName, message, status = 400) {
- super(`Query parameter "${paramName}" ${message}`)
- this.name = 'ValidationError'
- this.paramName = paramName
- this.status = status
- }
-}
-module.exports.ValidationError = ValidationError
-
-class NotFoundError extends Error {
- constructor(message, status = 404) {
- super(message)
- this.name = 'NotFoundError'
- this.status = status
- }
-}
-module.exports.NotFoundError = NotFoundError
-
-/**
- * Safely extracts a query parameter as a string, rejecting arrays to prevent type confusion
- * Express query parameters can be arrays if the same parameter appears multiple times
- * @example ?author=Smith => "Smith"
- * @example ?author=Smith&author=Jones => throws error
- *
- * @param {Object} query - Query object
- * @param {string} paramName - Parameter name
- * @param {string} defaultValue - Default value if undefined/null
- * @param {boolean} required - Whether the parameter is required
- * @param {number} maxLength - Optional maximum length (defaults to 10000 to prevent ReDoS attacks)
- * @returns {string} String value
- * @throws {ValidationError} If value is an array
- * @throws {ValidationError} If value is too long
- * @throws {ValidationError} If value is required but not provided
- */
-module.exports.getQueryParamAsString = (query, paramName, defaultValue = '', required = false, maxLength = 1000) => {
- const value = query[paramName]
- if (value === undefined || value === null) {
- if (required) {
- throw new ValidationError(paramName, 'is required')
- }
- return defaultValue
- }
- // Explicitly reject arrays to prevent type confusion
- if (Array.isArray(value)) {
- throw new ValidationError(paramName, 'is an array')
- }
- // Reject excessively long strings to prevent ReDoS attacks
- if (typeof value === 'string' && value.length > maxLength) {
- throw new ValidationError(paramName, 'is too long')
- }
- return String(value)
-}
diff --git a/server/utils/notifications.js b/server/utils/notifications.js
index 497d7a1a1..700d3c389 100644
--- a/server/utils/notifications.js
+++ b/server/utils/notifications.js
@@ -100,7 +100,7 @@ module.exports.notificationData = {
variables: ['version'],
defaults: {
title: 'Test Notification on Abs {{version}}',
- body: 'Test notification body for abs {{version}}.'
+ body: 'Test notificataion body for abs {{version}}.'
},
testData: {
version: 'v' + version
diff --git a/server/utils/parsers/parseNfoMetadata.js b/server/utils/parsers/parseNfoMetadata.js
index 4276443d0..6682a0078 100644
--- a/server/utils/parsers/parseNfoMetadata.js
+++ b/server/utils/parsers/parseNfoMetadata.js
@@ -22,7 +22,7 @@ function parseNfoMetadata(nfoText) {
switch (key) {
case 'title':
{
- const titleMatch = value.match(/^(.*?): (.*)$/)
+ const titleMatch = value.match(/^(.*?):(.*)$/)
if (titleMatch) {
metadata.title = titleMatch[1].trim()
metadata.subtitle = titleMatch[2].trim()
diff --git a/server/utils/parsers/parseUserAgent.js b/server/utils/parsers/parseUserAgent.js
deleted file mode 100644
index 045074429..000000000
--- a/server/utils/parsers/parseUserAgent.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const uaParserJs = require('../../libs/uaParser')
-
-/**
- * @param {string|null|undefined} userAgent
- * @returns {{ browserName?:string, browserVersion?:string, osName?:string, osVersion?:string, deviceType?:string, model?:string, vendor?:string }|null}
- */
-function parseUserAgent(userAgent) {
- if (!userAgent) return null
-
- const ua = uaParserJs(userAgent)
- const deviceInfo = {
- browserName: ua?.browser?.name || undefined,
- browserVersion: ua?.browser?.version || undefined,
- osName: ua?.os?.name || undefined,
- osVersion: ua?.os?.version || undefined,
- deviceType: ua?.device?.type || undefined,
- model: ua?.device?.model || undefined,
- vendor: ua?.device?.vendor || undefined
- }
-
- for (const key in deviceInfo) {
- if (deviceInfo[key] === undefined) delete deviceInfo[key]
- }
-
- return Object.keys(deviceInfo).length ? deviceInfo : null
-}
-
-module.exports = parseUserAgent
diff --git a/server/utils/podcastUtils.js b/server/utils/podcastUtils.js
index 1cb0c4cb4..b62e024f0 100644
--- a/server/utils/podcastUtils.js
+++ b/server/utils/podcastUtils.js
@@ -171,7 +171,7 @@ function extractEpisodeData(item) {
// Full description with html
if (item['content:encoded']) {
- const rawDescription = (extractFirstArrayItemString(item, 'content:encoded') || '').trim()
+ const rawDescription = (extractFirstArrayItem(item, 'content:encoded') || '').trim()
episode.description = htmlSanitizer.sanitize(rawDescription)
}
@@ -217,10 +217,6 @@ function extractEpisodeData(item) {
episode[cleanKey] = extractFirstArrayItemString(item, key)
})
- if (episode.subtitle) {
- episode.subtitle = htmlSanitizer.sanitize(episode.subtitle.trim())
- }
-
// Extract psc:chapters if duration is set
episode.durationSeconds = episode.duration ? timestampToSeconds(episode.duration) : null
diff --git a/server/utils/queries/libraryItemsBookFilters.js b/server/utils/queries/libraryItemsBookFilters.js
index fbe0c4f0d..ded712cf1 100644
--- a/server/utils/queries/libraryItemsBookFilters.js
+++ b/server/utils/queries/libraryItemsBookFilters.js
@@ -236,7 +236,7 @@ module.exports = {
} else if (group === 'publishedDecades') {
const startYear = parseInt(value)
const endYear = parseInt(value, 10) + 9
- mediaWhere = Sequelize.where(Sequelize.literal('CAST(publishedYear AS INTEGER)'), {
+ mediaWhere = Sequelize.where(Sequelize.literal('CAST(`book`.`publishedYear` AS INTEGER)'), {
[Sequelize.Op.between]: [startYear, endYear]
})
}
@@ -289,11 +289,7 @@ module.exports = {
const nullDir = sortDesc ? 'DESC NULLS FIRST' : 'ASC NULLS LAST'
return [[Sequelize.literal(`CAST(\`series.bookSeries.sequence\` AS FLOAT) ${nullDir}`)]]
} else if (sortBy === 'progress') {
- return [[Sequelize.literal(`mediaProgresses.updatedAt ${dir} NULLS LAST`)]]
- } else if (sortBy === 'progress.createdAt') {
- return [[Sequelize.literal(`mediaProgresses.createdAt ${dir} NULLS LAST`)]]
- } else if (sortBy === 'progress.finishedAt') {
- return [[Sequelize.literal(`mediaProgresses.finishedAt ${dir} NULLS LAST`)]]
+ return [[Sequelize.literal('mediaProgresses.updatedAt'), dir]]
} else if (sortBy === 'random') {
return [Database.sequelize.random()]
}
@@ -403,6 +399,9 @@ module.exports = {
if (filterGroup !== 'series' && sortBy === 'sequence') {
sortBy = 'media.metadata.title'
}
+ if (filterGroup !== 'progress' && sortBy === 'progress') {
+ sortBy = 'media.metadata.title'
+ }
const includeRSSFeed = include.includes('rssfeed')
const includeMediaItemShare = !!user?.isAdminOrUp && include.includes('share')
@@ -523,7 +522,7 @@ module.exports = {
}
bookIncludes.push({
model: Database.mediaProgressModel,
- attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt', 'createdAt', 'finishedAt'],
+ attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt'],
where: mediaProgressWhere,
required: false
})
@@ -533,18 +532,6 @@ module.exports = {
}
}
- // When sorting by progress but not filtering by progress, include media progresses
- if (filterGroup !== 'progress' && ['progress.createdAt', 'progress.finishedAt', 'progress'].includes(sortBy)) {
- bookIncludes.push({
- model: Database.mediaProgressModel,
- attributes: ['id', 'isFinished', 'currentTime', 'ebookProgress', 'updatedAt', 'createdAt', 'finishedAt'],
- where: {
- userId: user.id
- },
- required: false
- })
- }
-
let { mediaWhere, replacements } = this.getMediaGroupQuery(filterGroup, filterValue)
let bookWhere = Array.isArray(mediaWhere) ? mediaWhere : [mediaWhere]
@@ -888,79 +875,28 @@ module.exports = {
})
}
- const discoverWhere = [
- {
- '$mediaProgresses.isFinished$': {
- [Sequelize.Op.or]: [null, 0]
- },
- '$mediaProgresses.currentTime$': {
- [Sequelize.Op.or]: [null, 0]
- },
- [Sequelize.Op.or]: [
- Sequelize.where(Sequelize.literal(`(SELECT COUNT(*) FROM bookSeries bs where bs.bookId = book.id)`), 0),
- {
- id: {
- [Sequelize.Op.in]: booksFromSeriesToInclude
+ // Step 2: Get books not started and not in a series OR is the first book of a series not started (ordered randomly)
+ const { rows: books, count } = await Database.bookModel.findAndCountAll({
+ where: [
+ {
+ '$mediaProgresses.isFinished$': {
+ [Sequelize.Op.or]: [null, 0]
+ },
+ '$mediaProgresses.currentTime$': {
+ [Sequelize.Op.or]: [null, 0]
+ },
+ [Sequelize.Op.or]: [
+ Sequelize.where(Sequelize.literal(`(SELECT COUNT(*) FROM bookSeries bs where bs.bookId = book.id)`), 0),
+ {
+ id: {
+ [Sequelize.Op.in]: booksFromSeriesToInclude
+ }
}
- }
- ]
- },
- ...userPermissionBookWhere.bookWhere
- ]
-
- const baseDiscoverInclude = [
- {
- model: Database.libraryItemModel,
- where: {
- libraryId
- }
- },
- {
- model: Database.mediaProgressModel,
- where: {
- userId: user.id
+ ]
},
- required: false
- }
- ]
-
- // Step 2a: Count with lightweight includes only
- const count = await Database.bookModel.count({
- where: discoverWhere,
+ ...userPermissionBookWhere.bookWhere
+ ],
replacements: userPermissionBookWhere.replacements,
- include: baseDiscoverInclude,
- distinct: true,
- col: 'id',
- subQuery: false
- })
-
- // Step 2b: Select random IDs with lightweight includes only
- const randomSelection = await Database.bookModel.findAll({
- attributes: ['id'],
- where: discoverWhere,
- replacements: userPermissionBookWhere.replacements,
- include: baseDiscoverInclude,
- subQuery: false,
- distinct: true,
- limit,
- order: Database.sequelize.random()
- })
-
- const selectedIds = randomSelection.map((b) => b.id).filter(Boolean)
- if (!selectedIds.length) {
- return {
- libraryItems: [],
- count
- }
- }
-
- // Step 2c: Hydrate selected IDs with full metadata for API response
- const books = await Database.bookModel.findAll({
- where: {
- id: {
- [Sequelize.Op.in]: selectedIds
- }
- },
include: [
{
model: Database.libraryItemModel,
@@ -969,6 +905,13 @@ module.exports = {
},
include: libraryItemIncludes
},
+ {
+ model: Database.mediaProgressModel,
+ where: {
+ userId: user.id
+ },
+ required: false
+ },
{
model: Database.bookAuthorModel,
attributes: ['authorId'],
@@ -986,14 +929,14 @@ module.exports = {
separate: true
}
],
- subQuery: false
+ subQuery: false,
+ distinct: true,
+ limit,
+ order: Database.sequelize.random()
})
- const booksById = new Map(books.map((b) => [b.id, b]))
- const orderedBooks = selectedIds.map((id) => booksById.get(id)).filter(Boolean)
-
// Step 3: Map books to library items
- const libraryItems = orderedBooks.map((bookExpanded) => {
+ const libraryItems = books.map((bookExpanded) => {
const libraryItem = bookExpanded.libraryItem
const book = bookExpanded
delete book.libraryItem
diff --git a/server/utils/requestUtils.js b/server/utils/requestUtils.js
deleted file mode 100644
index afac4fcc0..000000000
--- a/server/utils/requestUtils.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Whether the request was made over HTTPS.
- * Uses Express `req.secure` and `x-forwarded-proto`
- *
- * @param {import('express').Request} req
- * @returns {boolean}
- */
-function isRequestSecure(req) {
- if (req.secure) return true
- const xfp = (req.get('x-forwarded-proto') || '').toLowerCase()
- // Nginx Proxy Manager sends "http, https"; see https://github.com/advplyr/audiobookshelf/pull/4635
- return (
- xfp === 'https' ||
- xfp
- .split(',')
- .map((s) => s.trim())
- .includes('https')
- )
-}
-
-/**
- * @param {import('express').Request} req
- * @returns {'https' | 'http'}
- */
-function getRequestProtocol(req) {
- return isRequestSecure(req) ? 'https' : 'http'
-}
-
-/**
- * @param {import('express').Request} req
- * @returns {{ protocol: 'https' | 'http', host: string, origin: string }}
- */
-function getRequestOrigin(req) {
- const protocol = getRequestProtocol(req)
- const host = req.get('host')
- return { protocol, host, origin: `${protocol}://${host}` }
-}
-
-module.exports = {
- isRequestSecure,
- getRequestProtocol,
- getRequestOrigin
-}
diff --git a/test/server/auth/OidcAuthStrategy.test.js b/test/server/auth/OidcAuthStrategy.test.js
deleted file mode 100644
index 6a84edac0..000000000
--- a/test/server/auth/OidcAuthStrategy.test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-const { expect } = require('chai')
-const sinon = require('sinon')
-
-// Load Database first so Auth resolves OidcAuthStrategy before the circular require completes.
-require('../../../server/Database')
-const OidcAuthStrategy = require('../../../server/auth/OidcAuthStrategy')
-const Logger = require('../../../server/Logger')
-
-describe('OidcAuthStrategy - isValidWebCallbackUrl', () => {
- /** @type {OidcAuthStrategy} */
- let strategy
-
- beforeEach(() => {
- global.RouterBasePath = ''
- strategy = new OidcAuthStrategy()
- sinon.stub(Logger, 'warn')
- sinon.stub(Logger, 'error')
- })
-
- afterEach(() => {
- sinon.restore()
- })
-
- function mockReq({ secure = false, host = 'books.example.com', xForwardedProto = null } = {}) {
- return {
- secure,
- get(header) {
- if (header === 'host') return host
- if (header === 'x-forwarded-proto') return xForwardedProto
- return null
- }
- }
- }
-
- it('accepts a same-origin relative path when router base path is empty', () => {
- expect(strategy.isValidWebCallbackUrl('/library', mockReq())).to.equal(true)
- })
-
- it('accepts a same-origin absolute https URL', () => {
- const req = mockReq({ secure: true })
- expect(strategy.isValidWebCallbackUrl('https://books.example.com/library', req)).to.equal(true)
- })
-
- it('rejects protocol-relative URLs', () => {
- expect(strategy.isValidWebCallbackUrl('//evil.example/capture', mockReq())).to.equal(false)
- })
-
- it('rejects backslash-prefixed URLs', () => {
- expect(strategy.isValidWebCallbackUrl('/\\evil.example/capture', mockReq())).to.equal(false)
- })
-
- it('rejects absolute external URLs', () => {
- expect(strategy.isValidWebCallbackUrl('http://evil.example/capture', mockReq())).to.equal(false)
- })
-
- it('rejects encoded protocol-relative path segments', () => {
- expect(strategy.isValidWebCallbackUrl('/%2F%2Fevil.example/capture', mockReq())).to.equal(false)
- })
-
- it('rejects same-origin URLs outside router base path', () => {
- global.RouterBasePath = '/audiobookshelf'
- expect(strategy.isValidWebCallbackUrl('/login', mockReq())).to.equal(false)
- expect(strategy.isValidWebCallbackUrl('/audiobookshelf/login', mockReq())).to.equal(true)
- })
-
- it('rejects empty and malformed callback URLs', () => {
- expect(strategy.isValidWebCallbackUrl('', mockReq())).to.equal(false)
- expect(strategy.isValidWebCallbackUrl(null, mockReq())).to.equal(false)
- expect(strategy.isValidWebCallbackUrl('not a url', mockReq())).to.equal(false)
- })
-
- it('uses x-forwarded-proto when determining same-origin https URLs', () => {
- const req = mockReq({ xForwardedProto: 'https' })
- expect(strategy.isValidWebCallbackUrl('https://books.example.com/login', req)).to.equal(true)
- expect(strategy.isValidWebCallbackUrl('http://books.example.com/login', req)).to.equal(false)
- })
-})
diff --git a/test/server/auth/TokenManager.test.js b/test/server/auth/TokenManager.test.js
deleted file mode 100644
index ad583455c..000000000
--- a/test/server/auth/TokenManager.test.js
+++ /dev/null
@@ -1,142 +0,0 @@
-const { expect } = require('chai')
-const sinon = require('sinon')
-const { Op } = require('sequelize')
-
-const Database = require('../../../server/Database')
-const jwt = require('../../../server/libs/jsonwebtoken')
-
-// Database â Auth â TokenManager circular require can leave TokenManager with a partial Database reference; reload before each test
-function loadTokenManager() {
- delete require.cache[require.resolve('../../../server/auth/TokenManager')]
- return require('../../../server/auth/TokenManager')
-}
-
-describe('TokenManager', () => {
- const secret = 'test-jwt-secret'
- const userId = 'user-uuid-1'
- let TokenManager
- let tokenManager
-
- beforeEach(() => {
- TokenManager = loadTokenManager()
- TokenManager.TokenSecret = secret
- tokenManager = new TokenManager()
- })
-
- afterEach(() => {
- sinon.restore()
- })
-
- describe('validateAccessToken', () => {
- it('rejects refresh tokens', () => {
- const refreshToken = jwt.sign({ userId, type: 'refresh' }, secret, { expiresIn: 3600 })
- expect(TokenManager.validateAccessToken(refreshToken)).to.equal(null)
- })
-
- it('accepts access tokens', () => {
- const accessToken = jwt.sign({ userId, type: 'access' }, secret, { expiresIn: 3600 })
- const decoded = TokenManager.validateAccessToken(accessToken)
- expect(decoded.userId).to.equal(userId)
- expect(decoded.type).to.equal('access')
- })
- })
-
- describe('jwtAuthCheck', () => {
- const user = { id: userId, username: 'testuser', isActive: true }
-
- it('rejects refresh tokens for API auth', async () => {
- const refreshToken = tokenManager.generateRefreshToken(user)
- const decoded = jwt.verify(refreshToken, secret)
- const done = sinon.spy()
-
- await tokenManager.jwtAuthCheck(decoded, done)
-
- expect(done.calledWith(null, null)).to.be.true
- })
-
- it('allows access tokens for active users', async () => {
- sinon.stub(Database, 'userModel').get(() => ({
- getUserByIdOrOldId: sinon.stub().resolves(user)
- }))
- const decoded = jwt.verify(tokenManager.generateTempAccessToken(user), secret)
- const done = sinon.spy()
-
- await tokenManager.jwtAuthCheck(decoded, done)
-
- expect(done.calledWith(null, user)).to.be.true
- })
- })
-
- describe('invalidateJwtSessionsForUser', () => {
- const targetUser = { id: userId, username: 'testuser' }
- const currentSession = {
- id: 'session-current',
- userId,
- refreshToken: 'refresh-current'
- }
-
- /** Minimal req/res for session invalidation (ApiRouter provides auth on real requests). */
- function makeReq({ requestUserId = userId, refreshToken = null, cookieRefreshToken = null } = {}) {
- return {
- user: { id: requestUserId },
- cookies: cookieRefreshToken ? { refresh_token: cookieRefreshToken } : {},
- headers: refreshToken ? { 'x-refresh-token': refreshToken } : {}
- }
- }
-
- let sessionFindOne
- let sessionDestroy
- let rotateStub
-
- beforeEach(() => {
- sessionFindOne = sinon.stub().resolves(currentSession)
- sessionDestroy = sinon.stub().resolves(1)
- sinon.stub(Database, 'sessionModel').get(() => ({
- findOne: sessionFindOne,
- destroy: sessionDestroy
- }))
- rotateStub = sinon.stub(tokenManager, 'rotateTokensForSession').resolves({
- accessToken: 'access-new',
- refreshToken: 'refresh-new'
- })
- })
-
- it('self password change: keeps current session, deletes others', async () => {
- const req = makeReq({ refreshToken: 'refresh-current' })
- const res = { cookie: sinon.spy() }
-
- const result = await tokenManager.invalidateJwtSessionsForUser(targetUser, req, res)
-
- // Found this device's session using the x-refresh-token header
- expect(sessionFindOne.calledOnce).to.be.true
- const findWhere = sessionFindOne.firstCall.args[0].where
- expect(findWhere.userId).to.equal(userId)
- expect(findWhere[Op.or]).to.deep.equal([{ refreshToken: 'refresh-current' }, { lastRefreshToken: 'refresh-current' }])
-
- // Rotated in place (no grace period) so the caller keeps a valid session
- expect(rotateStub.calledOnceWith(currentSession, targetUser, req, res, false)).to.be.true
-
- // Deleted all other sessions, but not this one
- expect(sessionDestroy.calledOnce).to.be.true
- const destroyWhere = sessionDestroy.firstCall.args[0].where
- expect(destroyWhere.userId).to.equal(userId)
- expect(destroyWhere.id[Op.ne]).to.equal(currentSession.id)
-
- expect(result).to.deep.equal({ accessToken: 'access-new', refreshToken: 'refresh-new' })
- })
-
- it('admin password reset: deletes all target sessions', async () => {
- const req = makeReq({ requestUserId: 'admin-id', refreshToken: 'refresh-current' })
- const res = { cookie: sinon.spy() }
-
- const result = await tokenManager.invalidateJwtSessionsForUser(targetUser, req, res)
-
- // Token rotation did not happen because target is a different user
- expect(sessionFindOne.called).to.be.false
- expect(rotateStub.called).to.be.false
-
- expect(sessionDestroy.calledOnceWith(sinon.match({ where: { userId } }))).to.be.true
- expect(result).to.equal(null)
- })
- })
-})
diff --git a/test/server/controllers/LibraryController.test.js b/test/server/controllers/LibraryController.test.js
deleted file mode 100644
index beb8dac03..000000000
--- a/test/server/controllers/LibraryController.test.js
+++ /dev/null
@@ -1,178 +0,0 @@
-const { expect } = require('chai')
-const { Sequelize } = require('sequelize')
-const sinon = require('sinon')
-
-const Database = require('../../../server/Database')
-const LibraryController = require('../../../server/controllers/LibraryController')
-const zipHelpers = require('../../../server/utils/zipHelpers')
-const Logger = require('../../../server/Logger')
-
-describe('LibraryController.downloadMultiple', () => {
- let library
- let libraryFolder
- let allowedItemId
- let explicitItemId
- let taggedItemId
- let restrictedUser
- let libraryRecord
-
- beforeEach(async () => {
- global.ServerSettings = {}
- Database.sequelize = new Sequelize({ dialect: 'sqlite', storage: ':memory:', logging: false })
- Database.sequelize.uppercaseFirst = (str) => (str ? `${str[0].toUpperCase()}${str.substr(1)}` : '')
- await Database.buildModels()
-
- library = await Database.libraryModel.create({ name: 'Test Library', mediaType: 'book' })
- libraryFolder = await Database.libraryFolderModel.create({ path: '/test-lib', libraryId: library.id })
- libraryRecord = await Database.libraryModel.findByIdWithFolders(library.id)
-
- const allowedBook = await Database.bookModel.create({
- title: 'Allowed Book',
- explicit: false,
- audioFiles: [],
- tags: ['allowed-tag'],
- narrators: [],
- genres: [],
- chapters: []
- })
- const allowedItem = await Database.libraryItemModel.create({
- path: '/test-lib/allowed',
- isFile: false,
- libraryFiles: [],
- mediaId: allowedBook.id,
- mediaType: 'book',
- libraryId: library.id,
- libraryFolderId: libraryFolder.id
- })
- allowedItemId = allowedItem.id
-
- const explicitBook = await Database.bookModel.create({
- title: 'Explicit Book',
- explicit: true,
- audioFiles: [],
- tags: [],
- narrators: [],
- genres: [],
- chapters: []
- })
- const explicitItem = await Database.libraryItemModel.create({
- path: '/test-lib/explicit',
- isFile: false,
- libraryFiles: [],
- mediaId: explicitBook.id,
- mediaType: 'book',
- libraryId: library.id,
- libraryFolderId: libraryFolder.id
- })
- explicitItemId = explicitItem.id
-
- const taggedBook = await Database.bookModel.create({
- title: 'Tagged Book',
- explicit: false,
- audioFiles: [],
- tags: ['restricted-tag'],
- narrators: [],
- genres: [],
- chapters: []
- })
- const taggedItem = await Database.libraryItemModel.create({
- path: '/test-lib/tagged',
- isFile: false,
- libraryFiles: [],
- mediaId: taggedBook.id,
- mediaType: 'book',
- libraryId: library.id,
- libraryFolderId: libraryFolder.id
- })
- taggedItemId = taggedItem.id
-
- const permissions = Database.userModel.getDefaultPermissionsForUserType('user')
- permissions.download = true
- permissions.accessExplicitContent = false
- permissions.accessAllLibraries = false
- permissions.accessAllTags = false
- permissions.librariesAccessible = [library.id]
- permissions.itemTagsSelected = ['allowed-tag']
- permissions.selectedTagsNotAccessible = false
-
- restrictedUser = await Database.userModel.create({
- username: 'restricted',
- pash: 'hash',
- token: 'token',
- type: 'user',
- isActive: true,
- permissions,
- bookmarks: [],
- extraData: {}
- })
-
- sinon.stub(Logger, 'info')
- sinon.stub(Logger, 'warn')
- sinon.stub(Logger, 'error')
- sinon.stub(zipHelpers, 'zipDirectoriesPipe').resolves()
- })
-
- afterEach(async () => {
- sinon.restore()
- await Database.sequelize.sync({ force: true })
- })
-
- function makeReq(ids) {
- return {
- query: { ids: ids.join(',') },
- user: restrictedUser,
- library: libraryRecord
- }
- }
-
- function makeRes() {
- return {
- sendStatus: sinon.spy(),
- status: sinon.stub().returnsThis(),
- send: sinon.spy()
- }
- }
-
- it('returns 403 for bulk download of an explicit item', async () => {
- const req = makeReq([explicitItemId])
- const res = makeRes()
-
- await LibraryController.downloadMultiple(req, res)
-
- expect(res.sendStatus.calledWith(403)).to.be.true
- expect(zipHelpers.zipDirectoriesPipe.called).to.be.false
- })
-
- it('returns 403 for bulk download of a tag-restricted item', async () => {
- const req = makeReq([taggedItemId])
- const res = makeRes()
-
- await LibraryController.downloadMultiple(req, res)
-
- expect(res.sendStatus.calledWith(403)).to.be.true
- expect(zipHelpers.zipDirectoriesPipe.called).to.be.false
- })
-
- it('returns 403 when bulk download includes both allowed and forbidden items', async () => {
- const req = makeReq([allowedItemId, explicitItemId])
- const res = makeRes()
-
- await LibraryController.downloadMultiple(req, res)
-
- expect(res.sendStatus.calledWith(403)).to.be.true
- expect(zipHelpers.zipDirectoriesPipe.called).to.be.false
- })
-
- it('starts zip download for allowed items only', async () => {
- const req = makeReq([allowedItemId])
- const res = makeRes()
-
- await LibraryController.downloadMultiple(req, res)
-
- expect(res.sendStatus.called).to.be.false
- expect(zipHelpers.zipDirectoriesPipe.calledOnce).to.be.true
- const pathObjects = zipHelpers.zipDirectoriesPipe.firstCall.args[0]
- expect(pathObjects).to.have.length(1)
- expect(pathObjects[0].path).to.equal('/test-lib/allowed')
- })
-})
diff --git a/test/server/controllers/LibraryItemController.test.js b/test/server/controllers/LibraryItemController.test.js
index 1d57219d3..5a0422392 100644
--- a/test/server/controllers/LibraryItemController.test.js
+++ b/test/server/controllers/LibraryItemController.test.js
@@ -123,9 +123,7 @@ describe('LibraryItemController', () => {
const fakeReq = {
query: {},
user: {
- username: 'test',
- canDelete: true,
- checkCanAccessLibraryItem: () => true
+ canDelete: true
},
body: {
libraryItemIds: [libraryItem1Id]
@@ -201,102 +199,4 @@ describe('LibraryItemController', () => {
expect(series2Exists).to.be.true
})
})
-
- describe('batch item access control', () => {
- let lib1Id
- let itemLib1Id
- let itemLib2Id
-
- beforeEach(async () => {
- const lib1 = await Database.libraryModel.create({ name: 'Lib 1', mediaType: 'book' })
- const folder1 = await Database.libraryFolderModel.create({ path: '/l1', libraryId: lib1.id })
- const book1 = await Database.bookModel.create({ title: 'B1', audioFiles: [], tags: [], narrators: [], genres: [], chapters: [] })
- const li1 = await Database.libraryItemModel.create({
- libraryFiles: [],
- mediaId: book1.id,
- mediaType: 'book',
- libraryId: lib1.id,
- libraryFolderId: folder1.id
- })
- lib1Id = lib1.id
- itemLib1Id = li1.id
-
- const lib2 = await Database.libraryModel.create({ name: 'Lib 2', mediaType: 'book' })
- const folder2 = await Database.libraryFolderModel.create({ path: '/l2', libraryId: lib2.id })
- const book2 = await Database.bookModel.create({ title: 'B2', audioFiles: [], tags: [], narrators: [], genres: [], chapters: [] })
- const li2 = await Database.libraryItemModel.create({
- libraryFiles: [],
- mediaId: book2.id,
- mediaType: 'book',
- libraryId: lib2.id,
- libraryFolderId: folder2.id
- })
- itemLib2Id = li2.id
- })
-
- const userLimitedToLib1 = () => ({
- username: 'limited',
- canDelete: true,
- canUpdate: true,
- checkCanAccessLibraryItem(li) {
- return li.libraryId === lib1Id
- }
- })
-
- it('batchGet returns 403 for a library item the user cannot access', async () => {
- const fakeRes = { sendStatus: sinon.spy(), json: sinon.spy() }
- const fakeReq = {
- body: { libraryItemIds: [itemLib2Id] },
- user: userLimitedToLib1()
- }
- await LibraryItemController.batchGet.bind(apiRouter)(fakeReq, fakeRes)
- expect(fakeRes.sendStatus.calledWith(403)).to.be.true
- })
-
- it('batchGet returns items when the user can access them', async () => {
- const fakeRes = { sendStatus: sinon.spy(), json: sinon.spy() }
- const fakeReq = {
- body: { libraryItemIds: [itemLib1Id] },
- user: userLimitedToLib1()
- }
- await LibraryItemController.batchGet.bind(apiRouter)(fakeReq, fakeRes)
- expect(fakeRes.json.calledOnce).to.be.true
- const payload = fakeRes.json.firstCall.args[0]
- expect(payload.libraryItems).to.have.length(1)
- expect(payload.libraryItems[0].id).to.equal(itemLib1Id)
- })
-
- it('batchUpdate returns 403 for a library item the user cannot access', async () => {
- const fakeRes = { sendStatus: sinon.spy(), json: sinon.spy() }
- const fakeReq = {
- user: userLimitedToLib1(),
- body: [{ id: itemLib2Id, mediaPayload: {} }]
- }
- await LibraryItemController.batchUpdate.bind(apiRouter)(fakeReq, fakeRes)
- expect(fakeRes.sendStatus.calledWith(403)).to.be.true
- })
-
- it('batchUpdate returns 403 when the user lacks canUpdate', async () => {
- const u = userLimitedToLib1()
- u.canUpdate = false
- const fakeRes = { sendStatus: sinon.spy(), json: sinon.spy() }
- const fakeReq = {
- user: u,
- body: [{ id: itemLib1Id, mediaPayload: {} }]
- }
- await LibraryItemController.batchUpdate.bind(apiRouter)(fakeReq, fakeRes)
- expect(fakeRes.sendStatus.calledWith(403)).to.be.true
- })
-
- it('batchDelete returns 403 for a library item the user cannot access', async () => {
- const fakeRes = { sendStatus: sinon.spy() }
- const fakeReq = {
- query: {},
- user: userLimitedToLib1(),
- body: { libraryItemIds: [itemLib2Id] }
- }
- await LibraryItemController.batchDelete.bind(apiRouter)(fakeReq, fakeRes)
- expect(fakeRes.sendStatus.calledWith(403)).to.be.true
- })
- })
})
diff --git a/test/server/controllers/UserController.test.js b/test/server/controllers/UserController.test.js
deleted file mode 100644
index add025d6e..000000000
--- a/test/server/controllers/UserController.test.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const { expect } = require('chai')
-const sinon = require('sinon')
-
-const UserController = require('../../../server/controllers/UserController')
-const Logger = require('../../../server/Logger')
-
-describe('UserController - delete', () => {
- beforeEach(() => {
- sinon.stub(Logger, 'error')
- })
-
- afterEach(() => {
- sinon.restore()
- })
-
- it('rejects deleting the root user by UUID', async () => {
- const rootUser = { id: 'root-uuid', isRoot: true, username: 'root' }
- const adminUser = { id: 'admin-uuid', isRoot: false, username: 'admin' }
- const fakeRes = { sendStatus: sinon.spy(), json: sinon.spy() }
-
- await UserController.delete({ user: adminUser, reqUser: rootUser, params: { id: rootUser.id } }, fakeRes)
-
- expect(fakeRes.sendStatus.calledWith(403)).to.be.true
- expect(fakeRes.json.called).to.be.false
- })
-})
diff --git a/test/server/finders/BookFinder.test.js b/test/server/finders/BookFinder.test.js
index cb697b81a..6578ca82a 100644
--- a/test/server/finders/BookFinder.test.js
+++ b/test/server/finders/BookFinder.test.js
@@ -35,10 +35,7 @@ describe('TitleCandidates', () => {
['adds candidate, removing author', `anna karenina by ${cleanAuthor}`, ['anna karenina']],
['does not add empty candidate after removing author', cleanAuthor, []],
['adds candidate, removing subtitle', 'anna karenina: subtitle', ['anna karenina']],
- ['adds candidate, not stripping subtitle for bare colon in title', '10:04', ['10:04']],
- ['adds candidate, not stripping subtitle for colon between words without space', 'making the mission:impossible movies', ['making the mission:impossible movies']],
['adds candidate + variant, removing "by ..."', 'anna karenina by arnold schwarzenegger', ['anna karenina', 'anna karenina by arnold schwarzenegger']],
- ['adds candidate + variant, removing "by ..." when title has bare colon', '10:04 by ben lerner', ['10:04', '10:04 by ben lerner']],
['adds candidate + variant, removing bitrate', 'anna karenina 64kbps', ['anna karenina', 'anna karenina 64kbps']],
['adds candidate + variant, removing edition 1', 'anna karenina 2nd edition', ['anna karenina', 'anna karenina 2nd edition']],
['adds candidate + variant, removing edition 2', 'anna karenina 4th ed.', ['anna karenina', 'anna karenina 4th ed.']],
diff --git a/test/server/managers/ApiCacheManager.test.js b/test/server/managers/ApiCacheManager.test.js
index 2e9ad5b77..19bbeecf6 100644
--- a/test/server/managers/ApiCacheManager.test.js
+++ b/test/server/managers/ApiCacheManager.test.js
@@ -1,7 +1,6 @@
// Import dependencies and modules for testing
const { expect } = require('chai')
const sinon = require('sinon')
-const { LRUCache } = require('lru-cache')
const ApiCacheManager = require('../../../server/managers/ApiCacheManager')
describe('ApiCacheManager', () => {
@@ -95,17 +94,4 @@ describe('ApiCacheManager', () => {
expect(res.originalSend.calledWith(body)).to.be.true
})
})
-
- describe('clear on mediaProgress', () => {
- it('should remove recent-episodes cache entries', () => {
- const key = JSON.stringify({ user: 'u', url: '/libraries/abc-123/recent-episodes?limit=50&page=0' })
- const cache = new LRUCache({ max: 10 })
- cache.set(key, { body: '[]', headers: {}, statusCode: 200 })
- const manager = new ApiCacheManager(cache)
-
- manager.clear({ name: 'mediaProgress' }, 'afterUpdate')
-
- expect(cache.get(key)).to.be.undefined
- })
- })
})
diff --git a/test/server/models/oldJsonSerialization.test.js b/test/server/models/oldJsonSerialization.test.js
deleted file mode 100644
index 98bab6afa..000000000
--- a/test/server/models/oldJsonSerialization.test.js
+++ /dev/null
@@ -1,158 +0,0 @@
-const { expect } = require('chai')
-const { Sequelize } = require('sequelize')
-
-const Database = require('../../../server/Database')
-
-/**
- * Assert that `expanded` contains every key from `minified` with matching values.
- * Used to enforce the contract: toOldJSONExpanded() is a strict superset of toOldJSONMinified().
- *
- * @param {object} minified
- * @param {object} expanded
- * @param {string} [path]
- */
-function assertExpandedSuperset(minified, expanded, path = '') {
- for (const key of Object.keys(minified)) {
- const keyPath = path ? `${path}.${key}` : key
- expect(expanded, `missing key ${keyPath}`).to.have.property(key)
-
- const minifiedValue = minified[key]
- const expandedValue = expanded[key]
-
- if (minifiedValue !== null && typeof minifiedValue === 'object' && !Array.isArray(minifiedValue)) {
- assertExpandedSuperset(minifiedValue, expandedValue, keyPath)
- } else if (Array.isArray(minifiedValue)) {
- expect(expandedValue, `expected array at ${keyPath}`).to.be.an('array')
- expect(expandedValue).to.deep.equal(minifiedValue)
- } else {
- expect(expandedValue, `value mismatch at ${keyPath}`).to.equal(minifiedValue)
- }
- }
-}
-
-describe('old JSON serialization', () => {
- let bookLibraryItemId
- let podcastLibraryItemId
-
- beforeEach(async () => {
- global.ServerSettings = {}
- Database.sequelize = new Sequelize({ dialect: 'sqlite', storage: ':memory:', logging: false })
- Database.sequelize.uppercaseFirst = (str) => (str ? `${str[0].toUpperCase()}${str.substr(1)}` : '')
- await Database.buildModels()
-
- const bookLibrary = await Database.libraryModel.create({ name: 'Book Library', mediaType: 'book' })
- const bookLibraryFolder = await Database.libraryFolderModel.create({ path: '/books', libraryId: bookLibrary.id })
-
- const book = await Database.bookModel.create({
- title: 'Test Book',
- audioFiles: [{ index: 1, ino: '1', metadata: { filename: 'track.mp3', ext: '.mp3', path: '/track.mp3', relPath: 'track.mp3', size: 1000 } }],
- tags: ['fiction'],
- narrators: ['Narrator One'],
- genres: ['Fantasy'],
- chapters: [{ id: 0, start: 0, end: 100, title: 'Chapter 1' }],
- ebookFile: { ino: '2', metadata: { filename: 'book.epub', ext: '.epub', path: '/book.epub', relPath: 'book.epub', size: 500 }, ebookFormat: 'epub' }
- })
- const bookLibraryItem = await Database.libraryItemModel.create({
- libraryFiles: [{ ino: '1', metadata: { filename: 'track.mp3', ext: '.mp3', path: '/track.mp3', relPath: 'track.mp3' } }],
- mediaId: book.id,
- mediaType: 'book',
- libraryId: bookLibrary.id,
- libraryFolderId: bookLibraryFolder.id
- })
- bookLibraryItemId = bookLibraryItem.id
-
- const author = await Database.authorModel.create({ name: 'Test Author', libraryId: bookLibrary.id })
- await Database.bookAuthorModel.create({ bookId: book.id, authorId: author.id })
-
- const series = await Database.seriesModel.create({ name: 'Test Series', libraryId: bookLibrary.id })
- await Database.bookSeriesModel.create({ bookId: book.id, seriesId: series.id, sequence: '2' })
-
- const podcastLibrary = await Database.libraryModel.create({ name: 'Podcast Library', mediaType: 'podcast' })
- const podcastLibraryFolder = await Database.libraryFolderModel.create({ path: '/podcasts', libraryId: podcastLibrary.id })
-
- const podcast = await Database.podcastModel.create({
- title: 'Test Podcast',
- tags: ['news'],
- genres: ['Technology'],
- autoDownloadEpisodes: false
- })
- const podcastLibraryItem = await Database.libraryItemModel.create({
- libraryFiles: [],
- mediaId: podcast.id,
- mediaType: 'podcast',
- libraryId: podcastLibrary.id,
- libraryFolderId: podcastLibraryFolder.id
- })
- podcastLibraryItemId = podcastLibraryItem.id
-
- await Database.podcastEpisodeModel.create({
- podcastId: podcast.id,
- title: 'Episode 1',
- index: 1,
- audioFile: { ino: '3', metadata: { filename: 'ep1.mp3', ext: '.mp3', path: '/ep1.mp3', relPath: 'ep1.mp3' } }
- })
- })
-
- afterEach(async () => {
- await Database.sequelize.sync({ force: true })
- })
-
- describe('Book', () => {
- it('toOldJSONExpanded is a strict superset of toOldJSONMinified', async () => {
- const libraryItem = await Database.libraryItemModel.getExpandedById(bookLibraryItemId)
- const minified = libraryItem.media.toOldJSONMinified()
- const expanded = libraryItem.media.toOldJSONExpanded(libraryItem.id)
-
- assertExpandedSuperset(minified, expanded)
-
- expect(expanded).to.have.property('libraryItemId', libraryItem.id)
- expect(expanded).to.have.property('audioFiles')
- expect(expanded).to.have.property('chapters')
- expect(expanded).to.have.property('tracks')
- expect(expanded.numTracks).to.equal(expanded.tracks.length)
- expect(expanded.numAudioFiles).to.equal(expanded.audioFiles.length)
- expect(expanded.numChapters).to.equal(expanded.chapters.length)
- expect(expanded.ebookFormat).to.equal('epub')
- })
- })
-
- describe('Podcast', () => {
- it('toOldJSONExpanded is a strict superset of toOldJSONMinified', async () => {
- const libraryItem = await Database.libraryItemModel.getExpandedById(podcastLibraryItemId)
- const minified = libraryItem.media.toOldJSONMinified()
- const expanded = libraryItem.media.toOldJSONExpanded(libraryItem.id)
-
- assertExpandedSuperset(minified, expanded)
-
- expect(expanded).to.have.property('libraryItemId', libraryItem.id)
- expect(expanded).to.have.property('episodes')
- expect(expanded.numEpisodes).to.equal(expanded.episodes.length)
- })
- })
-
- describe('LibraryItem', () => {
- it('book library item expanded is a strict superset of minified', async () => {
- const libraryItem = await Database.libraryItemModel.getExpandedById(bookLibraryItemId)
- const minified = libraryItem.toOldJSONMinified()
- const expanded = libraryItem.toOldJSONExpanded()
-
- assertExpandedSuperset(minified, expanded)
-
- expect(expanded).to.have.property('libraryFiles')
- expect(expanded).to.have.property('lastScan')
- expect(expanded.numFiles).to.equal(expanded.libraryFiles.length)
- expect(expanded.media.numTracks).to.equal(expanded.media.tracks.length)
- })
-
- it('podcast library item expanded is a strict superset of minified', async () => {
- const libraryItem = await Database.libraryItemModel.getExpandedById(podcastLibraryItemId)
- const minified = libraryItem.toOldJSONMinified()
- const expanded = libraryItem.toOldJSONExpanded()
-
- assertExpandedSuperset(minified, expanded)
-
- expect(expanded).to.have.property('libraryFiles')
- expect(expanded.media.numEpisodes).to.equal(expanded.media.episodes.length)
- })
- })
-})
diff --git a/test/server/utils/parsers/parseNfoMetadata.test.js b/test/server/utils/parsers/parseNfoMetadata.test.js
index ba11ddff2..9ff51fbe5 100644
--- a/test/server/utils/parsers/parseNfoMetadata.test.js
+++ b/test/server/utils/parsers/parseNfoMetadata.test.js
@@ -21,20 +21,6 @@ describe('parseNfoMetadata', () => {
expect(result.subtitle).to.equal('A Novel')
})
- it('does not split title on bare colon without space', () => {
- const nfoText = 'Title: 10:04'
- const result = parseNfoMetadata(nfoText)
- expect(result.title).to.equal('10:04')
- expect(result.subtitle).to.be.undefined
- })
-
- it('does not split title on colon between words without space', () => {
- const nfoText = 'Title: Making the Mission:Impossible Movies'
- const result = parseNfoMetadata(nfoText)
- expect(result.title).to.equal('Making the Mission:Impossible Movies')
- expect(result.subtitle).to.be.undefined
- })
-
it('parses authors', () => {
const nfoText = 'Author: F. Scott Fitzgerald'
const result = parseNfoMetadata(nfoText)
diff --git a/test/server/utils/requestUtils.test.js b/test/server/utils/requestUtils.test.js
deleted file mode 100644
index 589c6f1cd..000000000
--- a/test/server/utils/requestUtils.test.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const { expect } = require('chai')
-
-const { isRequestSecure, getRequestProtocol, getRequestOrigin } = require('../../../server/utils/requestUtils')
-
-function mockReq({ secure = false, host = 'books.example.com', xForwardedProto = null } = {}) {
- return {
- secure,
- get(header) {
- if (header === 'host') return host
- if (header === 'x-forwarded-proto') return xForwardedProto
- return null
- }
- }
-}
-
-describe('requestUtils', () => {
- it('isRequestSecure uses req.secure', () => {
- expect(isRequestSecure(mockReq({ secure: true }))).to.equal(true)
- expect(isRequestSecure(mockReq({ secure: false }))).to.equal(false)
- })
-
- it('isRequestSecure uses x-forwarded-proto', () => {
- expect(isRequestSecure(mockReq({ xForwardedProto: 'https' }))).to.equal(true)
- expect(isRequestSecure(mockReq({ xForwardedProto: 'http' }))).to.equal(false)
- expect(isRequestSecure(mockReq({ xForwardedProto: 'http, https' }))).to.equal(true)
- })
-
- it('getRequestProtocol returns https or http', () => {
- expect(getRequestProtocol(mockReq({ secure: true }))).to.equal('https')
- expect(getRequestProtocol(mockReq())).to.equal('http')
- })
-
- it('getRequestOrigin builds origin from protocol and host', () => {
- expect(getRequestOrigin(mockReq({ secure: true }))).to.deep.equal({
- protocol: 'https',
- host: 'books.example.com',
- origin: 'https://books.example.com'
- })
- })
-})
|