Merge pull request #8 from geodatagouv/tusbar/improve-error-handling

Improve error handling and upgrade @sentry/node

Author: tusbar

lib/api/errors.js

@@ -41,6 +41,7 @@ class Http500 extends HttpError {
 }
 
 module.exports = {
+  HttpError,
   Http400,
   Http404,
   Http500

lib/api/index.js

@@ -5,7 +5,7 @@ const cors = require('cors')
 
 const sentry = require('../sentry')
 
-const {Http404} = require('./errors')
+const {HttpError, Http404} = require('./errors')
 const links = require('./providers/links')
 const services = require('./providers/services')
 
@@ -36,17 +36,15 @@ app.use((req, res, next) => {
 
 app.use(sentry.Handlers.errorHandler())
 app.use((error, req, res, next) => { // eslint-disable-line no-unused-vars
-  const {statusCode = 500} = error
-
-  if (typeof error.toJSON === 'function') {
-    return res.status(statusCode).send(error.toJSON())
+  if (error instanceof HttpError) {
+    res.status(error.statusCode).send(error.toJSON())
+  } else {
+    res.status(500).send({
+      code: 500,
+      sentry: res.sentry,
+      error: 'An unexpected error happened'
+    })
   }
-
-  res.status(statusCode).send({
-    code: statusCode,
-    sentry: res.sentry,
-    error: 'An unexpected error happened'
-  })
 })
 
 module.exports = app

lib/api/middlewares/error.js

@@ -0,0 +1,9 @@
+const {HttpError, Http500} = require('../errors')
+
+module.exports = (error, req, res, next) => {
+  if (error instanceof HttpError) {
+    next(error)
+  } else {
+    next(new Http500('Failed transcoding dataset'))
+  }
+}

lib/api/middlewares/ogr2ogr.js

@@ -3,7 +3,7 @@ const ogr2ogr = require('ogr2ogr')
 const ms = require('ms')
 
 const got = require('../../got')
-const {Http400, Http500} = require('../errors')
+const {Http400} = require('../errors')
 
 const defaultTimeout = ms('20m')
 
@@ -98,7 +98,7 @@ function getOptions(opts) {
 }
 
 function downloadDataset(input, opts) {
-  return (req, res, next) => {
+  return (req, res) => {
     const projection = getProjection(req.query.projection)
     if (!projection) {
       throw new Http400('No valid projection given')
@@ -135,11 +135,7 @@ function downloadDataset(input, opts) {
       ogr._inDriver.output = opts.format
     }
 
-    ogr.stream().pipe(res).on('error', () => {
-      if (!res.headersSent) {
-        next(new Http500('Failed transcoding dataset'))
-      }
-    })
+    ogr.stream().pipe(res)
   }
 }
 

lib/api/providers/links/index.js

@@ -2,6 +2,7 @@ const {Router} = require('express')
 
 const am = require('../../middlewares/async')
 const ogr2ogr = require('../../middlewares/ogr2ogr')
+const errorHandler = require('../../middlewares/error')
 const {Http404} = require('../../errors')
 
 const {getLink} = require('./link-proxy')
@@ -32,4 +33,6 @@ router.get(
   })
 )
 
+router.use(errorHandler)
+
 module.exports = router

lib/api/providers/services/index.js

@@ -3,6 +3,7 @@ const splitOnFirst = require('split-on-first')
 
 const am = require('../../middlewares/async')
 const ogr2ogr = require('../../middlewares/ogr2ogr')
+const errorHandler = require('../../middlewares/error')
 const {Http404} = require('../../errors')
 
 const {getFeatureType} = require('./geoplatform')
@@ -31,4 +32,6 @@ router.get(
   })
 )
 
+router.use(errorHandler)
+
 module.exports = router

package.json

@@ -8,7 +8,7 @@
   "author": "Bertrand Marron <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@sentry/node": "^4.5.3",
+    "@sentry/node": "^4.5.4",
     "cors": "^2.8.5",
     "dotenv": "^6.2.0",
     "express": "^4.16.4",

yarn.lock

@@ -31,44 +31,44 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
   integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
 
-"@sentry/[email protected].3":
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-4.5.3.tgz#e55a42c694deec903aec2479e4a282d5a7a43878"
-  integrity sha512-off7XkyyiPXJTQ1XYPzxsY3zLHztMdK1kuIeHzyoIzu4kvs8H75eqou+fADo04JmfaMNy+OZSoW+5Aq2SZR2Ng==
+"@sentry/[email protected].4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-4.5.4.tgz#31c9a0b66d33cbd5b4d7de2b69d6c7951c7c06a3"
+  integrity sha512-Nj5VZjAVntroHn9tuqez8KnRgv91KWQfESzN9/DA/k9orZ8vI4+8bm78Zpq6IteumaxLxGdXw8H1s8xVGlU3/Q==
   dependencies:
-    "@sentry/hub" "4.5.3"
-    "@sentry/minimal" "4.5.3"
+    "@sentry/hub" "4.5.4"
+    "@sentry/minimal" "4.5.4"
     "@sentry/types" "4.5.3"
-    "@sentry/utils" "4.5.3"
+    "@sentry/utils" "4.5.4"
     tslib "^1.9.3"
 
-"@sentry/[email protected].3":
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-4.5.3.tgz#54ce5988ac6dedbe9bba99e2c00f8f26eb677dfe"
-  integrity sha512-4b8oPVAGw/hf11CQN9J7hAk2wzD2HIZsQBl/PcB/p5r1UyHw8cibpVobJulkHJMBJMiZ/twIBGZ1G1qK3LJdhw==
+"@sentry/[email protected].4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-4.5.4.tgz#7e0980dd2f3ead60ce1393e4e108fd4fe65e40b7"
+  integrity sha512-ghvfydSTDHh6pVuLpcubI6ksELplStORhsklOSw+fq7HtDPWNyr9Cv2USgd341whnURXvuT+TQuPnZnOMuBqSg==
   dependencies:
     "@sentry/types" "4.5.3"
-    "@sentry/utils" "4.5.3"
+    "@sentry/utils" "4.5.4"
     tslib "^1.9.3"
 
-"@sentry/[email protected].3":
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-4.5.3.tgz#7b69481df2d61e4b935d067be62a52824190f616"
-  integrity sha512-W9+eEZosoDKTAJkab/bxsSRim7I4lqeWHLhmCchDimKcdmpBzC+gOCT0PywwOWRLW08LhTHfmnNSAJv6PaZiCA==
+"@sentry/[email protected].4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-4.5.4.tgz#9c3203feae39e4172fdf4c7d34bc650383555a66"
+  integrity sha512-KuR7PmpGQcOLkMV7IMXo9R4EjkPoQYsLRf5WkswacKnaFNLwrfxU0/0Mv+eyY/JqRN8+vewPQ1hKkAWsbzBtqg==
   dependencies:
-    "@sentry/hub" "4.5.3"
+    "@sentry/hub" "4.5.4"
     "@sentry/types" "4.5.3"
     tslib "^1.9.3"
 
-"@sentry/node@^4.5.3":
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-4.5.3.tgz#f6b57747991c300d4f5f70add673ea3d1e78c873"
-  integrity sha512-glBIGsoYDcUEjZWDjbkDWt87cmuO/lcxpfz4zfTq9JfIfzI3WunJqABhFDc8tQSqUdHOlWb2QKvoNPvz+0EDfg==
+"@sentry/node@^4.5.4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-4.5.4.tgz#c6963b519fe3e21b8c3aa6b94526ebe60fec8dbd"
+  integrity sha512-JXMbbB+gNzomyJIoq4nVHRP3URVDb0eta5DTsIxM6ZVf7fOgHt+yrOQ7FAOz3qzT68xxY9wlGRxAnPEsiqPIXA==
   dependencies:
-    "@sentry/core" "4.5.3"
-    "@sentry/hub" "4.5.3"
+    "@sentry/core" "4.5.4"
+    "@sentry/hub" "4.5.4"
     "@sentry/types" "4.5.3"
-    "@sentry/utils" "4.5.3"
+    "@sentry/utils" "4.5.4"
     "@types/stack-trace" "0.0.29"
     cookie "0.3.1"
     https-proxy-agent "2.2.1"
@@ -82,10 +82,10 @@
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-4.5.3.tgz#3350dce2b7f9b936a8c327891c12e3aef7bd8852"
   integrity sha512-7ll1PAFNjrBNX9rzy3P2qAQrpQwHaDO3uKj735qsnGw34OtAS8Xr8WYrjI14f9fMPa/XIeWvMPb4GMic28V/ag==
 
-"@sentry/[email protected].3":
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-4.5.3.tgz#6893fca9fde230b230360779362752e9b5570852"
-  integrity sha512-yIYqnuq9cd9nAUJ2MPmq++Mgy81qB2fglsDB8TiBfk2eaba79qFcKp8xg3w3EMDHZMlfmlx4fkTmZJ/+V02oWQ==
+"@sentry/[email protected].4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-4.5.4.tgz#fc074b0c16850f39685a6c17f96407f56ed36b03"
+  integrity sha512-LhWnCuTEzmbQKyc0qyahs5PYPpj9qkY3BpMOyEIoYz79RU5lMD1iPR62wG8cqO09JmrCHuqfWeQIQIwUFQTaBQ==
   dependencies:
     "@sentry/types" "4.5.3"
     tslib "^1.9.3"