Intermediate status

Tubio/Framework.cpp

@@ -0,0 +1,75 @@
+#include "Framework.h"
+
+using namespace Logging;
+
+Framework::Framework()
+{
+    PreInit();
+
+    log = new Logger("Framework");
+    log->cout << "Starting Tubio server...";
+    log->Flush();
+    restInterface = new RestInterface();
+
+    PostInit();
+
+    isRunning = true;
+    Run();
+
+    return;
+}
+
+Framework::~Framework()
+{
+    delete restInterface;
+    delete log;
+
+    restInterface = nullptr;
+    log = nullptr;
+
+    return;
+}
+
+void Framework::Run()
+{
+    while (isRunning)
+    {
+        restInterface->Update();
+    }
+
+    OnExit();
+    PostExit();
+
+
+    return;
+}
+
+
+void Framework::PreInit()
+{
+    LogHistory::PreInit();
+
+    return;
+}
+
+
+void Framework::PostInit()
+{
+    restInterface->PostInit();
+
+    return;
+}
+
+void Framework::OnExit()
+{
+    restInterface->OnExit();
+
+    return;
+}
+
+void Framework::PostExit()
+{
+    LogHistory::PostExit();
+
+    return;
+}

Tubio/Framework.h

@@ -0,0 +1,27 @@
+#pragma once
+#include "Logger.h"
+#include "LogHistory.h"
+#include "RestInterface.h"
+
+class Framework
+{
+public:
+    Framework();
+    ~Framework();
+
+    void Run();
+
+private:
+
+    void PostInit();
+    void OnExit();
+    void PreInit();
+    void PostExit();
+
+    RestInterface* restInterface;
+
+    Log* log;
+
+    bool isRunning = true;
+};
+

Tubio/LogHistory.cpp

@@ -0,0 +1,33 @@
+#include "LogHistory.h"
+
+using namespace Logging;
+
+void LogHistory::PreInit()
+{
+    history = new std::vector<LogEntry*>();
+
+    return;
+}
+
+void LogHistory::PostExit()
+{
+    for (unsigned int i = 0; i < history->size(); i++)
+    {
+        delete history->at(i);
+        history->at(i) = nullptr;
+    }
+
+    delete history;
+    history = nullptr;
+
+    return;
+}
+
+void LogHistory::AddLogToHistory(LogEntry* _newEntry)
+{
+    history->push_back(_newEntry);
+
+    return;
+}
+
+std::vector<LogEntry*>* LogHistory::history;

Tubio/LogHistory.h

@@ -0,0 +1,35 @@
+#pragma once
+#include <string>
+#include <vector>
+#include <ctime>
+#include "LogTypes.h"
+
+namespace Logging
+{
+    class Logger;
+
+    class LogEntry
+    {
+    public:
+        std::string message;
+        std::string identifier;
+        LOG_TYPE type;
+        std::time_t timestamp;
+    };
+
+    class LogHistory
+    {
+    public:
+        static void PreInit();
+        static void PostExit();
+
+        static std::vector<LogEntry*>* GetLogHistory() { return history; }
+
+    private:
+        static void AddLogToHistory(LogEntry* _newEntry);
+
+        static std::vector<LogEntry*>* history;
+
+        friend Logger;
+    };
+}

Tubio/LogTypes.h

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Logging
+{
+    enum class LOG_TYPE
+    {
+        LOG,
+        WARN,
+        ERR
+    };
+}

Tubio/Logger.cpp

