Merge pull request #88 from saile515/fix-input-linux

Fix input not working on Linux

.github/workflows/cmake-linux.yml

@@ -0,0 +1,34 @@
+name: CMake Linux Build
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  linux-build:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'true'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-linux
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-linux
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-linux
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+
+      - name: Archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: BeamMP-Launcher
+          path: ${{github.workspace}}/build-linux/BeamMP-Launcher

.github/workflows/cmake-windows.yml

@@ -1,6 +1,6 @@
 name: CMake Windows Build
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   BUILD_TYPE: Release
@@ -18,9 +18,9 @@ jobs:
         uses: lukka/run-vcpkg@v7
         id: runvcpkg
         with:
-            vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]'
+            vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
+            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment

.github/workflows/release-build.yml

@@ -28,6 +28,7 @@ jobs:
           body: |
               Files included in this release:
               - `BeamMP-Launcher.exe` windows build
+              - `BeamMP-Launcher` linux build
 
   upload-release-files-windows:
     name: Upload Windows Release Files
@@ -42,9 +43,9 @@ jobs:
         uses: lukka/run-vcpkg@main
         id: runvcpkg
         with:
-            vcpkgArguments: 'discord-rpc zlib nlohmann-json openssl cpp-httplib[openssl]'
+            vcpkgArguments: 'discord-rpc zlib rapidjson openssl'
             vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-            vcpkgGitCommitId: '16ee2ecb31788c336ace8bb14c21801efb6836e4'
+            vcpkgGitCommitId: '06b5f4a769d848d1a20fa0acd556019728b56273'
             vcpkgTriplet: 'x64-windows-static'
 
       - name: Create Build Environment
@@ -70,3 +71,34 @@ jobs:
           asset_path: ${{github.workspace}}/build-windows/Release/BeamMP-Launcher.exe
           asset_name: BeamMP-Launcher.exe
           asset_content_type: application/vnd.microsoft.portable-executable
+
+  upload-release-files-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            submodules: 'true'
+
+      - name: Create Build Environment
+        run: cmake -E make_directory ${{github.workspace}}/build-linux
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{github.workspace}}/build-linux
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build-linux
+        shell: bash
+        run: cmake --build . --config $BUILD_TYPE
+        
+      - name: Upload Release Asset
+        id: upload-release-asset 
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
+          asset_path: ${{github.workspace}}/build-linux/BeamMP-Launcher
+          asset_name: BeamMP-Launcher
+          asset_content_type: application/octet-stream

CMakeLists.txt

@@ -7,18 +7,15 @@ if (WIN32)
     STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
 endif(WIN32)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
-file(GLOB source_files "src/*.cpp" "src/*/*.cpp" "src/*/*.hpp" "include/*.h"  "include/*/*.h" "include/*/*/*.h")
-find_package(httplib CONFIG REQUIRED)
-find_package(nlohmann_json CONFIG REQUIRED)
+file(GLOB source_files "src/*.cpp" "src/*/*.cpp" "src/*/*.hpp" "include/*.h"  "include/*/*.h" "include/*/*/*.h" "include/*.hpp"  "include/*/*.hpp" "include/*/*/*.hpp")
 
 add_executable(${PROJECT_NAME} ${source_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "BeamMP-Launcher")
 
-
 if (WIN32)
     find_package(ZLIB REQUIRED)
     find_package(OpenSSL REQUIRED)
@@ -26,14 +23,13 @@ if (WIN32)
     set(VcpkgRoot ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET})
     include_directories(${VcpkgRoot}/include)
     link_directories(${VcpkgRoot}/lib)
-    target_link_libraries(${PROJECT_NAME} PRIVATE
-            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32 httplib::httplib nlohmann_json::nlohmann_json)
-
-    if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib)
-    else ()
-        target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/debug/lib/discord-rpc.lib)
-    endif()
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${VcpkgRoot}/lib/discord-rpc.lib
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto ws2_32)
+elseif (LINUX)
+    find_package(ZLIB REQUIRED)
+    find_package(OpenSSL REQUIRED)
+    target_link_libraries(${PROJECT_NAME} PRIVATE 
+            ZLIB::ZLIB OpenSSL::SSL OpenSSL::Crypto)
 else(WIN32) #MINGW
     add_definitions("-D_WIN32_WINNT=0x0600")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Os -s --static")

include/Http.h

@@ -16,4 +16,5 @@ public:
     static bool ProgressBar(size_t c, size_t t);
 public:
     static bool isDownload;
+    static std::string Codes_[];
 };

include/Json.h

@@ -0,0 +1,12 @@
+// Copyright (c) 2019-present Anonymous275.
+// BeamMP Launcher code is not in the public domain and is not free software.
+// One must be granted explicit permission by the copyright holder in order to modify or distribute any part of the source or binaries.
+// Anything else is prohibited. Modified works may not be published and have be upstreamed to the official repository.
+///
+/// Created by Anonymous275 on 11/27/2020
+///
+#pragma once
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/document.h"
+#include "rapidjson/writer.h"
+namespace json = rapidjson;

include/Network/network.hpp

@@ -9,14 +9,21 @@
 
 #pragma once
 #include <string>
+
+#ifdef __linux__
+#include <cstdint>
+#include "linuxfixes.h"
+#include <bits/types/siginfo_t.h>
+#include <sys/ucontext.h>
+#endif
+
+
+
 void NetReset();
 extern bool Dev;
 extern int ping;
 
-extern bool ModWarningConfirmed;
-
 [[noreturn]] void CoreNetwork();
-extern int ProxyPort;
 extern int ClientID;
 extern int LastPort;
 extern bool ModLoaded;
@@ -30,7 +37,6 @@ extern std::string LastIP;
 extern std::string MStatus;
 extern std::string UlStatus;
 extern std::string PublicKey;
-extern std::string PrivateKey;
 extern std::string ListOfMods;
 int KillSocket(uint64_t Dead);
 void UUl(const std::string& R);
@@ -48,4 +54,3 @@ void TCPClientMain(const std::string& IP,int Port);
 void UDPClientMain(const std::string& IP,int Port);
 void TCPGameServer(const std::string& IP, int Port);
 
-

include/Startup.h

@@ -7,22 +7,10 @@
 ///
 #pragma once
 #include <string>
-#include <compare>
-#include <vector>
-
 void InitLauncher(int argc, char* argv[]);
 std::string GetEP(char*P = nullptr);
 std::string GetGamePath();
 std::string GetVer();
 std::string GetEN();
-void StartProxy();
 void ConfigInit();
-extern bool Dev;
-
-struct VersionParser {
-    explicit VersionParser(const std::string& from_string);
-    std::strong_ordering operator<=>(VersionParser const& rhs) const noexcept;
-    bool operator==(VersionParser const& rhs) const noexcept;
-    std::vector<std::string> split;
-    std::vector<size_t> data;
-};
+extern bool Dev;

include/linuxfixes.h

@@ -0,0 +1,19 @@
+#ifndef _LINUXFIXES_H
+#define _LINUXFIXES_H
+
+#include <stdint.h>
+
+// Translate windows sockets stuff to linux sockets
+#define SOCKET uint64_t
+#define SOCKADDR sockaddr
+#define SOCKADDR_IN sockaddr_in
+#define WSAGetLastError() errno
+#define closesocket close
+#define SD_BOTH SHUT_RDWR
+// We dont need wsacleanup
+#define WSACleanup() 
+#define SOCKET_ERROR -1
+
+#define ZeroMemory(mem, len) memset(mem, 0, len)
+
+#endif

include/vdf_parser.hpp

