diff --git a/dist/better-xcloud.user.js b/dist/better-xcloud.user.js index 1d1f2b6..34dea1f 100644 --- a/dist/better-xcloud.user.js +++ b/dist/better-xcloud.user.js @@ -5986,15 +5986,16 @@ class XhomeInterceptor { static async#handleConfiguration(request) { const response = await NATIVE_FETCH(request), obj = await response.clone().json(); console.log(obj); - const serverDetails = obj.serverDetails; - if (serverDetails.ipAddress) - XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = [serverDetails.port]; - if (serverDetails.ipV4Address) { + const processPorts = (port) => { const ports = new Set; - ports.add(serverDetails.ipV4Port), ports.add(9002), XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = Array.from(ports); - } + return ports.add(port), ports.add(9002), Array.from(ports); + }, serverDetails = obj.serverDetails; + if (serverDetails.ipAddress) + XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = processPorts(serverDetails.port); + if (serverDetails.ipV4Address) + XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = processPorts(serverDetails.ipV4Port); if (serverDetails.ipV6Address) - XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = [serverDetails.ipV6Port]; + XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = processPorts(serverDetails.ipV6Port); return response.json = () => Promise.resolve(obj), response.text = () => Promise.resolve(JSON.stringify(obj)), response; } static async#handleInputConfigs(request, opts) { diff --git a/src/utils/xhome-interceptor.ts b/src/utils/xhome-interceptor.ts index b906576..a916428 100644 --- a/src/utils/xhome-interceptor.ts +++ b/src/utils/xhome-interceptor.ts @@ -40,21 +40,25 @@ export class XhomeInterceptor { const obj = await response.clone().json() console.log(obj); + const processPorts = (port: number): number[] => { + const ports = new Set(); + ports.add(port); + ports.add(9002); + + return Array.from(ports); + }; + const serverDetails = obj.serverDetails; if (serverDetails.ipAddress) { - XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = [serverDetails.port]; + XhomeInterceptor.#consoleAddrs[serverDetails.ipAddress] = processPorts(serverDetails.port); } if (serverDetails.ipV4Address) { - const ports = new Set(); - ports.add(serverDetails.ipV4Port); - ports.add(9002); - - XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = Array.from(ports); + XhomeInterceptor.#consoleAddrs[serverDetails.ipV4Address] = processPorts(serverDetails.ipV4Port); } if (serverDetails.ipV6Address) { - XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = [serverDetails.ipV6Port]; + XhomeInterceptor.#consoleAddrs[serverDetails.ipV6Address] = processPorts(serverDetails.ipV6Port); } response.json = () => Promise.resolve(obj);