Bump version to 5.5.2

.github/ISSUE_TEMPLATE/02-feature-request.yml

@@ -14,41 +14,12 @@ body:
     id: device_type
     attributes:
       label: Device
-      description: "Which device are you using?"
+      description: "Which device type is this feature for?"
       options:
+        - All devices
         - Phone/Tablet
-        - Laptop
         - Desktop
         - TV
-        - Other
-      multiple: false
-    validations:
-      required: true
-  - type: dropdown
-    id: os
-    attributes:
-      label: "Operating System"
-      description: "Which operating system is it running?"
-      options:
-        - Windows
-        - macOS
-        - Linux
-        - Android
-        - iOS/iPadOS
-        - Other
-      multiple: false
-    validations:
-      required: true
-  - type: dropdown
-    id: browser
-    attributes:
-      label: "Browser"
-      description: "Which browser are you using?"
-      options:
-        - Chrome/Edge/Chromium
-        - Kiwi Browser
-        - Safari
-        - Other
       multiple: false
     validations:
       required: true

build.ts

@@ -2,9 +2,12 @@
 import { readFile } from "node:fs/promises";
 import { parseArgs } from "node:util";
 import { sys } from "typescript";
+// @ts-ignore
 import txtScriptHeader from "./src/assets/header_script.txt" with { type: "text" };
+// @ts-ignore
 import txtMetaHeader from "./src/assets/header_meta.txt" with { type: "text" };
 import { assert } from "node:console";
