Use ResourceMapper in ldp#get

Author: rubensworks

lib/handlers/get.js

@@ -19,7 +19,7 @@ const error = require('../http-error')
 const RDFs = require('../ldp').RDF_MIME_TYPES
 const LegacyResourceMapper = require('../legacy-resource-mapper')
 
-function handler (req, res, next) {
+async function handler (req, res, next) {
   const ldp = req.app.locals.ldp
   const includeBody = req.method === 'GET'
   const negotiator = new Negotiator(req)
@@ -42,107 +42,105 @@ function handler (req, res, next) {
   const options = {
     'hostname': req.hostname,
     'path': path,
-    'baseUri': baseUri,
     'includeBody': includeBody,
     'possibleRDFType': possibleRDFType,
     'range': req.headers.range
   }
-  ldp.get(options, function (err, ret) {
+
+  let ret
+  try {
+    ret = await ldp.get(options)
+  } catch (err) {
     // use globHandler if magic is detected
-    if (err && err.status === 404 && glob.hasMagic(path)) {
+    if (err.status === 404 && glob.hasMagic(path)) {
       debug('forwarding to glob request')
       return globHandler(req, res, next)
-    }
-
-    // Handle error
-    if (err) {
+    } else {
       debug(req.method + ' -- Error: ' + err.status + ' ' + err.message)
       return next(err)
     }
+  }
 
-    let stream
-    let contentType
-    let container
-    let contentRange
-    let chunksize
-
-    if (ret) {
-      stream = ret.stream
-      contentType = ret.contentType
-      container = ret.container
-      contentRange = ret.contentRange
-      chunksize = ret.chunksize
-    }
-
-    // Till here it must exist
-    if (!includeBody) {
-      debug('HEAD only')
-      const rootUrl = utils.getBaseUri(req)
-      const mapper = new LegacyResourceMapper({
-        rootUrl,
-        rootPath: ldp.root,
-        includeHost: ldp.multiuser
-      })
-      return mapper.mapFileToUrl({ path }).then(mappedFile => {
-        contentType = mappedFile.contentType
-        res.setHeader('Content-Type', contentType)
-        res.status(200).send('OK')
-        return next()
-      })
-    }
+  let stream
+  let contentType
+  let container
+  let contentRange
+  let chunksize
+
+  if (ret) {
+    stream = ret.stream
+    contentType = ret.contentType
+    container = ret.container
+    contentRange = ret.contentRange
+    chunksize = ret.chunksize
+  }
 
-    // Handle dataBrowser
-    if (requestedType && requestedType.includes('text/html')) {
-      let mimeTypeByExt = mime.lookup(_path.basename(path))
-      let isHtmlResource = mimeTypeByExt && mimeTypeByExt.includes('html')
-      let useDataBrowser = ldp.dataBrowserPath && (
-          container ||
-          RDFs.includes(contentType) && !isHtmlResource && !ldp.suppressDataBrowser)
-
-      if (useDataBrowser) {
-        res.set('Content-Type', 'text/html')
-        const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
-        const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
-        debug('   sending data browser file: ' + dataBrowserPath)
-        res.sendFile(dataBrowserPath)
-        return
-      } else if (stream) {
-        res.setHeader('Content-Type', contentType)
-        return stream.pipe(res)
-      }
-    }
+  // Till here it must exist
+  if (!includeBody) {
+    debug('HEAD only')
+    const rootUrl = utils.getBaseUri(req)
+    const mapper = new LegacyResourceMapper({
+      rootUrl,
+      rootPath: ldp.root,
+      includeHost: ldp.multiuser
+    })
+    const mappedFile = await mapper.mapFileToUrl({ path })
+    contentType = mappedFile.contentType
+    res.setHeader('Content-Type', contentType)
+    res.status(200).send('OK')
+    return next()
+  }
 
-    // If request accepts the content-type we found
-    if (stream && negotiator.mediaType([contentType])) {
+  // Handle dataBrowser
+  if (requestedType && requestedType.includes('text/html')) {
+    let mimeTypeByExt = mime.lookup(_path.basename(path))
+    let isHtmlResource = mimeTypeByExt && mimeTypeByExt.includes('html')
+    let useDataBrowser = ldp.dataBrowserPath && (
+      container ||
+      RDFs.includes(contentType) && !isHtmlResource && !ldp.suppressDataBrowser)
+
+    if (useDataBrowser) {
+      res.set('Content-Type', 'text/html')
+      const defaultDataBrowser = _path.join(__dirname, '../../static/databrowser.html')
+      const dataBrowserPath = ldp.dataBrowserPath === 'default' ? defaultDataBrowser : ldp.dataBrowserPath
+      debug('   sending data browser file: ' + dataBrowserPath)
+      res.sendFile(dataBrowserPath)
+      return
+    } else if (stream) {
       res.setHeader('Content-Type', contentType)
-      if (contentRange) {
-        const headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
-        res.writeHead(206, headers)
-        return stream.pipe(res)
-      } else {
-        return stream.pipe(res)
-      }
+      return stream.pipe(res)
     }
+  }
 
-    // If it is not in our RDFs we can't even translate,
-    // Sorry, we can't help
-    if (!possibleRDFType) {
-      return next(error(406, 'Cannot serve requested type: ' + contentType))
+  // If request accepts the content-type we found
+  if (stream && negotiator.mediaType([contentType])) {
+    res.setHeader('Content-Type', contentType)
+    if (contentRange) {
+      const headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
+      res.writeHead(206, headers)
+      return stream.pipe(res)
+    } else {
+      return stream.pipe(res)
     }
+  }
+
+  // If it is not in our RDFs we can't even translate,
+  // Sorry, we can't help
+  if (!possibleRDFType) {
+    return next(error(406, 'Cannot serve requested type: ' + contentType))
+  }
 
+  try {
     // Translate from the contentType found to the possibleRDFType desired
-    translate(stream, baseUri, contentType, possibleRDFType)
-      .then((data) => {
-        debug(req.originalUrl + ' translating ' + contentType + ' -> ' + possibleRDFType)
-        res.setHeader('Content-Type', possibleRDFType)
-        res.send(data)
-        return next()
-      })
-      .catch((err) => {
-        debug('error translating: ' + req.originalUrl + ' ' + contentType + ' -> ' + possibleRDFType + ' -- ' + 500 + ' ' + err.message)
-        return next(error(500, 'Error translating between RDF formats'))
-      })
-  })
+    const data = await translate(stream, baseUri, contentType, possibleRDFType)
+    debug(req.originalUrl + ' translating ' + contentType + ' -> ' + possibleRDFType)
+    res.setHeader('Content-Type', possibleRDFType)
+    res.send(data)
+    return next()
+  } catch (err) {
+    debug('error translating: ' + req.originalUrl + ' ' + contentType + ' -> ' + possibleRDFType + ' -- ' + 500 + ' ' + err.message)
+    return next(error(500, 'Error translating between RDF formats'))
+  }
 }
 
 function globHandler (req, res, next) {