@@ -0,0 +1,125 @@
+#include "Logger.h"
+
+using namespace Logging;
+
+Logger::Logger(std::string _identifier)
+{
+    isInitialized = true;
+
+    std::stringstream ss;
+
+    rawIdentifier = _identifier;
+    ss << "[" << rawIdentifier << "]";
+    identifier = ss.str();
+
+    return;
+}
+
+void Logger::Clear()
+{
+    if (!IsInitializedSanityCheck()) return;
+
+    cout.str("");
+    type = LOG_TYPE::LOG;
+
+    return;
+}
+
+void Logger::Set(std::string _str)
+{
+    if (!IsInitializedSanityCheck()) return;
+
+    Clear();
+    cout << _str;
+
+    return;
+}
+
+std::string Logger::Flush()
+{
+    if (!IsInitializedSanityCheck()) return "";
+
+
+    time_t currTime = time(0);
+    tm currTm;
+    localtime_s(&currTm, &currTime);
+    char timeBuf[256];
+    strftime(timeBuf, 100, "%d.%m.%Y - %T", currTm);
+
+    std::stringstream bufOut;
+    bufOut << "<" << timeBuf << "> " << identifier << TypeToPrefix(type) << ": " << cout.str();
+
+    LogEntry* newEntry = new LogEntry;
+    newEntry->message = bufOut.str();
+    newEntry->identifier = rawIdentifier;
+    newEntry->timestamp = currTime;
+    newEntry->type = type;
+    LogHistory::AddLogToHistory(newEntry);
+
+    std::cout << TypeToColor(type) << bufOut.str() << "\033[0m" << std::endl;
+
+    Clear();
+
+    return "";
+}
+
+std::string Logger::Type(LOG_TYPE _type)
+{
+    if (!IsInitializedSanityCheck()) return "";
+
+
+    type = _type;
+    return "";
+}
+
+std::string Logger::TypeToPrefix(LOG_TYPE _type)
+{
+    switch (_type)
+    {
+    case LOG_TYPE::LOG:
+        return "";
+
+    case LOG_TYPE::WARN:
+        return " [WARN]";
+
+    case LOG_TYPE::ERR:
+        return " [ERROR]";
+
+    default:
+        return "";
+    }
+
+    return "";
+}
+
+std::string Logger::TypeToColor(LOG_TYPE _type)
+{
+    switch (_type)
+    {
+    case LOG_TYPE::LOG:
+        return "\033[0m";
+
+    case LOG_TYPE::WARN:
+        return "\033[33m";
+
+    case LOG_TYPE::ERR:
+        return "\033[31m";
+
+    default:
+        return "\033[0m";
+    }
+
+    return "\033[0m";
+}
+
+bool Logger::IsInitializedSanityCheck()
+{
+    if (!isInitialized)
+    {
+        Logger log("Logger"); //A Log object cannot always have a Log-member because of its recursive nature. Only create them when needed!
+        log.cout << log.Err() << "Attempted to use logger object without being initialized!" << log.Flush();
+        return false;
+    }
+
+    return true;
+}

Tubio/Logger.h

@@ -0,0 +1,50 @@
+#pragma once
+#include <iostream>
+#include <string>
+#include <sstream>
+#include "LogTypes.h"
+#include "LogHistory.h"
+
+namespace Logging
+{
+    class Log
+    {
+    public:
+
+    public:
+        //Creates a Logger object. Pass an identifier such as MySQL
+        Log(std::string _identifier);
+
+        //Clears the buffered string and resets the log type to default
+        void Clear();
+
+        //Sets the buffered string
+        void Set(std::string _str);
+
+        //Prints the buffered string to the console and clears it
+        std::string Flush();
+
+        //Sets a custom log type
+        std::string Type(LOG_TYPE _type);
+
+        //Sets the log type to warning
+        std::string Warn() { return Type(WARN); }
+
+        //Sets the log type to error
+        std::string Err() { return Type(ERR); }
+
+        std::stringstream cout;
+
+    private:
+        std::string TypeToPrefix(LOG_TYPE _type);
+        std::string TypeToColor(LOG_TYPE _type);
+
+        bool IsInitializedSanityCheck();
+
+        std::string identifier;
+        std::string rawIdentifier;
+        LOG_TYPE type = LOG;
+
+        bool isInitialized = false;
+    };
+}

Tubio/RestInterface.cpp

