Fix touch problem with Stream Menu

dist/better-xcloud.meta.js

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

dist/better-xcloud.user.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         Better xCloud
 // @namespace    https://github.com/redphx
-// @version      5.5.3-beta
+// @version      5.5.4-beta
 // @description  Improve Xbox Cloud Gaming (xCloud) experience
 // @author       redphx
 // @license      MIT
@@ -120,7 +120,7 @@ function deepClone(obj) {
     return {};
   return JSON.parse(JSON.stringify(obj));
 }
-var SCRIPT_VERSION = "5.5.3-beta", AppInterface = window.AppInterface;
+var SCRIPT_VERSION = "5.5.4-beta", AppInterface = window.AppInterface;
 UserAgent.init();
 var userAgent = window.navigator.userAgent.toLowerCase(), isTv = userAgent.includes("smart-tv") || userAgent.includes("smarttv") || /\baft.*\b/.test(userAgent), isVr = window.navigator.userAgent.includes("VR") && window.navigator.userAgent.includes("OculusBrowser"), browserHasTouchSupport = "ontouchstart" in window || navigator.maxTouchPoints > 0, userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport, STATES = {
   supportedRegion: !0,
@@ -813,6 +813,79 @@ class StreamStats {
   }
 }
 
+class BaseSettingsStore {
+  storage;
+  storageKey;
+  _settings;
+  definitions;
+  constructor(storageKey, definitions) {
+    this.storage = window.localStorage, this.storageKey = storageKey;
+    for (let settingId in definitions) {
+      const setting = definitions[settingId];
+      setting.ready && setting.ready.call(this, setting);
+    }
+    this.definitions = definitions, this._settings = null;
+  }
+  get settings() {
+    if (this._settings)
+      return this._settings;
+    const settings = JSON.parse(this.storage.getItem(this.storageKey) || "{}");
+    return this._settings = settings, settings;
+  }
+  getDefinition(key) {
+    if (!this.definitions[key]) {
+      const error = "Request invalid definition: " + key;
+      throw alert(error), Error(error);
+    }
+    return this.definitions[key];
+  }
+  getSetting(key) {
+    if (typeof key === "undefined") {
+      debugger;
+      return;
+    }
+    if (this.definitions[key].unsupported)
+      return this.definitions[key].default;
+    if (!(key in this.settings))
+      this.settings[key] = this.validateValue(key, null);
+    return this.settings[key];
+  }
+  setSetting(key, value, emitEvent = !1) {
+    return value = this.validateValue(key, value), this.settings[key] = value, this.saveSettings(), emitEvent && BxEvent.dispatch(window, BxEvent.SETTINGS_CHANGED, {
+      storageKey: this.storageKey,
+      settingKey: key,
+      settingValue: value
+    }), value;
+  }
+  saveSettings() {
+    this.storage.setItem(this.storageKey, JSON.stringify(this.settings));
+  }
+  validateValue(key, value) {
+    const def = this.definitions[key];
+    if (!def)
+      return value;
+    if (typeof value === "undefined" || value === null)
+      value = def.default;
+    if ("min" in def)
+      value = Math.max(def.min, value);
+    if ("max" in def)
+      value = Math.min(def.max, value);
+    if ("options" in def && !(value in def.options))
+      value = def.default;
+    else if ("multipleOptions" in def) {
+      if (value.length) {
+        const validOptions = Object.keys(def.multipleOptions);
+        value.forEach((item2, idx) => {
+          validOptions.indexOf(item2) === -1 && value.splice(idx, 1);
+        });
+      }
+      if (!value.length)
+        value = def.default;
+    }
+    return value;
+  }
+}
+
 class SettingElement {
   static #renderOptions(key, setting, currentValue, onChange) {
     const $control = CE("select", {
@@ -985,7 +1058,9 @@ class SettingElement {
       type = "number";
     else
       type = "checkbox";
-    const params = Object.assign(overrideParams, definition.params || {});
+    let params = {};
+    if ("params" in definition)
+      params = Object.assign(overrideParams, definition.params || {});
     if (params.disabled)
       currentValue = definition.default;
     return SettingElement.render(type, key, definition, currentValue, (e, value) => {
@@ -994,79 +1069,6 @@ class SettingElement {
   }
 }
 
-class BaseSettingsStore {
-  storage;
-  storageKey;
-  _settings;
-  definitions;
-  constructor(storageKey, definitions) {
-    this.storage = window.localStorage, this.storageKey = storageKey;
-    for (let settingId in definitions) {
-      const setting = definitions[settingId];
-      setting.ready && setting.ready.call(this, setting);
-    }
-    this.definitions = definitions, this._settings = null;
-  }
-  get settings() {
-    if (this._settings)
-      return this._settings;
-    const settings = JSON.parse(this.storage.getItem(this.storageKey) || "{}");
-    return this._settings = settings, settings;
-  }
-  getDefinition(key) {
-    if (!this.definitions[key]) {
-      const error = "Request invalid definition: " + key;
-      throw alert(error), Error(error);
-    }
-    return this.definitions[key];
-  }
-  getSetting(key) {
-    if (typeof key === "undefined") {
-      debugger;
-      return;
-    }
-    if (this.definitions[key].unsupported)
-      return this.definitions[key].default;
-    if (!(key in this.settings))
-      this.settings[key] = this.validateValue(key, null);
-    return this.settings[key];
-  }
-  setSetting(key, value, emitEvent = !1) {
-    return value = this.validateValue(key, value), this.settings[key] = value, this.saveSettings(), emitEvent && BxEvent.dispatch(window, BxEvent.SETTINGS_CHANGED, {
-      storageKey: this.storageKey,
-      settingKey: key,
-      settingValue: value
-    }), value;
-  }
-  saveSettings() {
-    this.storage.setItem(this.storageKey, JSON.stringify(this.settings));
-  }
-  validateValue(key, value) {
-    const def = this.definitions[key];
-    if (!def)
-      return value;
-    if (typeof value === "undefined" || value === null)
-      value = def.default;
-    if ("min" in def)
-      value = Math.max(def.min, value);
-    if ("max" in def)
-      value = Math.min(def.max, value);
-    if ("options" in def && !(value in def.options))
-      value = def.default;
-    else if ("multipleOptions" in def) {
-      if (value.length) {
-        const validOptions = Object.keys(def.multipleOptions);
-        value.forEach((item2, idx) => {
-          validOptions.indexOf(item2) === -1 && value.splice(idx, 1);
-        });
-      }
-      if (!value.length)
-        value = def.default;
-    }
-    return value;
-  }
-}
-
 function getSupportedCodecProfiles() {
   const options = {
     default: t("default")
@@ -4358,12 +4360,6 @@ class SettingsNavigationDialog extends NavigationDialog {
       "game_fortnite_force_console",
       "stream_combine_sources"
     ]
-  }, {
-    group: "game-bar",
-    label: t("game-bar"),
-    items: [
-      "game_bar_position"
-    ]
   }, {
     group: "co-op",
     label: t("local-co-op"),
@@ -4390,14 +4386,6 @@ class SettingsNavigationDialog extends NavigationDialog {
       "stream_touch_controller_style_standard",
       "stream_touch_controller_style_custom"
     ]
-  }, {
-    group: "loading-screen",
-    label: t("loading-screen"),
-    items: [
-      "ui_loading_screen_game_art",
-      "ui_loading_screen_wait_time",
-      "ui_loading_screen_rocket"
-    ]
   }, {
     group: "ui",
     label: t("ui"),
@@ -4414,6 +4402,20 @@ class SettingsNavigationDialog extends NavigationDialog {
       "block_social_features",
       "ui_hide_sections"
     ]
+  }, {
+    group: "game-bar",
+    label: t("game-bar"),
+    items: [
+      "game_bar_position"
+    ]
+  }, {
+    group: "loading-screen",
+    label: t("loading-screen"),
+    items: [
+      "ui_loading_screen_game_art",
+      "ui_loading_screen_wait_time",
+      "ui_loading_screen_rocket"
+    ]
   }, {
     group: "other",
     label: t("other"),
@@ -6975,7 +6977,7 @@ class WebGL2Player {
   }
   #setupShaders() {
     BxLogger.info(LOG_TAG7, "Setting up", getPref("video_power_preference"));
-    const gl = this.#$canvas.getContext("webgl2", {
+    const gl = this.#$canvas.getContext("webgl", {
       isBx: !0,
       antialias: !0,
       alpha: !1,
@@ -7326,100 +7328,6 @@ function patchPointerLockApi() {
   };
 }
 
-function cloneStreamHudButton($orgButton, label, svgIcon) {
-  const $container = $orgButton.cloneNode(!0);
-  let timeout;
-  const onTransitionStart = (e) => {
-    if (e.propertyName !== "opacity")
-      return;
-    timeout && clearTimeout(timeout), $container.style.pointerEvents = "none";
-  }, onTransitionEnd = (e) => {
-    if (e.propertyName !== "opacity")
-      return;
-    if (document.getElementById("StreamHud")?.style.left === "0px")
-      timeout && clearTimeout(timeout), timeout = window.setTimeout(() => {
-        $container.style.pointerEvents = "auto";
-      }, 100);
-  };
-  if (STATES.browser.capabilities.touch)
-    $container.addEventListener("transitionstart", onTransitionStart), $container.addEventListener("transitionend", onTransitionEnd);
-  const $button = $container.querySelector("button");
-  $button.setAttribute("title", label);
-  const $orgSvg = $button.querySelector("svg"), $svg = createSvgIcon(svgIcon);
-  return $svg.style.fill = "none", $svg.setAttribute("class", $orgSvg.getAttribute("class") || ""), $svg.ariaHidden = "true", $orgSvg.replaceWith($svg), $container;
-}
-function cloneCloseButton($$btnOrg, icon, className, onChange) {
-  const $btn = $$btnOrg.cloneNode(!0), $svg = createSvgIcon(icon);
-  return $svg.setAttribute("class", $btn.firstElementChild.getAttribute("class") || ""), $svg.style.fill = "none", $btn.classList.add(className), $btn.removeChild($btn.firstElementChild), $btn.appendChild($svg), $btn.addEventListener("click", onChange), $btn;
-}
-function injectStreamMenuButtons() {
-  const $screen = document.querySelector("#PageContent section[class*=PureScreens]");
-  if (!$screen)
-    return;
-  if ($screen.xObserving)
-    return;
-  $screen.xObserving = !0;
-  let $btnStreamSettings, $btnStreamStats;
-  const streamStats = StreamStats.getInstance();
-  new MutationObserver((mutationList) => {
-    mutationList.forEach((item2) => {
-      if (item2.type !== "childList")
-        return;
-      item2.addedNodes.forEach(async ($node) => {
-        if (!$node || $node.nodeType !== Node.ELEMENT_NODE)
-          return;
-        let $elm = $node;
-        if ($elm instanceof SVGSVGElement)
-          return;
-        if ($elm.className?.includes("PureErrorPage")) {
-          BxEvent.dispatch(window, BxEvent.STREAM_ERROR_PAGE);
-          return;
-        }
-        if ($elm.className?.startsWith("StreamMenu-module__container")) {
-          const $btnCloseHud = document.querySelector("button[class*=StreamMenu-module__backButton]");
-          if (!$btnCloseHud)
-            return;
-          const $btnRefresh = cloneCloseButton($btnCloseHud, BxIcon.REFRESH, "bx-stream-refresh-button", () => {
-            confirm(t("confirm-reload-stream")) && window.location.reload();
-          }), $btnHome = cloneCloseButton($btnCloseHud, BxIcon.HOME, "bx-stream-home-button", () => {
-            confirm(t("back-to-home-confirm")) && (window.location.href = window.location.href.substring(0, 31));
-          });
-          $btnCloseHud.insertAdjacentElement("afterend", $btnRefresh), $btnRefresh.insertAdjacentElement("afterend", $btnHome), document.querySelector("div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module]")?.appendChild(await StreamBadges.getInstance().render());
-          return;
-        }
-        if ($elm.className?.startsWith("Overlay-module_") || $elm.className?.startsWith("InProgressScreen"))
-          $elm = $elm.querySelector("#StreamHud");
-        if (!$elm || ($elm.id || "") !== "StreamHud")
-          return;
-        const $gripHandle = $elm.querySelector("button[class^=GripHandle]"), hideGripHandle = () => {
-          if (!$gripHandle)
-            return;
-          $gripHandle.dispatchEvent(new PointerEvent("pointerdown")), $gripHandle.click(), $gripHandle.dispatchEvent(new PointerEvent("pointerdown")), $gripHandle.click();
-        }, $orgButton = $elm.querySelector("div[class^=HUDButton]");
-        if (!$orgButton)
-          return;
-        if (!$btnStreamSettings)
-          $btnStreamSettings = cloneStreamHudButton($orgButton, t("better-xcloud"), BxIcon.BETTER_XCLOUD), $btnStreamSettings.addEventListener("click", (e) => {
-            hideGripHandle(), e.preventDefault(), SettingsNavigationDialog.getInstance().show();
-          });
-        if (!$btnStreamStats)
-          $btnStreamStats = cloneStreamHudButton($orgButton, t("stream-stats"), BxIcon.STREAM_STATS), $btnStreamStats.addEventListener("click", (e) => {
-            hideGripHandle(), e.preventDefault(), streamStats.toggle();
-            const btnStreamStatsOn2 = !streamStats.isHidden() && !streamStats.isGlancing();
-            $btnStreamStats.classList.toggle("bx-stream-menu-button-on", btnStreamStatsOn2);
-          });
-        const btnStreamStatsOn = !streamStats.isHidden() && !streamStats.isGlancing();
-        if ($btnStreamStats.classList.toggle("bx-stream-menu-button-on", btnStreamStatsOn), $orgButton) {
-          const $btnParent = $orgButton.parentElement;
-          $btnParent.insertBefore($btnStreamStats, $btnParent.lastElementChild), $btnParent.insertBefore($btnStreamSettings, $btnStreamStats);
-          const $dotsButton = $btnParent.lastElementChild;
-          $dotsButton.parentElement.insertBefore($dotsButton, $dotsButton.parentElement.firstElementChild);
-        }
-      });
-    });
-  }).observe($screen, { subtree: !0, childList: !0 });
-}
-
 class BaseGameBarAction {
   constructor() {
   }
@@ -7798,6 +7706,141 @@ class ProductDetailsPage {
   }
 }
 
+class StreamUiHandler {
+  static $btnStreamSettings;
+  static $btnStreamStats;
+  static $btnRefresh;
+  static $btnHome;
+  static observer;
+  static cloneStreamHudButton($btnOrg, label, svgIcon) {
+    if (!$btnOrg)
+      return null;
+    const $container = $btnOrg.cloneNode(!0);
+    let timeout;
+    if (STATES.browser.capabilities.touch) {
+      const onTransitionStart = (e) => {
+        if (e.propertyName !== "opacity")
+          return;
+        timeout && clearTimeout(timeout), e.target.style.pointerEvents = "none";
+      }, onTransitionEnd = (e) => {
+        if (e.propertyName !== "opacity")
+          return;
+        const $streamHud = e.target.closest("#StreamHud");
+        if (!$streamHud)
+          return;
+        if ($streamHud.style.left === "0px") {
+          const $target = e.target;
+          timeout && clearTimeout(timeout), timeout = window.setTimeout(() => {
+            $target.style.pointerEvents = "auto";
+          }, 100);
+        }
+      };
+      $container.addEventListener("transitionstart", onTransitionStart), $container.addEventListener("transitionend", onTransitionEnd);
+    }
+    const $button = $container.querySelector("button");
+    if (!$button)
+      return null;
+    $button.setAttribute("title", label);
+    const $orgSvg = $button.querySelector("svg");
+    if (!$orgSvg)
+      return null;
+    const $svg = createSvgIcon(svgIcon);
+    return $svg.style.fill = "none", $svg.setAttribute("class", $orgSvg.getAttribute("class") || ""), $svg.ariaHidden = "true", $orgSvg.replaceWith($svg), $container;
+  }
+  static cloneCloseButton($btnOrg, icon, className, onChange) {
+    if (!$btnOrg)
+      return null;
+    const $btn = $btnOrg.cloneNode(!0), $svg = createSvgIcon(icon);
+    return $svg.setAttribute("class", $btn.firstElementChild.getAttribute("class") || ""), $svg.style.fill = "none", $btn.classList.add(className), $btn.removeChild($btn.firstElementChild), $btn.appendChild($svg), $btn.addEventListener("click", onChange), $btn;
+  }
+  static async handleStreamMenu() {
+    const $btnCloseHud = document.querySelector("button[class*=StreamMenu-module__backButton]");
+    if (!$btnCloseHud)
+      return;
+    let { $btnRefresh, $btnHome } = StreamUiHandler;
+    if (typeof $btnRefresh === "undefined")
+      $btnRefresh = StreamUiHandler.cloneCloseButton($btnCloseHud, BxIcon.REFRESH, "bx-stream-refresh-button", () => {
+        confirm(t("confirm-reload-stream")) && window.location.reload();
+      });
+    if (typeof $btnHome === "undefined")
+      $btnHome = StreamUiHandler.cloneCloseButton($btnCloseHud, BxIcon.HOME, "bx-stream-home-button", () => {
+        confirm(t("back-to-home-confirm")) && (window.location.href = window.location.href.substring(0, 31));
+      });
+    if ($btnRefresh && $btnHome)
+      $btnCloseHud.insertAdjacentElement("afterend", $btnRefresh), $btnRefresh.insertAdjacentElement("afterend", $btnHome);
+    document.querySelector("div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module]")?.appendChild(await StreamBadges.getInstance().render());
+  }
+  static handleSystemMenu($streamHud) {
+    const $gripHandle = $streamHud.querySelector("button[class^=GripHandle]");
+    if (!$gripHandle)
+      return;
+    const $orgButton = $streamHud.querySelector("div[class^=HUDButton]");
+    if (!$orgButton)
+      return;
+    const hideGripHandle = () => {
+      if (!$gripHandle)
+        return;
+      $gripHandle.dispatchEvent(new PointerEvent("pointerdown")), $gripHandle.click(), $gripHandle.dispatchEvent(new PointerEvent("pointerdown")), $gripHandle.click();
+    };
+    let $btnStreamSettings = StreamUiHandler.$btnStreamSettings;
+    if (typeof $btnStreamSettings === "undefined")
+      $btnStreamSettings = StreamUiHandler.cloneStreamHudButton($orgButton, t("better-xcloud"), BxIcon.BETTER_XCLOUD), $btnStreamSettings?.addEventListener("click", (e) => {
+        hideGripHandle(), e.preventDefault(), SettingsNavigationDialog.getInstance().show();
+      }), StreamUiHandler.$btnStreamSettings = $btnStreamSettings;
+    const streamStats = StreamStats.getInstance();
+    let $btnStreamStats = StreamUiHandler.$btnStreamStats;
+    if (typeof $btnStreamStats === "undefined")
+      $btnStreamStats = StreamUiHandler.cloneStreamHudButton($orgButton, t("stream-stats"), BxIcon.STREAM_STATS), $btnStreamStats?.addEventListener("click", (e) => {
+        hideGripHandle(), e.preventDefault(), streamStats.toggle();
+        const btnStreamStatsOn = !streamStats.isHidden() && !streamStats.isGlancing();
+        $btnStreamStats.classList.toggle("bx-stream-menu-button-on", btnStreamStatsOn);
+      }), StreamUiHandler.$btnStreamStats = $btnStreamStats;
+    const $btnParent = $orgButton.parentElement;
+    if ($btnStreamSettings && $btnStreamStats) {
+      const btnStreamStatsOn = !streamStats.isHidden() && !streamStats.isGlancing();
+      $btnStreamStats.classList.toggle("bx-stream-menu-button-on", btnStreamStatsOn), $btnParent.insertBefore($btnStreamStats, $btnParent.lastElementChild), $btnParent.insertBefore($btnStreamSettings, $btnStreamStats);
+    }
+    const $dotsButton = $btnParent.lastElementChild;
+    $dotsButton.parentElement.insertBefore($dotsButton, $dotsButton.parentElement.firstElementChild);
+  }
+  static reset() {
+    StreamUiHandler.$btnStreamSettings = void 0, StreamUiHandler.$btnStreamStats = void 0, StreamUiHandler.$btnRefresh = void 0, StreamUiHandler.$btnHome = void 0, StreamUiHandler.observer && StreamUiHandler.observer.disconnect(), StreamUiHandler.observer = void 0;
+  }
+  static observe() {
+    StreamUiHandler.reset();
+    const $screen = document.querySelector("#PageContent section[class*=PureScreens]");
+    if (!$screen)
+      return;
+    new MutationObserver((mutationList) => {
+      mutationList.forEach((item2) => {
+        if (item2.type !== "childList")
+          return;
+        item2.addedNodes.forEach(async ($node) => {
+          if (!$node || $node.nodeType !== Node.ELEMENT_NODE)
+            return;
+          let $elm = $node;
+          if (!($elm instanceof HTMLElement))
+            return;
+          const className = $elm.className || "";
+          if (className.includes("PureErrorPage")) {
+            BxEvent.dispatch(window, BxEvent.STREAM_ERROR_PAGE);
+            return;
+          }
+          if (className.startsWith("StreamMenu-module__container")) {
+            StreamUiHandler.handleStreamMenu();
+            return;
+          }
+          if (className.startsWith("Overlay-module_") || className.startsWith("InProgressScreen"))
+            $elm = $elm.querySelector("#StreamHud");
+          if (!$elm || ($elm.id || "") !== "StreamHud")
+            return;
+          StreamUiHandler.handleSystemMenu($elm);
+        });
+      });
+    }).observe($screen, { subtree: !0, childList: !0 });
+  }
+}
+
 function unload() {
   if (!STATES.isPlaying)
     return;
@@ -7920,7 +7963,7 @@ window.addEventListener(BxEvent.STREAM_STARTING, (e) => {
     MouseCursorHider.start(), MouseCursorHider.hide();
 });
 window.addEventListener(BxEvent.STREAM_PLAYING, (e) => {
-  if (STATES.isPlaying = !0, injectStreamMenuButtons(), getPref("game_bar_position") !== "off") {
+  if (STATES.isPlaying = !0, StreamUiHandler.observe(), getPref("game_bar_position") !== "off") {
     const gameBar = GameBar.getInstance();
     gameBar.reset(), gameBar.enable(), gameBar.showBar();
   }

src/index.ts

@@ -22,7 +22,6 @@ import { VibrationManager } from "@modules/vibration-manager";
 import { overridePreloadState } from "@utils/preload-state";
 import { disableAdobeAudienceManager, patchAudioContext, patchCanvasContext, patchMeControl, patchPointerLockApi, patchRtcCodecs, patchRtcPeerConnection, patchVideoApi } from "@utils/monkey-patches";
 import { AppInterface, STATES } from "@utils/global";
-import { injectStreamMenuButtons } from "@modules/stream/stream-ui";
 import { BxLogger } from "@utils/bx-logger";
 import { GameBar } from "./modules/game-bar/game-bar";
 import { Screenshot } from "./utils/screenshot";
@@ -38,6 +37,7 @@ import { PrefKey } from "./enums/pref-keys";
 import { getPref } from "./utils/settings-storages/global-settings-storage";
 import { compressCss } from "@macros/build" with {type: "macro"};
 import { SettingsNavigationDialog } from "./modules/ui/dialog/settings-dialog";
+import { StreamUiHandler } from "./modules/stream/stream-ui";
 
 
 // Handle login page
@@ -186,7 +186,7 @@ window.addEventListener(BxEvent.STREAM_STARTING, e => {
 
 window.addEventListener(BxEvent.STREAM_PLAYING, e => {
     STATES.isPlaying = true;
-    injectStreamMenuButtons();
+    StreamUiHandler.observe();
 
     if (getPref(PrefKey.GAME_BAR_POSITION) !== 'off') {
         const gameBar = GameBar.getInstance();

src/modules/player/webgl2-player.ts

@@ -124,7 +124,7 @@ export class WebGL2Player {
     #setupShaders() {
         BxLogger.info(LOG_TAG, 'Setting up', getPref(PrefKey.VIDEO_POWER_PREFERENCE));
 
-        const gl = this.#$canvas.getContext('webgl2', {
+        const gl = this.#$canvas.getContext('webgl', {
             isBx: true,
             antialias: true,
             alpha: false,

src/modules/stream/stream-ui.ts

@@ -8,17 +8,30 @@ import { StreamStats } from "./stream-stats.ts";
 import { SettingsNavigationDialog } from "../ui/dialog/settings-dialog.ts";
 
 
-function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: typeof BxIcon) {
-    const $container = $orgButton.cloneNode(true) as HTMLElement;
+export class StreamUiHandler {
+    private static $btnStreamSettings: HTMLElement | null | undefined;
+    private static $btnStreamStats: HTMLElement | null | undefined;
+    private static $btnRefresh: HTMLElement | null | undefined;
+    private static $btnHome: HTMLElement | null | undefined;
+    private static observer: MutationObserver | undefined;
+
+    private static cloneStreamHudButton($btnOrg: HTMLElement, label: string, svgIcon: typeof BxIcon): HTMLElement | null {
+        if (!$btnOrg) {
+            return null;
+        }
+
+        const $container = $btnOrg.cloneNode(true) as HTMLElement;
         let timeout: number | null;
 
+        // Prevent touching other button while the bar is showing/hiding
+        if (STATES.browser.capabilities.touch) {
             const onTransitionStart = (e: TransitionEvent) => {
                 if (e.propertyName !== 'opacity') {
                     return;
                 }
 
                 timeout && clearTimeout(timeout);
-        $container.style.pointerEvents = 'none';
+                (e.target as HTMLElement).style.pointerEvents = 'none';
             };
 
             const onTransitionEnd = (e: TransitionEvent) => {
@@ -26,24 +39,36 @@ function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: t
                     return;
                 }
 
-        const left = document.getElementById('StreamHud')?.style.left;
+                const $streamHud = (e.target as HTMLElement).closest('#StreamHud') as HTMLElement;
+                if (!$streamHud) {
+                    return;
+                }
+
+                const left = $streamHud.style.left;
                 if (left === '0px') {
+                    const $target = e.target as HTMLElement;
                     timeout && clearTimeout(timeout);
                     timeout = window.setTimeout(() => {
-                    $container.style.pointerEvents = 'auto';
+                        $target.style.pointerEvents = 'auto';
                     }, 100);
                 }
             };
 
-    if (STATES.browser.capabilities.touch) {
             $container.addEventListener('transitionstart', onTransitionStart);
             $container.addEventListener('transitionend', onTransitionEnd);
         }
 
-    const $button = $container.querySelector('button')!;
+        const $button = $container.querySelector('button') as HTMLElement;
+        if (!$button) {
+            return null;
+        }
         $button.setAttribute('title', label);
 
-    const $orgSvg = $button.querySelector('svg')!;
+        const $orgSvg = $button.querySelector('svg') as SVGElement;
+        if (!$orgSvg) {
+            return null;
+        }
+
         const $svg = createSvgIcon(svgIcon);
         $svg.style.fill = 'none';
         $svg.setAttribute('class', $orgSvg.getAttribute('class') || '');
@@ -53,12 +78,13 @@ function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: t
         return $container;
     }
 
-
-function cloneCloseButton($$btnOrg: HTMLElement, icon: typeof BxIcon, className: string, onChange: any) {
+    private static cloneCloseButton($btnOrg: HTMLElement, icon: typeof BxIcon, className: string, onChange: any): HTMLElement | null {
+        if (!$btnOrg) {
+            return null;
+        }
         // Create button from the Close button
-    const $btn = $$btnOrg.cloneNode(true) as HTMLElement;
+        const $btn = $btnOrg.cloneNode(true) as HTMLElement;
 
-    // Refresh SVG
         const $svg = createSvgIcon(icon);
         // Copy classes
         $svg.setAttribute('class', $btn.firstElementChild!.getAttribute('class') || '');
@@ -75,23 +101,131 @@ function cloneCloseButton($$btnOrg: HTMLElement, icon: typeof BxIcon, className:
         return $btn;
     }
 
+    private static async handleStreamMenu() {
+        const $btnCloseHud = document.querySelector('button[class*=StreamMenu-module__backButton]') as HTMLElement;
+        if (!$btnCloseHud) {
+            return;
+        }
+
+        let $btnRefresh = StreamUiHandler.$btnRefresh;
+        let $btnHome = StreamUiHandler.$btnHome;
+
+        // Create Refresh button from the Close button
+        if (typeof $btnRefresh === 'undefined') {
+            $btnRefresh = StreamUiHandler.cloneCloseButton($btnCloseHud, BxIcon.REFRESH, 'bx-stream-refresh-button', () => {
+                confirm(t('confirm-reload-stream')) && window.location.reload();
+            });
+        }
+
+        if (typeof $btnHome === 'undefined') {
+            $btnHome = StreamUiHandler.cloneCloseButton($btnCloseHud, BxIcon.HOME, 'bx-stream-home-button', () => {
+                confirm(t('back-to-home-confirm')) && (window.location.href = window.location.href.substring(0, 31));
+            });
+        }
+
+        // Add to website
+        if ($btnRefresh && $btnHome) {
+            $btnCloseHud.insertAdjacentElement('afterend', $btnRefresh);
+            $btnRefresh.insertAdjacentElement('afterend', $btnHome);
+        }
+
+        // Render stream badges
+        const $menu = document.querySelector('div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module]');
+        $menu?.appendChild(await StreamBadges.getInstance().render());
+    }
+
+    private static handleSystemMenu($streamHud: HTMLElement) {
+        // Grip handle
+        const $gripHandle = $streamHud.querySelector('button[class^=GripHandle]') as HTMLElement;
+        if (!$gripHandle) {
+            return;
+        }
+
+        // Get the last button
+        const $orgButton = $streamHud.querySelector('div[class^=HUDButton]') as HTMLElement;
+        if (!$orgButton) {
+            return;
+        }
+
+        const hideGripHandle = () => {
+            if (!$gripHandle) {
+                return;
+            }
+
+            $gripHandle.dispatchEvent(new PointerEvent('pointerdown'));
+            $gripHandle.click();
+            $gripHandle.dispatchEvent(new PointerEvent('pointerdown'));
+            $gripHandle.click();
+        }
+
+        // Create Stream Settings button
+        let $btnStreamSettings = StreamUiHandler.$btnStreamSettings;
+        if (typeof $btnStreamSettings === 'undefined') {
+            $btnStreamSettings = StreamUiHandler.cloneStreamHudButton($orgButton, t('better-xcloud'), BxIcon.BETTER_XCLOUD);
+            $btnStreamSettings?.addEventListener('click', e => {
+                hideGripHandle();
+                e.preventDefault();
+
+                // Show Stream Settings dialog
+                SettingsNavigationDialog.getInstance().show();
+            });
+
+            StreamUiHandler.$btnStreamSettings = $btnStreamSettings;
+        }
+
+        // Create Stream Stats button
+        const streamStats = StreamStats.getInstance();
+        let $btnStreamStats = StreamUiHandler.$btnStreamStats;
+        if (typeof $btnStreamStats === 'undefined') {
+            $btnStreamStats = StreamUiHandler.cloneStreamHudButton($orgButton, t('stream-stats'), BxIcon.STREAM_STATS);
+            $btnStreamStats?.addEventListener('click', e => {
+                hideGripHandle();
+                e.preventDefault();
+
+                // Toggle Stream Stats
+                streamStats.toggle();
+
+                const btnStreamStatsOn = (!streamStats.isHidden() && !streamStats.isGlancing());
+                $btnStreamStats!.classList.toggle('bx-stream-menu-button-on', btnStreamStatsOn);
+            });
+
+            StreamUiHandler.$btnStreamStats = $btnStreamStats;
+        }
+
+        const $btnParent = $orgButton.parentElement!;
+
+        if ($btnStreamSettings && $btnStreamStats) {
+            const btnStreamStatsOn = (!streamStats.isHidden() && !streamStats.isGlancing());
+            $btnStreamStats.classList.toggle('bx-stream-menu-button-on', btnStreamStatsOn);
+
+            // Insert buttons after Stream Settings button
+            $btnParent.insertBefore($btnStreamStats, $btnParent.lastElementChild);
+            $btnParent.insertBefore($btnStreamSettings, $btnStreamStats);
+        }
+
+        // Move the Dots button to the beginning
+        const $dotsButton = $btnParent.lastElementChild!;
+        $dotsButton.parentElement!.insertBefore($dotsButton, $dotsButton.parentElement!.firstElementChild);
+    }
+
+    private static reset() {
+        StreamUiHandler.$btnStreamSettings = undefined;
+        StreamUiHandler.$btnStreamStats = undefined;
+        StreamUiHandler.$btnRefresh = undefined;
+        StreamUiHandler.$btnHome = undefined;
+
+        StreamUiHandler.observer && StreamUiHandler.observer.disconnect();
+        StreamUiHandler.observer = undefined;
+    }
+
+    static observe() {
+        StreamUiHandler.reset();
 
-export function injectStreamMenuButtons() {
         const $screen = document.querySelector('#PageContent section[class*=PureScreens]');
         if (!$screen) {
             return;
         }
 
-    if (($screen as any).xObserving) {
-        return;
-    }
-
-    ($screen as any).xObserving = true;
-
-    let $btnStreamSettings: HTMLElement;
-    let $btnStreamStats: HTMLElement;
-    const streamStats = StreamStats.getInstance();
-
         const observer = new MutationObserver(mutationList => {
             mutationList.forEach(item => {
                 if (item.type !== 'childList') {
@@ -105,45 +239,26 @@ export function injectStreamMenuButtons() {
 
                     let $elm: HTMLElement | null = $node as HTMLElement;
 
-                // Ignore SVG elements
-                if ($elm instanceof SVGSVGElement) {
+                    // Ignore non-HTML elements
+                    if (!($elm instanceof HTMLElement)) {
                         return;
                     }
 
+                    const className = $elm.className || '';
+
                     // Error Page: .PureErrorPage.ErrorScreen
-                if ($elm.className?.includes('PureErrorPage')) {
+                    if (className.includes('PureErrorPage')) {
                         BxEvent.dispatch(window, BxEvent.STREAM_ERROR_PAGE);
                         return;
                     }
 
                     // Render badges
-                if ($elm.className?.startsWith('StreamMenu-module__container')) {
-                    const $btnCloseHud = document.querySelector('button[class*=StreamMenu-module__backButton]') as HTMLElement;
-                    if (!$btnCloseHud) {
+                    if (className.startsWith('StreamMenu-module__container')) {
+                        StreamUiHandler.handleStreamMenu();
                         return;
                     }
 
-                    // Create Refresh button from the Close button
-                    const $btnRefresh = cloneCloseButton($btnCloseHud, BxIcon.REFRESH, 'bx-stream-refresh-button', () => {
-                        confirm(t('confirm-reload-stream')) && window.location.reload();
-                    });
-
-                    const $btnHome = cloneCloseButton($btnCloseHud, BxIcon.HOME, 'bx-stream-home-button', () => {
-                        confirm(t('back-to-home-confirm')) && (window.location.href = window.location.href.substring(0, 31));
-                    });
-
-                    // Add to website
-                    $btnCloseHud.insertAdjacentElement('afterend', $btnRefresh);
-                    $btnRefresh.insertAdjacentElement('afterend', $btnHome);
-
-                    // Render stream badges
-                    const $menu = document.querySelector('div[class*=StreamMenu-module__menuContainer] > div[class*=Menu-module]');
-                    $menu?.appendChild(await StreamBadges.getInstance().render());
-
-                    return;
-                }
-
-                if ($elm.className?.startsWith('Overlay-module_') || $elm.className?.startsWith('InProgressScreen')) {
+                    if (className.startsWith('Overlay-module_') || className.startsWith('InProgressScreen')) {
                         $elm = $elm.querySelector('#StreamHud');
                     }
 
@@ -151,69 +266,12 @@ export function injectStreamMenuButtons() {
                         return;
                     }
 
-                // Grip handle
-                const $gripHandle = $elm.querySelector('button[class^=GripHandle]') as HTMLElement;
-
-                const hideGripHandle = () => {
-                    if (!$gripHandle) {
-                        return;
-                    }
-
-                    $gripHandle.dispatchEvent(new PointerEvent('pointerdown'));
-                    $gripHandle.click();
-                    $gripHandle.dispatchEvent(new PointerEvent('pointerdown'));
-                    $gripHandle.click();
-                }
-
-                // Get the second last button
-                const $orgButton = $elm.querySelector('div[class^=HUDButton]') as HTMLElement;
-                if (!$orgButton) {
-                    return;
-                }
-
-                // Create Stream Settings button
-                if (!$btnStreamSettings) {
-                    $btnStreamSettings = cloneStreamHudButton($orgButton, t('better-xcloud'), BxIcon.BETTER_XCLOUD);
-                    $btnStreamSettings.addEventListener('click', e => {
-                        hideGripHandle();
-                        e.preventDefault();
-
-                        // Show Stream Settings dialog
-                        SettingsNavigationDialog.getInstance().show();
-                    });
-                }
-
-                // Create Stream Stats button
-                if (!$btnStreamStats) {
-                    $btnStreamStats = cloneStreamHudButton($orgButton, t('stream-stats'), BxIcon.STREAM_STATS);
-                    $btnStreamStats.addEventListener('click', e => {
-                        hideGripHandle();
-                        e.preventDefault();
-
-                        // Toggle Stream Stats
-                        streamStats.toggle();
-
-                        const btnStreamStatsOn = (!streamStats.isHidden() && !streamStats.isGlancing());
-                        $btnStreamStats.classList.toggle('bx-stream-menu-button-on', btnStreamStatsOn);
-                    });
-                }
-
-                const btnStreamStatsOn = (!streamStats.isHidden() && !streamStats.isGlancing());
-                $btnStreamStats.classList.toggle('bx-stream-menu-button-on', btnStreamStatsOn);
-
-                if ($orgButton) {
-                    const $btnParent = $orgButton.parentElement!;
-
-                    // Insert buttons after Stream Settings button
-                    $btnParent.insertBefore($btnStreamStats, $btnParent.lastElementChild);
-                    $btnParent.insertBefore($btnStreamSettings, $btnStreamStats);
-
-                    // Move the Dots button to the beginning
-                    const $dotsButton = $btnParent.lastElementChild!;
-                    $dotsButton.parentElement!.insertBefore($dotsButton, $dotsButton.parentElement!.firstElementChild);
-                }
+                    // Handle System Menu bar
+                    StreamUiHandler.handleSystemMenu($elm);
                 });
             });
         });
+
         observer.observe($screen, {subtree: true, childList: true});
     }
+}

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

@@ -176,12 +176,6 @@ export class SettingsNavigationDialog extends NavigationDialog {
             PrefKey.GAME_FORTNITE_FORCE_CONSOLE,
             PrefKey.STREAM_COMBINE_SOURCES,
         ],
-    }, {
-        group: 'game-bar',
-        label: t('game-bar'),
-        items: [
-            PrefKey.GAME_BAR_POSITION,
-        ],
     }, {
         group: 'co-op',
         label: t('local-co-op'),
@@ -208,14 +202,6 @@ export class SettingsNavigationDialog extends NavigationDialog {
             PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD,
             PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_CUSTOM,
         ],
-    }, {
-        group: 'loading-screen',
-        label: t('loading-screen'),
-        items: [
-            PrefKey.UI_LOADING_SCREEN_GAME_ART,
-            PrefKey.UI_LOADING_SCREEN_WAIT_TIME,
-            PrefKey.UI_LOADING_SCREEN_ROCKET,
-        ],
     }, {
         group: 'ui',
         label: t('ui'),
@@ -232,6 +218,20 @@ export class SettingsNavigationDialog extends NavigationDialog {
             PrefKey.BLOCK_SOCIAL_FEATURES,
             PrefKey.UI_HIDE_SECTIONS,
         ],
+    }, {
+        group: 'game-bar',
+        label: t('game-bar'),
+        items: [
+            PrefKey.GAME_BAR_POSITION,
+        ],
+    }, {
+        group: 'loading-screen',
+        label: t('loading-screen'),
+        items: [
+            PrefKey.UI_LOADING_SCREEN_GAME_ART,
+            PrefKey.UI_LOADING_SCREEN_WAIT_TIME,
+            PrefKey.UI_LOADING_SCREEN_ROCKET,
+        ],
     }, {
         group: 'other',
         label: t('other'),

src/types/setting-definition.d.ts

@@ -1,19 +1,42 @@
 export type SettingDefinition = {
     default: any;
-    optionsGroup?: string;
-    options?: {[index: string]: string};
-    multipleOptions?: {[index: string]: string};
-    unsupported?: string | boolean;
-    note?: string | HTMLElement;
-    type?: SettingElementType;
-    ready?: (setting: SettingDefinition) => void;
+} & Partial<{
+    label: string;
+    note: string | HTMLElement;
+    experimental: boolean;
+    unsupported: string | boolean;
+    ready: (setting: SettingDefinition) => void;
     // migrate?: (this: Preferences, savedPrefs: any, value: any) => void;
-    min?: number;
-    max?: number;
+}> & (
+    {} | {
+        options: {[index: string]: string};
+        optionsGroup?: string;
+    } | {
+        multipleOptions: {[index: string]: string};
+        params: MultipleOptionsParams;
+    } | {
+        type: SettingElementType.NUMBER_STEPPER;
+        min: number;
+        max: number;
+        params: NumberStepperParams;
+
         steps?: number;
-    experimental?: boolean;
-    params?: any;
-    label?: string;
-};
+    }
+);
 
 export type SettingDefinitions = {[index in PrefKey]: SettingDefinition};
+
+export type MultipleOptionsParams = Partial<{
+    size?: number;
+}>
+
+export type NumberStepperParams = Partial<{
+    suffix: string;
+    disabled: boolean;
+    hideSlider: boolean;
+
+    ticks: number;
+    exactTicks: number;
+
+    customTextValue: (value: any) => string | null;
+}>

src/utils/setting-element.ts

@@ -3,21 +3,7 @@ import { CE } from "@utils/html";
 import { setNearby } from "./navigation-utils";
 import type { PrefKey } from "@/enums/pref-keys";
 import type { BaseSettingsStore } from "./settings-storages/base-settings-storage";
-
-type MultipleOptionsParams = {
-    size?: number;
-}
-
-type NumberStepperParams = {
-    suffix?: string;
-    disabled?: boolean;
-    hideSlider?: boolean;
-
-    ticks?: number;
-    exactTicks?: number;
-
-    customTextValue?: (value: any) => string | null;
-}
+import { type MultipleOptionsParams, type NumberStepperParams } from "@/types/setting-definition";
 
 export enum SettingElementType {
     OPTIONS = 'options',
@@ -381,7 +367,11 @@ export class SettingElement {
             type = SettingElementType.CHECKBOX;
         }
 
-        const params = Object.assign(overrideParams, definition.params || {});
+        let params: any = {};
+        if ('params' in definition) {
+            params = Object.assign(overrideParams, definition.params || {});
+        }
+
         if (params.disabled) {
             currentValue = definition.default;
         }

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

@@ -5,14 +5,14 @@ import { UiSection } from "@/enums/ui-sections";
 import { UserAgentProfile } from "@/enums/user-agent";
 import { StreamStat } from "@/modules/stream/stream-stats";
 import type { PreferenceSetting } from "@/types/preferences";
-import type { SettingDefinitions } from "@/types/setting-definition";
+import { type SettingDefinitions } from "@/types/setting-definition";
 import { BX_FLAGS } from "../bx-flags";
 import { STATES, AppInterface, STORAGE } from "../global";
 import { CE } from "../html";
-import { SettingElementType } from "../setting-element";
 import { t, SUPPORTED_LANGUAGES } from "../translation";
 import { UserAgent } from "../user-agent";
 import { BaseSettingsStore as BaseSettingsStorage } from "./base-settings-storage";
+import { SettingElementType } from "../setting-element";
 
 
 function getSupportedCodecProfiles() {