mkrieger/Wachalarm-IP-Web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update Di 16. Jun 09:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-06-16 09:01:01 +02:00
parent 2a7a201dfe
commit de2a953acc
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server.js
View File

@ -8,6 +8,7 @@ const webserver = https.createServer({
cert: fs.readFileSync('./misc/server.cert', 'utf8') cert: fs.readFileSync('./misc/server.cert', 'utf8')
}, app); }, app);
const io = require('socket.io').listen(webserver); const io = require('socket.io').listen(webserver);
const io_api = require('socket.io-client');
const async = require('async'); const async = require('async');
const path = require('path'); const path = require('path');
const favicon = require('serve-favicon'); const favicon = require('serve-favicon');
@ -34,13 +35,21 @@ app.use(bodyParser.urlencoded({
extended: false extended: false
})); }));
// Remote-Api aktivieren
var remote_api
if (app_cfg.endpoint.enabled) {
remote_api = io_api.connect(app_cfg.endpoint.host, {
reconnect: true
});
};
// Scripte einbinden // Scripte einbinden
var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg); var sql_cfg = require('./server/sql_cfg')(fs, bcrypt, app_cfg);
var sql = require('./server/sql_qry')(sql_cfg, app_cfg); var sql = require('./server/sql_qry')(sql_cfg, app_cfg);
var brk = require('./server/broker')(app_cfg, sql, uuidv4); var brk = require('./server/broker')(app_cfg, sql, uuidv4);
var waip = require('./server/waip')(io, sql, fs, brk, async, app_cfg, api); var waip = require('./server/waip')(io, sql, fs, brk, async, app_cfg);
var saver = require('./server/saver')(app_cfg, sql, waip, uuidv4); var saver = require('./server/saver')(app_cfg, sql, waip, uuidv4, io);
var api = require('./server/api')(io, sql, app_cfg, saver); var api = require('./server/api')(io, sql, app_cfg, remote_api, saver);
var socket = require('./server/socket')(io, sql, app_cfg, waip); var socket = require('./server/socket')(io, sql, app_cfg, waip);
var udp = require('./server/udp')(app_cfg, sql, saver); var udp = require('./server/udp')(app_cfg, sql, saver);
var auth = require('./server/auth')(app, app_cfg, sql_cfg, async, bcrypt, passport, io); var auth = require('./server/auth')(app, app_cfg, sql_cfg, async, bcrypt, passport, io);

9
server/saver.js
View File

@ -47,7 +47,11 @@ module.exports = function (app_cfg, sql, waip, uuidv4) {
}; };
// Einsatz in DB Speichern // Einsatz in DB Speichern
waip.waip_speichern(waip_data, app_id); waip.waip_speichern(waip_data, app_id);
sql.db_log('WAIP', 'Neuer Einsatz von ' + remote_addr + ' wird jetzt verarbeitet: ' + waip_data); sql.db_log('WAIP', 'Neuer Einsatz von ' + remote_addr + ' wird jetzt verarbeitet: ' + waip_data);
// Einsatzdaten per API weiterleiten (entweder zum Server oder zum verbunden Client)
// TODO TEST: Api WAIP
api.server_to_client_new_waip(waip_data, app_id);
api.client_to_server_new_waip(waip_data, app_id);
}); });
} else { } else {
sql.db_log('WAIP', 'Fehler: Einsatz von ' + remote_addr + ' nicht valide: ' + waip_data); sql.db_log('WAIP', 'Fehler: Einsatz von ' + remote_addr + ' nicht valide: ' + waip_data);
@ -70,6 +74,9 @@ module.exports = function (app_cfg, sql, waip, uuidv4) {
callback && callback(result); callback && callback(result);
}; };
}); });
// TODO TEST: Api WAIP
api.server_to_client_new_rmld(req.body, app_id);
api.client_to_server_new_rmld(req.body, app_id);
} else { } else {
sql.db_log('RMLD', 'Fehler: Rückmeldung von ' + remote_addr + ' nicht valide: ' + waip_data); sql.db_log('RMLD', 'Fehler: Rückmeldung von ' + remote_addr + ' nicht valide: ' + waip_data);
}; };

9
server/waip.js
View File

@ -1,4 +1,4 @@
module.exports = function (io, sql, fs, brk, async, app_cfg, api) { module.exports = function (io, sql, fs, brk, async, app_cfg) {
// Module laden // Module laden
const json2csv = require('json2csv'); const json2csv = require('json2csv');
@ -48,10 +48,6 @@ module.exports = function (io, sql, fs, brk, async, app_cfg, api) {
}; };
}); });
}); });
// Einsatzdaten per API weiterleiten (entweder zum Server oder zum verbunden Client)
// TODO TEST: Api WAIP
api.server_to_client_new_waip(waip_data, app_id);
api.client_to_server_new_waip(waip_data, app_id);
}; };
function waip_verteilen(waip_id, socket, wachen_nr) { function waip_verteilen(waip_id, socket, wachen_nr) {
@ -109,9 +105,6 @@ module.exports = function (io, sql, fs, brk, async, app_cfg, api) {
callback && callback(saved); callback && callback(saved);
}; };
}); });
// TODO TEST: Api WAIP
api.server_to_client_new_rmld(req.body, app_id);
api.client_to_server_new_rmld(req.body, app_id);
}; };
function rmld_verteilen_by_uuid(waip_uuid, rmld_uuid) { function rmld_verteilen_by_uuid(waip_uuid, rmld_uuid) {