@@ -0,0 +1,730 @@
+//MIT License
+//
+//Copyright(c) 2016 Matthias Moeller
+//
+//Permission is hereby granted, free of charge, to any person obtaining a copy
+//of this software and associated documentation files(the "Software"), to deal
+//in the Software without restriction, including without limitation the rights
+//to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+//copies of the Software, and to permit persons to whom the Software is
+//furnished to do so, subject to the following conditions :
+//
+//The above copyright notice and this permission notice shall be included in all
+//copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+//AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//SOFTWARE.
+
+#ifndef __TYTI_STEAM_VDF_PARSER_H__
+#define __TYTI_STEAM_VDF_PARSER_H__
+
+#include <map>
+#include <vector>
+#include <unordered_map>
+#include <utility>
+#include <fstream>
+#include <memory>
+#include <unordered_set>
+#include <algorithm>
+#include <iterator>
+#include <functional>
+
+#include <system_error>
+#include <exception>
+
+//for wstring support
+#include <locale>
+#include <string>
+
+// internal
+#include <stack>
+
+//VS < 2015 has only partial C++11 support
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#ifndef CONSTEXPR
+#define CONSTEXPR
+#endif
+
+#ifndef NOEXCEPT
+#define NOEXCEPT
+#endif
+#else
+#ifndef CONSTEXPR
+#define CONSTEXPR constexpr
+#define TYTI_UNDEF_CONSTEXPR
+#endif
+
+#ifndef NOEXCEPT
+#define NOEXCEPT noexcept
+#define TYTI_UNDEF_NOEXCEPT
+#endif
+
+#endif
+
+namespace tyti
+{
+    namespace vdf
+    {
+        namespace detail
+        {
+            ///////////////////////////////////////////////////////////////////////////
+            //  Helper functions selecting the right encoding (char/wchar_T)
+            ///////////////////////////////////////////////////////////////////////////
+
+            template <typename T>
+            struct literal_macro_help
+            {
+                static CONSTEXPR const char* result(const char* c, const wchar_t*) NOEXCEPT
+                {
+                    return c;
+                }
+                static CONSTEXPR const char result(const char c, const wchar_t) NOEXCEPT
+                {
+                    return c;
+                }
+            };
+
+            template <>
+            struct literal_macro_help<wchar_t>
+            {
+                static CONSTEXPR const wchar_t* result(const char*, const wchar_t* wc) NOEXCEPT
+                {
+                    return wc;
+                }
+                static CONSTEXPR const wchar_t result(const char, const wchar_t wc) NOEXCEPT
+                {
+                    return wc;
+                }
+            };
+#define TYTI_L(type, text) vdf::detail::literal_macro_help<type>::result(text, L##text)
+
+            inline std::string string_converter(const std::string& w) NOEXCEPT
+            {
+                return w;
+            }
+
+            // utility wrapper to adapt locale-bound facets for wstring/wbuffer convert
+            // from cppreference
+            template <class Facet>
+            struct deletable_facet : Facet
+            {
+                template <class... Args>
+                deletable_facet(Args &&... args) : Facet(std::forward<Args>(args)...) {}
+                ~deletable_facet() {}
+            };
+
+            inline std::string string_converter(const std::wstring& w) //todo: use us-locale
+            {
+                std::wstring_convert<deletable_facet<std::codecvt<wchar_t, char, std::mbstate_t>>> conv1;
+                return conv1.to_bytes(w);
+            }
+
+            ///////////////////////////////////////////////////////////////////////////
+            //  Writer helper functions
+            ///////////////////////////////////////////////////////////////////////////
+
+            template <typename charT>
+            class tabs
+            {
+                const size_t t;
+
+            public:
+                explicit CONSTEXPR tabs(size_t i) NOEXCEPT : t(i) {}
+                std::basic_string<charT> print() const { return std::basic_string<charT>(t, TYTI_L(charT, '\t')); }
+                inline CONSTEXPR tabs operator+(size_t i) const NOEXCEPT
+                {
+                    return tabs(t + i);
+                }
+            };
+
+            template <typename oStreamT>
+            oStreamT& operator<<(oStreamT& s, const tabs<typename oStreamT::char_type> t)
+            {
+                s << t.print();
+                return s;
+            }
+        } // end namespace detail
+
+        ///////////////////////////////////////////////////////////////////////////
+        //  Interface
+        ///////////////////////////////////////////////////////////////////////////
+
+        /// custom objects and their corresponding write functions
+
+        /// basic object node. Every object has a name and can contains attributes saved as key_value pairs or childrens
+        template <typename CharT>
+        struct basic_object
+        {
+            typedef CharT char_type;
+            std::basic_string<char_type> name;
+            std::unordered_map<std::basic_string<char_type>, std::basic_string<char_type>> attribs;
+            std::unordered_map<std::basic_string<char_type>, std::shared_ptr<basic_object<char_type>>> childs;
+
+            void add_attribute(std::basic_string<char_type> key, std::basic_string<char_type> value)
+            {
+                attribs.emplace(std::move(key), std::move(value));
+            }
+            void add_child(std::unique_ptr<basic_object<char_type>> child)
+            {
+                std::shared_ptr<basic_object<char_type>> obj{ child.release() };
+                childs.emplace(obj->name, obj);
+            }
+            void set_name(std::basic_string<char_type> n)
+            {
+                name = std::move(n);
+            }
+        };
+
+        template <typename CharT>
+        struct basic_multikey_object
+        {
+            typedef CharT char_type;
+            std::basic_string<char_type> name;
+            std::unordered_multimap<std::basic_string<char_type>, std::basic_string<char_type>> attribs;
+            std::unordered_multimap<std::basic_string<char_type>, std::shared_ptr<basic_multikey_object<char_type>>> childs;
+
+            void add_attribute(std::basic_string<char_type> key, std::basic_string<char_type> value)
+            {
+                attribs.emplace(std::move(key), std::move(value));
+            }
+            void add_child(std::unique_ptr<basic_multikey_object<char_type>> child)
+            {
+                std::shared_ptr<basic_multikey_object<char_type>> obj{ child.release() };
+                childs.emplace(obj->name, obj);
+            }
+            void set_name(std::basic_string<char_type> n)
+            {
+                name = std::move(n);
+            }
+        };
+
+        typedef basic_object<char> object;
+        typedef basic_object<wchar_t> wobject;
+        typedef basic_multikey_object<char> multikey_object;
+        typedef basic_multikey_object<wchar_t> wmultikey_object;
+
+        struct Options
+        {
+            bool strip_escape_symbols;
+            bool ignore_all_platform_conditionals;
+            bool ignore_includes;
+
+            Options() : strip_escape_symbols(true), ignore_all_platform_conditionals(false), ignore_includes(false) {}
+        };
+
+        //forward decls
+        //forward decl
+        template <typename OutputT, typename iStreamT>
+        OutputT read(iStreamT& inStream, const Options& opt = Options{});
+
+        /** \brief writes given object tree in vdf format to given stream.
+        Output is prettyfied, using tabs
+        */
+        template <typename oStreamT, typename T>
+        void write(oStreamT& s, const T& r,
+            const detail::tabs<typename oStreamT::char_type> tab = detail::tabs<typename oStreamT::char_type>(0))
+        {
+            typedef typename oStreamT::char_type charT;
+            using namespace detail;
+            s << tab << TYTI_L(charT, '"') << r.name << TYTI_L(charT, "\"\n") << tab << TYTI_L(charT, "{\n");
+            for (const auto& i : r.attribs)
+                s << tab + 1 << TYTI_L(charT, '"') << i.first << TYTI_L(charT, "\"\t\t\"") << i.second << TYTI_L(charT, "\"\n");
+            for (const auto& i : r.childs)
+                if (i.second)
+                    write(s, *i.second, tab + 1);
+            s << tab << TYTI_L(charT, "}\n");
+        }
+
+        namespace detail
+        {
+            template <typename iStreamT>
+            std::basic_string<typename iStreamT::char_type> read_file(iStreamT& inStream)
+            {
+                // cache the file
+                typedef typename iStreamT::char_type charT;
+                std::basic_string<charT> str;
+                inStream.seekg(0, std::ios::end);
+                str.resize(static_cast<size_t>(inStream.tellg()));
+                if (str.empty())
+                    return str;
+
+                inStream.seekg(0, std::ios::beg);
+                inStream.read(&str[0], str.size());
+                return str;
+            }
+
+            /** \brief Read VDF formatted sequences defined by the range [first, last).
+            If the file is mailformatted, parser will try to read it until it can.
+            @param first            begin iterator
+            @param end              end iterator
+            @param exclude_files    list of files which cant be included anymore.
+                                    prevents circular includes
+
+            can thow:
+                    - "std::runtime_error" if a parsing error occured
+                    - "std::bad_alloc" if not enough memory coup be allocated
+            */
+            template <typename OutputT, typename IterT>
+            std::vector<std::unique_ptr<OutputT>> read_internal(IterT first, const IterT last,
+                std::unordered_set<std::basic_string<typename std::iterator_traits<IterT>::value_type>>& exclude_files,
+                const Options& opt)
+            {
+                static_assert(std::is_default_constructible<OutputT>::value,
+                    "Output Type must be default constructible (provide constructor without arguments)");
+                static_assert(std::is_move_constructible<OutputT>::value,
+                    "Output Type must be move constructible");
+
+                typedef typename std::iterator_traits<IterT>::value_type charT;
+
+                const std::basic_string<charT> comment_end_str = TYTI_L(charT, "*/");
+                const std::basic_string<charT> whitespaces = TYTI_L(charT, " \n\v\f\r\t");
+
+#ifdef WIN32
+                std::function<bool(const std::basic_string<charT>&)> is_platform_str = [](const std::basic_string<charT>& in) {
+                    return in == TYTI_L(charT, "$WIN32") || in == TYTI_L(charT, "$WINDOWS");
+                };
+#elif __APPLE__
+                // WIN32 stands for pc in general
+                std::function<bool(const std::basic_string<charT>&)> is_platform_str = [](const std::basic_string<charT>& in) {
+                    return in == TYTI_L(charT, "$WIN32") || in == TYTI_L(charT, "$POSIX") || in == TYTI_L(charT, "$OSX");
+                };
+
+#elif __linux__
+                // WIN32 stands for pc in general
+                std::function<bool(const std::basic_string<charT>&)> is_platform_str = [](const std::basic_string<charT>& in) {
+                    return in == TYTI_L(charT, "$WIN32") || in == TYTI_L(charT, "$POSIX") || in == TYTI_L(charT, "$LINUX");
+                };
+#else
+                std::function<bool(const std::basic_string<charT>&)> is_platform_str = [](const std::basic_string<charT>& in) {
+                    return false;
+                };
+#endif
+
+                if (opt.ignore_all_platform_conditionals)
+                    is_platform_str = [](const std::basic_string<charT>&) {
+                    return false;
+                };
+
+                // function for skipping a comment block
+                // iter: iterator poition to the position after a '/'
+                auto skip_comments = [&comment_end_str](IterT iter, const IterT& last) -> IterT {
+                    ++iter;
+                    if (iter != last)
+                    {
+                        if (*iter == TYTI_L(charT, '/'))
+                        {
+                            // line comment, skip whole line
+                            iter = std::find(iter + 1, last, TYTI_L(charT, '\n'));
+                        }
+
+                        if (*iter == '*')
+                        {
+                            // block comment, skip until next occurance of "*\"
+                            iter = std::search(iter + 1, last, std::begin(comment_end_str), std::end(comment_end_str));
+                            iter += 2;
+                        }
+                    }
+                    return iter;
+                };
+
+                auto end_quote = [](IterT iter, const IterT& last) -> IterT {
+                    const auto begin = iter;
+                    auto last_esc = iter;
+                    do
+                    {
+                        ++iter;
+                        iter = std::find(iter, last, TYTI_L(charT, '\"'));
+                        if (iter == last)
+                            break;
+
+                        last_esc = std::prev(iter);
+                        while (last_esc != begin && *last_esc == '\\')
+                            --last_esc;
+                    } while (!(std::distance(last_esc, iter) % 2));
+                    if (iter == last)
+                        throw std::runtime_error{ "quote was opened but not closed." };
+                    return iter;
+                };
+
+                auto end_word = [&whitespaces](IterT iter, const IterT& last) -> IterT {
+                    const auto begin = iter;
+                    auto last_esc = iter;
+                    do
+                    {
+                        ++iter;
+                        iter = std::find_first_of(iter, last, std::begin(whitespaces), std::end(whitespaces));
+                        if (iter == last)
+                            break;
+
+                        last_esc = std::prev(iter);
+                        while (last_esc != begin && *last_esc == '\\')
+                            --last_esc;
+                    } while (!(std::distance(last_esc, iter) % 2));
+                    //if (iter == last)
+                    //	throw std::runtime_error{ "word wasnt properly ended" };
+                    return iter;
+                };
+
+                auto skip_whitespaces = [&whitespaces](IterT iter, const IterT& last) -> IterT {
+                    iter = std::find_if_not(iter, last, [&whitespaces](charT c) {
+                        // return true if whitespace
+                        return std::any_of(std::begin(whitespaces), std::end(whitespaces), [c](charT pc) { return pc == c; });
+                        });
+                    return iter;
+                };
+
+                std::function<void(std::basic_string<charT>&)> strip_escape_symbols = [](std::basic_string<charT>& s) {
+                    auto quote_searcher = [&s](size_t pos) { return s.find(TYTI_L(charT, "\\\""), pos); };
+                    auto p = quote_searcher(0);
+                    while (p != s.npos)
+                    {
+                        s.replace(p, 2, TYTI_L(charT, "\""));
+                        p = quote_searcher(p);
+                    }
+                    auto searcher = [&s](size_t pos) { return s.find(TYTI_L(charT, "\\\\"), pos); };
+                    p = searcher(0);
+                    while (p != s.npos)
+                    {
+                        s.replace(p, 2, TYTI_L(charT, "\\"));
+                        p = searcher(p);
+                    }
+                };
+
+                if (!opt.strip_escape_symbols)
+                    strip_escape_symbols = [](std::basic_string<charT>&) {};
+
+                auto conditional_fullfilled = [&skip_whitespaces, &is_platform_str](IterT& iter, const IterT& last) {
+                    iter = skip_whitespaces(iter, last);
+                    if (*iter == '[')
+                    {
+                        ++iter;
+                        const auto end = std::find(iter, last, ']');
+                        const bool negate = *iter == '!';
+                        if (negate)
+                            ++iter;
+                        auto conditional = std::basic_string<charT>(iter, end);
+
+                        const bool is_platform = is_platform_str(conditional);
+                        iter = end + 1;
+
+                        return static_cast<bool>(is_platform ^ negate);
+                    }
+                    return true;
+                };
+
+                //read header
+                // first, quoted name
+                std::unique_ptr<OutputT> curObj = nullptr;
+                std::vector<std::unique_ptr<OutputT>> roots;
+                std::stack<std::unique_ptr<OutputT>> lvls;
+                auto curIter = first;
+
+                while (curIter != last && *curIter != '\0')
+                {
+                    //find first starting attrib/child, or ending
+                    curIter = skip_whitespaces(curIter, last);
+                    if (curIter == last || *curIter == '\0')
+                        break;
+                    if (*curIter == TYTI_L(charT, '/'))
+                    {
+                        curIter = skip_comments(curIter, last);
+                    }
+                    else if (*curIter != TYTI_L(charT, '}'))
+                    {
+
+                        // get key
+                        const auto keyEnd = (*curIter == TYTI_L(charT, '\"')) ? end_quote(curIter, last) : end_word(curIter, last);
+                        if (*curIter == TYTI_L(charT, '\"'))
+                            ++curIter;
+                        std::basic_string<charT> key(curIter, keyEnd);
+                        strip_escape_symbols(key);
+                        curIter = keyEnd + ((*keyEnd == TYTI_L(charT, '\"')) ? 1 : 0);
+
+                        curIter = skip_whitespaces(curIter, last);
+
+                        auto conditional = conditional_fullfilled(curIter, last);
+                        if (!conditional)
+                            continue;
+
+                        while (*curIter == TYTI_L(charT, '/'))
+                        {
+
+                            curIter = skip_comments(curIter, last);
+                            if (curIter == last || *curIter == '}')
+                                throw std::runtime_error{ "key declared, but no value" };
+                            curIter = skip_whitespaces(curIter, last);
+                            if (curIter == last || *curIter == '}')
+                                throw std::runtime_error{ "key declared, but no value" };
+                        }
+                        // get value
+                        if (*curIter != '{')
+                        {
+                            const auto valueEnd = (*curIter == TYTI_L(charT, '\"')) ? end_quote(curIter, last) : end_word(curIter, last);
+                            if (*curIter == TYTI_L(charT, '\"'))
+                                ++curIter;
+
+                            auto value = std::basic_string<charT>(curIter, valueEnd);
+                            strip_escape_symbols(value);
+                            curIter = valueEnd + ((*valueEnd == TYTI_L(charT, '\"')) ? 1 : 0);
+
+                            auto conditional = conditional_fullfilled(curIter, last);
+                            if (!conditional)
+                                continue;
+
+                            // process value
+                            if (key != TYTI_L(charT, "#include") && key != TYTI_L(charT, "#base"))
+                            {
+                                if (curObj)
+                                {
+                                    curObj->add_attribute(std::move(key), std::move(value));
+                                }
+                                else
+                                {
+                                    throw std::runtime_error{ "unexpected key without object" };
+                                }
+                            }
+                            else
+                            {
+                                if (!opt.ignore_includes && exclude_files.find(value) == exclude_files.end())
+                                {
+                                    exclude_files.insert(value);
+                                    std::basic_ifstream<charT> i(detail::string_converter(value));
+                                    auto str = read_file(i);
+                                    auto file_objs = read_internal<OutputT>(str.begin(), str.end(), exclude_files, opt);
+                                    for (auto& n : file_objs)
+                                    {
+                                        if (curObj)
+                                            curObj->add_child(std::move(n));
+                                        else
+                                            roots.push_back(std::move(n));
+                                    }
+                                    exclude_files.erase(value);
+                                }
+                            }
+                        }
+                        else if (*curIter == '{')
+                        {
+                            if (curObj)
+                                lvls.push(std::move(curObj));
+                            curObj = std::make_unique<OutputT>();
+                            curObj->set_name(std::move(key));
+                            ++curIter;
+                        }
+                    }
+                    //end of new object
+                    else if (curObj && *curIter == TYTI_L(charT, '}'))
+                    {
+                        if (!lvls.empty())
+                        {
+                            //get object before
+                            std::unique_ptr<OutputT> prev{ std::move(lvls.top()) };
+                            lvls.pop();
+
+                            // add finished obj to obj before and release it from processing
+                            prev->add_child(std::move(curObj));
+                            curObj = std::move(prev);
+                        }
+                        else
+                        {
+                            roots.push_back(std::move(curObj));
+                            curObj.reset();
+                        }
+                        ++curIter;
+                    }
+                    else
+                    {
+                        throw std::runtime_error{ "unexpected '}'" };
+                    }
+                }
+                if (curObj != nullptr || !lvls.empty())
+                {
+                    throw std::runtime_error{ "object is not closed with '}'" };
+                }
+
+                return roots;
+            }
+
+        } // namespace detail
+
+        /** \brief Read VDF formatted sequences defined by the range [first, last).
+        If the file is mailformatted, parser will try to read it until it can.
+        @param first begin iterator
+        @param end end iterator
+
+        can thow:
+                - "std::runtime_error" if a parsing error occured
+                - "std::bad_alloc" if not enough memory coup be allocated
+        */
+        template <typename OutputT, typename IterT>
+        OutputT read(IterT first, const IterT last, const Options& opt = Options{})
+        {
+            auto exclude_files = std::unordered_set<std::basic_string<typename std::iterator_traits<IterT>::value_type>>{};
+            auto roots = detail::read_internal<OutputT>(first, last, exclude_files, opt);
+
+            OutputT result;
+            if (roots.size() > 1)
+            {
+                for (auto& i : roots)
+                    result.add_child(std::move(i));
+            }
+            else if (roots.size() == 1)
+                result = std::move(*roots[0]);
+
+            return result;
+        }
+
+        /** \brief Read VDF formatted sequences defined by the range [first, last).
+        If the file is mailformatted, parser will try to read it until it can.
+        @param first begin iterator
+        @param end end iterator
+        @param ec output bool. 0 if ok, otherwise, holds an system error code
+
+        Possible error codes:
+        std::errc::protocol_error: file is mailformatted
+        std::errc::not_enough_memory: not enough space
+        std::errc::invalid_argument: iterators throws e.g. out of range
+        */
+        template <typename OutputT, typename IterT>
+        OutputT read(IterT first, IterT last, std::error_code& ec, const Options& opt = Options{}) NOEXCEPT
+
+        {
+            ec.clear();
+            OutputT r{};
+            try
+            {
+                r = read<OutputT>(first, last, opt);
+            }
+            catch (std::runtime_error&)
+            {
+                ec = std::make_error_code(std::errc::protocol_error);
+            }
+            catch (std::bad_alloc&)
+            {
+                ec = std::make_error_code(std::errc::not_enough_memory);
+            }
+            catch (...)
+            {
+                ec = std::make_error_code(std::errc::invalid_argument);
+            }
+            return r;
+        }
+
+        /** \brief Read VDF formatted sequences defined by the range [first, last).
+        If the file is mailformatted, parser will try to read it until it can.
+        @param first begin iterator
+        @param end end iterator
+        @param ok output bool. true, if parser successed, false, if parser failed
+        */
+        template <typename OutputT, typename IterT>
+        OutputT read(IterT first, const IterT last, bool* ok, const Options& opt = Options{}) NOEXCEPT
+        {
+            std::error_code ec;
+            auto r = read<OutputT>(first, last, ec, opt);
+            if (ok)
+                *ok = !ec;
+            return r;
+        }
+
+        template <typename IterT>
+        inline auto read(IterT first, const IterT last, bool* ok, const Options& opt = Options{}) NOEXCEPT -> basic_object<typename std::iterator_traits<IterT>::value_type>
+        {
+            return read<basic_object<typename std::iterator_traits<IterT>::value_type>>(first, last, ok, opt);
+        }
+
+        template <typename IterT>
+        inline auto read(IterT first, IterT last, std::error_code& ec, const Options& opt = Options{}) NOEXCEPT
+            -> basic_object<typename std::iterator_traits<IterT>::value_type>
+        {
+            return read<basic_object<typename std::iterator_traits<IterT>::value_type>>(first, last, ec, opt);
+        }
+
+        template <typename IterT>
+        inline auto read(IterT first, const IterT last, const Options& opt = Options{})
+            -> basic_object<typename std::iterator_traits<IterT>::value_type>
+        {
+            return read<basic_object<typename std::iterator_traits<IterT>::value_type>>(first, last, opt);
+        }
+
+        /** \brief Loads a stream (e.g. filestream) into the memory and parses the vdf formatted data.
+            throws "std::bad_alloc" if file buffer could not be allocated
+        */
+        template <typename OutputT, typename iStreamT>
+        OutputT read(iStreamT& inStream, std::error_code& ec, const Options& opt = Options{})
+        {
+            // cache the file
+            typedef typename iStreamT::char_type charT;
+            std::basic_string<charT> str = detail::read_file(inStream);
+
+            // parse it
+            return read<OutputT>(str.begin(), str.end(), ec, opt);
+        }
+
+        template <typename iStreamT>
+        inline basic_object<typename iStreamT::char_type> read(iStreamT& inStream, std::error_code& ec, const Options& opt = Options{})
+        {
+            return read<basic_object<typename iStreamT::char_type>>(inStream, ec, opt);
+        }
+
+        /** \brief Loads a stream (e.g. filestream) into the memory and parses the vdf formatted data.
+            throws "std::bad_alloc" if file buffer could not be allocated
+            ok == false, if a parsing error occured
+        */
+        template <typename OutputT, typename iStreamT>
+        OutputT read(iStreamT& inStream, bool* ok, const Options& opt = Options{})
+        {
+            std::error_code ec;
+            const auto r = read<OutputT>(inStream, ec, opt);
+            if (ok)
+                *ok = !ec;
+            return r;
+        }
+
+        template <typename iStreamT>
+        inline basic_object<typename iStreamT::char_type> read(iStreamT& inStream, bool* ok, const Options& opt = Options{})
+        {
+            return read<basic_object<typename iStreamT::char_type>>(inStream, ok, opt);
+        }
+
+        /** \brief Loads a stream (e.g. filestream) into the memory and parses the vdf formatted data.
+            throws "std::bad_alloc" if file buffer could not be allocated
+            throws "std::runtime_error" if a parsing error occured
+        */
+        template <typename OutputT, typename iStreamT>
+        OutputT read(iStreamT& inStream, const Options& opt)
+        {
+
+            // cache the file
+            typedef typename iStreamT::char_type charT;
+            std::basic_string<charT> str = detail::read_file(inStream);
+            // parse it
+            return read<OutputT>(str.begin(), str.end(), opt);
+        }
+
+        template <typename iStreamT>
+        inline basic_object<typename iStreamT::char_type> read(iStreamT& inStream, const Options& opt = Options{})
+        {
+            return read<basic_object<typename iStreamT::char_type>>(inStream, opt);
+        }
+
+    } // namespace vdf
+} // namespace tyti
+#ifndef TYTI_NO_L_UNDEF
+#undef TYTI_L
+#endif
+
+#ifdef TYTI_UNDEF_CONSTEXPR
+#undef CONSTEXPR
+#undef TYTI_NO_L_UNDEF
+#endif
+
+#ifdef TYTI_UNDEF_NOTHROW
+#undef NOTHROW
+#undef TYTI_UNDEF_NOTHROW
+#endif
+
+#endif //__TYTI_STEAM_VDF_PARSER_H__

