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

update So 24. Mai 17:01:01 CEST 2020

Browse Source
This commit is contained in:
Robert Richter 2020-05-24 17:01:01 +02:00
parent 9e1c03c64a
commit 6941d6ba0e
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server.js
View File

@ -2,13 +2,14 @@
const fs = require('fs'); const fs = require('fs');
const express = require('express'); const express = require('express');
const app = express(); const app = express();
const http = require('http') //.Server(app); const http = require('http');
const https = require('https'); //.Server(app); const https = require('https');
const webserver = https.createServer({ const webserver = https.createServer({
key: fs.readFileSync('./misc/server.key', 'utf8'), key: fs.readFileSync('./misc/server.key', 'utf8'),
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');
@ -39,9 +40,9 @@ app.use(bodyParser.urlencoded({
// 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, uuidv4, turf, app_cfg); var sql = require('./server/sql_qry')(sql_cfg, uuidv4, turf, app_cfg);
var tw = require('./server/twitter')(twit, uuidv4, app_cfg); var brk = require('./server/broker')(twit, uuidv4, app_cfg);
var waip = require('./server/waip')(io, sql, tw, async, app_cfg); var waip = require('./server/waip')(io, sql, brk, async, app_cfg);
var socket = require('./server/socket')(io, sql, app_cfg, waip); var socket = require('./server/socket')(io, io_api, sql, app_cfg, waip);
var udp = require('./server/udp')(app_cfg, waip, sql); var udp = require('./server/udp')(app_cfg, waip, sql);
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);
var routes = require('./server/routing')(app, sql, uuidv4, app_cfg, passport, auth, waip, udp); var routes = require('./server/routing')(app, sql, uuidv4, app_cfg, passport, auth, waip, udp);

0
server/twitter.js → server/broker.js
View File

4
server/socket.js
View File

@ -1,8 +1,8 @@
module.exports = function (io, sql, app_cfg, waip) { module.exports = function (io, io_api, sql, app_cfg, waip) {
// Module laden // Module laden
//client.js //client.js
var io_api = require('socket.io-client');
var socket_api = io_api.connect(app_cfg.global.remoteapi, { var socket_api = io_api.connect(app_cfg.global.remoteapi, {
reconnect: true reconnect: true
}); });

8
server/waip.js
View File

@ -1,4 +1,4 @@
module.exports = function (io, sql, tw, async, app_cfg) { module.exports = function (io, sql, brk, async, app_cfg) {
// Einsatzmeldung in Datenbank speichern // Einsatzmeldung in Datenbank speichern
function einsatz_speichern(einsatz_rohdaten) { function einsatz_speichern(einsatz_rohdaten) {
@ -29,9 +29,9 @@ module.exports = function (io, sql, tw, async, app_cfg) {
sql.db_get_vmtl_list(waip_id, function (vmtl_data) { sql.db_get_vmtl_list(waip_id, function (vmtl_data) {
if (vmtl_data) { if (vmtl_data) {
if (app_cfg.global.development) { if (app_cfg.global.development) {
console.log('Daten Twitter: ' + JSON.stringify(vmtl_data)); console.log('Daten Vermittlung: ' + JSON.stringify(vmtl_data));
}; };
tw.alert_vmtl_list(vmtl_data, function (result) { brk.alert_vmtl_list(vmtl_data, function (result) {
if (!result) { if (!result) {
sql.db_log('VMTL', 'Link zur Einsatz-Rückmeldung erfolgreichen an Vermittler-Liste gesendet. ' + result); sql.db_log('VMTL', 'Link zur Einsatz-Rückmeldung erfolgreichen an Vermittler-Liste gesendet. ' + result);
} else { } else {
@ -341,7 +341,7 @@ module.exports = function (io, sql, tw, async, app_cfg) {
delete einsatzdaten.wgs84_y; delete einsatzdaten.wgs84_y;
}; };
socket.emit('io.Einsatz', einsatzdaten); socket.emit('io.Einsatz', einsatzdaten);
sql.db_log('DBRD', 'Einsatzdaten für Dashboard' + dbrd_uuid + ' an Socket ' + socket.id + ' gesendet'); sql.db_log('DBRD', 'Einsatzdaten für Dashboard ' + dbrd_uuid + ' an Socket ' + socket.id + ' gesendet');
sql.db_update_client_status(socket, dbrd_uuid); sql.db_update_client_status(socket, dbrd_uuid);
}); });
} else { } else {