Added fileTransferService, stringUtil and executeCommands module

Author: tajiknomi

CMakeLists.txt

@@ -37,6 +37,11 @@ set(SOURCES
     ${SOURCE_DIR}/utilities.cpp
     ${SOURCE_DIR}/operations.cpp
     ${SOURCE_DIR}/sharedResourceManager.cpp
+    ${SOURCE_DIR}/stringUtil.cpp
+    ${SOURCE_DIR}/systemInformation.cpp
+    ${SOURCE_DIR}/fileTransferService.cpp
+    ${SOURCE_DIR}/executeCommands.cpp
+
 )
 
 # Optionally, add headers for IDEs or reference
@@ -47,6 +52,10 @@ set(HEADERS
     ${HEADER_DIR}/utilities.h
     ${HEADER_DIR}/operations.h
     ${HEADER_DIR}/sharedResourceManager.h
+    ${HEADER_DIR}/stringUtil.h
+    ${HEADER_DIR}/systemInformation.h
+    ${HEADER_DIR}/fileTransferService.h
+    ${HEADER_DIR}/executeCommands.h
 )
 
 # Create the executable (using only source files)

include/executeCommands.h

@@ -0,0 +1,28 @@
+// Copyright (c) Nouman Tajik [github.com/tajiknomi]
+//
+// 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. 
+
+#pragma once
+#include <string>
+
+class executeCommand{
+
+public:
+    std::wstring operator()(const std::wstring& shellType, const std::wstring& command, const std::wstring& args);
+};

include/fileTransferService.h

@@ -0,0 +1,49 @@
+// Copyright (c) Nouman Tajik [github.com/tajiknomi]
+//
+// 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. 
+
+#pragma once
+
+#include <string>
+
+
+#if __has_include(<filesystem>)
+    #include <filesystem>
+    namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+    #include <experimental/filesystem>
+    namespace fs = std::experimental::filesystem;
+#else
+    #error "Neither <filesystem> nor <experimental/filesystem> are available."
+#endif
+
+
+class curlFileTransfer {
+
+private:
+    static bool isDataServerAvailable(const std::string& url);
+    static size_t WriteData(void* buffer, size_t size, size_t nmemb, void* userp);
+    static size_t WriteCallback(void* contents, size_t size, size_t nmemb, void* userp);
+
+public:
+    static bool DownloadFileFromURL(const std::wstring& url, const std::wstring& outputDirPath);
+    static bool DownloadDirectoryFromURL(const std::wstring& url, const std::wstring& outputDirPath);
+    static bool UploadFileToURL(const std::wstring& url, const std::wstring& filePath);
+    static bool UploadDirectoryToURL(const std::wstring& url, const std::wstring& dirPath, std::wstring &errorMsg, const std::wstring& extensions);
+};

include/json.h

@@ -24,14 +24,19 @@
 
 #include <vector>
 
-// data -----> json
-std::wstring to_json(const std::vector<std::wstring>& data);
-
-// json -----> data
-std::vector<std::wstring> from_json(const std::wstring& jsonData);
-
-// Extract <value> from json using <key>
-std::wstring json_ExtractValue(const std::wstring& jsonData, const std::wstring& key);
-
-// Insert a key-value pair into an existing JSON string
-std::wstring json_AppendKeyValue(const std::wstring& jsonData, const std::wstring& key, const std::wstring& value);
+class JsonUtil {
+
+private:
+    static std::string wstring_to_utf8(const std::wstring& wideStr);
+    static std::wstring utf8_to_wstring(const std::string& str);
+
+public:
+    // data -----> json
+    static std::wstring to_json(const std::vector<std::wstring>& data);
+    // json -----> data
+    static std::vector<std::wstring> from_json(const std::wstring& jsonData);
+    // Extract <value> from json using <key>
+    static std::wstring json_ExtractValue(const std::wstring& jsonData, const std::wstring& key);
+    // Insert a key-value pair into an existing JSON string
+    static std::wstring json_AppendKeyValue(const std::wstring& jsonData, const std::wstring& key, const std::wstring& value);
+};

include/operations.h

@@ -22,8 +22,6 @@
 
 #pragma once
 #include <string>
