Add AWS support to libcloudproxyneedlefish_13.93.0needlefish/13.93.0marlin_12.93.0marlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.93.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.0koi_10.93.0koi_10.92.0koi_10.91.0koi/10.93.0koi/10.92.0koi/10.91.013.93.012.93.012.92.012.91.012.90.112.90.011.92.011.91.010.93.010.92.010.91.0

Bug-AGL: SPEC-3645
Signed-off-by: Andrey Shamanin <andrei.shamanin@orioninc.com>
Change-Id: Ie165a50e7975a8e6f25b259be1679a9689414148

13 files changed, 260 insertions, 261 deletions

diff --git a/include/hmi-debug.h b/include/hmi-debug.h
index c8e8638..674f5df 100644
--- a/include/hmi-debug.h
+++ b/include/hmi-debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,29 +17,21 @@
 #ifndef __HMI_DEBUG_H__
 #define __HMI_DEBUG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <time.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include <sys/types.h> // gettid()
-#include <unistd.h>
-#include <sys/syscall.h>
-
-    enum LOG_LEVEL{
-        LOG_LEVEL_NONE = 0,
-        LOG_LEVEL_ERROR,
-        LOG_LEVEL_WARNING,
-        LOG_LEVEL_NOTICE,
-        LOG_LEVEL_INFO,
-        LOG_LEVEL_DEBUG,
-        LOG_LEVEL_MAX = LOG_LEVEL_DEBUG
-    };
+enum LOG_LEVEL{
+    LOG_LEVEL_NONE = 0,
+    LOG_LEVEL_ERROR,
+    LOG_LEVEL_WARNING,
+    LOG_LEVEL_NOTICE,
+    LOG_LEVEL_INFO,
+    LOG_LEVEL_DEBUG,
+    LOG_LEVEL_MAX = LOG_LEVEL_DEBUG
+};
 
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 
@@ -49,34 +41,30 @@ extern "C" {
 #define HMI_INFO(prefix, args,...)  _HMI_LOG(LOG_LEVEL_INFO, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
 #define HMI_DEBUG(prefix, args,...) _HMI_LOG(LOG_LEVEL_DEBUG, __FILENAME__, __FUNCTION__,__LINE__, prefix, args,##__VA_ARGS__)
 
-    static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"};
+static char ERROR_FLAG[6][20] = {"NONE", "ERROR", "WARNING", "NOTICE", "INFO", "DEBUG"};
 
-    static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, const char* prefix, const char* log, ...)
+static void _HMI_LOG(enum LOG_LEVEL level, const char* file, const char* func, const int line, const char* prefix, const char* log, ...)
+{
+    const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG"));
+    if(log_level < level)
     {
-        //SA: WARN: const int log_level = (getenv("USE_HMI_DEBUG") == NULL)?LOG_LEVEL_ERROR:atoi(getenv("USE_HMI_DEBUG"));
-        const int log_level = LOG_LEVEL_MAX;
-        if(log_level < level)
-        {
-            return;
-        }
-
-        char *message;
-        struct timespec tp;
-        unsigned int time;
+        return;
+    }
 
-        clock_gettime(CLOCK_REALTIME, &tp);
-        time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000);
+    char *message;
+    struct timespec tp;
+    unsigned int time;
 
-        va_list args;
-        va_start(args, log);
-        if (log == NULL || vasprintf(&message, log, args) < 0)
-            message = NULL;
-        fprintf(stderr,  "[%10.3f] [%s %s] [%s, %s(), Line:%d] [thread %llx]>>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, (unsigned long long)syscall(__NR_gettid), message);
-        va_end(args);
-        free(message);
-    }
+    clock_gettime(CLOCK_REALTIME, &tp);
+    time = (tp.tv_sec * 1000000L) + (tp.tv_nsec / 1000);
 
-#ifdef __cplusplus
+    va_list args;
+    va_start(args, log);
+    if (log == NULL || vasprintf(&message, log, args) < 0)
+        message = NULL;
+    fprintf(stderr,  "[%10.3f] [%s %s] [%s, %s(), Line:%d] >>> %s \n", time / 1000.0, prefix, ERROR_FLAG[level], file, func, line, message);
+    va_end(args);
+    free(message);
 }
-#endif
+
 #endif  //__HMI_DEBUG_H__
