This commit is contained in:
Finn Dittmar 2025-12-17 21:56:26 +01:00 committed by GitHub
commit 387f14e93c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 144 additions and 4 deletions

View file

@ -38,6 +38,7 @@ const CronManager = require('./managers/CronManager')
const ApiCacheManager = require('./managers/ApiCacheManager')
const BinaryManager = require('./managers/BinaryManager')
const ShareManager = require('./managers/ShareManager')
const LastSeenManager = require('./managers/LastSeenManager')
const LibraryScanner = require('./scanner/LibraryScanner')
//Import the main Passport and Express-Session library
@ -108,6 +109,7 @@ class Server {
this.cronManager = new CronManager(this.podcastManager, this.playbackSessionManager)
this.apiCacheManager = new ApiCacheManager()
this.binaryManager = new BinaryManager()
this.lastSeenManager = new LastSeenManager()
// Routers
this.apiRouter = new ApiRouter(this)
@ -131,6 +133,20 @@ class Server {
this.auth.isAuthenticated(req, res, next)
}
/**
* Middleware to track user activity for lastSeen updates
*
* @param {import('express').Request} req
* @param {import('express').Response} res
* @param {import('express').NextFunction} next
*/
lastSeenMiddleware(req, res, next) {
if (req.user && req.user.id) {
this.lastSeenManager.addActiveUser(req.user.id)
}
next()
}
cancelLibraryScan(libraryId) {
LibraryScanner.setCancelLibraryScan(libraryId)
}
@ -172,6 +188,7 @@ class Server {
const libraries = await Database.libraryModel.getAllWithFolders()
await this.cronManager.init(libraries)
this.apiCacheManager.init()
this.lastSeenManager.init()
if (Database.serverSettings.scannerDisableWatcher) {
Logger.info(`[Server] Watcher is disabled`)
@ -315,7 +332,7 @@ class Server {
// Skip JSON parsing for internal-api routes
router.use(/^(?!\/internal-api).*/, express.json({ limit: '10mb' }))
router.use('/api', this.auth.ifAuthNeeded(this.authMiddleware.bind(this)), this.apiRouter.router)
router.use('/api', this.auth.ifAuthNeeded(this.authMiddleware.bind(this)), this.lastSeenMiddleware.bind(this), this.apiRouter.router)
router.use('/hls', this.hlsRouter.router)
router.use('/public', this.publicRouter.router)
@ -503,6 +520,13 @@ class Server {
*/
async stop() {
Logger.info('=== Stopping Server ===')
// Cleanup LastSeenManager first to flush any pending updates
if (this.lastSeenManager) {
await this.lastSeenManager.cleanup()
Logger.info('[Server] LastSeenManager Cleaned Up')
}
Watcher.close()
Logger.info('[Server] Watcher Closed')
await SocketAuthority.close()