feat: Create dedicated client for HTTP requests

使用单独的client发送http请求, 避免请求结果混淆 Log:
kamiyadm · Jun 14, 2024 · bf8489c · bf8489c
1 parent 76c9989
commit bf8489c
Show file tree

Hide file tree

Showing 8 changed files with 205 additions and 177 deletions.
diff --git a/apps/ll-builder/src/main.cpp b/apps/ll-builder/src/main.cpp
@@ -8,6 +8,7 @@
 #include "linglong/builder/config.h"
 #include "linglong/builder/linglong_builder.h"
 #include "linglong/package/architecture.h"
+#include "linglong/repo/client_factory.h"
 #include "linglong/repo/config.h"
 #include "linglong/utils/command/env.h"
 #include "linglong/utils/configure.h"
@@ -400,15 +401,10 @@ int main(int argc, char **argv)
         qCritical() << repoCfg.error();
         return -1;
     }
-
-    QNetworkAccessManager networkAccessManager;
-
-    linglong::api::client::ClientApi api;
-    api.setTimeOut(10 * 60 * 1000);
-    api.setNetworkAccessManager(&networkAccessManager);
-    api.setNewServerForAllOperations(QString::fromStdString(repoCfg->repos[repoCfg->defaultRepo]));
-
-    linglong::repo::OSTreeRepo repo(QString::fromStdString(builderCfg->repo), *repoCfg, api);
+    linglong::repo::ClientFactory clientFactory(repoCfg->repos[repoCfg->defaultRepo]);
+    linglong::repo::OSTreeRepo repo(QString::fromStdString(builderCfg->repo),
+                                    *repoCfg,
+                                    clientFactory);
 
     auto containerBuidler = new linglong::runtime::ContainerBuilder(**ociRuntime);
     containerBuidler->setParent(QCoreApplication::instance());

diff --git a/apps/ll-cli/src/main.cpp b/apps/ll-cli/src/main.cpp
@@ -185,15 +185,15 @@ int main(int argc, char **argv)
               printer = std::make_unique<Printer>();
           }
 
-          linglong::api::client::ClientApi api;
           auto config = linglong::repo::loadConfig(
             { LINGLONG_ROOT "/config.yaml", LINGLONG_DATA_DIR "/config.yaml" });
           if (!config) {
               qCritical() << config.error();
               QCoreApplication::exit(-1);
               return;
           }
-          auto *repo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, api);
+          linglong::repo::ClientFactory clientFactory(config->repos[config->defaultRepo]);
+          auto *repo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, clientFactory);
           repo->setParent(QCoreApplication::instance());
 
           auto ociRuntimeCLI = qgetenv("LINGLONG_OCI_RUNTIME");

diff --git a/apps/ll-package-manager/src/main.cpp b/apps/ll-package-manager/src/main.cpp
@@ -28,13 +28,8 @@ void withDBusDaemon()
         return;
     }
 
-    auto api = new linglong::api::client::ClientApi;
-    api->setTimeOut(5000);
-    api->setNewServerForAllOperations(
-      QString::fromStdString(config->repos.at(config->defaultRepo)));
-    api->setParent(QCoreApplication::instance());
-
-    auto ostreeRepo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, *api);
+    linglong::repo::ClientFactory clientFactory(config->repos[config->defaultRepo]);
+    auto ostreeRepo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, clientFactory);
     ostreeRepo->setParent(QCoreApplication::instance());
 
     auto packageManager =
@@ -82,12 +77,8 @@ void withoutDBusDaemon()
         return;
     }
 
-    auto api = new linglong::api::client::ClientApi;
-    api->setParent(QCoreApplication::instance());
-    api->setNewServerForAllOperations(
-      QString::fromStdString(config->repos.at(config->defaultRepo)));
-
-    auto ostreeRepo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, *api);
+    linglong::repo::ClientFactory clientFactory(config->repos[config->defaultRepo]);
+    auto ostreeRepo = new linglong::repo::OSTreeRepo(QDir(LINGLONG_ROOT), *config, clientFactory);
     ostreeRepo->setParent(QCoreApplication::instance());
 
     auto packageManager =

diff --git a/libs/linglong/CMakeLists.txt b/libs/linglong/CMakeLists.txt
@@ -83,6 +83,8 @@ pfl_add_library(
   src/linglong/package/version_range.h
   src/linglong/repo/config.cpp
   src/linglong/repo/config.h
+  src/linglong/repo/client_factory.h
+  src/linglong/repo/client_factory.cpp
   src/linglong/repo/ostree_repo.cpp
   src/linglong/repo/ostree_repo.h
   src/linglong/runtime/container_builder.cpp

diff --git a/libs/linglong/src/linglong/repo/client_factory.cpp b/libs/linglong/src/linglong/repo/client_factory.cpp
@@ -0,0 +1,35 @@
+/*
+ * SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#include "client_factory.h"
+
+namespace linglong::repo {
+
+ClientFactory::ClientFactory(const QString &server)
+    : m_server(server)
+{
+}
+
+ClientFactory::ClientFactory(const std::string &server)
+    : m_server(QString::fromStdString(server))
+{
+}
+
+QSharedPointer<api::client::ClientApi> ClientFactory::createClient() const
+{
+    auto api = QSharedPointer<linglong::api::client::ClientApi>::create();
+    api->setTimeOut(5000);
+    api->setNewServerForAllOperations(m_server);
+    api->setParent(QCoreApplication::instance());
+    return api;
+}
+
+void ClientFactory::setServer(QString server)
+{
+    m_server = server;
+}
+
+} // namespace linglong::repo
diff --git a/libs/linglong/src/linglong/repo/client_factory.h b/libs/linglong/src/linglong/repo/client_factory.h
@@ -0,0 +1,32 @@
+/*
+ * SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+ *
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ */
+
+#ifndef LINGLONG_SRC_MODULE_REPO_CLIENT_FACTORY_H_
+#define LINGLONG_SRC_MODULE_REPO_CLIENT_FACTORY_H_
+#include "ClientApi.h"
+
+#include <QObject>
+#include <QPoint>
+
+namespace linglong::repo {
+
+class ClientFactory : public QObject
+{
+    Q_OBJECT
+public:
+    ClientFactory(const QString &server);
+    ClientFactory(const std::string &server);
+
+    QSharedPointer<api::client::ClientApi> createClient() const;
+
+    void setServer(QString server);
+
+private:
+    QString m_server;
+};
+} // namespace linglong::repo
+
+#endif // LINGLONG_SRC_MODULE_REPO_CLIENT_FACTORY_H_