src/Compressor.cpp

@@ -8,6 +8,9 @@
 
 #include <iostream>
 #include <zlib.h>
+#ifdef __linux__
+#include <cstring>
+#endif
 
 #define Biggest 30000
 std::string Comp(std::string Data){
@@ -27,7 +30,7 @@ std::string Comp(std::string Data){
     deflateEnd(&defstream);
     int TO = defstream.total_out;
     std::string Ret(TO,0);
-    memcpy_s(&Ret[0],TO,C,TO);
+    memcpy(&Ret[0],C,TO);
     delete [] C;
     return Ret;
 }
@@ -48,7 +51,7 @@ std::string DeComp(std::string Compressed){
     inflateEnd(&infstream);
     int TO = infstream.total_out;
     std::string Ret(TO,0);
-    memcpy_s(&Ret[0],TO,C,TO);
+    memcpy(&Ret[0],C,TO);
     delete [] C;
     return Ret;
 }

src/Config.cpp

@@ -2,18 +2,18 @@
 /// Created by Anonymous275 on 2/23/2021
 ///
 
-#include <nlohmann/json.hpp>
-#include "Network/network.h"
+#include "Network/network.hpp"
 #include <filesystem>
 #include "Logger.h"
 #include <fstream>
+#include "Json.h"
 #include <cstdint>
 namespace fs = std::filesystem;
 
 std::string Branch;
-void ParseConfig(const nlohmann::json& d){
-    if(d["Port"].is_number()){
-        DEFAULT_PORT = d["Port"].get<int>();
+void ParseConfig(const json::Document& d){
+    if(d["Port"].IsInt()){
+        DEFAULT_PORT = d["Port"].GetInt();
     }
     //Default -1
     //Release 1
@@ -21,8 +21,8 @@ void ParseConfig(const nlohmann::json& d){
     //Dev 3
     //Custom 3
 
-    if(d["Build"].is_string()){
-        Branch = d["Build"].get<std::string>();
+    if(d["Build"].IsString()){
+        Branch = d["Build"].GetString();
         for(char& c : Branch)c = char(tolower(c));
     }
 }
@@ -35,9 +35,10 @@ void ConfigInit(){
             std::string Buffer(Size, 0);
             cfg.read(&Buffer[0], Size);
             cfg.close();
-            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-            if(d.is_discarded()){
-                fatal("Config failed to parse make sure it's valid JSON!");
+            json::Document d;
+            d.Parse(Buffer.c_str());
+            if(d.HasParseError()){
+                fatal("Config failed to parse make sure it's valid JSON! Code : " + std::to_string(d.GetParseError()));
             }
             ParseConfig(d);
         }else fatal("Failed to open Launcher.cfg!");

src/Discord.cpp

@@ -5,6 +5,9 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
+
+#ifndef __linux__
+
 #include "Discord/discord_rpc.h"
 #include "Logger.h"
 #include <cstring>
@@ -109,3 +112,5 @@ void Discord_Main(){
     }
     if(DiscordInfo == nullptr)ErrorAboard();*/
 }
+
+#endif

src/GameStart.cpp

@@ -6,13 +6,26 @@
 /// Created by Anonymous275 on 7/19/2020
 ///
 
-#include <Security/Init.h>
+
+#if defined(_WIN32)
 #include <windows.h>
+#elif defined(__linux__)
+#include "vdf_parser.hpp"
+#include <pwd.h>
+#include <sys/wait.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <spawn.h>
+#endif
+
+#include <Security/Init.h>
+#include <filesystem>
 #include "Startup.h"
 #include "Logger.h"
 #include <thread>
 
 unsigned long GamePID = 0;
+#if defined(_WIN32)
 std::string QueryKey(HKEY hKey,int ID);
 std::string GetGamePath(){
     static std::string Path;
@@ -40,7 +53,21 @@ std::string GetGamePath(){
     Path += Ver + "\\";
     return Path;
 }
+#elif defined(__linux__)
+std::string GetGamePath(){
+    // Right now only steam is supported
+    struct passwd *pw = getpwuid(getuid());
+    std::string homeDir = pw->pw_dir;
+    
+    std::string Path = homeDir + "/.local/share/BeamNG.drive/";
+    std::string Ver = CheckVer(GetGameDir());
+    Ver = Ver.substr(0,Ver.find('.',Ver.find('.')+1));
+    Path += Ver + "/";
+    return Path;
+}
+#endif
 
+#if defined(_WIN32)
 void StartGame(std::string Dir){
     BOOL bSuccess = FALSE;
     PROCESS_INFORMATION pi;
@@ -61,6 +88,26 @@ void StartGame(std::string Dir){
     std::this_thread::sleep_for(std::chrono::seconds(5));
     exit(2);
 }
+#elif defined(__linux__)
+void StartGame(std::string Dir) {
+    int status;
+    std::string filename = (Dir + "/BinLinux/BeamNG.drive.x64");
+    char *argv[] = {filename.data(), NULL};
+    pid_t pid;
+    int result = posix_spawn(&pid, filename.c_str(), NULL, NULL, argv, environ);
+
+    if (result != 0) {
+        error("Failed to Launch the game! launcher closing soon");
+        return;
+    } else {
+        waitpid(pid, &status, 0);
+        error("Game Closed! launcher closing soon");
+    }
+
+    std::this_thread::sleep_for(std::chrono::seconds(5));
+    exit(2);
+}
+#endif
 
 void InitGame(const std::string& Dir){
     if(!Dev){

src/Network/Core.cpp

@@ -5,16 +5,24 @@
 ///
 /// Created by Anonymous275 on 7/20/2020
 ///
-
-#include "Network/network.h"
+#include "Network/network.hpp"
 #include "Security/Init.h"
-#include <regex>
+
 #include "Http.h"
+#if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
+
+#elif defined(__linux__)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <cstring>
+#include <errno.h>
+#endif
+
 #include "Startup.h"
 #include "Logger.h"
-#include <nlohmann/json.hpp>
 #include <charconv>
 #include <thread>
 #include <set>
@@ -25,8 +33,6 @@ bool TCPTerminate = false;
 int DEFAULT_PORT = 4444;
 bool Terminate = false;
 bool LoginAuth = false;
-std::string Username = "";
-std::string UserRole = "";
 std::string UlStatus;
 std::string MStatus;
 bool ModLoaded;
@@ -51,15 +57,6 @@ void StartSync(const std::string &Data){
     GS.detach();
     info("Connecting to server");
 }
-
-bool IsAllowedLink(const std::string& Link) {
-    std::regex link_pattern(R"(https:\/\/(?:\w+)?(?:\.)?(?:beammp\.com|discord\.gg))");
-    std::smatch link_match;
-    return std::regex_search(Link,link_match, link_pattern) && link_match.position() == 0;
-}
-
-bool ModWarningConfirmed = false;
-
 void Parse(std::string Data,SOCKET CSocket){
     char Code = Data.at(0), SubCode = 0;
     if(Data.length() > 1)SubCode = Data.at(1);
@@ -82,27 +79,6 @@ void Parse(std::string Data,SOCKET CSocket){
             if(ListOfMods == "-")Data = "L";
             else Data = "L"+ListOfMods;
             break;
-        case 'O': //open default browser with URL
-            if(IsAllowedLink(Data.substr(1))) {
-                ShellExecuteA(nullptr, "open", Data.substr(1).c_str(), nullptr, nullptr,SW_SHOW); ///TODO: Look at when working on linux port
-                info("Opening Link \"" + Data.substr(1) + "\"");
-            }
-            Data.clear();
-            break;
-        // response to "WMODS_FOUND" message, either Y (yes ok) or N (no)
-        case 'W': {
-            if (SubCode == 'Y') {
-                ModWarningConfirmed = true;
-            } else if (SubCode == 'N') {
-                ModWarningConfirmed = false;
-                NetReset();
-                Terminate = true;
-                TCPTerminate = true;
-            }
-        }
-        case 'P':
-            Data = Code + std::to_string(ProxyPort);
-            break;
         case 'U':
             if(SubCode == 'l')Data = UlStatus;
             if(SubCode == 'p'){
@@ -142,16 +118,7 @@ void Parse(std::string Data,SOCKET CSocket){
             break;
         case 'N':
             if (SubCode == 'c'){
-                nlohmann::json Auth = {
-                    {"Auth", LoginAuth ? 1 : 0 },
-                };
-                if (!Username.empty()) {
-                    Auth["username"] = Username;
-                }
-                if (!UserRole.empty()) {
-                    Auth["role"] = UserRole;
-                }
-                Data = "N" + Auth.dump();
+                Data = "N{\"Auth\":"+std::to_string(LoginAuth)+"}";
             }else{
                 Data = "N" + Login(Data.substr(Data.find(':') + 1));
             }
@@ -218,19 +185,20 @@ void localRes(){
     }
     ConfList = new std::set<std::string>;
 }
-
-
-uint64_t TheClientSocket;
-
 void CoreMain() {
     debug("Core Network on start!");
-    WSADATA wsaData;
     SOCKET LSocket,CSocket;
     struct addrinfo *res = nullptr;
     struct addrinfo hints{};
-    int iRes = WSAStartup(514, &wsaData); //2.2
+    int iRes;
+    #ifdef _WIN32
+    WSADATA wsaData;
+    iRes = WSAStartup(514, &wsaData); //2.2
     if (iRes)debug("WSAStartup failed with error: " + std::to_string(iRes));
+    #endif
+    
     ZeroMemory(&hints, sizeof(hints));
+
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;
     hints.ai_protocol = IPPROTO_TCP;
@@ -270,7 +238,6 @@ void CoreMain() {
             error("(Core) accept failed with error: " + std::to_string(WSAGetLastError()));
             continue;
         }
-        TheClientSocket = CSocket;
         localRes();
         info("Game Connected!");
         GameHandler(CSocket);
@@ -279,6 +246,8 @@ void CoreMain() {
     KillSocket(LSocket);
     WSACleanup();
 }
+
+#if defined(_WIN32)
 int Handle(EXCEPTION_POINTERS *ep){
     char* hex = new char[100];
     sprintf_s(hex,100, "%lX", ep->ExceptionRecord->ExceptionCode);
@@ -286,17 +255,24 @@ int Handle(EXCEPTION_POINTERS *ep){
     delete [] hex;
     return 1;
 }
-
+#endif
 
 [[noreturn]] void CoreNetwork(){
     while(true) {
-#ifndef __MINGW32__
-        __try{
-#endif
-                CoreMain();
-#ifndef __MINGW32__
-        }__except(Handle(GetExceptionInformation())){}
-#endif
+        #if not defined(__MINGW32__)
+            __try{
+        #endif
+        
+        CoreMain();
+
+        #if not defined(__MINGW32__) and not defined(__linux__)
+            }__except(Handle(GetExceptionInformation())){}
+        #elif not defined(__MINGW32__) and defined(__linux__)
+            } catch(...){
+                except("(Core) Code : " + std::string(strerror(errno)));
+            }
+        #endif
+
         std::this_thread::sleep_for(std::chrono::seconds(1));
     }
 }

src/Network/DNS.cpp

@@ -7,18 +7,29 @@
 ///
 
 #include <string>
+
+#if defined(_WIN32)
 #include <winsock2.h>
+#elif defined(__linux__)
+#include "linuxfixes.h"
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
+
 #include "Logger.h"
 
 std::string GetAddr(const std::string&IP){
     if(IP.find_first_not_of("0123456789.") == -1)return IP;
-    WSADATA wsaData;
     hostent *host;
+    #ifdef _WIN32
+    WSADATA wsaData;
     if(WSAStartup(514, &wsaData) != 0){
         error("WSA Startup Failed!");
         WSACleanup();
         return "";
     }
+    #endif
+    
     host = gethostbyname(IP.c_str());
     if(!host){
         error("DNS lookup failed! on " + IP);

src/Network/GlobalHandler.cpp

@@ -5,9 +5,20 @@
 ///
 /// Created by Anonymous275 on 7/25/2020
 ///
-#include "Network/network.h"
+#include "Network/network.hpp"
+#if defined(_WIN32)
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include "linuxfixes.h"
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <cstring>
+#endif
+
 #include "Logger.h"
 #include <charconv>
 #include <string>
@@ -117,12 +128,16 @@ SOCKET SetupListener(){
     if(GSocket != -1)return GSocket;
     struct addrinfo *result = nullptr;
     struct addrinfo hints{};
+    int iRes;
+    #ifdef _WIN32
     WSADATA wsaData;
-    int iRes = WSAStartup(514, &wsaData); //2.2
+    iRes = WSAStartup(514, &wsaData); //2.2
     if (iRes != 0) {
         error("(Proxy) WSAStartup failed with error: " + std::to_string(iRes));
         return -1;
     }
+    #endif
+
     ZeroMemory(&hints, sizeof(hints));
     hints.ai_family = AF_INET;
     hints.ai_socktype = SOCK_STREAM;

src/Network/Http.cpp

@@ -15,6 +15,13 @@
 #include <cmath>
 #include <httplib.h>
 
+std::string HTTP::Codes_[] =
+{
+ "Success","Unknown","Connection","BindIPAddress",
+ "Read","Write","ExceedRedirectCount","Canceled",
+ "SSLConnection","SSLLoadingCerts","SSLServerVerification",
+ "UnsupportedMultipartBoundaryChars","Compression"
+};
 bool HTTP::isDownload = false;
 std::string HTTP::Get(const std::string &IP) {
     static std::mutex Lock;
@@ -28,7 +35,7 @@ std::string HTTP::Get(const std::string &IP) {
     auto res = cli.Get(IP.substr(pos).c_str(), ProgressBar);
     std::string Ret;
 
-    if(res){
+    if(res.error() == 0){
         if(res->status == 200){
             Ret = res->body;
         }else error(res->reason);
@@ -37,7 +44,7 @@ std::string HTTP::Get(const std::string &IP) {
         if(isDownload) {
             std::cout << "\n";
         }
-        error("HTTP Get failed on " + to_string(res.error()));
+        error("HTTP Get failed on " + Codes_[res.error()]);
     }
 
     return Ret;
@@ -56,23 +63,23 @@ std::string HTTP::Post(const std::string& IP, const std::string& Fields) {
     if(!Fields.empty()) {
         httplib::Result res = cli.Post(IP.substr(pos).c_str(), Fields, "application/json");
 
-        if(res) {
+        if(res.error() == 0) {
             if (res->status != 200) {
                 error(res->reason);
             }
             Ret = res->body;
         }else{
-            error("HTTP Post failed on " + to_string(res.error()));
+            error("HTTP Post failed on " + Codes_[res.error()]);
         }
     }else{
         httplib::Result res = cli.Post(IP.substr(pos).c_str());
-        if(res) {
+        if(res.error() == 0) {
             if (res->status != 200) {
                 error(res->reason);
             }
             Ret = res->body;
         }else{
-            error("HTTP Post failed on " + to_string(res.error()));
+            error("HTTP Post failed on " + Codes_[res.error()]);
         }
     }
 

src/Network/Resources.cpp

@@ -6,8 +6,19 @@
 /// Created by Anonymous275 on 4/11/2020
 ///
 
-#include "Network/network.h"
+#include "Network/network.hpp"
+
+#if defined(_WIN32)
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
+
 #include <filesystem>
 #include "Startup.h"
 #include "Logger.h"
@@ -21,8 +32,6 @@
 #include <future>
 #include <cmath>
 
-extern SOCKET TheClientSocket;
-
 namespace fs = std::filesystem;
 std::string ListOfMods;
 std::vector<std::string> Split(const std::string& String,const std::string& delimiter){
@@ -40,7 +49,12 @@ std::vector<std::string> Split(const std::string& String,const std::string& deli
 
 void CheckForDir(){
     if(!fs::exists("Resources")){
+        // Could we just use fs::create_directory instead?
+        #if defined(_WIN32)
         _wmkdir(L"Resources");
+        #elif defined(__linux__)
+        fs::create_directory(L"Resources");
+        #endif
     }
 }
 void WaitForConfirm(){
@@ -104,7 +118,7 @@ std::string Auth(SOCKET Sock){
     return Res;
 }
 
-void UpdateUl(bool D,const std::string& msg){
+void UpdateUl(bool D,const std::string&msg){
     if(D)UlStatus = "UlDownloading Resource " + msg;
     else UlStatus = "UlLoading Resource " + msg;
 }
@@ -204,10 +218,10 @@ std::string MultiDownload(SOCKET MSock,SOCKET DSock, uint64_t Size, const std::s
 
     ///omg yes very ugly my god but i was in a rush will revisit
     std::string Ret(Size,0);
-    memcpy_s(&Ret[0],MSize,MData,MSize);
+    memcpy(&Ret[0],MData,MSize);
     delete[]MData;
 
-    memcpy_s(&Ret[MSize],DSize,DData,DSize);
+    memcpy(&Ret[MSize],DData,DSize);
     delete[]DData;
 
     return Ret;
@@ -223,23 +237,6 @@ void SyncResources(SOCKET Sock){
     std::string Ret = Auth(Sock);
     if(Ret.empty())return;
 
-    ModWarningConfirmed = false;
-    Terminate = false;
-
-    std::string Data = "WMODS_FOUND";
-    send(TheClientSocket, (Data + "\n").c_str(), int(Data.size())+1, 0);
-    
-    while (!Terminate && !ModWarningConfirmed) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(10));
-    }
-
-    if (!ModWarningConfirmed) {
-        UlStatus = "UlMods rejected!";
-        info("Mods rejected by user!");
-        // game has already cancelled by now
-        return;
-    }
-
     info("Checking Resources...");
     CheckForDir();
 
@@ -286,10 +283,17 @@ void SyncResources(SOCKET Sock){
                     if(!fs::exists(GetGamePath() + "mods/multiplayer")){
                         fs::create_directories(GetGamePath() + "mods/multiplayer");
                     }
-                    auto name = GetGamePath() + "mods/multiplayer" + a.substr(a.find_last_of('/'));
-                    auto tmp_name = name + ".tmp";
-                    fs::copy_file(a,tmp_name,fs::copy_options::overwrite_existing);
-                    fs::rename(tmp_name, name);
+
+                    std::string FName = a.substr(a.find_last_of('/'));
+                    // Linux version of the game doesnt support uppercase letters in mod names
+                    #if defined(__linux__)
+                    for(char &c : FName){
+                        c = ::tolower(c);
+                    }
+                    #endif
+
+                    fs::copy_file(a, GetGamePath() + "mods/multiplayer" + FName,
+                                  fs::copy_options::overwrite_existing);
                 } catch (std::exception& e) {
                     error("Failed copy to the mods folder! " + std::string(e.what()));
                     Terminate = true;
@@ -329,6 +333,14 @@ void SyncResources(SOCKET Sock){
             if(!fs::exists(GetGamePath() + "mods/multiplayer")){
                 fs::create_directories(GetGamePath() + "mods/multiplayer");
             }
+
+            // Linux version of the game doesnt support uppercase letters in mod names
+            #if defined(__linux__)
+            for(char &c : FName){
+                c = ::tolower(c);
+            }
+            #endif
+
             fs::copy_file(a,GetGamePath() + "mods/multiplayer" + FName, fs::copy_options::overwrite_existing);
         }
         WaitForConfirm();
@@ -341,4 +353,4 @@ void SyncResources(SOCKET Sock){
         UlStatus = "Ulstart";
         info("Connection Terminated!");
     }
-}
+}

src/Network/VehicleData.cpp

@@ -6,9 +6,20 @@
 /// Created by Anonymous275 on 5/8/2020
 ///
 #include "Zlib/Compressor.h"
-#include "Network/network.h"
+#include "Network/network.hpp"
 
+#if defined(_WIN32)
 #include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include "linuxfixes.h"
+#endif
+
 #include "Logger.h"
 #include <string>
 #include <set>
@@ -44,7 +55,11 @@ void UDPParser(std::string Packet){
 }
 void UDPRcv(){
     sockaddr_in FromServer{};
+    #if defined(_WIN32)
     int clientLength = sizeof(FromServer);
+    #elif defined(__linux__)
+    socklen_t clientLength = sizeof(FromServer);
+    #endif
     ZeroMemory(&FromServer, clientLength);
     std::string Ret(10240,0);
     if(UDPSock == -1)return;
@@ -53,11 +68,14 @@ void UDPRcv(){
     UDPParser(Ret.substr(0,Rcv));
 }
 void UDPClientMain(const std::string& IP,int Port){
+    #ifdef _WIN32
     WSADATA data;
     if (WSAStartup(514, &data)){
         error("Can't start Winsock!");
         return;
     }
+    #endif
+    
     delete ToServer;
     ToServer = new sockaddr_in;
     ToServer->sin_family = AF_INET;

src/Network/VehicleEvent.cpp

@@ -10,11 +10,20 @@
 #include <vector>
 #include "Logger.h"
 #include <iostream>
-#include <ws2tcpip.h>
 #include <Zlib/Compressor.h>
 
-#include "Network/network.h"
+#if defined(_WIN32)
+#include <ws2tcpip.h>
+#elif defined(__linux__)
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <cstring>
+#include <errno.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#endif
 
+#include "Network/network.hpp"
 
 int LastPort;
 std::string LastIP;
@@ -116,10 +125,12 @@ std::string TCPRcv(SOCKET Sock){
 void TCPClientMain(const std::string& IP,int Port){
     LastIP = IP;
     LastPort = Port;
-    WSADATA wsaData;
     SOCKADDR_IN ServerAddr;
     int RetCode;
+    #ifdef _WIN32
+    WSADATA wsaData;
     WSAStartup(514, &wsaData); //2.2
+    #endif
     TCPSock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
 
     if(TCPSock == -1){
@@ -127,6 +138,7 @@ void TCPClientMain(const std::string& IP,int Port){
         WSACleanup();
         return;
     }
+
     ServerAddr.sin_family = AF_INET;
     ServerAddr.sin_port = htons(Port);
     inet_pton(AF_INET, IP.c_str(), &ServerAddr.sin_addr);
@@ -152,6 +164,9 @@ void TCPClientMain(const std::string& IP,int Port){
     if(KillSocket(TCPSock) != 0)
         debug("(TCP) Cannot close socket. Error code: " + std::to_string(WSAGetLastError()));
 
+    #ifdef _WIN32
     if(WSACleanup() != 0)
         debug("(TCP) Client: WSACleanup() failed!...");
+    #endif
+
 }

src/Security/BeamNG.cpp

@@ -7,7 +7,14 @@
 ///
 
 #include <filesystem>
+#if defined(_WIN32)
 #include <windows.h>
+#elif defined(__linux__)
+#include "vdf_parser.hpp"
+#include <vector>
+#include <pwd.h>
+#include <unistd.h>
+#endif
 #include "Logger.h"
 #include <fstream>
 #include <sstream>
@@ -46,8 +53,13 @@ void SteamExit(int code){
 }*/
 std::string GetGameDir(){
     //if(TraceBack != 4)Exit(0);
+    #if defined(_WIN32)
     return GameDir.substr(0,GameDir.find_last_of('\\'));
+    #elif defined(__linux__)
+    return GameDir.substr(0,GameDir.find_last_of('/'));
+    #endif
 }
+#ifdef _WIN32
 LONG OpenKey(HKEY root,const char* path,PHKEY hKey){
     return RegOpenKeyEx(root, reinterpret_cast<LPCSTR>(path), 0, KEY_READ, hKey);
 }
@@ -129,6 +141,8 @@ std::string QueryKey(HKEY hKey,int ID){
     delete [] buffer;
     return "";
 }
+#endif
+
 namespace fs = std::filesystem;
 
 bool NameValid(const std::string& N){
@@ -144,9 +158,9 @@ void FileList(std::vector<std::string>&a,const std::string& Path){
     for (const auto &entry : fs::directory_iterator(Path)) {
         const auto& DPath = entry.path();
         if (!entry.is_directory()) {
-            a.emplace_back(DPath.string());
-        }else if(NameValid(DPath.filename().string())){
-            FileList(a, DPath.string());
+            a.emplace_back(DPath.u8string());
+        }else if(NameValid(DPath.filename().u8string())){
+            FileList(a, DPath.u8string());
         }
     }
 }
@@ -165,7 +179,7 @@ bool Find(const std::string& FName,const std::string& Path){
 bool FindHack(const std::string& Path){
     bool s = true;
     for (const auto &entry : fs::directory_iterator(Path)) {
-        std::string Name = entry.path().filename().string();
+        std::string Name = entry.path().filename().u8string();
         for(char&c : Name)c = char(tolower(c));
         if(Name == "steam.exe")s = false;
         if(Name.find("greenluma") != -1){
@@ -286,6 +300,7 @@ void LegitimacyCheck(){
     }else lowExit(2);
     K2.clear();
     RegCloseKey(hKey);*/
+    #if defined(_WIN32)
     std::string Result;
     std::string K3 = R"(Software\BeamNG\BeamNG.drive)";
     HKEY hKey;
@@ -301,9 +316,27 @@ void LegitimacyCheck(){
     Result.clear();
     RegCloseKey(hKey);
     //if(TraceBack < 3)exit(-1);
+    #elif defined(__linux__)
+    struct passwd *pw = getpwuid(getuid());
+    std::string homeDir = pw->pw_dir;
+    // Right now only steam is supported
+    std::ifstream libraryFolders(homeDir + "/.steam/root/steamapps/libraryfolders.vdf");
+    auto root = tyti::vdf::read(libraryFolders);
+
+    for (auto folderInfo: root.childs){
+        if (std::filesystem::exists(folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/")){
+            GameDir = folderInfo.second->attribs["path"] + "/steamapps/common/BeamNG.drive/";
+            break;
+        }
+    }
+    #endif
 }
 std::string CheckVer(const std::string &dir){
+    #if defined(_WIN32)
     std::string temp,Path = dir + "\\integrity.json";
+    #elif defined(__linux__)
+    std::string temp,Path = dir + "/integrity.json";
+    #endif
     std::ifstream f(Path.c_str(), std::ios::binary);
     int Size = int(std::filesystem::file_size(Path));
     std::string vec(Size,0);

src/Security/Login.cpp

@@ -6,23 +6,19 @@
 /// Created by Anonymous275 on 11/26/2020
 ///
 
-#include <nlohmann/json.hpp>
 #include "Http.h"
 #include <filesystem>
 #include "Logger.h"
 #include <fstream>
-
+#include "Json.h"
 
 namespace fs = std::filesystem;
 std::string PublicKey;
-std::string PrivateKey;
 extern bool LoginAuth;
-extern std::string Username;
-extern std::string UserRole;
+std::string Role;
 
 void UpdateKey(const char* newKey){
     if(newKey && std::isalnum(newKey[0])){
-        PrivateKey = newKey;
         std::ofstream Key("key");
         if(Key.is_open()){
             Key << newKey;
@@ -46,51 +42,41 @@ std::string GetFail(const std::string& R){
 
 std::string Login(const std::string& fields){
     if(fields == "LO"){
-        Username = "";
-        UserRole = "";
         LoginAuth = false;
         UpdateKey(nullptr);
         return "";
     }
     info("Attempting to authenticate...");
-    try {
-        std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
-
-        if(Buffer == "-1"){
-            return GetFail("Failed to communicate with the auth system!");
-        }
-
-        nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-
-        if (Buffer.at(0) != '{' || d.is_discarded()) {
-            error(Buffer);
-            return GetFail("Invalid answer from authentication servers, please try again later!");
-        }
-        if(d.contains("success") && d["success"].get<bool>()){
-            LoginAuth = true;
-            if (d.contains("username")) {
-                Username = d["username"].get<std::string>();
-            }
-            if (d.contains("role")) {
-                UserRole = d["role"].get<std::string>();
-            }
-            if(d.contains("private_key")) {
-                UpdateKey(d["private_key"].get<std::string>().c_str());
-            }
-            if(d.contains("public_key")){
-                PublicKey = d["public_key"].get<std::string>();
-            }
-            info("Authentication successful!");
-        }else info("Authentication failed!");
-        if(d.contains("message")){
-            d.erase("private_key");
-            d.erase("public_key");
-            return d.dump();
-        }
-        return GetFail("Invalid message parsing!");
-    } catch (const std::exception& e) {
-        return GetFail(e.what());
+    std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields);
+    json::Document d;
+    d.Parse(Buffer.c_str());
+    if(Buffer == "-1"){
+        return GetFail("Failed to communicate with the auth system!");
     }
+
+    if (Buffer.at(0) != '{' || d.HasParseError()) {
+        error(Buffer);
+        return GetFail("Invalid answer from authentication servers, please try again later!");
+    }
+    if(d.HasMember("success") && !d["success"].IsNull() && d["success"].GetBool()){
+        LoginAuth = true;
+        if(d.HasMember("private_key") && !d["private_key"].IsNull()){
+            UpdateKey(d["private_key"].GetString());
+        }
+        if(d.HasMember("public_key") && !d["public_key"].IsNull()){
+            PublicKey = d["public_key"].GetString();
+        }
+        info("Authentication successful!");
+    }else info("Authentication failed!");
+    if(d.HasMember("message") && !d["message"].IsNull()){
+        d.RemoveMember("private_key");
+        d.RemoveMember("public_key");
+        rapidjson::StringBuffer buffer;
+        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+        d.Accept(writer);
+        return buffer.GetString();
+    }
+    return GetFail("Invalid message parsing!");
 }
 
 void CheckLocalKey(){
@@ -111,23 +97,18 @@ void CheckLocalKey(){
 
             Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}");
 
-            nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
-
-            if (Buffer == "-1" || Buffer.at(0) != '{' || d.is_discarded()) {
+            json::Document d;
+            d.Parse(Buffer.c_str());
+            if (Buffer == "-1" || Buffer.at(0) != '{' || d.HasParseError()) {
                 error(Buffer);
                 info("Invalid answer from authentication servers.");
                 UpdateKey(nullptr);
             }
-            if(d["success"].get<bool>()){
+            if(d.HasMember("success") && d["success"].GetBool()){
                 LoginAuth = true;
-                UpdateKey(d["private_key"].get<std::string>().c_str());
-                PublicKey = d["public_key"].get<std::string>();
-                if (d.contains("username")) {
-                    Username = d["username"].get<std::string>();
-                }
-                if (d.contains("role")) {
-                    UserRole = d["role"].get<std::string>();
-                }
+                UpdateKey(d["private_key"].GetString());
+                PublicKey = d["public_key"].GetString();
+                Role = d["role"].GetString();
                 //info(Role);
             }else{
                 info("Auto-Authentication unsuccessful please re-login!");

src/Startup.cpp

@@ -5,64 +5,43 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
-
-#include <nlohmann/json.hpp>
-#include <httplib.h>
 #include "zip_file.h"
+#include <string>
+#if defined(_WIN32)
 #include <windows.h>
+#elif defined(__linux__)
+#include <unistd.h>
+#endif
 #include "Discord/discord_info.h"
-#include "Network/network.h"
+#include "Network/network.hpp"
 #include "Security/Init.h"
 #include <filesystem>
 #include "Startup.h"
-#include "hashpp.h"
 #include "Logger.h"
 #include <fstream>
 #include <thread>
 #include "Http.h"
-
+#include "Json.h"
 
 extern int TraceBack;
 bool Dev = false;
-int ProxyPort = 0;
-
 namespace fs = std::filesystem;
 
-VersionParser::VersionParser(const std::string& from_string) {
-    std::string token;
-    std::istringstream tokenStream(from_string);
-    while (std::getline(tokenStream, token, '.')) {
-        data.emplace_back(std::stol(token));
-        split.emplace_back(token);
-    }
-}
-
-std::strong_ordering VersionParser::operator<=>(
-        const VersionParser& rhs) const noexcept {
-    size_t const fields = std::min(data.size(), rhs.data.size());
-    for (size_t i = 0; i != fields; ++i) {
-        if (data[i] == rhs.data[i]) continue;
-        else if (data[i] < rhs.data[i]) return std::strong_ordering::less;
-        else return std::strong_ordering::greater;
-    }
-    if (data.size() == rhs.data.size()) return std::strong_ordering::equal;
-    else if (data.size() > rhs.data.size()) return std::strong_ordering::greater;
-    else return std::strong_ordering::less;
-}
-
-bool VersionParser::operator==(const VersionParser& rhs) const noexcept {
-    return std::is_eq(*this <=> rhs);
-}
-
-
+#if defined(_WIN32)
 std::string GetEN(){
     return "BeamMP-Launcher.exe";
 }
+#elif defined(__linux__)
+std::string GetEN(){
+    return "BeamMP-Launcher";
+}
+#endif
+
 std::string GetVer(){
     return "2.0";
 }
 std::string GetPatch(){
-    return ".85";
+    return ".82";
 }
 
 std::string GetEP(char*P){
@@ -72,6 +51,7 @@ std::string GetEP(char*P){
     } ();
     return Ret;
 }
+#if defined(_WIN32)
 void ReLaunch(int argc,char*args[]){
     std::string Arg;
     for(int c = 2; c <= argc; c++){
@@ -95,8 +75,36 @@ void URelaunch(int argc,char* args[]){
     std::this_thread::sleep_for(std::chrono::seconds(1));
     exit(1);
 }
+#elif defined(__linux__)
+void ReLaunch(int argc,char*args[]){
+    std::string Arg;
+    for(int c = 2; c <= argc; c++){
+        Arg += " ";
+        Arg += args[c-1];
+    }
+    system("clear");
+    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    exit(1);
+}
+void URelaunch(int argc,char* args[]){
+    std::string Arg;
+    for(int c = 2; c <= argc; c++){
+        Arg += " ";
+        Arg += args[c-1];
+    }
+    execl((GetEP() + GetEN()).c_str(), Arg.c_str(), NULL);
+    std::this_thread::sleep_for(std::chrono::seconds(1));
+    exit(1);
+}
+#endif
+
 void CheckName(int argc,char* args[]){
+    #if defined(_WIN32)
     std::string DN = GetEN(),CDir = args[0],FN = CDir.substr(CDir.find_last_of('\\')+1);
+    #elif defined(__linux__)
+    std::string DN = GetEN(),CDir = args[0],FN = CDir.substr(CDir.find_last_of('/')+1);
+    #endif
     if(FN != DN){
         if(fs::exists(DN))remove(DN.c_str());
         if(fs::exists(DN))ReLaunch(argc,args);
@@ -105,28 +113,47 @@ void CheckName(int argc,char* args[]){
     }
 }
 
-void CheckForUpdates(int argc, char* args[], const std::string& CV) {
-    std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
-    std::string LatestVersion = HTTP::Get(
-            "https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
+void CheckForUpdates(int argc,char*args[],const std::string& CV){
+    std::string link;
+    std::string HTTP = HTTP::Get("https://beammp.com/builds/launcher?version=true");
+    bool fallback = false;
+    if(HTTP.find_first_of("0123456789") == std::string::npos){
+        HTTP = HTTP::Get("https://backup1.beammp.com/builds/launcher?version=true");
+        fallback = true;
+        if(HTTP.find_first_of("0123456789") == std::string::npos) {
+            fatal("Primary Servers Offline! sorry for the inconvenience!");
+        }
+    }
+    if(fallback){
+        link = "https://backup1.beammp.com/builds/launcher?download=true";
+    }else link = "https://beammp.com/builds/launcher?download=true";
 
-    transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
     std::string EP(GetEP() + GetEN()), Back(GetEP() + "BeamMP-Launcher.back");
 
-    std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, EP);
+    if(fs::exists(Back))remove(Back.c_str());
 
-    if (FileHash != LatestHash && VersionParser(LatestVersion) > VersionParser(GetVer()+GetPatch())) {
-        info("Launcher update found!");
-        fs::remove(Back);
-        fs::rename(EP, Back);
-        info("Downloading Launcher update " + LatestHash);
-        HTTP::Download(
-                "https://backend.beammp.com/builds/launcher?download=true"
-                "&pk=" +
-                PublicKey + "&branch=" + Branch,
-                EP);
-        URelaunch(argc, args);
-    } else info("Launcher version is up to date");
+    if(HTTP > CV){
+        #if defined(_WIN32)
+        system("cls");
+        #elif defined(__linux__)
+        system("clear");
+        #endif
+        info("Update found!");
+        info("Updating...");
+        if(std::rename(EP.c_str(), Back.c_str()))error("failed creating a backup!");
+
+        if(!HTTP::Download(link, EP)){
+            error("Launcher Update failed! trying again...");
+            std::this_thread::sleep_for(std::chrono::seconds(2));
+
+            if(!HTTP::Download(link, EP)){
+                error("Launcher Update failed!");
+                std::this_thread::sleep_for(std::chrono::seconds(5));
+                ReLaunch(argc,args);
+            }
+        }
+        URelaunch(argc,args);
+    }else info("Launcher version is up to date");
     TraceBack++;
 }
 
@@ -143,6 +170,7 @@ void CustomPort(int argc, char* argv[]){
     }
 }
 
+#ifdef _WIN32
 void LinuxPatch(){
     HKEY hKey = nullptr;
     LONG result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Wine)", 0, KEY_READ, &hKey);
@@ -166,9 +194,36 @@ void LinuxPatch(){
     }
     RegCloseKey(hKey);
 
+    std::string Path = R"(Z:\home\)" + std::string(getenv("USER")) + R"(\.steam\steam\Steam.exe)";
+
+    if(!fs::exists(Path)) {
+        std::ofstream ofs(Path);
+        if (!ofs.is_open()) {
+            fatal("Failed to create file \"" + Path + "\"");
+            return;
+        } else ofs.close();
+    }
+
+    result = RegOpenKeyEx(HKEY_CURRENT_USER, R"(Software\Valve\Steam)", 0, KEY_ALL_ACCESS, &hKey);
+    if (result != ERROR_SUCCESS){
+        fatal(R"(failed to open HKEY_CURRENT_USER\Software\Valve\Steam)");
+        return;
+    }
+
+    result = RegSetValueEx(hKey, "SteamExe", 0, REG_SZ, (BYTE*)Path.c_str(), Path.size());
+
+    if (result != ERROR_SUCCESS){
+        fatal(R"(failed to create the value "Name" under HKEY_CURRENT_USER\Software\Valve\Steam\Apps\284160)");
+        return;
+    }
+
+    RegCloseKey(hKey);
+
     info("Patched!");
 }
+#endif
 
+#if defined(_WIN32)
 void InitLauncher(int argc, char* argv[]) {
     system("cls");
     SetConsoleTitleA(("BeamMP Launcher v" + std::string(GetVer()) + GetPatch()).c_str());
@@ -181,6 +236,17 @@ void InitLauncher(int argc, char* argv[]) {
     Discord_Main();
     CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
 }
+#elif defined(__linux__)
+void InitLauncher(int argc, char* argv[]) {
+    system("clear");
+    InitLog();
+    CheckName(argc, argv);
+    CheckLocalKey();
+    ConfigInit();
+    CustomPort(argc, argv);
+    CheckForUpdates(argc, argv, std::string(GetVer()) + GetPatch());
+}
+#endif
 
 size_t DirCount(const std::filesystem::path& path){
     return (size_t)std::distance(std::filesystem::directory_iterator{path}, std::filesystem::directory_iterator{});
@@ -192,7 +258,7 @@ void CheckMP(const std::string& Path) {
     try {
         for (auto& p : fs::directory_iterator(Path)){
             if(p.exists() && !p.is_directory()){
-                std::string Name = p.path().filename().string();
+                std::string Name = p.path().filename().u8string();
                 for(char&Ch : Name)Ch = char(tolower(Ch));
                 if(Name != "beammp.zip")fs::remove(p.path());
             }
@@ -213,16 +279,20 @@ void EnableMP(){
         std::string Data(Size, 0);
         db.read(&Data[0], Size);
         db.close();
-        nlohmann::json d = nlohmann::json::parse(Data, nullptr, false);
-        if(Data.at(0) != '{' || d.is_discarded()) {
+        json::Document d;
+        d.Parse(Data.c_str());
+        if(Data.at(0) != '{' || d.HasParseError()){
             //error("Failed to parse " + File); //TODO illegal formatting
             return;
         }
-        if(d.contains("mods") && d["mods"].contains("multiplayerbeammp")){
+        if(d.HasMember("mods") && !d["mods"].IsNull() && d["mods"].HasMember("multiplayerbeammp") && !d["mods"]["multiplayerbeammp"].IsNull()){
             d["mods"]["multiplayerbeammp"]["active"] = true;
+            rapidjson::StringBuffer buffer;
+            rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
+            d.Accept(writer);
             std::ofstream ofs(File);
             if(ofs.is_open()){
-                ofs << d.dump();
+                ofs << buffer.GetString();
                 ofs.close();
             }else{
                 error("Failed to write " + File);
@@ -238,11 +308,7 @@ void PreGame(const std::string& GamePath){
     CheckMP(GetGamePath() + "mods/multiplayer");
 
     if(!Dev) {
-        std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
-        transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
-        LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(),
-                               [](auto const& c ) -> bool { return !std::isalnum(c); } ), LatestHash.end());
-
+        info("Downloading mod please wait...");
         try {
             if (!fs::exists(GetGamePath() + "mods/multiplayer")) {
                 fs::create_directories(GetGamePath() + "mods/multiplayer");
@@ -251,76 +317,23 @@ void PreGame(const std::string& GamePath){
         }catch(std::exception&e){
             fatal(e.what());
         }
-
+        #if defined(_WIN32)
         std::string ZipPath(GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
+        #elif defined(__linux__)
+        // Linux version of the game cant handle mods with uppercase names
+        std::string ZipPath(GetGamePath() + R"(mods/multiplayer/beammp.zip)");
+        #endif
 
-        std::string FileHash = hashpp::get::getFileHash(hashpp::ALGORITHMS::SHA2_256, ZipPath);
-
-        if (FileHash != LatestHash) {
-            info("Downloading BeamMP Update " + LatestHash);
-            HTTP::Download("https://backend.beammp.com/builds/client?download=true"
-                           "&pk=" + PublicKey + "&branch=" + Branch, ZipPath);
-        }
+        HTTP::Download("https://backend.beammp.com/builds/client?download=true"
+                 "&pk=" + PublicKey + "&branch=" + Branch, ZipPath);
 
         std::string Target(GetGamePath() + "mods/unpacked/beammp");
 
         if(fs::is_directory(Target)) {
             fs::remove_all(Target);
         }
+
+        //HTTP::Download("beammp.com/builds/client", GetGamePath() + R"(mods\multiplayer\BeamMP.zip)");
     }
-}
 
-void set_headers(httplib::Response& res) {
-    res.set_header("Access-Control-Allow-Origin", "*");
-    res.set_header("Access-Control-Request-Method", "POST, OPTIONS, GET");
-    res.set_header("Access-Control-Request-Headers", "X-API-Version");
-}
-
-void StartProxy() {
-    std::thread proxy([&](){
-        httplib::Server HTTPProxy;
-        httplib::Headers headers = {
-                {"User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch()},
-                {"Accept", "*/*"}
-        };
-        std::string pattern = "/:any1";
-        for (int i = 2; i <= 4; i++) {
-            HTTPProxy.Get(pattern, [&](const httplib::Request &req, httplib::Response &res) {
-                httplib::Client cli("https://backend.beammp.com");
-                set_headers(res);
-                if (req.has_header("X-BMP-Authentication")) {
-                    headers.emplace("X-BMP-Authentication", PrivateKey);
-                }
-                if (req.has_header("X-API-Version")) {
-                    headers.emplace("X-API-Version", req.get_header_value("X-API-Version"));
-                }
-                if (auto cli_res = cli.Get(req.path, headers); cli_res) {
-                    res.set_content(cli_res->body, cli_res->get_header_value("Content-Type"));
-                } else {
-                    res.set_content(to_string(cli_res.error()), "text/plain");
-                }
-            });
-
-            HTTPProxy.Post(pattern, [&](const httplib::Request &req, httplib::Response &res) {
-                httplib::Client cli("https://backend.beammp.com");
-                set_headers(res);
-                if (req.has_header("X-BMP-Authentication")) {
-                    headers.emplace("X-BMP-Authentication", PrivateKey);
-                }
-                if (req.has_header("X-API-Version")) {
-                    headers.emplace("X-API-Version", req.get_header_value("X-API-Version"));
-                }
-                if (auto cli_res = cli.Post(req.path, headers, req.body,
-                                            req.get_header_value("Content-Type")); cli_res) {
-                    res.set_content(cli_res->body, cli_res->get_header_value("Content-Type"));
-                } else {
-                    res.set_content(to_string(cli_res.error()), "text/plain");
-                }
-            });
-            pattern += "/:any" + std::to_string(i);
-        }
-        ProxyPort = HTTPProxy.bind_to_any_port("0.0.0.0");
-        HTTPProxy.listen_after_bind();
-    });
-    proxy.detach();
 }

src/main.cpp

@@ -5,7 +5,7 @@
 ///
 /// Created by Anonymous275 on 7/16/2020
 ///
-#include "Network/network.h"
+#include "Network/network.hpp"
 #include "Security/Init.h"
 #include "Startup.h"
 #include <iostream>
@@ -21,21 +21,20 @@
 }
 
 int main(int argc, char* argv[]) {
-#ifdef DEBUG
-    std::thread th(flush);
-    th.detach();
-#endif
+    #ifdef DEBUG
+        std::thread th(flush);
+        th.detach();
+    #endif
     GetEP(argv[0]);
 
-    InitLauncher(argc, argv);
+    InitLauncher(argc,argv);
 
     try {
         LegitimacyCheck();
-    } catch (std::exception &e) {
+    }catch (std::exception& e){
         fatal("Main 1 : " + std::string(e.what()));
     }
 
-    StartProxy();
     PreGame(GetGameDir());
     InitGame(GetGameDir());
     CoreNetwork();