From 746e5ba0d85ddcde0fd93519b8f34a91e91860c7 Mon Sep 17 00:00:00 2001
From: Lachezar Lechev <lachezar@ambire.com>
Date: Tue, 15 Jul 2025 21:56:47 +0300
Subject: [PATCH] feat: Player - use player.stream field chore: bump core-web
 to feature branch

Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
---
 package-lock.json           | 43 ++++++++++++++++---------------------
 package.json                |  2 +-
 src/routes/Player/Player.js |  4 ++--
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d5ed4487..793c492c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
                 "@babel/runtime": "7.26.0",
                 "@sentry/browser": "8.42.0",
                 "@stremio/stremio-colors": "5.2.0",
-                "@stremio/stremio-core-web": "0.49.4",
+                "@stremio/stremio-core-web": "file:../core/stremio-core-web",
                 "@stremio/stremio-icons": "5.7.1",
                 "@stremio/stremio-video": "0.0.61",
                 "a-color-picker": "1.2.1",
@@ -81,6 +81,21 @@
                 "workbox-webpack-plugin": "^7.3.0"
             }
         },
+        "../core/stremio-core-web": {
+            "name": "@stremio/stremio-core-web",
+            "version": "0.49.4",
+            "license": "MIT",
+            "dependencies": {
+                "@babel/runtime": "7.24.1"
+            },
+            "devDependencies": {
+                "@babel/cli": "7.24.1",
+                "@babel/core": "7.24.3",
+                "@babel/plugin-transform-runtime": "7.24.3",
+                "@babel/preset-env": "7.24.3",
+                "babel-plugin-bundled-import-meta": "0.3.2"
+            }
+        },
         "node_modules/@ampproject/remapping": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
@@ -3374,30 +3389,8 @@
             "integrity": "sha512-dYlPgu9W/H7c9s1zmW5tiDnRenaUa4Hg1QCyOg1lhOcgSfM/bVTi5nnqX+IfvGTTUNA0zgzh8hI3o3miwnZxTg=="
         },
         "node_modules/@stremio/stremio-core-web": {
-            "version": "0.49.4",
-            "resolved": "https://registry.npmjs.org/@stremio/stremio-core-web/-/stremio-core-web-0.49.4.tgz",
-            "integrity": "sha512-K9LJGKXs8juV3pZOHH6thWTwOShAhjFt9bLL6K1VlORAe6AiieZ2uRp9wdOwFmPX+UgzWLIOd0r2aFXJ4OsJCw==",
-            "dependencies": {
-                "@babel/runtime": "7.24.1"
-            }
-        },
-        "node_modules/@stremio/stremio-core-web/node_modules/@babel/runtime": {
-            "version": "7.24.1",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
-            "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==",
-            "license": "MIT",
-            "dependencies": {
-                "regenerator-runtime": "^0.14.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@stremio/stremio-core-web/node_modules/regenerator-runtime": {
-            "version": "0.14.1",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-            "license": "MIT"
+            "resolved": "../core/stremio-core-web",
+            "link": true
         },
         "node_modules/@stremio/stremio-icons": {
             "version": "5.7.1",
diff --git a/package.json b/package.json
index ffcaef6b2..eddd3c805 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
         "@babel/runtime": "7.26.0",
         "@sentry/browser": "8.42.0",
         "@stremio/stremio-colors": "5.2.0",
-        "@stremio/stremio-core-web": "0.49.4",
+        "@stremio/stremio-core-web": "https://stremio.github.io/stremio-core/stremio-core-web/feat/stream-rar-and-zip-stream-creation/dev/stremio-stremio-core-web-0.49.4.tgz",
         "@stremio/stremio-icons": "5.7.1",
         "@stremio/stremio-video": "0.0.61",
         "a-color-picker": "1.2.1",
diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index 436f1a781..613429610 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -322,10 +322,10 @@ const Player = ({ urlParams, queryParams }) => {
         setError(null);
         video.unload();
 
-        if (player.selected && streamingServer.settings?.type !== 'Loading') {
+        if (player.stream?.type === 'Ready' && streamingServer.settings?.type !== 'Loading') {
             video.load({
                 stream: {
-                    ...player.selected.stream,
+                    ...player.stream.content,
                     subtitles: Array.isArray(player.selected.stream.subtitles) ?
                         player.selected.stream.subtitles.map((subtitles) => ({
                             ...subtitles,