check pt: Combine lib_py_market_data and provider py scripts into one project

fix build: Ensure py scripts use unix line endings
I'm not sure why, but my sparkd build (linux) suddenly began failing to generate cpp headers for protos. The error message indicated it was due to an unexpected carriage return (\r) in plugin.py: /usr/bin/env: ‘python\r’: No such file or directory
2024-08-12 14:03:33 +00:00 · 2024-08-10 15:17:01 +00:00 · 2024-08-10 03:21:06 +00:00 · 2024-08-09 16:50:49 +00:00 · 2024-08-09 16:50:49 +00:00 · 2024-08-09 16:50:49 +00:00
1751 changed files with 7272 additions and 19758 deletions
@@ -1,3 +1,4 @@
 *.cmd text=auto eol=crlf
 *.cs text=auto eol=crlf
 *.sh text=auto eol=lf
+*.py text=auto eol=lf
@@ -198,19 +198,60 @@
    },
    {
      "name": "Sparkd",
-      "type": "coreclr",
+      "type": "cppdbg",
      "request": "launch",
      "preLaunchTask": "Build Sparkd (Debug | Clang)",
      "program": "",
      "linux": {
-        "program": "sparkd",
+        "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
      },
      "args": [
        "run"
      ],
-      "cwd": "build/sparkd-debug-clang/server",
+      "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
      "stopAtEntry": false,
-      "console": "integratedTerminal"
+      "externalConsole": false,
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        },
+        {
+          "description": "Set Disassembly Flavor to Intel",
+          "text": "-gdb-set disassembly-flavor intel",
+          "ignoreFailures": true
+        }
+      ]
+    },
+    {
+      "name": "Sparkd (Skip Build)",
+      "type": "cppdbg",
+      "request": "launch",
+      "program": "",
+      "linux": {
+        "program": "${workspaceFolder}/build/sparkd-debug-clang/server/sparkd",
+      },
+      "args": [
+        "run"
+      ],
+      "cwd": "${workspaceFolder}/build/sparkd-debug-clang/server",
+      "stopAtEntry": false,
+      "externalConsole": false,
+      "MIMode": "gdb",
+      "setupCommands": [
+        {
+          "description": "Enable pretty-printing for gdb",
+          "text": "-enable-pretty-printing",
+          "ignoreFailures": true
+        },
+        {
+          "description": "Set Disassembly Flavor to Intel",
+          "text": "-gdb-set disassembly-flavor intel",
+          "ignoreFailures": true
+        }
+      ]
    }
  ],
  "inputs": [
@@ -19,9 +19,9 @@ set(
 # can run simultaneously without fighting over the same shm files (e.g., sparkd,
 # api server, etc.).
 set(SHARED_MEMORY_PREFIX "bts" CACHE STRING "Prefix to use when creating shared memory files")
-set(SPARK_BIN "${EXTERNALS_ROOT}/bin")
-set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
-set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
+set(EXTERNALS_BIN "${EXTERNALS_ROOT}/bin")
+set(EXTERNALS_INCLUDE "${EXTERNALS_ROOT}/include")
+set(EXTERNALS_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
 set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
 set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
 set(EXPORT_MD_CONSUMER OFF CACHE BOOL "Export (extern) C functions for MD consumer interop")
@@ -33,24 +33,22 @@ else()
  set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
 endif()

-include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
-link_directories(${SPARK_LIB})
+include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
+link_directories(${EXTERNALS_LIB})

 add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
-add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
-if(DEFINED APP_DATA_DIR_OVERRIDE)
-  add_compile_definitions(APP_DATA_DIR_OVERRIDE="${APP_DATA_DIR_OVERRIDE}")
+if(DEFINED APP_DATA_DIR)
+  add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
 endif()
 add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
 if(WIN32)
  # subdirs
-  add_subdirectory(src/lib)
+  add_subdirectory(src/lib_spark)
 else()
  # make sparkd look for libspark.so in its directory
-  set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-  set(CMAKE_INSTALL_RPATH ".")
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
-  set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")
+  # set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+  # set(CMAKE_INSTALL_RPATH ".")
+  # set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install/$<CONFIG>")

  if(BUILD_SPARKD)
    # Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
@@ -111,10 +109,12 @@ else()

  # subdirs
  if (BUILD_SPARKD)
-    add_subdirectory(src/server/sparkd)
+    add_subdirectory(src/app_sparkd)
    add_subdirectory(src/data_files)
+    add_subdirectory(src/lib_py_market_data)
+    # add_subdirectory(src/py_market_data_providers)
  endif()
-  add_subdirectory(src/lib)
+  add_subdirectory(src/lib_spark)
  if (BUILD_ADMIN_WEB_APP)
    add_subdirectory(src/Spark.Admin.WebApp)
  endif()
@@ -124,32 +124,4 @@ else()
  if(BUILD_SDK)
    add_subdirectory(src/sdk)
  endif()
-
-  if(BUILD_SPARKD)
-    add_custom_command(
-      OUTPUT ${CMAKE_BINARY_DIR}/server
-      COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
-      COMMAND
-        ln ARGS -sf
-        ${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
-        ${CMAKE_BINARY_DIR}/server
-      COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
-      COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
-      COMMENT "Creating server runtime layout"
-      DEPENDS sparkd data_files_dir)
-
-    add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
-
-    install(
-      DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
-      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
-    install(
-      FILES
-      "${SPARK_LIB}/libACE-5.7.5.so"
-      "${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
-      DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
-  endif()
 endif()
@@ -20,8 +20,6 @@
        "SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
      },
      "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{APPDATA}/bts",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_DATA_DIR}",
        "CMAKE_CXX_FLAGS": "$env{SPARK_CMAKE_CXX_FLAGS}",
        "CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
        "CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
@@ -35,8 +33,7 @@
        "EXPORT_MD_CONSUMER": {
          "type": "BOOL",
          "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "spark"
+        }
      }
    },

@@ -52,15 +49,9 @@
      "binaryDir": "${sourceDir}/build/${presetName}",
      "cacheVariables": {
        "platform": "",
-        "APP_DATA_DIR": "${dollar}{HOME}/sparkdata",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARKD_DATA_DIR}",
-        "CMAKE_BUILD_WITH_INSTALL_RPATH": {
-          "type": "BOOL",
-          "value": "ON"
-        },
        "CMAKE_CXX_STANDARD": "20",
-        "CMAKE_INSTALL_RPATH": ".",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+        "CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
        "CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
        "EXTERNALS_ROOT": "${sourceDir}/externals/linux",
        "BUILD_SDK": {
@@ -70,8 +61,7 @@
        "BUILD_ADMIN_WEB_APP": {
          "type": "BOOL",
          "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "sparkd"
+        }
      }
    },

@@ -152,11 +142,7 @@
    {
      "name": "spark-api-server-windows",
      "inherits": "spark",
-      "displayName": "Spark Api Server (Windows)",
-      "cacheVariables": {
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_API_SERVER_DATA_DIR}",
-        "SHARED_MEMORY_PREFIX": "spark_api_server"
-      }
+      "displayName": "Spark Api Server (Windows)"
    },

    {
@@ -165,7 +151,6 @@
      "displayName": "Spark Api Server (Linux)",
      "generator": "Ninja Multi-Config",
      "cacheVariables": {
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{SPARK_API_SERVER_DATA_DIR}",
        "BUILD_ADMIN_WEB_APP": {
          "type": "BOOL",
          "value": "OFF"
@@ -178,9 +163,12 @@
        "CMAKE_CXX_COMPILER": "clang++",
        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+        "CMAKE_EXPORT_COMPILE_COMMANDS": {
+          "type": "BOOL",
+          "value": "ON"
+        },
        "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
-        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
+        "DOTNET_BINARY_DIR": "${sourceDir}/build/Spark.Api.Server/$<CONFIG>/bin/net7.0",
        "EXPORT_MD_CONSUMER": {
          "type": "BOOL",
          "value": "ON"
@@ -218,11 +206,8 @@
      "description": "Data Stream utils ported over from Edge",
      "binaryDir": "${sourceDir}/build/${presetName}",
      "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{APPDATA}/bts/DataStream",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
        "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
-        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows",
-        "SHARED_MEMORY_PREFIX": "data_stream"
+        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net7.0-windows"
      }
    },

@@ -238,8 +223,6 @@
      "inherits": "sparkd",
      "generator": "Ninja Multi-Config",
      "cacheVariables": {
-        "APP_DATA_DIR": "${dollar}{HOME}/.local/share/DataStream",
-        "APP_DATA_DIR_OVERRIDE": "${dollar}{DATA_STREAM_DATA_DIR}",
        "BUILD_ADMIN_WEB_APP": {
          "type": "BOOL",
          "value": "OFF"
@@ -256,14 +239,13 @@
        "CMAKE_CXX_COMPILER": "clang++",
        "CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
        "CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
        "CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf",
+        "CONFIG_PROFILES": "default;data_stream",
        "DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0;${sourceDir}/build/$<CONFIG>/bin/net8.0",
        "EXPORT_MD_CONSUMER": {
          "type": "BOOL",
          "value": "ON"
-        },
-        "SHARED_MEMORY_PREFIX": "data_stream"
+        }
      }
    }
  ],
