Network refactor (notifications)

.clang-tidy

@@ -16,13 +16,11 @@ Checks: >
   performance-*,
   portability-*,
   readability-*,
-  -cppcoreguidelines-avoid-non-const-global-variables,
   -misc-use-anonymous-namespace,
   -readability-braces-around-statements,
   -modernize-use-trailing-return-type,
   -hicpp-braces-around-statements,
   -misc-const-correctness,
-  -cert-err58-cpp,
   -bugprone-easily-swappable-parameters,
   -bugprone-narrowing-conversions,
   -cppcoreguidelines-narrowing-conversions,
@@ -37,7 +35,9 @@ Checks: >
   -readability-magic-numbers,
   -readability-avoid-return-with-void-value,
   -portability-avoid-pragma-once,
-  -bugprone-throwing-static-initialization
+  -bugprone-throwing-static-initialization,
+  -google-build-using-namespace,
+  -cppcoreguidelines-rvalue-reference-param-not-moved
 CheckOptions:
   - key: readability-identifier-naming.ClassCase
     value: CamelCase

.codespellrc

@@ -0,0 +1,4 @@
+[codespell]
+skip = .git,out,vcpkg,__fiddler_captures,resources
+count =
+quiet-level = 1

.gitignore

@@ -2,7 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
-
+pragmabackend-docker.tar
 # User-specific files
 *.rsuser
 *.suo
@@ -526,3 +526,5 @@ vcpkg_installed
 /.idea/modules.xml
 /.idea/pragmabackend.iml
 /.idea/vcs.xml
+Launcher/.qtcreator
+Launcher/build

CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 4.0)
 project(pragmabackend_core)
 
 set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(WIN32)
     add_compile_definitions(_WIN32_WINNT=0x0A00) # target at least win10
     add_compile_definitions(_WIN32=1)
@@ -40,6 +41,7 @@ find_package(Protobuf CONFIG REQUIRED)
 find_program(PROTOC_COMPILER protoc REQUIRED)
 find_package(nlohmann_json CONFIG REQUIRED)
 find_package(stduuid CONFIG REQUIRED)