diff --git a/include/libcloudproxy.h b/include/libcloudproxy.h
index b333a14..e2501b3 100644
--- a/include/libcloudproxy.h
+++ b/include/libcloudproxy.h
@@ -19,6 +19,7 @@
 #include <vector>
 #include <map>
 #include <string>
+#include <mutex>
 #include <functional>
 #include <json-c/json.h>
 #include <systemd/sd-event.h>
@@ -29,6 +30,15 @@ extern "C"
 #include <afb/afb-ws-client.h>
 }
 
+
+struct CloudType
+{
+    static constexpr const char* Azure{"azure"};
+    static constexpr const char* Aws  {"aws"};
+
+    static bool isSupported(const char* type);
+};
+
 class CloudProxyClient
 {
 public:
@@ -41,7 +51,6 @@ public:
         Event_Max
     };
 
-
     CloudProxyClient();
     ~CloudProxyClient();
 
@@ -50,7 +59,8 @@ public:
 
     int init(const int port, const std::string& token);
 
-    int sendMessage(const std::string& data);
+    // sendMessage call is synchronous (will wait a cloudproxy reply):
+    int sendMessage(const std::string& cloud_type, const std::string& data);
 
     void set_event_handler(enum EventType et, handler_func f);
 
@@ -60,13 +70,14 @@ public:
     int unsubscribe(const std::string& event_name);
 
 private:
-    int call(const std::string& verb, struct json_object* arg);
+    int call_sync(const std::string& verb, struct json_object* arg);
 
 private:
     static const std::vector<std::string> m_api_list;
     static const std::vector<std::string> m_event_list;
 
-    std::map<EventType, handler_func> handlers;
+    std::mutex m_mutex; // used by call_sync only
+    std::map<EventType, handler_func> m_handlers;
     struct afb_wsj1_itf m_itf;
     struct afb_wsj1* m_websock{nullptr};
     sd_event* m_loop{nullptr};
diff --git a/sample/README.md b/sample/README.md
index 8edaddd..dd05521 100755
--- a/sample/README.md
+++ b/sample/README.md
@@ -36,7 +36,7 @@ CloudProxy client hides the communication with CloudProxy server. It incupsulate
 * Include the appropriate header to appliciation

 

  ```

- #include "cloudproxy-client/cloudproxyclient.h"

+ #include "libcloudproxy.h"

   ```

 

 * Initialization of the CloudProxy client inside the application:

@@ -57,36 +57,53 @@ g_cloudproxyclient->init(port, token.c_str());
 

 

 ```

-g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_SendMessageConfirmation, [](json_object* object){

-                                json_object *j_result;

-                                if(!json_object_object_get_ex(object, "result", &j_result))

-                                {

-                                        qDebug("Can't read confirmation result");

-                                        return;

-                                }

-

-                                qDebug("Confirmation result %d", (int)json_object_get_boolean(j_result));

-        });

+	g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_SendMessageConfirmation, [](json_object* object){

+		json_object *j_obj;

+		const char* cloud_type{nullptr};

+		if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||

+		   (cloud_type = json_object_get_string(j_obj)) == nullptr)

+		{

+			qDebug("Can't read cloud_type");

+			return;

+		}

+

+		if(!json_object_object_get_ex(object, "result", &j_obj))

+		{

+			qDebug("Can't read confirmation result");

+			return;

+		}

+

+		qDebug("Confirmation result from %s: %d", cloud_type, (int)json_object_get_boolean(j_obj));

+	});

 

    ```

 

 

 

-* Subsription to the Event_SendMessageConfirmation

+* Subsription to the Event_ReceivedMessage

 

 ```

 g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [](json_object* object)

-                                json_object *event_data;

-                                const char* data_str{nullptr};

-                                if(!json_object_object_get_ex(object, "data", &event_data) ||

-                                    data_str = json_object_get_string(event_data)) == nullptr)

-                                {

-                                        qDebug("Can't read event data");

-                                        return;

-                                }

-

-                                qDebug("Received data: %s", data_str);

-        });

+			json_object *j_obj;

+			const char* cloud_type{nullptr};

+			if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||

+			   (cloud_type = json_object_get_string(j_obj)) == nullptr)

+			{

+				qDebug("Can't read cloud_type");

+				return;

+			}

+

+			json_object *event_data;

+			const char* data_str{nullptr};

+			if(!json_object_object_get_ex(object, "data", &event_data) ||

+			   (data_str = json_object_get_string(event_data)) == nullptr)

+			{

+				qDebug("Can't read event data");

+				return;

+			}

+

+			qDebug("Received data from %s: %s", cloud_type, data_str);

+	});

    ```

 

 

