define user error

Author: lisong

app.js

@@ -16,6 +16,7 @@ var sessions = require('./routes/sessions');
 var account = require('./routes/account');
 var users = require('./routes/users');
 var apps = require('./routes/apps');
+var AppError = require('./core/services/app-error');
 var app = express();
 app.use(helmet());
 app.disable('x-powered-by');
@@ -69,29 +70,29 @@ app.use('/apps', apps);
 // will print stacktrace
 if (app.get('env') === 'development') {
   app.use(function(req, res, next) {
-    var err = new Error('Not Found');
-    err.status = 404;
-    next(err);
+    next(new AppError.NotFound());
   });
-  app.use(function(err, req, res) {
+  app.use(function(err, req, res, next) {
     res.status(err.status || 500);
     res.render('error', {
       message: err.message,
       error: err
     });
+    console.error(err.stack);
   });
 } else {
   app.use(function(req, res, next) {
-    res.status(404).send('Not Found');
+    res.status(404).send(new AppError.NotFound());
   });
   // production error handler
   // no stacktraces leaked to user
-  app.use(function(err, req, res) {
-    res.status(err.status || 500);
-    res.render('error', {
-      message: '服务器繁忙，请稍后再试!',
-      error: {}
-    });
+  app.use(function(err, req, res, next) {
+    var status = err.status || 500;
+    res.status(status);
+    var error = new AppError.AppError(`服务器繁忙，请稍后再试!`);
+    error.status = status;
+    res.status(status).send(error);
+    console.error(err.stack);
   });
 }
 

core/services/app-error.js

@@ -0,0 +1,25 @@
+var util = require('util')
+
+var AppError = function (msg, constr) {
+  if(msg) {
+    msg = msg.toString();
+  }
+  Error.captureStackTrace(this, constr || this)
+  this.message = msg || 'Error'
+  this.name = 'AppError'
+}
+util.inherits(AppError, Error)
+
+var NotFoundError = function(msg) {
+  NotFoundError.super_.call(this, msg, this.constructor)
+  this.message = msg || 'Not Found';
+  this.name = 'NotFoundError'
+  this.status = 404
+}
+util.inherits(NotFoundError, AppError)
+
+module.exports = {
+  AppError: AppError,
+  NotFound: NotFoundError
+}
+

core/services/client-manager.js

@@ -4,6 +4,7 @@ var models = require('../../models');
 var _ = require('lodash');
 var common = require('../utils/common');
 var factory = require('../utils/factory');
+var AppError = require('./app-error');
 
 var proto = module.exports = function (){
   function ClientManager() {
@@ -77,12 +78,12 @@ proto.updateCheck = function(deploymentKey, appVersion, label, packageHash) {
     shouldRunBinaryVersion: false
   };
   if (_.isEmpty(deploymentKey) || _.isEmpty(appVersion)) {
-    return Promise.reject(new Error("please input deploymentKey and appVersion"))
+    return Promise.reject(new AppError.AppError("please input deploymentKey and appVersion"))
   }
   return models.Deployments.findOne({where: {deployment_key: deploymentKey}})
   .then(function (dep) {
     if (_.isEmpty(dep)) {
-      throw new Error('does not found deployment');
+      throw new AppError.AppError('does not found deployment');
     }
     return models.DeploymentsVersions.findOne({where: {deployment_id: dep.id, app_version: appVersion}});
   })
@@ -132,18 +133,18 @@ proto.updateCheck = function(deploymentKey, appVersion, label, packageHash) {
 
 proto.getPackagesInfo = function (deploymentKey, label) {
   if (_.isEmpty(deploymentKey) || _.isEmpty(label)) {
-    return Promise.reject(new Error("please input deploymentKey and label"))
+    return Promise.reject(new AppError.AppError("please input deploymentKey and label"))
   }
   return models.Deployments.findOne({where: {deployment_key: deploymentKey}})
   .then(function (dep) {
     if (_.isEmpty(dep)) {
-      throw new Error('does not found deployment');
+      throw new AppError.AppError('does not found deployment');
     }
     return models.Packages.findOne({where: {deployment_id: dep.id, label: label}});
   })
   .then(function (packages) {
     if (_.isEmpty(packages)) {
-      throw new Error('does not found packages');
+      throw new AppError.AppError('does not found packages');
     }
     return packages;
   });

routes/index.js

@@ -1,15 +1,16 @@
 var express = require('express');
 var router = express.Router();
 var Promise = require('bluebird');
+var AppError = require('../core/services/app-error');
 var middleware = require('../core/middleware');
 var ClientManager = require('../core/services/client-manager');
 var _ = require('lodash');
 
-router.get('/', function(req, res) {
+router.get('/', function(req, res, next) {
   res.render('index', { title: 'CodePushServer' });
 });
 
-router.get('/README.md', function(req, res) {
+router.get('/README.md', function(req, res, next) {
   var MarkdownIt = require('markdown-it');
   const path = require('path');
   const fs = require('fs');
@@ -21,16 +22,19 @@ router.get('/README.md', function(req, res) {
     res.send(md.render(source));
   })
   .catch(e=>{
-    res.send(e.message);
+    if (e instanceof AppError.AppError) {
+      res.send(e.message);
+    } else {
+      next(e);
+    }
   });
-
 });
 
 router.get('/tokens', function(req, res) {
   res.render('tokens', { title: '获取token' });
 });
 
-router.get('/updateCheck', function(req, res){
+router.get('/updateCheck', function(req, res, next){
   var deploymentKey = _.get(req, "query.deploymentKey");
   var appVersion = _.get(req, "query.appVersion");
   var label = _.get(req, "query.label");
@@ -41,7 +45,11 @@ router.get('/updateCheck', function(req, res){
     res.send({"updateInfo":rs});
   })
   .catch(function (e) {
-    res.status(404).send(e.message);
+    if (e instanceof AppError.AppError) {
+      res.status(404).send(e.message);
+    } else {
+      next(e);
+    }
   });
 });
 
@@ -51,8 +59,10 @@ router.post('/reportStatus/download', function(req, res){
   var deploymentKey = _.get(req, "body.deploymentKey");
   var clientManager = new ClientManager();
   clientManager.reportStatusDownload(deploymentKey, label, clientUniqueId)
-  .catch(function (e) {
-    console.log(e);
+  .catch(function (err) {
+    if (!err instanceof AppError.AppError) {
+      console.error(err.stack)
+    }
   });
   res.send('OK');
 });
@@ -63,8 +73,10 @@ router.post('/reportStatus/deploy', function(req, res){
   var deploymentKey = _.get(req, "body.deploymentKey");
   var clientManager = new ClientManager();
   clientManager.reportStatusDeploy(deploymentKey, label, clientUniqueId, req.body)
-  .catch(function (e) {
-    console.log(e);
+  .catch(function (err) {
+    if (!err instanceof AppError.AppError) {
+      console.error(err.stack)
+    }
   });
   res.send('OK');
 });

routes/sessions.js

@@ -3,16 +3,21 @@ var router = express.Router();
 var _ = require('lodash');
 var models = require('../models');
 var middleware = require('../core/middleware');
+var AppError = require('../core/services/app-error');
 
-router.delete('/:machineName', middleware.checkToken, function(req, res){
+router.delete('/:machineName', middleware.checkToken, function(req, res, next){
   var machineName = _.trim(decodeURI(req.params.machineName));
   var uid = req.users.id;
   models.UserTokens.destroy({where: {created_by:machineName, uid: uid}})
   .then(function(rowNum){
     res.send("");
   })
-  .catch(function (e) {
-    res.status(406).send(e.message);
+  .catch(e => {
+    if (e instanceof AppError.AppError) {
+      res.status(406).send(e.message);
+    } else {
+      next(e);
+    }
   });
 });