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

Allow connecting to IPv6 address when Remote Playing

Browse Source
This commit is contained in:
redphx 2024-01-06 16:46:34 +07:00
parent 989634b52e
commit 25d87c5367
1 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
better-xcloud.user.js
View File

@ -8188,7 +8188,7 @@ function getPreferredServerRegion() {
function updateIceCandidates(candidates, options) { function updateIceCandidates(candidates, options) {
const pattern = new RegExp(/a=candidate:(?<foundation>\d+) (?<component>\d+) UDP (?<priority>\d+) (?<ip>[^\s]+) (?<the_rest>.*)/); const pattern = new RegExp(/a=candidate:(?<foundation>\d+) (?<component>\d+) UDP (?<priority>\d+) (?<ip>[^\s]+) (?<port>\d+) (?<the_rest>.*)/);
const lst = []; const lst = [];
for (let item of candidates) { for (let item of candidates) {
@ -8206,35 +8206,33 @@ function updateIceCandidates(candidates, options) {
const newCandidates = []; const newCandidates = [];
let foundation = 1; let foundation = 1;
const newCandidate = candidate => {
return {
'candidate': candidate,
'messageType': 'iceCandidate',
'sdpMLineIndex': '0',
'sdpMid': '0',
};
};
lst.forEach(item => { lst.forEach(item => {
item.foundation = foundation; item.foundation = foundation;
item.priority = (foundation == 1) ? 10000 : 1; item.priority = (foundation == 1) ? 10000 : 1;
newCandidates.push({ newCandidates.push(newCandidate(`a=candidate:${item.foundation} 1 UDP ${item.priority} ${item.ip} ${item.port} ${item.the_rest}`));
'candidate': `a=candidate:${item.foundation} 1 UDP ${item.priority} ${item.ip} ${item.the_rest}`,
'messageType': 'iceCandidate',
'sdpMLineIndex': '0',
'sdpMid': '0',
});
++foundation; ++foundation;
}); });
if (options.consoleIp) { if (options.consoleAddrs) {
newCandidates.push({ for (const ip in options.consoleAddrs) {
'candidate': `a=candidate:${newCandidates.length + 1} 1 UDP 1 ${options.consoleIp} 9002 typ host`, const port = options.consoleAddrs[ip];
'messageType': 'iceCandidate',
'sdpMLineIndex': '0', newCandidates.push(newCandidate(`a=candidate:${newCandidates.length + 1} 1 UDP 1 ${ip} ${port} typ host`));
'sdpMid': '0', }
});
} }
newCandidates.push({ newCandidates.push(newCandidate('a=end-of-candidates'));
'candidate': 'a=end-of-candidates',
'messageType': 'iceCandidate',
'sdpMLineIndex': '0',
'sdpMid': '0',
});
console.log(newCandidates); console.log(newCandidates);
return newCandidates; return newCandidates;
@ -8323,8 +8321,8 @@ function interceptHttpRequests() {
const PREF_AUDIO_MIC_ON_PLAYING = PREFS.get(Preferences.AUDIO_MIC_ON_PLAYING); const PREF_AUDIO_MIC_ON_PLAYING = PREFS.get(Preferences.AUDIO_MIC_ON_PLAYING);
const orgFetch = window.fetch; const orgFetch = window.fetch;
let consoleIp;
let consolePort; const consoleAddrs = {};
const patchIceCandidates = function(...arg) { const patchIceCandidates = function(...arg) {
// ICE server candidates // ICE server candidates
@ -8342,7 +8340,7 @@ function interceptHttpRequests() {
const options = { const options = {
preferIpv6Server: PREF_PREFER_IPV6_SERVER, preferIpv6Server: PREF_PREFER_IPV6_SERVER,
consoleIp: consoleIp, consoleAddrs: consoleAddrs,
}; };
const obj = JSON.parse(text); const obj = JSON.parse(text);
@ -8412,8 +8410,15 @@ function interceptHttpRequests() {
return promise.then(response => { return promise.then(response => {
return response.clone().json().then(obj => { return response.clone().json().then(obj => {
console.log(obj); console.log(obj);
consoleIp = obj.serverDetails.ipAddress;
consolePort = obj.serverDetails.port; const serverDetails = obj.serverDetails;
if (serverDetails.ipV4Address) {
consoleAddrs[serverDetails.ipV4Address] = serverDetails.ipV4Port;
}
if (serverDetails.ipV6Address) {
consoleAddrs[serverDetails.ipV6Address] = serverDetails.ipV6Port;
}
response.json = () => Promise.resolve(obj); response.json = () => Promise.resolve(obj);
response.text = () => Promise.resolve(JSON.stringify(obj)); response.text = () => Promise.resolve(JSON.stringify(obj));