mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-17 11:17:45 -05:00
debugging systems list
This commit is contained in:
@@ -15,7 +15,7 @@ const mailjet = new Mailjet({
|
|||||||
var systemList = [];
|
var systemList = [];
|
||||||
var systemListTime = Date.now();
|
var systemListTime = Date.now();
|
||||||
|
|
||||||
exports.contact_system = async function(req, res) {
|
exports.contact_system = async function (req, res) {
|
||||||
var system = await System.findOne({
|
var system = await System.findOne({
|
||||||
shortName: req.params.shortName.toLowerCase()
|
shortName: req.params.shortName.toLowerCase()
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
@@ -59,7 +59,7 @@ exports.contact_system = async function(req, res) {
|
|||||||
let message = "Thank you for contributing a feed to OpenMHz. A user has sent in a message about this feed:\n\n-------------------------------\n"
|
let message = "Thank you for contributing a feed to OpenMHz. A user has sent in a message about this feed:\n\n-------------------------------\n"
|
||||||
message = message + "User Name: " + req.body.name + "\n";
|
message = message + "User Name: " + req.body.name + "\n";
|
||||||
message = message + "User Email: " + req.body.email + "\n-------------------------------\n";
|
message = message + "User Email: " + req.body.email + "\n-------------------------------\n";
|
||||||
message = message + "Message:\n" + req.body.message + "\n-------------------------------\n\n";
|
message = message + "Message:\n" + req.body.message + "\n-------------------------------\n\n";
|
||||||
message = message + "If you wish to stop receiving User Messages for this System:\n - goto the Admin for " + site_name + ": " + admin_server + "\n - find this System\n - Update it and turn off this Allow Contact option."
|
message = message + "If you wish to stop receiving User Messages for this System:\n - goto the Admin for " + site_name + ": " + admin_server + "\n - find this System\n - Update it and turn off this Allow Contact option."
|
||||||
const request = mailjet.post("send", {
|
const request = mailjet.post("send", {
|
||||||
version: "v3.1"
|
version: "v3.1"
|
||||||
@@ -72,20 +72,20 @@ exports.contact_system = async function(req, res) {
|
|||||||
To: [{
|
To: [{
|
||||||
Email: user.email,
|
Email: user.email,
|
||||||
Name: user.firstName + " " + user.lastName
|
Name: user.firstName + " " + user.lastName
|
||||||
},{
|
}, {
|
||||||
Email: admin_email,
|
Email: admin_email,
|
||||||
Name: site_name + " Admin"
|
Name: site_name + " Admin"
|
||||||
}],
|
}],
|
||||||
Subject: site_name + " - " + system.shortName + " - " + " User Comment",
|
Subject: site_name + " - " + system.shortName + " - " + " User Comment",
|
||||||
TextPart: message
|
TextPart: message
|
||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
request.then(result => {
|
request.then(result => {
|
||||||
console.log(`User Comment sent to: ${user.email} for shortName: ${system.shortName}`)
|
console.log(`User Comment sent to: ${user.email} for shortName: ${system.shortName}`)
|
||||||
res.json({
|
res.json({
|
||||||
success: true
|
success: true
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
.catch(err => {
|
.catch(err => {
|
||||||
console.error(err.statusCode);
|
console.error(err.statusCode);
|
||||||
console.error(err);
|
console.error(err);
|
||||||
@@ -102,91 +102,91 @@ exports.contact_system = async function(req, res) {
|
|||||||
|
|
||||||
async function load_systems(systemClients) {
|
async function load_systems(systemClients) {
|
||||||
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
let fromDate = new Date(Date.now() - 60 * 60 * 24 * 30 * 1000);
|
||||||
const results = await System.find({lastActive: {$gte: fromDate}}).populate('userId', "screenName").catch( err => {
|
const results = await System.find({ lastActive: { $gte: fromDate } }).populate('userId', "screenName").catch(err => {
|
||||||
//const results = await System.find({active: true}).populate('userId', "screenName").catch( err => {
|
//const results = await System.find({active: true}).populate('userId', "screenName").catch( err => {
|
||||||
//const results = await System.find({active: true}).catch( err => { // super simple query
|
//const results = await System.find({active: true}).catch( err => { // super simple query
|
||||||
console.error("Error - get_systems: " + err.message);
|
console.error("Error - get_systems: " + err.message);
|
||||||
});
|
});
|
||||||
systemList = [];
|
systemList = [];
|
||||||
for (var result in results) {
|
for (var result in results) {
|
||||||
|
|
||||||
var clientCount = 0;
|
var clientCount = 0;
|
||||||
if (systemClients.hasOwnProperty(results[result].shortName)) {
|
if (systemClients.hasOwnProperty(results[result].shortName)) {
|
||||||
clientCount = systemClients[results[result].shortName];
|
clientCount = systemClients[results[result].shortName];
|
||||||
}
|
|
||||||
var system = {
|
|
||||||
name: results[result].name,
|
|
||||||
shortName: results[result].shortName,
|
|
||||||
systemType: results[result].systemType,
|
|
||||||
county: results[result].county,
|
|
||||||
country: results[result].country,
|
|
||||||
city: results[result].city,
|
|
||||||
state: results[result].state,
|
|
||||||
active: results[result].active,
|
|
||||||
lastActive: results[result].lastActive,
|
|
||||||
callAvg: results[result].callAvg,
|
|
||||||
description: results[result].description,
|
|
||||||
status: results[result].status,
|
|
||||||
allowContact: results[result].allowContact,
|
|
||||||
clientCount: clientCount
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
if (results[result].showScreenName && results[result].userId) {
|
|
||||||
system.screenName = results[result].userId.screenName
|
|
||||||
} else {
|
|
||||||
system.screenName = null;
|
|
||||||
}*/
|
|
||||||
system.screenName = null;
|
|
||||||
systemList.push(system);
|
|
||||||
}
|
}
|
||||||
|
var system = {
|
||||||
|
name: results[result].name,
|
||||||
|
shortName: results[result].shortName,
|
||||||
|
systemType: results[result].systemType,
|
||||||
|
county: results[result].county,
|
||||||
|
country: results[result].country,
|
||||||
|
city: results[result].city,
|
||||||
|
state: results[result].state,
|
||||||
|
active: results[result].active,
|
||||||
|
lastActive: results[result].lastActive,
|
||||||
|
callAvg: results[result].callAvg,
|
||||||
|
description: results[result].description,
|
||||||
|
status: results[result].status,
|
||||||
|
allowContact: results[result].allowContact,
|
||||||
|
clientCount: clientCount
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
if (results[result].showScreenName && results[result].userId) {
|
||||||
|
system.screenName = results[result].userId.screenName
|
||||||
|
} else {
|
||||||
|
system.screenName = null;
|
||||||
|
}*/
|
||||||
|
system.screenName = null;
|
||||||
|
systemList.push(system);
|
||||||
|
}
|
||||||
|
console.log("Loaded Systems: " + systemList.length + " that have been active since: " + fromDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
exports.get_systems = async function (req, res) {
|
exports.get_systems = async function (req, res) {
|
||||||
if ((systemList.length == 0) || (systemListTime < (Date.now() - 60 * 1000 * 15))) {
|
if ((systemList.length == 0) || (systemListTime < (Date.now() - 60 * 1000 * 2))) {
|
||||||
await load_systems(req.systemClients);
|
await load_systems(req.systemClients);
|
||||||
systemListTime = Date.now();
|
systemListTime = Date.now();
|
||||||
}
|
}
|
||||||
|
|
||||||
res.contentType('json');
|
res.contentType('json');
|
||||||
res.send(JSON.stringify({
|
res.send(JSON.stringify({
|
||||||
success: true,
|
success: true,
|
||||||
systems: systemList
|
systems: systemList
|
||||||
}));
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.authorize_system = async function (req, res) {
|
||||||
|
|
||||||
|
var shortName = req.params.shortName.toLowerCase();
|
||||||
|
var apiKey = req.body.api_key;
|
||||||
|
let item = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
item = await System.findOne({ 'shortName': shortName }, ["key"]);
|
||||||
|
} catch (err) {
|
||||||
|
console.warn("[" + req.params.shortName + "] Error /:shortName/authorize - Error: " + err);
|
||||||
|
res.status(500);
|
||||||
|
res.send("Invalid System Name\n");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.authorize_system = async function (req, res) {
|
if (!item) {
|
||||||
|
console.info("[" + req.params.shortName + "] Error /:shortName/authorize ShortName does not exist");
|
||||||
var shortName = req.params.shortName.toLowerCase();
|
res.status(500);
|
||||||
var apiKey = req.body.api_key;
|
res.send("Invalid System Name\n");
|
||||||
let item = null;
|
return;
|
||||||
|
|
||||||
try {
|
|
||||||
item = await System.findOne({ 'shortName': shortName }, ["key"]);
|
|
||||||
} catch (err) {
|
|
||||||
console.warn("[" + req.params.shortName + "] Error /:shortName/authorize - Error: " + err);
|
|
||||||
res.status(500);
|
|
||||||
res.send("Invalid System Name\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!item) {
|
|
||||||
console.info("[" + req.params.shortName + "] Error /:shortName/authorize ShortName does not exist");
|
|
||||||
res.status(500);
|
|
||||||
res.send("Invalid System Name\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (apiKey != item.key) {
|
|
||||||
console.warn("[" + req.params.shortName + "] Error /:shortName/authorize API Key Mismatch - Provided key: " + apiKey);
|
|
||||||
res.status(403);
|
|
||||||
res.send("Invalid API Key\n");
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
// System shortName exists and the API Key is valid.
|
|
||||||
res.status(200).end();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (apiKey != item.key) {
|
||||||
|
console.warn("[" + req.params.shortName + "] Error /:shortName/authorize API Key Mismatch - Provided key: " + apiKey);
|
||||||
|
res.status(403);
|
||||||
|
res.send("Invalid API Key\n");
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
// System shortName exists and the API Key is valid.
|
||||||
|
res.status(200).end();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user