@@ -94,5 +111,6 @@ g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [
 

 

 ```

-qDebug() << "sendMessage result: " << g_cloudproxyclient->sendMessage("{\"app_key\": \"app_value1111\"}");

+qDebug() << "sendMessage to Azure: result: " << g_cloudproxyclient->sendMessage(CloudType::Azure, "{\"app_key\": \"app_value1111\"}");

+qDebug() << "sendMessage to AWS: result: " << g_cloudproxyclient->sendMessage(CloudType::Aws, "{\"app_key\": \"app_value1111\"}");

 ```
\ No newline at end of file
diff --git a/sample/telemetry-cloud-app/app/TelemetryWorker.cpp b/sample/telemetry-cloud-app/app/TelemetryWorker.cpp
index c277d2b..5dd0eb4 100755
--- a/sample/telemetry-cloud-app/app/TelemetryWorker.cpp
+++ b/sample/telemetry-cloud-app/app/TelemetryWorker.cpp
@@ -15,6 +15,7 @@
  */

 

 #include "TelemetryWorker.h"

+#include "mainwindow.h"

 #include <QDebug>

 #include <nlohmann/json.hpp>

 #include <time.h>

@@ -23,6 +24,8 @@
 #include <libcloudproxy.h>

 

 /*

+Used coordinates:

+

 left up: 56.327  43.981

 right up:  56.327  44.03

 right bottom:  56.3  44.03

@@ -33,9 +36,6 @@ top: 56.329702 44.021352
 

 diff -0.008028   -0.014969

 coeff lon/lat = 1,8646

-

-

-https://gps-coordinates.org/distance-between-coordinates.php

 */

 

 

@@ -97,6 +97,7 @@ void TelemetryWorker::send()
 

     nlohmann::json jmsg{

         {"tele_ver", "1.0"},

+        {"client_id", "009a82af-a9f8-4dd9-b67b-558f1267958e"},

         {"lat", lat},

         {"lon", lon},

         {"alt", (size_t)(alt + drand(0, 10))},

@@ -105,12 +106,18 @@ void TelemetryWorker::send()
     };

 

     {

-        //WARN: remove

         const auto& msg{jmsg.dump()};

         qDebug() << "TelemetryWorker: " << msg.c_str();

     }

 

     if (cloudproxyclient)

-        qDebug() << "TelemetryWorker: cloud sendMessage result: " << cloudproxyclient->sendMessage(jmsg.dump());

+    {

+        int res = cloudproxyclient->sendMessage(CloudType::Azure, jmsg.dump());

+        qDebug() << "TelemetryWorker: cloud sendMessage result: " << res;

+

+        MainWindow* window = qobject_cast<MainWindow*>(parent());

+        if (window)

+            window->updateSendStatus(res == 0);

+    }

 

 }

diff --git a/sample/telemetry-cloud-app/app/TelemetryWorker.h b/sample/telemetry-cloud-app/app/TelemetryWorker.h
index 11210cb..5df65c6 100755
--- a/sample/telemetry-cloud-app/app/TelemetryWorker.h
+++ b/sample/telemetry-cloud-app/app/TelemetryWorker.h
@@ -37,8 +37,8 @@ private:
     CloudProxyClient* cloudproxyclient{nullptr};

 

     int direction{0};

-    const double init_lat{56.306};

-    const double init_lon{44.070};

+    const double init_lat{56.321674};

+    const double init_lon{44.006383};

     double lat{init_lat};

     double lon{init_lon};

     double alt{300.0};

