X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fhs-clientmanager.cpp;h=beac8166efbf76b20c907cf82fbfd28d4319fe5e;hb=88b0383f833c345d0c6ff8304f471ef9413487d5;hp=a79e9bb2a7485b92fb80c9f4061a33f50855fa06;hpb=789ecb879cc529400b290eb9750fd1f9298fc690;p=apps%2Fagl-service-homescreen.git

diff --git a/src/hs-clientmanager.cpp b/src/hs-clientmanager.cpp
index a79e9bb..beac816 100644
--- a/src/hs-clientmanager.cpp
+++ b/src/hs-clientmanager.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2018 TOYOTA MOTOR CORPORATION
+ * Copyright (C) 2020 Konsulko Group
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +15,11 @@
  * limitations under the License.
  */
 
+#include <cstring>
+#include <algorithm>
 #include "hs-clientmanager.h"
-#include "hmi-debug.h"
+
+static const char _homescreen[] = "homescreen";
 
 HS_ClientManager* HS_ClientManager::me = nullptr;
 
@@ -68,74 +72,7 @@ HS_ClientManager* HS_ClientManager::instance(void)
  */
 int HS_ClientManager::init(void)
 {
-    HMI_NOTICE("homescreen-service","called.");
-    // TODO : connect to windowmanger
-    // get applist from appfw
-}
-
-/**
- * find HS_Client in client_list
- *
- * #### Parameters
- *  - appid: app's id
- *
- * #### Return
- * found HS_Client pointer
- *
- */
-HS_Client* HS_ClientManager::find(std::string appid)
-{
-    std::lock_guard<std::mutex> lock(this->mtx);
-    HS_Client* p = nullptr;
-    auto ip = client_list.find(appid);
-    if(ip != client_list.end()) {
-        p = client_list[appid];
-    }
-    return p;
-}
-
-/**
- * get HS_Client
- *
- * #### Parameters
- *  - appid: app's id
- *
- * #### Return
- * found HS_Client pointer
- *
- */
-HS_Client* HS_ClientManager::getClient(afb_req_t req, std::string appid)
-{
-    std::lock_guard<std::mutex> lock(this->mtx);
-    HS_Client* p = nullptr;
-    auto ip = client_list.find(appid);
-    if(ip != client_list.end()) {
-        p = client_list[appid];
-    }
-    else {
-        appid2ctxt[appid] = createClientCtxt(req, appid);
-        p = addClient(req, appid);
-    }
-    return p;
-}
-
-/**
- * get HS_Client pointers set
- *
- * #### Parameters
- *  - Nothing
- *
- * #### Return
- * HS_Client pointers set
- *
- */
-std::vector<HS_Client*> HS_ClientManager::getAllClient(void)
-{
-    std::lock_guard<std::mutex> lock(this->mtx);
-    std::vector<HS_Client*> v;
-    for(auto a : client_list)
-        v.push_back(a.second);
-    return v;
+    return 0;
 }
 
 /**
@@ -153,11 +90,13 @@ HS_ClientCtxt* HS_ClientManager::createClientCtxt(afb_req_t req, std::string app
     HS_ClientCtxt *ctxt = (HS_ClientCtxt *)afb_req_context_get(req);
     if (!ctxt)
     {
-        HMI_NOTICE("homescreen-service", "create new session for %s", appid.c_str());
-        HS_ClientCtxt *ctxt = new HS_ClientCtxt(appid.c_str());
+        AFB_INFO( "create new session for %s", appid.c_str());
+        ctxt = new HS_ClientCtxt(appid);
         afb_req_session_set_LOA(req, 1);
         afb_req_context_set(req, ctxt, cbRemoveClientCtxt);
     }
+
+    appid2ctxt[appid] = ctxt;
     return ctxt;
 }
 
@@ -207,13 +146,94 @@ void HS_ClientManager::removeClientCtxt(void *data)
     HS_ClientCtxt *ctxt = (HS_ClientCtxt *)data;
     if(ctxt == nullptr)
     {
-        HMI_ERROR("homescreen-service", "data is nullptr");
+        AFB_WARNING( "data is nullptr");
         return;
     }
 
-    HMI_NOTICE("homescreen-service", "remove app %s", ctxt->id.c_str());
+    AFB_INFO( "remove app %s", ctxt->id.c_str());
     std::lock_guard<std::mutex> lock(this->mtx);
     removeClient(ctxt->id);
     delete appid2ctxt[ctxt->id];
     appid2ctxt.erase(ctxt->id);
 }
+
+/**
+ * handle homescreen request
+ *
+ * #### Parameters
+ *  - request : the request
+ *  - verb : the verb name
+ *  - appid : to which application
+ *
+ * #### Return
+ * 0 : success
+ * others : fail
+ *
+ */
+int HS_ClientManager::handleRequest(afb_req_t request, const char *verb, const char *appid)
+{
+    AFB_INFO("verb=[%s],appid=[%s].", verb, appid);
+    int ret = 0;
+    std::lock_guard<std::mutex> lock(this->mtx);
+    if(appid == nullptr) {
+        for(auto m : client_list) {
+            m.second->handleRequest(request, verb);
+        }
+    }
+    else {
+        std::string id(appid);
+        auto ip = client_list.find(id);
+        if(ip != client_list.end()) {
+	    // FIXME: do another verification here in case the application died
+            ret = ip->second->handleRequest(request, verb);
+        }
+        else {
+            if(!strcasecmp(verb, "subscribe")) {
+                createClientCtxt(request, id);
+                HS_Client* client = addClient(request, id);
+                ret = client->handleRequest(request, "subscribe");
+            }
+            else {
+                AFB_NOTICE("not exist session");
+                ret = AFB_REQ_NOT_STARTED_APPLICATION;
+            }
+        }
+    }
+    return ret;
+}
+
+/**
+ * push event
+ *
+ * #### Parameters
+ *  - event : the event want to push
+ *  - param : the parameter contents of event
+ *  - appid : the destination application's id
+ *
+ * #### Return
+ * 0 : success
+ * others : fail
+ *
+ */
+int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid)
+{
+    if(event == nullptr) {
+        AFB_WARNING("event name is null.");
+        return -1;
+    }
+
+    std::lock_guard<std::mutex> lock(this->mtx);
+    if(appid.empty()) { // broadcast event to clients who subscribed this event
+        for(auto m : client_list) {
+            m.second->pushEvent(event, param);
+        }
+    }
+    else {  // push event to specific client
+        auto ip = client_list.find(appid);
+        if(ip != client_list.end()) {
+            ip->second->pushEvent(event, param);
+        }
+    }
+
+    return 0;
+}