+find_package(Drogon REQUIRED)
 target_compile_definitions(pragmabackend_core PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
 file(GLOB_RECURSE packetimplementors CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/Packets/Implementation/*.cpp")
 target_sources(pragmabackend_core PRIVATE ${packetimplementors})
@@ -51,6 +53,8 @@ target_link_libraries(pragmabackend_core PUBLIC SQLiteCpp)
 target_link_libraries(pragmabackend_core PUBLIC protobuf::libprotoc protobuf::libprotobuf)
 target_link_libraries(pragmabackend_core PUBLIC nlohmann_json::nlohmann_json)
 target_link_libraries(pragmabackend_core PUBLIC stduuid)
+target_link_libraries(pragmabackend_core PUBLIC Drogon::Drogon)
+target_compile_features(pragmabackend_core PUBLIC cxx_std_20)
 target_include_directories(pragmabackend_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Packets/Model")
 target_include_directories(pragmabackend_core PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/Persistence/Model")
 
@@ -102,9 +106,8 @@ target_sources(pragmabackend_core PRIVATE ${GENERATED_PROTO_SRCS})
 target_include_directories(pragmabackend_core PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
 add_subdirectory(tests)
-
 if(MSVC)
     add_compile_options(/W4 /WX /permissive-)
 else ()
     add_compile_options(-Wall -Wextra -Wpedantic -Werror)
-endif ()
+endif ()

CMakePresets.json

@@ -14,6 +14,7 @@
         "CMAKE_BUILD_TYPE": "Debug",
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
         "VCPKG_TARGET_TRIPLET": "x64-windows",
+        "VCPKG_INSTALL_OPTIONS": "--x-buildtrees-root=C:/b;--x-packages-root=C:/p;--x-downloads-root=C:/d",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
 	"CMAKE_C_COMPILER": "cl",
 	"CMAKE_CXX_COMPILER": "cl"
@@ -37,6 +38,7 @@
         "CMAKE_BUILD_TYPE": "Release",
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
         "VCPKG_TARGET_TRIPLET": "x64-windows",
+        "VCPKG_INSTALL_OPTIONS": "--x-buildtrees-root=C:/b;--x-packages-root=C:/p;--x-downloads-root=C:/d",
         "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
 	"CMAKE_C_COMPILER": "cl",
 	"CMAKE_CXX_COMPILER": "cl"

Dockerfile

@@ -0,0 +1,10 @@
+FROM ubuntu:24.04
+
+WORKDIR /server
+
+COPY out/build/x64-release-linux/ .
+RUN chmod +x ./pragmabackend
+EXPOSE 8081
+EXPOSE 8082
+EXPOSE 80
+CMD ["./pragmabackend"]

Jenkinsfile

@@ -2,6 +2,14 @@ pipeline {
     agent none
 
     stages {
+        stage("Spell check") {
+            agent { label 'linux' }
+            steps {
+                checkout scm
+                sh 'codespell'
+            }
+        }
+
         stage('Build Matrix') {
             matrix {
                 axes {
@@ -16,6 +24,7 @@ pipeline {
                 }
 
                 agent { label "${OS}" }
+
                 options {
                     throttle(['RamIntensiveJob'])
                 }
@@ -57,7 +66,7 @@ pipeline {
                             ]) {
                                 script {
                                     if (isUnix()) {
-                                        sh "echo \"{\\\"steamApiKey\\\": \\\"$STEAM_KEY\\\"}\" > auth.json"
+                                        sh "echo \"{\\\"steamApiKey\\\": \\\"\$STEAM_KEY\\\"}\" > auth.json"
                                     } else {
                                         powershell '''
                                             $content = "{`"steamApiKey`": `"$env:STEAM_KEY`"}"
@@ -73,16 +82,12 @@ pipeline {
                         steps {
                             script {
                                 if (env.OS == 'windows') {
-                                    bat "if exist out rmdir /s /q out"
                                     bat """
-                                        call \"C:\\Program Files\\Microsoft Visual Studio\\18\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat\" x64
+                                        call "C:\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
                                         cmake --preset x64-${BUILD_TYPE}-win
                                     """
                                 } else {
-                                    sh """
-                                        rm -rf out
-                                        cmake --preset x64-${BUILD_TYPE}-linux
-                                    """
+                                    sh "cmake --preset x64-${BUILD_TYPE}-linux"
                                 }
                             }
                         }
@@ -93,7 +98,7 @@ pipeline {
                             script {
                                 if (env.OS == 'windows') {
                                     bat """
-                                        call \"C:\\Program Files\\Microsoft Visual Studio\\18\\Community\\VC\\Auxiliary\\Build\\vcvarsall.bat\" x64
+                                        call "C:\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsall.bat" x64
                                         cmake --build out/build/x64-${BUILD_TYPE}-win
                                     """
                                 } else {
@@ -116,104 +121,151 @@ pipeline {
                             }
                         }
                     }
-                }
-            }
+
+                    stage("Stash") {
+                        when {
+                            expression { BUILD_TYPE == "release" }
+                        }
+                        steps {
+                            script {
+                                if (env.OS == 'windows') {
+                                    stash name: 'winbuild', includes: 'package-release-win/**'
+                                } else {
+                                    stash name: 'linuxbuild', includes: 'package-release-linux/**'
+                                }
+                            }
+                        }
+                    }
+                } 
+            } 
         }
 
-        stage("code analysis") {
+        stage("Post-matrix parallel tasks") {
             parallel {
+                stage("Build docker server container") {
+                    agent { label 'docker-linux' }
+                    steps {
+                        checkout scm
+                        dir('out/build') {
+                            sh "rm -rf x64-release-linux"
+                            sh "rm -rf package-release-linux"
+                            unstash 'linuxbuild'
+                            sh "mv package-release-linux x64-release-linux"
+                        }
+                        sh "docker build -t pragmabackend:latest ."
+                        sh "docker tag pragmabackend:latest ohmivr/pragmabackend:latest"
+                        sh "docker push ohmivr/pragmabackend:latest"
+                        sh "docker save pragmabackend:latest -o pragmabackend-docker.tar"
+                        archiveArtifacts artifacts: 'pragmabackend-docker.tar', fingerprint: true
+                        sh "rm pragmabackend-docker.tar"
+                    }
+                }
+
                 stage("Code formatter") {
                     agent { label 'linux' }
                     steps {
                         script {
-                            stage("Checkout") {
-                                checkout scm
-                            }
-                            stage("Run formatter") {
-                                sh """
-                                    FILES=\$(find . -type f -regex '\\./\\(Packets\\|Persistence\\|tests\\)/.*\\.\\(h\\|cpp\\)\$')
-                                    clang-format -i \$FILES main.cpp StaticHTTPPackets.cpp StaticWSPackets.cpp
-                                """
-                            }
-                            stage("Create diff") {
-                                sh """
-                                    if ! git diff --quiet; then
-                                        git diff > clang-format.patch
-                                        echo \"Patch created, apply the patch from the artifacts section to fix\"
-                                    else
-                                        echo \"No changes required\"
-                                    fi
-                                """
-                            }
-                            stage("Upload diff if exists") {
-                                if (fileExists('clang-format.patch')) {
-                                    archiveArtifacts artifacts: 'clang-format.patch', fingerprint: true
-                                }
-                            }
-                            stage("Fail if diff exists") {
-                                if (fileExists('clang-format.patch')) {
-                                    sh "exit 1"
-                                }
+                            checkout scm
+                            sh """
+                                FILES=\$(find . -type f -regex '\\./\\(Packets\\|Persistence\\|tests\\)/.*\\.\\(h\\|cpp\\)\$')
+                                clang-format -i \$FILES main.cpp StaticHTTPPackets.cpp StaticWSPackets.cpp
+                            """
+                            sh """
+                                if ! git diff --quiet; then
+                                    git diff > clang-format.patch
+                                    echo "Patch created, apply the patch from the artifacts section to fix"
+                                else
+                                    echo "No changes required"
+                                fi
+                            """
+                            if (fileExists('clang-format.patch')) {
+                                archiveArtifacts artifacts: 'clang-format.patch', fingerprint: true
+                                sh "rm clang-format.patch"
+                                error("Formatting changes required")
                             }
                         }
                     }
                 }
 
                 stage("Code linter") {
                     agent { label 'linux' }
-                    options {
-                        throttle(['RamIntensiveJob'])
-                    }
+                    options { throttle(['RamIntensiveJob']) }
                     steps {
                         script {
-                            stage("Checkout") {
-                                checkout scm
-                                sh "git submodule sync --recursive"
-                                sh "git submodule update --init --recursive"
-                            }
-                            stage("Configure") {
-                                sh "cmake --preset x64-debug-linux"
-                            }
-                            stage("Build protobuf files") {
-                                sh "cmake --build out/build/x64-debug-linux --target generate_protos"
-                            }
-                            stage("Run linter") {
+                            checkout scm
+                            sh "git submodule sync --recursive"
+                            sh "git submodule update --init --recursive"
+                            sh "cmake --preset x64-debug-linux"
+                            sh "cmake --build out/build/x64-debug-linux --target generate_protos"
+
+                            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                                 sh """
                                     FILES=\$(find . -type f -regex '\\./\\(Packets\\|Persistence\\|tests\\)/.*\\.\\(h\\|cpp\\)\$')
                                     run-clang-tidy \$FILES main.cpp StaticHTTPPackets.cpp StaticWSPackets.cpp -fix -p out/build/x64-debug-linux -extra-arg=-Werror
                                 """
                             }
-                            stage("Create diff") {
-                                sh """
-                                    if ! git diff --quiet; then
-                                        git diff > clang-tidy.patch
-                                        echo \"Patch created, apply the patch from the artifacts section to fix\"
-                                    else
-                                        echo \"No changes required\"
-                                    fi
-                                """
+                            sh """
+                                if ! git diff --quiet; then
+                                    git diff > clang-tidy.patch
+                                    echo "Patch created, apply the patch from the artifacts section to fix"
+                                else
+                                    echo "No changes required"
+                                fi
+                            """
+                            if (fileExists('clang-tidy.patch')) {
+                                archiveArtifacts artifacts: 'clang-tidy.patch', fingerprint: true
+                                sh "rm clang-tidy.patch"
+                                error("Linter changes required")
                             }
-                            stage("Upload diff if exists") {
-                                if (fileExists('clang-tidy.patch')) {
-                                    archiveArtifacts artifacts: 'clang-tidy.patch', fingerprint: true
-                                }
+                        }
+                    }
+                }
+
+                stage("Unit tests - Linux") {
+                    agent { label 'linux' }
+                    steps {
+                        script {
+                            sh "mkdir -p testdir"
+                            sh "rm -rf testdir/package-release-linux"
+                            dir('testdir') {
+                                unstash 'linuxbuild'
                             }
-                            stage("Fail if diff exists") {
-                                if (fileExists('clang-tidy.patch')) {
-                                    sh "exit 1"
-                                }
+                            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                                sh "testdir/package-release-linux/tests/tests"
                             }
+                            sh "pkill -9 pragmabackend || true"
                         }
                     }
                 }
-            }
+
+                stage("Unit tests - Windows") {
+                    agent { label 'windows' }
+                    steps {
+                        script {
+                            bat "if not exist testdir mkdir testdir"
+                            dir('testdir') {
+                                unstash 'winbuild'
+                            }
+                            catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                                bat "testdir\\package-release-win\\tests\\tests.exe"
+                            }
+                            bat "taskkill /f /im pragmabackend.exe || exit 0"
+                        }
+                    }
+                }
+            } 
         }
-    }
+    } 
+
     post {
-	always {
-        node('linux'){
-            step([$class: 'GitHubCommitStatusSetter', contextSource: [$class: 'ManuallyEnteredCommitContextSource', context: 'jenkins/build-status'], reposSource: [$class: 'ManuallyEnteredRepositorySource', url: 'https://github.com/SpectreRevival/pragmabackend']])
+        always {
+            node('linux') {
+                step([
+                    $class: 'GitHubCommitStatusSetter',
+                    contextSource: [$class: 'ManuallyEnteredCommitContextSource', context: 'jenkins/build-status'],
+                    reposSource: [$class: 'ManuallyEnteredRepositorySource', url: 'https://github.com/SpectreRevival/pragmabackend']
+                ])
+            }
         }
-	}
     }
 }