Creepso/stremio-shell-ng
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-shell-ng.git synced 2026-05-11 20:50:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

fix: inject shell bootstrap before page scripts
Some checks are pending
Continuous integration / test (push) Waiting to run
Details

Browse source 
The WebUI bootstrap (window.stremio_server_ipc_key, the qt
webChannelTransport shim, contextmenu suppression) was injected via
execute_script from inside the add_content_loading callback. Both
add_content_loading and execute_script enqueue work async, so a page's
own inline <script> tags could observe window.stremio_server_ipc_key
as undefined and bypass the qt shim entirely. The race showed up
intermittently as the WebUI being unable to talk to the streaming
server even after the shell had finished launching.

Move the same script into add_script_to_execute_on_document_created
and register it BEFORE webview.navigate(...). WebView2 guarantees
DocumentCreated scripts run before any page scripts on every document,
including the first one as long as registration completes before the
navigation reaches DocumentCreated. The add_content_loading callback
that previously hosted these execute_script calls is removed since it
now serves no purpose.

Closes #54
This commit is contained in:
Timothy Z. 2026-05-10 12:44:12 +00:00
parent bbbe882faf
commit 4a9e61a3b7
1 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/stremio_app/stremio_wevbiew/wevbiew.rs
View file

@ -135,6 +135,32 @@ impl PartialUi for WebView {
Ok(())
})?;
// Must register before navigate() so DocumentCreated runs it ahead of page scripts.
let mut startup_script = format!(
"window.stremio_server_ipc_key='{}';\n",
std::env::var(SERVER_IPC_KEY).unwrap_or_default()
);
startup_script.push_str(r##"
try{
/* Disable context menus */
document.addEventListener('contextmenu', (e) => {
if(!(e.target.tagName == "INPUT" &&
['text', 'password', 'number', 'week', 'month', 'email'].includes(e.target.type.toLowerCase()))) {
e.stopPropagation();e.preventDefault()
}
})
}catch(e){}
try{console.log('Shell JS injected');if(window.self === window.top) {
window.qt={webChannelTransport:{send:window.chrome.webview.postMessage}};
window.chrome.webview.addEventListener('message',ev=>window.qt.webChannelTransport.onmessage(ev));
}}catch(e){}
window.addEventListener("load", function() {if(initShellComm) try { initShellComm() } catch(e) {}}, false)
"##);
webview
.add_script_to_execute_on_document_created(&startup_script, |_| Ok(()))
.expect("Cannot register startup script");
if let Some(endpoint) = endpoint.get() {
if webview
.navigate(endpoint.as_str()).is_err() {
@ -160,34 +186,6 @@ impl PartialUi for WebView {
Ok(())
}).expect("Cannot add full screen element changed");
webview.add_content_loading(move |wv, _| {
wv.execute_script(format!(
"window.stremio_server_ipc_key='{}'",
std::env::var(SERVER_IPC_KEY).unwrap_or_default()
).as_str(), |_| Ok(())
).expect("Cannot add SERVER_IPC_KEY to webview");
wv.execute_script(r##"
try{
/* Disable context menus */
document.addEventListener('contextmenu', (e) => {
if(!(e.target.tagName == "INPUT" &&
['text', 'password', 'number', 'week', 'month', 'email'].includes(e.target.type.toLowerCase()))) {
e.stopPropagation();e.preventDefault()
}
})
}catch(e){}
try{console.log('Shell JS injected');if(window.self === window.top) {
window.qt={webChannelTransport:{send:window.chrome.webview.postMessage}};
window.chrome.webview.addEventListener('message',ev=>window.qt.webChannelTransport.onmessage(ev));
}}catch(e){}
window.addEventListener("load", function() {if(initShellComm) try { initShellComm() } catch(e) {}}, false)
"##, |_| Ok(())).expect("Cannot add script to webview");
Ok(())
}).expect("Cannot add content loading");
WebView::resize_to_window_bounds(Some(&controller), Some(hwnd));
controller.put_is_visible(true).ok();
controller