diff --git a/sample/telemetry-cloud-app/app/main.cpp b/sample/telemetry-cloud-app/app/main.cpp
index ca053ad..aa629ef 100755
--- a/sample/telemetry-cloud-app/app/main.cpp
+++ b/sample/telemetry-cloud-app/app/main.cpp
@@ -31,7 +31,7 @@ CloudProxyClient* g_cloudproxyclient{nullptr};
 
 int main(int argc, char *argv[])
 {
-    QString graphic_role = QString("telemetrycloud");
+    QString graphic_role{"telemetrycloud"};
 
     QApplication app(argc, argv);
     app.setDesktopFileName(graphic_role);
@@ -64,13 +64,44 @@ int main(int argc, char *argv[])
         g_cloudproxyclient = new CloudProxyClient();
         g_cloudproxyclient->init(port, token.c_str());
 
+        g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_SendMessageConfirmation, [&window](json_object* object){
+                qDebug("CloudProxyClient::Event_SendMessageConfirmation: object ptr %p", object);
+
+                const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
+                if (!str)
+                    str = "<empty>";
+                qDebug("Event_SendMessageConfirmation: %s", str);
+
+                json_object *j_obj;
+
+                const char* cloud_type{nullptr};
+                if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||
+                   (cloud_type = json_object_get_string(j_obj)) == nullptr)
+                {
+                    qDebug("Can't read cloud_type");
+                    return;
+                }
+
+                if(!json_object_object_get_ex(object, "result", &j_obj))
+                {
+                    qDebug("Can't read confirmation result");
+                    return;
+                }
+
+                bool result = (bool)json_object_get_boolean(j_obj);
+                if (!result)
+                    window->updateSendStatus(false);
+
+                qDebug("Application received confirmation result from %s : %s", cloud_type, (result ? "true" : "false"));
+        });
+
         g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [&window](json_object* object){
                 qDebug("CloudProxyClient::Event_ReceivedMessage: object ptr %p", object);
 
                 const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
                 if (!str)
                     str = "<empty>";
-                qDebug("Event_SendMessageConfirmation: %s", str);
+                qDebug("Event_ReceivedMessage: %s", str);
 
                 json_object *event_data;
                 const char* data_str{nullptr};
diff --git a/sample/telemetry-cloud-app/app/mainwindow.cpp b/sample/telemetry-cloud-app/app/mainwindow.cpp
index 2e8796c..1038d1a 100755
--- a/sample/telemetry-cloud-app/app/mainwindow.cpp
+++ b/sample/telemetry-cloud-app/app/mainwindow.cpp
@@ -64,10 +64,22 @@ void MainWindow::updateState(QVariant recvMsg)
         qDebug() << "Can't parse incomming message: " << ex.what();
     }
 
-    QString str = QString::asprintf("Cloud info: %s", cloud_msg.c_str());
+    QString str = QString::asprintf("Cloud message: %s", cloud_msg.c_str());
     ui->stateLabel->setText(str);
 }
 
+void MainWindow::updateSendStatus(bool status)
+{
+    static bool init{false}, prev{false};
+    if (!init || prev != status)
+    {
+        init = true;
+        prev = status;
+        QString str = QString::asprintf("Connection status: %s", (status ? "OK" : "ERROR"));
+        ui->sendStatusLabel->setText(str);
+    }
+}
+
 void MainWindow::startMsgButtonClick()
 {
     qDebug() << "MainWindow::startMsgButtonClick()";
diff --git a/sample/telemetry-cloud-app/app/mainwindow.h b/sample/telemetry-cloud-app/app/mainwindow.h
index ce21845..6e36638 100755
--- a/sample/telemetry-cloud-app/app/mainwindow.h
+++ b/sample/telemetry-cloud-app/app/mainwindow.h
@@ -39,6 +39,7 @@ public:
 
 public slots:
     void updateState(QVariant recvMsg);
+    void updateSendStatus(bool status);
 
 private slots:
     void startMsgButtonClick();
diff --git a/sample/telemetry-cloud-app/app/ui_mainwindow.h b/sample/telemetry-cloud-app/app/ui_mainwindow.h
index 5dbcbd5..6a24c62 100755
--- a/sample/telemetry-cloud-app/app/ui_mainwindow.h
+++ b/sample/telemetry-cloud-app/app/ui_mainwindow.h
@@ -36,6 +36,7 @@ class Ui_MainWindow
 public:
     QWidget *centralWidget{nullptr};
     QPushButton *startMsgButton{nullptr};
+    QLabel *sendStatusLabel{nullptr};
     QLabel *stateLabel{nullptr};
 
     void setupUi(double scale_factor, QMainWindow *MainWindow)
@@ -54,9 +55,16 @@ public:
         startMsgButton->setGeometry(QRect((540-242/2)*scale_factor, 20*scale_factor, 242*scale_factor, 64*scale_factor));
         startMsgButton->setStyleSheet(style);
 
-		stateLabel = new QLabel(centralWidget);
-        stateLabel->setObjectName(QString::fromUtf8("label"));
-        stateLabel->setGeometry(QRect(40*scale_factor, 180*scale_factor, 1000*scale_factor, 420*scale_factor));
+        sendStatusLabel = new QLabel(centralWidget);
+        sendStatusLabel->setObjectName(QString::fromUtf8("sendStatusLabel"));
+        sendStatusLabel->setGeometry(QRect(40*scale_factor, 180*scale_factor, 1000*scale_factor, 80*scale_factor));
+        sendStatusLabel->setWordWrap(false);
+        sendStatusLabel->setAlignment(Qt::AlignTop);
+        sendStatusLabel->setStyleSheet(style);
+
+        stateLabel = new QLabel(centralWidget);
+        stateLabel->setObjectName(QString::fromUtf8("stateLabel"));
+        stateLabel->setGeometry(QRect(40*scale_factor, 280*scale_factor, 1000*scale_factor, 420*scale_factor));
         stateLabel->setWordWrap(true);
         stateLabel->setAlignment(Qt::AlignTop);
         stateLabel->setStyleSheet(style);
@@ -74,6 +82,8 @@ public:
     {
         MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", nullptr));
         startMsgButton->setText(QApplication::translate("MainWindow", "Start", nullptr));
+        sendStatusLabel->setText(QApplication::translate("MainWindow", "Connection status: None", nullptr));
+        stateLabel->setText(QApplication::translate("MainWindow", "Cloud message:", nullptr));
     } // retranslateUi
 };
 
