add release action

This reverts commit 1e592f6810.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,5 +1,5 @@
 ---
-name: Feature 
+name: Feature request
 about: Suggest an idea for this project
 title: "[Feature Request]"
 labels: enhancement
@@ -7,13 +7,14 @@ assignees: ''
 
 ---
 
-#### **Describe the feature you'd like in detail**
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. For example: "I'm always frustrated when ...".
 
+**Describe the solution you'd like**
 A clear and concise description of what you want to happen. Also supply OS information if relevant, for example "*On Linux*, I would like to be able to...".
 
-#### **Describe alternatives you've considered**
-
+**Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-#### **Acceptance Criteria**
-- [ ] *Only fill this out if you're a developer, otherwise leave as-is*
+**Additional context**
+Add any other context about the feature request here.

.github/workflows/linux.yml

@@ -4,7 +4,6 @@ on: [push]
 
 env: 
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
 
 jobs:
   debian-11-build:
@@ -148,4 +147,4 @@ jobs:
       - name: Test
         run: |
             chmod +x ./BeamMP-Server-tests
-            ./BeamMP-Server-tests
+            ./BeamMP-Server-tests

.github/workflows/release.yml

@@ -7,7 +7,6 @@ on:
 
 env:
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
 
 jobs:
   create-release:
@@ -28,7 +27,7 @@ jobs:
           prerelease: true
           body: |
               Files included in this release:
-              - `BeamMP-Server.exe` is the windows build. You need to install the [Visual C++ Redistributables](https://aka.ms/vs/17/release/vc_redist.x64.exe) to run this.
+              - `BeamMP-Server.exe` is the windows build.
               - `BeamMP-Server-debian` is a Debian 11 build, requires `liblua5.3-0`.
               - `BeamMP-Server-ubuntu` is a Ubuntu 22.04 build, requires `liblua5.3-0`.
 
@@ -114,6 +113,11 @@ jobs:
       - name: Install Dependencies
         run: bash ./scripts/ubuntu-22.04/1-install-deps.sh
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          runVcpkgInstall: true
+
       - name: Create Build Environment
         run: bash ./scripts/ubuntu-22.04/2-configure.sh '-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake'
 
@@ -132,7 +136,7 @@ jobs:
           asset_content_type: application/x-elf
 
   upload-release-files-windows:
-    name: Build and upload Windows Release Files
+    name: Upload Windows Release Files
     runs-on: windows-latest
     needs: create-release
     env:
@@ -149,6 +153,11 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          runVcpkgInstall: true
+
       - name: Create Build Environment
         shell: bash
         run: ./scripts/windows/1-configure.sh
@@ -166,4 +175,4 @@ jobs:
           upload_url: ${{ needs.create-release.outputs.upload_url }}
           asset_path: ./bin/Release/BeamMP-Server.exe
           asset_name: BeamMP-Server.exe
-          asset_content_type: application/vnd.microsoft.portable-executable
+          asset_content_type: application/vnd.microsoft.portable-executable

.github/workflows/windows.yml

@@ -5,7 +5,6 @@ on: [push]
 env:
   VCPKG_DEFAULT_TRIPLET: x64-windows-static
   VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-  CMAKE_BUILD_TYPE: "Release"
 
 jobs:
   windows-build:
@@ -39,5 +38,5 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: BeamMP-Server-windows
-          path: ./bin/Release/BeamMP-Server.exe
+          path: ./bin/BeamMP-Server.exe
 

CMakeLists.txt

@@ -126,10 +126,9 @@ include(FindThreads)
 # enables compile_commands.json for clang-related tools (such as the clang LS)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# build release builds by default (if not specified otherwise)
-if(NOT DEFINED CMAKE_BUILD_TYPE)
-    message(NOTICE "No build type specified, defaulting to 'Release'")
-    set(CMAKE_BUILD_TYPE "Release")
+# build debug builds by default (if not specified otherwise)
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
 if(UNIX)

README.md

@@ -6,7 +6,7 @@
 This is the server for the multiplayer mod **[BeamMP](https://beammp.com/)** for the game [BeamNG.drive](https://www.beamng.com/).
 The server is the point through which all clients communicate. You can write Lua mods for the server, there are detailed instructions on the [BeamMP Wiki](https://wiki.beammp.com).
 
-**For Linux, you __need__ the runtime dependencies, which are listed below under [Runtime Dependencies](#runtime-dependencies)**
+**For Linux, you __need__ the runtime dependencies, listed below under "[prerequisites](#prerequisites)".**
 
 ## Support + Contact
 
@@ -43,7 +43,7 @@ We only allow building unmodified (original) source code for public use. `master
 
 ## Supported Operating Systems
 
-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.
+The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and sometimes Linux. For any other distro or OS, you just have to find the same libraries listed in the Linux Build [Prerequisites](#prerequisites) further down the page, and it should build fine. We don't currently support any big-endian architectures.
 
 Recommended compilers: MSVC, GCC, CLANG. 
 
@@ -51,35 +51,128 @@ You can find precompiled binaries under [Releases](https://github.com/BeamMP/Bea
 
 ## Build Instructions
 
-On Linux, you need some dependencies to **build** the server (on Windows, you don't):
+**__Do not compile from `master`. Always build from a release tag, i.e. `tags/v3.1.0`!__**
 
-For Debian, Ubuntu and others you can find scripts that do this in `scripts/`.
+Currently only Linux and Windows are supported (generally). See [Releases](https://github.com/BeamMP/BeamMP-Server/releases/) for official binary releases. On systems to which we do not provide binaries (so anything but windows), you are allowed to compile the program and use it. Other restrictions, such as not being allowed to distribute those binaries, still apply (see [copyright notice](#copyright)).
 
+### Prerequisites
+
+#### Windows
+
+There are **no runtime libraries** needed for Windows.
+
+Please use the prepackaged binaries in [Releases](https://github.com/BeamMP/BeamMP-Server/releases/).
+
+Dependencies for **Windows** can be installed with `vcpkg`.
+These are:
 ```
-liblua5.3-dev curl zip unzip tar cmake make git g++
+lua zlib rapidjson openssl websocketpp curl
 ```
+The triplet we use for releases is `x64-windows-static`.
 
-The names of each package may change depending on your platform. See in `scripts/` or use a search engine to find out what they're called for you.
+#### Linux
 
-You can build on **Windows, Linux** or other platforms by following these steps:
+We recommend Ubuntu 22.04 or Arch Linux. Any Linux distribution will work, but you have to figure out the package names yourself (please feel free to PR in a change to this README with that info).
 
-1. Check out the repository with git: `git clone --recursive https://github.com/BeamMP/BeamMP-Server`.
-2. Go into the directory `cd BeamMP-Server`.
-3. Run CMake `cmake -S . -B bin -DCMAKE_BUILD_TYPE=Release` - this can take a few minutes and may take a lot of disk space and bandwidth.
-4. Build via `cmake --build bin --parallel -t BeamMP-Server`.
-5. Your executable can be found in `bin/`.
-
-When you make changes to the code, you only have to run step 4 again.
-
-### Runtime Dependencies
+##### Runtime Dependencies
 
 These are needed to *run* the server.
 
-Debian, Ubuntu and friends: `liblua5.3-0`
+<details>
+<summary>
+Ubuntu 22.04
+</summary>
 
-Other Linux distros: `liblua` of *some kind*.
+`apt-get install` the following libraries:
+```
+liblua5.3-0
+libssl3
+curl
+```
+</details>
 
-Windows: No libraries.
+<details>
+<summary>
+Arch Linux
+</summary>
+
+`pacman -Syu` the following libraries:
+```
+lua53
+openssl
+curl
+```
+</details>
+
+##### Build Dependencies
+These are needed for you to *build* the server, in addition to the [runtime dependencies](#runtime-dependencies).
+
+<details>
+<summary>
+Ubuntu 22.04
+</summary>
+
+`apt-get install` the following libraries and programs:
+```
+git
+libz-dev
+rapidjson-dev
+liblua5.3
+libssl-dev
+libwebsocketpp-dev
+libcurl4-openssl-dev
+cmake
+g++-10
+libboost1.74-all-dev
+libssl3
+curl
+```
+</details>
+
+<details>
+<summary>
+Arch Linux
+</summary>
+
+`pacman -Syu` the following libraries and programs:
+```
+lua53
+openssl
+curl
+git
+cmake
+g++
+cmake
+zlib
+boost
+websocketpp
+```
+</details>
+
+#### macOS
+
+Dependencies for **macOS** can be installed with homebrew.
+```
+brew install lua@5.3 rapidjson websocketpp cmake openssl@1.1
+```
+Some packages are included in **macOS** but you might want to install homebrew versions.
+```
+brew install curl zlib git make
+```
+
+### How to build
+
+On Windows, use git-bash for these commands. On Linux, these should work in your shell.
+
+1. Make sure you have all [prerequisites](#prerequisites) installed
+2. Clone the repository in a location of your choice with `git clone https://github.com/BeamMP/BeamMP-Server` . 
+3. Change into the BeamMP-Server directory by running `cd BeamMP-Server`. 
+4. Checkout the branch or tag of the release you want to compile, for example `git checkout tags/v3.0.2` for version 3.0.2. You can find the latest version [here](https://github.com/BeamMP/BeamMP-Server/tags).
+6. Run `cmake . -DCMAKE_BUILD_TYPE=Release` (with `.`). This may take some time, and will update all submodules and prepare the build.
+7. Run `make -j` . This step will take some time and will use a lot of CPU and RAM. Remove the `-j` if you run out of memory. *If you change something in the source code, you only have to re-run this step.*
+8. You now have a `BeamMP-Server` file in your directory, which is executable with `./BeamMP-Server` (`.\BeamMP-Server.exe` for windows). Follow the (Windows or Linux, doesnt matter) instructions on the [wiki](https://wiki.beammp.com/en/home/server-installation) for further setup after installation (which we just did), such as port-forwarding and getting a key to actually run the server.
+
+*tip: to run the server in the background, simply (in bash, zsh, etc) run:* `nohup ./BeamMP-Server &`*.*
 
 ## Support
 The BeamMP project is supported by community donations via our [Patreon](https://www.patreon.com/BeamMP). This brings perks such as Patreon-only channels on our Discord, early access to new updates, and more server keys. 

include/Common.h

@@ -46,7 +46,6 @@ public:
         std::string Resource { "Resources" };
         std::string MapName { "/levels/gridmap_v2/info.json" };
         std::string Key {};
-        std::string Password{};
         std::string SSLKeyPath { "./.ssl/HttpServer/key.pem" };
         std::string SSLCertPath { "./.ssl/HttpServer/cert.pem" };
         bool HTTPServerEnabled { false };
@@ -135,7 +134,7 @@ private:
     static inline std::mutex mShutdownHandlersMutex {};
     static inline std::deque<TShutdownHandler> mShutdownHandlers {};
 
-    static inline Version mVersion { 3, 1, 3 };
+    static inline Version mVersion { 3, 1, 2 };
 };
 
 std::string ThreadName(bool DebugModeOverride = false);

include/IThreaded.h

@@ -8,7 +8,7 @@ public:
     IThreaded()
         // invokes operator() on this object
         : mThread() { }
-    virtual ~IThreaded() noexcept {
+    ~IThreaded() noexcept {
         if (mThread.joinable()) {
             mThread.join();
         }

include/TLuaEngine.h

@@ -41,14 +41,7 @@ struct TLuaResult {
     sol::object Result { sol::lua_nil };
     TLuaStateId StateId;
     std::string Function;
-    std::shared_ptr<std::mutex> ReadyMutex {
-        std::make_shared<std::mutex>()
-    };
-    std::shared_ptr<std::condition_variable> ReadyCondition {
-        std::make_shared<std::condition_variable>()
-    };
-
-    void MarkAsReady();
+    // TODO: Add condition_variable
     void WaitUntilReady();
 };
 
@@ -105,8 +98,8 @@ public:
         return mLuaStates.size();
     }
     std::vector<std::string> GetLuaStateNames() {
-        std::vector<std::string> names {};
-        for (auto const& [stateId, _] : mLuaStates) {
+        std::vector<std::string> names{};
+        for(auto const& [stateId, _ ] : mLuaStates) {
             names.push_back(stateId);
         }
         return names;

include/TNetwork.h

@@ -52,5 +52,4 @@ private:
     static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
 
-std::string HashPassword(const std::string& str);
 std::vector<uint8_t> StringToVector(const std::string& Str);

include/TPPSMonitor.h

@@ -9,7 +9,6 @@ class TNetwork;
 class TPPSMonitor : public IThreaded {
 public:
     explicit TPPSMonitor(TServer& Server);
-    virtual ~TPPSMonitor() {}
 
     void operator()() override;
 

scripts/windows/2-build.sh

@@ -2,4 +2,4 @@
 
 set -ex
 
-cmake --build bin --parallel -t BeamMP-Server --config Release
+cmake --build bin --parallel -t BeamMP-Server

src/Client.cpp

@@ -51,7 +51,7 @@ TClient::TVehicleDataLockPair TClient::GetAllCars() {
 std::string TClient::GetCarPositionRaw(int Ident) {
     std::unique_lock lock(mVehiclePositionMutex);
     try {
-        return mVehiclePosition.at(size_t(Ident));
+        return mVehiclePosition.at(Ident);
     } catch (const std::out_of_range& oor) {
         return "";
     }
@@ -73,7 +73,7 @@ void TClient::Disconnect(std::string_view Reason) {
 
 void TClient::SetCarPosition(int Ident, const std::string& Data) {
     std::unique_lock lock(mVehiclePositionMutex);
-    mVehiclePosition[size_t(Ident)] = Data;
+    mVehiclePosition[Ident] = Data;
 }
 
 std::string TClient::GetCarData(int Ident) {

src/TConfig.cpp

@@ -18,7 +18,6 @@ static constexpr std::string_view StrDescription = "Description";
 static constexpr std::string_view StrResourceFolder = "ResourceFolder";
 static constexpr std::string_view StrAuthKey = "AuthKey";
 static constexpr std::string_view StrLogChat = "LogChat";
-static constexpr std::string_view StrPassword = "Password";
 
 // Misc
 static constexpr std::string_view StrSendErrors = "SendErrors";
@@ -107,8 +106,6 @@ void TConfig::FlushToFile() {
     data["General"][StrMap.data()] = Application::Settings.MapName;
     data["General"][StrDescription.data()] = Application::Settings.ServerDesc;
     data["General"][StrResourceFolder.data()] = Application::Settings.Resource;
-    // data["General"][StrPassword.data()] = Application::Settings.Password;
-    // SetComment(data["General"][StrPassword.data()].comments(), " Sets a password on this server, which restricts people from joining. To join, a player must enter this exact password. Leave empty ("") to disable the password.");
     // Misc
     data["Misc"][StrHideUpdateMessages.data()] = Application::Settings.HideUpdateMessages;
     SetComment(data["Misc"][StrHideUpdateMessages.data()].comments(), " Hides the periodic update message which notifies you of a new server version. You should really keep this on and always update as soon as possible. For more information visit https://wiki.beammp.com/en/home/server-maintenance#updating-the-server. An update message will always appear at startup regardless.");
@@ -192,7 +189,6 @@ void TConfig::ParseFromFile(std::string_view name) {
         TryReadValue(data, "General", StrResourceFolder, Application::Settings.Resource);
         TryReadValue(data, "General", StrAuthKey, Application::Settings.Key);
         TryReadValue(data, "General", StrLogChat, Application::Settings.LogChat);
-        TryReadValue(data, "General", StrPassword, Application::Settings.Password);
         // Misc
         TryReadValue(data, "Misc", StrSendErrors, Application::Settings.SendErrors);
         TryReadValue(data, "Misc", StrHideUpdateMessages, Application::Settings.HideUpdateMessages);
@@ -244,7 +240,6 @@ void TConfig::PrintDebug() {
     beammp_debug(std::string(StrHTTPServerIP) + ": \"" + Application::Settings.HTTPServerIP + "\"");
     // special!
     beammp_debug("Key Length: " + std::to_string(Application::Settings.Key.length()) + "");
-    beammp_debug("Password Protected: " + std::string(Application::Settings.Password.empty() ? "false" : "true"));
 }
 
 void TConfig::ParseOldFormat() {

src/TConsole.cpp

@@ -606,7 +606,9 @@ TConsole::TConsole() {
                     HandleLuaInternalCommand(cmd.substr(1));
                 } else {
                     auto Future = mLuaEngine->EnqueueScript(mStateId, { std::make_shared<std::string>(TrimmedCmd), "", "" });
-                    Future->WaitUntilReady();
+                    while (!Future->Ready) {
+                        std::this_thread::yield(); // TODO: Add a timeout
+                    }
                     if (Future->Error) {
                         beammp_lua_error("error in " + mStateId + ": " + Future->ErrorMessage);
                     }

src/THeartbeatThread.cpp

@@ -133,8 +133,7 @@ std::string THeartbeatThread::GenerateCall() {
         << "&modstotalsize=" << mResourceManager.MaxModSize()
         << "&modstotal=" << mResourceManager.ModsLoaded()
         << "&playerslist=" << GetPlayers()
-        << "&desc=" << Application::Settings.ServerDesc
-        << "&pass=" << (Application::Settings.Password.empty() ? "false" : "true");
+        << "&desc=" << Application::Settings.ServerDesc;
     return Ret.str();
 }
 THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& Server)

src/TLuaEngine.cpp

@@ -286,7 +286,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
         bool Cancelled = false;
         size_t ms = 0;
         std::set<std::string> WarnedResults;
-
         while (!Result->Ready && !Cancelled) {
             std::this_thread::sleep_for(std::chrono::milliseconds(10));
             ms += 10;
@@ -301,7 +300,6 @@ void TLuaEngine::WaitForAll(std::vector<std::shared_ptr<TLuaResult>>& Results, c
                 }
             }
         }
-
         if (Cancelled) {
             beammp_lua_warn("'" + Result->Function + "' in '" + Result->StateId + "' failed to execute in time and was not waited for. It may still finish executing at a later time.");
             LuaAPI::MP::Engine->ReportErrors({ Result });
@@ -427,7 +425,7 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerGlobalEvent(const std::string
                 Result->Error = true;
                 Result->ErrorMessage = "Function result in TriggerGlobalEvent was invalid";
             }
-            Result->MarkAsReady();
+            Result->Ready = true;
             Return.push_back(Result);
         }
     }
@@ -957,7 +955,7 @@ void TLuaEngine::StateThreadData::operator()() {
                     sol::error Err = Res;
                     S.second->ErrorMessage = Err.what();
                 }
-                S.second->MarkAsReady();
+                S.second->Ready = true;
             }
         }
         { // StateFunctionQueue Scope
@@ -1018,11 +1016,11 @@ void TLuaEngine::StateThreadData::operator()() {
                         sol::error Err = Res;
                         Result->ErrorMessage = Err.what();
                     }
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 } else {
                     Result->Error = true;
                     Result->ErrorMessage = BeamMPFnNotFoundError; // special error kind that we can ignore later
-                    Result->MarkAsReady();
+                    Result->Ready = true;
                 }
             }
         }
@@ -1072,19 +1070,11 @@ void TLuaEngine::StateThreadData::AddPath(const fs::path& Path) {
     mPaths.push(Path);
 }
 
-void TLuaResult::MarkAsReady() {
-    {
-        std::lock_guard<std::mutex> readyLock(*this->ReadyMutex);
-        this->Ready = true;
-    }
-    this->ReadyCondition->notify_all();
-}
-
 void TLuaResult::WaitUntilReady() {
-    std::unique_lock readyLock(*this->ReadyMutex);
-    // wait if not ready yet
-    if(!this->Ready)
-        this->ReadyCondition->wait(readyLock);
+    while (!Ready) {
+        std::this_thread::yield();
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
 }
 
 TLuaChunk::TLuaChunk(std::shared_ptr<std::string> Content, std::string FileName, std::string PluginPath)

src/TNetwork.cpp

@@ -11,8 +11,6 @@
 #include <boost/asio/ip/address_v4.hpp>
 #include <cstring>
 
-typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
-
 std::vector<uint8_t> StringToVector(const std::string& Str) {
     return std::vector<uint8_t>(Str.data(), Str.data() + Str.size());
 }
@@ -227,15 +225,6 @@ void TNetwork::HandleDownload(TConnection&& Conn) {
     });
 }
 
-std::string HashPassword(const std::string& str) {
-    std::stringstream ret;
-    unsigned char* hash = SHA256(reinterpret_cast<const unsigned char*>(str.c_str()), str.length(), nullptr);
-    for (int i = 0; i < 32; i++) {
-        ret << std::hex << static_cast<int>(hash[i]);
-    }
-    return ret.str();
-}
-
 std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     auto Client = CreateClient(std::move(RawConnection.Socket));
     Client->SetIdentifier("ip", RawConnection.SockAddr.address().to_string());
@@ -259,8 +248,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         ClientKick(*Client, fmt::format("Invalid version header: '{}' ({})", std::string(reinterpret_cast<const char*>(Data.data()), Data.size()), Data.size()));
         return nullptr;
     }
-
-    if (!TCPSend(*Client, StringToVector("A"))) { //changed to A for Accepted version
+    if (!TCPSend(*Client, StringToVector("S"))) {
         // TODO: handle
     }
 
@@ -316,22 +304,6 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         return nullptr;
     }
 
-    if(!Application::Settings.Password.empty()) { // ask password
-        if(!TCPSend(*Client, StringToVector("S"))) {
-            // TODO: handle
-        }
-        beammp_info("Waiting for password");
-        Data = TCPRcv(*Client);
-        std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
-        if(Pass != HashPassword(Application::Settings.Password)) {
-            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
-            ClientKick(*Client, "Wrong password!");
-            return {};
-        } else {
-            beammp_debug(Client->GetName() + " used the correct password");
-        }
-    }
-
     beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
     mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
         std::shared_ptr<TClient> Cl;
@@ -381,7 +353,6 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     } else {
         ClientKick(*Client, "Server full!");
     }
-
     return Client;
 }