Merge pull request #541 from freehackquest/version-0.2.54

Version 0.2.54

Author: sea5kg

.vscode/settings.json

@@ -66,7 +66,15 @@
         "memory_resource": "cpp",
         "random": "cpp",
         "regex": "cpp",
-        "qmutex": "cpp"
+        "qmutex": "cpp",
+        "bit": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "numbers": "cpp",
+        "semaphore": "cpp",
+        "stop_token": "cpp",
+        "variant": "cpp"
     },
     "files.autoSave": "off",
     "search.exclude": {

CHANGELOG.md

@@ -5,7 +5,29 @@ All notable changes to fhq-server project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [v0.2.53] - 2025-08-10 (2024 Jule 21)
+## [v0.2.54] - 2025-08-21 (2025 Aug 21)
+
+- Fix Dockerfile
+- [web-admin] Fix login dialog
+- Fix game_update and game_update_logo
+- Removed ci/travis/run2_language_node_js.sh
+- Fix warning: return in src/database/fhq_server_database_file.cpp
+- Fix clang-format
+- Added new task for runtime migration data (update missing uuids)
+- Removed unsed and deprecated options
+- Fix TODO deprecated setWorkDir and fix behaivor when not set '-wd'
+- Fix pylint warnings
+- Fixed 'Unreachable code' in 'tests/server-api-tests/test_01_games.py' by code-scanning
+- Fixed 'Variable defined multiple times' in 'libfhqpm/command_code_stats.py' by code-scanning
+- Fixed 'Variable defined multiple times ' in 'libfhqpm/utils_shell.py' by code-scanning
+- Fixed 'Unreachable code' in 'libfhqpm/utils_shell.py' by code-scanning
+- Fix warning
+- Updated .vscode/settings.json
+- Added new field uuid to public_event table
+- Added EmployPublicEvents and redesing work with this employ in cmd
+- Added model_public_event
+
+## [v0.2.53] - 2025-08-10 (2025 Jule 21)
 
 - Updated wsjcpp-yaml from 0.1.7 to 0.1.8
 - Updated years to -2025

CMakeLists.txt

@@ -118,6 +118,8 @@ list (APPEND WSJCPP_SOURCES "src/models/model_useful_link.cpp")
 list (APPEND WSJCPP_SOURCES "src/models/model_useful_link_comment.cpp")
 list (APPEND WSJCPP_SOURCES "src/models/model_useful_link_tag.cpp")
 list (APPEND WSJCPP_SOURCES "src/models/model_useful_link_user_favorite.cpp")
+list (APPEND WSJCPP_SOURCES "src/models/model_public_event.cpp")
+
 
 # validators
 list (APPEND WSJCPP_SOURCES "src/validators/validators.cpp")
@@ -136,15 +138,16 @@ list (APPEND WSJCPP_SOURCES "src/utils/utils_lxd.cpp")
 
 # employees
 list (APPEND WSJCPP_SOURCES "src/employees/employ_chats.cpp")
+list (APPEND WSJCPP_SOURCES "src/employees/employ_database.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_images.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_games.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_files.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_notify.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_quests.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_server_info.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_scoreboard.cpp")
-list (APPEND WSJCPP_SOURCES "src/employees/employ_database.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_orchestra.cpp")
+list (APPEND WSJCPP_SOURCES "src/employees/employ_public_events.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_leaks.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_mails.cpp")
 list (APPEND WSJCPP_SOURCES "src/employees/employ_users.cpp")
@@ -153,6 +156,7 @@ list (APPEND WSJCPP_SOURCES "src/employees/employ_uuids.cpp")
 # tasks
 list (APPEND WSJCPP_SOURCES "src/tasks/runtasks.h")
 list (APPEND WSJCPP_SOURCES "src/tasks/runtasks.cpp")
+list (APPEND WSJCPP_SOURCES "src/tasks/update_database_after_server_start_task.cpp")
 list (APPEND WSJCPP_SOURCES "src/tasks/mail_send_task.h")
 list (APPEND WSJCPP_SOURCES "src/tasks/mail_send_task.cpp")
 list (APPEND WSJCPP_SOURCES "src/tasks/notify_to_all_task.h")
@@ -183,6 +187,7 @@ list (APPEND WSJCPP_SOURCES "src/storages/updates/update_pmlyt8k7nm_215438peu8.c
 list (APPEND WSJCPP_SOURCES "src/storages/updates/update_215438peu8_9gwc2tm5ah.cpp")
 list (APPEND WSJCPP_SOURCES "src/storages/updates/update_9gwc2tm5ah_on73sheet9.cpp")
 list (APPEND WSJCPP_SOURCES "src/storages/updates/update_on73sheet9_ili7looowo.cpp")
+list (APPEND WSJCPP_SOURCES "src/storages/updates/update_ili7looowo_8i52flwubv.cpp")
 list (APPEND WSJCPP_SOURCES "src/storages/updates/update0101.cpp")
 
 # web-server

Dockerfile

@@ -13,6 +13,8 @@ RUN python3 -u pm.py clean && ./build_simple.sh
 COPY ./web-user /root/web-user
 RUN cp -rf /root/node_modules_cache/node_modules /root/web-user
 WORKDIR /root/web-user
+RUN node -v
+RUN npm -v
 RUN npm install && npm run build-prod
 
 FROM sea5kg/fhq-server-release-environment:2025-08-06

ci/travis/run.sh

@@ -23,9 +23,6 @@ cd $SCRIPT_DIR/../.. # go to root of repository
 ./ci/travis/run1_language_cpp.sh
 check_ret $? "run1_language_cpp"
 
-./ci/travis/run2_language_node_js.sh
-check_ret $? "run2_language_node_js"
-
 ./ci/travis/run3_language_python.sh
 check_ret $? "run3_language_python"
 

ci/travis/run2_language_node_js.sh

@@ -95,7 +95,6 @@ def execute(self, _):
 
         files = UtilsFiles.get_all_files(src_wsjcpp_dir)
         for filepath in files:
-            lines = UtilsFiles.safe_read_file(filepath)
             is_header = _fp.endswith(".h") or _fp.endswith(".hpp")
             is_source_code = _fp.endswith(".cpp") or _fp.endswith(".c") or _fp.endswith(".cc")
             if is_source_code or is_header:

libfhqpm/command_code_stats.py

@@ -52,30 +52,32 @@ def __init__(self, config: PmConfig):
         self.__subcomamnd_name = "rebuild-environment-images"
         self.__debian_version = "12"
         self.__node_version = "24"
-        self.__build_packages = [
-            "make",
-            "cmake",
-            "gcc",
-            "g++",
-            "curl",
-            "pkg-config",
-            "libcurl4-openssl-dev",
-            "zlib1g-dev",
-            "libpng-dev",
-            "default-libmysqlclient-dev",
-            "libwebsockets-dev",
-            "apt-utils",
-            "build-essential",
-            "nodejs",
-        ]
-        self.__release_packages = [
-            "libcurl4",
-            "zlib1g",
-            "libpng16-16",
-            "libmariadb3",
-            "libpthread-stubs0-dev",
-            "locales",
-        ]
+        self.__packages = {
+            "build": [
+                "make",
+                "cmake",
+                "gcc",
+                "g++",
+                "curl",
+                "pkg-config",
+                "libcurl4-openssl-dev",
+                "zlib1g-dev",
+                "libpng-dev",
+                "default-libmysqlclient-dev",
+                "libwebsockets-dev",
+                "apt-utils",
+                "build-essential",
+                "nodejs",
+            ],
+            "release": [
+                "libcurl4",
+                "zlib1g",
+                "libpng16-16",
+                "libmariadb3",
+                "libpthread-stubs0-dev",
+                "locales",
+            ],
+        }
 
     def get_name(self):
         """ return subcommand name """
@@ -131,8 +133,8 @@ def __update_dockerfile_build_env(self):
 
 # basic libs
 RUN apt-get update && apt-get install -y --no-install-recommends \\
-    """ + " \\\n    ".join(self.__build_packages) + """ \\
-    """ + " \\\n    ".join(self.__release_packages) + """
+    """ + " \\\n    ".join(self.__packages["build"]) + """ \\
+    """ + " \\\n    ".join(self.__packages["release"]) + """
 
 # RUN node --version
 # RUN npm --version
@@ -165,7 +167,7 @@ def __update_dockerfile_release_env(self):
 
 RUN apt-get update && \\
     apt-get install -y \\
-    """ + " \\\n    ".join(self.__release_packages) + """
+    """ + " \\\n    ".join(self.__packages["release"]) + """
 
 # RUN locale-gen en_US.UTF-8
 RUN sed -i -e "s/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/" /etc/locale.gen && \\

libfhqpm/command_rebuild_environment_images.py

@@ -75,14 +75,14 @@ def run_command(_command, _output=None):
                     _output.write("ERROR: returncode " + str(_returncode) + "\n")
                 sys.exit(_returncode)
             return
-        sys.exit("Could not start process")
+        print("ERROR: Could not start process")
+        sys.exit(-1)
 
     @staticmethod
     def run_command_get_output(_log, _command):
         """ run_command_get_output """
         # _log.info("Run command: " + " ".join(_command))
         _output = ""
-        _returncode = -1
         with subprocess.Popen(
             _command,
             stdout=subprocess.PIPE,

libfhqpm/utils_shell.py

@@ -1,7 +1,7 @@
 # Automaticly generated by wsjcpp@v0.2.5
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_APP_VERSION="v0.2.53")
+add_definitions(-DWSJCPP_APP_VERSION="v0.2.54")
 add_definitions(-DWSJCPP_APP_NAME="fhq-server")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")