diff --git a/sample/test-cloud-app/app/main.cpp b/sample/test-cloud-app/app/main.cpp
index 6918e97..829d593 100755
--- a/sample/test-cloud-app/app/main.cpp
+++ b/sample/test-cloud-app/app/main.cpp
@@ -72,14 +72,23 @@ int main(int argc, char *argv[])
                     str = "<empty>";
                 qDebug("Event_SendMessageConfirmation: %s", str);
 
-                json_object *j_result;
-                if(!json_object_object_get_ex(object, "result", &j_result))
+                json_object *j_obj;
+
+                const char* cloud_type{nullptr};
+                if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||
+                   (cloud_type = json_object_get_string(j_obj)) == nullptr)
+                {
+                    qDebug("Can't read cloud_type");
+                    return;
+                }
+
+                if(!json_object_object_get_ex(object, "result", &j_obj))
                 {
                     qDebug("Can't read confirmation result");
                     return;
                 }
 
-                int result = (int)json_object_get_boolean(j_result);
+                int result = (int)json_object_get_boolean(j_obj);
 
                 if (result)
                     ++i_confirm_good;
@@ -87,15 +96,25 @@ int main(int argc, char *argv[])
                     ++i_confirm_bad;
 
                 window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QVariant());
-                qDebug("Application received confirmation result [good: %d, bad: %d]: %d", i_confirm_good, i_confirm_bad, result);
+                qDebug("Application received confirmation result from %s [good: %d, bad: %d]: %d", cloud_type, i_confirm_good, i_confirm_bad, result);
             });
+
         g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [&window](json_object* object){
                 qDebug("CloudProxyClient::Event_ReceivedMessage: object ptr %p", object);
 
                 const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
                 if (!str)
                     str = "<empty>";
-                qDebug("Event_SendMessageConfirmation: %s", str);
+                qDebug("Event_ReceivedMessage: %s", str);
+
+                json_object *j_obj;
+                const char* cloud_type{nullptr};
+                if(!json_object_object_get_ex(object, "cloud_type", &j_obj) ||
+                   (cloud_type = json_object_get_string(j_obj)) == nullptr)
+                {
+                    qDebug("Can't read cloud_type");
+                    return;
+                }
 
                 json_object *event_data;
                 const char* data_str{nullptr};
@@ -108,7 +127,7 @@ int main(int argc, char *argv[])
 
                 ++i_recv;
                 window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QString(data_str));
