Remove CLI code; further refactoring of commands and models (#20)

.devcontainer/install-vcpkg.sh

@@ -89,7 +89,8 @@ install_debian_packages() {
         pkg-config
         bash-completion
         ninja-build
-        git)
+        git
+        libtool)
 
     if ! dpkg -s "${package_list[@]}" >/dev/null 2>&1; then
         apt_get_update_if_needed

.github/workflows/ci.yml

@@ -13,15 +13,12 @@ on:
       - "**.h"
       - "**/CMakeLists.txt"
       - "**.cmake"
+      - "**.json"
       - ".github/workflows/ci.yml"
 
 jobs:
   core:
-    strategy:
-      matrix:
-        os: [ubuntu-20.04, ubuntu-22.04]
-
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout

CMakeLists.txt

@@ -10,13 +10,49 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 endif()
 
 # set up library dependencies
-find_package(argh CONFIG REQUIRED)
-find_package(benchmark CONFIG REQUIRED)
-find_package(cpptoml CONFIG REQUIRED)
 find_package(libuv CONFIG REQUIRED)
 find_package(spdlog CONFIG REQUIRED)
 find_package(unofficial-sodium CONFIG REQUIRED)
 
+# these do not correctly support CMake
+find_path(SODIUM_INCLUDE_DIR sodium.h REQUIRED)
+
+# customize the builds of key networking components; WolfSSL is not 
+# well supported in vcpkg and we want to have more control here
+include(ExternalProject)
+execute_process(COMMAND nproc OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NPROC)
+ExternalProject_Add(wolfssl
+    GIT_REPOSITORY https://github.com/wolfSSL/wolfssl
+    GIT_TAG v5.6.6-stable
+    PREFIX ${CMAKE_BINARY_DIR}/wolfssl
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND autoreconf -i COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-all --enable-harden --enable-keylog-export --disable-ech
+    BUILD_COMMAND make -j ${NPROC}
+    INSTALL_COMMAND make install
+    UPDATE_COMMAND ""
+)
+ExternalProject_Add(nghttp3
+    GIT_REPOSITORY https://github.com/ngtcp2/nghttp3.git
+    GIT_TAG v1.2.0
+    PREFIX ${CMAKE_BINARY_DIR}/nghttp3
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND git submodule update --init COMMAND autoreconf -i COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-lib-only
+    BUILD_COMMAND make -j ${NPROC}
+    INSTALL_COMMAND make install
+    UPDATE_COMMAND ""
+)
+ExternalProject_Add(ngtcp2
+    GIT_REPOSITORY https://github.com/ngtcp2/ngtcp2.git
+    GIT_TAG v1.3.0
+    PREFIX ${CMAKE_BINARY_DIR}/ngtcp2
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND autoreconf -i COMMAND <SOURCE_DIR>/configure PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/wolfssl/lib/pkgconfig:${CMAKE_BINARY_DIR}/nghttp3/lib/pkgconfig --prefix=<INSTALL_DIR> --with-wolfssl --enable-asan --enable-lib-only
+    BUILD_COMMAND make -j ${NPROC}
+    INSTALL_COMMAND make install
+    UPDATE_COMMAND ""
+    DEPENDS nghttp3 wolfssl
+)
+
 add_library(
   iggy
 
@@ -25,21 +61,7 @@ add_library(
   sdk/serialization.cc
 )
 target_compile_features(iggy PRIVATE cxx_std_17)
-target_include_directories(iggy PRIVATE ${unofficial-sodium_DIR}/../../include)
-
-add_executable(
-  iggy_cmd
-
-  examples/cli/cli.cc
-  examples/cli/iggy_cmd.cc
-)
-target_include_directories(iggy_cmd PRIVATE ${argh_INCLUDE_DIR})
-target_link_libraries(
-  iggy_cmd
-
-  iggy
-  unofficial-sodium::sodium
-)
+target_include_directories(iggy PRIVATE ${SODIUM_INCLUDE_DIR} ${USOCKETS_INCLUDE_DIR})
 
 if (BUILD_TESTS)
   add_subdirectory(tests)

sdk/client.cc

@@ -18,7 +18,7 @@ void iggy::client::Client::ping() {
     ping_process.wait(reproc::milliseconds(5000));
 }
 
-iggy::model::Stats iggy::client::Client::getStats() {
+iggy::model::system::Stats iggy::client::Client::getStats() {
     // temporary! need to send GetStats command to server then use WireFormat to read the response
-    return iggy::model::Stats();
+    return iggy::model::system::Stats();
 }

sdk/client.h

@@ -113,7 +113,7 @@ class Client {
     /**
      * @brief Get the Iggy server's performance statistics.
      */
-    iggy::model::Stats getStats();
+    iggy::model::system::Stats getStats();
 };
 };  // namespace client
 };  // namespace iggy