chore: consolidate download service

Author: namchuai

engine/CMakeLists.txt

@@ -78,6 +78,7 @@ find_package(LibArchive REQUIRED)
 find_package(tabulate CONFIG REQUIRED)
 find_package(CURL REQUIRED)
 find_package(SQLiteCpp REQUIRED)
+find_package(eventpp CONFIG REQUIRED)
 
 add_executable(${TARGET_NAME} main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/utils/cpuid/cpu_info.cc
@@ -94,6 +95,7 @@ target_link_libraries(${TARGET_NAME} PRIVATE CURL::libcurl)
 target_link_libraries(${TARGET_NAME} PRIVATE JsonCpp::JsonCpp Drogon::Drogon OpenSSL::SSL OpenSSL::Crypto yaml-cpp::yaml-cpp
   ${CMAKE_THREAD_LIBS_INIT})
 target_link_libraries(${TARGET_NAME} PRIVATE SQLiteCpp)
+target_link_libraries(${TARGET_NAME} PRIVATE eventpp::eventpp)
 
 # ##############################################################################
 

engine/commands/cortex_upd_cmd.cc

@@ -385,7 +385,7 @@ bool CortexUpdCmd::HandleGithubRelease(const nlohmann::json& assets,
                                           .localPath = local_path,
                                       }}}};
 
-      DownloadService().AddDownloadTask(
+      auto result = DownloadService().AddDownloadTask(
           download_task, [](const DownloadTask& finishedTask) {
             // try to unzip the downloaded file
             CTL_INF("Downloaded engine path: "
@@ -400,6 +400,9 @@ bool CortexUpdCmd::HandleGithubRelease(const nlohmann::json& assets,
 
             CTL_INF("Finished!");
           });
+      if (result.has_error()) {
+        CTL_ERR("Failed to download: " << result.error());
+      }
       break;
     }
   }
@@ -447,7 +450,7 @@ bool CortexUpdCmd::GetNightly(const std::string& v) {
                        .localPath = localPath,
                    }}};
 
-  DownloadService().AddDownloadTask(
+  auto result = DownloadService().AddDownloadTask(
       download_task, [](const DownloadTask& finishedTask) {
         // try to unzip the downloaded file
         CTL_INF("Downloaded engine path: "
@@ -461,6 +464,10 @@ bool CortexUpdCmd::GetNightly(const std::string& v) {
 
         CTL_INF("Finished!");
       });
+  if (result.has_error()) {
+    CTL_ERR("Failed to download: " << result.error());
+    return false;
+  }
 
   // Replace binary file
   auto executable_path = file_manager_utils::GetExecutableFolderContainerPath();

engine/commands/engine_get_cmd.h

@@ -5,7 +5,8 @@
 namespace commands {
 class EngineGetCmd {
  public:
-  explicit EngineGetCmd() : engine_service_{EngineService()} {};
+  explicit EngineGetCmd()
+      : engine_service_{EngineService(std::make_shared<DownloadService>())} {};
 
   void Exec(const std::string& engineName) const;
 

engine/commands/engine_install_cmd.h

@@ -7,7 +7,8 @@ namespace commands {
 
 class EngineInstallCmd {
  public:
-  explicit EngineInstallCmd() : engine_service_{EngineService()} {};
+  explicit EngineInstallCmd()
+      : engine_service_{EngineService(std::make_shared<DownloadService>())} {};
 
   void Exec(const std::string& engine, const std::string& version = "latest",
             const std::string& src = "");

engine/commands/engine_list_cmd.cc

@@ -1,12 +1,10 @@
 #include "engine_list_cmd.h"
 #include <tabulate/table.hpp>
-#include "services/engine_service.h"
 
 namespace commands {
 
 bool EngineListCmd::Exec() {
-  auto engine_service = EngineService();
-  auto status_list = engine_service.GetEngineInfoList();
+  auto status_list = engine_service_.GetEngineInfoList();
 
   tabulate::Table table;
   table.add_row(

engine/commands/engine_list_cmd.h

@@ -1,9 +1,17 @@
 #pragma once
 
+#include "services/engine_service.h"
+
 namespace commands {
 class EngineListCmd {
  public:
+  explicit EngineListCmd()
+      : engine_service_{EngineService(std::make_shared<DownloadService>())} {};
+
   bool Exec();
+
+ private:
+  EngineService engine_service_;
 };
 
 }  // namespace commands

engine/commands/engine_uninstall_cmd.h

@@ -1,12 +1,14 @@
 #pragma once
 
+#include <memory>
 #include <string>
 #include "services/engine_service.h"
 
 namespace commands {
 class EngineUninstallCmd {
  public:
-  explicit EngineUninstallCmd() : engine_service_{EngineService()} {};
+  explicit EngineUninstallCmd()
+      : engine_service_{EngineService(std::make_shared<DownloadService>())} {};
 
   void Exec(const std::string& engine);
 

engine/commands/model_del_cmd.h

@@ -7,7 +7,8 @@ namespace commands {
 
 class ModelDelCmd {
  public:
-  explicit ModelDelCmd() : model_service_{ModelService()} {};
+  explicit ModelDelCmd()
+      : model_service_{ModelService(std::make_shared<DownloadService>())} {};
 
   void Exec(const std::string& model_handle);
 

engine/commands/model_pull_cmd.h

@@ -6,7 +6,8 @@ namespace commands {
 
 class ModelPullCmd {
  public:
-  explicit ModelPullCmd() : model_service_{ModelService()} {};
+  explicit ModelPullCmd()
+      : model_service_{ModelService(std::make_shared<DownloadService>())} {};
   void Exec(const std::string& input);
 
  private:

engine/commands/run_cmd.h

@@ -1,6 +1,6 @@
 #pragma once
+
 #include <string>
-#include "nlohmann/json.hpp"
 #include "services/engine_service.h"
 #include "services/model_service.h"
 
@@ -11,7 +11,8 @@ class RunCmd {
       : host_{std::move(host)},
         port_{port},
         model_handle_{std::move(model_handle)},
-        model_service_{ModelService()} {};
+        engine_service_{EngineService(std::make_shared<DownloadService>())},
+        model_service_{ModelService(std::make_shared<DownloadService>())} {};
 
   void Exec(bool chat_flag);