weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.1.0' of https://github.com/Pax1601/DCSOlympus into v0.1.0

Browse Source
This commit is contained in:
PeekabooSteam 2023-03-06 20:44:39 +00:00
commit c4b03a7795
12 changed files with 84 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/index.ts
View File

@ -99,17 +99,29 @@ function setup() {
getUnits((data: UnitsData) => getUnitsManager()?.update(data), true /* Does a full refresh */);
/* Start periodically requesting updates */
requestUpdate(true /* Start looping */);
startPeriodicUpdate();
}
function requestUpdate(loop: boolean) {
function startPeriodicUpdate()
{
requestUpdate();
requestRefresh();
}
function requestUpdate() {
/* Main update rate = 250ms is minimum time, equal to server update time. */
getUnits((data: UnitsData) => getUnitsManager()?.update(data))
setTimeout(() => requestUpdate(loop), getConnected() ? 250 : 1000);
getUnits((data: UnitsData) => getUnitsManager()?.update(data), false);
setTimeout(() => requestUpdate(), getConnected() ? 250 : 1000);
getConnectionStatusPanel()?.update(getConnected());
}
function requestRefresh() {
/* Main refresh rate = 5000ms. */
getUnits((data: UnitsData) => getUnitsManager()?.update(data), true);
setTimeout(() => requestUpdate(), 5000);
}
export function getMap() {
return map;
}

10
client/src/server/server.ts
View File

@ -1,7 +1,7 @@
import * as L from 'leaflet'
import { setConnected } from '..';
const DEMO = true;
const DEMO = false;
/* Edit here to change server address */
const REST_ADDRESS = "http://localhost:30000/olympus";
@ -18,9 +18,11 @@ export function GET(callback: CallableFunction, uri: string){
xmlHttp.onload = function (e) {
var data = JSON.parse(xmlHttp.responseText);
callback(data);
setConnected(true);
};
xmlHttp.onerror = function () {
console.error("An error occurred during the XMLHttpRequest");
setConnected(false);
};
xmlHttp.send(null);
}
@ -29,7 +31,9 @@ export function POST(request: object, callback: CallableFunction){
var xhr = new XMLHttpRequest();
xhr.open("PUT", REST_ADDRESS);
xhr.setRequestHeader("Content-Type", "application/json");
xhr.onreadystatechange = () => { callback(); };
xhr.onreadystatechange = () => {
callback();
};
xhr.send(JSON.stringify(request));
}
@ -47,7 +51,7 @@ export function getLogs(callback: CallableFunction) {
export function getUnits(callback: CallableFunction, refresh: boolean = false) {
if (!DEMO)
GET(callback, `${UNITS_URI}/${refresh? REFRESH_URI: UPDATE_URI}}`);
GET(callback, `${UNITS_URI}/${refresh? REFRESH_URI: UPDATE_URI}`);
else
callback(refresh? generateRandomUnitsDemoData(100): {units:{}});
}

4
client/src/units/unitsmanager.ts
View File

@ -49,14 +49,14 @@ export class UnitsManager {
.reduce((timeout: number, ID: string) => {
setTimeout(() => {
this.addUnit(parseInt(ID), data.units[ID]);
this.#units[parseInt(ID)].setData(data.units[ID]);
this.#units[parseInt(ID)]?.setData(data.units[ID]);
}, timeout);
return timeout + 10;
}, 10);
Object.keys(data.units)
.filter((ID: string) => ID in this.#units)
.forEach((ID: string) => this.#units[parseInt(ID)].setData(data.units[ID]));
.forEach((ID: string) => this.#units[parseInt(ID)]?.setData(data.units[ID]));
}
forceUpdate() {

14
scripts/OlympusMission.lua
View File

@ -11,13 +11,13 @@ function Olympus.setMissionData(arg, time)
local missionData = {}
-- Bullseye data
local bullseye = {}
local bullseyes = {}
for i = 0, 2 do
local bullseyeVec3 = coalition.getMainRefPoint(i)
local bullseyeLatitude, bullseyeLongitude, bullseyeAltitude = coord.LOtoLL(bullseyeVec3)
bullseye[i] = {}
bullseye[i]["lat"] = bullseyeLatitude
bullseye[i]["lng"] = bullseyeLongitude
bullseyes[i] = {}
bullseyes[i]["lat"] = bullseyeLatitude
bullseyes[i]["lng"] = bullseyeLongitude
end
-- Units tactical data
@ -51,7 +51,7 @@ function Olympus.setMissionData(arg, time)
end
end
end
if index == endIndex then
if index >= endIndex then
break
end
end
@ -77,10 +77,8 @@ function Olympus.setMissionData(arg, time)
basesData[i] = info
end
-- Assemble missionData table
missionData["bullseye"] = bullseye
missionData["bullseyes"] = bullseyes
missionData["unitsData"] = unitsData
missionData["airbases"] = basesData

32
src/core/src/Unit.cpp
View File

@ -83,16 +83,24 @@ json::value Unit::json(bool fullRefresh)
{
auto json = json::value::object();
/********** Base data **********/
json[L"AI"] = AI;
json[L"name"] = json::value::string(name);
json[L"unitName"] = json::value::string(unitName);
json[L"groupName"] = json::value::string(groupName);
json[L"alive"] = alive;
json[L"category"] = json::value::string(getCategory());
/********** Flight data **********/
json[L"flightData"] = json::value::object();
json[L"flightData"][L"latitude"] = latitude;
json[L"flightData"][L"longitude"] = longitude;
json[L"flightData"][L"altitude"] = altitude;
json[L"flightData"][L"speed"] = speed;
json[L"flightData"][L"heading"] = heading;
if (fullRefresh)
{
/********** Base data **********/
json[L"AI"] = AI;
json[L"name"] = json::value::string(name);
json[L"unitName"] = json::value::string(unitName);
json[L"groupName"] = json::value::string(groupName);
json[L"alive"] = alive;
json[L"category"] = json::value::string(getCategory());
/********** Mission data **********/
json[L"missionData"] = json::value::object();
json[L"missionData"][L"fuel"] = fuel;
@ -145,14 +153,6 @@ json::value Unit::json(bool fullRefresh)
json[L"optionsData"][L"reactionToThreat"] = json::value::string(reactionToThreat);
}
/********** Flight data **********/
json[L"flightData"] = json::value::object();
json[L"flightData"][L"latitude"] = latitude;
json[L"flightData"][L"longitude"] = longitude;
json[L"flightData"][L"altitude"] = altitude;
json[L"flightData"][L"speed"] = speed;
json[L"flightData"][L"heading"] = heading;
return json;
}

4
src/core/src/core.cpp
View File

@ -12,7 +12,7 @@ UnitsManager* unitsManager = nullptr;
Server* server = nullptr;
Scheduler* scheduler = nullptr;
json::value airbasesData;
json::value bullseyeData;
json::value bullseyesData;
mutex mutexLock;
bool initialized = false;
@ -91,7 +91,7 @@ extern "C" DllExport int coreMissionData(lua_State * L)
if (missionData.has_object_field(L"airbases"))
airbasesData = missionData[L"airbases"];
if (missionData.has_object_field(L"bullseye"))
bullseyeData = missionData[L"bullseye"];
bullseyesData = missionData[L"bullseyes"];
return(0);
}

41
src/core/src/server.cpp
View File

@ -10,7 +10,7 @@
extern UnitsManager* unitsManager;
extern Scheduler* scheduler;
extern json::value airbasesData;
extern json::value bullseyeData;
extern json::value bullseyesData;
extern mutex mutexLock;
void handle_eptr(std::exception_ptr eptr)
@ -71,28 +71,29 @@ void Server::handle_get(http_request request)
std::exception_ptr eptr;
try {
auto answer = json::value::object();
wstring requestUri = request.request_uri().to_string();
log(requestUri);
if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(UNITS_URI) + L"/" + wstring(PARTIAL_REFRESH_URI)) == 0)
unitsManager->updateAnswer(answer, false);
auto path = uri::split_path(uri::decode(request.relative_uri().path()));
if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(UNITS_URI) + L"/" + wstring(FULL_REFRESH_URI)) == 0)
unitsManager->updateAnswer(answer, true);
/* Get the logs from the logger */
if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(LOGS_URI)) == 0)
if (path.size() > 0)
{
auto logs = json::value::object();
getLogsJSON(logs); // By reference, for thread safety
answer[L"logs"] = logs;
if (path[0] == UNITS_URI && path.size() > 1)
{
if (path[1] == UPDATE_URI)
unitsManager->updateAnswer(answer, false);
else if (path[1] == REFRESH_URI)
unitsManager->updateAnswer(answer, true);
}
else if (path[0] == LOGS_URI)
{
auto logs = json::value::object();
getLogsJSON(logs, 100); // By reference, for thread safety. Get the last 100 log entries
answer[L"logs"] = logs;
}
else if (path[0] == AIRBASES_URI)
answer[L"airbases"] = airbasesData;
else if (path[0] == BULLSEYE_URI)
answer[L"bullseyes"] = bullseyesData;
}
if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(AIRBASES_URI)) == 0)
answer[L"airbases"] = airbasesData;
if (requestUri.compare(L"/" + wstring(REST_URI) + L"/" + wstring(BULLSEYE_URI)) == 0)
answer[L"bullseye"] = bullseyeData;
response.set_body(answer);
}
catch (...) {

2
src/logger/include/interface.h
View File

@ -3,4 +3,4 @@
void DllExport log(const std::string& sMessage);
void DllExport log(const std::wstring& sMessage);
void DllExport getLogsJSON(json::value& json);
void DllExport getLogsJSON(json::value& json, int logsNumber = NULL);

2
src/logger/include/logger.h
View File

@ -7,7 +7,7 @@ class Logger
public:
void log(const string& sMessage);
void log(const wstring& sMessage);
void toJSON(json::value& json);
void toJSON(json::value& json, int logsNumber = NULL);
static Logger* GetLogger();

4
src/logger/src/interface.cpp
View File

@ -14,7 +14,7 @@ void log(const wstring& message)
LOGGER->log(message);
}
void getLogsJSON(json::value& json)
void getLogsJSON(json::value& json, int logsNumber)
{
LOGGER->toJSON(json);
LOGGER->toJSON(json, logsNumber);
}

