Bump version to 3.1.6

better-xcloud.meta.js

@@ -1,5 +1,5 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      3.1.3
+// @version      3.1.6
 // ==/UserScript==

better-xcloud.user.js

@@ -1,11 +1,12 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      3.1.3
+// @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.3';
+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 = {
@@ -1320,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",
@@ -2460,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",
@@ -3136,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() {
@@ -3420,6 +3472,7 @@ class TouchController {
     static #dataChannel;
 
     static #customLayouts = {};
+    static #baseCustomLayouts = {};
     static #currentLayoutId;
 
     static enable() {
@@ -3476,54 +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())
-            .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);
-                })
-            .catch(() => {
-                    TouchController.#customLayouts[xboxTitleId] = null;
-                    // Wait for BX_EXPOSED.touch_layout_manager
-                    setTimeout(() => dispatchLayouts(null), 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) {
@@ -3531,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();
@@ -3541,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);
@@ -3620,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;
@@ -3627,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;
                 }
 
@@ -3637,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();
                         }
@@ -6440,7 +6537,7 @@ class Preferences {
             },
         },
         [Preferences.STREAM_TARGET_RESOLUTION]: {
-            'default': 'auto',
+            'default': '1080p',
             'options': {
                 'auto': __('default'),
                 '1080p': '1080p',
@@ -6503,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];
                 }
             },
         },
@@ -6528,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',
@@ -6794,6 +6903,7 @@ class Preferences {
         },
 
         // Deprecated
+        /*
         [Preferences.DEPRECATED_USE_DESKTOP_CODEC]: {
             'default': false,
             'migrate': function(savedPrefs, value) {
@@ -6802,6 +6912,7 @@ class Preferences {
                 savedPrefs[Preferences.STREAM_CODEC_PROFILE] = quality;
             },
         },
+        */
     }
 
     #storage = localStorage;
@@ -6816,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) {
@@ -8261,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 {
@@ -8879,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',
         ]);
     }
@@ -8993,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);
 
@@ -9028,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, {
@@ -9036,9 +9162,6 @@ function interceptHttpRequests() {
                                 });
                         } else {
                             TouchController.enable();
-
-                            const xboxTitleId = JSON.parse(opts.body).titleIds[0];
-                            GAME_XBOX_TITLE_ID = xboxTitleId;
                             TouchController.getCustomLayouts(xboxTitleId);
                         }