Bump version to 3.1.6

Fix game's gallery failed to load (#250 )
Cache base custom touch layouts
2025-06-28 18:31:44 +02:00 · 2024-02-11 17:50:54 +07:00 · 2024-02-11 16:21:40 +07:00 · 2024-02-10 15:05:13 +07:00 · 2024-02-10 14:57:11 +07:00 · 2024-02-10 14:46:51 +07:00
2 changed files with 266 additions and 117 deletions
--- a/better-xcloud.meta.js
+++ b/better-xcloud.meta.js
@ -1,5 +1,5 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      3.1.2
+// @version      3.1.6
 // ==/UserScript==
--- a/better-xcloud.user.js
+++ b/better-xcloud.user.js
@ -1,11 +1,12 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      3.1.2
+// @version      3.1.6
 // @description  Improve Xbox Cloud Gaming (xCloud) experience
 // @author       redphx
 // @license      MIT
 // @match        https://www.xbox.com/*/play*
+// @match        https://www.xbox.com/*/auth/msa?*loggedIn*
 // @run-at       document-start
 // @grant        none
 // @updateURL    https://raw.githubusercontent.com/redphx/better-xcloud/main/better-xcloud.meta.js
@ -13,13 +14,15 @@
 // ==/UserScript==
 'use strict';

-const SCRIPT_VERSION = '3.1.2';
+const SCRIPT_VERSION = '3.1.6';
 const SCRIPT_HOME = 'https://github.com/redphx/better-xcloud';

 const ENABLE_XCLOUD_LOGGER = false;
 const ENABLE_PRELOAD_BX_UI = false;
 const USE_DEV_TOUCH_LAYOUT = false;