-                qDebug("Application received data [count: %d,  good: %d, bad %d]: %s", i_recv, i_confirm_good, i_confirm_bad, data_str);
+                qDebug("Application received data from %s [count: %d,  good: %d, bad %d]: %s", cloud_type, i_recv, i_confirm_good, i_confirm_bad, data_str);
             });
 
 
diff --git a/sample/test-cloud-app/app/main.cpp.save b/sample/test-cloud-app/app/main.cpp.save
deleted file mode 100755
index 8236ada..0000000
--- a/sample/test-cloud-app/app/main.cpp.save
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2020 MERA
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <QtCore/QUrlQuery>
-#include <QtGui/QGuiApplication>
-#include <QtCore/QCommandLineParser>
-#include <QScopedPointer>
-
-#include "mainwindow.h"
-#include <QApplication>
-#include <QDebug>
-
-#include "cloudproxy-client/cloudproxyclient.h"
-
-
-CloudProxyClient* g_cloudproxyclient{nullptr};
-
-
-int main(int argc, char *argv[])
-{
-    QString graphic_role = QString("cloudapp") + QString(APP_INSTANCE_NUM);
-
-    QApplication app(argc, argv);
-    app.setDesktopFileName(graphic_role);
-    QScopedPointer<MainWindow> window;
-
-    QCommandLineParser parser;
-    parser.addPositionalArgument("port", app.translate("main", "port for binding"));
-    parser.addPositionalArgument("secret", app.translate("main", "secret for binding"));
-    parser.addHelpOption();
-    parser.addVersionOption();
-    parser.process(app);
-    QStringList positionalArguments = parser.positionalArguments();
-
-    if (positionalArguments.length() == 2)
-    {
-        int port = positionalArguments.takeFirst().toInt();
-        QString secret = positionalArguments.takeFirst();
-        QUrl bindingAddress;
-        bindingAddress.setScheme(QStringLiteral("ws"));
-        bindingAddress.setHost(QStringLiteral("localhost"));
-        bindingAddress.setPort(port);
-        bindingAddress.setPath(QStringLiteral("/api"));
-        QUrlQuery query;
-        query.addQueryItem(QStringLiteral("token"), secret);
-        bindingAddress.setQuery(query);
-        std::string token = secret.toStdString();
-        LibHomeScreen* hs = new LibHomeScreen();
-        QLibWindowmanager* qwm = new QLibWindowmanager();
-
-        // WindowManager
-        if(qwm->init(port,secret) != 0){
-            exit(EXIT_FAILURE);
-        }
-        AGLScreenInfo screenInfo(qwm->get_scale_factor());
-        window.reset(new MainWindow(screenInfo.scale_factor()));
-
-        // Request a surface as described in layers.json windowmanager’s file
-        if (qwm->requestSurface(graphic_role) != 0) {
-            exit(EXIT_FAILURE);
-        }
-        // Create an event callback against an event type. Here a lambda is called when SyncDraw event occurs
-        qwm->set_event_handler(QLibWindowmanager::Event_SyncDraw, [qwm, &graphic_role](json_object *object) {
-                (void)object;
-                qDebug() << "Surface got syncDraw!";
-                qwm->endDraw(graphic_role);
-            });
-
-        // HomeScreen
-        hs->init(port, token.c_str());
-        // Set the event handler for Event_ShowWindow which will activate the surface for windowmanager
-        hs->set_event_handler(LibHomeScreen::Event_ShowWindow, [qwm, &graphic_role](json_object *object){
-                (void)object;
-                qDebug("Surface %s got showWindow\n", graphic_role.toStdString().c_str());
-                qwm->activateWindow(graphic_role);
-            });
-
-        g_cloudproxyclient = new CloudProxyClient();
-        g_cloudproxyclient->init(port, token.c_str());
-
-        static int i_confirm_good{0}, i_confirm_bad{0}, i_recv{0};
-        g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_SendMessageConfirmation, [&window](json_object* object){
-                qDebug("CloudProxyClient::Event_SendMessageConfirmation: object ptr %p", object);
-
-                const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
-                if (!str)
-                    str = "<empty>";
-                qDebug("Event_SendMessageConfirmation: %s", str);
-
-                json_object *j_result;
-                if(!json_object_object_get_ex(object, "result", &j_result))
-                {
-                    qDebug("Can't read confirmation result");
-                    return;
-                }
-
-                int result = (int)json_object_get_boolean(j_result);
-
-                if (result)
-                    ++i_confirm_good;
-                else
-                    ++i_confirm_bad;
-
-                window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QVariant());
-                qDebug("Application received confirmation result [good: %d, bad: %d]: %d", i_confirm_good, i_confirm_bad, result);
-            });
-        g_cloudproxyclient->set_event_handler(CloudProxyClient::Event_ReceivedMessage, [&window](json_object* object){
-                qDebug("CloudProxyClient::Event_ReceivedMessage: object ptr %p", object);
-
-                const char* str = object ? json_object_to_json_string_ext(object, JSON_C_TO_STRING_SPACED | JSON_C_TO_STRING_PRETTY) : "<obj_null>";
-                if (!str)
-                    str = "<empty>";
-                qDebug("Event_SendMessageConfirmation: %s", str);
-
-                json_object *event_data;
-                const char* data_str{nullptr};
-                if(!json_object_object_get_ex(object, "data", &event_data) ||
-                   (data_str = json_object_get_string(event_data)) == nullptr)
-                {
-                    qDebug("Can't read event data");
-                    return;
-                }
-
-                ++i_recv;
-                window->updateStat(i_confirm_good, i_confirm_bad, i_recv, QString(data_str));
-                qDebug("Application received data [count: %d,  good: %d, bad %d]: %s", i_recv, i_confirm_good, i_confirm_bad, data_str);
-            });
-
-
-        window->show();
-        qwm->slotActivateWindow();
-    }
-
-    return app.exec();
-}
diff --git a/sample/test-cloud-app/app/mainwindow.cpp b/sample/test-cloud-app/app/mainwindow.cpp
index 355847c..1fcf50c 100755
--- a/sample/test-cloud-app/app/mainwindow.cpp
+++ b/sample/test-cloud-app/app/mainwindow.cpp
@@ -58,7 +58,6 @@ void MainWindow::updateStat()
     str.append("\n\nLast received message:\n");
     str.append(lastReceivedMsg);
     ui->statLabel->setText(str);
