From f42faa731efc3bf3953659c2950d1a7068676851 Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Fri, 24 Nov 2023 13:27:36 +0200 Subject: [PATCH 1/6] chore: add core-web rev. Signed-off-by: Lachezar Lechev --- package-lock.json | 29 +++++++++++++++++++++++------ package.json | 2 +- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 896aa5544..24e91f138 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.28", + "@stremio/stremio-core-web": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", @@ -69,6 +69,22 @@ "workbox-webpack-plugin": "^6.5.3" } }, + "../core-web": { + "name": "@stremio/stremio-core-web", + "version": "0.44.28", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": "7.16.0" + }, + "devDependencies": { + "@babel/cli": "7.16.8", + "@babel/core": "7.16.0", + "@babel/plugin-transform-runtime": "7.16.10", + "@babel/preset-env": "7.16.0", + "babel-plugin-bundled-import-meta": "0.3.2" + } + }, "node_modules/@babel/code-frame": { "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", @@ -2705,8 +2721,9 @@ }, "node_modules/@stremio/stremio-core-web": { "version": "0.44.28", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.28.tgz", - "integrity": "sha512-7c15Nrm/2qctSfQEf/PNMG4m71JmfzPk0+YAu9Z9ye8PRC1fJeNs4c9bPg0PcI95q/fi143t9TDDJ17T9H8jFA==", + "resolved": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", + "integrity": "sha512-QDXykdRmmZzhD5IfaA5KqIW7Ads5oq4qpoUreRq/LIKkbhmg2ZdD7ZgXyRO6zQBlo3wHzwGqeZD6GnuHwPX8HA==", + "license": "MIT", "dependencies": { "@babel/runtime": "7.16.0" } @@ -16834,9 +16851,9 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "@stremio/stremio-core-web": { - "version": "0.44.28", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.28.tgz", - "integrity": "sha512-7c15Nrm/2qctSfQEf/PNMG4m71JmfzPk0+YAu9Z9ye8PRC1fJeNs4c9bPg0PcI95q/fi143t9TDDJ17T9H8jFA==", + "version": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", + "integrity": "sha512-QDXykdRmmZzhD5IfaA5KqIW7Ads5oq4qpoUreRq/LIKkbhmg2ZdD7ZgXyRO6zQBlo3wHzwGqeZD6GnuHwPX8HA==", + "from": "@stremio/stremio-core-web@git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", "requires": { "@babel/runtime": "7.16.0" } diff --git a/package.json b/package.json index 7597e4c33..55e15b77d 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.28", + "@stremio/stremio-core-web": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", From b68465cca5982d6c202eb848b51acfad175c011e Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Mon, 27 Nov 2023 15:35:24 +0200 Subject: [PATCH 2/6] feat: Player - dispatch NextVideo action to core Signed-off-by: Lachezar Lechev --- src/routes/Player/Player.js | 4 +++- src/routes/Player/usePlayer.js | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js index bad9ff602..d2179740a 100644 --- a/src/routes/Player/Player.js +++ b/src/routes/Player/Player.js @@ -33,7 +33,7 @@ const Player = ({ urlParams, queryParams }) => { queryParams.has('maxAudioChannels') ? parseInt(queryParams.get('maxAudioChannels'), 10) : null ]; }, [queryParams]); - const [player, videoParamsChanged, timeChanged, pausedChanged, ended] = usePlayer(urlParams); + const [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo] = usePlayer(urlParams); const [settings, updateSettings] = useSettings(); const streamingServer = useStreamingServer(); const routeFocused = useRouteFocused(); @@ -199,6 +199,8 @@ const Player = ({ urlParams, queryParams }) => { }, []); const onNextVideoRequested = React.useCallback(() => { if (player.nextVideo !== null) { + nextVideo(); + const deepLinks = player.nextVideo.deepLinks; if (deepLinks.metaDetailsStreams && deepLinks.player) { window.location.replace(deepLinks.metaDetailsStreams); diff --git a/src/routes/Player/usePlayer.js b/src/routes/Player/usePlayer.js index d530d78db..9bbc1673d 100644 --- a/src/routes/Player/usePlayer.js +++ b/src/routes/Player/usePlayer.js @@ -121,8 +121,16 @@ const usePlayer = (urlParams) => { } }, 'player'); }, []); + const nextVideo = React.useCallback(() => { + core.transport.dispatch({ + action: 'Player', + args: { + action: 'NextVideo' + } + }, 'player'); + }, []); const player = useModelState({ model: 'player', action, map }); - return [player, videoParamsChanged, timeChanged, pausedChanged, ended]; + return [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo]; }; module.exports = usePlayer; From a72589837789f92b3f22e276447b7465ecdb99b4 Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Mon, 27 Nov 2023 15:43:25 +0200 Subject: [PATCH 3/6] chore: revert core-web to version Signed-off-by: Lachezar Lechev --- package-lock.json | 23 ++++++++++------------- package.json | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 24e91f138..125fa55f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", + "@stremio/stremio-core-web": "0.44.28", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", @@ -72,7 +72,6 @@ "../core-web": { "name": "@stremio/stremio-core-web", "version": "0.44.28", - "extraneous": true, "license": "MIT", "dependencies": { "@babel/runtime": "7.16.0" @@ -2720,13 +2719,8 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "node_modules/@stremio/stremio-core-web": { - "version": "0.44.28", - "resolved": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", - "integrity": "sha512-QDXykdRmmZzhD5IfaA5KqIW7Ads5oq4qpoUreRq/LIKkbhmg2ZdD7ZgXyRO6zQBlo3wHzwGqeZD6GnuHwPX8HA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "7.16.0" - } + "resolved": "../core-web", + "link": true }, "node_modules/@stremio/stremio-icons": { "version": "5.0.0-beta.3", @@ -16851,11 +16845,14 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "@stremio/stremio-core-web": { - "version": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", - "integrity": "sha512-QDXykdRmmZzhD5IfaA5KqIW7Ads5oq4qpoUreRq/LIKkbhmg2ZdD7ZgXyRO6zQBlo3wHzwGqeZD6GnuHwPX8HA==", - "from": "@stremio/stremio-core-web@git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", + "version": "file:../core-web", "requires": { - "@babel/runtime": "7.16.0" + "@babel/cli": "7.16.8", + "@babel/core": "7.16.0", + "@babel/plugin-transform-runtime": "7.16.10", + "@babel/preset-env": "7.16.0", + "@babel/runtime": "7.16.0", + "babel-plugin-bundled-import-meta": "0.3.2" } }, "@stremio/stremio-icons": { diff --git a/package.json b/package.json index 55e15b77d..7597e4c33 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "git+ssh://git@github.com/Stremio/stremio-core-web.git#51e739b45338f26932c64051b33c265332fc69e8", + "@stremio/stremio-core-web": "0.44.28", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", From e7d6ba735eb9949e8005ca65e4cd2d7b80734f7d Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Fri, 1 Dec 2023 16:54:06 +0200 Subject: [PATCH 4/6] chore: bump core-web to 0.44.29 Signed-off-by: Lachezar Lechev --- package-lock.json | 30 +++++++++++++++++++++++------- package.json | 2 +- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 896aa5544..429cbd17d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.28", + "@stremio/stremio-core-web": "0.44.29", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", @@ -69,6 +69,22 @@ "workbox-webpack-plugin": "^6.5.3" } }, + "../core-web": { + "name": "@stremio/stremio-core-web", + "version": "0.44.29", + "extraneous": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": "7.16.0" + }, + "devDependencies": { + "@babel/cli": "7.16.8", + "@babel/core": "7.16.0", + "@babel/plugin-transform-runtime": "7.16.10", + "@babel/preset-env": "7.16.0", + "babel-plugin-bundled-import-meta": "0.3.2" + } + }, "node_modules/@babel/code-frame": { "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", @@ -2704,9 +2720,9 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "node_modules/@stremio/stremio-core-web": { - "version": "0.44.28", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.28.tgz", - "integrity": "sha512-7c15Nrm/2qctSfQEf/PNMG4m71JmfzPk0+YAu9Z9ye8PRC1fJeNs4c9bPg0PcI95q/fi143t9TDDJ17T9H8jFA==", + "version": "0.44.29", + "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.29.tgz", + "integrity": "sha512-F+ezw3De5yrWZ4HG9ZzFL8xbThUfJqHOLm07hAYC4M4fpycX1HnPuvE/rlzHcEeWsp0KD0JgvA68AcWq0CErHw==", "dependencies": { "@babel/runtime": "7.16.0" } @@ -16834,9 +16850,9 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "@stremio/stremio-core-web": { - "version": "0.44.28", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.28.tgz", - "integrity": "sha512-7c15Nrm/2qctSfQEf/PNMG4m71JmfzPk0+YAu9Z9ye8PRC1fJeNs4c9bPg0PcI95q/fi143t9TDDJ17T9H8jFA==", + "version": "0.44.29", + "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.29.tgz", + "integrity": "sha512-F+ezw3De5yrWZ4HG9ZzFL8xbThUfJqHOLm07hAYC4M4fpycX1HnPuvE/rlzHcEeWsp0KD0JgvA68AcWq0CErHw==", "requires": { "@babel/runtime": "7.16.0" } diff --git a/package.json b/package.json index 7597e4c33..e36980778 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.28", + "@stremio/stremio-core-web": "0.44.29", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", From a58092a06bad1815e4f02fc8a99afd1d3b99e53c Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Fri, 1 Dec 2023 18:20:51 +0200 Subject: [PATCH 5/6] fix: package-lock Signed-off-by: Lachezar Lechev --- package-lock.json | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 429cbd17d..0f9ba2d62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,22 +69,6 @@ "workbox-webpack-plugin": "^6.5.3" } }, - "../core-web": { - "name": "@stremio/stremio-core-web", - "version": "0.44.29", - "extraneous": true, - "license": "MIT", - "dependencies": { - "@babel/runtime": "7.16.0" - }, - "devDependencies": { - "@babel/cli": "7.16.8", - "@babel/core": "7.16.0", - "@babel/plugin-transform-runtime": "7.16.10", - "@babel/preset-env": "7.16.0", - "babel-plugin-bundled-import-meta": "0.3.2" - } - }, "node_modules/@babel/code-frame": { "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz", From 0ea17d68695a95c3a82caf1ad884b8c8cde833e3 Mon Sep 17 00:00:00 2001 From: Lachezar Lechev Date: Tue, 5 Dec 2023 19:20:33 +0200 Subject: [PATCH 6/6] chore: bump stremio-core-web to v0.44.30 Signed-off-by: Lachezar Lechev --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f9ba2d62..0780a8c51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.29", + "@stremio/stremio-core-web": "0.44.30", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1", @@ -2704,9 +2704,9 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "node_modules/@stremio/stremio-core-web": { - "version": "0.44.29", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.29.tgz", - "integrity": "sha512-F+ezw3De5yrWZ4HG9ZzFL8xbThUfJqHOLm07hAYC4M4fpycX1HnPuvE/rlzHcEeWsp0KD0JgvA68AcWq0CErHw==", + "version": "0.44.30", + "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.30.tgz", + "integrity": "sha512-iwasxT7Urf/1iCuPVMkEgfdTt1aQnL5eIeZfp7R0+ThBZGNuM9YNhq2r9BbOZNYmC1PIPTfsa8QmWtXC5J9oIQ==", "dependencies": { "@babel/runtime": "7.16.0" } @@ -16834,9 +16834,9 @@ "integrity": "sha512-Dt3PYmy1DZ473QNs99KYXVWQPHtpIl37VUY0+gCEvvuCqE1fRrZIJtZ9KbysUKonvO7WwdQDztgcW0iGoc1dEA==" }, "@stremio/stremio-core-web": { - "version": "0.44.29", - "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.29.tgz", - "integrity": "sha512-F+ezw3De5yrWZ4HG9ZzFL8xbThUfJqHOLm07hAYC4M4fpycX1HnPuvE/rlzHcEeWsp0KD0JgvA68AcWq0CErHw==", + "version": "0.44.30", + "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.44.30.tgz", + "integrity": "sha512-iwasxT7Urf/1iCuPVMkEgfdTt1aQnL5eIeZfp7R0+ThBZGNuM9YNhq2r9BbOZNYmC1PIPTfsa8QmWtXC5J9oIQ==", "requires": { "@babel/runtime": "7.16.0" } diff --git a/package.json b/package.json index e36980778..f04290e69 100755 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@babel/runtime": "7.16.0", "@sentry/browser": "6.13.3", "@stremio/stremio-colors": "5.0.1", - "@stremio/stremio-core-web": "0.44.29", + "@stremio/stremio-core-web": "0.44.30", "@stremio/stremio-icons": "5.0.0-beta.3", "@stremio/stremio-video": "0.0.26", "a-color-picker": "1.2.1",