Fix BigInt, a crash and needing to relog every day

This is done by adding refresh support to ServerScreen.
This can cause a slight delay for the first connection.
A loading screen should be implemented for this.

Author: retrixe

index.js

@@ -8,10 +8,10 @@ import { AppRegistry } from 'react-native'
 import App from './src/App'
 import { name as appName } from './app.json'
 
+global.BigInt = require('jsbi').BigInt
 global.Buffer = require('buffer').Buffer
 // global.process = require('process');
 global.process.env.NODE_ENV = __DEV__ ? 'development' : 'production'
-if (typeof BigInt === 'undefined') global.BigInt = require('big-integer')
 
 // Needed so that 'stream-http' chooses the right default protocol.
 global.location = {

package-lock.json

@@ -19,10 +19,10 @@
     "@react-navigation/native": "^6.0.2",
     "@react-navigation/native-stack": "^6.1.0",
     "assert": "^2.0.0",
-    "big-integer": "^1.6.51",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "events": "^3.3.0",
+    "jsbi": "^3.2.5",
     "promise.allsettled": "^1.0.4",
     "react": "18.0.0",
     "react-native": "0.69.1",

package.json

@@ -43,16 +43,16 @@ export const refreshMSAuthToken = async (
 ): Promise<[string, string]> => {
   const body = `client_id=${clientId}
  &scope=${encodeURIComponent(scope)}
- &code=${encodeURIComponent(refreshToken)}
+ &refresh_token=${encodeURIComponent(refreshToken)}
  &grant_type=refresh_token
  &redirect_uri=${encodeURIComponent(redirectUri)}`
   const req = await fetch(authTokenUrl, {
     method: 'POST',
     body,
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
   })
-  const res = await req.json()
   if (!req.ok) throw new Error('Failed to request auth token from Microsoft!')
+  const res = await req.json()
   // { "expires_in":86400 }
   return [res.access_token, res.refresh_token]
 }

src/minecraft/api/microsoft.ts

@@ -30,4 +30,4 @@ export const getPlayerCertificates = async (accessToken: string) =>
   await fetch(getPlayerCertificatesUrl, {
     headers: { Authorization: 'Bearer ' + accessToken },
     method: 'POST'
-  })
+  }).then(async res => (await res.json()) as Certificate)

src/minecraft/api/mojang.ts

