diff --git a/launcher/net/PasteUpload.cpp b/launcher/net/PasteUpload.cpp index 2333a2256..0bbd077cf 100644 --- a/launcher/net/PasteUpload.cpp +++ b/launcher/net/PasteUpload.cpp @@ -36,6 +36,7 @@ */ #include "PasteUpload.h" +#include #include #include @@ -99,86 +100,101 @@ QNetworkReply* PasteUpload::getReply(QNetworkRequest& request) return nullptr; }; -auto PasteUpload::Sink::init(QNetworkRequest&) -> Task::State +auto PasteUpload::Sink::finalize(QNetworkReply& reply) -> Task::State { - m_output.clear(); - return Task::State::Running; -}; + if (!finalizeAllValidators(reply)) { + m_fail_reason = "Failed to finalize validators"; + return Task::State::Failed; + } + int statusCode = reply.attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); -auto PasteUpload::Sink::write(QByteArray& data) -> Task::State -{ - m_output.append(data); - return Task::State::Running; -} + if (reply.error() != QNetworkReply::NetworkError::NoError) { + m_fail_reason = QObject::tr("Network error: %1").arg(reply.errorString()); + return Task::State::Failed; + } else if (statusCode != 200 && statusCode != 201) { + QString reasonPhrase = reply.attribute(QNetworkRequest::HttpReasonPhraseAttribute).toString(); + m_fail_reason = + QObject::tr("Error: %1 returned unexpected status code %2 %3").arg(m_d->url().toString()).arg(statusCode).arg(reasonPhrase); + return Task::State::Failed; + } -auto PasteUpload::Sink::abort() -> Task::State -{ - m_output.clear(); - return Task::State::Failed; -} - -auto PasteUpload::Sink::finalize(QNetworkReply&) -> Task::State -{ - switch (m_paste_type) { + switch (m_d->m_paste_type) { case PasteUpload::NullPointer: - m_result->link = QString::fromUtf8(m_output).trimmed(); + m_d->m_pasteLink = QString::fromUtf8(*m_output).trimmed(); break; case PasteUpload::Hastebin: { QJsonParseError jsonError; - auto doc = QJsonDocument::fromJson(m_output, &jsonError); + auto doc = QJsonDocument::fromJson(*m_output, &jsonError); if (jsonError.error != QJsonParseError::NoError) { qDebug() << "hastebin server did not reply with JSON" << jsonError.errorString(); + m_fail_reason = + QObject::tr("Failed to parse response from hastebin server: expected JSON but got an invalid response. Error: %1") + .arg(jsonError.errorString()); return Task::State::Failed; } auto obj = doc.object(); if (obj.contains("key") && obj["key"].isString()) { QString key = doc.object()["key"].toString(); - m_result->link = m_base_url + "/" + key; + m_d->m_pasteLink = m_d->m_baseUrl + "/" + key; } else { qDebug() << "Log upload failed:" << doc.toJson(); + m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString()); return Task::State::Failed; } break; } case PasteUpload::Mclogs: { QJsonParseError jsonError; - auto doc = QJsonDocument::fromJson(m_output, &jsonError); + auto doc = QJsonDocument::fromJson(*m_output, &jsonError); if (jsonError.error != QJsonParseError::NoError) { qDebug() << "mclogs server did not reply with JSON" << jsonError.errorString(); + m_fail_reason = + QObject::tr("Failed to parse response from mclogs server: expected JSON but got an invalid response. Error: %1") + .arg(jsonError.errorString()); return Task::State::Failed; } auto obj = doc.object(); if (obj.contains("success") && obj["success"].isBool()) { bool success = obj["success"].toBool(); if (success) { - m_result->link = obj["url"].toString(); + m_d->m_pasteLink = obj["url"].toString(); } else { - m_result->error = obj["error"].toString(); + QString error = obj["error"].toString(); + m_fail_reason = QObject::tr("Error: %1 returned an error: %2").arg(m_d->url().toString(), error); + return Task::State::Failed; } } else { qDebug() << "Log upload failed:" << doc.toJson(); + m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString()); return Task::State::Failed; } break; } case PasteUpload::PasteGG: QJsonParseError jsonError; - auto doc = QJsonDocument::fromJson(m_output, &jsonError); + auto doc = QJsonDocument::fromJson(*m_output, &jsonError); if (jsonError.error != QJsonParseError::NoError) { qDebug() << "pastegg server did not reply with JSON" << jsonError.errorString(); + m_fail_reason = + QObject::tr("Failed to parse response from pasteGG server: expected JSON but got an invalid response. Error: %1") + .arg(jsonError.errorString()); return Task::State::Failed; } auto obj = doc.object(); if (obj.contains("status") && obj["status"].isString()) { QString status = obj["status"].toString(); if (status == "success") { - m_result->link = m_base_url + "/p/anonymous/" + obj["result"].toObject()["id"].toString(); + m_d->m_pasteLink = m_d->m_baseUrl + "/p/anonymous/" + obj["result"].toObject()["id"].toString(); } else { - m_result->error = obj["error"].toString(); - m_result->extra_message = (obj.contains("message") && obj["message"].isString()) ? obj["message"].toString() : "none"; + QString error = obj["error"].toString(); + QString message = (obj.contains("message") && obj["message"].isString()) ? obj["message"].toString() : "none"; + m_fail_reason = + QObject::tr("Error: %1 returned an error code: %2\nError message: %3").arg(m_d->url().toString(), error, message); + return Task::State::Failed; } } else { qDebug() << "Log upload failed:" << doc.toJson(); + m_fail_reason = QObject::tr("Error: %1 returned a malformed response body").arg(m_d->url().toString()); return Task::State::Failed; } break; @@ -186,23 +202,18 @@ auto PasteUpload::Sink::finalize(QNetworkReply&) -> Task::State return Task::State::Succeeded; } -Net::NetRequest::Ptr PasteUpload::make(const QString& log, PasteUpload::PasteType pasteType, QString customBaseURL, ResultPtr result) -{ - auto base = PasteUpload::PasteTypes.at(pasteType); - QString baseUrl = customBaseURL.isEmpty() ? base.defaultBase : customBaseURL; - auto up = makeShared(log, pasteType); - - // HACK: Paste's docs say the standard API path is at /api/ but the official instance paste.gg doesn't follow that?? - if (pasteType == PasteUpload::PasteGG && baseUrl == base.defaultBase) - up->m_url = "https://api.paste.gg/v1/pastes"; - else - up->m_url = baseUrl + base.endpointPath; - - up->m_sink.reset(new Sink(pasteType, baseUrl, result)); - return up; -} - -PasteUpload::PasteUpload(const QString& log, PasteType pasteType) : m_log(log), m_paste_type(pasteType) +PasteUpload::PasteUpload(const QString& log, QString url, PasteType pasteType) : m_log(log), m_baseUrl(url), m_paste_type(pasteType) { anonymizeLog(m_log); + auto base = PasteUpload::PasteTypes.at(pasteType); + if (m_baseUrl.isEmpty()) + m_baseUrl = base.defaultBase; + + // HACK: Paste's docs say the standard API path is at /api/ but the official instance paste.gg doesn't follow that?? + if (pasteType == PasteUpload::PasteGG && m_baseUrl == base.defaultBase) + m_url = "https://api.paste.gg/v1/pastes"; + else + m_url = m_baseUrl + base.endpointPath; + + m_sink.reset(new Sink(this)); } diff --git a/launcher/net/PasteUpload.h b/launcher/net/PasteUpload.h index 55fb2231c..7f43779c4 100644 --- a/launcher/net/PasteUpload.h +++ b/launcher/net/PasteUpload.h @@ -35,6 +35,7 @@ #pragma once +#include "net/ByteArraySink.h" #include "net/NetRequest.h" #include "tasks/Task.h" @@ -67,40 +68,29 @@ class PasteUpload : public Net::NetRequest { }; static const std::array PasteTypes; - struct Result { - QString link; - QString error; - QString extra_message; - }; - using ResultPtr = std::shared_ptr; - - class Sink : public Net::Sink { + class Sink : public Net::ByteArraySink { public: - Sink(const PasteType pasteType, const QString base_url, ResultPtr result) - : m_paste_type(pasteType), m_base_url(base_url), m_result(result) {}; + Sink(PasteUpload* p) : Net::ByteArraySink(std::make_shared()), m_d(p) {}; virtual ~Sink() = default; public: - auto init(QNetworkRequest& request) -> Task::State override; - auto write(QByteArray& data) -> Task::State override; - auto abort() -> Task::State override; auto finalize(QNetworkReply& reply) -> Task::State override; - auto hasLocalData() -> bool override { return false; } private: - const PasteType m_paste_type; - const QString m_base_url; - ResultPtr m_result; - QByteArray m_output; + PasteUpload* m_d; }; - PasteUpload(const QString& log, PasteType pasteType); + friend Sink; + + PasteUpload(const QString& log, QString url, PasteType pasteType); virtual ~PasteUpload() = default; - static NetRequest::Ptr make(const QString& log, PasteType pasteType, QString baseURL, ResultPtr result); + QString pasteLink() { return m_pasteLink; } private: virtual QNetworkReply* getReply(QNetworkRequest&) override; QString m_log; + QString m_pasteLink; + QString m_baseUrl; const PasteType m_paste_type; -}; \ No newline at end of file +}; diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp index adb6e8bf2..141153b92 100644 --- a/launcher/ui/GuiUtil.cpp +++ b/launcher/ui/GuiUtil.cpp @@ -43,11 +43,10 @@ #include #include -#include - #include "FileSystem.h" #include "logs/AnonymizeLog.h" #include "net/NetJob.h" +#include "net/NetRequest.h" #include "net/PasteUpload.h" #include "ui/dialogs/CustomMessageBox.h" #include "ui/dialogs/ProgressDialog.h" @@ -134,10 +133,10 @@ std::optional GuiUtil::uploadPaste(const QString& name, const QString& textToUpload = truncateLogForMclogs(text); } - auto result = std::make_shared(); auto job = NetJob::Ptr(new NetJob("Log Upload", APPLICATION->network())); - job->addNetAction(PasteUpload::make(textToUpload, pasteType, baseURL, result)); + auto pasteJob = new PasteUpload(textToUpload, baseURL, pasteType); + job->addNetAction(Net::NetRequest::Ptr(pasteJob)); QObject::connect(job.get(), &Task::failed, [parentWidget](QString reason) { CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), reason, QMessageBox::Critical)->show(); }); @@ -148,27 +147,19 @@ std::optional GuiUtil::uploadPaste(const QString& name, const QString& }); if (dialog.execWithTask(job.get()) == QDialog::Accepted) { - if (!result->error.isEmpty() || !result->extra_message.isEmpty()) { - QString message = QObject::tr("Error: %1").arg(result->error); - if (!result->extra_message.isEmpty()) { - message += QObject::tr("\nError message: %1").arg(result->extra_message); - } - CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), message, QMessageBox::Critical)->show(); - return {}; - } - if (result->link.isEmpty()) { + if (pasteJob->pasteLink().isEmpty()) { CustomMessageBox::selectable(parentWidget, QObject::tr("Failed to upload logs!"), "The upload link is empty", QMessageBox::Critical) ->show(); return {}; } - setClipboardText(result->link); + setClipboardText(pasteJob->pasteLink()); CustomMessageBox::selectable( parentWidget, QObject::tr("Upload finished"), - QObject::tr("The link to the uploaded log has been placed in your clipboard.").arg(result->link), + QObject::tr("The link to the uploaded log has been placed in your clipboard.").arg(pasteJob->pasteLink()), QMessageBox::Information) ->exec(); - return result->link; + return pasteJob->pasteLink(); } return {}; }