fix(collections): find manual collections across libraries on Jellyfin/Emby (#3026)#3042
Merged
Merged
Conversation
3674669 to
dd27f4f
Compare
…n/Emby (#3026) Jellyfin/Emby BoxSets are server-global and only reported under libraries whose content they currently hold, so a manual collection shared between a movie rule and a show rule was invisible to the show-library lookup. Add a capability-gated cross-library fallback for manual collections, and cache Emby getCollections with invalidation to mirror the Jellyfin adapter. Make Emby getCollections/getCollectionChildren user-scoped; Emby resolves BoxSet queries against a user's library view, so an unscoped read can miss or 404 and break the manual-collection bootstrap. Maintainerr only ever operates as an admin, so when no emby_user_id is configured, resolve and cache the first admin user. The user is passed via the UserId query param on the literal /Items path (not interpolated into the request path), which keeps the read user-scoped without tripping CodeQL's request-forgery sink. Add dev tooling to reproduce this end-to-end: a fake-emby mock plus MEDIA_SERVER=emby support in seed-db, and teach fake-jellyfin to model a server-global BoxSet reported under the movie library only.
dd27f4f to
39464e4
Compare
maintainerr-automation Bot
added a commit
that referenced
this pull request
Jun 4, 2026
* docs: sync v3.13.0 changelog with release notes * build(deps-dev): bump @typescript-eslint/eslint-plugin (#3032) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.60.0 to 8.60.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.1/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.60.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump axios from 1.16.1 to 1.17.0 (#3033) Bumps [axios](https://github.com/axios/axios) from 1.16.1 to 1.17.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.16.1...v1.17.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump react-hook-form from 7.76.1 to 7.77.0 (#3035) Bumps [react-hook-form](https://github.com/react-hook-form/react-hook-form) from 7.76.1 to 7.77.0. - [Release notes](https://github.com/react-hook-form/react-hook-form/releases) - [Changelog](https://github.com/react-hook-form/react-hook-form/blob/master/CHANGELOG.md) - [Commits](react-hook-form/react-hook-form@v7.76.1...v7.77.0) --- updated-dependencies: - dependency-name: react-hook-form dependency-version: 7.77.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps-dev): bump typescript-eslint from 8.60.0 to 8.60.1 (#3034) Bumps [typescript-eslint](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/typescript-eslint) from 8.60.0 to 8.60.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/typescript-eslint/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.60.1/packages/typescript-eslint) --- updated-dependencies: - dependency-name: typescript-eslint dependency-version: 8.60.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump @tanstack/react-query from 5.100.14 to 5.101.0 (#3036) Bumps [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) from 5.100.14 to 5.101.0. - [Release notes](https://github.com/TanStack/query/releases) - [Changelog](https://github.com/TanStack/query/blob/main/packages/react-query/CHANGELOG.md) - [Commits](https://github.com/TanStack/query/commits/@tanstack/react-query@5.101.0/packages/react-query) --- updated-dependencies: - dependency-name: "@tanstack/react-query" dependency-version: 5.101.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump rolldown from 1.0.3 to 1.1.0 (#3037) Bumps [rolldown](https://github.com/rolldown/rolldown/tree/HEAD/packages/rolldown) from 1.0.3 to 1.1.0. - [Release notes](https://github.com/rolldown/rolldown/releases) - [Changelog](https://github.com/rolldown/rolldown/blob/main/CHANGELOG.md) - [Commits](https://github.com/rolldown/rolldown/commits/v1.1.0/packages/rolldown) --- updated-dependencies: - dependency-name: rolldown dependency-version: 1.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump react-router-dom from 7.16.0 to 7.17.0 (#3038) Bumps [react-router-dom](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router-dom) from 7.16.0 to 7.17.0. - [Release notes](https://github.com/remix-run/react-router/releases) - [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md) - [Commits](https://github.com/remix-run/react-router/commits/react-router-dom@7.17.0/packages/react-router-dom) --- updated-dependencies: - dependency-name: react-router-dom dependency-version: 7.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump openpgp from 6.3.0 to 6.3.1 (#3039) Bumps [openpgp](https://github.com/openpgpjs/openpgpjs) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/openpgpjs/openpgpjs/releases) - [Commits](openpgpjs/openpgpjs@v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: openpgp dependency-version: 6.3.1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(collections): prune media that no longer exists on the media server (#3023) (#3040) When a collection action can't run because the item is already gone from the media server, handle it instead of failing: confirm absence with the transient-safe itemExists primitive, then drop the stale rows from the collection (and any siblings) so it stops being re-processed every run. Also promote itemExists onto the shared IMediaServerService interface as the single existence-check primitive (consumed by the collection handler, removeStaleCollectionMedia, and the overlay processor), replacing the per-overlay-provider copies and the getMetadata-falsiness staleness check that could drop live rows on a transient error. Follow-up to #3024. * feat: skip currently-playing media in the collection handler (#3027) Before the collection handler acts on eligible media, skip anything that is currently being streamed so it isn't removed out from under an active viewer. Skipped media stays eligible and is handled on the next run. - Plex: GET /status/sessions - Jellyfin/Emby: GET /Sessions (NowPlayingItem) A playing item protects its episode, season, and show, so a collection tracking any of those levels is deferred. Best-effort: the session snapshot is read once per run and an empty or failed lookup just means "handle as usual". Also consolidate the axios retry config into a shared applyHttpRetry helper, adding retry parity to the Emby and Jellyfin clients. * fix(collections): find manual collections across libraries on Jellyfin/Emby (#3026) (#3042) Jellyfin/Emby BoxSets are server-global and only reported under libraries whose content they currently hold, so a manual collection shared between a movie rule and a show rule was invisible to the show-library lookup. Add a capability-gated cross-library fallback for manual collections, and cache Emby getCollections with invalidation to mirror the Jellyfin adapter. Make Emby getCollections/getCollectionChildren user-scoped; Emby resolves BoxSet queries against a user's library view, so an unscoped read can miss or 404 and break the manual-collection bootstrap. Maintainerr only ever operates as an admin, so when no emby_user_id is configured, resolve and cache the first admin user. The user is passed via the UserId query param on the literal /Items path (not interpolated into the request path), which keeps the read user-scoped without tripping CodeQL's request-forgery sink. Add dev tooling to reproduce this end-to-end: a fake-emby mock plus MEDIA_SERVER=emby support in seed-db, and teach fake-jellyfin to model a server-global BoxSet reported under the movie library only. --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: enoch85 <mailto@danielhansson.nu> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Contributor
|
🎉 This PR is included in version 3.14.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
doonga
pushed a commit
to greyrock-labs/home-ops
that referenced
this pull request
Jun 6, 2026
… ➔ 3.14.0) (#207) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [ghcr.io/maintainerr/maintainerr](https://github.com/Maintainerr/Maintainerr) | minor | `3.13.0` → `3.14.0` | --- ### Release Notes <details> <summary>Maintainerr/Maintainerr (ghcr.io/maintainerr/maintainerr)</summary> ### [`v3.14.0`](https://github.com/Maintainerr/Maintainerr/blob/HEAD/CHANGELOG.md#3140-2026-06-05) [Compare Source](Maintainerr/Maintainerr@v3.13.0...v3.14.0) #### Highlights - Added `/api/health` endpoints with liveness and readiness checks for monitoring and integration with tools like Kubernetes and Docker Compose ([#​3029](Maintainerr/Maintainerr#3029)). - Collection handler now skips media currently being streamed to avoid disrupting active viewers ([#​3027](Maintainerr/Maintainerr#3027)). - Fixed issue where saving log settings would overwrite an active `LOG_LEVEL` environment variable override ([#​3053](Maintainerr/Maintainerr#3053)). #### Features - Added `/api/health` endpoints with liveness and readiness checks ([#​3029](Maintainerr/Maintainerr#3029)). - Collection handler now skips media currently being streamed ([#​3027](Maintainerr/Maintainerr#3027)). - Logging system now honors the `LOG_LEVEL` environment variable on startup ([#​3030](Maintainerr/Maintainerr#3030)). #### Fixes - Fixed issue where saving log settings would overwrite an active `LOG_LEVEL` environment variable override ([#​3053](Maintainerr/Maintainerr#3053)). - Validated webhook URL schemes to prevent invalid or potentially harmful requests ([#​3031](Maintainerr/Maintainerr#3031)). - Fixed issue where rule groups lost collection links and visibility on partial updates ([#​3045](Maintainerr/Maintainerr#3045), [#​3046](Maintainerr/Maintainerr#3046)). - Fixed issue with manual collections not being found across libraries on Jellyfin/Emby ([#​3026](Maintainerr/Maintainerr#3026), [#​3042](Maintainerr/Maintainerr#3042)). - Resolved issue where deleted media remained stuck in Jellyfin/Emby collections and caused repeated processing errors ([#​3023](Maintainerr/Maintainerr#3023), [#​3024](Maintainerr/Maintainerr#3024), [#​3040](Maintainerr/Maintainerr#3040)). - Fixed issue where Seerr requests for episode rules incorrectly deleted entire season requests ([#​3015](Maintainerr/Maintainerr#3015)). - Improved error notifications for collection handling failures to include the name of the failing collection ([#​3013](Maintainerr/Maintainerr#3013)). - Used Radarr bulk exclusions endpoint to avoid duplicate 400 errors when adding exclusions ([#​3012](Maintainerr/Maintainerr#3012)). #### Performance - Pruned media that no longer exists on the media server to improve collection handling efficiency ([#​3023](Maintainerr/Maintainerr#3023), [#​3040](Maintainerr/Maintainerr#3040)). #### Internal - Refreshed README with updated features, deployment examples, and credits ([#​3048](Maintainerr/Maintainerr#3048)). - Clarified that a missing `yarn` command indicates a stale `node_modules` directory. #### Dependencies - Updated 20 dependencies, including `@typescript-eslint/parser`, `react-router-dom`, `axios`, and `vite`. #### New Contributors - [@​Arvuno](https://github.com/Arvuno) made their first contribution in [#​3029](Maintainerr/Maintainerr#3029) </details> --- ### Configuration 📅 **Schedule**: (in timezone America/New_York) - Branch creation - At any time (no schedule defined) - Automerge - At any time (no schedule defined) 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4yMDYuMCIsInVwZGF0ZWRJblZlciI6IjQzLjIwNi4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJyZW5vdmF0ZS9jb250YWluZXIiLCJ0eXBlL21pbm9yIl19--> Reviewed-on: https://git.greyrock.io/greyrock-labs/home-ops/pulls/207
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #3026.
Custom (manual) collections shared between a movie rule and a show rule failed to resolve on Emby/Jellyfin. BoxSets are server-global and only reported under the libraries whose content they currently hold, so a show rule couldn't find a BoxSet that (so far) holds only movies — while the movie rule found it fine.
Fix
CROSS_LIBRARY_COLLECTIONScapability (Jellyfin/Emby; not Plex). For manual collections, when the own-library lookup misses, fall back to the other movie/show libraries (getLibraries()already returns only movie/show; the movie↔show crossover is intentional since one BoxSet spans both). Primary and fallback share the singlematchCollectionInLibraryhelper.getCollections/getCollectionChildrenuser-scoped — Emby resolves BoxSet queries against a user's library view, so an unscoped read can miss or 404 and break the manual-collection bootstrap. The user is passed via theUserIdquery param on the literal/Itemspath (not interpolated into the request path, so no request-forgery sink). Whenemby_user_idis unset, resolve and cache the first admin user (Maintainerr only ever operates as an admin).getCollectionsper library (skip-empty) with create/update/delete invalidation, mirroring the Jellyfin adapter, so the fallback stays cheap.collection-worker.server.spec.ts(handleMediareturnsHandleMediaResult).Dev tooling
tools/dev/fake-emby.mjsmock +MEDIA_SERVER=embysupport inseed-db.mjs, andfake-jellyfinnow models a server-global BoxSet reported under the movie library only — so this cross-library bug reproduces end-to-end against both adapters.