Merge branch 'v14_ums' into main_v14

* v14_ums: (24 commits) fix HttpExchangeServletRequest Servlet implementation fix HttpExchangeServletRequest Servlet implementation fix ServerSentEvents implementation Ensure resolution is divisible by 2 after scaling (UniversalMediaServer#4507) Bump JRE from 17.0.9 to 17.0.10 (UniversalMediaServer#4509) log resource finding Bump @types/react from 18.2.55 to 18.2.59 in /react-client (UniversalMediaServer#4505) Bump @types/node from 18.19.17 to 18.19.18 in /react-client (UniversalMediaServer#4502) Bump eslint from 8.56.0 to 8.57.0 in /react-client (UniversalMediaServer#4503) Bump org.codehaus.mojo:exec-maven-plugin from 3.1.1 to 3.2.0 (UniversalMediaServer#4504) remove old paypal link remove old paypal link remove old paypal link log more on MediaScanner Bump MediaInfo to 24.01.1 and FFmpeg to 2024-02-22 (UniversalMediaServer#4500) loading overlay Bump the npm_and_yarn group across 1 directories with 1 update (UniversalMediaServer#4498) Removed broken PayPal link, replace with link to our donate page Fix Open Collective link Removed PayPal, added Open Collective Bump @testing-library/react from 14.1.2 to 14.2.1 in /react-client (UniversalMediaServer#4488) ...
ik666 · Mar 4, 2024 · 0abb97c · 0abb97c
2 parents 2b67de7 + 1179eb5
commit 0abb97c
Show file tree

Hide file tree

Showing 58 changed files with 850 additions and 695 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -2,11 +2,10 @@
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: universalmediaserver
-open_collective: # Replace with a single Open Collective username
+open_collective: universal-media-server
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KZLD5J8DS6K6W']
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -37,3 +37,6 @@ updates:
       mockito:
         patterns:
         - "mockito"
+      jupnp:
+        patterns:
+        - "org.jupnp:org.jupnp"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,22 +10,26 @@
 ### Dependencies
 - Bump `axios` from 1.6.4 to 1.6.7 ([#4349](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4349), [#4434](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4434))
 - Bump `org.apache.maven.plugins:maven-surefire-plugin` from 3.2.3 to 3.2.5 ([#4371](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4371))
-- Bump `@typescript-eslint/eslint-plugin` from 6.17.0 to 7.0.1 ([#4376](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4376), [#4391](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4391), [#4464](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4464), [#4479](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4479))
-- Bump `@typescript-eslint/parser` from 6.17.0 to 7.0.1 ([#4365](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4365), [#4419](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4419), [#4459](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4459), [#4479](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4479))
+- Bump `@typescript-eslint/eslint-plugin` from 6.17.0 to 7.0.2 ([#4376](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4376), [#4391](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4391), [#4464](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4464), [#4479](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4479), [#4495](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4495))
+- Bump `@typescript-eslint/parser` from 6.17.0 to 7.0.2 ([#4365](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4365), [#4419](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4419), [#4459](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4459), [#4479](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4479), [#4495](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4495))
 - Bump `react-router-dom` from 6.21.1 to 6.22.1 ([#4380](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4380), [#4408](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4408), [#4465](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4465), [#4485](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4485))
 - Bump `@playwright/test` from 1.40.1 to 1.41.2 ([#4397](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4397), [#4416](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4416), [#4449](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4449))
 - Bump `org.mockito:mockito-junit-jupiter` from 5.8.0 to 5.10.0 ([#4388](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4388), [#4425](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4425))
 - Bump `actions/cache` from 3 to 4 ([#4400](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4400))
-- Bump `@types/react` from 18.2.47 to 18.2.55 ([#4392](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4392), [#4468](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4468))
+- Bump `@types/react` from 18.2.47 to 18.2.59 ([#4392](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4392), [#4468](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4468), [#4505](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4505))
 - Bump `@testing-library/jest-dom` from 6.2.0 to 6.4.2 ([#4417](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4417), [#4423](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4423), [#4455](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4455))
 - Bump `org.mockito:mockito-core` from 5.8.0 to 5.10.0 ([#4426](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4426))
 - Bump `org.slf4j:slf4j-api` from 2.0.10 to 2.0.12 ([#4364](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4364), [#4450](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4450))
 - Bump `dorny/paths-filter` from 2 to 3 ([#4429](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4429))
 - Bump `web-vitals` from 3.5.1 to 3.5.2 ([#4435](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4435))
-- Bump `@types/node` from 18.19.4 to 18.19.15 ([#4462](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4462))
+- Bump `@types/node` from 18.19.4 to 18.19.18 ([#4462](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4462), [#4490](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4490), [#4502](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4502))
 - Bump `@types/jest` from 29.5.11 to 29.5.12 ([#4482](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4482))
 - Bump `logback-version` from 1.4.14 to 1.5.0 ([#4484](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4484))
 - Bump `@types/react-dom` from 18.2.18 to 18.2.19 ([#4469](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4469))
+- Bump `@testing-library/react` from 14.1.2 to 14.2.1 ([#4488](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4488))
+- Bump `ip` from 2.0.0 to 2.0.1 ([#4498](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4498))
+- Bump `org.codehaus.mojo:exec-maven-plugin` from 3.1.1 to 3.2.0 ([#4504](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4504))
+- Bump `eslint` from 8.56.0 to 8.57.0 ([#4503](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4503))
 
 ## 14.0.0 (Unreleased) - Since 14.0.0-b1
 

diff --git a/pom.xml b/pom.xml
@@ -72,9 +72,9 @@
 
 		<project.binaries-base>https://www.universalmediaserver.com/svn/binaries</project.binaries-base>
 
-		<binary-revision>184</binary-revision>
+		<binary-revision>186</binary-revision>
 
-		<exec-maven-plugin-version>3.1.1</exec-maven-plugin-version>
+		<exec-maven-plugin-version>3.2.0</exec-maven-plugin-version>
 		<maven-antrun-plugin-version>3.1.0</maven-antrun-plugin-version>
 		<git-commit-id-plugin-version>7.0.0</git-commit-id-plugin-version>
 		<maven-assembly-plugin-version>3.6.0</maven-assembly-plugin-version>

diff --git a/react-client/package.json b/react-client/package.json
@@ -57,16 +57,16 @@
   "devDependencies": {
     "@playwright/test": "^1.41.2",
     "@testing-library/jest-dom": "6.4.2",
-    "@testing-library/react": "14.1.2",
+    "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.12",
     "@types/lodash": "4.14.202",
-    "@types/node": "18.19.15",
-    "@types/react": "18.2.55",
+    "@types/node": "18.19.18",
+    "@types/react": "18.2.59",
     "@types/react-dom": "18.2.19",
-    "@typescript-eslint/eslint-plugin": "7.0.1",
-    "@typescript-eslint/parser": "7.0.1",
-    "eslint": "8.56.0",
+    "@typescript-eslint/eslint-plugin": "7.0.2",
+    "@typescript-eslint/parser": "7.0.2",
+    "eslint": "8.57.0",
     "eslint-plugin-react": "7.33.2",
     "react-scripts": "5.0.1",
     "source-map-explorer": "2.5.3"

diff --git a/react-client/src/components/Player/Player.tsx b/react-client/src/components/Player/Player.tsx
@@ -14,7 +14,7 @@
  * this program; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-import { Badge, Box, Breadcrumbs, Button, Card, Center, Grid, Group, Image, List, LoadingOverlay, MantineTheme, Menu, Paper, Rating, ScrollArea, Stack, Text, Title, Tooltip, useComputedColorScheme, useMantineColorScheme } from '@mantine/core';
+import { Badge, Box, Breadcrumbs, Button, Card, Center, Grid, Group, Image, List, LoadingOverlay, MantineTheme, Menu, Paper, Rating, ScrollArea, Stack, Text, Title, Tooltip, useComputedColorScheme } from '@mantine/core';
 import { showNotification } from '@mantine/notifications';
 import axios from 'axios';
 import { createElement, useContext, useEffect, useRef, useState } from 'react';
@@ -35,13 +35,11 @@ export const Player = () => {
   const [uuid, setUuid] = useState('');
   const [data, setData] = useState({ goal: '', folders: [], breadcrumbs: [], medias: [], useWebControl: false } as BaseBrowse);
   const [loading, setLoading] = useState(false);
-  const mainScroll = useRef<HTMLDivElement>(null);
   const i18n = useContext(I18nContext);
   const main = useContext(MainContext);
   const session = useContext(SessionContext);
   const sse = useContext(PlayerEventContext);
   const { req, id } = useParams();
-  const { colorScheme } = useMantineColorScheme();
   const [showVideoMetadataEdit, setShowVideoMetadataEdit] = useState(false);
   const computedColorScheme = useComputedColorScheme('dark', { getInitialValueInEffect: true });
 
@@ -763,10 +761,10 @@ export const Player = () => {
 
   return (!session.authenticate || havePermission(session, Permissions.web_player_browse)) ? (
     <Box>
-      <LoadingOverlay visible={loading} />
+      <LoadingOverlay visible={loading} overlayProps={{fixed: true}} />
       {getVideoMetadataEditModal()}
       {getBreadcrumbs()}
-      <ScrollArea offsetScrollbars viewportRef={mainScroll}>
+      <ScrollArea offsetScrollbars>
         {
           data.goal === 'play' ?
             <Paper>

diff --git a/react-client/src/providers/player-server-event-provider.tsx b/react-client/src/providers/player-server-event-provider.tsx
@@ -142,8 +142,7 @@ export const PlayerEventProvider = ({ children }: Props) => {
         setConnectionStatus(1);
       } else if (event.status == 401) {
         //reload Unauthorized
-        console.log('SSE Unauthorized');
-        throw new Error('SSE Unauthorized');
+        window.location.reload();
       } else if (event.status == 403) {
         //stop Forbidden
         console.log('SSE Forbidden');
@@ -211,10 +210,12 @@ export const PlayerEventProvider = ({ children }: Props) => {
     };
 
     const startSse = () => {
+      const player = sessionStorage.getItem('player');
       setConnectionStatus(0);
-      fetchEventSource(playerApiUrl + 'sse/' + sessionStorage.getItem('player'), {
+      fetchEventSource(playerApiUrl + 'sse/' + player, {
         headers: {
-          'Authorization': 'Bearer ' + getJwt()
+          'Authorization': 'Bearer ' + getJwt(),
+          'Player': player ? player : ''
         },
         async onopen(event: Response) { onOpen(event); },
         onmessage(event: EventSourceMessage) {

diff --git a/react-client/src/providers/server-event-provider.tsx b/react-client/src/providers/server-event-provider.tsx
@@ -79,8 +79,7 @@ export const ServerEventProvider = ({ children }: Props) => {
         setConnectionStatus(1);
       } else if (event.status == 401) {
         //reload Unauthorized
-        console.log('SSE Unauthorized');
-        throw new Error('SSE Unauthorized');
+        window.location.reload();
       } else if (event.status == 403) {
         //stop Forbidden
         console.log('SSE Forbidden');