@@ -302,16 +284,7 @@
        "lhs": "${hostSystemName}",
        "rhs": "Linux"
      },
-      "hidden": true,
-      "targets": [
-        "data_files_dir",
-        "admin_web_app_bundle",
-        "install",
-        "libspark",
-        "rapidjson_project",
-        "server_layout",
-        "sparkd"
-      ]
+      "hidden": true
    },

    {
@@ -0,0 +1,66 @@
+function(init_executable)
+  set(source_dir)
+  if (${ARGC} EQUAL 0)
+    set(source_dir ${PROJECT_NAME})
+  elseif(${ARGC} GREATER 1)
+    message(FATAL_ERROR "init_shared_library received invalid arguments. Usage: init_shared_library(<OPTIONAL:source_dir>)")
+  else()
+    set(source_dir ${ARGV})
+  endif()
+
+  set(_options)
+  set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
+  set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
+  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
+  if (${_ARGS_PROTO_SOURCES} EQUAL "GLOB_RECURSIVE")
+    file(
+      GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES
+      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+      *.proto
+    )
+  endif()
+
+  set(${PROJECT_NAME}_SOURCES PARENT_SCOPE)
+  file(
+    GLOB_RECURSE ${PROJECT_NAME}_SOURCES
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${source_dir}/*.cpp
+  )
+  set(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_SOURCES} PARENT_SCOPE)
+  # set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
+  # Note: cpp files inside 'tests' dir(s) are considered tests.
+  # Remove tests from main sources, and add them to test sources
+  set(${PROJECT_NAME}_TEST_SOURCES)
+  foreach(item ${${PROJECT_NAME}_SOURCES})
+    if(${item} MATCHES "tests/*.cpp")
+      list(REMOVE_ITEM ${PROJECT_NAME}_SOURCES ${item})
+      list(APPEND ${PROJECT_NAME}_TEST_SOURCES ${item})
+    endif()
+  set(${PROJECT_NAME}_TEST_SOURCES ${${PROJECT_NAME}_TEST_SOURCES} PARENT_SCOPE)
+  endforeach()
+
+  # Add executable
+  add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
+  target_include_directories(
+    ${PROJECT_NAME}
+    PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  )
+
+  target_link_directories(
+    ${PROJECT_NAME}
+    PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
+  )
+
+  # Add tests executable (if there are any)
+  if (${PROJECT_NAME}_TEST_SOURCES)
+    add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_TEST_SOURCEs})
+    target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME})
+    # Catch2
+    find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain)
+    target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain)
+  endif()
+endfunction()
@@ -0,0 +1,52 @@
+function(init_shared_library)
+  set(source_dir)
+  if (${ARGC} EQUAL 0)
+    set(source_dir ${PROJECT_NAME})
+  elseif(${ARGC} GREATER 1)
+    message(FATAL_ERROR "init_shared_library received invalid arguments. Usage: init_shared_library(<OPTIONAL:source_dir>)")
+  else()
+    set(source_dir ${ARGV})
+  endif()
+  set(${PROJECT_NAME}_Sources PARENT_SCOPE)
+  file(
+    GLOB_RECURSE ${PROJECT_NAME}_Sources
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    ${source_dir}/*.cpp)
+  set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
+  # set(${PROJECT_NAME}_Sources ${${PROJECT_NAME}_Sources} PARENT_SCOPE)
+  # Note: cpp files inside 'tests' dir(s) are considered tests.
+  # Remove tests from main sources, and add them to test sources
+  set(${PROJECT_NAME}_Test_Sources)
+  foreach(item ${${PROJECT_NAME}_Sources})
+    if(${item} MATCHES "tests/*.cpp")
+      list(REMOVE_ITEM ${PROJECT_NAME}_Sources ${item})
+      list(APPEND ${PROJECT_NAME}_Test_Sources ${item})
+    endif()
+  set(${PROJECT_NAME}_Test_Sources ${${PROJECT_NAME}_Test_Sources} PARENT_SCOPE)
+  endforeach()
+
+  # Add main library
+  add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_Sources})
+  target_include_directories(
+    ${PROJECT_NAME}
+    PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  )
+
+  target_link_directories(
+    ${PROJECT_NAME}
+    PUBLIC
+      $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+      $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
+  )
+
+  # Add tests executable (if there are any)
+  if (${PROJECT_NAME}_Test_Sources)
+    add_executable(${PROJECT_NAME}-tests ${${PROJECT_NAME}_Test_Sources})
+    target_link_libraries(${PROJECT_NAME}-tests PRIVATE ${PROJECT_NAME})
+    # Catch2
+    find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain)
+    target_link_libraries(${PROJECT_NAME}-tests PRIVATE Catch2::Catch2WithMain)
+  endif()
+endfunction(init_shared_library)
@@ -0,0 +1,29 @@
+include(${CMAKE_SOURCE_DIR}/cmake/PackBasic.cmake)
+
+function(install_basic_config)
+  file(
+    GLOB_RECURSE ${PROJECT_NAME}_HEADERS
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+    *.h)
+
+  target_sources(${PROJECT_NAME}
+    PUBLIC
+      FILE_SET HEADERS FILES ${${PROJECT_NAME}_HEADERS})
+
+  install(
+    TARGETS ${PROJECT_NAME}
+    EXPORT ${PROJECT_NAME}Targets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+
+  install(
+    EXPORT ${PROJECT_NAME}Targets
+    FILE ${PROJECT_NAME}Targets.cmake
+    NAMESPACE ${PROJECT_NAME}::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+
+  pack_basic()
+endfunction()
@@ -0,0 +1,21 @@
+include(CMakePackageConfigHelpers)
+
+function(pack_basic)
+  write_basic_package_version_file(
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+    VERSION ${PROJECT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+  )
+
+  configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
+  )
+
+  install(
+    FILES
+      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+endfunction()
@@ -1,12 +1,23 @@
-set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
-set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
+set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc")
+set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}")
 set(PROTOBUF_STATIC_LIB "libprotobuf")
+set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark)
+set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark)

-function(Protobuf_Generate_Cpp SRCS HDRS)
-  set(${SRCS})
-  set(${HDRS})
+function(Protobuf_Generate_Cpp)
+set(_options)
+  set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
+  set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
+  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
+  set(${_ARGS_CXX_SOURCES})
+  set(${_ARGS_CXX_HEADERS})

-  foreach(FIL ${ARGN})
+  set(_proto_include_cli_args)
+  foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
+    list(APPEND _proto_include_cli_args -I ${_dir})
+  endforeach()
+
+  foreach(FIL ${_ARGS_PROTO_SOURCES})
    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
    get_filename_component(FIL_WE ${FIL} NAME_WE)
    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
@@ -14,48 +25,59 @@ function(Protobuf_Generate_Cpp SRCS HDRS)
      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
    endif()

-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
+    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")

    add_custom_command(
-      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-             "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
+      OUTPUT
+        "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
+        "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
      COMMAND
-        ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I
-        ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
+        ${Protobuf_PROTOC_EXECUTABLE}
+      ARGS
+        --cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL}
      DEPENDS ${ABS_FIL}
      COMMENT "Running C++ protocol buffer compiler on ${FIL}"
      VERBATIM)
  endforeach()

-  set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
+  set_source_files_properties(${${_ARGS_CXX_SOURCES}} ${${_ARGS_CXX_HEADERS}} PROPERTIES GENERATED TRUE)

  # remove some warnings from protobuf generated files
  if(WIN32)
-    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
+    set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
                                                      "/wd4309 /wd4838")
  else()
    set_source_files_properties(
-      ${${SRCS}}
+      ${${_ARGS_CXX_SOURCES}}
      PROPERTIES
        COMPILE_FLAGS
        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
    )
  endif()

-  set(${SRCS}
-      ${${SRCS}}
+  set(${_ARGS_CXX_SOURCES}
+      ${${_ARGS_CXX_SOURCES}}
      PARENT_SCOPE)
-  set(${HDRS}
-      ${${HDRS}}
+  set(${_ARGS_CXX_HEADERS}
+      ${${_ARGS_CXX_HEADERS}}
      PARENT_SCOPE)
 endfunction()

-function(Service_Compiler_Generate_Cpp SRCS HDRS)
-  set(${SRCS})
-  set(${HDRS})
+function(Service_Compiler_Generate_Cpp)
+  set(_options)
+  set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
+  set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
+  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
+  set(${_ARGS_CXX_SOURCES})
+  set(${_ARGS_CXX_HEADERS})

-  foreach(FIL ${ARGN})
+  set(_proto_include_cli_args)
+  foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
+    list(APPEND _proto_include_cli_args -I ${_dir})
+  endforeach()
+
+  foreach(FIL ${_ARGS_PROTO_SOURCES})
    get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
    get_filename_component(FIL_WE ${FIL} NAME_WE)
    get_filename_component(FIL_DIR ${FIL} DIRECTORY)
@@ -63,58 +85,58 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS)
      set(FIL_WE "${FIL_DIR}/${FIL_WE}")
    endif()

-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
+    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
+    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")

-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
+    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc")
+    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h")

-    list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
-    list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
+    list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc")
+    list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h")

    set(TEMPLATES
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
-        ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
+        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc
+        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h
+        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc
+        ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h
    )

+    set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
    if(WIN32)
+      set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd)
      add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
+        OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
        COMMAND SET PYTHONPATH=${SPARK_PYTHON}
        COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
        COMMAND
-          ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src
-          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
-          --service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I
-          ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES}
-                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
+          ${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${_ARGS_CXX_OUT_DIR}
+          --plugin=protoc-gen-service=${_plugin_cmd}
+          --service_out=lang=cpp:${_ARGS_CXX_OUT_DIR} -I
+          ${PROTOBUF_INCLUDE_DIRS} -I ${_protobuf_src_dir} ${ABS_FIL}
+        DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_cmd} ${_plugin_py}
        COMMENT "Running C++ service compiler on ${FIL}"
        VERBATIM)
    else()
      add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
-               "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
+        OUTPUT "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
+               "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
        COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
        ARGS
          ${Protobuf_PROTOC_EXECUTABLE}
-          --cpp_out=${CMAKE_BINARY_DIR}/src
-          --plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
-          --service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src
-          -I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
-        DEPENDS ${ABS_FIL} ${TEMPLATES}
-                ${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
+          --cpp_out=${_ARGS_CXX_OUT_DIR}
+          --plugin=protoc-gen-service=${_plugin_py}
+          --service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR}
+          ${_proto_include_cli_args} ${ABS_FIL}
+        DEPENDS ${ABS_FIL} ${TEMPLATES} ${_plugin_py}
        COMMENT "Running C++ service compiler on ${FIL}"
        VERBATIM)
    endif()
@@ -123,22 +145,22 @@ function(Service_Compiler_Generate_Cpp SRCS HDRS)

  # remove some warnings from protobuf generated files
  if(WIN32)
-    set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
+    set_source_files_properties(${${_ARGS_CXX_SOURCES}} PROPERTIES COMPILE_FLAGS
                                                      "/wd4309 /wd4838")
  else()
    set_source_files_properties(
-      ${${SRCS}}
+      ${${_ARGS_CXX_SOURCES}}
      PROPERTIES
        COMPILE_FLAGS
        "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
    )
  endif()

-  set(${SRCS}
-      ${${SRCS}}
+  set(${_ARGS_CXX_SOURCES}
+      ${${_ARGS_CXX_SOURCES}}
      PARENT_SCOPE)
-  set(${HDRS}
-      ${${HDRS}}
+  set(${_ARGS_CXX_HEADERS}
+      ${${_ARGS_CXX_HEADERS}}
      PARENT_SCOPE)

 endfunction()
@@ -0,0 +1,8 @@
+macro(set_first_defined RESULT CANDIDATE_VARS)
+  foreach(_candidate_var ${CANDIDATE_VARS})
+    if (DEFINED _candidate_var)
+      set(${RESULT} ${_candidate_var})
+      break()
+    endif()
+  endforeach()
+endmacro()
@@ -0,0 +1,42 @@
+function(sym_link_dir TARGET_NAME SOURCE DEST)
+  add_custom_command(
+    OUTPUT ${DEST}
+    COMMAND ln ARGS -sf ${SOURCE} ${DEST}
+  )
+  add_custom_target(
+    ${TARGET_NAME} ALL
+    DEPENDS ${DEST}
+  )
+endfunction()
+
+function(sym_link_file)
+  set(_options)
+  set(_one_value_args TARGET_NAME SOURCE DEST INSTALL_DEST)
+  set(_multi_value_args)
+  cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
+  add_custom_command(
+    OUTPUT ${_ARGS_DEST}
+    COMMAND ln ARGS -s ${_ARGS_SOURCE} ${_ARGS_DEST}
+  )
+  add_custom_target(
+    ${_ARGS_TARGET_NAME} ALL
+    DEPENDS ${_ARGS_DEST}
+  )
+  if (DEFINED _ARGS_INSTALL_DEST)
+    install(
+      FILES
+      ${_ARGS_SOURCE}
+      DESTINATION ${_ARGS_INSTALL_DEST}
+    )
+  endif()
+endfunction()
+
+function(sym_link_local_lib LIB_NAME)
+  set(_lib_file_name "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}.so")
+  file(
+    CREATE_LINK
+      "${CMAKE_BINARY_DIR}/src/lib_${LIB_NAME}/${_lib_file_name}"
+      "${CMAKE_CURRENT_BINARY_DIR}/${_lib_file_name}"
+    SYMBOLIC
+  )
+endfunction()
@@ -0,0 +1,7 @@
+macro(set_ternary RESULT CONDITION TRUE_VALUE FALSE_VALUE)
+  if(${CONDITION})
+    set(${RESULT} ${TRUE_VALUE})
+  else()
+    set(${RESULT} ${FALSE_VALUE})
+  endif()
+endmacro()
@@ -42,11 +42,27 @@ services:
      dockerfile: src/DataStreamSuite/Bts.DataStreamWebApp.Server/Dockerfile
    command: [ "./Bts.DataStreamWebApp.Server" ]
    environment:
-      - ASPNETCORE_HTTP_PORT=8080
-      - ASPNETCORE_HTTPS_PORT=8443
      - ASPNETCORE_ENVIRONMENT=Staging

-  pingtest:
+  api-server:
+    profiles:
+      - api-server
+    depends_on:
+      - sparkd
+    ports:
+      - 8008:8008
+      - 9443:9443
+    build:
+      dockerfile: src/client/spark_api_server/Dockerfile
+    command: [ "./spark_api_server", "run" ]
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Staging
+
+  sparkd-ping-test:
+    depends_on:
+      - sparkd
+    profiles:
+      - ping-test
    build:
      context: .
      dockerfile_inline: |
@@ -1 +1 @@
-VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:8443/ws
+VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
@@ -1 +1 @@
-VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:8443/ws
+VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:443
@@ -12,6 +12,18 @@ module.exports = {
  settings: { react: { version: '18.3.1' } },
  plugins: ['react-refresh'],
  rules: {
+    "import/order": [
+      "error",
+      {
+        "groups": [
+          "builtin",
+          "external",
+          "internal",
+          ["parent", "sibling", "index"]
+        ],
+        "newlines-between": "always"
+      }
+    ],
    'react-refresh/only-export-components': [
      'warn',
      { allowConstantExport: true },
@@ -32,6 +32,7 @@
        "@types/react-dom": "^18.3.0",
        "@vitejs/plugin-react": "^4.3.1",
        "eslint": "^8.57.0",
+        "eslint-plugin-import": "^2.29.1",
        "eslint-plugin-react": "^7.34.2",
        "eslint-plugin-react-hooks": "^4.6.2",
        "eslint-plugin-react-refresh": "^0.4.7",
@@ -3178,6 +3179,12 @@
      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
      "dev": true
    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
+    },
    "node_modules/@types/parse-json": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
@@ -3492,6 +3499,26 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
+      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/array.prototype.flat": {
      "version": "1.3.2",
      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
@@ -4306,6 +4333,121 @@
        "url": "https://opencollective.com/eslint"
      }
    },
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-import-resolver-node/node_modules/resolve": {
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
+      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^3.2.7"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import": {
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/eslint-plugin-react": {
      "version": "7.34.2",
      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz",
@@ -5603,6 +5745,15 @@
        "node": "*"
      }
    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/ms": {
      "version": "2.1.2",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5731,6 +5882,20 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/object.groupby": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
+      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/object.hasown": {
      "version": "1.1.4",
      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz",
@@ -6584,6 +6749,15 @@
        "node": ">=8"
      }
    },
+    "node_modules/strip-bom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
    "node_modules/strip-json-comments": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -6677,6 +6851,30 @@
        "node": ">=4"
      }
    },
+    "node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
+      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
+      "dev": true,
+      "dependencies": {
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
+      }
+    },
+    "node_modules/tsconfig-paths/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      }
+    },
    "node_modules/tslib": {
      "version": "2.6.3",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
@@ -34,6 +34,7 @@
    "@types/react-dom": "^18.3.0",
    "@vitejs/plugin-react": "^4.3.1",
    "eslint": "^8.57.0",
+    "eslint-plugin-import": "^2.29.1",
    "eslint-plugin-react": "^7.34.2",
    "eslint-plugin-react-hooks": "^4.6.2",
    "eslint-plugin-react-refresh": "^0.4.7",
@@ -1,5 +1,5 @@
 import { fileURLToPath, URL } from 'node:url';
-import { defineConfig } from 'vite';
+import { defineConfig, loadEnv } from 'vite';
 import plugin from '@vitejs/plugin-react';
 import fs from 'fs';
 import path from 'path';
@@ -29,13 +29,12 @@ if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
  }
 }

-const target = env.ASPNETCORE_HTTPS_PORT
-  ? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
-  : env.ASPNETCORE_URLS
-    ? env.ASPNETCORE_URLS.split(';')[0]
-    : 'https://localhost:8443';
-
 export default defineConfig(({ $$command, mode, $$isSsrBuild, $$isPreview }) => {
+  const target = env.ASPNETCORE_HTTPS_PORT
+    ? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}`
+    : env.ASPNETCORE_URLS
+      ? env.ASPNETCORE_URLS.split(';')[0]
+      : 'https://localhost:8443';
  return {
    plugins: [plugin()],
    resolve: {
@@ -3,5 +3,5 @@ FROM bluetradingsystems/linux_dotnet7
 RUN dotnet dev-certs https --trust
 COPY --chown=bts:bts "build/Release/bin/net7.0/linux-x64/publish" "bin"
 COPY --chown=bts:bts "build/Bts.DataStreamWebApp.Client/production/dist" "bin/wwwroot"
-COPY --chown=bts:bts "src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf" ".local/share/DataStream/conf/spark.conf"
+COPY --chown=bts:bts "src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf" ".local/share/bts/Bts.DataStreamWebApp.Server/conf/spark.conf"
 WORKDIR "/home/bts/bin"
@@ -9,5 +9,5 @@ RUN apt-get update \

 USER bts
 COPY --chown=bts:bts "build/Release/bin/net7.0/linux-x64/publish" "bin"
-COPY --chown=bts:bts "src/DataStreamSuite/DataStreamPublisher/spark.conf" ".local/share/DataStream/conf/spark.conf"
+COPY --chown=bts:bts "src/DataStreamSuite/DataStreamPublisher/spark.conf" ".local/share/bts/DataStreamPublisher/conf/spark.conf"
 WORKDIR "/home/bts/bin"
@@ -1,5 +1,5 @@
 FROM bluetradingsystems/linux_dotnet7

 COPY --chown=bts:bts "build/Release/bin/net7.0/linux-x64/publish" "bin"
-COPY --chown=bts:bts "src/DataStreamSuite/PubSubServer/spark.conf" ".local/share/DataStream/conf/spark.conf"
+COPY --chown=bts:bts "src/DataStreamSuite/PubSubServer/spark.conf" ".local/share/bts/PubSubServer/conf/spark.conf"
 WORKDIR "/home/bts/bin"
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Define the bash array
+# values=("value1" "value2" "value3")
+values=$(dotnet sln DataStreamSuite.sln list | tail +3)
+
+# Function to get the key for a value
+get_key() {
+  local value=$1
+  # Replace this with your actual logic to get the key
+  echo "key_for_$value"
+}
+
+# Function to get the JSON array of child values for a value
+get_children() {
+  local value=$1
+  # Replace this with your actual logic to get the JSON array of child values
+  echo '["child1", "child2", "child3"]'
+}
+
+# Create an empty JSON object
+json_object="{}"
+
+# Iterate through the array and construct the JSON object
+for value in ${values[@]}; do
+  key=$(get_key "$value")
+  children=$(get_children "$value")
+  json_object=$(echo "$json_object" | jq --arg key "$key" --argjson children "$children" '. + {($key): $children}')
+done
+
+# Print the final JSON object
+echo "$json_object"
+
@@ -2,15 +2,14 @@ cmake_minimum_required(VERSION 3.5)
 project(Spark.Admin.WebApp)

 include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
-include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)

 # dependencies
 set(PROTO_GLOBS
-  ../lib/api/*.proto
-  ../lib/api/services/*.proto
-  ../lib/domain_model/*.proto
-  ../lib/sparkproto/*.proto
-  ../lib/md/protos/*.proto
+  ../lib_spark/spark/api/*.proto
+  ../lib_spark/spark/api/services/*.proto
+  ../lib_spark/spark/domain_model/*.proto
+  ../lib_spark/spark/sparkproto/*.proto
+  ../lib_spark/spark/md/protos/*.proto
  ../../externals/linux/include/google/protobuf/descriptor.proto
  ../../externals/linux/include/google/protobuf/timestamp.proto)

@@ -58,7 +57,7 @@ set(_build_admin_web_app_deps
  ${_build_admin_web_app_py}
  ${CMAKE_CURRENT_SOURCE_DIR}/src/Spark.Admin.WebApp.fsproj
  ${CMAKE_CURRENT_SOURCE_DIR}/webpack.config.js
-  ${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/templates/fs/fable.fs
+  ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs
  ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
  ${_proto_rel_SOURCES}
  ${_api_ts_SOURCES}
@@ -105,4 +104,4 @@ add_custom_command(

 add_custom_target(admin_web_app_bundle ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bundle.js)

-install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" DESTINATION "bin")
@@ -0,0 +1,159 @@
+cmake_minimum_required(VERSION 3.5)
+project(sparkd)
+
+include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
+include(${CMAKE_SOURCE_DIR}/cmake/Protobuf.cmake)
+include(GNUInstallDirs)
+
+if (NOT DEFINED PROJECT_VERSION)
+  set(PROJECT_VERSION 1.0.0)
+endif()
+
+# dependencies
+file(
+  GLOB_RECURSE ${PROJECT_NAME}_PROTO_SOURCES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  *.proto
+)
+file(
+  GLOB_RECURSE ${PROJECT_NAME}_SOURCES
+  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+  *.cpp
+)
+update_deps_file("${${PROJECT_NAME}_PROTO_SOURCES};${${PROJECT_NAME}_SOURCES}")
+
+protobuf_generate_cpp(
+  CXX_SOURCES ${PROJECT_NAME}_PROTO_CXX_SOURCES
+  CXX_HEADERS ${PROJECT_NAME}_PROTO_CXX_HEADERS
+  CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/include
+  PROTO_INCLUDE_DIRS
+    ${EXTERNALS_INCLUDE}
+    ${CMAKE_SOURCE_DIR}/src/lib_spark
+    ${CMAKE_CURRENT_SOURCE_DIR}
+  PROTO_SOURCES
+    ${${PROJECT_NAME}_PROTO_SOURCES})
+add_executable(sparkd ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_PROTO_CXX_SOURCES})
+
+# include paths
+target_include_directories(
+  sparkd PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>/include
+  $<BUILD_INTERFACE:${emumba-deribit-connector-library_INCLUDE_DIRS}>)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(emumba-deribit-connector-library REQUIRED emumba-deribit-connector)
+
+# This dir contains rapidjsonConfig.cmake
+list(APPEND CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
+find_package(rapidjson REQUIRED)
+target_include_directories(
+  ${PROJECT_NAME} SYSTEM PUBLIC
+  $<BUILD_INTERFACE:${rapidjson_INCLUDE_DIR}> 
+)
+add_dependencies(${PROJECT_NAME} rapidjson_project)
+
+# deribit-demo log level
+if(NOT DEFINED DERIBIT_DEMO_LOG_LEVEL)
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=0)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "TRACE")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=0)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "DEBUG")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=1)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=DEBUG")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "INFO")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=2)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=INFO")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "WARN")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=3)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=WARN")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "ERROR")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=4)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=ERROR")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "CRITICAL")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=5)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=CRITICAL")
+elseif(DERIBIT_DEMO_LOG_LEVEL STREQUAL "OFF")
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=6)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=OFF")
+else()
+  add_definitions(-DSPDLOG_ACTIVE_LEVEL=0)
+  message("-- Building of DERIBIT_DEMO_LOG_LEVEL=TRACE")
+endif()
+
+# add_dependencies(${PROJECT_NAME} py_market_data)
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_SOURCE_DIR}/install/$<CONFIG>/lib/cmake/py-market-data")
+
+target_link_directories(
+  ${PROJECT_NAME} PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
+)
+
+# Set RPATH so sparkd knows where to find our shared libs (e.g., libspark, lib_py_market_data).
+# The dirs are relative to sparkd's path, represented by "$ORIGIN".
+set_target_properties(
+  ${PROJECT_NAME} PROPERTIES
+  BUILD_RPATH "$ORIGIN/../lib_spark;$ORIGIN/../lib_py_market_data"
+  INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
+)
+
+include(${CMAKE_SOURCE_DIR}/cmake/SymLink.cmake)
+
+sym_link_local_lib(py_market_data)
+sym_link_file(
+  TARGET_NAME link_py_market_data_module
+  SOURCE ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+  DEST ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+  INSTALL_DEST ${CMAKE_INSTALL_BINDIR}/
+)
+# add_custom_command(
+#   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+#   COMMAND ${CMAKE_COMMAND} -E create_symlink
+#     ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+#     ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+#   DEPENDS 
+#     ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+#   COMMENT "Creating symlink to py_market_data_module.so"
+# )
+# add_custom_target(create_symlinks ALL
+#   DEPENDS ${CMAKE_BINARY_DIR}/src/lib_py_market_data/py_market_data_module.cpython-310-x86_64-linux-gnu.so)
+# install(
+#   FILES
+#   ${CMAKE_CURRENT_BINARY_DIR}/py_market_data_module.cpython-310-x86_64-linux-gnu.so
+#   DESTINATION ${CMAKE_INSTALL_BINDIR}/
+# )
+
+target_link_libraries(
+  sparkd
+  py_market_data
+  py_market_data_module
+  spark
+  ${emumba-deribit-connector-library_LIBRARIES}
+  ssl
+  cryptopp
+  tbb
+  onixs-cmemdh-all-4.8.0
+  OnixS.IceImpactMulticastPriceFeedHandlerCpp
+  ACE
+  quickfix
+  benchmark
+  Common++
+  Packet++
+  Pcap++
+  lttng-ust
+  -lpcap
+  -static-libgcc
+  -static-libstdc++
+  -pthread)
+
+include(${CMAKE_SOURCE_DIR}/cmake/InstallBasicConfig.cmake)
+install_basic_config()
+install(
+  FILES
+    "${EXTERNALS_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
+    "${EXTERNALS_LIB}/libACE-5.7.5.so"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
@@ -0,0 +1,5 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/sparkdTargets.cmake")
+
+check_required_components(sparkd)
@@ -6,5 +6,5 @@ RUN apt-get update \

 USER "bts"
 COPY --chown=bts:bts "install/Release/bin" "bin"
-COPY --chown=bts:bts "src/server/sparkd/spark.current.conf" "sparkdata/conf/spark.conf"
+COPY --chown=bts:bts "src/server/sparkd/spark.current.conf" ".local/share/bts/sparkd/conf/spark.conf"
 WORKDIR "/home/bts/bin"
@@ -1,16 +1,16 @@
 #pragma once

-#include "lib/api/public/ServiceContext.h"
-#include "lib/api/services/AlgoDefinitionService.server.pb.h"
-#include "lib/api/services/OrderService.client.pb.h"
-#include "lib/api/services/OrderService.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/persistence/IStore.h"
-#include "lib/persistence/SqliteStore.h"
-#include "lib/utils/PBUtils.h"
-#include "lib/utils/TimeStamp.h"
-#include "lib/utils/bts_assert.h"
-#include "lib/utils/bts_no_copy.h"
+#include "spark/api/public/ServiceContext.h"
+#include "spark/api/services/AlgoDefinitionService.server.pb.h"
+#include "spark/api/services/OrderService.client.pb.h"
+#include "spark/api/services/OrderService.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/persistence/IStore.h"
+#include "spark/persistence/SqliteStore.h"
+#include "spark/utils/PBUtils.h"
+#include "spark/utils/TimeStamp.h"
+#include "spark/utils/bts_assert.h"
+#include "spark/utils/bts_no_copy.h"
 #include <memory>

 #include <boost/tokenizer.hpp>
@@ -1,21 +1,19 @@
 #include "AnalyticsServiceServer.h"
-#include "lib/api/apicore.pb.h"
-#include "lib/api/services/AnalyticsService.pb.h"
-#include "lib/api/services/AnalyticsService.server.pb.h"
-#include "lib/api/services/ShellLatencyService.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/persistence/IStore.h"
-#include "lib/persistence/SqliteStore.h"
-#include "lib/utils/PBUtils.h"
-#include "lib/utils/Puid.h"
-#include "lib/utils/TimeStamp.h"
-#include "lib/utils/bts_assert.h"
-#include "server/sparkd/algo/AlgoDefinitionServiceServer.h"
+#include "spark/api/apicore.pb.h"
+#include "spark/api/services/AnalyticsService.pb.h"
+#include "spark/api/services/AnalyticsService.server.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/persistence/IStore.h"
+#include "spark/persistence/SqliteStore.h"
+#include "spark/utils/PBUtils.h"
+#include "spark/utils/TimeStamp.h"
+#include "spark/utils/bts_assert.h"
+#include "sparkd/algo/AlgoDefinitionServiceServer.h"
+
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
 #include <chrono>
 #include <cstdint>
-#include <locale>
 #include <memory>
 #include <string>
 #include <tuple>
@@ -1,7 +1,7 @@
 #pragma once

-#include "lib/api/services/AnalyticsService.server.pb.h"
-#include "lib/utils/bts_no_copy.h"
+#include "spark/api/services/AnalyticsService.server.pb.h"
+#include "spark/utils/bts_no_copy.h"

 namespace bts {
 namespace api {
@@ -1,13 +1,13 @@
 #include "AdminReport.h"

-#include "lib/api/public/ServiceContext.h"
-#include "lib/config/config.h"
-#include "lib/config/protos/logging.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/quickbus/quickbus.h"
+#include "spark/api/public/ServiceContext.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/logging.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/quickbus/quickbus.h"

-#include "lib/api/service_helpers/AdminServiceUtils.h"
-#include "lib/api/services/AdminService.client.pb.h"
+#include "spark/api/service_helpers/AdminServiceUtils.h"
+#include "spark/api/services/AdminService.client.pb.h"

 #include <algorithm>
 #include <boost/algorithm/string.hpp>
@@ -1,12 +1,12 @@
 #include "AutoCert.h"
-#include "lib/utils/PBUtils.h"
+#include "spark/utils/PBUtils.h"

-#include "lib/jetfix/common/InMsgBuffer.h"
-#include "lib/utils/bts_chrono.h"
-#include "lib/utils/datetime.h"
+#include "spark/jetfix/common/InMsgBuffer.h"
+#include "spark/utils/bts_chrono.h"
+#include "spark/utils/datetime.h"

-#include "lib/jetfix/codec/i32_toa.h"
-#include "lib/utils/SecureLogon.h"
+#include "spark/jetfix/codec/i32_toa.h"
+#include "spark/utils/SecureLogon.h"
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/filesystem.hpp>
@@ -1,13 +1,13 @@
 #include "CMECert.h"
-#include "lib/logging/logging.h"
-#include "lib/orderman/ilink3/IL3Dispatcher.h"
-#include "lib/orderman/ilink3/IL3GW.h"
-#include "lib/orderman/ilink3/IL3Reactor.h"
-#include "lib/orderman/ilink3/ILink3Utils.h"
-#include "lib/os/os.h"
-#include "lib/utils/Dispatcher.h"
-#include "lib/utils/SecureLogon.h"
-#include "lib/utils/TimeStamp.h"
+#include "spark/logging/logging.h"
+#include "spark/orderman/ilink3/IL3Dispatcher.h"
+#include "spark/orderman/ilink3/IL3GW.h"
+#include "spark/orderman/ilink3/IL3Reactor.h"
+#include "spark/orderman/ilink3/ILink3Utils.h"
+#include "spark/os/os.h"
+#include "spark/utils/Dispatcher.h"
+#include "spark/utils/SecureLogon.h"
+#include "spark/utils/TimeStamp.h"
 #include <chrono>
 #include <fstream>
 #include <future>
@@ -1,6 +1,6 @@
 #include "ConfigCmd.h"
-#include "lib/config/ConfigQuerier.h"
-#include "lib/config/config.h"
+#include "spark/config/ConfigQuerier.h"
+#include "spark/config/config.h"

 namespace bts::cmds {

@@ -1,5 +1,5 @@
-#include "server/sparkd/cmds/FIXSim.h"
-#include "server/sparkd/exchange_sim/ExchangeSim.h"
+#include "sparkd/cmds/FIXSim.h"
+#include "sparkd/exchange_sim/ExchangeSim.h"

 namespace bts::cmds {

@@ -1,18 +1,18 @@
 #include "KeyCmd.h"

-#include "lib/config/config.h"
-#include "lib/config/protos/keycode.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/os/os.h"
-#include "lib/utils/AuthToken.h"
-#include "lib/utils/FileUtils.h"
-#include "lib/utils/bts_assert.h"
-#include "lib/utils/crypto/CryptoInit.h"
-#include "lib/utils/crypto/KeyCodeHelper.h"
-#include "lib/utils/crypto/PrivateKey.h"
-#include "lib/utils/crypto/PublicKey.h"
-#include "lib/utils/datetime.h"
-#include "lib/utils/helper_macros.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/keycode.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/os/os.h"
+#include "spark/utils/AuthToken.h"
+#include "spark/utils/FileUtils.h"
+#include "spark/utils/bts_assert.h"
+#include "spark/utils/crypto/CryptoInit.h"
+#include "spark/utils/crypto/KeyCodeHelper.h"
+#include "spark/utils/crypto/PrivateKey.h"
+#include "spark/utils/crypto/PublicKey.h"
+#include "spark/utils/datetime.h"
+#include "spark/utils/helper_macros.h"

 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/gregorian/gregorian.hpp>
@@ -1,10 +1,10 @@
 #include "ParseHistoricalFIX.h"
-#include "lib/jetfix/codec/FIXMsg.h"
-#include "lib/jetfix/codec/FIXParser.h"
-#include "lib/jetfix/codec/Fields.h"
-#include "lib/jetfix/codec/Group.h"
-#include "lib/jetfix/codec/MessageTypes.h"
-#include "lib/utils/bts_chrono.h"
+#include "spark/jetfix/codec/FIXMsg.h"
+#include "spark/jetfix/codec/FIXParser.h"
+#include "spark/jetfix/codec/Fields.h"
+#include "spark/jetfix/codec/Group.h"
+#include "spark/jetfix/codec/MessageTypes.h"
+#include "spark/utils/bts_chrono.h"

 #include <fstream>
 #include <unordered_map>
@@ -1,7 +1,7 @@
-#include "server/sparkd/cmds/PrintHedgeOrders.h"
-#include "lib/api/services/OrderService.pb.h"
-#include "lib/persistence/SqliteStore.h"
-#include "lib/utils/PBUtils.h"
+#include "PrintHedgeOrders.h"
+#include "spark/api/services/OrderService.pb.h"
+#include "spark/persistence/SqliteStore.h"
+#include "spark/utils/PBUtils.h"

 namespace bts::cmds {

@@ -1,5 +1,5 @@
 #include "QuickTest.h"
-#include "lib/logging/logging.h"
+#include "spark/logging/logging.h"

 #include <thread>

@@ -1,49 +1,42 @@
 #include "Run.h"
-#include "lib/api/public/ServiceContext.h"
-#include "lib/config/config.h"
-#include "lib/config/protos/ports.pb.h"
-#include "lib/config/protos/quickbus_cfg.pb.h"
-#include "lib/config/protos/toggles.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/md/MBOProcessor.h"
-#include "lib/md/MBOServiceServer.h"
-#include "lib/md/MDClient.h"
-#include "lib/md/SyntheticSecurityService.h"
-#include "lib/md/relay/QueryServer.h"
-#include "lib/md/service/MarketDataServiceServer.h"
-#include "lib/metrics/metrics.h"
-#include "lib/metrics/system_metrics.h"
-#include "lib/orderman/OrderServiceServer.h"
-#include "lib/orderman/gateways/sim/SimExecutionGatewayFactory.h"
-#include "lib/orderman/order_factory/DynamicOrderRegistry.h"
-#include "lib/orderman/orders/algo/algo_orders/ProRataAlgo.h"
-#include "lib/orderman/orders/algo/algo_orders/ScratchAlgo.h"
-#include "lib/os/os.h"
-#include "lib/persistence/PersistenceServiceServer.h"
-#include "lib/plugin/SparkServices.h"
-#include "lib/plugin/plugin.h"
-#include "lib/quickbus/quickbus.h"
-#include "lib/tracing/PerfLog.h"
-#include "lib/utils/Dispatcher.h"
-#include "lib/utils/thread_manager.h"
+#include "spark/api/public/ServiceContext.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/ports.pb.h"
+#include "spark/config/protos/quickbus_cfg.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/md/MBOProcessor.h"
+#include "spark/md/MBOServiceServer.h"
+#include "spark/md/MDClient.h"
+#include "spark/md/SyntheticSecurityService.h"
+#include "spark/md/relay/QueryServer.h"
+#include "spark/md/service/MarketDataServiceServer.h"
+#include "spark/metrics/metrics.h"
+#include "spark/metrics/system_metrics.h"
+#include "spark/orderman/OrderServiceServer.h"
+#include "spark/orderman/events/TradeSummarySignalDispatcher.h"
+#include "spark/orderman/order_factory/DynamicOrderRegistry.h"
+#include "spark/persistence/PersistenceServiceServer.h"
+#include "spark/plugin/SparkServices.h"
+#include "spark/plugin/plugin.h"
+#include "spark/quickbus/core/Quickbus.h"
+#include "spark/tracing/PerfLog.h"
+#include "spark/utils/Dispatcher.h"
 #include "md/cmds/Run.h"
-#include "server/sparkd/algo/AlgoDefinitionServiceServer.h"
-#include "server/sparkd/analytics/AnalyticsServiceServer.h"
-#include "server/sparkd/http/WebServer.h"
-#include "server/sparkd/md/MarketDataAuxiliaryServiceServer.h"
-#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h"
-#include "server/sparkd/md/recording/MDRecorder.h"
-#include "server/sparkd/position/MarginServiceServer.h"
-#include "server/sparkd/position/PositionServiceServer.h"
-#include "server/sparkd/position/import/BasePositionServiceServer.h"
-#include "server/sparkd/position/import/MoneyFileServiceServer.h"
-#include "server/sparkd/subprocess/SubProcessRunner.h"
-#include "server/sparkd/support/ErrorReportService.h"
-#include "server/sparkd/support/ShellLatencyServer.h"
-#include "server/sparkd/user/AdminServiceServer.h"
-#include "server/sparkd/user/AuthServiceServer.h"
+#include "sparkd/algo/AlgoDefinitionServiceServer.h"
+#include "sparkd/analytics/AnalyticsServiceServer.h"
+#include "sparkd/http/WebServer.h"
+#include "sparkd/md/MarketDataAuxiliaryServiceServer.h"
+#include "sparkd/md/recording/MDRecorder.h"
+#include "sparkd/position/MarginServiceServer.h"
+#include "sparkd/position/PositionServiceServer.h"
+#include "sparkd/position/import/BasePositionServiceServer.h"
+#include "sparkd/position/import/MoneyFileServiceServer.h"
+#include "sparkd/subprocess/SubProcessRunner.h"
+#include "sparkd/support/ErrorReportService.h"
+#include "sparkd/support/ShellLatencyServer.h"
+#include "sparkd/user/AdminServiceServer.h"
+#include "sparkd/user/AuthServiceServer.h"

-#include <thread>

 namespace bts::cmds {

@@ -1,17 +1,17 @@
 #include "Span.h"

-#include "server/sparkd/position/MarginServiceCore.h"
-#include "server/sparkd/position/Position.h"
-#include "server/sparkd/position/PositionAggregator.h"
+#include "sparkd/position/MarginServiceCore.h"
+#include "sparkd/position/Position.h"
+#include "sparkd/position/PositionAggregator.h"

-#include "lib/orderman/orderman_utils/orderman_common.h"
+#include "spark/orderman/orderman_utils/orderman_common.h"

-#include "lib/api/public/ServiceContext.h"
-#include "lib/api/services/AuthService.client.pb.h"
-#include "lib/config/config.h"
-#include "lib/domain_model/Security.pb.h"
-#include "lib/utils/Dispatcher.h"
-#include "lib/utils/helper_macros.h"
+#include "spark/api/public/ServiceContext.h"
+#include "spark/api/services/AuthService.client.pb.h"
+#include "spark/config/config.h"
+#include "spark/domain_model/Security.pb.h"
+#include "spark/utils/Dispatcher.h"
+#include "spark/utils/helper_macros.h"

 #include <condition_variable>
 #include <future>
@@ -1,28 +1,27 @@
 #include "Web.h"
-#include "lib/api/public/ServiceContext.h"
-#include "lib/api/services/MarketDataService.pb.h"
-#include "lib/api/services/SyntheticSecurityService.pb.h"
-#include "lib/config/config.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/config/protos/ports.pb.h"
-#include "lib/config/protos/quickbus_cfg.pb.h"
-#include "lib/md/MBOProcessor.h"
-#include "lib/md/MDClient.h"
-#include "lib/md/SyntheticSecurityService.h"
-#include "lib/md/relay/QueryServer.h"
-#include "lib/metrics/metrics.h"
-#include "lib/metrics/system_metrics.h"
-#include "lib/quickbus/quickbus.h"
-#include "lib/tracing/PerfLog.h"
-#include "lib/utils/Dispatcher.h"
-#include "lib/utils/thread_manager.h"
+#include "spark/api/public/ServiceContext.h"
+#include "spark/api/services/MarketDataService.pb.h"
+#include "spark/api/services/SyntheticSecurityService.pb.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/config/protos/ports.pb.h"
+#include "spark/config/protos/quickbus_cfg.pb.h"
+#include "spark/md/MBOProcessor.h"
+#include "spark/md/MDClient.h"
+#include "spark/md/SyntheticSecurityService.h"
+#include "spark/md/relay/QueryServer.h"
+#include "spark/metrics/metrics.h"
+#include "spark/metrics/system_metrics.h"
+#include "spark/quickbus/quickbus.h"
+#include "spark/tracing/PerfLog.h"
+#include "spark/utils/Dispatcher.h"
+#include "spark/utils/thread_manager.h"
 #include "md/cmds/Cleanup.h"
 #include "md/cmds/Run.h"
-#include "server/sparkd/exchange_sim/ExchangeSim.h"
-#include "server/sparkd/http/WebServer.h"
-#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h"
-#include "server/sparkd/user/AdminServiceServer.h"
-#include "server/sparkd/user/AuthServiceServer.h"
+#include "sparkd/exchange_sim/ExchangeSim.h"
+#include "sparkd/http/WebServer.h"
+#include "sparkd/user/AdminServiceServer.h"
+#include "sparkd/user/AuthServiceServer.h"
 #include <optional>
 #include <string>
 #include <vector>
@@ -1,5 +1,5 @@
 #include "Validators.h"
-#include "lib/utils/FileUtils.h"
+#include "spark/utils/FileUtils.h"
 #include <fmt/format.h>

 namespace bts::cmds {
@@ -1,13 +1,12 @@
 #include "DeribitDemo.h"
-#include "DeribitDemoConfiguration.h"
-#include "lib/logging/logging.h"
-#include "server/sparkd/cmds/crypto/DeribitDemoListener.h"
+#include "spark/logging/logging.h"
+#include "sparkd/cmds/crypto/DeribitDemoListener.h"
+
 #include <csignal>
 #include <emumba-deribit-connector/deribit_exception.h>
 #include <emumba-deribit-connector/deribit_handler.h>
 #include <emumba-deribit-connector/deribit_listener.h>
 #include <emumba-deribit-connector/trading_session_interface.h>
-#include <list>

 namespace bts::cmds {

@@ -1,7 +1,7 @@
 #include "DeribitDemoCmd.h"
 #include "DeribitDemo.h"
-#include "lib/config/config.h"
-#include "lib/os/os.h"
+#include "spark/config/config.h"
+#include "spark/os/os.h"
 #include <CLI11/CLI11.hpp>
 #include <functional>
 #include <optional>
@@ -1,6 +1,6 @@
 #include "DeribitDemoConfiguration.h"
 #include "RapidJsonReader.h"
-#include "lib/logging/logging.h"
+#include "spark/logging/logging.h"
 #include "rapidjson/istreamwrapper.h"
 #include <emumba-deribit-connector/deribit_utils.h>
 #include <fstream>
@@ -1,6 +1,6 @@
 #pragma once

-#include "lib/core/FMT_IMPL.h"
+#include "spark/core/FMT_IMPL.h"

 #include <emumba-deribit-connector/deribit_utils.h>
 #include <iostream>
@@ -1,12 +1,12 @@
 // #include "DeribitDemoListener.h"
-// #include "lib/utils/UNUSED_PARAM.h"
-// #include "lib/utils/overloaded.h"
+// #include "spark/utils/UNUSED_PARAM.h"
+// #include "spark/utils/overloaded.h"
 // #include "rapidjson/istreamwrapper.h"
 // #include "rapidjson/ostreamwrapper.h"
 // #include "rapidjson/stringbuffer.h"
 // #include "rapidjson/writer.h"
-// #include "server/sparkd/cmds/crypto/DeribitDemoConfiguration.h"
-// #include "server/sparkd/cmds/spartan/utils/FileUtils.h"
+// #include "sparkd/cmds/crypto/DeribitDemoConfiguration.h"
+// #include "sparkd/cmds/spartan/utils/FileUtils.h"
 // #include <cassert>
 // #include <emumba-deribit-connector/deribit_exception.h>
 // #include <emumba-deribit-connector/deribit_utils.h>
@@ -1,9 +1,9 @@
 #include "LiveLadderDemo.h"
-#include "lib/api/md/MarketDataConfig.pb.h"
-#include "server/sparkd/md/MarketDataGateway.h"
-#include "server/sparkd/md/MarketDataRegistration.h"
-#include "server/sparkd/md/listeners/LiveLadderPrinter.h"
-#include <vector>
+#include "spark/api/md/MarketDataConfig.pb.h"
+#include "sparkd/md/MarketDataGateway.h"
+#include "sparkd/md/listeners/LiveLadderPrinter.h"
+
+#include <thread>

 namespace bts::cmds {

@@ -1,11 +1,11 @@
 #ifdef SPARK_ENABLE_CCAPI
 #include "LiveLadderDemoCmd.h"
 #include "LiveLadderDemo.h"
-#include "lib/api/md/MarketDataConfig.pb.h"
-#include "lib/io/ProtoReader.h"
-#include "lib/logging/logging.h"
-#include "server/sparkd/cmds/common/Validators.h"
-#include "server/sparkd/cmds/crypto/LiveLadderDemo.h"
+#include "spark/api/md/MarketDataConfig.pb.h"
+#include "spark/io/ProtoReader.h"
+#include "spark/logging/logging.h"
+#include "sparkd/cmds/common/Validators.h"
+#include "sparkd/cmds/crypto/LiveLadderDemo.h"
 #include <CLI11/CLI11.hpp>
 #include <optional>

@@ -1,5 +1,5 @@
 #pragma once
-#include "lib/utils/bts_assert.h"
+#include "spark/utils/bts_assert.h"
 #include <rapidjson/document.h>
 #include <string>

@@ -1,5 +1,5 @@
 #include "Channels.h"
-#include "lib/md/cme/MDP3Utils.h"
+#include "spark/md/cme/MDP3Utils.h"

 namespace bts::cmds::md::cmds {

@@ -1,9 +1,9 @@
 #include "Cleanup.h"
-#include "lib/config/config.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/logging/logging.h"
-#include "lib/md/ShmSegmentName.h"
-#include "lib/md/protos/co2.pb.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/logging/logging.h"
+#include "spark/md/ShmSegmentName.h"
+#include "spark/md/protos/co2.pb.h"
 #include <boost/filesystem.hpp>
 #include <string>

@@ -1,12 +1,12 @@
 #include "Dump.h"
 #include "../common/SecurityTypeOption.h"
 #include "../common/VenueOption.h"
-#include "lib/config/config.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/domain_model/Security.pb.h"
-#include "lib/md/Diag/ShmDumper.h"
-#include "lib/md/ShmSegmentName.h"
-#include "lib/md/protos/co2.pb.h"
+#include "spark/config/config.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/domain_model/Security.pb.h"
+#include "spark/md/Diag/ShmDumper.h"
+#include "spark/md/ShmSegmentName.h"
+#include "spark/md/protos/co2.pb.h"
 #include <boost/algorithm/string.hpp>
 #include <iostream>
 #include <map>
@@ -1,10 +1,10 @@
 #include "DumpSecurity.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/domain_model/Security.pb.h"
-#include "lib/md/Diag/ShmDumper.h"
-#include "lib/md/SecurityDB.h"
-#include "lib/md/SymbolLoader.h"
-#include "lib/md/UserSymbol.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/domain_model/Security.pb.h"
+#include "spark/md/Diag/ShmDumper.h"
+#include "spark/md/SecurityDB.h"
+#include "spark/md/SymbolLoader.h"
+#include "spark/md/UserSymbol.h"
 #include <unordered_set>
 #include <vector>

@@ -1,5 +1,5 @@
 #include "Record.h"
-#include "lib/md/relay/RelayRecorder.h"
+#include "spark/md/relay/RelayRecorder.h"
 #include <boost/filesystem.hpp>

 namespace bts::cmds::md::cmds {
@@ -1,5 +1,5 @@
 #include "Relay.h"
-#include "lib/md/relay/RelayClient.h"
+#include "spark/md/relay/RelayClient.h"

 namespace bts::cmds::md::cmds {

@@ -1,5 +1,5 @@
 #include "Replay.h"
-#include "lib/md/relay/RelayRecorder.h"
+#include "spark/md/relay/RelayRecorder.h"

 namespace bts::cmds::md::cmds {

@@ -1,18 +1,18 @@
 #include "Run.h"
 #include "Cleanup.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/domain/SecurityCriteria.h"
-#include "lib/logging/logging.h"
-#include "lib/md/SymbolLoader.h"
-#include "lib/md/UserSymbol.h"
-#include "lib/md/relay/RelayRecorder.h"
-#include "lib/os/os.h"
-#include "lib/utils/bts_assert.h"
-#include "lib/utils/thread_manager.h"
-#include "server/sparkd/md/MarketDataGateway.h"
-#include "server/sparkd/md/platforms/IMDPlatform.h"
-#include "server/sparkd/md/platforms/ice_onixs/ICEMain.h"
-#include "server/sparkd/md/platforms/mdp3_onixs/MDP3Main.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/domain/SecurityCriteria.h"
+#include "spark/logging/logging.h"
+#include "spark/md/SymbolLoader.h"
+#include "spark/md/UserSymbol.h"
+#include "spark/md/relay/RelayRecorder.h"
+#include "spark/os/os.h"
+#include "spark/utils/bts_assert.h"
+#include "spark/utils/thread_manager.h"
+#include "sparkd/md/MarketDataGateway.h"
+#include "sparkd/md/platforms/IMDPlatform.h"
+#include "sparkd/md/platforms/ice_onixs/ICEMain.h"
+#include "sparkd/md/platforms/mdp3_onixs/MDP3Main.h"
 #include <string>

 namespace bts::cmds::md::cmds {
@@ -1,6 +1,5 @@
 #pragma once
-#include "lib/md/MBOProcessor.h"
-#include "server/sparkd/md/platforms/mdp3_onixs/TradeSummarySignalDispatcher.h"
+
 #include <CLI11/CLI11.hpp>

 namespace bts::cmds::md::cmds {
@@ -1,12 +1,12 @@
 #include "Tail.h"
-#include "lib/api/domain/SecurityType.pb.h"
-#include "lib/api/domain/Venue.pb.h"
-#include "lib/config/protos/market_data.pb.h"
-#include "lib/domain/SecurityCriteria.h"
-#include "lib/md/Diag/MDPeriodicDumper.h"
-#include "lib/md/Diag/ShmDumper.h"
-#include "lib/md/SymbolLoader.h"
-#include "lib/md/UserSymbol.h"
+#include "spark/api/domain/SecurityType.pb.h"
+#include "spark/api/domain/Venue.pb.h"
+#include "spark/config/protos/market_data.pb.h"
+#include "spark/domain/SecurityCriteria.h"
+#include "spark/md/Diag/MDPeriodicDumper.h"
+#include "spark/md/Diag/ShmDumper.h"
+#include "spark/md/SymbolLoader.h"
+#include "spark/md/UserSymbol.h"
 #include <map>

 namespace bts::cmds::md::cmds {
Author	SHA1	Message	Date
John Colvin	75ebee4de0	check pt: Combine lib_py_market_data and provider py scripts into one project	2024-08-12 14:03:33 +00:00
John Colvin	059358ec2c	fix build: Ensure py scripts use unix line endings I'm not sure why, but my sparkd build (linux) suddenly began failing to generate cpp headers for protos. The error message indicated it was due to an unexpected carriage return (\r) in plugin.py: /usr/bin/env: ‘python\r’: No such file or directory	2024-08-10 15:17:01 +00:00
John Colvin	87bbc3bab2	Clean up InitSharedLibrary.cmake	2024-08-10 03:21:06 +00:00
John Colvin	511bfe0aee	build: Remove explicit targets from sparkd build preset So it builds the default targets (all). They were only listed explicitly in the first place so we could build specific targets in vs code using the dropdown	2024-08-09 16:50:49 +00:00
John Colvin	3cf91232b2	Clean up MarketDataGateway python md plugins	2024-08-09 16:50:49 +00:00
John Colvin	de4caf33e8	build: Add py_market_data_providers cmake proj For md providers implemented in python. They're loaded as plugins in sparkd	2024-08-09 16:50:49 +00:00
John Colvin	70a5859395	build: Clean up libspark CMakeLists	2024-08-09 16:46:00 +00:00
John Colvin	97643ed2a5	fix Set up necessary paths, symlinks for sparkd	2024-08-09 15:59:47 +00:00
John Colvin	0fe9a67260	build: Set include and link dirs in InitSharedLibrary Reduces boilerplate code needed for basic cmake projects	2024-08-09 15:59:17 +00:00
John Colvin	f703b55079	build: Clean up py_market_data cmake proj	2024-08-09 15:57:07 +00:00
John Colvin	0b2ac8b3cd	build: Set up necessary paths, symlinks for sparkd in sparkd cmake proj Rather than performing this step in the root CMakeLists, as we previously did in the "server_layout" target. This effectively replaces the "server_layout" target.	2024-08-09 15:55:51 +00:00
John Colvin	376772c2c9	build: Clean up data_files cmake proj (support --target clean)	2024-08-09 15:50:15 +00:00
John Colvin	7b7ab13f89	fix Rename py-market-data	2024-08-08 18:06:20 +00:00
John Colvin	af5a39e914	fix add install targets for lib spark	2024-08-08 13:17:38 +00:00
John Colvin	7bebfc1f8c	refactor: Rename py-market-data -> py_market_data Because '-' is an illegal character in py module names	2024-08-08 13:17:12 +00:00
John Colvin	e70b1f5e4a	fix build: Generate proto hdrs in "include" dir (child of proj's bin dir) Reorganizing the sparkd proj with stuttering dirs broke the build because the generated protos were being dumped into a dir with the same name as the "sparkd" executable.	2024-08-07 17:47:08 +00:00
John Colvin	86780f2e8c	fix build: Update sparkd & risk webapp after moving libspark	2024-08-07 15:30:51 +00:00
John Colvin	9cb0365ac1	refactor: Parse input args in Protobuf_Generate_cpp So we can be more precise when generating protobufs. For example, now we can specify different include dirs when generating code for different group of proto messages - an obvious improvement over the previous system, which relied on a hardcoded superset of include dirs that would support every proto message in our code base.	2024-08-07 14:58:45 +00:00
John Colvin	c372c0d70e	refactor: Orgnaize libspark proj w/ stuttering include	2024-08-07 14:17:37 +00:00
John Colvin	bba81b4d73	build: Add install targets for libspark	2024-08-07 04:07:32 +00:00
John Colvin	02249396fb	check pt: py_interop, cmake install targets	2024-08-06 18:11:41 +00:00
John Colvin	fbca7eb9e4	webapp check pt?	2024-08-06 18:10:07 +00:00
John Colvin	1843d8343a	check pt: Python cpp md interop	2024-08-05 04:43:23 +00:00
John Colvin	7033a065d3	vscode: Add debug cfg to skip sparkd build	2024-08-05 04:42:19 +00:00
John Colvin	1d3d9161ee	fix build: Add ShmSegmentName.cpp to windows client sources	2024-08-04 11:02:08 -05:00
John Colvin	eeb48df4fc	Make a few timestamp fns const They should have been const in the first place	2024-08-02 13:15:07 +00:00
John Colvin	9d38adc990	Add config profiles to libspark (check pt) This is part of a larger effort to unify the libspark build, and eliminate compile time differences between the builds used by our various services	2024-08-01 15:02:03 +00:00
John Colvin	47f1a34abd	fix resolve app data dir	2024-08-01 14:04:44 +00:00
John Colvin	9798edec08	Add api server to docker compose	2024-08-01 14:03:21 +00:00
John Colvin	1a1a867d7f	Rename pingtest "sparkd-ping-test", make it depend on sparkd Add it to a "ping-test" profile, as we may add similar tests for other services	2024-08-01 13:38:32 +00:00
John Colvin	2494642115	cleanup: Remove unnecessary env vars from webapp docker compose	2024-08-01 13:37:04 +00:00
John Colvin	27b8d36e1c	Change api server ports so they don't conflict w/ ds webapp	2024-08-01 13:35:00 +00:00
John Colvin	0dd141047e	fix resolve app data dir	2024-08-01 13:33:43 +00:00
John Colvin	fa9f5d9952	vscode: Fix sparkd debug config	2024-08-01 13:27:29 +00:00
John Colvin	949634542c	build: Resolve app data dir and shared mem prefix at runtime We really can't define them at compile time anymore as we build multiple exes that depend on libspark in the same dir (e.g., spark api server, pubsub, ds-publisher, webapp, etc.). That means one libspark.so (or dll) must serve all exes. We should compile a consistent libspark to mitigate the risk of running an exe with the wrong version (of libspark). For example, running pubsub with a libspark configured for spark api server, leftover from an earlier build.	2024-08-01 04:11:54 +00:00