From 4ce9292b28cfe923be25f70b7912ecaf0753f47f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Thu, 23 Feb 2023 13:10:31 -0500
Subject: [PATCH] proxy server: allow to ping push
---
include/opendht/dht_proxy_server.h | 3 +++
src/dht_proxy_server.cpp | 39 ++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/include/opendht/dht_proxy_server.h b/include/opendht/dht_proxy_server.h
index 440d82b8..9a97a2ed 100644
--- a/include/opendht/dht_proxy_server.h
+++ b/include/opendht/dht_proxy_server.h
@@ -278,6 +278,9 @@ private:
#ifdef OPENDHT_PUSH_NOTIFICATIONS
PushType getTypeFromString(const std::string& type);
std::string getDefaultTopic(PushType type);
+
+ RequestStatus pingPush(restinio::request_handle_t request,
+ restinio::router::route_params_t /*params*/);
/**
* Subscribe to push notifications for an iOS or Android device.
* Method: SUBSCRIBE "/{InfoHash: .*}"
diff --git a/src/dht_proxy_server.cpp b/src/dht_proxy_server.cpp
index 1b4b1772..8fd771cc 100644
--- a/src/dht_proxy_server.cpp
+++ b/src/dht_proxy_server.cpp
@@ -631,6 +631,8 @@ DhtProxyServer::createRestRouter()
// key.listen
router->http_get("/key/:hash/listen", std::bind(&DhtProxyServer::listen, this, _1, _2));
#ifdef OPENDHT_PUSH_NOTIFICATIONS
+ // node.pingPush
+ router->http_post("/node/pingPush", std::bind(&DhtProxyServer::pingPush, this, _1, _2));
// key.subscribe
router->add_handler(restinio::http_method_subscribe(),
"/key/:hash", std::bind(&DhtProxyServer::subscribe, this, _1, _2));
@@ -772,6 +774,43 @@ DhtProxyServer::getDefaultTopic(PushType) {
return bundleId_;
}
+RequestStatus
+DhtProxyServer::pingPush(restinio::request_handle_t request,
+ restinio::router::route_params_t /*params*/)
+{
+ requestNum_++;
+ try {
+ std::string err;
+ Json::Value r;
+ auto* char_data = reinterpret_cast<const char*>(request->body().data());
+ auto reader = std::unique_ptr<Json::CharReader>(jsonReaderBuilder_.newCharReader());
+ if (!reader->parse(char_data, char_data + request->body().size(), &r, &err)){
+ auto response = initHttpResponse(request->create_response(restinio::status_bad_request()));
+ response.set_body(RESP_MSG_JSON_INCORRECT);
+ return response.done();
+ }
+ const Json::Value& root(r); // parse using const Json so [] never creates element
+ auto pushToken = root["key"].asString();
+ if (pushToken.empty()){
+ auto response = initHttpResponse(request->create_response(restinio::status_bad_request()));
+ response.set_body(RESP_MSG_NO_TOKEN);
+ return response.done();
+ }
+ auto type = getTypeFromString(root["platform"].asString());
+ auto topic = root["topic"].asString();
+ if (topic.empty()) {
+ topic = getDefaultTopic(type);
+ }
+ Json::Value json;
+ json["to"] = root["client_id"];
+ json["pong"] = true;
+ sendPushNotification(pushToken, std::move(json), type, true, topic);
+ } catch (...) {
+ return serverError(*request);
+ }
+ return restinio::request_handling_status_t::accepted;
+}
+
RequestStatus
DhtProxyServer::subscribe(restinio::request_handle_t request,
restinio::router::route_params_t params)
--
GitLab