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

changing upload approach

Browse Source
This commit is contained in:
Luke Berndt
2023-04-11 08:59:06 -04:00
parent aafe97c710
commit 3f73d12254
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
backend/controllers/uploads.js
View File

@@ -22,7 +22,7 @@ const client = new S3Client({
}); });
exports.upload = async function (req, res, next) { exports.upload = async function (req, res, next) {
process.nextTick( async () => {
if (!req.file && (path.extname(req.file.originalname)) != '.m4a') { if (!req.file && (path.extname(req.file.originalname)) != '.m4a') {
console.warn("[" + req.params.shortName + "] Error file name is wrong or file does not exist"); console.warn("[" + req.params.shortName + "] Error file name is wrong or file does not exist");
res.status(500); res.status(500);
@@ -144,37 +144,30 @@ exports.upload = async function (req, res, next) {
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
let s3Src; let fileContent;
try { try {
s3Src = fs.createReadStream(req.file.path); fileContent = fs.readFileSync(req.file.path);
//s3Src = fs.createReadStream(req.file.path);
} catch (err) { } catch (err) {
console.error("[" + call.shortName + "] Unable to open file: " + req.file.path) console.error("[" + call.shortName + "] Unable to open file: " + req.file.path + " Error: " + err);
return; return;
} }
const command = new PutObjectCommand({ const command = new PutObjectCommand({
Bucket: s3_bucket, Bucket: s3_bucket,
Key: object_key, Key: object_key,
Body: s3Src, Body: fileContent,
ACL: 'public-read' ACL: 'public-read'
}); });
try { try {
await client.send(command); await client.send(command);
await call.save();
s3Src.destroy(); sysStats.addCall(call.toObject());
fs.unlink(req.file.path, async (err) => { // we only want to notify clients if the clip is longer than 1 second.
if (err) { if (call.len >= 1) {
console.error("[" + call.shortName + "]error deleting: " + req.file.path); req.call = call.toObject();
} next();
await call.save(); }
sysStats.addCall(call.toObject());
// we only want to notify clients if the clip is longer than 1 second.
if (call.len >= 1) {
req.call = call.toObject();
next();
}
});
} catch (err) { } catch (err) {
console.warn("[" + call.shortName + "] Upload Error: " + err + " Filename: " + call.name + " content-length: " + req.headers['content-length'] + " Key: " + object_key + " Bucket: " + s3_bucket); console.warn("[" + call.shortName + "] Upload Error: " + err + " Filename: " + call.name + " content-length: " + req.headers['content-length'] + " Key: " + object_key + " Bucket: " + s3_bucket);
/*res.status(500); /*res.status(500);
@@ -185,11 +178,17 @@ exports.upload = async function (req, res, next) {
success: false, success: false,
error: "File Upload" error: "File Upload"
}));*/ }));*/
}
try { try {
fs.unlinkSync(req.file.path); fs.unlinkSync(req.file.path);
} catch (err) { } catch (err) {
console.warn("There was an Error uploading an deleting: " + req.file.path); console.warn("There was an Error uploading an deleting: " + req.file.path);
}; };
}
});
} }