Refactoring project layout

src/RESTAPI/RESTAPI_RPC.cpp

@@ -0,0 +1,118 @@
+//
+// Created by stephane bourque on 2021-06-28.
+//
+#include <cctype>
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <future>
+#include <numeric>
+#include <chrono>
+#include "RESTAPI_RPC.h"
+
+#include "CommandManager.h"
+#include "DeviceRegistry.h"
+#include "StorageService.h"
+#include "framework/uCentralProtocol.h"
+
+namespace OpenWifi::RESTAPI_RPC {
+	void SetCommandStatus(GWObjects::CommandDetails &Cmd,
+							 Poco::Net::HTTPServerRequest &Request,
+							 Poco::Net::HTTPServerResponse &Response,
+					  		 RESTAPIHandler *Handler,
+					  		 OpenWifi::Storage::CommandExecutionType Status,
+							 Poco::Logger &Logger) {
+		if (Storage()->AddCommand(Cmd.SerialNumber, Cmd, Status)) {
+			Poco::JSON::Object RetObj;
+			Cmd.to_json(RetObj);
+			Handler->ReturnObject(RetObj);
+			return;
+		} else {
+			Handler->ReturnStatus(Poco::Net::HTTPResponse::HTTP_INTERNAL_SERVER_ERROR);
+			return;
+		}
+	}
+
+	void WaitForCommand(GWObjects::CommandDetails &Cmd,
+						Poco::JSON::Object  & Params,
+						Poco::Net::HTTPServerRequest &Request,
+						Poco::Net::HTTPServerResponse &Response,
+						int64_t WaitTimeInMs,
+						Poco::JSON::Object * ObjectToReturn,
+						RESTAPIHandler * Handler,
+						Poco::Logger &Logger) {
+
+		// 	if the command should be executed in the future, or if the device is not connected, then we should just add the command to
+		//	the DB and let it figure out when to deliver the command.
+		if(Cmd.RunAt || !DeviceRegistry()->Connected(Cmd.SerialNumber)) {
+			SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
+			return;
+		}
+
+		Cmd.Executed = std::time(nullptr);
+
+		uint64_t RPC_Id=0;
+		if (CommandManager()->SendCommand(Cmd.SerialNumber, Cmd.Command, Params, Cmd.UUID, RPC_Id)) {
+			CommandTag T;
+			while (CommandManager()->Running() && WaitTimeInMs > 0) {
+				if (CommandManager()->GetCommand(RPC_Id, Cmd.SerialNumber, T)) {
+					auto Answer = T.Result;
+					if (Answer->has("result") && Answer->isObject("result")) {
+						auto ResultFields =
+							Answer->get("result").extract<Poco::JSON::Object::Ptr>();
+						if (ResultFields->has("status") && ResultFields->isObject("status")) {
+							auto StatusInnerObj =
+								ResultFields->get("status").extract<Poco::JSON::Object::Ptr>();
+							if (StatusInnerObj->has("error"))
+								Cmd.ErrorCode = StatusInnerObj->get("error");
+							if (StatusInnerObj->has("text"))
+								Cmd.ErrorText = StatusInnerObj->get("text").toString();
+							std::stringstream ResultText;
+							Poco::JSON::Stringifier::stringify(Answer->get("result"), ResultText);
+							Cmd.Results = ResultText.str();
+							Cmd.Status = "completed";
+							Cmd.Completed = time(nullptr);
+
+							if (Cmd.ErrorCode && Cmd.Command == uCentralProtocol::TRACE) {
+								Cmd.WaitingForFile = 0;
+								Cmd.AttachDate = Cmd.AttachSize = 0;
+								Cmd.AttachType = "";
+							}
+
+							//	Add the completed command to the database...
+							Storage()->AddCommand(Cmd.SerialNumber, Cmd,
+												  Storage::COMMAND_COMPLETED);
+
+							if (ObjectToReturn) {
+								Handler->ReturnObject(*ObjectToReturn);
+							} else {
+								Poco::JSON::Object O;
+								Cmd.to_json(O);
+								Handler->ReturnObject(O);
+							}
+							return;
+						} else {
+							SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
+							Logger.information(Poco::format("Invalid response for command '%s'. Missing status.", Cmd.UUID));
+							return;
+						}
+					} else {
+						SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_FAILED, Logger);
+						Logger.information(Poco::format("Invalid response for command '%s'. Missing result.", Cmd.UUID));
+						return;
+					}
+				} else {
+					Poco::Thread::trySleep(100);
+					WaitTimeInMs -= 100;
+				}
+			}
+			if(WaitTimeInMs<0)
+				SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_TIMEDOUT, Logger);
+			else
+				SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
+		} else {
+			SetCommandStatus(Cmd, Request, Response, Handler, Storage::COMMAND_PENDING, Logger);
+		}
+	}
+
+}