fix: 恢复 CURL 的内部状态

Author: z2z63

src/skipper.cpp

@@ -16,8 +16,8 @@ using namespace std::string_literals;
 Skipper::Skipper(ConfigAwareQEasy *qeasy, QObject *parent)
     : QObject(parent), _qeasy(qeasy), _logger(spdlog::get("skipper")) {
     assert(qeasy != nullptr);
-        connect(_qeasy, &ConfigAwareQEasy::testFinished, this,
-                [this](bool testSuccess, std::string message) { emit testFinished(testSuccess, message); });
+    connect(_qeasy, &ConfigAwareQEasy::testFinished, this,
+            [this](bool testSuccess, const std::string &message) { emit testFinished(testSuccess, message); });
 }
 
 Skipper::~Skipper() = default;
@@ -45,7 +45,7 @@ void Skipper::getConnection() {
     _qeasy->perform();
 }
 
-void Skipper::handleGetConnectionThenKill(const QString& error, long code, const QByteArray &body) {
+void Skipper::handleGetConnectionThenKill(const QString &error, long code, const QByteArray &body) {
     const std::string url = _qeasy->config().connections();
     if (!error.isEmpty()) {
         SPDLOG_LOGGER_ERROR(_logger, "GET {} failed: {}", url, error.toStdString());
@@ -65,9 +65,10 @@ void Skipper::handleGetConnectionThenKill(const QString& error, long code, const
     }
     std::string connection_to_kill;
     for (auto obj : doc["connections"].toArray()) {
-        if (obj.isObject() && obj.toObject()["metadata"].toObject()["processPath"].toString()
-                                 .endsWith("Hearthstone.app/Contents/MacOS/Hearthstone") &&
-                                 obj.toObject()["metadata"].toObject()["host"] == "") {
+        if (obj.isObject() &&
+            obj.toObject()["metadata"].toObject()["processPath"].toString().endsWith(
+                "Hearthstone.app/Contents/MacOS/Hearthstone") &&
+            obj.toObject()["metadata"].toObject()["host"] == "") {
             connection_to_kill = obj.toObject()["id"].toString().toStdString();
             SPDLOG_LOGGER_INFO(_logger, "Connection to kill {}", connection_to_kill);
             break;
@@ -78,25 +79,26 @@ void Skipper::handleGetConnectionThenKill(const QString& error, long code, const
         _logger->flush();
         return;
     }
-    const static std::string url2 = _qeasy->config().kill_connection(connection_to_kill);
+    const std::string url2 = _qeasy->config().kill_connection(connection_to_kill);
     curl_easy_setopt(_qeasy->curl, CURLOPT_URL, url2.c_str());
     curl_easy_setopt(_qeasy->curl, CURLOPT_CUSTOMREQUEST, "DELETE");
     connect(_qeasy, &QCurlEasy::done, this, &Skipper::handleKillConnection, Qt::SingleShotConnection);
     _qeasy->perform();
 }
 
 void Skipper::handleKillConnection(const QString &error, long code, const QByteArray &body) {
-    char *url, *method;
+    curl_easy_setopt(_qeasy->curl, CURLOPT_CUSTOMREQUEST, nullptr);
+    curl_easy_setopt(_qeasy->curl, CURLOPT_HTTPGET, 1L);    // 恢复 CURL 的内部状态
+    char *url;
     curl_easy_getinfo(_qeasy->curl, CURLINFO_EFFECTIVE_URL, &url);
-    curl_easy_getinfo(_qeasy->curl, CURLINFO_REDIRECT_URL, &method);
 
     if (!error.isEmpty()) {
-        SPDLOG_LOGGER_ERROR(_logger, "{} {} failed: {}", method, url, error.toStdString());
+        SPDLOG_LOGGER_ERROR(_logger, "DELETE {} failed: {}", url, error.toStdString());
         _logger->flush();
         return;
     }
     if (code / 100 != 2) {
-        SPDLOG_LOGGER_ERROR(_logger, "{} {} failed code={} body={}", method, url, code, body.toStdString());
+        SPDLOG_LOGGER_ERROR(_logger, "DELETE {} failed code={} body={}", url, code, body.toStdString());
         _logger->flush();
         return;
     }