@reldens/server-utils 0.10.0 → 0.12.0

package/lib/app-server-factory.js

@@ -47,7 +47,13 @@ class AppServerFactory
         this.corsOrigin = String(process.env.RELDENS_CORS_ORIGIN || '*');
         this.corsMethods = String(process.env.RELDENS_CORS_METHODS || 'GET,POST').split(',');
         this.corsHeaders = String(process.env.RELDENS_CORS_HEADERS || 'Content-Type,Authorization').split(',');
-        this.errorMessage = '';
+        this.tooManyRequestsMessage = String(
+            process.env.RELDENS_TOO_MANY_REQUESTS_MESSAGE || 'Too many requests, please try again later.'
+        );
+        this.error = {};
+        this.processErrorResponse = function(status, message, req, res) {
+            return { status, message, handled: false };
+        };
     }
 
     createAppServer(appServerConfig)
@@ -72,7 +78,7 @@ class AppServerFactory
                 max: this.maxRequests,
                 standardHeaders: true,
                 legacyHeaders: false,
-                message: 'Too many requests from this IP, please try again later'
+                message: this.tooManyRequestsMessage
             };
             if(this.applyKeyGenerator){
                 limiterParams.keyGenerator = function(req){
@@ -168,13 +174,21 @@ class AppServerFactory
         app.get('/', async (req, res, next) => {
             if('/' === req._parsedUrl.pathname){
                 if('function' !== typeof homePageLoadCallback){
-                    return res.send('Homepage contents could not be loaded.');
+                    let result = this.processErrorResponse(500, 'Homepage contents could not be loaded.', req, res);
+                    if(result.handled){
+                        return;
+                    }
+                    return res.status(result.status).send(result.message);
                 }
                 try {
                     return res.send(await homePageLoadCallback(req));
                 } catch(error){
-                    this.errorMessage = 'Error loading homepage.';
-                    return res.status(500).send('Error loading homepage.');
+                    this.error = {message: 'Error loading homepage.', error};
+                    let result = this.processErrorResponse(500, 'Error loading homepage.', req, res);
+                    if(result.handled){
+                        return;
+                    }
+                    return res.status(result.status).send(result.message);
                 }
             }
             next();
@@ -184,7 +198,7 @@ class AppServerFactory
     async serveStatics(app, statics)
     {
         if(!FileHandler.isValidPath(statics)){
-            this.errorMessage = 'Invalid statics path.';
+            this.error = {message: 'Invalid statics path.'};
             return;
         }
         let staticOptions = {
@@ -202,7 +216,7 @@ class AppServerFactory
     async serveStaticsPath(app, staticsPath, statics)
     {
         if(!FileHandler.isValidPath(staticsPath) || !FileHandler.isValidPath(statics)){
-            this.errorMessage = 'Invalid statics path to be served.';
+            this.error = {message: 'Invalid statics path to be served.'};
             return;
         }
         let staticOptions = {

package/lib/uploader-factory.js

@@ -18,6 +18,9 @@ class UploaderFactory
         this.fileLimit = props.fileLimit || 0;
         this.allowedExtensions = props.allowedExtensions;
         this.applySecureFileNames = props.applySecureFileNames;
+        this.processErrorResponse = props.processErrorResponse || function(status, message, req, res) {
+            return { status, message, handled: false };
+        };
     }
 
     createUploader(fields, buckets, allowedFileTypes)
@@ -66,14 +69,30 @@ class UploaderFactory
                 if(err){
                     if(err instanceof multer.MulterError){
                         if(err.code === 'LIMIT_FILE_SIZE'){
-                            return res.status(413).send('File too large');
+                            let result = this.processErrorResponse(413, 'File too large.', req, res);
+                            if(result.handled){
+                                return;
+                            }
+                            return res.status(result.status).send(result.message);
                         }
                         if(err.code === 'LIMIT_FILE_COUNT'){
-                            return res.status(413).send('Too many files');
+                            let result = this.processErrorResponse(413, 'Too many files.', req, res);
+                            if(result.handled){
+                                return;
+                            }
+                            return res.status(result.status).send(result.message);
+                        }
+                        let result = this.processErrorResponse(400, 'File upload error: ' + err.message, req, res);
+                        if(result.handled){
+                            return;
                         }
-                        return res.status(400).send('File upload error: ' + err.message);
+                        return res.status(result.status).send(result.message);
                     }
-                    return res.status(500).send('Server error during file upload');
+                    let result = this.processErrorResponse(500, 'Server error during file upload.', req, res);
+                    if(result.handled){
+                        return;
+                    }
+                    return res.status(result.status).send(result.message);
                 }
                 if(!req.files){
                     return next();
@@ -85,7 +104,14 @@ class UploaderFactory
                                 if(FileHandler.exists(file.path)){
                                     FileHandler.remove(file.path);
                                 }
-                                return res.status(415).send('File contents do not match declared type.');
+                                let result = this.processErrorResponse(
+                                    415,
+                                    'File contents do not match declared type.', req, res
+                                );
+                                if(result.handled){
+                                    return;
+                                }
+                                return res.status(result.status).send(result.message);
                             }
                         }
                     }
@@ -93,7 +119,11 @@ class UploaderFactory
                 } catch(error){
                     this.error = {message: 'File validation error.', error};
                     this.cleanupFiles(req.files);
-                    return res.status(500).send('Error processing uploaded files');
+                    let result = this.processErrorResponse(500, 'Error processing uploaded files.', req, res);
+                    if(result.handled){
+                        return;
+                    }
+                    return res.status(result.status).send(result.message);
                 }
             });
         };
@@ -118,11 +148,11 @@ class UploaderFactory
                 this.error = {message: 'Field name is invalid'};
                 return false;
             }
-            if(!Object.prototype.hasOwnProperty.call(buckets, field.name)){
+            if(!buckets[field.name]){
                 this.error = {message: `Missing bucket for field: ${field.name}`};
                 return false;
             }
-            if(!Object.prototype.hasOwnProperty.call(allowedFileTypes, field.name)){
+            if(!allowedFileTypes[field.name]){
                 this.error = {message: `Missing allowedFileType for field: ${field.name}`};
                 return false;
             }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/server-utils",
     "scope": "@reldens",
-    "version": "0.10.0",
+    "version": "0.12.0",
     "description": "Reldens - Server Utils",
     "author": "Damian A. Pastorini",
     "license": "MIT",