mirror of
https://github.com/redphx/better-xcloud.git
synced 2025-07-05 22:01:43 +02:00
Compare commits
65 Commits
Author | SHA1 | Date | |
---|---|---|---|
55a56837c8 | |||
df713136d8 | |||
29dfdaf72e | |||
04cf66a466 | |||
1d55026c6d | |||
fcfecf7ff9 | |||
5e22bf097a | |||
542079d53e | |||
1d00d793b8 | |||
2a9da6f827 | |||
b6089a61f9 | |||
0fe6608be9 | |||
9e39e80309 | |||
5bfcf3a044 | |||
66d5d9edc6 | |||
9d00082c67 | |||
ef2e0892bc | |||
ce1901b300 | |||
18a8b8330c | |||
b9e78f09d3 | |||
33b2b36e2b | |||
61ed68c40f | |||
4ad0d44929 | |||
422442071e | |||
8d1ae0656c | |||
a78de2ca37 | |||
db1da22c0a | |||
91ab57fa29 | |||
416307e23a | |||
e7c94f3ece | |||
ea9ad16770 | |||
9a2e7de68d | |||
962f4dec6d | |||
10d0dedc0a | |||
c6acc251ae | |||
a06d061409 | |||
6b2412ff27 | |||
0f360d4be1 | |||
900ab38153 | |||
c03c63f3c3 | |||
d4f4084991 | |||
975549b4e7 | |||
345d0f78dc | |||
938dfa6aaa | |||
d7ed9e1603 | |||
224e98829d | |||
56a3f1d8c8 | |||
d82a38c0f1 | |||
77729789e3 | |||
5763701355 | |||
cafeed1a3c | |||
691f116ea0 | |||
481b365e6e | |||
2b63edb7eb | |||
b6746598a3 | |||
45bda4bb24 | |||
c93db035f3 | |||
e75fa397ee | |||
98a9f4fc37 | |||
dee8c9dbd0 | |||
d31a06be89 | |||
277c777121 | |||
385fd71e86 | |||
986d9fe088 | |||
6de235ce2f |
3
build.ts
3
build.ts
@ -4,6 +4,7 @@ import { parseArgs } from "node:util";
|
|||||||
import { sys } from "typescript";
|
import { sys } from "typescript";
|
||||||
import txtScriptHeader from "./src/assets/header_script.txt" with { type: "text" };
|
import txtScriptHeader from "./src/assets/header_script.txt" with { type: "text" };
|
||||||
import txtMetaHeader from "./src/assets/header_meta.txt" with { type: "text" };
|
import txtMetaHeader from "./src/assets/header_meta.txt" with { type: "text" };
|
||||||
|
import { assert } from "node:console";
|
||||||
|
|
||||||
enum BuildTarget {
|
enum BuildTarget {
|
||||||
ALL = 'all',
|
ALL = 'all',
|
||||||
@ -24,6 +25,8 @@ const postProcess = (str: string): string => {
|
|||||||
// 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;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
dist/better-xcloud.meta.js
vendored
2
dist/better-xcloud.meta.js
vendored
@ -1,5 +1,5 @@
|
|||||||
// ==UserScript==
|
// ==UserScript==
|
||||||
// @name Better xCloud
|
// @name Better xCloud
|
||||||
// @namespace https://github.com/redphx
|
// @namespace https://github.com/redphx
|
||||||
// @version 5.1.0
|
// @version 5.3.0
|
||||||
// ==/UserScript==
|
// ==/UserScript==
|
||||||
|
2887
dist/better-xcloud.user.js
vendored
2887
dist/better-xcloud.user.js
vendored
File diff suppressed because one or more lines are too long
@ -6,8 +6,8 @@
|
|||||||
"build": "build.ts"
|
"build": "build.ts"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/bun": "^1.1.5",
|
"@types/bun": "^1.1.6",
|
||||||
"@types/node": "^20.14.9",
|
"@types/node": "^20.14.10",
|
||||||
"@types/stylus": "^0.48.42",
|
"@types/stylus": "^0.48.42",
|
||||||
"stylus": "^0.63.0"
|
"stylus": "^0.63.0"
|
||||||
},
|
},
|
||||||
|
@ -48,11 +48,18 @@
|
|||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: block;
|
display: block;
|
||||||
color: #5dc21e;
|
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
text-transform: none;
|
||||||
|
margin-right: 10px;
|
||||||
|
|
||||||
|
span {
|
||||||
|
color: #5dc21e !important;
|
||||||
|
}
|
||||||
|
|
||||||
&:focus {
|
&:focus {
|
||||||
color: #83f73a;
|
span {
|
||||||
|
color: #83f73a !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -105,6 +105,10 @@ div[class^=HUDButton-module__hiddenContainer] ~ div:not([class^=HUDButton-module
|
|||||||
font-family: var(--bx-promptfont-font);
|
font-family: var(--bx-promptfont-font);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
select[multiple] {
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
/* Hide UI elements */
|
/* Hide UI elements */
|
||||||
#headerArea, #uhfSkipToMain, .uhf-footer {
|
#headerArea, #uhfSkipToMain, .uhf-footer {
|
||||||
display: none;
|
display: none;
|
||||||
@ -128,3 +132,35 @@ div[class*=SupportedInputsBadge] {
|
|||||||
display: none;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
6
src/enums/ui-sections.ts
Normal file
6
src/enums/ui-sections.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
export enum UiSection {
|
||||||
|
NEWS = 'news',
|
||||||
|
FRIENDS = 'friends',
|
||||||
|
MOST_POPULAR = 'most-popular',
|
||||||
|
ALL_GAMES = 'all-games',
|
||||||
|
}
|
@ -1,8 +1,8 @@
|
|||||||
export enum UserAgentProfile {
|
export enum UserAgentProfile {
|
||||||
WINDOWS_EDGE = 'windows-edge',
|
WINDOWS_EDGE = 'windows-edge',
|
||||||
MACOS_SAFARI = 'macos-safari',
|
MACOS_SAFARI = 'macos-safari',
|
||||||
SMARTTV_GENERIC = 'smarttv-generic',
|
SMART_TV_GENERIC = 'smarttv-generic',
|
||||||
SMARTTV_TIZEN = 'smarttv-tizen',
|
SMART_TV_TIZEN = 'smarttv-tizen',
|
||||||
VR_OCULUS = 'vr-oculus',
|
VR_OCULUS = 'vr-oculus',
|
||||||
DEFAULT = 'default',
|
DEFAULT = 'default',
|
||||||
CUSTOM = 'custom',
|
CUSTOM = 'custom',
|
||||||
|
61
src/index.ts
61
src/index.ts
@ -16,7 +16,6 @@ import { PrefKey, getPref } from "@utils/preferences";
|
|||||||
import { LoadingScreen } from "@modules/loading-screen";
|
import { LoadingScreen } from "@modules/loading-screen";
|
||||||
import { MouseCursorHider } from "@modules/mkb/mouse-cursor-hider";
|
import { MouseCursorHider } from "@modules/mkb/mouse-cursor-hider";
|
||||||
import { TouchController } from "@modules/touch-controller";
|
import { TouchController } from "@modules/touch-controller";
|
||||||
import { watchHeader } from "@modules/ui/header";
|
|
||||||
import { checkForUpdate, disablePwa } from "@utils/utils";
|
import { checkForUpdate, disablePwa } from "@utils/utils";
|
||||||
import { Patcher } from "@modules/patcher";
|
import { Patcher } from "@modules/patcher";
|
||||||
import { RemotePlay } from "@modules/remote-play";
|
import { RemotePlay } from "@modules/remote-play";
|
||||||
@ -33,17 +32,26 @@ import { NativeMkbHandler } from "./modules/mkb/native-mkb-handler";
|
|||||||
import { GuideMenu, GuideMenuTab } from "./modules/ui/guide-menu";
|
import { GuideMenu, GuideMenuTab } from "./modules/ui/guide-menu";
|
||||||
import { StreamSettings } from "./modules/stream/stream-settings";
|
import { StreamSettings } from "./modules/stream/stream-settings";
|
||||||
import { updateVideoPlayer } from "./modules/stream/stream-settings-utils";
|
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
|
// Handle login page
|
||||||
if (window.location.pathname.includes('/auth/msa')) {
|
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
|
// Stop processing the script
|
||||||
throw new Error('[Better xCloud] Refreshing the page after logging in');
|
throw new Error('[Better xCloud] Refreshing the page after logging in');
|
||||||
}
|
}
|
||||||
@ -94,8 +102,19 @@ window.addEventListener('load', e => {
|
|||||||
window.location.reload(true);
|
window.location.reload(true);
|
||||||
}
|
}
|
||||||
}, 3000);
|
}, 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;
|
window.BX_EXPOSED = BxExposed;
|
||||||
|
|
||||||
// Hide Settings UI when navigate to another page
|
// Hide Settings UI when navigate to another page
|
||||||
@ -107,13 +126,13 @@ window.addEventListener('popstate', onHistoryChanged);
|
|||||||
window.history.pushState = patchHistoryMethod('pushState');
|
window.history.pushState = patchHistoryMethod('pushState');
|
||||||
window.history.replaceState = patchHistoryMethod('replaceState');
|
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 => {
|
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 => {
|
window.addEventListener(BxEvent.STREAM_LOADING, e => {
|
||||||
@ -277,7 +296,7 @@ function main() {
|
|||||||
getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && patchAudioContext();
|
getPref(PrefKey.AUDIO_ENABLE_VOLUME_CONTROL) && patchAudioContext();
|
||||||
getPref(PrefKey.BLOCK_TRACKING) && patchMeControl();
|
getPref(PrefKey.BLOCK_TRACKING) && patchMeControl();
|
||||||
|
|
||||||
STATES.userAgentHasTouchSupport && TouchController.updateCustomList();
|
STATES.userAgent.capabilities.touch && TouchController.updateCustomList();
|
||||||
overridePreloadState();
|
overridePreloadState();
|
||||||
|
|
||||||
VibrationManager.initialSetup();
|
VibrationManager.initialSetup();
|
||||||
@ -303,8 +322,10 @@ function main() {
|
|||||||
disablePwa();
|
disablePwa();
|
||||||
|
|
||||||
// Show a toast when connecting/disconecting controller
|
// 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
|
// Preload Remote Play
|
||||||
if (getPref(PrefKey.REMOTE_PLAY_ENABLED)) {
|
if (getPref(PrefKey.REMOTE_PLAY_ENABLED)) {
|
||||||
@ -320,6 +341,12 @@ function main() {
|
|||||||
STATES.pointerServerPort = AppInterface.startPointerServer() || 9269;
|
STATES.pointerServerPort = AppInterface.startPointerServer() || 9269;
|
||||||
BxLogger.info('startPointerServer', 'Port', STATES.pointerServerPort.toString());
|
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();
|
main();
|
||||||
|
@ -41,7 +41,7 @@ export class GameBar {
|
|||||||
|
|
||||||
this.actions = [
|
this.actions = [
|
||||||
new ScreenshotAction(),
|
new ScreenshotAction(),
|
||||||
...(STATES.userAgentHasTouchSupport && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'off') ? [new TouchControlAction()] : []),
|
...(STATES.userAgent.capabilities.touch && (getPref(PrefKey.STREAM_TOUCH_CONTROLLER) !== 'off') ? [new TouchControlAction()] : []),
|
||||||
new MicrophoneAction(),
|
new MicrophoneAction(),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -9,10 +9,12 @@ import { BxEvent } from "@/utils/bx-event";
|
|||||||
import codeControllerShortcuts from "./patches/controller-shortcuts.js" with { type: "text" };
|
import codeControllerShortcuts from "./patches/controller-shortcuts.js" with { type: "text" };
|
||||||
import codeExposeStreamSession from "./patches/expose-stream-session.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 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 codeRemotePlayEnable from "./patches/remote-play-enable.js" with { type: "text" };
|
||||||
import codeRemotePlayKeepAlive from "./patches/remote-play-keep-alive.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 codeVibrationAdjust from "./patches/vibration-adjust.js" with { type: "text" };
|
||||||
import { FeatureGates } from "@/utils/feature-gates.js";
|
import { FeatureGates } from "@/utils/feature-gates.js";
|
||||||
|
import { UiSection } from "@/enums/ui-sections.js";
|
||||||
|
|
||||||
type PatchArray = (keyof typeof PATCHES)[];
|
type PatchArray = (keyof typeof PATCHES)[];
|
||||||
|
|
||||||
@ -189,12 +191,18 @@ if (!!window.BX_REMOTE_PLAY_CONFIG) {
|
|||||||
},
|
},
|
||||||
|
|
||||||
enableXcloudLogger(str: string) {
|
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)) {
|
if (!str.includes(text)) {
|
||||||
return false;
|
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;
|
return str;
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -635,6 +643,151 @@ true` + text;
|
|||||||
str = str.replace(text, 'if (!e) e = "https://www.xbox.com";');
|
str = str.replace(text, 'if (!e) e = "https://www.xbox.com";');
|
||||||
return str;
|
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 = [
|
let PATCH_ORDERS: PatchArray = [
|
||||||
@ -652,11 +805,20 @@ let PATCH_ORDERS: PatchArray = [
|
|||||||
'broadcastPollingMode',
|
'broadcastPollingMode',
|
||||||
|
|
||||||
'exposeStreamSession',
|
'exposeStreamSession',
|
||||||
|
'exposeDialogRoutes',
|
||||||
|
|
||||||
|
'enableTvRoutes',
|
||||||
|
|
||||||
|
'overrideStorageGetSettings',
|
||||||
|
getPref(PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME) && 'patchSetCurrentlyFocusedInteractable',
|
||||||
|
|
||||||
getPref(PrefKey.UI_LAYOUT) !== 'default' && 'websiteLayout',
|
getPref(PrefKey.UI_LAYOUT) !== 'default' && 'websiteLayout',
|
||||||
getPref(PrefKey.LOCAL_CO_OP_ENABLED) && 'supportLocalCoOp',
|
getPref(PrefKey.LOCAL_CO_OP_ENABLED) && 'supportLocalCoOp',
|
||||||
getPref(PrefKey.GAME_FORTNITE_FORCE_CONSOLE) && 'forceFortniteConsole',
|
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) ? [
|
...(getPref(PrefKey.BLOCK_TRACKING) ? [
|
||||||
'disableAiTrack',
|
'disableAiTrack',
|
||||||
'disableTelemetry',
|
'disableTelemetry',
|
||||||
@ -672,7 +834,7 @@ let PATCH_ORDERS: PatchArray = [
|
|||||||
'remotePlayKeepAlive',
|
'remotePlayKeepAlive',
|
||||||
'remotePlayDirectConnectUrl',
|
'remotePlayDirectConnectUrl',
|
||||||
'remotePlayDisableAchievementToast',
|
'remotePlayDisableAchievementToast',
|
||||||
STATES.userAgentHasTouchSupport && 'patchUpdateInputConfigurationAsync',
|
STATES.userAgent.capabilities.touch && 'patchUpdateInputConfigurationAsync',
|
||||||
] : []),
|
] : []),
|
||||||
|
|
||||||
...(BX_FLAGS.EnableXcloudLogging ? [
|
...(BX_FLAGS.EnableXcloudLogging ? [
|
||||||
@ -688,6 +850,8 @@ let PLAYING_PATCH_ORDERS: PatchArray = [
|
|||||||
'patchStreamHud',
|
'patchStreamHud',
|
||||||
'playVibration',
|
'playVibration',
|
||||||
|
|
||||||
|
'alwaysShowStreamHud',
|
||||||
|
|
||||||
// 'exposeEventTarget',
|
// 'exposeEventTarget',
|
||||||
|
|
||||||
// Patch volume control for normal stream
|
// Patch volume control for normal stream
|
||||||
@ -698,10 +862,10 @@ let PLAYING_PATCH_ORDERS: PatchArray = [
|
|||||||
// Skip feedback dialog
|
// Skip feedback dialog
|
||||||
getPref(PrefKey.STREAM_DISABLE_FEEDBACK_DIALOG) && 'skipFeedbackDialog',
|
getPref(PrefKey.STREAM_DISABLE_FEEDBACK_DIALOG) && 'skipFeedbackDialog',
|
||||||
|
|
||||||
...(STATES.userAgentHasTouchSupport ? [
|
...(STATES.userAgent.capabilities.touch ? [
|
||||||
getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'patchShowSensorControls',
|
getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'patchShowSensorControls',
|
||||||
getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'exposeTouchLayoutManager',
|
getPref(PrefKey.STREAM_TOUCH_CONTROLLER) === 'all' && 'exposeTouchLayoutManager',
|
||||||
(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',
|
||||||
getPref(PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY) !== 100 && 'patchTouchControlDefaultOpacity',
|
getPref(PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY) !== 100 && 'patchTouchControlDefaultOpacity',
|
||||||
'patchBabylonRendererClass',
|
'patchBabylonRendererClass',
|
||||||
] : []),
|
] : []),
|
||||||
|
@ -0,0 +1 @@
|
|||||||
|
e && BxEvent.dispatch(window, BxEvent.NAVIGATION_FOCUS_CHANGED, {element: e});
|
@ -7,6 +7,7 @@ import { getPref, PrefKey, setPref } from "@utils/preferences";
|
|||||||
import { t } from "@utils/translation";
|
import { t } from "@utils/translation";
|
||||||
import { localRedirect } from "@modules/ui/ui";
|
import { localRedirect } from "@modules/ui/ui";
|
||||||
import { BxLogger } from "@utils/bx-logger";
|
import { BxLogger } from "@utils/bx-logger";
|
||||||
|
import { HeaderSection } from "./ui/header";
|
||||||
|
|
||||||
const LOG_TAG = 'RemotePlay';
|
const LOG_TAG = 'RemotePlay';
|
||||||
|
|
||||||
@ -97,6 +98,10 @@ export class RemotePlay {
|
|||||||
RemotePlay.#getXhomeToken(() => {
|
RemotePlay.#getXhomeToken(() => {
|
||||||
RemotePlay.#getConsolesList(() => {
|
RemotePlay.#getConsolesList(() => {
|
||||||
BxLogger.info(LOG_TAG, 'Consoles', RemotePlay.#CONSOLES);
|
BxLogger.info(LOG_TAG, 'Consoles', RemotePlay.#CONSOLES);
|
||||||
|
if (RemotePlay.#CONSOLES && RemotePlay.#CONSOLES.length > 0) {
|
||||||
|
STATES.supportedRegion && HeaderSection.showRemotePlayButton();
|
||||||
|
}
|
||||||
|
|
||||||
RemotePlay.#renderConsoles();
|
RemotePlay.#renderConsoles();
|
||||||
BxEvent.dispatch(window, BxEvent.REMOTE_PLAY_READY);
|
BxEvent.dispatch(window, BxEvent.REMOTE_PLAY_READY);
|
||||||
});
|
});
|
||||||
|
@ -91,7 +91,7 @@ export class StreamBadges {
|
|||||||
let batteryLevel = '100%';
|
let batteryLevel = '100%';
|
||||||
let batteryLevelInt = 100;
|
let batteryLevelInt = 100;
|
||||||
let isCharging = false;
|
let isCharging = false;
|
||||||
if ('getBattery' in navigator) {
|
if (STATES.browser.capabilities.batteryApi) {
|
||||||
try {
|
try {
|
||||||
const bm = await (navigator as NavigatorBattery).getBattery();
|
const bm = await (navigator as NavigatorBattery).getBattery();
|
||||||
isCharging = bm.charging;
|
isCharging = bm.charging;
|
||||||
@ -224,7 +224,7 @@ export class StreamBadges {
|
|||||||
|
|
||||||
// Battery
|
// Battery
|
||||||
let batteryLevel = '';
|
let batteryLevel = '';
|
||||||
if ('getBattery' in navigator) {
|
if (STATES.browser.capabilities.batteryApi) {
|
||||||
batteryLevel = '100%';
|
batteryLevel = '100%';
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -338,7 +338,7 @@ export class StreamBadges {
|
|||||||
|
|
||||||
// Get battery level
|
// Get battery level
|
||||||
try {
|
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);
|
streamBadges.startBatteryLevel = Math.round(bm.level * 100);
|
||||||
});
|
});
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
|
@ -103,7 +103,7 @@ export class StreamSettings {
|
|||||||
}],
|
}],
|
||||||
},
|
},
|
||||||
|
|
||||||
STATES.userAgentHasTouchSupport && {
|
STATES.userAgent.capabilities.touch && {
|
||||||
group: 'touch-controller',
|
group: 'touch-controller',
|
||||||
label: t('touch-controller'),
|
label: t('touch-controller'),
|
||||||
items: [{
|
items: [{
|
||||||
@ -240,6 +240,9 @@ export class StreamSettings {
|
|||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
this.#setupDialog();
|
this.#setupDialog();
|
||||||
|
|
||||||
|
// Hide dialog when the Guide menu is shown
|
||||||
|
window.addEventListener(BxEvent.XCLOUD_GUIDE_MENU_SHOWN, e => this.hide());
|
||||||
}
|
}
|
||||||
|
|
||||||
show(tabId?: string) {
|
show(tabId?: string) {
|
||||||
@ -255,6 +258,8 @@ export class StreamSettings {
|
|||||||
|
|
||||||
$container.classList.remove('bx-gone');
|
$container.classList.remove('bx-gone');
|
||||||
document.body.classList.add('bx-no-scroll');
|
document.body.classList.add('bx-no-scroll');
|
||||||
|
|
||||||
|
BxEvent.dispatch(window, BxEvent.XCLOUD_DIALOG_SHOWN);
|
||||||
}
|
}
|
||||||
|
|
||||||
hide() {
|
hide() {
|
||||||
@ -262,6 +267,8 @@ export class StreamSettings {
|
|||||||
this.$container!.classList.add('bx-gone');
|
this.$container!.classList.add('bx-gone');
|
||||||
|
|
||||||
document.body.classList.remove('bx-no-scroll');
|
document.body.classList.remove('bx-no-scroll');
|
||||||
|
|
||||||
|
BxEvent.dispatch(window, BxEvent.XCLOUD_DIALOG_DISMISSED);
|
||||||
}
|
}
|
||||||
|
|
||||||
#setupDialog() {
|
#setupDialog() {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import { PrefKey } from "@utils/preferences"
|
import { PrefKey, getPref } from "@utils/preferences"
|
||||||
import { BxEvent } from "@utils/bx-event"
|
import { BxEvent } from "@utils/bx-event"
|
||||||
import { getPref } from "@utils/preferences"
|
|
||||||
import { CE } from "@utils/html"
|
import { CE } from "@utils/html"
|
||||||
import { t } from "@utils/translation"
|
import { t } from "@utils/translation"
|
||||||
import { STATES } from "@utils/global"
|
import { STATES } from "@utils/global"
|
||||||
@ -143,10 +142,10 @@ export class StreamStats {
|
|||||||
this.#$fps!.textContent = stat.framesPerSecond || 0;
|
this.#$fps!.textContent = stat.framesPerSecond || 0;
|
||||||
|
|
||||||
// Packets Lost
|
// 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 packetsReceived = stat.packetsReceived;
|
||||||
const packetsLostPercentage = (packetsLost * 100 / ((packetsLost + packetsReceived) || 1)).toFixed(2);
|
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
|
// Frames dropped
|
||||||
const framesDropped = stat.framesDropped;
|
const framesDropped = stat.framesDropped;
|
||||||
|
@ -35,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('transitionstart', onTransitionStart);
|
||||||
$container.addEventListener('transitionend', onTransitionEnd);
|
$container.addEventListener('transitionend', onTransitionEnd);
|
||||||
}
|
}
|
||||||
|
87
src/modules/ui/game-tile.ts
Normal file
87
src/modules/ui/game-tile.ts
Normal file
@ -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);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
@ -15,6 +15,7 @@ const SETTINGS_UI = {
|
|||||||
'Better xCloud': {
|
'Better xCloud': {
|
||||||
items: [
|
items: [
|
||||||
PrefKey.BETTER_XCLOUD_LOCALE,
|
PrefKey.BETTER_XCLOUD_LOCALE,
|
||||||
|
PrefKey.SERVER_BYPASS_RESTRICTION,
|
||||||
PrefKey.REMOTE_PLAY_ENABLED,
|
PrefKey.REMOTE_PLAY_ENABLED,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@ -66,8 +67,8 @@ const SETTINGS_UI = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
[t('touch-controller')]: {
|
[t('touch-controller')]: {
|
||||||
note: !STATES.userAgentHasTouchSupport ? '⚠️ ' + t('device-unsupported-touch') : null,
|
note: !STATES.userAgent.capabilities.touch ? '⚠️ ' + t('device-unsupported-touch') : null,
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
items: [
|
items: [
|
||||||
PrefKey.STREAM_TOUCH_CONTROLLER,
|
PrefKey.STREAM_TOUCH_CONTROLLER,
|
||||||
PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF,
|
PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF,
|
||||||
@ -89,17 +90,20 @@ const SETTINGS_UI = {
|
|||||||
items: [
|
items: [
|
||||||
PrefKey.UI_LAYOUT,
|
PrefKey.UI_LAYOUT,
|
||||||
PrefKey.UI_HOME_CONTEXT_MENU_DISABLED,
|
PrefKey.UI_HOME_CONTEXT_MENU_DISABLED,
|
||||||
|
PrefKey.UI_GAME_CARD_SHOW_WAIT_TIME,
|
||||||
|
PrefKey.CONTROLLER_SHOW_CONNECTION_STATUS,
|
||||||
PrefKey.STREAM_SIMPLIFY_MENU,
|
PrefKey.STREAM_SIMPLIFY_MENU,
|
||||||
PrefKey.SKIP_SPLASH_VIDEO,
|
PrefKey.SKIP_SPLASH_VIDEO,
|
||||||
!AppInterface && PrefKey.UI_SCROLLBAR_HIDE,
|
!AppInterface && PrefKey.UI_SCROLLBAR_HIDE,
|
||||||
PrefKey.HIDE_DOTS_ICON,
|
PrefKey.HIDE_DOTS_ICON,
|
||||||
PrefKey.REDUCE_ANIMATIONS,
|
PrefKey.REDUCE_ANIMATIONS,
|
||||||
|
PrefKey.BLOCK_SOCIAL_FEATURES,
|
||||||
|
PrefKey.UI_HIDE_SECTIONS,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|
||||||
[t('other')]: {
|
[t('other')]: {
|
||||||
items: [
|
items: [
|
||||||
PrefKey.BLOCK_SOCIAL_FEATURES,
|
|
||||||
PrefKey.BLOCK_TRACKING,
|
PrefKey.BLOCK_TRACKING,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@ -130,11 +134,12 @@ export function setupSettingsUi() {
|
|||||||
|
|
||||||
const $wrapper = CE('div', {'class': 'bx-settings-wrapper'},
|
const $wrapper = CE('div', {'class': 'bx-settings-wrapper'},
|
||||||
CE('div', {'class': 'bx-settings-title-wrapper'},
|
CE('div', {'class': 'bx-settings-title-wrapper'},
|
||||||
CE('a', {
|
createButton({
|
||||||
'class': 'bx-settings-title',
|
classes: ['bx-settings-title'],
|
||||||
'href': 'https://github.com/redphx/better-xcloud/releases',
|
style: ButtonStyle.FOCUSABLE | ButtonStyle.GHOST,
|
||||||
'target': '_blank',
|
label: 'Better xCloud ' + SCRIPT_VERSION,
|
||||||
}, 'Better xCloud ' + SCRIPT_VERSION),
|
url: 'https://github.com/redphx/better-xcloud/releases',
|
||||||
|
}),
|
||||||
createButton({
|
createButton({
|
||||||
icon: BxIcon.QUESTION,
|
icon: BxIcon.QUESTION,
|
||||||
style: ButtonStyle.FOCUSABLE,
|
style: ButtonStyle.FOCUSABLE,
|
||||||
@ -257,9 +262,9 @@ export function setupSettingsUi() {
|
|||||||
if (setting.experimental) {
|
if (setting.experimental) {
|
||||||
settingLabel = '🧪 ' + settingLabel;
|
settingLabel = '🧪 ' + settingLabel;
|
||||||
if (!settingNote) {
|
if (!settingNote) {
|
||||||
settingNote = t('experimental')
|
settingNote = t('experimental');
|
||||||
} else {
|
} else {
|
||||||
settingNote = `${t('experimental')}: ${settingNote}`
|
settingNote = `${t('experimental')}: ${settingNote}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -340,6 +345,8 @@ export function setupSettingsUi() {
|
|||||||
$control.appendChild($option);
|
$control.appendChild($option);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$control.disabled = Object.keys(STATES.serverRegions).length === 0;
|
||||||
|
|
||||||
// Select preferred region
|
// Select preferred region
|
||||||
$control.value = selectedValue;
|
$control.value = selectedValue;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1,33 +1,97 @@
|
|||||||
import { BxEvent } from "@/utils/bx-event";
|
import { BxEvent } from "@/utils/bx-event";
|
||||||
import { AppInterface, STATES } from "@/utils/global";
|
import { AppInterface, STATES } from "@/utils/global";
|
||||||
import { createButton, ButtonStyle } from "@/utils/html";
|
import { createButton, ButtonStyle, CE } from "@/utils/html";
|
||||||
import { t } from "@/utils/translation";
|
import { t } from "@/utils/translation";
|
||||||
|
import { StreamSettings } from "../stream/stream-settings";
|
||||||
|
|
||||||
export enum GuideMenuTab {
|
export enum GuideMenuTab {
|
||||||
HOME,
|
HOME,
|
||||||
}
|
}
|
||||||
|
|
||||||
export class GuideMenu {
|
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) {
|
static #injectHome($root: HTMLElement) {
|
||||||
// Find the last divider
|
// Find the last divider
|
||||||
const $dividers = $root.querySelectorAll('div[class*=Divider-module__divider]');
|
const $dividers = $root.querySelectorAll('div[class*=Divider-module__divider]');
|
||||||
if (!$dividers) {
|
if (!$dividers) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const $lastDivider = $dividers[$dividers.length - 1];
|
|
||||||
|
|
||||||
// Add "Close app" button
|
const buttons: HTMLElement[] = [];
|
||||||
|
|
||||||
|
// "Stream settings" button
|
||||||
|
buttons.push(GuideMenu.#BUTTONS.streamSetting);
|
||||||
|
|
||||||
|
// "App settings" & "Close app" buttons
|
||||||
if (AppInterface) {
|
if (AppInterface) {
|
||||||
const $btnQuit = createButton({
|
buttons.push(GuideMenu.#BUTTONS.appSettings);
|
||||||
label: t('close-app'),
|
buttons.push(GuideMenu.#BUTTONS.closeApp);
|
||||||
style: ButtonStyle.FULL_WIDTH | ButtonStyle.FOCUSABLE | ButtonStyle.DANGER,
|
|
||||||
onClick: e => {
|
|
||||||
AppInterface.closeApp();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
$lastDivider.insertAdjacentElement('afterend', $btnQuit);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const $buttons = GuideMenu.#renderButtons(buttons);
|
||||||
|
|
||||||
|
const $lastDivider = $dividers[$dividers.length - 1];
|
||||||
|
$lastDivider.insertAdjacentElement('afterend', $buttons);
|
||||||
}
|
}
|
||||||
|
|
||||||
static #injectHomePlaying($root: HTMLElement) {
|
static #injectHomePlaying($root: HTMLElement) {
|
||||||
@ -36,25 +100,19 @@ export class GuideMenu {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add buttons
|
const buttons: HTMLElement[] = [];
|
||||||
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({
|
buttons.push(GuideMenu.#BUTTONS.streamSetting);
|
||||||
label: t('back-to-home'),
|
AppInterface && buttons.push(GuideMenu.#BUTTONS.appSettings);
|
||||||
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);
|
// Reload stream
|
||||||
$btnReload.insertAdjacentElement('afterend', $btnHome);
|
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
|
// Hide xCloud's Home button
|
||||||
const $btnXcloudHome = $root.querySelector('div[class^=HomeButtonWithDivider]') as HTMLElement;
|
const $btnXcloudHome = $root.querySelector('div[class^=HomeButtonWithDivider]') as HTMLElement;
|
||||||
@ -65,11 +123,13 @@ export class GuideMenu {
|
|||||||
const where = (e as any).where as GuideMenuTab;
|
const where = (e as any).where as GuideMenuTab;
|
||||||
|
|
||||||
if (where === GuideMenuTab.HOME) {
|
if (where === GuideMenuTab.HOME) {
|
||||||
const $root = document.querySelector('#gamepass-dialog-root div[role=dialog]') as HTMLElement;
|
const $root = document.querySelector('#gamepass-dialog-root div[role=dialog] div[role=tabpanel] div[class*=HomeLandingPage]') as HTMLElement;
|
||||||
if (STATES.isPlaying) {
|
if ($root) {
|
||||||
GuideMenu.#injectHomePlaying($root);
|
if (STATES.isPlaying) {
|
||||||
} else {
|
GuideMenu.#injectHomePlaying($root);
|
||||||
GuideMenu.#injectHome($root);
|
} else {
|
||||||
|
GuideMenu.#injectHome($root);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { SCRIPT_VERSION } from "@utils/global";
|
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 { BxIcon } from "@utils/bx-icon";
|
||||||
import { getPreferredServerRegion } from "@utils/region";
|
import { getPreferredServerRegion } from "@utils/region";
|
||||||
import { PrefKey, getPref } from "@utils/preferences";
|
import { PrefKey, getPref } from "@utils/preferences";
|
||||||
@ -7,35 +7,20 @@ import { RemotePlay } from "@modules/remote-play";
|
|||||||
import { t } from "@utils/translation";
|
import { t } from "@utils/translation";
|
||||||
import { setupSettingsUi } from "./global-settings";
|
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'],
|
classes: ['bx-header-settings-button'],
|
||||||
label: PREF_PREFERRED_REGION,
|
label: '???',
|
||||||
style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE | ButtonStyle.FULL_HEIGHT,
|
style: ButtonStyle.GHOST | ButtonStyle.FOCUSABLE | ButtonStyle.FULL_HEIGHT,
|
||||||
onClick: e => {
|
onClick: e => {
|
||||||
setupSettingsUi();
|
setupSettingsUi();
|
||||||
@ -47,39 +32,58 @@ function injectSettingsButton($parent?: HTMLElement) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show new update status
|
static #$buttonsWrapper = CE('div', {},
|
||||||
if (!SCRIPT_VERSION.includes('beta') && 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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -26,8 +26,10 @@ export function localRedirect(path: string) {
|
|||||||
$anchor.click();
|
$anchor.click();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export function setupStreamUi() {
|
export function setupStreamUi() {
|
||||||
StreamSettings.getInstance();
|
StreamSettings.getInstance();
|
||||||
onChangeVideoPlayerType();
|
onChangeVideoPlayerType();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
(window as any).localRedirect = localRedirect;
|
||||||
|
30
src/types/index.d.ts
vendored
30
src/types/index.d.ts
vendored
@ -24,12 +24,28 @@ interface NavigatorBattery extends Navigator {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type BxStates = {
|
type BxStates = {
|
||||||
|
supportedRegion: boolean;
|
||||||
|
serverRegions: any;
|
||||||
|
selectedRegion: any;
|
||||||
|
gsToken: string;
|
||||||
|
|
||||||
|
|
||||||
isPlaying: boolean;
|
isPlaying: boolean;
|
||||||
appContext: any | null;
|
appContext: any | null;
|
||||||
serverRegions: any;
|
|
||||||
|
|
||||||
userAgentHasTouchSupport: boolean;
|
browser: {
|
||||||
browserHasTouchSupport: boolean;
|
capabilities: {
|
||||||
|
touch: boolean;
|
||||||
|
batteryApi: boolean;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
userAgent: {
|
||||||
|
isTv: boolean;
|
||||||
|
capabilities: {
|
||||||
|
touch: boolean;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
currentStream: Partial<{
|
currentStream: Partial<{
|
||||||
titleId: string;
|
titleId: string;
|
||||||
@ -58,6 +74,8 @@ type BxStates = {
|
|||||||
type DualEnum = {[index: string]: number} & {[index: number]: string};
|
type DualEnum = {[index: string]: number} & {[index: number]: string};
|
||||||
|
|
||||||
type XcloudTitleInfo = {
|
type XcloudTitleInfo = {
|
||||||
|
titleId: string,
|
||||||
|
|
||||||
details: {
|
details: {
|
||||||
productId: string;
|
productId: string;
|
||||||
supportedInputTypes: InputType[];
|
supportedInputTypes: InputType[];
|
||||||
@ -75,6 +93,12 @@ type XcloudTitleInfo = {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type XcloudWaitTimeInfo = Partial<{
|
||||||
|
estimatedAllocationTimeInSeconds: number,
|
||||||
|
estimatedProvisioningTimeInSeconds: number,
|
||||||
|
estimatedTotalWaitTimeInSeconds: number,
|
||||||
|
}>;
|
||||||
|
|
||||||
declare module '*.js';
|
declare module '*.js';
|
||||||
declare module '*.svg';
|
declare module '*.svg';
|
||||||
declare module '*.styl';
|
declare module '*.styl';
|
||||||
|
@ -26,6 +26,7 @@ export enum BxEvent {
|
|||||||
REMOTE_PLAY_FAILED = 'bx-remote-play-failed',
|
REMOTE_PLAY_FAILED = 'bx-remote-play-failed',
|
||||||
|
|
||||||
XCLOUD_SERVERS_READY = 'bx-servers-ready',
|
XCLOUD_SERVERS_READY = 'bx-servers-ready',
|
||||||
|
XCLOUD_SERVERS_UNAVAILABLE = 'bx-servers-unavailable',
|
||||||
|
|
||||||
DATA_CHANNEL_CREATED = 'bx-data-channel-created',
|
DATA_CHANNEL_CREATED = 'bx-data-channel-created',
|
||||||
|
|
||||||
@ -38,6 +39,8 @@ export enum BxEvent {
|
|||||||
POINTER_LOCK_REQUESTED = 'bx-pointer-lock-requested',
|
POINTER_LOCK_REQUESTED = 'bx-pointer-lock-requested',
|
||||||
POINTER_LOCK_EXITED = 'bx-pointer-lock-exited',
|
POINTER_LOCK_EXITED = 'bx-pointer-lock-exited',
|
||||||
|
|
||||||
|
NAVIGATION_FOCUS_CHANGED = 'bx-nav-focus-changed',
|
||||||
|
|
||||||
// xCloud Dialog events
|
// xCloud Dialog events
|
||||||
XCLOUD_DIALOG_SHOWN = 'bx-xcloud-dialog-shown',
|
XCLOUD_DIALOG_SHOWN = 'bx-xcloud-dialog-shown',
|
||||||
XCLOUD_DIALOG_DISMISSED = 'bx-xcloud-dialog-dismissed',
|
XCLOUD_DIALOG_DISMISSED = 'bx-xcloud-dialog-dismissed',
|
||||||
|
@ -34,7 +34,7 @@ export const BxExposed = {
|
|||||||
|
|
||||||
titleInfo.details.hasMkbSupport = supportedInputTypes.includes(InputType.MKB);
|
titleInfo.details.hasMkbSupport = supportedInputTypes.includes(InputType.MKB);
|
||||||
|
|
||||||
if (STATES.userAgentHasTouchSupport) {
|
if (STATES.userAgent.capabilities.touch) {
|
||||||
let touchControllerAvailability = getPref(PrefKey.STREAM_TOUCH_CONTROLLER);
|
let touchControllerAvailability = getPref(PrefKey.STREAM_TOUCH_CONTROLLER);
|
||||||
|
|
||||||
// Disable touch control when gamepad found
|
// Disable touch control when gamepad found
|
||||||
@ -109,4 +109,10 @@ export const BxExposed = {
|
|||||||
|
|
||||||
handleControllerShortcut: ControllerShortcut.handle,
|
handleControllerShortcut: ControllerShortcut.handle,
|
||||||
resetControllerShortcut: ControllerShortcut.reset,
|
resetControllerShortcut: ControllerShortcut.reset,
|
||||||
|
|
||||||
|
overrideSettings: {
|
||||||
|
'Tv_settings': {
|
||||||
|
hasCompletedOnboarding: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
@ -11,6 +11,8 @@ type BxFlags = Partial<{
|
|||||||
FeatureGates: {[key: string]: boolean} | null,
|
FeatureGates: {[key: string]: boolean} | null,
|
||||||
|
|
||||||
ScriptUi: 'default' | 'tv',
|
ScriptUi: 'default' | 'tv',
|
||||||
|
|
||||||
|
IsSupportedTvBrowser: boolean,
|
||||||
}>
|
}>
|
||||||
|
|
||||||
// Setup flags
|
// Setup flags
|
||||||
|
@ -1,23 +1,33 @@
|
|||||||
import { CE } from "@utils/html";
|
import { CE } from "@utils/html";
|
||||||
import { PrefKey, getPref } from "@utils/preferences";
|
import { PrefKey, getPref } from "@utils/preferences";
|
||||||
import { renderStylus } from "@macros/build" with {type: "macro"};
|
import { renderStylus } from "@macros/build" with {type: "macro"};
|
||||||
|
import { UiSection } from "@/enums/ui-sections";
|
||||||
|
|
||||||
|
|
||||||
export function addCss() {
|
export function addCss() {
|
||||||
const STYLUS_CSS = renderStylus();
|
const STYLUS_CSS = renderStylus();
|
||||||
let css = STYLUS_CSS;
|
let css = STYLUS_CSS;
|
||||||
|
|
||||||
|
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)) {
|
if (getPref(PrefKey.BLOCK_SOCIAL_FEATURES)) {
|
||||||
css += `
|
selectorToHide.push('#gamepass-dialog-root div[class^=AchievementsPreview-module__container] + button[class*=HomeLandingPage-module__button]');
|
||||||
/* Hide "Play with friends" section */
|
}
|
||||||
div[class^=HomePage-module__bottomSpacing]:has(button[class*=SocialEmptyCard]),
|
|
||||||
button[class*=SocialEmptyCard],
|
if (selectorToHide) {
|
||||||
/* Hide "Start a party" button in the Guide menu */
|
css += selectorToHide.join(',') + '{ display: none; }';
|
||||||
#gamepass-dialog-root div[class^=AchievementsPreview-module__container] + button[class*=HomeLandingPage-module__button]
|
|
||||||
{
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reduce animations
|
// Reduce animations
|
||||||
|
@ -3,6 +3,7 @@ import { getPref, PrefKey } from "./preferences";
|
|||||||
|
|
||||||
export let FeatureGates: {[key: string]: boolean} = {
|
export let FeatureGates: {[key: string]: boolean} = {
|
||||||
'PwaPrompt': false,
|
'PwaPrompt': false,
|
||||||
|
'EnableWifiWarnings': false,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Disable context menu in Home page
|
// Disable context menu in Home page
|
||||||
|
@ -13,11 +13,27 @@ const browserHasTouchSupport = 'ontouchstart' in window || navigator.maxTouchPoi
|
|||||||
const userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport;
|
const userAgentHasTouchSupport = !isTv && !isVr && browserHasTouchSupport;
|
||||||
|
|
||||||
export const STATES: BxStates = {
|
export const STATES: BxStates = {
|
||||||
|
supportedRegion: true,
|
||||||
|
serverRegions: {},
|
||||||
|
selectedRegion: {},
|
||||||
|
gsToken: '',
|
||||||
|
|
||||||
isPlaying: false,
|
isPlaying: false,
|
||||||
appContext: {},
|
appContext: {},
|
||||||
serverRegions: {},
|
|
||||||
userAgentHasTouchSupport: userAgentHasTouchSupport,
|
browser: {
|
||||||
browserHasTouchSupport: browserHasTouchSupport,
|
capabilities: {
|
||||||
|
touch: browserHasTouchSupport,
|
||||||
|
batteryApi: 'getBattery' in window.navigator,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
userAgent: {
|
||||||
|
isTv: isTv,
|
||||||
|
capabilities: {
|
||||||
|
touch: userAgentHasTouchSupport,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
currentStream: {},
|
currentStream: {},
|
||||||
remotePlay: {},
|
remotePlay: {},
|
||||||
@ -31,7 +47,7 @@ export function deepClone(obj: any): any {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!obj) {
|
if (!obj) {
|
||||||
return obj;
|
return {};
|
||||||
}
|
}
|
||||||
|
|
||||||
return JSON.parse(JSON.stringify(obj));
|
return JSON.parse(JSON.stringify(obj));
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { BxEvent } from "@utils/bx-event";
|
import { BxEvent } from "@utils/bx-event";
|
||||||
import { LoadingScreen } from "@modules/loading-screen";
|
import { LoadingScreen } from "@modules/loading-screen";
|
||||||
import { RemotePlay } from "@modules/remote-play";
|
import { RemotePlay } from "@modules/remote-play";
|
||||||
import { checkHeader } from "@modules/ui/header";
|
import { HeaderSection } from "@/modules/ui/header";
|
||||||
|
|
||||||
export function patchHistoryMethod(type: 'pushState' | 'replaceState') {
|
export function patchHistoryMethod(type: 'pushState' | 'replaceState') {
|
||||||
const orig = window.history[type];
|
const orig = window.history[type];
|
||||||
@ -34,7 +34,7 @@ export function onHistoryChanged(e: PopStateEvent) {
|
|||||||
RemotePlay.detachPopup();
|
RemotePlay.detachPopup();
|
||||||
|
|
||||||
LoadingScreen.reset();
|
LoadingScreen.reset();
|
||||||
window.setTimeout(checkHeader, 2000);
|
window.setTimeout(HeaderSection.watchHeader, 2000);
|
||||||
|
|
||||||
BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
|
BxEvent.dispatch(window, BxEvent.STREAM_STOPPED);
|
||||||
}
|
}
|
||||||
|
@ -104,6 +104,16 @@ export const createButton = <T=HTMLButtonElement>(options: BxButton): T => {
|
|||||||
return $btn as T;
|
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 {
|
export function escapeHtml(html: string): string {
|
||||||
const text = document.createTextNode(html);
|
const text = document.createTextNode(html);
|
||||||
const $span = document.createElement('span');
|
const $span = document.createElement('span');
|
||||||
|
@ -11,8 +11,6 @@ export function patchVideoApi() {
|
|||||||
// Show video player when it's ready
|
// Show video player when it's ready
|
||||||
const showFunc = function(this: HTMLVideoElement) {
|
const showFunc = function(this: HTMLVideoElement) {
|
||||||
this.style.visibility = 'visible';
|
this.style.visibility = 'visible';
|
||||||
this.removeEventListener('playing', showFunc);
|
|
||||||
|
|
||||||
if (!this.videoWidth) {
|
if (!this.videoWidth) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -49,7 +47,7 @@ export function patchVideoApi() {
|
|||||||
const $parent = this.parentElement!!;
|
const $parent = this.parentElement!!;
|
||||||
// Video tag is stream player
|
// Video tag is stream player
|
||||||
if (!this.src && $parent.dataset.testid === 'media-container') {
|
if (!this.src && $parent.dataset.testid === 'media-container') {
|
||||||
this.addEventListener('playing', showFunc);
|
this.addEventListener('loadedmetadata', showFunc, {once: true});
|
||||||
}
|
}
|
||||||
|
|
||||||
return nativePlay.apply(this);
|
return nativePlay.apply(this);
|
||||||
@ -163,6 +161,8 @@ export function patchMeControl() {
|
|||||||
API: {
|
API: {
|
||||||
setDisplayMode: () => {},
|
setDisplayMode: () => {},
|
||||||
setMobileState: () => {},
|
setMobileState: () => {},
|
||||||
|
addEventListener: () => {},
|
||||||
|
removeEventListener: () => {},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
import { BxEvent } from "@utils/bx-event";
|
import { BxEvent } from "@utils/bx-event";
|
||||||
import { BX_FLAGS, NATIVE_FETCH } from "@utils/bx-flags";
|
import { BX_FLAGS, NATIVE_FETCH } from "@utils/bx-flags";
|
||||||
import { LoadingScreen } from "@modules/loading-screen";
|
|
||||||
import { PrefKey, getPref } from "@utils/preferences";
|
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 { TouchController } from "@modules/touch-controller";
|
||||||
import { STATES } from "@utils/global";
|
import { STATES } from "@utils/global";
|
||||||
import { getPreferredServerRegion } from "@utils/region";
|
|
||||||
import { GamePassCloudGallery } from "../enums/game-pass-gallery";
|
import { GamePassCloudGallery } from "../enums/game-pass-gallery";
|
||||||
import { InputType } from "./bx-exposed";
|
|
||||||
import { FeatureGates } from "./feature-gates";
|
import { FeatureGates } from "./feature-gates";
|
||||||
|
import { BxLogger } from "./bx-logger";
|
||||||
|
import { XhomeInterceptor } from "./xhome-interceptor";
|
||||||
|
import { XcloudInterceptor } from "./xcloud-interceptor";
|
||||||
|
|
||||||
enum RequestType {
|
enum RequestType {
|
||||||
XCLOUD = 'xcloud',
|
XCLOUD = 'xcloud',
|
||||||
@ -95,12 +93,12 @@ function updateIceCandidates(candidates: any, options: any) {
|
|||||||
|
|
||||||
newCandidates.push(newCandidate('a=end-of-candidates'));
|
newCandidates.push(newCandidate('a=end-of-candidates'));
|
||||||
|
|
||||||
console.log(newCandidates);
|
BxLogger.info('ICE Candidates', newCandidates);
|
||||||
return 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 response = await NATIVE_FETCH(request);
|
||||||
const text = await response.clone().text();
|
const text = await response.clone().text();
|
||||||
|
|
||||||
@ -124,379 +122,6 @@ async function patchIceCandidates(request: Request, consoleAddrs?: {[index: stri
|
|||||||
return response;
|
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;
|
|
||||||
|
|
||||||
let overrideMkb: boolean | null = null;
|
|
||||||
|
|
||||||
if (getPref(PrefKey.NATIVE_MKB_ENABLED) === 'on' || 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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export function interceptHttpRequests() {
|
export function interceptHttpRequests() {
|
||||||
let BLOCKED_URLS: string[] = [];
|
let BLOCKED_URLS: string[] = [];
|
||||||
if (getPref(PrefKey.BLOCK_TRACKING)) {
|
if (getPref(PrefKey.BLOCK_TRACKING)) {
|
||||||
@ -576,7 +201,7 @@ export function interceptHttpRequests() {
|
|||||||
const response = await NATIVE_FETCH(request, init);
|
const response = await NATIVE_FETCH(request, init);
|
||||||
const json = await response.json();
|
const json = await response.json();
|
||||||
|
|
||||||
if (json && json.exp && json.treatments) {
|
if (json && json.exp && json.exp.treatments) {
|
||||||
for (const key in FeatureGates) {
|
for (const key in FeatureGates) {
|
||||||
json.exp.treatments[key] = FeatureGates[key]
|
json.exp.treatments[key] = FeatureGates[key]
|
||||||
}
|
}
|
||||||
@ -590,7 +215,7 @@ export function interceptHttpRequests() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add list of games with custom layouts to the official list
|
// Add list of games with custom layouts to the official list
|
||||||
if (STATES.userAgentHasTouchSupport && 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 response = await NATIVE_FETCH(request, init);
|
||||||
const obj = await response.clone().json();
|
const obj = await response.clone().json();
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { CE } from "@utils/html";
|
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 { SettingElement, SettingElementType } from "@utils/settings";
|
||||||
import { UserAgent } from "@utils/user-agent";
|
import { UserAgent } from "@utils/user-agent";
|
||||||
import { StreamStat } from "@modules/stream/stream-stats";
|
import { StreamStat } from "@modules/stream/stream-stats";
|
||||||
@ -7,6 +7,7 @@ import type { PreferenceSetting, PreferenceSettings } from "@/types/preferences"
|
|||||||
import { AppInterface, STATES } from "@utils/global";
|
import { AppInterface, STATES } from "@utils/global";
|
||||||
import { StreamPlayerType, StreamVideoProcessing } from "@enums/stream-player";
|
import { StreamPlayerType, StreamVideoProcessing } from "@enums/stream-player";
|
||||||
import { UserAgentProfile } from "@/enums/user-agent";
|
import { UserAgentProfile } from "@/enums/user-agent";
|
||||||
|
import { UiSection } from "@/enums/ui-sections";
|
||||||
|
|
||||||
export enum PrefKey {
|
export enum PrefKey {
|
||||||
LAST_UPDATE_CHECK = 'version_last_check',
|
LAST_UPDATE_CHECK = 'version_last_check',
|
||||||
@ -16,6 +17,8 @@ export enum PrefKey {
|
|||||||
BETTER_XCLOUD_LOCALE = 'bx_locale',
|
BETTER_XCLOUD_LOCALE = 'bx_locale',
|
||||||
|
|
||||||
SERVER_REGION = 'server_region',
|
SERVER_REGION = 'server_region',
|
||||||
|
SERVER_BYPASS_RESTRICTION = 'server_bypass_restriction',
|
||||||
|
|
||||||
PREFER_IPV6_SERVER = 'prefer_ipv6_server',
|
PREFER_IPV6_SERVER = 'prefer_ipv6_server',
|
||||||
STREAM_TARGET_RESOLUTION = 'stream_target_resolution',
|
STREAM_TARGET_RESOLUTION = 'stream_target_resolution',
|
||||||
STREAM_PREFERRED_LOCALE = 'stream_preferred_locale',
|
STREAM_PREFERRED_LOCALE = 'stream_preferred_locale',
|
||||||
@ -45,6 +48,7 @@ export enum PrefKey {
|
|||||||
CONTROLLER_ENABLE_VIBRATION = 'controller_enable_vibration',
|
CONTROLLER_ENABLE_VIBRATION = 'controller_enable_vibration',
|
||||||
CONTROLLER_DEVICE_VIBRATION = 'controller_device_vibration',
|
CONTROLLER_DEVICE_VIBRATION = 'controller_device_vibration',
|
||||||
CONTROLLER_VIBRATION_INTENSITY = 'controller_vibration_intensity',
|
CONTROLLER_VIBRATION_INTENSITY = 'controller_vibration_intensity',
|
||||||
|
CONTROLLER_SHOW_CONNECTION_STATUS = 'controller_show_connection_status',
|
||||||
|
|
||||||
NATIVE_MKB_ENABLED = 'native_mkb_enabled',
|
NATIVE_MKB_ENABLED = 'native_mkb_enabled',
|
||||||
NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY = 'native_mkb_scroll_x_sensitivity',
|
NATIVE_MKB_SCROLL_HORIZONTAL_SENSITIVITY = 'native_mkb_scroll_x_sensitivity',
|
||||||
@ -69,8 +73,10 @@ export enum PrefKey {
|
|||||||
|
|
||||||
UI_LAYOUT = 'ui_layout',
|
UI_LAYOUT = 'ui_layout',
|
||||||
UI_SCROLLBAR_HIDE = 'ui_scrollbar_hide',
|
UI_SCROLLBAR_HIDE = 'ui_scrollbar_hide',
|
||||||
|
UI_HIDE_SECTIONS = 'ui_hide_sections',
|
||||||
|
|
||||||
UI_HOME_CONTEXT_MENU_DISABLED = 'ui_home_context_menu_disabled',
|
UI_HOME_CONTEXT_MENU_DISABLED = 'ui_home_context_menu_disabled',
|
||||||
|
UI_GAME_CARD_SHOW_WAIT_TIME = 'ui_game_card_show_wait_time',
|
||||||
|
|
||||||
VIDEO_PLAYER_TYPE = 'video_player_type',
|
VIDEO_PLAYER_TYPE = 'video_player_type',
|
||||||
VIDEO_PROCESSING = 'video_processing',
|
VIDEO_PROCESSING = 'video_processing',
|
||||||
@ -119,6 +125,12 @@ export class Preferences {
|
|||||||
label: t('region'),
|
label: t('region'),
|
||||||
default: 'default',
|
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]: {
|
[PrefKey.STREAM_PREFERRED_LOCALE]: {
|
||||||
label: t('preferred-game-language'),
|
label: t('preferred-game-language'),
|
||||||
default: 'default',
|
default: 'default',
|
||||||
@ -267,7 +279,7 @@ export class Preferences {
|
|||||||
all: t('tc-all-games'),
|
all: t('tc-all-games'),
|
||||||
off: t('off'),
|
off: t('off'),
|
||||||
},
|
},
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
ready: (setting: PreferenceSetting) => {
|
ready: (setting: PreferenceSetting) => {
|
||||||
if (setting.unsupported) {
|
if (setting.unsupported) {
|
||||||
setting.default = 'default';
|
setting.default = 'default';
|
||||||
@ -277,7 +289,7 @@ export class Preferences {
|
|||||||
[PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF]: {
|
[PrefKey.STREAM_TOUCH_CONTROLLER_AUTO_OFF]: {
|
||||||
label: t('tc-auto-off'),
|
label: t('tc-auto-off'),
|
||||||
default: false,
|
default: false,
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
},
|
},
|
||||||
[PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY]: {
|
[PrefKey.STREAM_TOUCH_CONTROLLER_DEFAULT_OPACITY]: {
|
||||||
type: SettingElementType.NUMBER_STEPPER,
|
type: SettingElementType.NUMBER_STEPPER,
|
||||||
@ -291,7 +303,7 @@ export class Preferences {
|
|||||||
ticks: 10,
|
ticks: 10,
|
||||||
hideSlider: true,
|
hideSlider: true,
|
||||||
},
|
},
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
},
|
},
|
||||||
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD]: {
|
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_STANDARD]: {
|
||||||
label: t('tc-standard-layout-style'),
|
label: t('tc-standard-layout-style'),
|
||||||
@ -301,7 +313,7 @@ export class Preferences {
|
|||||||
white: t('tc-all-white'),
|
white: t('tc-all-white'),
|
||||||
muted: t('tc-muted-colors'),
|
muted: t('tc-muted-colors'),
|
||||||
},
|
},
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
},
|
},
|
||||||
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_CUSTOM]: {
|
[PrefKey.STREAM_TOUCH_CONTROLLER_STYLE_CUSTOM]: {
|
||||||
label: t('tc-custom-layout-style'),
|
label: t('tc-custom-layout-style'),
|
||||||
@ -310,7 +322,7 @@ export class Preferences {
|
|||||||
default: t('default'),
|
default: t('default'),
|
||||||
muted: t('tc-muted-colors'),
|
muted: t('tc-muted-colors'),
|
||||||
},
|
},
|
||||||
unsupported: !STATES.userAgentHasTouchSupport,
|
unsupported: !STATES.userAgent.capabilities.touch,
|
||||||
},
|
},
|
||||||
|
|
||||||
[PrefKey.STREAM_SIMPLIFY_MENU]: {
|
[PrefKey.STREAM_SIMPLIFY_MENU]: {
|
||||||
@ -384,6 +396,11 @@ export class Preferences {
|
|||||||
},
|
},
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
[PrefKey.CONTROLLER_SHOW_CONNECTION_STATUS]: {
|
||||||
|
label: t('show-controller-connection-status'),
|
||||||
|
default: true,
|
||||||
|
},
|
||||||
|
|
||||||
[PrefKey.CONTROLLER_ENABLE_SHORTCUTS]: {
|
[PrefKey.CONTROLLER_ENABLE_SHORTCUTS]: {
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
@ -548,7 +565,26 @@ export class Preferences {
|
|||||||
|
|
||||||
[PrefKey.UI_HOME_CONTEXT_MENU_DISABLED]: {
|
[PrefKey.UI_HOME_CONTEXT_MENU_DISABLED]: {
|
||||||
label: t('disable-home-context-menu'),
|
label: t('disable-home-context-menu'),
|
||||||
default: STATES.browserHasTouchSupport,
|
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,
|
||||||
},
|
},
|
||||||
|
|
||||||
[PrefKey.BLOCK_SOCIAL_FEATURES]: {
|
[PrefKey.BLOCK_SOCIAL_FEATURES]: {
|
||||||
@ -567,8 +603,8 @@ export class Preferences {
|
|||||||
[UserAgentProfile.DEFAULT]: t('default'),
|
[UserAgentProfile.DEFAULT]: t('default'),
|
||||||
[UserAgentProfile.WINDOWS_EDGE]: 'Edge + Windows',
|
[UserAgentProfile.WINDOWS_EDGE]: 'Edge + Windows',
|
||||||
[UserAgentProfile.MACOS_SAFARI]: 'Safari + macOS',
|
[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.VR_OCULUS]: 'Meta Quest VR',
|
||||||
[UserAgentProfile.CUSTOM]: t('custom'),
|
[UserAgentProfile.CUSTOM]: t('custom'),
|
||||||
},
|
},
|
||||||
|
@ -24,7 +24,7 @@ export function overridePreloadState() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Add list of games with custom layouts to the official list
|
// Add list of games with custom layouts to the official list
|
||||||
if (STATES.userAgentHasTouchSupport) {
|
if (STATES.userAgent.capabilities.touch) {
|
||||||
try {
|
try {
|
||||||
const sigls = state.xcloud.sigls;
|
const sigls = state.xcloud.sigls;
|
||||||
if (GamePassCloudGallery.TOUCH in sigls) {
|
if (GamePassCloudGallery.TOUCH in sigls) {
|
||||||
|
@ -57,7 +57,7 @@ export class Screenshot {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$player.parentElement!.addEventListener('animationend', this.#onAnimationEnd);
|
$player.parentElement!.addEventListener('animationend', this.#onAnimationEnd, { once: true });
|
||||||
$player.parentElement!.classList.add('bx-taking-screenshot');
|
$player.parentElement!.classList.add('bx-taking-screenshot');
|
||||||
|
|
||||||
const canvasContext = Screenshot.#canvasContext;
|
const canvasContext = Screenshot.#canvasContext;
|
||||||
|
@ -27,7 +27,7 @@ export enum SettingElementType {
|
|||||||
export class SettingElement {
|
export class SettingElement {
|
||||||
static #renderOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any) {
|
static #renderOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any) {
|
||||||
const $control = CE<HTMLSelectElement>('select', {
|
const $control = CE<HTMLSelectElement>('select', {
|
||||||
title: setting.label,
|
// title: setting.label,
|
||||||
tabindex: 0,
|
tabindex: 0,
|
||||||
}) as HTMLSelectElement;
|
}) as HTMLSelectElement;
|
||||||
for (let value in setting.options) {
|
for (let value in setting.options) {
|
||||||
@ -54,7 +54,7 @@ export class SettingElement {
|
|||||||
|
|
||||||
static #renderMultipleOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any, params: MultipleOptionsParams={}) {
|
static #renderMultipleOptions(key: string, setting: PreferenceSetting, currentValue: any, onChange: any, params: MultipleOptionsParams={}) {
|
||||||
const $control = CE<HTMLSelectElement>('select', {
|
const $control = CE<HTMLSelectElement>('select', {
|
||||||
title: setting.label,
|
// title: setting.label,
|
||||||
multiple: true,
|
multiple: true,
|
||||||
tabindex: 0,
|
tabindex: 0,
|
||||||
});
|
});
|
||||||
|
@ -51,6 +51,7 @@ const Texts = {
|
|||||||
"bottom-right": "Bottom-right",
|
"bottom-right": "Bottom-right",
|
||||||
"brightness": "Brightness",
|
"brightness": "Brightness",
|
||||||
"browser-unsupported-feature": "Your browser doesn't support this feature",
|
"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",
|
"can-stream-xbox-360-games": "Can stream Xbox 360 games",
|
||||||
"cancel": "Cancel",
|
"cancel": "Cancel",
|
||||||
"cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
|
"cant-stream-xbox-360-games": "Can't stream Xbox 360 games",
|
||||||
@ -110,6 +111,7 @@ const Texts = {
|
|||||||
"hide": "Hide",
|
"hide": "Hide",
|
||||||
"hide-idle-cursor": "Hide mouse cursor on idle",
|
"hide-idle-cursor": "Hide mouse cursor on idle",
|
||||||
"hide-scrollbar": "Hide web page's scrollbar",
|
"hide-scrollbar": "Hide web page's scrollbar",
|
||||||
|
"hide-sections": "Hide sections",
|
||||||
"hide-system-menu-icon": "Hide System menu's icon",
|
"hide-system-menu-icon": "Hide System menu's icon",
|
||||||
"hide-touch-controller": "Hide touch controller",
|
"hide-touch-controller": "Hide touch controller",
|
||||||
"horizontal-scroll-sensitivity": "Horizontal scroll sensitivity",
|
"horizontal-scroll-sensitivity": "Horizontal scroll sensitivity",
|
||||||
@ -164,13 +166,13 @@ const Texts = {
|
|||||||
(e: any) => `${e.key} でこの機能を切替`,
|
(e: any) => `${e.key} でこの機能を切替`,
|
||||||
(e: any) => `${e.key} 키를 눌러 이 기능을 켜고 끄세요`,
|
(e: any) => `${e.key} 키를 눌러 이 기능을 켜고 끄세요`,
|
||||||
(e: any) => `Naciśnij ${e.key} aby przełączyć tę funkcję`,
|
(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) => `Нажмите ${e.key} для переключения этой функции`,
|
||||||
,
|
,
|
||||||
(e: any) => `Etkinleştirmek için ${e.key} tuşuna basın`,
|
(e: any) => `Etkinleştirmek için ${e.key} tuşuna basın`,
|
||||||
(e: any) => `Натисніть ${e.key} щоб перемкнути цю функцію`,
|
(e: any) => `Натисніть ${e.key} щоб перемкнути цю функцію`,
|
||||||
(e: any) => `Nhấn ${e.key} để bật/tắt tính năng này`,
|
(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...",
|
"press-to-bind": "Press a key or do a mouse click to bind...",
|
||||||
"prompt-preset-name": "Preset's name:",
|
"prompt-preset-name": "Preset's name:",
|
||||||
@ -191,6 +193,10 @@ const Texts = {
|
|||||||
"save": "Save",
|
"save": "Save",
|
||||||
"screen": "Screen",
|
"screen": "Screen",
|
||||||
"screenshot-apply-filters": "Applies video filters to screenshots",
|
"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": "Separate Touch controller & Controller #1",
|
||||||
"separate-touch-controller-note": "Touch controller is Player 1, Controller #1 is Player 2",
|
"separate-touch-controller-note": "Touch controller is Player 1, Controller #1 is Player 2",
|
||||||
"server": "Server",
|
"server": "Server",
|
||||||
@ -200,11 +206,13 @@ const Texts = {
|
|||||||
"sharpness": "Sharpness",
|
"sharpness": "Sharpness",
|
||||||
"shortcut-keys": "Shortcut keys",
|
"shortcut-keys": "Shortcut keys",
|
||||||
"show": "Show",
|
"show": "Show",
|
||||||
|
"show-controller-connection-status": "Show controller connection status",
|
||||||
"show-game-art": "Show game art",
|
"show-game-art": "Show game art",
|
||||||
"show-hide": "Show/hide",
|
"show-hide": "Show/hide",
|
||||||
"show-stats-on-startup": "Show stats when starting the game",
|
"show-stats-on-startup": "Show stats when starting the game",
|
||||||
"show-touch-controller": "Show touch controller",
|
"show-touch-controller": "Show touch controller",
|
||||||
"show-wait-time": "Show the estimated wait time",
|
"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",
|
"simplify-stream-menu": "Simplify Stream's menu",
|
||||||
"skip-splash-video": "Skip Xbox splash video",
|
"skip-splash-video": "Skip Xbox splash video",
|
||||||
"slow": "Slow",
|
"slow": "Slow",
|
||||||
@ -271,6 +279,7 @@ const Texts = {
|
|||||||
"unmuted": "Unmuted",
|
"unmuted": "Unmuted",
|
||||||
"unsharp-masking": "Unsharp masking",
|
"unsharp-masking": "Unsharp masking",
|
||||||
"use-mouse-absolute-position": "Use mouse's absolute position",
|
"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",
|
"user-agent-profile": "User-Agent profile",
|
||||||
"vertical-scroll-sensitivity": "Vertical scroll sensitivity",
|
"vertical-scroll-sensitivity": "Vertical scroll sensitivity",
|
||||||
"vertical-sensitivity": "Vertical sensitivity",
|
"vertical-sensitivity": "Vertical sensitivity",
|
||||||
|
@ -1,11 +1,14 @@
|
|||||||
import { UserAgentProfile } from "@enums/user-agent";
|
import { UserAgentProfile } from "@enums/user-agent";
|
||||||
import { deepClone } from "./global";
|
import { deepClone } from "./global";
|
||||||
|
import { BX_FLAGS } from "./bx-flags";
|
||||||
|
|
||||||
type UserAgentConfig = {
|
type UserAgentConfig = {
|
||||||
profile: UserAgentProfile,
|
profile: UserAgentProfile,
|
||||||
custom?: string,
|
custom?: string,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const SMART_TV_UNIQUE_ID = 'FC4A1DA2-711C-4E9C-BC7F-047AF8A672EA';
|
||||||
|
|
||||||
let CHROMIUM_VERSION = '123.0.0.0';
|
let CHROMIUM_VERSION = '123.0.0.0';
|
||||||
if (!!(window as any).chrome || window.navigator.userAgent.includes('Chrome')) {
|
if (!!(window as any).chrome || window.navigator.userAgent.includes('Chrome')) {
|
||||||
// Get Chromium version in the original User-Agent value
|
// Get Chromium version in the original User-Agent value
|
||||||
@ -26,8 +29,8 @@ export class UserAgent {
|
|||||||
static #USER_AGENTS: PartialRecord<UserAgentProfile, string> = {
|
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.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.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.VR_OCULUS]: window.navigator.userAgent + ' OculusBrowser VR',
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,7 +119,12 @@ export class UserAgent {
|
|||||||
return;
|
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
|
// Clear data of navigator.userAgentData, force xCloud to detect browser based on navigator.userAgent
|
||||||
(window.navigator as any).orgUserAgentData = (window.navigator as any).userAgentData;
|
(window.navigator as any).orgUserAgentData = (window.navigator as any).userAgentData;
|
||||||
|
79
src/utils/xcloud-api.ts
Normal file
79
src/utils/xcloud-api.ts
Normal file
@ -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;
|
||||||
|
}
|
||||||
|
}
|
223
src/utils/xcloud-interceptor.ts
Normal file
223
src/utils/xcloud-interceptor.ts
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
184
src/utils/xhome-interceptor.ts
Normal file
184
src/utils/xhome-interceptor.ts
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user