@@ -0,0 +1,117 @@
+#include "RestInterface.h"
+
+using namespace Logging;
+
+RestInterface::RestInterface()
+{
+	pMgr = new mg_mgr();
+	pNc = nullptr;
+	log = new Logger("WebServer");
+
+	isBootedSuccessfully = false;
+
+	return;
+}
+
+RestInterface::~RestInterface()
+{
+	delete pMgr;
+	delete log;
+
+	log = nullptr;
+	pMgr = nullptr;
+
+	return;
+}
+
+void RestInterface::PostInit()
+{
+	isBootedSuccessfully = InitWebServer();
+
+
+	return;
+}
+
+bool RestInterface::InitWebServer()
+{
+	mg_mgr_init(pMgr, NULL);
+
+	log->cout << "Starting web server on port " << WEBAPI_SERVER_PORT << "...";
+	log->Flush();
+
+	pNc = mg_bind(pMgr, WEBAPI_SERVER_PORT, this->EventHandler);
+
+	if (pNc == NULL)
+	{
+		log->cout << log->Err() << "Failed to boot the web server! - Unable to bind listener!";
+		log->Flush();
+		return false;
+	}
+
+	mg_set_protocol_http_websocket(pNc);
+
+	log->cout << "Started web server successfully!";
+	log->Flush();
+	isBootedSuccessfully = true;
+
+	return true;
+}
+
+void RestInterface::Update()
+{
+	mg_mgr_poll(pMgr, WEBAPI_SERVER_POLLRATE);
+
+	return;
+}
+
+void RestInterface::ServeStringToConnection(struct mg_connection* _c, std::string _str)
+{
+	mg_send_head(_c, 200, _str.length(), "content-type: application/json\nAccess-Control-Allow-Origin: *");
+	mg_printf(_c, _str.c_str());
+
+	return;
+}
+
+
+void RestInterface::EventHandler(mg_connection* _pNc, int _ev, void* _p)
+{
+	switch (_ev)
+	{
+	case MG_EV_HTTP_REQUEST:
+
+		/*
+		StringParser sp(_pNc->recv_mbuf.buf);
+
+		sp.Skip("GET /");
+		std::string rawRequest = sp.ExtSeek(" HTTP/");
+		std::string jsonQuery = StringTools::UrlDecode(rawRequest);
+
+		std::string queryResult = RestAPIQueryHandler::ProcessQuery(jsonQuery);
+
+
+
+		ServeStringToConnection(_pNc, queryResult);
+		*/
+
+		//std::cout << _pNc->recv_mbuf.buf << std::endl;
+		
+		http_message* hpm = (http_message*)_p;
+		
+		char buf[500];
+		mg_get_http_var(&hpm->body, "data", buf, 500);
+		std::cout << buf << std::endl;
+
+		ServeStringToConnection(_pNc, _pNc->recv_mbuf.buf);
+
+		break;
+	}
+
+	return;
+}
+
+void RestInterface::OnExit()
+{
+	mg_mgr_free(pMgr);
+
+	return;
+}

Tubio/RestInterface.h

@@ -0,0 +1,37 @@
+#pragma once
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include "mongoose.h"
+#include "Logger.h"
+
+#define WEBAPI_SERVER_POLLRATE 100
+#define WEBAPI_SERVER_PORT "6969"
+
+class RestInterface
+{
+public:
+	RestInterface();
+	~RestInterface();
+
+	void PostInit();
+	void Update();
+	void OnExit();
+
+private:
+	bool InitWebServer();
+
+	static void EventHandler(struct mg_connection* _pNc, int _ev, void* _p);
+
+	static void ServeStringToConnection(struct mg_connection* _c, std::string _str);
+
+
+	struct mg_mgr* pMgr;
+	struct mg_connection* pNc;
+	static mg_serve_http_opts pServeOpts;
+
+	Logging::Logger* log;
+
+	bool isBootedSuccessfully;
+};
+

Tubio/Tubio.vcxproj

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{8ae799c5-cb17-4714-a362-d8b9817a723e}</ProjectGuid>
+    <RootNamespace>Tubio</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Framework.cpp" />
+    <ClCompile Include="JasonPP.cpp" />
+    <ClCompile Include="Logger.cpp" />
+    <ClCompile Include="LogHistory.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="mongoose.c" />
+    <ClCompile Include="RestInterface.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Framework.h" />
+    <ClInclude Include="JasonPP.hpp" />
+    <ClInclude Include="Logger.h" />
+    <ClInclude Include="LogHistory.h" />
+    <ClInclude Include="LogTypes.h" />
+    <ClInclude Include="mongoose.h" />
+    <ClInclude Include="RestInterface.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Tubio/Tubio.vcxproj.filters

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Quelldateien">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Headerdateien">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Ressourcendateien">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="_external_dependencies">
+      <UniqueIdentifier>{714ac1f3-3586-412c-9b83-bf00f08d58ab}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="JasonPP.cpp">
+      <Filter>_external_dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="mongoose.c">
+      <Filter>_external_dependencies</Filter>
+    </ClCompile>
+    <ClCompile Include="Logger.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="LogHistory.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="Framework.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="RestInterface.cpp">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="JasonPP.hpp">
+      <Filter>_external_dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="mongoose.h">
+      <Filter>_external_dependencies</Filter>
+    </ClInclude>
+    <ClInclude Include="Logger.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="LogHistory.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="LogTypes.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="Framework.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="RestInterface.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

Tubio/main.cpp

@@ -0,0 +1,8 @@
+#include "Framework.h"
+
+int main()
+{
+	Framework framework;
+
+	return 0;
+}