Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-03-11 21:27:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix chromecast transport for large messages

Browse source
This commit is contained in:
nklhrstv 2022-06-10 18:30:47 +03:00
parent 48639168ba
commit 24a8cbcab4
5 changed files with 52 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
package-lock.json generated
View file

@ -1856,9 +1856,9 @@
"integrity": "sha512-knlcBibqJW2mbEgid6YEeQN9FPkIGAEtozYWqzKWeHd2DPY2nl8kYX2pMQpa2Db/RVSqbVstu/gdey5TtSgGYw=="
},
"@stremio/stremio-video": {
"version": "0.0.19-rc.1",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.19-rc.1.tgz",
"integrity": "sha512-UiML0reTHcBhb2cddTrw7BqwYnJ7FcjOANltszmcG9Rx6PiJbZdfwZ2CR3VQX91nXbQlpeq81SjPt4WwcdXmuQ==",
"version": "0.0.20-rc.4",
"resolved": "https://registry.npmjs.org/@stremio/stremio-video/-/stremio-video-0.0.20-rc.4.tgz",
"integrity": "sha512-hRVXSH/3MsdQ2GNE56FqaUDT39PELoHV1BGRO9gLPIAJSX+nMlTs1eupGuGVcBdCnqPwEfZyRgpG0lRAmjLrRw==",
"requires": {
"color": "4.2.3",
"deep-freeze": "0.0.1",
@ -3725,7 +3725,7 @@
"deep-freeze": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz",
"integrity": "sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ="
"integrity": "sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg=="
},
"deep-is": {
"version": "0.1.4",
@ -4992,7 +4992,7 @@
"hat": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz",
"integrity": "sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo="
"integrity": "sha512-zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug=="
},
"he": {
"version": "1.2.0",
@ -8413,7 +8413,7 @@
"punycode": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
"integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
},
"qs": {
"version": "6.9.6",
@ -8424,7 +8424,7 @@
"querystring": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
"integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="
},
"queue-microtask": {
"version": "1.2.3",
@ -8973,7 +8973,7 @@
"simple-swizzle": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
"integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
"integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
"requires": {
"is-arrayish": "^0.3.1"
},
@ -9438,7 +9438,7 @@
"thirty-two": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz",
"integrity": "sha1-TKL//AKlEpDSdEueP1V2k8prYno="
"integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA=="
},
"throat": {
"version": "6.0.1",

2
package.json
View file

@ -17,7 +17,7 @@
"@stremio/stremio-colors": "4.0.1",
"@stremio/stremio-core-web": "0.42.0",
"@stremio/stremio-icons": "3.0.5",
"@stremio/stremio-video": "0.0.19-rc.1",
"@stremio/stremio-video": "0.0.20-rc.4",
"a-color-picker": "1.2.1",
"buffer": "6.0.3",
"classnames": "2.3.1",

2
src/routes/Player/Video/Video.js
View file

@ -70,7 +70,7 @@ const Video = React.forwardRef(({ className, ...props }, ref) => {
});
}
return () => {
dispatch({ type: 'command', commandName: 'destroy' });
videoRef.current.destroy();
};
}, []);
return (

4
src/services/Chromecast/Chromecast.js
View file

@ -17,7 +17,7 @@ function Chromecast() {
starting = false;
onStateChanged();
}
function onTransportError(args) {
function onTransportInitError(args) {
console.error(args);
active = false;
error = new Error('Google Cast API not available');
@ -68,7 +68,7 @@ function Chromecast() {
starting = true;
transport = new ChromecastTransport();
transport.on('init', onTransportInit);
transport.on('error', onTransportError);
transport.on('init-error', onTransportInitError);
onStateChanged();
};
this.stop = function() {

42
src/services/Chromecast/ChromecastTransport.js
View file

@ -3,6 +3,7 @@
const EventEmitter = require('eventemitter3');
const MESSAGE_NAMESPACE = 'urn:x-cast:com.stremio';
const CHUNK_SIZE = 20000;
let castAPIAvailable = null;
const castAPIEvents = new EventEmitter();
@ -32,6 +33,7 @@ const initialize = () => {
function ChromecastTransport() {
const events = new EventEmitter();
const chunks = [];
initialize()
.then(() => {
@ -52,11 +54,31 @@ function ChromecastTransport() {
}
})
.catch((error) => {
events.emit('error', error);
events.emit('init-error', error);
});
function onMessage(_, message) {
events.emit('message', JSON.parse(message));
try {
const { chunk, last } = JSON.parse(message);
chunks.push(chunk);
if (!last) {
return;
}
} catch (error) {
chunks.splice(0, chunks.length);
events.emit('message-error', error);
return;
}
let parsedMessage;
try {
parsedMessage = JSON.parse(chunks.splice(0, chunks.length).join(''));
} catch (error) {
events.emit('message-error', error);
return;
}
events.emit('message', parsedMessage);
}
function onApplicationStatusChanged(event) {
events.emit(cast.framework.CastSession.APPLICATION_STATUS_CHANGED, event);
@ -135,7 +157,21 @@ function ChromecastTransport() {
this.sendMessage = function(message) {
const castSession = cast.framework.CastContext.getInstance().getCurrentSession();
if (castSession !== null) {
return castSession.sendMessage(MESSAGE_NAMESPACE, message);
const serializedMessage = JSON.stringify(message);
const chunksCount = Math.ceil(serializedMessage.length / CHUNK_SIZE);
const chunks = [];
for (let i = 0; i < chunksCount; i++) {
const start = i * CHUNK_SIZE;
const chunk = serializedMessage.slice(start, start + CHUNK_SIZE);
chunks.push(chunk);
}
return Promise.all(chunks.map((chunk, index) => {
return castSession.sendMessage(MESSAGE_NAMESPACE, {
chunk,
last: index === chunks.length - 1,
});
}));
} else {
return Promise.reject(new Error('Session not started'));
}