Don't die on request abort

Author: 3ach

lib/views/submit.js

@@ -132,6 +132,12 @@ function submitPost (req, res) {
   // Abort on errors
   form.on('error', (err) => {
     console.error(err)
+
+    if (err.message && err.message === 'Request aborted') {
+      console.log('Request aborted, just bailing.')
+      return
+    }
+
     res.status(500).send(err)
   })
 
@@ -279,6 +285,7 @@ async function handleSubmission (req, res, submission) {
 
   if (errors.length > 0) {
     if (req.forceNoHTML || !req.accepts('text/html')) {
+      console.log('Sending on 278')
       res.status(400).type('text/plain').send(errors)
     } else {
       submitForm(req, res, submissionData, {
@@ -297,6 +304,7 @@ async function handleSubmission (req, res, submission) {
   if (!metaData || !metaData.displayId) {
     if (submissionData.overwriteMerge === '2' || submissionData.overwriteMerge === '3') {
       if (req.forceNoHTML || !req.accepts('text/html')) {
+        console.log('Sending on 297')
         res.status(500).type('text/plain').send('Submission id and version do not exist')
       } else {
         errors.push('Submission id and version do not exist')
@@ -328,6 +336,7 @@ async function handleSubmission (req, res, submission) {
 
       if (req.forceNoHTML || !req.accepts('text/html')) {
         console.log('prevent')
+        console.log('Sending on 329')
         res.status(500).type('text/plain').send('Submission id and version already in use')
       } else {
         errors.push('Submission id and version already in use')
@@ -388,6 +397,7 @@ async function handleSubmission (req, res, submission) {
     })
   } catch (err) {
     if (req.forceNoHTML || !req.accepts('text/html')) {
+      console.log('Sending on 387')
       res.status(500).type('text/plain').send(err)
       return
     } else {
@@ -398,6 +408,7 @@ async function handleSubmission (req, res, submission) {
         errors: [err]
       }
 
+      console.log('Sending on 398')
       res.send(pug.renderFile('templates/views/errors/invalid.jade', locals))
       return
     }
@@ -408,6 +419,7 @@ async function handleSubmission (req, res, submission) {
 
   if (!success) {
     if (req.forceNoHTML || !req.accepts('text/html')) {
+      console.log('Sending on 409')
       res.status(500).type('text/plain').send(errorLog)
       return
     } else {
@@ -418,6 +430,7 @@ async function handleSubmission (req, res, submission) {
         errors: [errorLog]
       }
 
+      console.log('Sending on 420')
       res.send(pug.renderFile('templates/views/errors/invalid.jade', locals))
       return
     }
@@ -511,8 +524,10 @@ async function handleSubmission (req, res, submission) {
   fs.unlink(resultFilename)
 
   if (req.forceNoHTML || !req.accepts('text/html')) {
+    console.log('Sending on 514')
     res.status(200).type('text/plain').send('Successfully uploaded')
   } else {
+    console.log('Sending on 517')
     res.redirect('/user/' + encodeURIComponent(submissionData.createdBy.username) + '/' + submissionData.id + '/' + submissionData.collectionId + '/' + submissionData.version)
   }
 }