-    //QApplication::processEvents();
 }
 
 void MainWindow::sendMsgButtonClick()
@@ -66,7 +65,8 @@ void MainWindow::sendMsgButtonClick()
     qDebug() << "MainWindow::sendMegButtonClick()";
 
     std::string msg = std::string{"{\"app_key\": \"app_value_"} + std::to_string(sendCount + sendErrorCount) + "\"}";
-    int res = g_cloudproxyclient->sendMessage(msg);
+    static int i{0};
+    int res = g_cloudproxyclient->sendMessage((++i%2 ? CloudType::Azure : CloudType::Aws), msg);
     if (res == 0)
         ++sendCount;
     else
diff --git a/src/libcloudproxy.cpp b/src/libcloudproxy.cpp
index 7b0f605..3638e46 100644
--- a/src/libcloudproxy.cpp
+++ b/src/libcloudproxy.cpp
@@ -16,24 +16,30 @@
 
 #include <thread>
 #include <algorithm>
+#include <condition_variable>
+
+#include <string.h>
 
 #include "libcloudproxy.h"
 #include "hmi-debug.h"
 
-
 static const char API_name[] = "cloudproxy";
 
 const std::vector<std::string> CloudProxyClient::m_api_list {
-        std::string("ping"),
-        std::string("createConnection"),
-        std::string("sendMessage"),
-        std::string("destroyConnection")
-    };
+    std::string("ping"),
+    std::string("sendMessage")
+};
 
 const std::vector<std::string> CloudProxyClient::m_event_list {
-        std::string("sendMessageConfirmation"),
-        std::string("receivedMessage")
-    };
+    std::string("sendMessageConfirmation"),
+    std::string("receivedMessage")
+};
+
+
+bool CloudType::isSupported(const char* type)
+{
+    return (type && (strcmp(Azure, type) == 0 || strcmp(Aws, type) == 0));
+}
 
 static void event_loop_run(sd_event* loop)
 {
@@ -134,9 +140,11 @@ int CloudProxyClient::init(const int port, const std::string& token)
 }
 
 