@@ -177,6 +177,7 @@ const parseChatToJsx = (
 ) => {
   if (typeof chat !== 'string' && (chat as TranslatedChat).translate) {
     const translatedChat = chat as TranslatedChat
+    if (!translatedChat.with) translatedChat.with = []
     const translation = translations[translatedChat.translate]
       ?.split('%s')
       ?.map((text, index) => [{ text }, translatedChat.with[index]])

src/minecraft/chatToJsx.tsx

@@ -29,13 +29,22 @@ import AccountsContext from '../context/accountsContext'
 import ConnectionContext from '../context/connectionContext'
 import { resolveHostname, protocolMap } from '../minecraft/utils'
 import initiateConnection from '../minecraft/connection'
+import {
+  refreshMSAuthToken,
+  getXboxLiveTokenAndUserHash,
+  getXstsTokenAndUserHash,
+  authenticateWithXsts
+} from '../minecraft/api/microsoft'
+import { Certificate, getPlayerCertificates } from '../minecraft/api/mojang'
+import { refresh } from '../minecraft/api/yggdrasil'
 import {
   ChatToJsx,
   lightColorMap,
   mojangColorMap,
   parseValidJson
 } from '../minecraft/chatToJsx'
 import useDarkMode from '../context/useDarkMode'
+import config from '../../config.json'
 
 const parseIp = (ipAddress: string): [string, number] => {
   const splitAddr = ipAddress.split(':')
@@ -48,10 +57,15 @@ const parseIp = (ipAddress: string): [string, number] => {
   return [splitAddr.join(':'), port]
 }
 
+interface Session {
+  certificate?: Certificate
+  accessToken: string
+}
+
 const ServerScreen = () => {
   const darkMode = useDarkMode()
   const { servers, setServers } = useContext(ServersContext)
-  const { accounts } = useContext(AccountsContext)
+  const { accounts, setAccounts } = useContext(AccountsContext)
   const { connection, setConnection, setDisconnectReason } =
     useContext(ConnectionContext)
   const initiatingConnection = useRef(false)
@@ -70,6 +84,7 @@ const ServerScreen = () => {
     // false - no route, null - unknown err, undefined - pinging
     [ip: string]: LegacyPing | Ping | false | null | undefined
   }>({})
+  const [sessions, setSessions] = useState<{ [uuid: string]: Session }>({})
 
   useEffect(() => {
     if (Object.keys(pingResponses).length > 0) {
@@ -103,12 +118,14 @@ const ServerScreen = () => {
   }, [servers, pingResponses])
 
   const invalidServerName = newServerName.length > 32
+
   const openEditServerDialog = (server: string) => {
     setEditServerDialogOpen(server)
     setNewServerName(server)
     setServerVersion(servers[server].version)
     setIpAddr(servers[server].address)
   }
+
   const cancelAddServer = () => {
     setEditServerDialogOpen(false)
     setServerVersion('auto')
@@ -117,12 +134,14 @@ const ServerScreen = () => {
     setIpAddrRed(false)
     setServerNameRed(false)
   }
+
   const deleteServer = () => {
     if (typeof editServerDialogOpen !== 'string') return cancelAddServer()
     delete servers[editServerDialogOpen]
     setServers(servers)
     cancelAddServer()
   }
+
   const editServer = () => {
     const edit = typeof editServerDialogOpen === 'string'
     if (
@@ -142,6 +161,7 @@ const ServerScreen = () => {
     setPingResponses({})
     cancelAddServer()
   }
+
   const connectToServer = async (server: string) => {
     if (initiatingConnection.current) return
     if (!connection) {
@@ -173,31 +193,86 @@ const ServerScreen = () => {
           reason: 'EnderChat only supports 1.16.4 and newer (for now).'
         })
       }
-      // TODO: Refresh token before trying to connect.
       const uuid = accounts[activeAccount].type ? activeAccount : undefined
-      const newConn = await initiateConnection({
-        host,
-        port,
-        username: accounts[activeAccount].username,
-        protocolVersion,
-        selectedProfile: uuid,
-        accessToken: accounts[activeAccount].accessToken
-      })
-      const onCloseOrError: () => void = () => {
-        setConnection(undefined)
-        if (newConn.disconnectReason) {
-          setDisconnectReason({
-            server,
-            reason: parseValidJson(newConn.disconnectReason)
-          })
+
+      // Create an updated "session" containing access tokens and certificates.
+      // LOW-TODO: Creating a session would be better with a loading screen, since Microsoft Login is slow.
+      // Maybe setConnection(null) to bring up ChatScreen while still being in a logged out state?
+      let session = sessions[activeAccount]
+      const is119 = protocolVersion >= protocolMap[1.19]
+      if (uuid && (!session || (!session.certificate && is119))) {
+        // LOW-TODO: Certificates and access tokens should be updated regularly.
+        try {
+          // Create a session with the latest access token.
+          const account = accounts[activeAccount]
+          if (!session && accounts[activeAccount].type === 'microsoft') {
+            const [msAccessToken, msRefreshToken] = await refreshMSAuthToken(
+              accounts[activeAccount].microsoftRefreshToken || '',
+              config.clientId,
+              config.scope
+            )
+            const [xlt, xuh] = await getXboxLiveTokenAndUserHash(msAccessToken)
+            const [xstsToken] = await getXstsTokenAndUserHash(xlt)
+            const accessToken = await authenticateWithXsts(xstsToken, xuh)
+            session = { accessToken }
+            setAccounts({
+              [activeAccount]: {
+                ...account,
+                accessToken,
+                microsoftAccessToken: msAccessToken,
+                microsoftRefreshToken: msRefreshToken
+              }
+            })
+          } else if (!session && accounts[activeAccount].type === 'mojang') {
+            const { accessToken, clientToken } = await refresh(
+              accounts[activeAccount].accessToken || '',
+              accounts[activeAccount].clientToken || '',
+              false
+            )
+            session = { accessToken }
+            setAccounts({
+              [activeAccount]: { ...account, accessToken, clientToken }
+            })
+          }
+          // If connecting to 1.19, get player certificates.
+          if (!session.certificate && is119) {
+            const token = session.accessToken
+            session.certificate = await getPlayerCertificates(token)
+          }
+          setSessions({ [activeAccount]: session })
+        } catch (e) {
+          const reason =
+            'Failed to create session! You may need to re-login with your Microsoft Account in the Accounts tab.'
+          setDisconnectReason({ server, reason })
+          initiatingConnection.current = false
+          return
+        }
+      }
+
+      // Connect to server after setting up the session.
+      try {
+        const newConn = await initiateConnection({
+          host,
+          port,
+          username: accounts[activeAccount].username,
+          protocolVersion,
+          selectedProfile: uuid,
+          accessToken: session?.accessToken,
+          certificate: session?.certificate // TODO: Chat Signing toggle?
+        })
+        const onCloseOrError = () => {
+          setConnection(undefined)
+          if (newConn.disconnectReason) {
+            const reason = parseValidJson(newConn.disconnectReason)
+            setDisconnectReason({ server, reason })
+          }
         }
+        newConn.on('close', onCloseOrError)
+        newConn.on('error', onCloseOrError)
+        setConnection({ serverName: server, connection: newConn })
+      } catch (e) {
+        setDisconnectReason({ server, reason: 'Failed to connect to server!' })
       }
-      newConn.on('close', onCloseOrError)
-      newConn.on('error', onCloseOrError)
-      setConnection({
-        serverName: server,
-        connection: newConn
-      })
       initiatingConnection.current = false
     }
   }

src/screens/ServerScreen.tsx

@@ -2517,11 +2517,6 @@
   dependencies:
     "tweetnacl" "^0.14.3"
 
-"big-integer@^1.6.51":
-  "integrity" "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg=="
-  "resolved" "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz"
-  "version" "1.6.51"
-
 "bl@^4.1.0":
   "integrity" "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="
   "resolved" "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
@@ -5428,6 +5423,11 @@
     "argparse" "^1.0.7"
     "esprima" "^4.0.0"
 
+"jsbi@^3.2.5":
+  "integrity" "sha512-aBE4n43IPvjaddScbvWRA2YlTzKEynHzu7MqOyTipdHucf/VxS63ViCjxYRg86M8Rxwbt/GfzHl1kKERkt45fQ=="
+  "resolved" "https://registry.npmjs.org/jsbi/-/jsbi-3.2.5.tgz"
+  "version" "3.2.5"
+
 "jsbn@~0.1.0":
   "integrity" "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
   "resolved" "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"