🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
fix(player): fix play next after transcoding changes
Deluana0fe72809869
diff --git a/ui/package-lock.json b/ui/package-lock.jsonindex 04d6fe07c..7d1131005 100644--- a/ui/package-lock.json+++ b/ui/package-lock.json@@ -23,7 +23,7 @@"inflection": "^3.0.2","jwt-decode": "^4.0.0","lodash.throttle": "^4.1.1",- "navidrome-music-player": "4.25.1",+ "navidrome-music-player": "4.25.2","prop-types": "^15.8.1","ra-data-json-server": "^3.19.12","ra-i18n-polyglot": "^3.19.12",@@ -73,6 +73,106 @@"vitest": "^4.0.3"}},+ "../../react-music-player": {+ "name": "navidrome-music-player",+ "version": "4.25.2",+ "license": "MIT",+ "dependencies": {+ "@react-icons/all-files": "^4.1.0",+ "classnames": "^2.3.1",+ "downloadjs": "^1.4.7",+ "is-mobile": "^2.2.2",+ "prop-types": "^15.7.2",+ "rc-slider": "^9.7.2",+ "rc-switch": "^3.2.2",+ "react-draggable": "^4.4.3",+ "sortablejs": "^1.13.0"+ },+ "devDependencies": {+ "@babel/cli": "7.13.16",+ "@babel/core": "7.14.0",+ "@babel/plugin-proposal-class-properties": "7.13.0",+ "@babel/plugin-proposal-object-rest-spread": "7.13.8",+ "@babel/plugin-syntax-dynamic-import": "7.8.3",+ "@babel/plugin-syntax-object-rest-spread": "7.8.3",+ "@babel/plugin-transform-object-assign": "7.12.13",+ "@babel/plugin-transform-runtime": "^7.13.15",+ "@babel/preset-env": "7.14.1",+ "@babel/preset-react": "^7.13.13",+ "@babel/runtime": "7.14.0",+ "@commitlint/config-conventional": "^12.1.1",+ "@semantic-release/changelog": "^5.0.1",+ "@semantic-release/git": "^9.0.0",+ "@types/jest": "^26.0.23",+ "@types/sortablejs": "^1.10.6",+ "autoprefixer": "^10.2.5",+ "babel-core": "^7.0.0-bridge.0",+ "babel-eslint": "^10.1.0",+ "babel-jest": "^26.6.3",+ "babel-loader": "^8.2.2",+ "babel-plugin-import": "^1.13.3",+ "babel-plugin-transform-runtime": "^6.23.0",+ "bundlesize": "^0.18.1",+ "clean-webpack-plugin": "^3.0.0",+ "codecov": "^3.8.2",+ "commitizen": "^4.2.4",+ "commitlint": "^12.1.1",+ "copy-webpack-plugin": "latest",+ "coveralls": "^3.1.0",+ "cross-env": "^7.0.3",+ "css-loader": "^5.2.4",+ "css-minimizer-webpack-plugin": "^2.0.0",+ "enzyme": "^3.11.0",+ "enzyme-adapter-react-16": "^1.15.6",+ "enzyme-to-json": "^3.6.2",+ "esbuild-webpack-plugin": "^1.1.0",+ "eslint": "^7.26.0",+ "eslint-config-airbnb": "^18.2.1",+ "eslint-config-prettier": "^8.3.0",+ "eslint-plugin-babel": "^5.3.1",+ "eslint-plugin-import": "^2.22.1",+ "eslint-plugin-jest": "^24.3.6",+ "eslint-plugin-jsx-a11y": "^6.4.1",+ "eslint-plugin-prettier": "^3.4.0",+ "eslint-plugin-react": "^7.23.2",+ "file-loader": "^6.2.0",+ "html-loader": "^2.1.2",+ "html-webpack-plugin": "^5.3.1",+ "husky": "^6.0.0",+ "jest": "^26.6.3",+ "jest-environment-jsdom": "^26.6.2",+ "jsdom": "^16.5.3",+ "less": "^4.1.1",+ "less-loader": "^8.1.1",+ "lint-staged": "^11.0.0",+ "mini-css-extract-plugin": "^1.6.0",+ "postcss": "^8.2.14",+ "postcss-loader": "^5.2.0",+ "power-assert": "^1.6.1",+ "pre-commit": "^1.2.2",+ "prettier": "^2.2.1",+ "pretty-quick": "^3.1.0",+ "react": "16.13.1",+ "react-dom": "16.13.1",+ "react-hot-loader": "^4.13.0",+ "react-loader": "^2.4.7",+ "rimraf": "^3.0.2",+ "semantic-release": "^17.4.2",+ "style-loader": "~2.0.0",+ "stylelint": "^13.13.1",+ "stylelint-config-prettier": "^8.0.2",+ "stylelint-config-standard": "^22.0.0",+ "uglifyjs-webpack-plugin": "^2.2.0",+ "webpack": "^5.36.2",+ "webpack-bundle-analyzer": "^4.4.1",+ "webpack-cli": "^4.7.0",+ "webpack-dev-server": "3.11.2"+ },+ "peerDependencies": {+ "react": ">=16.9.0",+ "react-dom": ">=16.9.0"+ }+ },"node_modules/@adobe/css-tools": {"version": "4.4.4","resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.4.tgz",@@ -129,6 +229,7 @@"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.6.tgz","integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==","license": "MIT",+ "peer": true,"dependencies": {"@babel/code-frame": "^7.28.6","@babel/generator": "^7.28.6",@@ -1743,6 +1844,7 @@}],"license": "MIT",+ "peer": true,"engines": {"node": ">=18"},@@ -1766,6 +1868,7 @@}],"license": "MIT",+ "peer": true,"engines": {"node": ">=18"}@@ -2573,6 +2676,7 @@"resolved": "https://registry.npmjs.org/@jsonforms/core/-/core-2.5.2.tgz","integrity": "sha512-tl64cLC2dUrGvu2nTHRDEA5Yv3RfwzMCIlVaoSUSq44LakKLGJdkPl8j/fb07llpFqz0a7gEAmy/8gLdmwgaLQ==","license": "MIT",+ "peer": true,"dependencies": {"@types/json-schema": "^7.0.3","ajv": "^6.10.2",@@ -2626,6 +2730,7 @@"resolved": "https://registry.npmjs.org/@jsonforms/react/-/react-2.5.2.tgz","integrity": "sha512-kZf2fq4urIBlFTCiBX95eKg8uojkyJj7FVDtIV739aVkJjE5+ihn1+kG1qLxYSxlGC7S24i12BZJzRetSRihBQ==","license": "MIT",+ "peer": true,"dependencies": {"lodash": "^4.17.15","object-hash": "^2.0.0"@@ -2641,6 +2746,7 @@"integrity": "sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==","deprecated": "Material UI v4 doesn't receive active development since September 2021. See the guide https://mui.com/material-ui/migration/migration-v4/ to upgrade to v5.","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.4.4","@material-ui/styles": "^4.11.5",@@ -2687,6 +2793,7 @@"resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz","integrity": "sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.4.4"},@@ -2982,15 +3089,6 @@"integrity": "sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==","license": "MIT"},- "node_modules/@react-icons/all-files": {- "version": "4.1.0",- "resolved": "https://registry.npmjs.org/@react-icons/all-files/-/all-files-4.1.0.tgz",- "integrity": "sha512-hxBI2UOuVaI3O/BhQfhtb4kcGn9ft12RWAFVMUeNjqqhLsHvFtzIkFaptBJpFDANTKoDfdVoHTKZDlwKCACbMQ==",- "license": "MIT",- "peerDependencies": {- "react": "*"- }- },"node_modules/@redux-saga/core": {"version": "1.4.2","resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.4.2.tgz",@@ -3410,6 +3508,7 @@"resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.7.tgz","integrity": "sha512-PQTyIulDkIDro8P+IHbKCsw7U2xxBYflVzW/FgWdCAePD9xGSidgA76/GeJ6lBKoblyhf9pBY763gbrN+1dI8g==","license": "MIT",+ "peer": true,"dependencies": {"hoist-non-react-statics": "^3.3.0"},@@ -3462,6 +3561,7 @@"integrity": "sha512-ne4A0IpG3+2ETuREInjPNhUGis1SFjv1d5asp8MzEAGtOZeTeHVDOYqOgqfhvseqg/iXty2hjBf1zAOb7RNiNw==","devOptional": true,"license": "MIT",+ "peer": true,"dependencies": {"undici-types": "~7.16.0"}@@ -3483,6 +3583,7 @@"resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.90.tgz","integrity": "sha512-P9beVR/x06U9rCJzSxtENnOr4BrbJ6VrsrDTc+73TtHv9XHhryXKbjGRB+6oooB2r0G/pQkD/S4dHo/7jUfwFw==","license": "MIT",+ "peer": true,"dependencies": {"@types/prop-types": "*","@types/scheduler": "^0.16",@@ -3652,6 +3753,7 @@"integrity": "sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==","dev": true,"license": "BSD-2-Clause",+ "peer": true,"dependencies": {"@typescript-eslint/scope-manager": "6.21.0","@typescript-eslint/types": "6.21.0",@@ -3983,6 +4085,7 @@"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz","integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==","license": "MIT",+ "peer": true,"bin": {"acorn": "bin/acorn"},@@ -4664,6 +4767,7 @@}],"license": "MIT",+ "peer": true,"dependencies": {"baseline-browser-mapping": "^2.9.0","caniuse-lite": "^1.0.30001759",@@ -4885,12 +4989,6 @@"node": ">= 6"}},- "node_modules/classnames": {- "version": "2.5.1",- "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",- "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",- "license": "MIT"- },"node_modules/cli-boxes": {"version": "3.0.0","resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz",@@ -5039,6 +5137,7 @@"resolved": "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.9.3.tgz","integrity": "sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ==","license": "MIT",+ "peer": true,"dependencies": {"lodash.isequalwith": "^4.4.0","prop-types": "^15.7.2"@@ -5480,12 +5579,6 @@"dev": true,"license": "MIT"},- "node_modules/dom-align": {- "version": "1.12.4",- "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz",- "integrity": "sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw==",- "license": "MIT"- },"node_modules/dom-helpers": {"version": "5.2.1","resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",@@ -5541,12 +5634,6 @@"url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/downloadjs": {- "version": "1.4.7",- "resolved": "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz",- "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==",- "license": "MIT"- },"node_modules/downshift": {"version": "3.2.7","resolved": "https://registry.npmjs.org/downshift/-/downshift-3.2.7.tgz",@@ -5926,6 +6013,7 @@"deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.","dev": true,"license": "MIT",+ "peer": true,"dependencies": {"@eslint-community/eslint-utils": "^4.2.0","@eslint-community/regexpp": "^4.6.1",@@ -6509,6 +6597,7 @@"resolved": "https://registry.npmjs.org/final-form/-/final-form-4.20.10.tgz","integrity": "sha512-TL48Pi1oNHeMOHrKv1bCJUrWZDcD3DIG6AGYVNOnyZPr7Bd/pStN0pL+lfzF5BNoj/FclaoiaLenk4XUIFVYng==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.10.0"},@@ -6525,6 +6614,7 @@"resolved": "https://registry.npmjs.org/final-form-arrays/-/final-form-arrays-3.1.0.tgz","integrity": "sha512-TWBvun+AopgBLw9zfTFHBllnKMVNEwCEyDawphPuBGGqNsuhGzhT7yewHys64KFFwzIs6KEteGLpKOwvTQEscQ==","license": "MIT",+ "peer": true,"peerDependencies": {"final-form": "^4.20.8"}@@ -6939,6 +7029,7 @@"integrity": "sha512-hM9gltmtQLfmWPqoPreUtRdP3nZCSzQEw7l/JC+up5CxquDykhYFKzIzoFFeVev3AGFEULNvsbE8fpZPgxUYEQ==","dev": true,"license": "MIT",+ "peer": true,"dependencies": {"@types/node": ">=20.0.0","@types/whatwg-mimetype": "^3.0.2",@@ -7052,6 +7143,7 @@"resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz","integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.1.2","loose-envify": "^1.2.0",@@ -7598,12 +7690,6 @@"url": "https://github.com/sponsors/ljharb"}},- "node_modules/is-mobile": {- "version": "2.2.2",- "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.2.tgz",- "integrity": "sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==",- "license": "MIT"- },"node_modules/is-module": {"version": "1.0.0","resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",@@ -8660,6 +8746,7 @@"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz","integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==","license": "MIT",+ "peer": true,"engines": {"node": "*"}@@ -8703,25 +8790,8 @@"license": "MIT"},"node_modules/navidrome-music-player": {- "version": "4.25.1",- "resolved": "https://registry.npmjs.org/navidrome-music-player/-/navidrome-music-player-4.25.1.tgz",- "integrity": "sha512-bHYr84ATUf/4+/PUoTpUSmpF4/igBx2UPhgnPqvda4FND+GJZtb1ikbMs1U+mhkNEUebe+2I29ob1zY7YZdtjg==",- "license": "MIT",- "dependencies": {- "@react-icons/all-files": "^4.1.0",- "classnames": "^2.3.1",- "downloadjs": "^1.4.7",- "is-mobile": "^2.2.2",- "prop-types": "^15.7.2",- "rc-slider": "^9.7.2",- "rc-switch": "^3.2.2",- "react-draggable": "^4.4.3",- "sortablejs": "^1.13.0"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }+ "resolved": "../../react-music-player",+ "link": true},"node_modules/node-polyglot": {"version": "2.6.0",@@ -9379,6 +9449,7 @@"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz","integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==","license": "MIT",+ "peer": true,"dependencies": {"loose-envify": "^1.4.0","object-assign": "^4.1.1",@@ -9470,6 +9541,7 @@"resolved": "https://registry.npmjs.org/ra-core/-/ra-core-3.19.12.tgz","integrity": "sha512-E0cM6OjEUtccaR+dR5mL1MLiVVYML0Yf7aPhpLEq4iue73X3+CKcLztInoBhWgeevPbFQwgAtsXhlpedeyrNNg==","license": "MIT",+ "peer": true,"dependencies": {"classnames": "~2.3.1","date-fns": "^1.29.0",@@ -9723,128 +9795,6 @@"rc": "cli.js"}},- "node_modules/rc-align": {- "version": "4.0.15",- "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz",- "integrity": "sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.10.1",- "classnames": "2.x",- "dom-align": "^1.7.0",- "rc-util": "^5.26.0",- "resize-observer-polyfill": "^1.5.1"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-motion": {- "version": "2.9.5",- "resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-2.9.5.tgz",- "integrity": "sha512-w+XTUrfh7ArbYEd2582uDrEhmBHwK1ZENJiSJVb7uRxdE7qJSYjbO2eksRXmndqyKqKoYPc9ClpPh5242mV1vA==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.11.1",- "classnames": "^2.2.1",- "rc-util": "^5.44.0"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-slider": {- "version": "9.7.5",- "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.7.5.tgz",- "integrity": "sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.10.1",- "classnames": "^2.2.5",- "rc-tooltip": "^5.0.1",- "rc-util": "^5.16.1",- "shallowequal": "^1.1.0"- },- "engines": {- "node": ">=8.x"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-switch": {- "version": "3.2.2",- "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-3.2.2.tgz",- "integrity": "sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.10.1",- "classnames": "^2.2.1",- "rc-util": "^5.0.1"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-tooltip": {- "version": "5.3.1",- "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.3.1.tgz",- "integrity": "sha512-e6H0dMD38EPaSPD2XC8dRfct27VvT2TkPdoBSuNl3RRZ5tspiY/c5xYEmGC0IrABvMBgque4Mr2SMZuliCvoiQ==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.11.2",- "classnames": "^2.3.1",- "rc-trigger": "^5.3.1"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-trigger": {- "version": "5.3.4",- "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz",- "integrity": "sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.18.3",- "classnames": "^2.2.6",- "rc-align": "^4.0.0",- "rc-motion": "^2.0.0",- "rc-util": "^5.19.2"- },- "engines": {- "node": ">=8.x"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-util": {- "version": "5.44.4",- "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.4.tgz",- "integrity": "sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==",- "license": "MIT",- "dependencies": {- "@babel/runtime": "^7.18.3",- "react-is": "^18.2.0"- },- "peerDependencies": {- "react": ">=16.9.0",- "react-dom": ">=16.9.0"- }- },- "node_modules/rc-util/node_modules/react-is": {- "version": "18.3.1",- "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",- "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",- "license": "MIT"- },"node_modules/rc/node_modules/ini": {"version": "1.3.8","resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",@@ -9865,6 +9815,7 @@"resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz","integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==","license": "MIT",+ "peer": true,"dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1"@@ -9946,6 +9897,7 @@"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz","integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==","license": "MIT",+ "peer": true,"dependencies": {"loose-envify": "^1.1.0","object-assign": "^4.1.1",@@ -9965,20 +9917,6 @@"prop-types": "^15.5.8"}},- "node_modules/react-draggable": {- "version": "4.5.0",- "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.5.0.tgz",- "integrity": "sha512-VC+HBLEZ0XJxnOxVAZsdRi8rD04Iz3SiiKOoYzamjylUcju/hP9np/aZdLHf/7WOD268WMoNJMvYfB5yAK45cw==",- "license": "MIT",- "dependencies": {- "clsx": "^2.1.1",- "prop-types": "^15.8.1"- },- "peerDependencies": {- "react": ">= 16.3.0",- "react-dom": ">= 16.3.0"- }- },"node_modules/react-dropzone": {"version": "10.2.2","resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-10.2.2.tgz",@@ -10018,6 +9956,7 @@"resolved": "https://registry.npmjs.org/react-final-form/-/react-final-form-6.5.9.tgz","integrity": "sha512-x3XYvozolECp3nIjly+4QqxdjSSWfcnpGEL5K8OBT6xmGrq5kBqbA6+/tOqoom9NwqIPPbxPNsOViFlbKgowbA==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.15.4"},@@ -10035,6 +9974,7 @@"resolved": "https://registry.npmjs.org/react-final-form-arrays/-/react-final-form-arrays-3.1.4.tgz","integrity": "sha512-siVFAolUAe29rMR6u8VwepoysUcUdh6MLV2OWnCtKpsPRUdT9VUgECjAPaVMAH2GROZNiVB9On1H9MMrm9gdpg==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.19.4"},@@ -10140,6 +10080,7 @@"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz","integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.15.4","@types/react-redux": "^7.1.20",@@ -10175,6 +10116,7 @@"resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz","integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.12.13","history": "^4.9.0",@@ -10195,6 +10137,7 @@"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz","integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.12.13","history": "^4.9.0",@@ -10376,6 +10319,7 @@"resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz","integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==","license": "MIT",+ "peer": true,"dependencies": {"@babel/runtime": "^7.9.2"}@@ -10385,6 +10329,7 @@"resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-1.4.2.tgz","integrity": "sha512-QLIn/q+7MX/B+MkGJ/K6R3//60eJ4QNy65eqPsJrfGezbxdh1Jx+37VRKE2K4PsJnNET5JufJtgWdT30WBa+6w==","license": "MIT",+ "peer": true,"dependencies": {"@redux-saga/core": "^1.4.2"}@@ -10638,6 +10583,7 @@"integrity": "sha512-oWKZLjYwTihnTeINcNenxIIDfeotkQ2GAjFJPe7aYsMONrwDwQQXcAl3Qv0qON7Hdc8RTsFomq22zotm/i6VVQ==","devOptional": true,"license": "MIT",+ "peer": true,"dependencies": {"@types/estree": "1.0.8"},@@ -10897,12 +10843,6 @@"node": ">= 0.4"}},- "node_modules/shallowequal": {- "version": "1.1.0",- "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",- "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",- "license": "MIT"- },"node_modules/shebang-command": {"version": "2.0.0","resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",@@ -11025,12 +10965,6 @@"integrity": "sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==","license": "MIT"},- "node_modules/sortablejs": {- "version": "1.15.6",- "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.6.tgz",- "integrity": "sha512-aNfiuwMEpfBM/CN6LY0ibyhxPfPbyFeBTYJKCvzkJ2GkUpazIt3H+QIPAMHwqQ7tMKaHz1Qj+rJJCqljnf4p3A==",- "license": "MIT"- },"node_modules/source-map": {"version": "0.8.0-beta.0","resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",@@ -11598,6 +11532,7 @@"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==","dev": true,"license": "MIT",+ "peer": true,"engines": {"node": ">=12"},@@ -11819,6 +11754,7 @@"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==","dev": true,"license": "Apache-2.0",+ "peer": true,"bin": {"tsc": "bin/tsc","tsserver": "bin/tsserver"@@ -12063,6 +11999,7 @@"integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==","dev": true,"license": "MIT",+ "peer": true,"dependencies": {"esbuild": "^0.27.0","fdir": "^6.5.0",@@ -12187,6 +12124,7 @@"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==","dev": true,"license": "MIT",+ "peer": true,"engines": {"node": ">=12"},@@ -12200,6 +12138,7 @@"integrity": "sha512-FQMeF0DJdWY0iOnbv466n/0BudNdKj1l5jYgl5JVTwjSsZSlqyXFt/9+1sEyhR6CLowbZpV7O1sCHrzBhucKKg==","dev": true,"license": "MIT",+ "peer": true,"dependencies": {"@vitest/expect": "4.0.17","@vitest/mocker": "4.0.17",@@ -12716,6 +12655,7 @@"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz","integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==","license": "MIT",+ "peer": true,"dependencies": {"fast-deep-equal": "^3.1.3","fast-uri": "^3.0.1",@@ -12803,6 +12743,7 @@"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz","integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==","license": "MIT",+ "peer": true,"bin": {"rollup": "dist/bin/rollup"},diff --git a/ui/package.json b/ui/package.jsonindex 5b4deb773..d4c149b23 100644--- a/ui/package.json+++ b/ui/package.json@@ -32,7 +32,7 @@"inflection": "^3.0.2","jwt-decode": "^4.0.0","lodash.throttle": "^4.1.1",- "navidrome-music-player": "4.25.1",+ "navidrome-music-player": "4.25.2","prop-types": "^15.8.1","ra-data-json-server": "^3.19.12","ra-i18n-polyglot": "^3.19.12",diff --git a/ui/src/reducers/playerReducer.js b/ui/src/reducers/playerReducer.jsindex d3291633c..466a3ec87 100644--- a/ui/src/reducers/playerReducer.js+++ b/ui/src/reducers/playerReducer.js@@ -134,30 +134,24 @@ const reduceAddTracks = (state, { data }) => {}const reducePlayNext = (state, { data }) => {+ const newTracks = Object.keys(data).map((id) => mapToAudioLists(data[id]))const newQueue = []const current = state.current || {}let foundPos = false- let currentIndex = 0state.queue.forEach((item) => {newQueue.push(item)if (item.uuid === current.uuid) {foundPos = true- currentIndex = newQueue.length - 1- Object.keys(data).forEach((id) => {- newQueue.push(mapToAudioLists(data[id]))- })+ newQueue.push(...newTracks)}})if (!foundPos) {- Object.keys(data).forEach((id) => {- newQueue.push(mapToAudioLists(data[id]))- })+ newQueue.push(...newTracks)}return {...state,queue: newQueue,- playIndex: foundPos ? currentIndex : undefined,clear: true,}}@@ -170,14 +164,18 @@ const reduceSetVolume = (state, { data: { volume } }) => {}const reduceSyncQueue = (state, { data: { audioInfo, audioLists } }) => {+ // Only keep clear and playIndex alive when there is an actual pending+ // track switch (playIndex differs from savedPlayIndex). This lets+ // PLAYER_PLAY_TRACKS selections survive the sync, while allowing+ // PLAYER_PLAY_NEXT (which sets playIndex to the current track) to+ // reset immediately and avoid restarting playback.+ const hasPendingSwitch =+ state.playIndex != null && state.playIndex !== state.savedPlayIndexreturn {...state,queue: audioLists,- // Keep clear and playIndex alive so the music player can still- // pick up a pending track selection set by PLAYER_PLAY_TRACKS.- // They will be consumed by the next PLAYER_CURRENT dispatch.- clear: state.playIndex != null ? state.clear : false,- playIndex: state.playIndex != null ? state.playIndex : undefined,+ clear: hasPendingSwitch ? state.clear : false,+ playIndex: hasPendingSwitch ? state.playIndex : undefined,}}