marcel/better-xcloud
1
0
Fork 0
mirror of https://github.com/redphx/better-xcloud.git synced 2025-08-08 06:08:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename States to STATES

Browse Source
This commit is contained in:
redphx
2024-04-24 17:09:39 +07:00
parent fd0f0799ee
commit 06ffcf20f7
17 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/bx-exposed.ts
View File

@@ -1,8 +1,8 @@
import { States } from "../utils/global";
import { STATES } from "../utils/global";
export const BxExposed = {
onPollingModeChanged: (mode: 'All' | 'None') => {
if (!States.isPlaying) {
if (!STATES.isPlaying) {
return false;
}

8
src/modules/patcher.ts
View File

@@ -1,4 +1,4 @@
import { States } from "../utils/global";
import { STATES } from "../utils/global";
import { BX_FLAGS } from "./bx-flags";
import { getPref, PrefKey } from "./preferences";
import { VibrationManager } from "./vibration-manager";
@@ -424,7 +424,7 @@ let PATCH_ORDERS = [
'overrideSettings',
],
getPref(PrefKey.REMOTE_PLAY_ENABLED) && States.hasTouchSupport && ['patchUpdateInputConfigurationAsync'],
getPref(PrefKey.REMOTE_PLAY_ENABLED) && STATES.hasTouchSupport && ['patchUpdateInputConfigurationAsync'],
getPref(PrefKey.GAME_FORTNITE_FORCE_CONSOLE) && ['forceFortniteConsole'],
];
@@ -438,8 +438,8 @@ const PLAYING_PATCH_ORDERS = [
['patchStreamHud'],
['playVibration'],
States.hasTouchSupport && getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && ['exposeTouchLayoutManager'],
States.hasTouchSupport && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'off' || getPref(PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF)) && ['disableTakRenderer'],
STATES.hasTouchSupport && getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && ['exposeTouchLayoutManager'],
STATES.hasTouchSupport && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'off' || getPref(PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF)) && ['disableTakRenderer'],
BX_FLAGS.EnableXcloudLogging && ['enableConsoleLogging'],

10
src/modules/preferences.ts
View File

@@ -4,7 +4,7 @@ import { SettingElement, SettingElementType } from "./settings";
import { UserAgentProfile } from "../utils/user-agent";
import { StreamStat } from "./stream/stream-stats";
import type { PreferenceSettings } from "../types/preferences";
import { States } from "../utils/global";
import { STATES } from "../utils/global";
export enum PrefKey {
LAST_UPDATE_CHECK = 'version_last_check',
@@ -280,7 +280,7 @@ export class Preferences {
all: t('tc-all-games'),
off: t('off'),
},
unsupported: !States.hasTouchSupport,
unsupported: !STATES.hasTouchSupport,
ready: () => {
const setting = Preferences.SETTINGS[PrefKey.STREAM_TOUCH_CONTROLLER];
if (setting.unsupported) {
@@ -291,7 +291,7 @@ export class Preferences {
[PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF]: {
label: t('tc-auto-off'),
default: false,
unsupported: !States.hasTouchSupport,
unsupported: !STATES.hasTouchSupport,
},
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD]: {
label: t('tc-standard-layout-style'),
@@ -301,7 +301,7 @@ export class Preferences {
white: t('tc-all-white'),
muted: t('tc-muted-colors'),
},
unsupported: !States.hasTouchSupport,
unsupported: !STATES.hasTouchSupport,
},
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_CUSTOM]: {
label: t('tc-custom-layout-style'),
@@ -310,7 +310,7 @@ export class Preferences {
default: t('default'),
muted: t('tc-muted-colors'),
},
unsupported: !States.hasTouchSupport,
unsupported: !STATES.hasTouchSupport,
},
[PrefKey.STREAM_SIMPLIFY_MENU]: {

16
src/modules/remote-play.ts
View File

@@ -1,4 +1,4 @@
import { States, AppInterface } from "../utils/global";
import { STATES, AppInterface } from "../utils/global";
import { CE, createButton, ButtonStyle, Icon } from "../utils/html";
import { Toast } from "../utils/toast";
import { BxEvent } from "./bx-event";
@@ -259,7 +259,7 @@ export class RemotePlay {
RemotePlay.#CONSOLES = json.results;
// Store working server
States.remotePlay.server = region.baseUri;
STATES.remotePlay.server = region.baseUri;
callback();
} catch (e) {}
@@ -270,7 +270,7 @@ export class RemotePlay {
}
// None of the servers worked
if (!States.remotePlay.server) {
if (!STATES.remotePlay.server) {
RemotePlay.#CONSOLES = [];
}
}
@@ -280,10 +280,10 @@ export class RemotePlay {
setPref(PrefKey.REMOTE_PLAY_RESOLUTION, resolution);
}
States.remotePlay.config = {
STATES.remotePlay.config = {
serverId: serverId,
};
window.BX_REMOTE_PLAY_CONFIG = States.remotePlay.config;
window.BX_REMOTE_PLAY_CONFIG = STATES.remotePlay.config;
localRedirect('/launch/fortnite/BT5P2X999VH2#remote-play');
RemotePlay.detachPopup();
@@ -337,9 +337,9 @@ export class RemotePlay {
return;
}
States.remotePlay.isPlaying = window.location.pathname.includes('/launch/') && window.location.hash.startsWith('#remote-play');
if (States.remotePlay?.isPlaying) {
window.BX_REMOTE_PLAY_CONFIG = States.remotePlay.config;
STATES.remotePlay.isPlaying = window.location.pathname.includes('/launch/') && window.location.hash.startsWith('#remote-play');
if (STATES.remotePlay?.isPlaying) {
window.BX_REMOTE_PLAY_CONFIG = STATES.remotePlay.config;
// Remove /launch/... from URL
window.history.replaceState({origin: 'better-xcloud'}, '', 'https://www.xbox.com/' + location.pathname.substring(1, 6) + '/play');
} else {

6
src/modules/screenshot.ts
View File

@@ -1,8 +1,8 @@
import { States, AppInterface } from "../utils/global";
import { STATES, AppInterface } from "../utils/global";
import { CE } from "../utils/html";
export function takeScreenshot(callback: any) {
const currentStream = States.currentStream!;
const currentStream = STATES.currentStream!;
const $video = currentStream.$video;
const $canvas = currentStream.$screenshotCanvas;
if (!$video || !$canvas) {
@@ -44,7 +44,7 @@ export function takeScreenshot(callback: any) {
export function setupScreenshotButton() {
const currentStream = States.currentStream!
const currentStream = STATES.currentStream!
currentStream.$screenshotCanvas = CE('canvas', {'class': 'bx-screenshot-canvas'});
document.documentElement.appendChild(currentStream.$screenshotCanvas!);

4
src/modules/stream/stream-badges.ts
View File

@@ -1,7 +1,7 @@
import { t } from "../translation";
import { BxEvent } from "../bx-event";
import { CE } from "../../utils/html";
import { States } from "../../utils/global";
import { STATES } from "../../utils/global";
enum StreamBadge {
PLAYTIME = 'playtime',
@@ -86,7 +86,7 @@ export class StreamBadges {
} catch(e) {}
}
const stats = await States.currentStream.peerConnection?.getStats()!;
const stats = await STATES.currentStream.peerConnection?.getStats()!;
let totalIn = 0;
let totalOut = 0;
stats.forEach(stat => {

8
src/modules/stream/stream-stats.ts
View File

@@ -4,7 +4,7 @@ import { getPref } from "../preferences"
import { StreamBadges } from "./stream-badges"
import { CE } from "../../utils/html"
import { t } from "../translation"
import { States } from "../../utils/global"
import { STATES } from "../../utils/global"
export enum StreamStat {
PING = 'ping',
@@ -106,13 +106,13 @@ export class StreamStats {
}
static update() {
if (StreamStats.isHidden() || !States.currentStream.peerConnection) {
if (StreamStats.isHidden() || !STATES.currentStream.peerConnection) {
StreamStats.onStoppedPlaying();
return;
}
const PREF_STATS_CONDITIONAL_FORMATTING = getPref(PrefKey.STATS_CONDITIONAL_FORMATTING);
States.currentStream.peerConnection.getStats().then(stats => {
STATES.currentStream.peerConnection.getStats().then(stats => {
stats.forEach(stat => {
let grade = '';
if (stat.type === 'inbound-rtp' && stat.kind === 'video') {
@@ -214,7 +214,7 @@ export class StreamStats {
}
static getServerStats() {
States.currentStream.peerConnection && States.currentStream.peerConnection.getStats().then(stats => {
STATES.currentStream.peerConnection && STATES.currentStream.peerConnection.getStats().then(stats => {
const allVideoCodecs: {[index: string]: RTCBasicStat} = {};
let videoCodecId;

4
src/modules/stream/stream-ui.ts
View File

@@ -1,4 +1,4 @@
import { States } from "../../utils/global";
import { STATES } from "../../utils/global";
import { Icon } from "../../utils/html";
import { BxEvent } from "../bx-event";
import { PrefKey, getPref } from "../preferences";
@@ -93,7 +93,7 @@ function cloneStreamHudButton($orgButton: HTMLElement, label: string, svgIcon: I
}
};
if (States.hasTouchSupport) {
if (STATES.hasTouchSupport) {
$container.addEventListener('transitionstart', onTransitionStart);
$container.addEventListener('transitionend', onTransitionEnd);
}

8
src/modules/touch-controller.ts
View File

@@ -1,4 +1,4 @@
import { NATIVE_FETCH, States } from "../utils/global";
import { NATIVE_FETCH, STATES } from "../utils/global";
import { CE } from "../utils/html";
import { Toast } from "../utils/toast";
import { BxEvent } from "./bx-event";
@@ -189,7 +189,7 @@ export class TouchController {
touch_layout_manager && touch_layout_manager.changeLayoutForScope({
type: 'showLayout',
scope: '' + States.currentStream?.xboxTitleId,
scope: '' + STATES.currentStream?.xboxTitleId,
subscope: 'base',
layout: {
id: 'System.Standard',
@@ -273,7 +273,7 @@ export class TouchController {
if (msg.data.includes('touchcontrols/showtitledefault')) {
if (TouchController.#enable) {
if (focused) {
TouchController.getCustomLayouts(States.currentStream?.xboxTitleId!);
TouchController.getCustomLayouts(STATES.currentStream?.xboxTitleId!);
} else {
TouchController.#showDefault();
}
@@ -292,7 +292,7 @@ export class TouchController {
TouchController.#show();
}
States.currentStream.xboxTitleId = parseInt(json.titleid, 16).toString();
STATES.currentStream.xboxTitleId = parseInt(json.titleid, 16).toString();
}
} catch (e) {
console.log(e);

10
src/modules/ui/global-settings.ts
View File

@@ -1,4 +1,4 @@
import { States, AppInterface, SCRIPT_HOME, SCRIPT_VERSION } from "../../utils/global";
import { STATES, AppInterface, SCRIPT_HOME, SCRIPT_VERSION } from "../../utils/global";
import { CE, createButton, Icon, ButtonStyle } from "../../utils/html";
import { getPreferredServerRegion } from "../../utils/region";
import { UserAgent, UserAgentProfile } from "../../utils/user-agent";
@@ -51,8 +51,8 @@ const SETTINGS_UI = {
},
[t('touch-controller')]: {
note: !States.hasTouchSupport ? '⚠️ ' + t('device-unsupported-touch') : null,
unsupported: !States.hasTouchSupport,
note: !STATES.hasTouchSupport ? '⚠️ ' + t('device-unsupported-touch') : null,
unsupported: !STATES.hasTouchSupport,
items: [
PrefKey.STREAM_TOUCH_CONTROLLER,
PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF,
@@ -251,8 +251,8 @@ export function setupSettingsUi() {
selectedValue = PREF_PREFERRED_REGION;
setting.options = {};
for (let regionName in States.serverRegions) {
const region = States.serverRegions[regionName];
for (let regionName in STATES.serverRegions) {
const region = STATES.serverRegions[regionName];
let value = regionName;
let label = `${region.shortName} - ${regionName}`;

14
src/modules/ui/ui.ts
View File

@@ -1,4 +1,4 @@
import { States } from "../../utils/global";
import { STATES } from "../../utils/global";
import { Icon, CE, createButton, ButtonStyle } from "../../utils/html";
import { UserAgent } from "../../utils/user-agent";
import { BxEvent } from "../bx-event";
@@ -95,7 +95,7 @@ function setupQuickSettingsBar() {
pref: PrefKey.AUDIO_VOLUME,
label: t('volume'),
onChange: (e: any, value: number) => {
States.currentStream && (States.currentStream.audioGainNode!.gain.value = value / 100)
STATES.currentStream && (STATES.currentStream.audioGainNode!.gain.value = value / 100)
},
params: {
disabled: !getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL),
@@ -176,7 +176,7 @@ function setupQuickSettingsBar() {
],
},
States.hasTouchSupport && {
STATES.hasTouchSupport && {
group: 'touch-controller',
label: t('touch-controller'),
items: [
@@ -185,18 +185,18 @@ function setupQuickSettingsBar() {
content: CE('select', {disabled: true}, CE('option', {}, t('default'))),
onMounted: ($elm: HTMLSelectElement) => {
$elm.addEventListener('change', e => {
TouchController.loadCustomLayout(States.currentStream?.xboxTitleId!, $elm.value, 1000);
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) {
if (STATES.currentStream?.xboxTitleId && ($elm as any).xboxTitleId === STATES.currentStream?.xboxTitleId) {
$elm.dispatchEvent(new Event('change'));
return;
}
($elm as any).xboxTitleId = States.currentStream?.xboxTitleId;
($elm as any).xboxTitleId = STATES.currentStream?.xboxTitleId;
// Clear options
while ($elm.firstChild) {
@@ -431,7 +431,7 @@ export function updateVideoPlayerCss() {
// Apply video filters to screenshots
if (getPref(PrefKey.SCREENSHOT_APPLY_FILTERS)) {
States.currentStream.$screenshotCanvas!.getContext('2d')!.filter = filters;
STATES.currentStream.$screenshotCanvas!.getContext('2d')!.filter = filters;
}
const PREF_RATIO = getPref(PrefKey.VIDEO_RATIO);