Fixes to XCloud, call as default - make sure to delete appconfig.json for new Xal params to propagate!

Author: tuxuser

auth/xal_auth.py

@@ -183,7 +183,7 @@ async def _exchange_code_for_token(
 
         return await self.__oauth20_token_endpoint(post_body)
 
-    async def _exchange_refresh_token_for_xcloud_transfer_token(
+    async def exchange_refresh_token_for_xcloud_transfer_token(
         self,
         refresh_token_jwt: str
     ) -> XCloudTokenResponse:

main.py

@@ -5,12 +5,13 @@
 
 from common import AppConfiguration
 
-from auth.constants import IOS_XBOXBETA_APP_PARAMS
+from auth.constants import IOS_XBOXBETA_APP_PARAMS, ANDROID_GAMEPASS_BETA_PARAMS
 from auth.models import XalClientParameters, XSTSResponse
 from auth.xal_auth import XalAuthenticator
 from auth.request_signer import RequestSigner
 
 from smartglass_api import SmartglassApi
+from xcloud_api import XCloudApi
 from xhomestreaming_api import XHomeStreamingApi
 
 APP_CONFIG_FILE = "appconfig.json"
@@ -66,6 +67,33 @@ async def test_xhome_streaming(
     await xhome_api.session.aclose()
 
 
+async def test_xcloud_streaming(
+    config: AppConfiguration
+):
+    xal = XalAuthenticator(
+        config.ClientUUID,
+        config.XalParameters,
+        RequestSigner.from_pem(config.SigningKey)
+    )
+
+    print(':: Requesting XSTS Token (RelyingParty: http://gssv.xboxlive.com)')
+    gssv_token = await xal.xsts_authorization(
+        config.Authorization.DeviceToken,
+        config.Authorization.TitleToken.Token,
+        config.Authorization.UserToken.Token,
+        relying_party='http://gssv.xboxlive.com/'
+    )
+    print(':: Exchanging refresh token for xcloud transfer token')
+    xcloud_token = await xal.exchange_refresh_token_for_xcloud_transfer_token(
+        config.WindowsLiveTokens.refresh_token
+    )
+    await xal.session.aclose()
+
+    xhome_api = XCloudApi(gssv_token, xcloud_token)
+    await xhome_api.start_streaming()
+    await xhome_api.session.aclose()
+
+
 async def main():
     """
     Prepare needed values
@@ -80,7 +108,7 @@ async def main():
             ClientUUID=uuid.uuid4(),
             SigningKey=RequestSigner().export_signing_key(),
             XalParameters=XalClientParameters.parse_obj(
-                IOS_XBOXBETA_APP_PARAMS
+                ANDROID_GAMEPASS_BETA_PARAMS  # NOTE: XBOXBETA APP -> XHOME, XBOXGAMEPASS BETA -> XCLOUD!
             )
         )
 
@@ -105,6 +133,7 @@ async def main():
     with io.open(APP_CONFIG_FILE, 'wt') as f:
         f.write(config.json(indent=2))
 
+    """
     smartglass = SmartglassApi(
         request_signer,
         config.Authorization.AuthorizationToken
@@ -116,9 +145,11 @@ async def main():
 
     console = choose_console(console_list)
     console_liveid = console.id
+    """
 
     # test_smartglass_api(smartglass, console_liveid)
-    await test_xhome_streaming(config, console_liveid)
+    await test_xcloud_streaming(config)
+    # await test_xhome_streaming(config, console_liveid)
 
 
 if __name__ == '__main__':

xcloud_api.py

@@ -181,27 +181,22 @@ async def start_streaming(self):
         stream_session = await self._request_stream(base_url, gametitle.titleId)
         print(f':: Stream session {stream_session}')
 
-        print(':: Waiting for stream ReadyToConnect...')
+        print(':: Waiting for stream')
         while True:
             state = await self._get_session_state(base_url, stream_session.sessionPath)
+            print(state.state)
             if state.state == StreamSetupState.ReadyToConnect:
+                print(':: Connecting to stream')
+                success = await self._connect_to_session(
+                    base_url, stream_session.sessionPath, self.xcloud_token.lpt
+                )
+                if not success:
+                    print(':: Failed to connect to session')
+                    return
+            elif state.state == StreamSetupState.Provisioned:
                 break
-            await asyncio.sleep(100)
 
-        print(':: Connecting to stream')
-        success = await self._connect_to_session(
-            base_url, stream_session.sessionPath, self.xcloud_token.lpt
-        )
-        if not success:
-            print(':: Failed to connect to session')
-            return
-
-        print(':: Waiting for provisioning')
-        while True:
-            state = await self._get_session_state(base_url, stream_session.sessionPath)
-            if state.state == StreamSetupState.Provisioned:
-                break
-            await asyncio.sleep(100)
+            await asyncio.sleep(1)
 
         print(':: Requesting config')
         config = await self._get_stream_config(base_url, stream_session.sessionPath)