+let REMOTE_PLAY_SERVER;
+
 const ENABLE_NATIVE_MKB_BETA = false;
 window.NATIVE_MKB_TITLES = [
    // Not working anymore
@ -38,6 +41,17 @@ window.NATIVE_MKB_TITLES = [
    // '9P731Z4BBCT3', // Atomic Heart
 ];

+if (window.location.pathname.includes('/auth/msa')) {
+    window.addEventListener('load', e => {
+            window.location.search.includes('loggedIn') && setTimeout(() => {
+                const location = window.location;
+                location.pathname.includes('/play') && location.reload(true);
+            }, 2000);
+        });
+    // Stop processing the script
+    throw new Error('[Better xCloud] Refreshing the page after logging in');
+}
+
 console.log(`[Better xCloud] readyState: ${document.readyState}`);

 const BxEvent = {
@ -49,6 +63,10 @@ const BxEvent = {
    STREAM_STARTED: 'bx-stream-started',
    STREAM_PLAYING: 'bx-stream-playing',
    STREAM_STOPPED: 'bx-stream-stopped',
+    STREAM_ERROR_PAGE: 'bx-stream-error-page',
+
+    STREAM_MENU_SHOWN: 'bx-stream-menu-shown',
+    STREAM_MENU_HIDDEN: 'bx-stream-menu-hidden',

    STREAM_WEBRTC_CONNECTED: 'bx-stream-webrtc-connected',
    STREAM_WEBRTC_DISCONNECTED: 'bx-stream-webrtc-disconnected',
@ -58,6 +76,11 @@ const BxEvent = {
    DATA_CHANNEL_CREATED: 'bx-data-channel-created',

    dispatch: (target, eventName, data) => {
+        if (!eventName) {
+            alert('BxEvent.dispatch(): eventName is null');
+            return;
+        }
+
        const event = new Event(eventName);

        if (data) {
@ -1311,8 +1334,10 @@ const Translations = {
        "pl-PL": "Używanie tej funkcji podczas grania online może być postrzegane jako oszukiwanie",
        "pt-BR": "Usar esta função em jogos online pode ser considerado como uma forma de trapaça",
        "ru-RU": "Использование этой функции при игре онлайн может рассматриваться как читерство",
+        "tr-TR": "Bu özellik çevrimiçi oyunlarda sizi hile yapıyormuşsunuz gibi gösterebilir",
        "uk-UA": "Використання цієї функції під час гри онлайн може розглядатися як шахрайство",
        "vi-VN": "Sử dụng chức năng này khi chơi trực tuyến có thể bị xem là gian lận",
+        "zh-CN": "游玩在线游戏时，使用此功能可能被视为作弊。",
    },
    "mouse-and-keyboard": {
        "de-DE": "Maus & Tastatur",
@ -2451,6 +2476,17 @@ const Translations = {
        "vi-VN": "Phía trên bên phải",
        "zh-CN": "右上角",
    },
+    "touch-control-layout": {
+        "de-DE": "Touch-Steuerungslayout",
+        "en-US": "Touch control layout",
+        "ja-JP": "タッチコントロールレイアウト",
+        "pt-BR": "Layout do controle por toque",
+        "ru-RU": "Расположение сенсорных кнопок",
+        "tr-TR": "Dokunmatik kontrol şeması",
+        "uk-UA": "Розташування сенсорного керування",
+        "vi-VN": "Bố cục điều khiển cảm ứng",
+        "zh-CN": "触摸控制布局",
+    },
    "touch-controller": {
        "de-DE": "Touch-Controller",
        "en-US": "Touch controller",
@ -3127,22 +3163,47 @@ class RemotePlay {
            });
    }

-    static #getConsolesList(callback) {
+    static async #getConsolesList(callback) {
        if (RemotePlay.#CONSOLES) {
            callback();
            return;
        }

-        fetch('https://wus2.gssv-play-prodxhome.xboxlive.com/v6/servers/home?mr=50', {
-            method: 'GET',
-            headers: {
-                'Authorization': `Bearer ${RemotePlay.XHOME_TOKEN}`,
-            },
-        }).then(resp => resp.json())
-            .then(json => {
+        let servers;
+        if (!REMOTE_PLAY_SERVER) {
+            servers = ['wus2', 'eus', 'uks']; // Possible values: wus2 (WestUS2), eus (EastUS), uks (UkSouth)
+        } else {
+            servers = REMOTE_PLAY_SERVER;
+        }
+
+        const options = {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${RemotePlay.XHOME_TOKEN}`,
+                },
+            };
+
+        // Test servers one by one
+        for (const server of servers) {
+            try {
+                const url = `https://${server}.gssv-play-prodxhome.xboxlive.com/v6/servers/home?mr=50`;
+                const resp = await fetch(url, options);
+
+                const json = await resp.json();
                RemotePlay.#CONSOLES = json.results;
+
+                // Store working server
+                REMOTE_PLAY_SERVER = server;
+
                callback();
-            });
+                break;
+            } catch (e) {}
+        }
+
+        // None of the servers worked
+        if (!REMOTE_PLAY_SERVER) {
+            RemotePlay.#CONSOLES = [];
+        }
    }

    static showDialog() {
@ -3411,6 +3472,7 @@ class TouchController {
    static #dataChannel;

    static #customLayouts = {};
+    static #baseCustomLayouts = {};
    static #currentLayoutId;

    static enable() {
@ -3431,14 +3493,12 @@ class TouchController {
    }

    static #show() {
-        document.querySelector('#BabylonCanvasContainer-main').parentElement.classList.remove('bx-gone');
-        // TouchController.loadCustomLayout(GAME_XBOX_TITLE_ID, TouchController.#currentLayoutId, 0);
+        document.querySelector('#BabylonCanvasContainer-main').parentElement.classList.remove('bx-offscreen');
        TouchController.#showing = true;
    }

    static #hide() {
-        document.querySelector('#BabylonCanvasContainer-main').parentElement.classList.add('bx-gone');
-        // TouchController.#dispatchMessage(TouchController.#EVENT_HIDE_CONTROLLER);
+        document.querySelector('#BabylonCanvasContainer-main').parentElement.classList.add('bx-offscreen');
        TouchController.#showing = false;
    }

@ -3469,53 +3529,64 @@ class TouchController {
        }, 10);
    }

-    static getCustomLayouts(xboxTitleId) {
-        const dispatchLayouts = data => {
-            BxEvent.dispatch(window, BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, {
-                    data: data,
-                });
-        };
+    static #dispatchLayouts(data) {
+        BxEvent.dispatch(window, BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, {
+            data: data,
+        });
+    };

+    static async getCustomLayouts(xboxTitleId, retries) {
        xboxTitleId = '' + xboxTitleId;
        if (xboxTitleId in TouchController.#customLayouts) {
-            dispatchLayouts(TouchController.#customLayouts[xboxTitleId]);
+            TouchController.#dispatchLayouts(TouchController.#customLayouts[xboxTitleId]);
            return;
        }

-        let url = 'https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/touch-layouts/';
-        if (USE_DEV_TOUCH_LAYOUT) {
-            url += `dev/${xboxTitleId}.json`;
-        } else {
-            url += `${xboxTitleId}.json`;
+        retries = retries || 1;
+        if (retries > 2) {
+            TouchController.#customLayouts[xboxTitleId] = null;
+            // Wait for BX_EXPOSED.touch_layout_manager
+            setTimeout(() => TouchController.#dispatchLayouts(null), 1000);
+            return;
        }
-        NATIVE_FETCH(url)
-            .then(resp => resp.json(), () => {
-                    TouchController.#customLayouts[xboxTitleId] = null;
-                    // Wait for BX_EXPOSED.touch_layout_manager
-                    setTimeout(() => dispatchLayouts(null), 1000);
-                })
-            .then(json => {
-                    // Normalize data
-                    const schema_version = json.schema_version || 1;
-                    let layout;
+
+        const baseUrl = `https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/touch-layouts${USE_DEV_TOUCH_LAYOUT ? '/dev' : ''}`;
+        const url = `${baseUrl}/${xboxTitleId}.json`;
+
+        // Get layout info
+        try {
+            const resp = await NATIVE_FETCH(url);
+            const json = await resp.json();
+
+            const layouts = {};
+
+            json.layouts.forEach(async layoutName => {
+                let baseLayouts = {};
+                if (layoutName in TouchController.#baseCustomLayouts) {
+                    baseLayouts = TouchController.#baseCustomLayouts[layoutName];
+                } else {
                    try {
-                        if (schema_version === 1) {
-                            json.layouts = {
-                                default: {
-                                    name: 'Default',
-                                    content: json.layout,
-                                },
-                            };
-                            json.default_layout = 'default';
-                            delete json.layout;
-                        }
+                        const layoutUrl = `${baseUrl}/layouts/${layoutName}.json`;
+                        const resp = await NATIVE_FETCH(layoutUrl);
+                        const json = await resp.json();
+
+                        baseLayouts = json.layouts;
+                        TouchController.#baseCustomLayouts[layoutName] = baseLayouts;
                    } catch (e) {}
+                }

-                    TouchController.#customLayouts[xboxTitleId] = json;
+                Object.assign(layouts, baseLayouts);
+            });

-                    // Wait for BX_EXPOSED.touch_layout_manager
-                    setTimeout(() => dispatchLayouts(json), 1000);
-                });
+            json.layouts = layouts;
+            TouchController.#customLayouts[xboxTitleId] = json;
+
+            // Wait for BX_EXPOSED.touch_layout_manager
+            setTimeout(() => TouchController.#dispatchLayouts(json), 1000);
+        } catch (e) {
+            // Retry
+            TouchController.getCustomLayouts(xboxTitleId, retries + 1);
+        }
    }

    static loadCustomLayout(xboxTitleId, layoutId, delay) {
@ -3523,9 +3594,12 @@ class TouchController {
            return;
        }

+        const layoutChanged = TouchController.#currentLayoutId !== layoutId;
+
        TouchController.#currentLayoutId = layoutId;
        xboxTitleId = '' + xboxTitleId;

+        // Get layout data
        const layoutData = TouchController.#customLayouts[xboxTitleId];
        if (!xboxTitleId || !layoutId || !layoutData) {
            TouchController.#enable && TouchController.#showDefault();
@ -3533,23 +3607,46 @@ class TouchController {
        }

        const layout = (layoutData.layouts[layoutId] || layoutData.layouts[layoutData.default_layout]);
-        layout && setTimeout(() => {
-            window.BX_EXPOSED.touch_layout_manager.changeLayoutForScope({
-                type: 'showLayout',
-                scope: xboxTitleId,
-                subscope: 'base',
-                layout: {
-                    id: 'System.Standard',
-                    displayName: 'System',
-                    layoutFile: {
-                        content: layout.content,
-                    },
-                }
-            });
-        }, delay);
+        if (layout) {
+            // Show a toast with layout's name
+            layoutChanged && Toast.show(__('touch-control-layout'), layout.name);
+
+            setTimeout(() => {
+                window.BX_EXPOSED.touch_layout_manager.changeLayoutForScope({
+                    type: 'showLayout',
+                    scope: xboxTitleId,
+                    subscope: 'base',
+                    layout: {
+                        id: 'System.Standard',
+                        displayName: 'System',
+                        layoutFile: {
+                            content: layout.content,
+                        },
+                    }
+                });
+            }, delay);
+        }
    }

    static setup() {
+        // Function for testing touch control
+        window.BX_EXPOSED.test_touch_control = content => {
+            const { touch_layout_manager } = window.BX_EXPOSED;
+
+            touch_layout_manager && touch_layout_manager.changeLayoutForScope({
+                type: 'showLayout',
+                scope: '' + GAME_XBOX_TITLE_ID,
+                subscope: 'base',
+                layout: {
+                    id: 'System.Standard',
+                    displayName: 'Custom',
+                    layoutFile: {
+                        content: content,
+                    },
+                },
+            });
+        };
+
        const $fragment = document.createDocumentFragment();
        const $style = document.createElement('style');
        $fragment.appendChild($style);
@ -3612,6 +3709,7 @@ class TouchController {
                setTimeout(TouchController.#show, 1000);
            });

+            let focused = false;
            dataChannel.addEventListener('message', msg => {
                if (msg.origin === 'better-xcloud' || typeof msg.data !== 'string') {
                    return;
@ -3619,7 +3717,13 @@ class TouchController {

                // Dispatch a message to display generic touch controller
                if (msg.data.includes('touchcontrols/showtitledefault')) {
-                    TouchController.#enable && TouchController.getCustomLayouts(GAME_XBOX_TITLE_ID);
+                    if (TouchController.#enable) {
+                        if (focused) {
+                            TouchController.getCustomLayouts(GAME_XBOX_TITLE_ID);
+                        } else {
+                            TouchController.#showDefault();
+                        }
+                    }
                    return;
                }

@ -3629,6 +3733,7 @@ class TouchController {
                        const json = JSON.parse(JSON.parse(msg.data).content);
                        TouchController.#toggleBar(json.focused);

+                        focused = json.focused;
                        if (!json.focused) {
                            TouchController.#show();
                        }
@ -4781,8 +4886,8 @@ class MkbHandler {
        this.#$message.addEventListener('click', this.#onActivatePointerLock);
        document.documentElement.appendChild(this.#$message);

-        window.addEventListener('bx-stream-menu-shown', this.#onStreamMenuShown);
-        window.addEventListener('bx-stream-menu-hidden', this.#onStreamMenuHidden);
+        window.addEventListener(BxEvent.STREAM_MENU_SHOWN, this.#onStreamMenuShown);
+        window.addEventListener(BxEvent.STREAM_MENU_HIDDEN, this.#onStreamMenuHidden);

        this.#waitForPointerLock(true);
    }
@ -4799,8 +4904,8 @@ class MkbHandler {
        document.removeEventListener('pointerlockchange', this.#onPointerLockChange);
        document.removeEventListener('pointerlockerror', this.#onPointerLockError);

-        window.removeEventListener('bx-stream-menu-shown', this.#onStreamMenuShown);
-        window.removeEventListener('bx-stream-menu-hidden', this.#onStreamMenuHidden);
+        window.removeEventListener(BxEvent.STREAM_MENU_SHOWN, this.#onStreamMenuShown);
+        window.removeEventListener(BxEvent.STREAM_MENU_HIDDEN, this.#onStreamMenuHidden);
    }

    start = () => {
@ -6432,7 +6537,7 @@ class Preferences {
            },
        },
        [Preferences.STREAM_TARGET_RESOLUTION]: {
-            'default': 'auto',
+            'default': '1080p',
            'options': {
                'auto': __('default'),
                '1080p': '1080p',
@ -6495,10 +6600,16 @@ class Preferences {
                return options;
            })(),
            'ready': () => {
-                const options = Preferences.SETTINGS[Preferences.STREAM_CODEC_PROFILE].options;
-                if (Object.keys(options).length <= 1) {
-                    Preferences.SETTINGS[Preferences.STREAM_CODEC_PROFILE].unsupported = true;
-                    Preferences.SETTINGS[Preferences.STREAM_CODEC_PROFILE].note = '⚠️ ' + __('browser-unsupported-feature');
+                const setting = Preferences.SETTINGS[Preferences.STREAM_CODEC_PROFILE]
+                const options = setting.options;
+                const keys = Object.keys(options);
+
+                if (keys.length <= 1) { // Unsupported
+                    setting.unsupported = true;
+                    setting.note = '⚠️ ' + __('browser-unsupported-feature');
+                } else {
+                    // Set default value to the best codec profile
+                    setting.default = keys[keys.length - 1];
                }
            },
        },
@ -6520,13 +6631,19 @@ class Preferences {
            'default': false,
        },
        [Preferences.STREAM_TOUCH_CONTROLLER]: {
-            'default': 'default',
+            'default': 'all',
            'options': {
                'default': __('default'),
                'all': __('tc-all-games'),
                'off': __('off'),
            },
            'unsupported': !HAS_TOUCH_SUPPORT,
+            'ready': () => {
+                const setting = Preferences.SETTINGS[Preferences.STREAM_TOUCH_CONTROLLER];
+                if (setting.unsupported) {
+                    setting.default = 'off';
+                }
+            },
        },
        [Preferences.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD]: {
            'default': 'default',
@ -6786,6 +6903,7 @@ class Preferences {
        },

        // Deprecated
+        /*
        [Preferences.DEPRECATED_USE_DESKTOP_CODEC]: {
            'default': false,
            'migrate': function(savedPrefs, value) {
@ -6794,6 +6912,7 @@ class Preferences {
                savedPrefs[Preferences.STREAM_CODEC_PROFILE] = quality;
            },
        },
+        */
    }

    #storage = localStorage;
@ -6808,12 +6927,14 @@ class Preferences {
        savedPrefs = JSON.parse(savedPrefs);

        for (let settingId in Preferences.SETTINGS) {
-            if (!(settingId in savedPrefs)) {
-                continue;
-            }
            const setting = Preferences.SETTINGS[settingId];
-            setting && setting.migrate && setting.migrate.call(this, savedPrefs, savedPrefs[settingId]);
-            setting && setting.ready && setting.ready.call(this);
+            setting.ready && setting.ready.call(this);
+
+            /*
+            if (setting.migrate && !(settingId in savedPrefs)) {
+                setting.migrate.call(this, savedPrefs, savedPrefs[settingId]);
+            }
+            */
        }

        for (let settingId in Preferences.SETTINGS) {
@ -8253,16 +8374,18 @@ div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module] {
    font-size: 14px;
    display: inline-block;
    padding: 12px 16px;
+    white-space: pre;
 }

 .bx-toast-status {
    font-weight: bold;
-    font-size: 16px;
+    font-size: 14px;
    text-transform: uppercase;
    display: inline-block;
    background: #515863;
    padding: 12px 16px;
    color: #fff;
+    white-space: pre;
 }

 .bx-number-stepper span {
@ -8871,7 +8994,7 @@ function interceptHttpRequests() {
    if (getPref(Preferences.BLOCK_SOCIAL_FEATURES)) {
        BLOCKED_URLS = BLOCKED_URLS.concat([
            'https://peoplehub.xboxlive.com/users/me',
-            'https://accounts.xboxlive.com/family/memberXuid',
+            // 'https://accounts.xboxlive.com/family/memberXuid',
            'https://notificationinbox.xboxlive.com',
        ]);
    }
@ -8985,7 +9108,7 @@ function interceptHttpRequests() {
            }

            const index = request.url.indexOf('.xboxlive.com');
-            let newUrl = 'https://wus2.gssv-play-prodxhome' + request.url.substring(index);
+            let newUrl = `https://${REMOTE_PLAY_SERVER}.gssv-play-prodxhome` + request.url.substring(index);

            request = new Request(newUrl, opts);

@ -9020,7 +9143,18 @@ function interceptHttpRequests() {

                return promise.then(response => {
                    return response.clone().json().then(obj => {
-                        if (obj[0].supportedTabs.length > 0) {
+                        const xboxTitleId = JSON.parse(opts.body).titleIds[0];
+                        GAME_XBOX_TITLE_ID = xboxTitleId;
+
+                        const inputConfigs = obj[0];
+
+                        let hasTouchSupport = inputConfigs.supportedTabs.length > 0;
+                        if (!hasTouchSupport) {
+                            const supportedInputTypes = inputConfigs.supportedInputTypes;
+                            hasTouchSupport = supportedInputTypes.includes('NativeTouch');
+                        }
+
+                        if (hasTouchSupport) {
                            TouchController.disable();

                            BxEvent.dispatch(window, BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, {
@ -9028,9 +9162,6 @@ function interceptHttpRequests() {
                                });
                        } else {
                            TouchController.enable();
-
-                            const xboxTitleId = JSON.parse(opts.body).titleIds[0];
-                            GAME_XBOX_TITLE_ID = xboxTitleId;
                            TouchController.getCustomLayouts(xboxTitleId);
                        }

@ -9790,13 +9921,13 @@ function injectStreamMenuButtons() {
            }

            item.removedNodes.forEach($node => {
-                if (!$node.className || !$node.className.startsWith) {
+                if (!$node || !$node.className || !$node.className.startsWith) {
                    return;
                }

                if ($node.className.startsWith('StreamMenu')) {
                    if (!document.querySelector('div[class^=PureInStreamConfirmationModal]')) {
-                        window.dispatchEvent(new Event('bx-stream-menu-hidden'));
+                        BxEvent.dispatch(window, BxEvent.STREAM_MENU_HIDDEN);
                    }
                }
            });
@ -9806,6 +9937,12 @@ function injectStreamMenuButtons() {
                    return;
                }

+                // Error Page: .PureErrorPage.ErrorScreen
+                if ($node.className.includes('PureErrorPage')) {
+                    BxEvent.dispatch(window, BxEvent.STREAM_ERROR_PAGE);
+                    return;
+                }
+
                if (PREF_DISABLE_FEEDBACK_DIALOG && $node.className.startsWith('PostStreamFeedbackScreen')) {
                    const $btnClose = $node.querySelector('button');
                    $btnClose && $btnClose.click();
@ -9814,7 +9951,7 @@ function injectStreamMenuButtons() {

                // Render badges
                if ($node.className.startsWith('StreamMenu')) {
-                    window.dispatchEvent(new Event('bx-stream-menu-shown'));
+                    BxEvent.dispatch(window, BxEvent.STREAM_MENU_SHOWN);

                    // Hide Quick bar when closing HUD
                    const $btnCloseHud = document.querySelector('button[class*=StreamMenu-module__backButton]');
@ -10456,14 +10593,10 @@ function patchHistoryMethod(type) {


 function onHistoryChanged(e) {
-    if (e.arguments && e.arguments[0] && e.arguments[0].origin === 'better-xcloud') {
+    if (e && e.arguments && e.arguments[0] && e.arguments[0].origin === 'better-xcloud') {
        return;
    }

-    // Stop MKB listeners
-    MkbHandler.INSTANCE.destroy();
-
-    IS_PLAYING = false;
    setTimeout(RemotePlay.detect, 10);

    const $settings = document.querySelector('.better_xcloud_settings');
@ -10471,28 +10604,10 @@ function onHistoryChanged(e) {
        $settings.classList.add('bx-gone');
    }

-    const $quickBar = document.querySelector('.bx-quick-settings-bar');
-    if ($quickBar) {
-        $quickBar.classList.add('bx-gone');
-    }
-
-    STREAM_AUDIO_GAIN_NODE = null;
-    $STREAM_VIDEO = null;
-    StreamStats.onStoppedPlaying();
-
-    const $screenshotBtn = document.querySelector('.bx-screenshot-button');
-    if ($screenshotBtn) {
-        $screenshotBtn.style = '';
-    }
-
-    MouseCursorHider.stop();
-    TouchController.reset();
-
    LoadingScreen.reset();
-
-    GamepadHandler.stopPolling();
-
    setTimeout(checkHeader, 2000);
+
+    BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
 }


@ -10587,6 +10702,40 @@ window.addEventListener(BxEvent.STREAM_PLAYING, e => {
    }
 });

+window.addEventListener(BxEvent.STREAM_ERROR_PAGE, e => {
+    BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
+});
+
+window.addEventListener(BxEvent.STREAM_STOPPED, e => {
+    if (!IS_PLAYING) {
+        return;
+    }
+
+    IS_PLAYING = false;
+
+    // Stop MKB listeners
+    MkbHandler.INSTANCE.destroy();
+
+    const $quickBar = document.querySelector('.bx-quick-settings-bar');
+    if ($quickBar) {
+        $quickBar.classList.add('bx-gone');
+    }
+
+    STREAM_AUDIO_GAIN_NODE = null;
+    $STREAM_VIDEO = null;
+    StreamStats.onStoppedPlaying();
+
+    const $screenshotBtn = document.querySelector('.bx-screenshot-button');
+    if ($screenshotBtn) {
+        $screenshotBtn.style = '';
+    }
+
+    MouseCursorHider.stop();
+    TouchController.reset();
+
+    GamepadHandler.stopPolling();
+});
+

 PreloadedState.override();
Author	SHA1	Message	Date
redphx	5ca8eb754c	Bump version to 3.1.6	2024-02-11 17:50:54 +07:00
redphx	506f89ea51	Fix game's gallery failed to load (#250 )	2024-02-11 16:21:40 +07:00
redphx	9332f375b8	Cache base custom touch layouts	2024-02-10 15:05:13 +07:00
redphx	dbe0435669	Use async/await in TouchController.getCustomLayouts()	2024-02-10 14:57:11 +07:00
redphx	c1684abf27	Switch to another Remote Play server if one is down	2024-02-10 14:46:51 +07:00
redphx	07e4f9dffd	Add REMOTE_PLAY_SERVER for switching Remote Play server	2024-02-09 21:52:58 +07:00
redphx	bb980d2cad	Bump version to 3.1.5	2024-02-09 18:07:40 +07:00
redphx	102c796c69	Set USE_DEV_TOUCH_LAYOUT to "false"	2024-02-09 18:07:04 +07:00
redphx	2f7218d165	Update translations	2024-02-09 18:04:06 +07:00
redphx	b07318e07f	Add BX_EXPOSED.test_touch_control() for layout testing	2024-02-09 17:57:25 +07:00
redphx	70a8fc9866	Test new structure of custom touch layout	2024-02-09 17:46:05 +07:00
redphx	2d9ee16531	Bump version to 3.1.4	2024-02-07 21:43:49 +07:00
redphx	21168803e0	Set default value of STREAM_CODEC_PROFILE to the best codec profile	2024-02-07 21:37:35 +07:00
redphx	3068aa8a06	Minor fix for touch control	2024-02-07 18:40:36 +07:00
redphx	b6b9ec49f6	Update touch support detection in Remote Play	2024-02-07 17:35:13 +07:00
redphx	4dc60f965f	Minor fix	2024-02-07 15:22:27 +07:00
redphx	2142c4a83c	Only request custom touch control when the game is focused	2024-02-07 15:15:53 +07:00
redphx	6b090194c9	Only show toast when the layout has been changed	2024-02-07 14:56:36 +07:00
redphx	a878150ec3	Show a toast with layout's name when switching touch control layout	2024-02-07 11:09:10 +07:00
redphx	5fb1dded42	Change default value of "STREAM_TARGET_RESOLUTION" to "1080p"	2024-02-07 10:53:12 +07:00
redphx	ac6879c189	Change default value of "STREAM_TOUCH_CONTROLLER" to "all"	2024-02-07 10:52:04 +07:00
redphx	b8efaf9648	Fix not loading Better xCloud after logging in	2024-02-06 22:53:53 +07:00
redphx	033ac31333	Bump version to 3.1.3	2024-02-03 07:16:46 +07:00
redphx	1f754d4a1d	Add STREAM_STOPPED and STREAM_ERROR_PAGE events	2024-02-02 10:31:40 +07:00
redphx	0d39ccf8bf	Typo	2024-02-02 10:04:59 +07:00
redphx	966d7f2f6c	Hide touchscreen using bx-offscreen instead of bx-gone	2024-02-02 10:02:57 +07:00
redphx	fdbf618253	Add STREAM_MENU_SHOWN and STREAM_MENU_HIDDEN events	2024-02-02 09:59:42 +07:00
redphx	aaa7612293	Fix default touch control not showing sometimes	2024-02-01 20:22:18 +07:00