GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-13 01:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'system-test' into better-honeycomb

Browse Source
This commit is contained in:
Luke Berndt
2024-08-20 11:25:32 -04:00
committed by GitHub
parent bbbd4e1819 32af2ca734
commit be11cd2006
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
backend/controllers/systems.js
View File

@@ -12,6 +12,9 @@ const mailjet = new Mailjet({
apiSecret: process.env['MAILJET_SECRET']
});
var systemList = [];
var systemListTime = Date.now();
exports.contact_system = async function(req, res) {
var system = await System.findOne({
shortName: req.params.shortName.toLowerCase()
@@ -97,25 +100,19 @@ exports.contact_system = async function(req, res) {
}
exports.get_systems = async function (req, res) {
async function load_systems(systemClients) {
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}).catch( err => {
//const results = await System.find({active: true}).catch( err => { // super simple query
console.error("Error - get_systems: " + err.message);
res.status(500);
res.json({
success: false,
message: err
});
return;
});
var systemList = [];
systemList = [];
for (var result in results) {
var clientCount = 0;
if (req.systemClients.hasOwnProperty(results[result].shortName)) {
clientCount = req.systemClients[results[result].shortName];
if (systemClients.hasOwnProperty(results[result].shortName)) {
clientCount = systemClients[results[result].shortName];
}
var system = {
name: results[result].name,
@@ -142,6 +139,16 @@ exports.get_systems = async function (req, res) {
system.screenName = null;
systemList.push(system);
}
}
exports.get_systems = async function (req, res) {
if ((systemList.length == 0) || (systemListTime < (Date.now() - 60 * 1000 * 15))) {
await load_systems(req.systemClients);
systemListTime = Date.now();
}
res.contentType('json');
res.send(JSON.stringify({
success: true,

10
backend/controllers/uploads.js
View File

@@ -14,7 +14,7 @@ const { NodeHttpHandler } = require('@smithy/node-http-handler');
const https = require('https');
const agent = new https.Agent({
maxSockets: 150
maxSockets: 250
});
@@ -22,7 +22,7 @@ var s3_endpoint = process.env['S3_ENDPOINT'] != null ? process.env['S3_ENDPOINT'
var s3_region = process.env['S3_REGION'] != null ? process.env['S3_REGION'] : 'us-west-1';
var s3_bucket = process.env['S3_BUCKET'] != null ? process.env['S3_BUCKET'] : 'openmhz-west';
var s3_profile = process.env['S3_PROFILE'] != null ? process.env['S3_PROFILE'] : 'wasabi-account';
var s3_public_url = process.env['S3_PUBLIC_URL'] != null ? process.env['S3_PUBLIC_URL'] : s3_endpoint + "/" + s3_bucket;
const client = new S3Client({
requestHandler: new NodeHttpHandler({
@@ -192,7 +192,7 @@ exports.upload = async function (req, res, next) {
var endpoint = s3_endpoint;
var bucket = s3_bucket;
var url = s3_endpoint + "/" + s3_bucket + "/" + object_key;
var url = s3_public_url + "/" + object_key;
call = new Call({
shortName: shortName,
@@ -268,10 +268,6 @@ exports.upload = async function (req, res, next) {
req.call = call.toObject();
next();
}
fs.unlinkSync(req.file.path);
} catch (err) {
saveSpan.recordException(err);
saveSpan.setStatus({