diff --git a/package-lock.json b/package-lock.json index 76db0e04a..8ccf06bbd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,9 +12,9 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.47.2", + "@stremio/stremio-core-web": "0.47.7", "@stremio/stremio-icons": "5.2.0", - "@stremio/stremio-video": "0.0.38", + "@stremio/stremio-video": "0.0.44", "a-color-picker": "1.2.1", "bowser": "2.11.0", "buffer": "6.0.3", @@ -2971,9 +2971,9 @@ "license": "MIT" }, "node_modules/@stremio/stremio-core-web": { - "version": "0.47.2", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.47.2.tgz", - "integrity": "sha512-kJXkshXT5f5go137id9MHrVA7PfHao2pGSxfEBbMDGFCqAVfF4jRFTXmfLC0cS1R+EjYhajUrSsXnEddtb2c7g==", + "version": "0.47.7", + "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.47.7.tgz", + "integrity": "sha512-3hTie3Yx6198TY1rS2fdA5HKPmejqTDbE8C05+HdqM6oXor9TXVoSjY9AMPlSVUJvu40sP3oeenhe2MRBUQizw==", "dependencies": { "@babel/runtime": "7.24.1" } @@ -3000,9 +3000,9 @@ "integrity": "sha512-rABlPBTFF17QcSm/4IizVoE/jh+REt+waqA0RvIxuGjQppXlvj7CalqVvTam0CC2wgY00zNG1v/9kVHUDVzo4Q==" }, "node_modules/@stremio/stremio-video": { - "version": "0.0.38", - "resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.38.tgz", - "integrity": "sha512-ev9z3YdMcZAsTQjEwOLfqB9EI8GdbQzwSGMZIOLPR/7/Ce7BQIctwDnEtTLgPmCsRpYZsqOD1PiBwU9tiDHZ8w==", + "version": "0.0.44", + "resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.44.tgz", + "integrity": "sha512-cDwUSbNTR6VpHJiREHR/lRiIgLUO4KFKqHn1oIQeA/EF5guqL0x4omhUZq7mcEfLHwdlgDZ7vChDd4TbkJ6z+Q==", "dependencies": { "buffer": "6.0.3", "color": "4.2.3", @@ -3014,7 +3014,7 @@ "magnet-uri": "6.2.0", "url": "0.11.0", "video-name-parser": "1.4.6", - "vtt.js": "github:jaruba/vtt.js#e4f5f5603730866bacb174a93f51b734c9f29e6a" + "vtt.js": "github:jaruba/vtt.js#84d33d157848407d790d78423dacc41a096294f0" } }, "node_modules/@surma/rollup-plugin-off-main-thread": { @@ -13506,8 +13506,8 @@ }, "node_modules/vtt.js": { "version": "0.13.0", - "resolved": "git+ssh://git@github.com/jaruba/vtt.js.git#e4f5f5603730866bacb174a93f51b734c9f29e6a", - "integrity": "sha512-RXV60lPGrmjuRcV/jRuydLC2thMaMlmK4Vc3DtBmVSotFA3986sgW0H5AH9IUmHzQo4bFR2gELYLcfwVh7Dqow==", + "resolved": "git+ssh://git@github.com/jaruba/vtt.js.git#84d33d157848407d790d78423dacc41a096294f0", + "integrity": "sha512-N/WeijIW9oiGmfqWdEcNqSblzfnXR8dfsBRNPIG9YYFhIBU0Y2c7w8Sfl0bDOZVhjA5qHbwoHx6SxDgRLiraTQ==", "license": "Apache-2.0" }, "node_modules/w3c-hr-time": { diff --git a/package.json b/package.json index bf4b1bd10..8fe82ef66 100755 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.47.2", + "@stremio/stremio-core-web": "0.47.7", "@stremio/stremio-icons": "5.2.0", - "@stremio/stremio-video": "0.0.38", + "@stremio/stremio-video": "0.0.44", "a-color-picker": "1.2.1", "bowser": "2.11.0", "buffer": "6.0.3", diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js index c7d94d82c..34fc25bbe 100644 --- a/src/routes/Player/Player.js +++ b/src/routes/Player/Player.js @@ -292,6 +292,7 @@ const Player = ({ urlParams, queryParams }) => { 0, forceTranscoding: forceTranscoding || casting, maxAudioChannels: settings.surroundSound ? 32 : 2, + streamingServerSettings: streamingServer.settings.type === 'Ready' ? streamingServer.settings.content : null, streamingServerURL: streamingServer.baseUrl ? casting ? streamingServer.baseUrl diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js index 071f14d0e..3518ef471 100644 --- a/src/routes/Settings/Settings.js +++ b/src/routes/Settings/Settings.js @@ -47,6 +47,7 @@ const Settings = () => { } = useProfileSettingsInputs(profile); const { streamingServerRemoteUrlInput, + proxyStreamsCheckbox, remoteEndpointSelect, cacheSizeSelect, torrentProfileSelect, @@ -627,6 +628,21 @@ const Settings = () => { : null } + { + proxyStreamsCheckbox !== null ? +
+
+
{ t('SETTINGS_PROXY_STREAMS') }
+
+ +
+ : + null + }
{ t('SETTINGS_NAV_SHORTCUTS') }
diff --git a/src/routes/Settings/useStreamingServerSettingsInputs.js b/src/routes/Settings/useStreamingServerSettingsInputs.js index 32fb971a5..06ca18c2b 100644 --- a/src/routes/Settings/useStreamingServerSettingsInputs.js +++ b/src/routes/Settings/useStreamingServerSettingsInputs.js @@ -61,6 +61,28 @@ const useStreamingServerSettingsInputs = (streamingServer) => { value: streamingServer.remoteUrl, }), [streamingServer.remoteUrl]); + const proxyStreamsCheckbox = React.useMemo(() => { + if (streamingServer.settings?.type !== 'Ready') { + return null; + } + + return { + checked: streamingServer.settings.content.proxyStreamsEnabled, + onClick: () => { + core.transport.dispatch({ + action: 'StreamingServer', + args: { + action: 'UpdateSettings', + args: { + ...streamingServer.settings.content, + proxyStreamsEnabled: !streamingServer.settings.content.proxyStreamsEnabled + } + } + }); + } + }; + }, [streamingServer.settings]); + const remoteEndpointSelect = React.useMemo(() => { if (streamingServer.settings?.type !== 'Ready' || streamingServer.networkInfo?.type !== 'Ready') { return null; @@ -198,7 +220,7 @@ const useStreamingServerSettingsInputs = (streamingServer) => { } }; }, [streamingServer.settings, streamingServer.deviceInfo]); - return { streamingServerRemoteUrlInput, remoteEndpointSelect, cacheSizeSelect, torrentProfileSelect, transcodingProfileSelect }; + return { streamingServerRemoteUrlInput, proxyStreamsCheckbox, remoteEndpointSelect, cacheSizeSelect, torrentProfileSelect, transcodingProfileSelect }; }; module.exports = useStreamingServerSettingsInputs;