Fix backwards compatibility for old resources

multitheftauto · Jan 13, 2024 · 4508f72 · 4508f72
1 parent 2517c59
commit 4508f72
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 20 deletions.
diff --git a/Client/mods/deathmatch/logic/CRemoteCalls.cpp b/Client/mods/deathmatch/logic/CRemoteCalls.cpp
@@ -180,8 +180,10 @@ void CRemoteCall::DownloadFinishedCallback(const SHttpDownloadResult& result)
                 arguments.PushNumber(0);
             }
             else
-                // @todo: test 
-                arguments.ReadJSONString(result.pData);
+            {
+                if (arguments.ReadJSONString(result.pData))
+                    arguments.PushArguments(arguments);
+            } 
         }
         else
         {

diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Client/mods/deathmatch/logic/lua/CLuaArguments.cpp
@@ -492,8 +492,23 @@ bool CLuaArguments::WriteToBitStream(NetBitStreamInterface& bitStream, CFastHash
     return bSuccess;
 }
 
-bool CLuaArguments::ReadJSONString(const char* szJSON)
+bool CLuaArguments::ReadJSONString(const char* szJSON, bool bBackwardsCompatibility)
 {
+    if (bBackwardsCompatibility)
+    {
+        // Backwards compatibility with old resources using function get()
+        // Fast isJSON check: Check first non-white space character is '[' or '{'
+        for (const char* ptr = szJSON; true;)
+        {
+            char c = *ptr++;
+            if (c == '[' || c == '{')
+                break;
+            if (isspace((uchar)c))
+                continue;
+            return false;
+        }
+    }
+
     rapidjson::Document    doc;
     rapidjson::ParseResult result = doc.Parse(szJSON);
 

diff --git a/Client/mods/deathmatch/logic/lua/CLuaArguments.h b/Client/mods/deathmatch/logic/lua/CLuaArguments.h
@@ -80,9 +80,9 @@ class CLuaArguments
     std::vector<CLuaArgument*>::const_iterator IterEnd() const { return m_Arguments.end(); };
 
     // json parse
-    bool ReadJSONString(const char* szJSON);
-    bool ReadJSONArray(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
-    bool ReadJSONObject(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
+    bool        ReadJSONString(const char* szJSON, bool bBackwardsCompatibility = false);
+    bool        ReadJSONArray(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
+    bool        ReadJSONObject(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
 
     // json writer
     bool        SerializeToJSONString(rapidjson::StringBuffer* buffer, bool bSerialize = false, int flags = 1, bool bBackwardsCompatibility = false);

diff --git a/Server/mods/deathmatch/logic/CElement.cpp b/Server/mods/deathmatch/logic/CElement.cpp
@@ -499,8 +499,10 @@ void CElement::ReadCustomData(CEvents* pEvents, CXMLNode& Node)
 
         // Make a lua argument from it and set the content
         CLuaArguments args;
-        if (!args.ReadJSONString(pAttribute->GetValue().c_str()))
+        if (!args.ReadJSONString(pAttribute->GetValue().c_str(), true))
             args.PushString(pAttribute->GetValue().c_str());
+        else
+            args.PushArguments(args);
 
         // Don't trigger onElementDataChanged event
         ESyncType syncType = g_pGame->GetConfig()->GetSyncMapElementData() ? ESyncType::BROADCAST : ESyncType::LOCAL;

diff --git a/Server/mods/deathmatch/logic/CRemoteCalls.cpp b/Server/mods/deathmatch/logic/CRemoteCalls.cpp
@@ -237,13 +237,14 @@ void CRemoteCall::DownloadFinishedCallback(const SHttpDownloadResult& result)
         if (result.bSuccess)
         {
             if (pCall->IsFetch())
+            {
                 arguments.PushString(std::string(result.pData, result.dataSize));
+                arguments.PushNumber(0);
+            }
             else
             {
-                // @todo: test
-                arguments.ReadJSONString(result.pData);
-
-                arguments.PushNumber(0);
+                if (arguments.ReadJSONString(result.pData))
+                    arguments.PushArguments(arguments);
             }
         }
         else

diff --git a/Server/mods/deathmatch/logic/CResource.cpp b/Server/mods/deathmatch/logic/CResource.cpp
@@ -2565,7 +2565,9 @@ ResponseCode CResource::HandleRequestCall(HttpRequest* ipoHttpRequest, HttpRespo
         else if (ipoHttpRequest->nRequestMethod == REQUESTMETHOD_POST)
         {
             const char* szRequestBody = ipoHttpRequest->sBody.c_str();
-            Arguments.ReadJSONString(szRequestBody);
+            if (Arguments.ReadJSONString(szRequestBody))
+                Arguments.PushArguments(Arguments);
+
         }
 
         CLuaArguments FormData;

diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp b/Server/mods/deathmatch/logic/lua/CLuaArguments.cpp
@@ -569,10 +569,24 @@ bool CLuaArguments::WriteToBitStream(NetBitStreamInterface& bitStream, CFastHash
     return bSuccess;
 }
 
-bool CLuaArguments::ReadJSONString(const char* szJSON)
+bool CLuaArguments::ReadJSONString(const char* szJSON, bool bBackwardsCompatibility)
 {
-    // allow comments? <rapidjson::ParseComments>
+    if (bBackwardsCompatibility)
+    {
+        // Backwards compatibility with old resources using function get()
+        // Fast isJSON check: Check first non-white space character is '[' or '{'
+        for (const char* ptr = szJSON; true;)
+        {
+            char c = *ptr++;
+            if (c == '[' || c == '{')
+                break;
+            if (isspace((uchar)c))
+                continue;
+            return false;
+        }
+    }
 
+    // allow comments? <rapidjson::ParseComments>
     rapidjson::Document doc;
     rapidjson::ParseResult result = doc.Parse(szJSON);
 

diff --git a/Server/mods/deathmatch/logic/lua/CLuaArguments.h b/Server/mods/deathmatch/logic/lua/CLuaArguments.h
@@ -102,7 +102,7 @@ class CLuaArguments
     bool IsEqualTo(const CLuaArguments& compareTo, std::set<const CLuaArguments*>* knownTables = nullptr) const;
 
     // json parse
-    bool        ReadJSONString(const char* szJSON);
+    bool        ReadJSONString(const char* szJSON, bool bBackwardsCompatibility = false);
     bool        ReadJSONArray(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
     bool        ReadJSONObject(const rapidjson::Value& obj, std::vector<CLuaArguments*>* pKnownTables = NULL);
 

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaFunctionDefs.Server.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaFunctionDefs.Server.cpp
@@ -261,13 +261,14 @@ int CLuaFunctionDefs::Get(lua_State* luaVM)
                     }
                     // We only have a single entry for a specific setting, so output a string
                     const std::string& strDataValue = pAttribute->GetValue();
-                    if (!Args.ReadJSONString(strDataValue.c_str()))
+                    if (!Args.ReadJSONString(strDataValue.c_str(), true))
                     {
                         // No valid JSON? Parse as plain text
                         Args.PushString(strDataValue);
                     }
+                    else
+                        Args.PushArguments(luaVM);
 
-                    Args.PushArguments(luaVM);
                     uiArgCount = Args.Count();
 
                     /* Don't output a table because although it is more consistent with the multiple values output below,
@@ -286,14 +287,14 @@ int CLuaFunctionDefs::Get(lua_State* luaVM)
                         CXMLAttributes& attributes = pSubNode->GetAttributes();
                         Args.PushString(attributes.Find("name")->GetValue());
                         const std::string& strDataValue = attributes.Find("value")->GetValue();
-                        if (!Args.ReadJSONString(strDataValue.c_str()))
+                        if (!Args.ReadJSONString(strDataValue.c_str(), true))
                         {
                             Args.PushString(strDataValue);
                         }
                     }
+
                     // Push a table and return
-                    // @todo: test that
-                    Args.PushArguments(luaVM); // Args.PushAsTable(luaVM);
+                    Args.PushAsTable(luaVM);
                     uiArgCount = Args.Count();
                 }