Stop asserting that all chat is in JSON format.

Author: retrixe

src/minecraft/chatToJsx.tsx

@@ -224,4 +224,12 @@ const ChatToJsxNonMemo = ({
 // Memoisation means this is only re-rendered if the props changed.
 export const ChatToJsx = React.memo(ChatToJsxNonMemo)
 
+export const parseValidJson = (text: string) => {
+  try {
+    return JSON.parse(text)
+  } catch (e) {
+    return text
+  }
+}
+
 export default parseChatToJsx

src/minecraft/pingServer.ts

@@ -3,8 +3,8 @@ import { Buffer } from 'buffer'
 
 import { makeBasePacket, concatPacketData, parsePacket, Packet } from './packet'
 import { toggleEndian, padBufferToLength, resolveHostname } from './utils'
+import { parseValidJson, PlainTextChat } from './chatToJsx'
 import { readVarInt, writeVarInt } from './packetUtils'
-import { PlainTextChat } from './chatToJsx'
 
 export interface LegacyPing {
   ff: number
@@ -136,7 +136,7 @@ export const modernPing = async (opts: { host: string; port: number }) => {
         const json = responsePacket.data
           .slice(varIntLength, varIntLength + jsonLength)
           .toString('utf8')
-        const response = JSON.parse(json)
+        const response = parseValidJson(json)
 
         resolve({
           ping: (timeReceived - timeSent) / 2,

src/screens/ChatScreen.tsx

@@ -15,6 +15,7 @@ import SettingsContext from '../context/settingsContext'
 import ConnectionContext from '../context/connectionContext'
 import {
   ChatToJsx,
+  parseValidJson,
   mojangColorMap,
   lightColorMap,
   MinecraftChat,
@@ -127,7 +128,9 @@ const ChatScreen = ({ navigation }: { navigation: ChatNavigationProp }) => {
             .toString('utf8')
           const position = packet.data.readInt8(chatVarIntLength + chatLength)
           // TODO: Support position 2 and sender.
-          if (position === 0 || position === 1) addMessage(JSON.parse(chatJson))
+          if (position === 0 || position === 1) {
+            addMessage(parseValidJson(chatJson))
+          }
         } catch (e) {
           createErrorHandler(colorMap.dark_red, addMessage, parseMessageErr)(e)
         }

src/screens/ServerScreen.tsx

@@ -32,7 +32,8 @@ import initiateConnection from '../minecraft/connection'
 import {
   ChatToJsx,
   lightColorMap,
-  mojangColorMap
+  mojangColorMap,
+  parseValidJson
 } from '../minecraft/chatToJsx'
 import useDarkMode from '../context/useDarkMode'
 
@@ -176,7 +177,7 @@ const ServerScreen = () => {
         if (newConn.disconnectReason) {
           setDisconnectReason({
             server,
-            reason: JSON.parse(newConn.disconnectReason)
+            reason: parseValidJson(newConn.disconnectReason)
           })
         }
       }