From ed378de511cd09dd3c4491d327af1f6911d1a018 Mon Sep 17 00:00:00 2001 From: nklhrstv Date: Wed, 27 May 2020 18:13:31 +0300 Subject: [PATCH] core-web updated --- .npmrc | 1 - package.json | 4 ++-- src/routes/Player/Player.js | 16 ++++++++-------- .../Player/Video/selectVideoImplementation.js | 2 +- yarn.lock | 17 ++++++++++++----- 5 files changed, 23 insertions(+), 17 deletions(-) delete mode 100644 .npmrc diff --git a/.npmrc b/.npmrc deleted file mode 100644 index ab890481c..000000000 --- a/.npmrc +++ /dev/null @@ -1 +0,0 @@ -@stremio:registry=https://npm.pkg.github.com diff --git a/package.json b/package.json index bc117cfc9..997c3c9cb 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@sentry/browser": "5.11.1", - "@stremio/stremio-core-web": "0.12.0", + "@stremio/stremio-core-web": "0.16.0", "a-color-picker": "1.2.1", "classnames": "2.2.6", "events": "1.1.1", @@ -67,4 +67,4 @@ "webpack-cli": "3.3.11", "webpack-dev-server": "3.10.3" } -} \ No newline at end of file +} diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js index 95c695a63..f6cee3448 100644 --- a/src/routes/Player/Player.js +++ b/src/routes/Player/Player.js @@ -27,7 +27,7 @@ const Player = ({ urlParams }) => { const toast = useToast(); const [, , , toggleFullscreen] = useFullscreen(); const [casting, setCasting] = React.useState(() => { - return chromecast.active && chromecast.transport.getSessionState() === cast.framework.SessionState.SESSION_STARTED; + return chromecast.active && chromecast.transport.getCastState() === cast.framework.CastState.CONNECTED; }); const [immersed, setImmersed] = React.useState(true); const setImmersedDebounced = React.useCallback(debounce(setImmersed, 3000), []); @@ -265,16 +265,16 @@ const Player = ({ urlParams }) => { }; }, []); React.useEffect(() => { - const onSessionStateChange = () => { - setCasting(chromecast.active && chromecast.transport.getSessionState() === cast.framework.SessionState.SESSION_STARTED); + const onCastStateChange = () => { + setCasting(chromecast.active && chromecast.transport.getCastState() === cast.framework.CastState.CONNECTED); }; const onChromecastStateChange = () => { if (chromecast.active) { chromecast.transport.on( - cast.framework.CastContextEventType.SESSION_STATE_CHANGED, - onSessionStateChange + cast.framework.CastContextEventType.CAST_STATE_CHANGED, + onCastStateChange ); - onSessionStateChange(); + onCastStateChange(); } }; chromecast.on('stateChanged', onChromecastStateChange); @@ -283,8 +283,8 @@ const Player = ({ urlParams }) => { chromecast.off('stateChanged', onChromecastStateChange); if (chromecast.active) { chromecast.transport.off( - cast.framework.CastContextEventType.SESSION_STATE_CHANGED, - onSessionStateChange + cast.framework.CastContextEventType.CAST_STATE_CHANGED, + onCastStateChange ); } }; diff --git a/src/routes/Player/Video/selectVideoImplementation.js b/src/routes/Player/Video/selectVideoImplementation.js index 98c0e2aba..5a6c5f888 100644 --- a/src/routes/Player/Video/selectVideoImplementation.js +++ b/src/routes/Player/Video/selectVideoImplementation.js @@ -7,7 +7,7 @@ const selectVideoImplementation = (args) => { // TODO handle IFrameVideo // TODO handle MPVVideo - if (args.chromecastTransport && args.chromecastTransport.getSessionState() === cast.framework.SessionState.SESSION_STARTED) { + if (args.chromecastTransport && args.chromecastTransport.getCastState() === cast.framework.CastState.CONNECTED) { return ChromecastVideo; } diff --git a/yarn.lock b/yarn.lock index 4a3afb9e3..785f853ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -998,6 +998,13 @@ core-js-pure "^3.0.0" regenerator-runtime "^0.13.4" +"@babel/runtime@7.10.0": + version "7.10.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.0.tgz#2cdcd6d7a391c24f7154235134c830cfb58ac0b1" + integrity sha512-tgYb3zVApHbLHYOPWtVwg25sBqHhfBXRKeKoTIyoheIxln1nA7oBl7SfHfiTG2GhDPI8EUBkOD/0wJCP/3HN4Q== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@7.8.7": version "7.8.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d" @@ -1782,12 +1789,12 @@ telejson "^3.0.2" util-deprecate "^1.0.2" -"@stremio/stremio-core-web@0.12.0": - version "0.12.0" - resolved "https://npm.pkg.github.com/download/@stremio/stremio-core-web/0.12.0/e498bcdf44176c46602f06a97cfb76c2e05ac15bd9f42058f10fab17fe8399da#fa8051f5d34115fba6e63635480da6542b890eb3" - integrity sha512-7cgrZs59mCmiEbCAlbXdGUDp0zp2ErpPzA8wVk1surWElipShpc0eZqMeeaD2o4bBUl5P9UwHv5HWEVm9+03jA== +"@stremio/stremio-core-web@0.16.0": + version "0.16.0" + resolved "https://registry.yarnpkg.com/@stremio/stremio-core-web/-/stremio-core-web-0.16.0.tgz#ae60ea017a48616db9b91ca9057d6df594fbe2e5" + integrity sha512-1DkiHMI47xolPta+SzN60vgvqBxF+73JU7H4yUoKV50H+opQ6lF5/Xb0E7+KmG/ZHERgaZX4YMafzCuf/6g3WQ== dependencies: - "@babel/runtime" "7.8.7" + "@babel/runtime" "7.10.0" "@svgr/babel-plugin-add-jsx-attribute@^4.2.0": version "4.2.0"