Bump version to 5.3.0

This reverts commit 91ab57fa29.

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -11,12 +11,21 @@ body:
       options:
         - label: I will only use English in my report.
           required: true
-        - label: "The bug doesn't happen when I disable Better xCloud script."
-          required: true
         - label: I have used the search function for [**open and closed issues**](https://github.com/redphx/better-xcloud/issues?q=is%3Aissue) to see if someone else has already submitted the same bug report.
           required: true
         - label: I will describe the problem with as much detail as possible.
           required: true
+  - type: checkboxes
+    id: questions
+    attributes:
+      label: Questions
+      options:
+        - label: xCloud officially supports my country/region.
+          required: false
+        - label: "The bug doesn't happen when I disable Better xCloud script."
+          required: false
+        - label: "The bug didn't happen in previous Better xCloud version (name which one)."
+          required: false
   - type: dropdown
     id: device_type
     attributes:
@@ -50,9 +59,9 @@ body:
   - type: input
     id: browser_version
     attributes:
-      label: "Browser Version"
+      label: "Android app/Browser Version"
-      description: "What is the name and version of the browser?"
+      description: "What is the name and version of the browser/Android app?"
-      placeholder: "e.g., Chrome 124.0"
+      placeholder: "e.g., Chrome 124.0, Android app 0.15.0"
     validations:
       required: true
   - type: input

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "files.readonlyInclude": {
+    "dist/**/*": true
+  }
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "type": "typescript",
+      "tsconfig": "tsconfig.json",
+      "option": "watch",
+      "problemMatcher": [
+        "$tsc-watch"
+      ],
+      "group": "build",
+      "label": "tsc: watch - tsconfig.json"
+    }
+  ]
+}

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2023 redphx
+Copyright (c) 2023 Advanced Micro Devices, Inc.
 Copyright (c) 2020 Phosphor Icons
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -5,7 +5,9 @@ Improve Xbox Cloud Gaming (xCloud) experience on [xbox.com/play](https://www.xbo
 > The Android app is in development at [redphx/better-xcloud-android](https://github.com/redphx/better-xcloud-android)
 
 > [!IMPORTANT]
-> I don't accept pull requests at the moment (except PR for custom touch controls)
+> I only accept pull requests for:
+> - Custom touch controls
+> - Bug fixes
 
 **Supported platforms:**  
 - Windows
@@ -21,50 +23,15 @@ If you like this project please give it a 🌟. Thank you 🙏.
 [![Total downloads](https://img.shields.io/github/downloads/redphx/better-xcloud/total?color=%23e15f2c)](https://github.com/redphx/better-xcloud/releases) 
 [![Total stars](https://img.shields.io/github/stars/redphx/better-xcloud?color=%23cca400)](https://github.com/redphx/better-xcloud/stargazers)  
 
+## How to install
+Visit the [home page](https://better-xcloud.github.io) to know how to install Better xCloud on your device.
+
 ## Full documentations
-- For the full details please visit: https://better-xcloud.github.io  
+- For the full details please visit: [**better-xcloud.github.io**](https://better-xcloud.github.io)  
 - [Demo video](https://youtu.be/hyp69Jrb2sQ)
 
 ⚠️ Please DO NOT report **Better xCloud**'s bugs on [/r/xcloud subreddit](https://reddit.com/r/xcloud/). Report bugs in [Issues](https://github.com/redphx/better-xcloud/issues) or [Telegram channel](https://t.me/betterxcloud) instead.
 
-## Table of Contents
-- [**How to install**](#how-to-install)
-- [**Features**](#features)
-- [**Donation**](#donation)
-- [**Acknowledgements**](#acknowledgements)
-- [**Disclaimers**](#disclaimers)
-
-## How to install
-Visit [this page](https://better-xcloud.github.io/browsers) to know how to install Better xCloud on your device.
-
-## Features
-
-<img width="400" alt="Settings UI" src="https://github.com/redphx/better-xcloud/assets/96280/4bec2d62-31df-499c-9aad-2485626b6925">
-<br>
-<img width="400" alt="Remote Play dialog" src="https://github.com/redphx/better-xcloud/assets/96280/daf7f698-a228-4f9c-8f23-9669e061a64c">
-<br>
-<img width="600" alt="Stream HUD" src="https://github.com/redphx/better-xcloud/assets/96280/51bdb96c-79ab-402f-902a-a9e6229973b2">
-<br>
-<img width="600" alt="Stream settings" src="https://github.com/redphx/better-xcloud/assets/96280/ed513cb3-6e6c-4e8e-9e06-c62e71e41c90">
-<br>
-<img width="600" alt="Remapper" src="https://github.com/redphx/better-xcloud/assets/96280/f2e2bc51-f673-4b24-b127-c7169b86462b">
-
-
-&nbsp;  
-  
-**Demo video:** [https://youtu.be/oDr5Eddp55E  ](https://youtu.be/AYb-EUcz72U)  
-- **🔥 Totally free and open-source**
-- **🔥 Allow playing with [Mouse & Keyboard](https://better-xcloud.github.io/mouse-and-keyboard)**
-- **🔥 Enable [Remote Play](https://better-xcloud.github.io/remote-play) support**  
-  > 1080p resolution and can stream Xbox 360 games.  
-- **🔥 [Improve visual quality](https://better-xcloud.github.io/ingame-features/#improve-streams-clarity) of the stream**  
-  > Similar to (but not as good as) the "Clarity Boost" of xCloud on Edge browser. [Demo video](https://youtu.be/ZhW2choAHUs). 
-- **🔥 Show [Stream stats](https://better-xcloud.github.io/stream-stats)**  
-- **🔥 [Screenshot capture](https://better-xcloud.github.io/screenshot-capture)**
-- **🔥 [Touch controller](https://better-xcloud.github.io/features/#touch-controller)**
-  > Enable touch controller support for all games.
-- [And more...](https://better-xcloud.github.io/features/)
-
 ## Donation
 If you think this project is useful and want to support future developments, please consider making a donate via [my Ko-fi page](https://ko-fi.com/redphx).  
 Or you can give this project a star, that's also helpful.  

build.ts

@@ -4,12 +4,13 @@ import { parseArgs } from "node:util";
 import { sys } from "typescript";
 import txtScriptHeader from "./src/assets/header_script.txt" with { type: "text" };
 import txtMetaHeader from "./src/assets/header_meta.txt" with { type: "text" };
+import { assert } from "node:console";
 
 enum BuildTarget {
-	ALL = 'all',
+    ALL = 'all',
-	ANDROID_APP = 'android-app',
+    ANDROID_APP = 'android-app',
-	MOBILE = 'mobile',
+    MOBILE = 'mobile',
-	WEBOS = 'webos',
+    WEBOS = 'webos',
 }
 
 const postProcess = (str: string): string => {
@@ -21,83 +22,88 @@ const postProcess = (str: string): string => {
     // Replace "globalThis." with "var";
     str = str.replaceAll('globalThis.', 'var ');
 
-	// Add ADDITIONAL CODE block
+    // Add ADDITIONAL CODE block
-	str = str.replace('var DEFAULT_FLAGS', '\n/* ADDITIONAL CODE */\n\nvar DEFAULT_FLAGS');
+    str = str.replace('var DEFAULT_FLAGS', '\n/* ADDITIONAL CODE */\n\nvar DEFAULT_FLAGS');
+
+    assert(str.includes('/* ADDITIONAL CODE */'));
 
     return str;
 }
 
 const build = async (target: BuildTarget, version: string, config: any={}) => {
-	console.log('-- Target:', target);
+    console.log('-- Target:', target);
-	const startTime = performance.now();
+    const startTime = performance.now();
 
-	let outputScriptName = 'better-xcloud';
+    let outputScriptName = 'better-xcloud';
-	if (target !== BuildTarget.ALL) {
+    if (target !== BuildTarget.ALL) {
-		outputScriptName += `.${target}`;
+        outputScriptName += `.${target}`;
-	}
+    }
-	let outputMetaName = outputScriptName;
+    let outputMetaName = outputScriptName;
-	outputScriptName += '.user.js';
+    outputScriptName += '.user.js';
-	outputMetaName += '.meta.js';
+    outputMetaName += '.meta.js';
 
-	const outDir = './dist';
+    const outDir = './dist';
 
-	let output = await Bun.build({
+    let output = await Bun.build({
-		entrypoints: ['src/index.ts'],
+        entrypoints: ['src/index.ts'],
-		outdir: outDir,
+        outdir: outDir,
-		naming: outputScriptName,
+        naming: outputScriptName,
-		define: {
+        minify: {
-			'Bun.env.BUILD_TARGET': JSON.stringify(target),
+            syntax: true,
-			'Bun.env.SCRIPT_VERSION': JSON.stringify(version),
+        },
-		},
+        define: {
-	});
+            'Bun.env.BUILD_TARGET': JSON.stringify(target),
+            'Bun.env.SCRIPT_VERSION': JSON.stringify(version),
+        },
+    });
 
-	if (!output.success) {
+    if (!output.success) {
-		console.log(output);
+        console.log(output);
-		process.exit(1);
+        process.exit(1);
-	}
+    }
 
-	const {path} = output.outputs[0];
+    const {path} = output.outputs[0];
-	// Get generated file
+    // Get generated file
-	let result = postProcess(await readFile(path, 'utf-8'));
+    let result = postProcess(await readFile(path, 'utf-8'));
 
-	// Replace [[VERSION]] with real value
+    // Replace [[VERSION]] with real value
-	const scriptHeader = txtScriptHeader.replace('[[VERSION]]', version);
+    const scriptHeader = txtScriptHeader.replace('[[VERSION]]', version);
 
-	// Save to script
+    // Save to script
-	await Bun.write(path, scriptHeader + result);
+    await Bun.write(path, scriptHeader + result);
-	console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);
+    console.log(`---- [${target}] done in ${performance.now() - startTime} ms`);
 
-	// Create meta file
+    // Create meta file
-	await Bun.write(outDir + '/' + outputMetaName, txtMetaHeader.replace('[[VERSION]]', version));
+    await Bun.write(outDir + '/' + outputMetaName, txtMetaHeader.replace('[[VERSION]]', version));
 }
 
 const buildTargets = [
-	BuildTarget.ALL,
+    BuildTarget.ALL,
-	// BuildTarget.ANDROID_APP,
+    // BuildTarget.ANDROID_APP,
-	// BuildTarget.MOBILE,
+    // BuildTarget.MOBILE,
-	// BuildTarget.WEBOS,
+    // BuildTarget.WEBOS,
 ];
 
 const { values, positionals } = parseArgs({
-	args: Bun.argv,
+    args: Bun.argv,
-	options: {
+    options: {
-	  version: {
+      version: {
-		type: 'string',
+        type: 'string',
 
-	  },
+      },
-	},
+    },
-	strict: true,
+    strict: true,
-	allowPositionals: true,
+    allowPositionals: true,
   });
 
 if (!values['version']) {
-	console.log('Missing --version param');
+    console.log('Missing --version param');
-	sys.exit(-1);
+    sys.exit(-1);
 }
 
 console.log('Building: ', values['version']);
 
 const config = {};
 for (const target of buildTargets) {
-	await build(target, values['version'], config);
+    await build(target, values['version']!!, config);
 }

dist/better-xcloud.meta.js

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

package.json

@@ -6,12 +6,12 @@
     "build": "build.ts"
   },
   "devDependencies": {
-    "@types/bun": "^1.1.3",
+    "@types/bun": "^1.1.6",
-    "@types/node": "^20.13.0",
+    "@types/node": "^20.14.10",
     "@types/stylus": "^0.48.42",
     "stylus": "^0.63.0"
   },
   "peerDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   }
 }

scripts/custom-flags.user.js

@@ -0,0 +1,41 @@
+// ==UserScript==
+// @name         Better xCloud - Custom flags
+// @namespace    https://github.com/redphx
+// @version      1.0.0
+// @description  Customize Better xCloud script
+// @author       redphx
+// @license      MIT
+// @match        https://www.xbox.com/*/play*
+// @run-at       document-start
+// @grant        none
+// ==/UserScript==
+'use strict';
+
+/*
+Make sure this script is being loaded before the Better xCloud script.
+
+How to:
+1. Uninstall Better xCloud script.
+2. Install this script.
+3. Reinstall Better xCloud script. All your settings are still there.
+*/
+
+// Change this to `false` if you want to temporary disable the script
+const enabled = true;
+
+enabled && (window.BX_FLAGS = {
+    /*
+    Add titleId of the game(s) you want to add here.
+    Keep in mind: this method only works with some games.
+
+    Example:
+        - Flight Simulator has this link: /play/games/microsoft-flight-simulator-standard-40th-anniversa/9PMQDM08SNK9
+        - That means its titleId is "9PMQDM08SNK9"
+        - So it becomes:
+            ForceNativeMkbTitles: [
+                "9PMQDM08SNK9",
+            ],
+    */
+    ForceNativeMkbTitles: [
+    ],
+});

src/assets/css/button.styl

@@ -59,6 +59,10 @@
         }
     }
 
+    &.bx-tall {
+        height: calc(var(--bx-button-height) * 1.5) !important;
+    }
+
     svg {
         display: inline-block;
         width: 16px;

src/assets/css/global-settings.styl

@@ -1,6 +1,5 @@
 .bx-settings-reload-button {
     margin-top: 10px;
-    height: calc(var(--bx-button-height) * 1.5);
 }
 
 .bx-settings-container {
@@ -30,6 +29,13 @@
         outline: none !important;
     }
 
+    .bx-top-buttons {
+        .bx-button {
+            display: block;
+            margin-bottom: 8px;
+        }
+    }
+
     .bx-settings-title-wrapper {
         display: flex;
         margin-bottom: 10px;
@@ -42,18 +48,21 @@
         text-decoration: none;
         font-weight: bold;
         display: block;
-        color: #5dc21e;
         flex: 1;
+        text-transform: none;
+        margin-right: 10px;
+
+        span {
+            color: #5dc21e !important;
+        }
 
         &:focus {
-            color: #83f73a;
+            span {
+                color: #83f73a !important;
+            }
         }
     }
 
-    .bx-button.bx-primary {
-        margin-top: 8px;
-    }
-
     a.bx-settings-update {
         display: block;
         color: #ff834b;

src/assets/css/mkb.styl

@@ -16,7 +16,6 @@
 }
 
 .bx-mkb-pointer-lock-msg {
-    cursor: pointer;
     user-select: none;
     -webkit-user-select: none;
     position: fixed;
@@ -24,7 +23,7 @@
     top: 50%;
     transform: translateX(-50%) translateY(-50%);
     margin: auto;
-    background: #000000b3;
+    background: #151515;
     z-index: var(--bx-mkb-pointer-lock-msg-z-index);
     color: #fff;
     text-align: center;
@@ -35,9 +34,11 @@
     border-radius: 8px;
     align-items: center;
     box-shadow: 0 0 6px #000;
+    min-width: 220px;
+    opacity: 0.9;
 
     &:hover {
-        background: #151515;
+        opacity: 1;
     }
 
     > div:first-of-type {
@@ -51,33 +52,46 @@
 
         &:first-child {
             font-size: 22px;
-            margin-bottom: 8px;
+            margin-bottom: 4px;
+            font-weight: bold;
         }
 
         &:last-child {
-            font-size: 14px;
+            font-size: 12px;
             font-style: italic;
         }
     }
 
     > div:last-of-type {
-        display: flex;
-        flex-flow: row;
         margin-top: 10px;
 
-        button {
+        &[data-type='native'] {
-            flex: 1;
+            button {
-
+                &:first-of-type {
-            &:first-of-type {
+                    margin-bottom: 8px;
-                margin-right: 5px;
+                }
-            }
-
-            &:last-of-type {
-                margin-left: 5px;
             }
         }
 
-        button
+        &[data-type='virtual'] {
+            div {
+                display: flex;
+                flex-flow: row;
+                margin-top: 8px;
+
+                button {
+                    flex: 1;
+
+                    &:first-of-type {
+                        margin-right: 5px;
+                    }
+
+                    &:last-of-type {
+                        margin-left: 5px;
+                    }
+                }
+            }
+        }
     }
 }
 

src/assets/css/number-stepper.styl

@@ -20,7 +20,6 @@
         font-weight: bold;
         font-size: 14px;
         font-family: var(--bx-monospaced-font);
-        color: #fff;
 
         &:hover {
             @media (hover: hover) {
@@ -47,4 +46,10 @@
     input[type=range]:disabled, button:disabled {
         display: none;
     }
+
+    &[data-disabled=true] {
+        input[type=range], button {
+            display: none;
+        }
+    }
 }

src/assets/css/root.styl

@@ -23,9 +23,10 @@
     --bx-dialog-z-index: 9101;
     --bx-dialog-overlay-z-index: 9100;
     --bx-remote-play-popup-z-index: 9090;
-    --bx-stats-bar-z-index: 9001;
+    --bx-stats-bar-z-index: 9010;
-    --bx-stream-settings-z-index: 9000;
+    --bx-stream-settings-z-index: 9001;
-    --bx-mkb-pointer-lock-msg-z-index: 8999;
+    --bx-mkb-pointer-lock-msg-z-index: 9000;
+    --bx-stream-settings-overlay-z-index: 8999;
     --bx-game-bar-z-index: 8888;
     --bx-wait-time-box-z-index: 100;
     --bx-screenshot-animation-z-index: 1;
@@ -79,6 +80,19 @@ div[class^=HUDButton-module__hiddenContainer] ~ div:not([class^=HUDButton-module
     visibility: hidden !important;
 }
 
+.bx-invisible {
+    opacity: 0;
+}
+
+.bx-unclickable {
+    pointer-events: none;
+}
+
+.bx-pixel {
+    width: 1px !important;
+    height: 1px !important;
+}
+
 .bx-no-margin {
     margin: 0 !important;
 }
@@ -91,6 +105,10 @@ div[class^=HUDButton-module__hiddenContainer] ~ div:not([class^=HUDButton-module
     font-family: var(--bx-promptfont-font);
 }
 
+select[multiple] {
+    overflow: auto;
+}
+
 /* Hide UI elements */
 #headerArea, #uhfSkipToMain, .uhf-footer {
     display: none;
@@ -107,3 +125,42 @@ div[class*=NotFocusedDialog] {
 #game-stream video:not([src]) {
     visibility: hidden;
 }
+
+/* Hide Controller icon in Game tiles */
+div[class*=SupportedInputsBadge] {
+    &:not(:has(:nth-child(2))), svg:first-of-type {
+        display: none;
+    }
+}
+
+
+.bx-game-tile-wait-time {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    background: #0000008c;
+    display: none;
+    border-radius: 0 0 4px 0;
+    align-items: center;
+    padding: 4px 8px;
+
+    a[class^=BaseItem-module__container]:focus &,
+    button[class^=BaseItem-module__container]:focus & {
+        display: flex;
+    }
+
+    svg {
+        width: 14px;
+        height: 16px;
+        margin-right: 2px;
+    }
+
+    span {
+        display: inline-block;
+        height: 16px;
+        line-height: 16px;
+        font-size: 12px;
+        font-weight: bold;
+    }
+}

src/assets/css/stream-settings.styl

@@ -7,6 +7,20 @@
     -webkit-user-select: none;
 }
 
+.bx-stream-settings-overlay {
+    position: fixed;
+    background: #0b0b0be3;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: var(--bx-stream-settings-overlay-z-index);
+
+    &[data-is-playing="true"] {
+        background: transparent;
+    }
+}
+
 .bx-stream-settings-tabs {
     position: fixed;
     top: 0;
@@ -95,7 +109,7 @@
     margin-bottom: 16px;
     padding-bottom: 16px;
 
-    label {
+    > label {
         font-size: 16px;
         display: block;
         text-align: left;
@@ -113,6 +127,11 @@
         background: transparent;
         text-align-last: right;
         border: none;
+        color: #fff;
+    }
+
+    select option:disabled {
+        display: none;
     }
 }
 

src/assets/css/stream-stats.styl

@@ -16,7 +16,6 @@
     margin: 0 8px 8px 0;
     box-shadow: 0px 0px 6px #000;
     border-radius: 4px;
-    height: 30px;
 }
 
 .bx-badge-name {

src/assets/css/stream.styl

@@ -66,6 +66,14 @@ div[data-testid=media-container] {
     background: #000;
 }
 
+#game-stream canvas {
+    position: absolute;
+    align-self: center;
+    margin: auto;
+    left: 0;
+    right: 0;
+}
+
 #gamepass-dialog-root div[class^=Guide-module__guide] {
     .bx-button {
         overflow: visible;

src/assets/css/styles.styl

@@ -7,6 +7,7 @@
 @import 'toast.styl';
 @import 'loading-screen.styl';
 @import 'remote-play.styl';
+@import 'web-components.styl';
 
 @import 'stream.styl';
 @import 'number-stepper.styl';

src/assets/css/web-components.styl

@@ -0,0 +1,48 @@
+.bx-select {
+    select {
+        display: none;
+    }
+
+    > div {
+        display: inline-block;
+        min-width: 110px;
+        text-align: center;
+        margin: 0 10px;
+        line-height: 24px;
+        vertical-align: middle;
+        background: #fff;
+        color: #000;
+        border-radius: 4px;
+        padding: 2px 4px;
+
+        input {
+            display: inline-block;
+            margin-right: 8px;
+        }
+
+        label {
+            margin-bottom: 0;
+        }
+    }
+
+    button {
+        border: none;
+        width: 24px;
+        height: 24px;
+        line-height: 24px;
+        color: #fff;
+        border-radius: 4px;
+        font-weight: bold;
+        font-size: 14px;
+        font-family: var(--bx-monospaced-font);
+
+        &.bx-inactive {
+            pointer-events: none;
+            opacity: 0.2;
+        }
+
+        span {
+            line-height: unset;
+        }
+    }
+}

src/assets/svg/native-mkb.svg

@@ -0,0 +1,10 @@
+<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
+    <g stroke-width="2.1">
+        <path d="m15.817 6h-10.604c-2.215 0-4.013 1.798-4.013 4.013v12.213c0 2.215 1.798 4.013 4.013 4.013h11.21"/>
+        <path d="m5.698 20.617h1.124m-1.124-4.517h7.9m-7.881-4.5h7.9m-2.3 9h2.2"/>
+    </g>
+    <g stroke-width="2.13">
+        <path d="m30.805 13.1c0-3.919-3.181-7.1-7.1-7.1s-7.1 3.181-7.1 7.1v6.4c0 3.919 3.182 7.1 7.1 7.1s7.1-3.181 7.1-7.1z"/>
+        <path d="m23.705 14.715v-4.753"/>
+    </g>
+</svg>

src/assets/svg/virtual-controller.svg

@@ -0,0 +1,11 @@
+<svg xmlns='http://www.w3.org/2000/svg' fill='none' stroke='#fff' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' viewBox='0 0 32 32'>
+    <g stroke-width="2.06">
+        <path d="M8.417 13.218h4.124"/>
+        <path d="M10.479 11.155v4.125"/>
+        <path d="M12.787 19.404L7.36 25.565a3.61 3.61 0 0 1-2.551 1.056A3.63 3.63 0 0 1 1.2 23.013c0-.21.018-.42.055-.626l2.108-10.845C3.923 8.356 6.714 6.007 9.949 6h5.192"/>
+    </g>
+    <g stroke-width="2.11">
+        <path d="M30.8 13.1c0-3.919-3.181-7.1-7.1-7.1s-7.1 3.181-7.1 7.1v6.421c0 3.919 3.181 7.1 7.1 7.1s7.1-3.181 7.1-7.1V13.1z"/>
+        <path d="M23.7 14.724V9.966"/>
+    </g>
+</svg>

src/enums/game-pass-gallery.ts

@@ -1,4 +1,5 @@
 export enum GamePassCloudGallery {
-    TOUCH = '9c86f07a-f3e8-45ad-82a0-a1f759597059',
     ALL = '29a81209-df6f-41fd-a528-2ae6b91f719c',
+    NATIVE_MKB = '8fa264dd-124f-4af3-97e8-596fcdf4b486',
+    TOUCH = '9c86f07a-f3e8-45ad-82a0-a1f759597059',
 }

src/enums/mkb.ts

@@ -1,5 +1,5 @@
 import type { GamepadKeyNameType } from "@/types/mkb";
-import { PrompFont } from "@/utils/prompt-font";
+import { PrompFont } from "@enums/prompt-font";
 
 export enum GamepadKey {
     A = 0,

src/enums/stream-player.ts

@@ -0,0 +1,9 @@
+export enum StreamPlayerType {
+    VIDEO = 'default',
+    WEBGL2 = 'webgl2',
+}
+
+export enum StreamVideoProcessing {
+    USM = 'usm',
+    CAS = 'cas',
+}

src/enums/ui-sections.ts

@@ -0,0 +1,6 @@
+export enum UiSection {
+    NEWS = 'news',
+    FRIENDS = 'friends',
+    MOST_POPULAR = 'most-popular',
+    ALL_GAMES = 'all-games',
+}

src/enums/user-agent.ts

@@ -0,0 +1,9 @@
+export enum UserAgentProfile {
+    WINDOWS_EDGE = 'windows-edge',
+    MACOS_SAFARI = 'macos-safari',
+    SMART_TV_GENERIC = 'smarttv-generic',
+    SMART_TV_TIZEN = 'smarttv-tizen',
+    VR_OCULUS = 'vr-oculus',
+    DEFAULT = 'default',
+    CUSTOM = 'custom',
+}

src/index.ts

@@ -1,45 +1,57 @@
 import "@utils/global";
-import { BxEvent, XcloudGuideWhere } from "@utils/bx-event";
+import { BxEvent } from "@utils/bx-event";
 import { BX_FLAGS } from "@utils/bx-flags";
 import { BxExposed } from "@utils/bx-exposed";
 import { t } from "@utils/translation";
 import { interceptHttpRequests } from "@utils/network";
 import { CE } from "@utils/html";
 import { showGamepadToast } from "@utils/gamepad";
-import { MkbHandler } from "@modules/mkb/mkb-handler";
+import { EmulatedMkbHandler } from "@modules/mkb/mkb-handler";
 import { StreamBadges } from "@modules/stream/stream-badges";
 import { StreamStats } from "@modules/stream/stream-stats";
-import { addCss } from "@utils/css";
+import { addCss, preloadFonts } from "@utils/css";
 import { Toast } from "@utils/toast";
-import { setupStreamUi, updateVideoPlayerCss } from "@modules/ui/ui";
+import { setupStreamUi } from "@modules/ui/ui";
 import { PrefKey, getPref } from "@utils/preferences";
 import { LoadingScreen } from "@modules/loading-screen";
 import { MouseCursorHider } from "@modules/mkb/mouse-cursor-hider";
 import { TouchController } from "@modules/touch-controller";
-import { watchHeader } from "@modules/ui/header";
 import { checkForUpdate, disablePwa } from "@utils/utils";
 import { Patcher } from "@modules/patcher";
 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, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
+import { patchAudioContext, patchCanvasContext, patchMeControl, patchPointerLockApi, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
 import { AppInterface, STATES } from "@utils/global";
-import { injectStreamMenuButtons, setupStreamUiEvents } from "@modules/stream/stream-ui";
+import { injectStreamMenuButtons } from "@modules/stream/stream-ui";
 import { BxLogger } from "@utils/bx-logger";
 import { GameBar } from "./modules/game-bar/game-bar";
 import { Screenshot } from "./utils/screenshot";
+import { NativeMkbHandler } from "./modules/mkb/native-mkb-handler";
+import { GuideMenu, GuideMenuTab } from "./modules/ui/guide-menu";
+import { StreamSettings } from "./modules/stream/stream-settings";
+import { updateVideoPlayer } from "./modules/stream/stream-settings-utils";
+import { UiSection } from "./enums/ui-sections";
+import { HeaderSection } from "./modules/ui/header";
+import { GameTile } from "./modules/ui/game-tile";
 
 
 // Handle login page
 if (window.location.pathname.includes('/auth/msa')) {
-    window.addEventListener('load', e => {
+    const nativePushState = window.history['pushState'];
-            window.location.search.includes('loggedIn') && window.setTimeout(() => {
+    window.history['pushState'] = function(...args: any[]) {
-                const location = window.location;
+        const url = args[2];
-                // @ts-ignore
+        if (url && (url.startsWith('/play') || url.substring(6).startsWith('/play'))) {
-                location.pathname.includes('/play') && location.reload(true);
+            console.log('Redirecting to xbox.com/play');
-            }, 2000);
+            window.stop();
-        });
+            window.location.href = 'https://www.xbox.com' + url;
+            return;
+        }
+
+        // @ts-ignore
+        return nativePushState.apply(this, arguments);
+    }
     // Stop processing the script
     throw new Error('[Better xCloud] Refreshing the page after logging in');
 }
@@ -90,8 +102,19 @@ window.addEventListener('load', e => {
             window.location.reload(true);
         }
     }, 3000);
+
 });
 
+// Hide "Play with Friends" skeleton section
+if (getPref(PrefKey.UI_HIDE_SECTIONS).includes(UiSection.FRIENDS)) {
+    document.addEventListener('readystatechange', e => {
+        if (document.readyState === 'interactive') {
+            const $parent = document.querySelector('div[class*=PlayWithFriendsSkeleton]')?.closest('div[class*=HomePage-module]') as HTMLElement;
+            $parent && ($parent.style.display = 'none');
+        }
+    })
+}
+
 window.BX_EXPOSED = BxExposed;
 
 // Hide Settings UI when navigate to another page
@@ -103,13 +126,13 @@ window.addEventListener('popstate', onHistoryChanged);
 window.history.pushState = patchHistoryMethod('pushState');
 window.history.replaceState = patchHistoryMethod('replaceState');
 
+window.addEventListener(BxEvent.XCLOUD_SERVERS_UNAVAILABLE, e => {
+    STATES.supportedRegion = false;
+    window.setTimeout(HeaderSection.watchHeader, 2000);
+});
+
 window.addEventListener(BxEvent.XCLOUD_SERVERS_READY, e => {
-    // Start rendering UI
+    HeaderSection.watchHeader();
-    if (document.querySelector('div[class^=UnsupportedMarketPage]')) {
-        window.setTimeout(watchHeader, 2000);
-    } else {
-        watchHeader();
-    }
 });
 
 window.addEventListener(BxEvent.STREAM_LOADING, e => {
@@ -144,9 +167,6 @@ window.addEventListener(BxEvent.STREAM_STARTING, e => {
 });
 
 window.addEventListener(BxEvent.STREAM_PLAYING, e => {
-    const $video = (e as any).$video as HTMLVideoElement;
-    STATES.currentStream.$video = $video;
-
     STATES.isPlaying = true;
     injectStreamMenuButtons();
 
@@ -157,39 +177,44 @@ window.addEventListener(BxEvent.STREAM_PLAYING, e => {
         gameBar.showBar();
     }
 
+    const $video = (e as any).$video as HTMLVideoElement;
     Screenshot.updateCanvasSize($video.videoWidth, $video.videoHeight);
 
-    updateVideoPlayerCss();
+    updateVideoPlayer();
 });
 
 window.addEventListener(BxEvent.STREAM_ERROR_PAGE, e => {
     BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
 });
 
-window.addEventListener(BxEvent.STREAM_STOPPED, e => {
+function unload() {
     if (!STATES.isPlaying) {
         return;
     }
 
+    // Stop MKB listeners
+    EmulatedMkbHandler.getInstance().destroy();
+    NativeMkbHandler.getInstance().destroy();
+
+    // Destroy StreamPlayer
+    STATES.currentStream.streamPlayer?.destroy();
+
     STATES.isPlaying = false;
     STATES.currentStream = {};
     window.BX_EXPOSED.shouldShowSensorControls = false;
+    window.BX_EXPOSED.stopTakRendering = false;
 
-    // Stop MKB listeners
+    StreamSettings.getInstance().hide();
-    getPref(PrefKey.MKB_ENABLED) && MkbHandler.INSTANCE.destroy();
-
-    const $streamSettingsDialog = document.querySelector('.bx-stream-settings-dialog');
-    if ($streamSettingsDialog) {
-        $streamSettingsDialog.classList.add('bx-gone');
-    }
-
-    STATES.currentStream.audioGainNode = null;
-    STATES.currentStream.$video = null;
     StreamStats.getInstance().onStoppedPlaying();
 
     MouseCursorHider.stop();
     TouchController.reset();
     GameBar.getInstance().disable();
+}
+
+window.addEventListener(BxEvent.STREAM_STOPPED, unload);
+window.addEventListener('pagehide', e => {
+    BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
 });
 
 window.addEventListener(BxEvent.CAPTURE_SCREENSHOT, e => {
@@ -210,15 +235,18 @@ function observeRootDialog($root: HTMLElement) {
                 const $addedElm = mutation.addedNodes[0];
                 if ($addedElm instanceof HTMLElement && $addedElm.className) {
                     if ($addedElm.className.startsWith('NavigationAnimation') || $addedElm.className.startsWith('DialogRoutes') || $addedElm.className.startsWith('Dialog-module__container')) {
-                        // Find navigation bar
+                        // Make sure it's Guide dialog
-                        const $selectedTab = $addedElm.querySelector('div[class^=NavigationMenu] button[aria-selected=true');
+                        if (document.querySelector('#gamepass-dialog-root div[class*=GuideDialog]')) {
-                        if ($selectedTab) {
+                            // Find navigation bar
-                            let $elm: Element | null = $selectedTab;
+                            const $selectedTab = $addedElm.querySelector('div[class^=NavigationMenu] button[aria-selected=true');
-                            let index;
+                            if ($selectedTab) {
-                            for (index = 0; ($elm = $elm?.previousElementSibling); index++);
+                                let $elm: Element | null = $selectedTab;
+                                let index;
+                                for (index = 0; ($elm = $elm?.previousElementSibling); index++);
 
-                            if (index === 0) {
+                                if (index === 0) {
-                                BxEvent.dispatch(window, BxEvent.XCLOUD_GUIDE_SHOWN, {where: XcloudGuideWhere.HOME});
+                                    BxEvent.dispatch(window, BxEvent.XCLOUD_GUIDE_MENU_SHOWN, {where: GuideMenuTab.HOME});
+                                }
                             }
                         }
                     }
@@ -263,11 +291,12 @@ function main() {
     interceptHttpRequests();
     patchVideoApi();
     patchCanvasContext();
+    AppInterface && patchPointerLockApi();
 
     getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && patchAudioContext();
     getPref(PrefKey.BLOCK_TRACKING) && patchMeControl();
 
-    STATES.hasTouchSupport && TouchController.updateCustomList();
+    STATES.userAgent.capabilities.touch && TouchController.updateCustomList();
     overridePreloadState();
 
     VibrationManager.initialSetup();
@@ -277,22 +306,26 @@ function main() {
 
     // Setup UI
     addCss();
+    preloadFonts();
     Toast.setup();
     (getPref(PrefKey.GAME_BAR_POSITION) !== 'off') && GameBar.getInstance();
     BX_FLAGS.PreloadUi && setupStreamUi();
+    Screenshot.setup();
 
-    setupStreamUiEvents();
+    GuideMenu.observe();
     StreamBadges.setupEvents();
     StreamStats.setupEvents();
-    MkbHandler.setupEvents();
+    EmulatedMkbHandler.setupEvents();
 
     Patcher.init();
 
     disablePwa();
 
     // Show a toast when connecting/disconecting controller
-    window.addEventListener('gamepadconnected', e => showGamepadToast(e.gamepad));
+    if (getPref(PrefKey.CONTROLLER_SHOW_CONNECTION_STATUS)) {
-    window.addEventListener('gamepaddisconnected', e => showGamepadToast(e.gamepad));
+        window.addEventListener('gamepadconnected', e => showGamepadToast(e.gamepad));
+        window.addEventListener('gamepaddisconnected', e => showGamepadToast(e.gamepad));
+    }
 
     // Preload Remote Play
     if (getPref(PrefKey.REMOTE_PLAY_ENABLED)) {
@@ -304,7 +337,16 @@ function main() {
     }
 
     // Start PointerProviderServer
-    (getPref(PrefKey.MKB_ENABLED)) && AppInterface && AppInterface.startPointerServer();
+    if (getPref(PrefKey.MKB_ENABLED) && AppInterface) {
+        STATES.pointerServerPort = AppInterface.startPointerServer() || 9269;
+        BxLogger.info('startPointerServer', 'Port', STATES.pointerServerPort.toString());
+    }
+
+    // Preload Remote Play
+    getPref(PrefKey.REMOTE_PLAY_ENABLED) && BX_FLAGS.PreloadRemotePlay && RemotePlay.preload();
+
+    // Show wait time in game card
+    getPref(PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME) && GameTile.setup();
 }
 
 main();

src/macros/build.ts

@@ -4,6 +4,7 @@ import cssStr from "@assets/css/styles.styl" with { type: "text" };
 
 const generatedCss = await (stylus(cssStr, {})
 	.set('filename', 'styles.css')
+	.set('compress', true)
 	.include('src/assets/css/'))
 	.render();
 

src/modules/controller-shortcut.ts

@@ -1,9 +1,9 @@
 import { Screenshot } from "@utils/screenshot";
-import { GamepadKey } from "./mkb/definitions";
+import { GamepadKey } from "@enums/mkb";
-import { PrompFont } from "@utils/prompt-font";
+import { PrompFont } from "@enums/prompt-font";
 import { CE } from "@utils/html";
 import { t } from "@utils/translation";
-import { MkbHandler } from "./mkb/mkb-handler";
+import { EmulatedMkbHandler } from "./mkb/mkb-handler";
 import { StreamStats } from "./stream/stream-stats";
 import { MicrophoneShortcut } from "./shortcuts/shortcut-microphone";
 import { StreamUiShortcut } from "./shortcuts/shortcut-stream-ui";
@@ -172,7 +172,7 @@ export class ControllerShortcut {
             }
 
             // Ignore emulated gamepad
-            if (gamepad.id === MkbHandler.VIRTUAL_GAMEPAD_ID) {
+            if (gamepad.id === EmulatedMkbHandler.VIRTUAL_GAMEPAD_ID) {
                 continue;
             }
 

src/modules/game-bar/game-bar.ts

@@ -41,7 +41,7 @@ export class GameBar {
 
         this.actions = [
             new ScreenshotAction(),
-            ...(STATES.hasTouchSupport && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'off') ? [new TouchControlAction()] : []),
+            ...(STATES.userAgent.capabilities.touch && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'off') ? [new TouchControlAction()] : []),
             new MicrophoneAction(),
         ];
 

src/modules/loading-screen.ts

@@ -109,7 +109,7 @@ export class LoadingScreen {
 
         let $waitTimeBox = LoadingScreen.#$waitTimeBox;
         if (!$waitTimeBox) {
-            $waitTimeBox = CE<HTMLElement>('div', {'class': 'bx-wait-time-box'},
+            $waitTimeBox = CE('div', {'class': 'bx-wait-time-box'},
                                     CE('label', {}, t('server')),
                                     CE('span', {}, getPreferredServerRegion()),
                                     CE('label', {}, t('wait-time-estimated')),

src/modules/mkb/base-mkb-handler.ts

@@ -0,0 +1,23 @@
+export abstract class MouseDataProvider {
+    protected mkbHandler: MkbHandler;
+    constructor(handler: MkbHandler) {
+        this.mkbHandler = handler;
+    }
+
+    abstract init(): void;
+    abstract start(): void;
+    abstract stop(): void;
+    abstract destroy(): void;
+}
+
+export abstract class MkbHandler {
+    abstract init(): void;
+    abstract start(): void;
+    abstract stop(): void;
+    abstract destroy(): void;
+    abstract handleMouseMove(data: MkbMouseMove): void;
+    abstract handleMouseClick(data: MkbMouseClick): void;
+    abstract handleMouseWheel(data: MkbMouseWheel): boolean;
+    abstract waitForMouseData(enabled: boolean): void;
+    abstract isEnabled(): boolean;
+}

src/modules/mkb/key-helper.ts

@@ -1,4 +1,4 @@
-import { MouseButtonCode, WheelCode } from "./definitions";
+import { MouseButtonCode, WheelCode } from "@enums/mkb";
 
 export class KeyHelper {
     static #NON_PRINTABLE_KEYS = {

src/modules/mkb/mkb-handler.ts

@@ -1,5 +1,5 @@
 import { MkbPreset } from "./mkb-preset";
-import { GamepadKey, MkbPresetKey, GamepadStick, MouseMapTo } from "./definitions";
+import { GamepadKey, MkbPresetKey, GamepadStick, MouseMapTo, WheelCode } from "@enums/mkb";
 import { createButton, ButtonStyle, CE } from "@utils/html";
 import { BxEvent } from "@utils/bx-event";
 import { PrefKey, getPref } from "@utils/preferences";
@@ -8,29 +8,23 @@ import { t } from "@utils/translation";
 import { LocalDb } from "@utils/local-db";
 import { KeyHelper } from "./key-helper";
 import type { MkbStoredPreset } from "@/types/mkb";
-import { showStreamSettings } from "@modules/stream/stream-ui";
 import { AppInterface, STATES } from "@utils/global";
 import { UserAgent } from "@utils/user-agent";
 import { BxLogger } from "@utils/bx-logger";
-import { BxIcon } from "@utils/bx-icon";
 import { PointerClient } from "./pointer-client";
+import { NativeMkbHandler } from "./native-mkb-handler";
+import { MkbHandler, MouseDataProvider } from "./base-mkb-handler";
+import { StreamSettings } from "../stream/stream-settings";
 
 const LOG_TAG = 'MkbHandler';
 
-
+const PointerToMouseButton = {
-abstract class MouseDataProvider {
+    1: 0,
-    protected mkbHandler: MkbHandler;
+    2: 2,
-    constructor(handler: MkbHandler) {
+    4: 1,
-        this.mkbHandler = handler;
-    }
-
-    abstract init(): void;
-    abstract start(): void;
-    abstract stop(): void;
-    abstract destroy(): void;
-    abstract toggle(enabled: boolean): void;
 }
 
+
 class WebSocketMouseDataProvider extends MouseDataProvider {
     #pointerClient: PointerClient | undefined
     #connected = false
@@ -39,7 +33,7 @@ class WebSocketMouseDataProvider extends MouseDataProvider {
         this.#pointerClient = PointerClient.getInstance();
         this.#connected = false;
         try {
-            this.#pointerClient.start(this.mkbHandler);
+            this.#pointerClient.start(STATES.pointerServerPort, this.mkbHandler);
             this.#connected = true;
         } catch (e) {
             Toast.show('Cannot enable Mouse & Keyboard feature');
@@ -57,36 +51,22 @@ class WebSocketMouseDataProvider extends MouseDataProvider {
     destroy(): void {
         this.#connected && this.#pointerClient?.stop();
     }
-
-    toggle(enabled: boolean): void {
-        if (!this.#connected) {
-            enabled = false;
-        }
-
-        enabled ? this.mkbHandler.start() : this.mkbHandler.stop();
-        this.mkbHandler.waitForMouseData(!enabled);
-    }
 }
 
 class PointerLockMouseDataProvider extends MouseDataProvider {
-    init(): void {
+    init(): void {}
-        document.addEventListener('pointerlockchange', this.#onPointerLockChange);
-        document.addEventListener('pointerlockerror', this.#onPointerLockError);
-    }
 
     start(): void {
-        if (!document.pointerLockElement) {
-            document.body.requestPointerLock();
-        }
-
         window.addEventListener('mousemove', this.#onMouseMoveEvent);
         window.addEventListener('mousedown', this.#onMouseEvent);
         window.addEventListener('mouseup', this.#onMouseEvent);
-        window.addEventListener('wheel', this.#onWheelEvent);
+        window.addEventListener('wheel', this.#onWheelEvent, {passive: false});
         window.addEventListener('contextmenu', this.#disableContextMenu);
     }
 
     stop(): void {
+        document.pointerLockElement && document.exitPointerLock();
+
         window.removeEventListener('mousemove', this.#onMouseMoveEvent);
         window.removeEventListener('mousedown', this.#onMouseEvent);
         window.removeEventListener('mouseup', this.#onMouseEvent);
@@ -94,32 +74,7 @@ class PointerLockMouseDataProvider extends MouseDataProvider {
         window.removeEventListener('contextmenu', this.#disableContextMenu);
     }
 
-    destroy(): void {
+    destroy(): void {}
-        document.removeEventListener('pointerlockchange', this.#onPointerLockChange);
-        document.removeEventListener('pointerlockerror', this.#onPointerLockError);
-    }
-
-    toggle(enabled: boolean): void {
-        enabled ? document.pointerLockElement && this.mkbHandler.start() : this.mkbHandler.stop();
-
-        if (enabled) {
-            !document.pointerLockElement && this.mkbHandler.waitForMouseData(true);
-        } else {
-            this.mkbHandler.waitForMouseData(false);
-            document.pointerLockElement && document.exitPointerLock();
-        }
-    }
-
-    #onPointerLockChange = () => {
-        if (this.mkbHandler.isEnabled() && !document.pointerLockElement) {
-            this.mkbHandler.stop();
-        }
-    }
-
-    #onPointerLockError = (e: Event) => {
-        console.log(e);
-        this.stop();
-    }
 
     #onMouseMoveEvent = (e: MouseEvent) => {
         this.mkbHandler.handleMouseMove({
@@ -132,10 +87,9 @@ class PointerLockMouseDataProvider extends MouseDataProvider {
         e.preventDefault();
 
         const isMouseDown = e.type === 'mousedown';
-        const key = KeyHelper.getKeyFromEvent(e);
         const data: MkbMouseClick = {
-            key: key,
+            mouseButton: e.button,
-            pressed: isMouseDown
+            pressed: isMouseDown,
         };
 
         this.mkbHandler.handleMouseClick(data);
@@ -147,7 +101,12 @@ class PointerLockMouseDataProvider extends MouseDataProvider {
             return;
         }
 
-        if (this.mkbHandler.handleMouseWheel({key})) {
+        const data: MkbMouseWheel = {
+            vertical: e.deltaY,
+            horizontal: e.deltaX,
+        };
+
+        if (this.mkbHandler.handleMouseWheel(data)) {
             e.preventDefault();
         }
     }
@@ -159,14 +118,14 @@ class PointerLockMouseDataProvider extends MouseDataProvider {
 This class uses some code from Yuzu emulator to handle mouse's movements
 Source: https://github.com/yuzu-emu/yuzu-mainline/blob/master/src/input_common/drivers/mouse.cpp
 */
-export class MkbHandler {
+export class EmulatedMkbHandler extends MkbHandler {
-    static #instance: MkbHandler;
+    static #instance: EmulatedMkbHandler;
-    static get INSTANCE() {
+    public static getInstance(): EmulatedMkbHandler {
-        if (!MkbHandler.#instance) {
+        if (!EmulatedMkbHandler.#instance) {
-            MkbHandler.#instance = new MkbHandler();
+            EmulatedMkbHandler.#instance = new EmulatedMkbHandler();
         }
 
-        return MkbHandler.#instance;
+        return EmulatedMkbHandler.#instance;
     }
 
     #CURRENT_PRESET_DATA = MkbPreset.convert(MkbPreset.DEFAULT_PRESET);
@@ -178,7 +137,7 @@ export class MkbHandler {
     static VIRTUAL_GAMEPAD_ID = 'Xbox 360 Controller';
 
     #VIRTUAL_GAMEPAD = {
-            id: MkbHandler.VIRTUAL_GAMEPAD_ID,
+            id: EmulatedMkbHandler.VIRTUAL_GAMEPAD_ID,
             index: 3,
             connected: false,
             hapticActuators: null,
@@ -203,6 +162,8 @@ export class MkbHandler {
 
     #$message?: HTMLElement;
 
+    #escKeyDownTime: number = -1;
+
     #STICK_MAP: {[key in GamepadKey]?: [GamepadKey[], number, number]};
     #LEFT_STICK_X: GamepadKey[] = [];
     #LEFT_STICK_Y: GamepadKey[] = [];
@@ -210,6 +171,8 @@ export class MkbHandler {
     #RIGHT_STICK_Y: GamepadKey[] = [];
 
     constructor() {
+        super();
+
         this.#STICK_MAP = {
             [GamepadKey.LS_LEFT]: [this.#LEFT_STICK_X, 0, -1],
             [GamepadKey.LS_RIGHT]: [this.#LEFT_STICK_X, 0, 1],
@@ -307,20 +270,34 @@ export class MkbHandler {
         const isKeyDown = e.type === 'keydown';
 
         // Toggle MKB feature
-        if (isKeyDown) {
+        if (e.code === 'F8') {
-            if (e.code === 'F8') {
+            if (!isKeyDown) {
                 e.preventDefault();
                 this.toggle();
-                return;
-            } else if (e.code === 'Escape') {
-                e.preventDefault();
-                this.#enabled && this.stop();
-                return;
             }
 
-            if (!this.#isPolling) {
+            return;
-                return;
+        }
+
+        // Hijack the Esc button
+        if (e.code === 'Escape') {
+            e.preventDefault();
+
+            // Hold the Esc for 1 second to disable MKB
+            if (this.#enabled && isKeyDown) {
+                if (this.#escKeyDownTime === -1) {
+                    this.#escKeyDownTime = performance.now();
+                } else if (performance.now() - this.#escKeyDownTime >= 1000) {
+                    this.stop();
+                }
+            } else {
+                this.#escKeyDownTime = -1;
             }
+            return;
+        }
+
+        if (!this.#isPolling) {
+            return;
         }
 
         const buttonIndex = this.#CURRENT_PRESET_DATA.mapping[e.code || e.key]!;
@@ -347,11 +324,24 @@ export class MkbHandler {
     }
 
     handleMouseClick = (data: MkbMouseClick) => {
-        if (!data || !data.key) {
+        let mouseButton;
+        if (typeof data.mouseButton !== 'undefined') {
+            mouseButton = data.mouseButton;
+        } else if (typeof data.pointerButton !== 'undefined') {
+            mouseButton = PointerToMouseButton[data.pointerButton as keyof typeof PointerToMouseButton];
+        }
+
+        const keyCode = 'Mouse' + mouseButton;
+        const key = {
+            code: keyCode,
+            name: KeyHelper.codeToKeyName(keyCode),
+        };
+
+        if (!key.name) {
             return;
         }
 
-        const buttonIndex = this.#CURRENT_PRESET_DATA.mapping[data.key.code]!;
+        const buttonIndex = this.#CURRENT_PRESET_DATA.mapping[key.code]!;
         if (typeof buttonIndex === 'undefined') {
             return;
         }
@@ -379,9 +369,9 @@ export class MkbHandler {
         if (length !== 0 && length < deadzoneCounterweight) {
             x *= deadzoneCounterweight / length;
             y *= deadzoneCounterweight / length;
-        } else if (length > MkbHandler.MAXIMUM_STICK_RANGE) {
+        } else if (length > EmulatedMkbHandler.MAXIMUM_STICK_RANGE) {
-            x *= MkbHandler.MAXIMUM_STICK_RANGE / length;
+            x *= EmulatedMkbHandler.MAXIMUM_STICK_RANGE / length;
-            y *= MkbHandler.MAXIMUM_STICK_RANGE / length;
+            y *= EmulatedMkbHandler.MAXIMUM_STICK_RANGE / length;
         }
 
         const analog = mouseMapTo === MouseMapTo.LS ? GamepadStick.LEFT : GamepadStick.RIGHT;
@@ -389,16 +379,32 @@ export class MkbHandler {
     }
 
     handleMouseWheel = (data: MkbMouseWheel): boolean => {
-        if (!data || !data.key) {
+        let code = '';
+        if (data.vertical < 0) {
+            code = WheelCode.SCROLL_UP;
+        } else if (data.vertical > 0) {
+            code = WheelCode.SCROLL_DOWN;
+        } else if (data.horizontal < 0) {
+            code = WheelCode.SCROLL_LEFT;
+        } else if (data.horizontal > 0) {
+            code = WheelCode.SCROLL_RIGHT;
+        }
+
+        if (!code) {
             return false;
         }
 
-        const buttonIndex = this.#CURRENT_PRESET_DATA.mapping[data.key.code]!;
+        const key = {
+            code: code,
+            name: KeyHelper.codeToKeyName(code),
+        };
+
+        const buttonIndex = this.#CURRENT_PRESET_DATA.mapping[key.code]!;
         if (typeof buttonIndex === 'undefined') {
             return false;
         }
 
-        if (this.#prevWheelCode === null || this.#prevWheelCode === data.key.code) {
+        if (this.#prevWheelCode === null || this.#prevWheelCode === key.code) {
             this.#wheelStoppedTimeout && clearTimeout(this.#wheelStoppedTimeout);
             this.#pressButton(buttonIndex, true);
         }
@@ -418,8 +424,11 @@ export class MkbHandler {
             this.#enabled = !this.#enabled;
         }
 
-        Toast.show(t('mouse-and-keyboard'), t(this.#enabled ? 'enabled' : 'disabled'), {instant: true});
+        if (this.#enabled) {
-        this.#mouseDataProvider?.toggle(this.#enabled);
+            document.body.requestPointerLock();
+        } else {
+            document.pointerLockElement && document.exitPointerLock();
+        }
     }
 
     #getCurrentPreset = (): Promise<MkbStoredPreset> => {
@@ -455,9 +464,97 @@ export class MkbHandler {
         }
     }
 
+    #onDialogShown = () => {
+        document.pointerLockElement && document.exitPointerLock();
+    }
+
+    #initMessage = () => {
+        if (!this.#$message) {
+            this.#$message = CE('div', {'class': 'bx-mkb-pointer-lock-msg bx-gone'},
+                CE('div', {},
+                    CE('p', {}, t('virtual-controller')),
+                    CE('p', {}, t('press-key-to-toggle-mkb', {key: 'F8'})),
+                ),
+
+                CE('div', {'data-type': 'virtual'},
+                    createButton({
+                        style: ButtonStyle.PRIMARY | ButtonStyle.TALL | ButtonStyle.FULL_WIDTH,
+                        label: t('activate'),
+                        onClick: ((e: Event) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+
+                            this.toggle(true);
+                        }).bind(this),
+                    }),
+
+                    CE('div', {},
+                        createButton({
+                            label: t('ignore'),
+                            style: ButtonStyle.GHOST,
+                            onClick: e => {
+                                e.preventDefault();
+                                e.stopPropagation();
+
+                                this.toggle(false);
+                                this.waitForMouseData(false);
+                            },
+                        }),
+
+                        createButton({
+                            label: t('edit'),
+                            onClick: e => {
+                                e.preventDefault();
+                                e.stopPropagation();
+
+                                StreamSettings.getInstance().show('mkb');
+                            },
+                        }),
+                    ),
+                ),
+            );
+        }
+
+        if (!this.#$message.isConnected) {
+            document.documentElement.appendChild(this.#$message);
+        }
+    }
+
+    #onPointerLockChange = () => {
+        if (document.pointerLockElement) {
+            this.start();
+        } else {
+            this.stop();
+        }
+    }
+
+    #onPointerLockError = (e: Event) => {
+        console.log(e);
+        this.stop();
+    }
+
+    #onPointerLockRequested = () => {
+        this.start();
+    }
+
+    #onPointerLockExited = () => {
+        this.#mouseDataProvider?.stop();
+    }
+
+    handleEvent(event: Event) {
+        switch (event.type) {
+            case BxEvent.POINTER_LOCK_REQUESTED:
+                this.#onPointerLockRequested();
+                break;
+            case BxEvent.POINTER_LOCK_EXITED:
+                this.#onPointerLockExited();
+                break;
+        }
+    }
+
     init = () => {
         this.refreshPresetData();
-        this.#enabled = true;
+        this.#enabled = false;
 
         if (AppInterface) {
             this.#mouseDataProvider = new WebSocketMouseDataProvider(this);
@@ -467,48 +564,29 @@ export class MkbHandler {
         this.#mouseDataProvider.init();
 
         window.addEventListener('keydown', this.#onKeyboardEvent);
-
+        window.addEventListener('keyup', this.#onKeyboardEvent);
-        if (!this.#$message) {
-            this.#$message = CE('div', {'class': 'bx-mkb-pointer-lock-msg'},
-                CE('div', {},
-                    CE('p', {}, t('mkb-click-to-activate')),
-                    CE('p', {}, t('press-key-to-toggle-mkb', {key: 'F8'})),
-                ),
-
-                CE('div', {},
-                    createButton({
-                        icon: BxIcon.MOUSE_SETTINGS,
-                        label: t('edit'),
-                        style: ButtonStyle.PRIMARY,
-                        onClick: e => {
-                            e.preventDefault();
-                            e.stopPropagation();
-
-                            showStreamSettings('mkb');
-                        },
-                    }),
-
-                    createButton({
-                        label: t('disable'),
-                        onClick: e => {
-                            e.preventDefault();
-                            e.stopPropagation();
-
-                            this.toggle(false);
-                            this.waitForMouseData(false);
-                        },
-                    }),
-                ),
-            );
-
-            this.#$message.addEventListener('click', this.start.bind(this));
-            document.documentElement.appendChild(this.#$message);
-        }
 
         window.addEventListener(BxEvent.XCLOUD_POLLING_MODE_CHANGED, this.#onPollingModeChanged);
+        window.addEventListener(BxEvent.XCLOUD_DIALOG_SHOWN, this.#onDialogShown);
 
-        this.#$message.classList.add('bx-gone');
+        if (AppInterface) {
-        this.waitForMouseData(true);
+            // Android app doesn't support PointerLock API so we need to use a different method
+            window.addEventListener(BxEvent.POINTER_LOCK_REQUESTED, this);
+            window.addEventListener(BxEvent.POINTER_LOCK_EXITED, this);
+        } else {
+            document.addEventListener('pointerlockchange', this.#onPointerLockChange);
+            document.addEventListener('pointerlockerror', this.#onPointerLockError);
+        }
+
+        this.#initMessage();
+        this.#$message?.classList.add('bx-gone');
+
+        if (AppInterface) {
+            Toast.show(t('press-key-to-toggle-mkb', {key: `<b>F8</b>`}), t('virtual-controller'), {html: true});
+            this.waitForMouseData(false);
+        } else {
+            this.waitForMouseData(true);
+        }
     }
 
     destroy = () => {
@@ -520,6 +598,18 @@ export class MkbHandler {
         document.pointerLockElement && document.exitPointerLock();
 
         window.removeEventListener('keydown', this.#onKeyboardEvent);
+        window.removeEventListener('keyup', this.#onKeyboardEvent);
+
+        if (AppInterface) {
+            window.removeEventListener(BxEvent.POINTER_LOCK_REQUESTED, this);
+            window.removeEventListener(BxEvent.POINTER_LOCK_EXITED, this);
+        } else {
+            document.removeEventListener('pointerlockchange', this.#onPointerLockChange);
+            document.removeEventListener('pointerlockerror', this.#onPointerLockError);
+        }
+
+        window.removeEventListener(BxEvent.XCLOUD_POLLING_MODE_CHANGED, this.#onPollingModeChanged);
+        window.removeEventListener(BxEvent.XCLOUD_DIALOG_SHOWN, this.#onDialogShown);
 
         this.#mouseDataProvider?.destroy();
 
@@ -529,17 +619,17 @@ export class MkbHandler {
     start = () => {
         if (!this.#enabled) {
             this.#enabled = true;
-            Toast.show(t('mouse-and-keyboard'), t('enabled'), {instant: true});
+            Toast.show(t('virtual-controller'), t('enabled'), {instant: true});
         }
 
         this.#isPolling = true;
+        this.#escKeyDownTime = -1;
 
         this.#resetGamepad();
         window.navigator.getGamepads = this.#patchedGetGamepads;
 
         this.waitForMouseData(false);
 
-        window.addEventListener('keyup', this.#onKeyboardEvent);
         this.#mouseDataProvider?.start();
 
         // Dispatch "gamepadconnected" event
@@ -550,36 +640,48 @@ export class MkbHandler {
         BxEvent.dispatch(window, 'gamepadconnected', {
                 gamepad: virtualGamepad,
             });
+
+        window.BX_EXPOSED.stopTakRendering = true;
+
+        Toast.show(t('virtual-controller'), t('enabled'), {instant: true});
     }
 
     stop = () => {
+        this.#enabled = false;
         this.#isPolling = false;
-
+        this.#escKeyDownTime = -1;
-        // Dispatch "gamepaddisconnected" event
-        this.#resetGamepad();
 
         const virtualGamepad = this.#getVirtualGamepad();
-        virtualGamepad.connected = false;
+        if (virtualGamepad.connected) {
-        virtualGamepad.timestamp = performance.now();
+            // Dispatch "gamepaddisconnected" event
+            this.#resetGamepad();
 
-        BxEvent.dispatch(window, 'gamepaddisconnected', {
+            virtualGamepad.connected = false;
-                gamepad: virtualGamepad,
+            virtualGamepad.timestamp = performance.now();
-            });
 
-        window.navigator.getGamepads = this.#nativeGetGamepads;
+            BxEvent.dispatch(window, 'gamepaddisconnected', {
+                    gamepad: virtualGamepad,
+                });
 
-        window.removeEventListener('keyup', this.#onKeyboardEvent);
+            window.navigator.getGamepads = this.#nativeGetGamepads;
+        }
 
         this.waitForMouseData(true);
         this.#mouseDataProvider?.stop();
+
+        // Toast.show(t('virtual-controller'), t('disabled'), {instant: true});
     }
 
     static setupEvents() {
-        getPref(PrefKey.MKB_ENABLED) && (AppInterface || !UserAgent.isMobile()) && window.addEventListener(BxEvent.STREAM_PLAYING, () => {
+        window.addEventListener(BxEvent.STREAM_PLAYING, () => {
-            // Enable MKB
+            if (STATES.currentStream.titleInfo?.details.hasMkbSupport) {
-            if (!STATES.currentStream.titleInfo?.details.hasMkbSupport) {
+                // Enable native MKB in Android app
-                BxLogger.info(LOG_TAG, 'Emulate MKB');
+                if (AppInterface && getPref(PrefKey.NATIVE_MKB_ENABLED) === 'on') {
-                MkbHandler.INSTANCE.init();
+                    AppInterface && NativeMkbHandler.getInstance().init();
+                }
+            } else if (getPref(PrefKey.MKB_ENABLED) && (AppInterface || !UserAgent.isMobile())) {
+                    BxLogger.info(LOG_TAG, 'Emulate MKB');
+                    EmulatedMkbHandler.getInstance().init();
             }
         });
     }

src/modules/mkb/mkb-preset.ts

@@ -1,7 +1,7 @@
 import { t } from "@utils/translation";
 import { SettingElementType } from "@utils/settings";
-import { GamepadKey, MouseButtonCode, MouseMapTo, MkbPresetKey } from "./definitions";
+import { GamepadKey, MouseButtonCode, MouseMapTo, MkbPresetKey } from "@enums/mkb";
-import { MkbHandler } from "./mkb-handler";
+import { EmulatedMkbHandler } from "./mkb-handler";
 import type { MkbPresetData, MkbConvertedPresetData } from "@/types/mkb";
 import type { PreferenceSettings } from "@/types/preferences";
 
@@ -119,9 +119,9 @@ export class MkbPreset {
 
         // Pre-calculate mouse's sensitivities
         const mouse = obj.mouse;
-        mouse[MkbPresetKey.MOUSE_SENSITIVITY_X] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY;
+        mouse[MkbPresetKey.MOUSE_SENSITIVITY_X] *= EmulatedMkbHandler.DEFAULT_PANNING_SENSITIVITY;
-        mouse[MkbPresetKey.MOUSE_SENSITIVITY_Y] *= MkbHandler.DEFAULT_PANNING_SENSITIVITY;
+        mouse[MkbPresetKey.MOUSE_SENSITIVITY_Y] *= EmulatedMkbHandler.DEFAULT_PANNING_SENSITIVITY;
-        mouse[MkbPresetKey.MOUSE_DEADZONE_COUNTERWEIGHT] *= MkbHandler.DEFAULT_DEADZONE_COUNTERWEIGHT;
+        mouse[MkbPresetKey.MOUSE_DEADZONE_COUNTERWEIGHT] *= EmulatedMkbHandler.DEFAULT_DEADZONE_COUNTERWEIGHT;
 
         const mouseMapTo = MouseMapTo[mouse[MkbPresetKey.MOUSE_MAP_TO]!];
         if (typeof mouseMapTo !== 'undefined') {

src/modules/mkb/mkb-remapper.ts

@@ -1,16 +1,16 @@
-import { GamepadKey } from "./definitions";
 import { CE, createButton, ButtonStyle } from "@utils/html";
 import { t } from "@utils/translation";
 import { Dialog } from "@modules/dialog";
 import { getPref, setPref, PrefKey } from "@utils/preferences";
-import { MkbPresetKey, GamepadKeyName } from "./definitions";
 import { KeyHelper } from "./key-helper";
 import { MkbPreset } from "./mkb-preset";
-import { MkbHandler } from "./mkb-handler";
+import { EmulatedMkbHandler } from "./mkb-handler";
 import { LocalDb } from "@utils/local-db";
 import { BxIcon } from "@utils/bx-icon";
 import { SettingElement } from "@utils/settings";
 import type { MkbPresetData, MkbStoredPresets } from "@/types/mkb";
+import { MkbPresetKey, GamepadKey, GamepadKeyName } from "@enums/mkb";
+import { deepClone } from "@utils/global";
 
 
 type MkbRemapperElements = {
@@ -258,7 +258,7 @@ export class MkbRemapper {
 
                 defaultPresetId = this.#STATE.currentPresetId;
                 setPref(PrefKey.MKB_DEFAULT_PRESET_ID, defaultPresetId);
-                MkbHandler.INSTANCE.refreshPresetData();
+                EmulatedMkbHandler.getInstance().refreshPresetData();
             } else {
                 defaultPresetId = getPref(PrefKey.MKB_DEFAULT_PRESET_ID);
             }
@@ -292,7 +292,7 @@ export class MkbRemapper {
         this.#$.wrapper!.classList.toggle('bx-editing', this.#STATE.isEditing);
 
         if (this.#STATE.isEditing) {
-            this.#STATE.editingPresetData = structuredClone(this.#getCurrentPreset().data);
+            this.#STATE.editingPresetData = deepClone(this.#getCurrentPreset().data);
         } else {
             this.#STATE.editingPresetData = null;
         }
@@ -487,7 +487,7 @@ export class MkbRemapper {
                            style: ButtonStyle.PRIMARY,
                            onClick: e => {
                                setPref(PrefKey.MKB_DEFAULT_PRESET_ID, this.#STATE.currentPresetId);
-                               MkbHandler.INSTANCE.refreshPresetData();
+                               EmulatedMkbHandler.getInstance().refreshPresetData();
 
                                this.#refresh();
                            },
@@ -511,13 +511,13 @@ export class MkbRemapper {
                            label: t('save'),
                            style: ButtonStyle.PRIMARY,
                            onClick: e => {
-                               const updatedPreset = structuredClone(this.#getCurrentPreset());
+                               const updatedPreset = deepClone(this.#getCurrentPreset());
                                updatedPreset.data = this.#STATE.editingPresetData as MkbPresetData;
 
                                LocalDb.INSTANCE.updatePreset(updatedPreset).then(id => {
                                    // If this is the default preset => refresh preset data
                                    if (id === getPref(PrefKey.MKB_DEFAULT_PRESET_ID)) {
-                                       MkbHandler.INSTANCE.refreshPresetData();
+                                       EmulatedMkbHandler.getInstance().refreshPresetData();
                                    }
 
                                    this.#toggleEditing(false);

src/modules/mkb/native-mkb-handler.ts

@@ -0,0 +1,319 @@
+import { Toast } from "@/utils/toast";
+import { PointerClient } from "./pointer-client";
+import { AppInterface, STATES } from "@/utils/global";
+import { MkbHandler } from "./base-mkb-handler";
+import { t } from "@/utils/translation";
+import { BxEvent } from "@/utils/bx-event";
+import { ButtonStyle, CE, createButton } from "@/utils/html";
+import { PrefKey, getPref } from "@/utils/preferences";
+
+type NativeMouseData = {
+    X: number,
+    Y: number,
+    Buttons: number,
+    WheelX: number,
+    WheelY: number,
+    Type? : 0,  // 0: Relative, 1: Absolute
+}
+
+type XcloudInputSink = {
+    onMouseInput: (data: NativeMouseData) => void;
+}
+
+export class NativeMkbHandler extends MkbHandler {
+    private static instance: NativeMkbHandler;
+    #pointerClient: PointerClient | undefined;
+    #enabled: boolean = false;
+
+    #mouseButtonsPressed = 0;
+    #mouseWheelX = 0;
+    #mouseWheelY = 0;
+
+    #mouseVerticalMultiply = 0;
+    #mouseHorizontalMultiply = 0;
+
+    #inputSink: XcloudInputSink | undefined;
+
+    #$message?: HTMLElement;
+
+    public static getInstance(): NativeMkbHandler {
+        if (!NativeMkbHandler.instance) {
+            NativeMkbHandler.instance = new NativeMkbHandler();
+        }
+
+        return NativeMkbHandler.instance;
+    }
+
+    #onKeyboardEvent(e: KeyboardEvent) {
+        if (e.type === 'keyup' && e.code === 'F8') {
+            e.preventDefault();
+            this.toggle();
+            return;
+        }
+    }
+
+    #onPointerLockRequested(e: Event) {
+        AppInterface.requestPointerCapture();
+        this.start();
+    }
+
+    #onPointerLockExited(e: Event) {
+        AppInterface.releasePointerCapture();
+        this.stop();
+    }
+
+    #onPollingModeChanged = (e: Event) => {
+        if (!this.#$message) {
+            return;
+        }
+
+        const mode = (e as any).mode;
+        if (mode === 'None') {
+            this.#$message.classList.remove('bx-offscreen');
+        } else {
+            this.#$message.classList.add('bx-offscreen');
+        }
+    }
+
+    #onDialogShown = () => {
+        document.pointerLockElement && document.exitPointerLock();
+    }
+
+    #initMessage() {
+        if (!this.#$message) {
+            this.#$message = CE('div', {'class': 'bx-mkb-pointer-lock-msg'},
+                CE('div', {},
+                    CE('p', {}, t('native-mkb')),
+                    CE('p', {}, t('press-key-to-toggle-mkb', {key: 'F8'})),
+                ),
+
+                CE('div', {'data-type': 'native'},
+                    createButton({
+                        style: ButtonStyle.PRIMARY | ButtonStyle.FULL_WIDTH | ButtonStyle.TALL,
+                        label: t('activate'),
+                        onClick: ((e: Event) => {
+                            e.preventDefault();
+                            e.stopPropagation();
+
+                            this.toggle(true);
+                        }).bind(this),
+                    }),
+
+                    createButton({
+                        style: ButtonStyle.GHOST | ButtonStyle.FULL_WIDTH,
+                        label: t('ignore'),
+                        onClick: e => {
+                            e.preventDefault();
+                            e.stopPropagation();
+
+                            this.#$message?.classList.add('bx-gone');
+                        },
+                    }),
+                ),
+            );
+        }
+
+        if (!this.#$message.isConnected) {
+            document.documentElement.appendChild(this.#$message);
+        }
+    }
+
+    handleEvent(event: Event) {
+        switch (event.type) {
+            case 'keyup':
+                this.#onKeyboardEvent(event as KeyboardEvent);
+                break;
+
+            case BxEvent.XCLOUD_DIALOG_SHOWN:
+                this.#onDialogShown();
+                break;
+
+            case BxEvent.POINTER_LOCK_REQUESTED:
+                this.#onPointerLockRequested(event);
+                break;
+            case BxEvent.POINTER_LOCK_EXITED:
+                this.#onPointerLockExited(event);
+                break;
+
+            case BxEvent.XCLOUD_POLLING_MODE_CHANGED:
+                this.#onPollingModeChanged(event);
+                break;
+        }
+    }
+
+    init() {
+        this.#pointerClient = PointerClient.getInstance();
+        this.#inputSink = window.BX_EXPOSED.inputSink;
+
+        // Stop keyboard input at startup
+        this.#updateInputConfigurationAsync(false);
+
+        try {
+            this.#pointerClient.start(STATES.pointerServerPort, this);
+        } catch (e) {
+            Toast.show('Cannot enable Mouse & Keyboard feature');
+        }
+
+        this.#mouseVerticalMultiply = getPref(PrefKey.NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY);
+        this.#mouseHorizontalMultiply = getPref(PrefKey.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY);
+
+        window.addEventListener('keyup', this);
+
+        window.addEventListener(BxEvent.XCLOUD_DIALOG_SHOWN, this);
+        window.addEventListener(BxEvent.POINTER_LOCK_REQUESTED, this);
+        window.addEventListener(BxEvent.POINTER_LOCK_EXITED, this);
+        window.addEventListener(BxEvent.XCLOUD_POLLING_MODE_CHANGED, this);
+
+        this.#initMessage();
+
+        if (AppInterface) {
+            Toast.show(t('press-key-to-toggle-mkb', {key: `<b>F8</b>`}), t('native-mkb'), {html: true});
+            this.#$message?.classList.add('bx-gone');
+        } else {
+            this.#$message?.classList.remove('bx-gone');
+        }
+    }
+
+    toggle(force?: boolean) {
+        let setEnable: boolean;
+        if (typeof force !== 'undefined') {
+            setEnable = force;
+        } else {
+            setEnable = !this.#enabled;
+        }
+
+        if (setEnable) {
+            document.documentElement.requestPointerLock();
+        } else {
+            document.exitPointerLock();
+        }
+    }
+
+    #updateInputConfigurationAsync(enabled: boolean) {
+        window.BX_EXPOSED.streamSession.updateInputConfigurationAsync({
+            enableKeyboardInput: enabled,
+            enableMouseInput: enabled,
+            enableAbsoluteMouse: false,
+            enableTouchInput: false,
+        });
+    }
+
+    start() {
+        this.#resetMouseInput();
+        this.#enabled = true;
+
+        this.#updateInputConfigurationAsync(true);
+
+        window.BX_EXPOSED.stopTakRendering = true;
+        this.#$message?.classList.add('bx-gone');
+
+        Toast.show(t('native-mkb'), t('enabled'), {instant: true});
+    }
+
+    stop() {
+        this.#resetMouseInput();
+        this.#enabled = false;
+        this.#updateInputConfigurationAsync(false);
+
+        this.#$message?.classList.remove('bx-gone');
+    }
+
+    destroy(): void {
+        this.#pointerClient?.stop();
+        window.removeEventListener('keyup', this);
+
+        window.removeEventListener(BxEvent.XCLOUD_DIALOG_SHOWN, this);
+        window.removeEventListener(BxEvent.POINTER_LOCK_REQUESTED, this);
+        window.removeEventListener(BxEvent.POINTER_LOCK_EXITED, this);
+        window.removeEventListener(BxEvent.XCLOUD_POLLING_MODE_CHANGED, this);
+
+        this.#$message?.classList.add('bx-gone');
+    }
+
+    handleMouseMove(data: MkbMouseMove): void {
+        this.#sendMouseInput({
+            X: data.movementX,
+            Y: data.movementY,
+            Buttons: this.#mouseButtonsPressed,
+            WheelX: this.#mouseWheelX,
+            WheelY: this.#mouseWheelY,
+        });
+    }
+
+    handleMouseClick(data: MkbMouseClick): void {
+        const { pointerButton, pressed } = data;
+
+        if (pressed) {
+            this.#mouseButtonsPressed |= pointerButton!;
+        } else {
+            this.#mouseButtonsPressed ^= pointerButton!;
+        }
+        this.#mouseButtonsPressed = Math.max(0, this.#mouseButtonsPressed);
+
+        this.#sendMouseInput({
+            X: 0,
+            Y: 0,
+            Buttons: this.#mouseButtonsPressed,
+            WheelX: this.#mouseWheelX,
+            WheelY: this.#mouseWheelY,
+        });
+    }
+
+    handleMouseWheel(data: MkbMouseWheel): boolean {
+        const { vertical, horizontal } = data;
+
+        this.#mouseWheelX = horizontal;
+        if (this.#mouseHorizontalMultiply && this.#mouseHorizontalMultiply !== 1) {
+            this.#mouseWheelX *= this.#mouseHorizontalMultiply;
+        }
+
+        this.#mouseWheelY = vertical;
+        if (this.#mouseVerticalMultiply && this.#mouseVerticalMultiply !== 1) {
+            this.#mouseWheelY *= this.#mouseVerticalMultiply;
+        }
+
+        this.#sendMouseInput({
+            X: 0,
+            Y: 0,
+            Buttons: this.#mouseButtonsPressed,
+            WheelX: this.#mouseWheelX,
+            WheelY: this.#mouseWheelY,
+        });
+
+        return true;
+    }
+
+    setVerticalScrollMultiplier(vertical: number) {
+        this.#mouseVerticalMultiply = vertical;
+    }
+
+    setHorizontalScrollMultiplier(horizontal: number) {
+        this.#mouseHorizontalMultiply = horizontal;
+    }
+
+    waitForMouseData(enabled: boolean): void {
+    }
+
+    isEnabled(): boolean {
+        return this.#enabled;
+    }
+
+    #sendMouseInput(data: NativeMouseData) {
+        data.Type = 0;  // Relative
+        this.#inputSink?.onMouseInput(data);
+    }
+
+    #resetMouseInput() {
+        this.#mouseButtonsPressed = 0;
+        this.#mouseWheelX = 0;
+        this.#mouseWheelY = 0;
+
+        this.#sendMouseInput({
+            X: 0,
+            Y: 0,
+            Buttons: 0,
+            WheelX: 0,
+            WheelY: 0,
+        });
+    }
+}

src/modules/mkb/pointer-client.ts

@@ -1,8 +1,6 @@
 import { BxLogger } from "@/utils/bx-logger";
-import type { MkbHandler } from "./mkb-handler";
-import { KeyHelper } from "./key-helper";
-import { WheelCode } from "./definitions";
 import { Toast } from "@/utils/toast";
+import type { MkbHandler } from "./base-mkb-handler";
 
 const LOG_TAG = 'PointerClient';
 
@@ -14,15 +12,8 @@ enum PointerAction {
     POINTER_CAPTURE_CHANGED = 5,
 }
 
-const FixedMouseIndex = {
-    1: 0,
-    2: 2,
-    4: 1,
-}
 
 export class PointerClient {
-    static #PORT = 9269;
-
     private static instance: PointerClient;
     public static getInstance(): PointerClient {
         if (!PointerClient.instance) {
@@ -35,11 +26,15 @@ export class PointerClient {
     #socket: WebSocket | undefined | null;
     #mkbHandler: MkbHandler | undefined;
 
-    start(mkbHandler: MkbHandler) {
+    start(port: number, mkbHandler: MkbHandler) {
+        if (!port) {
+            throw new Error('PointerServer port is 0');
+        }
+
         this.#mkbHandler = mkbHandler;
 
         // Create WebSocket connection.
-        this.#socket = new WebSocket(`ws://localhost:${PointerClient.#PORT}`);
+        this.#socket = new WebSocket(`ws://localhost:${port}`);
         this.#socket.binaryType = 'arraybuffer';
 
         // Connection opened
@@ -50,7 +45,7 @@ export class PointerClient {
         // Error
         this.#socket.addEventListener('error', (event) => {
             BxLogger.error(LOG_TAG, event);
-            Toast.show('Cannot setup mouse');
+            Toast.show('Cannot setup mouse: ' + event);
         });
 
         this.#socket.addEventListener('close', (event) => {
@@ -97,15 +92,10 @@ export class PointerClient {
     }
 
     onPress(messageType: PointerAction, dataView: DataView, offset: number) {
-        const buttonIndex = dataView.getInt8(offset);
+        const button = dataView.getUint8(offset);
-        const fixedIndex = FixedMouseIndex[buttonIndex as keyof typeof FixedMouseIndex];
-        const keyCode = 'Mouse' + fixedIndex;
 
         this.#mkbHandler?.handleMouseClick({
-            key: {
+            pointerButton: button,
-                code: keyCode,
-                name: KeyHelper.codeToKeyName(keyCode),
-            },
             pressed: messageType === PointerAction.BUTTON_PRESS,
         });
 
@@ -114,26 +104,13 @@ export class PointerClient {
 
     onScroll(dataView: DataView, offset: number) {
         // [V_SCROLL, H_SCROLL]
-        const vScroll = dataView.getInt8(offset);
+        const vScroll = dataView.getInt16(offset);
-        offset += Int8Array.BYTES_PER_ELEMENT;
+        offset += Int16Array.BYTES_PER_ELEMENT;
-        const hScroll = dataView.getInt8(offset);
+        const hScroll = dataView.getInt16(offset);
 
-        let code = '';
+        this.#mkbHandler?.handleMouseWheel({
-        if (vScroll < 0) {
+            vertical: vScroll,
-            code = WheelCode.SCROLL_UP;
+            horizontal: hScroll,
-        } else if (vScroll > 0) {
-            code = WheelCode.SCROLL_DOWN;
-        } else if (hScroll < 0) {
-            code = WheelCode.SCROLL_LEFT;
-        } else if (hScroll > 0) {
-            code = WheelCode.SCROLL_RIGHT;
-        }
-
-        code && this.#mkbHandler?.handleMouseWheel({
-            key: {
-                code: code,
-                name: KeyHelper.codeToKeyName(code),
-            },
         });
 
         // BxLogger.info(LOG_TAG, 'scroll', vScroll, hScroll);
@@ -148,5 +125,6 @@ export class PointerClient {
         try {
             this.#socket?.close();
         } catch (e) {}
+        this.#socket = null;
     }
 }

src/modules/patcher.ts

@@ -7,10 +7,14 @@ import { hashCode, renderString } from "@utils/utils";
 import { BxEvent } from "@/utils/bx-event";
 
 import codeControllerShortcuts from "./patches/controller-shortcuts.js" with { type: "text" };
+import codeExposeStreamSession from "./patches/expose-stream-session.js" with { type: "text" };
 import codeLocalCoOpEnable from "./patches/local-co-op-enable.js" with { type: "text" };
+import codeSetCurrentlyFocusedInteractable from "./patches/set-currently-focused-interactable.js" with { type: "text" };
 import codeRemotePlayEnable from "./patches/remote-play-enable.js" with { type: "text" };
 import codeRemotePlayKeepAlive from "./patches/remote-play-keep-alive.js" with { type: "text" };
 import codeVibrationAdjust from "./patches/vibration-adjust.js" with { type: "text" };
+import { FeatureGates } from "@/utils/feature-gates.js";
+import { UiSection } from "@/enums/ui-sections.js";
 
 type PatchArray = (keyof typeof PATCHES)[];
 
@@ -187,12 +191,18 @@ if (!!window.BX_REMOTE_PLAY_CONFIG) {
     },
 
     enableXcloudLogger(str: string) {
-        const text = 'this.telemetryProvider=e}log(e,t,i){';
+        const text = 'this.telemetryProvider=e}log(e,t,r){';
         if (!str.includes(text)) {
             return false;
         }
 
-        str = str.replaceAll(text, text + 'console.log(Array.from(arguments));');
+        const newCode = `
+const [logTag, logLevel, logMessage] = Array.from(arguments);
+const logFunc = [console.debug, console.log, console.warn, console.error][logLevel];
+logFunc(logTag, '//', logMessage);
+`;
+
+        str = str.replaceAll(text, text + newCode);
         return str;
     },
 
@@ -228,12 +238,10 @@ if (!!window.BX_REMOTE_PLAY_CONFIG) {
         // Find the next "},"
         const endIndex = str.indexOf('},', index);
 
-        const newSettings = [
+        let newSettings = JSON.stringify(FeatureGates);
-            // 'EnableStreamGate: false',
+        newSettings = newSettings.substring(1, newSettings.length - 1);
-            'PwaPrompt: false',
-        ];
 
-        const newCode = newSettings.join(',');
+        const newCode = newSettings;
 
         str = str.substring(0, endIndex) + ',' + newCode + str.substring(endIndex);
         return str;
@@ -304,6 +312,37 @@ window.dispatchEvent(new Event("${BxEvent.TOUCH_LAYOUT_MANAGER_READY}"));
         return str;
     },
 
+
+    patchBabylonRendererClass(str: string) {
+        // ()=>{a.current.render(),h.current=window.requestAnimationFrame(l)
+        let index = str.indexOf('.current.render(),');
+        if (index === -1) {
+            return false;
+        }
+
+        // Move back a character
+        index -= 1;
+
+        // Get variable of the "BabylonRendererClass" object
+        const rendererVar = str[index];
+
+        const newCode = `
+if (window.BX_EXPOSED.stopTakRendering) {
+    try {
+        document.getElementById('BabylonCanvasContainer-main')?.parentElement.classList.add('bx-offscreen');
+
+        ${rendererVar}.current.dispose();
+    } catch (e) {}
+
+    window.BX_EXPOSED.stopTakRendering = false;
+    return;
+}
+`;
+
+        str = str.substring(0, index) + newCode + str.substring(index);
+        return str;
+    },
+
     supportLocalCoOp(str: string) {
         const text = 'this.gamepadMappingsToSend=[],';
         if (!str.includes(text)) {
@@ -535,20 +574,7 @@ window.dispatchEvent(new Event('${BxEvent.STREAM_EVENT_TARGET_READY}'))
         }
 
         const newCode = `;
-window.BX_EXPOSED.streamSession = this;
+${codeExposeStreamSession}
-
-const orgSetMicrophoneState = this.setMicrophoneState.bind(this);
-this.setMicrophoneState = state => {
-    orgSetMicrophoneState(state);
-
-    const evt = new Event('${BxEvent.MICROPHONE_STATE_CHANGED}');
-    evt.microphoneState = state;
-
-    window.dispatchEvent(evt);
-};
-
-window.dispatchEvent(new Event('${BxEvent.STREAM_SESSION_READY}'))
-
 true` + text;
 
         str = str.replace(text, newCode);
@@ -564,19 +590,235 @@ true` + text;
         str = str.replace(text, '&& false ' + text);
         return str;
     },
+
+    enableNativeMkb(str: string) {
+        const text = 'e.mouseSupported&&e.keyboardSupported&&e.fullscreenSupported;';
+        if ((!str.includes(text))) {
+            return false;
+        }
+
+        str = str.replace(text, text + 'return true;');
+        return str;
+    },
+
+    patchMouseAndKeyboardEnabled(str: string) {
+        const text = 'get mouseAndKeyboardEnabled(){';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        str = str.replace(text, text + 'return true;');
+        return str;
+    },
+
+    exposeInputSink(str: string) {
+        const text = 'this.controlChannel=null,this.inputChannel=null';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        const newCode = 'window.BX_EXPOSED.inputSink = this;';
+
+        str = str.replace(text, newCode + text);
+        return str;
+    },
+
+    disableNativeRequestPointerLock(str: string) {
+        const text = 'async requestPointerLock(){';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        str = str.replace(text, text + 'return;');
+        return str;
+    },
+
+    // Fix crashing when RequestInfo.origin is empty
+    patchRequestInfoCrash(str: string) {
+        const text = 'if(!e)throw new Error("RequestInfo.origin is falsy");';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        str = str.replace(text, 'if (!e) e = "https://www.xbox.com";');
+        return str;
+    },
+
+    exposeDialogRoutes(str: string) {
+        const text = 'return{goBack:function(){';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        str = str.replace(text, 'return window.BX_EXPOSED.dialogRoutes = {goBack:function(){');
+        return str;
+    },
+
+    /*
+    (x.AW, {
+        path: V.LoginDeviceCode.path,
+        exact: !0,
+        render: () => (0, n.jsx)(qe, {
+            children: (0, n.jsx)(Et.R, {})
+        })
+    }, V.LoginDeviceCode.name),
+
+    const qe = e => {
+        let {
+            children: t
+        } = e;
+        const {
+            isTV: a,
+            isSupportedTVBrowser: r
+        } = (0, T.d)();
+        return a && r ? (0, n.jsx)(n.Fragment, {
+            children: t
+        }) : (0, n.jsx)(x.l_, {
+            to: V.Home.getLink()
+        })
+    };
+    */
+    enableTvRoutes(str: string) {
+        let index = str.indexOf('.LoginDeviceCode.path,');
+        if (index < 0) {
+            return false;
+        }
+
+        // Find *qe* name
+        const match = /render:.*?jsx\)\(([^,]+),/.exec(str.substring(index, index + 100));
+        if (!match) {
+            return false;
+        }
+
+        const funcName = match[1];
+
+        // Replace *qe*'s return value
+        // `return a && r ?` => `return a && r || true ?`
+        index = str.indexOf(`const ${funcName}=e=>{`);
+        index > -1 && (index = str.indexOf('return ', index));
+        index > -1 && (index = str.indexOf('?', index));
+
+        if (index === -1) {
+            return false;
+        }
+
+        str = str.substring(0, index) + '|| true' + str.substring(index);
+        return str;
+    },
+
+    // Don't render "Play With Friends" sections
+    ignorePlayWithFriendsSection(str: string) {
+        let index = str.indexOf('location:"PlayWithFriendsRow",');
+        if (index === -1) {
+            return false;
+        }
+
+        index = str.indexOf('return', index - 50);
+        if (index === -1) {
+            return false;
+        }
+
+        str = str.substring(0, index) + 'return null;' + str.substring(index + 6);
+        return str;
+    },
+
+    // Don't render "All Games" sections
+    ignoreAllGamesSection(str: string) {
+        let index = str.indexOf('className:"AllGamesRow-module__allGamesRowContainer');
+        if (index === -1) {
+            return false;
+        }
+
+        index = str.indexOf('grid:!0,', index);
+        index > -1 && (index = str.indexOf('(0,', index - 70));
+
+        if (index === -1) {
+            return false;
+        }
+
+        str = str.substring(0, index) + 'true ? null :' + str.substring(index);
+        return str;
+    },
+
+    // Override Storage.getSettings()
+    overrideStorageGetSettings(str: string) {
+        const text = '}getSetting(e){';
+        if (!str.includes(text)) {
+            return false;
+        }
+
+        const newCode = `
+// console.log('setting', this.baseStorageKey, e);
+if (this.baseStorageKey in window.BX_EXPOSED.overrideSettings) {
+    const settings = window.BX_EXPOSED.overrideSettings[this.baseStorageKey];
+    if (e in settings) {
+        return settings[e];
+    }
+}
+`;
+        str = str.replace(text, text + newCode);
+        return str;
+    },
+
+    // game-stream.js   24.16.4
+    alwaysShowStreamHud(str: string) {
+        let index = str.indexOf(',{onShowStreamMenu:');
+        if (index === -1) {
+            return false;
+        }
+
+        index = str.indexOf('&&(0,', index - 100);
+        if (index === -1) {
+            return false;
+        }
+
+        const commaIndex = str.indexOf(',', index - 10);
+        str = str.substring(0, commaIndex) + ',true' + str.substring(index);
+        return str;
+    },
+
+    // 24225.js#4127, 24.17.11
+    patchSetCurrentlyFocusedInteractable(str: string) {
+        let index = str.indexOf('.setCurrentlyFocusedInteractable=(');
+        if (index === -1) {
+            return false;
+        }
+
+        index = str.indexOf('{', index) + 1;
+        str = str.substring(0, index) + codeSetCurrentlyFocusedInteractable + str.substring(index);
+        return str;
+    },
 };
 
 let PATCH_ORDERS: PatchArray = [
+    ...(getPref(PrefKey.NATIVE_MKB_ENABLED) === 'on' ? [
+        'enableNativeMkb',
+        'patchMouseAndKeyboardEnabled',
+        'disableNativeRequestPointerLock',
+        'exposeInputSink',
+    ] : []),
+
+    'patchRequestInfoCrash',
+
     'disableStreamGate',
     'overrideSettings',
     'broadcastPollingMode',
 
     'exposeStreamSession',
+    'exposeDialogRoutes',
+
+    'enableTvRoutes',
+
+    'overrideStorageGetSettings',
+    getPref(PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME) && 'patchSetCurrentlyFocusedInteractable',
 
     getPref(PrefKey.UI_LAYOUT) !== 'default' && 'websiteLayout',
     getPref(PrefKey.LOCAL_CO_OP_ENABLED) && 'supportLocalCoOp',
     getPref(PrefKey.GAME_FORTNITE_FORCE_CONSOLE) && 'forceFortniteConsole',
 
+    getPref(PrefKey.UI_HIDE_SECTIONS).includes(UiSection.FRIENDS) && 'ignorePlayWithFriendsSection',
+    getPref(PrefKey.UI_HIDE_SECTIONS).includes(UiSection.ALL_GAMES) && 'ignoreAllGamesSection',
+
     ...(getPref(PrefKey.BLOCK_TRACKING) ? [
         'disableAiTrack',
         'disableTelemetry',
@@ -592,7 +834,7 @@ let PATCH_ORDERS: PatchArray = [
         'remotePlayKeepAlive',
         'remotePlayDirectConnectUrl',
         'remotePlayDisableAchievementToast',
-        STATES.hasTouchSupport && 'patchUpdateInputConfigurationAsync',
+        STATES.userAgent.capabilities.touch && 'patchUpdateInputConfigurationAsync',
     ] : []),
 
     ...(BX_FLAGS.EnableXcloudLogging ? [
@@ -608,6 +850,8 @@ let PLAYING_PATCH_ORDERS: PatchArray = [
     'patchStreamHud',
     'playVibration',
 
+    'alwaysShowStreamHud',
+
     // 'exposeEventTarget',
 
     // Patch volume control for normal stream
@@ -618,11 +862,13 @@ let PLAYING_PATCH_ORDERS: PatchArray = [
     // Skip feedback dialog
     getPref(PrefKey.STREAM_DISABLE_FEEDBACK_DIALOG) && 'skipFeedbackDialog',
 
-
+    ...(STATES.userAgent.capabilities.touch ? [
-    STATES.hasTouchSupport && getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'patchShowSensorControls',
+        getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'patchShowSensorControls',
-    STATES.hasTouchSupport && getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'exposeTouchLayoutManager',
+        getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'exposeTouchLayoutManager',
-    STATES.hasTouchSupport && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'off' || getPref(PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF)) && 'disableTakRenderer',
+        (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'off' || getPref(PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF) || !STATES.userAgent.capabilities.touch) && 'disableTakRenderer',
-    STATES.hasTouchSupport && getPref(PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY) !== 100 && 'patchTouchControlDefaultOpacity',
+        getPref(PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY) !== 100 && 'patchTouchControlDefaultOpacity',
+        'patchBabylonRendererClass',
+    ] : []),
 
     BX_FLAGS.EnableXcloudLogging && 'enableConsoleLogging',
 

src/modules/patches/expose-stream-session.js

@@ -0,0 +1,29 @@
+window.BX_EXPOSED.streamSession = this;
+
+const orgSetMicrophoneState = this.setMicrophoneState.bind(this);
+this.setMicrophoneState = state => {
+    orgSetMicrophoneState(state);
+
+    const evt = new Event(BxEvent.MICROPHONE_STATE_CHANGED);
+    evt.microphoneState = state;
+
+    window.dispatchEvent(evt);
+};
+
+window.dispatchEvent(new Event(BxEvent.STREAM_SESSION_READY));
+
+// Patch updateDimensions() to make native touch work correctly with WebGL2
+let updateDimensionsStr = this.updateDimensions.toString();
+
+// if(r){
+const renderTargetVar = updateDimensionsStr.match(/if\((\w+)\){/)[1];
+
+updateDimensionsStr = updateDimensionsStr.replaceAll(renderTargetVar + '.scroll', 'scroll');
+
+updateDimensionsStr = updateDimensionsStr.replace(`if(${renderTargetVar}){`, `
+if (${renderTargetVar}) {
+    const scrollWidth = ${renderTargetVar}.dataset.width ? parseInt(${renderTargetVar}.dataset.width) : ${renderTargetVar}.scrollWidth;
+    const scrollHeight = ${renderTargetVar}.dataset.height ? parseInt(${renderTargetVar}.dataset.height) : ${renderTargetVar}.scrollHeight;
+`);
+
+eval(`this.updateDimensions = function ${updateDimensionsStr}`);

src/modules/patches/set-currently-focused-interactable.js

@@ -0,0 +1 @@
+e && BxEvent.dispatch(window, BxEvent.NAVIGATION_FOCUS_CHANGED, {element: e});

src/modules/player/shaders/clarity_boost.fs

@@ -0,0 +1,121 @@
+const int FILTER_UNSHARP_MASKING = 1;
+const int FILTER_CAS = 2;
+
+precision highp float;
+uniform sampler2D data;
+uniform vec2 iResolution;
+
+uniform int filterId;
+uniform float sharpenFactor;
+uniform float brightness;
+uniform float contrast;
+uniform float saturation;
+
+vec3 textureAt(sampler2D tex, vec2 coord) {
+    return texture2D(tex, coord / iResolution.xy).rgb;
+}
+
+vec3 clarityBoost(sampler2D tex, vec2 coord)
+{
+    // Load a collection of samples in a 3x3 neighorhood, where e is the current pixel.
+    // a b c
+    // d e f
+    // g h i
+    vec3 a = textureAt(tex, coord + vec2(-1, 1));
+    vec3 b = textureAt(tex, coord + vec2(0, 1));
+    vec3 c = textureAt(tex, coord + vec2(1, 1));
+
+    vec3 d = textureAt(tex, coord + vec2(-1, 0));
+    vec3 e = textureAt(tex, coord);
+    vec3 f = textureAt(tex, coord + vec2(1, 0));
+
+    vec3 g = textureAt(tex, coord + vec2(-1, -1));
+    vec3 h = textureAt(tex, coord + vec2(0, -1));
+    vec3 i = textureAt(tex, coord + vec2(1, -1));
+
+    if (filterId == FILTER_CAS) {
+        // Soft min and max.
+        //  a b c             b
+        //  d e f * 0.5  +  d e f * 0.5
+        //  g h i             h
+        // These are 2.0x bigger (factored out the extra multiply).
+        vec3 minRgb = min(min(min(d, e), min(f, b)), h);
+        vec3 minRgb2 = min(min(a, c), min(g, i));
+        minRgb += min(minRgb, minRgb2);
+
+        vec3 maxRgb = max(max(max(d, e), max(f, b)), h);
+        vec3 maxRgb2 = max(max(a, c), max(g, i));
+        maxRgb += max(maxRgb, maxRgb2);
+
+        // Smooth minimum distance to signal limit divided by smooth max.
+        vec3 reciprocalMaxRgb = 1.0 / maxRgb;
+        vec3 amplifyRgb = clamp(min(minRgb, 2.0 - maxRgb) * reciprocalMaxRgb, 0.0, 1.0);
+
+        // Shaping amount of sharpening.
+        amplifyRgb = inversesqrt(amplifyRgb);
+
+        float contrast = 0.8;
+        float peak = -3.0 * contrast + 8.0;
+        vec3 weightRgb = -(1.0 / (amplifyRgb * peak));
+
+        vec3 reciprocalWeightRgb = 1.0 / (4.0 * weightRgb + 1.0);
+
+        //                0 w 0
+        // Filter shape:  w 1 w
+        //                0 w 0
+        vec3 window = (b + d) + (f + h);
+        vec3 outColor = clamp((window * weightRgb + e) * reciprocalWeightRgb, 0.0, 1.0);
+
+        outColor = mix(e, outColor, sharpenFactor / 2.0);
+
+        return outColor;
+    } else if (filterId == FILTER_UNSHARP_MASKING) {
+        vec3 gaussianBlur = (a * 1.0 + b * 2.0 + c * 1.0 +
+            d * 2.0 + e * 4.0 + f * 2.0 +
+            g * 1.0 + h * 2.0 + i * 1.0) / 16.0;
+
+        // Return edge detection
+        return e + (e - gaussianBlur) * sharpenFactor / 3.0;
+    }
+
+    return e;
+}
+
+vec3 adjustBrightness(vec3 color) {
+    return (1.0 + brightness) * color;
+}
+
+vec3 adjustContrast(vec3 color) {
+    return 0.5 + (1.0 + contrast) * (color - 0.5);
+}
+
+vec3 adjustSaturation(vec3 color) {
+    const vec3 luminosityFactor = vec3(0.2126, 0.7152, 0.0722);
+    vec3 grayscale = vec3(dot(color, luminosityFactor));
+
+    return mix(grayscale, color, 1.0 + saturation);
+}
+
+void main() {
+    vec3 color;
+
+    if (sharpenFactor > 0.0) {
+        color = clarityBoost(data, gl_FragCoord.xy);
+    } else {
+        color = textureAt(data, gl_FragCoord.xy);
+    }
+
+    if (saturation != 0.0) {
+        color = adjustSaturation(color);
+    }
+
+    if (contrast != 0.0) {
+        color = adjustContrast(color);
+    }
+
+    if (brightness != 0.0) {
+        color = adjustBrightness(color);
+    }
+
+    gl_FragColor = vec4(color, 1.0);
+}

src/modules/player/shaders/clarity_boost.vert

@@ -0,0 +1,5 @@
+attribute vec2 position;
+
+void main() {
+    gl_Position = vec4(position, 0, 1);
+}

src/modules/player/webgl2-player.ts

@@ -0,0 +1,250 @@
+import vertClarityBoost from "./shaders/clarity_boost.vert" with { type: "text" };
+import fsClarityBoost from "./shaders/clarity_boost.fs" with { type: "text" };
+import { BxLogger } from "@/utils/bx-logger";
+
+
+const LOG_TAG = 'WebGL2Player';
+
+export class WebGL2Player {
+    #$video: HTMLVideoElement;
+    #$canvas: HTMLCanvasElement;
+
+    #gl: WebGL2RenderingContext | null = null;
+    #resources: Array<any> = [];
+    #program: WebGLProgram | null = null;
+
+    #stopped: boolean = false;
+
+    #options = {
+        filterId: 1,
+        sharpenFactor: 0,
+        brightness: 0.0,
+        contrast: 0.0,
+        saturation: 0.0,
+    };
+
+    #animFrameId: number | null = null;
+
+    constructor($video: HTMLVideoElement) {
+        BxLogger.info(LOG_TAG, 'Initialize');
+        this.#$video = $video;
+
+        const $canvas = document.createElement('canvas');
+        $canvas.width = $video.videoWidth;
+        $canvas.height = $video.videoHeight;
+        this.#$canvas = $canvas;
+
+        this.#setupShaders();
+        this.#setupRendering();
+
+        $video.insertAdjacentElement('afterend', $canvas);
+    }
+
+    setFilter(filterId: number, update = true) {
+        this.#options.filterId = filterId;
+        update && this.updateCanvas();
+    }
+
+    setSharpness(sharpness: number, update = true) {
+        this.#options.sharpenFactor = sharpness;
+        update && this.updateCanvas();
+    }
+
+    setBrightness(brightness: number, update = true) {
+        this.#options.brightness = (brightness - 100) / 100;
+        update && this.updateCanvas();
+    }
+
+    setContrast(contrast: number, update = true) {
+        this.#options.contrast = (contrast - 100) / 100;
+        update && this.updateCanvas();
+    }
+
+    setSaturation(saturation: number, update = true) {
+        this.#options.saturation = (saturation - 100) / 100;
+        update && this.updateCanvas();
+    }
+
+    getCanvas() {
+        return this.#$canvas;
+    }
+
+    updateCanvas() {
+        const gl = this.#gl!;
+        const program = this.#program!;
+
+        gl.uniform2f(gl.getUniformLocation(program, 'iResolution'), this.#$canvas.width, this.#$canvas.height);
+
+        gl.uniform1i(gl.getUniformLocation(program, 'filterId'), this.#options.filterId);
+        gl.uniform1f(gl.getUniformLocation(program, 'sharpenFactor'), this.#options.sharpenFactor);
+        gl.uniform1f(gl.getUniformLocation(program, 'brightness'), this.#options.brightness);
+        gl.uniform1f(gl.getUniformLocation(program, 'contrast'), this.#options.contrast);
+        gl.uniform1f(gl.getUniformLocation(program, 'saturation'), this.#options.saturation);
+    }
+
+    drawFrame() {
+        const gl = this.#gl!;
+        const $video = this.#$video;
+
+        gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGB, gl.RGB, gl.UNSIGNED_BYTE, $video);
+        gl.drawArrays(gl.TRIANGLES, 0, 6);
+    }
+
+    #setupRendering() {
+        let animate: any;
+
+        if ('requestVideoFrameCallback' in HTMLVideoElement.prototype) {
+            const $video = this.#$video;
+            animate = () => {
+                if (this.#stopped) {
+                    return;
+                }
+
+                this.drawFrame();
+                this.#animFrameId = $video.requestVideoFrameCallback(animate);
+            }
+
+            this.#animFrameId = $video.requestVideoFrameCallback(animate);
+        } else {
+            animate = () => {
+                if (this.#stopped) {
+                    return;
+                }
+
+                this.drawFrame();
+                this.#animFrameId = requestAnimationFrame(animate);
+            }
+
+            this.#animFrameId = requestAnimationFrame(animate);
+        }
+    }
+
+    #setupShaders() {
+        const gl = this.#$canvas.getContext('webgl2', {
+            isBx: true,
+            antialias: true,
+            alpha: false,
+            powerPreference: 'high-performance',
+        }) as WebGL2RenderingContext;
+        this.#gl = gl;
+
+        gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferWidth);
+
+        // Vertex shader: Identity map
+        const vShader = gl.createShader(gl.VERTEX_SHADER)!;
+        gl.shaderSource(vShader, vertClarityBoost);
+        gl.compileShader(vShader);
+
+        const fShader = gl.createShader(gl.FRAGMENT_SHADER)!;
+        gl.shaderSource(fShader, fsClarityBoost);
+        gl.compileShader(fShader);
+
+        // Create and link program
+        const program = gl.createProgram()!;
+        this.#program = program;
+
+        gl.attachShader(program, vShader);
+        gl.attachShader(program, fShader);
+        gl.linkProgram(program);
+        gl.useProgram(program);
+
+        if (!gl.getProgramParameter(program, gl.LINK_STATUS)) {
+            console.error(`Link failed: ${gl.getProgramInfoLog(program)}`);
+            console.error(`vs info-log: ${gl.getShaderInfoLog(vShader)}`);
+            console.error(`fs info-log: ${gl.getShaderInfoLog(fShader)}`);
+        }
+
+        this.updateCanvas();
+
+        // Vertices: A screen-filling quad made from two triangles
+        const buffer = gl.createBuffer();
+        this.#resources.push(buffer);
+
+        gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
+        gl.bufferData(gl.ARRAY_BUFFER, new Float32Array([
+            -1, -1,
+            1, -1,
+            -1,  1,
+            -1,  1,
+            1, -1,
+            1,  1,
+        ]), gl.STATIC_DRAW);
+
+        gl.enableVertexAttribArray(0);
+        gl.vertexAttribPointer(0, 2, gl.FLOAT, false, 0, 0);
+
+        // Texture to contain the video data
+        const texture = gl.createTexture();
+        this.#resources.push(texture);
+
+        gl.bindTexture(gl.TEXTURE_2D, texture);
+        gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, true);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR);
+        gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR);
+
+        // Bind texture to the "data" argument to the fragment shader
+        gl.uniform1i(gl.getUniformLocation(program, 'data'), 0);
+
+        gl.activeTexture(gl.TEXTURE0);
+        // gl.bindTexture(gl.TEXTURE_2D, texture);
+    }
+
+    resume() {
+        this.stop();
+        this.#stopped = false;
+        BxLogger.info(LOG_TAG, 'Resume');
+
+        this.#$canvas.classList.remove('bx-gone');
+        this.#setupRendering();
+    }
+
+    stop() {
+        BxLogger.info(LOG_TAG, 'Stop');
+        this.#$canvas.classList.add('bx-gone');
+
+        this.#stopped = true;
+        if (this.#animFrameId) {
+            if ('requestVideoFrameCallback' in HTMLVideoElement.prototype) {
+                this.#$video.cancelVideoFrameCallback(this.#animFrameId);
+            } else {
+                cancelAnimationFrame(this.#animFrameId);
+            }
+
+            this.#animFrameId = null;
+        }
+    }
+
+    destroy() {
+        BxLogger.info(LOG_TAG, 'Destroy');
+        this.stop();
+
+        const gl = this.#gl;
+        if (gl) {
+            gl.getExtension('WEBGL_lose_context')?.loseContext();
+
+            for (const resource of this.#resources) {
+                if (resource instanceof WebGLProgram) {
+                    gl.useProgram(null);
+                    gl.deleteProgram(resource);
+                } else if (resource instanceof WebGLShader) {
+                    gl.deleteShader(resource);
+                } else if (resource instanceof WebGLTexture) {
+                    gl.deleteTexture(resource);
+                } else if (resource instanceof WebGLBuffer) {
+                    gl.deleteBuffer(resource);
+                }
+            }
+
+            this.#gl = null;
+        }
+
+        if (this.#$canvas.isConnected) {
+            this.#$canvas.parentElement?.removeChild(this.#$canvas);
+        }
+
+        this.#$canvas.width = 1;
+        this.#$canvas.height = 1;
+    }
+}

src/modules/remote-play.ts

@@ -7,6 +7,7 @@ import { getPref, PrefKey, setPref } from "@utils/preferences";
 import { t } from "@utils/translation";
 import { localRedirect } from "@modules/ui/ui";
 import { BxLogger } from "@utils/bx-logger";
+import { HeaderSection } from "./ui/header";
 
 const LOG_TAG = 'RemotePlay';
 
@@ -97,6 +98,10 @@ export class RemotePlay {
         RemotePlay.#getXhomeToken(() => {
             RemotePlay.#getConsolesList(() => {
                 BxLogger.info(LOG_TAG, 'Consoles', RemotePlay.#CONSOLES);
+                if (RemotePlay.#CONSOLES && RemotePlay.#CONSOLES.length > 0) {
+                    STATES.supportedRegion && HeaderSection.showRemotePlayButton();
+                }
+
                 RemotePlay.#renderConsoles();
                 BxEvent.dispatch(window, BxEvent.REMOTE_PLAY_READY);
             });

src/modules/stream-player.ts

@@ -0,0 +1,268 @@
+import { CE } from "@/utils/html";
+import { WebGL2Player } from "./player/webgl2-player";
+import { getPref, PrefKey } from "@/utils/preferences";
+import { Screenshot } from "@/utils/screenshot";
+import { StreamPlayerType, StreamVideoProcessing } from "@enums/stream-player";
+import { STATES } from "@/utils/global";
+
+export type StreamPlayerOptions = Partial<{
+    processing: string,
+    sharpness: number,
+    saturation: number,
+    contrast: number,
+    brightness: number,
+}>;
+
+export class StreamPlayer {
+    #$video: HTMLVideoElement;
+    #playerType: StreamPlayerType = StreamPlayerType.VIDEO;
+
+    #options: StreamPlayerOptions = {};
+
+    #webGL2Player: WebGL2Player | null = null;
+
+    #$videoCss: HTMLStyleElement | null = null;
+    #$usmMatrix: SVGFEConvolveMatrixElement | null = null;
+
+    constructor($video: HTMLVideoElement, type: StreamPlayerType, options: StreamPlayerOptions) {
+        this.#setupVideoElements();
+
+        this.#$video = $video;
+        this.#options = options || {};
+        this.setPlayerType(type);
+    }
+
+    #setupVideoElements() {
+        this.#$videoCss = document.getElementById('bx-video-css') as HTMLStyleElement;
+        if (this.#$videoCss) {
+            this.#$usmMatrix = this.#$videoCss.querySelector('#bx-filter-usm-matrix') as any;
+            return;
+        }
+
+        const $fragment = document.createDocumentFragment();
+
+        this.#$videoCss = CE<HTMLStyleElement>('style', {id: 'bx-video-css'});
+        $fragment.appendChild(this.#$videoCss);
+
+        // Setup SVG filters
+        const $svg = CE('svg', {
+            id: 'bx-video-filters',
+            xmlns: 'http://www.w3.org/2000/svg',
+            class: 'bx-gone',
+        }, CE('defs', {xmlns: 'http://www.w3.org/2000/svg'},
+            CE('filter', {
+                    id: 'bx-filter-usm',
+                    xmlns: 'http://www.w3.org/2000/svg',
+                }, this.#$usmMatrix = CE('feConvolveMatrix', {
+                    id: 'bx-filter-usm-matrix',
+                    order: '3',
+                    xmlns: 'http://www.w3.org/2000/svg',
+                })),
+            ),
+        );
+        $fragment.appendChild($svg);
+        document.documentElement.appendChild($fragment);
+    }
+
+    #getVideoPlayerFilterStyle() {
+        const filters = [];
+
+        const sharpness = this.#options.sharpness || 0;
+        if (sharpness != 0) {
+            const level = (7 - ((sharpness / 2) - 1) * 0.5).toFixed(1); // 5, 5.5, 6, 6.5, 7
+            const matrix = `0 -1 0 -1 ${level} -1 0 -1 0`;
+            this.#$usmMatrix?.setAttributeNS(null, 'kernelMatrix', matrix);
+
+            filters.push(`url(#bx-filter-usm)`);
+        }
+
+        const saturation = this.#options.saturation || 100;
+        if (saturation != 100) {
+            filters.push(`saturate(${saturation}%)`);
+        }
+
+        const contrast =  this.#options.contrast || 100;
+        if (contrast != 100) {
+            filters.push(`contrast(${contrast}%)`);
+        }
+
+        const brightness = this.#options.brightness || 100;
+        if (brightness != 100) {
+            filters.push(`brightness(${brightness}%)`);
+        }
+
+        return filters.join(' ');
+    }
+
+    #resizePlayer() {
+        const PREF_RATIO = getPref(PrefKey.VIDEO_RATIO);
+        const $video = this.#$video;
+        const isNativeTouchGame = STATES.currentStream.titleInfo?.details.hasNativeTouchSupport;
+
+        let $webGL2Canvas;
+        if (this.#playerType == StreamPlayerType.WEBGL2) {
+            $webGL2Canvas = this.#webGL2Player?.getCanvas()!;
+        }
+
+        let targetWidth;
+        let targetHeight;
+        let targetObjectFit;
+
+        if (PREF_RATIO.includes(':')) {
+            const tmp = PREF_RATIO.split(':');
+
+            // Get preferred ratio
+            const videoRatio = parseFloat(tmp[0]) / parseFloat(tmp[1]);
+
+            let width = 0;
+            let height = 0;
+
+            // Get parent's ratio
+            const parentRect = $video.parentElement!.getBoundingClientRect();
+            const parentRatio = parentRect.width / parentRect.height;
+
+            // Get target width & height
+            if (parentRatio > videoRatio) {
+                height = parentRect.height;
+                width = height * videoRatio;
+            } else {
+                width = parentRect.width;
+                height = width / videoRatio;
+            }
+
+            // Prevent floating points
+            width = Math.ceil(Math.min(parentRect.width, width));
+            height = Math.ceil(Math.min(parentRect.height, height));
+
+            $video.dataset.width = width.toString();
+            $video.dataset.height = height.toString();
+
+            // Update size
+            targetWidth = `${width}px`;
+            targetHeight = `${height}px`;
+            targetObjectFit = PREF_RATIO === '16:9' ? 'contain' : 'fill';
+        } else {
+            targetWidth = '100%';
+            targetHeight = '100%';
+            targetObjectFit = PREF_RATIO;
+
+            $video.dataset.width = window.innerWidth.toString();
+            $video.dataset.height = window.innerHeight.toString();
+        }
+
+        $video.style.width = targetWidth;
+        $video.style.height = targetHeight;
+        $video.style.objectFit = targetObjectFit;
+
+        // $video.style.padding = padding;
+
+        if ($webGL2Canvas) {
+            $webGL2Canvas.style.width = targetWidth;
+            $webGL2Canvas.style.height = targetHeight;
+            $webGL2Canvas.style.objectFit = targetObjectFit;
+        }
+
+        // Update video dimensions
+        if (isNativeTouchGame && this.#playerType == StreamPlayerType.WEBGL2) {
+            window.BX_EXPOSED.streamSession.updateDimensions();
+        }
+    }
+
+    setPlayerType(type: StreamPlayerType, refreshPlayer: boolean = false) {
+        if (this.#playerType !== type) {
+            // Switch from Video -> WebGL2
+            if (type === StreamPlayerType.WEBGL2) {
+                // Initialize WebGL2 player
+                if (!this.#webGL2Player) {
+                    this.#webGL2Player = new WebGL2Player(this.#$video);
+                } else {
+                    this.#webGL2Player.resume();
+                }
+
+                this.#$videoCss!.textContent = '';
+
+                this.#$video.classList.add('bx-pixel');
+            } else {
+                // Cleanup WebGL2 Player
+                this.#webGL2Player?.stop();
+
+                this.#$video.classList.remove('bx-pixel');
+            }
+        }
+
+        this.#playerType = type;
+        refreshPlayer && this.refreshPlayer();
+    }
+
+    setOptions(options: StreamPlayerOptions, refreshPlayer: boolean = false) {
+        this.#options = options;
+        refreshPlayer && this.refreshPlayer();
+    }
+
+    updateOptions(options: StreamPlayerOptions, refreshPlayer: boolean = false) {
+        this.#options = Object.assign(this.#options, options);
+        refreshPlayer && this.refreshPlayer();
+    }
+
+    getPlayerElement(playerType?: StreamPlayerType) {
+        if (typeof playerType === 'undefined') {
+            playerType = this.#playerType;
+        }
+
+        if (playerType === StreamPlayerType.WEBGL2) {
+            return this.#webGL2Player?.getCanvas();
+        }
+
+        return this.#$video;
+    }
+
+    getWebGL2Player() {
+        return this.#webGL2Player;
+    }
+
+    refreshPlayer() {
+        if (this.#playerType === StreamPlayerType.WEBGL2) {
+            const options = this.#options;
+            const webGL2Player = this.#webGL2Player!;
+
+            if (options.processing === StreamVideoProcessing.USM) {
+                webGL2Player.setFilter(1);
+            } else {
+                webGL2Player.setFilter(2);
+            }
+
+            Screenshot.updateCanvasFilters('none');
+
+            webGL2Player.setSharpness(options.sharpness || 0);
+            webGL2Player.setSaturation(options.saturation || 100);
+            webGL2Player.setContrast(options.contrast || 100);
+            webGL2Player.setBrightness(options.brightness || 100);
+        } else {
+            let filters = this.#getVideoPlayerFilterStyle();
+            let videoCss = '';
+            if (filters) {
+                videoCss += `filter: ${filters} !important;`;
+            }
+
+            // Apply video filters to screenshots
+            if (getPref(PrefKey.SCREENSHOT_APPLY_FILTERS)) {
+                Screenshot.updateCanvasFilters(filters);
+            }
+
+            let css = '';
+            if (videoCss) {
+                css = `#game-stream video { ${videoCss} }`;
+            }
+
+            this.#$videoCss!.textContent = css;
+        }
+
+        this.#resizePlayer();
+    }
+
+    destroy() {
+         // Cleanup WebGL2 Player
+         this.#webGL2Player?.destroy();
+         this.#webGL2Player = null;
+    }
+}

src/modules/stream/stream-badges.ts

@@ -1,5 +1,5 @@
 import { t } from "@utils/translation";
-import { BxEvent, XcloudGuideWhere } from "@utils/bx-event";
+import { BxEvent } from "@utils/bx-event";
 import { CE, createSvgIcon } from "@utils/html";
 import { STATES } from "@utils/global";
 import { BxLogger } from "@/utils/bx-logger";
@@ -91,7 +91,7 @@ export class StreamBadges {
         let batteryLevel = '100%';
         let batteryLevelInt = 100;
         let isCharging = false;
-        if ('getBattery' in navigator) {
+        if (STATES.browser.capabilities.batteryApi) {
             try {
                 const bm = await (navigator as NavigatorBattery).getBattery();
                 isCharging = bm.charging;
@@ -158,19 +158,26 @@ export class StreamBadges {
     }
 
     #secondsToHm(seconds: number) {
-        const h = Math.floor(seconds / 3600);
+        let h = Math.floor(seconds / 3600);
-        const m = Math.floor(seconds % 3600 / 60) + 1;
+        let m = Math.floor(seconds % 3600 / 60) + 1;
 
-        const hDisplay = h > 0 ? `${h}h`: '';
+        if (m === 60) {
-        const mDisplay = m > 0 ? `${m}m`: '';
+            h += 1;
-        return hDisplay + mDisplay;
+            m = 0;
+        }
+
+        const output = [];
+        h > 0 && output.push(`${h}h`);
+        m > 0 && output.push(`${m}m`);
+
+        return output.join(' ');
     }
 
     // https://stackoverflow.com/a/20732091
     #humanFileSize(size: number) {
         const units = ['B', 'KB', 'MB', 'GB', 'TB'];
 
-        let i = size == 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
+        const i = size == 0 ? 0 : Math.floor(Math.log(size) / Math.log(1024));
         return (size / Math.pow(1024, i)).toFixed(2) + ' ' + units[i];
     }
 
@@ -217,7 +224,7 @@ export class StreamBadges {
 
         // Battery
         let batteryLevel = '';
-        if ('getBattery' in navigator) {
+        if (STATES.browser.capabilities.batteryApi) {
             batteryLevel = '100%';
         }
 
@@ -331,7 +338,7 @@ export class StreamBadges {
 
             // Get battery level
             try {
-                'getBattery' in navigator && (navigator as NavigatorBattery).getBattery().then(bm => {
+                STATES.browser.capabilities.batteryApi && (navigator as NavigatorBattery).getBattery().then(bm => {
                     streamBadges.startBatteryLevel = Math.round(bm.level * 100);
                 });
             } catch(e) {}

src/modules/stream/stream-settings-utils.ts

@@ -0,0 +1,54 @@
+import { StreamPlayerType, StreamVideoProcessing } from "@enums/stream-player";
+import { STATES } from "@utils/global";
+import { getPref, PrefKey, setPref } from "@utils/preferences";
+import { UserAgent } from "@utils/user-agent";
+import type { StreamPlayerOptions } from "../stream-player";
+
+export function onChangeVideoPlayerType() {
+    const playerType = getPref(PrefKey.VIDEO_PLAYER_TYPE);
+    const $videoProcessing = document.getElementById('bx_setting_video_processing') as HTMLSelectElement;
+    const $videoSharpness = document.getElementById('bx_setting_video_sharpness') as HTMLElement;
+
+    let isDisabled = false;
+
+    if (playerType === StreamPlayerType.WEBGL2) {
+        ($videoProcessing.querySelector(`option[value=${StreamVideoProcessing.CAS}]`) as HTMLOptionElement).disabled = false;
+    } else {
+        // Only allow USM when player type is Video
+        $videoProcessing.value = StreamVideoProcessing.USM;
+        setPref(PrefKey.VIDEO_PROCESSING, StreamVideoProcessing.USM);
+
+        ($videoProcessing.querySelector(`option[value=${StreamVideoProcessing.CAS}]`) as HTMLOptionElement).disabled = true;
+
+        if (UserAgent.isSafari()) {
+            isDisabled = true;
+        }
+    }
+
+    $videoProcessing.disabled = isDisabled;
+    $videoSharpness.dataset.disabled = isDisabled.toString();
+
+    updateVideoPlayer();
+}
+
+
+export function updateVideoPlayer() {
+    const streamPlayer = STATES.currentStream.streamPlayer;
+    if (!streamPlayer) {
+        return;
+    }
+
+    const options = {
+        processing: getPref(PrefKey.VIDEO_PROCESSING),
+        sharpness: getPref(PrefKey.VIDEO_SHARPNESS),
+        saturation: getPref(PrefKey.VIDEO_SATURATION),
+        contrast: getPref(PrefKey.VIDEO_CONTRAST),
+        brightness: getPref(PrefKey.VIDEO_BRIGHTNESS),
+    } satisfies StreamPlayerOptions;
+
+    streamPlayer.setPlayerType(getPref(PrefKey.VIDEO_PLAYER_TYPE));
+    streamPlayer.updateOptions(options);
+    streamPlayer.refreshPlayer();
+}
+
+window.addEventListener('resize', updateVideoPlayer);

src/modules/stream/stream-settings.ts

@@ -0,0 +1,397 @@
+import { BxEvent } from "@utils/bx-event";
+import { BxIcon } from "@utils/bx-icon";
+import { STATES, AppInterface } from "@utils/global";
+import { ButtonStyle, CE, createButton, createSvgIcon } from "@utils/html";
+import { PrefKey, Preferences, getPref, toPrefElement } from "@utils/preferences";
+import { t } from "@utils/translation";
+import { ControllerShortcut } from "../controller-shortcut";
+import { MkbRemapper } from "../mkb/mkb-remapper";
+import { NativeMkbHandler } from "../mkb/native-mkb-handler";
+import { SoundShortcut } from "../shortcuts/shortcut-sound";
+import { TouchController } from "../touch-controller";
+import { VibrationManager } from "../vibration-manager";
+import { StreamStats } from "./stream-stats";
+import { BX_FLAGS } from "@/utils/bx-flags";
+import { BxSelectElement } from "@/web-components/bx-select";
+import { onChangeVideoPlayerType, updateVideoPlayer } from "./stream-settings-utils";
+
+export class StreamSettings {
+    private static instance: StreamSettings;
+
+    public static getInstance(): StreamSettings {
+        if (!StreamSettings.instance) {
+            StreamSettings.instance = new StreamSettings();
+        }
+
+        return StreamSettings.instance;
+    }
+
+    private $container: HTMLElement | undefined;
+    private $overlay: HTMLElement | undefined;
+
+    readonly SETTINGS_UI = [{
+        icon: BxIcon.DISPLAY,
+        group: 'stream',
+        items: [{
+            group: 'audio',
+            label: t('audio'),
+            help_url: 'https://better-xcloud.github.io/ingame-features/#audio',
+            items: [{
+                pref: PrefKey.AUDIO_VOLUME,
+                onChange: (e: any, value: number) => {
+                    SoundShortcut.setGainNodeVolume(value);
+                },
+                params: {
+                    disabled: !getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL),
+                },
+                onMounted: ($elm: HTMLElement) => {
+                    const $range = $elm.querySelector('input[type=range') as HTMLInputElement;
+                    window.addEventListener(BxEvent.GAINNODE_VOLUME_CHANGED, e => {
+                        $range.value = (e as any).volume;
+                        BxEvent.dispatch($range, 'input', {
+                            ignoreOnChange: true,
+                        });
+                    });
+                },
+            }],
+        }, {
+            group: 'video',
+            label: t('video'),
+            help_url: 'https://better-xcloud.github.io/ingame-features/#video',
+            items: [{
+                pref: PrefKey.VIDEO_PLAYER_TYPE,
+                onChange: onChangeVideoPlayerType,
+            }, {
+                pref: PrefKey.VIDEO_RATIO,
+                onChange: updateVideoPlayer,
+            }, {
+                pref: PrefKey.VIDEO_PROCESSING,
+                onChange: updateVideoPlayer,
+            }, {
+                pref: PrefKey.VIDEO_SHARPNESS,
+                onChange: updateVideoPlayer,
+            }, {
+                pref: PrefKey.VIDEO_SATURATION,
+                onChange: updateVideoPlayer,
+            }, {
+                pref: PrefKey.VIDEO_CONTRAST,
+                onChange: updateVideoPlayer,
+            }, {
+                pref: PrefKey.VIDEO_BRIGHTNESS,
+                onChange: updateVideoPlayer,
+            }],
+        }],
+        }, {
+            icon: BxIcon.CONTROLLER,
+            group: 'controller',
+            items: [{
+                group: 'controller',
+                label: t('controller'),
+                help_url: 'https://better-xcloud.github.io/ingame-features/#controller',
+                items: [{
+                    pref: PrefKey.CONTROLLER_ENABLE_VIBRATION,
+                    unsupported: !VibrationManager.supportControllerVibration(),
+                    onChange: () => VibrationManager.updateGlobalVars(),
+                }, {
+                    pref: PrefKey.CONTROLLER_DEVICE_VIBRATION,
+                    unsupported: !VibrationManager.supportDeviceVibration(),
+                    onChange: () => VibrationManager.updateGlobalVars(),
+                }, (VibrationManager.supportControllerVibration() || VibrationManager.supportDeviceVibration()) && {
+                    pref: PrefKey.CONTROLLER_VIBRATION_INTENSITY,
+                    unsupported: !VibrationManager.supportDeviceVibration(),
+                    onChange: () => VibrationManager.updateGlobalVars(),
+                }],
+            },
+
+            STATES.userAgent.capabilities.touch && {
+                group: 'touch-controller',
+                label: t('touch-controller'),
+                items: [{
+                    label: t('layout'),
+                    content: CE('select', {disabled: true}, CE('option', {}, t('default'))),
+                    onMounted: ($elm: HTMLSelectElement) => {
+                        $elm.addEventListener('change', e => {
+                            TouchController.loadCustomLayout(STATES.currentStream?.xboxTitleId!, $elm.value, 1000);
+                        });
+
+                        window.addEventListener(BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, e => {
+                            const data = (e as any).data;
+
+                            if (STATES.currentStream?.xboxTitleId && ($elm as any).xboxTitleId === STATES.currentStream?.xboxTitleId) {
+                                $elm.dispatchEvent(new Event('change'));
+                                return;
+                            }
+
+                            ($elm as any).xboxTitleId = STATES.currentStream?.xboxTitleId;
+
+                            // Clear options
+                            while ($elm.firstChild) {
+                                $elm.removeChild($elm.firstChild);
+                            }
+
+                            $elm.disabled = !data;
+                            if (!data) {
+                                $elm.appendChild(CE('option', {value: ''}, t('default')));
+                                $elm.value = '';
+                                $elm.dispatchEvent(new Event('change'));
+                                return;
+                            }
+
+                            // Add options
+                            const $fragment = document.createDocumentFragment();
+                            for (const key in data.layouts) {
+                                const layout = data.layouts[key];
+
+                                let name;
+                                if (layout.author) {
+                                    name = `${layout.name} (${layout.author})`;
+                                } else {
+                                    name = layout.name;
+                                }
+
+                                const $option = CE('option', {value: key}, name);
+                                $fragment.appendChild($option);
+                            }
+
+                            $elm.appendChild($fragment);
+                            $elm.value = data.default_layout;
+                            $elm.dispatchEvent(new Event('change'));
+                        });
+                    },
+                }],
+            }],
+        },
+
+        getPref(PrefKey.MKB_ENABLED) && {
+            icon: BxIcon.VIRTUAL_CONTROLLER,
+            group: 'mkb',
+            items: [{
+                group: 'mkb',
+                label: t('virtual-controller'),
+                help_url: 'https://better-xcloud.github.io/mouse-and-keyboard/',
+                content: MkbRemapper.INSTANCE.render(),
+            }],
+        },
+
+        AppInterface && getPref(PrefKey.NATIVE_MKB_ENABLED) === 'on' && {
+            icon: BxIcon.NATIVE_MKB,
+            group: 'native-mkb',
+            items: [{
+                group: 'native-mkb',
+                label: t('native-mkb'),
+                items: [{
+                    pref: PrefKey.NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY,
+                    onChange: (e: any, value: number) => {
+                        NativeMkbHandler.getInstance().setVerticalScrollMultiplier(value / 100);
+                    },
+                }, {
+                    pref: PrefKey.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY,
+                    onChange: (e: any, value: number) => {
+                        NativeMkbHandler.getInstance().setHorizontalScrollMultiplier(value / 100);
+                    },
+                }],
+            }],
+        }, {
+            icon: BxIcon.COMMAND,
+            group: 'shortcuts',
+            items: [{
+                group: 'shortcuts_controller',
+                label: t('controller-shortcuts'),
+                content: ControllerShortcut.renderSettings(),
+            }],
+        }, {
+            icon: BxIcon.STREAM_STATS,
+            group: 'stats',
+            items: [{
+                group: 'stats',
+                label: t('stream-stats'),
+                help_url: 'https://better-xcloud.github.io/stream-stats/',
+                items: [{
+                        pref: PrefKey.STATS_SHOW_WHEN_PLAYING,
+                    }, {
+                        pref: PrefKey.STATS_QUICK_GLANCE,
+                        onChange: (e: InputEvent) => {
+                            const streamStats = StreamStats.getInstance();
+                            (e.target! as HTMLInputElement).checked ? streamStats.quickGlanceSetup() : streamStats.quickGlanceStop();
+                        },
+                    }, {
+                        pref: PrefKey.STATS_ITEMS,
+                        onChange: StreamStats.refreshStyles,
+                    }, {
+                        pref: PrefKey.STATS_POSITION,
+                        onChange: StreamStats.refreshStyles,
+                    }, {
+                        pref: PrefKey.STATS_TEXT_SIZE,
+                        onChange: StreamStats.refreshStyles,
+                    }, {
+                        pref: PrefKey.STATS_OPACITY,
+                        onChange: StreamStats.refreshStyles,
+                    }, {
+                        pref: PrefKey.STATS_TRANSPARENT,
+                        onChange: StreamStats.refreshStyles,
+                    }, {
+                        pref: PrefKey.STATS_CONDITIONAL_FORMATTING,
+                        onChange: StreamStats.refreshStyles,
+                    },
+                ],
+            }],
+        },
+    ];
+
+    constructor() {
+        this.#setupDialog();
+
+        // Hide dialog when the Guide menu is shown
+        window.addEventListener(BxEvent.XCLOUD_GUIDE_MENU_SHOWN, e => this.hide());
+    }
+
+    show(tabId?: string) {
+        const $container = this.$container!;
+        // Select tab
+        if (tabId) {
+            const $tab = $container.querySelector(`.bx-stream-settings-tabs svg[data-group=${tabId}]`);
+            $tab && $tab.dispatchEvent(new Event('click'));
+        }
+
+        this.$overlay!.classList.remove('bx-gone');
+        this.$overlay!.dataset.isPlaying = STATES.isPlaying.toString();
+
+        $container.classList.remove('bx-gone');
+        document.body.classList.add('bx-no-scroll');
+
+        BxEvent.dispatch(window, BxEvent.XCLOUD_DIALOG_SHOWN);
+    }
+
+    hide() {
+        this.$overlay!.classList.add('bx-gone');
+        this.$container!.classList.add('bx-gone');
+
+        document.body.classList.remove('bx-no-scroll');
+
+        BxEvent.dispatch(window, BxEvent.XCLOUD_DIALOG_DISMISSED);
+    }
+
+    #setupDialog() {
+        let $tabs: HTMLElement;
+        let $settings: HTMLElement;
+
+        const $overlay = CE('div', {'class': 'bx-stream-settings-overlay bx-gone'});
+        this.$overlay = $overlay;
+
+        const $container = CE('div', {'class': 'bx-stream-settings-dialog bx-gone'},
+                $tabs = CE('div', {'class': 'bx-stream-settings-tabs'}),
+                $settings = CE('div', {'class': 'bx-stream-settings-tab-contents'}),
+            );
+        this.$container = $container;
+
+        // Close dialog when clicking on the overlay
+        $overlay.addEventListener('click', e => {
+            e.preventDefault();
+            e.stopPropagation();
+            this.hide();
+        });
+
+        for (const settingTab of this.SETTINGS_UI) {
+            if (!settingTab) {
+                continue;
+            }
+
+            const $svg = createSvgIcon(settingTab.icon);
+            $svg.addEventListener('click', e => {
+                // Switch tab
+                for (const $child of Array.from($settings.children)) {
+                    if ($child.getAttribute('data-group') === settingTab.group) {
+                        $child.classList.remove('bx-gone');
+                    } else {
+                        $child.classList.add('bx-gone');
+                    }
+                }
+
+                // Highlight current tab button
+                for (const $child of Array.from($tabs.children)) {
+                    $child.classList.remove('bx-active');
+                }
+
+                $svg.classList.add('bx-active');
+            });
+
+            $tabs.appendChild($svg);
+
+            const $group = CE('div', {'data-group': settingTab.group, 'class': 'bx-gone'});
+
+            for (const settingGroup of settingTab.items) {
+                if (!settingGroup) {
+                    continue;
+                }
+
+                $group.appendChild(CE('h2', {},
+                        CE('span', {}, settingGroup.label),
+                        settingGroup.help_url && createButton({
+                                icon: BxIcon.QUESTION,
+                                style: ButtonStyle.GHOST,
+                                url: settingGroup.help_url,
+                                title: t('help'),
+                            }),
+                    ));
+                if (settingGroup.note) {
+                    if (typeof settingGroup.note === 'string') {
+                        settingGroup.note = document.createTextNode(settingGroup.note);
+                    }
+                    $group.appendChild(settingGroup.note);
+                }
+
+                if (settingGroup.content) {
+                    $group.appendChild(settingGroup.content);
+                    continue;
+                }
+
+                if (!settingGroup.items) {
+                    settingGroup.items = [];
+                }
+
+                for (const setting of settingGroup.items) {
+                    if (!setting) {
+                        continue;
+                    }
+
+                    const pref = setting.pref;
+
+                    let $control;
+                    if (setting.content) {
+                        $control = setting.content;
+                    } else if (!setting.unsupported) {
+                        $control = toPrefElement(pref, setting.onChange, setting.params);
+
+                        if ($control instanceof HTMLSelectElement && BX_FLAGS.ScriptUi === 'tv') {
+                            $control = BxSelectElement.wrap($control);
+                        }
+                    }
+
+                    const label = Preferences.SETTINGS[pref as PrefKey]?.label || setting.label;
+                    const note = Preferences.SETTINGS[pref as PrefKey]?.note || setting.note;
+
+                    const $content = CE('div', {'class': 'bx-stream-settings-row', 'data-type': settingGroup.group},
+                        CE('label', {for: `bx_setting_${pref}`},
+                            label,
+                            note && CE('div', {'class': 'bx-stream-settings-dialog-note'}, note),
+                            setting.unsupported && CE('div', {'class': 'bx-stream-settings-dialog-note'}, t('browser-unsupported-feature')),
+                        ),
+                        !setting.unsupported && $control,
+                    );
+
+                    $group.appendChild($content);
+
+                    setting.onMounted && setting.onMounted($control);
+                }
+            }
+
+            $settings.appendChild($group);
+        }
+
+        // Select first tab
+        $tabs.firstElementChild!.dispatchEvent(new Event('click'));
+
+        document.documentElement.appendChild($overlay);
+        document.documentElement.appendChild($container);
+    }
+}

src/modules/stream/stream-stats.ts

@@ -1,6 +1,5 @@
-import { PrefKey } from "@utils/preferences"
+import { PrefKey, getPref } from "@utils/preferences"
 import { BxEvent } from "@utils/bx-event"
-import { getPref } from "@utils/preferences"
 import { CE } from "@utils/html"
 import { t } from "@utils/translation"
 import { STATES } from "@utils/global"
@@ -39,6 +38,10 @@ export class StreamStats {
 
     #quickGlanceObserver?: MutationObserver | null;
 
+    constructor() {
+        this.#render();
+    }
+
     start(glancing=false) {
         if (!this.isHidden() || (glancing && this.isGlancing())) {
             return;
@@ -85,11 +88,15 @@ export class StreamStats {
     isGlancing = () => this.#$container && this.#$container.dataset.display === 'glancing';
 
     quickGlanceSetup() {
-        if (this.#quickGlanceObserver) {
+        if (!STATES.isPlaying || this.#quickGlanceObserver) {
             return;
         }
 
         const $uiContainer = document.querySelector('div[data-testid=ui-container]')!;
+        if (!$uiContainer) {
+            return;
+        }
+
         this.#quickGlanceObserver = new MutationObserver((mutationList, observer) => {
             for (let record of mutationList) {
                 if (record.attributeName && record.attributeName === 'aria-expanded') {
@@ -135,10 +142,10 @@ export class StreamStats {
                 this.#$fps!.textContent = stat.framesPerSecond || 0;
 
                 // Packets Lost
-                const packetsLost = stat.packetsLost;
+                const packetsLost = Math.max(0, stat.packetsLost);  // packetsLost can be negative, but we don't care about that
                 const packetsReceived = stat.packetsReceived;
                 const packetsLostPercentage = (packetsLost * 100 / ((packetsLost + packetsReceived) || 1)).toFixed(2);
-                this.#$pl!.textContent = packetsLostPercentage === '0.00' ? packetsLost : `${packetsLost} (${packetsLostPercentage}%)`;
+                this.#$pl!.textContent = packetsLostPercentage === '0.00' ? packetsLost.toString() : `${packetsLost} (${packetsLostPercentage}%)`;
 
                 // Frames dropped
                 const framesDropped = stat.framesDropped;
@@ -161,7 +168,12 @@ export class StreamStats {
                 const totalDecodeTimeDiff = stat.totalDecodeTime - lastStat.totalDecodeTime;
                 const framesDecodedDiff = stat.framesDecoded - lastStat.framesDecoded;
                 const currentDecodeTime = totalDecodeTimeDiff / framesDecodedDiff * 1000;
-                this.#$dt!.textContent = `${currentDecodeTime.toFixed(2)}ms`;
+
+                if (isNaN(currentDecodeTime)) {
+                    this.#$dt!.textContent = '??ms';
+                } else {
+                    this.#$dt!.textContent = `${currentDecodeTime.toFixed(2)}ms`;
+                }
 
                 if (PREF_STATS_CONDITIONAL_FORMATTING) {
                     grade = (currentDecodeTime > 12) ? 'bad' : (currentDecodeTime > 9) ? 'ok' : (currentDecodeTime > 6) ? 'good' : '';
@@ -207,10 +219,6 @@ export class StreamStats {
     }
 
     #render() {
-        if (this.#$container) {
-            return;
-        }
-
         const stats = {
             [StreamStat.PING]: [t('stat-ping'), this.#$ping = CE('span', {}, '0')],
             [StreamStat.FPS]: [t('stat-fps'), this.#$fps = CE('span', {}, '0')],
@@ -241,10 +249,6 @@ export class StreamStats {
     }
 
     static setupEvents() {
-        window.addEventListener(BxEvent.STREAM_LOADING, e => {
-            StreamStats.getInstance().#render();
-        });
-
         window.addEventListener(BxEvent.STREAM_PLAYING, e => {
             const PREF_STATS_QUICK_GLANCE = getPref(PrefKey.STATS_QUICK_GLANCE);
             const PREF_STATS_SHOW_WHEN_PLAYING = getPref(PrefKey.STATS_SHOW_WHEN_PLAYING);

src/modules/stream/stream-ui.ts

@@ -1,10 +1,11 @@
 import { STATES } from "@utils/global.ts";
-import { ButtonStyle, createButton, createSvgIcon } from "@utils/html.ts";
+import { createSvgIcon } from "@utils/html.ts";
 import { BxIcon } from "@utils/bx-icon";
-import { BxEvent, XcloudGuideWhere } from "@utils/bx-event.ts";
+import { BxEvent } from "@utils/bx-event.ts";
 import { t } from "@utils/translation.ts";
 import { StreamBadges } from "./stream-badges.ts";
 import { StreamStats } from "./stream-stats.ts";
+import { StreamSettings } from "./stream-settings.ts";
 
 
 function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: typeof BxIcon) {
@@ -34,7 +35,7 @@ function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: t
         }
     };
 
-    if (STATES.browserHasTouchSupport) {
+    if (STATES.browser.capabilities.touch) {
         $container.addEventListener('transitionstart', onTransitionStart);
         $container.addEventListener('transitionend', onTransitionEnd);
     }
@@ -87,27 +88,6 @@ export function injectStreamMenuButtons() {
 
     ($screen as any).xObserving = true;
 
-    const $settingsDialog = document.querySelector('.bx-stream-settings-dialog')!;
-    const $parent = $screen.parentElement;
-    const hideSettingsFunc = (e?: MouseEvent | TouchEvent) => {
-        if (e) {
-            const $target = e.target as HTMLElement;
-            e.stopPropagation();
-            if ($target != $parent && $target.id !== 'MultiTouchSurface' && !$target.querySelector('#BabylonCanvasContainer-main')) {
-                return;
-            }
-            if ($target.id === 'MultiTouchSurface') {
-                $target.removeEventListener('touchstart', hideSettingsFunc);
-            }
-        }
-
-        // Hide Stream settings dialog
-        $settingsDialog.classList.add('bx-gone');
-
-        $parent?.removeEventListener('click', hideSettingsFunc);
-        // $parent.removeEventListener('touchstart', hideSettingsFunc);
-    }
-
     let $btnStreamSettings: HTMLElement;
     let $btnStreamStats: HTMLElement;
     const streamStats = StreamStats.getInstance();
@@ -145,7 +125,7 @@ export function injectStreamMenuButtons() {
 
                     // Hide Stream Settings dialog when closing HUD
                     $btnCloseHud.addEventListener('click', e => {
-                        $settingsDialog.classList.add('bx-gone');
+                        StreamSettings.getInstance().hide();
                     });
 
                     // Create Refresh button from the Close button
@@ -165,7 +145,6 @@ export function injectStreamMenuButtons() {
                     const $menu = document.querySelector('div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module]');
                     $menu?.appendChild(await StreamBadges.getInstance().render());
 
-                    hideSettingsFunc();
                     return;
                 }
 
@@ -205,13 +184,7 @@ export function injectStreamMenuButtons() {
                         e.preventDefault();
 
                         // Show Stream Settings dialog
-                        $settingsDialog.classList.remove('bx-gone');
+                        StreamSettings.getInstance().show();
-
-                        $parent?.addEventListener('click', hideSettingsFunc);
-                        //$parent.addEventListener('touchstart', hideSettingsFunc);
-
-                        const $touchSurface = document.getElementById('MultiTouchSurface');
-                        $touchSurface && $touchSurface.style.display != 'none' && $touchSurface.addEventListener('touchstart', hideSettingsFunc);
                     });
                 }
 
@@ -249,77 +222,3 @@ export function injectStreamMenuButtons() {
     });
     observer.observe($screen, {subtree: true, childList: true});
 }
-
-
-export function showStreamSettings(tabId: string) {
-    const $wrapper = document.querySelector('.bx-stream-settings-dialog');
-    if (!$wrapper) {
-        return;
-    }
-
-    // Select tab
-    if (tabId) {
-        const $tab = $wrapper.querySelector(`.bx-stream-settings-tabs svg[data-group=${tabId}]`);
-        $tab && $tab.dispatchEvent(new Event('click'));
-    }
-
-    $wrapper.classList.remove('bx-gone');
-
-    const $screen = document.querySelector('#PageContent section[class*=PureScreens]');
-    if ($screen && $screen.parentElement) {
-        const $parent = $screen.parentElement;
-        if (!$parent || ($parent as any).bxClick) {
-            return;
-        }
-
-        ($parent as any).bxClick = true;
-
-        const onClick = (e: Event) => {
-            $wrapper.classList.add('bx-gone');
-            ($parent as any).bxClick = false;
-            $parent.removeEventListener('click', onClick);
-        };
-
-        $parent.addEventListener('click', onClick);
-    }
-}
-
-
-export function setupStreamUiEvents() {
-    window.addEventListener(BxEvent.XCLOUD_GUIDE_SHOWN, async e => {
-        const where = (e as any).where as XcloudGuideWhere;
-
-        if (where !== XcloudGuideWhere.HOME || !STATES.isPlaying) {
-            return;
-        }
-
-        const $btnQuit = document.querySelector('#gamepass-dialog-root a[class*=QuitGameButton]');
-        if (!$btnQuit) {
-            return;
-        }
-
-        // Add buttons
-        const $btnReload = createButton({
-            label: t('reload-stream'),
-            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
-            onClick: e => {
-                confirm(t('confirm-reload-stream')) && window.location.reload();
-            },
-        });
-
-        const $btnHome = createButton({
-            label: t('back-to-home'),
-            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
-            onClick: e => {
-                confirm(t('back-to-home-confirm')) && (window.location.href = window.location.href.substring(0, 31));
-            },
-        });
-
-        $btnQuit.insertAdjacentElement('afterend', $btnReload);
-        $btnReload.insertAdjacentElement('afterend', $btnHome);
-
-        // Hide xCloud's Home button
-        const $btnXcloudHome = document.querySelector('#gamepass-dialog-root div[class^=HomeButtonWithDivider]') as HTMLElement;
-        $btnXcloudHome && ($btnXcloudHome.style.display = 'none');
-    });
-}

src/modules/ui/game-tile.ts

@@ -0,0 +1,87 @@
+import { BxEvent } from "@/utils/bx-event";
+import { BxIcon } from "@/utils/bx-icon";
+import { CE, createSvgIcon, getReactProps } from "@/utils/html";
+import { XcloudApi } from "@/utils/xcloud-api";
+
+export class GameTile {
+    static #timeout: number | null;
+
+    static #secondsToHms(seconds: number) {
+        let h = Math.floor(seconds / 3600);
+        seconds %= 3600;
+        let m = Math.floor(seconds / 60);
+        let s = seconds % 60;
+
+        const output = [];
+        h > 0 && output.push(`${h}h`);
+        m > 0 && output.push(`${m}m`);
+        if (s > 0 || output.length === 0) {
+            output.push(`${s}s`);
+        }
+
+        return output.join(' ');
+    }
+
+    static async #showWaitTime($elm: HTMLElement, productId: string) {
+        let totalWaitTime;
+
+        const api = XcloudApi.getInstance();
+        const info = await api.getTitleInfo(productId);
+        if (info) {
+            const waitTime = await api.getWaitTime(info.titleId);
+            if (waitTime) {
+                totalWaitTime = waitTime.estimatedAllocationTimeInSeconds;
+            }
+        }
+
+        if (typeof totalWaitTime === 'number' && $elm.isConnected) {
+            const $div = CE('div', {'class': 'bx-game-tile-wait-time'},
+                createSvgIcon(BxIcon.PLAYTIME),
+                CE('span', {}, GameTile.#secondsToHms(totalWaitTime)),
+            );
+            $elm.insertAdjacentElement('afterbegin', $div);
+        }
+    }
+
+    static requestWaitTime($elm: HTMLElement, productId: string) {
+        GameTile.#timeout && clearTimeout(GameTile.#timeout);
+        GameTile.#timeout = window.setTimeout(async () => {
+            if (!($elm as any).hasWaitTime) {
+                ($elm as any).hasWaitTime = true;
+                GameTile.#showWaitTime($elm, productId);
+            }
+        }, 1000);
+    }
+
+    static setup() {
+        window.addEventListener(BxEvent.NAVIGATION_FOCUS_CHANGED, e => {
+            let productId;
+            const $elm = (e as any).element;
+            try {
+                if (($elm.tagName === 'BUTTON' && $elm.className.includes('MruGameCard')) || (($elm.tagName === 'A' && $elm.className.includes('GameCard')))) {
+                    let props = getReactProps($elm.parentElement);
+
+                    // When context menu is enabled
+                    if (Array.isArray(props.children)) {
+                        productId = props.children[0].props.productId;
+                    } else {
+                        productId = props.children.props.productId;
+                    }
+                } else if ($elm.tagName === 'A' && $elm.className.includes('GameItem'))  {
+                    let props = getReactProps($elm.parentElement);
+                    props = props.children.props;
+                    if (props.location !== 'NonStreamableGameItem') {
+                        if ('productId' in props) {
+                            productId = props.productId;
+                        } else {
+                            // Search page
+                            productId = props.children.props.productId;
+                        }
+                    }
+                }
+            } catch (e) {}
+
+            productId && GameTile.requestWaitTime($elm, productId);
+        });
+    }
+}

src/modules/ui/global-settings.ts

@@ -1,16 +1,21 @@
-import { STATES, AppInterface, SCRIPT_HOME, SCRIPT_VERSION } from "@utils/global";
+import { STATES, AppInterface, SCRIPT_VERSION } from "@utils/global";
 import { CE, createButton, ButtonStyle } from "@utils/html";
 import { BxIcon } from "@utils/bx-icon";
 import { getPreferredServerRegion } from "@utils/region";
-import { UserAgent, UserAgentProfile } from "@utils/user-agent";
+import { UserAgent } from "@utils/user-agent";
 import { getPref, Preferences, PrefKey, setPref, toPrefElement } from "@utils/preferences";
 import { t, Translations } from "@utils/translation";
 import { PatcherCache } from "../patcher";
+import { UserAgentProfile } from "@enums/user-agent";
+import { BX_FLAGS } from "@/utils/bx-flags";
+import { BxSelectElement } from "@/web-components/bx-select";
+import { StreamSettings } from "../stream/stream-settings";
 
 const SETTINGS_UI = {
     'Better xCloud': {
         items: [
             PrefKey.BETTER_XCLOUD_LOCALE,
+            PrefKey.SERVER_BYPASS_RESTRICTION,
             PrefKey.REMOTE_PLAY_ENABLED,
         ],
     },
@@ -55,15 +60,15 @@ const SETTINGS_UI = {
 
     [t('mouse-and-keyboard')]: {
         items: [
-            PrefKey.NATIVE_MKB_DISABLED,
+            PrefKey.NATIVE_MKB_ENABLED,
             PrefKey.MKB_ENABLED,
             PrefKey.MKB_HIDE_IDLE_CURSOR,
         ],
     },
 
     [t('touch-controller')]: {
-        note: !STATES.hasTouchSupport ? '⚠️ ' + t('device-unsupported-touch') : null,
+        note: !STATES.userAgent.capabilities.touch ? '⚠️ ' + t('device-unsupported-touch') : null,
-        unsupported: !STATES.hasTouchSupport,
+        unsupported: !STATES.userAgent.capabilities.touch,
         items: [
             PrefKey.STREAM_TOUCH_CONTROLLER,
             PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF,
@@ -85,17 +90,20 @@ const SETTINGS_UI = {
         items: [
             PrefKey.UI_LAYOUT,
             PrefKey.UI_HOME_CONTEXT_MENU_DISABLED,
+            PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME,
+            PrefKey.CONTROLLER_SHOW_CONNECTION_STATUS,
             PrefKey.STREAM_SIMPLIFY_MENU,
             PrefKey.SKIP_SPLASH_VIDEO,
             !AppInterface && PrefKey.UI_SCROLLBAR_HIDE,
             PrefKey.HIDE_DOTS_ICON,
             PrefKey.REDUCE_ANIMATIONS,
+            PrefKey.BLOCK_SOCIAL_FEATURES,
+            PrefKey.UI_HIDE_SECTIONS,
         ],
     },
 
     [t('other')]: {
         items: [
-            PrefKey.BLOCK_SOCIAL_FEATURES,
             PrefKey.BLOCK_TRACKING,
         ],
     },
@@ -120,19 +128,18 @@ export function setupSettingsUi() {
     let $btnReload: HTMLButtonElement;
 
     // Setup Settings UI
-    const $container = CE<HTMLElement>('div', {
+    const $container = CE('div', {
         'class': 'bx-settings-container bx-gone',
     });
 
-    let $updateAvailable;
+    const $wrapper = CE('div', {'class': 'bx-settings-wrapper'},
-
+            CE('div', {'class': 'bx-settings-title-wrapper'},
-    const $wrapper = CE<HTMLElement>('div', {'class': 'bx-settings-wrapper'},
+                createButton({
-            CE<HTMLElement>('div', {'class': 'bx-settings-title-wrapper'},
+                    classes: ['bx-settings-title'],
-                CE('a', {
+                    style: ButtonStyle.FOCUSABLE | ButtonStyle.GHOST,
-                    'class': 'bx-settings-title',
+                    label: 'Better xCloud ' + SCRIPT_VERSION,
-                    'href': SCRIPT_HOME,
+                    url: 'https://github.com/redphx/better-xcloud/releases',
-                    'target': '_blank',
+                }),
-                }, 'Better xCloud ' + SCRIPT_VERSION),
                 createButton({
                     icon: BxIcon.QUESTION,
                     style: ButtonStyle.FOCUSABLE,
@@ -141,46 +148,61 @@ export function setupSettingsUi() {
                 }),
             )
         );
-    $updateAvailable = CE('a', {
-        'class': 'bx-settings-update bx-gone',
-        'href': 'https://github.com/redphx/better-xcloud/releases',
-        'target': '_blank',
-    });
 
-    $wrapper.appendChild($updateAvailable);
+    const topButtons = [];
 
-    // Show new version indicator
+    // "New version available" button
-    if (PREF_LATEST_VERSION && PREF_LATEST_VERSION != SCRIPT_VERSION) {
+    if (!SCRIPT_VERSION.includes('beta') && PREF_LATEST_VERSION && PREF_LATEST_VERSION != SCRIPT_VERSION) {
-        $updateAvailable.textContent = `🌟 Version ${PREF_LATEST_VERSION} available`;
+        // Show new version indicator
-        $updateAvailable.classList.remove('bx-gone');
+        topButtons.push(createButton({
+            label: `🌟 Version ${PREF_LATEST_VERSION} available`,
+            style: ButtonStyle.PRIMARY | ButtonStyle.FOCUSABLE | ButtonStyle.FULL_WIDTH,
+            url: 'https://github.com/redphx/better-xcloud/releases/latest',
+        }));
     }
 
+    // "Stream settings" button
+    topButtons.push(createButton({
+        label: t('stream-settings'),
+        icon: BxIcon.STREAM_SETTINGS,
+        style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
+        onClick: e => {
+            StreamSettings.getInstance().show();
+        },
+    }));
+
+    // Buttons for Android app
     if (AppInterface) {
         // Show Android app settings button
-        const $btn = createButton({
+        topButtons.push(createButton({
             label: t('android-app-settings'),
             icon: BxIcon.STREAM_SETTINGS,
             style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
             onClick: e => {
                 AppInterface.openAppSettings && AppInterface.openAppSettings();
             },
-        });
+        }));
-
-        $wrapper.appendChild($btn);
     } else {
         // Show link to Android app
         const userAgent = UserAgent.getDefault().toLowerCase();
         if (userAgent.includes('android')) {
-            const $btn = createButton({
+            topButtons.push(createButton({
                 label: '🔥 ' + t('install-android'),
                 style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
                 url: 'https://better-xcloud.github.io/android',
-            });
+            }));
-
-            $wrapper.appendChild($btn);
         }
     }
 
+    if (topButtons.length) {
+        const $div = CE('div', {class: 'bx-top-buttons'});
+        for (const $button of topButtons) {
+            $div.appendChild($button);
+        }
+
+        $wrapper.appendChild($div);
+    }
+
     const onChange = async (e: Event) => {
         // Clear PatcherCache;
         PatcherCache.clear();
@@ -196,8 +218,11 @@ export function setupSettingsUi() {
             Translations.refreshCurrentLocale();
             await Translations.updateTranslations();
 
-            $btnReload.textContent = t('settings-reloading');
+            // Don't refresh the page on TV
-            $btnReload.click();
+            if (BX_FLAGS.ScriptUi !== 'tv') {
+                $btnReload.textContent = t('settings-reloading');
+                $btnReload.click();
+            }
         }
     };
 
@@ -237,9 +262,9 @@ export function setupSettingsUi() {
             if (setting.experimental) {
                 settingLabel = '🧪 ' + settingLabel;
                 if (!settingNote) {
-                    settingNote = t('experimental')
+                    settingNote = t('experimental');
                 } else {
-                    settingNote = `${t('experimental')}: ${settingNote}`
+                    settingNote = `${t('experimental')}: ${settingNote}`;
                 }
             }
 
@@ -257,7 +282,7 @@ export function setupSettingsUi() {
                     placeholder: defaultUserAgent,
                     'class': 'bx-settings-custom-user-agent',
                 });
-                $inpCustomUserAgent.addEventListener('change', e => {
+                $inpCustomUserAgent.addEventListener('input', e => {
                     const profile = $control.value;
                     const custom = (e.target as HTMLInputElement).value.trim();
 
@@ -288,7 +313,7 @@ export function setupSettingsUi() {
                     });
                 $control.name = $control.id;
 
-                $control.addEventListener('change', (e: Event) => {
+                $control.addEventListener('input', (e: Event) => {
                     setPref(settingId, (e.target as HTMLSelectElement).value);
                     onChange(e);
                 });
@@ -320,6 +345,8 @@ export function setupSettingsUi() {
                     $control.appendChild($option);
                 }
 
+                $control.disabled = Object.keys(STATES.serverRegions).length === 0;
+
                 // Select preferred region
                 $control.value = selectedValue;
             } else {
@@ -353,10 +380,20 @@ export function setupSettingsUi() {
             if (settingNote) {
                 $label.appendChild(CE('b', {}, settingNote));
             }
-            const $elm = CE<HTMLElement>('div', {'class': 'bx-settings-row'},
+
+            let $elm: HTMLElement;
+
+            if ($control instanceof HTMLSelectElement && BX_FLAGS.ScriptUi === 'tv') {
+                $elm = CE('div', {'class': 'bx-settings-row'},
+                    $label,
+                    BxSelectElement.wrap($control),
+                );
+            } else {
+                $elm = CE('div', {'class': 'bx-settings-row'},
                     $label,
                     $control,
                 );
+            }
 
             $wrapper.appendChild($elm);
 
@@ -365,7 +402,7 @@ export function setupSettingsUi() {
                 $wrapper.appendChild($inpCustomUserAgent!);
                 // Trigger 'change' event
                 $control.disabled = true;
-                $control.dispatchEvent(new Event('change'));
+                $control.dispatchEvent(new Event('input'));
                 $control.disabled = false;
             }
         }
@@ -375,7 +412,7 @@ export function setupSettingsUi() {
     $btnReload = createButton({
         label: t('settings-reload'),
         classes: ['bx-settings-reload-button'],
-        style: ButtonStyle.FOCUSABLE | ButtonStyle.FULL_WIDTH,
+        style: ButtonStyle.FOCUSABLE | ButtonStyle.FULL_WIDTH | ButtonStyle.TALL,
         onClick: e => {
             window.location.reload();
             $btnReload.disabled = true;
@@ -399,7 +436,7 @@ export function setupSettingsUi() {
     try {
         const appVersion = (document.querySelector('meta[name=gamepass-app-version]') as HTMLMetaElement).content;
         const appDate = new Date((document.querySelector('meta[name=gamepass-app-date]') as HTMLMetaElement).content).toISOString().substring(0, 10);
-        $wrapper.appendChild(CE<HTMLElement>('div', {'class': 'bx-settings-app-version'}, `xCloud website version ${appVersion} (${appDate})`));
+        $wrapper.appendChild(CE('div', {'class': 'bx-settings-app-version'}, `xCloud website version ${appVersion} (${appDate})`));
     } catch (e) {}
 
     $container.appendChild($wrapper);

src/modules/ui/guide-menu.ts

@@ -0,0 +1,140 @@
+import { BxEvent } from "@/utils/bx-event";
+import { AppInterface, STATES } from "@/utils/global";
+import { createButton, ButtonStyle, CE } from "@/utils/html";
+import { t } from "@/utils/translation";
+import { StreamSettings } from "../stream/stream-settings";
+
+export enum GuideMenuTab {
+    HOME,
+}
+
+export class GuideMenu {
+    static #BUTTONS = {
+        streamSetting: createButton({
+            label: t('stream-settings'),
+            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
+            onClick: e => {
+                // Wait until the Guide dialog is closed
+                window.addEventListener(BxEvent.XCLOUD_DIALOG_DISMISSED, e => {
+                    setTimeout(() => StreamSettings.getInstance().show(), 50);
+                }, {once: true});
+
+                // Close all xCloud's dialogs
+                window.BX_EXPOSED.dialogRoutes.closeAll();
+            },
+        }),
+
+        appSettings: createButton({
+            label: t('android-app-settings'),
+            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
+            onClick: e => {
+                // Close all xCloud's dialogs
+                window.BX_EXPOSED.dialogRoutes.closeAll();
+
+                AppInterface.openAppSettings && AppInterface.openAppSettings();
+            },
+        }),
+
+        closeApp: createButton({
+            label: t('close-app'),
+            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE | ButtonStyle.DANGER,
+            onClick: e => {
+                AppInterface.closeApp();
+            },
+        }),
+
+        reloadStream: createButton({
+            label: t('reload-stream'),
+            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
+            onClick: e => {
+                confirm(t('confirm-reload-stream')) && window.location.reload();
+            },
+        }),
+
+        backToHome: createButton({
+            label: t('back-to-home'),
+            style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE,
+            onClick: e => {
+                confirm(t('back-to-home-confirm')) && (window.location.href = window.location.href.substring(0, 31));
+            },
+        }),
+    }
+
+    static #renderButtons(buttons: HTMLElement[]) {
+        const $div = CE('div', {});
+
+        for (const $button of buttons) {
+            $div.appendChild($button);
+        }
+
+        return $div;
+    }
+
+    static #injectHome($root: HTMLElement) {
+        // Find the last divider
+        const $dividers = $root.querySelectorAll('div[class*=Divider-module__divider]');
+        if (!$dividers) {
+            return;
+        }
+
+        const buttons: HTMLElement[] = [];
+
+        // "Stream settings" button
+        buttons.push(GuideMenu.#BUTTONS.streamSetting);
+
+        // "App settings" & "Close app" buttons
+        if (AppInterface) {
+            buttons.push(GuideMenu.#BUTTONS.appSettings);
+            buttons.push(GuideMenu.#BUTTONS.closeApp);
+        }
+
+        const $buttons = GuideMenu.#renderButtons(buttons);
+
+        const $lastDivider = $dividers[$dividers.length - 1];
+        $lastDivider.insertAdjacentElement('afterend', $buttons);
+    }
+
+    static #injectHomePlaying($root: HTMLElement) {
+        const $btnQuit = $root.querySelector('a[class*=QuitGameButton]');
+        if (!$btnQuit) {
+            return;
+        }
+
+        const buttons: HTMLElement[] = [];
+
+        buttons.push(GuideMenu.#BUTTONS.streamSetting);
+        AppInterface && buttons.push(GuideMenu.#BUTTONS.appSettings);
+
+        // Reload stream
+        buttons.push(GuideMenu.#BUTTONS.reloadStream);
+
+        // Back to home
+        buttons.push(GuideMenu.#BUTTONS.backToHome);
+
+        const $buttons = GuideMenu.#renderButtons(buttons);
+        $btnQuit.insertAdjacentElement('afterend', $buttons);
+
+        // Hide xCloud's Home button
+        const $btnXcloudHome = $root.querySelector('div[class^=HomeButtonWithDivider]') as HTMLElement;
+        $btnXcloudHome && ($btnXcloudHome.style.display = 'none');
+    }
+
+    static async #onShown(e: Event) {
+        const where = (e as any).where as GuideMenuTab;
+
+        if (where === GuideMenuTab.HOME) {
+            const $root = document.querySelector('#gamepass-dialog-root div[role=dialog] div[role=tabpanel] div[class*=HomeLandingPage]') as HTMLElement;
+            if ($root) {
+                if (STATES.isPlaying) {
+                    GuideMenu.#injectHomePlaying($root);
+                } else {
+                    GuideMenu.#injectHome($root);
+                }
+            }
+        }
+    }
+
+    static observe() {
+        window.addEventListener(BxEvent.XCLOUD_GUIDE_MENU_SHOWN, GuideMenu.#onShown);
+    }
+}

src/modules/ui/header.ts

@@ -1,5 +1,5 @@
 import { SCRIPT_VERSION } from "@utils/global";
-import { createButton, ButtonStyle } from "@utils/html";
+import { createButton, ButtonStyle, CE } from "@utils/html";
 import { BxIcon } from "@utils/bx-icon";
 import { getPreferredServerRegion } from "@utils/region";
 import { PrefKey, getPref } from "@utils/preferences";
@@ -7,35 +7,20 @@ import { RemotePlay } from "@modules/remote-play";
 import { t } from "@utils/translation";
 import { setupSettingsUi } from "./global-settings";
 
+export class HeaderSection {
+    static #$remotePlayBtn = createButton({
+        classes: ['bx-header-remote-play-button', 'bx-gone'],
+        icon: BxIcon.REMOTE_PLAY,
+        title: t('remote-play'),
+        style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE,
+        onClick: e => {
+            RemotePlay.togglePopup();
+        },
+    });
 
-function injectSettingsButton($parent?: HTMLElement) {
+    static #$settingsBtn = createButton({
-    if (!$parent) {
-        return;
-    }
-
-    const PREF_PREFERRED_REGION = getPreferredServerRegion(true);
-    const PREF_LATEST_VERSION = getPref(PrefKey.LATEST_VERSION);
-
-    const $headerFragment = document.createDocumentFragment();
-
-    // Remote Play button
-    if (getPref(PrefKey.REMOTE_PLAY_ENABLED)) {
-        const $remotePlayBtn = createButton({
-            classes: ['bx-header-remote-play-button'],
-            icon: BxIcon.REMOTE_PLAY,
-            title: t('remote-play'),
-            style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE,
-            onClick: e => {
-                RemotePlay.togglePopup();
-            },
-        });
-        $headerFragment.appendChild($remotePlayBtn);
-    }
-
-    // Setup Settings button
-    const $settingsBtn = createButton({
         classes: ['bx-header-settings-button'],
-        label: PREF_PREFERRED_REGION,
+        label: '???',
         style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE | ButtonStyle.FULL_HEIGHT,
         onClick: e => {
             setupSettingsUi();
@@ -47,39 +32,58 @@ function injectSettingsButton($parent?: HTMLElement) {
         },
     });
 
-    // Show new update status
+    static #$buttonsWrapper = CE('div', {},
-    if (PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) {
+        getPref(PrefKey.REMOTE_PLAY_ENABLED) ? HeaderSection.#$remotePlayBtn : null,
-        $settingsBtn.setAttribute('data-update-available', 'true');
+        HeaderSection.#$settingsBtn,
+    );
+
+    static #observer: MutationObserver;
+    static #timeout: number | null;
+
+    static #injectSettingsButton($parent?: HTMLElement) {
+        if (!$parent) {
+            return;
+        }
+
+        const PREF_LATEST_VERSION = getPref(PrefKey.LATEST_VERSION);
+
+        // Setup Settings button
+        const $settingsBtn = HeaderSection.#$settingsBtn;
+        $settingsBtn.querySelector('span')!.textContent = getPreferredServerRegion(true);
+
+        // Show new update status
+        if (!SCRIPT_VERSION.includes('beta') && PREF_LATEST_VERSION && PREF_LATEST_VERSION !== SCRIPT_VERSION) {
+            $settingsBtn.setAttribute('data-update-available', 'true');
+        }
+
+        // Add the Settings button to the web page
+        $parent.appendChild(HeaderSection.#$buttonsWrapper);
     }
 
-    // Add the Settings button to the web page
+    static checkHeader() {
-    $headerFragment.appendChild($settingsBtn);
+        if (!HeaderSection.#$buttonsWrapper.isConnected) {
-    $parent.appendChild($headerFragment);
+            const $rightHeader = document.querySelector('#PageContent div[class*=EdgewaterHeader-module__rightSectionSpacing]');
-}
+            HeaderSection.#injectSettingsButton($rightHeader as HTMLElement);
-
+        }
-
-export function checkHeader() {
-    const $button = document.querySelector('.bx-header-settings-button');
-
-    if (!$button) {
-        const $rightHeader = document.querySelector('#PageContent div[class*=EdgewaterHeader-module__rightSectionSpacing]');
-        injectSettingsButton($rightHeader as HTMLElement);
-    }
-}
-
-
-export function watchHeader() {
-    const $header = document.querySelector('#PageContent header');
-    if (!$header) {
-        return;
     }
 
-    let timeout: number | null;
+    static showRemotePlayButton() {
-    const observer = new MutationObserver(mutationList => {
+        HeaderSection.#$remotePlayBtn.classList.remove('bx-gone');
-        timeout && clearTimeout(timeout);
+    }
-        timeout = window.setTimeout(checkHeader, 2000);
-    });
-    observer.observe($header, {subtree: true, childList: true});
 
-    checkHeader();
+    static watchHeader() {
+        const $header = document.querySelector('#PageContent header');
+        if (!$header) {
+            return;
+        }
+
+        HeaderSection.#observer && HeaderSection.#observer.disconnect();
+        HeaderSection.#observer = new MutationObserver(mutationList => {
+            HeaderSection.#timeout && clearTimeout(HeaderSection.#timeout);
+            HeaderSection.#timeout = window.setTimeout(HeaderSection.checkHeader, 2000);
+        });
+        HeaderSection.#observer.observe($header, {subtree: true, childList: true});
+
+        HeaderSection.checkHeader();
+    }
 }

src/modules/ui/ui.ts

@@ -1,17 +1,6 @@
-import { STATES } from "@utils/global";
+import { CE } from "@utils/html";
-import { CE, createButton, ButtonStyle, createSvgIcon } from "@utils/html";
+import { onChangeVideoPlayerType } from "../stream/stream-settings-utils";
-import { BxIcon } from "@utils/bx-icon";
+import { StreamSettings } from "../stream/stream-settings";
-import { UserAgent } from "@utils/user-agent";
-import { BxEvent } from "@utils/bx-event";
-import { MkbRemapper } from "@modules/mkb/mkb-remapper";
-import { getPref, Preferences, PrefKey, toPrefElement } from "@utils/preferences";
-import { StreamStats } from "@modules/stream/stream-stats";
-import { TouchController } from "@modules/touch-controller";
-import { t } from "@utils/translation";
-import { VibrationManager } from "@modules/vibration-manager";
-import { Screenshot } from "@/utils/screenshot";
-import { ControllerShortcut } from "../controller-shortcut";
-import { SoundShortcut } from "../shortcuts/shortcut-sound";
 
 
 export function localRedirect(path: string) {
@@ -37,493 +26,10 @@ export function localRedirect(path: string) {
     $anchor.click();
 }
 
-
-function getVideoPlayerFilterStyle() {
-    const filters = [];
-
-    const clarity = getPref(PrefKey.VIDEO_CLARITY);
-    if (clarity != 0) {
-        const level = (7 - (clarity - 1) * 0.5).toFixed(1); // 5, 5.5, 6, 6.5, 7
-        const matrix = `0 -1 0 -1 ${level} -1 0 -1 0`;
-        document.getElementById('bx-filter-clarity-matrix')!.setAttributeNS(null, 'kernelMatrix', matrix);
-
-        filters.push(`url(#bx-filter-clarity)`);
-    }
-
-    const saturation = getPref(PrefKey.VIDEO_SATURATION);
-    if (saturation != 100) {
-        filters.push(`saturate(${saturation}%)`);
-    }
-
-    const contrast = getPref(PrefKey.VIDEO_CONTRAST);
-    if (contrast != 100) {
-        filters.push(`contrast(${contrast}%)`);
-    }
-
-    const brightness = getPref(PrefKey.VIDEO_BRIGHTNESS);
-    if (brightness != 100) {
-        filters.push(`brightness(${brightness}%)`);
-    }
-
-    return filters.join(' ');
-}
-
-function setupStreamSettingsDialog() {
-    const isSafari = UserAgent.isSafari();
-
-    const SETTINGS_UI = [
-        getPref(PrefKey.MKB_ENABLED) && {
-            icon: BxIcon.MOUSE,
-            group: 'mkb',
-            items: [
-                {
-                    group: 'mkb',
-                    label: t('mouse-and-keyboard'),
-                    help_url: 'https://better-xcloud.github.io/mouse-and-keyboard/',
-                    content: MkbRemapper.INSTANCE.render(),
-                },
-            ],
-        },
-
-        {
-            icon: BxIcon.DISPLAY,
-            group: 'stream',
-            items: [
-                {
-                    group: 'audio',
-                    label: t('audio'),
-                    help_url: 'https://better-xcloud.github.io/ingame-features/#audio',
-                    items: [
-                        {
-                            pref: PrefKey.AUDIO_VOLUME,
-                            onChange: (e: any, value: number) => {
-                                SoundShortcut.setGainNodeVolume(value);
-                            },
-                            params: {
-                                disabled: !getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL),
-                            },
-                            onMounted: ($elm: HTMLElement) => {
-                                const $range = $elm.querySelector('input[type=range') as HTMLInputElement;
-                                window.addEventListener(BxEvent.GAINNODE_VOLUME_CHANGED, e => {
-                                    $range.value = (e as any).volume;
-                                    BxEvent.dispatch($range, 'input', {
-                                            ignoreOnChange: true,
-                                        });
-                                });
-                            },
-                        },
-                    ],
-                },
-
-                {
-                    group: 'video',
-                    label: t('video'),
-                    help_url: 'https://better-xcloud.github.io/ingame-features/#video',
-                    items: [
-                        {
-                            pref: PrefKey.VIDEO_RATIO,
-                            onChange: updateVideoPlayerCss,
-                        },
-
-                        {
-                            pref: PrefKey.VIDEO_CLARITY,
-                            onChange: updateVideoPlayerCss,
-                            unsupported: isSafari,
-                        },
-
-                        {
-                            pref: PrefKey.VIDEO_SATURATION,
-                            onChange: updateVideoPlayerCss,
-                        },
-
-                        {
-                            pref: PrefKey.VIDEO_CONTRAST,
-                            onChange: updateVideoPlayerCss,
-                        },
-
-                        {
-                            pref: PrefKey.VIDEO_BRIGHTNESS,
-                            onChange: updateVideoPlayerCss,
-                        },
-                    ],
-                },
-            ],
-        },
-
-        {
-            icon: BxIcon.CONTROLLER,
-            group: 'controller',
-            items: [
-                {
-                    group: 'controller',
-                    label: t('controller'),
-                    help_url: 'https://better-xcloud.github.io/ingame-features/#controller',
-                    items: [
-                        {
-                            pref: PrefKey.CONTROLLER_ENABLE_VIBRATION,
-                            unsupported: !VibrationManager.supportControllerVibration(),
-                            onChange: VibrationManager.updateGlobalVars,
-                        },
-
-                        {
-                            pref: PrefKey.CONTROLLER_DEVICE_VIBRATION,
-                            unsupported: !VibrationManager.supportDeviceVibration(),
-                            onChange: VibrationManager.updateGlobalVars,
-                        },
-
-                        (VibrationManager.supportControllerVibration() || VibrationManager.supportDeviceVibration()) && {
-                            pref: PrefKey.CONTROLLER_VIBRATION_INTENSITY,
-                            unsupported: !VibrationManager.supportDeviceVibration(),
-                            onChange: VibrationManager.updateGlobalVars,
-                        },
-                    ],
-                },
-
-                STATES.hasTouchSupport && {
-                    group: 'touch-controller',
-                    label: t('touch-controller'),
-                    items: [
-                        {
-                            label: t('layout'),
-                            content: CE('select', {disabled: true}, CE('option', {}, t('default'))),
-                            onMounted: ($elm: HTMLSelectElement) => {
-                                $elm.addEventListener('change', e => {
-                                    TouchController.loadCustomLayout(STATES.currentStream?.xboxTitleId!, $elm.value, 1000);
-                                });
-
-                                window.addEventListener(BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, e => {
-                                    const data = (e as any).data;
-
-                                    if (STATES.currentStream?.xboxTitleId && ($elm as any).xboxTitleId === STATES.currentStream?.xboxTitleId) {
-                                        $elm.dispatchEvent(new Event('change'));
-                                        return;
-                                    }
-
-                                    ($elm as any).xboxTitleId = STATES.currentStream?.xboxTitleId;
-
-                                    // Clear options
-                                    while ($elm.firstChild) {
-                                        $elm.removeChild($elm.firstChild);
-                                    }
-
-                                    $elm.disabled = !data;
-                                    if (!data) {
-                                        $elm.appendChild(CE('option', {value: ''}, t('default')));
-                                        $elm.value = '';
-                                        $elm.dispatchEvent(new Event('change'));
-                                        return;
-                                    }
-
-                                    // Add options
-                                    const $fragment = document.createDocumentFragment();
-                                    for (const key in data.layouts) {
-                                        const layout = data.layouts[key];
-
-                                        let name;
-                                        if (layout.author) {
-                                            name = `${layout.name} (${layout.author})`;
-                                        } else {
-                                            name = layout.name;
-                                        }
-
-                                        const $option = CE('option', {value: key}, name);
-                                        $fragment.appendChild($option);
-                                    }
-
-                                    $elm.appendChild($fragment);
-                                    $elm.value = data.default_layout;
-                                    $elm.dispatchEvent(new Event('change'));
-                                });
-                            },
-                        },
-                    ],
-                }
-            ],
-        },
-
-        {
-            icon: BxIcon.COMMAND,
-            group: 'shortcuts',
-            items: [
-                {
-                    group: 'shortcuts_controller',
-                    label: t('controller-shortcuts'),
-                    content: ControllerShortcut.renderSettings(),
-                },
-            ],
-        },
-
-        {
-            icon: BxIcon.STREAM_STATS,
-            group: 'stats',
-            items: [
-                {
-                    group: 'stats',
-                    label: t('stream-stats'),
-                    help_url: 'https://better-xcloud.github.io/stream-stats/',
-                    items: [
-                        {
-                            pref: PrefKey.STATS_SHOW_WHEN_PLAYING,
-                        },
-                        {
-                            pref: PrefKey.STATS_QUICK_GLANCE,
-                            onChange: (e: InputEvent) => {
-                                const streamStats = StreamStats.getInstance();
-                                (e.target! as HTMLInputElement).checked ? streamStats.quickGlanceSetup() : streamStats.quickGlanceStop();
-                            },
-                        },
-                        {
-                            pref: PrefKey.STATS_ITEMS,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                        {
-                            pref: PrefKey.STATS_POSITION,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                        {
-                            pref: PrefKey.STATS_TEXT_SIZE,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                        {
-                            pref: PrefKey.STATS_OPACITY,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                        {
-                            pref: PrefKey.STATS_TRANSPARENT,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                        {
-                            pref: PrefKey.STATS_CONDITIONAL_FORMATTING,
-                            onChange: StreamStats.refreshStyles,
-                        },
-                    ],
-                },
-            ],
-        },
-    ];
-
-    let $tabs: HTMLElement;
-    let $settings: HTMLElement;
-
-    const $wrapper = CE<HTMLElement>('div', {'class': 'bx-stream-settings-dialog bx-gone'},
-            $tabs = CE<HTMLElement>('div', {'class': 'bx-stream-settings-tabs'}),
-            $settings = CE<HTMLElement>('div', {'class': 'bx-stream-settings-tab-contents'}),
-        );
-
-    for (const settingTab of SETTINGS_UI) {
-        if (!settingTab) {
-            continue;
-        }
-
-        const $svg = createSvgIcon(settingTab.icon);
-        $svg.addEventListener('click', e => {
-            // Switch tab
-            for (const $child of Array.from($settings.children)) {
-                if ($child.getAttribute('data-group') === settingTab.group) {
-                    $child.classList.remove('bx-gone');
-                } else {
-                    $child.classList.add('bx-gone');
-                }
-            }
-
-            // Highlight current tab button
-            for (const $child of Array.from($tabs.children)) {
-                $child.classList.remove('bx-active');
-            }
-
-            $svg.classList.add('bx-active');
-        });
-
-        $tabs.appendChild($svg);
-
-        const $group = CE<HTMLElement>('div', {'data-group': settingTab.group, 'class': 'bx-gone'});
-
-        for (const settingGroup of settingTab.items) {
-            if (!settingGroup) {
-                continue;
-            }
-
-            $group.appendChild(CE('h2', {},
-                    CE('span', {}, settingGroup.label),
-                    settingGroup.help_url && createButton({
-                            icon: BxIcon.QUESTION,
-                            style: ButtonStyle.GHOST,
-                            url: settingGroup.help_url,
-                            title: t('help'),
-                        }),
-                ));
-            if (settingGroup.note) {
-                if (typeof settingGroup.note === 'string') {
-                    settingGroup.note = document.createTextNode(settingGroup.note);
-                }
-                $group.appendChild(settingGroup.note);
-            }
-
-            if (settingGroup.content) {
-                $group.appendChild(settingGroup.content);
-                continue;
-            }
-
-            if (!settingGroup.items) {
-                settingGroup.items = [];
-            }
-
-            for (const setting of settingGroup.items) {
-                if (!setting) {
-                    continue;
-                }
-
-                const pref = setting.pref;
-
-                let $control;
-                if (setting.content) {
-                    $control = setting.content;
-                } else if (!setting.unsupported) {
-                    $control = toPrefElement(pref, setting.onChange, setting.params);
-                }
-
-                const label = Preferences.SETTINGS[pref as PrefKey]?.label || setting.label;
-                const note = Preferences.SETTINGS[pref as PrefKey]?.note || setting.note;
-
-                const $content = CE('div', {'class': 'bx-stream-settings-row', 'data-type': settingGroup.group},
-                    CE('label', {for: `bx_setting_${pref}`},
-                        label,
-                        note && CE('div', {'class': 'bx-stream-settings-dialog-note'}, note),
-                        setting.unsupported && CE('div', {'class': 'bx-stream-settings-dialog-note'}, t('browser-unsupported-feature')),
-                    ),
-                    !setting.unsupported && $control,
-                );
-
-                $group.appendChild($content);
-
-                setting.onMounted && setting.onMounted($control);
-            }
-        }
-
-        $settings.appendChild($group);
-    }
-
-    // Select first tab
-    $tabs.firstElementChild!.dispatchEvent(new Event('click'));
-
-    document.documentElement.appendChild($wrapper);
-}
-
-
-export function updateVideoPlayerCss() {
-    let $elm = document.getElementById('bx-video-css');
-    if (!$elm) {
-        const $fragment = document.createDocumentFragment();
-        $elm = CE<HTMLStyleElement>('style', {id: 'bx-video-css'});
-        $fragment.appendChild($elm);
-
-        // Setup SVG filters
-        const $svg = CE('svg', {
-            'id': 'bx-video-filters',
-            'xmlns': 'http://www.w3.org/2000/svg',
-            'class': 'bx-gone',
-        }, CE('defs', {'xmlns': 'http://www.w3.org/2000/svg'},
-              CE('filter', {'id': 'bx-filter-clarity', 'xmlns': 'http://www.w3.org/2000/svg'},
-                CE('feConvolveMatrix', {'id': 'bx-filter-clarity-matrix', 'order': '3', 'xmlns': 'http://www.w3.org/2000/svg'}))
-             )
-        );
-        $fragment.appendChild($svg);
-        document.documentElement.appendChild($fragment);
-    }
-
-    let filters = getVideoPlayerFilterStyle();
-    let videoCss = '';
-    if (filters) {
-        videoCss += `filter: ${filters} !important;`;
-    }
-
-    // Apply video filters to screenshots
-    if (getPref(PrefKey.SCREENSHOT_APPLY_FILTERS)) {
-        Screenshot.updateCanvasFilters(filters);
-    }
-
-    let css = '';
-    if (videoCss) {
-        css = `
-#game-stream video {
-    ${videoCss}
-}
-`;
-    }
-
-    $elm.textContent = css;
-
-    resizeVideoPlayer();
-}
-
-function resizeVideoPlayer() {
-    const $video = STATES.currentStream.$video;
-    if (!$video || !$video.parentElement) {
-        return;
-    }
-
-    const PREF_RATIO = getPref(PrefKey.VIDEO_RATIO);
-    if (PREF_RATIO.includes(':')) {
-        const tmp = PREF_RATIO.split(':');
-
-        // Get preferred ratio
-        const videoRatio = parseFloat(tmp[0]) / parseFloat(tmp[1]);
-
-        let width = 0;
-        let height = 0;
-
-        // Get parent's ratio
-        const parentRect = $video.parentElement.getBoundingClientRect();
-        const parentRatio = parentRect.width / parentRect.height;
-
-        // Get target width & height
-        if (parentRatio > videoRatio) {
-            height = parentRect.height;
-            width = height * videoRatio;
-        } else {
-            width = parentRect.width;
-            height = width / videoRatio;
-        }
-
-        // Prevent floating points
-        width = Math.min(parentRect.width, Math.ceil(width));
-        height = Math.min(parentRect.height, Math.ceil(height));
-
-        // Update size
-        $video.style.width = `${width}px`;
-        $video.style.height = `${height}px`;
-        $video.style.objectFit = 'contain';
-    } else {
-        $video.style.width = '100%';
-        $video.style.height = '100%';
-        $video.style.objectFit = PREF_RATIO;
-    }
-}
-
-
-function preloadFonts() {
-    const $link = CE<HTMLLinkElement>('link', {
-            rel: 'preload',
-            href: 'https://redphx.github.io/better-xcloud/fonts/promptfont.otf',
-            as: 'font',
-            type: 'font/otf',
-            crossorigin: '',
-        });
-
-    document.querySelector('head')?.appendChild($link);
-}
-
-
 export function setupStreamUi() {
-    // Prevent initializing multiple times
+    StreamSettings.getInstance();
-    if (!document.querySelector('.bx-stream-settings-dialog')) {
+    onChangeVideoPlayerType();
-        preloadFonts();
-
-        window.addEventListener('resize', updateVideoPlayerCss);
-        setupStreamSettingsDialog();
-
-        Screenshot.setup();
-    }
-
-    updateVideoPlayerCss();
 }
+
+
+(window as any).localRedirect = localRedirect;

src/modules/vibration-manager.ts

@@ -53,7 +53,7 @@ export class VibrationManager {
         return !!window.navigator.vibrate;
     }
 
-    static updateGlobalVars() {
+    static updateGlobalVars(stopVibration: boolean = true) {
         window.BX_ENABLE_CONTROLLER_VIBRATION = VibrationManager.supportControllerVibration() ? getPref(PrefKey.CONTROLLER_ENABLE_VIBRATION) : false;
         window.BX_VIBRATION_INTENSITY = getPref(PrefKey.CONTROLLER_VIBRATION_INTENSITY) / 100;
 
@@ -63,7 +63,7 @@ export class VibrationManager {
         }
 
         // Stop vibration
-        window.navigator.vibrate(0);
+        stopVibration && window.navigator.vibrate(0);
 
         const value = getPref(PrefKey.CONTROLLER_DEVICE_VIBRATION);
         let enabled;
@@ -134,10 +134,10 @@ export class VibrationManager {
     }
 
     static initialSetup() {
-        window.addEventListener('gamepadconnected', VibrationManager.updateGlobalVars);
+        window.addEventListener('gamepadconnected', e => VibrationManager.updateGlobalVars());
-        window.addEventListener('gamepaddisconnected', VibrationManager.updateGlobalVars);
+        window.addEventListener('gamepaddisconnected', e => VibrationManager.updateGlobalVars());
 
-        VibrationManager.updateGlobalVars();
+        VibrationManager.updateGlobalVars(false);
 
         window.addEventListener(BxEvent.DATA_CHANNEL_CREATED, e => {
             const dataChannel = (e as any).dataChannel;

src/types/index.d.ts

@@ -24,12 +24,28 @@ interface NavigatorBattery extends Navigator {
 }
 
 type BxStates = {
+    supportedRegion: boolean;
+    serverRegions: any;
+    selectedRegion: any;
+    gsToken: string;
+
+
     isPlaying: boolean;
     appContext: any | null;
-    serverRegions: any;
 
-    hasTouchSupport: boolean;
+    browser: {
-    browserHasTouchSupport: boolean;
+        capabilities: {
+            touch: boolean;
+            batteryApi: boolean;
+        };
+    };
+
+    userAgent: {
+        isTv: boolean;
+        capabilities: {
+            touch: boolean;
+        };
+    };
 
     currentStream: Partial<{
         titleId: string;
@@ -37,7 +53,7 @@ type BxStates = {
         productId: string;
         titleInfo: XcloudTitleInfo;
 
-        $video: HTMLVideoElement | null;
+        streamPlayer: StreamPlayer | null;
 
         peerConnection: RTCPeerConnection;
         audioContext: AudioContext | null;
@@ -51,15 +67,20 @@ type BxStates = {
             serverId: string;
         };
     }>;
+
+    pointerServerPort: number;
 }
 
 type DualEnum = {[index: string]: number} & {[index: number]: string};
 
 type XcloudTitleInfo = {
+    titleId: string,
+
     details: {
         productId: string;
         supportedInputTypes: InputType[];
         supportedTabs: any[];
+        hasNativeTouchSupport: boolean;
         hasTouchSupport: boolean;
         hasFakeTouchSupport: boolean;
         hasMkbSupport: boolean;
@@ -72,26 +93,31 @@ type XcloudTitleInfo = {
     };
 };
 
+type XcloudWaitTimeInfo = Partial<{
+    estimatedAllocationTimeInSeconds: number,
+    estimatedProvisioningTimeInSeconds: number,
+    estimatedTotalWaitTimeInSeconds: number,
+}>;
+
 declare module '*.js';
 declare module '*.svg';
 declare module '*.styl';
 
+declare module '*.fs';
+declare module '*.vert';
+
 type MkbMouseMove = {
     movementX: number;
     movementY: number;
 }
 
 type MkbMouseClick = {
-    key: {
+    pointerButton?: number,
-        code: string;
+    mouseButton?: number,
-        name: string;
+    pressed: boolean,
-    } | null;
-    pressed: boolean;
 }
 
 type MkbMouseWheel = {
-    key: {
+    vertical: number;
-        code: string;
+    horizontal: number;
-        name: string;
-    } | null;
 }

src/types/mkb.d.ts

@@ -1,4 +1,4 @@
-import { MkbPresetKey } from "@modules/mkb/definitions";
+import { MkbPresetKey } from "@enums/mkb";
 
 type GamepadKeyNameType = {[index: string | number]: string[]};
 

src/utils/bx-event.ts

@@ -26,6 +26,7 @@ export enum BxEvent {
     REMOTE_PLAY_FAILED = 'bx-remote-play-failed',
 
     XCLOUD_SERVERS_READY = 'bx-servers-ready',
+    XCLOUD_SERVERS_UNAVAILABLE = 'bx-servers-unavailable',
 
     DATA_CHANNEL_CREATED = 'bx-data-channel-created',
 
@@ -35,11 +36,16 @@ export enum BxEvent {
     CAPTURE_SCREENSHOT = 'bx-capture-screenshot',
     GAINNODE_VOLUME_CHANGED = 'bx-gainnode-volume-changed',
 
+    POINTER_LOCK_REQUESTED = 'bx-pointer-lock-requested',
+    POINTER_LOCK_EXITED = 'bx-pointer-lock-exited',
+
+    NAVIGATION_FOCUS_CHANGED = 'bx-nav-focus-changed',
+
     // xCloud Dialog events
     XCLOUD_DIALOG_SHOWN = 'bx-xcloud-dialog-shown',
     XCLOUD_DIALOG_DISMISSED = 'bx-xcloud-dialog-dismissed',
 
-    XCLOUD_GUIDE_SHOWN = 'bx-xcloud-guide-shown',
+    XCLOUD_GUIDE_MENU_SHOWN = 'bx-xcloud-guide-menu-shown',
 
     XCLOUD_POLLING_MODE_CHANGED = 'bx-xcloud-polling-mode-changed',
 }
@@ -48,10 +54,6 @@ export enum XcloudEvent {
     MICROPHONE_STATE_CHANGED = 'microphoneStateChanged',
 }
 
-export enum XcloudGuideWhere {
-    HOME,
-}
-
 export namespace BxEvent {
     export function dispatch(target: HTMLElement | Window, eventName: string, data?: any) {
         if (!eventName) {
@@ -67,8 +69,8 @@ export namespace BxEvent {
             }
         }
 
-        AppInterface && AppInterface.onEvent(eventName);
         target.dispatchEvent(event);
+        AppInterface && AppInterface.onEvent(eventName);
     }
 }
 

src/utils/bx-exposed.ts

@@ -1,9 +1,9 @@
 import { ControllerShortcut } from "@/modules/controller-shortcut";
 import { BxEvent } from "@utils/bx-event";
-import { STATES } from "@utils/global";
+import { deepClone, STATES } from "@utils/global";
 import { getPref, PrefKey } from "@utils/preferences";
-import { UserAgent } from "@utils/user-agent";
 import { BxLogger } from "./bx-logger";
+import { BX_FLAGS } from "./bx-flags";
 
 export enum InputType {
     CONTROLLER = 'Controller',
@@ -19,18 +19,22 @@ export const BxExposed = {
 
     modifyTitleInfo: (titleInfo: XcloudTitleInfo): XcloudTitleInfo => {
         // Clone the object since the original is read-only
-        titleInfo = structuredClone(titleInfo);
+        titleInfo = deepClone(titleInfo);
 
         let supportedInputTypes = titleInfo.details.supportedInputTypes;
 
+        if (BX_FLAGS.ForceNativeMkbTitles?.includes(titleInfo.details.productId)) {
+            supportedInputTypes.push(InputType.MKB);
+        }
+
         // Remove native MKB support on mobile browsers or by user's choice
-        if (getPref(PrefKey.NATIVE_MKB_DISABLED) || UserAgent.isMobile()) {
+        if (getPref(PrefKey.NATIVE_MKB_ENABLED) === 'off') {
             supportedInputTypes = supportedInputTypes.filter(i => i !== InputType.MKB);
         }
 
         titleInfo.details.hasMkbSupport = supportedInputTypes.includes(InputType.MKB);
 
-        if (STATES.hasTouchSupport) {
+        if (STATES.userAgent.capabilities.touch) {
             let touchControllerAvailability = getPref(PrefKey.STREAM_TOUCH_CONTROLLER);
 
             // Disable touch control when gamepad found
@@ -56,7 +60,8 @@ export const BxExposed = {
             }
 
             // Pre-check supported input types
-            titleInfo.details.hasTouchSupport = supportedInputTypes.includes(InputType.NATIVE_TOUCH) ||
+            titleInfo.details.hasNativeTouchSupport = supportedInputTypes.includes(InputType.NATIVE_TOUCH);
+            titleInfo.details.hasTouchSupport = titleInfo.details.hasNativeTouchSupport ||
                     supportedInputTypes.includes(InputType.CUSTOM_TOUCH_OVERLAY) ||
                     supportedInputTypes.includes(InputType.GENERIC_TOUCH);
 
@@ -104,4 +109,10 @@ export const BxExposed = {
 
     handleControllerShortcut: ControllerShortcut.handle,
     resetControllerShortcut: ControllerShortcut.reset,
+
+    overrideSettings: {
+        'Tv_settings': {
+            hasCompletedOnboarding: true,
+        },
+    },
 };

src/utils/bx-flags.ts

@@ -1,12 +1,19 @@
-type BxFlags = {
+type BxFlags = Partial<{
-    CheckForUpdate?: boolean;
+    CheckForUpdate: boolean;
-    PreloadRemotePlay?: boolean;
+    PreloadRemotePlay: boolean;
-    PreloadUi?: boolean;
+    PreloadUi: boolean;
-    EnableXcloudLogging?: boolean;
+    EnableXcloudLogging: boolean;
-    SafariWorkaround?: boolean;
+    SafariWorkaround: boolean;
 
-    UseDevTouchLayout?: boolean;
+    UseDevTouchLayout: boolean;
-}
+
+    ForceNativeMkbTitles: string[];
+    FeatureGates: {[key: string]: boolean} | null,
+
+    ScriptUi: 'default' | 'tv',
+
+    IsSupportedTvBrowser: boolean,
+}>
 
 // Setup flags
 const DEFAULT_FLAGS: BxFlags = {
@@ -17,9 +24,14 @@ const DEFAULT_FLAGS: BxFlags = {
     SafariWorkaround: true,
 
     UseDevTouchLayout: false,
+
+    ForceNativeMkbTitles: [],
+    FeatureGates: null,
+
+    ScriptUi: 'default',
 }
 
-export const BX_FLAGS = Object.assign(DEFAULT_FLAGS, window.BX_FLAGS || {});
+export const BX_FLAGS: BxFlags = Object.assign(DEFAULT_FLAGS, window.BX_FLAGS || {});
 try {
     delete window.BX_FLAGS;
 } catch (e) {}

src/utils/bx-icon.ts

@@ -4,8 +4,7 @@ import iconCopy from "@assets/svg/copy.svg" with { type: "text" };
 import iconCursorText from "@assets/svg/cursor-text.svg" with { type: "text" };
 import iconDisplay from "@assets/svg/display.svg" with { type: "text" };
 import iconHome from "@assets/svg/home.svg" with { type: "text" };
-import iconMouseSettings from "@assets/svg/mouse-settings.svg" with { type: "text" };
+import iconNativeMkb from "@assets/svg/native-mkb.svg" with { type: "text" };
-import iconMouse from "@assets/svg/mouse.svg" with { type: "text" };
 import iconNew from "@assets/svg/new.svg" with { type: "text" };
 import iconQuestion from "@assets/svg/question.svg" with { type: "text" };
 import iconRefresh from "@assets/svg/refresh.svg" with { type: "text" };
@@ -15,6 +14,7 @@ import iconStreamStats from "@assets/svg/stream-stats.svg" with { type: "text" }
 import iconTrash from "@assets/svg/trash.svg" with { type: "text" };
 import iconTouchControlEnable from "@assets/svg/touch-control-enable.svg" with { type: "text" };
 import iconTouchControlDisable from "@assets/svg/touch-control-disable.svg" with { type: "text" };
+import iconVirtualController from "@assets/svg/virtual-controller.svg" with { type: "text" };
 
 // Game Bar
 import iconCaretLeft from "@assets/svg/caret-left.svg" with { type: "text" };
@@ -39,14 +39,14 @@ export const BxIcon = {
     CONTROLLER: iconController,
     DISPLAY: iconDisplay,
     HOME: iconHome,
-    MOUSE: iconMouse,
+    NATIVE_MKB: iconNativeMkb,
-    MOUSE_SETTINGS: iconMouseSettings,
     NEW: iconNew,
     COPY: iconCopy,
     TRASH: iconTrash,
     CURSOR_TEXT: iconCursorText,
     QUESTION: iconQuestion,
     REFRESH: iconRefresh,
+    VIRTUAL_CONTROLLER: iconVirtualController,
 
     REMOTE_PLAY: iconRemotePlay,
 

src/utils/css.ts

@@ -1,19 +1,33 @@
 import { CE } from "@utils/html";
 import { PrefKey, getPref } from "@utils/preferences";
 import { renderStylus } from "@macros/build" with {type: "macro"};
+import { UiSection } from "@/enums/ui-sections";
 
 
 export function addCss() {
-    let css = renderStylus();
+    const STYLUS_CSS = renderStylus();
+    let css = STYLUS_CSS;
 
-    // Hide "Play with friends" section
+    const PREF_HIDE_SECTIONS = getPref(PrefKey.UI_HIDE_SECTIONS);
+    const selectorToHide = [];
+
+    // Hide "News" section
+    if (PREF_HIDE_SECTIONS.includes(UiSection.NEWS)) {
+        selectorToHide.push('#BodyContent > div[class*=CarouselRow-module]');
+    }
+
+    // Hide "All games" section
+    if (PREF_HIDE_SECTIONS.includes(UiSection.ALL_GAMES)) {
+        selectorToHide.push('#BodyContent div[class*=AllGamesRow-module__gridContainer]');
+    }
+
+   // Hide "Start a party" button in the Guide menu
     if (getPref(PrefKey.BLOCK_SOCIAL_FEATURES)) {
-        css += `
+        selectorToHide.push('#gamepass-dialog-root div[class^=AchievementsPreview-module__container] + button[class*=HomeLandingPage-module__button]');
-div[class^=HomePage-module__bottomSpacing]:has(button[class*=SocialEmptyCard]),
+    }
-button[class*=SocialEmptyCard] {
+
-    display: none;
+    if (selectorToHide) {
-}
+        css += selectorToHide.join(',') + '{ display: none; }';
-`;
     }
 
     // Reduce animations
@@ -54,12 +68,13 @@ div[class*=StreamHUD-module__buttonsContainer] {
 `;
     }
 
-    // Simplify Stream's menu
     css += `
 div[class*=StreamMenu-module__menu] {
     min-width: 100vw !important;
 }
 `;
+
+    // Simplify Stream's menu
     if (getPref(PrefKey.STREAM_SIMPLIFY_MENU)) {
         css += `
 div[class*=Menu-module__scrollable] {
@@ -135,3 +150,16 @@ body::-webkit-scrollbar {
     const $style = CE('style', {}, css);
     document.documentElement.appendChild($style);
 }
+
+
+export function preloadFonts() {
+    const $link = CE<HTMLLinkElement>('link', {
+            rel: 'preload',
+            href: 'https://redphx.github.io/better-xcloud/fonts/promptfont.otf',
+            as: 'font',
+            type: 'font/otf',
+            crossorigin: '',
+        });
+
+    document.querySelector('head')?.appendChild($link);
+}

src/utils/feature-gates.ts

@@ -0,0 +1,21 @@
+import { BX_FLAGS } from "./bx-flags";
+import { getPref, PrefKey } from "./preferences";
+
+export let FeatureGates: {[key: string]: boolean} = {
+    'PwaPrompt': false,
+    'EnableWifiWarnings': false,
+};
+
+// Disable context menu in Home page
+if (getPref(PrefKey.UI_HOME_CONTEXT_MENU_DISABLED)) {
+    FeatureGates['EnableHomeContextMenu'] = false;
+}
+
+// Disable chat feature
+if (getPref(PrefKey.BLOCK_SOCIAL_FEATURES)) {
+    FeatureGates['EnableGuideChatTab'] = false;
+}
+
+if (BX_FLAGS.FeatureGates) {
+    FeatureGates = Object.assign(BX_FLAGS.FeatureGates, FeatureGates);
+}

src/utils/gamepad.ts

@@ -1,4 +1,4 @@
-import { MkbHandler } from "@modules/mkb/mkb-handler";
+import { EmulatedMkbHandler } from "@modules/mkb/mkb-handler";
 import { PrefKey, getPref } from "@utils/preferences";
 import { t } from "@utils/translation";
 import { Toast } from "@utils/toast";
@@ -7,7 +7,7 @@ import { BxLogger } from "@utils/bx-logger";
 // Show a toast when connecting/disconecting controller
 export function showGamepadToast(gamepad: Gamepad) {
     // Don't show Toast for virtual controller
-    if (gamepad.id === MkbHandler.VIRTUAL_GAMEPAD_ID) {
+    if (gamepad.id === EmulatedMkbHandler.VIRTUAL_GAMEPAD_ID) {
         return;
     }
 

src/utils/global.ts

@@ -1,7 +1,6 @@
 import { UserAgent } from "./user-agent";
 
-export const SCRIPT_VERSION = Bun.env.SCRIPT_VERSION;
+export const SCRIPT_VERSION = Bun.env.SCRIPT_VERSION!;
-export const SCRIPT_HOME = 'https://github.com/redphx/better-xcloud';
 
 export const AppInterface = window.AppInterface;
 
@@ -11,15 +10,45 @@ const userAgent = window.navigator.userAgent.toLowerCase();
 const isTv = userAgent.includes('smart-tv') || userAgent.includes('smarttv') || /\baft.*\b/.test(userAgent);
 const isVr = window.navigator.userAgent.includes('VR') && window.navigator.userAgent.includes('OculusBrowser');
 const browserHasTouchSupport = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
-const hasTouchSupport = !isTv && !isVr && browserHasTouchSupport;
+const userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport;
 
 export const STATES: BxStates = {
+    supportedRegion: true,
+    serverRegions: {},
+    selectedRegion: {},
+    gsToken: '',
+
     isPlaying: false,
     appContext: {},
-    serverRegions: {},
+
-    hasTouchSupport: hasTouchSupport,
+    browser: {
-    browserHasTouchSupport: browserHasTouchSupport,
+        capabilities: {
+            touch: browserHasTouchSupport,
+            batteryApi: 'getBattery' in window.navigator,
+        },
+    },
+
+    userAgent: {
+        isTv: isTv,
+        capabilities: {
+            touch: userAgentHasTouchSupport,
+        }
+    },
 
     currentStream: {},
     remotePlay: {},
+
+    pointerServerPort: 9269,
 };
+
+export function deepClone(obj: any): any {
+    if ('structuredClone' in window) {
+        return structuredClone(obj);
+    }
+
+    if (!obj) {
+        return {};
+    }
+
+    return JSON.parse(JSON.stringify(obj));
+}

src/utils/history.ts

@@ -1,7 +1,7 @@
 import { BxEvent } from "@utils/bx-event";
 import { LoadingScreen } from "@modules/loading-screen";
 import { RemotePlay } from "@modules/remote-play";
-import { checkHeader } from "@modules/ui/header";
+import { HeaderSection } from "@/modules/ui/header";
 
 export function patchHistoryMethod(type: 'pushState' | 'replaceState') {
     const orig = window.history[type];
@@ -34,7 +34,7 @@ export function onHistoryChanged(e: PopStateEvent) {
     RemotePlay.detachPopup();
 
     LoadingScreen.reset();
-    window.setTimeout(checkHeader, 2000);
+    window.setTimeout(HeaderSection.watchHeader, 2000);
 
     BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
 }

src/utils/html.ts

@@ -1,7 +1,7 @@
 import type { BxIcon } from "@utils/bx-icon";
 
 type BxButton = {
-    style?: number | string;
+    style?: number | string | ButtonStyle;
     url?: string;
     classes?: string[];
     icon?: typeof BxIcon;
@@ -9,6 +9,7 @@ type BxButton = {
     title?: string;
     disabled?: boolean;
     onClick?: EventListener;
+    attributes?: {[key: string]: any},
 }
 
 type ButtonStyle = {[index: string]: number} & {[index: number]: string};
@@ -67,6 +68,7 @@ ButtonStyle[ButtonStyle.GHOST = 4] = 'bx-ghost';
 ButtonStyle[ButtonStyle.FOCUSABLE = 8] = 'bx-focusable';
 ButtonStyle[ButtonStyle.FULL_WIDTH = 16] = 'bx-full-width';
 ButtonStyle[ButtonStyle.FULL_HEIGHT = 32] = 'bx-full-height';
+ButtonStyle[ButtonStyle.TALL = 64] = 'bx-tall';
 
 const ButtonStyleIndices = Object.keys(ButtonStyle).splice(0, Object.keys(ButtonStyle).length / 2).map(i => parseInt(i));
 
@@ -93,9 +95,25 @@ export const createButton = <T=HTMLButtonElement>(options: BxButton): T => {
     options.disabled && (($btn as HTMLButtonElement).disabled = true);
     options.onClick && $btn.addEventListener('click', options.onClick);
 
+    for (const key in options.attributes) {
+        if (!$btn.hasOwnProperty(key)) {
+            $btn.setAttribute(key, options.attributes[key]);
+        }
+    }
+
     return $btn as T;
 }
 
+export function getReactProps($elm: HTMLElement): any | null {
+    for (const key in $elm) {
+        if (key.startsWith('__reactProps')) {
+            return ($elm as any)[key];
+        }
+    }
+
+    return null;
+}
+
 export function escapeHtml(html: string): string {
     const text = document.createTextNode(html);
     const $span = document.createElement('span');

src/utils/monkey-patches.ts

@@ -2,7 +2,8 @@ import { BxEvent } from "@utils/bx-event";
 import { getPref, PrefKey } from "@utils/preferences";
 import { STATES } from "@utils/global";
 import { BxLogger } from "@utils/bx-logger";
-import { patchSdpBitrate } from "./sdp";
+import { patchSdpBitrate, setCodecPreferences } from "./sdp";
+import { StreamPlayer, type StreamPlayerOptions } from "@/modules/stream-player";
 
 export function patchVideoApi() {
     const PREF_SKIP_SPLASH_VIDEO = getPref(PrefKey.SKIP_SPLASH_VIDEO);
@@ -10,18 +11,26 @@ export function patchVideoApi() {
     // Show video player when it's ready
     const showFunc = function(this: HTMLVideoElement) {
         this.style.visibility = 'visible';
-        this.removeEventListener('playing', showFunc);
-
         if (!this.videoWidth) {
             return;
         }
 
+        const playerOptions = {
+            processing: getPref(PrefKey.VIDEO_PROCESSING),
+            sharpness: getPref(PrefKey.VIDEO_SHARPNESS),
+            saturation: getPref(PrefKey.VIDEO_SATURATION),
+            contrast: getPref(PrefKey.VIDEO_CONTRAST),
+            brightness: getPref(PrefKey.VIDEO_BRIGHTNESS),
+        } satisfies StreamPlayerOptions;
+        STATES.currentStream.streamPlayer = new StreamPlayer(this, getPref(PrefKey.VIDEO_PLAYER_TYPE), playerOptions);
+
         BxEvent.dispatch(window, BxEvent.STREAM_PLAYING, {
                 $video: this,
             });
     }
 
     const nativePlay = HTMLMediaElement.prototype.play;
+    (HTMLMediaElement.prototype as any).nativePlay = nativePlay;
     HTMLMediaElement.prototype.play = function() {
         if (this.className && this.className.startsWith('XboxSplashVideo')) {
             if (PREF_SKIP_SPLASH_VIDEO) {
@@ -35,12 +44,12 @@ export function patchVideoApi() {
             return nativePlay.apply(this);
         }
 
-        if (!!this.src) {
+        const $parent = this.parentElement!!;
-            return nativePlay.apply(this);
+        // Video tag is stream player
+        if (!this.src && $parent.dataset.testid === 'media-container') {
+            this.addEventListener('loadedmetadata', showFunc, {once: true});
         }
 
-        this.addEventListener('playing', showFunc);
-
         return nativePlay.apply(this);
     };
 }
@@ -55,33 +64,6 @@ export function patchRtcCodecs() {
     if (typeof RTCRtpTransceiver === 'undefined' || !('setCodecPreferences' in RTCRtpTransceiver.prototype)) {
         return false;
     }
-
-    const profilePrefix = codecProfile === 'high' ? '4d' : (codecProfile === 'low' ? '420' : '42e');
-    const profileLevelId = `profile-level-id=${profilePrefix}`;
-
-    const nativeSetCodecPreferences = RTCRtpTransceiver.prototype.setCodecPreferences;
-    RTCRtpTransceiver.prototype.setCodecPreferences = function(codecs) {
-        // Use the same codecs as desktop
-        const newCodecs = codecs.slice();
-        let pos = 0;
-        newCodecs.forEach((codec, i) => {
-            // Find high-quality codecs
-            if (codec.sdpFmtpLine && codec.sdpFmtpLine.includes(profileLevelId)) {
-                // Move it to the top of the array
-                newCodecs.splice(i, 1);
-                newCodecs.splice(pos, 0, codec);
-                ++pos;
-            }
-        });
-
-        try {
-            nativeSetCodecPreferences.apply(this, [newCodecs]);
-        } catch (e) {
-            // Didn't work -> use default codecs
-            BxLogger.error('setCodecPreferences', e);
-            nativeSetCodecPreferences.apply(this, [codecs]);
-        }
-    }
 }
 
 export function patchRtcPeerConnection() {
@@ -97,21 +79,32 @@ export function patchRtcPeerConnection() {
         return dataChannel;
     }
 
-    const nativeSetLocalDescription = RTCPeerConnection.prototype.setLocalDescription;
+    const maxVideoBitrate = getPref(PrefKey.BITRATE_VIDEO_MAX);
-    RTCPeerConnection.prototype.setLocalDescription = function(description?: RTCLocalSessionDescriptionInit): Promise<void> {
+    const codec = getPref(PrefKey.STREAM_CODEC_PROFILE);
-        // set maximum bitrate
-        try {
-            const maxVideoBitrate = getPref(PrefKey.BITRATE_VIDEO_MAX);
-            if (maxVideoBitrate > 0) {
-                arguments[0].sdp = patchSdpBitrate(arguments[0].sdp, Math.round(maxVideoBitrate / 1000));
-            }
-        } catch (e) {
-            BxLogger.error('setLocalDescription', e);
-        }
 
-        // @ts-ignore
+    if (codec !== 'default' || maxVideoBitrate > 0) {
-        return nativeSetLocalDescription.apply(this, arguments);
+        const nativeSetLocalDescription = RTCPeerConnection.prototype.setLocalDescription;
-    };
+        RTCPeerConnection.prototype.setLocalDescription = function(description?: RTCLocalSessionDescriptionInit): Promise<void> {
+            // Set preferred codec profile
+            if (codec !== 'default') {
+                arguments[0].sdp = setCodecPreferences(arguments[0].sdp, codec);
+            }
+
+            // set maximum bitrate
+            try {
+                if (maxVideoBitrate > 0 && description) {
+                    arguments[0].sdp = patchSdpBitrate(arguments[0].sdp, Math.round(maxVideoBitrate / 1000));
+                }
+            } catch (e) {
+                BxLogger.error('setLocalDescription', e);
+            }
+
+            BxLogger.info('setLocalDescription', arguments[0].sdp);
+
+            // @ts-ignore
+            return nativeSetLocalDescription.apply(this, arguments);
+        };
+    }
 
     const OrgRTCPeerConnection = window.RTCPeerConnection;
     // @ts-ignore
@@ -132,6 +125,10 @@ export function patchAudioContext() {
 
     // @ts-ignore
     window.AudioContext = function(options?: AudioContextOptions | undefined): AudioContext {
+        if (options && options.latencyHint) {
+            options.latencyHint = 0;
+        }
+
         const ctx = new OrgAudioContext(options);
         BxLogger.info('patchAudioContext', ctx, options);
 
@@ -160,7 +157,14 @@ export function patchMeControl() {
     };
 
     const MSA = {
-        MeControl: {},
+        MeControl: {
+            API: {
+                setDisplayMode: () => {},
+                setMobileState: () => {},
+                addEventListener: () => {},
+                removeEventListener: () => {},
+            },
+        },
     };
     const MeControl = {};
 
@@ -207,15 +211,57 @@ export function patchCanvasContext() {
     HTMLCanvasElement.prototype.getContext = function(contextType: string, contextAttributes?: any) {
         if (contextType.includes('webgl')) {
             contextAttributes = contextAttributes || {};
+            if (!contextAttributes.isBx) {
+                contextAttributes.antialias = false;
 
-            contextAttributes.antialias = false;
+                // Use low-power profile for touch controller
-
+                if (contextAttributes.powerPreference === 'high-performance') {
-            // Use low-power profile for touch controller
+                    contextAttributes.powerPreference = 'low-power';
-            if (contextAttributes.powerPreference === 'high-performance') {
+                }
-                contextAttributes.powerPreference = 'low-power';
             }
         }
 
         return nativeGetContext.apply(this, [contextType, contextAttributes]);
     }
 }
+
+
+export function patchPointerLockApi() {
+    Object.defineProperty(document, 'fullscreenElement', {
+        configurable: true,
+        get() {
+            return document.documentElement;
+        },
+    });
+
+    HTMLElement.prototype.requestFullscreen = function(options?: FullscreenOptions): Promise<void> {
+        return Promise.resolve();
+    }
+
+    let pointerLockElement: unknown = null;
+    Object.defineProperty(document, 'pointerLockElement', {
+        configurable: true,
+        get() {
+            return pointerLockElement;
+        },
+    });
+
+    // const nativeRequestPointerLock = HTMLElement.prototype.requestPointerLock;
+    HTMLElement.prototype.requestPointerLock = function() {
+        pointerLockElement = document.documentElement;
+        window.dispatchEvent(new Event(BxEvent.POINTER_LOCK_REQUESTED));
+        // document.dispatchEvent(new Event('pointerlockchange'));
+
+        // @ts-ignore
+        // nativeRequestPointerLock.apply(this, arguments);
+    }
+
+    // const nativeExitPointerLock = Document.prototype.exitPointerLock;
+    Document.prototype.exitPointerLock = function() {
+        pointerLockElement = null;
+        window.dispatchEvent(new Event(BxEvent.POINTER_LOCK_EXITED));
+        // document.dispatchEvent(new Event('pointerlockchange'));
+
+        // nativeExitPointerLock.apply(this);
+    }
+}

src/utils/network.ts

@@ -1,15 +1,13 @@
 import { BxEvent } from "@utils/bx-event";
 import { BX_FLAGS, NATIVE_FETCH } from "@utils/bx-flags";
-import { LoadingScreen } from "@modules/loading-screen";
 import { PrefKey, getPref } from "@utils/preferences";
-import { RemotePlay } from "@modules/remote-play";
-import { StreamBadges } from "@modules/stream/stream-badges";
 import { TouchController } from "@modules/touch-controller";
 import { STATES } from "@utils/global";
-import { getPreferredServerRegion } from "@utils/region";
+import { GamePassCloudGallery } from "../enums/game-pass-gallery";
-import { GamePassCloudGallery } from "./gamepass-gallery";
+import { FeatureGates } from "./feature-gates";
-import { InputType } from "./bx-exposed";
+import { BxLogger } from "./bx-logger";
-import { UserAgent } from "./user-agent";
+import { XhomeInterceptor } from "./xhome-interceptor";
+import { XcloudInterceptor } from "./xcloud-interceptor";
 
 enum RequestType {
     XCLOUD = 'xcloud',
@@ -95,12 +93,12 @@ function updateIceCandidates(candidates: any, options: any) {
 
     newCandidates.push(newCandidate('a=end-of-candidates'));
 
-    console.log(newCandidates);
+    BxLogger.info('ICE Candidates', newCandidates);
     return newCandidates;
 }
 
 
-async function patchIceCandidates(request: Request, consoleAddrs?: {[index: string]: number}) {
+export async function patchIceCandidates(request: Request, consoleAddrs?: {[index: string]: number}) {
     const response = await NATIVE_FETCH(request);
     const text = await response.clone().text();
 
@@ -124,373 +122,6 @@ async function patchIceCandidates(request: Request, consoleAddrs?: {[index: stri
     return response;
 }
 
-
-class XhomeInterceptor {
-    static #consoleAddrs: {[index: string]: number} = {};
-
-    static async #handleLogin(request: Request) {
-        try {
-            const clone = (request as Request).clone();
-
-            const obj = await clone.json();
-            obj.offeringId = 'xhome';
-
-            request = new Request('https://xhome.gssv-play-prod.xboxlive.com/v2/login/user', {
-                method: 'POST',
-                body: JSON.stringify(obj),
-                headers: {
-                    'Content-Type': 'application/json',
-                },
-            });
-        } catch (e) {
-            alert(e);
-            console.log(e);
-        }
-
-        return NATIVE_FETCH(request);
-    }
-
-    static async #handleConfiguration(request: Request | URL) {
-        const response = await NATIVE_FETCH(request);
-
-        const obj = await response.clone().json()
-        console.log(obj);
-
-        const serverDetails = obj.serverDetails;
-        if (serverDetails.ipV4Address) {
-            XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = serverDetails.ipV4Port;
-        }
-
-        if (serverDetails.ipV6Address) {
-            XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = serverDetails.ipV6Port;
-        }
-
-        response.json = () => Promise.resolve(obj);
-        response.text = () => Promise.resolve(JSON.stringify(obj));
-
-        return response;
-    }
-
-    static async #handleInputConfigs(request: Request | URL, opts: {[index: string]: any}) {
-        const response = await NATIVE_FETCH(request);
-
-        if (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'all') {
-            return response;
-        }
-
-        const obj = await response.clone().json() as any;
-
-        const xboxTitleId = JSON.parse(opts.body).titleIds[0];
-        STATES.currentStream.xboxTitleId = xboxTitleId;
-
-        const inputConfigs = obj[0];
-
-        let hasTouchSupport = inputConfigs.supportedTabs.length > 0;
-        if (!hasTouchSupport) {
-            const supportedInputTypes = inputConfigs.supportedInputTypes;
-            hasTouchSupport = supportedInputTypes.includes(InputType.NATIVE_TOUCH) || supportedInputTypes.includes(InputType.CUSTOM_TOUCH_OVERLAY);
-        }
-
-        if (hasTouchSupport) {
-            TouchController.disable();
-
-            BxEvent.dispatch(window, BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, {
-                data: null,
-            });
-        } else {
-            TouchController.enable();
-            TouchController.getCustomLayouts(xboxTitleId);
-        }
-
-        response.json = () => Promise.resolve(obj);
-        response.text = () => Promise.resolve(JSON.stringify(obj));
-
-        return response;
-    }
-
-    static async #handleTitles(request: Request) {
-        const clone = request.clone();
-
-        const headers: {[index: string]: any} = {};
-        for (const pair of (clone.headers as any).entries()) {
-            headers[pair[0]] = pair[1];
-        }
-        headers.authorization = `Bearer ${RemotePlay.XCLOUD_TOKEN}`;
-
-        const index = request.url.indexOf('.xboxlive.com');
-        request = new Request('https://wus.core.gssv-play-prod' + request.url.substring(index), {
-            method: clone.method,
-            body: await clone.text(),
-            headers: headers,
-        });
-
-        return NATIVE_FETCH(request);
-    }
-
-    static async #handlePlay(request: RequestInfo | URL) {
-        const clone = (request as Request).clone();
-        const body = await clone.json();
-
-        // body.settings.useIceConnection = true;
-
-        const newRequest = new Request(request, {
-            body: JSON.stringify(body),
-        });
-
-        return NATIVE_FETCH(newRequest);
-    }
-
-    static async handle(request: Request) {
-        TouchController.disable();
-
-        const clone = request.clone();
-
-        const headers: {[index: string]: string} = {};
-        for (const pair of (clone.headers as any).entries()) {
-            headers[pair[0]] = pair[1];
-        }
-        // Add xHome token to headers
-        headers.authorization = `Bearer ${RemotePlay.XHOME_TOKEN}`;
-
-        // Patch resolution
-        const deviceInfo = RemotePlay.BASE_DEVICE_INFO;
-        if (getPref(PrefKey.REMOTE_PLAY_RESOLUTION) === '720p') {
-            deviceInfo.dev.os.name = 'android';
-        }
-
-        headers['x-ms-device-info'] = JSON.stringify(deviceInfo);
-
-        const opts: {[index: string]: any} = {
-            method: clone.method,
-            headers: headers,
-        };
-
-        if (clone.method === 'POST') {
-            opts.body = await clone.text();
-        }
-
-        let newUrl = request.url;
-        if (!newUrl.includes('/servers/home')) {
-            const index = request.url.indexOf('.xboxlive.com');
-            newUrl = STATES.remotePlay.server + request.url.substring(index + 13);
-        }
-
-        request = new Request(newUrl, opts);
-        let url = (typeof request === 'string') ? request : request.url;
-
-        // Get console IP
-        if (url.includes('/configuration')) {
-            return XhomeInterceptor.#handleConfiguration(request);
-        } else if (url.endsWith('/sessions/home/play')) {
-            return XhomeInterceptor.#handlePlay(request);
-        } else if (url.includes('inputconfigs')) {
-            return XhomeInterceptor.#handleInputConfigs(request, opts);
-        } else if (url.includes('/login/user')) {
-            return XhomeInterceptor.#handleLogin(request);
-        } else if (url.endsWith('/titles')) {
-            return XhomeInterceptor.#handleTitles(request);
-        } else if (url && url.endsWith('/ice') && url.includes('/sessions/') && (request as Request).method === 'GET') {
-            return patchIceCandidates(request, XhomeInterceptor.#consoleAddrs);
-        }
-
-        return await NATIVE_FETCH(request);
-    }
-}
-
-
-class XcloudInterceptor {
-    static async #handleLogin(request: RequestInfo | URL, init?: RequestInit) {
-        const response = await NATIVE_FETCH(request, init);
-        const obj = await response.clone().json();
-
-        // Preload Remote Play
-        getPref(PrefKey.REMOTE_PLAY_ENABLED) && BX_FLAGS.PreloadRemotePlay && RemotePlay.preload();
-
-        // Store xCloud token
-        RemotePlay.XCLOUD_TOKEN = obj.gsToken;
-
-        // Get server list
-        const serverEmojis = {
-            AustraliaEast: '🇦🇺',
-            AustraliaSouthEast: '🇦🇺',
-            BrazilSouth: '🇧🇷',
-            EastUS: '🇺🇸',
-            EastUS2: '🇺🇸',
-            JapanEast: '🇯🇵',
-            KoreaCentral: '🇰🇷',
-            MexicoCentral: '🇲🇽',
-            NorthCentralUs: '🇺🇸',
-            SouthCentralUS: '🇺🇸',
-            UKSouth: '🇬🇧',
-            WestEurope: '🇪🇺',
-            WestUS: '🇺🇸',
-            WestUS2: '🇺🇸',
-        };
-
-        const serverRegex = /\/\/(\w+)\./;
-
-        for (let region of obj.offeringSettings.regions) {
-            const regionName = region.name as keyof typeof serverEmojis;
-            let shortName = region.name;
-
-            let match = serverRegex.exec(region.baseUri);
-            if (match) {
-                shortName = match[1];
-                if (serverEmojis[regionName]) {
-                    shortName = serverEmojis[regionName] + ' ' + shortName;
-                }
-            }
-
-            region.shortName = shortName.toUpperCase();
-            STATES.serverRegions[region.name] = Object.assign({}, region);
-        }
-
-        BxEvent.dispatch(window, BxEvent.XCLOUD_SERVERS_READY);
-
-        const preferredRegion = getPreferredServerRegion();
-        if (preferredRegion in STATES.serverRegions) {
-            const tmp = Object.assign({}, STATES.serverRegions[preferredRegion]);
-            tmp.isDefault = true;
-
-            obj.offeringSettings.regions = [tmp];
-        }
-
-        response.json = () => Promise.resolve(obj);
-        return response;
-    }
-
-    static async #handlePlay(request: RequestInfo | URL, init?: RequestInit) {
-        const PREF_STREAM_TARGET_RESOLUTION = getPref(PrefKey.STREAM_TARGET_RESOLUTION);
-        const PREF_STREAM_PREFERRED_LOCALE = getPref(PrefKey.STREAM_PREFERRED_LOCALE);
-
-        const url = (typeof request === 'string') ? request : (request as Request).url;
-        const parsedUrl = new URL(url);
-
-        let badgeRegion: string = parsedUrl.host.split('.', 1)[0];
-        for (let regionName in STATES.serverRegions) {
-            const region = STATES.serverRegions[regionName];
-            if (parsedUrl.origin == region.baseUri) {
-                badgeRegion = regionName;
-                break;
-            }
-        }
-        StreamBadges.getInstance().setRegion(badgeRegion);
-
-        const clone = (request as Request).clone();
-        const body = await clone.json();
-
-        // Force stream's resolution
-        if (PREF_STREAM_TARGET_RESOLUTION !== 'auto') {
-            const osName = (PREF_STREAM_TARGET_RESOLUTION === '720p') ? 'android' : 'windows';
-            body.settings.osName = osName;
-        }
-
-        // Override "locale" value
-        if (PREF_STREAM_PREFERRED_LOCALE !== 'default') {
-            body.settings.locale = PREF_STREAM_PREFERRED_LOCALE;
-        }
-
-        const newRequest = new Request(request, {
-            body: JSON.stringify(body),
-        });
-
-        return NATIVE_FETCH(newRequest);
-    }
-
-    static async #handleWaitTime(request: RequestInfo | URL, init?: RequestInit) {
-        const response = await NATIVE_FETCH(request, init);
-
-        if (getPref(PrefKey.UI_LOADING_SCREEN_WAIT_TIME)) {
-            const json = await response.clone().json();
-            if (json.estimatedAllocationTimeInSeconds > 0) {
-                // Setup wait time overlay
-                LoadingScreen.setupWaitTime(json.estimatedTotalWaitTimeInSeconds);
-            }
-        }
-
-        return response;
-    }
-
-    static async #handleConfiguration(request: RequestInfo | URL, init?: RequestInit) {
-        if ((request as Request).method !== 'GET') {
-            return NATIVE_FETCH(request, init);
-        }
-
-        // Touch controller for all games
-        if (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all') {
-            const titleInfo = STATES.currentStream.titleInfo;
-            if (titleInfo?.details.hasTouchSupport) {
-                TouchController.disable();
-            } else {
-                TouchController.enable();
-            }
-        }
-
-        // Intercept configurations
-        const response = await NATIVE_FETCH(request, init);
-        const text = await response.clone().text();
-        if (!text.length) {
-            return response;
-        }
-
-        const obj = JSON.parse(text);
-        let overrides = JSON.parse(obj.clientStreamingConfigOverrides || '{}') || {};
-
-        overrides.inputConfiguration = overrides.inputConfiguration || {};
-        overrides.inputConfiguration.enableVibration = true;
-
-        if (getPref(PrefKey.NATIVE_MKB_DISABLED) || UserAgent.isMobile()) {
-            overrides.inputConfiguration = Object.assign(overrides.inputConfiguration, {
-                    enableMouseInput: false,
-                    enableAbsoluteMouse: false,
-                    enableKeyboardInput: false,
-                });
-        }
-
-        overrides.videoConfiguration = overrides.videoConfiguration || {};
-        overrides.videoConfiguration.setCodecPreferences = true;
-
-        // Enable touch controller
-        if (TouchController.isEnabled()) {
-            overrides.inputConfiguration.enableTouchInput = true;
-            overrides.inputConfiguration.maxTouchPoints = 10;
-        }
-
-        // Enable mic
-        if (getPref(PrefKey.AUDIO_MIC_ON_PLAYING)) {
-            overrides.audioConfiguration = overrides.audioConfiguration || {};
-            overrides.audioConfiguration.enableMicrophone = true;
-        }
-
-        obj.clientStreamingConfigOverrides = JSON.stringify(overrides);
-
-        response.json = () => Promise.resolve(obj);
-        response.text = () => Promise.resolve(JSON.stringify(obj));
-
-        return response;
-    }
-
-    static async handle(request: RequestInfo | URL, init?: RequestInit) {
-        let url = (typeof request === 'string') ? request : (request as Request).url;
-
-        // Server list
-        if (url.endsWith('/v2/login/user')) {
-            return XcloudInterceptor.#handleLogin(request, init);
-        } else if (url.endsWith('/sessions/cloud/play')) {  // Get session
-            return XcloudInterceptor.#handlePlay(request, init);
-        } else if (url.includes('xboxlive.com') && url.includes('/waittime/')) {
-            return XcloudInterceptor.#handleWaitTime(request, init);
-        } else if (url.endsWith('/configuration')) {
-            return XcloudInterceptor.#handleConfiguration(request, init);
-        } else if (url && url.endsWith('/ice') && url.includes('/sessions/') && (request as Request).method === 'GET') {
-            return patchIceCandidates(request as Request);
-        }
-
-        return NATIVE_FETCH(request, init);
-    }
-}
-
-
 export function interceptHttpRequests() {
     let BLOCKED_URLS: string[] = [];
     if (getPref(PrefKey.BLOCK_TRACKING)) {
@@ -570,14 +201,10 @@ export function interceptHttpRequests() {
                 const response = await NATIVE_FETCH(request, init);
                 const json = await response.json();
 
-                const overrideTreatments: {[key: string]: boolean} = {};
+                if (json && json.exp && json.exp.treatments) {
-
+                    for (const key in FeatureGates) {
-                if (getPref(PrefKey.UI_HOME_CONTEXT_MENU_DISABLED)) {
+                        json.exp.treatments[key] = FeatureGates[key]
-                    overrideTreatments['EnableHomeContextMenu'] = false;
+                    }
-                }
-
-                for (const key in overrideTreatments) {
-                    json.exp.treatments[key] = overrideTreatments[key]
                 }
 
                 response.json = () => Promise.resolve(json);
@@ -588,7 +215,7 @@ export function interceptHttpRequests() {
         }
 
         // Add list of games with custom layouts to the official list
-        if (STATES.hasTouchSupport && url.includes('catalog.gamepass.com/sigls/')) {
+        if (STATES.userAgent.capabilities.touch && url.includes('catalog.gamepass.com/sigls/')) {
             const response = await NATIVE_FETCH(request, init);
             const obj = await response.clone().json();
 
@@ -614,6 +241,21 @@ export function interceptHttpRequests() {
             return response;
         }
 
+        if (BX_FLAGS.ForceNativeMkbTitles && url.includes('catalog.gamepass.com/sigls/') && url.includes(GamePassCloudGallery.NATIVE_MKB)) {
+            const response = await NATIVE_FETCH(request, init);
+            const obj = await response.clone().json();
+
+            try {
+                const newCustomList = BX_FLAGS.ForceNativeMkbTitles.map((item: string) => ({ id: item }));
+                obj.push(...newCustomList);
+            } catch (e) {
+                console.log(e);
+            }
+
+            response.json = () => Promise.resolve(obj);
+            return response;
+        }
+
         let requestType: RequestType;
         if (url.includes('/sessions/home') || url.includes('xhome.') || (STATES.remotePlay.isPlaying && url.endsWith('/inputconfigs'))) {
             requestType = RequestType.XHOME;

src/utils/preferences.ts

@@ -1,10 +1,13 @@
 import { CE } from "@utils/html";
-import { SUPPORTED_LANGUAGES, t } from "@utils/translation";
+import { SUPPORTED_LANGUAGES, t} from "@utils/translation";
 import { SettingElement, SettingElementType } from "@utils/settings";
-import { UserAgentProfile } from "@utils/user-agent";
+import { UserAgent } from "@utils/user-agent";
 import { StreamStat } from "@modules/stream/stream-stats";
 import type { PreferenceSetting, PreferenceSettings } from "@/types/preferences";
 import { AppInterface, STATES } from "@utils/global";
+import { StreamPlayerType, StreamVideoProcessing } from "@enums/stream-player";
+import { UserAgentProfile } from "@/enums/user-agent";
+import { UiSection } from "@/enums/ui-sections";
 
 export enum PrefKey {
     LAST_UPDATE_CHECK = 'version_last_check',
@@ -14,6 +17,8 @@ export enum PrefKey {
     BETTER_XCLOUD_LOCALE = 'bx_locale',
 
     SERVER_REGION = 'server_region',
+    SERVER_BYPASS_RESTRICTION = 'server_bypass_restriction',
+
     PREFER_IPV6_SERVER = 'prefer_ipv6_server',
     STREAM_TARGET_RESOLUTION = 'stream_target_resolution',
     STREAM_PREFERRED_LOCALE = 'stream_preferred_locale',
@@ -43,8 +48,12 @@ export enum PrefKey {
     CONTROLLER_ENABLE_VIBRATION = 'controller_enable_vibration',
     CONTROLLER_DEVICE_VIBRATION = 'controller_device_vibration',
     CONTROLLER_VIBRATION_INTENSITY = 'controller_vibration_intensity',
+    CONTROLLER_SHOW_CONNECTION_STATUS = 'controller_show_connection_status',
+
+    NATIVE_MKB_ENABLED = 'native_mkb_enabled',
+    NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY = 'native_mkb_scroll_x_sensitivity',
+    NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY = 'native_mkb_scroll_y_sensitivity',
 
-    NATIVE_MKB_DISABLED = 'native_mkb_disabled',
     MKB_ENABLED = 'mkb_enabled',
     MKB_HIDE_IDLE_CURSOR = 'mkb_hide_idle_cursor',
     MKB_ABSOLUTE_MOUSE = 'mkb_absolute_mouse',
@@ -64,10 +73,14 @@ export enum PrefKey {
 
     UI_LAYOUT = 'ui_layout',
     UI_SCROLLBAR_HIDE = 'ui_scrollbar_hide',
+    UI_HIDE_SECTIONS = 'ui_hide_sections',
 
     UI_HOME_CONTEXT_MENU_DISABLED = 'ui_home_context_menu_disabled',
+    UI_GAME_CARD_SHOW_WAIT_TIME = 'ui_game_card_show_wait_time',
 
-    VIDEO_CLARITY = 'video_clarity',
+    VIDEO_PLAYER_TYPE = 'video_player_type',
+    VIDEO_PROCESSING = 'video_processing',
+    VIDEO_SHARPNESS = 'video_sharpness',
     VIDEO_RATIO = 'video_ratio',
     VIDEO_BRIGHTNESS = 'video_brightness',
     VIDEO_CONTRAST = 'video_contrast',
@@ -112,6 +125,12 @@ export class Preferences {
             label: t('region'),
             default: 'default',
         },
+        [PrefKey.SERVER_BYPASS_RESTRICTION]: {
+            label: t('bypass-region-restriction'),
+            note: t('use-this-at-your-own-risk'),
+            default: false,
+        },
+
         [PrefKey.STREAM_PREFERRED_LOCALE]: {
             label: t('preferred-game-language'),
             default: 'default',
@@ -163,7 +182,7 @@ export class Preferences {
                     default: t('default'),
                 };
 
-                if (!('getCapabilities' in RTCRtpReceiver) || typeof RTCRtpTransceiver === 'undefined' || !('setCodecPreferences' in RTCRtpTransceiver.prototype)) {
+                if (!('getCapabilities' in RTCRtpReceiver)) {
                     return options;
                 }
 
@@ -260,7 +279,7 @@ export class Preferences {
                 all: t('tc-all-games'),
                 off: t('off'),
             },
-            unsupported: !STATES.hasTouchSupport,
+            unsupported: !STATES.userAgent.capabilities.touch,
             ready: (setting: PreferenceSetting) => {
                 if (setting.unsupported) {
                     setting.default = 'default';
@@ -270,7 +289,7 @@ export class Preferences {
         [PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF]: {
             label: t('tc-auto-off'),
             default: false,
-            unsupported: !STATES.hasTouchSupport,
+            unsupported: !STATES.userAgent.capabilities.touch,
         },
         [PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY]: {
             type: SettingElementType.NUMBER_STEPPER,
@@ -284,7 +303,7 @@ export class Preferences {
                 ticks: 10,
                 hideSlider: true,
             },
-            unsupported: !STATES.hasTouchSupport,
+            unsupported: !STATES.userAgent.capabilities.touch,
         },
         [PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD]: {
             label: t('tc-standard-layout-style'),
@@ -294,7 +313,7 @@ export class Preferences {
                 white: t('tc-all-white'),
                 muted: t('tc-muted-colors'),
             },
-            unsupported: !STATES.hasTouchSupport,
+            unsupported: !STATES.userAgent.capabilities.touch,
         },
         [PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_CUSTOM]: {
             label: t('tc-custom-layout-style'),
@@ -303,7 +322,7 @@ export class Preferences {
                 default: t('default'),
                 muted: t('tc-muted-colors'),
             },
-            unsupported: !STATES.hasTouchSupport,
+            unsupported: !STATES.userAgent.capabilities.touch,
         },
 
         [PrefKey.STREAM_SIMPLIFY_MENU]: {
@@ -337,8 +356,6 @@ export class Preferences {
                     } else {
                         return (value / (1024 * 1000)).toFixed(1) + ' Mb/s';
                     }
-
-                    return null;
                 },
             },
             migrate: function(savedPrefs: any, value: any) {
@@ -379,6 +396,11 @@ export class Preferences {
         },
         */
 
+        [PrefKey.CONTROLLER_SHOW_CONNECTION_STATUS]: {
+            label: t('show-controller-connection-status'),
+            default: true,
+        },
+
         [PrefKey.CONTROLLER_ENABLE_SHORTCUTS]: {
             default: false,
         },
@@ -436,9 +458,64 @@ export class Preferences {
             },
         },
 
-        [PrefKey.NATIVE_MKB_DISABLED]: {
+        [PrefKey.NATIVE_MKB_ENABLED]: {
-            label: t('disable-native-mkb'),
+            label: t('native-mkb'),
-            default: false,
+            default: 'default',
+            options: {
+                default: t('default'),
+                on: t('on'),
+                off: t('off'),
+            },
+            ready: (setting: PreferenceSetting) => {
+                if (AppInterface) {
+
+                } else if (UserAgent.isMobile()) {
+                    setting.unsupported = true;
+                    setting.default = 'off';
+                    delete setting.options!['default'];
+                    delete setting.options!['on'];
+                } else {
+                    delete setting.options!['on'];
+                }
+            },
+        },
+
+        [PrefKey.NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY]: {
+            label: t('horizontal-scroll-sensitivity'),
+            type: SettingElementType.NUMBER_STEPPER,
+            default: 0,
+            min: 0,
+            max: 100 * 100,
+            steps: 10,
+            params: {
+                exactTicks: 20 * 100,
+                customTextValue: (value: any) => {
+                    if (!value) {
+                        return t('default');
+                    }
+
+                    return (value / 100).toFixed(1) + 'x';
+                },
+            },
+        },
+
+        [PrefKey.NATIVE_MKB_SCROLL_VERTICAL_SENSITIVITY]: {
+            label: t('vertical-scroll-sensitivity'),
+            type: SettingElementType.NUMBER_STEPPER,
+            default: 0,
+            min: 0,
+            max: 100 * 100,
+            steps: 10,
+            params: {
+                exactTicks: 20 * 100,
+                customTextValue: (value: any) => {
+                    if (!value) {
+                        return t('default');
+                    }
+
+                    return (value / 100).toFixed(1) + 'x';
+                },
+            },
         },
 
         [PrefKey.MKB_DEFAULT_PRESET_ID]: {
@@ -488,6 +565,25 @@ export class Preferences {
 
         [PrefKey.UI_HOME_CONTEXT_MENU_DISABLED]: {
             label: t('disable-home-context-menu'),
+            default: STATES.browser.capabilities.touch,
+        },
+
+        [PrefKey.UI_HIDE_SECTIONS]: {
+            label: t('hide-sections'),
+            default: [],
+            multipleOptions: {
+                [UiSection.NEWS]: t('section-news'),
+                [UiSection.FRIENDS]: t('section-play-with-friends'),
+                // [UiSection.MOST_POPULAR]: t('section-most-popular'),
+                [UiSection.ALL_GAMES]: t('section-all-games'),
+            },
+            params: {
+                size: 3,
+            },
+        },
+
+        [PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME]: {
+            label: t('show-wait-time-in-game-card'),
             default: false,
         },
 
@@ -507,26 +603,45 @@ export class Preferences {
                 [UserAgentProfile.DEFAULT]: t('default'),
                 [UserAgentProfile.WINDOWS_EDGE]: 'Edge + Windows',
                 [UserAgentProfile.MACOS_SAFARI]: 'Safari + macOS',
-                [UserAgentProfile.SMARTTV_GENERIC]: 'Smart TV',
+                [UserAgentProfile.SMART_TV_GENERIC]: 'Smart TV',
-                [UserAgentProfile.SMARTTV_TIZEN]: 'Samsung Smart TV',
+                [UserAgentProfile.SMART_TV_TIZEN]: 'Samsung Smart TV',
                 [UserAgentProfile.VR_OCULUS]: 'Meta Quest VR',
-                [UserAgentProfile.ANDROID_KIWI_V123]: 'Kiwi Browser v123',
                 [UserAgentProfile.CUSTOM]: t('custom'),
             },
         },
-        [PrefKey.VIDEO_CLARITY]: {
+        [PrefKey.VIDEO_PLAYER_TYPE]: {
-            label: t('clarity'),
+            label: t('renderer'),
+            default: 'default',
+            options: {
+                [StreamPlayerType.VIDEO]: t('default'),
+                [StreamPlayerType.WEBGL2]: t('webgl2'),
+            },
+        },
+        [PrefKey.VIDEO_PROCESSING]: {
+            label: t('clarity-boost'),
+            default: StreamVideoProcessing.USM,
+            options: {
+                [StreamVideoProcessing.USM]: t('unsharp-masking'),
+                [StreamVideoProcessing.CAS]: t('amd-fidelity-cas'),
+            },
+        },
+        [PrefKey.VIDEO_SHARPNESS]: {
+            label: t('sharpness'),
             type: SettingElementType.NUMBER_STEPPER,
             default: 0,
             min: 0,
-            max: 5,
+            max: 10,
             params: {
                 hideSlider: true,
+                customTextValue: (value: any) => {
+                    value = parseInt(value);
+                    return value === 0 ? t('off') : value.toString();
+                },
             },
         },
         [PrefKey.VIDEO_RATIO]: {
-            label: t('ratio'),
+            label: t('aspect-ratio'),
-            note: t('stretch-note'),
+            note: t('aspect-ratio-note'),
             default: '16:9',
             options: {
                 '16:9': '16:9',

src/utils/preload-state.ts

@@ -1,8 +1,9 @@
-import { STATES } from "@utils/global";
+import { deepClone, STATES } from "@utils/global";
 import { BxLogger } from "./bx-logger";
 import { TouchController } from "@modules/touch-controller";
-import { GamePassCloudGallery } from "./gamepass-gallery";
+import { GamePassCloudGallery } from "../enums/game-pass-gallery";
 import { getPref, PrefKey } from "./preferences";
+import { BX_FLAGS } from "./bx-flags";
 
 const LOG_TAG = 'PreloadState';
 
@@ -23,7 +24,7 @@ export function overridePreloadState() {
             }
 
             // Add list of games with custom layouts to the official list
-            if (STATES.hasTouchSupport) {
+            if (STATES.userAgent.capabilities.touch) {
                 try {
                     const sigls = state.xcloud.sigls;
                     if (GamePassCloudGallery.TOUCH in sigls) {
@@ -37,6 +38,12 @@ export function overridePreloadState() {
                         // Add to the official list
                         sigls[GamePassCloudGallery.TOUCH]?.data.products.push(...customList);
                     }
+
+                    if (BX_FLAGS.ForceNativeMkbTitles && GamePassCloudGallery.NATIVE_MKB in sigls) {
+                        // Add to the official list
+                        sigls[GamePassCloudGallery.NATIVE_MKB]?.data.products.push(...BX_FLAGS.ForceNativeMkbTitles);
+                    }
+
                 } catch (e) {
                     BxLogger.error(LOG_TAG, e);
                 }
@@ -52,7 +59,7 @@ export function overridePreloadState() {
 
             // @ts-ignore
             _state = state;
-            STATES.appContext = structuredClone(state.appContext);
+            STATES.appContext = deepClone(state.appContext);
         }
     });
 }

src/utils/screenshot.ts

@@ -1,5 +1,7 @@
+import { StreamPlayerType } from "@enums/stream-player";
 import { AppInterface, STATES } from "./global";
 import { CE } from "./html";
+import { getPref, PrefKey } from "./preferences";
 
 
 export class Screenshot {
@@ -31,23 +33,39 @@ export class Screenshot {
         Screenshot.#canvasContext.filter = filters;
     }
 
-    private static onAnimationEnd(e: Event) {
+    static #onAnimationEnd(e: Event) {
-        (e.target as any).classList.remove('bx-taking-screenshot');
+        const $target = e.target as HTMLElement;
+        $target.classList.remove('bx-taking-screenshot');
     }
 
     static takeScreenshot(callback?: any) {
         const currentStream = STATES.currentStream;
-        const $video = currentStream.$video;
+        const streamPlayer = currentStream.streamPlayer;
         const $canvas = Screenshot.#$canvas;
-        if (!$video || !$canvas) {
+        if (!streamPlayer || !$canvas) {
             return;
         }
 
-        $video.parentElement?.addEventListener('animationend', this.onAnimationEnd);
+        let $player;
-        $video.parentElement?.classList.add('bx-taking-screenshot');
+        if (getPref(PrefKey.SCREENSHOT_APPLY_FILTERS)) {
+            $player = streamPlayer.getPlayerElement();
+        } else {
+            $player = streamPlayer.getPlayerElement(StreamPlayerType.VIDEO);
+        }
+
+        if (!$player || !$player.isConnected) {
+            return;
+        }
+
+        $player.parentElement!.addEventListener('animationend', this.#onAnimationEnd, { once: true });
+        $player.parentElement!.classList.add('bx-taking-screenshot');
 
         const canvasContext = Screenshot.#canvasContext;
-        canvasContext.drawImage($video, 0, 0, $canvas.width, $canvas.height);
+
+        if ($player instanceof HTMLCanvasElement) {
+            streamPlayer.getWebGL2Player().drawFrame();
+        }
+        canvasContext.drawImage($player, 0, 0, $canvas.width, $canvas.height);
 
         // Get data URL and pass to parent app
         if (AppInterface) {

src/utils/sdp.ts

@@ -1,5 +1,59 @@
+export function setCodecPreferences(sdp: string, preferredCodec: string) {
+    const h264Pattern = /a=fmtp:(\d+).*profile-level-id=([0-9a-f]{6})/g;
+    const profilePrefix = preferredCodec === 'high' ? '4d' : (preferredCodec === 'low' ? '420' : '42e');
+
+    const preferredCodecIds: string[] = [];
+
+    // Find all H.264 codec profile IDs
+    const matches = sdp.matchAll(h264Pattern) || [];
+    for (const match of matches) {
+        const id = match[1];
+        const profileId = match[2];
+
+        if (profileId.startsWith(profilePrefix)) {
+            preferredCodecIds.push(id);
+        }
+    }
+
+    // No preferred IDs found
+    if (!preferredCodecIds.length) {
+        return sdp;
+    }
+
+    const lines = sdp.split('\r\n');
+    for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+        const line = lines[lineIndex];
+        if (!line.startsWith('m=video')) {
+            continue;
+        }
+
+        // https://datatracker.ietf.org/doc/html/rfc4566#section-5.14
+        // m=<media> <port> <proto> <fmt>
+        // m=video 9 UDP/TLS/RTP/SAVPF 127 39 102 104 106 108
+        const tmp = line.trim().split(' ');
+
+        // Get array of <fmt>
+        // ['127', '39', '102', '104', '106', '108']
+        let ids = tmp.slice(3);
+
+        // Remove preferred IDs in the original array
+        ids = ids.filter(item => !preferredCodecIds.includes(item));
+
+        // Put preferred IDs at the beginning
+        ids = preferredCodecIds.concat(ids);
+
+        // Update line's content
+        lines[lineIndex] = tmp.slice(0, 3).concat(ids).join(' ');
+
+        break;
+    }
+
+    return lines.join('\r\n');
+}
+
+
 export function patchSdpBitrate(sdp: string, video?: number, audio?: number) {
-    const lines = sdp.split('\n');
+    const lines = sdp.split('\r\n');
 
     const mediaSet: Set<string> = new Set();
     !!video && mediaSet.add('video');
@@ -57,5 +111,5 @@ export function patchSdpBitrate(sdp: string, video?: number, audio?: number) {
         }
     }
 
-    return lines.join('\n');
+    return lines.join('\r\n');
 }

src/utils/settings.ts

@@ -27,7 +27,7 @@ export enum SettingElementType {
 export class SettingElement {
     static #renderOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any) {
         const $control = CE<HTMLSelectElement>('select', {
-                title: setting.label,
+                // title: setting.label,
                 tabindex: 0,
             }) as HTMLSelectElement;
         for (let value in setting.options) {
@@ -38,7 +38,7 @@ export class SettingElement {
         }
 
         $control.value = currentValue;
-        onChange && $control.addEventListener('change', e => {
+        onChange && $control.addEventListener('input', e => {
             const target = e.target as HTMLSelectElement;
             const value = (setting.type && setting.type === 'number') ? parseInt(target.value) : target.value;
             onChange(e, value);
@@ -54,7 +54,7 @@ export class SettingElement {
 
     static #renderMultipleOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any, params: MultipleOptionsParams={}) {
         const $control = CE<HTMLSelectElement>('select', {
-                title: setting.label,
+                // title: setting.label,
                 multiple: true,
                 tabindex: 0,
             });
@@ -76,7 +76,7 @@ export class SettingElement {
 
                 const $parent = target.parentElement!;
                 $parent.focus();
-                $parent.dispatchEvent(new Event('change'));
+                $parent.dispatchEvent(new Event('input'));
             });
 
             $control.appendChild($option);
@@ -90,7 +90,7 @@ export class SettingElement {
 
         $control.addEventListener('mousemove', e => e.preventDefault());
 
-        onChange && $control.addEventListener('change', (e: Event) => {
+        onChange && $control.addEventListener('input', (e: Event) => {
             const target = e.target as HTMLSelectElement
             const values = Array.from(target.selectedOptions).map(i => i.value);
             onChange(e, values);
@@ -132,10 +132,12 @@ export class SettingElement {
         options.hideSlider = !!options.hideSlider;
 
         let $text: HTMLSpanElement;
-        let $decBtn: HTMLButtonElement;
+        let $btnDec: HTMLButtonElement;
-        let $incBtn: HTMLButtonElement;
+        let $btnInc: HTMLButtonElement;
         let $range: HTMLInputElement;
 
+        let controlValue = value;
+
         const MIN = setting.min!;
         const MAX = setting.max!;
         const STEPS = Math.max(setting.steps || 1, 1);
@@ -155,14 +157,19 @@ export class SettingElement {
             return textContent;
         };
 
-        const $wrapper = CE('div', {'class': 'bx-number-stepper'},
+        const updateButtonsVisibility = () => {
-                $decBtn = CE('button', {
+            $btnDec.classList.toggle('bx-hidden', controlValue === MIN);
+            $btnInc.classList.toggle('bx-hidden', controlValue === MAX);
+        }
+
+        const $wrapper = CE('div', {'class': 'bx-number-stepper', id: `bx_setting_${key}`},
+                $btnDec = CE('button', {
                         'data-type': 'dec',
                         type: 'button',
                         tabindex: -1,
                     }, '-') as HTMLButtonElement,
                 $text = CE('span', {}, renderTextValue(value)) as HTMLSpanElement,
-                $incBtn = CE('button', {
+                $btnInc = CE('button', {
                         'data-type': 'inc',
                         type: 'button',
                         tabindex: -1,
@@ -182,6 +189,9 @@ export class SettingElement {
 
             $range.addEventListener('input', e => {
                 value = parseInt((e.target as HTMLInputElement).value);
+                controlValue = value;
+                updateButtonsVisibility();
+
                 $text.textContent = renderTextValue(value);
                 !(e as any).ignoreOnChange && onChange && onChange(e, value);
             });
@@ -212,14 +222,16 @@ export class SettingElement {
         }
 
         if (options.disabled) {
-            $incBtn.disabled = true;
+            $btnInc.disabled = true;
-            $incBtn.classList.add('bx-hidden');
+            $btnInc.classList.add('bx-hidden');
 
-            $decBtn.disabled = true;
+            $btnDec.disabled = true;
-            $decBtn.classList.add('bx-hidden');
+            $btnDec.classList.add('bx-hidden');
             return $wrapper;
         }
 
+        updateButtonsVisibility();
+
         let interval: number;
         let isHolding = false;
 
@@ -231,19 +243,19 @@ export class SettingElement {
                 return;
             }
 
-            let value: number;
+            const $btn = e.target as HTMLElement;
-            if ($range) {
+            let value = parseInt(controlValue);
-                value = parseInt($range.value);
+
-            } else {
+            const btnType = $btn.dataset.type;
-                value = parseInt($text.textContent!);
-            }
-            const btnType = (e.target as HTMLElement).getAttribute('data-type');
             if (btnType === 'dec') {
                 value = Math.max(MIN, value - STEPS);
             } else {
                 value = Math.min(MAX, value + STEPS);
             }
 
+            controlValue = value;
+            updateButtonsVisibility();
+
             $text.textContent = renderTextValue(value);
             $range && ($range.value = value.toString());
 
@@ -277,19 +289,21 @@ export class SettingElement {
 
         // Custom method
         ($wrapper as any).setValue = (value: any) => {
+            controlValue = parseInt(value);
+
             $text.textContent = renderTextValue(value);
             $range && ($range.value = value);
         };
 
-        $decBtn.addEventListener('click', onClick);
+        $btnDec.addEventListener('click', onClick);
-        $decBtn.addEventListener('pointerdown', onMouseDown);
+        $btnDec.addEventListener('pointerdown', onMouseDown);
-        $decBtn.addEventListener('pointerup', onMouseUp);
+        $btnDec.addEventListener('pointerup', onMouseUp);
-        $decBtn.addEventListener('contextmenu', onContextMenu);
+        $btnDec.addEventListener('contextmenu', onContextMenu);
 
-        $incBtn.addEventListener('click', onClick);
+        $btnInc.addEventListener('click', onClick);
-        $incBtn.addEventListener('pointerdown', onMouseDown);
+        $btnInc.addEventListener('pointerdown', onMouseDown);
-        $incBtn.addEventListener('pointerup', onMouseUp);
+        $btnInc.addEventListener('pointerup', onMouseUp);
-        $incBtn.addEventListener('contextmenu', onContextMenu);
+        $btnInc.addEventListener('contextmenu', onContextMenu);
 
         return $wrapper;
     }

src/utils/translation.ts

@@ -1,11 +1,12 @@
 import { NATIVE_FETCH } from "./bx-flags";
+import { BxLogger } from "./bx-logger";
 
 export const SUPPORTED_LANGUAGES = {
     'en-US': 'English (United States)',
 
     'ca-CA': 'Català',
-    'en-ID': 'Bahasa Indonesia',
     'de-DE': 'Deutsch',
+    'en-ID': 'Bahasa Indonesia',
     'es-ES': 'español (España)',
     'fr-FR': 'français',
     'it-IT': 'italiano',
@@ -26,8 +27,13 @@ const Texts = {
     "activated": "Activated",
     "active": "Active",
     "advanced": "Advanced",
+    "always-off": "Always off",
+    "always-on": "Always on",
+    "amd-fidelity-cas": "AMD FidelityFX CAS",
     "android-app-settings": "Android app settings",
     "apply": "Apply",
+    "aspect-ratio": "Aspect ratio",
+    "aspect-ratio-note": "Don't use with native touch games",
     "audio": "Audio",
     "auto": "Auto",
     "back-to-home": "Back to home",
@@ -45,13 +51,15 @@ const Texts = {
     "bottom-right": "Bottom-right",
     "brightness": "Brightness",
     "browser-unsupported-feature": "Your browser doesn't support this feature",
+    "bypass-region-restriction": "Bypass region restriction",
     "can-stream-xbox-360-games": "Can stream Xbox 360 games",
     "cancel": "Cancel",
     "cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
-    "clarity": "Clarity",
+    "clarity-boost": "Clarity boost",
     "clarity-boost-warning": "These settings don't work when the Clarity Boost mode is ON",
     "clear": "Clear",
     "close": "Close",
+    "close-app": "Close app",
     "combine-audio-video-streams": "Combine audio & video streams",
     "combine-audio-video-streams-summary": "May fix the laggy audio problem",
     "conditional-formatting": "Conditional formatting text color",
@@ -77,7 +85,6 @@ const Texts = {
     "device-vibration-not-using-gamepad": "On when not using gamepad",
     "disable": "Disable",
     "disable-home-context-menu": "Disable context menu in Home page",
-    "disable-native-mkb": "Disable native Mouse & Keyboard feature",
     "disable-post-stream-feedback-dialog": "Disable post-stream feedback dialog",
     "disable-social-features": "Disable social features",
     "disable-xcloud-analytics": "Disable xCloud analytics",
@@ -104,9 +111,12 @@ const Texts = {
     "hide": "Hide",
     "hide-idle-cursor": "Hide mouse cursor on idle",
     "hide-scrollbar": "Hide web page's scrollbar",
+    "hide-sections": "Hide sections",
     "hide-system-menu-icon": "Hide System menu's icon",
     "hide-touch-controller": "Hide touch controller",
+    "horizontal-scroll-sensitivity": "Horizontal scroll sensitivity",
     "horizontal-sensitivity": "Horizontal sensitivity",
+    "ignore": "Ignore",
     "import": "Import",
     "increase": "Increase",
     "install-android": "Install Better xCloud app for Android",
@@ -125,8 +135,10 @@ const Texts = {
     "mkb-click-to-activate": "Click to activate",
     "mkb-disclaimer": "Using this feature when playing online could be viewed as cheating",
     "mouse-and-keyboard": "Mouse & Keyboard",
+    "mouse-wheel": "Mouse wheel",
     "muted": "Muted",
     "name": "Name",
+    "native-mkb": "Native Mouse & Keyboard",
     "new": "New",
     "no-consoles-found": "No consoles found",
     "normal": "Normal",
@@ -144,32 +156,32 @@ const Texts = {
     "preset": "Preset",
     "press-esc-to-cancel": "Press Esc to cancel",
     "press-key-to-toggle-mkb": [
-        (e: any) => `Press ${e.key} to toggle the Mouse and Keyboard feature`,
+        (e: any) => `Press ${e.key} to toggle this feature`,
-        (e: any) => `Premeu ${e.key} per alternar la funció de teclat i ratolí`,
-        (e: any) => `${e.key}: Maus- und Tastaturunterstützung an-/ausschalten`,
-        (e: any) => `Tekan ${e.key} untuk mengaktifkan fitur Mouse dan Keyboard`,
-        (e: any) => `Pulsa ${e.key} para activar la función de ratón y teclado`,
-        (e: any) => `Appuyez sur ${e.key} pour activer/désactiver la fonction Souris et Clavier`,
-        (e: any) => `Premi ${e.key} per attivare o disattivare la funzione Mouse e Tastiera`,
-        (e: any) => `${e.key} キーでマウスとキーボードの機能を切り替える`,
-        (e: any) => `${e.key} 키를 눌러 마우스와 키보드 기능을 활성화 하십시오`,
-        (e: any) => `Naciśnij ${e.key}, aby przełączyć funkcję myszy i klawiatury`,
-        (e: any) => `Pressione ${e.key} para ativar/desativar a função de Mouse e Teclado`,
-        (e: any) => `Нажмите ${e.key} для переключения функции мыши и клавиатуры`,
         ,
-        (e: any) => `Klavye ve fare özelliğini açmak için ${e.key} tuşuna basın`,
+        (e: any) => `${e.key}: Funktion an-/ausschalten`,
-        (e: any) => `Натисніть ${e.key}, щоб увімкнути або вимкнути функцію миші та клавіатури`,
+        ,
-        (e: any) => `Nhấn ${e.key} để bật/tắt tính năng Chuột và Bàn phím`,
+        (e: any) => `Pulsa ${e.key} para alternar esta función`,
-        (e: any) => `按下 ${e.key} 切换键鼠模式`,
+        (e: any) => `Appuyez sur ${e.key} pour activer cette fonctionnalité`,
+        (e: any) => `Premi ${e.key} per attivare questa funzionalità`,
+        (e: any) => `${e.key} でこの機能を切替`,
+        (e: any) => `${e.key} 키를 눌러 이 기능을 켜고 끄세요`,
+        (e: any) => `Naciśnij ${e.key} aby przełączyć tę funkcję`,
+        (e: any) => `Pressione ${e.key} para alternar este recurso`,
+        (e: any) => `Нажмите ${e.key} для переключения этой функции`,
+        ,
+        (e: any) => `Etkinleştirmek için ${e.key} tuşuna basın`,
+        (e: any) => `Натисніть ${e.key} щоб перемкнути цю функцію`,
+        (e: any) => `Nhấn ${e.key} để bật/tắt tính năng này`,
+        (e: any) => `按下 ${e.key} 来切换此功能`,
     ],
     "press-to-bind": "Press a key or do a mouse click to bind...",
     "prompt-preset-name": "Preset's name:",
-    "ratio": "Ratio",
     "reduce-animations": "Reduce UI animations",
     "region": "Region",
     "reload-stream": "Reload stream",
     "remote-play": "Remote Play",
     "rename": "Rename",
+    "renderer": "Renderer",
     "right-click-to-unbind": "Right-click on a key to unbind it",
     "right-stick": "Right stick",
     "rocket-always-hide": "Always hide",
@@ -181,19 +193,26 @@ const Texts = {
     "save": "Save",
     "screen": "Screen",
     "screenshot-apply-filters": "Applies video filters to screenshots",
+    "section-all-games": "All games",
+    "section-most-popular": "Most popular",
+    "section-news": "News",
+    "section-play-with-friends": "Play with friends",
     "separate-touch-controller": "Separate Touch controller & Controller #1",
     "separate-touch-controller-note": "Touch controller is Player 1, Controller #1 is Player 2",
     "server": "Server",
     "settings": "Settings",
     "settings-reload": "Reload page to reflect changes",
     "settings-reloading": "Reloading...",
+    "sharpness": "Sharpness",
     "shortcut-keys": "Shortcut keys",
     "show": "Show",
+    "show-controller-connection-status": "Show controller connection status",
     "show-game-art": "Show game art",
     "show-hide": "Show/hide",
     "show-stats-on-startup": "Show stats when starting the game",
     "show-touch-controller": "Show touch controller",
     "show-wait-time": "Show the estimated wait time",
+    "show-wait-time-in-game-card": "Show wait time in game card",
     "simplify-stream-menu": "Simplify Stream's menu",
     "skip-splash-video": "Skip Xbox splash video",
     "slow": "Slow",
@@ -214,7 +233,6 @@ const Texts = {
     "stream-settings": "Stream settings",
     "stream-stats": "Stream stats",
     "stretch": "Stretch",
-    "stretch-note": "Don't use with native touch games",
     "support-better-xcloud": "Support Better xCloud",
     "swap-buttons": "Swap buttons",
     "take-screenshot": "Take screenshot",
@@ -259,12 +277,16 @@ const Texts = {
     "unknown": "Unknown",
     "unlimited": "Unlimited",
     "unmuted": "Unmuted",
+    "unsharp-masking": "Unsharp masking",
     "use-mouse-absolute-position": "Use mouse's absolute position",
+    "use-this-at-your-own-risk": "Use this at your own risk",
     "user-agent-profile": "User-Agent profile",
+    "vertical-scroll-sensitivity": "Vertical scroll sensitivity",
     "vertical-sensitivity": "Vertical sensitivity",
     "vibration-intensity": "Vibration intensity",
     "vibration-status": "Vibration",
     "video": "Video",
+    "virtual-controller": "Virtual controller",
     "visual-quality": "Visual quality",
     "visual-quality-high": "High",
     "visual-quality-low": "Low",
@@ -272,6 +294,7 @@ const Texts = {
     "volume": "Volume",
     "wait-time-countdown": "Countdown",
     "wait-time-estimated": "Estimated finish time",
+    "webgl2": "WebGL2",
 };
 
 export class Translations {
@@ -363,8 +386,12 @@ export class Translations {
             const resp = await NATIVE_FETCH(`https://raw.githubusercontent.com/redphx/better-xcloud/gh-pages/translations/${locale}.json`);
             const translations = await resp.json();
 
-            window.localStorage.setItem(Translations.#KEY_TRANSLATIONS, JSON.stringify(translations));
+            // Prevent saving incorrect translations
-            Translations.#foreignTranslations = translations;
+            let currentLocale = localStorage.getItem(Translations.#KEY_LOCALE);
+            if (currentLocale === locale) {
+                window.localStorage.setItem(Translations.#KEY_TRANSLATIONS, JSON.stringify(translations));
+                Translations.#foreignTranslations = translations;
+            }
             return true;
         } catch (e) {
             debugger;
@@ -384,5 +411,9 @@ export class Translations {
 }
 
 export const t = Translations.get;
+export const ut = (text: string): string => {
+    BxLogger.warning('Untranslated text', text);
+    return text;
+}
 
 Translations.init();

src/utils/user-agent.ts

@@ -1,18 +1,13 @@
+import { UserAgentProfile } from "@enums/user-agent";
+import { deepClone } from "./global";
+import { BX_FLAGS } from "./bx-flags";
+
 type UserAgentConfig = {
     profile: UserAgentProfile,
     custom?: string,
 };
 
-export enum UserAgentProfile {
+const SMART_TV_UNIQUE_ID = 'FC4A1DA2-711C-4E9C-BC7F-047AF8A672EA';
-    WINDOWS_EDGE = 'windows-edge',
-    MACOS_SAFARI = 'macos-safari',
-    SMARTTV_GENERIC = 'smarttv-generic',
-    SMARTTV_TIZEN = 'smarttv-tizen',
-    VR_OCULUS = 'vr-oculus',
-    ANDROID_KIWI_V123 = 'android-kiwi-v123',
-    DEFAULT = 'default',
-    CUSTOM = 'custom',
-}
 
 let CHROMIUM_VERSION = '123.0.0.0';
 if (!!(window as any).chrome || window.navigator.userAgent.includes('Chrome')) {
@@ -27,13 +22,16 @@ export class UserAgent {
     static readonly STORAGE_KEY = 'better_xcloud_user_agent';
     static #config: UserAgentConfig;
 
+    static #isMobile: boolean | null = null;
+    static #isSafari: boolean | null = null;
+    static #isSafariMobile: boolean | null = null;
+
     static #USER_AGENTS: PartialRecord<UserAgentProfile, string> = {
         [UserAgentProfile.WINDOWS_EDGE]: `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${CHROMIUM_VERSION} Safari/537.36 Edg/${CHROMIUM_VERSION}`,
         [UserAgentProfile.MACOS_SAFARI]: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.5.2 Safari/605.1.1',
-        [UserAgentProfile.SMARTTV_GENERIC]: window.navigator.userAgent + ' SmartTV',
+        [UserAgentProfile.SMART_TV_GENERIC]: `${window.navigator.userAgent} SmartTV`,
-        [UserAgentProfile.SMARTTV_TIZEN]: `Mozilla/5.0 (SMART-TV; LINUX; Tizen 7.0) AppleWebKit/537.36 (KHTML, like Gecko) ${CHROMIUM_VERSION}/7.0 TV Safari/537.36`,
+        [UserAgentProfile.SMART_TV_TIZEN]: `Mozilla/5.0 (SMART-TV; LINUX; Tizen 7.0) AppleWebKit/537.36 (KHTML, like Gecko) ${CHROMIUM_VERSION}/7.0 TV Safari/537.36 ${SMART_TV_UNIQUE_ID}`,
         [UserAgentProfile.VR_OCULUS]: window.navigator.userAgent + ' OculusBrowser VR',
-        [UserAgentProfile.ANDROID_KIWI_V123]: 'Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.6312.118 Mobile Safari/537.36',
     }
 
     static init() {
@@ -50,7 +48,7 @@ export class UserAgent {
     }
 
     static updateStorage(profile: UserAgentProfile, custom?: string) {
-        const clonedConfig = structuredClone(UserAgent.#config);
+        const clonedConfig = deepClone(UserAgent.#config);
         clonedConfig.profile = profile;
 
         if (typeof custom !== 'undefined') {
@@ -79,20 +77,40 @@ export class UserAgent {
         }
     }
 
-    static isSafari(mobile=false): boolean {
+    static isSafari(): boolean {
+        if (this.#isSafari !== null) {
+            return this.#isSafari;
+        }
+
         const userAgent = UserAgent.getDefault().toLowerCase();
         let result = userAgent.includes('safari') && !userAgent.includes('chrom');
 
-        if (result && mobile) {
+        this.#isSafari = result;
-            result = userAgent.includes('mobile');
+        return result;
+    }
+
+    static isSafariMobile(): boolean {
+        if (this.#isSafariMobile !== null) {
+            return this.#isSafariMobile;
         }
 
+        const userAgent = UserAgent.getDefault().toLowerCase();
+        const result = this.isSafari() && userAgent.includes('mobile');
+
+        this.#isSafariMobile = result;
         return result;
     }
 
     static isMobile(): boolean {
+        if (this.#isMobile !== null) {
+            return this.#isMobile;
+        }
+
         const userAgent = UserAgent.getDefault().toLowerCase();
-        return /iphone|ipad|android/.test(userAgent);
+        const result = /iphone|ipad|android/.test(userAgent);
+
+        this.#isMobile = result;
+        return result;
     }
 
     static spoof() {
@@ -101,7 +119,12 @@ export class UserAgent {
             return;
         }
 
-        const newUserAgent = UserAgent.get(profile);
+        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;

src/utils/utils.ts

@@ -7,6 +7,11 @@ import { Translations } from "./translation";
  * Check for update
  */
 export function checkForUpdate() {
+    // Don't check update for beta version
+    if (SCRIPT_VERSION.includes('beta')) {
+        return;
+    }
+
     const CHECK_INTERVAL_SECONDS = 2 * 3600; // check every 2 hours
 
     const currentVersion = getPref(PrefKey.CURRENT_VERSION);
@@ -42,7 +47,7 @@ export function disablePwa() {
     }
 
     // Check if it's Safari on mobile
-    if (!!AppInterface || UserAgent.isSafari(true)) {
+    if (!!AppInterface || UserAgent.isSafariMobile()) {
         // Disable the PWA prompt
         Object.defineProperty(window.navigator, 'standalone', {
             value: true,

src/utils/xcloud-api.ts

@@ -0,0 +1,79 @@
+import { NATIVE_FETCH } from "./bx-flags";
+import { STATES } from "./global";
+
+export class XcloudApi {
+    private static instance: XcloudApi;
+
+    public static getInstance(): XcloudApi {
+        if (!XcloudApi.instance) {
+            XcloudApi.instance = new XcloudApi();
+        }
+
+        return XcloudApi.instance;
+    }
+
+    #CACHE_TITLES: {[key: string]: XcloudTitleInfo} = {};
+    #CACHE_WAIT_TIME: {[key: string]: XcloudWaitTimeInfo} = {};
+
+    async getTitleInfo(id: string): Promise<XcloudTitleInfo | null> {
+        if (id in this.#CACHE_TITLES) {
+            return this.#CACHE_TITLES[id];
+        }
+
+        const baseUri = STATES.selectedRegion.baseUri;
+        if (!baseUri || !STATES.gsToken) {
+            return null;
+        }
+
+        let json;
+        try {
+            const response = await NATIVE_FETCH(`${baseUri}/v2/titles`, {
+                method: 'POST',
+                headers: {
+                    'Authorization': `Bearer ${STATES.gsToken}`,
+                    'Content-Type': 'application/json',
+                },
+
+                // format the data
+                body: JSON.stringify({
+                    alternateIds: [id],
+                    alternateIdType: 'productId',
+                }),
+            });
+
+            json = (await response.json()).results[0];
+        } catch (e) {
+            json = {}
+        }
+        this.#CACHE_TITLES[id] = json;
+        return json;
+    }
+
+    async getWaitTime(id: string): Promise<XcloudWaitTimeInfo | null> {
+        if (id in this.#CACHE_WAIT_TIME) {
+            return this.#CACHE_WAIT_TIME[id];
+        }
+
+        const baseUri = STATES.selectedRegion.baseUri;
+        if (!baseUri || !STATES.gsToken) {
+            return null;
+        }
+
+        let json;
+        try {
+            const response = await NATIVE_FETCH(`${baseUri}/v1/waittime/${id}`, {
+                method: 'GET',
+                headers: {
+                    'Authorization': `Bearer ${STATES.gsToken}`,
+                },
+            });
+
+            json = await response.json();
+        } catch (e) {
+            json = {};
+        }
+
+        this.#CACHE_WAIT_TIME[id] = json;
+        return json;
+    }
+}

src/utils/xcloud-interceptor.ts

@@ -0,0 +1,223 @@
+import { LoadingScreen } from "@modules/loading-screen";
+import { RemotePlay } from "@modules/remote-play";
+import { StreamBadges } from "@modules/stream/stream-badges";
+import { TouchController } from "@modules/touch-controller";
+import { BxEvent } from "./bx-event";
+import { NATIVE_FETCH, BX_FLAGS } from "./bx-flags";
+import { STATES } from "./global";
+import { patchIceCandidates } from "./network";
+import { getPref, PrefKey } from "./preferences";
+import { getPreferredServerRegion } from "./region";
+
+export
+class XcloudInterceptor {
+    static async #handleLogin(request: RequestInfo | URL, init?: RequestInit) {
+        if (getPref(PrefKey.SERVER_BYPASS_RESTRICTION)) {
+            (request as Request).headers.set('X-Forwarded-For', '9.9.9.9');
+        }
+
+        const response = await NATIVE_FETCH(request, init);
+        if (response.status !== 200) {
+            // Unsupported region
+            BxEvent.dispatch(window, BxEvent.XCLOUD_SERVERS_UNAVAILABLE);
+            return response;
+        }
+
+        const obj = await response.clone().json();
+
+        // Store xCloud token
+        RemotePlay.XCLOUD_TOKEN = obj.gsToken;
+
+        // Get server list
+        const serverEmojis = {
+            AustraliaEast: '🇦🇺',
+            AustraliaSouthEast: '🇦🇺',
+            BrazilSouth: '🇧🇷',
+            EastUS: '🇺🇸',
+            EastUS2: '🇺🇸',
+            JapanEast: '🇯🇵',
+            KoreaCentral: '🇰🇷',
+            MexicoCentral: '🇲🇽',
+            NorthCentralUs: '🇺🇸',
+            SouthCentralUS: '🇺🇸',
+            UKSouth: '🇬🇧',
+            WestEurope: '🇪🇺',
+            WestUS: '🇺🇸',
+            WestUS2: '🇺🇸',
+        };
+
+        const serverRegex = /\/\/(\w+)\./;
+
+        for (let region of obj.offeringSettings.regions) {
+            const regionName = region.name as keyof typeof serverEmojis;
+            let shortName = region.name;
+
+            if (region.isDefault) {
+                STATES.selectedRegion = Object.assign({}, region);
+            }
+
+            let match = serverRegex.exec(region.baseUri);
+            if (match) {
+                shortName = match[1];
+                if (serverEmojis[regionName]) {
+                    shortName = serverEmojis[regionName] + ' ' + shortName;
+                }
+            }
+
+            region.shortName = shortName.toUpperCase();
+            STATES.serverRegions[region.name] = Object.assign({}, region);
+        }
+
+        BxEvent.dispatch(window, BxEvent.XCLOUD_SERVERS_READY);
+
+        const preferredRegion = getPreferredServerRegion();
+        if (preferredRegion in STATES.serverRegions) {
+            const tmp = Object.assign({}, STATES.serverRegions[preferredRegion]);
+            tmp.isDefault = true;
+
+            obj.offeringSettings.regions = [tmp];
+            STATES.selectedRegion = tmp;
+        }
+
+        STATES.gsToken = obj.gsToken;
+
+        response.json = () => Promise.resolve(obj);
+        return response;
+    }
+
+    static async #handlePlay(request: RequestInfo | URL, init?: RequestInit) {
+        const PREF_STREAM_TARGET_RESOLUTION = getPref(PrefKey.STREAM_TARGET_RESOLUTION);
+        const PREF_STREAM_PREFERRED_LOCALE = getPref(PrefKey.STREAM_PREFERRED_LOCALE);
+
+        const url = (typeof request === 'string') ? request : (request as Request).url;
+        const parsedUrl = new URL(url);
+
+        let badgeRegion: string = parsedUrl.host.split('.', 1)[0];
+        for (let regionName in STATES.serverRegions) {
+            const region = STATES.serverRegions[regionName];
+            if (parsedUrl.origin == region.baseUri) {
+                badgeRegion = regionName;
+                break;
+            }
+        }
+        StreamBadges.getInstance().setRegion(badgeRegion);
+
+        const clone = (request as Request).clone();
+        const body = await clone.json();
+
+        // Force stream's resolution
+        if (PREF_STREAM_TARGET_RESOLUTION !== 'auto') {
+            const osName = (PREF_STREAM_TARGET_RESOLUTION === '720p') ? 'android' : 'windows';
+            body.settings.osName = osName;
+        }
+
+        // Override "locale" value
+        if (PREF_STREAM_PREFERRED_LOCALE !== 'default') {
+            body.settings.locale = PREF_STREAM_PREFERRED_LOCALE;
+        }
+
+        const newRequest = new Request(request, {
+            body: JSON.stringify(body),
+        });
+
+        return NATIVE_FETCH(newRequest);
+    }
+
+    static async #handleWaitTime(request: RequestInfo | URL, init?: RequestInit) {
+        const response = await NATIVE_FETCH(request, init);
+
+        if (getPref(PrefKey.UI_LOADING_SCREEN_WAIT_TIME)) {
+            const json = await response.clone().json();
+            if (json.estimatedAllocationTimeInSeconds > 0) {
+                // Setup wait time overlay
+                LoadingScreen.setupWaitTime(json.estimatedTotalWaitTimeInSeconds);
+            }
+        }
+
+        return response;
+    }
+
+    static async #handleConfiguration(request: RequestInfo | URL, init?: RequestInit) {
+        if ((request as Request).method !== 'GET') {
+            return NATIVE_FETCH(request, init);
+        }
+
+        // Touch controller for all games
+        if (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all') {
+            const titleInfo = STATES.currentStream.titleInfo;
+            if (titleInfo?.details.hasTouchSupport) {
+                TouchController.disable();
+            } else {
+                TouchController.enable();
+            }
+        }
+
+        // Intercept configurations
+        const response = await NATIVE_FETCH(request, init);
+        const text = await response.clone().text();
+        if (!text.length) {
+            return response;
+        }
+
+        const obj = JSON.parse(text);
+        let overrides = JSON.parse(obj.clientStreamingConfigOverrides || '{}') || {};
+
+        overrides.inputConfiguration = overrides.inputConfiguration || {};
+        overrides.inputConfiguration.enableVibration = true;
+
+        let overrideMkb: boolean | null = null;
+
+        if (getPref(PrefKey.NATIVE_MKB_ENABLED) === 'on' || (STATES.currentStream.titleInfo && BX_FLAGS.ForceNativeMkbTitles?.includes(STATES.currentStream.titleInfo.details.productId))) {
+            overrideMkb = true;
+        }
+
+        if (getPref(PrefKey.NATIVE_MKB_ENABLED) === 'off') {
+            overrideMkb = false;
+        }
+
+        if (overrideMkb !== null) {
+            overrides.inputConfiguration = Object.assign(overrides.inputConfiguration, {
+                enableMouseInput: overrideMkb,
+                enableKeyboardInput: overrideMkb,
+            });
+        }
+
+        // Enable touch controller
+        if (TouchController.isEnabled()) {
+            overrides.inputConfiguration.enableTouchInput = true;
+            overrides.inputConfiguration.maxTouchPoints = 10;
+        }
+
+        // Enable mic
+        if (getPref(PrefKey.AUDIO_MIC_ON_PLAYING)) {
+            overrides.audioConfiguration = overrides.audioConfiguration || {};
+            overrides.audioConfiguration.enableMicrophone = true;
+        }
+
+        obj.clientStreamingConfigOverrides = JSON.stringify(overrides);
+
+        response.json = () => Promise.resolve(obj);
+        response.text = () => Promise.resolve(JSON.stringify(obj));
+
+        return response;
+    }
+
+    static async handle(request: RequestInfo | URL, init?: RequestInit) {
+        let url = (typeof request === 'string') ? request : (request as Request).url;
+
+        // Server list
+        if (url.endsWith('/v2/login/user')) {
+            return XcloudInterceptor.#handleLogin(request, init);
+        } else if (url.endsWith('/sessions/cloud/play')) {  // Get session
+            return XcloudInterceptor.#handlePlay(request, init);
+        } else if (url.includes('xboxlive.com') && url.includes('/waittime/')) {
+            return XcloudInterceptor.#handleWaitTime(request, init);
+        } else if (url.endsWith('/configuration')) {
+            return XcloudInterceptor.#handleConfiguration(request, init);
+        } else if (url && url.endsWith('/ice') && url.includes('/sessions/') && (request as Request).method === 'GET') {
+            return patchIceCandidates(request as Request);
+        }
+
+        return NATIVE_FETCH(request, init);
+    }
+}

src/utils/xhome-interceptor.ts

@@ -0,0 +1,184 @@
+import { RemotePlay } from "@/modules/remote-play";
+import { TouchController } from "@/modules/touch-controller";
+import { BxEvent } from "./bx-event";
+import { InputType } from "./bx-exposed";
+import { NATIVE_FETCH } from "./bx-flags";
+import { STATES } from "./global";
+import { getPref, PrefKey } from "./preferences";
+import { patchIceCandidates } from "./network";
+
+export class XhomeInterceptor {
+    static #consoleAddrs: {[index: string]: number} = {};
+
+    static async #handleLogin(request: Request) {
+        try {
+            const clone = (request as Request).clone();
+
+            const obj = await clone.json();
+            obj.offeringId = 'xhome';
+
+            request = new Request('https://xhome.gssv-play-prod.xboxlive.com/v2/login/user', {
+                method: 'POST',
+                body: JSON.stringify(obj),
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+        } catch (e) {
+            alert(e);
+            console.log(e);
+        }
+
+        return NATIVE_FETCH(request);
+    }
+
+    static async #handleConfiguration(request: Request | URL) {
+        const response = await NATIVE_FETCH(request);
+
+        const obj = await response.clone().json()
+        console.log(obj);
+
+        const serverDetails = obj.serverDetails;
+        if (serverDetails.ipAddress) {
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = serverDetails.port;
+        }
+
+        if (serverDetails.ipV4Address) {
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = serverDetails.ipV4Port;
+        }
+
+        if (serverDetails.ipV6Address) {
+            XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = serverDetails.ipV6Port;
+        }
+
+        response.json = () => Promise.resolve(obj);
+        response.text = () => Promise.resolve(JSON.stringify(obj));
+
+        return response;
+    }
+
+    static async #handleInputConfigs(request: Request | URL, opts: {[index: string]: any}) {
+        const response = await NATIVE_FETCH(request);
+
+        if (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'all') {
+            return response;
+        }
+
+        const obj = await response.clone().json() as any;
+
+        const xboxTitleId = JSON.parse(opts.body).titleIds[0];
+        STATES.currentStream.xboxTitleId = xboxTitleId;
+
+        const inputConfigs = obj[0];
+
+        let hasTouchSupport = inputConfigs.supportedTabs.length > 0;
+        if (!hasTouchSupport) {
+            const supportedInputTypes = inputConfigs.supportedInputTypes;
+            hasTouchSupport = supportedInputTypes.includes(InputType.NATIVE_TOUCH) || supportedInputTypes.includes(InputType.CUSTOM_TOUCH_OVERLAY);
+        }
+
+        if (hasTouchSupport) {
+            TouchController.disable();
+
+            BxEvent.dispatch(window, BxEvent.CUSTOM_TOUCH_LAYOUTS_LOADED, {
+                data: null,
+            });
+        } else {
+            TouchController.enable();
+            TouchController.getCustomLayouts(xboxTitleId);
+        }
+
+        response.json = () => Promise.resolve(obj);
+        response.text = () => Promise.resolve(JSON.stringify(obj));
+
+        return response;
+    }
+
+    static async #handleTitles(request: Request) {
+        const clone = request.clone();
+
+        const headers: {[index: string]: any} = {};
+        for (const pair of (clone.headers as any).entries()) {
+            headers[pair[0]] = pair[1];
+        }
+        headers.authorization = `Bearer ${RemotePlay.XCLOUD_TOKEN}`;
+
+        const index = request.url.indexOf('.xboxlive.com');
+        request = new Request('https://wus.core.gssv-play-prod' + request.url.substring(index), {
+            method: clone.method,
+            body: await clone.text(),
+            headers: headers,
+        });
+
+        return NATIVE_FETCH(request);
+    }
+
+    static async #handlePlay(request: RequestInfo | URL) {
+        const clone = (request as Request).clone();
+        const body = await clone.json();
+
+        // body.settings.useIceConnection = true;
+
+        const newRequest = new Request(request, {
+            body: JSON.stringify(body),
+        });
+
+        return NATIVE_FETCH(newRequest);
+    }
+
+    static async handle(request: Request) {
+        TouchController.disable();
+
+        const clone = request.clone();
+
+        const headers: {[index: string]: string} = {};
+        for (const pair of (clone.headers as any).entries()) {
+            headers[pair[0]] = pair[1];
+        }
+        // Add xHome token to headers
+        headers.authorization = `Bearer ${RemotePlay.XHOME_TOKEN}`;
+
+        // Patch resolution
+        const deviceInfo = RemotePlay.BASE_DEVICE_INFO;
+        if (getPref(PrefKey.REMOTE_PLAY_RESOLUTION) === '720p') {
+            deviceInfo.dev.os.name = 'android';
+        }
+
+        headers['x-ms-device-info'] = JSON.stringify(deviceInfo);
+
+        const opts: {[index: string]: any} = {
+            method: clone.method,
+            headers: headers,
+        };
+
+        if (clone.method === 'POST') {
+            opts.body = await clone.text();
+        }
+
+        let newUrl = request.url;
+        if (!newUrl.includes('/servers/home')) {
+            const index = request.url.indexOf('.xboxlive.com');
+            newUrl = STATES.remotePlay.server + request.url.substring(index + 13);
+        }
+
+        request = new Request(newUrl, opts);
+        let url = (typeof request === 'string') ? request : request.url;
+
+        // Get console IP
+        if (url.includes('/configuration')) {
+            return XhomeInterceptor.#handleConfiguration(request);
+        } else if (url.endsWith('/sessions/home/play')) {
+            return XhomeInterceptor.#handlePlay(request);
+        } else if (url.includes('inputconfigs')) {
+            return XhomeInterceptor.#handleInputConfigs(request, opts);
+        } else if (url.includes('/login/user')) {
+            return XhomeInterceptor.#handleLogin(request);
+        } else if (url.endsWith('/titles')) {
+            return XhomeInterceptor.#handleTitles(request);
+        } else if (url && url.endsWith('/ice') && url.includes('/sessions/') && (request as Request).method === 'GET') {
+            return patchIceCandidates(request, XhomeInterceptor.#consoleAddrs);
+        }
+
+        return await NATIVE_FETCH(request);
+    }
+}

src/web-components/bx-select.ts

@@ -0,0 +1,115 @@
+import { ButtonStyle, CE, createButton } from "@utils/html";
+
+export class BxSelectElement {
+    static wrap($select: HTMLSelectElement) {
+        const $btnPrev = createButton({
+            label: '<',
+            style: ButtonStyle.FOCUSABLE,
+            attributes: {
+                tabindex: 0,
+            },
+        });
+
+        const $btnNext = createButton({
+            label: '>',
+            style: ButtonStyle.FOCUSABLE,
+            attributes: {
+                tabindex: 0,
+            },
+        });
+
+        const isMultiple = $select.multiple;
+        let visibleIndex = $select.selectedIndex;
+        let $checkBox: HTMLInputElement;
+        let $label: HTMLElement;
+
+        const $content = CE('div', {},
+            $checkBox = CE('input', {type: 'checkbox', id: $select.id + '_checkbox'}),
+            $label = CE('label', {for: $select.id + '_checkbox'}, ''),
+        );
+
+        isMultiple && $checkBox.addEventListener('input', e => {
+            const $option = getOptionAtIndex(visibleIndex);
+            $option && ($option.selected = (e.target as HTMLInputElement).checked);
+
+            $select.dispatchEvent(new Event('input'));
+        });
+
+        // Only show checkbox in "multiple" <select>
+        $checkBox.classList.toggle('bx-gone', !isMultiple);
+
+        const getOptionAtIndex = (index: number): HTMLOptionElement | undefined => {
+            return $select.querySelector(`option:nth-of-type(${visibleIndex + 1})`) as HTMLOptionElement;
+        }
+
+        const render = () => {
+            // console.log('options', this.options, 'selectedIndices', this.selectedIndices, 'selectedOptions', this.selectedOptions);
+
+            visibleIndex = normalizeIndex(visibleIndex);
+
+            const $option = getOptionAtIndex(visibleIndex);
+            let content = '';
+            if ($option) {
+                content = $option.textContent || '';
+            }
+
+            $label.textContent = content;
+
+            // Hide checkbox when the selection is empty
+            isMultiple && ($checkBox.checked = $option?.selected || false);
+            $checkBox.classList.toggle('bx-gone', !isMultiple || !content);
+
+            const disablePrev = visibleIndex <= 0;
+            const disableNext = visibleIndex === $select.querySelectorAll('option').length - 1;
+
+            $btnPrev.classList.toggle('bx-inactive', disablePrev);
+            disablePrev && $btnNext.focus();
+
+            $btnNext.classList.toggle('bx-inactive', disableNext);
+            disableNext && $btnPrev.focus();
+        }
+
+        const normalizeIndex = (index: number): number => {
+            return Math.min(Math.max(index, 0), $select.querySelectorAll('option').length - 1);
+        }
+
+        const onPrevNext = (e: Event) => {
+            const goNext = e.target === $btnNext;
+
+            const currentIndex = visibleIndex;
+            let newIndex = goNext ? currentIndex + 1 : currentIndex - 1;
+            newIndex = normalizeIndex(newIndex);
+
+            visibleIndex = newIndex;
+            if (!isMultiple && newIndex !== currentIndex) {
+                $select.selectedIndex = newIndex;
+            }
+
+            $select.dispatchEvent(new Event('input'));
+        };
+
+        $select.addEventListener('input', e => render());
+        $btnPrev.addEventListener('click', onPrevNext);
+        $btnNext.addEventListener('click', onPrevNext);
+
+        const observer = new MutationObserver((mutationList, observer) => {
+            mutationList.forEach(mutation => {
+                mutation.type === 'childList' && render();
+            });
+        });
+
+        observer.observe($select, {
+            subtree: true,
+            childList: true,
+        });
+
+        render();
+
+        return CE('div', {class: 'bx-select'},
+            $select,
+            $btnPrev,
+            $content,
+            $btnNext,
+        );
+    }
+}

tsconfig.json

@@ -11,6 +11,7 @@
     "paths": {
       "@/*": ["./*"],
       "@assets/*": ["./assets/*"],
+      "@enums/*": ["./enums/*"],
       "@macros/*": ["./macros/*"],
       "@modules/*": ["./modules/*"],
       "@utils/*": ["./utils/*"],