-#include <queue>
-#include <mutex>
 #include "sharedResourceManager.h"
 
 #if __has_include(<filesystem>)

include/sharedResourceManager.h

@@ -33,8 +33,6 @@ class SharedResourceManager {
 	std::wstring jsonSysInfo;
 	std::mutex jsonSysInfoMutex;
 
-
-
 public:
 	void pushResponse(const std::wstring &response);
 	std::wstring popResponse(void);

include/stringUtil.h

@@ -0,0 +1,37 @@
+// Copyright (c) Nouman Tajik [github.com/tajiknomi]
+//
+// 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. 
+
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+class StringUtils {
+
+public:
+	static std::wstring s2ws(const std::string& str);
+	static std::string ws2s(const std::wstring& wstr);
+	static std::string convertWStringToUTF8(const std::wstring& wstr);
+	static std::vector<std::string> extract_items_from_str(const std::string& input_str, const std::string& delimiter);
+	static std::string wstring_to_utf8(const std::wstring& wideStr);
+	static std::wstring utf8_to_wstring(const std::string& str);
+	static std::wstring extractFilename(const std::wstring& filePath);
+};

include/systemInformation.h

@@ -0,0 +1,40 @@
+// Copyright (c) Nouman Tajik [github.com/tajiknomi]
+//
+// 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. 
+
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+class SysInformation {
+
+private:
+	static const unsigned int RANDOM_NUMBER_LENGTH = 15;
+
+private:
+	static std::string generateRandomAlphanumeric(const int &length, const long long &seed);
+	static std::wstring s2ws(const std::string& str);
+
+public:
+	static std::wstring getComputerName();
+	static std::wstring getUserName();
+	static std::vector<std::wstring> getSysInfo();
+};

include/utilities.h

@@ -25,7 +25,6 @@
 #include "utilities.h"
 #include <string>
 #include <vector>
-#include <system_error>
 
 #if __has_include(<filesystem>)
     #include <filesystem>
@@ -37,54 +36,23 @@
     #error "Neither <filesystem> nor <experimental/filesystem> are available."
 #endif
 
-
-#define RANDOM_NUMBER_LENGTH    15
+std::wstring createHeartbeatRequest(const std::wstring &sysInfoInJson);
 
 bool isValidPort(const std::string& portNum);
 
 bool hasWritePermissionForDirectory(const std::wstring &dirPath);
 
 std::wstring changeDir(const std::wstring& newPath, std::error_code& ec);
 
-std::wstring s2ws(const std::string& str);
-
-std::string ws2s(const std::wstring& wstr);
-
-std::string wstring_to_utf8(const std::wstring& wideStr);
-
-std::wstring utf8_to_wstring(const std::string& utf8Str);
-
-std::wstring extractFilename(const std::wstring& filePath);
-
 std::wstring ExtractLastDirectoryName(const std::wstring& path);
 
 bool isExecutable(const std::wstring& path);
 
 std::size_t calculateDirectorySize(const std::string& path);
 
-std::wstring getComputerName();
-
-std::wstring getUserName();
-
-std::string generateRandomAlphanumeric(int length, long long seed);
-
-std::wstring getSysInfo();
-
 std::string extractBase64Data(const std::wstring &buff);
 
-std::vector<std::string> extract_items_from_str(const std::string &input_str, const std::string &delimiter);
-
 std::wstring ReplaceTildeWithPath(const std::wstring& filePath);
 
 bool isDataServerAvailable(const std::string& url);
 
-bool DownloadFileFromURL(const std::wstring& url, const std::wstring& outputDirPath);
-
-bool DownloadDirectoryFromURL(const std::wstring& url, const std::wstring& outputDirPath);
-
-bool UploadFileToURL(const std::wstring& url, const std::wstring& filePath);
-
-bool UploadDirectoryToURL(const std::wstring& url, const std::wstring& dirPath, std::wstring &errorMsg, const std::wstring& extensions);
-//bool UploadDirectoryToURL(const std::wstring& url, const std::wstring& dirPath, std::wstring &errorMsg, const std::wstring& fileExtensions);
-
-std::wstring executeCommand(const std::wstring& shellType, const std::wstring& command, const std::wstring& args);