mirror of
https://github.com/openmhz/trunk-server.git
synced 2026-11-20 20:55:54 -05:00
Update uploads.js
This commit is contained in:
@@ -17,6 +17,7 @@ const agent = new https.Agent({
|
||||
});
|
||||
|
||||
|
||||
|
||||
var s3_endpoint = process.env['S3_ENDPOINT'] != null ? process.env['S3_ENDPOINT'] : 'https://s3.us-west-1.wasabisys.com';
|
||||
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';
|
||||
@@ -35,8 +36,9 @@ const client = new S3Client({
|
||||
});
|
||||
|
||||
exports.upload = async function (req, res, next) {
|
||||
const tracer = trace.getTracer("upload-service")
|
||||
const parentSpan = trace.getActiveSpan();
|
||||
await trace.getTracer('upload-service').startActiveSpan('upload_handler', { parent: parentSpan }, async (span) => {
|
||||
await tracer.startActiveSpan('upload_handler', { parent: parentSpan }, async (span) => {
|
||||
try {
|
||||
span.setAttribute('call.shortName', req.params.shortName.toLowerCase());
|
||||
span.setAttribute('call.talkgroup_num', req.body.talkgroup_num);
|
||||
@@ -95,7 +97,8 @@ exports.upload = async function (req, res, next) {
|
||||
|
||||
console.log("Finished parsing request data");
|
||||
// Validate that the system exists and the API key is correct
|
||||
await trace.getTracer('upload-service').startActiveSpan('validate_system', { parent: span }, async (validateSpan) => {
|
||||
const validateSpan = tracer.startSpan("validate_system");
|
||||
|
||||
|
||||
try {
|
||||
item = await System.findOne({ 'shortName': shortName }, ["key", "ignoreUnknownTalkgroup"]);
|
||||
@@ -134,12 +137,11 @@ exports.upload = async function (req, res, next) {
|
||||
} finally {
|
||||
validateSpan.end();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log("Finished validating system API key");
|
||||
// Blocking sensitive talkgroups
|
||||
await trace.getTracer('upload-service').startActiveSpan('check_sensitive_talkgroups', { parent: span }, async (sensitiveSpan) => {
|
||||
|
||||
const sensitiveSpan = tracer.startSpan("check_sensitive_talkgroups");
|
||||
if ((shortName == "hennearmer") && ((talkgroupNum == 3421) || (talkgroupNum == 3423))) {
|
||||
sensitiveSpan.setStatus({
|
||||
code: opentelemetry.SpanStatusCode.ERROR,
|
||||
@@ -149,13 +151,12 @@ exports.upload = async function (req, res, next) {
|
||||
return;
|
||||
}
|
||||
sensitiveSpan.end();
|
||||
});
|
||||
|
||||
|
||||
console.log("Finished checking sensitive talkgroups");
|
||||
|
||||
if (item.ignoreUnknownTalkgroup == true) {
|
||||
await trace.getTracer('upload-service').startActiveSpan('check_talkgroup_exists', { parent: span }, async (talkgroupSpan) => {
|
||||
|
||||
const talkgroupSpan = tracer.startSpan("check_talkgroup_exists");
|
||||
talkgroupExists = await Talkgroup.exists({
|
||||
'shortName': shortName,
|
||||
'num': talkgroupNum
|
||||
@@ -177,7 +178,7 @@ exports.upload = async function (req, res, next) {
|
||||
return;
|
||||
}
|
||||
talkgroupSpan.end();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
console.log("Finished checking talkgroup exists");
|
||||
@@ -187,7 +188,7 @@ exports.upload = async function (req, res, next) {
|
||||
|
||||
// Prepare call object
|
||||
let call;
|
||||
await trace.getTracer('upload-service').startActiveSpan('prepare_call_object', { parent: span }, async (prepareSpan) => {
|
||||
const prepareSpan = tracer.startSpan('prepare_call_object');
|
||||
|
||||
var local_path = "/" + shortName + "/" + time.getFullYear() + "/" + (time.getMonth() + 1) + "/" + time.getDate() + "/";
|
||||
var object_key = "media/" + shortName + "-" + talkgroupNum + "-" + startTime + path.extname(req.file.originalname);
|
||||
@@ -227,13 +228,12 @@ exports.upload = async function (req, res, next) {
|
||||
prepareSpan.setAttribute('call.object_key', object_key);
|
||||
prepareSpan.setAttribute('call.url', url);
|
||||
prepareSpan.end();
|
||||
});
|
||||
|
||||
|
||||
console.log("Finished preparing call object");
|
||||
let fileContent;
|
||||
// Upload file to S3
|
||||
await trace.getTracer('upload-service').startActiveSpan('upload_to_s3',{ parent: span }, async (uploadSpan) => {
|
||||
|
||||
const uploadSpan = tracer.startSpan('upload_to_s3');
|
||||
try {
|
||||
fileContent = fs.readFileSync(req.file.path);
|
||||
//s3Src = fs.createReadStream(req.file.path);
|
||||
@@ -244,11 +244,8 @@ exports.upload = async function (req, res, next) {
|
||||
Body: fileContent,
|
||||
ACL: 'public-read'
|
||||
});
|
||||
|
||||
|
||||
await client.send(command);
|
||||
|
||||
|
||||
} catch (err) {
|
||||
uploadSpan.recordException(err);
|
||||
uploadSpan.setStatus({
|
||||
@@ -259,11 +256,12 @@ exports.upload = async function (req, res, next) {
|
||||
} finally {
|
||||
uploadSpan.end();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log("Finished uploading to S3");
|
||||
// Save call to database
|
||||
await trace.getTracer('upload-service').startActiveSpan('save_call',{ parent: span }, async (saveSpan) => {
|
||||
const saveSpan = tracer.startSpan('save_call');
|
||||
|
||||
try {
|
||||
await call.save();
|
||||
sysStats.addCall(call.toObject());
|
||||
@@ -282,11 +280,12 @@ exports.upload = async function (req, res, next) {
|
||||
} finally {
|
||||
saveSpan.end();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log("Finished saving call to database");
|
||||
// Clean up temporary file
|
||||
await trace.getTracer('upload-service').startActiveSpan('cleanup_temp_file',{ parent: span }, async (cleanupSpan) => {
|
||||
const cleanupSpan = tracer.startSpan('cleanup_temp_file');
|
||||
|
||||
try {
|
||||
fs.unlinkSync(req.file.path);
|
||||
cleanupSpan.setAttribute('file.deleted', true);
|
||||
@@ -296,7 +295,7 @@ exports.upload = async function (req, res, next) {
|
||||
} finally {
|
||||
cleanupSpan.end();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
} catch (error) {
|
||||
span.recordException(error);
|
||||
|
||||
Reference in New Issue
Block a user