-int CloudProxyClient::call(const std::string& verb, json_object* arg)
+int CloudProxyClient::call_sync(const std::string& verb, json_object* arg)
 {
-    int ret;
+    std::lock_guard<std::mutex> l(m_mutex);
+
+    int ret{-1};
     if(!m_websock)
     {
         return -1;
@@ -148,8 +156,49 @@ int CloudProxyClient::call(const std::string& verb, json_object* arg)
         return -1;
     }
 
-    ret = afb_wsj1_call_j(m_websock, API_name, verb.c_str(), arg, ::on_reply, this);
-    if (ret < 0)
+    std::condition_variable cv;
+    std::mutex cv_m;
+    bool signal{false};
+
+    std::function<void(afb_wsj1_msg *msg)> local_on_reply = [&ret, &cv, &cv_m, &signal](afb_wsj1_msg *msg)->void
+    {
+        std::unique_lock<std::mutex> lock(cv_m);
+
+        if (msg && afb_wsj1_msg_is_reply_ok(msg))
+            ret = 0;
+        else
+            ret = -1;
+
+        signal = true;
+        cv.notify_all();
+    };
+
+    int call_ret = afb_wsj1_call_j(m_websock, API_name, verb.c_str(), arg,
+                                   [](void *closure, afb_wsj1_msg *msg)->void
+                                   {
+                                       auto *cb = reinterpret_cast<std::function<void(afb_wsj1_msg *msg)> *>(closure);
+                                       if (!cb || !(*cb))
+                                       {
+                                           HMI_ERROR("cloudproxyclient", "Can't process reply: invalid callback");
+                                           return;
+                                       }
+                                       (*cb)(msg);
+                                   },
+                                   &local_on_reply);
+
+    if (call_ret == 0)
+    {
+        // Wait a signal if not received yet:
+        std::unique_lock<std::mutex> lock(cv_m);
+        if (!signal)
+            cv.wait(lock);
+    }
+    else
+    {
+        ret = call_ret;
+    }
+
+    if (ret != 0)
     {
         HMI_ERROR("cloudproxyclient", "Failed to call verb:%s", verb.c_str());
     }
@@ -158,15 +207,16 @@ int CloudProxyClient::call(const std::string& verb, json_object* arg)
 }
 
 
-int CloudProxyClient::sendMessage(const std::string& data)
+int CloudProxyClient::sendMessage(const std::string& cloud_type, const std::string& data)
 {
-    if(!m_websock)
+    if(!m_websock || !CloudType::isSupported(cloud_type.c_str()))
         return -1;
 
     json_object* j_obj = json_object_new_object();
+    json_object_object_add(j_obj, "cloud_type", json_object_new_string(cloud_type.c_str()));
     json_object_object_add(j_obj, "data", json_object_new_string(data.c_str()));
 
-    return this->call("sendMessage", j_obj);
+    return this->call_sync("sendMessage", j_obj);
 }
 
 void CloudProxyClient::set_event_handler(enum EventType et, handler_func f)
@@ -185,7 +235,7 @@ void CloudProxyClient::set_event_handler(enum EventType et, handler_func f)
                 break;
         }
 
-        this->handlers[et] = std::move(f);
+        this->m_handlers[et] = std::move(f);
     }
 }
 
@@ -214,7 +264,7 @@ int CloudProxyClient::unsubscribe(const std::string& event_name)
 
     int ret = afb_wsj1_call_j(m_websock, API_name, "unsubscribe", j_obj, ::on_reply, this);
     if (ret < 0)
-        HMI_ERROR("cloudproxyclient", "unsubscribe filed for '%s'", event_name.c_str());
+        HMI_ERROR("cloudproxyclient", "unsubscribe failed for '%s'", event_name.c_str());
 
     return ret;
 }
@@ -248,14 +298,14 @@ void CloudProxyClient::on_event(void *closure, const char *event, afb_wsj1_msg *
     const std::string et{event_type};
     if (CloudProxyClient::m_event_list[0] == et)
     {
-        auto i = this->handlers.find(Event_SendMessageConfirmation);
-        if (i != this->handlers.end())
+        auto i = this->m_handlers.find(Event_SendMessageConfirmation);
+        if (i != this->m_handlers.end())
             i->second(json_data);
     }
     else if (CloudProxyClient::m_event_list[1] == et)
     {
-        auto i = this->handlers.find(Event_ReceivedMessage);
-        if (i != this->handlers.end())
+        auto i = this->m_handlers.find(Event_ReceivedMessage);
+        if (i != this->m_handlers.end())
             i->second(json_data);
     }
 }