#include <cstring>
#include <algorithm>
#include "hs-clientmanager.h"
+#include "hs-apprecover.h"
static const char _homescreen[] = "homescreen";
+static const char _area[] = "area";
+static const char _parameter[] = "parameter";
HS_ClientManager* HS_ClientManager::me = nullptr;
{
AFB_INFO("verb=[%s],appid=[%s].", verb, appid);
int ret = 0;
- std::lock_guard<std::mutex> lock(this->mtx);
+ bool isRegisterApp = false;
if(appid == nullptr) {
+ std::lock_guard<std::mutex> lock(this->mtx);
for(auto m : client_list) {
m.second->handleRequest(request, verb);
}
}
else {
+ std::lock_guard<std::mutex> lock(this->mtx);
auto ip = client_list.find(std::string(appid));
if(ip != client_list.end()) {
ret = ip->second->handleRequest(request, verb);
appid2ctxt[appid] = createClientCtxt(request, appid);
HS_Client* client = addClient(request, appid);
ret = client->handleRequest(request, "subscribe");
- registerApplication(appid);
+ isRegisterApp = true;
}
else {
AFB_NOTICE("not exist session");
}
}
}
+ if(isRegisterApp) {
+ checkRegisterApp(request->api, std::string(appid));
+ }
return ret;
}
*/
int HS_ClientManager::pushEvent(const char *event, struct json_object *param, std::string appid)
{
+ AFB_INFO("event=[%s], appid=[%s].", event, appid.c_str());
if(event == nullptr) {
AFB_WARNING("event name is null.");
return -1;
}
/**
- * register recovered application
+ * check register application
*
* #### Parameters
- * - appid : application id
+ * - api : the api
+ * - appid : register application's id
*
* #### Return
* None
*
*/
-void HS_ClientManager::registerApplication(std::string appid)
+void HS_ClientManager::checkRegisterApp(afb_api_t api, const std::string &appid)
{
+ if(HS_AppRecover::instance()->registerRecoveredApp(api, appid)) {
+ AFB_INFO("register recover application %s.", appid.c_str());
+ return;
+ }
+ if(startup_appid == appid) {
+ startup_appid.clear();
+// pushEvent("showWindow", nullptr, appid);
+ struct json_object* json_param = json_object_new_object();
+ json_object_object_add(json_param, _area, json_object_new_string(startup_area.c_str()));
+ pushEvent("showWindow", json_param, appid);
+ startup_area.clear();
+ }
}
\ No newline at end of file