From 58987b2ec6e026881e88e844dc15e49a19b9a502 Mon Sep 17 00:00:00 2001 From: xiphon Date: Tue, 31 Mar 2020 16:29:28 +0000 Subject: network: provide common HTTP GET functionality with js callbacks --- main.qml | 40 +++++++++--------- monero-wallet-gui.pro | 4 +- src/main/main.cpp | 6 +-- src/qt/network.cpp | 92 +++++++++++++++++++++++++++++++++++++++++ src/qt/network.h | 20 +++++++++ src/qt/prices.cpp | 110 -------------------------------------------------- src/qt/prices.h | 29 ------------- 7 files changed, 139 insertions(+), 162 deletions(-) create mode 100644 src/qt/network.cpp create mode 100644 src/qt/network.h delete mode 100644 src/qt/prices.cpp delete mode 100644 src/qt/prices.h diff --git a/main.qml b/main.qml index bcf067bd..88e607b0 100644 --- a/main.qml +++ b/main.qml @@ -1135,9 +1135,9 @@ ApplicationWindow { triggeredOnStart: false } - function fiatApiParseTicker(resp, currency){ + function fiatApiParseTicker(url, resp, currency){ // parse & validate incoming JSON - if(resp._url.startsWith("https://api.kraken.com/0/")){ + if(url.startsWith("https://api.kraken.com/0/")){ if(resp.hasOwnProperty("error") && resp.error.length > 0 || !resp.hasOwnProperty("result")){ appWindow.fiatApiError("Kraken API has error(s)"); return; @@ -1146,14 +1146,14 @@ ApplicationWindow { var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD"; var ticker = resp.result[key]["o"]; return ticker; - } else if(resp._url.startsWith("https://api.coingecko.com/api/v3/")){ + } else if(url.startsWith("https://api.coingecko.com/api/v3/")){ var key = currency === "xmreur" ? "eur" : "usd"; if(!resp.hasOwnProperty("monero") || !resp["monero"].hasOwnProperty(key)){ appWindow.fiatApiError("Coingecko API has error(s)"); return; } return resp["monero"][key]; - } else if(resp._url.startsWith("https://min-api.cryptocompare.com/data/")){ + } else if(url.startsWith("https://min-api.cryptocompare.com/data/")){ var key = currency === "xmreur" ? "EUR" : "USD"; if(!resp.hasOwnProperty(key)){ appWindow.fiatApiError("cryptocompare API has error(s)"); @@ -1163,13 +1163,7 @@ ApplicationWindow { } } - function fiatApiGetCurrency(resp){ - // map response to `appWindow.fiatPriceAPIs` object - if (!resp.hasOwnProperty('_url')){ - appWindow.fiatApiError("invalid JSON"); - return; - } - + function fiatApiGetCurrency(url) { var apis = appWindow.fiatPriceAPIs; for (var api in apis){ if (!apis.hasOwnProperty(api)) @@ -1179,23 +1173,34 @@ ApplicationWindow { if(!apis[api].hasOwnProperty(cur)) continue; - var url = apis[api][cur]; - if(url === resp._url){ + if (apis[api][cur] === url) { return cur; } } } } - function fiatApiJsonReceived(resp){ + function fiatApiJsonReceived(url, resp, error) { + if (error) { + appWindow.fiatApiError(error); + return; + } + + try { + resp = JSON.parse(resp); + } catch (e) { + appWindow.fiatApiError("bad JSON: " + e); + return; + } + // handle incoming JSON, set ticker - var currency = appWindow.fiatApiGetCurrency(resp); + var currency = appWindow.fiatApiGetCurrency(url); if(typeof currency == "undefined"){ appWindow.fiatApiError("could not get currency"); return; } - var ticker = appWindow.fiatApiParseTicker(resp, currency); + var ticker = appWindow.fiatApiParseTicker(url, resp, currency); if(ticker <= 0){ appWindow.fiatApiError("could not get ticker"); return; @@ -1227,7 +1232,7 @@ ApplicationWindow { } var url = provider[userCurrency]; - Prices.getJSON(url); + Network.getJSON(url, fiatApiJsonReceived); } function fiatApiCurrencySymbol() { @@ -1285,7 +1290,6 @@ ApplicationWindow { walletManager.checkUpdatesComplete.connect(onWalletCheckUpdatesComplete); walletManager.walletPassphraseNeeded.connect(onWalletPassphraseNeeded); IPC.uriHandler.connect(onUriHandler); - Prices.priceJsonReceived.connect(appWindow.fiatApiJsonReceived); if(typeof daemonManager != "undefined") { daemonManager.daemonStarted.connect(onDaemonStarted); diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro index 981473fb..359b11db 100644 --- a/monero-wallet-gui.pro +++ b/monero-wallet-gui.pro @@ -79,8 +79,8 @@ HEADERS += \ src/qt/FutureScheduler.h \ src/qt/ipc.h \ src/qt/KeysFiles.h \ + src/qt/network.h \ src/qt/utils.h \ - src/qt/prices.h \ src/qt/macoshelper.h \ src/qt/MoneroSettings.h \ src/qt/TailsOS.h @@ -115,8 +115,8 @@ SOURCES += src/main/main.cpp \ src/qt/FutureScheduler.cpp \ src/qt/ipc.cpp \ src/qt/KeysFiles.cpp \ + src/qt/network.cpp \ src/qt/utils.cpp \ - src/qt/prices.cpp \ src/qt/MoneroSettings.cpp \ src/qt/TailsOS.cpp diff --git a/src/main/main.cpp b/src/main/main.cpp index c5210e5f..c6c0ea52 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -62,11 +62,11 @@ #include "Logger.h" #include "MainApp.h" #include "qt/ipc.h" +#include "qt/network.h" #include "qt/utils.h" #include "qt/TailsOS.h" #include "qt/KeysFiles.h" #include "qt/MoneroSettings.h" -#include "qt/prices.h" // IOS exclusions #ifndef Q_OS_IOS @@ -436,8 +436,8 @@ int main(int argc, char *argv[]) #endif engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner); - Prices prices; - engine.rootContext()->setContextProperty("Prices", &prices); + Network network; + engine.rootContext()->setContextProperty("Network", &network); // Load main window (context properties needs to be defined obove this line) engine.load(QUrl(QStringLiteral("qrc:///main.qml"))); diff --git a/src/qt/network.cpp b/src/qt/network.cpp new file mode 100644 index 00000000..0d523a5c --- /dev/null +++ b/src/qt/network.cpp @@ -0,0 +1,92 @@ +// Copyright (c) 2014-2019, The Monero Project +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, are +// permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, this list +// of conditions and the following disclaimer in the documentation and/or other +// materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific +// prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF +// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "network.h" + +#include +#include + +// TODO: wallet_merged - epee library triggers the warnings +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wreorder" +#include +#pragma GCC diagnostic pop + +#include "utils.h" + +Network::Network(QObject *parent) + : QObject(parent) + , m_scheduler(this) +{ +} + +void Network::get(const QString &url, const QJSValue &callback, const QString &contentType) const +{ + qDebug() << QString("Fetching: %1").arg(url); + + m_scheduler.run( + [url, contentType] { + epee::net_utils::http::http_simple_client httpClient; + + const QUrl urlParsed(url); + httpClient.set_server(urlParsed.host().toStdString(), urlParsed.scheme() == "https" ? "443" : "80", {}); + + const QString uri = (urlParsed.hasQuery() ? urlParsed.path() + "?" + urlParsed.query() : urlParsed.path()); + const epee::net_utils::http::http_response_info *pri = NULL; + constexpr std::chrono::milliseconds timeout = std::chrono::seconds(15); + + epee::net_utils::http::fields_list headers({{"User-Agent", randomUserAgent().toStdString()}}); + if (!contentType.isEmpty()) + { + headers.push_back({"Content-Type", contentType.toStdString()}); + } + const bool result = httpClient.invoke(uri.toStdString(), "GET", {}, timeout, std::addressof(pri), headers); + + if (!result) + { + return QJSValueList({QJSValue(), QJSValue(), "unknown error"}); + } + if (!pri) + { + return QJSValueList({QJSValue(), QJSValue(), "internal error (null response ptr)"}); + } + if (pri->m_response_code != 200) + { + return QJSValueList({QJSValue(), QJSValue(), QString("response code: %1").arg(pri->m_response_code)}); + } + + return QJSValueList({url, QString::fromStdString(pri->m_body)}); + }, + callback); +} + +void Network::getJSON(const QString &url, const QJSValue &callback) const +{ + get(url, callback, "application/json; charset=utf-8"); +} diff --git a/src/qt/network.h b/src/qt/network.h new file mode 100644 index 00000000..765b2512 --- /dev/null +++ b/src/qt/network.h @@ -0,0 +1,20 @@ +#pragma once + +#include +#include + +#include "FutureScheduler.h" + +class Network : public QObject +{ + Q_OBJECT +public: + Network(QObject *parent = nullptr); + +public: + Q_INVOKABLE void get(const QString &url, const QJSValue &callback, const QString &contentType = {}) const; + Q_INVOKABLE void getJSON(const QString &url, const QJSValue &callback) const; + +private: + mutable FutureScheduler m_scheduler; +}; diff --git a/src/qt/prices.cpp b/src/qt/prices.cpp deleted file mode 100644 index 6c09553a..00000000 --- a/src/qt/prices.cpp +++ /dev/null @@ -1,110 +0,0 @@ -// Copyright (c) 2014-2019, The Monero Project -// -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without modification, are -// permitted provided that the following conditions are met: -// -// 1. Redistributions of source code must retain the above copyright notice, this list of -// conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright notice, this list -// of conditions and the following disclaimer in the documentation and/or other -// materials provided with the distribution. -// -// 3. Neither the name of the copyright holder nor the names of its contributors may be -// used to endorse or promote products derived from this software without specific -// prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY -// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF -// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#include -#include - -// TODO: wallet_merged - epee library triggers the warnings -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-parameter" -#pragma GCC diagnostic ignored "-Wreorder" -#include -#pragma GCC diagnostic pop - -#include "utils.h" -#include "prices.h" - -Prices::Prices(QObject *parent) - : QObject(parent) - , m_scheduler(this) -{ -} - -void Prices::getJSON(const QString url) const -{ - qDebug() << QString("Fetching: %1").arg(url); - - m_scheduler.run([this, url] { - epee::net_utils::http::http_simple_client http_client; - - const QUrl urlParsed(url); - http_client.set_server(urlParsed.host().toStdString(), urlParsed.scheme() == "https" ? "443" : "80", {}); - - const QString uri = (urlParsed.hasQuery() ? urlParsed.path() + "?" + urlParsed.query() : urlParsed.path()); - const epee::net_utils::http::http_response_info* pri = NULL; - constexpr std::chrono::milliseconds timeout = std::chrono::seconds(15); - - const bool result = http_client.invoke( - uri.toStdString(), - "GET", - {}, - timeout, - std::addressof(pri), - { - {"Content-Type", "application/json; charset=utf-8"}, - {"User-Agent", randomUserAgent().toStdString()} - }); - - if (!result) - { - this->gotError("unknown error"); - } - else if (!pri) - { - this->gotError("internal error (null response ptr)"); - } - else if (pri->m_response_code != 200) - { - this->gotError(QString("response code: %1").arg(pri->m_response_code)); - } - else - { - QJsonDocument doc = QJsonDocument::fromJson({&pri->m_body[0], static_cast(pri->m_body.size())}); - if (doc.isEmpty()) - { - this->gotError("bad JSON"); - } - else - { - // Insert source url for later reference - QJsonObject docobj = doc.object(); - docobj["_url"] = url; - doc.setObject(docobj); - - QVariantMap vMap = doc.object().toVariantMap(); - emit priceJsonReceived(vMap); - } - } - }); -} - -void Prices::gotError(const QString &message) const -{ - qCritical() << "[Fiat API] Error:" << message; - emit priceJsonError(message); -} diff --git a/src/qt/prices.h b/src/qt/prices.h deleted file mode 100644 index 4168aedc..00000000 --- a/src/qt/prices.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef PRICES_H -#define PRICES_H - -#include -#include - -#include "FutureScheduler.h" - -class Prices : public QObject -{ -Q_OBJECT -public: - Prices(QObject *parent = nullptr); - -public: - Q_INVOKABLE void getJSON(const QString url) const; - -private: - void gotError(const QString &message) const; - -signals: - void priceJsonReceived(QVariantMap document) const; - void priceJsonError(QString message) const; - -private: - mutable FutureScheduler m_scheduler; -}; - -#endif // PRICES_H -- cgit v1.2.3