+import { ESLint } from "eslint";
 
 enum BuildTarget {
     ALL = 'all',
@@ -80,10 +83,19 @@ const build = async (target: BuildTarget, version: string, config: any={}) => {
 
     // Save to script
     await Bun.write(path, scriptHeader + result);
-    console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);
 
     // Create meta file
     await Bun.write(outDir + '/' + outputMetaName, txtMetaHeader.replace('[[VERSION]]', version));
+
+    // Check with ESLint
+    const eslint = new ESLint();
+    const results = await eslint.lintFiles([path]);
+    results[0].messages.forEach((msg: any) => {
+        console.error(`${path}#${msg.line}: ${msg.message}`);
+    });
+
+    console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);
+    console.log(`---- [${target}] ${new Date()}`);
 }
 
 const buildTargets = [
@@ -110,9 +122,26 @@ if (!values['version']) {
     sys.exit(-1);
 }
 
-console.log('Building: ', values['version']);
+async function main() {
+    const config = {};
+    console.log('Building: ', values['version']);
+    for (const target of buildTargets) {
+        await build(target, values['version']!!, config);
+    }
 
-const config = {};
-for (const target of buildTargets) {
-    await build(target, values['version']!!, config);
+    console.log('\n** Press Enter to build or Esc to exit');
 }
+
+function onKeyPress(data: any) {
+    const keyCode = data[0];
+    if (keyCode === 13) {  // Enter key
+        main();
+    } else if (keyCode === 27) {  // Esc key
+        process.exit(0);
+    }
+}
+
+main();
+process.stdin.setRawMode(true);
+process.stdin.resume();
+process.stdin.on('data', onKeyPress);

dist/better-xcloud.meta.js

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

eslint.config.mjs

@@ -0,0 +1,3 @@
+import compat from "eslint-plugin-compat";
+
+export default [compat.configs['flat/recommended']];

package.json

@@ -2,6 +2,9 @@
   "name": "better-xcloud",
   "module": "src/index.ts",
   "type": "module",
+  "browserslist": [
+    "Chrome >= 80"
+  ],
   "bin": {
     "build": "build.ts"
   },
@@ -9,6 +12,8 @@
     "@types/bun": "^1.1.6",
     "@types/node": "^20.14.12",
     "@types/stylus": "^0.48.42",
+    "eslint": "^9.8.0",
+    "eslint-plugin-compat": "^6.0.0",
     "stylus": "^0.63.0"
   },
   "peerDependencies": {

src/assets/css/button.styl

@@ -141,9 +141,8 @@
         border-radius: 10px;
     }
 
-    &:focus-visible::after {
+    &:focus::after {
         offset = -6px;
-
         content: '';
         border-color: white;
         position: absolute;
@@ -153,6 +152,13 @@
         bottom: offset;
     }
 
+    body[data-input-mode=Touch] &,
+    body[data-input-mode=Mouse] & {
+        &:focus::after {
+            border-color: transparent !important;
+        }
+    }
+
     &.bx-circular {
         &::after {
             border-radius: var(--bx-button-height);
@@ -177,7 +183,7 @@ button.bx-inactive {
 .bx-button-shortcut {
     max-width: max-content;
     margin: 10px 0 0 0;
-    overflow: hidden;
+    flex: 1 0 auto;
 }
 
 @media (min-width: 568px) and (max-height: 480px) {

src/assets/css/root.styl

@@ -26,20 +26,22 @@ button_color(name, normal, hover, active, disabled)
     button_color('primary', #008746, #04b358, #044e2a, #448262);
     button_color('danger', #c10404, #e61d1d, #a26c6c, #df5656);
 
-    --bx-toast-z-index: 9999;
-    --bx-dialog-z-index: 9101;
-    --bx-dialog-overlay-z-index: 9100;
-    --bx-stats-bar-z-index: 9010;
-    --bx-mkb-pointer-lock-msg-z-index: 9000;
+    --bx-fullscreen-text-z-index: 9999;
+    --bx-toast-z-index: 6000;
+    --bx-dialog-z-index: 5000;
 
-    --bx-navigation-dialog-z-index: 8999;
-    --bx-navigation-dialog-overlay-z-index: 8998;
+    --bx-dialog-overlay-z-index: 4020;
+    --bx-stats-bar-z-index: 4010;
+    --bx-mkb-pointer-lock-msg-z-index: 4000;
+
+    --bx-navigation-dialog-z-index: 3010;
+    --bx-navigation-dialog-overlay-z-index: 3000;
 
     --bx-remote-play-popup-z-index: 2000;
 
     --bx-game-bar-z-index: 1000;
     --bx-wait-time-box-z-index: 100;
-    --bx-screenshot-animation-z-index: 1;
+    --bx-screenshot-animation-z-index: 10;
 }
 
 @font-face {
@@ -190,3 +192,36 @@ div[class*=SupportedInputsBadge] {
         font-weight: bold;
     }
 }
+
+
+.bx-fullscreen-text {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: #000000cc;
+    z-index: var(--bx-fullscreen-text-z-index);
+    line-height: 100vh;
+    color: #fff;
+    text-align: center;
+    font-weight: 400;
+    font-family: var(--bx-normal-font);
+    font-size: 1.3rem;
+    user-select: none;
+    -webkit-user-select: none;
+}
+
+/* Device Code page */
+#root {
+    section[class*=DeviceCodePage-module__page] {
+        margin-left: 20px !important;
+        margin-right: 20px !important;
+        margin-top: 20px !important;
+        max-width: 800px !important;
+    }
+
+    div[class*=DeviceCodePage-module__back] {
+        display: none;
+    }
+}

src/index.ts

@@ -20,7 +20,7 @@ import { RemotePlay } from "@modules/remote-play";
 import { onHistoryChanged, patchHistoryMethod } from "@utils/history";
 import { VibrationManager } from "@modules/vibration-manager";
 import { overridePreloadState } from "@utils/preload-state";
-import { patchAudioContext, patchCanvasContext, patchMeControl, patchPointerLockApi, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
+import { disableAdobeAudienceManager, patchAudioContext, patchCanvasContext, patchMeControl, patchPointerLockApi, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
 import { AppInterface, STATES } from "@utils/global";
 import { injectStreamMenuButtons } from "@modules/stream/stream-ui";
 import { BxLogger } from "@utils/bx-logger";
@@ -36,6 +36,8 @@ import { ProductDetailsPage } from "./modules/ui/product-details";
 import { NavigationDialogManager } from "./modules/ui/dialog/navigation-dialog";
 import { PrefKey } from "./enums/pref-keys";
 import { getPref } from "./utils/settings-storages/global-settings-storage";
+import { compressCss } from "@macros/build" with {type: "macro"};
+import { SettingsNavigationDialog } from "./modules/ui/dialog/settings-dialog";
 
 
 // Handle login page
@@ -64,7 +66,7 @@ if (BX_FLAGS.SafariWorkaround && document.readyState !== 'loading') {
     window.stop();
 
     // Show the reloading overlay
-    const css = `
+    const css = compressCss(`
 .bx-reload-overlay {
     position: fixed;
     top: 0;
@@ -78,7 +80,7 @@ if (BX_FLAGS.SafariWorkaround && document.readyState !== 'loading') {
     font-family: "Segoe UI", Arial, Helvetica, sans-serif;
     font-size: 1.3rem;
 }
-`;
+`);
     const $fragment = document.createDocumentFragment();
     $fragment.appendChild(CE('style', {}, css));
     $fragment.appendChild(CE('div', {'class': 'bx-reload-overlay'}, t('safari-failed-message')));
@@ -110,13 +112,13 @@ document.addEventListener('readystatechange', e => {
         return;
     }
 
-    STATES.isSignedIn = (window as any).xbcUser?.isSignedIn;
+    STATES.isSignedIn = !!((window as any).xbcUser?.isSignedIn);
 
     if (STATES.isSignedIn) {
         // Preload Remote Play
-        getPref(PrefKey.REMOTE_PLAY_ENABLED) && BX_FLAGS.PreloadRemotePlay && RemotePlay.preload();
+        getPref(PrefKey.REMOTE_PLAY_ENABLED) && RemotePlay.preload();
     } else {
-        // Show Settings button in the header when not signed
+        // Show Settings button in the header when not signed in
         HeaderSection.watchHeader();
     }
 
@@ -144,9 +146,13 @@ window.history.replaceState = patchHistoryMethod('replaceState');
 window.addEventListener(BxEvent.XCLOUD_SERVERS_UNAVAILABLE, e => {
     STATES.supportedRegion = false;
     window.setTimeout(HeaderSection.watchHeader, 2000);
+
+    // Open Settings dialog on Unsupported page
+    SettingsNavigationDialog.getInstance().show();
 });
 
 window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => {
+    STATES.isSignedIn = true;
     HeaderSection.watchHeader();
 });
 
@@ -313,7 +319,11 @@ function main() {
     AppInterface && patchPointerLockApi();
 
     getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && patchAudioContext();
-    getPref(PrefKey.BLOCK_TRACKING) && patchMeControl();
+
+    if (getPref(PrefKey.BLOCK_TRACKING)) {
+        patchMeControl();
+        disableAdobeAudienceManager();
+    }
 
     STATES.userAgent.capabilities.touch && TouchController.updateCustomList();
     overridePreloadState();

src/macros/build.ts

@@ -1,18 +1,19 @@
 import stylus from 'stylus';
 
-import cssStr from "@assets/css/styles.styl" with { type: "text" };
+export const renderStylus = async () => {
+    const file = Bun.file('./src/assets/css/styles.styl');
+    const cssStr = await file.text();
 
-const generatedCss = await (stylus(cssStr, {})
-	.set('filename', 'styles.css')
-	.set('compress', true)
-	.include('src/assets/css/'))
-	.render();
+    const generatedCss = await (stylus(cssStr, {})
+        .set('filename', 'styles.css')
+        .set('compress', true)
+        .include('src/assets/css/'))
+        .render();
 
-export const renderStylus = () => {
     return generatedCss;
 };
 
 
 export const compressCss = async (css: string) => {
-	return await (stylus(css, {}).set('compress', true)).render();
+    return await (stylus(css, {}).set('compress', true)).render();
 };

src/modules/patcher.ts

@@ -140,16 +140,6 @@ if (!!window.BX_REMOTE_PLAY_CONFIG) {
         return str.replace(text, text + newCode);
     },
 
-    // Disable trackEvent() function
-    disableTrackEvent(str: string) {
-        const text = 'this.trackEvent=';
-        if (!str.includes(text)) {
-            return false;
-        }
-
-        return str.replace(text, 'this.trackEvent=e=>{},this.uwuwu=');
-    },
-
     // Block WebRTC stats collector
     blockWebRtcStatsCollector(str: string) {
         const text = 'this.shouldCollectStats=!0';
@@ -760,7 +750,7 @@ true` + text;
             return false;
         }
 
-        index = str.indexOf('const ', index - 100);
+        index = str.indexOf('const ', index - 30);
         if (index < 0) {
             return false;
         }
@@ -915,7 +905,6 @@ let PATCH_ORDERS: PatchArray = [
         'disableIndexDbLogging',
 
         'disableTelemetryProvider',
-        'disableTrackEvent',
     ] : []),
 
     ...(getPref(PrefKey.REMOTE_PLAY_ENABLED) ? [

src/modules/ui/dialog/settings-dialog.ts

@@ -24,6 +24,7 @@ import { PrefKey, StorageKey } from "@/enums/pref-keys";
 import { getPref, getPrefDefinition, setPref } from "@/utils/settings-storages/global-settings-storage";
 import { SettingElement } from "@/utils/setting-element";
 import type { SettingDefinition } from "@/types/setting-definition";
+import { FullscreenText } from "../fullscreen-text";
 
 
 type SettingTabContentItem = Partial<{
@@ -40,8 +41,8 @@ type SettingTabContentItem = Partial<{
 }>
 
 type SettingTabContent = {
-    group: 'general' | 'server' | 'stream' | 'game-bar' | 'co-op' | 'mkb' | 'touch-control' | 'loading-screen' | 'ui' | 'other' | 'advanced' | 'audio' | 'video' | 'controller' | 'native-mkb' | 'stats' | 'controller-shortcuts';
-    label: string;
+    group: 'general' | 'server' | 'stream' | 'game-bar' | 'co-op' | 'mkb' | 'touch-control' | 'loading-screen' | 'ui' | 'other' | 'advanced' | 'footer' | 'audio' | 'video' | 'controller' | 'native-mkb' | 'stats' | 'controller-shortcuts';
+    label?: string;
     note?: string | Text | null;
     unsupported?: boolean;
     helpUrl?: string;
@@ -69,7 +70,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
     private $settings!: HTMLElement;
 
     private $btnReload!: HTMLElement;
-    private $btnGlobalReload!: HTMLElement;
+    private $btnGlobalReload!: HTMLButtonElement;
     private $noteGlobalReload!: HTMLElement;
 
     private renderFullSettings: boolean;
@@ -103,6 +104,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
                         style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
                         onClick: e => {
                             AppInterface.openAppSettings && AppInterface.openAppSettings();
+                            this.hide();
                         },
                     }));
                 } else {
@@ -122,11 +124,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
                     classes: ['bx-settings-reload-button', 'bx-gone'],
                     style: ButtonStyle.FOCUSABLE | ButtonStyle.FULL_WIDTH,
                     onClick: e => {
-                        const $target = (e.target as HTMLButtonElement).closest('button')!;
-                        $target.disabled = true;
-                        $target.firstElementChild!.textContent = t('settings-reloading');
-
-                        window.location.reload();
+                        this.reloadPage();
                     },
                 });
 
@@ -273,7 +271,10 @@ export class SettingsNavigationDialog extends NavigationDialog {
                     });
                 },
             },
-
+        ],
+    }, {
+        group: 'footer',
+        items: [
             // Donation link
             ($parent) => {
                 $parent.appendChild(CE('a', {
@@ -320,7 +321,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
                 );
 
                 $parent.appendChild($debugInfo);
-            }
+            },
         ],
     }];
 
@@ -607,7 +608,13 @@ export class SettingsNavigationDialog extends NavigationDialog {
         }
     }
 
-    onUnmounted(): void {
+    private reloadPage() {
+        this.$btnGlobalReload.disabled = true;
+        this.$btnGlobalReload.firstElementChild!.textContent = t('settings-reloading');
+
+        this.hide();
+        FullscreenText.getInstance().show(t('settings-reloading'));
+        window.location.reload();
     }
 
     private renderTab(settingTab: SettingTab) {
@@ -851,8 +858,7 @@ export class SettingsNavigationDialog extends NavigationDialog {
                         icon: BxIcon.REFRESH,
                         style: ButtonStyle.FOCUSABLE | ButtonStyle.DROP_SHADOW,
                         onClick: e => {
-                            window.location.reload();
-                            this.dialogManager.hide();
+                            this.reloadPage();
                         },
                     }),
 
@@ -920,8 +926,8 @@ export class SettingsNavigationDialog extends NavigationDialog {
                 }
 
                 // Don't render other settings in unsupported regions
-                if (!this.renderFullSettings && settingTab.group === 'global' && settingTabContent.group !== 'general') {
-                    break;
+                if (!this.renderFullSettings && settingTab.group === 'global' && settingTabContent.group !== 'general' && settingTabContent.group !== 'footer') {
+                    continue;
                 }
 
                 let label = settingTabContent.label;
@@ -936,21 +942,23 @@ export class SettingsNavigationDialog extends NavigationDialog {
                     });
                 }
 
-                const $title = CE('h2', {
-                    _nearby: {
-                        orientation: 'horizontal',
-                    }
-                },
-                    CE('span', {}, label),
-                    settingTabContent.helpUrl && createButton({
-                            icon: BxIcon.QUESTION,
-                            style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE,
-                            url: settingTabContent.helpUrl,
-                            title: t('help'),
-                        }),
-                );
+                if (label) {
+                    const $title = CE('h2', {
+                        _nearby: {
+                            orientation: 'horizontal',
+                        }
+                    },
+                        CE('span', {}, label),
+                        settingTabContent.helpUrl && createButton({
+                                icon: BxIcon.QUESTION,
+                                style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE,
+                                url: settingTabContent.helpUrl,
+                                title: t('help'),
+                            }),
+                    );
 
-                $tabContent.appendChild($title);
+                    $tabContent.appendChild($title);
+                }
 
                 // Add note
                 if (settingTabContent.note) {

src/modules/ui/fullscreen-text.ts

@@ -0,0 +1,33 @@
+import { CE } from "@/utils/html";
+
+export class FullscreenText {
+    private static instance: FullscreenText;
+    public static getInstance(): FullscreenText {
+        if (!FullscreenText.instance) {
+            FullscreenText.instance = new FullscreenText();
+        }
+        return FullscreenText.instance;
+    }
+
+    $text: HTMLElement;
+
+    constructor() {
+        this.$text = CE('div', {
+            class: 'bx-fullscreen-text bx-gone',
+        });
+
+        document.documentElement.appendChild(this.$text);
+    }
+
+    show(msg: string) {
+        document.body.classList.add('bx-no-scroll');
+
+        this.$text.classList.remove('bx-gone');
+        this.$text.textContent = msg;
+    }
+
+    hide() {
+        document.body.classList.remove('bx-no-scroll');
+        this.$text.classList.add('bx-gone');
+    }
+}

src/modules/ui/header.ts

@@ -58,8 +58,11 @@ export class HeaderSection {
 
     static checkHeader() {
         if (!HeaderSection.#$buttonsWrapper.isConnected) {
-            const $rightHeader = document.querySelector('#PageContent div[class*=EdgewaterHeader-module__rightSectionSpacing]');
-            HeaderSection.#injectSettingsButton($rightHeader as HTMLElement);
+            let $target = document.querySelector('#PageContent div[class*=EdgewaterHeader-module__rightSectionSpacing]');
+            if (!$target) {
+                $target = document.querySelector("div[class^=UnsupportedMarketPage-module__buttons]");
+            }
+            $target && HeaderSection.#injectSettingsButton($target as HTMLElement);
         }
     }
 
@@ -68,8 +71,8 @@ export class HeaderSection {
     }
 
     static watchHeader() {
-        const $header = document.querySelector('#PageContent header');
-        if (!$header) {
+        let $root = document.querySelector('#PageContent header') || document.querySelector('#root');
+        if (!$root) {
             return;
         }
 
@@ -78,7 +81,7 @@ export class HeaderSection {
             HeaderSection.#timeout && clearTimeout(HeaderSection.#timeout);
             HeaderSection.#timeout = window.setTimeout(HeaderSection.checkHeader, 2000);
         });
-        HeaderSection.#observer.observe($header, {subtree: true, childList: true});
+        HeaderSection.#observer.observe($root, {subtree: true, childList: true});
 
         HeaderSection.checkHeader();
     }

src/modules/ui/product-details.ts

@@ -19,7 +19,7 @@ export class ProductDetailsPage {
     private static shortcutTimeoutId: number | null = null;
 
     static injectShortcutButton() {
-        if (!AppInterface || BX_FLAGS.DeviceInfo!.deviceType !== 'android') {
+        if (!AppInterface || BX_FLAGS.DeviceInfo.deviceType !== 'android') {
             return;
         }
 

src/types/network.ts

@@ -0,0 +1,3 @@
+export type RemotePlayConsoleAddresses = {
+    [key: string]: number[],
+}

src/utils/bx-flags.ts

@@ -1,26 +1,20 @@
-type BxFlags = Partial<{
+type BxFlags = {
     CheckForUpdate: boolean;
-    PreloadRemotePlay: boolean;
-    PreloadUi: boolean;
     EnableXcloudLogging: boolean;
     SafariWorkaround: boolean;
 
     ForceNativeMkbTitles: string[];
     FeatureGates: {[key: string]: boolean} | null,
 
-    IsSupportedTvBrowser: boolean,
-
-    DeviceInfo: Partial<{
+    DeviceInfo: {
         deviceType: 'android' | 'android-tv' | 'webos' | 'unknown',
         userAgent?: string,
-    }>,
-}>
+    }
+}
 
 // Setup flags
 const DEFAULT_FLAGS: BxFlags = {
     CheckForUpdate: true,
-    PreloadRemotePlay: true,
-    PreloadUi: false,
     EnableXcloudLogging: false,
     SafariWorkaround: true,
 
@@ -37,8 +31,8 @@ try {
     delete window.BX_FLAGS;
 } catch (e) {}
 
-if (!BX_FLAGS.DeviceInfo!.userAgent) {
-    BX_FLAGS.DeviceInfo!.userAgent = window.navigator.userAgent;
+if (!BX_FLAGS.DeviceInfo.userAgent) {
+    BX_FLAGS.DeviceInfo.userAgent = window.navigator.userAgent;
 }
 
 export const NATIVE_FETCH = window.fetch;

src/utils/monkey-patches.ts

@@ -201,6 +201,14 @@ export function patchMeControl() {
     (window as any).MeControl = new Proxy(MeControl, MeControlHandler);
 }
 
+
+/**
+ * Disable Adobe Audience Manager (AAM)
+ */
+export function disableAdobeAudienceManager() {
+    (window as any).adobe = Object.freeze({});
+}
+
 /**
  * Use power-saving flags for touch control
  */

src/utils/network.ts

@@ -9,6 +9,7 @@ import { XhomeInterceptor } from "./xhome-interceptor";
 import { XcloudInterceptor } from "./xcloud-interceptor";
 import { PrefKey } from "@/enums/pref-keys";
 import { getPref } from "./settings-storages/global-settings-storage";
+import type { RemotePlayConsoleAddresses } from "@/types/network";
 
 type RequestType = 'xcloud' | 'xhome';
 
@@ -39,7 +40,7 @@ function clearAllLogs() {
     clearDbLogs('XCloudAppLogs', 'logs');
 }
 
-function updateIceCandidates(candidates: any, options: any) {
+function updateIceCandidates(candidates: any, options: {preferIpv6Server: boolean, consoleAddrs?: RemotePlayConsoleAddresses}) {
     const pattern = new RegExp(/a=candidate:(?<foundation>\d+) (?<component>\d+) UDP (?<priority>\d+) (?<ip>[^\s]+) (?<port>\d+) (?<the_rest>.*)/);
 
     const lst = [];
@@ -83,9 +84,9 @@ function updateIceCandidates(candidates: any, options: any) {
 
     if (options.consoleAddrs) {
         for (const ip in options.consoleAddrs) {
-            const port = options.consoleAddrs[ip];
-
-            newCandidates.push(newCandidate(`a=candidate:${newCandidates.length + 1} 1 UDP 1 ${ip} ${port} typ host`));
+            for (const port of options.consoleAddrs[ip]) {
+                newCandidates.push(newCandidate(`a=candidate:${newCandidates.length + 1} 1 UDP 1 ${ip} ${port} typ host`));
+            }
         }
     }
 
@@ -96,7 +97,7 @@ function updateIceCandidates(candidates: any, options: any) {
 }
 
 
-export async function patchIceCandidates(request: Request, consoleAddrs?: {[index: string]: number}) {
+export async function patchIceCandidates(request: Request, consoleAddrs?: RemotePlayConsoleAddresses) {
     const response = await NATIVE_FETCH(request);
     const text = await response.clone().text();
 

src/utils/settings-storages/global-settings-storage.ts

@@ -44,11 +44,11 @@ function getSupportedCodecProfiles() {
         }
     }
 
-    if (hasHighCodec) {
-        if (!hasLowCodec && !hasNormalCodec) {
-            options.default = `${t('visual-quality-high')} (${t('default')})`;
+    if (hasLowCodec) {
+        if (!hasNormalCodec && !hasHighCodec) {
+            options.default = `${t('visual-quality-low')} (${t('default')})`;
         } else {
-            options.high = t('visual-quality-high');
+            options.low = t('visual-quality-low');
         }
     }
 
@@ -60,11 +60,11 @@ function getSupportedCodecProfiles() {
         }
     }
 
-    if (hasLowCodec) {
-        if (!hasNormalCodec && !hasHighCodec) {
-            options.default = `${t('visual-quality-low')} (${t('default')})`;
+    if (hasHighCodec) {
+        if (!hasLowCodec && !hasNormalCodec) {
+            options.default = `${t('visual-quality-high')} (${t('default')})`;
         } else {
-            options.low = t('visual-quality-low');
+            options.high = t('visual-quality-high');
         }
     }
 
@@ -140,8 +140,8 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
             default: 'auto',
             options: {
                 auto: t('default'),
-                '1080p': '1080p',
                 '720p': '720p',
+                '1080p': '1080p',
             },
         },
         [PrefKey.STREAM_CODEC_PROFILE]: {
@@ -457,7 +457,7 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
 
         [PrefKey.UI_CONTROLLER_FRIENDLY]: {
             label: t('controller-friendly-ui'),
-            default: BX_FLAGS.DeviceInfo!.deviceType !== 'unknown',
+            default: BX_FLAGS.DeviceInfo.deviceType !== 'unknown',
         },
 
         [PrefKey.UI_LAYOUT]: {
@@ -512,7 +512,7 @@ export class GlobalSettingsStorage extends BaseSettingsStorage {
         [PrefKey.USER_AGENT_PROFILE]: {
             label: t('user-agent-profile'),
             note: '⚠️ ' + t('unexpected-behavior'),
-            default: BX_FLAGS.DeviceInfo!.deviceType === 'android-tv' ? UserAgentProfile.VR_OCULUS : 'default',
+            default: (BX_FLAGS.DeviceInfo.deviceType === 'android-tv' || BX_FLAGS.DeviceInfo.deviceType === 'webos') ? UserAgentProfile.VR_OCULUS : 'default',
             options: {
                 [UserAgentProfile.DEFAULT]: t('default'),
                 [UserAgentProfile.WINDOWS_EDGE]: 'Edge + Windows',

src/utils/user-agent.ts

@@ -36,7 +36,7 @@ export class UserAgent {
     static init() {
         UserAgent.#config = JSON.parse(window.localStorage.getItem(UserAgent.STORAGE_KEY)  || '{}') as UserAgentConfig;
         if (!UserAgent.#config.profile) {
-            UserAgent.#config.profile = UserAgentProfile.DEFAULT;
+            UserAgent.#config.profile = (BX_FLAGS.DeviceInfo.deviceType === 'android-tv' || BX_FLAGS.DeviceInfo.deviceType === 'webos') ? UserAgentProfile.VR_OCULUS : UserAgentProfile.DEFAULT;
         }
 
         if (!UserAgent.#config.custom) {
@@ -120,14 +120,11 @@ export class UserAgent {
 
         let newUserAgent = UserAgent.get(profile);
 
-        // Pretend to be Tizen TV
-        if (BX_FLAGS.IsSupportedTvBrowser) {
-            newUserAgent += ` SmartTV ${SMART_TV_UNIQUE_ID}`;
-        }
-
         // Clear data of navigator.userAgentData, force xCloud to detect browser based on navigator.userAgent
-        (window.navigator as any).orgUserAgentData = (window.navigator as any).userAgentData;
-        Object.defineProperty(window.navigator, 'userAgentData', {});
+        if ('userAgentData' in window.navigator) {
+            (window.navigator as any).orgUserAgentData = (window.navigator as any).userAgentData;
+            Object.defineProperty(window.navigator, 'userAgentData', {});
+        }
 
         // Override navigator.userAgent
         (window.navigator as any).orgUserAgent = window.navigator.userAgent;

src/utils/xhome-interceptor.ts

@@ -7,9 +7,10 @@ import { STATES } from "./global";
 import { patchIceCandidates } from "./network";
 import { PrefKey } from "@/enums/pref-keys";
 import { getPref } from "./settings-storages/global-settings-storage";
+import type { RemotePlayConsoleAddresses } from "@/types/network";
 
 export class XhomeInterceptor {
-    static #consoleAddrs: {[index: string]: number} = {};
+    static #consoleAddrs: RemotePlayConsoleAddresses = {};
 
     static async #handleLogin(request: Request) {
         try {
@@ -39,17 +40,25 @@ export class XhomeInterceptor {
         const obj = await response.clone().json()
         console.log(obj);
 
+        const processPorts = (port: number): number[] => {
+            const ports = new Set<number>();
+            ports.add(port);
+            ports.add(9002);
+
+            return Array.from(ports);
+        };
+
         const serverDetails = obj.serverDetails;
         if (serverDetails.ipAddress) {
-            XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = serverDetails.port;
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = processPorts(serverDetails.port);
         }
 
         if (serverDetails.ipV4Address) {
-            XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = serverDetails.ipV4Port;
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = processPorts(serverDetails.ipV4Port);
         }
 
         if (serverDetails.ipV6Address) {
-            XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = serverDetails.ipV6Port;
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = processPorts(serverDetails.ipV6Port);
         }
 
         response.json = () => Promise.resolve(obj);