10
src/logger/src/logger.cpp
View File

@ -32,12 +32,16 @@ void Logger::Close()
m_Logfile.close();
}
void Logger::toJSON(json::value& json)
void Logger::toJSON(json::value& json, int logsNumber)
{
lock_guard<mutex> guard(mutexLock);
int i = 0;
for (auto log : m_logs)
json[to_wstring(i++)] = json::value::string(to_wstring(log));
for (auto itr = m_logs.end(); itr != m_logs.begin(); --itr)
{
json[to_wstring(m_logs.size() - 1 - i)] = json::value::string(to_wstring(*itr));
if (logsNumber != 0 && i > logsNumber)
break;
}
}
void Logger::log(const string& message)

6
src/shared/include/defines.h
View File

@ -5,10 +5,10 @@
#define REST_ADDRESS L"http://localhost:30000"
#define REST_URI L"olympus"
#define UNITS_URI L"units"
#define PARTIAL_REFRESH_URI L"partial"
#define FULL_REFRESH_URI L"full"
#define UPDATE_URI L"update"
#define REFRESH_URI L"refresh"
#define LOGS_URI L"logs"
#define AIRBASES_URI L"airbases"
#define BULLSEYE_URI L"bullseye"
#define BULLSEYE_URI L"bullseyes"
#define UPDATE_TIME_INTERVAL 0.25